x86 fixes

GIT PULL Ingo Molnar 1 participant 1 message Jan 15, 2012

Subsystems (3)

x86 Atomic infrastructure x86 platform uv hpe superdome flex

lore

Share & tools

lore

Ingo Molnar

author

2012-01-15 13:40 UTC #0 lore raw

Linus,

Please pull the latest x86-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus

HEAD: 8030c36d13f030103356709e63638678fdc66fdc x86, atomic: atomic64_read() take a const pointer

Thanks,

Ingo

------------------>
H. Peter Anvin (1):
x86, atomic: atomic64_read() take a const pointer

Jack Steiner (1):
x86, UV: Update Boot messages for SGI UV2 platform

 arch/x86/include/asm/atomic64_32.h |    2 +-
 arch/x86/kernel/apic/x2apic_uv_x.c |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

arch/x86/include/asm/atomic64_32.h +1 -1

index 24098aa..fa13f0e 100644
@@ -82,7 +82,7 @@ static inline void atomic64_set(atomic64_t *v, long long i)
  *
  * Atomically reads the value of @v and returns it.
  */
-static inline long long atomic64_read(atomic64_t *v)
+static inline long long atomic64_read(const atomic64_t *v)
 {
 	long long r;
 	asm volatile(ATOMIC64_ALTERNATIVE(read)

arch/x86/kernel/apic/x2apic_uv_x.c +6 -1

index 9d59bba..79b05b8 100644
@@ -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);