Commit 7639adaa authored by Jesse Larrew's avatar Jesse Larrew Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: Fix brace placement in numa.c



Fix brace placement in VPHN code.
Signed-off-by: default avatarJesse Larrew <jlarrew@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent bd03403a
...@@ -1310,9 +1310,8 @@ static void setup_cpu_associativity_change_counters(void) ...@@ -1310,9 +1310,8 @@ static void setup_cpu_associativity_change_counters(void)
u8 *counts = vphn_cpu_change_counts[cpu]; u8 *counts = vphn_cpu_change_counts[cpu];
volatile u8 *hypervisor_counts = lppaca[cpu].vphn_assoc_counts; 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]; counts[i] = hypervisor_counts[i];
}
} }
} }
...@@ -1379,14 +1378,12 @@ static int vphn_unpack_associativity(const long *packed, unsigned int *unpacked) ...@@ -1379,14 +1378,12 @@ static int vphn_unpack_associativity(const long *packed, unsigned int *unpacked)
*/ */
unpacked[i] = *((u32*)field); unpacked[i] = *((u32*)field);
field += 2; field += 2;
} } else if (*field & VPHN_FIELD_MSB) {
else if (*field & VPHN_FIELD_MSB) {
/* Data is in the lower 15 bits of this field */ /* Data is in the lower 15 bits of this field */
unpacked[i] = *field & VPHN_FIELD_MASK; unpacked[i] = *field & VPHN_FIELD_MASK;
field++; field++;
nr_assoc_doms++; nr_assoc_doms++;
} } else {
else {
/* Data is in the lower 15 bits of this field /* Data is in the lower 15 bits of this field
* concatenated with the next 16 bit field * concatenated with the next 16 bit field
*/ */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment