git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
vmi_32.c
diff --git
a/arch/x86/kernel/vmi_32.c
b/arch/x86/kernel/vmi_32.c
index
b153460
..
0a1b1a9
100644
(file)
--- a/
arch/x86/kernel/vmi_32.c
+++ b/
arch/x86/kernel/vmi_32.c
@@
-906,7
+906,6
@@
static inline int __init activate_vmi(void)
#ifdef CONFIG_X86_LOCAL_APIC
para_fill(pv_apic_ops.apic_read, APICRead);
para_fill(pv_apic_ops.apic_write, APICWrite);
- para_fill(pv_apic_ops.apic_write_atomic, APICWrite);
#endif
/*