dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Jesse Larrew 2011-01-20 19:01:13 +00:00 committed by Benjamin Herrenschmidt
parent bd03403ad5
commit 7639adaafb
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/mm/numa.c
View File

@ -1310,9 +1310,8 @@ static void setup_cpu_associativity_change_counters(void)
u8 *counts = vphn_cpu_change_counts[cpu];
volatile u8 *hypervisor_counts = lppaca[cpu].vphn_assoc_counts;
for (i = 0; i < VPHN_NR_CHANGE_CTRS; i++) {
for (i = 0; i < VPHN_NR_CHANGE_CTRS; i++)
counts[i] = hypervisor_counts[i];
}
}
}
@ -1379,14 +1378,12 @@ static int vphn_unpack_associativity(const long *packed, unsigned int *unpacked)
*/
unpacked[i] = *((u32*)field);
field += 2;
}
else if (*field & VPHN_FIELD_MSB) {
} else if (*field & VPHN_FIELD_MSB) {
/* Data is in the lower 15 bits of this field */
unpacked[i] = *field & VPHN_FIELD_MASK;
field++;
nr_assoc_doms++;
}
else {
} else {
/* Data is in the lower 15 bits of this field
* concatenated with the next 16 bit field
*/