From d29df610b087713c1e245b3cdd8cbf88e2b1f326 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 30 Jan 2004 17:56:15 -0800
Subject: [PATCH] [PATCH] ppc64: add missing include guards, from Nathan Lynch

From: Anton Blanchard <anton@samba.org>

add missing include guards, from Nathan Lynch
---
 include/asm-ppc64/bugs.h          | 4 ++++
 include/asm-ppc64/hvcall.h        | 3 +++
 include/asm-ppc64/percpu.h        | 6 +++---
 include/asm-ppc64/ppc_asm.h       | 4 ++++
 include/asm-ppc64/ptrace-common.h | 4 ++++
 include/asm-ppc64/serial.h        | 6 +++++-
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/include/asm-ppc64/bugs.h b/include/asm-ppc64/bugs.h
index 3b95d97ab75dd..861074b3cf715 100644
--- a/include/asm-ppc64/bugs.h
+++ b/include/asm-ppc64/bugs.h
@@ -3,6 +3,10 @@
  * bugs.
  *
  */
+#ifndef _ASM_PPC64_BUGS_H
+#define _ASM_PPC64_BUGS_H
 
 static void check_bugs(void) {
 }
+
+#endif /* _ASM_PPC64_BUGS_H */
diff --git a/include/asm-ppc64/hvcall.h b/include/asm-ppc64/hvcall.h
index d963feaa077c7..13b78b8fc2b4f 100644
--- a/include/asm-ppc64/hvcall.h
+++ b/include/asm-ppc64/hvcall.h
@@ -1,3 +1,5 @@
+#ifndef _PPC64_HVCALL_H
+#define _PPC64_HVCALL_H
 
 #define H_Success	0
 #define H_Busy		1	/* Hardware busy -- retry later */
@@ -138,3 +140,4 @@ long plpar_hcall_4out(unsigned long opcode,
 		      unsigned long *out3,
 		      unsigned long *out4);
 
+#endif /* _PPC64_HVCALL_H */
diff --git a/include/asm-ppc64/percpu.h b/include/asm-ppc64/percpu.h
index 5764afa4b6a4b..60a659a4ce1fe 100644
--- a/include/asm-ppc64/percpu.h
+++ b/include/asm-ppc64/percpu.h
@@ -1,6 +1,6 @@
-#ifndef __ARCH_I386_PERCPU__
-#define __ARCH_I386_PERCPU__
+#ifndef __ARCH_PPC64_PERCPU__
+#define __ARCH_PPC64_PERCPU__
 
 #include <asm-generic/percpu.h>
 
-#endif /* __ARCH_I386_PERCPU__ */
+#endif /* __ARCH_PPC64_PERCPU__ */
diff --git a/include/asm-ppc64/ppc_asm.h b/include/asm-ppc64/ppc_asm.h
index a33d6347bd634..6ac08bb267e04 100644
--- a/include/asm-ppc64/ppc_asm.h
+++ b/include/asm-ppc64/ppc_asm.h
@@ -11,6 +11,8 @@
  *  2 of the License, or (at your option) any later version.
  */
 
+#ifndef _PPC64_PPC_ASM_H
+#define _PPC64_PPC_ASM_H
 /*
  * Macros for storing registers into and loading registers from
  * exception frames.
@@ -238,3 +240,5 @@
 #define	vr29	29
 #define	vr30	30
 #define	vr31	31
+
+#endif /* _PPC64_PPC_ASM_H */
diff --git a/include/asm-ppc64/ptrace-common.h b/include/asm-ppc64/ptrace-common.h
index b3295b1bf9920..3dbd3e5847b30 100644
--- a/include/asm-ppc64/ptrace-common.h
+++ b/include/asm-ppc64/ptrace-common.h
@@ -9,6 +9,8 @@
  * this archive for more details.
  */
 
+#ifndef _PPC64_PTRACE_COMMON_H
+#define _PPC64_PTRACE_COMMON_H
 /*
  * Set of msr bits that gdb can change on behalf of a process.
  */
@@ -64,3 +66,5 @@ static inline void clear_single_step(struct task_struct *task)
 	if (regs != NULL)
 		regs->msr &= ~MSR_SE;
 }
+
+#endif /* _PPC64_PTRACE_COMMON_H */
diff --git a/include/asm-ppc64/serial.h b/include/asm-ppc64/serial.h
index 64c4e0eef7000..edf5886c24c37 100644
--- a/include/asm-ppc64/serial.h
+++ b/include/asm-ppc64/serial.h
@@ -1,6 +1,8 @@
 /*
- * include/asm-ppc/serial.h
+ * include/asm-ppc64/serial.h
  */
+#ifndef _PPC64_SERIAL_H
+#define _PPC64_SERIAL_H
 
 #include <linux/config.h>
 
@@ -124,3 +126,5 @@
 	EXTRA_SERIAL_PORT_DEFNS		\
 	HUB6_SERIAL_PORT_DFNS		\
 	MCA_SERIAL_PORT_DFNS
+
+#endif /* _PPC64_SERIAL_H */
-- 
2.53.0