aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-10-23 03:01:39 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-23 03:01:39 -0400
commit05e4d3169bd16229d84a2ef095e1ba2cd3873baa (patch)
tree4046f086ce649f3bd28e9de9a3bdd4092e1395c1 /arch/x86/include/asm
parent1965aae3c98397aad957412413c07e97b1bd4e64 (diff)
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: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/mach-default/apm.h6
-rw-r--r--arch/x86/include/asm/mach-default/mach_apic.h6
-rw-r--r--arch/x86/include/asm/mach-default/mach_apicdef.h6
-rw-r--r--arch/x86/include/asm/mach-default/mach_ipi.h6
-rw-r--r--arch/x86/include/asm/mach-default/mach_mpparse.h6
-rw-r--r--arch/x86/include/asm/mach-default/mach_mpspec.h6
-rw-r--r--arch/x86/include/asm/mach-default/mach_timer.h6
-rw-r--r--arch/x86/include/asm/mach-default/mach_traps.h6
-rw-r--r--arch/x86/include/asm/mach-default/mach_wakecpu.h6
-rw-r--r--arch/x86/include/asm/mach-generic/gpio.h6
-rw-r--r--arch/x86/include/asm/mach-generic/mach_apic.h6
-rw-r--r--arch/x86/include/asm/mach-generic/mach_apicdef.h6
-rw-r--r--arch/x86/include/asm/mach-generic/mach_ipi.h6
-rw-r--r--arch/x86/include/asm/mach-generic/mach_mpparse.h6
-rw-r--r--arch/x86/include/asm/mach-generic/mach_mpspec.h6
-rw-r--r--arch/x86/include/asm/mach-rdc321x/gpio.h6
-rw-r--r--arch/x86/include/asm/uv/bios.h6
-rw-r--r--arch/x86/include/asm/uv/uv_bau.h6
-rw-r--r--arch/x86/include/asm/uv/uv_hub.h6
-rw-r--r--arch/x86/include/asm/uv/uv_irq.h6
-rw-r--r--arch/x86/include/asm/uv/uv_mmrs.h6
-rw-r--r--arch/x86/include/asm/visws/cobalt.h6
-rw-r--r--arch/x86/include/asm/visws/lithium.h6
-rw-r--r--arch/x86/include/asm/visws/piix4.h6
-rw-r--r--arch/x86/include/asm/xen/events.h6
-rw-r--r--arch/x86/include/asm/xen/grant_table.h6
-rw-r--r--arch/x86/include/asm/xen/hypercall.h6
-rw-r--r--arch/x86/include/asm/xen/hypervisor.h6
-rw-r--r--arch/x86/include/asm/xen/interface.h6
-rw-r--r--arch/x86/include/asm/xen/interface_32.h6
-rw-r--r--arch/x86/include/asm/xen/interface_64.h6
-rw-r--r--arch/x86/include/asm/xen/page.h6
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 @@
3 * Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp> 3 * Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp>
4 */ 4 */
5 5
6#ifndef _ASM_X86_MACH_DEFAULT__APM_H 6#ifndef _ASM_X86_MACH_DEFAULT_APM_H
7#define _ASM_X86_MACH_DEFAULT__APM_H 7#define _ASM_X86_MACH_DEFAULT_APM_H
8 8
9#ifdef APM_ZERO_SEGS 9#ifdef APM_ZERO_SEGS
10# define APM_DO_ZERO_SEGS \ 10# define APM_DO_ZERO_SEGS \
@@ -70,4 +70,4 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
70 return error; 70 return error;
71} 71}
72 72
73#endif /* _ASM_X86_MACH_DEFAULT__APM_H */ 73#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 @@
1#ifndef _ASM_X86_MACH_DEFAULT__MACH_APIC_H 1#ifndef _ASM_X86_MACH_DEFAULT_MACH_APIC_H
2#define _ASM_X86_MACH_DEFAULT__MACH_APIC_H 2#define _ASM_X86_MACH_DEFAULT_MACH_APIC_H
3 3
4#ifdef CONFIG_X86_LOCAL_APIC 4#ifdef CONFIG_X86_LOCAL_APIC
5 5
@@ -153,4 +153,4 @@ static inline void enable_apic_mode(void)
153{ 153{
154} 154}
155#endif /* CONFIG_X86_LOCAL_APIC */ 155#endif /* CONFIG_X86_LOCAL_APIC */
156#endif /* _ASM_X86_MACH_DEFAULT__MACH_APIC_H */ 156#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 @@
1#ifndef _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H 1#ifndef _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H
2#define _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H 2#define _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H
3 3
4#include <asm/apic.h> 4#include <asm/apic.h>
5 5
@@ -21,4 +21,4 @@ static inline unsigned get_apic_id(unsigned long x)
21#define GET_APIC_ID(x) get_apic_id(x) 21#define GET_APIC_ID(x) get_apic_id(x)
22#endif 22#endif
23 23
24#endif /* _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H */ 24#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 @@
1#ifndef _ASM_X86_MACH_DEFAULT__MACH_IPI_H 1#ifndef _ASM_X86_MACH_DEFAULT_MACH_IPI_H
2#define _ASM_X86_MACH_DEFAULT__MACH_IPI_H 2#define _ASM_X86_MACH_DEFAULT_MACH_IPI_H
3 3
4/* Avoid include hell */ 4/* Avoid include hell */
5#define NMI_VECTOR 0x02 5#define NMI_VECTOR 0x02
@@ -61,4 +61,4 @@ static inline void send_IPI_all(int vector)
61} 61}
62#endif 62#endif
63 63
64#endif /* _ASM_X86_MACH_DEFAULT__MACH_IPI_H */ 64#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 @@
1#ifndef _ASM_X86_MACH_DEFAULT__MACH_MPPARSE_H 1#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
2#define _ASM_X86_MACH_DEFAULT__MACH_MPPARSE_H 2#define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
3 3
4static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, 4static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
5 char *productid) 5 char *productid)
@@ -14,4 +14,4 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
14} 14}
15 15
16 16
17#endif /* _ASM_X86_MACH_DEFAULT__MACH_MPPARSE_H */ 17#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 @@
1#ifndef _ASM_X86_MACH_DEFAULT__MACH_MPSPEC_H 1#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H
2#define _ASM_X86_MACH_DEFAULT__MACH_MPSPEC_H 2#define _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H
3 3
4#define MAX_IRQ_SOURCES 256 4#define MAX_IRQ_SOURCES 256
5 5
@@ -9,4 +9,4 @@
9#define MAX_MP_BUSSES 32 9#define MAX_MP_BUSSES 32
10#endif 10#endif
11 11
12#endif /* _ASM_X86_MACH_DEFAULT__MACH_MPSPEC_H */ 12#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 @@
10 * directly because of the awkward 8-bit access mechanism of the 82C54 10 * directly because of the awkward 8-bit access mechanism of the 82C54
11 * device. 11 * device.
12 */ 12 */
13#ifndef _ASM_X86_MACH_DEFAULT__MACH_TIMER_H 13#ifndef _ASM_X86_MACH_DEFAULT_MACH_TIMER_H
14#define _ASM_X86_MACH_DEFAULT__MACH_TIMER_H 14#define _ASM_X86_MACH_DEFAULT_MACH_TIMER_H
15 15
16#define CALIBRATE_TIME_MSEC 30 /* 30 msecs */ 16#define CALIBRATE_TIME_MSEC 30 /* 30 msecs */
17#define CALIBRATE_LATCH \ 17#define CALIBRATE_LATCH \
@@ -45,4 +45,4 @@ static inline void mach_countup(unsigned long *count_p)
45 *count_p = count; 45 *count_p = count;
46} 46}
47 47
48#endif /* _ASM_X86_MACH_DEFAULT__MACH_TIMER_H */ 48#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 @@
2 * Machine specific NMI handling for generic. 2 * Machine specific NMI handling for generic.
3 * Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp> 3 * Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp>
4 */ 4 */
5#ifndef _ASM_X86_MACH_DEFAULT__MACH_TRAPS_H 5#ifndef _ASM_X86_MACH_DEFAULT_MACH_TRAPS_H
6#define _ASM_X86_MACH_DEFAULT__MACH_TRAPS_H 6#define _ASM_X86_MACH_DEFAULT_MACH_TRAPS_H
7 7
8#include <asm/mc146818rtc.h> 8#include <asm/mc146818rtc.h>
9 9
@@ -30,4 +30,4 @@ static inline void reassert_nmi(void)
30 unlock_cmos(); 30 unlock_cmos();
31} 31}
32 32
33#endif /* _ASM_X86_MACH_DEFAULT__MACH_TRAPS_H */ 33#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 @@
1#ifndef _ASM_X86_MACH_DEFAULT__MACH_WAKECPU_H 1#ifndef _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H
2#define _ASM_X86_MACH_DEFAULT__MACH_WAKECPU_H 2#define _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H
3 3
4/* 4/*
5 * This file copes with machines that wakeup secondary CPUs by the 5 * 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 #define inquire_remote_apic(apicid) {} 39 #define inquire_remote_apic(apicid) {}
40#endif 40#endif
41 41
42#endif /* _ASM_X86_MACH_DEFAULT__MACH_WAKECPU_H */ 42#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 @@
1#ifndef _ASM_X86_MACH_GENERIC__GPIO_H 1#ifndef _ASM_X86_MACH_GENERIC_GPIO_H
2#define _ASM_X86_MACH_GENERIC__GPIO_H 2#define _ASM_X86_MACH_GENERIC_GPIO_H
3 3
4int gpio_request(unsigned gpio, const char *label); 4int gpio_request(unsigned gpio, const char *label);
5void gpio_free(unsigned gpio); 5void gpio_free(unsigned gpio);
@@ -12,4 +12,4 @@ int irq_to_gpio(unsigned irq);
12 12
13#include <asm-generic/gpio.h> /* cansleep wrappers */ 13#include <asm-generic/gpio.h> /* cansleep wrappers */
14 14
15#endif /* _ASM_X86_MACH_GENERIC__GPIO_H */ 15#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 @@
1#ifndef _ASM_X86_MACH_GENERIC__MACH_APIC_H 1#ifndef _ASM_X86_MACH_GENERIC_MACH_APIC_H
2#define _ASM_X86_MACH_GENERIC__MACH_APIC_H 2#define _ASM_X86_MACH_GENERIC_MACH_APIC_H
3 3
4#include <asm/genapic.h> 4#include <asm/genapic.h>
5 5
@@ -30,4 +30,4 @@
30 30
31extern void generic_bigsmp_probe(void); 31extern void generic_bigsmp_probe(void);
32 32
33#endif /* _ASM_X86_MACH_GENERIC__MACH_APIC_H */ 33#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 @@
1#ifndef _ASM_X86_MACH_GENERIC__MACH_APICDEF_H 1#ifndef _ASM_X86_MACH_GENERIC_MACH_APICDEF_H
2#define _ASM_X86_MACH_GENERIC__MACH_APICDEF_H 2#define _ASM_X86_MACH_GENERIC_MACH_APICDEF_H
3 3
4#ifndef APIC_DEFINITION 4#ifndef APIC_DEFINITION
5#include <asm/genapic.h> 5#include <asm/genapic.h>
@@ -8,4 +8,4 @@
8#define APIC_ID_MASK (genapic->apic_id_mask) 8#define APIC_ID_MASK (genapic->apic_id_mask)
9#endif 9#endif
10 10
11#endif /* _ASM_X86_MACH_GENERIC__MACH_APICDEF_H */ 11#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 @@
1#ifndef _ASM_X86_MACH_GENERIC__MACH_IPI_H 1#ifndef _ASM_X86_MACH_GENERIC_MACH_IPI_H
2#define _ASM_X86_MACH_GENERIC__MACH_IPI_H 2#define _ASM_X86_MACH_GENERIC_MACH_IPI_H
3 3
4#include <asm/genapic.h> 4#include <asm/genapic.h>
5 5
@@ -7,4 +7,4 @@
7#define send_IPI_allbutself (genapic->send_IPI_allbutself) 7#define send_IPI_allbutself (genapic->send_IPI_allbutself)
8#define send_IPI_all (genapic->send_IPI_all) 8#define send_IPI_all (genapic->send_IPI_all)
9 9
10#endif /* _ASM_X86_MACH_GENERIC__MACH_IPI_H */ 10#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 @@
1#ifndef _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H 1#ifndef _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H
2#define _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H 2#define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H
3 3
4 4
5extern int mps_oem_check(struct mp_config_table *mpc, char *oem, 5extern 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 7
8extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id); 8extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
9 9
10#endif /* _ASM_X86_MACH_GENERIC__MACH_MPPARSE_H */ 10#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 @@
1#ifndef _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H 1#ifndef _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H
2#define _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H 2#define _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H
3 3
4#define MAX_IRQ_SOURCES 256 4#define MAX_IRQ_SOURCES 256
5 5
@@ -9,4 +9,4 @@
9 9
10extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, 10extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,
11 char *productid); 11 char *productid);
12#endif /* _ASM_X86_MACH_GENERIC__MACH_MPSPEC_H */ 12#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 @@
1#ifndef _ASM_X86_MACH_RDC321X__GPIO_H 1#ifndef _ASM_X86_MACH_RDC321X_GPIO_H
2#define _ASM_X86_MACH_RDC321X__GPIO_H 2#define _ASM_X86_MACH_RDC321X_GPIO_H
3 3
4#include <linux/kernel.h> 4#include <linux/kernel.h>
5 5
@@ -57,4 +57,4 @@ static inline int irq_to_gpio(unsigned irq)
57/* For cansleep */ 57/* For cansleep */
58#include <asm-generic/gpio.h> 58#include <asm-generic/gpio.h>
59 59
60#endif /* _ASM_X86_MACH_RDC321X__GPIO_H */ 60#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 @@
1#ifndef _ASM_X86_UV__BIOS_H 1#ifndef _ASM_X86_UV_BIOS_H
2#define _ASM_X86_UV__BIOS_H 2#define _ASM_X86_UV_BIOS_H
3 3
4/* 4/*
5 * UV BIOS layer definitions. 5 * UV BIOS layer definitions.
@@ -91,4 +91,4 @@ extern long uv_region_size;
91 91
92extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */ 92extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */
93 93
94#endif /* _ASM_X86_UV__BIOS_H */ 94#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 @@
8 * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved. 8 * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
9 */ 9 */
10 10
11#ifndef _ASM_X86_UV__UV_BAU_H 11#ifndef _ASM_X86_UV_UV_BAU_H
12#define _ASM_X86_UV__UV_BAU_H 12#define _ASM_X86_UV_UV_BAU_H
13 13
14#include <linux/bitmap.h> 14#include <linux/bitmap.h>
15#define BITSPERBYTE 8 15#define BITSPERBYTE 8
@@ -329,4 +329,4 @@ extern int uv_flush_tlb_others(cpumask_t *, struct mm_struct *, unsigned long);
329extern void uv_bau_message_intr1(void); 329extern void uv_bau_message_intr1(void);
330extern void uv_bau_timeout_intr1(void); 330extern void uv_bau_timeout_intr1(void);
331 331
332#endif /* _ASM_X86_UV__UV_BAU_H */ 332#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 @@
8 * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved. 8 * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved.
9 */ 9 */
10 10
11#ifndef _ASM_X86_UV__UV_HUB_H 11#ifndef _ASM_X86_UV_UV_HUB_H
12#define _ASM_X86_UV__UV_HUB_H 12#define _ASM_X86_UV_UV_HUB_H
13 13
14#include <linux/numa.h> 14#include <linux/numa.h>
15#include <linux/percpu.h> 15#include <linux/percpu.h>
@@ -350,5 +350,5 @@ static inline int uv_num_possible_blades(void)
350 return uv_possible_blades; 350 return uv_possible_blades;
351} 351}
352 352
353#endif /* _ASM_X86_UV__UV_HUB_H */ 353#endif /* _ASM_X86_UV_UV_HUB_H */
354 354
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 @@
8 * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved. 8 * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
9 */ 9 */
10 10
11#ifndef _ASM_X86_UV__UV_IRQ_H 11#ifndef _ASM_X86_UV_UV_IRQ_H
12#define _ASM_X86_UV__UV_IRQ_H 12#define _ASM_X86_UV_UV_IRQ_H
13 13
14/* If a generic version of this structure gets defined, eliminate this one. */ 14/* If a generic version of this structure gets defined, eliminate this one. */
15struct uv_IO_APIC_route_entry { 15struct uv_IO_APIC_route_entry {
@@ -33,4 +33,4 @@ extern void arch_disable_uv_irq(int, unsigned long);
33extern int uv_setup_irq(char *, int, int, unsigned long); 33extern int uv_setup_irq(char *, int, int, unsigned long);
34extern void uv_teardown_irq(unsigned int, int, unsigned long); 34extern void uv_teardown_irq(unsigned int, int, unsigned long);
35 35
36#endif /* _ASM_X86_UV__UV_IRQ_H */ 36#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 @@
8 * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved. 8 * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved.
9 */ 9 */
10 10
11#ifndef _ASM_X86_UV__UV_MMRS_H 11#ifndef _ASM_X86_UV_UV_MMRS_H
12#define _ASM_X86_UV__UV_MMRS_H 12#define _ASM_X86_UV_UV_MMRS_H
13 13
14#define UV_MMR_ENABLE (1UL << 63) 14#define UV_MMR_ENABLE (1UL << 63)
15 15
@@ -1292,4 +1292,4 @@ union uvh_si_alias2_overlay_config_u {
1292}; 1292};
1293 1293
1294 1294
1295#endif /* _ASM_X86_UV__UV_MMRS_H */ 1295#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 @@
1#ifndef _ASM_X86_VISWS__COBALT_H 1#ifndef _ASM_X86_VISWS_COBALT_H
2#define _ASM_X86_VISWS__COBALT_H 2#define _ASM_X86_VISWS_COBALT_H
3 3
4#include <asm/fixmap.h> 4#include <asm/fixmap.h>
5 5
@@ -122,4 +122,4 @@ extern char visws_board_type;
122 122
123extern char visws_board_rev; 123extern char visws_board_rev;
124 124
125#endif /* _ASM_X86_VISWS__COBALT_H */ 125#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 @@
1#ifndef _ASM_X86_VISWS__LITHIUM_H 1#ifndef _ASM_X86_VISWS_LITHIUM_H
2#define _ASM_X86_VISWS__LITHIUM_H 2#define _ASM_X86_VISWS_LITHIUM_H
3 3
4#include <asm/fixmap.h> 4#include <asm/fixmap.h>
5 5
@@ -49,5 +49,5 @@ static inline unsigned short li_pcib_read16(unsigned long reg)
49 return *((volatile unsigned short *)(LI_PCIB_VADDR+reg)); 49 return *((volatile unsigned short *)(LI_PCIB_VADDR+reg));
50} 50}
51 51
52#endif /* _ASM_X86_VISWS__LITHIUM_H */ 52#endif /* _ASM_X86_VISWS_LITHIUM_H */
53 53
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 @@
1#ifndef _ASM_X86_VISWS__PIIX4_H 1#ifndef _ASM_X86_VISWS_PIIX4_H
2#define _ASM_X86_VISWS__PIIX4_H 2#define _ASM_X86_VISWS_PIIX4_H
3 3
4/* 4/*
5 * PIIX4 as used on SGI Visual Workstations 5 * PIIX4 as used on SGI Visual Workstations
@@ -104,4 +104,4 @@
104 */ 104 */
105#define PIIX_GPI_STPCLK 0x4 // STPCLK signal routed back in 105#define PIIX_GPI_STPCLK 0x4 // STPCLK signal routed back in
106 106
107#endif /* _ASM_X86_VISWS__PIIX4_H */ 107#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 @@
1#ifndef _ASM_X86_XEN__EVENTS_H 1#ifndef _ASM_X86_XEN_EVENTS_H
2#define _ASM_X86_XEN__EVENTS_H 2#define _ASM_X86_XEN_EVENTS_H
3 3
4enum ipi_vector { 4enum ipi_vector {
5 XEN_RESCHEDULE_VECTOR, 5 XEN_RESCHEDULE_VECTOR,
@@ -21,4 +21,4 @@ static inline void xen_do_IRQ(int irq, struct pt_regs *regs)
21 do_IRQ(regs); 21 do_IRQ(regs);
22} 22}
23 23
24#endif /* _ASM_X86_XEN__EVENTS_H */ 24#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 @@
1#ifndef _ASM_X86_XEN__GRANT_TABLE_H 1#ifndef _ASM_X86_XEN_GRANT_TABLE_H
2#define _ASM_X86_XEN__GRANT_TABLE_H 2#define _ASM_X86_XEN_GRANT_TABLE_H
3 3
4#define xen_alloc_vm_area(size) alloc_vm_area(size) 4#define xen_alloc_vm_area(size) alloc_vm_area(size)
5#define xen_free_vm_area(area) free_vm_area(area) 5#define xen_free_vm_area(area) free_vm_area(area)
6 6
7#endif /* _ASM_X86_XEN__GRANT_TABLE_H */ 7#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 @@
30 * IN THE SOFTWARE. 30 * IN THE SOFTWARE.
31 */ 31 */
32 32
33#ifndef _ASM_X86_XEN__HYPERCALL_H 33#ifndef _ASM_X86_XEN_HYPERCALL_H
34#define _ASM_X86_XEN__HYPERCALL_H 34#define _ASM_X86_XEN_HYPERCALL_H
35 35
36#include <linux/errno.h> 36#include <linux/errno.h>
37#include <linux/string.h> 37#include <linux/string.h>
@@ -524,4 +524,4 @@ MULTI_stack_switch(struct multicall_entry *mcl,
524 mcl->args[1] = esp; 524 mcl->args[1] = esp;
525} 525}
526 526
527#endif /* _ASM_X86_XEN__HYPERCALL_H */ 527#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 @@
30 * IN THE SOFTWARE. 30 * IN THE SOFTWARE.
31 */ 31 */
32 32
33#ifndef _ASM_X86_XEN__HYPERVISOR_H 33#ifndef _ASM_X86_XEN_HYPERVISOR_H
34#define _ASM_X86_XEN__HYPERVISOR_H 34#define _ASM_X86_XEN_HYPERVISOR_H
35 35
36#include <linux/types.h> 36#include <linux/types.h>
37#include <linux/kernel.h> 37#include <linux/kernel.h>
@@ -79,4 +79,4 @@ extern enum xen_domain_type xen_domain_type;
79#define xen_initial_domain() (xen_pv_domain() && xen_start_info->flags & SIF_INITDOMAIN) 79#define xen_initial_domain() (xen_pv_domain() && xen_start_info->flags & SIF_INITDOMAIN)
80#define xen_hvm_domain() (xen_domain_type == XEN_HVM_DOMAIN) 80#define xen_hvm_domain() (xen_domain_type == XEN_HVM_DOMAIN)
81 81
82#endif /* _ASM_X86_XEN__HYPERVISOR_H */ 82#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 @@
6 * Copyright (c) 2004, K A Fraser 6 * Copyright (c) 2004, K A Fraser
7 */ 7 */
8 8
9#ifndef _ASM_X86_XEN__INTERFACE_H 9#ifndef _ASM_X86_XEN_INTERFACE_H
10#define _ASM_X86_XEN__INTERFACE_H 10#define _ASM_X86_XEN_INTERFACE_H
11 11
12#ifdef __XEN__ 12#ifdef __XEN__
13#define __DEFINE_GUEST_HANDLE(name, type) \ 13#define __DEFINE_GUEST_HANDLE(name, type) \
@@ -172,4 +172,4 @@ DEFINE_GUEST_HANDLE_STRUCT(vcpu_guest_context);
172#define XEN_CPUID XEN_EMULATE_PREFIX "cpuid" 172#define XEN_CPUID XEN_EMULATE_PREFIX "cpuid"
173#endif 173#endif
174 174
175#endif /* _ASM_X86_XEN__INTERFACE_H */ 175#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 @@
6 * Copyright (c) 2004, K A Fraser 6 * Copyright (c) 2004, K A Fraser
7 */ 7 */
8 8
9#ifndef _ASM_X86_XEN__INTERFACE_32_H 9#ifndef _ASM_X86_XEN_INTERFACE_32_H
10#define _ASM_X86_XEN__INTERFACE_32_H 10#define _ASM_X86_XEN_INTERFACE_32_H
11 11
12 12
13/* 13/*
@@ -94,4 +94,4 @@ typedef struct xen_callback xen_callback_t;
94#define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) 94#define xen_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20))
95#define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) 95#define xen_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20))
96 96
97#endif /* _ASM_X86_XEN__INTERFACE_32_H */ 97#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 @@
1#ifndef _ASM_X86_XEN__INTERFACE_64_H 1#ifndef _ASM_X86_XEN_INTERFACE_64_H
2#define _ASM_X86_XEN__INTERFACE_64_H 2#define _ASM_X86_XEN_INTERFACE_64_H
3 3
4/* 4/*
5 * 64-bit segment selectors 5 * 64-bit segment selectors
@@ -156,4 +156,4 @@ typedef unsigned long xen_callback_t;
156#endif /* !__ASSEMBLY__ */ 156#endif /* !__ASSEMBLY__ */
157 157
158 158
159#endif /* _ASM_X86_XEN__INTERFACE_64_H */ 159#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 @@
1#ifndef _ASM_X86_XEN__PAGE_H 1#ifndef _ASM_X86_XEN_PAGE_H
2#define _ASM_X86_XEN__PAGE_H 2#define _ASM_X86_XEN_PAGE_H
3 3
4#include <linux/pfn.h> 4#include <linux/pfn.h>
5 5
@@ -162,4 +162,4 @@ xmaddr_t arbitrary_virt_to_machine(void *address);
162void make_lowmem_page_readonly(void *vaddr); 162void make_lowmem_page_readonly(void *vaddr);
163void make_lowmem_page_readwrite(void *vaddr); 163void make_lowmem_page_readwrite(void *vaddr);
164 164
165#endif /* _ASM_X86_XEN__PAGE_H */ 165#endif /* _ASM_X86_XEN_PAGE_H */