diff options
32 files changed, 96 insertions, 96 deletions
diff --git a/arch/x86/include/asm/mach-default/apm.h b/arch/x86/include/asm/mach-default/apm.h index fc392ec1a578..20370c6db74b 100644 --- a/arch/x86/include/asm/mach-default/apm.h +++ b/arch/x86/include/asm/mach-default/apm.h @@ -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 */ diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h index 2ad00eb6deb9..ff3a6c236c00 100644 --- a/arch/x86/include/asm/mach-default/mach_apic.h +++ b/arch/x86/include/asm/mach-default/mach_apic.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-default/mach_apicdef.h b/arch/x86/include/asm/mach-default/mach_apicdef.h index b9feb25bfe6f..53179936d6c6 100644 --- a/arch/x86/include/asm/mach-default/mach_apicdef.h +++ b/arch/x86/include/asm/mach-default/mach_apicdef.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-default/mach_ipi.h b/arch/x86/include/asm/mach-default/mach_ipi.h index 377dfd8cfc7c..fabca01ebacf 100644 --- a/arch/x86/include/asm/mach-default/mach_ipi.h +++ b/arch/x86/include/asm/mach-default/mach_ipi.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-default/mach_mpparse.h b/arch/x86/include/asm/mach-default/mach_mpparse.h index 028e08b335fb..8c1ea21238a7 100644 --- a/arch/x86/include/asm/mach-default/mach_mpparse.h +++ b/arch/x86/include/asm/mach-default/mach_mpparse.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-default/mach_mpspec.h b/arch/x86/include/asm/mach-default/mach_mpspec.h index 2a9663306857..e85ede686be8 100644 --- a/arch/x86/include/asm/mach-default/mach_mpspec.h +++ b/arch/x86/include/asm/mach-default/mach_mpspec.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-default/mach_timer.h b/arch/x86/include/asm/mach-default/mach_timer.h index a075b4675b29..853728519ae9 100644 --- a/arch/x86/include/asm/mach-default/mach_timer.h +++ b/arch/x86/include/asm/mach-default/mach_timer.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 */ diff --git a/arch/x86/include/asm/mach-default/mach_traps.h b/arch/x86/include/asm/mach-default/mach_traps.h index d4fb0bc3fe18..f7920601e472 100644 --- a/arch/x86/include/asm/mach-default/mach_traps.h +++ b/arch/x86/include/asm/mach-default/mach_traps.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 */ diff --git a/arch/x86/include/asm/mach-default/mach_wakecpu.h b/arch/x86/include/asm/mach-default/mach_wakecpu.h index d7136fcdd8f3..d5c0b826a4ff 100644 --- a/arch/x86/include/asm/mach-default/mach_wakecpu.h +++ b/arch/x86/include/asm/mach-default/mach_wakecpu.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-generic/gpio.h b/arch/x86/include/asm/mach-generic/gpio.h index 5fef612df2c6..995c45efdb33 100644 --- a/arch/x86/include/asm/mach-generic/gpio.h +++ b/arch/x86/include/asm/mach-generic/gpio.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h index 81668b3905a5..5180bd7478fb 100644 --- a/arch/x86/include/asm/mach-generic/mach_apic.h +++ b/arch/x86/include/asm/mach-generic/mach_apic.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-generic/mach_apicdef.h b/arch/x86/include/asm/mach-generic/mach_apicdef.h index b2eaf1e654ab..68041f3802f4 100644 --- a/arch/x86/include/asm/mach-generic/mach_apicdef.h +++ b/arch/x86/include/asm/mach-generic/mach_apicdef.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-generic/mach_ipi.h b/arch/x86/include/asm/mach-generic/mach_ipi.h index fe430df5536a..ffd637e3c3d9 100644 --- a/arch/x86/include/asm/mach-generic/mach_ipi.h +++ b/arch/x86/include/asm/mach-generic/mach_ipi.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-generic/mach_mpparse.h b/arch/x86/include/asm/mach-generic/mach_mpparse.h index aed9f856da89..048f1d468535 100644 --- a/arch/x86/include/asm/mach-generic/mach_mpparse.h +++ b/arch/x86/include/asm/mach-generic/mach_mpparse.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-generic/mach_mpspec.h b/arch/x86/include/asm/mach-generic/mach_mpspec.h index ec615de0574e..bbab5ccfd4fe 100644 --- a/arch/x86/include/asm/mach-generic/mach_mpspec.h +++ b/arch/x86/include/asm/mach-generic/mach_mpspec.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/mach-rdc321x/gpio.h b/arch/x86/include/asm/mach-rdc321x/gpio.h index b21d9174385f..c210ab5788b0 100644 --- a/arch/x86/include/asm/mach-rdc321x/gpio.h +++ b/arch/x86/include/asm/mach-rdc321x/gpio.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h index 28364396cf6b..d931d3b7e6f7 100644 --- a/arch/x86/include/asm/uv/bios.h +++ b/arch/x86/include/asm/uv/bios.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h index 4d632fdd3440..e2363253bbbf 100644 --- a/arch/x86/include/asm/uv/uv_bau.h +++ b/arch/x86/include/asm/uv/uv_bau.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 */ diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h index 126fafa13d56..c6ad93e315c8 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.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 */ diff --git a/arch/x86/include/asm/uv/uv_irq.h b/arch/x86/include/asm/uv/uv_irq.h index 8502826dce2f..9613c8c0b647 100644 --- a/arch/x86/include/asm/uv/uv_irq.h +++ b/arch/x86/include/asm/uv/uv_irq.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 */ diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h index 9ce9ba57f014..dd627793a234 100644 --- a/arch/x86/include/asm/uv/uv_mmrs.h +++ b/arch/x86/include/asm/uv/uv_mmrs.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 */ diff --git a/arch/x86/include/asm/visws/cobalt.h b/arch/x86/include/asm/visws/cobalt.h index 0cc20f3ad714..166adf61e770 100644 --- a/arch/x86/include/asm/visws/cobalt.h +++ b/arch/x86/include/asm/visws/cobalt.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/visws/lithium.h b/arch/x86/include/asm/visws/lithium.h index 1163e518b61a..a10d89bc1270 100644 --- a/arch/x86/include/asm/visws/lithium.h +++ b/arch/x86/include/asm/visws/lithium.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/visws/piix4.h b/arch/x86/include/asm/visws/piix4.h index 80d376ef8880..d0af4d338e7f 100644 --- a/arch/x86/include/asm/visws/piix4.h +++ b/arch/x86/include/asm/visws/piix4.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/xen/events.h b/arch/x86/include/asm/xen/events.h index ae3c9ada14b2..19144184983a 100644 --- a/arch/x86/include/asm/xen/events.h +++ b/arch/x86/include/asm/xen/events.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/xen/grant_table.h b/arch/x86/include/asm/xen/grant_table.h index 6d55da987250..fdbbb45767a6 100644 --- a/arch/x86/include/asm/xen/grant_table.h +++ b/arch/x86/include/asm/xen/grant_table.h @@ -1,7 +1,7 @@ -#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 */ diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index 7c1192ad7902..3f6000d95fe2 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.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 */ diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h index ff60551a67b5..a38d25ac87d2 100644 --- a/arch/x86/include/asm/xen/hypervisor.h +++ b/arch/x86/include/asm/xen/hypervisor.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 */ diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h index 6cfc896e335e..e8506c1f0c55 100644 --- a/arch/x86/include/asm/xen/interface.h +++ b/arch/x86/include/asm/xen/interface.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 */ diff --git a/arch/x86/include/asm/xen/interface_32.h b/arch/x86/include/asm/xen/interface_32.h index a5377d4a8b7e..42a7e004ae5c 100644 --- a/arch/x86/include/asm/xen/interface_32.h +++ b/arch/x86/include/asm/xen/interface_32.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 */ diff --git a/arch/x86/include/asm/xen/interface_64.h b/arch/x86/include/asm/xen/interface_64.h index 21373e7a7dd5..100d2662b97c 100644 --- a/arch/x86/include/asm/xen/interface_64.h +++ b/arch/x86/include/asm/xen/interface_64.h @@ -1,5 +1,5 @@ -#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 */ diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h index 4f483e4fcab3..bc628998a1b9 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h @@ -1,5 +1,5 @@ -#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 */ |