diff options
| author | Daniel J Blueman <daniel@numascale.com> | 2014-11-04 08:29:41 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-11-04 17:17:27 (GMT) |
| commit | 00e7977dd1bbd46e336d7ef907d0fb6b6a4c294f (patch) | |
| tree | c2b62c3c54aac409017312b99a30a5004bdbb793 /arch/x86/kernel/apic/apic_numachip.c | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| download | linux-00e7977dd1bbd46e336d7ef907d0fb6b6a4c294f.tar.xz | |
x86: numachip: Fix 16-bit APIC ID truncation
Prevent 16-bit APIC IDs being truncated by using correct mask. This fixes
booting large systems, where the wrong core would receive the startup and
init IPIs, causing hanging.
Signed-off-by: Daniel J Blueman <daniel@numascale.com>
Cc: Steffen Persvold <sp@numascale.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: http://lkml.kernel.org/r/1415089784-28779-1-git-send-email-daniel@numascale.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic/apic_numachip.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic_numachip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c index 4128b5f..2aaee79 100644 --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -40,7 +40,7 @@ static unsigned int get_apic_id(unsigned long x) unsigned int id; rdmsrl(MSR_FAM10H_NODE_ID, value); - id = ((x >> 24) & 0xffU) | ((value << 2) & 0x3f00U); + id = ((x >> 24) & 0xffU) | ((value << 2) & 0xff00U); return id; } |