From: "Jan Beulich" Subject: [PATCH] linux/x86: avoid a re-definition warning Date: Fri, 02 Mar 2007 10:54:53 +0000 Message-ID: <45E8108D.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org .. on x86-64 and change i386 similarly to be consistent. Signed-off-by: Jan Beulich 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 #include -#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 -#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 @@ -29,13 +37,6 @@ #include #include -/* - * 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) \