[Xen-changelog] [xen-unstable] [XEN] x86-64: don't compile some unused machine check code

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 63d58674596f3760c2b7837f9b61f239d15dd585
# Parent  c5ad4b36fce279c408e5d44a2c6901516fef8c0d
[XEN] x86-64: don't compile some unused machine check code
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/cpu/mcheck/Makefile |    6 +++---
 xen/arch/x86/cpu/mcheck/mce.c    |    4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff -r c5ad4b36fce2 -r 63d58674596f xen/arch/x86/cpu/mcheck/Makefile
--- a/xen/arch/x86/cpu/mcheck/Makefile  Mon Nov 13 14:11:08 2006 +0000
+++ b/xen/arch/x86/cpu/mcheck/Makefile  Mon Nov 13 14:12:01 2006 +0000
@@ -2,6 +2,6 @@ obj-y += mce.o
 obj-y += mce.o
 obj-y += non-fatal.o
 obj-y += p4.o
-obj-y += p5.o
-obj-y += p6.o
-obj-y += winchip.o
+obj-$(x86_32) += p5.o
+obj-$(x86_32) += p6.o
+obj-$(x86_32) += winchip.o
diff -r c5ad4b36fce2 -r 63d58674596f xen/arch/x86/cpu/mcheck/mce.c
--- a/xen/arch/x86/cpu/mcheck/mce.c     Mon Nov 13 14:11:08 2006 +0000
+++ b/xen/arch/x86/cpu/mcheck/mce.c     Mon Nov 13 14:12:01 2006 +0000
@@ -39,18 +39,22 @@ void mcheck_init(struct cpuinfo_x86 *c)
                        break;
 
                case X86_VENDOR_INTEL:
+#ifndef CONFIG_X86_64
                        if (c->x86==5)
                                intel_p5_mcheck_init(c);
                        if (c->x86==6)
                                intel_p6_mcheck_init(c);
+#endif
                        if (c->x86==15)
                                intel_p4_mcheck_init(c);
                        break;
 
+#ifndef CONFIG_X86_64
                case X86_VENDOR_CENTAUR:
                        if (c->x86==5)
                                winchip_mcheck_init(c);
                        break;
+#endif
 
                default:
                        break;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog