git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
mtrr
/
Makefile
diff --git
a/arch/i386/kernel/cpu/mtrr/Makefile
b/arch/i386/kernel/cpu/mtrr/Makefile
index
a25b701
..
06df4fe
100644
(file)
--- a/
arch/i386/kernel/cpu/mtrr/Makefile
+++ b/
arch/i386/kernel/cpu/mtrr/Makefile
@@
-3,3
+3,10
@@
obj-y += amd.o
obj-y += cyrix.o
obj-y += centaur.o
obj-y += cyrix.o
obj-y += centaur.o
+ifdef CONFIG_XEN
+include $(srctree)/scripts/Makefile.xen
+n-obj-xen := generic.o state.o amd.o cyrix.o centaur.o
+
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif