Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 05e4d316 authored Oct 23, 2008 by 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: H. Peter Anvin <hpa@zytor.com>

parent 1965aae3

arch/x86/include/asm/mach-default/apm.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3,8 +3,8 @@
	* Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp>		* Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp>
	*/		*/

	#ifndef _ASM_X86_MACH_DEFAULT__APM_H		#ifndef _ASM_X86_MACH_DEFAULT_APM_H
	#define _ASM_X86_MACH_DEFAULT__APM_H		#define _ASM_X86_MACH_DEFAULT_APM_H

	#ifdef APM_ZERO_SEGS		#ifdef APM_ZERO_SEGS
	# define APM_DO_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;		return error;
	}		}

	#endif /* _ASM_X86_MACH_DEFAULT__APM_H */		#endif /* _ASM_X86_MACH_DEFAULT_APM_H */

arch/x86/include/asm/mach-default/mach_apic.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_MACH_DEFAULT__MACH_APIC_H		#ifndef _ASM_X86_MACH_DEFAULT_MACH_APIC_H
	#define _ASM_X86_MACH_DEFAULT__MACH_APIC_H		#define _ASM_X86_MACH_DEFAULT_MACH_APIC_H

	#ifdef CONFIG_X86_LOCAL_APIC		#ifdef CONFIG_X86_LOCAL_APIC

	@@ -153,4 +153,4 @@ static inline void enable_apic_mode(void)
	{		{
	}		}
	#endif /* CONFIG_X86_LOCAL_APIC */		#endif /* CONFIG_X86_LOCAL_APIC */
	#endif /* _ASM_X86_MACH_DEFAULT__MACH_APIC_H */		#endif /* _ASM_X86_MACH_DEFAULT_MACH_APIC_H */

arch/x86/include/asm/mach-default/mach_apicdef.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H		#ifndef _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H
	#define _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H		#define _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H

	#include <asm/apic.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)		#define GET_APIC_ID(x) get_apic_id(x)
	#endif		#endif

	#endif /* _ASM_X86_MACH_DEFAULT__MACH_APICDEF_H */		#endif /* _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H */

arch/x86/include/asm/mach-default/mach_ipi.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_MACH_DEFAULT__MACH_IPI_H		#ifndef _ASM_X86_MACH_DEFAULT_MACH_IPI_H
	#define _ASM_X86_MACH_DEFAULT__MACH_IPI_H		#define _ASM_X86_MACH_DEFAULT_MACH_IPI_H

	/* Avoid include hell */		/* Avoid include hell */
	#define NMI_VECTOR 0x02		#define NMI_VECTOR 0x02
	@@ -61,4 +61,4 @@ static inline void send_IPI_all(int vector)
	}		}
	#endif		#endif

	#endif /* _ASM_X86_MACH_DEFAULT__MACH_IPI_H */		#endif /* _ASM_X86_MACH_DEFAULT_MACH_IPI_H */

arch/x86/include/asm/mach-default/mach_mpparse.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_MACH_DEFAULT__MACH_MPPARSE_H		#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
	#define _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,		static inline int mps_oem_check(struct mp_config_table mpc, char oem,
	char *productid)		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 */