linux/x86: avoid a re-definition warning
PATCH 1/1 linux/x86: avoid a re-definition warning
.. on x86-64 and change i386 similarly to be consistent.
Signed-off-by Jan Beulich <[email protected]>
arch/i386/kernel/head-xen.S +0 -2
@@ -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. */
arch/x86_64/kernel/head-xen.S +0 -2
@@ -25,8 +25,6 @@ #include <xen/interface/elfnote.h> -#define _PAGE_PRESENT 0x1 - .section .bootstrap.text, "ax", @progbits .code64 #define VIRT_ENTRY_OFFSET 0x0
include/asm-i386/mach-xen/asm/page.h +8 -7
@@ -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) \