diff options
| author |   Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2015-12-01 09:06:26 +0530 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2015-12-14 15:19:04 +1100 |
| commit | 26b6a3d9bb48f8b4624a62281bc2a295df3a8109 (patch) | |
| tree | 5cd9d811b9f786e28b22486c52da954b1d69ff75 /arch | |
| parent | powerpc/mm: Fix infinite loop in hash fault with 4K page size (diff) | |
| download | linux-dev-26b6a3d9bb48f8b4624a62281bc2a295df3a8109.tar.xz linux-dev-26b6a3d9bb48f8b4624a62281bc2a295df3a8109.zip | |
powerpc/mm: move pte headers to book3s directory
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/book3s/32/hash.h (renamed from arch/powerpc/include/asm/pte-hash32.h) | 6 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/book3s/64/hash-4k.h (renamed from arch/powerpc/include/asm/pte-hash64-4k.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/book3s/64/hash-64k.h (renamed from arch/powerpc/include/asm/pte-hash64-64k.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/book3s/64/hash.h (renamed from arch/powerpc/include/asm/pte-hash64.h) | 10 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/pgtable-ppc32.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/pgtable-ppc64.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/book3s/32/hash.h index 62cfb0c663bb..264b754d65b0 100644 --- a/arch/powerpc/include/asm/pte-hash32.h +++ b/arch/powerpc/include/asm/book3s/32/hash.h @@ -1,5 +1,5 @@ -#ifndef _ASM_POWERPC_PTE_HASH32_H -#define _ASM_POWERPC_PTE_HASH32_H +#ifndef _ASM_POWERPC_BOOK3S_32_HASH_H +#define _ASM_POWERPC_BOOK3S_32_HASH_H #ifdef __KERNEL__ /* @@ -43,4 +43,4 @@ #define PTE_ATOMIC_UPDATES 1 #endif /* __KERNEL__ */ -#endif /* _ASM_POWERPC_PTE_HASH32_H */ +#endif /* _ASM_POWERPC_BOOK3S_32_HASH_H */ diff --git a/arch/powerpc/include/asm/pte-hash64-4k.h b/arch/powerpc/include/asm/book3s/64/hash-4k.h index c134e809aac3..c134e809aac3 100644 --- a/arch/powerpc/include/asm/pte-hash64-4k.h +++ b/arch/powerpc/include/asm/book3s/64/hash-4k.h diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h index 4f4ec2ab45c9..4f4ec2ab45c9 100644 --- a/arch/powerpc/include/asm/pte-hash64-64k.h +++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h diff --git a/arch/powerpc/include/asm/pte-hash64.h b/arch/powerpc/include/asm/book3s/64/hash.h index ef612c160da7..8e60d4fa434d 100644 --- a/arch/powerpc/include/asm/pte-hash64.h +++ b/arch/powerpc/include/asm/book3s/64/hash.h @@ -1,5 +1,5 @@ -#ifndef _ASM_POWERPC_PTE_HASH64_H -#define _ASM_POWERPC_PTE_HASH64_H +#ifndef _ASM_POWERPC_BOOK3S_64_HASH_H +#define _ASM_POWERPC_BOOK3S_64_HASH_H #ifdef __KERNEL__ /* @@ -45,10 +45,10 @@ #define PTE_ATOMIC_UPDATES 1 #ifdef CONFIG_PPC_64K_PAGES -#include <asm/pte-hash64-64k.h> +#include <asm/book3s/64/hash-64k.h> #else -#include <asm/pte-hash64-4k.h> +#include <asm/book3s/64/hash-4k.h> #endif #endif /* __KERNEL__ */ -#endif /* _ASM_POWERPC_PTE_HASH64_H */ +#endif /* _ASM_POWERPC_BOOK3S_64_HASH_H */ diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h index 9c326565d498..1a58a05be99c 100644 --- a/arch/powerpc/include/asm/pgtable-ppc32.h +++ b/arch/powerpc/include/asm/pgtable-ppc32.h @@ -116,7 +116,7 @@ extern int icache_44x_need_flush; #elif defined(CONFIG_8xx) #include <asm/pte-8xx.h> #else /* CONFIG_6xx */ -#include <asm/pte-hash32.h> +#include <asm/book3s/32/hash.h> #endif /* And here we include common definitions */ diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h index 3245f2d96d4f..b36a932abdfb 100644 --- a/arch/powerpc/include/asm/pgtable-ppc64.h +++ b/arch/powerpc/include/asm/pgtable-ppc64.h @@ -98,7 +98,7 @@ * Include the PTE bits definitions */ #ifdef CONFIG_PPC_BOOK3S -#include <asm/pte-hash64.h> +#include <asm/book3s/64/hash.h> #else #include <asm/pte-book3e.h> #endif |