Skip to content

L
linux
Commit b8cd9d05 authored by Ingo Molnar's avatar Ingo Molnar
Browse files
Options

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: default avatarIngo Molnar <mingo@elte.hu>
parents fec6ed1d 1503af66
Hide whitespace changes
Inline Side-by-side
Showing with 849 additions and 849 deletions
arch/x86/boot/compressed/misc.c
View file @ b8cd9d05
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
*/ */
#undef CONFIG_PARAVIRT #undef CONFIG_PARAVIRT
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
#define _ASM_DESC_H_ 1 #define ASM_X86__DESC_H 1
#endif #endif
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
......
arch/x86/kernel/asm-offsets_64.c
View file @ b8cd9d05
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define __NO_STUBS 1 #define __NO_STUBS 1
#undef __SYSCALL #undef __SYSCALL
#undef _ASM_X86_64_UNISTD_H_ #undef ASM_X86__UNISTD_64_H
#define __SYSCALL(nr, sym) [nr] = 1, #define __SYSCALL(nr, sym) [nr] = 1,
static char syscalls[] = { static char syscalls[] = {
#include <asm/unistd.h> #include <asm/unistd.h>
......
arch/x86/kernel/syscall_64.c
View file @ b8cd9d05
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
#define __NO_STUBS #define __NO_STUBS
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ; #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> #include <asm/unistd_64.h>
#undef __SYSCALL #undef __SYSCALL
#define __SYSCALL(nr, sym) [nr] = sym, #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); typedef void (*sys_call_ptr_t)(void);
......
include/asm-x86/a.out-core.h
View file @ b8cd9d05
...@@ -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_A_OUT_CORE_H #ifndef ASM_X86__A_OUT_CORE_H
#define _ASM_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_A_OUT_CORE_H */ #endif /* ASM_X86__A_OUT_CORE_H */
include/asm-x86/a.out.h
View file @ b8cd9d05
#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 */
include/asm-x86/acpi.h
View file @ b8cd9d05
#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 /*__X86_ASM_ACPI_H*/ #endif /* ASM_X86__ACPI_H */
include/asm-x86/agp.h
View file @ b8cd9d05
#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 #endif /* ASM_X86__AGP_H */
include/asm-x86/alternative.h
View file @ b8cd9d05
#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 */
include/asm-x86/amd_iommu.h
View file @ b8cd9d05
...@@ -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
#ifdef CONFIG_AMD_IOMMU #ifdef CONFIG_AMD_IOMMU
extern int amd_iommu_init(void); extern int amd_iommu_init(void);
...@@ -29,4 +29,4 @@ static inline int amd_iommu_init(void) { return -ENODEV; } ...@@ -29,4 +29,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 #endif /* ASM_X86__AMD_IOMMU_H */
include/asm-x86/amd_iommu_types.h
View file @ b8cd9d05
...@@ -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 __AMD_IOMMU_TYPES_H__ #ifndef ASM_X86__AMD_IOMMU_TYPES_H
#define __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>
...@@ -341,4 +341,4 @@ static inline u16 calc_devid(u8 bus, u8 devfn) ...@@ -341,4 +341,4 @@ static inline u16 calc_devid(u8 bus, u8 devfn)
return (((u16)bus) << 8) | devfn; return (((u16)bus) << 8) | devfn;
} }
#endif #endif /* ASM_X86__AMD_IOMMU_TYPES_H */
include/asm-x86/apic.h
View file @ b8cd9d05
#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>
...@@ -128,4 +128,4 @@ static inline void init_apic_mappings(void) { } ...@@ -128,4 +128,4 @@ static inline void init_apic_mappings(void) { }
#endif /* !CONFIG_X86_LOCAL_APIC */ #endif /* !CONFIG_X86_LOCAL_APIC */
#endif /* __ASM_APIC_H */ #endif /* ASM_X86__APIC_H */
include/asm-x86/apicdef.h
View file @ b8cd9d05
#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.)
...@@ -411,4 +411,4 @@ struct local_apic { ...@@ -411,4 +411,4 @@ struct local_apic {
#else #else
#define BAD_APICID 0xFFFFu #define BAD_APICID 0xFFFFu
#endif #endif
#endif #endif /* ASM_X86__APICDEF_H */
include/asm-x86/arch_hooks.h
View file @ b8cd9d05
#ifndef _ASM_ARCH_HOOKS_H #ifndef ASM_X86__ARCH_HOOKS_H
#define _ASM_ARCH_HOOKS_H #define ASM_X86__ARCH_HOOKS_H
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -25,4 +25,4 @@ extern void pre_time_init_hook(void); ...@@ -25,4 +25,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 #endif /* ASM_X86__ARCH_HOOKS_H */
include/asm-x86/asm.h
View file @ b8cd9d05
#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
...@@ -39,4 +39,4 @@ ...@@ -39,4 +39,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 */
include/asm-x86/atomic_32.h
View file @ b8cd9d05
#ifndef __ARCH_I386_ATOMIC__ #ifndef ASM_X86__ATOMIC_32_H
#define __ARCH_I386_ATOMIC__ #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 #endif /* ASM_X86__ATOMIC_32_H */
include/asm-x86/atomic_64.h
View file @ b8cd9d05
#ifndef __ARCH_X86_64_ATOMIC__ #ifndef ASM_X86__ATOMIC_64_H
#define __ARCH_X86_64_ATOMIC__ #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 #endif /* ASM_X86__ATOMIC_64_H */
include/asm-x86/auxvec.h
View file @ b8cd9d05
#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 #endif /* ASM_X86__AUXVEC_H */
include/asm-x86/bios_ebda.h
View file @ b8cd9d05
#ifndef _MACH_BIOS_EBDA_H #ifndef ASM_X86__BIOS_EBDA_H
#define _MACH_BIOS_EBDA_H #define ASM_X86__BIOS_EBDA_H
#include <asm/io.h> #include <asm/io.h>
...@@ -16,4 +16,4 @@ static inline unsigned int get_bios_ebda(void) ...@@ -16,4 +16,4 @@ static inline unsigned int get_bios_ebda(void)
void reserve_ebda_region(void); void reserve_ebda_region(void);
#endif /* _MACH_BIOS_EBDA_H */ #endif /* ASM_X86__BIOS_EBDA_H */
include/asm-x86/bitops.h
View file @ b8cd9d05
#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.
...@@ -458,4 +458,4 @@ static inline void set_bit_string(unsigned long *bitmap, ...@@ -458,4 +458,4 @@ static inline void set_bit_string(unsigned long *bitmap,
#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 */
include/asm-x86/boot.h
View file @ b8cd9d05
#ifndef _ASM_BOOT_H #ifndef ASM_X86__BOOT_H
#define _ASM_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_INITSEG 0x9000 #define DEF_INITSEG 0x9000
...@@ -25,4 +25,4 @@ ...@@ -25,4 +25,4 @@
#define BOOT_STACK_SIZE 0x1000 #define BOOT_STACK_SIZE 0x1000
#endif #endif
#endif /* _ASM_BOOT_H */ #endif /* ASM_X86__BOOT_H */
include/asm-x86/bootparam.h
View file @ b8cd9d05
#ifndef _ASM_BOOTPARAM_H #ifndef ASM_X86__BOOTPARAM_H
#define _ASM_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_BOOTPARAM_H */ #endif /* ASM_X86__BOOTPARAM_H */
include/asm-x86/bug.h
View file @ b8cd9d05
#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 #endif /* ASM_X86__BUG_H */
include/asm-x86/bugs.h
View file @ b8cd9d05
#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);
int ppro_with_ram_bug(void); int ppro_with_ram_bug(void);
#endif /* _ASM_X86_BUGS_H */ #endif /* ASM_X86__BUGS_H */
include/asm-x86/byteorder.h
View file @ b8cd9d05
#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 */
include/asm-x86/cache.h
View file @ b8cd9d05
#ifndef _ARCH_X86_CACHE_H #ifndef ASM_X86__CACHE_H
#define _ARCH_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 #endif /* ASM_X86__CACHE_H */
include/asm-x86/cacheflush.h
View file @ b8cd9d05
#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>
...@@ -112,4 +112,4 @@ static inline int rodata_test(void) ...@@ -112,4 +112,4 @@ static inline int rodata_test(void)
} }
#endif #endif
#endif #endif /* ASM_X86__CACHEFLUSH_H */
include/asm-x86/calgary.h
View file @ b8cd9d05
...@@ -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_64_CALGARY_H #ifndef ASM_X86__CALGARY_H
#define _ASM_X86_64_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_64_CALGARY_H */ #endif /* ASM_X86__CALGARY_H */
include/asm-x86/checksum_32.h
View file @ b8cd9d05
#ifndef _I386_CHECKSUM_H #ifndef ASM_X86__CHECKSUM_32_H
#define _I386_CHECKSUM_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 #endif /* ASM_X86__CHECKSUM_32_H */
include/asm-x86/checksum_64.h
View file @ b8cd9d05
#ifndef _X86_64_CHECKSUM_H #ifndef ASM_X86__CHECKSUM_64_H
#define _X86_64_CHECKSUM_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 #endif /* ASM_X86__CHECKSUM_64_H */
include/asm-x86/cmpxchg_32.h
View file @ b8cd9d05
#ifndef __ASM_CMPXCHG_H #ifndef ASM_X86__CMPXCHG_32_H
#define __ASM_CMPXCHG_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 #endif /* ASM_X86__CMPXCHG_32_H */
include/asm-x86/cmpxchg_64.h
View file @ b8cd9d05
#ifndef __ASM_CMPXCHG_H #ifndef ASM_X86__CMPXCHG_64_H
#define __ASM_CMPXCHG_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 #endif /* ASM_X86__CMPXCHG_64_H */
include/asm-x86/compat.h
View file @ b8cd9d05
#ifndef _ASM_X86_64_COMPAT_H #ifndef ASM_X86__COMPAT_H
#define _ASM_X86_64_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_64_COMPAT_H */ #endif /* ASM_X86__COMPAT_H */
include/asm-x86/cpu.h
View file @ b8cd9d05
#ifndef _ASM_I386_CPU_H_ #ifndef ASM_X86__CPU_H
#define _ASM_I386_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_I386_CPU_H_ */ #endif /* ASM_X86__CPU_H */
include/asm-x86/cpufeature.h
View file @ b8cd9d05
/* /*
* 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>
...@@ -224,4 +224,4 @@ extern const char * const x86_power_flags[32]; ...@@ -224,4 +224,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 */
include/asm-x86/current.h
View file @ b8cd9d05
#ifndef _X86_CURRENT_H #ifndef ASM_X86__CURRENT_H
#define _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 /* X86_CURRENT_H */ #endif /* ASM_X86__CURRENT_H */
include/asm-x86/debugreg.h
View file @ b8cd9d05
#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 #endif /* ASM_X86__DEBUGREG_H */
include/asm-x86/delay.h
View file @ b8cd9d05
#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 */
include/asm-x86/desc.h
View file @ b8cd9d05
#ifndef _ASM_DESC_H_ #ifndef ASM_X86__DESC_H
#define _ASM_DESC_H_ #define ASM_X86__DESC_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/desc_defs.h> #include <asm/desc_defs.h>
...@@ -397,4 +397,4 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist) ...@@ -397,4 +397,4 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif #endif /* ASM_X86__DESC_H */
include/asm-x86/desc_defs.h
View file @ b8cd9d05
/* Written 2000 by Andi Kleen */ /* Written 2000 by Andi Kleen */
#ifndef __ARCH_DESC_DEFS_H #ifndef ASM_X86__DESC_DEFS_H
#define __ARCH_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 #endif /* ASM_X86__DESC_DEFS_H */
include/asm-x86/device.h
View file @ b8cd9d05
#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 */
include/asm-x86/div64.h
View file @ b8cd9d05
#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 */
include/asm-x86/dma-mapping.h
View file @ b8cd9d05
#ifndef _ASM_DMA_MAPPING_H_ #ifndef ASM_X86__DMA_MAPPING_H
#define _ASM_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
...@@ -250,4 +250,4 @@ static inline int dma_get_cache_alignment(void) ...@@ -250,4 +250,4 @@ static inline int dma_get_cache_alignment(void)
#define dma_is_consistent(d, h) (1) #define dma_is_consistent(d, h) (1)
#include <asm-generic/dma-coherent.h> #include <asm-generic/dma-coherent.h>
#endif #endif /* ASM_X86__DMA_MAPPING_H */
include/asm-x86/dma.h
View file @ b8cd9d05
...@@ -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 */
include/asm-x86/dmi.h
View file @ b8cd9d05
#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 #endif /* ASM_X86__DMI_H */
include/asm-x86/ds.h
View file @ b8cd9d05
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* Markus Metzger <markus.t.metzger@intel.com>, Dec 2007 * Markus Metzger <markus.t.metzger@intel.com>, Dec 2007
*/ */
#ifndef _ASM_X86_DS_H #ifndef ASM_X86__DS_H
#define _ASM_X86_DS_H #define ASM_X86__DS_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -69,4 +69,4 @@ extern int ds_write_bts(void *, const struct bts_struct *); ...@@ -69,4 +69,4 @@ extern int ds_write_bts(void *, const struct bts_struct *);
extern unsigned long ds_debugctl_mask(void); extern unsigned long ds_debugctl_mask(void);
extern void __cpuinit ds_init_intel(struct cpuinfo_x86 *c); extern void __cpuinit ds_init_intel(struct cpuinfo_x86 *c);
#endif /* _ASM_X86_DS_H */ #endif /* ASM_X86__DS_H */
include/asm-x86/dwarf2.h
View file @ b8cd9d05
#ifndef _DWARF2_H #ifndef ASM_X86__DWARF2_H
#define _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 #endif /* ASM_X86__DWARF2_H */
include/asm-x86/e820.h
View file @ b8cd9d05
#ifndef __ASM_E820_H #ifndef ASM_X86__E820_H
#define __ASM_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 */
...@@ -140,4 +140,4 @@ extern char *memory_setup(void); ...@@ -140,4 +140,4 @@ extern char *memory_setup(void);
#define HIGH_MEMORY (1024*1024) #define HIGH_MEMORY (1024*1024)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASM_E820_H */ #endif /* ASM_X86__E820_H */
include/asm-x86/edac.h
View file @ b8cd9d05
#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 #endif /* ASM_X86__EDAC_H */
include/asm-x86/efi.h
View file @ b8cd9d05
#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
...@@ -94,4 +94,4 @@ extern void efi_reserve_early(void); ...@@ -94,4 +94,4 @@ extern void efi_reserve_early(void);
extern void efi_call_phys_prelog(void); extern void efi_call_phys_prelog(void);
extern void efi_call_phys_epilog(void); extern void efi_call_phys_epilog(void);
#endif #endif /* ASM_X86__EFI_H */
include/asm-x86/elf.h
View file @ b8cd9d05
#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..
...@@ -332,4 +332,4 @@ extern int syscall32_setup_pages(struct linux_binprm *, int exstack); ...@@ -332,4 +332,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 #endif /* ASM_X86__ELF_H */
include/asm-x86/emergency-restart.h
View file @ b8cd9d05
#ifndef _ASM_EMERGENCY_RESTART_H #ifndef ASM_X86__EMERGENCY_RESTART_H
#define _ASM_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_EMERGENCY_RESTART_H */ #endif /* ASM_X86__EMERGENCY_RESTART_H */
include/asm-x86/fb.h
View file @ b8cd9d05
#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 */
include/asm-x86/fixmap.h
View file @ b8cd9d05
#ifndef _ASM_FIXMAP_H #ifndef ASM_X86__FIXMAP_H
#define _ASM_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 #endif /* ASM_X86__FIXMAP_H */
include/asm-x86/fixmap_32.h
View file @ b8cd9d05
...@@ -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_FIXMAP_32_H #ifndef ASM_X86__FIXMAP_32_H
#define _ASM_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 #endif /* ASM_X86__FIXMAP_32_H */
include/asm-x86/fixmap_64.h
View file @ b8cd9d05
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Copyright (C) 1998 Ingo Molnar * Copyright (C) 1998 Ingo Molnar
*/ */
#ifndef _ASM_FIXMAP_64_H #ifndef ASM_X86__FIXMAP_64_H
#define _ASM_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 #endif /* ASM_X86__FIXMAP_64_H */
include/asm-x86/floppy.h
View file @ b8cd9d05
...@@ -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 */
include/asm-x86/ftrace.h
View file @ b8cd9d05
#ifndef _ASM_X86_FTRACE #ifndef ASM_X86__FTRACE_H
#define _ASM_X86_FTRACE #define ASM_X86__FTRACE_H
#ifdef CONFIG_FTRACE #ifdef CONFIG_FTRACE
#define MCOUNT_ADDR ((long)(mcount)) #define MCOUNT_ADDR ((long)(mcount))
...@@ -11,4 +11,4 @@ extern void mcount(void); ...@@ -11,4 +11,4 @@ extern void mcount(void);
#endif /* CONFIG_FTRACE */ #endif /* CONFIG_FTRACE */
#endif /* _ASM_X86_FTRACE */ #endif /* ASM_X86__FTRACE_H */
include/asm-x86/futex.h
View file @ b8cd9d05
#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 #endif /* ASM_X86__FUTEX_H */
include/asm-x86/gart.h
View file @ b8cd9d05
#ifndef _ASM_X8664_GART_H #ifndef ASM_X86__GART_H
#define _ASM_X8664_GART_H 1 #define ASM_X86__GART_H
#include <asm/e820.h> #include <asm/e820.h>
...@@ -68,4 +68,4 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size) ...@@ -68,4 +68,4 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size)
return 1; return 1;
} }
#endif #endif /* ASM_X86__GART_H */
include/asm-x86/genapic_32.h
View file @ b8cd9d05
#ifndef _ASM_GENAPIC_H #ifndef ASM_X86__GENAPIC_32_H
#define _ASM_GENAPIC_H 1 #define ASM_X86__GENAPIC_32_H
#include <asm/mpspec.h> #include <asm/mpspec.h>
...@@ -121,4 +121,4 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; ...@@ -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) #define uv_system_init() do {} while (0)
#endif #endif /* ASM_X86__GENAPIC_32_H */
include/asm-x86/genapic_64.h
View file @ b8cd9d05
#ifndef _ASM_GENAPIC_H #ifndef ASM_X86__GENAPIC_64_H
#define _ASM_GENAPIC_H 1 #define ASM_X86__GENAPIC_64_H
/* /*
* Copyright 2004 James Cleverdon, IBM. * Copyright 2004 James Cleverdon, IBM.
...@@ -47,4 +47,4 @@ extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip); ...@@ -47,4 +47,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 #endif /* ASM_X86__GENAPIC_64_H */
include/asm-x86/geode.h
View file @ b8cd9d05
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* as published by the Free Software Foundation. * as published by the Free Software Foundation.
*/ */
#ifndef _ASM_GEODE_H_ #ifndef ASM_X86__GEODE_H
#define _ASM_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 #endif /* ASM_X86__GEODE_H */
include/asm-x86/gpio.h
View file @ b8cd9d05
...@@ -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_I386_GPIO_H */ #endif /* ASM_X86__GPIO_H */
include/asm-x86/hardirq_32.h
View file @ b8cd9d05
#ifndef __ASM_HARDIRQ_H #ifndef ASM_X86__HARDIRQ_32_H
#define __ASM_HARDIRQ_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_HARDIRQ_H */ #endif /* ASM_X86__HARDIRQ_32_H */
include/asm-x86/hardirq_64.h
View file @ b8cd9d05
#ifndef __ASM_HARDIRQ_H #ifndef ASM_X86__HARDIRQ_64_H
#define __ASM_HARDIRQ_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_HARDIRQ_H */ #endif /* ASM_X86__HARDIRQ_64_H */
include/asm-x86/highmem.h
View file @ b8cd9d05
...@@ -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_HIGHMEM_H #ifndef ASM_X86__HIGHMEM_H
#define _ASM_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_HIGHMEM_H */ #endif /* ASM_X86__HIGHMEM_H */
include/asm-x86/hpet.h
View file @ b8cd9d05
#ifndef ASM_X86_HPET_H #ifndef ASM_X86__HPET_H
#define ASM_X86_HPET_H #define ASM_X86__HPET_H
#ifdef CONFIG_HPET_TIMER #ifdef CONFIG_HPET_TIMER
...@@ -90,4 +90,4 @@ static inline int is_hpet_enabled(void) { return 0; } ...@@ -90,4 +90,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 */
include/asm-x86/hugetlb.h
View file @ b8cd9d05
#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 */
include/asm-x86/hw_irq.h
View file @ b8cd9d05
#ifndef _ASM_HW_IRQ_H #ifndef ASM_X86__HW_IRQ_H
#define _ASM_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
...@@ -112,4 +112,4 @@ static inline void __setup_vector_irq(int cpu) {} ...@@ -112,4 +112,4 @@ static inline void __setup_vector_irq(int cpu) {}
#endif /* !ASSEMBLY_ */ #endif /* !ASSEMBLY_ */
#endif #endif /* ASM_X86__HW_IRQ_H */
include/asm-x86/hypertransport.h
View file @ b8cd9d05
#ifndef ASM_HYPERTRANSPORT_H #ifndef ASM_X86__HYPERTRANSPORT_H
#define ASM_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_HYPERTRANSPORT_H */ #endif /* ASM_X86__HYPERTRANSPORT_H */
include/asm-x86/i387.h
View file @ b8cd9d05
...@@ -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>
...@@ -336,4 +336,4 @@ static inline unsigned short get_fpu_mxcsr(struct task_struct *tsk) ...@@ -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 */
include/asm-x86/i8253.h
View file @ b8cd9d05
#ifndef __ASM_I8253_H__ #ifndef ASM_X86__I8253_H
#define __ASM_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_I8253_H__ */ #endif /* ASM_X86__I8253_H */
include/asm-x86/i8259.h
View file @ b8cd9d05
#ifndef __ASM_I8259_H__ #ifndef ASM_X86__I8259_H
#define __ASM_I8259_H__ #define ASM_X86__I8259_H
#include <linux/delay.h> #include <linux/delay.h>
...@@ -57,4 +57,4 @@ static inline void outb_pic(unsigned char value, unsigned int port) ...@@ -57,4 +57,4 @@ static inline void outb_pic(unsigned char value, unsigned int port)
extern struct irq_chip i8259A_chip; extern struct irq_chip i8259A_chip;
#endif /* __ASM_I8259_H__ */ #endif /* ASM_X86__I8259_H */
include/asm-x86/ia32.h
View file @ b8cd9d05
#ifndef _ASM_X86_64_IA32_H #ifndef ASM_X86__IA32_H
#define _ASM_X86_64_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 #endif /* ASM_X86__IA32_H */
include/asm-x86/ia32_unistd.h
View file @ b8cd9d05
#ifndef _ASM_X86_64_IA32_UNISTD_H_ #ifndef ASM_X86__IA32_UNISTD_H
#define _ASM_X86_64_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_64_IA32_UNISTD_H_ */ #endif /* ASM_X86__IA32_UNISTD_H */
include/asm-x86/idle.h
View file @ b8cd9d05
#ifndef _ASM_X86_64_IDLE_H #ifndef ASM_X86__IDLE_H
#define _ASM_X86_64_IDLE_H 1 #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 #endif /* ASM_X86__IDLE_H */
include/asm-x86/intel_arch_perfmon.h
View file @ b8cd9d05
#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 */
include/asm-x86/io.h
View file @ b8cd9d05
#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
...@@ -99,4 +99,4 @@ extern void early_iounmap(void *addr, unsigned long size); ...@@ -99,4 +99,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 */
include/asm-x86/io_32.h
View file @ b8cd9d05
#ifndef _ASM_IO_H #ifndef ASM_X86__IO_32_H
#define _ASM_IO_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 #endif /* ASM_X86__IO_32_H */
include/asm-x86/io_64.h
View file @ b8cd9d05
#ifndef _ASM_IO_H #ifndef ASM_X86__IO_64_H
#define _ASM_IO_H #define ASM_X86__IO_64_H
/* /*
...@@ -245,4 +245,4 @@ extern int iommu_bio_merge; ...@@ -245,4 +245,4 @@ extern int iommu_bio_merge;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif /* ASM_X86__IO_64_H */
include/asm-x86/io_apic.h
View file @ b8cd9d05
#ifndef __ASM_IO_APIC_H #ifndef ASM_X86__IO_APIC_H
#define __ASM_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>
...@@ -189,4 +189,4 @@ static const int timer_through_8259 = 0; ...@@ -189,4 +189,4 @@ static const int timer_through_8259 = 0;
static inline void ioapic_init_mappings(void) { } static inline void ioapic_init_mappings(void) { }
#endif #endif
#endif #endif /* ASM_X86__IO_APIC_H */
include/asm-x86/ioctls.h
View file @ b8cd9d05
#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>
...@@ -85,4 +85,4 @@ ...@@ -85,4 +85,4 @@
#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
#endif #endif /* ASM_X86__IOCTLS_H */
include/asm-x86/iommu.h
View file @ b8cd9d05
#ifndef _ASM_X8664_IOMMU_H #ifndef ASM_X86__IOMMU_H
#define _ASM_X8664_IOMMU_H 1 #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);
...@@ -42,4 +42,4 @@ static inline void gart_iommu_hole_init(void) ...@@ -42,4 +42,4 @@ static inline void gart_iommu_hole_init(void)
} }
#endif #endif
#endif #endif /* ASM_X86__IOMMU_H */
include/asm-x86/ipcbuf.h
View file @ b8cd9d05
#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 */
include/asm-x86/ipi.h
View file @ b8cd9d05
#ifndef __ASM_IPI_H #ifndef ASM_X86__IPI_H
#define __ASM_IPI_H #define ASM_X86__IPI_H
/* /*
* Copyright 2004 James Cleverdon, IBM. * Copyright 2004 James Cleverdon, IBM.
...@@ -129,4 +129,4 @@ static inline void send_IPI_mask_sequence(cpumask_t mask, int vector) ...@@ -129,4 +129,4 @@ static inline void send_IPI_mask_sequence(cpumask_t mask, int vector)
local_irq_restore(flags); local_irq_restore(flags);
} }
#endif /* __ASM_IPI_H */ #endif /* ASM_X86__IPI_H */
include/asm-x86/irq.h
View file @ b8cd9d05
#ifndef _ASM_IRQ_H #ifndef ASM_X86__IRQ_H
#define _ASM_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_IRQ_H */ #endif /* ASM_X86__IRQ_H */
include/asm-x86/irq_regs_32.h
View file @ b8cd9d05
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* *
* Jeremy Fitzhardinge <jeremy@goop.org> * Jeremy Fitzhardinge <jeremy@goop.org>
*/ */
#ifndef _ASM_I386_IRQ_REGS_H #ifndef ASM_X86__IRQ_REGS_32_H
#define _ASM_I386_IRQ_REGS_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_I386_IRQ_REGS_H */ #endif /* ASM_X86__IRQ_REGS_32_H */
include/asm-x86/irq_vectors.h
View file @ b8cd9d05
#ifndef _ASM_IRQ_VECTORS_H #ifndef ASM_X86__IRQ_VECTORS_H
#define _ASM_IRQ_VECTORS_H #define ASM_X86__IRQ_VECTORS_H
#include <linux/threads.h> #include <linux/threads.h>
...@@ -179,4 +179,4 @@ ...@@ -179,4 +179,4 @@
#define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8) #define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8)
#endif /* _ASM_IRQ_VECTORS_H */ #endif /* ASM_X86__IRQ_VECTORS_H */
include/asm-x86/ist.h
View file @ b8cd9d05
#ifndef _ASM_IST_H #ifndef ASM_X86__IST_H
#define _ASM_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_IST_H */ #endif /* ASM_X86__IST_H */
include/asm-x86/k8.h
View file @ b8cd9d05
#ifndef _ASM_K8_H #ifndef ASM_X86__K8_H
#define _ASM_K8_H 1 #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 #endif /* ASM_X86__K8_H */
include/asm-x86/kdebug.h
View file @ b8cd9d05
#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>
...@@ -35,4 +35,4 @@ extern void show_regs(struct pt_regs *regs); ...@@ -35,4 +35,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 #endif /* ASM_X86__KDEBUG_H */
include/asm-x86/kexec.h
View file @ b8cd9d05
#ifndef _KEXEC_H #ifndef ASM_X86__KEXEC_H
#define _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 /* _KEXEC_H */ #endif /* ASM_X86__KEXEC_H */
include/asm-x86/kgdb.h
View file @ b8cd9d05
#ifndef _ASM_KGDB_H_ #ifndef ASM_X86__KGDB_H
#define _ASM_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_KGDB_H_ */ #endif /* ASM_X86__KGDB_H */
include/asm-x86/kmap_types.h
View file @ b8cd9d05
#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 #endif /* ASM_X86__KMAP_TYPES_H */
include/asm-x86/kprobes.h
View file @ b8cd9d05
#ifndef _ASM_KPROBES_H #ifndef ASM_X86__KPROBES_H
#define _ASM_KPROBES_H #define ASM_X86__KPROBES_H
/* /*
* Kernel Probes (KProbes) * Kernel Probes (KProbes)
* *
...@@ -94,4 +94,4 @@ static inline void restore_interrupts(struct pt_regs *regs) ...@@ -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_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_KPROBES_H */ #endif /* ASM_X86__KPROBES_H */
include/asm-x86/kvm.h
View file @ b8cd9d05
#ifndef __LINUX_KVM_X86_H #ifndef ASM_X86__KVM_H
#define __LINUX_KVM_X86_H #define ASM_X86__KVM_H
/* /*
* KVM x86 specific structures and definitions * KVM x86 specific structures and definitions
...@@ -230,4 +230,4 @@ struct kvm_pit_state { ...@@ -230,4 +230,4 @@ struct kvm_pit_state {
#define KVM_TRC_APIC_ACCESS (KVM_TRC_HANDLER + 0x14) #define KVM_TRC_APIC_ACCESS (KVM_TRC_HANDLER + 0x14)
#define KVM_TRC_TDP_FAULT (KVM_TRC_HANDLER + 0x15) #define KVM_TRC_TDP_FAULT (KVM_TRC_HANDLER + 0x15)
#endif #endif /* ASM_X86__KVM_H */
include/asm-x86/kvm_host.h
View file @ b8cd9d05
#/* /*
* Kernel-based Virtual Machine driver for Linux * Kernel-based Virtual Machine driver for Linux
* *
* This header defines architecture specific interfaces, x86 version * This header defines architecture specific interfaces, x86 version
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* *
*/ */
#ifndef ASM_KVM_HOST_H #ifndef ASM_X86__KVM_HOST_H
#define ASM_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>
...@@ -735,4 +735,4 @@ asmlinkage void kvm_handle_fault_on_reboot(void); ...@@ -735,4 +735,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 #endif /* ASM_X86__KVM_HOST_H */
include/asm-x86/kvm_para.h
View file @ b8cd9d05
#ifndef __X86_KVM_PARA_H #ifndef ASM_X86__KVM_PARA_H
#define __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 #endif /* ASM_X86__KVM_PARA_H */
include/asm-x86/kvm_x86_emulate.h
View file @ b8cd9d05
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4 * From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4
*/ */
#ifndef __X86_EMULATE_H__ #ifndef ASM_X86__KVM_X86_EMULATE_H
#define __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 /* __X86_EMULATE_H__ */ #endif /* ASM_X86__KVM_X86_EMULATE_H */
include/asm-x86/ldt.h
View file @ b8cd9d05
...@@ -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 #endif /* ASM_X86__LDT_H */
include/asm-x86/lguest.h
View file @ b8cd9d05
#ifndef _X86_LGUEST_H #ifndef ASM_X86__LGUEST_H
#define _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 #endif /* ASM_X86__LGUEST_H */
include/asm-x86/lguest_hcall.h
View file @ b8cd9d05
/* Architecture specific portion of the lguest hypercalls */ /* Architecture specific portion of the lguest hypercalls */
#ifndef _X86_LGUEST_HCALL_H #ifndef ASM_X86__LGUEST_HCALL_H
#define _X86_LGUEST_HCALL_H #define ASM_X86__LGUEST_HCALL_H
#define LHCALL_FLUSH_ASYNC 0 #define LHCALL_FLUSH_ASYNC 0
#define LHCALL_LGUEST_INIT 1 #define LHCALL_LGUEST_INIT 1
...@@ -68,4 +68,4 @@ struct hcall_args { ...@@ -68,4 +68,4 @@ struct hcall_args {
}; };
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* _I386_LGUEST_HCALL_H */ #endif /* ASM_X86__LGUEST_HCALL_H */
include/asm-x86/linkage.h
View file @ b8cd9d05
#ifndef __ASM_LINKAGE_H #ifndef ASM_X86__LINKAGE_H
#define __ASM_LINKAGE_H #define ASM_X86__LINKAGE_H
#undef notrace #undef notrace
#define notrace __attribute__((no_instrument_function)) #define notrace __attribute__((no_instrument_function))
...@@ -57,5 +57,5 @@ ...@@ -57,5 +57,5 @@
#define __ALIGN_STR ".align 16,0x90" #define __ALIGN_STR ".align 16,0x90"
#endif #endif
#endif #endif /* ASM_X86__LINKAGE_H */
include/asm-x86/local.h
View file @ b8cd9d05
#ifndef _ARCH_LOCAL_H #ifndef ASM_X86__LOCAL_H
#define _ARCH_LOCAL_H #define ASM_X86__LOCAL_H
#include <linux/percpu.h> #include <linux/percpu.h>
...@@ -232,4 +232,4 @@ static inline long local_sub_return(long i, local_t *l) ...@@ -232,4 +232,4 @@ static inline long local_sub_return(long i, local_t *l)
#define __cpu_local_add(i, l) cpu_local_add((i), (l)) #define __cpu_local_add(i, l) cpu_local_add((i), (l))
#define __cpu_local_sub(i, l) cpu_local_sub((i), (l)) #define __cpu_local_sub(i, l) cpu_local_sub((i), (l))
#endif /* _ARCH_LOCAL_H */ #endif /* ASM_X86__LOCAL_H */
include/asm-x86/mach-bigsmp/mach_apic.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APIC_H #ifndef ASM_X86__MACH_BIGSMP__MACH_APIC_H
#define __ASM_MACH_APIC_H #define ASM_X86__MACH_BIGSMP__MACH_APIC_H
#define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu)) #define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu))
#define esr_disable (1) #define esr_disable (1)
...@@ -141,4 +141,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) ...@@ -141,4 +141,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }
#endif /* __ASM_MACH_APIC_H */ #endif /* ASM_X86__MACH_BIGSMP__MACH_APIC_H */
include/asm-x86/mach-bigsmp/mach_apicdef.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APICDEF_H #ifndef ASM_X86__MACH_BIGSMP__MACH_APICDEF_H
#define __ASM_MACH_APICDEF_H #define ASM_X86__MACH_BIGSMP__MACH_APICDEF_H
#define APIC_ID_MASK (0xFF<<24) #define APIC_ID_MASK (0xFF<<24)
...@@ -10,4 +10,4 @@ static inline unsigned get_apic_id(unsigned long x) ...@@ -10,4 +10,4 @@ static inline unsigned get_apic_id(unsigned long x)
#define GET_APIC_ID(x) get_apic_id(x) #define GET_APIC_ID(x) get_apic_id(x)
#endif #endif /* ASM_X86__MACH_BIGSMP__MACH_APICDEF_H */
include/asm-x86/mach-bigsmp/mach_ipi.h
View file @ b8cd9d05
#ifndef __ASM_MACH_IPI_H #ifndef ASM_X86__MACH_BIGSMP__MACH_IPI_H
#define __ASM_MACH_IPI_H #define ASM_X86__MACH_BIGSMP__MACH_IPI_H
void send_IPI_mask_sequence(cpumask_t mask, int vector); void send_IPI_mask_sequence(cpumask_t mask, int vector);
...@@ -22,4 +22,4 @@ static inline void send_IPI_all(int vector) ...@@ -22,4 +22,4 @@ static inline void send_IPI_all(int vector)
send_IPI_mask(cpu_online_map, vector); send_IPI_mask(cpu_online_map, vector);
} }
#endif /* __ASM_MACH_IPI_H */ #endif /* ASM_X86__MACH_BIGSMP__MACH_IPI_H */
include/asm-x86/mach-default/apm.h
View file @ b8cd9d05
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp> * Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp>
*/ */
#ifndef _ASM_APM_H #ifndef ASM_X86__MACH_DEFAULT__APM_H
#define _ASM_APM_H #define ASM_X86__MACH_DEFAULT__APM_H
#ifdef APM_ZERO_SEGS #ifdef APM_ZERO_SEGS
# define APM_DO_ZERO_SEGS \ # define APM_DO_ZERO_SEGS \
...@@ -70,4 +70,4 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in, ...@@ -70,4 +70,4 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
return error; return error;
} }
#endif /* _ASM_APM_H */ #endif /* ASM_X86__MACH_DEFAULT__APM_H */
include/asm-x86/mach-default/mach_apic.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APIC_H #ifndef ASM_X86__MACH_DEFAULT__MACH_APIC_H
#define __ASM_MACH_APIC_H #define ASM_X86__MACH_DEFAULT__MACH_APIC_H
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
...@@ -138,4 +138,4 @@ static inline void enable_apic_mode(void) ...@@ -138,4 +138,4 @@ static inline void enable_apic_mode(void)
} }
#endif /* CONFIG_X86_LOCAL_APIC */ #endif /* CONFIG_X86_LOCAL_APIC */
#endif /* __ASM_MACH_APIC_H */ #endif /* ASM_X86__MACH_DEFAULT__MACH_APIC_H */
include/asm-x86/mach-default/mach_apicdef.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APICDEF_H #ifndef ASM_X86__MACH_DEFAULT__MACH_APICDEF_H
#define __ASM_MACH_APICDEF_H #define ASM_X86__MACH_DEFAULT__MACH_APICDEF_H
#include <asm/apic.h> #include <asm/apic.h>
...@@ -21,4 +21,4 @@ static inline unsigned get_apic_id(unsigned long x) ...@@ -21,4 +21,4 @@ static inline unsigned get_apic_id(unsigned long x)
#define GET_APIC_ID(x) get_apic_id(x) #define GET_APIC_ID(x) get_apic_id(x)
#endif #endif
#endif #endif /* ASM_X86__MACH_DEFAULT__MACH_APICDEF_H */
include/asm-x86/mach-default/mach_ipi.h
View file @ b8cd9d05
#ifndef __ASM_MACH_IPI_H #ifndef ASM_X86__MACH_DEFAULT__MACH_IPI_H
#define __ASM_MACH_IPI_H #define ASM_X86__MACH_DEFAULT__MACH_IPI_H
/* Avoid include hell */ /* Avoid include hell */
#define NMI_VECTOR 0x02 #define NMI_VECTOR 0x02
...@@ -61,4 +61,4 @@ static inline void send_IPI_all(int vector) ...@@ -61,4 +61,4 @@ static inline void send_IPI_all(int vector)
} }
#endif #endif
#endif /* __ASM_MACH_IPI_H */ #endif /* ASM_X86__MACH_DEFAULT__MACH_IPI_H */
include/asm-x86/mach-default/mach_mpparse.h
View file @ b8cd9d05
#ifndef __ASM_MACH_MPPARSE_H #ifndef ASM_X86__MACH_DEFAULT__MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H #define ASM_X86__MACH_DEFAULT__MACH_MPPARSE_H
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid) char *productid)
...@@ -14,4 +14,4 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) ...@@ -14,4 +14,4 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
} }
#endif /* __ASM_MACH_MPPARSE_H */ #endif /* ASM_X86__MACH_DEFAULT__MACH_MPPARSE_H */
include/asm-x86/mach-default/mach_mpspec.h
View file @ b8cd9d05
#ifndef __ASM_MACH_MPSPEC_H #ifndef ASM_X86__MACH_DEFAULT__MACH_MPSPEC_H
#define __ASM_MACH_MPSPEC_H #define ASM_X86__MACH_DEFAULT__MACH_MPSPEC_H
#define MAX_IRQ_SOURCES 256 #define MAX_IRQ_SOURCES 256
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
#define MAX_MP_BUSSES 32 #define MAX_MP_BUSSES 32
#endif #endif
#endif /* __ASM_MACH_MPSPEC_H */ #endif /* ASM_X86__MACH_DEFAULT__MACH_MPSPEC_H */
include/asm-x86/mach-default/mach_timer.h
View file @ b8cd9d05
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
* directly because of the awkward 8-bit access mechanism of the 82C54 * directly because of the awkward 8-bit access mechanism of the 82C54
* device. * device.
*/ */
#ifndef _MACH_TIMER_H #ifndef ASM_X86__MACH_DEFAULT__MACH_TIMER_H
#define _MACH_TIMER_H #define ASM_X86__MACH_DEFAULT__MACH_TIMER_H
#define CALIBRATE_TIME_MSEC 30 /* 30 msecs */ #define CALIBRATE_TIME_MSEC 30 /* 30 msecs */
#define CALIBRATE_LATCH \ #define CALIBRATE_LATCH \
...@@ -45,4 +45,4 @@ static inline void mach_countup(unsigned long *count_p) ...@@ -45,4 +45,4 @@ static inline void mach_countup(unsigned long *count_p)
*count_p = count; *count_p = count;
} }
#endif /* !_MACH_TIMER_H */ #endif /* ASM_X86__MACH_DEFAULT__MACH_TIMER_H */
include/asm-x86/mach-default/mach_traps.h
View file @ b8cd9d05
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Machine specific NMI handling for generic. * Machine specific NMI handling for generic.
* Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp> * Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp>
*/ */
#ifndef _MACH_TRAPS_H #ifndef ASM_X86__MACH_DEFAULT__MACH_TRAPS_H
#define _MACH_TRAPS_H #define ASM_X86__MACH_DEFAULT__MACH_TRAPS_H
#include <asm/mc146818rtc.h> #include <asm/mc146818rtc.h>
...@@ -36,4 +36,4 @@ static inline void reassert_nmi(void) ...@@ -36,4 +36,4 @@ static inline void reassert_nmi(void)
unlock_cmos(); unlock_cmos();
} }
#endif /* !_MACH_TRAPS_H */ #endif /* ASM_X86__MACH_DEFAULT__MACH_TRAPS_H */
include/asm-x86/mach-default/mach_wakecpu.h
View file @ b8cd9d05
#ifndef __ASM_MACH_WAKECPU_H #ifndef ASM_X86__MACH_DEFAULT__MACH_WAKECPU_H
#define __ASM_MACH_WAKECPU_H #define ASM_X86__MACH_DEFAULT__MACH_WAKECPU_H
/* /*
* This file copes with machines that wakeup secondary CPUs by the * This file copes with machines that wakeup secondary CPUs by the
...@@ -39,4 +39,4 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) ...@@ -39,4 +39,4 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
#define inquire_remote_apic(apicid) {} #define inquire_remote_apic(apicid) {}
#endif #endif
#endif /* __ASM_MACH_WAKECPU_H */ #endif /* ASM_X86__MACH_DEFAULT__MACH_WAKECPU_H */
include/asm-x86/mach-es7000/mach_apic.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APIC_H #ifndef ASM_X86__MACH_ES7000__MACH_APIC_H
#define __ASM_MACH_APIC_H #define ASM_X86__MACH_ES7000__MACH_APIC_H
#define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu) #define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu)
#define esr_disable (1) #define esr_disable (1)
...@@ -191,4 +191,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) ...@@ -191,4 +191,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }
#endif /* __ASM_MACH_APIC_H */ #endif /* ASM_X86__MACH_ES7000__MACH_APIC_H */
include/asm-x86/mach-es7000/mach_apicdef.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APICDEF_H #ifndef ASM_X86__MACH_ES7000__MACH_APICDEF_H
#define __ASM_MACH_APICDEF_H #define ASM_X86__MACH_ES7000__MACH_APICDEF_H
#define APIC_ID_MASK (0xFF<<24) #define APIC_ID_MASK (0xFF<<24)
...@@ -10,4 +10,4 @@ static inline unsigned get_apic_id(unsigned long x) ...@@ -10,4 +10,4 @@ static inline unsigned get_apic_id(unsigned long x)
#define GET_APIC_ID(x) get_apic_id(x) #define GET_APIC_ID(x) get_apic_id(x)
#endif #endif /* ASM_X86__MACH_ES7000__MACH_APICDEF_H */
include/asm-x86/mach-es7000/mach_ipi.h
View file @ b8cd9d05
#ifndef __ASM_MACH_IPI_H #ifndef ASM_X86__MACH_ES7000__MACH_IPI_H
#define __ASM_MACH_IPI_H #define ASM_X86__MACH_ES7000__MACH_IPI_H
void send_IPI_mask_sequence(cpumask_t mask, int vector); void send_IPI_mask_sequence(cpumask_t mask, int vector);
...@@ -21,4 +21,4 @@ static inline void send_IPI_all(int vector) ...@@ -21,4 +21,4 @@ static inline void send_IPI_all(int vector)
send_IPI_mask(cpu_online_map, vector); send_IPI_mask(cpu_online_map, vector);
} }
#endif /* __ASM_MACH_IPI_H */ #endif /* ASM_X86__MACH_ES7000__MACH_IPI_H */
include/asm-x86/mach-es7000/mach_mpparse.h
View file @ b8cd9d05
#ifndef __ASM_MACH_MPPARSE_H #ifndef ASM_X86__MACH_ES7000__MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H #define ASM_X86__MACH_ES7000__MACH_MPPARSE_H
#include <linux/acpi.h> #include <linux/acpi.h>
...@@ -26,4 +26,4 @@ static inline int es7000_check_dsdt(void) ...@@ -26,4 +26,4 @@ static inline int es7000_check_dsdt(void)
} }
#endif #endif
#endif /* __ASM_MACH_MPPARSE_H */ #endif /* ASM_X86__MACH_ES7000__MACH_MPPARSE_H */
include/asm-x86/mach-es7000/mach_wakecpu.h
View file @ b8cd9d05
#ifndef __ASM_MACH_WAKECPU_H #ifndef ASM_X86__MACH_ES7000__MACH_WAKECPU_H
#define __ASM_MACH_WAKECPU_H #define ASM_X86__MACH_ES7000__MACH_WAKECPU_H
/* /*
* This file copes with machines that wakeup secondary CPUs by the * This file copes with machines that wakeup secondary CPUs by the
...@@ -56,4 +56,4 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) ...@@ -56,4 +56,4 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
#define inquire_remote_apic(apicid) {} #define inquire_remote_apic(apicid) {}
#endif #endif
#endif /* __ASM_MACH_WAKECPU_H */ #endif /* ASM_X86__MACH_ES7000__MACH_WAKECPU_H */
include/asm-x86/mach-generic/gpio.h
View file @ b8cd9d05
#ifndef __ASM_MACH_GENERIC_GPIO_H #ifndef ASM_X86__MACH_GENERIC__GPIO_H
#define __ASM_MACH_GENERIC_GPIO_H #define ASM_X86__MACH_GENERIC__GPIO_H
int gpio_request(unsigned gpio, const char *label); int gpio_request(unsigned gpio, const char *label);
void gpio_free(unsigned gpio); void gpio_free(unsigned gpio);
...@@ -12,4 +12,4 @@ int irq_to_gpio(unsigned irq); ...@@ -12,4 +12,4 @@ int irq_to_gpio(unsigned irq);
#include <asm-generic/gpio.h> /* cansleep wrappers */ #include <asm-generic/gpio.h> /* cansleep wrappers */
#endif /* __ASM_MACH_GENERIC_GPIO_H */ #endif /* ASM_X86__MACH_GENERIC__GPIO_H */
include/asm-x86/mach-generic/irq_vectors_limits.h
View file @ b8cd9d05
#ifndef _ASM_IRQ_VECTORS_LIMITS_H #ifndef ASM_X86__MACH_GENERIC__IRQ_VECTORS_LIMITS_H
#define _ASM_IRQ_VECTORS_LIMITS_H #define ASM_X86__MACH_GENERIC__IRQ_VECTORS_LIMITS_H
/* /*
* For Summit or generic (i.e. installer) kernels, we have lots of I/O APICs, * For Summit or generic (i.e. installer) kernels, we have lots of I/O APICs,
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
#define NR_IRQS 224 #define NR_IRQS 224
#define NR_IRQ_VECTORS 1024 #define NR_IRQ_VECTORS 1024
#endif /* _ASM_IRQ_VECTORS_LIMITS_H */ #endif /* ASM_X86__MACH_GENERIC__IRQ_VECTORS_LIMITS_H */
include/asm-x86/mach-generic/mach_apic.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APIC_H #ifndef ASM_X86__MACH_GENERIC__MACH_APIC_H
#define __ASM_MACH_APIC_H #define ASM_X86__MACH_GENERIC__MACH_APIC_H
#include <asm/genapic.h> #include <asm/genapic.h>
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
extern void generic_bigsmp_probe(void); extern void generic_bigsmp_probe(void);
#endif /* __ASM_MACH_APIC_H */ #endif /* ASM_X86__MACH_GENERIC__MACH_APIC_H */
include/asm-x86/mach-generic/mach_apicdef.h
View file @ b8cd9d05
#ifndef _GENAPIC_MACH_APICDEF_H #ifndef ASM_X86__MACH_GENERIC__MACH_APICDEF_H
#define _GENAPIC_MACH_APICDEF_H 1 #define ASM_X86__MACH_GENERIC__MACH_APICDEF_H
#ifndef APIC_DEFINITION #ifndef APIC_DEFINITION
#include <asm/genapic.h> #include <asm/genapic.h>
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
#define APIC_ID_MASK (genapic->apic_id_mask) #define APIC_ID_MASK (genapic->apic_id_mask)
#endif #endif
#endif #endif /* ASM_X86__MACH_GENERIC__MACH_APICDEF_H */
include/asm-x86/mach-generic/mach_ipi.h
View file @ b8cd9d05
#ifndef _MACH_IPI_H #ifndef ASM_X86__MACH_GENERIC__MACH_IPI_H
#define _MACH_IPI_H 1 #define ASM_X86__MACH_GENERIC__MACH_IPI_H
#include <asm/genapic.h> #include <asm/genapic.h>
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
#define send_IPI_allbutself (genapic->send_IPI_allbutself) #define send_IPI_allbutself (genapic->send_IPI_allbutself)
#define send_IPI_all (genapic->send_IPI_all) #define send_IPI_all (genapic->send_IPI_all)
#endif #endif /* ASM_X86__MACH_GENERIC__MACH_IPI_H */
include/asm-x86/mach-generic/mach_mpparse.h
View file @ b8cd9d05
#ifndef _MACH_MPPARSE_H #ifndef ASM_X86__MACH_GENERIC__MACH_MPPARSE_H
#define _MACH_MPPARSE_H 1 #define ASM_X86__MACH_GENERIC__MACH_MPPARSE_H
extern int mps_oem_check(struct mp_config_table *mpc, char *oem, extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
...@@ -7,4 +7,4 @@ extern int mps_oem_check(struct mp_config_table *mpc, char *oem, ...@@ -7,4 +7,4 @@ extern int mps_oem_check(struct mp_config_table *mpc, char *oem,
extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id); extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
#endif #endif /* ASM_X86__MACH_GENERIC__MACH_MPPARSE_H */
include/asm-x86/mach-generic/mach_mpspec.h
View file @ b8cd9d05
#ifndef __ASM_MACH_MPSPEC_H #ifndef ASM_X86__MACH_GENERIC__MACH_MPSPEC_H
#define __ASM_MACH_MPSPEC_H #define ASM_X86__MACH_GENERIC__MACH_MPSPEC_H
#define MAX_IRQ_SOURCES 256 #define MAX_IRQ_SOURCES 256
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid); char *productid);
#endif /* __ASM_MACH_MPSPEC_H */ #endif /* ASM_X86__MACH_GENERIC__MACH_MPSPEC_H */
include/asm-x86/mach-numaq/mach_apic.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APIC_H #ifndef ASM_X86__MACH_NUMAQ__MACH_APIC_H
#define __ASM_MACH_APIC_H #define ASM_X86__MACH_NUMAQ__MACH_APIC_H
#include <asm/io.h> #include <asm/io.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
...@@ -135,4 +135,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) ...@@ -135,4 +135,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }
#endif /* __ASM_MACH_APIC_H */ #endif /* ASM_X86__MACH_NUMAQ__MACH_APIC_H */
include/asm-x86/mach-numaq/mach_apicdef.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APICDEF_H #ifndef ASM_X86__MACH_NUMAQ__MACH_APICDEF_H
#define __ASM_MACH_APICDEF_H #define ASM_X86__MACH_NUMAQ__MACH_APICDEF_H
#define APIC_ID_MASK (0xF<<24) #define APIC_ID_MASK (0xF<<24)
...@@ -11,4 +11,4 @@ static inline unsigned get_apic_id(unsigned long x) ...@@ -11,4 +11,4 @@ static inline unsigned get_apic_id(unsigned long x)
#define GET_APIC_ID(x) get_apic_id(x) #define GET_APIC_ID(x) get_apic_id(x)
#endif #endif /* ASM_X86__MACH_NUMAQ__MACH_APICDEF_H */
include/asm-x86/mach-numaq/mach_ipi.h
View file @ b8cd9d05
#ifndef __ASM_MACH_IPI_H #ifndef ASM_X86__MACH_NUMAQ__MACH_IPI_H
#define __ASM_MACH_IPI_H #define ASM_X86__MACH_NUMAQ__MACH_IPI_H
void send_IPI_mask_sequence(cpumask_t, int vector); void send_IPI_mask_sequence(cpumask_t, int vector);
...@@ -22,4 +22,4 @@ static inline void send_IPI_all(int vector) ...@@ -22,4 +22,4 @@ static inline void send_IPI_all(int vector)
send_IPI_mask(cpu_online_map, vector); send_IPI_mask(cpu_online_map, vector);
} }
#endif /* __ASM_MACH_IPI_H */ #endif /* ASM_X86__MACH_NUMAQ__MACH_IPI_H */
include/asm-x86/mach-numaq/mach_mpparse.h
View file @ b8cd9d05
#ifndef __ASM_MACH_MPPARSE_H #ifndef ASM_X86__MACH_NUMAQ__MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H #define ASM_X86__MACH_NUMAQ__MACH_MPPARSE_H
extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid); char *productid);
#endif /* __ASM_MACH_MPPARSE_H */ #endif /* ASM_X86__MACH_NUMAQ__MACH_MPPARSE_H */
include/asm-x86/mach-numaq/mach_wakecpu.h
View file @ b8cd9d05
#ifndef __ASM_MACH_WAKECPU_H #ifndef ASM_X86__MACH_NUMAQ__MACH_WAKECPU_H
#define __ASM_MACH_WAKECPU_H #define ASM_X86__MACH_NUMAQ__MACH_WAKECPU_H
/* This file copes with machines that wakeup secondary CPUs by NMIs */ /* This file copes with machines that wakeup secondary CPUs by NMIs */
...@@ -40,4 +40,4 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) ...@@ -40,4 +40,4 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
#define inquire_remote_apic(apicid) {} #define inquire_remote_apic(apicid) {}
#endif /* __ASM_MACH_WAKECPU_H */ #endif /* ASM_X86__MACH_NUMAQ__MACH_WAKECPU_H */
include/asm-x86/mach-rdc321x/gpio.h
View file @ b8cd9d05
#ifndef _RDC321X_GPIO_H #ifndef ASM_X86__MACH_RDC321X__GPIO_H
#define _RDC321X_GPIO_H #define ASM_X86__MACH_RDC321X__GPIO_H
extern int rdc_gpio_get_value(unsigned gpio); extern int rdc_gpio_get_value(unsigned gpio);
extern void rdc_gpio_set_value(unsigned gpio, int value); extern void rdc_gpio_set_value(unsigned gpio, int value);
...@@ -54,4 +54,4 @@ static inline int irq_to_gpio(unsigned irq) ...@@ -54,4 +54,4 @@ static inline int irq_to_gpio(unsigned irq)
/* For cansleep */ /* For cansleep */
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
#endif /* _RDC321X_GPIO_H_ */ #endif /* ASM_X86__MACH_RDC321X__GPIO_H */
include/asm-x86/mach-summit/irq_vectors_limits.h
View file @ b8cd9d05
#ifndef _ASM_IRQ_VECTORS_LIMITS_H #ifndef ASM_X86__MACH_SUMMIT__IRQ_VECTORS_LIMITS_H
#define _ASM_IRQ_VECTORS_LIMITS_H #define ASM_X86__MACH_SUMMIT__IRQ_VECTORS_LIMITS_H
/* /*
* For Summit or generic (i.e. installer) kernels, we have lots of I/O APICs, * For Summit or generic (i.e. installer) kernels, we have lots of I/O APICs,
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
#define NR_IRQS 224 #define NR_IRQS 224
#define NR_IRQ_VECTORS 1024 #define NR_IRQ_VECTORS 1024
#endif /* _ASM_IRQ_VECTORS_LIMITS_H */ #endif /* ASM_X86__MACH_SUMMIT__IRQ_VECTORS_LIMITS_H */
include/asm-x86/mach-summit/mach_apic.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APIC_H #ifndef ASM_X86__MACH_SUMMIT__MACH_APIC_H
#define __ASM_MACH_APIC_H #define ASM_X86__MACH_SUMMIT__MACH_APIC_H
#include <asm/smp.h> #include <asm/smp.h>
...@@ -182,4 +182,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) ...@@ -182,4 +182,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
return hard_smp_processor_id() >> index_msb; return hard_smp_processor_id() >> index_msb;
} }
#endif /* __ASM_MACH_APIC_H */ #endif /* ASM_X86__MACH_SUMMIT__MACH_APIC_H */
include/asm-x86/mach-summit/mach_apicdef.h
View file @ b8cd9d05
#ifndef __ASM_MACH_APICDEF_H #ifndef ASM_X86__MACH_SUMMIT__MACH_APICDEF_H
#define __ASM_MACH_APICDEF_H #define ASM_X86__MACH_SUMMIT__MACH_APICDEF_H
#define APIC_ID_MASK (0xFF<<24) #define APIC_ID_MASK (0xFF<<24)
...@@ -10,4 +10,4 @@ static inline unsigned get_apic_id(unsigned long x) ...@@ -10,4 +10,4 @@ static inline unsigned get_apic_id(unsigned long x)
#define GET_APIC_ID(x) get_apic_id(x) #define GET_APIC_ID(x) get_apic_id(x)
#endif #endif /* ASM_X86__MACH_SUMMIT__MACH_APICDEF_H */
include/asm-x86/mach-summit/mach_ipi.h
View file @ b8cd9d05
#ifndef __ASM_MACH_IPI_H #ifndef ASM_X86__MACH_SUMMIT__MACH_IPI_H
#define __ASM_MACH_IPI_H #define ASM_X86__MACH_SUMMIT__MACH_IPI_H
void send_IPI_mask_sequence(cpumask_t mask, int vector); void send_IPI_mask_sequence(cpumask_t mask, int vector);
...@@ -22,4 +22,4 @@ static inline void send_IPI_all(int vector) ...@@ -22,4 +22,4 @@ static inline void send_IPI_all(int vector)
send_IPI_mask(cpu_online_map, vector); send_IPI_mask(cpu_online_map, vector);
} }
#endif /* __ASM_MACH_IPI_H */ #endif /* ASM_X86__MACH_SUMMIT__MACH_IPI_H */
include/asm-x86/mach-summit/mach_mpparse.h
View file @ b8cd9d05
#ifndef __ASM_MACH_MPPARSE_H #ifndef ASM_X86__MACH_SUMMIT__MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H #define ASM_X86__MACH_SUMMIT__MACH_MPPARSE_H
#include <mach_apic.h> #include <mach_apic.h>
#include <asm/tsc.h> #include <asm/tsc.h>
...@@ -107,4 +107,4 @@ static inline int is_WPEG(struct rio_detail *rio){ ...@@ -107,4 +107,4 @@ static inline int is_WPEG(struct rio_detail *rio){
rio->type == LookOutAWPEG || rio->type == LookOutBWPEG); rio->type == LookOutAWPEG || rio->type == LookOutBWPEG);
} }
#endif /* __ASM_MACH_MPPARSE_H */ #endif /* ASM_X86__MACH_SUMMIT__MACH_MPPARSE_H */
include/asm-x86/math_emu.h
View file @ b8cd9d05
#ifndef _I386_MATH_EMU_H #ifndef ASM_X86__MATH_EMU_H
#define _I386_MATH_EMU_H #define ASM_X86__MATH_EMU_H
/* This structure matches the layout of the data saved to the stack /* This structure matches the layout of the data saved to the stack
following a device-not-present interrupt, part of it saved following a device-not-present interrupt, part of it saved
...@@ -28,4 +28,4 @@ struct info { ...@@ -28,4 +28,4 @@ struct info {
long ___vm86_fs; long ___vm86_fs;
long ___vm86_gs; long ___vm86_gs;
}; };
#endif #endif /* ASM_X86__MATH_EMU_H */
include/asm-x86/mc146818rtc.h
View file @ b8cd9d05
/* /*
* Machine dependent access functions for RTC registers. * Machine dependent access functions for RTC registers.
*/ */
#ifndef _ASM_MC146818RTC_H #ifndef ASM_X86__MC146818RTC_H
#define _ASM_MC146818RTC_H #define ASM_X86__MC146818RTC_H
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
...@@ -101,4 +101,4 @@ extern unsigned long mach_get_cmos_time(void); ...@@ -101,4 +101,4 @@ extern unsigned long mach_get_cmos_time(void);
#define RTC_IRQ 8 #define RTC_IRQ 8
#endif /* _ASM_MC146818RTC_H */ #endif /* ASM_X86__MC146818RTC_H */
include/asm-x86/mca.h
View file @ b8cd9d05
/* -*- mode: c; c-basic-offset: 8 -*- */ /* -*- mode: c; c-basic-offset: 8 -*- */
/* Platform specific MCA defines */ /* Platform specific MCA defines */
#ifndef _ASM_MCA_H #ifndef ASM_X86__MCA_H
#define _ASM_MCA_H #define ASM_X86__MCA_H
/* Maximal number of MCA slots - actually, some machines have less, but /* Maximal number of MCA slots - actually, some machines have less, but
* they all have sufficient number of POS registers to cover 8. * they all have sufficient number of POS registers to cover 8.
...@@ -40,4 +40,4 @@ ...@@ -40,4 +40,4 @@
*/ */
#define MCA_NUMADAPTERS (MCA_MAX_SLOT_NR+3) #define MCA_NUMADAPTERS (MCA_MAX_SLOT_NR+3)
#endif #endif /* ASM_X86__MCA_H */
include/asm-x86/mca_dma.h
View file @ b8cd9d05
#ifndef MCA_DMA_H #ifndef ASM_X86__MCA_DMA_H
#define MCA_DMA_H #define ASM_X86__MCA_DMA_H
#include <asm/io.h> #include <asm/io.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -198,4 +198,4 @@ static inline void mca_set_dma_mode(unsigned int dmanr, unsigned int mode) ...@@ -198,4 +198,4 @@ static inline void mca_set_dma_mode(unsigned int dmanr, unsigned int mode)
outb(mode, MCA_DMA_REG_EXE); outb(mode, MCA_DMA_REG_EXE);
} }
#endif /* MCA_DMA_H */ #endif /* ASM_X86__MCA_DMA_H */
include/asm-x86/mce.h
View file @ b8cd9d05
#ifndef _ASM_X86_MCE_H #ifndef ASM_X86__MCE_H
#define _ASM_X86_MCE_H #define ASM_X86__MCE_H
#ifdef __x86_64__ #ifdef __x86_64__
...@@ -127,4 +127,4 @@ extern void restart_mce(void); ...@@ -127,4 +127,4 @@ extern void restart_mce(void);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif /* ASM_X86__MCE_H */
include/asm-x86/mman.h
View file @ b8cd9d05
#ifndef _ASM_X86_MMAN_H #ifndef ASM_X86__MMAN_H
#define _ASM_X86_MMAN_H #define ASM_X86__MMAN_H
#include <asm-generic/mman.h> #include <asm-generic/mman.h>
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
#define MCL_CURRENT 1 /* lock all current mappings */ #define MCL_CURRENT 1 /* lock all current mappings */
#define MCL_FUTURE 2 /* lock all future mappings */ #define MCL_FUTURE 2 /* lock all future mappings */
#endif /* _ASM_X86_MMAN_H */ #endif /* ASM_X86__MMAN_H */
include/asm-x86/mmconfig.h
View file @ b8cd9d05
#ifndef _ASM_MMCONFIG_H #ifndef ASM_X86__MMCONFIG_H
#define _ASM_MMCONFIG_H #define ASM_X86__MMCONFIG_H
#ifdef CONFIG_PCI_MMCONFIG #ifdef CONFIG_PCI_MMCONFIG
extern void __cpuinit fam10h_check_enable_mmcfg(void); extern void __cpuinit fam10h_check_enable_mmcfg(void);
...@@ -9,4 +9,4 @@ static inline void fam10h_check_enable_mmcfg(void) { } ...@@ -9,4 +9,4 @@ static inline void fam10h_check_enable_mmcfg(void) { }
static inline void check_enable_amd_mmconf_dmi(void) { } static inline void check_enable_amd_mmconf_dmi(void) { }
#endif #endif
#endif #endif /* ASM_X86__MMCONFIG_H */
include/asm-x86/mmu.h
View file @ b8cd9d05
#ifndef _ASM_X86_MMU_H #ifndef ASM_X86__MMU_H
#define _ASM_X86_MMU_H #define ASM_X86__MMU_H
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/mutex.h> #include <linux/mutex.h>
...@@ -28,4 +28,4 @@ static inline void leave_mm(int cpu) ...@@ -28,4 +28,4 @@ static inline void leave_mm(int cpu)
} }
#endif #endif
#endif /* _ASM_X86_MMU_H */ #endif /* ASM_X86__MMU_H */
include/asm-x86/mmu_context.h
View file @ b8cd9d05
#ifndef __ASM_X86_MMU_CONTEXT_H #ifndef ASM_X86__MMU_CONTEXT_H
#define __ASM_X86_MMU_CONTEXT_H #define ASM_X86__MMU_CONTEXT_H
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/atomic.h> #include <asm/atomic.h>
...@@ -34,4 +34,4 @@ do { \ ...@@ -34,4 +34,4 @@ do { \
} while (0); } while (0);
#endif /* __ASM_X86_MMU_CONTEXT_H */ #endif /* ASM_X86__MMU_CONTEXT_H */
include/asm-x86/mmu_context_32.h
View file @ b8cd9d05
#ifndef __I386_SCHED_H #ifndef ASM_X86__MMU_CONTEXT_32_H
#define __I386_SCHED_H #define ASM_X86__MMU_CONTEXT_32_H
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{ {
...@@ -53,4 +53,4 @@ static inline void switch_mm(struct mm_struct *prev, ...@@ -53,4 +53,4 @@ static inline void switch_mm(struct mm_struct *prev,
#define deactivate_mm(tsk, mm) \ #define deactivate_mm(tsk, mm) \
asm("movl %0,%%gs": :"r" (0)); asm("movl %0,%%gs": :"r" (0));
#endif #endif /* ASM_X86__MMU_CONTEXT_32_H */
include/asm-x86/mmu_context_64.h
View file @ b8cd9d05
#ifndef __X86_64_MMU_CONTEXT_H #ifndef ASM_X86__MMU_CONTEXT_64_H
#define __X86_64_MMU_CONTEXT_H #define ASM_X86__MMU_CONTEXT_64_H
#include <asm/pda.h> #include <asm/pda.h>
...@@ -51,4 +51,4 @@ do { \ ...@@ -51,4 +51,4 @@ do { \
asm volatile("movl %0,%%fs"::"r"(0)); \ asm volatile("movl %0,%%fs"::"r"(0)); \
} while (0) } while (0)
#endif #endif /* ASM_X86__MMU_CONTEXT_64_H */
include/asm-x86/mmx.h
View file @ b8cd9d05
#ifndef _ASM_MMX_H #ifndef ASM_X86__MMX_H
#define _ASM_MMX_H #define ASM_X86__MMX_H
/* /*
* MMX 3Dnow! helper operations * MMX 3Dnow! helper operations
...@@ -11,4 +11,4 @@ extern void *_mmx_memcpy(void *to, const void *from, size_t size); ...@@ -11,4 +11,4 @@ extern void *_mmx_memcpy(void *to, const void *from, size_t size);
extern void mmx_clear_page(void *page); extern void mmx_clear_page(void *page);
extern void mmx_copy_page(void *to, void *from); extern void mmx_copy_page(void *to, void *from);
#endif #endif /* ASM_X86__MMX_H */
include/asm-x86/mmzone_32.h
View file @ b8cd9d05
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* *
*/ */
#ifndef _ASM_MMZONE_H_ #ifndef ASM_X86__MMZONE_32_H
#define _ASM_MMZONE_H_ #define ASM_X86__MMZONE_32_H
#include <asm/smp.h> #include <asm/smp.h>
...@@ -131,4 +131,4 @@ static inline int pfn_valid(int pfn) ...@@ -131,4 +131,4 @@ static inline int pfn_valid(int pfn)
}) })
#endif /* CONFIG_NEED_MULTIPLE_NODES */ #endif /* CONFIG_NEED_MULTIPLE_NODES */
#endif /* _ASM_MMZONE_H_ */ #endif /* ASM_X86__MMZONE_32_H */
include/asm-x86/mmzone_64.h
View file @ b8cd9d05
/* K8 NUMA support */ /* K8 NUMA support */
/* Copyright 2002,2003 by Andi Kleen, SuSE Labs */ /* Copyright 2002,2003 by Andi Kleen, SuSE Labs */
/* 2.5 Version loosely based on the NUMAQ Code by Pat Gaughen. */ /* 2.5 Version loosely based on the NUMAQ Code by Pat Gaughen. */
#ifndef _ASM_X86_64_MMZONE_H #ifndef ASM_X86__MMZONE_64_H
#define _ASM_X86_64_MMZONE_H 1 #define ASM_X86__MMZONE_64_H
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
...@@ -49,4 +49,4 @@ extern int early_pfn_to_nid(unsigned long pfn); ...@@ -49,4 +49,4 @@ extern int early_pfn_to_nid(unsigned long pfn);
#endif #endif
#endif #endif
#endif #endif /* ASM_X86__MMZONE_64_H */
include/asm-x86/module.h
View file @ b8cd9d05
#ifndef _ASM_MODULE_H #ifndef ASM_X86__MODULE_H
#define _ASM_MODULE_H #define ASM_X86__MODULE_H
/* x86_32/64 are simple */ /* x86_32/64 are simple */
struct mod_arch_specific {}; struct mod_arch_specific {};
...@@ -79,4 +79,4 @@ struct mod_arch_specific {}; ...@@ -79,4 +79,4 @@ struct mod_arch_specific {};
# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
#endif #endif
#endif /* _ASM_MODULE_H */ #endif /* ASM_X86__MODULE_H */
include/asm-x86/mpspec.h
View file @ b8cd9d05
#ifndef _AM_X86_MPSPEC_H #ifndef ASM_X86__MPSPEC_H
#define _AM_X86_MPSPEC_H #define ASM_X86__MPSPEC_H
#include <linux/init.h> #include <linux/init.h>
...@@ -141,4 +141,4 @@ static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map) ...@@ -141,4 +141,4 @@ static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map)
extern physid_mask_t phys_cpu_present_map; extern physid_mask_t phys_cpu_present_map;
#endif #endif /* ASM_X86__MPSPEC_H */
include/asm-x86/mpspec_def.h
View file @ b8cd9d05
#ifndef __ASM_MPSPEC_DEF_H #ifndef ASM_X86__MPSPEC_DEF_H
#define __ASM_MPSPEC_DEF_H #define ASM_X86__MPSPEC_DEF_H
/* /*
* Structure definitions for SMP machines following the * Structure definitions for SMP machines following the
...@@ -177,4 +177,4 @@ enum mp_bustype { ...@@ -177,4 +177,4 @@ enum mp_bustype {
MP_BUS_PCI, MP_BUS_PCI,
MP_BUS_MCA, MP_BUS_MCA,
}; };
#endif #endif /* ASM_X86__MPSPEC_DEF_H */
include/asm-x86/msgbuf.h
View file @ b8cd9d05
#ifndef _ASM_X86_MSGBUF_H #ifndef ASM_X86__MSGBUF_H
#define _ASM_X86_MSGBUF_H #define ASM_X86__MSGBUF_H
/* /*
* The msqid64_ds structure for i386 architecture. * The msqid64_ds structure for i386 architecture.
...@@ -36,4 +36,4 @@ struct msqid64_ds { ...@@ -36,4 +36,4 @@ struct msqid64_ds {
unsigned long __unused5; unsigned long __unused5;
}; };
#endif /* _ASM_X86_MSGBUF_H */ #endif /* ASM_X86__MSGBUF_H */
include/asm-x86/msidef.h
View file @ b8cd9d05
#ifndef ASM_MSIDEF_H #ifndef ASM_X86__MSIDEF_H
#define ASM_MSIDEF_H #define ASM_X86__MSIDEF_H
/* /*
* Constants for Intel APIC based MSI messages. * Constants for Intel APIC based MSI messages.
...@@ -48,4 +48,4 @@ ...@@ -48,4 +48,4 @@
#define MSI_ADDR_DEST_ID(dest) (((dest) << MSI_ADDR_DEST_ID_SHIFT) & \ #define MSI_ADDR_DEST_ID(dest) (((dest) << MSI_ADDR_DEST_ID_SHIFT) & \
MSI_ADDR_DEST_ID_MASK) MSI_ADDR_DEST_ID_MASK)
#endif /* ASM_MSIDEF_H */ #endif /* ASM_X86__MSIDEF_H */
include/asm-x86/msr-index.h
View file @ b8cd9d05
#ifndef __ASM_MSR_INDEX_H #ifndef ASM_X86__MSR_INDEX_H
#define __ASM_MSR_INDEX_H #define ASM_X86__MSR_INDEX_H
/* CPU model specific register (MSR) numbers */ /* CPU model specific register (MSR) numbers */
...@@ -310,4 +310,4 @@ ...@@ -310,4 +310,4 @@
/* Geode defined MSRs */ /* Geode defined MSRs */
#define MSR_GEODE_BUSCONT_CONF0 0x00001900 #define MSR_GEODE_BUSCONT_CONF0 0x00001900
#endif /* __ASM_MSR_INDEX_H */ #endif /* ASM_X86__MSR_INDEX_H */
include/asm-x86/msr.h
View file @ b8cd9d05
#ifndef __ASM_X86_MSR_H_ #ifndef ASM_X86__MSR_H
#define __ASM_X86_MSR_H_ #define ASM_X86__MSR_H
#include <asm/msr-index.h> #include <asm/msr-index.h>
...@@ -221,4 +221,4 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) ...@@ -221,4 +221,4 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif /* ASM_X86__MSR_H */
include/asm-x86/mtrr.h
View file @ b8cd9d05
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
The postal address is: The postal address is:
Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
*/ */
#ifndef _ASM_X86_MTRR_H #ifndef ASM_X86__MTRR_H
#define _ASM_X86_MTRR_H #define ASM_X86__MTRR_H
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -170,4 +170,4 @@ struct mtrr_gentry32 { ...@@ -170,4 +170,4 @@ struct mtrr_gentry32 {
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_X86_MTRR_H */ #endif /* ASM_X86__MTRR_H */
include/asm-x86/mutex_32.h
View file @ b8cd9d05
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* *
* Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> * Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
*/ */
#ifndef _ASM_MUTEX_H #ifndef ASM_X86__MUTEX_32_H
#define _ASM_MUTEX_H #define ASM_X86__MUTEX_32_H
#include <asm/alternative.h> #include <asm/alternative.h>
...@@ -122,4 +122,4 @@ static inline int __mutex_fastpath_trylock(atomic_t *count, ...@@ -122,4 +122,4 @@ static inline int __mutex_fastpath_trylock(atomic_t *count,
#endif #endif
} }
#endif #endif /* ASM_X86__MUTEX_32_H */
include/asm-x86/mutex_64.h
View file @ b8cd9d05
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* *
* Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> * Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
*/ */
#ifndef _ASM_MUTEX_H #ifndef ASM_X86__MUTEX_64_H
#define _ASM_MUTEX_H #define ASM_X86__MUTEX_64_H
/** /**
* __mutex_fastpath_lock - decrement and call function if negative * __mutex_fastpath_lock - decrement and call function if negative
...@@ -97,4 +97,4 @@ static inline int __mutex_fastpath_trylock(atomic_t *count, ...@@ -97,4 +97,4 @@ static inline int __mutex_fastpath_trylock(atomic_t *count,
return 0; return 0;
} }
#endif #endif /* ASM_X86__MUTEX_64_H */
include/asm-x86/nmi.h
View file @ b8cd9d05
#ifndef _ASM_X86_NMI_H_ #ifndef ASM_X86__NMI_H
#define _ASM_X86_NMI_H_ #define ASM_X86__NMI_H
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -81,4 +81,4 @@ void enable_lapic_nmi_watchdog(void); ...@@ -81,4 +81,4 @@ void enable_lapic_nmi_watchdog(void);
void stop_nmi(void); void stop_nmi(void);
void restart_nmi(void); void restart_nmi(void);
#endif #endif /* ASM_X86__NMI_H */
include/asm-x86/nops.h
View file @ b8cd9d05
#ifndef _ASM_NOPS_H #ifndef ASM_X86__NOPS_H
#define _ASM_NOPS_H 1 #define ASM_X86__NOPS_H
/* Define nops for use with alternative() */ /* Define nops for use with alternative() */
...@@ -115,4 +115,4 @@ ...@@ -115,4 +115,4 @@
#define ASM_NOP_MAX 8 #define ASM_NOP_MAX 8
#endif #endif /* ASM_X86__NOPS_H */
include/asm-x86/numa_32.h
View file @ b8cd9d05
#ifndef _ASM_X86_32_NUMA_H #ifndef ASM_X86__NUMA_32_H
#define _ASM_X86_32_NUMA_H 1 #define ASM_X86__NUMA_32_H
extern int pxm_to_nid(int pxm); extern int pxm_to_nid(int pxm);
extern void numa_remove_cpu(int cpu); extern void numa_remove_cpu(int cpu);
...@@ -8,4 +8,4 @@ extern void numa_remove_cpu(int cpu); ...@@ -8,4 +8,4 @@ extern void numa_remove_cpu(int cpu);
extern void set_highmem_pages_init(void); extern void set_highmem_pages_init(void);
#endif #endif
#endif /* _ASM_X86_32_NUMA_H */ #endif /* ASM_X86__NUMA_32_H */
include/asm-x86/numa_64.h
View file @ b8cd9d05
#ifndef _ASM_X8664_NUMA_H #ifndef ASM_X86__NUMA_64_H
#define _ASM_X8664_NUMA_H 1 #define ASM_X86__NUMA_64_H
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <asm/apicdef.h> #include <asm/apicdef.h>
...@@ -40,4 +40,4 @@ static inline void numa_add_cpu(int cpu, int node) { } ...@@ -40,4 +40,4 @@ static inline void numa_add_cpu(int cpu, int node) { }
static inline void numa_remove_cpu(int cpu) { } static inline void numa_remove_cpu(int cpu) { }
#endif #endif
#endif #endif /* ASM_X86__NUMA_64_H */
include/asm-x86/numaq.h
View file @ b8cd9d05
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* Send feedback to <gone@us.ibm.com> * Send feedback to <gone@us.ibm.com>
*/ */
#ifndef NUMAQ_H #ifndef ASM_X86__NUMAQ_H
#define NUMAQ_H #define ASM_X86__NUMAQ_H
#ifdef CONFIG_X86_NUMAQ #ifdef CONFIG_X86_NUMAQ
...@@ -165,5 +165,5 @@ static inline int get_memcfg_numaq(void) ...@@ -165,5 +165,5 @@ static inline int get_memcfg_numaq(void)
return 0; return 0;
} }
#endif /* CONFIG_X86_NUMAQ */ #endif /* CONFIG_X86_NUMAQ */
#endif /* NUMAQ_H */ #endif /* ASM_X86__NUMAQ_H */
include/asm-x86/olpc.h
View file @ b8cd9d05
/* OLPC machine specific definitions */ /* OLPC machine specific definitions */
#ifndef ASM_OLPC_H_ #ifndef ASM_X86__OLPC_H
#define ASM_OLPC_H_ #define ASM_X86__OLPC_H
#include <asm/geode.h> #include <asm/geode.h>
...@@ -129,4 +129,4 @@ extern int olpc_ec_mask_unset(uint8_t bits); ...@@ -129,4 +129,4 @@ extern int olpc_ec_mask_unset(uint8_t bits);
#define OLPC_GPIO_LID geode_gpio(26) #define OLPC_GPIO_LID geode_gpio(26)
#define OLPC_GPIO_ECSCI geode_gpio(27) #define OLPC_GPIO_ECSCI geode_gpio(27)
#endif #endif /* ASM_X86__OLPC_H */
include/asm-x86/page.h
View file @ b8cd9d05
#ifndef _ASM_X86_PAGE_H #ifndef ASM_X86__PAGE_H
#define _ASM_X86_PAGE_H #define ASM_X86__PAGE_H
#include <linux/const.h> #include <linux/const.h>
...@@ -199,4 +199,4 @@ static inline pteval_t native_pte_flags(pte_t pte) ...@@ -199,4 +199,4 @@ static inline pteval_t native_pte_flags(pte_t pte)
#define __HAVE_ARCH_GATE_AREA 1 #define __HAVE_ARCH_GATE_AREA 1
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_X86_PAGE_H */ #endif /* ASM_X86__PAGE_H */
include/asm-x86/page_32.h
View file @ b8cd9d05
#ifndef _ASM_X86_PAGE_32_H #ifndef ASM_X86__PAGE_32_H
#define _ASM_X86_PAGE_32_H #define ASM_X86__PAGE_32_H
/* /*
* This handles the memory map. * This handles the memory map.
...@@ -126,4 +126,4 @@ static inline void copy_page(void *to, void *from) ...@@ -126,4 +126,4 @@ static inline void copy_page(void *to, void *from)
#endif /* CONFIG_X86_3DNOW */ #endif /* CONFIG_X86_3DNOW */
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* _ASM_X86_PAGE_32_H */ #endif /* ASM_X86__PAGE_32_H */
include/asm-x86/page_64.h
View file @ b8cd9d05
#ifndef _X86_64_PAGE_H #ifndef ASM_X86__PAGE_64_H
#define _X86_64_PAGE_H #define ASM_X86__PAGE_64_H
#define PAGETABLE_LEVELS 4 #define PAGETABLE_LEVELS 4
...@@ -102,4 +102,4 @@ extern void init_extra_mapping_wb(unsigned long phys, unsigned long size); ...@@ -102,4 +102,4 @@ extern void init_extra_mapping_wb(unsigned long phys, unsigned long size);
#endif #endif
#endif /* _X86_64_PAGE_H */ #endif /* ASM_X86__PAGE_64_H */
include/asm-x86/param.h
View file @ b8cd9d05
#ifndef _ASM_X86_PARAM_H #ifndef ASM_X86__PARAM_H
#define _ASM_X86_PARAM_H #define ASM_X86__PARAM_H
#ifdef __KERNEL__ #ifdef __KERNEL__
# define HZ CONFIG_HZ /* Internal kernel timer frequency */ # define HZ CONFIG_HZ /* Internal kernel timer frequency */
...@@ -19,4 +19,4 @@ ...@@ -19,4 +19,4 @@
#define MAXHOSTNAMELEN 64 /* max length of hostname */ #define MAXHOSTNAMELEN 64 /* max length of hostname */
#endif /* _ASM_X86_PARAM_H */ #endif /* ASM_X86__PARAM_H */
include/asm-x86/paravirt.h
View file @ b8cd9d05
#ifndef __ASM_PARAVIRT_H #ifndef ASM_X86__PARAVIRT_H
#define __ASM_PARAVIRT_H #define ASM_X86__PARAVIRT_H
/* Various instructions on x86 need to be replaced for /* Various instructions on x86 need to be replaced for
* para-virtualization: those hooks are defined here. */ * para-virtualization: those hooks are defined here. */
...@@ -1634,4 +1634,4 @@ static inline unsigned long __raw_local_irq_save(void) ...@@ -1634,4 +1634,4 @@ static inline unsigned long __raw_local_irq_save(void)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* CONFIG_PARAVIRT */ #endif /* CONFIG_PARAVIRT */
#endif /* __ASM_PARAVIRT_H */ #endif /* ASM_X86__PARAVIRT_H */
include/asm-x86/parport.h
View file @ b8cd9d05
#ifndef _ASM_X86_PARPORT_H #ifndef ASM_X86__PARPORT_H
#define _ASM_X86_PARPORT_H #define ASM_X86__PARPORT_H
static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma); static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma);
static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma) static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma)
...@@ -7,4 +7,4 @@ static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma) ...@@ -7,4 +7,4 @@ static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma)
return parport_pc_find_isa_ports(autoirq, autodma); return parport_pc_find_isa_ports(autoirq, autodma);
} }
#endif /* _ASM_X86_PARPORT_H */ #endif /* ASM_X86__PARPORT_H */
include/asm-x86/pat.h
View file @ b8cd9d05
#ifndef _ASM_PAT_H #ifndef ASM_X86__PAT_H
#define _ASM_PAT_H #define ASM_X86__PAT_H
#include <linux/types.h> #include <linux/types.h>
...@@ -19,4 +19,4 @@ extern int free_memtype(u64 start, u64 end); ...@@ -19,4 +19,4 @@ extern int free_memtype(u64 start, u64 end);
extern void pat_disable(char *reason); extern void pat_disable(char *reason);
#endif #endif /* ASM_X86__PAT_H */
include/asm-x86/pci-direct.h
View file @ b8cd9d05
#ifndef ASM_PCI_DIRECT_H #ifndef ASM_X86__PCI_DIRECT_H
#define ASM_PCI_DIRECT_H 1 #define ASM_X86__PCI_DIRECT_H
#include <linux/types.h> #include <linux/types.h>
...@@ -18,4 +18,4 @@ extern int early_pci_allowed(void); ...@@ -18,4 +18,4 @@ extern int early_pci_allowed(void);
extern unsigned int pci_early_dump_regs; extern unsigned int pci_early_dump_regs;
extern void early_dump_pci_device(u8 bus, u8 slot, u8 func); extern void early_dump_pci_device(u8 bus, u8 slot, u8 func);
extern void early_dump_pci_devices(void); extern void early_dump_pci_devices(void);
#endif #endif /* ASM_X86__PCI_DIRECT_H */
include/asm-x86/pci.h
View file @ b8cd9d05
#ifndef __x86_PCI_H #ifndef ASM_X86__PCI_H
#define __x86_PCI_H #define ASM_X86__PCI_H
#include <linux/mm.h> /* for struct page */ #include <linux/mm.h> /* for struct page */
#include <linux/types.h> #include <linux/types.h>
...@@ -111,4 +111,4 @@ static inline cpumask_t __pcibus_to_cpumask(struct pci_bus *bus) ...@@ -111,4 +111,4 @@ static inline cpumask_t __pcibus_to_cpumask(struct pci_bus *bus)
} }
#endif #endif
#endif #endif /* ASM_X86__PCI_H */
include/asm-x86/pci_32.h
View file @ b8cd9d05
#ifndef __i386_PCI_H #ifndef ASM_X86__PCI_32_H
#define __i386_PCI_H #define ASM_X86__PCI_32_H
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -31,4 +31,4 @@ struct pci_dev; ...@@ -31,4 +31,4 @@ struct pci_dev;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __i386_PCI_H */ #endif /* ASM_X86__PCI_32_H */
include/asm-x86/pci_64.h
View file @ b8cd9d05
#ifndef __x8664_PCI_H #ifndef ASM_X86__PCI_64_H
#define __x8664_PCI_H #define ASM_X86__PCI_64_H
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -63,4 +63,4 @@ extern void pci_iommu_alloc(void); ...@@ -63,4 +63,4 @@ extern void pci_iommu_alloc(void);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __x8664_PCI_H */ #endif /* ASM_X86__PCI_64_H */
include/asm-x86/pda.h
View file @ b8cd9d05
#ifndef X86_64_PDA_H #ifndef ASM_X86__PDA_H
#define X86_64_PDA_H #define ASM_X86__PDA_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/stddef.h> #include <linux/stddef.h>
...@@ -134,4 +134,4 @@ do { \ ...@@ -134,4 +134,4 @@ do { \
#define PDA_STACKOFFSET (5*8) #define PDA_STACKOFFSET (5*8)
#endif #endif /* ASM_X86__PDA_H */
include/asm-x86/percpu.h
View file @ b8cd9d05
#ifndef _ASM_X86_PERCPU_H_ #ifndef ASM_X86__PERCPU_H
#define _ASM_X86_PERCPU_H_ #define ASM_X86__PERCPU_H
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
#include <linux/compiler.h> #include <linux/compiler.h>
...@@ -215,4 +215,4 @@ do { \ ...@@ -215,4 +215,4 @@ do { \
#endif /* !CONFIG_SMP */ #endif /* !CONFIG_SMP */
#endif /* _ASM_X86_PERCPU_H_ */ #endif /* ASM_X86__PERCPU_H */
include/asm-x86/pgalloc.h
View file @ b8cd9d05
#ifndef _ASM_X86_PGALLOC_H #ifndef ASM_X86__PGALLOC_H
#define _ASM_X86_PGALLOC_H #define ASM_X86__PGALLOC_H
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/mm.h> /* for struct page */ #include <linux/mm.h> /* for struct page */
...@@ -111,4 +111,4 @@ extern void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud); ...@@ -111,4 +111,4 @@ extern void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud);
#endif /* PAGETABLE_LEVELS > 3 */ #endif /* PAGETABLE_LEVELS > 3 */
#endif /* PAGETABLE_LEVELS > 2 */ #endif /* PAGETABLE_LEVELS > 2 */
#endif /* _ASM_X86_PGALLOC_H */ #endif /* ASM_X86__PGALLOC_H */
include/asm-x86/pgtable-2level-defs.h
View file @ b8cd9d05
#ifndef _I386_PGTABLE_2LEVEL_DEFS_H #ifndef ASM_X86__PGTABLE_2LEVEL_DEFS_H
#define _I386_PGTABLE_2LEVEL_DEFS_H #define ASM_X86__PGTABLE_2LEVEL_DEFS_H
#define SHARED_KERNEL_PMD 0 #define SHARED_KERNEL_PMD 0
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
#define PTRS_PER_PTE 1024 #define PTRS_PER_PTE 1024
#endif /* _I386_PGTABLE_2LEVEL_DEFS_H */ #endif /* ASM_X86__PGTABLE_2LEVEL_DEFS_H */
include/asm-x86/pgtable-2level.h
View file @ b8cd9d05
#ifndef _I386_PGTABLE_2LEVEL_H #ifndef ASM_X86__PGTABLE_2LEVEL_H
#define _I386_PGTABLE_2LEVEL_H #define ASM_X86__PGTABLE_2LEVEL_H
#define pte_ERROR(e) \ #define pte_ERROR(e) \
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low) printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)
...@@ -78,4 +78,4 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp) ...@@ -78,4 +78,4 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp)
#define __pte_to_swp_entry(pte) ((swp_entry_t) { (pte).pte_low }) #define __pte_to_swp_entry(pte) ((swp_entry_t) { (pte).pte_low })
#define __swp_entry_to_pte(x) ((pte_t) { .pte = (x).val }) #define __swp_entry_to_pte(x) ((pte_t) { .pte = (x).val })
#endif /* _I386_PGTABLE_2LEVEL_H */ #endif /* ASM_X86__PGTABLE_2LEVEL_H */
include/asm-x86/pgtable-3level-defs.h
View file @ b8cd9d05
#ifndef _I386_PGTABLE_3LEVEL_DEFS_H #ifndef ASM_X86__PGTABLE_3LEVEL_DEFS_H
#define _I386_PGTABLE_3LEVEL_DEFS_H #define ASM_X86__PGTABLE_3LEVEL_DEFS_H
#ifdef CONFIG_PARAVIRT #ifdef CONFIG_PARAVIRT
#define SHARED_KERNEL_PMD (pv_info.shared_kernel_pmd) #define SHARED_KERNEL_PMD (pv_info.shared_kernel_pmd)
...@@ -25,4 +25,4 @@ ...@@ -25,4 +25,4 @@
*/ */
#define PTRS_PER_PTE 512 #define PTRS_PER_PTE 512
#endif /* _I386_PGTABLE_3LEVEL_DEFS_H */ #endif /* ASM_X86__PGTABLE_3LEVEL_DEFS_H */
include/asm-x86/pgtable-3level.h
View file @ b8cd9d05
#ifndef _I386_PGTABLE_3LEVEL_H #ifndef ASM_X86__PGTABLE_3LEVEL_H
#define _I386_PGTABLE_3LEVEL_H #define ASM_X86__PGTABLE_3LEVEL_H
/* /*
* Intel Physical Address Extension (PAE) Mode - three-level page * Intel Physical Address Extension (PAE) Mode - three-level page
...@@ -179,4 +179,4 @@ static inline unsigned long pte_pfn(pte_t pte) ...@@ -179,4 +179,4 @@ static inline unsigned long pte_pfn(pte_t pte)
#define __pte_to_swp_entry(pte) ((swp_entry_t){ (pte).pte_high }) #define __pte_to_swp_entry(pte) ((swp_entry_t){ (pte).pte_high })
#define __swp_entry_to_pte(x) ((pte_t){ { .pte_high = (x).val } }) #define __swp_entry_to_pte(x) ((pte_t){ { .pte_high = (x).val } })
#endif /* _I386_PGTABLE_3LEVEL_H */ #endif /* ASM_X86__PGTABLE_3LEVEL_H */
include/asm-x86/pgtable.h
View file @ b8cd9d05
#ifndef _ASM_X86_PGTABLE_H #ifndef ASM_X86__PGTABLE_H
#define _ASM_X86_PGTABLE_H #define ASM_X86__PGTABLE_H
#define FIRST_USER_ADDRESS 0 #define FIRST_USER_ADDRESS 0
...@@ -521,4 +521,4 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) ...@@ -521,4 +521,4 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
#include <asm-generic/pgtable.h> #include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_PGTABLE_H */ #endif /* ASM_X86__PGTABLE_H */
include/asm-x86/pgtable_32.h
View file @ b8cd9d05
#ifndef _I386_PGTABLE_H #ifndef ASM_X86__PGTABLE_32_H
#define _I386_PGTABLE_H #define ASM_X86__PGTABLE_32_H
/* /*
...@@ -186,4 +186,4 @@ do { \ ...@@ -186,4 +186,4 @@ do { \
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
remap_pfn_range(vma, vaddr, pfn, size, prot) remap_pfn_range(vma, vaddr, pfn, size, prot)
#endif /* _I386_PGTABLE_H */ #endif /* ASM_X86__PGTABLE_32_H */
include/asm-x86/pgtable_64.h
View file @ b8cd9d05
#ifndef _X86_64_PGTABLE_H #ifndef ASM_X86__PGTABLE_64_H
#define _X86_64_PGTABLE_H #define ASM_X86__PGTABLE_64_H
#include <linux/const.h> #include <linux/const.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -284,4 +284,4 @@ extern void cleanup_highmap(void); ...@@ -284,4 +284,4 @@ extern void cleanup_highmap(void);
#define __HAVE_ARCH_PTE_SAME #define __HAVE_ARCH_PTE_SAME
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* _X86_64_PGTABLE_H */ #endif /* ASM_X86__PGTABLE_64_H */
include/asm-x86/posix_types_32.h
View file @ b8cd9d05
#ifndef __ARCH_I386_POSIX_TYPES_H #ifndef ASM_X86__POSIX_TYPES_32_H
#define __ARCH_I386_POSIX_TYPES_H #define ASM_X86__POSIX_TYPES_32_H
/* /*
* This file is generally used by user-level software, so you need to * This file is generally used by user-level software, so you need to
...@@ -82,4 +82,4 @@ do { \ ...@@ -82,4 +82,4 @@ do { \
#endif /* defined(__KERNEL__) */ #endif /* defined(__KERNEL__) */
#endif #endif /* ASM_X86__POSIX_TYPES_32_H */
include/asm-x86/posix_types_64.h
View file @ b8cd9d05
#ifndef _ASM_X86_64_POSIX_TYPES_H #ifndef ASM_X86__POSIX_TYPES_64_H
#define _ASM_X86_64_POSIX_TYPES_H #define ASM_X86__POSIX_TYPES_64_H
/* /*
* This file is generally used by user-level software, so you need to * This file is generally used by user-level software, so you need to
...@@ -116,4 +116,4 @@ static inline void __FD_ZERO(__kernel_fd_set *p) ...@@ -116,4 +116,4 @@ static inline void __FD_ZERO(__kernel_fd_set *p)
#endif /* defined(__KERNEL__) */ #endif /* defined(__KERNEL__) */
#endif #endif /* ASM_X86__POSIX_TYPES_64_H */
include/asm-x86/prctl.h
View file @ b8cd9d05
#ifndef X86_64_PRCTL_H #ifndef ASM_X86__PRCTL_H
#define X86_64_PRCTL_H 1 #define ASM_X86__PRCTL_H
#define ARCH_SET_GS 0x1001 #define ARCH_SET_GS 0x1001
#define ARCH_SET_FS 0x1002 #define ARCH_SET_FS 0x1002
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
#define ARCH_GET_GS 0x1004 #define ARCH_GET_GS 0x1004
#endif #endif /* ASM_X86__PRCTL_H */
include/asm-x86/processor-flags.h
View file @ b8cd9d05
#ifndef __ASM_I386_PROCESSOR_FLAGS_H #ifndef ASM_X86__PROCESSOR_FLAGS_H
#define __ASM_I386_PROCESSOR_FLAGS_H #define ASM_X86__PROCESSOR_FLAGS_H
/* Various flags defined: can be included from assembler. */ /* Various flags defined: can be included from assembler. */
/* /*
...@@ -96,4 +96,4 @@ ...@@ -96,4 +96,4 @@
#endif #endif
#endif #endif
#endif /* __ASM_I386_PROCESSOR_FLAGS_H */ #endif /* ASM_X86__PROCESSOR_FLAGS_H */
include/asm-x86/processor.h
View file @ b8cd9d05
#ifndef __ASM_X86_PROCESSOR_H #ifndef ASM_X86__PROCESSOR_H
#define __ASM_X86_PROCESSOR_H #define ASM_X86__PROCESSOR_H
#include <asm/processor-flags.h> #include <asm/processor-flags.h>
...@@ -943,4 +943,4 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip, ...@@ -943,4 +943,4 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
extern int get_tsc_mode(unsigned long adr); extern int get_tsc_mode(unsigned long adr);
extern int set_tsc_mode(unsigned int val); extern int set_tsc_mode(unsigned int val);
#endif #endif /* ASM_X86__PROCESSOR_H */
include/asm-x86/proto.h
View file @ b8cd9d05
#ifndef _ASM_X8664_PROTO_H #ifndef ASM_X86__PROTO_H
#define _ASM_X8664_PROTO_H 1 #define ASM_X86__PROTO_H
#include <asm/ldt.h> #include <asm/ldt.h>
...@@ -29,4 +29,4 @@ long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); ...@@ -29,4 +29,4 @@ long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);
#define round_up(x, y) (((x) + (y) - 1) & ~((y) - 1)) #define round_up(x, y) (((x) + (y) - 1) & ~((y) - 1))
#define round_down(x, y) ((x) & ~((y) - 1)) #define round_down(x, y) ((x) & ~((y) - 1))
#endif #endif /* ASM_X86__PROTO_H */
include/asm-x86/ptrace-abi.h
View file @ b8cd9d05
#ifndef _ASM_X86_PTRACE_ABI_H #ifndef ASM_X86__PTRACE_ABI_H
#define _ASM_X86_PTRACE_ABI_H #define ASM_X86__PTRACE_ABI_H
#ifdef __i386__ #ifdef __i386__
...@@ -140,4 +140,4 @@ struct ptrace_bts_config { ...@@ -140,4 +140,4 @@ struct ptrace_bts_config {
Returns number of BTS records drained. Returns number of BTS records drained.
*/ */
#endif #endif /* ASM_X86__PTRACE_ABI_H */
include/asm-x86/ptrace.h
View file @ b8cd9d05
#ifndef _ASM_X86_PTRACE_H #ifndef ASM_X86__PTRACE_H
#define _ASM_X86_PTRACE_H #define ASM_X86__PTRACE_H
#include <linux/compiler.h> /* For __user */ #include <linux/compiler.h> /* For __user */
#include <asm/ptrace-abi.h> #include <asm/ptrace-abi.h>
...@@ -239,4 +239,4 @@ extern int do_set_thread_area(struct task_struct *p, int idx, ...@@ -239,4 +239,4 @@ extern int do_set_thread_area(struct task_struct *p, int idx,
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif #endif /* ASM_X86__PTRACE_H */
include/asm-x86/pvclock-abi.h
View file @ b8cd9d05
#ifndef _ASM_X86_PVCLOCK_ABI_H_ #ifndef ASM_X86__PVCLOCK_ABI_H
#define _ASM_X86_PVCLOCK_ABI_H_ #define ASM_X86__PVCLOCK_ABI_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* /*
...@@ -39,4 +39,4 @@ struct pvclock_wall_clock { ...@@ -39,4 +39,4 @@ struct pvclock_wall_clock {
} __attribute__((__packed__)); } __attribute__((__packed__));
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_PVCLOCK_ABI_H_ */ #endif /* ASM_X86__PVCLOCK_ABI_H */
include/asm-x86/pvclock.h
View file @ b8cd9d05
#ifndef _ASM_X86_PVCLOCK_H_ #ifndef ASM_X86__PVCLOCK_H
#define _ASM_X86_PVCLOCK_H_ #define ASM_X86__PVCLOCK_H
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <asm/pvclock-abi.h> #include <asm/pvclock-abi.h>
...@@ -10,4 +10,4 @@ void pvclock_read_wallclock(struct pvclock_wall_clock *wall, ...@@ -10,4 +10,4 @@ void pvclock_read_wallclock(struct pvclock_wall_clock *wall,
struct pvclock_vcpu_time_info *vcpu, struct pvclock_vcpu_time_info *vcpu,
struct timespec *ts); struct timespec *ts);
#endif /* _ASM_X86_PVCLOCK_H_ */ #endif /* ASM_X86__PVCLOCK_H */
include/asm-x86/reboot.h
View file @ b8cd9d05
#ifndef _ASM_REBOOT_H #ifndef ASM_X86__REBOOT_H
#define _ASM_REBOOT_H #define ASM_X86__REBOOT_H
struct pt_regs; struct pt_regs;
...@@ -18,4 +18,4 @@ void native_machine_crash_shutdown(struct pt_regs *regs); ...@@ -18,4 +18,4 @@ void native_machine_crash_shutdown(struct pt_regs *regs);
void native_machine_shutdown(void); void native_machine_shutdown(void);
void machine_real_restart(const unsigned char *code, int length); void machine_real_restart(const unsigned char *code, int length);
#endif /* _ASM_REBOOT_H */ #endif /* ASM_X86__REBOOT_H */
include/asm-x86/reboot_fixups.h
View file @ b8cd9d05
#ifndef _LINUX_REBOOT_FIXUPS_H #ifndef ASM_X86__REBOOT_FIXUPS_H
#define _LINUX_REBOOT_FIXUPS_H #define ASM_X86__REBOOT_FIXUPS_H
extern void mach_reboot_fixups(void); extern void mach_reboot_fixups(void);
#endif /* _LINUX_REBOOT_FIXUPS_H */ #endif /* ASM_X86__REBOOT_FIXUPS_H */
include/asm-x86/required-features.h
View file @ b8cd9d05
#ifndef _ASM_REQUIRED_FEATURES_H #ifndef ASM_X86__REQUIRED_FEATURES_H
#define _ASM_REQUIRED_FEATURES_H 1 #define ASM_X86__REQUIRED_FEATURES_H
/* Define minimum CPUID feature set for kernel These bits are checked /* Define minimum CPUID feature set for kernel These bits are checked
really early to actually display a visible error message before the really early to actually display a visible error message before the
...@@ -79,4 +79,4 @@ ...@@ -79,4 +79,4 @@
#define REQUIRED_MASK6 0 #define REQUIRED_MASK6 0
#define REQUIRED_MASK7 0 #define REQUIRED_MASK7 0
#endif #endif /* ASM_X86__REQUIRED_FEATURES_H */
include/asm-x86/resume-trace.h
View file @ b8cd9d05
#ifndef _ASM_X86_RESUME_TRACE_H #ifndef ASM_X86__RESUME_TRACE_H
#define _ASM_X86_RESUME_TRACE_H #define ASM_X86__RESUME_TRACE_H
#include <asm/asm.h> #include <asm/asm.h>
...@@ -18,4 +18,4 @@ do { \ ...@@ -18,4 +18,4 @@ do { \
} \ } \
} while (0) } while (0)
#endif #endif /* ASM_X86__RESUME_TRACE_H */
include/asm-x86/rio.h
View file @ b8cd9d05
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* Author: Laurent Vivier <Laurent.Vivier@bull.net> * Author: Laurent Vivier <Laurent.Vivier@bull.net>
*/ */
#ifndef __ASM_RIO_H #ifndef ASM_X86__RIO_H
#define __ASM_RIO_H #define ASM_X86__RIO_H
#define RIO_TABLE_VERSION 3 #define RIO_TABLE_VERSION 3
...@@ -60,4 +60,4 @@ enum { ...@@ -60,4 +60,4 @@ enum {
ALT_CALGARY = 5, /* Second Planar Calgary */ ALT_CALGARY = 5, /* Second Planar Calgary */
}; };
#endif /* __ASM_RIO_H */ #endif /* ASM_X86__RIO_H */
include/asm-x86/rwlock.h
View file @ b8cd9d05
#ifndef _ASM_X86_RWLOCK_H #ifndef ASM_X86__RWLOCK_H
#define _ASM_X86_RWLOCK_H #define ASM_X86__RWLOCK_H
#define RW_LOCK_BIAS 0x01000000 #define RW_LOCK_BIAS 0x01000000
/* Actual code is in asm/spinlock.h or in arch/x86/lib/rwlock.S */ /* Actual code is in asm/spinlock.h or in arch/x86/lib/rwlock.S */
#endif /* _ASM_X86_RWLOCK_H */ #endif /* ASM_X86__RWLOCK_H */
include/asm-x86/rwsem.h
View file @ b8cd9d05
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
* front, then they'll all be woken up, but no other readers will be. * front, then they'll all be woken up, but no other readers will be.
*/ */
#ifndef _I386_RWSEM_H #ifndef ASM_X86__RWSEM_H
#define _I386_RWSEM_H #define ASM_X86__RWSEM_H
#ifndef _LINUX_RWSEM_H #ifndef _LINUX_RWSEM_H
#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead" #error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead"
...@@ -262,4 +262,4 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem) ...@@ -262,4 +262,4 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem)
} }
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _I386_RWSEM_H */ #endif /* ASM_X86__RWSEM_H */
include/asm-x86/scatterlist.h
View file @ b8cd9d05
#ifndef _ASM_X86_SCATTERLIST_H #ifndef ASM_X86__SCATTERLIST_H
#define _ASM_X86_SCATTERLIST_H #define ASM_X86__SCATTERLIST_H
#include <asm/types.h> #include <asm/types.h>
...@@ -30,4 +30,4 @@ struct scatterlist { ...@@ -30,4 +30,4 @@ struct scatterlist {
# define sg_dma_len(sg) ((sg)->dma_length) # define sg_dma_len(sg) ((sg)->dma_length)
#endif #endif
#endif #endif /* ASM_X86__SCATTERLIST_H */
include/asm-x86/seccomp_32.h
View file @ b8cd9d05
#ifndef _ASM_SECCOMP_H #ifndef ASM_X86__SECCOMP_32_H
#define _ASM_SECCOMP_H #define ASM_X86__SECCOMP_32_H
#include <linux/thread_info.h> #include <linux/thread_info.h>
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
#define __NR_seccomp_exit __NR_exit #define __NR_seccomp_exit __NR_exit
#define __NR_seccomp_sigreturn __NR_sigreturn #define __NR_seccomp_sigreturn __NR_sigreturn
#endif /* _ASM_SECCOMP_H */ #endif /* ASM_X86__SECCOMP_32_H */
include/asm-x86/seccomp_64.h
View file @ b8cd9d05
#ifndef _ASM_SECCOMP_H #ifndef ASM_X86__SECCOMP_64_H
#define _ASM_SECCOMP_H #define ASM_X86__SECCOMP_64_H
#include <linux/thread_info.h> #include <linux/thread_info.h>
...@@ -22,4 +22,4 @@ ...@@ -22,4 +22,4 @@
#define __NR_seccomp_exit_32 __NR_ia32_exit #define __NR_seccomp_exit_32 __NR_ia32_exit
#define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn #define __NR_seccomp_sigreturn_32 __NR_ia32_sigreturn
#endif /* _ASM_SECCOMP_H */ #endif /* ASM_X86__SECCOMP_64_H */
include/asm-x86/segment.h
View file @ b8cd9d05
#ifndef _ASM_X86_SEGMENT_H_ #ifndef ASM_X86__SEGMENT_H
#define _ASM_X86_SEGMENT_H_ #define ASM_X86__SEGMENT_H
/* Constructor for a conventional segment GDT (or LDT) entry */ /* Constructor for a conventional segment GDT (or LDT) entry */
/* This is a macro so it can be used in initializers */ /* This is a macro so it can be used in initializers */
...@@ -212,4 +212,4 @@ extern const char early_idt_handlers[NUM_EXCEPTION_VECTORS][10]; ...@@ -212,4 +212,4 @@ extern const char early_idt_handlers[NUM_EXCEPTION_VECTORS][10];
#endif #endif
#endif #endif
#endif #endif /* ASM_X86__SEGMENT_H */
include/asm-x86/sembuf.h
View file @ b8cd9d05
#ifndef _ASM_X86_SEMBUF_H #ifndef ASM_X86__SEMBUF_H
#define _ASM_X86_SEMBUF_H #define ASM_X86__SEMBUF_H
/* /*
* The semid64_ds structure for x86 architecture. * The semid64_ds structure for x86 architecture.
...@@ -21,4 +21,4 @@ struct semid64_ds { ...@@ -21,4 +21,4 @@ struct semid64_ds {
unsigned long __unused4; unsigned long __unused4;
}; };
#endif /* _ASM_X86_SEMBUF_H */ #endif /* ASM_X86__SEMBUF_H */
include/asm-x86/serial.h
View file @ b8cd9d05
#ifndef _ASM_X86_SERIAL_H #ifndef ASM_X86__SERIAL_H
#define _ASM_X86_SERIAL_H #define ASM_X86__SERIAL_H
/* /*
* This assumes you have a 1.8432 MHz clock for your UART. * This assumes you have a 1.8432 MHz clock for your UART.
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
#endif /* _ASM_X86_SERIAL_H */ #endif /* ASM_X86__SERIAL_H */
include/asm-x86/setup.h
View file @ b8cd9d05
#ifndef _ASM_X86_SETUP_H #ifndef ASM_X86__SETUP_H
#define _ASM_X86_SETUP_H #define ASM_X86__SETUP_H
#define COMMAND_LINE_SIZE 2048 #define COMMAND_LINE_SIZE 2048
...@@ -100,4 +100,4 @@ void __init x86_64_start_reservations(char *real_mode_data); ...@@ -100,4 +100,4 @@ void __init x86_64_start_reservations(char *real_mode_data);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_X86_SETUP_H */ #endif /* ASM_X86__SETUP_H */
include/asm-x86/shmbuf.h
View file @ b8cd9d05
#ifndef _ASM_X86_SHMBUF_H #ifndef ASM_X86__SHMBUF_H
#define _ASM_X86_SHMBUF_H #define ASM_X86__SHMBUF_H
/* /*
* The shmid64_ds structure for x86 architecture. * The shmid64_ds structure for x86 architecture.
...@@ -48,4 +48,4 @@ struct shminfo64 { ...@@ -48,4 +48,4 @@ struct shminfo64 {
unsigned long __unused4; unsigned long __unused4;
}; };
#endif /* _ASM_X86_SHMBUF_H */ #endif /* ASM_X86__SHMBUF_H */
include/asm-x86/shmparam.h
View file @ b8cd9d05
#ifndef _ASM_X86_SHMPARAM_H #ifndef ASM_X86__SHMPARAM_H
#define _ASM_X86_SHMPARAM_H #define ASM_X86__SHMPARAM_H
#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
#endif /* _ASM_X86_SHMPARAM_H */ #endif /* ASM_X86__SHMPARAM_H */
include/asm-x86/sigcontext.h
View file @ b8cd9d05
#ifndef _ASM_X86_SIGCONTEXT_H #ifndef ASM_X86__SIGCONTEXT_H
#define _ASM_X86_SIGCONTEXT_H #define ASM_X86__SIGCONTEXT_H
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/types.h> #include <asm/types.h>
...@@ -202,4 +202,4 @@ struct sigcontext { ...@@ -202,4 +202,4 @@ struct sigcontext {
#endif /* !__i386__ */ #endif /* !__i386__ */
#endif #endif /* ASM_X86__SIGCONTEXT_H */
include/asm-x86/sigcontext32.h
View file @ b8cd9d05
#ifndef _SIGCONTEXT32_H #ifndef ASM_X86__SIGCONTEXT32_H
#define _SIGCONTEXT32_H 1 #define ASM_X86__SIGCONTEXT32_H
/* signal context for 32bit programs. */ /* signal context for 32bit programs. */
...@@ -68,4 +68,4 @@ struct sigcontext_ia32 { ...@@ -68,4 +68,4 @@ struct sigcontext_ia32 {
unsigned int cr2; unsigned int cr2;
}; };
#endif #endif /* ASM_X86__SIGCONTEXT32_H */
include/asm-x86/siginfo.h
View file @ b8cd9d05
#ifndef _ASM_X86_SIGINFO_H #ifndef ASM_X86__SIGINFO_H
#define _ASM_X86_SIGINFO_H #define ASM_X86__SIGINFO_H
#ifdef __x86_64__ #ifdef __x86_64__
# define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) # define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
#include <asm-generic/siginfo.h> #include <asm-generic/siginfo.h>
#endif #endif /* ASM_X86__SIGINFO_H */
include/asm-x86/signal.h
View file @ b8cd9d05
#ifndef _ASM_X86_SIGNAL_H #ifndef ASM_X86__SIGNAL_H
#define _ASM_X86_SIGNAL_H #define ASM_X86__SIGNAL_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/types.h> #include <linux/types.h>
...@@ -256,4 +256,4 @@ struct pt_regs; ...@@ -256,4 +256,4 @@ struct pt_regs;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif #endif /* ASM_X86__SIGNAL_H */
include/asm-x86/smp.h
View file @ b8cd9d05
#ifndef _ASM_X86_SMP_H_ #ifndef ASM_X86__SMP_H
#define _ASM_X86_SMP_H_ #define ASM_X86__SMP_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -205,4 +205,4 @@ extern void cpu_uninit(void); ...@@ -205,4 +205,4 @@ extern void cpu_uninit(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif #endif /* ASM_X86__SMP_H */
include/asm-x86/socket.h
View file @ b8cd9d05
#ifndef _ASM_SOCKET_H #ifndef ASM_X86__SOCKET_H
#define _ASM_SOCKET_H #define ASM_X86__SOCKET_H
#include <asm/sockios.h> #include <asm/sockios.h>
...@@ -54,4 +54,4 @@ ...@@ -54,4 +54,4 @@
#define SO_MARK 36 #define SO_MARK 36
#endif /* _ASM_SOCKET_H */ #endif /* ASM_X86__SOCKET_H */
include/asm-x86/sockios.h
View file @ b8cd9d05
#ifndef _ASM_X86_SOCKIOS_H #ifndef ASM_X86__SOCKIOS_H
#define _ASM_X86_SOCKIOS_H #define ASM_X86__SOCKIOS_H
/* Socket-level I/O control calls. */ /* Socket-level I/O control calls. */
#define FIOSETOWN 0x8901 #define FIOSETOWN 0x8901
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
#endif /* _ASM_X86_SOCKIOS_H */ #endif /* ASM_X86__SOCKIOS_H */
include/asm-x86/sparsemem.h
View file @ b8cd9d05
#ifndef _ASM_X86_SPARSEMEM_H #ifndef ASM_X86__SPARSEMEM_H
#define _ASM_X86_SPARSEMEM_H #define ASM_X86__SPARSEMEM_H
#ifdef CONFIG_SPARSEMEM #ifdef CONFIG_SPARSEMEM
/* /*
...@@ -31,4 +31,4 @@ ...@@ -31,4 +31,4 @@
#endif #endif
#endif /* CONFIG_SPARSEMEM */ #endif /* CONFIG_SPARSEMEM */
#endif #endif /* ASM_X86__SPARSEMEM_H */
include/asm-x86/spinlock.h
View file @ b8cd9d05
#ifndef _X86_SPINLOCK_H_ #ifndef ASM_X86__SPINLOCK_H
#define _X86_SPINLOCK_H_ #define ASM_X86__SPINLOCK_H
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/rwlock.h> #include <asm/rwlock.h>
...@@ -366,4 +366,4 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw) ...@@ -366,4 +366,4 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
#define _raw_read_relax(lock) cpu_relax() #define _raw_read_relax(lock) cpu_relax()
#define _raw_write_relax(lock) cpu_relax() #define _raw_write_relax(lock) cpu_relax()
#endif #endif /* ASM_X86__SPINLOCK_H */
include/asm-x86/spinlock_types.h
View file @ b8cd9d05
#ifndef __ASM_SPINLOCK_TYPES_H #ifndef ASM_X86__SPINLOCK_TYPES_H
#define __ASM_SPINLOCK_TYPES_H #define ASM_X86__SPINLOCK_TYPES_H
#ifndef __LINUX_SPINLOCK_TYPES_H #ifndef __LINUX_SPINLOCK_TYPES_H
# error "please don't include this file directly" # error "please don't include this file directly"
...@@ -17,4 +17,4 @@ typedef struct { ...@@ -17,4 +17,4 @@ typedef struct {
#define __RAW_RW_LOCK_UNLOCKED { RW_LOCK_BIAS } #define __RAW_RW_LOCK_UNLOCKED { RW_LOCK_BIAS }
#endif #endif /* ASM_X86__SPINLOCK_TYPES_H */
include/asm-x86/srat.h
View file @ b8cd9d05
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* Send feedback to Pat Gaughen <gone@us.ibm.com> * Send feedback to Pat Gaughen <gone@us.ibm.com>
*/ */
#ifndef _ASM_SRAT_H_ #ifndef ASM_X86__SRAT_H
#define _ASM_SRAT_H_ #define ASM_X86__SRAT_H
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
extern int get_memcfg_from_srat(void); extern int get_memcfg_from_srat(void);
...@@ -36,4 +36,4 @@ static inline int get_memcfg_from_srat(void) ...@@ -36,4 +36,4 @@ static inline int get_memcfg_from_srat(void)
} }
#endif #endif
#endif /* _ASM_SRAT_H_ */ #endif /* ASM_X86__SRAT_H */
include/asm-x86/stacktrace.h
View file @ b8cd9d05
#ifndef _ASM_STACKTRACE_H #ifndef ASM_X86__STACKTRACE_H
#define _ASM_STACKTRACE_H 1 #define ASM_X86__STACKTRACE_H
extern int kstack_depth_to_print; extern int kstack_depth_to_print;
...@@ -18,4 +18,4 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, ...@@ -18,4 +18,4 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
unsigned long *stack, unsigned long bp, unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data); const struct stacktrace_ops *ops, void *data);
#endif #endif /* ASM_X86__STACKTRACE_H */
include/asm-x86/stat.h
View file @ b8cd9d05
#ifndef _ASM_X86_STAT_H #ifndef ASM_X86__STAT_H
#define _ASM_X86_STAT_H #define ASM_X86__STAT_H
#define STAT_HAVE_NSEC 1 #define STAT_HAVE_NSEC 1
...@@ -111,4 +111,4 @@ struct __old_kernel_stat { ...@@ -111,4 +111,4 @@ struct __old_kernel_stat {
#endif #endif
}; };
#endif #endif /* ASM_X86__STAT_H */
include/asm-x86/statfs.h
View file @ b8cd9d05
#ifndef _ASM_X86_STATFS_H #ifndef ASM_X86__STATFS_H
#define _ASM_X86_STATFS_H #define ASM_X86__STATFS_H
#ifdef __i386__ #ifdef __i386__
#include <asm-generic/statfs.h> #include <asm-generic/statfs.h>
...@@ -60,4 +60,4 @@ struct compat_statfs64 { ...@@ -60,4 +60,4 @@ struct compat_statfs64 {
} __attribute__((packed)); } __attribute__((packed));
#endif /* !__i386__ */ #endif /* !__i386__ */
#endif #endif /* ASM_X86__STATFS_H */
include/asm-x86/string_32.h
View file @ b8cd9d05
#ifndef _I386_STRING_H_ #ifndef ASM_X86__STRING_32_H
#define _I386_STRING_H_ #define ASM_X86__STRING_32_H
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -323,4 +323,4 @@ extern void *memscan(void *addr, int c, size_t size); ...@@ -323,4 +323,4 @@ extern void *memscan(void *addr, int c, size_t size);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif /* ASM_X86__STRING_32_H */
include/asm-x86/string_64.h
View file @ b8cd9d05
#ifndef _X86_64_STRING_H_ #ifndef ASM_X86__STRING_64_H
#define _X86_64_STRING_H_ #define ASM_X86__STRING_64_H
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -57,4 +57,4 @@ int strcmp(const char *cs, const char *ct); ...@@ -57,4 +57,4 @@ int strcmp(const char *cs, const char *ct);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif /* ASM_X86__STRING_64_H */
include/asm-x86/suspend_32.h
View file @ b8cd9d05
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* Based on code * Based on code
* Copyright 2001 Patrick Mochel <mochel@osdl.org> * Copyright 2001 Patrick Mochel <mochel@osdl.org>
*/ */
#ifndef __ASM_X86_32_SUSPEND_H #ifndef ASM_X86__SUSPEND_32_H
#define __ASM_X86_32_SUSPEND_H #define ASM_X86__SUSPEND_32_H
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/i387.h> #include <asm/i387.h>
...@@ -48,4 +48,4 @@ static inline void acpi_save_register_state(unsigned long return_point) ...@@ -48,4 +48,4 @@ static inline void acpi_save_register_state(unsigned long return_point)
extern int acpi_save_state_mem(void); extern int acpi_save_state_mem(void);
#endif #endif
#endif /* __ASM_X86_32_SUSPEND_H */ #endif /* ASM_X86__SUSPEND_32_H */
include/asm-x86/suspend_64.h
View file @ b8cd9d05
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* Based on code * Based on code
* Copyright 2001 Patrick Mochel <mochel@osdl.org> * Copyright 2001 Patrick Mochel <mochel@osdl.org>
*/ */
#ifndef __ASM_X86_64_SUSPEND_H #ifndef ASM_X86__SUSPEND_64_H
#define __ASM_X86_64_SUSPEND_H #define ASM_X86__SUSPEND_64_H
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/i387.h> #include <asm/i387.h>
...@@ -49,4 +49,4 @@ extern int acpi_save_state_mem(void); ...@@ -49,4 +49,4 @@ extern int acpi_save_state_mem(void);
extern char core_restore_code; extern char core_restore_code;
extern char restore_registers; extern char restore_registers;
#endif /* __ASM_X86_64_SUSPEND_H */ #endif /* ASM_X86__SUSPEND_64_H */
include/asm-x86/swiotlb.h
View file @ b8cd9d05
#ifndef _ASM_SWIOTLB_H #ifndef ASM_X86__SWIOTLB_H
#define _ASM_SWIOTLB_H 1 #define ASM_X86__SWIOTLB_H
#include <asm/dma-mapping.h> #include <asm/dma-mapping.h>
...@@ -55,4 +55,4 @@ static inline void pci_swiotlb_init(void) ...@@ -55,4 +55,4 @@ static inline void pci_swiotlb_init(void)
static inline void dma_mark_clean(void *addr, size_t size) {} static inline void dma_mark_clean(void *addr, size_t size) {}
#endif /* _ASM_SWIOTLB_H */ #endif /* ASM_X86__SWIOTLB_H */
include/asm-x86/sync_bitops.h
View file @ b8cd9d05
#ifndef _I386_SYNC_BITOPS_H #ifndef ASM_X86__SYNC_BITOPS_H
#define _I386_SYNC_BITOPS_H #define ASM_X86__SYNC_BITOPS_H
/* /*
* Copyright 1992, Linus Torvalds. * Copyright 1992, Linus Torvalds.
...@@ -127,4 +127,4 @@ static inline int sync_test_and_change_bit(int nr, volatile unsigned long *addr) ...@@ -127,4 +127,4 @@ static inline int sync_test_and_change_bit(int nr, volatile unsigned long *addr)
#undef ADDR #undef ADDR
#endif /* _I386_SYNC_BITOPS_H */ #endif /* ASM_X86__SYNC_BITOPS_H */
include/asm-x86/system.h
View file @ b8cd9d05
#ifndef _ASM_X86_SYSTEM_H_ #ifndef ASM_X86__SYSTEM_H
#define _ASM_X86_SYSTEM_H_ #define ASM_X86__SYSTEM_H
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/segment.h> #include <asm/segment.h>
...@@ -419,4 +419,4 @@ static inline void rdtsc_barrier(void) ...@@ -419,4 +419,4 @@ static inline void rdtsc_barrier(void)
alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC);
} }
#endif #endif /* ASM_X86__SYSTEM_H */
include/asm-x86/system_64.h
View file @ b8cd9d05
#ifndef __ASM_SYSTEM_H #ifndef ASM_X86__SYSTEM_64_H
#define __ASM_SYSTEM_H #define ASM_X86__SYSTEM_64_H
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/cmpxchg.h> #include <asm/cmpxchg.h>
...@@ -19,4 +19,4 @@ static inline void write_cr8(unsigned long val) ...@@ -19,4 +19,4 @@ static inline void write_cr8(unsigned long val)
#include <linux/irqflags.h> #include <linux/irqflags.h>
#endif #endif /* ASM_X86__SYSTEM_64_H */
include/asm-x86/tce.h
View file @ b8cd9d05
...@@ -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_64_TCE_H #ifndef ASM_X86__TCE_H
#define _ASM_X86_64_TCE_H #define ASM_X86__TCE_H
extern unsigned int specified_table_size; extern unsigned int specified_table_size;
struct iommu_table; struct iommu_table;
...@@ -45,4 +45,4 @@ extern void * __init alloc_tce_table(void); ...@@ -45,4 +45,4 @@ extern void * __init alloc_tce_table(void);
extern void __init free_tce_table(void *tbl); extern void __init free_tce_table(void *tbl);
extern int __init build_tce_table(struct pci_dev *dev, void __iomem *bbar); extern int __init build_tce_table(struct pci_dev *dev, void __iomem *bbar);
#endif /* _ASM_X86_64_TCE_H */ #endif /* ASM_X86__TCE_H */
include/asm-x86/termbits.h
View file @ b8cd9d05
#ifndef _ASM_X86_TERMBITS_H #ifndef ASM_X86__TERMBITS_H
#define _ASM_X86_TERMBITS_H #define ASM_X86__TERMBITS_H
#include <linux/posix_types.h> #include <linux/posix_types.h>
...@@ -195,4 +195,4 @@ struct ktermios { ...@@ -195,4 +195,4 @@ struct ktermios {
#define TCSADRAIN 1 #define TCSADRAIN 1
#define TCSAFLUSH 2 #define TCSAFLUSH 2
#endif /* _ASM_X86_TERMBITS_H */ #endif /* ASM_X86__TERMBITS_H */
include/asm-x86/termios.h
View file @ b8cd9d05
#ifndef _ASM_X86_TERMIOS_H #ifndef ASM_X86__TERMIOS_H
#define _ASM_X86_TERMIOS_H #define ASM_X86__TERMIOS_H
#include <asm/termbits.h> #include <asm/termbits.h>
#include <asm/ioctls.h> #include <asm/ioctls.h>
...@@ -110,4 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u, ...@@ -110,4 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_X86_TERMIOS_H */ #endif /* ASM_X86__TERMIOS_H */
include/asm-x86/therm_throt.h
View file @ b8cd9d05
#ifndef __ASM_I386_THERM_THROT_H__ #ifndef ASM_X86__THERM_THROT_H
#define __ASM_I386_THERM_THROT_H__ 1 #define ASM_X86__THERM_THROT_H
#include <asm/atomic.h> #include <asm/atomic.h>
extern atomic_t therm_throt_en; extern atomic_t therm_throt_en;
int therm_throt_process(int curr); int therm_throt_process(int curr);
#endif /* __ASM_I386_THERM_THROT_H__ */ #endif /* ASM_X86__THERM_THROT_H */
include/asm-x86/thread_info.h
View file @ b8cd9d05
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* - Incorporating suggestions made by Linus Torvalds and Dave Miller * - Incorporating suggestions made by Linus Torvalds and Dave Miller
*/ */
#ifndef _ASM_X86_THREAD_INFO_H #ifndef ASM_X86__THREAD_INFO_H
#define _ASM_X86_THREAD_INFO_H #define ASM_X86__THREAD_INFO_H
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/page.h> #include <asm/page.h>
...@@ -258,4 +258,4 @@ extern void free_thread_info(struct thread_info *ti); ...@@ -258,4 +258,4 @@ extern void free_thread_info(struct thread_info *ti);
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src); extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
#define arch_task_cache_init arch_task_cache_init #define arch_task_cache_init arch_task_cache_init
#endif #endif
#endif /* _ASM_X86_THREAD_INFO_H */ #endif /* ASM_X86__THREAD_INFO_H */
include/asm-x86/time.h
View file @ b8cd9d05
#ifndef _ASMX86_TIME_H #ifndef ASM_X86__TIME_H
#define _ASMX86_TIME_H #define ASM_X86__TIME_H
extern void hpet_time_init(void); extern void hpet_time_init(void);
...@@ -58,4 +58,4 @@ static inline int native_set_wallclock(unsigned long nowtime) ...@@ -58,4 +58,4 @@ static inline int native_set_wallclock(unsigned long nowtime)
extern unsigned long __init calibrate_cpu(void); extern unsigned long __init calibrate_cpu(void);
#endif #endif /* ASM_X86__TIME_H */
include/asm-x86/timer.h
View file @ b8cd9d05
#ifndef _ASMi386_TIMER_H #ifndef ASM_X86__TIMER_H
#define _ASMi386_TIMER_H #define ASM_X86__TIMER_H
#include <linux/init.h> #include <linux/init.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/percpu.h> #include <linux/percpu.h>
...@@ -60,4 +60,4 @@ static inline unsigned long long cycles_2_ns(unsigned long long cyc) ...@@ -60,4 +60,4 @@ static inline unsigned long long cycles_2_ns(unsigned long long cyc)
return ns; return ns;
} }
#endif #endif /* ASM_X86__TIMER_H */
include/asm-x86/timex.h
View file @ b8cd9d05
/* x86 architecture timex specifications */ /* x86 architecture timex specifications */
#ifndef _ASM_X86_TIMEX_H #ifndef ASM_X86__TIMEX_H
#define _ASM_X86_TIMEX_H #define ASM_X86__TIMEX_H
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/tsc.h> #include <asm/tsc.h>
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
#define ARCH_HAS_READ_CURRENT_TIMER #define ARCH_HAS_READ_CURRENT_TIMER
#endif #endif /* ASM_X86__TIMEX_H */
include/asm-x86/tlb.h
View file @ b8cd9d05
#ifndef _ASM_X86_TLB_H #ifndef ASM_X86__TLB_H
#define _ASM_X86_TLB_H #define ASM_X86__TLB_H
#define tlb_start_vma(tlb, vma) do { } while (0) #define tlb_start_vma(tlb, vma) do { } while (0)
#define tlb_end_vma(tlb, vma) do { } while (0) #define tlb_end_vma(tlb, vma) do { } while (0)
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
#include <asm-generic/tlb.h> #include <asm-generic/tlb.h>
#endif #endif /* ASM_X86__TLB_H */
include/asm-x86/tlbflush.h
View file @ b8cd9d05
#ifndef _ASM_X86_TLBFLUSH_H #ifndef ASM_X86__TLBFLUSH_H
#define _ASM_X86_TLBFLUSH_H #define ASM_X86__TLBFLUSH_H
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -165,4 +165,4 @@ static inline void flush_tlb_kernel_range(unsigned long start, ...@@ -165,4 +165,4 @@ static inline void flush_tlb_kernel_range(unsigned long start,
flush_tlb_all(); flush_tlb_all();
} }
#endif /* _ASM_X86_TLBFLUSH_H */ #endif /* ASM_X86__TLBFLUSH_H */
include/asm-x86/topology.h
View file @ b8cd9d05
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* *
* Send feedback to <colpatch@us.ibm.com> * Send feedback to <colpatch@us.ibm.com>
*/ */
#ifndef _ASM_X86_TOPOLOGY_H #ifndef ASM_X86__TOPOLOGY_H
#define _ASM_X86_TOPOLOGY_H #define ASM_X86__TOPOLOGY_H
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# ifdef CONFIG_X86_HT # ifdef CONFIG_X86_HT
...@@ -255,4 +255,4 @@ static inline void set_mp_bus_to_node(int busnum, int node) ...@@ -255,4 +255,4 @@ static inline void set_mp_bus_to_node(int busnum, int node)
} }
#endif #endif
#endif /* _ASM_X86_TOPOLOGY_H */ #endif /* ASM_X86__TOPOLOGY_H */
include/asm-x86/trampoline.h
View file @ b8cd9d05
#ifndef __TRAMPOLINE_HEADER #ifndef ASM_X86__TRAMPOLINE_H
#define __TRAMPOLINE_HEADER #define ASM_X86__TRAMPOLINE_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -18,4 +18,4 @@ extern unsigned long setup_trampoline(void); ...@@ -18,4 +18,4 @@ extern unsigned long setup_trampoline(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __TRAMPOLINE_HEADER */ #endif /* ASM_X86__TRAMPOLINE_H */
include/asm-x86/traps.h
View file @ b8cd9d05
#ifndef _ASM_X86_TRAPS_H #ifndef ASM_X86__TRAPS_H
#define _ASM_X86_TRAPS_H #define ASM_X86__TRAPS_H
/* Common in X86_32 and X86_64 */ /* Common in X86_32 and X86_64 */
asmlinkage void divide_error(void); asmlinkage void divide_error(void);
...@@ -63,4 +63,4 @@ asmlinkage void do_simd_coprocessor_error(struct pt_regs *); ...@@ -63,4 +63,4 @@ asmlinkage void do_simd_coprocessor_error(struct pt_regs *);
asmlinkage void do_spurious_interrupt_bug(struct pt_regs *); asmlinkage void do_spurious_interrupt_bug(struct pt_regs *);
#endif /* CONFIG_X86_32 */ #endif /* CONFIG_X86_32 */
#endif /* _ASM_X86_TRAPS_H */ #endif /* ASM_X86__TRAPS_H */
include/asm-x86/tsc.h
View file @ b8cd9d05
/* /*
* x86 TSC related functions * x86 TSC related functions
*/ */
#ifndef _ASM_X86_TSC_H #ifndef ASM_X86__TSC_H
#define _ASM_X86_TSC_H #define ASM_X86__TSC_H
#include <asm/processor.h> #include <asm/processor.h>
...@@ -59,4 +59,4 @@ extern void check_tsc_sync_target(void); ...@@ -59,4 +59,4 @@ extern void check_tsc_sync_target(void);
extern int notsc_setup(char *); extern int notsc_setup(char *);
#endif #endif /* ASM_X86__TSC_H */
include/asm-x86/types.h
View file @ b8cd9d05
#ifndef _ASM_X86_TYPES_H #ifndef ASM_X86__TYPES_H
#define _ASM_X86_TYPES_H #define ASM_X86__TYPES_H
#include <asm-generic/int-ll64.h> #include <asm-generic/int-ll64.h>
...@@ -33,4 +33,4 @@ typedef u32 dma_addr_t; ...@@ -33,4 +33,4 @@ typedef u32 dma_addr_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif /* ASM_X86__TYPES_H */
include/asm-x86/uaccess.h
View file @ b8cd9d05
#ifndef _ASM_UACCES_H_ #ifndef ASM_X86__UACCESS_H
#define _ASM_UACCES_H_ #define ASM_X86__UACCESS_H
/* /*
* User space memory access functions * User space memory access functions
*/ */
...@@ -450,5 +450,5 @@ extern struct movsl_mask { ...@@ -450,5 +450,5 @@ extern struct movsl_mask {
# include "uaccess_64.h" # include "uaccess_64.h"
#endif #endif
#endif #endif /* ASM_X86__UACCESS_H */
include/asm-x86/uaccess_32.h
View file @ b8cd9d05
#ifndef __i386_UACCESS_H #ifndef ASM_X86__UACCESS_32_H
#define __i386_UACCESS_H #define ASM_X86__UACCESS_32_H
/* /*
* User space memory access functions * User space memory access functions
...@@ -215,4 +215,4 @@ long strnlen_user(const char __user *str, long n); ...@@ -215,4 +215,4 @@ long strnlen_user(const char __user *str, long n);
unsigned long __must_check clear_user(void __user *mem, unsigned long len); unsigned long __must_check clear_user(void __user *mem, unsigned long len);
unsigned long __must_check __clear_user(void __user *mem, unsigned long len); unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
#endif /* __i386_UACCESS_H */ #endif /* ASM_X86__UACCESS_32_H */
include/asm-x86/uaccess_64.h
View file @ b8cd9d05
#ifndef __X86_64_UACCESS_H #ifndef ASM_X86__UACCESS_64_H
#define __X86_64_UACCESS_H #define ASM_X86__UACCESS_64_H
/* /*
* User space memory access functions * User space memory access functions
...@@ -199,4 +199,4 @@ static inline int __copy_from_user_inatomic_nocache(void *dst, ...@@ -199,4 +199,4 @@ static inline int __copy_from_user_inatomic_nocache(void *dst,
unsigned long unsigned long
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
#endif /* __X86_64_UACCESS_H */ #endif /* ASM_X86__UACCESS_64_H */
include/asm-x86/ucontext.h
View file @ b8cd9d05
#ifndef _ASM_X86_UCONTEXT_H #ifndef ASM_X86__UCONTEXT_H
#define _ASM_X86_UCONTEXT_H #define ASM_X86__UCONTEXT_H
struct ucontext { struct ucontext {
unsigned long uc_flags; unsigned long uc_flags;
...@@ -9,4 +9,4 @@ struct ucontext { ...@@ -9,4 +9,4 @@ struct ucontext {
sigset_t uc_sigmask; /* mask last for extensibility */ sigset_t uc_sigmask; /* mask last for extensibility */
}; };
#endif /* _ASM_X86_UCONTEXT_H */ #endif /* ASM_X86__UCONTEXT_H */
include/asm-x86/unaligned.h
View file @ b8cd9d05
#ifndef _ASM_X86_UNALIGNED_H #ifndef ASM_X86__UNALIGNED_H
#define _ASM_X86_UNALIGNED_H #define ASM_X86__UNALIGNED_H
/* /*
* The x86 can do unaligned accesses itself. * The x86 can do unaligned accesses itself.
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
#define get_unaligned __get_unaligned_le #define get_unaligned __get_unaligned_le
#define put_unaligned __put_unaligned_le #define put_unaligned __put_unaligned_le
#endif /* _ASM_X86_UNALIGNED_H */ #endif /* ASM_X86__UNALIGNED_H */
include/asm-x86/unistd_32.h
View file @ b8cd9d05
#ifndef _ASM_I386_UNISTD_H_ #ifndef ASM_X86__UNISTD_32_H
#define _ASM_I386_UNISTD_H_ #define ASM_X86__UNISTD_32_H
/* /*
* This file contains the system call numbers. * This file contains the system call numbers.
...@@ -376,4 +376,4 @@ ...@@ -376,4 +376,4 @@
#endif #endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_I386_UNISTD_H_ */ #endif /* ASM_X86__UNISTD_32_H */
include/asm-x86/unistd_64.h
View file @ b8cd9d05
#ifndef _ASM_X86_64_UNISTD_H_ #ifndef ASM_X86__UNISTD_64_H
#define _ASM_X86_64_UNISTD_H_ #define ASM_X86__UNISTD_64_H
#ifndef __SYSCALL #ifndef __SYSCALL
#define __SYSCALL(a, b) #define __SYSCALL(a, b)
...@@ -690,4 +690,4 @@ __SYSCALL(__NR_inotify_init1, sys_inotify_init1) ...@@ -690,4 +690,4 @@ __SYSCALL(__NR_inotify_init1, sys_inotify_init1)
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_X86_64_UNISTD_H_ */ #endif /* ASM_X86__UNISTD_64_H */
include/asm-x86/unwind.h
View file @ b8cd9d05
#ifndef _ASM_X86_UNWIND_H #ifndef ASM_X86__UNWIND_H
#define _ASM_X86_UNWIND_H #define ASM_X86__UNWIND_H
#define UNW_PC(frame) ((void)(frame), 0UL) #define UNW_PC(frame) ((void)(frame), 0UL)
#define UNW_SP(frame) ((void)(frame), 0UL) #define UNW_SP(frame) ((void)(frame), 0UL)
...@@ -10,4 +10,4 @@ static inline int arch_unw_user_mode(const void *info) ...@@ -10,4 +10,4 @@ static inline int arch_unw_user_mode(const void *info)
return 0; return 0;
} }
#endif /* _ASM_X86_UNWIND_H */ #endif /* ASM_X86__UNWIND_H */
include/asm-x86/user32.h
View file @ b8cd9d05
#ifndef USER32_H #ifndef ASM_X86__USER32_H
#define USER32_H 1 #define ASM_X86__USER32_H
/* IA32 compatible user structures for ptrace. /* IA32 compatible user structures for ptrace.
* These should be used for 32bit coredumps too. */ * These should be used for 32bit coredumps too. */
...@@ -67,4 +67,4 @@ struct user32 { ...@@ -67,4 +67,4 @@ struct user32 {
}; };
#endif #endif /* ASM_X86__USER32_H */
include/asm-x86/user_32.h
View file @ b8cd9d05
#ifndef _I386_USER_H #ifndef ASM_X86__USER_32_H
#define _I386_USER_H #define ASM_X86__USER_32_H
#include <asm/page.h> #include <asm/page.h>
/* Core file format: The core file is written in such a way that gdb /* Core file format: The core file is written in such a way that gdb
...@@ -128,4 +128,4 @@ struct user{ ...@@ -128,4 +128,4 @@ struct user{
#define HOST_TEXT_START_ADDR (u.start_code) #define HOST_TEXT_START_ADDR (u.start_code)
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
#endif /* _I386_USER_H */ #endif /* ASM_X86__USER_32_H */
include/asm-x86/user_64.h
View file @ b8cd9d05
#ifndef _X86_64_USER_H #ifndef ASM_X86__USER_64_H
#define _X86_64_USER_H #define ASM_X86__USER_64_H
#include <asm/types.h> #include <asm/types.h>
#include <asm/page.h> #include <asm/page.h>
...@@ -134,4 +134,4 @@ struct user { ...@@ -134,4 +134,4 @@ struct user {
#define HOST_TEXT_START_ADDR (u.start_code) #define HOST_TEXT_START_ADDR (u.start_code)
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
#endif /* _X86_64_USER_H */ #endif /* ASM_X86__USER_64_H */
include/asm-x86/uv/bios.h
View file @ b8cd9d05
#ifndef _ASM_X86_BIOS_H #ifndef ASM_X86__UV__BIOS_H
#define _ASM_X86_BIOS_H #define ASM_X86__UV__BIOS_H
/* /*
* BIOS layer definitions. * BIOS layer definitions.
...@@ -65,4 +65,4 @@ x86_bios_freq_base(unsigned long which, unsigned long *ticks_per_second, ...@@ -65,4 +65,4 @@ x86_bios_freq_base(unsigned long which, unsigned long *ticks_per_second,
unsigned long *drift_info); unsigned long *drift_info);
extern const char *x86_bios_strerror(long status); extern const char *x86_bios_strerror(long status);
#endif /* _ASM_X86_BIOS_H */ #endif /* ASM_X86__UV__BIOS_H */
include/asm-x86/uv/uv_bau.h
View file @ b8cd9d05
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
*/ */
#ifndef __ASM_X86_UV_BAU__ #ifndef ASM_X86__UV__UV_BAU_H
#define __ASM_X86_UV_BAU__ #define ASM_X86__UV__UV_BAU_H
#include <linux/bitmap.h> #include <linux/bitmap.h>
#define BITSPERBYTE 8 #define BITSPERBYTE 8
...@@ -329,4 +329,4 @@ extern int uv_flush_tlb_others(cpumask_t *, struct mm_struct *, unsigned long); ...@@ -329,4 +329,4 @@ extern int uv_flush_tlb_others(cpumask_t *, struct mm_struct *, unsigned long);
extern void uv_bau_message_intr1(void); extern void uv_bau_message_intr1(void);
extern void uv_bau_timeout_intr1(void); extern void uv_bau_timeout_intr1(void);
#endif /* __ASM_X86_UV_BAU__ */ #endif /* ASM_X86__UV__UV_BAU_H */
include/asm-x86/uv/uv_hub.h
View file @ b8cd9d05
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved.
*/ */
#ifndef __ASM_X86_UV_HUB_H__ #ifndef ASM_X86__UV__UV_HUB_H
#define __ASM_X86_UV_HUB_H__ #define ASM_X86__UV__UV_HUB_H
#include <linux/numa.h> #include <linux/numa.h>
#include <linux/percpu.h> #include <linux/percpu.h>
...@@ -350,5 +350,5 @@ static inline int uv_num_possible_blades(void) ...@@ -350,5 +350,5 @@ static inline int uv_num_possible_blades(void)
return uv_possible_blades; return uv_possible_blades;
} }
#endif /* __ASM_X86_UV_HUB__ */ #endif /* ASM_X86__UV__UV_HUB_H */
include/asm-x86/uv/uv_mmrs.h
View file @ b8cd9d05
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved.
*/ */
#ifndef __ASM_X86_UV_MMRS__ #ifndef ASM_X86__UV__UV_MMRS_H
#define __ASM_X86_UV_MMRS__ #define ASM_X86__UV__UV_MMRS_H
#define UV_MMR_ENABLE (1UL << 63) #define UV_MMR_ENABLE (1UL << 63)
...@@ -1292,4 +1292,4 @@ union uvh_si_alias2_overlay_config_u { ...@@ -1292,4 +1292,4 @@ union uvh_si_alias2_overlay_config_u {
}; };
#endif /* __ASM_X86_UV_MMRS__ */ #endif /* ASM_X86__UV__UV_MMRS_H */
include/asm-x86/vdso.h
View file @ b8cd9d05
#ifndef _ASM_X86_VDSO_H #ifndef ASM_X86__VDSO_H
#define _ASM_X86_VDSO_H 1 #define ASM_X86__VDSO_H
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
extern const char VDSO64_PRELINK[]; extern const char VDSO64_PRELINK[];
...@@ -44,4 +44,4 @@ extern const char vdso32_int80_start, vdso32_int80_end; ...@@ -44,4 +44,4 @@ extern const char vdso32_int80_start, vdso32_int80_end;
extern const char vdso32_syscall_start, vdso32_syscall_end; extern const char vdso32_syscall_start, vdso32_syscall_end;
extern const char vdso32_sysenter_start, vdso32_sysenter_end; extern const char vdso32_sysenter_start, vdso32_sysenter_end;
#endif /* asm-x86/vdso.h */ #endif /* ASM_X86__VDSO_H */
include/asm-x86/vga.h
View file @ b8cd9d05
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* (c) 1998 Martin Mares <mj@ucw.cz> * (c) 1998 Martin Mares <mj@ucw.cz>
*/ */
#ifndef _LINUX_ASM_VGA_H_ #ifndef ASM_X86__VGA_H
#define _LINUX_ASM_VGA_H_ #define ASM_X86__VGA_H
/* /*
* On the PC, we can just recalculate addresses and then * On the PC, we can just recalculate addresses and then
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
#define vga_readb(x) (*(x)) #define vga_readb(x) (*(x))
#define vga_writeb(x, y) (*(y) = (x)) #define vga_writeb(x, y) (*(y) = (x))
#endif #endif /* ASM_X86__VGA_H */
include/asm-x86/vgtod.h
View file @ b8cd9d05
#ifndef _ASM_VGTOD_H #ifndef ASM_X86__VGTOD_H
#define _ASM_VGTOD_H 1 #define ASM_X86__VGTOD_H
#include <asm/vsyscall.h> #include <asm/vsyscall.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
...@@ -26,4 +26,4 @@ extern struct vsyscall_gtod_data __vsyscall_gtod_data ...@@ -26,4 +26,4 @@ extern struct vsyscall_gtod_data __vsyscall_gtod_data
__section_vsyscall_gtod_data; __section_vsyscall_gtod_data;
extern struct vsyscall_gtod_data vsyscall_gtod_data; extern struct vsyscall_gtod_data vsyscall_gtod_data;
#endif #endif /* ASM_X86__VGTOD_H */
include/asm-x86/visws/cobalt.h
View file @ b8cd9d05
#ifndef __I386_SGI_COBALT_H #ifndef ASM_X86__VISWS__COBALT_H
#define __I386_SGI_COBALT_H #define ASM_X86__VISWS__COBALT_H
#include <asm/fixmap.h> #include <asm/fixmap.h>
...@@ -122,4 +122,4 @@ extern char visws_board_type; ...@@ -122,4 +122,4 @@ extern char visws_board_type;
extern char visws_board_rev; extern char visws_board_rev;
#endif /* __I386_SGI_COBALT_H */ #endif /* ASM_X86__VISWS__COBALT_H */
include/asm-x86/visws/lithium.h
View file @ b8cd9d05
#ifndef __I386_SGI_LITHIUM_H #ifndef ASM_X86__VISWS__LITHIUM_H
#define __I386_SGI_LITHIUM_H #define ASM_X86__VISWS__LITHIUM_H
#include <asm/fixmap.h> #include <asm/fixmap.h>
...@@ -49,5 +49,5 @@ static inline unsigned short li_pcib_read16(unsigned long reg) ...@@ -49,5 +49,5 @@ static inline unsigned short li_pcib_read16(unsigned long reg)
return *((volatile unsigned short *)(LI_PCIB_VADDR+reg)); return *((volatile unsigned short *)(LI_PCIB_VADDR+reg));
} }
#endif #endif /* ASM_X86__VISWS__LITHIUM_H */
include/asm-x86/visws/piix4.h
View file @ b8cd9d05
#ifndef __I386_SGI_PIIX_H #ifndef ASM_X86__VISWS__PIIX4_H
#define __I386_SGI_PIIX_H #define ASM_X86__VISWS__PIIX4_H
/* /*
* PIIX4 as used on SGI Visual Workstations * PIIX4 as used on SGI Visual Workstations
...@@ -104,4 +104,4 @@ ...@@ -104,4 +104,4 @@
*/ */
#define PIIX_GPI_STPCLK 0x4 // STPCLK signal routed back in #define PIIX_GPI_STPCLK 0x4 // STPCLK signal routed back in
#endif #endif /* ASM_X86__VISWS__PIIX4_H */
include/asm-x86/vm86.h
View file @ b8cd9d05
#ifndef _LINUX_VM86_H #ifndef ASM_X86__VM86_H
#define _LINUX_VM86_H #define ASM_X86__VM86_H
/* /*
* I'm guessing at the VIF/VIP flag usage, but hope that this is how * I'm guessing at the VIF/VIP flag usage, but hope that this is how
...@@ -205,4 +205,4 @@ static inline int handle_vm86_trap(struct kernel_vm86_regs *a, long b, int c) ...@@ -205,4 +205,4 @@ static inline int handle_vm86_trap(struct kernel_vm86_regs *a, long b, int c)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif /* ASM_X86__VM86_H */
include/asm-x86/vmi_time.h
View file @ b8cd9d05
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* *
*/ */
#ifndef __VMI_TIME_H #ifndef ASM_X86__VMI_TIME_H
#define __VMI_TIME_H #define ASM_X86__VMI_TIME_H
/* /*
* Raw VMI call indices for timer functions * Raw VMI call indices for timer functions
...@@ -95,4 +95,4 @@ extern void __devinit vmi_time_ap_init(void); ...@@ -95,4 +95,4 @@ extern void __devinit vmi_time_ap_init(void);
#define CONFIG_VMI_ALARM_HZ 100 #define CONFIG_VMI_ALARM_HZ 100
#endif #endif /* ASM_X86__VMI_TIME_H */
include/asm-x86/vsyscall.h
View file @ b8cd9d05
#ifndef _ASM_X86_64_VSYSCALL_H_ #ifndef ASM_X86__VSYSCALL_H
#define _ASM_X86_64_VSYSCALL_H_ #define ASM_X86__VSYSCALL_H
enum vsyscall_num { enum vsyscall_num {
__NR_vgettimeofday, __NR_vgettimeofday,
...@@ -41,4 +41,4 @@ extern void map_vsyscall(void); ...@@ -41,4 +41,4 @@ extern void map_vsyscall(void);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_X86_64_VSYSCALL_H_ */ #endif /* ASM_X86__VSYSCALL_H */
include/asm-x86/xen/events.h
View file @ b8cd9d05
#ifndef __XEN_EVENTS_H #ifndef ASM_X86__XEN__EVENTS_H
#define __XEN_EVENTS_H #define ASM_X86__XEN__EVENTS_H
enum ipi_vector { enum ipi_vector {
XEN_RESCHEDULE_VECTOR, XEN_RESCHEDULE_VECTOR,
...@@ -21,4 +21,4 @@ static inline void xen_do_IRQ(int irq, struct pt_regs *regs) ...@@ -21,4 +21,4 @@ static inline void xen_do_IRQ(int irq, struct pt_regs *regs)
do_IRQ(regs); do_IRQ(regs);
} }
#endif /* __XEN_EVENTS_H */ #endif /* ASM_X86__XEN__EVENTS_H */
include/asm-x86/xen/grant_table.h
View file @ b8cd9d05
#ifndef __XEN_GRANT_TABLE_H #ifndef ASM_X86__XEN__GRANT_TABLE_H
#define __XEN_GRANT_TABLE_H #define ASM_X86__XEN__GRANT_TABLE_H
#define xen_alloc_vm_area(size) alloc_vm_area(size) #define xen_alloc_vm_area(size) alloc_vm_area(size)
#define xen_free_vm_area(area) free_vm_area(area) #define xen_free_vm_area(area) free_vm_area(area)
#endif /* __XEN_GRANT_TABLE_H */ #endif /* ASM_X86__XEN__GRANT_TABLE_H */
include/asm-x86/xen/hypercall.h
View file @ b8cd9d05
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __HYPERCALL_H__ #ifndef ASM_X86__XEN__HYPERCALL_H
#define __HYPERCALL_H__ #define ASM_X86__XEN__HYPERCALL_H
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -524,4 +524,4 @@ MULTI_stack_switch(struct multicall_entry *mcl, ...@@ -524,4 +524,4 @@ MULTI_stack_switch(struct multicall_entry *mcl,
mcl->args[1] = esp; mcl->args[1] = esp;
} }
#endif /* __HYPERCALL_H__ */ #endif /* ASM_X86__XEN__HYPERCALL_H */
include/asm-x86/xen/hypervisor.h
View file @ b8cd9d05
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __HYPERVISOR_H__ #ifndef ASM_X86__XEN__HYPERVISOR_H
#define __HYPERVISOR_H__ #define ASM_X86__XEN__HYPERVISOR_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -69,4 +69,4 @@ u64 jiffies_to_st(unsigned long jiffies); ...@@ -69,4 +69,4 @@ u64 jiffies_to_st(unsigned long jiffies);
#define is_running_on_xen() (xen_start_info ? 1 : 0) #define is_running_on_xen() (xen_start_info ? 1 : 0)
#endif /* __HYPERVISOR_H__ */ #endif /* ASM_X86__XEN__HYPERVISOR_H */
include/asm-x86/xen/interface.h
View file @ b8cd9d05
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* Copyright (c) 2004, K A Fraser * Copyright (c) 2004, K A Fraser
*/ */
#ifndef __ASM_X86_XEN_INTERFACE_H #ifndef ASM_X86__XEN__INTERFACE_H
#define __ASM_X86_XEN_INTERFACE_H #define ASM_X86__XEN__INTERFACE_H
#ifdef __XEN__ #ifdef __XEN__
#define __DEFINE_GUEST_HANDLE(name, type) \ #define __DEFINE_GUEST_HANDLE(name, type) \
...@@ -172,4 +172,4 @@ DEFINE_GUEST_HANDLE_STRUCT(vcpu_guest_context); ...@@ -172,4 +172,4 @@ DEFINE_GUEST_HANDLE_STRUCT(vcpu_guest_context);
#define XEN_CPUID XEN_EMULATE_PREFIX "cpuid" #define XEN_CPUID XEN_EMULATE_PREFIX "cpuid"
#endif #endif
#endif /* __ASM_X86_XEN_INTERFACE_H */ #endif /* ASM_X86__XEN__INTERFACE_H */
include/asm-x86/xen/interface_32.h
View file @ b8cd9d05
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* Copyright (c) 2004, K A Fraser * Copyright (c) 2004, K A Fraser
*/ */
#ifndef __ASM_X86_XEN_INTERFACE_32_H #ifndef ASM_X86__XEN__INTERFACE_32_H
#define __ASM_X86_XEN_INTERFACE_32_H #define ASM_X86__XEN__INTERFACE_32_H
/* /*
...@@ -94,4 +94,4 @@ typedef struct xen_callback xen_callback_t; ...@@ -94,4 +94,4 @@ typedef struct xen_callback xen_callback_t;
#define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) #define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20))
#define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) #define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20))
#endif /* __ASM_X86_XEN_INTERFACE_32_H */ #endif /* ASM_X86__XEN__INTERFACE_32_H */
include/asm-x86/xen/interface_64.h
View file @ b8cd9d05
#ifndef __ASM_X86_XEN_INTERFACE_64_H #ifndef ASM_X86__XEN__INTERFACE_64_H
#define __ASM_X86_XEN_INTERFACE_64_H #define ASM_X86__XEN__INTERFACE_64_H
/* /*
* 64-bit segment selectors * 64-bit segment selectors
...@@ -156,4 +156,4 @@ typedef unsigned long xen_callback_t; ...@@ -156,4 +156,4 @@ typedef unsigned long xen_callback_t;
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* __ASM_X86_XEN_INTERFACE_64_H */ #endif /* ASM_X86__XEN__INTERFACE_64_H */
include/asm-x86/xen/page.h
View file @ b8cd9d05
#ifndef __XEN_PAGE_H #ifndef ASM_X86__XEN__PAGE_H
#define __XEN_PAGE_H #define ASM_X86__XEN__PAGE_H
#include <linux/pfn.h> #include <linux/pfn.h>
...@@ -162,4 +162,4 @@ xmaddr_t arbitrary_virt_to_machine(void *address); ...@@ -162,4 +162,4 @@ xmaddr_t arbitrary_virt_to_machine(void *address);
void make_lowmem_page_readonly(void *vaddr); void make_lowmem_page_readonly(void *vaddr);
void make_lowmem_page_readwrite(void *vaddr); void make_lowmem_page_readwrite(void *vaddr);
#endif /* __XEN_PAGE_H */ #endif /* ASM_X86__XEN__PAGE_H */
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7