4 files changed, 12 insertions, 14 deletions
diff --git a/arch/microblaze/include/uapi/asm/elf.h b/arch/microblaze/include/uapi/asm/elf.h
index be1731d5e2fa..f96828f2b70a 100644
--- a/arch/microblaze/include/uapi/asm/elf.h
+++ b/arch/microblaze/include/uapi/asm/elf.h
@@ -8,8 +8,8 @@
  * for more details.
  */
 
-#ifndef _UAPI_ASM_MICROBLAZE_ELF_H
-#define _UAPI_ASM_MICROBLAZE_ELF_H
+#ifndef _ASM_MICROBLAZE_ELF_H
+#define _ASM_MICROBLAZE_ELF_H
 
 /*
  * Note there is no "official" ELF designation for Microblaze.
@@ -118,4 +118,4 @@ do {							\
 
 #endif /* __uClinux__ */
 
-#endif /* _UAPI_ASM_MICROBLAZE_ELF_H */
+#endif /* _ASM_MICROBLAZE_ELF_H */
diff --git a/arch/microblaze/include/uapi/asm/ptrace.h b/arch/microblaze/include/uapi/asm/ptrace.h
index d31238a5f946..5b0be96be9d7 100644
--- a/arch/microblaze/include/uapi/asm/ptrace.h
+++ b/arch/microblaze/include/uapi/asm/ptrace.h
@@ -6,8 +6,8 @@
  * for more details.
  */
 
-#ifndef _UAPI_ASM_MICROBLAZE_PTRACE_H
-#define _UAPI_ASM_MICROBLAZE_PTRACE_H
+#ifndef _ASM_MICROBLAZE_PTRACE_H
+#define _ASM_MICROBLAZE_PTRACE_H
 
 #ifndef __ASSEMBLY__
 
@@ -54,7 +54,6 @@ struct pt_regs {
 	int pt_mode;
 };
 
-#ifndef __KERNEL__
 
 /* pt_regs offsets used by gdbserver etc in ptrace syscalls */
 #define PT_GPR(n)	((n) * sizeof(microblaze_reg_t))
@@ -65,8 +64,7 @@ struct pt_regs {
 #define PT_FSR		(36 * sizeof(microblaze_reg_t))
 #define PT_KERNEL_MODE	(37 * sizeof(microblaze_reg_t))
 
-#endif /* __KERNEL */
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* _UAPI_ASM_MICROBLAZE_PTRACE_H */
+#endif /* _ASM_MICROBLAZE_PTRACE_H */
diff --git a/arch/microblaze/include/uapi/asm/setup.h b/arch/microblaze/include/uapi/asm/setup.h
index 76bc2acee6af..6af93cf87815 100644
--- a/arch/microblaze/include/uapi/asm/setup.h
+++ b/arch/microblaze/include/uapi/asm/setup.h
@@ -8,12 +8,12 @@
  * for more details.
  */
 
-#ifndef _UAPI_ASM_MICROBLAZE_SETUP_H
-#define _UAPI_ASM_MICROBLAZE_SETUP_H
+#ifndef _ASM_MICROBLAZE_SETUP_H
+#define _ASM_MICROBLAZE_SETUP_H
 
 #define COMMAND_LINE_SIZE	256
 
 # ifndef __ASSEMBLY__
 
 # endif /* __ASSEMBLY__ */
-#endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */
+#endif /* _ASM_MICROBLAZE_SETUP_H */
diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h
index 20043b67d158..0fa49724e42f 100644
--- a/arch/microblaze/include/uapi/asm/unistd.h
+++ b/arch/microblaze/include/uapi/asm/unistd.h
@@ -7,8 +7,8 @@
  * for more details.
  */
 
-#ifndef _UAPI_ASM_MICROBLAZE_UNISTD_H
-#define _UAPI_ASM_MICROBLAZE_UNISTD_H
+#ifndef _ASM_MICROBLAZE_UNISTD_H
+#define _ASM_MICROBLAZE_UNISTD_H
 
 #define __NR_restart_syscall	0 /* ok */
 #define __NR_exit		1 /* ok */
@@ -397,4 +397,4 @@
 #define __NR_kcmp		379
 #define __NR_finit_module	380
 
-#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
+#endif /* _ASM_MICROBLAZE_UNISTD_H */