All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] hugetlb: fix ARM 3level page tables
@ 2018-10-05 16:16 ` Arnd Bergmann
  0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2018-10-05 16:16 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Alexandre Ghiti, Luiz Capitulino, Mike Kravetz, Arnd Bergmann,
	Russell King, Stephen Rothwell, linux-arm-kernel, linux-kernel

The check for __HAVE_ARCH_HUGE_PTEP_GET comes before the definition,
leading to an extraneous definition of huge_ptep_get:

In file included from arch/arm/include/asm/hugetlb.h:28,
                 from include/linux/hugetlb.h:456,
                 from arch/arm/kvm/../../../virt/kvm/arm/mmu.c:22:
arch/arm/include/asm/hugetlb-3level.h:33:21: error: redefinition of 'huge_ptep_get'
 static inline pte_t huge_ptep_get(pte_t *ptep)

Change the header file inclusions to be in the correct order for
this to work.

Fixes: bb1d18ffc7ae ("hugetlb: introduce generic version of huge_ptep_get")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/include/asm/hugetlb.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/hugetlb.h b/arch/arm/include/asm/hugetlb.h
index 3fcef21ff2c2..b67256c22b08 100644
--- a/arch/arm/include/asm/hugetlb.h
+++ b/arch/arm/include/asm/hugetlb.h
@@ -23,9 +23,8 @@
 #define _ASM_ARM_HUGETLB_H
 
 #include <asm/page.h>
-#include <asm-generic/hugetlb.h>
-
 #include <asm/hugetlb-3level.h>
+#include <asm-generic/hugetlb.h>
 
 static inline int is_hugepage_only_range(struct mm_struct *mm,
 					 unsigned long addr, unsigned long len)
-- 
2.18.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] hugetlb: fix ARM 3level page tables
@ 2018-10-05 16:16 ` Arnd Bergmann
  0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2018-10-05 16:16 UTC (permalink / raw)
  To: linux-arm-kernel

The check for __HAVE_ARCH_HUGE_PTEP_GET comes before the definition,
leading to an extraneous definition of huge_ptep_get:

In file included from arch/arm/include/asm/hugetlb.h:28,
                 from include/linux/hugetlb.h:456,
                 from arch/arm/kvm/../../../virt/kvm/arm/mmu.c:22:
arch/arm/include/asm/hugetlb-3level.h:33:21: error: redefinition of 'huge_ptep_get'
 static inline pte_t huge_ptep_get(pte_t *ptep)

Change the header file inclusions to be in the correct order for
this to work.

Fixes: bb1d18ffc7ae ("hugetlb: introduce generic version of huge_ptep_get")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/include/asm/hugetlb.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/hugetlb.h b/arch/arm/include/asm/hugetlb.h
index 3fcef21ff2c2..b67256c22b08 100644
--- a/arch/arm/include/asm/hugetlb.h
+++ b/arch/arm/include/asm/hugetlb.h
@@ -23,9 +23,8 @@
 #define _ASM_ARM_HUGETLB_H
 
 #include <asm/page.h>
-#include <asm-generic/hugetlb.h>
-
 #include <asm/hugetlb-3level.h>
+#include <asm-generic/hugetlb.h>
 
 static inline int is_hugepage_only_range(struct mm_struct *mm,
 					 unsigned long addr, unsigned long len)
-- 
2.18.0

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] hugetlb: fix ARM 3level page tables
  2018-10-05 16:16 ` Arnd Bergmann
@ 2018-10-06  7:50   ` Naresh Kamboju
  -1 siblings, 0 replies; 6+ messages in thread
From: Naresh Kamboju @ 2018-10-06  7:50 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Andrew Morton, alex, lcapitulino, mike.kravetz,
	Russell King - ARM Linux, Stephen Rothwell, linux-arm-kernel,
	open list

Arnd,

On Fri, 5 Oct 2018 at 09:17, Arnd Bergmann <arnd@arndb.de> wrote:
>
> The check for __HAVE_ARCH_HUGE_PTEP_GET comes before the definition,
> leading to an extraneous definition of huge_ptep_get:
>
> In file included from arch/arm/include/asm/hugetlb.h:28,
>                  from include/linux/hugetlb.h:456,
>                  from arch/arm/kvm/../../../virt/kvm/arm/mmu.c:22:
> arch/arm/include/asm/hugetlb-3level.h:33:21: error: redefinition of 'huge_ptep_get'
>  static inline pte_t huge_ptep_get(pte_t *ptep)
>
> Change the header file inclusions to be in the correct order for
> this to work.
>
> Fixes: bb1d18ffc7ae ("hugetlb: introduce generic version of huge_ptep_get")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I have noticed this build error on linux next tree for arm32 build.
Thanks for the fix.

- Naresh

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] hugetlb: fix ARM 3level page tables
@ 2018-10-06  7:50   ` Naresh Kamboju
  0 siblings, 0 replies; 6+ messages in thread
From: Naresh Kamboju @ 2018-10-06  7:50 UTC (permalink / raw)
  To: linux-arm-kernel

Arnd,

On Fri, 5 Oct 2018 at 09:17, Arnd Bergmann <arnd@arndb.de> wrote:
>
> The check for __HAVE_ARCH_HUGE_PTEP_GET comes before the definition,
> leading to an extraneous definition of huge_ptep_get:
>
> In file included from arch/arm/include/asm/hugetlb.h:28,
>                  from include/linux/hugetlb.h:456,
>                  from arch/arm/kvm/../../../virt/kvm/arm/mmu.c:22:
> arch/arm/include/asm/hugetlb-3level.h:33:21: error: redefinition of 'huge_ptep_get'
>  static inline pte_t huge_ptep_get(pte_t *ptep)
>
> Change the header file inclusions to be in the correct order for
> this to work.
>
> Fixes: bb1d18ffc7ae ("hugetlb: introduce generic version of huge_ptep_get")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I have noticed this build error on linux next tree for arm32 build.
Thanks for the fix.

- Naresh

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] hugetlb: fix ARM 3level page tables
  2018-10-05 16:16 ` Arnd Bergmann
@ 2018-10-07 18:59   ` Alex Ghiti
  -1 siblings, 0 replies; 6+ messages in thread
From: Alex Ghiti @ 2018-10-07 18:59 UTC (permalink / raw)
  To: Arnd Bergmann, Andrew Morton
  Cc: Luiz Capitulino, Mike Kravetz, Russell King, Stephen Rothwell,
	linux-arm-kernel, linux-kernel

Thanks Arnd, this change intervened in v5, that seemed straightforward 
enough...Sorry about that, and thanks for your fix.

Alex


On 10/05/2018 04:16 PM, Arnd Bergmann wrote:
> The check for __HAVE_ARCH_HUGE_PTEP_GET comes before the definition,
> leading to an extraneous definition of huge_ptep_get:
>
> In file included from arch/arm/include/asm/hugetlb.h:28,
>                   from include/linux/hugetlb.h:456,
>                   from arch/arm/kvm/../../../virt/kvm/arm/mmu.c:22:
> arch/arm/include/asm/hugetlb-3level.h:33:21: error: redefinition of 'huge_ptep_get'
>   static inline pte_t huge_ptep_get(pte_t *ptep)
>
> Change the header file inclusions to be in the correct order for
> this to work.
>
> Fixes: bb1d18ffc7ae ("hugetlb: introduce generic version of huge_ptep_get")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   arch/arm/include/asm/hugetlb.h | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm/include/asm/hugetlb.h b/arch/arm/include/asm/hugetlb.h
> index 3fcef21ff2c2..b67256c22b08 100644
> --- a/arch/arm/include/asm/hugetlb.h
> +++ b/arch/arm/include/asm/hugetlb.h
> @@ -23,9 +23,8 @@
>   #define _ASM_ARM_HUGETLB_H
>   
>   #include <asm/page.h>
> -#include <asm-generic/hugetlb.h>
> -
>   #include <asm/hugetlb-3level.h>
> +#include <asm-generic/hugetlb.h>
>   
>   static inline int is_hugepage_only_range(struct mm_struct *mm,
>   					 unsigned long addr, unsigned long len)


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] hugetlb: fix ARM 3level page tables
@ 2018-10-07 18:59   ` Alex Ghiti
  0 siblings, 0 replies; 6+ messages in thread
From: Alex Ghiti @ 2018-10-07 18:59 UTC (permalink / raw)
  To: linux-arm-kernel

Thanks Arnd, this change intervened in v5, that seemed straightforward 
enough...Sorry about that, and thanks for your fix.

Alex


On 10/05/2018 04:16 PM, Arnd Bergmann wrote:
> The check for __HAVE_ARCH_HUGE_PTEP_GET comes before the definition,
> leading to an extraneous definition of huge_ptep_get:
>
> In file included from arch/arm/include/asm/hugetlb.h:28,
>                   from include/linux/hugetlb.h:456,
>                   from arch/arm/kvm/../../../virt/kvm/arm/mmu.c:22:
> arch/arm/include/asm/hugetlb-3level.h:33:21: error: redefinition of 'huge_ptep_get'
>   static inline pte_t huge_ptep_get(pte_t *ptep)
>
> Change the header file inclusions to be in the correct order for
> this to work.
>
> Fixes: bb1d18ffc7ae ("hugetlb: introduce generic version of huge_ptep_get")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   arch/arm/include/asm/hugetlb.h | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm/include/asm/hugetlb.h b/arch/arm/include/asm/hugetlb.h
> index 3fcef21ff2c2..b67256c22b08 100644
> --- a/arch/arm/include/asm/hugetlb.h
> +++ b/arch/arm/include/asm/hugetlb.h
> @@ -23,9 +23,8 @@
>   #define _ASM_ARM_HUGETLB_H
>   
>   #include <asm/page.h>
> -#include <asm-generic/hugetlb.h>
> -
>   #include <asm/hugetlb-3level.h>
> +#include <asm-generic/hugetlb.h>
>   
>   static inline int is_hugepage_only_range(struct mm_struct *mm,
>   					 unsigned long addr, unsigned long len)

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-10-07 19:01 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-05 16:16 [PATCH] hugetlb: fix ARM 3level page tables Arnd Bergmann
2018-10-05 16:16 ` Arnd Bergmann
2018-10-06  7:50 ` Naresh Kamboju
2018-10-06  7:50   ` Naresh Kamboju
2018-10-07 18:59 ` Alex Ghiti
2018-10-07 18:59   ` Alex Ghiti

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.