提交 05e4d316 编写于 作者: H H. Peter Anvin

x86: drop double underscores from header guards

Drop double underscores from header guards in arch/x86/include.  They
are used inconsistently, and are not necessary.
Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
上级 1965aae3
......@@ -3,8 +3,8 @@
* Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp>
*/
#ifndef _ASM_X86_MACH_DEFAULT__APM_H
#define _ASM_X86_MACH_DEFAULT__APM_H
#ifndef _ASM_X86_MACH_DEFAULT_APM_H
#define _ASM_X86_MACH_DEFAULT_APM_H
#ifdef APM_ZERO_SEGS
# define APM_DO_ZERO_SEGS \
......@@ -70,4 +70,4 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
return error;
}
#endif /* _ASM_X86_MACH_DEFAULT__APM_H */
#endif /* _ASM_X86_MACH_DEFAULT_APM_H */
#ifndef _ASM_X86_MACH_DEFAULT__MACH_APIC_H
#define _ASM_X86_MACH_DEFAULT__MACH_APIC_H
#ifndef _ASM_X86_MACH_DEFAULT_MACH_APIC_H
#define _ASM_X86_MACH_DEFAULT_MACH_APIC_H
#ifdef CONFIG_X86_LOCAL_APIC
......@@ -153,4 +153,4 @@ static inline void enable_apic_mode(void)
{
}
#endif /* CONFIG_X86_LOCAL_APIC */
#endif /* _ASM_X86_MACH_DEFAULT__MACH_APIC_H */
#endif /* _ASM_X86_MACH_DEFAULT_MACH_APIC_H */
#ifndef _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H
#define _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H
#ifndef _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H
#define _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H
#include <asm/apic.h>
......@@ -21,4 +21,4 @@ static inline unsigned get_apic_id(unsigned long x)
#define GET_APIC_ID(x) get_apic_id(x)
#endif
#endif /* _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H */
#endif /* _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H */
#ifndef _ASM_X86_MACH_DEFAULT__MACH_IPI_H
#define _ASM_X86_MACH_DEFAULT__MACH_IPI_H
#ifndef _ASM_X86_MACH_DEFAULT_MACH_IPI_H
#define _ASM_X86_MACH_DEFAULT_MACH_IPI_H
/* Avoid include hell */
#define NMI_VECTOR 0x02
......@@ -61,4 +61,4 @@ static inline void send_IPI_all(int vector)
}
#endif
#endif /* _ASM_X86_MACH_DEFAULT__MACH_IPI_H */
#endif /* _ASM_X86_MACH_DEFAULT_MACH_IPI_H */
#ifndef _ASM_X86_MACH_DEFAULT__MACH_MPPARSE_H
#define _ASM_X86_MACH_DEFAULT__MACH_MPPARSE_H
#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
#define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
......@@ -14,4 +14,4 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
}
#endif /* _ASM_X86_MACH_DEFAULT__MACH_MPPARSE_H */
#endif /* _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H */
#ifndef _ASM_X86_MACH_DEFAULT__MACH_MPSPEC_H
#define _ASM_X86_MACH_DEFAULT__MACH_MPSPEC_H
#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H
#define _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H
#define MAX_IRQ_SOURCES 256
......@@ -9,4 +9,4 @@
#define MAX_MP_BUSSES 32
#endif
#endif /* _ASM_X86_MACH_DEFAULT__MACH_MPSPEC_H */
#endif /* _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H */
......@@ -10,8 +10,8 @@
* directly because of the awkward 8-bit access mechanism of the 82C54
* device.
*/
#ifndef _ASM_X86_MACH_DEFAULT__MACH_TIMER_H
#define _ASM_X86_MACH_DEFAULT__MACH_TIMER_H
#ifndef _ASM_X86_MACH_DEFAULT_MACH_TIMER_H
#define _ASM_X86_MACH_DEFAULT_MACH_TIMER_H
#define CALIBRATE_TIME_MSEC 30 /* 30 msecs */
#define CALIBRATE_LATCH \
......@@ -45,4 +45,4 @@ static inline void mach_countup(unsigned long *count_p)
*count_p = count;
}
#endif /* _ASM_X86_MACH_DEFAULT__MACH_TIMER_H */
#endif /* _ASM_X86_MACH_DEFAULT_MACH_TIMER_H */
......@@ -2,8 +2,8 @@
* Machine specific NMI handling for generic.
* Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp>
*/
#ifndef _ASM_X86_MACH_DEFAULT__MACH_TRAPS_H
#define _ASM_X86_MACH_DEFAULT__MACH_TRAPS_H
#ifndef _ASM_X86_MACH_DEFAULT_MACH_TRAPS_H
#define _ASM_X86_MACH_DEFAULT_MACH_TRAPS_H
#include <asm/mc146818rtc.h>
......@@ -30,4 +30,4 @@ static inline void reassert_nmi(void)
unlock_cmos();
}
#endif /* _ASM_X86_MACH_DEFAULT__MACH_TRAPS_H */
#endif /* _ASM_X86_MACH_DEFAULT_MACH_TRAPS_H */
#ifndef _ASM_X86_MACH_DEFAULT__MACH_WAKECPU_H
#define _ASM_X86_MACH_DEFAULT__MACH_WAKECPU_H
#ifndef _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H
#define _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H
/*
* 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)
#define inquire_remote_apic(apicid) {}
#endif
#endif /* _ASM_X86_MACH_DEFAULT__MACH_WAKECPU_H */
#endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */
#ifndef _ASM_X86_MACH_GENERIC__GPIO_H
#define _ASM_X86_MACH_GENERIC__GPIO_H
#ifndef _ASM_X86_MACH_GENERIC_GPIO_H
#define _ASM_X86_MACH_GENERIC_GPIO_H
int gpio_request(unsigned gpio, const char *label);
void gpio_free(unsigned gpio);
......@@ -12,4 +12,4 @@ int irq_to_gpio(unsigned irq);
#include <asm-generic/gpio.h> /* cansleep wrappers */
#endif /* _ASM_X86_MACH_GENERIC__GPIO_H */
#endif /* _ASM_X86_MACH_GENERIC_GPIO_H */
#ifndef _ASM_X86_MACH_GENERIC__MACH_APIC_H
#define _ASM_X86_MACH_GENERIC__MACH_APIC_H
#ifndef _ASM_X86_MACH_GENERIC_MACH_APIC_H
#define _ASM_X86_MACH_GENERIC_MACH_APIC_H
#include <asm/genapic.h>
......@@ -30,4 +30,4 @@
extern void generic_bigsmp_probe(void);
#endif /* _ASM_X86_MACH_GENERIC__MACH_APIC_H */
#endif /* _ASM_X86_MACH_GENERIC_MACH_APIC_H */
#ifndef _ASM_X86_MACH_GENERIC__MACH_APICDEF_H
#define _ASM_X86_MACH_GENERIC__MACH_APICDEF_H
#ifndef _ASM_X86_MACH_GENERIC_MACH_APICDEF_H
#define _ASM_X86_MACH_GENERIC_MACH_APICDEF_H
#ifndef APIC_DEFINITION
#include <asm/genapic.h>
......@@ -8,4 +8,4 @@
#define APIC_ID_MASK (genapic->apic_id_mask)
#endif
#endif /* _ASM_X86_MACH_GENERIC__MACH_APICDEF_H */
#endif /* _ASM_X86_MACH_GENERIC_MACH_APICDEF_H */
#ifndef _ASM_X86_MACH_GENERIC__MACH_IPI_H
#define _ASM_X86_MACH_GENERIC__MACH_IPI_H
#ifndef _ASM_X86_MACH_GENERIC_MACH_IPI_H
#define _ASM_X86_MACH_GENERIC_MACH_IPI_H
#include <asm/genapic.h>
......@@ -7,4 +7,4 @@
#define send_IPI_allbutself (genapic->send_IPI_allbutself)
#define send_IPI_all (genapic->send_IPI_all)
#endif /* _ASM_X86_MACH_GENERIC__MACH_IPI_H */
#endif /* _ASM_X86_MACH_GENERIC_MACH_IPI_H */
#ifndef _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H
#define _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H
#ifndef _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H
#define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H
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);
#endif /* _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H */
#endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */
#ifndef _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H
#define _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H
#ifndef _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H
#define _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H
#define MAX_IRQ_SOURCES 256
......@@ -9,4 +9,4 @@
extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid);
#endif /* _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H */
#endif /* _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H */
#ifndef _ASM_X86_MACH_RDC321X__GPIO_H
#define _ASM_X86_MACH_RDC321X__GPIO_H
#ifndef _ASM_X86_MACH_RDC321X_GPIO_H
#define _ASM_X86_MACH_RDC321X_GPIO_H
#include <linux/kernel.h>
......@@ -57,4 +57,4 @@ static inline int irq_to_gpio(unsigned irq)
/* For cansleep */
#include <asm-generic/gpio.h>
#endif /* _ASM_X86_MACH_RDC321X__GPIO_H */
#endif /* _ASM_X86_MACH_RDC321X_GPIO_H */
#ifndef _ASM_X86_UV__BIOS_H
#define _ASM_X86_UV__BIOS_H
#ifndef _ASM_X86_UV_BIOS_H
#define _ASM_X86_UV_BIOS_H
/*
* UV BIOS layer definitions.
......@@ -91,4 +91,4 @@ extern long uv_region_size;
extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */
#endif /* _ASM_X86_UV__BIOS_H */
#endif /* _ASM_X86_UV_BIOS_H */
......@@ -8,8 +8,8 @@
* Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
*/
#ifndef _ASM_X86_UV__UV_BAU_H
#define _ASM_X86_UV__UV_BAU_H
#ifndef _ASM_X86_UV_UV_BAU_H
#define _ASM_X86_UV_UV_BAU_H
#include <linux/bitmap.h>
#define BITSPERBYTE 8
......@@ -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_timeout_intr1(void);
#endif /* _ASM_X86_UV__UV_BAU_H */
#endif /* _ASM_X86_UV_UV_BAU_H */
......@@ -8,8 +8,8 @@
* Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved.
*/
#ifndef _ASM_X86_UV__UV_HUB_H
#define _ASM_X86_UV__UV_HUB_H
#ifndef _ASM_X86_UV_UV_HUB_H
#define _ASM_X86_UV_UV_HUB_H
#include <linux/numa.h>
#include <linux/percpu.h>
......@@ -350,5 +350,5 @@ static inline int uv_num_possible_blades(void)
return uv_possible_blades;
}
#endif /* _ASM_X86_UV__UV_HUB_H */
#endif /* _ASM_X86_UV_UV_HUB_H */
......@@ -8,8 +8,8 @@
* Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
*/
#ifndef _ASM_X86_UV__UV_IRQ_H
#define _ASM_X86_UV__UV_IRQ_H
#ifndef _ASM_X86_UV_UV_IRQ_H
#define _ASM_X86_UV_UV_IRQ_H
/* If a generic version of this structure gets defined, eliminate this one. */
struct uv_IO_APIC_route_entry {
......@@ -33,4 +33,4 @@ extern void arch_disable_uv_irq(int, unsigned long);
extern int uv_setup_irq(char *, int, int, unsigned long);
extern void uv_teardown_irq(unsigned int, int, unsigned long);
#endif /* _ASM_X86_UV__UV_IRQ_H */
#endif /* _ASM_X86_UV_UV_IRQ_H */
......@@ -8,8 +8,8 @@
* Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved.
*/
#ifndef _ASM_X86_UV__UV_MMRS_H
#define _ASM_X86_UV__UV_MMRS_H
#ifndef _ASM_X86_UV_UV_MMRS_H
#define _ASM_X86_UV_UV_MMRS_H
#define UV_MMR_ENABLE (1UL << 63)
......@@ -1292,4 +1292,4 @@ union uvh_si_alias2_overlay_config_u {
};
#endif /* _ASM_X86_UV__UV_MMRS_H */
#endif /* _ASM_X86_UV_UV_MMRS_H */
#ifndef _ASM_X86_VISWS__COBALT_H
#define _ASM_X86_VISWS__COBALT_H
#ifndef _ASM_X86_VISWS_COBALT_H
#define _ASM_X86_VISWS_COBALT_H
#include <asm/fixmap.h>
......@@ -122,4 +122,4 @@ extern char visws_board_type;
extern char visws_board_rev;
#endif /* _ASM_X86_VISWS__COBALT_H */
#endif /* _ASM_X86_VISWS_COBALT_H */
#ifndef _ASM_X86_VISWS__LITHIUM_H
#define _ASM_X86_VISWS__LITHIUM_H
#ifndef _ASM_X86_VISWS_LITHIUM_H
#define _ASM_X86_VISWS_LITHIUM_H
#include <asm/fixmap.h>
......@@ -49,5 +49,5 @@ static inline unsigned short li_pcib_read16(unsigned long reg)
return *((volatile unsigned short *)(LI_PCIB_VADDR+reg));
}
#endif /* _ASM_X86_VISWS__LITHIUM_H */
#endif /* _ASM_X86_VISWS_LITHIUM_H */
#ifndef _ASM_X86_VISWS__PIIX4_H
#define _ASM_X86_VISWS__PIIX4_H
#ifndef _ASM_X86_VISWS_PIIX4_H
#define _ASM_X86_VISWS_PIIX4_H
/*
* PIIX4 as used on SGI Visual Workstations
......@@ -104,4 +104,4 @@
*/
#define PIIX_GPI_STPCLK 0x4 // STPCLK signal routed back in
#endif /* _ASM_X86_VISWS__PIIX4_H */
#endif /* _ASM_X86_VISWS_PIIX4_H */
#ifndef _ASM_X86_XEN__EVENTS_H
#define _ASM_X86_XEN__EVENTS_H
#ifndef _ASM_X86_XEN_EVENTS_H
#define _ASM_X86_XEN_EVENTS_H
enum ipi_vector {
XEN_RESCHEDULE_VECTOR,
......@@ -21,4 +21,4 @@ static inline void xen_do_IRQ(int irq, struct pt_regs *regs)
do_IRQ(regs);
}
#endif /* _ASM_X86_XEN__EVENTS_H */
#endif /* _ASM_X86_XEN_EVENTS_H */
#ifndef _ASM_X86_XEN__GRANT_TABLE_H
#define _ASM_X86_XEN__GRANT_TABLE_H
#ifndef _ASM_X86_XEN_GRANT_TABLE_H
#define _ASM_X86_XEN_GRANT_TABLE_H
#define xen_alloc_vm_area(size) alloc_vm_area(size)
#define xen_free_vm_area(area) free_vm_area(area)
#endif /* _ASM_X86_XEN__GRANT_TABLE_H */
#endif /* _ASM_X86_XEN_GRANT_TABLE_H */
......@@ -30,8 +30,8 @@
* IN THE SOFTWARE.
*/
#ifndef _ASM_X86_XEN__HYPERCALL_H
#define _ASM_X86_XEN__HYPERCALL_H
#ifndef _ASM_X86_XEN_HYPERCALL_H
#define _ASM_X86_XEN_HYPERCALL_H
#include <linux/errno.h>
#include <linux/string.h>
......@@ -524,4 +524,4 @@ MULTI_stack_switch(struct multicall_entry *mcl,
mcl->args[1] = esp;
}
#endif /* _ASM_X86_XEN__HYPERCALL_H */
#endif /* _ASM_X86_XEN_HYPERCALL_H */
......@@ -30,8 +30,8 @@
* IN THE SOFTWARE.
*/
#ifndef _ASM_X86_XEN__HYPERVISOR_H
#define _ASM_X86_XEN__HYPERVISOR_H
#ifndef _ASM_X86_XEN_HYPERVISOR_H
#define _ASM_X86_XEN_HYPERVISOR_H
#include <linux/types.h>
#include <linux/kernel.h>
......@@ -79,4 +79,4 @@ extern enum xen_domain_type xen_domain_type;
#define xen_initial_domain() (xen_pv_domain() && xen_start_info->flags & SIF_INITDOMAIN)
#define xen_hvm_domain() (xen_domain_type == XEN_HVM_DOMAIN)
#endif /* _ASM_X86_XEN__HYPERVISOR_H */
#endif /* _ASM_X86_XEN_HYPERVISOR_H */
......@@ -6,8 +6,8 @@
* Copyright (c) 2004, K A Fraser
*/
#ifndef _ASM_X86_XEN__INTERFACE_H
#define _ASM_X86_XEN__INTERFACE_H
#ifndef _ASM_X86_XEN_INTERFACE_H
#define _ASM_X86_XEN_INTERFACE_H
#ifdef __XEN__
#define __DEFINE_GUEST_HANDLE(name, type) \
......@@ -172,4 +172,4 @@ DEFINE_GUEST_HANDLE_STRUCT(vcpu_guest_context);
#define XEN_CPUID XEN_EMULATE_PREFIX "cpuid"
#endif
#endif /* _ASM_X86_XEN__INTERFACE_H */
#endif /* _ASM_X86_XEN_INTERFACE_H */
......@@ -6,8 +6,8 @@
* Copyright (c) 2004, K A Fraser
*/
#ifndef _ASM_X86_XEN__INTERFACE_32_H
#define _ASM_X86_XEN__INTERFACE_32_H
#ifndef _ASM_X86_XEN_INTERFACE_32_H
#define _ASM_X86_XEN_INTERFACE_32_H
/*
......@@ -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_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20))
#endif /* _ASM_X86_XEN__INTERFACE_32_H */
#endif /* _ASM_X86_XEN_INTERFACE_32_H */
#ifndef _ASM_X86_XEN__INTERFACE_64_H
#define _ASM_X86_XEN__INTERFACE_64_H
#ifndef _ASM_X86_XEN_INTERFACE_64_H
#define _ASM_X86_XEN_INTERFACE_64_H
/*
* 64-bit segment selectors
......@@ -156,4 +156,4 @@ typedef unsigned long xen_callback_t;
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_X86_XEN__INTERFACE_64_H */
#endif /* _ASM_X86_XEN_INTERFACE_64_H */
#ifndef _ASM_X86_XEN__PAGE_H
#define _ASM_X86_XEN__PAGE_H
#ifndef _ASM_X86_XEN_PAGE_H
#define _ASM_X86_XEN_PAGE_H
#include <linux/pfn.h>
......@@ -162,4 +162,4 @@ xmaddr_t arbitrary_virt_to_machine(void *address);
void make_lowmem_page_readonly(void *vaddr);
void make_lowmem_page_readwrite(void *vaddr);
#endif /* _ASM_X86_XEN__PAGE_H */
#endif /* _ASM_X86_XEN_PAGE_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册