Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit da517a08ac5913cd80ce3507cddd00f2a091b13c

Authored by Jack Steiner
Committed by Ingo Molnar
1 parent edf7c8148e
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

x86, UV: Update Boot messages for SGI UV2 platform 

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>
Cc: <stable@kernel.org>
Link: http://lkml.kernel.org/r/20120106191900.GA19772@sgi.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

arch/x86/kernel/apic/x2apic_uv_x.c
Diff comments   View file @ da517a0
... ... @@ -769,7 +769,12 @@
769 769 for(i = 0; i < UVH_NODE_PRESENT_TABLE_DEPTH; i++)
770 770 uv_possible_blades +=
771 771 hweight64(uv_read_local_mmr( UVH_NODE_PRESENT_TABLE + i * 8));
772   - printk(KERN_DEBUG "UV: Found %d blades\n", uv_num_possible_blades());
  772 +
  773 + /* uv_num_possible_blades() is really the hub count */
  774 + printk(KERN_INFO "UV: Found %d blades, %d hubs\n",
  775 + is_uv1_hub() ? uv_num_possible_blades() :
  776 + (uv_num_possible_blades() + 1) / 2,
  777 + uv_num_possible_blades());
773 778  
774 779 bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades();
775 780 uv_blade_info = kzalloc(bytes, GFP_KERNEL);