Commit 1965aae3 authored by H. Peter Anvin's avatar H. Peter Anvin

x86: Fix ASM_X86__ header guards

Change header guards named "ASM_X86__*" to "_ASM_X86_*" since:

a. the double underscore is ugly and pointless.
b. no leading underscore violates namespace constraints.
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 87e299e5
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
#define stub_rt_sigreturn sys_rt_sigreturn #define stub_rt_sigreturn sys_rt_sigreturn
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ; #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
#undef ASM_X86__UNISTD_64_H #undef _ASM_X86_UNISTD_64_H
#include "../../x86/include/asm/unistd_64.h" #include "../../x86/include/asm/unistd_64.h"
#undef __SYSCALL #undef __SYSCALL
#define __SYSCALL(nr, sym) [ nr ] = sym, #define __SYSCALL(nr, sym) [ nr ] = sym,
#undef ASM_X86__UNISTD_64_H #undef _ASM_X86_UNISTD_64_H
typedef void (*sys_call_ptr_t)(void); typedef void (*sys_call_ptr_t)(void);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
*/ */
#undef CONFIG_PARAVIRT #undef CONFIG_PARAVIRT
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
#define ASM_X86__DESC_H 1 #define _ASM_X86_DESC_H 1
#endif #endif
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* 2 of the Licence, or (at your option) any later version. * 2 of the Licence, or (at your option) any later version.
*/ */
#ifndef ASM_X86__A_OUT_CORE_H #ifndef _ASM_X86_A_OUT_CORE_H
#define ASM_X86__A_OUT_CORE_H #define _ASM_X86_A_OUT_CORE_H
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
...@@ -70,4 +70,4 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump) ...@@ -70,4 +70,4 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
#endif /* CONFIG_X86_32 */ #endif /* CONFIG_X86_32 */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* ASM_X86__A_OUT_CORE_H */ #endif /* _ASM_X86_A_OUT_CORE_H */
#ifndef ASM_X86__A_OUT_H #ifndef _ASM_X86_A_OUT_H
#define ASM_X86__A_OUT_H #define _ASM_X86_A_OUT_H
struct exec struct exec
{ {
...@@ -17,4 +17,4 @@ struct exec ...@@ -17,4 +17,4 @@ struct exec
#define N_DRSIZE(a) ((a).a_drsize) #define N_DRSIZE(a) ((a).a_drsize)
#define N_SYMSIZE(a) ((a).a_syms) #define N_SYMSIZE(a) ((a).a_syms)
#endif /* ASM_X86__A_OUT_H */ #endif /* _ASM_X86_A_OUT_H */
#ifndef ASM_X86__ACPI_H #ifndef _ASM_X86_ACPI_H
#define ASM_X86__ACPI_H #define _ASM_X86_ACPI_H
/* /*
* Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> * Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
...@@ -175,4 +175,4 @@ static inline void acpi_fake_nodes(const struct bootnode *fake_nodes, ...@@ -175,4 +175,4 @@ static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
#define acpi_unlazy_tlb(x) leave_mm(x) #define acpi_unlazy_tlb(x) leave_mm(x)
#endif /* ASM_X86__ACPI_H */ #endif /* _ASM_X86_ACPI_H */
#ifndef ASM_X86__AGP_H #ifndef _ASM_X86_AGP_H
#define ASM_X86__AGP_H #define _ASM_X86_AGP_H
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
...@@ -32,4 +32,4 @@ ...@@ -32,4 +32,4 @@
#define free_gatt_pages(table, order) \ #define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order)) free_pages((unsigned long)(table), (order))
#endif /* ASM_X86__AGP_H */ #endif /* _ASM_X86_AGP_H */
#ifndef ASM_X86__ALTERNATIVE_H #ifndef _ASM_X86_ALTERNATIVE_H
#define ASM_X86__ALTERNATIVE_H #define _ASM_X86_ALTERNATIVE_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/stddef.h> #include <linux/stddef.h>
...@@ -180,4 +180,4 @@ extern void add_nops(void *insns, unsigned int len); ...@@ -180,4 +180,4 @@ extern void add_nops(void *insns, unsigned int len);
extern void *text_poke(void *addr, const void *opcode, size_t len); extern void *text_poke(void *addr, const void *opcode, size_t len);
extern void *text_poke_early(void *addr, const void *opcode, size_t len); extern void *text_poke_early(void *addr, const void *opcode, size_t len);
#endif /* ASM_X86__ALTERNATIVE_H */ #endif /* _ASM_X86_ALTERNATIVE_H */
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef ASM_X86__AMD_IOMMU_H #ifndef _ASM_X86_AMD_IOMMU_H
#define ASM_X86__AMD_IOMMU_H #define _ASM_X86_AMD_IOMMU_H
#include <linux/irqreturn.h> #include <linux/irqreturn.h>
...@@ -32,4 +32,4 @@ static inline int amd_iommu_init(void) { return -ENODEV; } ...@@ -32,4 +32,4 @@ static inline int amd_iommu_init(void) { return -ENODEV; }
static inline void amd_iommu_detect(void) { } static inline void amd_iommu_detect(void) { }
#endif #endif
#endif /* ASM_X86__AMD_IOMMU_H */ #endif /* _ASM_X86_AMD_IOMMU_H */
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef ASM_X86__AMD_IOMMU_TYPES_H #ifndef _ASM_X86_AMD_IOMMU_TYPES_H
#define ASM_X86__AMD_IOMMU_TYPES_H #define _ASM_X86_AMD_IOMMU_TYPES_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/list.h> #include <linux/list.h>
...@@ -401,4 +401,4 @@ static inline u16 calc_devid(u8 bus, u8 devfn) ...@@ -401,4 +401,4 @@ static inline u16 calc_devid(u8 bus, u8 devfn)
return (((u16)bus) << 8) | devfn; return (((u16)bus) << 8) | devfn;
} }
#endif /* ASM_X86__AMD_IOMMU_TYPES_H */ #endif /* _ASM_X86_AMD_IOMMU_TYPES_H */
#ifndef ASM_X86__APIC_H #ifndef _ASM_X86_APIC_H
#define ASM_X86__APIC_H #define _ASM_X86_APIC_H
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -196,4 +196,4 @@ static inline void init_apic_mappings(void) { } ...@@ -196,4 +196,4 @@ static inline void init_apic_mappings(void) { }
#endif /* !CONFIG_X86_LOCAL_APIC */ #endif /* !CONFIG_X86_LOCAL_APIC */
#endif /* ASM_X86__APIC_H */ #endif /* _ASM_X86_APIC_H */
#ifndef ASM_X86__APICDEF_H #ifndef _ASM_X86_APICDEF_H
#define ASM_X86__APICDEF_H #define _ASM_X86_APICDEF_H
/* /*
* Constants for various Intel APICs. (local APIC, IOAPIC, etc.) * Constants for various Intel APICs. (local APIC, IOAPIC, etc.)
...@@ -414,4 +414,4 @@ struct local_apic { ...@@ -414,4 +414,4 @@ struct local_apic {
#else #else
#define BAD_APICID 0xFFFFu #define BAD_APICID 0xFFFFu
#endif #endif
#endif /* ASM_X86__APICDEF_H */ #endif /* _ASM_X86_APICDEF_H */
#ifndef ASM_X86__ARCH_HOOKS_H #ifndef _ASM_X86_ARCH_HOOKS_H
#define ASM_X86__ARCH_HOOKS_H #define _ASM_X86_ARCH_HOOKS_H
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -23,4 +23,4 @@ extern void pre_time_init_hook(void); ...@@ -23,4 +23,4 @@ extern void pre_time_init_hook(void);
extern void time_init_hook(void); extern void time_init_hook(void);
extern void mca_nmi_hook(void); extern void mca_nmi_hook(void);
#endif /* ASM_X86__ARCH_HOOKS_H */ #endif /* _ASM_X86_ARCH_HOOKS_H */
#ifndef ASM_X86__ASM_H #ifndef _ASM_X86_ASM_H
#define ASM_X86__ASM_H #define _ASM_X86_ASM_H
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
# define __ASM_FORM(x) x # define __ASM_FORM(x) x
...@@ -44,4 +44,4 @@ ...@@ -44,4 +44,4 @@
_ASM_PTR #from "," #to "\n" \ _ASM_PTR #from "," #to "\n" \
" .previous\n" " .previous\n"
#endif /* ASM_X86__ASM_H */ #endif /* _ASM_X86_ASM_H */
#ifndef ASM_X86__ATOMIC_32_H #ifndef _ASM_X86_ATOMIC_32_H
#define ASM_X86__ATOMIC_32_H #define _ASM_X86_ATOMIC_32_H
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/processor.h> #include <asm/processor.h>
...@@ -256,4 +256,4 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -256,4 +256,4 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic.h>
#endif /* ASM_X86__ATOMIC_32_H */ #endif /* _ASM_X86_ATOMIC_32_H */
#ifndef ASM_X86__ATOMIC_64_H #ifndef _ASM_X86_ATOMIC_64_H
#define ASM_X86__ATOMIC_64_H #define _ASM_X86_ATOMIC_64_H
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/cmpxchg.h> #include <asm/cmpxchg.h>
...@@ -470,4 +470,4 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2) ...@@ -470,4 +470,4 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic.h>
#endif /* ASM_X86__ATOMIC_64_H */ #endif /* _ASM_X86_ATOMIC_64_H */
#ifndef ASM_X86__AUXVEC_H #ifndef _ASM_X86_AUXVEC_H
#define ASM_X86__AUXVEC_H #define _ASM_X86_AUXVEC_H
/* /*
* Architecture-neutral AT_ values in 0-17, leave some room * Architecture-neutral AT_ values in 0-17, leave some room
* for more of them, start the x86-specific ones at 32. * for more of them, start the x86-specific ones at 32.
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
#endif #endif
#define AT_SYSINFO_EHDR 33 #define AT_SYSINFO_EHDR 33
#endif /* ASM_X86__AUXVEC_H */ #endif /* _ASM_X86_AUXVEC_H */
#ifndef ASM_X86__BIOS_EBDA_H #ifndef _ASM_X86_BIOS_EBDA_H
#define ASM_X86__BIOS_EBDA_H #define _ASM_X86_BIOS_EBDA_H
#include <asm/io.h> #include <asm/io.h>
...@@ -33,4 +33,4 @@ static inline void start_periodic_check_for_corruption(void) ...@@ -33,4 +33,4 @@ static inline void start_periodic_check_for_corruption(void)
} }
#endif #endif
#endif /* ASM_X86__BIOS_EBDA_H */ #endif /* _ASM_X86_BIOS_EBDA_H */
#ifndef ASM_X86__BITOPS_H #ifndef _ASM_X86_BITOPS_H
#define ASM_X86__BITOPS_H #define _ASM_X86_BITOPS_H
/* /*
* Copyright 1992, Linus Torvalds. * Copyright 1992, Linus Torvalds.
...@@ -448,4 +448,4 @@ static inline int fls(int x) ...@@ -448,4 +448,4 @@ static inline int fls(int x)
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* ASM_X86__BITOPS_H */ #endif /* _ASM_X86_BITOPS_H */
#ifndef ASM_X86__BOOT_H #ifndef _ASM_X86_BOOT_H
#define ASM_X86__BOOT_H #define _ASM_X86_BOOT_H
/* Don't touch these, unless you really know what you're doing. */ /* Don't touch these, unless you really know what you're doing. */
#define DEF_SYSSEG 0x1000 #define DEF_SYSSEG 0x1000
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
#define BOOT_STACK_SIZE 0x1000 #define BOOT_STACK_SIZE 0x1000
#endif #endif
#endif /* ASM_X86__BOOT_H */ #endif /* _ASM_X86_BOOT_H */
#ifndef ASM_X86__BOOTPARAM_H #ifndef _ASM_X86_BOOTPARAM_H
#define ASM_X86__BOOTPARAM_H #define _ASM_X86_BOOTPARAM_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/screen_info.h> #include <linux/screen_info.h>
...@@ -108,4 +108,4 @@ struct boot_params { ...@@ -108,4 +108,4 @@ struct boot_params {
__u8 _pad9[276]; /* 0xeec */ __u8 _pad9[276]; /* 0xeec */
} __attribute__((packed)); } __attribute__((packed));
#endif /* ASM_X86__BOOTPARAM_H */ #endif /* _ASM_X86_BOOTPARAM_H */
#ifndef ASM_X86__BUG_H #ifndef _ASM_X86_BUG_H
#define ASM_X86__BUG_H #define _ASM_X86_BUG_H
#ifdef CONFIG_BUG #ifdef CONFIG_BUG
#define HAVE_ARCH_BUG #define HAVE_ARCH_BUG
...@@ -36,4 +36,4 @@ do { \ ...@@ -36,4 +36,4 @@ do { \
#endif /* !CONFIG_BUG */ #endif /* !CONFIG_BUG */
#include <asm-generic/bug.h> #include <asm-generic/bug.h>
#endif /* ASM_X86__BUG_H */ #endif /* _ASM_X86_BUG_H */
#ifndef ASM_X86__BUGS_H #ifndef _ASM_X86_BUGS_H
#define ASM_X86__BUGS_H #define _ASM_X86_BUGS_H
extern void check_bugs(void); extern void check_bugs(void);
...@@ -9,4 +9,4 @@ int ppro_with_ram_bug(void); ...@@ -9,4 +9,4 @@ int ppro_with_ram_bug(void);
static inline int ppro_with_ram_bug(void) { return 0; } static inline int ppro_with_ram_bug(void) { return 0; }
#endif #endif
#endif /* ASM_X86__BUGS_H */ #endif /* _ASM_X86_BUGS_H */
#ifndef ASM_X86__BYTEORDER_H #ifndef _ASM_X86_BYTEORDER_H
#define ASM_X86__BYTEORDER_H #define _ASM_X86_BYTEORDER_H
#include <asm/types.h> #include <asm/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
...@@ -78,4 +78,4 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) ...@@ -78,4 +78,4 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
#include <linux/byteorder/little_endian.h> #include <linux/byteorder/little_endian.h>
#endif /* ASM_X86__BYTEORDER_H */ #endif /* _ASM_X86_BYTEORDER_H */
#ifndef ASM_X86__CACHE_H #ifndef _ASM_X86_CACHE_H
#define ASM_X86__CACHE_H #define _ASM_X86_CACHE_H
/* L1 cache line size */ /* L1 cache line size */
#define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
#endif #endif
#endif #endif
#endif /* ASM_X86__CACHE_H */ #endif /* _ASM_X86_CACHE_H */
#ifndef ASM_X86__CACHEFLUSH_H #ifndef _ASM_X86_CACHEFLUSH_H
#define ASM_X86__CACHEFLUSH_H #define _ASM_X86_CACHEFLUSH_H
/* Keep includes the same across arches. */ /* Keep includes the same across arches. */
#include <linux/mm.h> #include <linux/mm.h>
...@@ -115,4 +115,4 @@ static inline int rodata_test(void) ...@@ -115,4 +115,4 @@ static inline int rodata_test(void)
} }
#endif #endif
#endif /* ASM_X86__CACHEFLUSH_H */ #endif /* _ASM_X86_CACHEFLUSH_H */
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef ASM_X86__CALGARY_H #ifndef _ASM_X86_CALGARY_H
#define ASM_X86__CALGARY_H #define _ASM_X86_CALGARY_H
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/device.h> #include <linux/device.h>
...@@ -69,4 +69,4 @@ static inline int calgary_iommu_init(void) { return 1; } ...@@ -69,4 +69,4 @@ static inline int calgary_iommu_init(void) { return 1; }
static inline void detect_calgary(void) { return; } static inline void detect_calgary(void) { return; }
#endif #endif
#endif /* ASM_X86__CALGARY_H */ #endif /* _ASM_X86_CALGARY_H */
#ifndef ASM_X86__CHECKSUM_32_H #ifndef _ASM_X86_CHECKSUM_32_H
#define ASM_X86__CHECKSUM_32_H #define _ASM_X86_CHECKSUM_32_H
#include <linux/in6.h> #include <linux/in6.h>
...@@ -186,4 +186,4 @@ static inline __wsum csum_and_copy_to_user(const void *src, ...@@ -186,4 +186,4 @@ static inline __wsum csum_and_copy_to_user(const void *src,
return (__force __wsum)-1; /* invalid checksum */ return (__force __wsum)-1; /* invalid checksum */
} }
#endif /* ASM_X86__CHECKSUM_32_H */ #endif /* _ASM_X86_CHECKSUM_32_H */
#ifndef ASM_X86__CHECKSUM_64_H #ifndef _ASM_X86_CHECKSUM_64_H
#define ASM_X86__CHECKSUM_64_H #define _ASM_X86_CHECKSUM_64_H
/* /*
* Checksums for x86-64 * Checksums for x86-64
...@@ -188,4 +188,4 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b) ...@@ -188,4 +188,4 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b)
return a; return a;
} }
#endif /* ASM_X86__CHECKSUM_64_H */ #endif /* _ASM_X86_CHECKSUM_64_H */
#ifndef ASM_X86__CMPXCHG_32_H #ifndef _ASM_X86_CMPXCHG_32_H
#define ASM_X86__CMPXCHG_32_H #define _ASM_X86_CMPXCHG_32_H
#include <linux/bitops.h> /* for LOCK_PREFIX */ #include <linux/bitops.h> /* for LOCK_PREFIX */
...@@ -341,4 +341,4 @@ extern unsigned long long cmpxchg_486_u64(volatile void *, u64, u64); ...@@ -341,4 +341,4 @@ extern unsigned long long cmpxchg_486_u64(volatile void *, u64, u64);
#endif #endif
#endif /* ASM_X86__CMPXCHG_32_H */ #endif /* _ASM_X86_CMPXCHG_32_H */
#ifndef ASM_X86__CMPXCHG_64_H #ifndef _ASM_X86_CMPXCHG_64_H
#define ASM_X86__CMPXCHG_64_H #define _ASM_X86_CMPXCHG_64_H
#include <asm/alternative.h> /* Provides LOCK_PREFIX */ #include <asm/alternative.h> /* Provides LOCK_PREFIX */
...@@ -182,4 +182,4 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, ...@@ -182,4 +182,4 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr,
cmpxchg_local((ptr), (o), (n)); \ cmpxchg_local((ptr), (o), (n)); \
}) })
#endif /* ASM_X86__CMPXCHG_64_H */ #endif /* _ASM_X86_CMPXCHG_64_H */
#ifndef ASM_X86__COMPAT_H #ifndef _ASM_X86_COMPAT_H
#define ASM_X86__COMPAT_H #define _ASM_X86_COMPAT_H
/* /*
* Architecture specific compatibility types * Architecture specific compatibility types
...@@ -215,4 +215,4 @@ static inline int is_compat_task(void) ...@@ -215,4 +215,4 @@ static inline int is_compat_task(void)
return current_thread_info()->status & TS_COMPAT; return current_thread_info()->status & TS_COMPAT;
} }
#endif /* ASM_X86__COMPAT_H */ #endif /* _ASM_X86_COMPAT_H */
#ifndef ASM_X86__CPU_H #ifndef _ASM_X86_CPU_H
#define ASM_X86__CPU_H #define _ASM_X86_CPU_H
#include <linux/device.h> #include <linux/device.h>
#include <linux/cpu.h> #include <linux/cpu.h>
...@@ -17,4 +17,4 @@ extern void arch_unregister_cpu(int); ...@@ -17,4 +17,4 @@ extern void arch_unregister_cpu(int);
#endif #endif
DECLARE_PER_CPU(int, cpu_state); DECLARE_PER_CPU(int, cpu_state);
#endif /* ASM_X86__CPU_H */ #endif /* _ASM_X86_CPU_H */
/* /*
* Defines x86 CPU feature bits * Defines x86 CPU feature bits
*/ */
#ifndef ASM_X86__CPUFEATURE_H #ifndef _ASM_X86_CPUFEATURE_H
#define ASM_X86__CPUFEATURE_H #define _ASM_X86_CPUFEATURE_H
#include <asm/required-features.h> #include <asm/required-features.h>
...@@ -268,4 +268,4 @@ extern const char * const x86_power_flags[32]; ...@@ -268,4 +268,4 @@ extern const char * const x86_power_flags[32];
#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */ #endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
#endif /* ASM_X86__CPUFEATURE_H */ #endif /* _ASM_X86_CPUFEATURE_H */
#ifndef ASM_X86__CURRENT_H #ifndef _ASM_X86_CURRENT_H
#define ASM_X86__CURRENT_H #define _ASM_X86_CURRENT_H
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
#include <linux/compiler.h> #include <linux/compiler.h>
...@@ -36,4 +36,4 @@ static __always_inline struct task_struct *get_current(void) ...@@ -36,4 +36,4 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current() #define current get_current()
#endif /* ASM_X86__CURRENT_H */ #endif /* _ASM_X86_CURRENT_H */
#ifndef ASM_X86__DEBUGREG_H #ifndef _ASM_X86_DEBUGREG_H
#define ASM_X86__DEBUGREG_H #define _ASM_X86_DEBUGREG_H
/* Indicate the register numbers for a number of the specific /* Indicate the register numbers for a number of the specific
...@@ -67,4 +67,4 @@ ...@@ -67,4 +67,4 @@
#define DR_LOCAL_SLOWDOWN (0x100) /* Local slow the pipeline */ #define DR_LOCAL_SLOWDOWN (0x100) /* Local slow the pipeline */
#define DR_GLOBAL_SLOWDOWN (0x200) /* Global slow the pipeline */ #define DR_GLOBAL_SLOWDOWN (0x200) /* Global slow the pipeline */
#endif /* ASM_X86__DEBUGREG_H */ #endif /* _ASM_X86_DEBUGREG_H */
#ifndef ASM_X86__DELAY_H #ifndef _ASM_X86_DELAY_H
#define ASM_X86__DELAY_H #define _ASM_X86_DELAY_H
/* /*
* Copyright (C) 1993 Linus Torvalds * Copyright (C) 1993 Linus Torvalds
...@@ -28,4 +28,4 @@ extern void __delay(unsigned long loops); ...@@ -28,4 +28,4 @@ extern void __delay(unsigned long loops);
void use_tsc_delay(void); void use_tsc_delay(void);
#endif /* ASM_X86__DELAY_H */ #endif /* _ASM_X86_DELAY_H */
#ifndef ASM_X86__DESC_H #ifndef _ASM_X86_DESC_H
#define ASM_X86__DESC_H #define _ASM_X86_DESC_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/desc_defs.h> #include <asm/desc_defs.h>
...@@ -406,4 +406,4 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist) ...@@ -406,4 +406,4 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* ASM_X86__DESC_H */ #endif /* _ASM_X86_DESC_H */
/* Written 2000 by Andi Kleen */ /* Written 2000 by Andi Kleen */
#ifndef ASM_X86__DESC_DEFS_H #ifndef _ASM_X86_DESC_DEFS_H
#define ASM_X86__DESC_DEFS_H #define _ASM_X86_DESC_DEFS_H
/* /*
* Segment descriptor structure definitions, usable from both x86_64 and i386 * Segment descriptor structure definitions, usable from both x86_64 and i386
...@@ -92,4 +92,4 @@ struct desc_ptr { ...@@ -92,4 +92,4 @@ struct desc_ptr {
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* ASM_X86__DESC_DEFS_H */ #endif /* _ASM_X86_DESC_DEFS_H */
#ifndef ASM_X86__DEVICE_H #ifndef _ASM_X86_DEVICE_H
#define ASM_X86__DEVICE_H #define _ASM_X86_DEVICE_H
struct dev_archdata { struct dev_archdata {
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
...@@ -13,4 +13,4 @@ struct dma_mapping_ops *dma_ops; ...@@ -13,4 +13,4 @@ struct dma_mapping_ops *dma_ops;
#endif #endif
}; };
#endif /* ASM_X86__DEVICE_H */ #endif /* _ASM_X86_DEVICE_H */
#ifndef ASM_X86__DIV64_H #ifndef _ASM_X86_DIV64_H
#define ASM_X86__DIV64_H #define _ASM_X86_DIV64_H
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
...@@ -57,4 +57,4 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder) ...@@ -57,4 +57,4 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
# include <asm-generic/div64.h> # include <asm-generic/div64.h>
#endif /* CONFIG_X86_32 */ #endif /* CONFIG_X86_32 */
#endif /* ASM_X86__DIV64_H */ #endif /* _ASM_X86_DIV64_H */
#ifndef ASM_X86__DMA_MAPPING_H #ifndef _ASM_X86_DMA_MAPPING_H
#define ASM_X86__DMA_MAPPING_H #define _ASM_X86_DMA_MAPPING_H
/* /*
* IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for
...@@ -65,7 +65,7 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev) ...@@ -65,7 +65,7 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)
return dma_ops; return dma_ops;
else else
return dev->archdata.dma_ops; return dev->archdata.dma_ops;
#endif /* ASM_X86__DMA_MAPPING_H */ #endif /* _ASM_X86_DMA_MAPPING_H */
} }
/* Make sure we keep the same behaviour */ /* Make sure we keep the same behaviour */
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* and John Boyd, Nov. 1992. * and John Boyd, Nov. 1992.
*/ */
#ifndef ASM_X86__DMA_H #ifndef _ASM_X86_DMA_H
#define ASM_X86__DMA_H #define _ASM_X86_DMA_H
#include <linux/spinlock.h> /* And spinlocks */ #include <linux/spinlock.h> /* And spinlocks */
#include <asm/io.h> /* need byte IO */ #include <asm/io.h> /* need byte IO */
...@@ -315,4 +315,4 @@ extern int isa_dma_bridge_buggy; ...@@ -315,4 +315,4 @@ extern int isa_dma_bridge_buggy;
#define isa_dma_bridge_buggy (0) #define isa_dma_bridge_buggy (0)
#endif #endif
#endif /* ASM_X86__DMA_H */ #endif /* _ASM_X86_DMA_H */
#ifndef ASM_X86__DMI_H #ifndef _ASM_X86_DMI_H
#define ASM_X86__DMI_H #define _ASM_X86_DMI_H
#include <asm/io.h> #include <asm/io.h>
...@@ -23,4 +23,4 @@ static inline void *dmi_alloc(unsigned len) ...@@ -23,4 +23,4 @@ static inline void *dmi_alloc(unsigned len)
#define dmi_ioremap early_ioremap #define dmi_ioremap early_ioremap
#define dmi_iounmap early_iounmap #define dmi_iounmap early_iounmap
#endif /* ASM_X86__DMI_H */ #endif /* _ASM_X86_DMI_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Markus Metzger <markus.t.metzger@intel.com>, 2007-2008 * Markus Metzger <markus.t.metzger@intel.com>, 2007-2008
*/ */
#ifndef ASM_X86__DS_H #ifndef _ASM_X86_DS_H
#define ASM_X86__DS_H #define _ASM_X86_DS_H
#ifdef CONFIG_X86_DS #ifdef CONFIG_X86_DS
...@@ -235,4 +235,4 @@ extern void ds_free(struct ds_context *context); ...@@ -235,4 +235,4 @@ extern void ds_free(struct ds_context *context);
#define ds_init_intel(config) do {} while (0) #define ds_init_intel(config) do {} while (0)
#endif /* CONFIG_X86_DS */ #endif /* CONFIG_X86_DS */
#endif /* ASM_X86__DS_H */ #endif /* _ASM_X86_DS_H */
#ifndef ASM_X86__DWARF2_H #ifndef _ASM_X86_DWARF2_H
#define ASM_X86__DWARF2_H #define _ASM_X86_DWARF2_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#warning "asm/dwarf2.h should be only included in pure assembly files" #warning "asm/dwarf2.h should be only included in pure assembly files"
...@@ -58,4 +58,4 @@ ...@@ -58,4 +58,4 @@
#endif #endif
#endif /* ASM_X86__DWARF2_H */ #endif /* _ASM_X86_DWARF2_H */
#ifndef ASM_X86__E820_H #ifndef _ASM_X86_E820_H
#define ASM_X86__E820_H #define _ASM_X86_E820_H
#define E820MAP 0x2d0 /* our map */ #define E820MAP 0x2d0 /* our map */
#define E820MAX 128 /* number of entries in E820MAP */ #define E820MAX 128 /* number of entries in E820MAP */
...@@ -143,4 +143,4 @@ extern char *memory_setup(void); ...@@ -143,4 +143,4 @@ extern char *memory_setup(void);
#define HIGH_MEMORY (1024*1024) #define HIGH_MEMORY (1024*1024)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* ASM_X86__E820_H */ #endif /* _ASM_X86_E820_H */
#ifndef ASM_X86__EDAC_H #ifndef _ASM_X86_EDAC_H
#define ASM_X86__EDAC_H #define _ASM_X86_EDAC_H
/* ECC atomic, DMA, SMP and interrupt safe scrub function */ /* ECC atomic, DMA, SMP and interrupt safe scrub function */
...@@ -15,4 +15,4 @@ static inline void atomic_scrub(void *va, u32 size) ...@@ -15,4 +15,4 @@ static inline void atomic_scrub(void *va, u32 size)
asm volatile("lock; addl $0, %0"::"m" (*virt_addr)); asm volatile("lock; addl $0, %0"::"m" (*virt_addr));
} }
#endif /* ASM_X86__EDAC_H */ #endif /* _ASM_X86_EDAC_H */
#ifndef ASM_X86__EFI_H #ifndef _ASM_X86_EFI_H
#define ASM_X86__EFI_H #define _ASM_X86_EFI_H
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
...@@ -107,4 +107,4 @@ extern void efi_call_phys_epilog(void); ...@@ -107,4 +107,4 @@ extern void efi_call_phys_epilog(void);
#define efi_call6(_f, _a1, _a2, _a3, _a4, _a5, _a6) (-ENOSYS) #define efi_call6(_f, _a1, _a2, _a3, _a4, _a5, _a6) (-ENOSYS)
#endif /* CONFIG_EFI */ #endif /* CONFIG_EFI */
#endif /* ASM_X86__EFI_H */ #endif /* _ASM_X86_EFI_H */
#ifndef ASM_X86__ELF_H #ifndef _ASM_X86_ELF_H
#define ASM_X86__ELF_H #define _ASM_X86_ELF_H
/* /*
* ELF register definitions.. * ELF register definitions..
...@@ -333,4 +333,4 @@ extern int syscall32_setup_pages(struct linux_binprm *, int exstack); ...@@ -333,4 +333,4 @@ extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
extern unsigned long arch_randomize_brk(struct mm_struct *mm); extern unsigned long arch_randomize_brk(struct mm_struct *mm);
#define arch_randomize_brk arch_randomize_brk #define arch_randomize_brk arch_randomize_brk
#endif /* ASM_X86__ELF_H */ #endif /* _ASM_X86_ELF_H */
#ifndef ASM_X86__EMERGENCY_RESTART_H #ifndef _ASM_X86_EMERGENCY_RESTART_H
#define ASM_X86__EMERGENCY_RESTART_H #define _ASM_X86_EMERGENCY_RESTART_H
enum reboot_type { enum reboot_type {
BOOT_TRIPLE = 't', BOOT_TRIPLE = 't',
...@@ -15,4 +15,4 @@ extern enum reboot_type reboot_type; ...@@ -15,4 +15,4 @@ extern enum reboot_type reboot_type;
extern void machine_emergency_restart(void); extern void machine_emergency_restart(void);
#endif /* ASM_X86__EMERGENCY_RESTART_H */ #endif /* _ASM_X86_EMERGENCY_RESTART_H */
#ifndef ASM_X86__FB_H #ifndef _ASM_X86_FB_H
#define ASM_X86__FB_H #define _ASM_X86_FB_H
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/fs.h> #include <linux/fs.h>
...@@ -18,4 +18,4 @@ extern int fb_is_primary_device(struct fb_info *info); ...@@ -18,4 +18,4 @@ extern int fb_is_primary_device(struct fb_info *info);
static inline int fb_is_primary_device(struct fb_info *info) { return 0; } static inline int fb_is_primary_device(struct fb_info *info) { return 0; }
#endif #endif
#endif /* ASM_X86__FB_H */ #endif /* _ASM_X86_FB_H */
#ifndef ASM_X86__FIXMAP_H #ifndef _ASM_X86_FIXMAP_H
#define ASM_X86__FIXMAP_H #define _ASM_X86_FIXMAP_H
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "fixmap_32.h" # include "fixmap_32.h"
...@@ -65,4 +65,4 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr) ...@@ -65,4 +65,4 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
return __virt_to_fix(vaddr); return __virt_to_fix(vaddr);
} }
#endif /* ASM_X86__FIXMAP_H */ #endif /* _ASM_X86_FIXMAP_H */
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
* Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
*/ */
#ifndef ASM_X86__FIXMAP_32_H #ifndef _ASM_X86_FIXMAP_32_H
#define ASM_X86__FIXMAP_32_H #define _ASM_X86_FIXMAP_32_H
/* used by vmalloc.c, vsyscall.lds.S. /* used by vmalloc.c, vsyscall.lds.S.
...@@ -120,4 +120,4 @@ extern void reserve_top_address(unsigned long reserve); ...@@ -120,4 +120,4 @@ extern void reserve_top_address(unsigned long reserve);
#define FIXADDR_BOOT_START (FIXADDR_TOP - __FIXADDR_BOOT_SIZE) #define FIXADDR_BOOT_START (FIXADDR_TOP - __FIXADDR_BOOT_SIZE)
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* ASM_X86__FIXMAP_32_H */ #endif /* _ASM_X86_FIXMAP_32_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Copyright (C) 1998 Ingo Molnar * Copyright (C) 1998 Ingo Molnar
*/ */
#ifndef ASM_X86__FIXMAP_64_H #ifndef _ASM_X86_FIXMAP_64_H
#define ASM_X86__FIXMAP_64_H #define _ASM_X86_FIXMAP_64_H
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/acpi.h> #include <asm/acpi.h>
...@@ -80,4 +80,4 @@ enum fixed_addresses { ...@@ -80,4 +80,4 @@ enum fixed_addresses {
#define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL) #define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL)
#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) #define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE)
#endif /* ASM_X86__FIXMAP_64_H */ #endif /* _ASM_X86_FIXMAP_64_H */
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* *
* Copyright (C) 1995 * Copyright (C) 1995
*/ */
#ifndef ASM_X86__FLOPPY_H #ifndef _ASM_X86_FLOPPY_H
#define ASM_X86__FLOPPY_H #define _ASM_X86_FLOPPY_H
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
...@@ -278,4 +278,4 @@ static int FDC2 = -1; ...@@ -278,4 +278,4 @@ static int FDC2 = -1;
#define EXTRA_FLOPPY_PARAMS #define EXTRA_FLOPPY_PARAMS
#endif /* ASM_X86__FLOPPY_H */ #endif /* _ASM_X86_FLOPPY_H */
#ifndef ASM_X86__FTRACE_H #ifndef _ASM_X86_FTRACE_H
#define ASM_X86__FTRACE_H #define _ASM_X86_FTRACE_H
#ifdef CONFIG_FTRACE #ifdef CONFIG_FTRACE
#define MCOUNT_ADDR ((long)(mcount)) #define MCOUNT_ADDR ((long)(mcount))
...@@ -21,4 +21,4 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) ...@@ -21,4 +21,4 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
#endif /* CONFIG_FTRACE */ #endif /* CONFIG_FTRACE */
#endif /* ASM_X86__FTRACE_H */ #endif /* _ASM_X86_FTRACE_H */
#ifndef ASM_X86__FUTEX_H #ifndef _ASM_X86_FUTEX_H
#define ASM_X86__FUTEX_H #define _ASM_X86_FUTEX_H
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -137,4 +137,4 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, ...@@ -137,4 +137,4 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
} }
#endif #endif
#endif /* ASM_X86__FUTEX_H */ #endif /* _ASM_X86_FUTEX_H */
#ifndef ASM_X86__GART_H #ifndef _ASM_X86_GART_H
#define ASM_X86__GART_H #define _ASM_X86_GART_H
#include <asm/e820.h> #include <asm/e820.h>
...@@ -70,4 +70,4 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size) ...@@ -70,4 +70,4 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size)
return 1; return 1;
} }
#endif /* ASM_X86__GART_H */ #endif /* _ASM_X86_GART_H */
#ifndef ASM_X86__GENAPIC_32_H #ifndef _ASM_X86_GENAPIC_32_H
#define ASM_X86__GENAPIC_32_H #define _ASM_X86_GENAPIC_32_H
#include <asm/mpspec.h> #include <asm/mpspec.h>
...@@ -123,4 +123,4 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; ...@@ -123,4 +123,4 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC};
#define uv_system_init() do {} while (0) #define uv_system_init() do {} while (0)
#endif /* ASM_X86__GENAPIC_32_H */ #endif /* _ASM_X86_GENAPIC_32_H */
#ifndef ASM_X86__GENAPIC_64_H #ifndef _ASM_X86_GENAPIC_64_H
#define ASM_X86__GENAPIC_64_H #define _ASM_X86_GENAPIC_64_H
/* /*
* Copyright 2004 James Cleverdon, IBM. * Copyright 2004 James Cleverdon, IBM.
...@@ -55,4 +55,4 @@ extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip); ...@@ -55,4 +55,4 @@ extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip);
extern void setup_apic_routing(void); extern void setup_apic_routing(void);
#endif /* ASM_X86__GENAPIC_64_H */ #endif /* _ASM_X86_GENAPIC_64_H */
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* as published by the Free Software Foundation. * as published by the Free Software Foundation.
*/ */
#ifndef ASM_X86__GEODE_H #ifndef _ASM_X86_GEODE_H
#define ASM_X86__GEODE_H #define _ASM_X86_GEODE_H
#include <asm/processor.h> #include <asm/processor.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -250,4 +250,4 @@ extern int __init mfgpt_timer_setup(void); ...@@ -250,4 +250,4 @@ extern int __init mfgpt_timer_setup(void);
static inline int mfgpt_timer_setup(void) { return 0; } static inline int mfgpt_timer_setup(void) { return 0; }
#endif #endif
#endif /* ASM_X86__GEODE_H */ #endif /* _ASM_X86_GEODE_H */
...@@ -53,4 +53,4 @@ static inline int irq_to_gpio(unsigned int irq) ...@@ -53,4 +53,4 @@ static inline int irq_to_gpio(unsigned int irq)
#endif /* CONFIG_GPIOLIB */ #endif /* CONFIG_GPIOLIB */
#endif /* ASM_X86__GPIO_H */ #endif /* _ASM_X86_GPIO_H */
#ifndef ASM_X86__HARDIRQ_32_H #ifndef _ASM_X86_HARDIRQ_32_H
#define ASM_X86__HARDIRQ_32_H #define _ASM_X86_HARDIRQ_32_H
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -25,4 +25,4 @@ DECLARE_PER_CPU(irq_cpustat_t, irq_stat); ...@@ -25,4 +25,4 @@ DECLARE_PER_CPU(irq_cpustat_t, irq_stat);
void ack_bad_irq(unsigned int irq); void ack_bad_irq(unsigned int irq);
#include <linux/irq_cpustat.h> #include <linux/irq_cpustat.h>
#endif /* ASM_X86__HARDIRQ_32_H */ #endif /* _ASM_X86_HARDIRQ_32_H */
#ifndef ASM_X86__HARDIRQ_64_H #ifndef _ASM_X86_HARDIRQ_64_H
#define ASM_X86__HARDIRQ_64_H #define _ASM_X86_HARDIRQ_64_H
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -20,4 +20,4 @@ ...@@ -20,4 +20,4 @@
extern void ack_bad_irq(unsigned int irq); extern void ack_bad_irq(unsigned int irq);
#endif /* ASM_X86__HARDIRQ_64_H */ #endif /* _ASM_X86_HARDIRQ_64_H */
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com> * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
*/ */
#ifndef ASM_X86__HIGHMEM_H #ifndef _ASM_X86_HIGHMEM_H
#define ASM_X86__HIGHMEM_H #define _ASM_X86_HIGHMEM_H
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -79,4 +79,4 @@ extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn, ...@@ -79,4 +79,4 @@ extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* ASM_X86__HIGHMEM_H */ #endif /* _ASM_X86_HIGHMEM_H */
#ifndef ASM_X86__HPET_H #ifndef _ASM_X86_HPET_H
#define ASM_X86__HPET_H #define _ASM_X86_HPET_H
#include <linux/msi.h> #include <linux/msi.h>
...@@ -111,4 +111,4 @@ static inline int is_hpet_enabled(void) { return 0; } ...@@ -111,4 +111,4 @@ static inline int is_hpet_enabled(void) { return 0; }
#define hpet_readl(a) 0 #define hpet_readl(a) 0
#endif #endif
#endif /* ASM_X86__HPET_H */ #endif /* _ASM_X86_HPET_H */
#ifndef ASM_X86__HUGETLB_H #ifndef _ASM_X86_HUGETLB_H
#define ASM_X86__HUGETLB_H #define _ASM_X86_HUGETLB_H
#include <asm/page.h> #include <asm/page.h>
...@@ -90,4 +90,4 @@ static inline void arch_release_hugepage(struct page *page) ...@@ -90,4 +90,4 @@ static inline void arch_release_hugepage(struct page *page)
{ {
} }
#endif /* ASM_X86__HUGETLB_H */ #endif /* _ASM_X86_HUGETLB_H */
#ifndef ASM_X86__HW_IRQ_H #ifndef _ASM_X86_HW_IRQ_H
#define ASM_X86__HW_IRQ_H #define _ASM_X86_HW_IRQ_H
/* /*
* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar * (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar
...@@ -128,4 +128,4 @@ static inline void __setup_vector_irq(int cpu) {} ...@@ -128,4 +128,4 @@ static inline void __setup_vector_irq(int cpu) {}
#endif /* !ASSEMBLY_ */ #endif /* !ASSEMBLY_ */
#endif /* ASM_X86__HW_IRQ_H */ #endif /* _ASM_X86_HW_IRQ_H */
#ifndef ASM_X86__HYPERTRANSPORT_H #ifndef _ASM_X86_HYPERTRANSPORT_H
#define ASM_X86__HYPERTRANSPORT_H #define _ASM_X86_HYPERTRANSPORT_H
/* /*
* Constants for x86 Hypertransport Interrupts. * Constants for x86 Hypertransport Interrupts.
...@@ -42,4 +42,4 @@ ...@@ -42,4 +42,4 @@
#define HT_IRQ_HIGH_DEST_ID(v) \ #define HT_IRQ_HIGH_DEST_ID(v) \
((((v) >> 8) << HT_IRQ_HIGH_DEST_ID_SHIFT) & HT_IRQ_HIGH_DEST_ID_MASK) ((((v) >> 8) << HT_IRQ_HIGH_DEST_ID_SHIFT) & HT_IRQ_HIGH_DEST_ID_MASK)
#endif /* ASM_X86__HYPERTRANSPORT_H */ #endif /* _ASM_X86_HYPERTRANSPORT_H */
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* x86-64 work by Andi Kleen 2002 * x86-64 work by Andi Kleen 2002
*/ */
#ifndef ASM_X86__I387_H #ifndef _ASM_X86_I387_H
#define ASM_X86__I387_H #define _ASM_X86_I387_H
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
...@@ -397,4 +397,4 @@ static inline unsigned short get_fpu_mxcsr(struct task_struct *tsk) ...@@ -397,4 +397,4 @@ static inline unsigned short get_fpu_mxcsr(struct task_struct *tsk)
} }
} }
#endif /* ASM_X86__I387_H */ #endif /* _ASM_X86_I387_H */
#ifndef ASM_X86__I8253_H #ifndef _ASM_X86_I8253_H
#define ASM_X86__I8253_H #define _ASM_X86_I8253_H
/* i8253A PIT registers */ /* i8253A PIT registers */
#define PIT_MODE 0x43 #define PIT_MODE 0x43
...@@ -15,4 +15,4 @@ extern void setup_pit_timer(void); ...@@ -15,4 +15,4 @@ extern void setup_pit_timer(void);
#define inb_pit inb_p #define inb_pit inb_p
#define outb_pit outb_p #define outb_pit outb_p
#endif /* ASM_X86__I8253_H */ #endif /* _ASM_X86_I8253_H */
#ifndef ASM_X86__I8259_H #ifndef _ASM_X86_I8259_H
#define ASM_X86__I8259_H #define _ASM_X86_I8259_H
#include <linux/delay.h> #include <linux/delay.h>
...@@ -60,4 +60,4 @@ extern struct irq_chip i8259A_chip; ...@@ -60,4 +60,4 @@ extern struct irq_chip i8259A_chip;
extern void mask_8259A(void); extern void mask_8259A(void);
extern void unmask_8259A(void); extern void unmask_8259A(void);
#endif /* ASM_X86__I8259_H */ #endif /* _ASM_X86_I8259_H */
#ifndef ASM_X86__IA32_H #ifndef _ASM_X86_IA32_H
#define ASM_X86__IA32_H #define _ASM_X86_IA32_H
#ifdef CONFIG_IA32_EMULATION #ifdef CONFIG_IA32_EMULATION
...@@ -167,4 +167,4 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm); ...@@ -167,4 +167,4 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm);
#endif /* !CONFIG_IA32_SUPPORT */ #endif /* !CONFIG_IA32_SUPPORT */
#endif /* ASM_X86__IA32_H */ #endif /* _ASM_X86_IA32_H */
#ifndef ASM_X86__IA32_UNISTD_H #ifndef _ASM_X86_IA32_UNISTD_H
#define ASM_X86__IA32_UNISTD_H #define _ASM_X86_IA32_UNISTD_H
/* /*
* This file contains the system call numbers of the ia32 port, * This file contains the system call numbers of the ia32 port,
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
#define __NR_ia32_sigreturn 119 #define __NR_ia32_sigreturn 119
#define __NR_ia32_rt_sigreturn 173 #define __NR_ia32_rt_sigreturn 173
#endif /* ASM_X86__IA32_UNISTD_H */ #endif /* _ASM_X86_IA32_UNISTD_H */
#ifndef ASM_X86__IDLE_H #ifndef _ASM_X86_IDLE_H
#define ASM_X86__IDLE_H #define _ASM_X86_IDLE_H
#define IDLE_START 1 #define IDLE_START 1
#define IDLE_END 2 #define IDLE_END 2
...@@ -12,4 +12,4 @@ void exit_idle(void); ...@@ -12,4 +12,4 @@ void exit_idle(void);
void c1e_remove_cpu(int cpu); void c1e_remove_cpu(int cpu);
#endif /* ASM_X86__IDLE_H */ #endif /* _ASM_X86_IDLE_H */
#ifndef ASM_X86__INTEL_ARCH_PERFMON_H #ifndef _ASM_X86_INTEL_ARCH_PERFMON_H
#define ASM_X86__INTEL_ARCH_PERFMON_H #define _ASM_X86_INTEL_ARCH_PERFMON_H
#define MSR_ARCH_PERFMON_PERFCTR0 0xc1 #define MSR_ARCH_PERFMON_PERFCTR0 0xc1
#define MSR_ARCH_PERFMON_PERFCTR1 0xc2 #define MSR_ARCH_PERFMON_PERFCTR1 0xc2
...@@ -28,4 +28,4 @@ union cpuid10_eax { ...@@ -28,4 +28,4 @@ union cpuid10_eax {
unsigned int full; unsigned int full;
}; };
#endif /* ASM_X86__INTEL_ARCH_PERFMON_H */ #endif /* _ASM_X86_INTEL_ARCH_PERFMON_H */
#ifndef ASM_X86__IO_H #ifndef _ASM_X86_IO_H
#define ASM_X86__IO_H #define _ASM_X86_IO_H
#define ARCH_HAS_IOREMAP_WC #define ARCH_HAS_IOREMAP_WC
...@@ -88,4 +88,4 @@ extern void early_iounmap(void *addr, unsigned long size); ...@@ -88,4 +88,4 @@ extern void early_iounmap(void *addr, unsigned long size);
extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
#endif /* ASM_X86__IO_H */ #endif /* _ASM_X86_IO_H */
#ifndef ASM_X86__IO_32_H #ifndef _ASM_X86_IO_32_H
#define ASM_X86__IO_32_H #define _ASM_X86_IO_32_H
#include <linux/string.h> #include <linux/string.h>
#include <linux/compiler.h> #include <linux/compiler.h>
...@@ -281,4 +281,4 @@ BUILDIO(b, b, char) ...@@ -281,4 +281,4 @@ BUILDIO(b, b, char)
BUILDIO(w, w, short) BUILDIO(w, w, short)
BUILDIO(l, , int) BUILDIO(l, , int)
#endif /* ASM_X86__IO_32_H */ #endif /* _ASM_X86_IO_32_H */
#ifndef ASM_X86__IO_64_H #ifndef _ASM_X86_IO_64_H
#define ASM_X86__IO_64_H #define _ASM_X86_IO_64_H
/* /*
...@@ -241,4 +241,4 @@ void memset_io(volatile void __iomem *a, int b, size_t c); ...@@ -241,4 +241,4 @@ void memset_io(volatile void __iomem *a, int b, size_t c);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* ASM_X86__IO_64_H */ #endif /* _ASM_X86_IO_64_H */
#ifndef ASM_X86__IO_APIC_H #ifndef _ASM_X86_IO_APIC_H
#define ASM_X86__IO_APIC_H #define _ASM_X86_IO_APIC_H
#include <linux/types.h> #include <linux/types.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
...@@ -201,4 +201,4 @@ static inline int probe_nr_irqs(void) ...@@ -201,4 +201,4 @@ static inline int probe_nr_irqs(void)
} }
#endif #endif
#endif /* ASM_X86__IO_APIC_H */ #endif /* _ASM_X86_IO_APIC_H */
#ifndef ASM_X86__IOCTLS_H #ifndef _ASM_X86_IOCTLS_H
#define ASM_X86__IOCTLS_H #define _ASM_X86_IOCTLS_H
#include <asm/ioctl.h> #include <asm/ioctl.h>
...@@ -91,4 +91,4 @@ ...@@ -91,4 +91,4 @@
#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
#endif /* ASM_X86__IOCTLS_H */ #endif /* _ASM_X86_IOCTLS_H */
#ifndef ASM_X86__IOMMU_H #ifndef _ASM_X86_IOMMU_H
#define ASM_X86__IOMMU_H #define _ASM_X86_IOMMU_H
extern void pci_iommu_shutdown(void); extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void); extern void no_iommu_init(void);
...@@ -43,4 +43,4 @@ static inline void gart_iommu_hole_init(void) ...@@ -43,4 +43,4 @@ static inline void gart_iommu_hole_init(void)
} }
#endif #endif
#endif /* ASM_X86__IOMMU_H */ #endif /* _ASM_X86_IOMMU_H */
#ifndef ASM_X86__IPCBUF_H #ifndef _ASM_X86_IPCBUF_H
#define ASM_X86__IPCBUF_H #define _ASM_X86_IPCBUF_H
/* /*
* The ipc64_perm structure for x86 architecture. * The ipc64_perm structure for x86 architecture.
...@@ -25,4 +25,4 @@ struct ipc64_perm { ...@@ -25,4 +25,4 @@ struct ipc64_perm {
unsigned long __unused2; unsigned long __unused2;
}; };
#endif /* ASM_X86__IPCBUF_H */ #endif /* _ASM_X86_IPCBUF_H */
#ifndef ASM_X86__IPI_H #ifndef _ASM_X86_IPI_H
#define ASM_X86__IPI_H #define _ASM_X86_IPI_H
/* /*
* Copyright 2004 James Cleverdon, IBM. * Copyright 2004 James Cleverdon, IBM.
...@@ -135,4 +135,4 @@ static inline void send_IPI_mask_sequence(cpumask_t mask, int vector) ...@@ -135,4 +135,4 @@ static inline void send_IPI_mask_sequence(cpumask_t mask, int vector)
local_irq_restore(flags); local_irq_restore(flags);
} }
#endif /* ASM_X86__IPI_H */ #endif /* _ASM_X86_IPI_H */
#ifndef ASM_X86__IRQ_H #ifndef _ASM_X86_IRQ_H
#define ASM_X86__IRQ_H #define _ASM_X86_IRQ_H
/* /*
* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar * (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar
* *
...@@ -47,4 +47,4 @@ extern void native_init_IRQ(void); ...@@ -47,4 +47,4 @@ extern void native_init_IRQ(void);
/* Interrupt vector management */ /* Interrupt vector management */
extern DECLARE_BITMAP(used_vectors, NR_VECTORS); extern DECLARE_BITMAP(used_vectors, NR_VECTORS);
#endif /* ASM_X86__IRQ_H */ #endif /* _ASM_X86_IRQ_H */
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* *
* Jeremy Fitzhardinge <jeremy@goop.org> * Jeremy Fitzhardinge <jeremy@goop.org>
*/ */
#ifndef ASM_X86__IRQ_REGS_32_H #ifndef _ASM_X86_IRQ_REGS_32_H
#define ASM_X86__IRQ_REGS_32_H #define _ASM_X86_IRQ_REGS_32_H
#include <asm/percpu.h> #include <asm/percpu.h>
...@@ -26,4 +26,4 @@ static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs) ...@@ -26,4 +26,4 @@ static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs)
return old_regs; return old_regs;
} }
#endif /* ASM_X86__IRQ_REGS_32_H */ #endif /* _ASM_X86_IRQ_REGS_32_H */
#ifndef ASM_X86__IRQ_VECTORS_H #ifndef _ASM_X86_IRQ_VECTORS_H
#define ASM_X86__IRQ_VECTORS_H #define _ASM_X86_IRQ_VECTORS_H
#include <linux/threads.h> #include <linux/threads.h>
...@@ -161,4 +161,4 @@ ...@@ -161,4 +161,4 @@
#define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8) #define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8)
#endif /* ASM_X86__IRQ_VECTORS_H */ #endif /* _ASM_X86_IRQ_VECTORS_H */
#ifndef ASM_X86__IST_H #ifndef _ASM_X86_IST_H
#define ASM_X86__IST_H #define _ASM_X86_IST_H
/* /*
* Include file for the interface to IST BIOS * Include file for the interface to IST BIOS
...@@ -31,4 +31,4 @@ struct ist_info { ...@@ -31,4 +31,4 @@ struct ist_info {
extern struct ist_info ist_info; extern struct ist_info ist_info;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* ASM_X86__IST_H */ #endif /* _ASM_X86_IST_H */
#ifndef ASM_X86__K8_H #ifndef _ASM_X86_K8_H
#define ASM_X86__K8_H #define _ASM_X86_K8_H
#include <linux/pci.h> #include <linux/pci.h>
...@@ -12,4 +12,4 @@ extern int cache_k8_northbridges(void); ...@@ -12,4 +12,4 @@ extern int cache_k8_northbridges(void);
extern void k8_flush_garts(void); extern void k8_flush_garts(void);
extern int k8_scan_nodes(unsigned long start, unsigned long end); extern int k8_scan_nodes(unsigned long start, unsigned long end);
#endif /* ASM_X86__K8_H */ #endif /* _ASM_X86_K8_H */
#ifndef ASM_X86__KDEBUG_H #ifndef _ASM_X86_KDEBUG_H
#define ASM_X86__KDEBUG_H #define _ASM_X86_KDEBUG_H
#include <linux/notifier.h> #include <linux/notifier.h>
...@@ -34,4 +34,4 @@ extern void show_regs(struct pt_regs *regs); ...@@ -34,4 +34,4 @@ extern void show_regs(struct pt_regs *regs);
extern unsigned long oops_begin(void); extern unsigned long oops_begin(void);
extern void oops_end(unsigned long, struct pt_regs *, int signr); extern void oops_end(unsigned long, struct pt_regs *, int signr);
#endif /* ASM_X86__KDEBUG_H */ #endif /* _ASM_X86_KDEBUG_H */
#ifndef ASM_X86__KEXEC_H #ifndef _ASM_X86_KEXEC_H
#define ASM_X86__KEXEC_H #define _ASM_X86_KEXEC_H
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# define PA_CONTROL_PAGE 0 # define PA_CONTROL_PAGE 0
...@@ -172,4 +172,4 @@ relocate_kernel(unsigned long indirection_page, ...@@ -172,4 +172,4 @@ relocate_kernel(unsigned long indirection_page,
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* ASM_X86__KEXEC_H */ #endif /* _ASM_X86_KEXEC_H */
#ifndef ASM_X86__KGDB_H #ifndef _ASM_X86_KGDB_H
#define ASM_X86__KGDB_H #define _ASM_X86_KGDB_H
/* /*
* Copyright (C) 2001-2004 Amit S. Kale * Copyright (C) 2001-2004 Amit S. Kale
...@@ -76,4 +76,4 @@ static inline void arch_kgdb_breakpoint(void) ...@@ -76,4 +76,4 @@ static inline void arch_kgdb_breakpoint(void)
#define BREAK_INSTR_SIZE 1 #define BREAK_INSTR_SIZE 1
#define CACHE_FLUSH_IS_SAFE 1 #define CACHE_FLUSH_IS_SAFE 1
#endif /* ASM_X86__KGDB_H */ #endif /* _ASM_X86_KGDB_H */
#ifndef ASM_X86__KMAP_TYPES_H #ifndef _ASM_X86_KMAP_TYPES_H
#define ASM_X86__KMAP_TYPES_H #define _ASM_X86_KMAP_TYPES_H
#if defined(CONFIG_X86_32) && defined(CONFIG_DEBUG_HIGHMEM) #if defined(CONFIG_X86_32) && defined(CONFIG_DEBUG_HIGHMEM)
# define D(n) __KM_FENCE_##n , # define D(n) __KM_FENCE_##n ,
...@@ -26,4 +26,4 @@ D(13) KM_TYPE_NR ...@@ -26,4 +26,4 @@ D(13) KM_TYPE_NR
#undef D #undef D
#endif /* ASM_X86__KMAP_TYPES_H */ #endif /* _ASM_X86_KMAP_TYPES_H */
#ifndef ASM_X86__KPROBES_H #ifndef _ASM_X86_KPROBES_H
#define ASM_X86__KPROBES_H #define _ASM_X86_KPROBES_H
/* /*
* Kernel Probes (KProbes) * Kernel Probes (KProbes)
* *
...@@ -85,4 +85,4 @@ struct kprobe_ctlblk { ...@@ -85,4 +85,4 @@ struct kprobe_ctlblk {
extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
extern int kprobe_exceptions_notify(struct notifier_block *self, extern int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data); unsigned long val, void *data);
#endif /* ASM_X86__KPROBES_H */ #endif /* _ASM_X86_KPROBES_H */
#ifndef ASM_X86__KVM_H #ifndef _ASM_X86_KVM_H
#define ASM_X86__KVM_H #define _ASM_X86_KVM_H
/* /*
* KVM x86 specific structures and definitions * KVM x86 specific structures and definitions
...@@ -208,4 +208,4 @@ struct kvm_pit_channel_state { ...@@ -208,4 +208,4 @@ struct kvm_pit_channel_state {
struct kvm_pit_state { struct kvm_pit_state {
struct kvm_pit_channel_state channels[3]; struct kvm_pit_channel_state channels[3];
}; };
#endif /* ASM_X86__KVM_H */ #endif /* _ASM_X86_KVM_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* *
*/ */
#ifndef ASM_X86__KVM_HOST_H #ifndef _ASM_X86_KVM_HOST_H
#define ASM_X86__KVM_HOST_H #define _ASM_X86_KVM_HOST_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -749,4 +749,4 @@ asmlinkage void kvm_handle_fault_on_reboot(void); ...@@ -749,4 +749,4 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
int kvm_unmap_hva(struct kvm *kvm, unsigned long hva); int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
int kvm_age_hva(struct kvm *kvm, unsigned long hva); int kvm_age_hva(struct kvm *kvm, unsigned long hva);
#endif /* ASM_X86__KVM_HOST_H */ #endif /* _ASM_X86_KVM_HOST_H */
#ifndef ASM_X86__KVM_PARA_H #ifndef _ASM_X86_KVM_PARA_H
#define ASM_X86__KVM_PARA_H #define _ASM_X86_KVM_PARA_H
/* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It
* should be used to determine that a VM is running under KVM. * should be used to determine that a VM is running under KVM.
...@@ -144,4 +144,4 @@ static inline unsigned int kvm_arch_para_features(void) ...@@ -144,4 +144,4 @@ static inline unsigned int kvm_arch_para_features(void)
#endif #endif
#endif /* ASM_X86__KVM_PARA_H */ #endif /* _ASM_X86_KVM_PARA_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4 * From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4
*/ */
#ifndef ASM_X86__KVM_X86_EMULATE_H #ifndef _ASM_X86_KVM_X86_EMULATE_H
#define ASM_X86__KVM_X86_EMULATE_H #define _ASM_X86_KVM_X86_EMULATE_H
struct x86_emulate_ctxt; struct x86_emulate_ctxt;
...@@ -181,4 +181,4 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, ...@@ -181,4 +181,4 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt,
int x86_emulate_insn(struct x86_emulate_ctxt *ctxt, int x86_emulate_insn(struct x86_emulate_ctxt *ctxt,
struct x86_emulate_ops *ops); struct x86_emulate_ops *ops);
#endif /* ASM_X86__KVM_X86_EMULATE_H */ #endif /* _ASM_X86_KVM_X86_EMULATE_H */
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* *
* Definitions of structures used with the modify_ldt system call. * Definitions of structures used with the modify_ldt system call.
*/ */
#ifndef ASM_X86__LDT_H #ifndef _ASM_X86_LDT_H
#define ASM_X86__LDT_H #define _ASM_X86_LDT_H
/* Maximum number of LDT entries supported. */ /* Maximum number of LDT entries supported. */
#define LDT_ENTRIES 8192 #define LDT_ENTRIES 8192
...@@ -37,4 +37,4 @@ struct user_desc { ...@@ -37,4 +37,4 @@ struct user_desc {
#define MODIFY_LDT_CONTENTS_CODE 2 #define MODIFY_LDT_CONTENTS_CODE 2
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* ASM_X86__LDT_H */ #endif /* _ASM_X86_LDT_H */
#ifndef ASM_X86__LGUEST_H #ifndef _ASM_X86_LGUEST_H
#define ASM_X86__LGUEST_H #define _ASM_X86_LGUEST_H
#define GDT_ENTRY_LGUEST_CS 10 #define GDT_ENTRY_LGUEST_CS 10
#define GDT_ENTRY_LGUEST_DS 11 #define GDT_ENTRY_LGUEST_DS 11
...@@ -91,4 +91,4 @@ static inline void lguest_set_ts(void) ...@@ -91,4 +91,4 @@ static inline void lguest_set_ts(void)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* ASM_X86__LGUEST_H */ #endif /* _ASM_X86_LGUEST_H */
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment