diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:15:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:15:57 -0400 |
| commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch) | |
| tree | a49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/xen/interface_32.h | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/xen/interface_32.h')
| -rw-r--r-- | include/asm-x86/xen/interface_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/xen/interface_32.h b/include/asm-x86/xen/interface_32.h index d8ac41d5db86..08167e19fc66 100644 --- a/include/asm-x86/xen/interface_32.h +++ b/include/asm-x86/xen/interface_32.h | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | * Copyright (c) 2004, K A Fraser | 6 | * Copyright (c) 2004, K A Fraser |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef __ASM_X86_XEN_INTERFACE_32_H | 9 | #ifndef ASM_X86__XEN__INTERFACE_32_H |
| 10 | #define __ASM_X86_XEN_INTERFACE_32_H | 10 | #define ASM_X86__XEN__INTERFACE_32_H |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | /* | 13 | /* |
| @@ -94,4 +94,4 @@ typedef struct xen_callback xen_callback_t; | |||
| 94 | #define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) | 94 | #define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) |
| 95 | #define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) | 95 | #define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) |
| 96 | 96 | ||
| 97 | #endif /* __ASM_X86_XEN_INTERFACE_32_H */ | 97 | #endif /* ASM_X86__XEN__INTERFACE_32_H */ |