releases/3.0.18/x86-uv-update-boot-messages-for-sgi-uv2-platform.patch

   1 From da517a08ac5913cd80ce3507cddd00f2a091b13c Mon Sep 17 00:00:00 2001
   2 From: Jack Steiner <steiner@sgi.com>
   3 Date: Fri, 6 Jan 2012 13:19:00 -0600
   4 Subject: x86, UV: Update Boot messages for SGI UV2 platform
   5
   6 From: Jack Steiner <steiner@sgi.com>
   7
   8 commit da517a08ac5913cd80ce3507cddd00f2a091b13c upstream.
   9
  10 SGI UV systems print a message during boot:
  11
  12         UV: Found <num> blades
  13
  14 Due to packaging changes, the blade count is not accurate for
  15 on the next generation of the platform. This patch corrects the
  16 count.
  17
  18 Signed-off-by: Jack Steiner <steiner@sgi.com>
  19 Link: http://lkml.kernel.org/r/20120106191900.GA19772@sgi.com
  20 Signed-off-by: Ingo Molnar <mingo@elte.hu>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  22
  23 ---
  24  arch/x86/kernel/apic/x2apic_uv_x.c |    7 ++++++-
  25  1 file changed, 6 insertions(+), 1 deletion(-)
  26
  27 --- a/arch/x86/kernel/apic/x2apic_uv_x.c
  28 +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
  29 @@ -779,7 +779,12 @@ void __init uv_system_init(void)
  30         for(i = 0; i < UVH_NODE_PRESENT_TABLE_DEPTH; i++)
  31                 uv_possible_blades +=
  32                   hweight64(uv_read_local_mmr( UVH_NODE_PRESENT_TABLE + i * 8));
  33 -       printk(KERN_DEBUG "UV: Found %d blades\n", uv_num_possible_blades());
  34 +
  35 +       /* uv_num_possible_blades() is really the hub count */
  36 +       printk(KERN_INFO "UV: Found %d blades, %d hubs\n",
  37 +                       is_uv1_hub() ? uv_num_possible_blades() :
  38 +                       (uv_num_possible_blades() + 1) / 2,
  39 +                       uv_num_possible_blades());
  40
  41         bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades();
  42         uv_blade_info = kzalloc(bytes, GFP_KERNEL);