lkml.org 
[lkml]   [2016]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/platform] x86/platform/uv/BAU: Populate ->uvhub_version with UV4 version information
    Commit-ID:  58d4ab46f21e7e800a7597f271a23ec602796247
    Gitweb: http://git.kernel.org/tip/58d4ab46f21e7e800a7597f271a23ec602796247
    Author: Andrew Banman <abanman@sgi.com>
    AuthorDate: Wed, 21 Sep 2016 11:09:18 -0500
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Thu, 22 Sep 2016 11:16:14 +0200

    x86/platform/uv/BAU: Populate ->uvhub_version with UV4 version information

    Signed-off-by: Andrew Banman <abanman@sgi.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Mike Travis <travis@sgi.com>
    Acked-by: Dimitri Sivanich <sivanich@sgi.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: akpm@linux-foundation.org
    Cc: rja@sgi.com
    Link: http://lkml.kernel.org/r/1474474161-265604-8-git-send-email-abanman@sgi.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/platform/uv/tlb_uv.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
    index 030d452..ddbeb16 100644
    --- a/arch/x86/platform/uv/tlb_uv.c
    +++ b/arch/x86/platform/uv/tlb_uv.c
    @@ -2044,8 +2044,10 @@ static int scan_sock(struct socket_desc *sdp, struct uvhub_desc *bdp,
    bcp->uvhub_version = 2;
    else if (is_uv3_hub())
    bcp->uvhub_version = 3;
    + else if (is_uv4_hub())
    + bcp->uvhub_version = 4;
    else {
    - pr_emerg("uvhub version not 1, 2, or 3\n");
    + pr_emerg("uvhub version not 1, 2, 3, or 4\n");
    return 1;
    }
    bcp->uvhub_master = *hmasterp;
    \
     
     \ /
      Last update: 2016-09-23 00:02    [W:2.552 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site