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>
This commit is contained in:
Ingo Molnar 2008-10-06 16:15:57 +02:00
commit b8cd9d056b
285 changed files with 849 additions and 849 deletions

View File

@ -16,7 +16,7 @@
*/
#undef CONFIG_PARAVIRT
#ifdef CONFIG_X86_32
#define _ASM_DESC_H_ 1
#define ASM_X86__DESC_H 1
#endif
#ifdef CONFIG_X86_64

View File

@ -22,7 +22,7 @@
#define __NO_STUBS 1
#undef __SYSCALL
#undef _ASM_X86_64_UNISTD_H_
#undef ASM_X86__UNISTD_64_H
#define __SYSCALL(nr, sym) [nr] = 1,
static char syscalls[] = {
#include <asm/unistd.h>

View File

@ -8,12 +8,12 @@
#define __NO_STUBS
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
#undef _ASM_X86_64_UNISTD_H_
#undef ASM_X86__UNISTD_64_H
#include <asm/unistd_64.h>
#undef __SYSCALL
#define __SYSCALL(nr, sym) [nr] = sym,
#undef _ASM_X86_64_UNISTD_H_
#undef ASM_X86__UNISTD_64_H
typedef void (*sys_call_ptr_t)(void);

View File

@ -9,8 +9,8 @@
* 2 of the Licence, or (at your option) any later version.
*/
#ifndef _ASM_A_OUT_CORE_H
#define _ASM_A_OUT_CORE_H
#ifndef ASM_X86__A_OUT_CORE_H
#define ASM_X86__A_OUT_CORE_H
#ifdef __KERNEL__
#ifdef CONFIG_X86_32
@ -70,4 +70,4 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
#endif /* CONFIG_X86_32 */
#endif /* __KERNEL__ */
#endif /* _ASM_A_OUT_CORE_H */
#endif /* ASM_X86__A_OUT_CORE_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_A_OUT_H
#define _ASM_X86_A_OUT_H
#ifndef ASM_X86__A_OUT_H
#define ASM_X86__A_OUT_H
struct exec
{
@ -17,4 +17,4 @@ struct exec
#define N_DRSIZE(a) ((a).a_drsize)
#define N_SYMSIZE(a) ((a).a_syms)
#endif /* _ASM_X86_A_OUT_H */
#endif /* ASM_X86__A_OUT_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_ACPI_H
#define _ASM_X86_ACPI_H
#ifndef ASM_X86__ACPI_H
#define ASM_X86__ACPI_H
/*
* 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,
#define acpi_unlazy_tlb(x) leave_mm(x)
#endif /*__X86_ASM_ACPI_H*/
#endif /* ASM_X86__ACPI_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_AGP_H
#define _ASM_X86_AGP_H
#ifndef ASM_X86__AGP_H
#define ASM_X86__AGP_H
#include <asm/pgtable.h>
#include <asm/cacheflush.h>
@ -32,4 +32,4 @@
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif
#endif /* ASM_X86__AGP_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_ALTERNATIVE_H
#define _ASM_X86_ALTERNATIVE_H
#ifndef ASM_X86__ALTERNATIVE_H
#define ASM_X86__ALTERNATIVE_H
#include <linux/types.h>
#include <linux/stddef.h>
@ -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_early(void *addr, const void *opcode, size_t len);
#endif /* _ASM_X86_ALTERNATIVE_H */
#endif /* ASM_X86__ALTERNATIVE_H */

View File

@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _ASM_X86_AMD_IOMMU_H
#define _ASM_X86_AMD_IOMMU_H
#ifndef ASM_X86__AMD_IOMMU_H
#define ASM_X86__AMD_IOMMU_H
#ifdef CONFIG_AMD_IOMMU
extern int amd_iommu_init(void);
@ -29,4 +29,4 @@ static inline int amd_iommu_init(void) { return -ENODEV; }
static inline void amd_iommu_detect(void) { }
#endif
#endif
#endif /* ASM_X86__AMD_IOMMU_H */

View File

@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __AMD_IOMMU_TYPES_H__
#define __AMD_IOMMU_TYPES_H__
#ifndef ASM_X86__AMD_IOMMU_TYPES_H
#define ASM_X86__AMD_IOMMU_TYPES_H
#include <linux/types.h>
#include <linux/list.h>
@ -341,4 +341,4 @@ static inline u16 calc_devid(u8 bus, u8 devfn)
return (((u16)bus) << 8) | devfn;
}
#endif
#endif /* ASM_X86__AMD_IOMMU_TYPES_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_APIC_H
#define _ASM_X86_APIC_H
#ifndef ASM_X86__APIC_H
#define ASM_X86__APIC_H
#include <linux/pm.h>
#include <linux/delay.h>
@ -128,4 +128,4 @@ static inline void init_apic_mappings(void) { }
#endif /* !CONFIG_X86_LOCAL_APIC */
#endif /* __ASM_APIC_H */
#endif /* ASM_X86__APIC_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_APICDEF_H
#define _ASM_X86_APICDEF_H
#ifndef ASM_X86__APICDEF_H
#define ASM_X86__APICDEF_H
/*
* Constants for various Intel APICs. (local APIC, IOAPIC, etc.)
@ -411,4 +411,4 @@ struct local_apic {
#else
#define BAD_APICID 0xFFFFu
#endif
#endif
#endif /* ASM_X86__APICDEF_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_ARCH_HOOKS_H
#define _ASM_ARCH_HOOKS_H
#ifndef ASM_X86__ARCH_HOOKS_H
#define ASM_X86__ARCH_HOOKS_H
#include <linux/interrupt.h>
@ -25,4 +25,4 @@ extern void pre_time_init_hook(void);
extern void time_init_hook(void);
extern void mca_nmi_hook(void);
#endif
#endif /* ASM_X86__ARCH_HOOKS_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H
#ifndef ASM_X86__ASM_H
#define ASM_X86__ASM_H
#ifdef __ASSEMBLY__
# define __ASM_FORM(x) x
@ -39,4 +39,4 @@
_ASM_PTR #from "," #to "\n" \
" .previous\n"
#endif /* _ASM_X86_ASM_H */
#endif /* ASM_X86__ASM_H */

View File

@ -1,5 +1,5 @@
#ifndef __ARCH_I386_ATOMIC__
#define __ARCH_I386_ATOMIC__
#ifndef ASM_X86__ATOMIC_32_H
#define ASM_X86__ATOMIC_32_H
#include <linux/compiler.h>
#include <asm/processor.h>
@ -256,4 +256,4 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h>
#endif
#endif /* ASM_X86__ATOMIC_32_H */

View File

@ -1,5 +1,5 @@
#ifndef __ARCH_X86_64_ATOMIC__
#define __ARCH_X86_64_ATOMIC__
#ifndef ASM_X86__ATOMIC_64_H
#define ASM_X86__ATOMIC_64_H
#include <asm/alternative.h>
#include <asm/cmpxchg.h>
@ -470,4 +470,4 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
#define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h>
#endif
#endif /* ASM_X86__ATOMIC_64_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_AUXVEC_H
#define _ASM_X86_AUXVEC_H
#ifndef ASM_X86__AUXVEC_H
#define ASM_X86__AUXVEC_H
/*
* Architecture-neutral AT_ values in 0-17, leave some room
* for more of them, start the x86-specific ones at 32.
@ -9,4 +9,4 @@
#endif
#define AT_SYSINFO_EHDR 33
#endif
#endif /* ASM_X86__AUXVEC_H */

View File

@ -1,5 +1,5 @@
#ifndef _MACH_BIOS_EBDA_H
#define _MACH_BIOS_EBDA_H
#ifndef ASM_X86__BIOS_EBDA_H
#define ASM_X86__BIOS_EBDA_H
#include <asm/io.h>
@ -16,4 +16,4 @@ static inline unsigned int get_bios_ebda(void)
void reserve_ebda_region(void);
#endif /* _MACH_BIOS_EBDA_H */
#endif /* ASM_X86__BIOS_EBDA_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_BITOPS_H
#define _ASM_X86_BITOPS_H
#ifndef ASM_X86__BITOPS_H
#define ASM_X86__BITOPS_H
/*
* Copyright 1992, Linus Torvalds.
@ -458,4 +458,4 @@ static inline void set_bit_string(unsigned long *bitmap,
#include <asm-generic/bitops/minix.h>
#endif /* __KERNEL__ */
#endif /* _ASM_X86_BITOPS_H */
#endif /* ASM_X86__BITOPS_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_BOOT_H
#define _ASM_BOOT_H
#ifndef ASM_X86__BOOT_H
#define ASM_X86__BOOT_H
/* Don't touch these, unless you really know what you're doing. */
#define DEF_INITSEG 0x9000
@ -25,4 +25,4 @@
#define BOOT_STACK_SIZE 0x1000
#endif
#endif /* _ASM_BOOT_H */
#endif /* ASM_X86__BOOT_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_BOOTPARAM_H
#define _ASM_BOOTPARAM_H
#ifndef ASM_X86__BOOTPARAM_H
#define ASM_X86__BOOTPARAM_H
#include <linux/types.h>
#include <linux/screen_info.h>
@ -108,4 +108,4 @@ struct boot_params {
__u8 _pad9[276]; /* 0xeec */
} __attribute__((packed));
#endif /* _ASM_BOOTPARAM_H */
#endif /* ASM_X86__BOOTPARAM_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_BUG_H
#define _ASM_X86_BUG_H
#ifndef ASM_X86__BUG_H
#define ASM_X86__BUG_H
#ifdef CONFIG_BUG
#define HAVE_ARCH_BUG
@ -36,4 +36,4 @@ do { \
#endif /* !CONFIG_BUG */
#include <asm-generic/bug.h>
#endif
#endif /* ASM_X86__BUG_H */

View File

@ -1,7 +1,7 @@
#ifndef _ASM_X86_BUGS_H
#define _ASM_X86_BUGS_H
#ifndef ASM_X86__BUGS_H
#define ASM_X86__BUGS_H
extern void check_bugs(void);
int ppro_with_ram_bug(void);
#endif /* _ASM_X86_BUGS_H */
#endif /* ASM_X86__BUGS_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_BYTEORDER_H
#define _ASM_X86_BYTEORDER_H
#ifndef ASM_X86__BYTEORDER_H
#define ASM_X86__BYTEORDER_H
#include <asm/types.h>
#include <linux/compiler.h>
@ -78,4 +78,4 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
#include <linux/byteorder/little_endian.h>
#endif /* _ASM_X86_BYTEORDER_H */
#endif /* ASM_X86__BYTEORDER_H */

View File

@ -1,5 +1,5 @@
#ifndef _ARCH_X86_CACHE_H
#define _ARCH_X86_CACHE_H
#ifndef ASM_X86__CACHE_H
#define ASM_X86__CACHE_H
/* L1 cache line size */
#define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
@ -17,4 +17,4 @@
#endif
#endif
#endif
#endif /* ASM_X86__CACHE_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_CACHEFLUSH_H
#define _ASM_X86_CACHEFLUSH_H
#ifndef ASM_X86__CACHEFLUSH_H
#define ASM_X86__CACHEFLUSH_H
/* Keep includes the same across arches. */
#include <linux/mm.h>
@ -112,4 +112,4 @@ static inline int rodata_test(void)
}
#endif
#endif
#endif /* ASM_X86__CACHEFLUSH_H */

View File

@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _ASM_X86_64_CALGARY_H
#define _ASM_X86_64_CALGARY_H
#ifndef ASM_X86__CALGARY_H
#define ASM_X86__CALGARY_H
#include <linux/spinlock.h>
#include <linux/device.h>
@ -69,4 +69,4 @@ static inline int calgary_iommu_init(void) { return 1; }
static inline void detect_calgary(void) { return; }
#endif
#endif /* _ASM_X86_64_CALGARY_H */
#endif /* ASM_X86__CALGARY_H */

View File

@ -1,5 +1,5 @@
#ifndef _I386_CHECKSUM_H
#define _I386_CHECKSUM_H
#ifndef ASM_X86__CHECKSUM_32_H
#define ASM_X86__CHECKSUM_32_H
#include <linux/in6.h>
@ -186,4 +186,4 @@ static inline __wsum csum_and_copy_to_user(const void *src,
return (__force __wsum)-1; /* invalid checksum */
}
#endif
#endif /* ASM_X86__CHECKSUM_32_H */

View File

@ -1,5 +1,5 @@
#ifndef _X86_64_CHECKSUM_H
#define _X86_64_CHECKSUM_H
#ifndef ASM_X86__CHECKSUM_64_H
#define ASM_X86__CHECKSUM_64_H
/*
* Checksums for x86-64
@ -188,4 +188,4 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b)
return a;
}
#endif
#endif /* ASM_X86__CHECKSUM_64_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_CMPXCHG_H
#define __ASM_CMPXCHG_H
#ifndef ASM_X86__CMPXCHG_32_H
#define ASM_X86__CMPXCHG_32_H
#include <linux/bitops.h> /* for LOCK_PREFIX */
@ -341,4 +341,4 @@ extern unsigned long long cmpxchg_486_u64(volatile void *, u64, u64);
#endif
#endif
#endif /* ASM_X86__CMPXCHG_32_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_CMPXCHG_H
#define __ASM_CMPXCHG_H
#ifndef ASM_X86__CMPXCHG_64_H
#define ASM_X86__CMPXCHG_64_H
#include <asm/alternative.h> /* Provides LOCK_PREFIX */
@ -182,4 +182,4 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr,
cmpxchg_local((ptr), (o), (n)); \
})
#endif
#endif /* ASM_X86__CMPXCHG_64_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_64_COMPAT_H
#define _ASM_X86_64_COMPAT_H
#ifndef ASM_X86__COMPAT_H
#define ASM_X86__COMPAT_H
/*
* Architecture specific compatibility types
@ -215,4 +215,4 @@ static inline int is_compat_task(void)
return current_thread_info()->status & TS_COMPAT;
}
#endif /* _ASM_X86_64_COMPAT_H */
#endif /* ASM_X86__COMPAT_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_I386_CPU_H_
#define _ASM_I386_CPU_H_
#ifndef ASM_X86__CPU_H
#define ASM_X86__CPU_H
#include <linux/device.h>
#include <linux/cpu.h>
@ -17,4 +17,4 @@ extern void arch_unregister_cpu(int);
#endif
DECLARE_PER_CPU(int, cpu_state);
#endif /* _ASM_I386_CPU_H_ */
#endif /* ASM_X86__CPU_H */

View File

@ -1,8 +1,8 @@
/*
* Defines x86 CPU feature bits
*/
#ifndef _ASM_X86_CPUFEATURE_H
#define _ASM_X86_CPUFEATURE_H
#ifndef ASM_X86__CPUFEATURE_H
#define ASM_X86__CPUFEATURE_H
#include <asm/required-features.h>
@ -224,4 +224,4 @@ extern const char * const x86_power_flags[32];
#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
#endif /* _ASM_X86_CPUFEATURE_H */
#endif /* ASM_X86__CPUFEATURE_H */

View File

@ -1,5 +1,5 @@
#ifndef _X86_CURRENT_H
#define _X86_CURRENT_H
#ifndef ASM_X86__CURRENT_H
#define ASM_X86__CURRENT_H
#ifdef CONFIG_X86_32
#include <linux/compiler.h>
@ -36,4 +36,4 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current()
#endif /* X86_CURRENT_H */
#endif /* ASM_X86__CURRENT_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_DEBUGREG_H
#define _ASM_X86_DEBUGREG_H
#ifndef ASM_X86__DEBUGREG_H
#define ASM_X86__DEBUGREG_H
/* Indicate the register numbers for a number of the specific
@ -67,4 +67,4 @@
#define DR_LOCAL_SLOWDOWN (0x100) /* Local slow the pipeline */
#define DR_GLOBAL_SLOWDOWN (0x200) /* Global slow the pipeline */
#endif
#endif /* ASM_X86__DEBUGREG_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_DELAY_H
#define _ASM_X86_DELAY_H
#ifndef ASM_X86__DELAY_H
#define ASM_X86__DELAY_H
/*
* Copyright (C) 1993 Linus Torvalds
@ -28,4 +28,4 @@ extern void __delay(unsigned long loops);
void use_tsc_delay(void);
#endif /* _ASM_X86_DELAY_H */
#endif /* ASM_X86__DELAY_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_DESC_H_
#define _ASM_DESC_H_
#ifndef ASM_X86__DESC_H
#define ASM_X86__DESC_H
#ifndef __ASSEMBLY__
#include <asm/desc_defs.h>
@ -397,4 +397,4 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
#endif /* __ASSEMBLY__ */
#endif
#endif /* ASM_X86__DESC_H */

View File

@ -1,6 +1,6 @@
/* Written 2000 by Andi Kleen */
#ifndef __ARCH_DESC_DEFS_H
#define __ARCH_DESC_DEFS_H
#ifndef ASM_X86__DESC_DEFS_H
#define ASM_X86__DESC_DEFS_H
/*
* Segment descriptor structure definitions, usable from both x86_64 and i386
@ -92,4 +92,4 @@ struct desc_ptr {
#endif /* !__ASSEMBLY__ */
#endif
#endif /* ASM_X86__DESC_DEFS_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_DEVICE_H
#define _ASM_X86_DEVICE_H
#ifndef ASM_X86__DEVICE_H
#define ASM_X86__DEVICE_H
struct dev_archdata {
#ifdef CONFIG_ACPI
@ -13,4 +13,4 @@ struct dma_mapping_ops *dma_ops;
#endif
};
#endif /* _ASM_X86_DEVICE_H */
#endif /* ASM_X86__DEVICE_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_DIV64_H
#define _ASM_X86_DIV64_H
#ifndef ASM_X86__DIV64_H
#define ASM_X86__DIV64_H
#ifdef CONFIG_X86_32
@ -57,4 +57,4 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
# include <asm-generic/div64.h>
#endif /* CONFIG_X86_32 */
#endif /* _ASM_X86_DIV64_H */
#endif /* ASM_X86__DIV64_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_DMA_MAPPING_H_
#define _ASM_DMA_MAPPING_H_
#ifndef ASM_X86__DMA_MAPPING_H
#define ASM_X86__DMA_MAPPING_H
/*
* IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for
@ -250,4 +250,4 @@ static inline int dma_get_cache_alignment(void)
#define dma_is_consistent(d, h) (1)
#include <asm-generic/dma-coherent.h>
#endif
#endif /* ASM_X86__DMA_MAPPING_H */

View File

@ -5,8 +5,8 @@
* and John Boyd, Nov. 1992.
*/
#ifndef _ASM_X86_DMA_H
#define _ASM_X86_DMA_H
#ifndef ASM_X86__DMA_H
#define ASM_X86__DMA_H
#include <linux/spinlock.h> /* And spinlocks */
#include <asm/io.h> /* need byte IO */
@ -315,4 +315,4 @@ extern int isa_dma_bridge_buggy;
#define isa_dma_bridge_buggy (0)
#endif
#endif /* _ASM_X86_DMA_H */
#endif /* ASM_X86__DMA_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_DMI_H
#define _ASM_X86_DMI_H
#ifndef ASM_X86__DMI_H
#define ASM_X86__DMI_H
#include <asm/io.h>
@ -23,4 +23,4 @@ static inline void *dmi_alloc(unsigned len)
#define dmi_ioremap early_ioremap
#define dmi_iounmap early_iounmap
#endif
#endif /* ASM_X86__DMI_H */

View File

@ -17,8 +17,8 @@
* Markus Metzger <markus.t.metzger@intel.com>, Dec 2007
*/
#ifndef _ASM_X86_DS_H
#define _ASM_X86_DS_H
#ifndef ASM_X86__DS_H
#define ASM_X86__DS_H
#include <linux/types.h>
#include <linux/init.h>
@ -69,4 +69,4 @@ extern int ds_write_bts(void *, const struct bts_struct *);
extern unsigned long ds_debugctl_mask(void);
extern void __cpuinit ds_init_intel(struct cpuinfo_x86 *c);
#endif /* _ASM_X86_DS_H */
#endif /* ASM_X86__DS_H */

View File

@ -1,5 +1,5 @@
#ifndef _DWARF2_H
#define _DWARF2_H
#ifndef ASM_X86__DWARF2_H
#define ASM_X86__DWARF2_H
#ifndef __ASSEMBLY__
#warning "asm/dwarf2.h should be only included in pure assembly files"
@ -58,4 +58,4 @@
#endif
#endif
#endif /* ASM_X86__DWARF2_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_E820_H
#define __ASM_E820_H
#ifndef ASM_X86__E820_H
#define ASM_X86__E820_H
#define E820MAP 0x2d0 /* our map */
#define E820MAX 128 /* number of entries in E820MAP */
@ -140,4 +140,4 @@ extern char *memory_setup(void);
#define HIGH_MEMORY (1024*1024)
#endif /* __KERNEL__ */
#endif /* __ASM_E820_H */
#endif /* ASM_X86__E820_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_EDAC_H
#define _ASM_X86_EDAC_H
#ifndef ASM_X86__EDAC_H
#define ASM_X86__EDAC_H
/* ECC atomic, DMA, SMP and interrupt safe scrub function */
@ -15,4 +15,4 @@ static inline void atomic_scrub(void *va, u32 size)
asm volatile("lock; addl $0, %0"::"m" (*virt_addr));
}
#endif
#endif /* ASM_X86__EDAC_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_EFI_H
#define _ASM_X86_EFI_H
#ifndef ASM_X86__EFI_H
#define ASM_X86__EFI_H
#ifdef CONFIG_X86_32
@ -94,4 +94,4 @@ extern void efi_reserve_early(void);
extern void efi_call_phys_prelog(void);
extern void efi_call_phys_epilog(void);
#endif
#endif /* ASM_X86__EFI_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_ELF_H
#define _ASM_X86_ELF_H
#ifndef ASM_X86__ELF_H
#define ASM_X86__ELF_H
/*
* ELF register definitions..
@ -332,4 +332,4 @@ extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
extern unsigned long arch_randomize_brk(struct mm_struct *mm);
#define arch_randomize_brk arch_randomize_brk
#endif
#endif /* ASM_X86__ELF_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H
#ifndef ASM_X86__EMERGENCY_RESTART_H
#define ASM_X86__EMERGENCY_RESTART_H
enum reboot_type {
BOOT_TRIPLE = 't',
@ -15,4 +15,4 @@ extern enum reboot_type reboot_type;
extern void machine_emergency_restart(void);
#endif /* _ASM_EMERGENCY_RESTART_H */
#endif /* ASM_X86__EMERGENCY_RESTART_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_FB_H
#define _ASM_X86_FB_H
#ifndef ASM_X86__FB_H
#define ASM_X86__FB_H
#include <linux/fb.h>
#include <linux/fs.h>
@ -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; }
#endif
#endif /* _ASM_X86_FB_H */
#endif /* ASM_X86__FB_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_FIXMAP_H
#define _ASM_FIXMAP_H
#ifndef ASM_X86__FIXMAP_H
#define ASM_X86__FIXMAP_H
#ifdef CONFIG_X86_32
# include "fixmap_32.h"
@ -65,4 +65,4 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
return __virt_to_fix(vaddr);
}
#endif
#endif /* ASM_X86__FIXMAP_H */

View File

@ -10,8 +10,8 @@
* Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
*/
#ifndef _ASM_FIXMAP_32_H
#define _ASM_FIXMAP_32_H
#ifndef ASM_X86__FIXMAP_32_H
#define ASM_X86__FIXMAP_32_H
/* used by vmalloc.c, vsyscall.lds.S.
@ -120,4 +120,4 @@ extern void reserve_top_address(unsigned long reserve);
#define FIXADDR_BOOT_START (FIXADDR_TOP - __FIXADDR_BOOT_SIZE)
#endif /* !__ASSEMBLY__ */
#endif
#endif /* ASM_X86__FIXMAP_32_H */

View File

@ -8,8 +8,8 @@
* Copyright (C) 1998 Ingo Molnar
*/
#ifndef _ASM_FIXMAP_64_H
#define _ASM_FIXMAP_64_H
#ifndef ASM_X86__FIXMAP_64_H
#define ASM_X86__FIXMAP_64_H
#include <linux/kernel.h>
#include <asm/acpi.h>
@ -80,4 +80,4 @@ enum fixed_addresses {
#define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL)
#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE)
#endif
#endif /* ASM_X86__FIXMAP_64_H */

View File

@ -7,8 +7,8 @@
*
* Copyright (C) 1995
*/
#ifndef _ASM_X86_FLOPPY_H
#define _ASM_X86_FLOPPY_H
#ifndef ASM_X86__FLOPPY_H
#define ASM_X86__FLOPPY_H
#include <linux/vmalloc.h>
@ -278,4 +278,4 @@ static int FDC2 = -1;
#define EXTRA_FLOPPY_PARAMS
#endif /* _ASM_X86_FLOPPY_H */
#endif /* ASM_X86__FLOPPY_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_FTRACE
#define _ASM_X86_FTRACE
#ifndef ASM_X86__FTRACE_H
#define ASM_X86__FTRACE_H
#ifdef CONFIG_FTRACE
#define MCOUNT_ADDR ((long)(mcount))
@ -11,4 +11,4 @@ extern void mcount(void);
#endif /* CONFIG_FTRACE */
#endif /* _ASM_X86_FTRACE */
#endif /* ASM_X86__FTRACE_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_FUTEX_H
#define _ASM_X86_FUTEX_H
#ifndef ASM_X86__FUTEX_H
#define ASM_X86__FUTEX_H
#ifdef __KERNEL__
@ -137,4 +137,4 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
}
#endif
#endif
#endif /* ASM_X86__FUTEX_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X8664_GART_H
#define _ASM_X8664_GART_H 1
#ifndef ASM_X86__GART_H
#define ASM_X86__GART_H
#include <asm/e820.h>
@ -68,4 +68,4 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size)
return 1;
}
#endif
#endif /* ASM_X86__GART_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_GENAPIC_H
#define _ASM_GENAPIC_H 1
#ifndef ASM_X86__GENAPIC_32_H
#define ASM_X86__GENAPIC_32_H
#include <asm/mpspec.h>
@ -121,4 +121,4 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC};
#define uv_system_init() do {} while (0)
#endif
#endif /* ASM_X86__GENAPIC_32_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_GENAPIC_H
#define _ASM_GENAPIC_H 1
#ifndef ASM_X86__GENAPIC_64_H
#define ASM_X86__GENAPIC_64_H
/*
* Copyright 2004 James Cleverdon, IBM.
@ -47,4 +47,4 @@ extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip);
extern void setup_apic_routing(void);
#endif
#endif /* ASM_X86__GENAPIC_64_H */

View File

@ -7,8 +7,8 @@
* as published by the Free Software Foundation.
*/
#ifndef _ASM_GEODE_H_
#define _ASM_GEODE_H_
#ifndef ASM_X86__GEODE_H
#define ASM_X86__GEODE_H
#include <asm/processor.h>
#include <linux/io.h>
@ -250,4 +250,4 @@ extern int __init mfgpt_timer_setup(void);
static inline int mfgpt_timer_setup(void) { return 0; }
#endif
#endif
#endif /* ASM_X86__GEODE_H */

View File

@ -53,4 +53,4 @@ static inline int irq_to_gpio(unsigned int irq)
#endif /* CONFIG_GPIOLIB */
#endif /* _ASM_I386_GPIO_H */
#endif /* ASM_X86__GPIO_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_HARDIRQ_H
#define __ASM_HARDIRQ_H
#ifndef ASM_X86__HARDIRQ_32_H
#define ASM_X86__HARDIRQ_32_H
#include <linux/threads.h>
#include <linux/irq.h>
@ -25,4 +25,4 @@ DECLARE_PER_CPU(irq_cpustat_t, irq_stat);
void ack_bad_irq(unsigned int irq);
#include <linux/irq_cpustat.h>
#endif /* __ASM_HARDIRQ_H */
#endif /* ASM_X86__HARDIRQ_32_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_HARDIRQ_H
#define __ASM_HARDIRQ_H
#ifndef ASM_X86__HARDIRQ_64_H
#define ASM_X86__HARDIRQ_64_H
#include <linux/threads.h>
#include <linux/irq.h>
@ -20,4 +20,4 @@
extern void ack_bad_irq(unsigned int irq);
#endif /* __ASM_HARDIRQ_H */
#endif /* ASM_X86__HARDIRQ_64_H */

View File

@ -15,8 +15,8 @@
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
*/
#ifndef _ASM_HIGHMEM_H
#define _ASM_HIGHMEM_H
#ifndef ASM_X86__HIGHMEM_H
#define ASM_X86__HIGHMEM_H
#ifdef __KERNEL__
@ -79,4 +79,4 @@ extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,
#endif /* __KERNEL__ */
#endif /* _ASM_HIGHMEM_H */
#endif /* ASM_X86__HIGHMEM_H */

View File

@ -1,5 +1,5 @@
#ifndef ASM_X86_HPET_H
#define ASM_X86_HPET_H
#ifndef ASM_X86__HPET_H
#define ASM_X86__HPET_H
#ifdef CONFIG_HPET_TIMER
@ -90,4 +90,4 @@ static inline int is_hpet_enabled(void) { return 0; }
#define hpet_readl(a) 0
#endif
#endif /* ASM_X86_HPET_H */
#endif /* ASM_X86__HPET_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_HUGETLB_H
#define _ASM_X86_HUGETLB_H
#ifndef ASM_X86__HUGETLB_H
#define ASM_X86__HUGETLB_H
#include <asm/page.h>
@ -90,4 +90,4 @@ static inline void arch_release_hugepage(struct page *page)
{
}
#endif /* _ASM_X86_HUGETLB_H */
#endif /* ASM_X86__HUGETLB_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_HW_IRQ_H
#define _ASM_HW_IRQ_H
#ifndef ASM_X86__HW_IRQ_H
#define ASM_X86__HW_IRQ_H
/*
* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar
@ -112,4 +112,4 @@ static inline void __setup_vector_irq(int cpu) {}
#endif /* !ASSEMBLY_ */
#endif
#endif /* ASM_X86__HW_IRQ_H */

View File

@ -1,5 +1,5 @@
#ifndef ASM_HYPERTRANSPORT_H
#define ASM_HYPERTRANSPORT_H
#ifndef ASM_X86__HYPERTRANSPORT_H
#define ASM_X86__HYPERTRANSPORT_H
/*
* Constants for x86 Hypertransport Interrupts.
@ -42,4 +42,4 @@
#define HT_IRQ_HIGH_DEST_ID(v) \
((((v) >> 8) << HT_IRQ_HIGH_DEST_ID_SHIFT) & HT_IRQ_HIGH_DEST_ID_MASK)
#endif /* ASM_HYPERTRANSPORT_H */
#endif /* ASM_X86__HYPERTRANSPORT_H */

View File

@ -7,8 +7,8 @@
* x86-64 work by Andi Kleen 2002
*/
#ifndef _ASM_X86_I387_H
#define _ASM_X86_I387_H
#ifndef ASM_X86__I387_H
#define ASM_X86__I387_H
#include <linux/sched.h>
#include <linux/kernel_stat.h>
@ -336,4 +336,4 @@ static inline unsigned short get_fpu_mxcsr(struct task_struct *tsk)
}
}
#endif /* _ASM_X86_I387_H */
#endif /* ASM_X86__I387_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_I8253_H__
#define __ASM_I8253_H__
#ifndef ASM_X86__I8253_H
#define ASM_X86__I8253_H
/* i8253A PIT registers */
#define PIT_MODE 0x43
@ -15,4 +15,4 @@ extern void setup_pit_timer(void);
#define inb_pit inb_p
#define outb_pit outb_p
#endif /* __ASM_I8253_H__ */
#endif /* ASM_X86__I8253_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_I8259_H__
#define __ASM_I8259_H__
#ifndef ASM_X86__I8259_H
#define ASM_X86__I8259_H
#include <linux/delay.h>
@ -57,4 +57,4 @@ static inline void outb_pic(unsigned char value, unsigned int port)
extern struct irq_chip i8259A_chip;
#endif /* __ASM_I8259_H__ */
#endif /* ASM_X86__I8259_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_64_IA32_H
#define _ASM_X86_64_IA32_H
#ifndef ASM_X86__IA32_H
#define ASM_X86__IA32_H
#ifdef CONFIG_IA32_EMULATION
@ -167,4 +167,4 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm);
#endif /* !CONFIG_IA32_SUPPORT */
#endif
#endif /* ASM_X86__IA32_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_64_IA32_UNISTD_H_
#define _ASM_X86_64_IA32_UNISTD_H_
#ifndef ASM_X86__IA32_UNISTD_H
#define ASM_X86__IA32_UNISTD_H
/*
* This file contains the system call numbers of the ia32 port,
@ -15,4 +15,4 @@
#define __NR_ia32_sigreturn 119
#define __NR_ia32_rt_sigreturn 173
#endif /* _ASM_X86_64_IA32_UNISTD_H_ */
#endif /* ASM_X86__IA32_UNISTD_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_64_IDLE_H
#define _ASM_X86_64_IDLE_H 1
#ifndef ASM_X86__IDLE_H
#define ASM_X86__IDLE_H
#define IDLE_START 1
#define IDLE_END 2
@ -12,4 +12,4 @@ void exit_idle(void);
void c1e_remove_cpu(int cpu);
#endif
#endif /* ASM_X86__IDLE_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_INTEL_ARCH_PERFMON_H
#define _ASM_X86_INTEL_ARCH_PERFMON_H
#ifndef ASM_X86__INTEL_ARCH_PERFMON_H
#define ASM_X86__INTEL_ARCH_PERFMON_H
#define MSR_ARCH_PERFMON_PERFCTR0 0xc1
#define MSR_ARCH_PERFMON_PERFCTR1 0xc2
@ -28,4 +28,4 @@ union cpuid10_eax {
unsigned int full;
};
#endif /* _ASM_X86_INTEL_ARCH_PERFMON_H */
#endif /* ASM_X86__INTEL_ARCH_PERFMON_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_IO_H
#define _ASM_X86_IO_H
#ifndef ASM_X86__IO_H
#define ASM_X86__IO_H
#define ARCH_HAS_IOREMAP_WC
@ -99,4 +99,4 @@ extern void early_iounmap(void *addr, unsigned long size);
extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
#endif /* _ASM_X86_IO_H */
#endif /* ASM_X86__IO_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_IO_H
#define _ASM_IO_H
#ifndef ASM_X86__IO_32_H
#define ASM_X86__IO_32_H
#include <linux/string.h>
#include <linux/compiler.h>
@ -281,4 +281,4 @@ BUILDIO(b, b, char)
BUILDIO(w, w, short)
BUILDIO(l, , int)
#endif
#endif /* ASM_X86__IO_32_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_IO_H
#define _ASM_IO_H
#ifndef ASM_X86__IO_64_H
#define ASM_X86__IO_64_H
/*
@ -245,4 +245,4 @@ extern int iommu_bio_merge;
#endif /* __KERNEL__ */
#endif
#endif /* ASM_X86__IO_64_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_IO_APIC_H
#define __ASM_IO_APIC_H
#ifndef ASM_X86__IO_APIC_H
#define ASM_X86__IO_APIC_H
#include <linux/types.h>
#include <asm/mpspec.h>
@ -189,4 +189,4 @@ static const int timer_through_8259 = 0;
static inline void ioapic_init_mappings(void) { }
#endif
#endif
#endif /* ASM_X86__IO_APIC_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_IOCTLS_H
#define _ASM_X86_IOCTLS_H
#ifndef ASM_X86__IOCTLS_H
#define ASM_X86__IOCTLS_H
#include <asm/ioctl.h>
@ -85,4 +85,4 @@
#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
#endif
#endif /* ASM_X86__IOCTLS_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X8664_IOMMU_H
#define _ASM_X8664_IOMMU_H 1
#ifndef ASM_X86__IOMMU_H
#define ASM_X86__IOMMU_H
extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void);
@ -42,4 +42,4 @@ static inline void gart_iommu_hole_init(void)
}
#endif
#endif
#endif /* ASM_X86__IOMMU_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_IPCBUF_H
#define _ASM_X86_IPCBUF_H
#ifndef ASM_X86__IPCBUF_H
#define ASM_X86__IPCBUF_H
/*
* The ipc64_perm structure for x86 architecture.
@ -25,4 +25,4 @@ struct ipc64_perm {
unsigned long __unused2;
};
#endif /* _ASM_X86_IPCBUF_H */
#endif /* ASM_X86__IPCBUF_H */

View File

@ -1,5 +1,5 @@
#ifndef __ASM_IPI_H
#define __ASM_IPI_H
#ifndef ASM_X86__IPI_H
#define ASM_X86__IPI_H
/*
* Copyright 2004 James Cleverdon, IBM.
@ -129,4 +129,4 @@ static inline void send_IPI_mask_sequence(cpumask_t mask, int vector)
local_irq_restore(flags);
}
#endif /* __ASM_IPI_H */
#endif /* ASM_X86__IPI_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_IRQ_H
#define _ASM_IRQ_H
#ifndef ASM_X86__IRQ_H
#define ASM_X86__IRQ_H
/*
* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar
*
@ -47,4 +47,4 @@ extern void native_init_IRQ(void);
/* Interrupt vector management */
extern DECLARE_BITMAP(used_vectors, NR_VECTORS);
#endif /* _ASM_IRQ_H */
#endif /* ASM_X86__IRQ_H */

View File

@ -4,8 +4,8 @@
*
* Jeremy Fitzhardinge <jeremy@goop.org>
*/
#ifndef _ASM_I386_IRQ_REGS_H
#define _ASM_I386_IRQ_REGS_H
#ifndef ASM_X86__IRQ_REGS_32_H
#define ASM_X86__IRQ_REGS_32_H
#include <asm/percpu.h>
@ -26,4 +26,4 @@ static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs)
return old_regs;
}
#endif /* _ASM_I386_IRQ_REGS_H */
#endif /* ASM_X86__IRQ_REGS_32_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_IRQ_VECTORS_H
#define _ASM_IRQ_VECTORS_H
#ifndef ASM_X86__IRQ_VECTORS_H
#define ASM_X86__IRQ_VECTORS_H
#include <linux/threads.h>
@ -179,4 +179,4 @@
#define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8)
#endif /* _ASM_IRQ_VECTORS_H */
#endif /* ASM_X86__IRQ_VECTORS_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_IST_H
#define _ASM_IST_H
#ifndef ASM_X86__IST_H
#define ASM_X86__IST_H
/*
* Include file for the interface to IST BIOS
@ -31,4 +31,4 @@ struct ist_info {
extern struct ist_info ist_info;
#endif /* __KERNEL__ */
#endif /* _ASM_IST_H */
#endif /* ASM_X86__IST_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_K8_H
#define _ASM_K8_H 1
#ifndef ASM_X86__K8_H
#define ASM_X86__K8_H
#include <linux/pci.h>
@ -12,4 +12,4 @@ extern int cache_k8_northbridges(void);
extern void k8_flush_garts(void);
extern int k8_scan_nodes(unsigned long start, unsigned long end);
#endif
#endif /* ASM_X86__K8_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_KDEBUG_H
#define _ASM_X86_KDEBUG_H
#ifndef ASM_X86__KDEBUG_H
#define ASM_X86__KDEBUG_H
#include <linux/notifier.h>
@ -35,4 +35,4 @@ extern void show_regs(struct pt_regs *regs);
extern unsigned long oops_begin(void);
extern void oops_end(unsigned long, struct pt_regs *, int signr);
#endif
#endif /* ASM_X86__KDEBUG_H */

View File

@ -1,5 +1,5 @@
#ifndef _KEXEC_H
#define _KEXEC_H
#ifndef ASM_X86__KEXEC_H
#define ASM_X86__KEXEC_H
#ifdef CONFIG_X86_32
# define PA_CONTROL_PAGE 0
@ -172,4 +172,4 @@ relocate_kernel(unsigned long indirection_page,
#endif /* __ASSEMBLY__ */
#endif /* _KEXEC_H */
#endif /* ASM_X86__KEXEC_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_KGDB_H_
#define _ASM_KGDB_H_
#ifndef ASM_X86__KGDB_H
#define ASM_X86__KGDB_H
/*
* Copyright (C) 2001-2004 Amit S. Kale
@ -76,4 +76,4 @@ static inline void arch_kgdb_breakpoint(void)
#define BREAK_INSTR_SIZE 1
#define CACHE_FLUSH_IS_SAFE 1
#endif /* _ASM_KGDB_H_ */
#endif /* ASM_X86__KGDB_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_X86_KMAP_TYPES_H
#define _ASM_X86_KMAP_TYPES_H
#ifndef ASM_X86__KMAP_TYPES_H
#define ASM_X86__KMAP_TYPES_H
#if defined(CONFIG_X86_32) && defined(CONFIG_DEBUG_HIGHMEM)
# define D(n) __KM_FENCE_##n ,
@ -26,4 +26,4 @@ D(13) KM_TYPE_NR
#undef D
#endif
#endif /* ASM_X86__KMAP_TYPES_H */

View File

@ -1,5 +1,5 @@
#ifndef _ASM_KPROBES_H
#define _ASM_KPROBES_H
#ifndef ASM_X86__KPROBES_H
#define ASM_X86__KPROBES_H
/*
* Kernel Probes (KProbes)
*
@ -94,4 +94,4 @@ static inline void restore_interrupts(struct pt_regs *regs)
extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
extern int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data);
#endif /* _ASM_KPROBES_H */
#endif /* ASM_X86__KPROBES_H */

View File

@ -1,5 +1,5 @@
#ifndef __LINUX_KVM_X86_H
#define __LINUX_KVM_X86_H
#ifndef ASM_X86__KVM_H
#define ASM_X86__KVM_H
/*
* KVM x86 specific structures and definitions
@ -230,4 +230,4 @@ struct kvm_pit_state {
#define KVM_TRC_APIC_ACCESS (KVM_TRC_HANDLER + 0x14)
#define KVM_TRC_TDP_FAULT (KVM_TRC_HANDLER + 0x15)
#endif
#endif /* ASM_X86__KVM_H */

View File

@ -1,4 +1,4 @@
#/*
/*
* Kernel-based Virtual Machine driver for Linux
*
* This header defines architecture specific interfaces, x86 version
@ -8,8 +8,8 @@
*
*/
#ifndef ASM_KVM_HOST_H
#define ASM_KVM_HOST_H
#ifndef ASM_X86__KVM_HOST_H
#define ASM_X86__KVM_HOST_H
#include <linux/types.h>
#include <linux/mm.h>
@ -735,4 +735,4 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
int kvm_age_hva(struct kvm *kvm, unsigned long hva);
#endif
#endif /* ASM_X86__KVM_HOST_H */

View File

@ -1,5 +1,5 @@
#ifndef __X86_KVM_PARA_H
#define __X86_KVM_PARA_H
#ifndef ASM_X86__KVM_PARA_H
#define ASM_X86__KVM_PARA_H
/* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It
* 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)
#endif
#endif
#endif /* ASM_X86__KVM_PARA_H */

View File

@ -8,8 +8,8 @@
* From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4
*/
#ifndef __X86_EMULATE_H__
#define __X86_EMULATE_H__
#ifndef ASM_X86__KVM_X86_EMULATE_H
#define ASM_X86__KVM_X86_EMULATE_H
struct x86_emulate_ctxt;
@ -181,4 +181,4 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt,
int x86_emulate_insn(struct x86_emulate_ctxt *ctxt,
struct x86_emulate_ops *ops);
#endif /* __X86_EMULATE_H__ */
#endif /* ASM_X86__KVM_X86_EMULATE_H */

View File

@ -3,8 +3,8 @@
*
* Definitions of structures used with the modify_ldt system call.
*/
#ifndef _ASM_X86_LDT_H
#define _ASM_X86_LDT_H
#ifndef ASM_X86__LDT_H
#define ASM_X86__LDT_H
/* Maximum number of LDT entries supported. */
#define LDT_ENTRIES 8192
@ -37,4 +37,4 @@ struct user_desc {
#define MODIFY_LDT_CONTENTS_CODE 2
#endif /* !__ASSEMBLY__ */
#endif
#endif /* ASM_X86__LDT_H */

Some files were not shown because too many files have changed in this diff Show More