Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/booke/32/pte-40x.h | 6 +++---
arch/powerpc/include/asm/booke/32/pte-44x.h | 6 +++---
arch/powerpc/include/asm/booke/32/pte-8xx.h | 6 +++---
arch/powerpc/include/asm/booke/32/pte-fsl-booke.h | 6 +++---
arch/powerpc/include/asm/booke/64/pgtable-4k.h | 7 ++++---
arch/powerpc/include/asm/booke/64/pgtable-64k.h | 6 +++---
arch/powerpc/include/asm/booke/pte-book3e.h | 6 +++---
7 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/arch/powerpc/include/asm/booke/32/pte-40x.h
b/arch/powerpc/include/asm/booke/32/pte-40x.h
index 486b1ef81338..555a14540069 100644
--- a/arch/powerpc/include/asm/booke/32/pte-40x.h
+++ b/arch/powerpc/include/asm/booke/32/pte-40x.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_PTE_40x_H
-#define _ASM_POWERPC_PTE_40x_H
+#ifndef _ASM_POWERPC_BOOKE_32_PTE_40x_H
+#define _ASM_POWERPC_BOOKE_32_PTE_40x_H
#ifdef __KERNEL__
/*
@@ -61,4 +61,4 @@
#define PTE_ATOMIC_UPDATES 1
#endif /* __KERNEL__ */
-#endif /* _ASM_POWERPC_PTE_40x_H */
+#endif /* _ASM_POWERPC_BOOKE_32_PTE_40x_H */
diff --git a/arch/powerpc/include/asm/booke/32/pte-44x.h
b/arch/powerpc/include/asm/booke/32/pte-44x.h
index 36f75fab23f5..43f116f52fff 100644
--- a/arch/powerpc/include/asm/booke/32/pte-44x.h
+++ b/arch/powerpc/include/asm/booke/32/pte-44x.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_PTE_44x_H
-#define _ASM_POWERPC_PTE_44x_H
+#ifndef _ASM_POWERPC_BOOKE_32_PTE_44x_H
+#define _ASM_POWERPC_BOOKE_32_PTE_44x_H
#ifdef __KERNEL__
/*
@@ -94,4 +94,4 @@
#endif /* __KERNEL__ */
-#endif /* _ASM_POWERPC_PTE_44x_H */
+#endif /* _ASM_POWERPC_BOOKE_32_PTE_44x_H */
diff --git a/arch/powerpc/include/asm/booke/32/pte-8xx.h
b/arch/powerpc/include/asm/booke/32/pte-8xx.h
index a0e2ba960976..c5c4383b3298 100644
--- a/arch/powerpc/include/asm/booke/32/pte-8xx.h
+++ b/arch/powerpc/include/asm/booke/32/pte-8xx.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_PTE_8xx_H
-#define _ASM_POWERPC_PTE_8xx_H
+#ifndef _ASM_POWERPC_BOOKE_32_PTE_8xx_H
+#define _ASM_POWERPC_BOOKE_32_PTE_8xx_H
#ifdef __KERNEL__
/*
@@ -62,4 +62,4 @@
_PAGE_HWWRITE | _PAGE_EXEC)
#endif /* __KERNEL__ */
-#endif /* _ASM_POWERPC_PTE_8xx_H */
+#endif /* _ASM_POWERPC_BOOKE_32_PTE_8xx_H */
diff --git a/arch/powerpc/include/asm/booke/32/pte-fsl-booke.h
b/arch/powerpc/include/asm/booke/32/pte-fsl-booke.h
index 9f5c3d04a1a3..6c6aecc1ab3f 100644
--- a/arch/powerpc/include/asm/booke/32/pte-fsl-booke.h
+++ b/arch/powerpc/include/asm/booke/32/pte-fsl-booke.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_PTE_FSL_BOOKE_H
-#define _ASM_POWERPC_PTE_FSL_BOOKE_H
+#ifndef _ASM_POWERPC_BOOKE_32_PTE_FSL_BOOKE_H
+#define _ASM_POWERPC_BOOKE_32_PTE_FSL_BOOKE_H
#ifdef __KERNEL__
/* PTE bit definitions for Freescale BookE SW loaded TLB MMU based
@@ -37,4 +37,4 @@
#define PTE_WIMGE_SHIFT (6)
#endif /* __KERNEL__ */
-#endif /* _ASM_POWERPC_PTE_FSL_BOOKE_H */
+#endif /* _ASM_POWERPC_BOOKE_32_PTE_FSL_BOOKE_H */
diff --git a/arch/powerpc/include/asm/booke/64/pgtable-4k.h
b/arch/powerpc/include/asm/booke/64/pgtable-4k.h
index 7bace25d6b62..a509140bd81c 100644
--- a/arch/powerpc/include/asm/booke/64/pgtable-4k.h
+++ b/arch/powerpc/include/asm/booke/64/pgtable-4k.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_PGTABLE_PPC64_4K_H
-#define _ASM_POWERPC_PGTABLE_PPC64_4K_H
+#ifndef _ASM_POWERPC_BOOKE_64_PGTABLE_4K_H
+#define _ASM_POWERPC_BOOKE_64_PGTABLE_4K_H
/*
* Entries per page directory level. The PTE level must use a 64b record
* for each page table entry. The PMD and PGD level use a 32b record for
@@ -89,4 +89,5 @@ extern struct page *pgd_page(pgd_t pgd);
#define remap_4k_pfn(vma, addr, pfn, prot) \
remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE, (prot))
-#endif /* _ASM_POWERPC_PGTABLE_PPC64_4K_H */
+#endif /* _ _ASM_POWERPC_BOOKE_64_PGTABLE_4K_H */
+
diff --git a/arch/powerpc/include/asm/booke/64/pgtable-64k.h
b/arch/powerpc/include/asm/booke/64/pgtable-64k.h
index 1de35bbd02a6..67faa8acb871 100644
--- a/arch/powerpc/include/asm/booke/64/pgtable-64k.h
+++ b/arch/powerpc/include/asm/booke/64/pgtable-64k.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_PGTABLE_PPC64_64K_H
-#define _ASM_POWERPC_PGTABLE_PPC64_64K_H
+#ifndef _ASM_POWERPC_BOOKE_64_PGTABLE_64K_H
+#define _ASM_POWERPC_BOOKE_64_PGTABLE_64K_H
#include <asm-generic/pgtable-nopud.h>
@@ -41,4 +41,4 @@
#define pgd_pte(pgd) (pud_pte(((pud_t){ pgd })))
#define pte_pgd(pte) ((pgd_t)pte_pud(pte))
-#endif /* _ASM_POWERPC_PGTABLE_PPC64_64K_H */
+#endif /* _ASM_POWERPC_BOOKE_64_PGTABLE_64K_H */
diff --git a/arch/powerpc/include/asm/booke/pte-book3e.h
b/arch/powerpc/include/asm/booke/pte-book3e.h
index 8d8473278d91..46c889c20b8a 100644
--- a/arch/powerpc/include/asm/booke/pte-book3e.h
+++ b/arch/powerpc/include/asm/booke/pte-book3e.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_PTE_BOOK3E_H
-#define _ASM_POWERPC_PTE_BOOK3E_H
+#ifndef _ASM_POWERPC_BOOKE_PTE_BOOK3E_H
+#define _ASM_POWERPC_BOOKE_PTE_BOOK3E_H
#ifdef __KERNEL__
/* PTE bit definitions for processors compliant to the Book3E
@@ -84,4 +84,4 @@
#endif
#endif /* __KERNEL__ */
-#endif /* _ASM_POWERPC_PTE_FSL_BOOKE_H */
+#endif /* _ASM_POWERPC_BOOKE_PTE_BOOK3E_H */
--
2.5.0
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
