[Xen-devel] [PATCH] linux/x86: avoid a re-definition warning

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

.. on x86-64 and change i386 similarly to be consistent.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: head-2007-02-27/arch/i386/kernel/head-xen.S
===================================================================
--- head-2007-02-27.orig/arch/i386/kernel/head-xen.S    2007-02-27 
16:55:09.000000000 +0100
+++ head-2007-02-27/arch/i386/kernel/head-xen.S 2007-02-28 08:47:14.000000000 
+0100
@@ -12,8 +12,6 @@
 #include <xen/interface/xen.h>
 #include <xen/interface/elfnote.h>
 
-#define _PAGE_PRESENT 0x1
-
 /*
  * References to members of the new_cpu_data structure.
  */
Index: head-2007-02-27/arch/x86_64/kernel/head-xen.S
===================================================================
--- head-2007-02-27.orig/arch/x86_64/kernel/head-xen.S  2007-02-28 
08:46:04.000000000 +0100
+++ head-2007-02-27/arch/x86_64/kernel/head-xen.S       2007-02-28 
08:47:28.000000000 +0100
@@ -25,8 +25,6 @@
 
 #include <xen/interface/elfnote.h>
 
-#define _PAGE_PRESENT 0x1
-
        .section .bootstrap.text, "ax", @progbits
        .code64
 #define VIRT_ENTRY_OFFSET 0x0
Index: head-2007-02-27/include/asm-i386/mach-xen/asm/page.h
===================================================================
--- head-2007-02-27.orig/include/asm-i386/mach-xen/asm/page.h   2007-02-28 
08:50:16.000000000 +0100
+++ head-2007-02-27/include/asm-i386/mach-xen/asm/page.h        2007-02-28 
08:51:09.000000000 +0100
@@ -20,6 +20,14 @@
 #define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
 
 #ifdef __KERNEL__
+
+/*
+ * Need to repeat this here in order to not include pgtable.h (which in turn
+ * depends on definitions made here), but to be able to use the symbolic
+ * below. The preprocessor will warn if the two definitions aren't identical.
+ */
+#define _PAGE_PRESENT  0x001
+
 #ifndef __ASSEMBLY__
 
 #include <linux/string.h>
@@ -29,13 +37,6 @@
 #include <xen/interface/xen.h>
 #include <xen/features.h>
 
-/*
- * Need to repeat this here in order to not include pgtable.h (which in turn
- * depends on definitions made here), but to be able to use the symbolic
- * below. The preprocessor will warn if the two definitions aren't identical.
- */
-#define _PAGE_PRESENT  0x001
-
 #define arch_free_page(_page,_order)           \
 ({     int foreign = PageForeign(_page);       \
        if (foreign)                            \



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