Re: [PATCH V5 02/31] powerpc/mm: move pte headers to book3s directory (part 2)

[Anshuman Khandual]

On 11/23/2015 03:52 PM, Aneesh Kumar K.V wrote:
> diff --git a/arch/powerpc/include/asm/pte-hash64-4k.h 
> b/arch/powerpc/include/asm/book3s/64/hash-4k.h
> similarity index 99%
> rename from arch/powerpc/include/asm/pte-hash64-4k.h
> rename to arch/powerpc/include/asm/book3s/64/hash-4k.h
> index c134e809aac3..79750fd3eeb8 100644
> --- a/arch/powerpc/include/asm/pte-hash64-4k.h
> +++ b/arch/powerpc/include/asm/book3s/64/hash-4k.h
> @@ -14,4 +14,3 @@
>  
>  /* shift to put page number into pte */
>  #define PTE_RPN_SHIFT(17)
> -

Is there any specific reason to remove this one line while
renaming & moving the header file ? It will be cleaner not
to make any changes to the header while moving it around.

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH V5 02/31] powerpc/mm: move pte headers to book3s directory (part 2)

[Aneesh Kumar K.V]

Splitting this so that rename can track changes to file. Before merging
we will fold this

Acked-by: Scott Wood 
Signed-off-by: Aneesh Kumar K.V 
---
 arch/powerpc/include/asm/book3s/32/hash.h  |  6 +++---
 .../include/asm/{pte-hash64-4k.h => book3s/64/hash-4k.h}   |  1 -
 .../include/asm/{pte-hash64-64k.h => book3s/64/hash-64k.h} |  0
 arch/powerpc/include/asm/book3s/64/hash.h  | 10 +-
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename arch/powerpc/include/asm/{pte-hash64-4k.h => book3s/64/hash-4k.h} (99%)
 rename arch/powerpc/include/asm/{pte-hash64-64k.h => book3s/64/hash-64k.h} 
(100%)

diff --git a/arch/powerpc/include/asm/book3s/32/hash.h 
b/arch/powerpc/include/asm/book3s/32/hash.h
index 62cfb0c663bb..264b754d65b0 100644
--- a/arch/powerpc/include/asm/book3s/32/hash.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
similarity index 99%
rename from arch/powerpc/include/asm/pte-hash64-4k.h
rename to arch/powerpc/include/asm/book3s/64/hash-4k.h
index c134e809aac3..79750fd3eeb8 100644
--- a/arch/powerpc/include/asm/pte-hash64-4k.h
+++ b/arch/powerpc/include/asm/book3s/64/hash-4k.h
@@ -14,4 +14,3 @@
 
 /* shift to put page number into pte */
 #define PTE_RPN_SHIFT  (17)
-
diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h 
b/arch/powerpc/include/asm/book3s/64/hash-64k.h
similarity index 100%
rename from arch/powerpc/include/asm/pte-hash64-64k.h
rename to arch/powerpc/include/asm/book3s/64/hash-64k.h
diff --git a/arch/powerpc/include/asm/book3s/64/hash.h 
b/arch/powerpc/include/asm/book3s/64/hash.h
index ef612c160da7..8e60d4fa434d 100644
--- a/arch/powerpc/include/asm/book3s/64/hash.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 
+#include 
 #else
-#include 
+#include 
 #endif
 
 #endif /* __KERNEL__ */
-#endif /*  _ASM_POWERPC_PTE_HASH64_H */
+#endif /* _ASM_POWERPC_BOOK3S_64_HASH_H */
-- 
2.5.0

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev