lkml.org 
[lkml]   [2012]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[072/129] x86, UV: Update Boot messages for SGI UV2 platform
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------
    Content-Length: 1306
    Lines: 38

    From: Jack Steiner <steiner@sgi.com>

    commit da517a08ac5913cd80ce3507cddd00f2a091b13c upstream.

    SGI UV systems print a message during boot:

    UV: Found <num> blades

    Due to packaging changes, the blade count is not accurate for
    on the next generation of the platform. This patch corrects the
    count.

    Signed-off-by: Jack Steiner <steiner@sgi.com>
    Link: http://lkml.kernel.org/r/20120106191900.GA19772@sgi.com
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kernel/apic/x2apic_uv_x.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    --- a/arch/x86/kernel/apic/x2apic_uv_x.c
    +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
    @@ -769,7 +769,12 @@ void __init uv_system_init(void)
    for(i = 0; i < UVH_NODE_PRESENT_TABLE_DEPTH; i++)
    uv_possible_blades +=
    hweight64(uv_read_local_mmr( UVH_NODE_PRESENT_TABLE + i * 8));
    - printk(KERN_DEBUG "UV: Found %d blades\n", uv_num_possible_blades());
    +
    + /* uv_num_possible_blades() is really the hub count */
    + printk(KERN_INFO "UV: Found %d blades, %d hubs\n",
    + is_uv1_hub() ? uv_num_possible_blades() :
    + (uv_num_possible_blades() + 1) / 2,
    + uv_num_possible_blades());

    bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades();
    uv_blade_info = kzalloc(bytes, GFP_KERNEL);



    \
     
     \ /
      Last update: 2012-01-24 03:59    [W:4.217 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site