[PATCH] m68k: pgtable: Add missing #include <asm/page.h>

Geert Uytterhoeven posted 1 patch 1 year, 9 months ago
arch/m68k/include/asm/pgtable.h | 2 ++
1 file changed, 2 insertions(+)
[PATCH] m68k: pgtable: Add missing #include <asm/page.h>
Posted by Geert Uytterhoeven 1 year, 9 months ago
When just including <linux/pgtable.h>:

    include/asm-generic/pgtable-nop4d.h:9:18: error: unknown type name ‘pgd_t’
	9 | typedef struct { pgd_t pgd; } p4d_t;
	  |                  ^~~~~

Make <asm/pgtable.h> self-contained by including <asm/page.h>.

Reported-by: Jani Nikula <jani.nikula@intel.com>
Closes: https://lore.kernel.org/r/878r2uxwha.fsf@intel.com
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Jani: Feel free to pick this up as a dependency.
Else I will queue this in the m68k tree for v6.10.

 arch/m68k/include/asm/pgtable.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/m68k/include/asm/pgtable.h b/arch/m68k/include/asm/pgtable.h
index 27525c6a12fd0c7f..49fcfd7348600594 100644
--- a/arch/m68k/include/asm/pgtable.h
+++ b/arch/m68k/include/asm/pgtable.h
@@ -2,6 +2,8 @@
 #ifndef __M68K_PGTABLE_H
 #define __M68K_PGTABLE_H
 
+#include <asm/page.h>
+
 #ifdef __uClinux__
 #include <asm/pgtable_no.h>
 #else
-- 
2.34.1

Re: [PATCH] m68k: pgtable: Add missing #include <asm/page.h>
Posted by Jani Nikula 1 year, 9 months ago
On Thu, 07 Mar 2024, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> When just including <linux/pgtable.h>:
>
>     include/asm-generic/pgtable-nop4d.h:9:18: error: unknown type name ‘pgd_t’
> 	9 | typedef struct { pgd_t pgd; } p4d_t;
> 	  |                  ^~~~~
>
> Make <asm/pgtable.h> self-contained by including <asm/page.h>.
>
> Reported-by: Jani Nikula <jani.nikula@intel.com>
> Closes: https://lore.kernel.org/r/878r2uxwha.fsf@intel.com
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> Jani: Feel free to pick this up as a dependency.
> Else I will queue this in the m68k tree for v6.10.

Thanks, I'd like to pick this up as a dependency, so I can proceed with
my series. It'll also be queued for v6.10 via the drm subsystem.

BR,
Jani.


>
>  arch/m68k/include/asm/pgtable.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/m68k/include/asm/pgtable.h b/arch/m68k/include/asm/pgtable.h
> index 27525c6a12fd0c7f..49fcfd7348600594 100644
> --- a/arch/m68k/include/asm/pgtable.h
> +++ b/arch/m68k/include/asm/pgtable.h
> @@ -2,6 +2,8 @@
>  #ifndef __M68K_PGTABLE_H
>  #define __M68K_PGTABLE_H
>  
> +#include <asm/page.h>
> +
>  #ifdef __uClinux__
>  #include <asm/pgtable_no.h>
>  #else

-- 
Jani Nikula, Intel
Re: [PATCH] m68k: pgtable: Add missing #include <asm/page.h>
Posted by Jani Nikula 1 year, 9 months ago
On Thu, 07 Mar 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> On Thu, 07 Mar 2024, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>> When just including <linux/pgtable.h>:
>>
>>     include/asm-generic/pgtable-nop4d.h:9:18: error: unknown type name ‘pgd_t’
>> 	9 | typedef struct { pgd_t pgd; } p4d_t;
>> 	  |                  ^~~~~
>>
>> Make <asm/pgtable.h> self-contained by including <asm/page.h>.
>>
>> Reported-by: Jani Nikula <jani.nikula@intel.com>
>> Closes: https://lore.kernel.org/r/878r2uxwha.fsf@intel.com
>> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> ---
>> Jani: Feel free to pick this up as a dependency.
>> Else I will queue this in the m68k tree for v6.10.
>
> Thanks, I'd like to pick this up as a dependency, so I can proceed with
> my series. It'll also be queued for v6.10 via the drm subsystem.

Replying here too, I've merged this via drm-misc-next as d1815393cac0
("m68k: pgtable: Add missing #include <asm/page.h>").

Thanks for the patch!

BR,
Jani.


-- 
Jani Nikula, Intel