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 branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
apic
/
apic_noop.c
diff --git
a/arch/x86/kernel/apic/apic_noop.c
b/arch/x86/kernel/apic/apic_noop.c
index 563d9207b2bc9b9a95e764ad870c7cf4cafa5901..c05688b2deff7248473b91d8d9fe953e7395f67e 100644
(file)
--- a/
arch/x86/kernel/apic/apic_noop.c
+++ b/
arch/x86/kernel/apic/apic_noop.c
@@
-140,7
+140,6
@@
struct apic apic_noop = {
.get_apic_id = noop_get_apic_id,
.set_apic_id = NULL,
- .apic_id_mask = 0x0F << 24,
.cpu_mask_to_apicid_and = flat_cpu_mask_to_apicid_and,