aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorJesse Larrew <jlarrew@linux.vnet.ibm.com>2011-01-20 14:01:13 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-02-06 20:58:23 -0500
commit7639adaafbfe988d814d45181389fac7697d844e (patch)
treea5ab7cc82e67480abc8570c47b788658f31366e9 /arch/powerpc/mm
parentbd03403ad5d789f75974985b698cffcd23ef9346 (diff)
powerpc/pseries: Fix brace placement in numa.c
Fix brace placement in VPHN code. Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/numa.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 4d7f9e78023c..6c0cd06d0d59 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1310,9 +1310,8 @@ static void setup_cpu_associativity_change_counters(void)
1310 u8 *counts = vphn_cpu_change_counts[cpu]; 1310 u8 *counts = vphn_cpu_change_counts[cpu];
1311 volatile u8 *hypervisor_counts = lppaca[cpu].vphn_assoc_counts; 1311 volatile u8 *hypervisor_counts = lppaca[cpu].vphn_assoc_counts;
1312 1312
1313 for (i = 0; i < VPHN_NR_CHANGE_CTRS; i++) { 1313 for (i = 0; i < VPHN_NR_CHANGE_CTRS; i++)
1314 counts[i] = hypervisor_counts[i]; 1314 counts[i] = hypervisor_counts[i];
1315 }
1316 } 1315 }
1317} 1316}
1318 1317
@@ -1379,14 +1378,12 @@ static int vphn_unpack_associativity(const long *packed, unsigned int *unpacked)
1379 */ 1378 */
1380 unpacked[i] = *((u32*)field); 1379 unpacked[i] = *((u32*)field);
1381 field += 2; 1380 field += 2;
1382 } 1381 } else if (*field & VPHN_FIELD_MSB) {
1383 else if (*field & VPHN_FIELD_MSB) {
1384 /* Data is in the lower 15 bits of this field */ 1382 /* Data is in the lower 15 bits of this field */
1385 unpacked[i] = *field & VPHN_FIELD_MASK; 1383 unpacked[i] = *field & VPHN_FIELD_MASK;
1386 field++; 1384 field++;
1387 nr_assoc_doms++; 1385 nr_assoc_doms++;
1388 } 1386 } else {
1389 else {
1390 /* Data is in the lower 15 bits of this field 1387 /* Data is in the lower 15 bits of this field
1391 * concatenated with the next 16 bit field 1388 * concatenated with the next 16 bit field
1392 */ 1389 */