ia64/xen-unstable

changeset 14217:145d3c81e654

linux/x86: avoid a re-definition warning on x86-64 and change i386
similarly to be consistent.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Fri Mar 02 15:12:54 2007 +0000 (2007-03-02)
parents 4847e5b8adf1
children 0d5d7d472024
files linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Fri Mar 02 15:10:54 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Fri Mar 02 15:12:54 2007 +0000
     1.3 @@ -12,8 +12,6 @@
     1.4  #include <xen/interface/xen.h>
     1.5  #include <xen/interface/elfnote.h>
     1.6  
     1.7 -#define _PAGE_PRESENT 0x1
     1.8 -
     1.9  /*
    1.10   * References to members of the new_cpu_data structure.
    1.11   */
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Fri Mar 02 15:10:54 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Fri Mar 02 15:12:54 2007 +0000
     2.3 @@ -25,8 +25,6 @@
     2.4  
     2.5  #include <xen/interface/elfnote.h>
     2.6  
     2.7 -#define _PAGE_PRESENT 0x1
     2.8 -
     2.9  	.section .bootstrap.text, "ax", @progbits
    2.10  	.code64
    2.11  #define VIRT_ENTRY_OFFSET 0x0
     3.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h	Fri Mar 02 15:10:54 2007 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h	Fri Mar 02 15:12:54 2007 +0000
     3.3 @@ -20,6 +20,14 @@
     3.4  #define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
     3.5  
     3.6  #ifdef __KERNEL__
     3.7 +
     3.8 +/*
     3.9 + * Need to repeat this here in order to not include pgtable.h (which in turn
    3.10 + * depends on definitions made here), but to be able to use the symbolic
    3.11 + * below. The preprocessor will warn if the two definitions aren't identical.
    3.12 + */
    3.13 +#define _PAGE_PRESENT	0x001
    3.14 +
    3.15  #ifndef __ASSEMBLY__
    3.16  
    3.17  #include <linux/string.h>
    3.18 @@ -29,13 +37,6 @@
    3.19  #include <xen/interface/xen.h>
    3.20  #include <xen/features.h>
    3.21  
    3.22 -/*
    3.23 - * Need to repeat this here in order to not include pgtable.h (which in turn
    3.24 - * depends on definitions made here), but to be able to use the symbolic
    3.25 - * below. The preprocessor will warn if the two definitions aren't identical.
    3.26 - */
    3.27 -#define _PAGE_PRESENT	0x001
    3.28 -
    3.29  #define arch_free_page(_page,_order)		\
    3.30  ({	int foreign = PageForeign(_page);	\
    3.31  	if (foreign)				\