git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
cpu.h
diff --git
a/arch/x86/include/asm/cpu.h
b/arch/x86/include/asm/cpu.h
index 678637ad7476358a8263deee72a84e476912d2f0..9b7fa6313f1a6d28608943b9a40f0838f8b80389 100644
(file)
--- a/
arch/x86/include/asm/cpu.h
+++ b/
arch/x86/include/asm/cpu.h
@@
-16,8
+16,8
@@
extern void prefill_possible_map(void);
static inline void prefill_possible_map(void) {}
#define cpu_physical_id(cpu) boot_cpu_physical_apicid
+#define cpu_acpi_id(cpu) 0
#define safe_smp_processor_id() 0
-#define stack_smp_processor_id() 0
#endif /* CONFIG_SMP */