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

x86: Fix ASM_X86__ header guards

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

a. the double underscore is ugly and pointless.
b. no leading underscore violates namespace constraints.
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 87e299e5
......@@ -41,12 +41,12 @@
#define stub_rt_sigreturn sys_rt_sigreturn
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
#undef ASM_X86__UNISTD_64_H
#undef _ASM_X86_UNISTD_64_H
#include "../../x86/include/asm/unistd_64.h"
#undef __SYSCALL
#define __SYSCALL(nr, sym) [ nr ] = sym,
#undef ASM_X86__UNISTD_64_H
#undef _ASM_X86_UNISTD_64_H
typedef void (*sys_call_ptr_t)(void);
......
......@@ -16,7 +16,7 @@
*/
#undef CONFIG_PARAVIRT
#ifdef CONFIG_X86_32
#define ASM_X86__DESC_H 1
#define _ASM_X86_DESC_H 1
#endif
#ifdef CONFIG_X86_64
......
......@@ -9,8 +9,8 @@
* 2 of the Licence, or (at your option) any later version.
*/
#ifndef ASM_X86__A_OUT_CORE_H
#define ASM_X86__A_OUT_CORE_H
#ifndef _ASM_X86_A_OUT_CORE_H
#define _ASM_X86_A_OUT_CORE_H
#ifdef __KERNEL__
#ifdef CONFIG_X86_32
......@@ -70,4 +70,4 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
#endif /* CONFIG_X86_32 */
#endif /* __KERNEL__ */
#endif /* ASM_X86__A_OUT_CORE_H */
#endif /* _ASM_X86_A_OUT_CORE_H */
#ifndef ASM_X86__A_OUT_H
#define ASM_X86__A_OUT_H
#ifndef _ASM_X86_A_OUT_H
#define _ASM_X86_A_OUT_H
struct exec
{
......@@ -17,4 +17,4 @@ struct exec
#define N_DRSIZE(a) ((a).a_drsize)
#define N_SYMSIZE(a) ((a).a_syms)
#endif /* ASM_X86__A_OUT_H */
#endif /* _ASM_X86_A_OUT_H */
#ifndef ASM_X86__ACPI_H
#define ASM_X86__ACPI_H
#ifndef _ASM_X86_ACPI_H
#define _ASM_X86_ACPI_H
/*
* Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
......@@ -175,4 +175,4 @@ static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
#define acpi_unlazy_tlb(x) leave_mm(x)
#endif /* ASM_X86__ACPI_H */
#endif /* _ASM_X86_ACPI_H */
#ifndef ASM_X86__AGP_H
#define ASM_X86__AGP_H
#ifndef _ASM_X86_AGP_H
#define _ASM_X86_AGP_H
#include <asm/pgtable.h>
#include <asm/cacheflush.h>
......@@ -32,4 +32,4 @@
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif /* ASM_X86__AGP_H */
#endif /* _ASM_X86_AGP_H */
#ifndef ASM_X86__ALTERNATIVE_H
#define ASM_X86__ALTERNATIVE_H
#ifndef _ASM_X86_ALTERNATIVE_H
#define _ASM_X86_ALTERNATIVE_H
#include <linux/types.h>
#include <linux/stddef.h>
......@@ -180,4 +180,4 @@ extern void add_nops(void *insns, unsigned int len);
extern void *text_poke(void *addr, const void *opcode, size_t len);
extern void *text_poke_early(void *addr, const void *opcode, size_t len);
#endif /* ASM_X86__ALTERNATIVE_H */
#endif /* _ASM_X86_ALTERNATIVE_H */
......@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef ASM_X86__AMD_IOMMU_H
#define ASM_X86__AMD_IOMMU_H
#ifndef _ASM_X86_AMD_IOMMU_H
#define _ASM_X86_AMD_IOMMU_H
#include <linux/irqreturn.h>
......@@ -32,4 +32,4 @@ static inline int amd_iommu_init(void) { return -ENODEV; }
static inline void amd_iommu_detect(void) { }
#endif
#endif /* ASM_X86__AMD_IOMMU_H */
#endif /* _ASM_X86_AMD_IOMMU_H */
......@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef ASM_X86__AMD_IOMMU_TYPES_H
#define ASM_X86__AMD_IOMMU_TYPES_H
#ifndef _ASM_X86_AMD_IOMMU_TYPES_H
#define _ASM_X86_AMD_IOMMU_TYPES_H
#include <linux/types.h>
#include <linux/list.h>
......@@ -401,4 +401,4 @@ static inline u16 calc_devid(u8 bus, u8 devfn)
return (((u16)bus) << 8) | devfn;
}
#endif /* ASM_X86__AMD_IOMMU_TYPES_H */
#endif /* _ASM_X86_AMD_IOMMU_TYPES_H */
#ifndef ASM_X86__APIC_H
#define ASM_X86__APIC_H
#ifndef _ASM_X86_APIC_H
#define _ASM_X86_APIC_H
#include <linux/pm.h>
#include <linux/delay.h>
......@@ -196,4 +196,4 @@ static inline void init_apic_mappings(void) { }
#endif /* !CONFIG_X86_LOCAL_APIC */
#endif /* ASM_X86__APIC_H */
#endif /* _ASM_X86_APIC_H */
#ifndef ASM_X86__APICDEF_H
#define ASM_X86__APICDEF_H
#ifndef _ASM_X86_APICDEF_H
#define _ASM_X86_APICDEF_H
/*
* Constants for various Intel APICs. (local APIC, IOAPIC, etc.)
......@@ -414,4 +414,4 @@ struct local_apic {
#else
#define BAD_APICID 0xFFFFu
#endif
#endif /* ASM_X86__APICDEF_H */
#endif /* _ASM_X86_APICDEF_H */
#ifndef ASM_X86__ARCH_HOOKS_H
#define ASM_X86__ARCH_HOOKS_H
#ifndef _ASM_X86_ARCH_HOOKS_H
#define _ASM_X86_ARCH_HOOKS_H
#include <linux/interrupt.h>
......@@ -23,4 +23,4 @@ extern void pre_time_init_hook(void);
extern void time_init_hook(void);
extern void mca_nmi_hook(void);
#endif /* ASM_X86__ARCH_HOOKS_H */
#endif /* _ASM_X86_ARCH_HOOKS_H */
#ifndef ASM_X86__ASM_H
#define ASM_X86__ASM_H
#ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H
#ifdef __ASSEMBLY__
# define __ASM_FORM(x) x
......@@ -44,4 +44,4 @@
_ASM_PTR #from "," #to "\n" \
" .previous\n"
#endif /* ASM_X86__ASM_H */
#endif /* _ASM_X86_ASM_H */
#ifndef ASM_X86__ATOMIC_32_H
#define ASM_X86__ATOMIC_32_H
#ifndef _ASM_X86_ATOMIC_32_H
#define _ASM_X86_ATOMIC_32_H
#include <linux/compiler.h>
#include <asm/processor.h>
......@@ -256,4 +256,4 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h>
#endif /* ASM_X86__ATOMIC_32_H */
#endif /* _ASM_X86_ATOMIC_32_H */
#ifndef ASM_X86__ATOMIC_64_H
#define ASM_X86__ATOMIC_64_H
#ifndef _ASM_X86_ATOMIC_64_H
#define _ASM_X86_ATOMIC_64_H
#include <asm/alternative.h>
#include <asm/cmpxchg.h>
......@@ -470,4 +470,4 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
#define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h>
#endif /* ASM_X86__ATOMIC_64_H */
#endif /* _ASM_X86_ATOMIC_64_H */
#ifndef ASM_X86__AUXVEC_H
#define ASM_X86__AUXVEC_H
#ifndef _ASM_X86_AUXVEC_H
#define _ASM_X86_AUXVEC_H
/*
* Architecture-neutral AT_ values in 0-17, leave some room
* for more of them, start the x86-specific ones at 32.
......@@ -9,4 +9,4 @@
#endif
#define AT_SYSINFO_EHDR 33
#endif /* ASM_X86__AUXVEC_H */
#endif /* _ASM_X86_AUXVEC_H */
#ifndef ASM_X86__BIOS_EBDA_H
#define ASM_X86__BIOS_EBDA_H
#ifndef _ASM_X86_BIOS_EBDA_H
#define _ASM_X86_BIOS_EBDA_H
#include <asm/io.h>
......@@ -33,4 +33,4 @@ static inline void start_periodic_check_for_corruption(void)
}
#endif
#endif /* ASM_X86__BIOS_EBDA_H */
#endif /* _ASM_X86_BIOS_EBDA_H */
#ifndef ASM_X86__BITOPS_H
#define ASM_X86__BITOPS_H
#ifndef _ASM_X86_BITOPS_H
#define _ASM_X86_BITOPS_H
/*
* Copyright 1992, Linus Torvalds.
......@@ -448,4 +448,4 @@ static inline int fls(int x)
#include <asm-generic/bitops/minix.h>
#endif /* __KERNEL__ */
#endif /* ASM_X86__BITOPS_H */
#endif /* _ASM_X86_BITOPS_H */
#ifndef ASM_X86__BOOT_H
#define ASM_X86__BOOT_H
#ifndef _ASM_X86_BOOT_H
#define _ASM_X86_BOOT_H
/* Don't touch these, unless you really know what you're doing. */
#define DEF_SYSSEG 0x1000
......@@ -23,4 +23,4 @@
#define BOOT_STACK_SIZE 0x1000
#endif
#endif /* ASM_X86__BOOT_H */
#endif /* _ASM_X86_BOOT_H */
#ifndef ASM_X86__BOOTPARAM_H
#define ASM_X86__BOOTPARAM_H
#ifndef _ASM_X86_BOOTPARAM_H
#define _ASM_X86_BOOTPARAM_H
#include <linux/types.h>
#include <linux/screen_info.h>
......@@ -108,4 +108,4 @@ struct boot_params {
__u8 _pad9[276]; /* 0xeec */
} __attribute__((packed));
#endif /* ASM_X86__BOOTPARAM_H */
#endif /* _ASM_X86_BOOTPARAM_H */
#ifndef ASM_X86__BUG_H
#define ASM_X86__BUG_H
#ifndef _ASM_X86_BUG_H
#define _ASM_X86_BUG_H
#ifdef CONFIG_BUG
#define HAVE_ARCH_BUG
......@@ -36,4 +36,4 @@ do { \
#endif /* !CONFIG_BUG */
#include <asm-generic/bug.h>
#endif /* ASM_X86__BUG_H */
#endif /* _ASM_X86_BUG_H */
#ifndef ASM_X86__BUGS_H
#define ASM_X86__BUGS_H
#ifndef _ASM_X86_BUGS_H
#define _ASM_X86_BUGS_H
extern void check_bugs(void);
......@@ -9,4 +9,4 @@ int ppro_with_ram_bug(void);
static inline int ppro_with_ram_bug(void) { return 0; }
#endif
#endif /* ASM_X86__BUGS_H */
#endif /* _ASM_X86_BUGS_H */
#ifndef ASM_X86__BYTEORDER_H
#define ASM_X86__BYTEORDER_H
#ifndef _ASM_X86_BYTEORDER_H
#define _ASM_X86_BYTEORDER_H
#include <asm/types.h>
#include <linux/compiler.h>
......@@ -78,4 +78,4 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
#include <linux/byteorder/little_endian.h>
#endif /* ASM_X86__BYTEORDER_H */
#endif /* _ASM_X86_BYTEORDER_H */
#ifndef ASM_X86__CACHE_H
#define ASM_X86__CACHE_H
#ifndef _ASM_X86_CACHE_H
#define _ASM_X86_CACHE_H
/* L1 cache line size */
#define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
......@@ -17,4 +17,4 @@
#endif
#endif
#endif /* ASM_X86__CACHE_H */
#endif /* _ASM_X86_CACHE_H */
#ifndef ASM_X86__CACHEFLUSH_H
#define ASM_X86__CACHEFLUSH_H
#ifndef _ASM_X86_CACHEFLUSH_H
#define _ASM_X86_CACHEFLUSH_H
/* Keep includes the same across arches. */
#include <linux/mm.h>
......@@ -115,4 +115,4 @@ static inline int rodata_test(void)
}
#endif
#endif /* ASM_X86__CACHEFLUSH_H */
#endif /* _ASM_X86_CACHEFLUSH_H */
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef ASM_X86__CALGARY_H
#define ASM_X86__CALGARY_H
#ifndef _ASM_X86_CALGARY_H
#define _ASM_X86_CALGARY_H
#include <linux/spinlock.h>
#include <linux/device.h>
......@@ -69,4 +69,4 @@ static inline int calgary_iommu_init(void) { return 1; }
static inline void detect_calgary(void) { return; }
#endif
#endif /* ASM_X86__CALGARY_H */
#endif /* _ASM_X86_CALGARY_H */
#ifndef ASM_X86__CHECKSUM_32_H
#define ASM_X86__CHECKSUM_32_H
#ifndef _ASM_X86_CHECKSUM_32_H
#define _ASM_X86_CHECKSUM_32_H
#include <linux/in6.h>
......@@ -186,4 +186,4 @@ static inline __wsum csum_and_copy_to_user(const void *src,
return (__force __wsum)-1; /* invalid checksum */
}
#endif /* ASM_X86__CHECKSUM_32_H */
#endif /* _ASM_X86_CHECKSUM_32_H */
#ifndef ASM_X86__CHECKSUM_64_H
#define ASM_X86__CHECKSUM_64_H
#ifndef _ASM_X86_CHECKSUM_64_H
#define _ASM_X86_CHECKSUM_64_H
/*
* Checksums for x86-64
......@@ -188,4 +188,4 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b)
return a;
}
#endif /* ASM_X86__CHECKSUM_64_H */
#endif /* _ASM_X86_CHECKSUM_64_H */
#ifndef ASM_X86__CMPXCHG_32_H
#define ASM_X86__CMPXCHG_32_H
#ifndef _ASM_X86_CMPXCHG_32_H
#define _ASM_X86_CMPXCHG_32_H
#include <linux/bitops.h> /* for LOCK_PREFIX */
......@@ -341,4 +341,4 @@ extern unsigned long long cmpxchg_486_u64(volatile void *, u64, u64);
#endif
#endif /* ASM_X86__CMPXCHG_32_H */
#endif /* _ASM_X86_CMPXCHG_32_H */
#ifndef ASM_X86__CMPXCHG_64_H
#define ASM_X86__CMPXCHG_64_H
#ifndef _ASM_X86_CMPXCHG_64_H
#define _ASM_X86_CMPXCHG_64_H
#include <asm/alternative.h> /* Provides LOCK_PREFIX */
......@@ -182,4 +182,4 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr,
cmpxchg_local((ptr), (o), (n)); \
})
#endif /* ASM_X86__CMPXCHG_64_H */
#endif /* _ASM_X86_CMPXCHG_64_H */
#ifndef ASM_X86__COMPAT_H
#define ASM_X86__COMPAT_H
#ifndef _ASM_X86_COMPAT_H
#define _ASM_X86_COMPAT_H
/*
* Architecture specific compatibility types
......@@ -215,4 +215,4 @@ static inline int is_compat_task(void)
return current_thread_info()->status & TS_COMPAT;
}
#endif /* ASM_X86__COMPAT_H */
#endif /* _ASM_X86_COMPAT_H */
#ifndef ASM_X86__CPU_H
#define ASM_X86__CPU_H
#ifndef _ASM_X86_CPU_H
#define _ASM_X86_CPU_H
#include <linux/device.h>
#include <linux/cpu.h>
......@@ -17,4 +17,4 @@ extern void arch_unregister_cpu(int);
#endif
DECLARE_PER_CPU(int, cpu_state);
#endif /* ASM_X86__CPU_H */
#endif /* _ASM_X86_CPU_H */
/*
* Defines x86 CPU feature bits
*/
#ifndef ASM_X86__CPUFEATURE_H
#define ASM_X86__CPUFEATURE_H
#ifndef _ASM_X86_CPUFEATURE_H
#define _ASM_X86_CPUFEATURE_H
#include <asm/required-features.h>
......@@ -268,4 +268,4 @@ extern const char * const x86_power_flags[32];
#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
#endif /* ASM_X86__CPUFEATURE_H */
#endif /* _ASM_X86_CPUFEATURE_H */
#ifndef ASM_X86__CURRENT_H
#define ASM_X86__CURRENT_H
#ifndef _ASM_X86_CURRENT_H
#define _ASM_X86_CURRENT_H
#ifdef CONFIG_X86_32
#include <linux/compiler.h>
......@@ -36,4 +36,4 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current()
#endif /* ASM_X86__CURRENT_H */
#endif /* _ASM_X86_CURRENT_H */
#ifndef ASM_X86__DEBUGREG_H
#define ASM_X86__DEBUGREG_H
#ifndef _ASM_X86_DEBUGREG_H
#define _ASM_X86_DEBUGREG_H
/* Indicate the register numbers for a number of the specific
......@@ -67,4 +67,4 @@
#define DR_LOCAL_SLOWDOWN (0x100) /* Local slow the pipeline */
#define DR_GLOBAL_SLOWDOWN (0x200) /* Global slow the pipeline */
#endif /* ASM_X86__DEBUGREG_H */
#endif /* _ASM_X86_DEBUGREG_H */
#ifndef ASM_X86__DELAY_H
#define ASM_X86__DELAY_H
#ifndef _ASM_X86_DELAY_H
#define _ASM_X86_DELAY_H
/*
* Copyright (C) 1993 Linus Torvalds
......@@ -28,4 +28,4 @@ extern void __delay(unsigned long loops);
void use_tsc_delay(void);
#endif /* ASM_X86__DELAY_H */
#endif /* _ASM_X86_DELAY_H */
#ifndef ASM_X86__DESC_H
#define ASM_X86__DESC_H
#ifndef _ASM_X86_DESC_H
#define _ASM_X86_DESC_H
#ifndef __ASSEMBLY__
#include <asm/desc_defs.h>
......@@ -406,4 +406,4 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
#endif /* __ASSEMBLY__ */
#endif /* ASM_X86__DESC_H */
#endif /* _ASM_X86_DESC_H */
/* Written 2000 by Andi Kleen */
#ifndef ASM_X86__DESC_DEFS_H
#define ASM_X86__DESC_DEFS_H
#ifndef _ASM_X86_DESC_DEFS_H
#define _ASM_X86_DESC_DEFS_H
/*
* Segment descriptor structure definitions, usable from both x86_64 and i386
......@@ -92,4 +92,4 @@ struct desc_ptr {
#endif /* !__ASSEMBLY__ */
#endif /* ASM_X86__DESC_DEFS_H */
#endif /* _ASM_X86_DESC_DEFS_H */
#ifndef ASM_X86__DEVICE_H
#define ASM_X86__DEVICE_H
#ifndef _ASM_X86_DEVICE_H
#define _ASM_X86_DEVICE_H
struct dev_archdata {
#ifdef CONFIG_ACPI
......@@ -13,4 +13,4 @@ struct dma_mapping_ops *dma_ops;
#endif
};
#endif /* ASM_X86__DEVICE_H */
#endif /* _ASM_X86_DEVICE_H */
#ifndef ASM_X86__DIV64_H
#define ASM_X86__DIV64_H
#ifndef _ASM_X86_DIV64_H
#define _ASM_X86_DIV64_H
#ifdef CONFIG_X86_32
......@@ -57,4 +57,4 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
# include <asm-generic/div64.h>
#endif /* CONFIG_X86_32 */
#endif /* ASM_X86__DIV64_H */
#endif /* _ASM_X86_DIV64_H */
#ifndef ASM_X86__DMA_MAPPING_H
#define ASM_X86__DMA_MAPPING_H
#ifndef _ASM_X86_DMA_MAPPING_H
#define _ASM_X86_DMA_MAPPING_H
/*
* IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for
......@@ -65,7 +65,7 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)
return dma_ops;
else
return dev->archdata.dma_ops;
#endif /* ASM_X86__DMA_MAPPING_H */
#endif /* _ASM_X86_DMA_MAPPING_H */
}
/* Make sure we keep the same behaviour */
......
......@@ -5,8 +5,8 @@
* and John Boyd, Nov. 1992.
*/
#ifndef ASM_X86__DMA_H
#define ASM_X86__DMA_H
#ifndef _ASM_X86_DMA_H
#define _ASM_X86_DMA_H
#include <linux/spinlock.h> /* And spinlocks */
#include <asm/io.h> /* need byte IO */
......@@ -315,4 +315,4 @@ extern int isa_dma_bridge_buggy;
#define isa_dma_bridge_buggy (0)
#endif
#endif /* ASM_X86__DMA_H */
#endif /* _ASM_X86_DMA_H */
#ifndef ASM_X86__DMI_H
#define ASM_X86__DMI_H
#ifndef _ASM_X86_DMI_H
#define _ASM_X86_DMI_H
#include <asm/io.h>
......@@ -23,4 +23,4 @@ static inline void *dmi_alloc(unsigned len)
#define dmi_ioremap early_ioremap
#define dmi_iounmap early_iounmap
#endif /* ASM_X86__DMI_H */
#endif /* _ASM_X86_DMI_H */
......@@ -20,8 +20,8 @@
* Markus Metzger <markus.t.metzger@intel.com>, 2007-2008
*/
#ifndef ASM_X86__DS_H
#define ASM_X86__DS_H
#ifndef _ASM_X86_DS_H
#define _ASM_X86_DS_H
#ifdef CONFIG_X86_DS
......@@ -235,4 +235,4 @@ extern void ds_free(struct ds_context *context);
#define ds_init_intel(config) do {} while (0)
#endif /* CONFIG_X86_DS */
#endif /* ASM_X86__DS_H */
#endif /* _ASM_X86_DS_H */
#ifndef ASM_X86__DWARF2_H
#define ASM_X86__DWARF2_H
#ifndef _ASM_X86_DWARF2_H