diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-10-23 00:01:39 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-23 00:01:39 -0700 |
commit | 05e4d3169bd16229d84a2ef095e1ba2cd3873baa (patch) | |
tree | 4046f086ce649f3bd28e9de9a3bdd4092e1395c1 /arch/x86/include/asm/xen | |
parent | 1965aae3c98397aad957412413c07e97b1bd4e64 (diff) | |
download | kernel_samsung_smdk4412-05e4d3169bd16229d84a2ef095e1ba2cd3873baa.zip kernel_samsung_smdk4412-05e4d3169bd16229d84a2ef095e1ba2cd3873baa.tar.gz kernel_samsung_smdk4412-05e4d3169bd16229d84a2ef095e1ba2cd3873baa.tar.bz2 |
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/xen')
-rw-r--r-- | arch/x86/include/asm/xen/events.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/xen/grant_table.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/xen/hypercall.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/xen/hypervisor.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/xen/interface.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/xen/interface_32.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/xen/interface_64.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/xen/page.h | 6 |
8 files changed, 24 insertions, 24 deletions
diff --git a/arch/x86/include/asm/xen/events.h b/arch/x86/include/asm/xen/events.h index ae3c9ad..1914418 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 6d55da9..fdbbb45 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 7c1192a..3f6000d 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 ff60551..a38d25a 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 6cfc896..e8506c1 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 a5377d4..42a7e00 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 21373e7..100d266 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 4f483e4..bc62899 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 */ |