Linux-parisc archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] parisc: fix compilation errrors
@ 2019-08-15 20:53 Qian Cai
  2019-08-15 21:02 ` Guenter Roeck
  0 siblings, 1 reply; 5+ messages in thread
From: Qian Cai @ 2019-08-15 20:53 UTC (permalink / raw)
  To: akpm
  Cc: James.Bottomley, deller, linux, kirill.shutemov, linux-parisc,
	linux-kernel, Qian Cai

The commit 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix
variable 'p4d' set but not used") converted a few functions from macros
to static inline, which causes parisc to complain,

In file included from ./include/asm-generic/4level-fixup.h:38:0,
                 from ./arch/parisc/include/asm/pgtable.h:5,
                 from ./arch/parisc/include/asm/io.h:6,
                 from ./include/linux/io.h:13,
                 from sound/core/memory.c:9:
./include/asm-generic/5level-fixup.h:14:18: error: unknown type name
'pgd_t'; did you mean 'pid_t'?
 #define p4d_t    pgd_t
                  ^
./include/asm-generic/5level-fixup.h:24:28: note: in expansion of macro
'p4d_t'
 static inline int p4d_none(p4d_t p4d)
                            ^~~~~

It is because "4level-fixup.h" is included before "asm/page.h" where
"pgd_t" is defined.

Fixes: 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix variable 'p4d' set but not used")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Qian Cai <cai@lca.pw>
---
 arch/parisc/include/asm/pgtable.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index a39b079e73f2..6d58c1739b42 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -2,6 +2,7 @@
 #ifndef _PARISC_PGTABLE_H
 #define _PARISC_PGTABLE_H
 
+#include <asm/page.h>
 #include <asm-generic/4level-fixup.h>
 
 #include <asm/fixmap.h>
@@ -98,8 +99,6 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
 
 #endif /* !__ASSEMBLY__ */
 
-#include <asm/page.h>
-
 #define pte_ERROR(e) \
 	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
 #define pmd_ERROR(e) \
-- 
2.20.1 (Apple Git-117)


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

* Re: [PATCH] parisc: fix compilation errrors
  2019-08-15 20:53 [PATCH] parisc: fix compilation errrors Qian Cai
@ 2019-08-15 21:02 ` Guenter Roeck
  2019-08-22 20:53   ` Helge Deller
  0 siblings, 1 reply; 5+ messages in thread
From: Guenter Roeck @ 2019-08-15 21:02 UTC (permalink / raw)
  To: Qian Cai
  Cc: akpm, James.Bottomley, deller, kirill.shutemov, linux-parisc,
	linux-kernel

On Thu, Aug 15, 2019 at 04:53:05PM -0400, Qian Cai wrote:
> The commit 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix
> variable 'p4d' set but not used") converted a few functions from macros
> to static inline, which causes parisc to complain,
> 
> In file included from ./include/asm-generic/4level-fixup.h:38:0,
>                  from ./arch/parisc/include/asm/pgtable.h:5,
>                  from ./arch/parisc/include/asm/io.h:6,
>                  from ./include/linux/io.h:13,
>                  from sound/core/memory.c:9:
> ./include/asm-generic/5level-fixup.h:14:18: error: unknown type name
> 'pgd_t'; did you mean 'pid_t'?
>  #define p4d_t    pgd_t
>                   ^
> ./include/asm-generic/5level-fixup.h:24:28: note: in expansion of macro
> 'p4d_t'
>  static inline int p4d_none(p4d_t p4d)
>                             ^~~~~
> 
> It is because "4level-fixup.h" is included before "asm/page.h" where
> "pgd_t" is defined.
> 
> Fixes: 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix variable 'p4d' set but not used")
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Qian Cai <cai@lca.pw>

Tested-by: Guenter Roeck <linux@roeck-us.net>

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

* Re: [PATCH] parisc: fix compilation errrors
  2019-08-15 21:02 ` Guenter Roeck
@ 2019-08-22 20:53   ` Helge Deller
  2019-08-22 23:04     ` Guenter Roeck
  0 siblings, 1 reply; 5+ messages in thread
From: Helge Deller @ 2019-08-22 20:53 UTC (permalink / raw)
  To: Guenter Roeck, Qian Cai
  Cc: akpm, James.Bottomley, kirill.shutemov, linux-parisc, linux-kernel

On 15.08.19 23:02, Guenter Roeck wrote:
> On Thu, Aug 15, 2019 at 04:53:05PM -0400, Qian Cai wrote:
>> The commit 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix
>> variable 'p4d' set but not used") converted a few functions from macros
>> to static inline, which causes parisc to complain,
>>
>> In file included from ./include/asm-generic/4level-fixup.h:38:0,
>>                   from ./arch/parisc/include/asm/pgtable.h:5,
>>                   from ./arch/parisc/include/asm/io.h:6,
>>                   from ./include/linux/io.h:13,
>>                   from sound/core/memory.c:9:
>> ./include/asm-generic/5level-fixup.h:14:18: error: unknown type name
>> 'pgd_t'; did you mean 'pid_t'?
>>   #define p4d_t    pgd_t
>>                    ^
>> ./include/asm-generic/5level-fixup.h:24:28: note: in expansion of macro
>> 'p4d_t'
>>   static inline int p4d_none(p4d_t p4d)
>>                              ^~~~~
>>
>> It is because "4level-fixup.h" is included before "asm/page.h" where
>> "pgd_t" is defined.
>>
>> Fixes: 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix variable 'p4d' set but not used")
>> Reported-by: Guenter Roeck <linux@roeck-us.net>
>> Signed-off-by: Qian Cai <cai@lca.pw>
>
> Tested-by: Guenter Roeck <linux@roeck-us.net>

Acked-by: Helge Deller <deller@gmx.de>

Helge

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

* Re: [PATCH] parisc: fix compilation errrors
  2019-08-22 20:53   ` Helge Deller
@ 2019-08-22 23:04     ` Guenter Roeck
  2019-08-22 23:15       ` Andrew Morton
  0 siblings, 1 reply; 5+ messages in thread
From: Guenter Roeck @ 2019-08-22 23:04 UTC (permalink / raw)
  To: Helge Deller, Qian Cai
  Cc: akpm, James.Bottomley, kirill.shutemov, linux-parisc, linux-kernel

On 8/22/19 1:53 PM, Helge Deller wrote:
> On 15.08.19 23:02, Guenter Roeck wrote:
>> On Thu, Aug 15, 2019 at 04:53:05PM -0400, Qian Cai wrote:
>>> The commit 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix
>>> variable 'p4d' set but not used") converted a few functions from macros
>>> to static inline, which causes parisc to complain,
>>>
>>> In file included from ./include/asm-generic/4level-fixup.h:38:0,
>>>                   from ./arch/parisc/include/asm/pgtable.h:5,
>>>                   from ./arch/parisc/include/asm/io.h:6,
>>>                   from ./include/linux/io.h:13,
>>>                   from sound/core/memory.c:9:
>>> ./include/asm-generic/5level-fixup.h:14:18: error: unknown type name
>>> 'pgd_t'; did you mean 'pid_t'?
>>>   #define p4d_t    pgd_t
>>>                    ^
>>> ./include/asm-generic/5level-fixup.h:24:28: note: in expansion of macro
>>> 'p4d_t'
>>>   static inline int p4d_none(p4d_t p4d)
>>>                              ^~~~~
>>>
>>> It is because "4level-fixup.h" is included before "asm/page.h" where
>>> "pgd_t" is defined.
>>>
>>> Fixes: 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix variable 'p4d' set but not used")
>>> Reported-by: Guenter Roeck <linux@roeck-us.net>
>>> Signed-off-by: Qian Cai <cai@lca.pw>
>>
>> Tested-by: Guenter Roeck <linux@roeck-us.net>
> 
> Acked-by: Helge Deller <deller@gmx.de>
> 
> Helge
> 

Any chance to push this patch into mainline anytime soon ? It has been applied
to -next, but all parisc builds in mainline are still broken.

Thanks,
Guenter

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

* Re: [PATCH] parisc: fix compilation errrors
  2019-08-22 23:04     ` Guenter Roeck
@ 2019-08-22 23:15       ` Andrew Morton
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Morton @ 2019-08-22 23:15 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: Helge Deller, Qian Cai, James.Bottomley, kirill.shutemov,
	linux-parisc, linux-kernel

On Thu, 22 Aug 2019 16:04:38 -0700 Guenter Roeck <linux@roeck-us.net> wrote:

> >>> Fixes: 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix variable 'p4d' set but not used")
> >>> Reported-by: Guenter Roeck <linux@roeck-us.net>
> >>> Signed-off-by: Qian Cai <cai@lca.pw>
> >>
> >> Tested-by: Guenter Roeck <linux@roeck-us.net>
> > 
> > Acked-by: Helge Deller <deller@gmx.de>
> > 
> > Helge
> > 
> 
> Any chance to push this patch into mainline anytime soon ? It has been applied
> to -next, but all parisc builds in mainline are still broken.

I'll be including it in tomorrow's patchpile->Linus.

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

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-15 20:53 [PATCH] parisc: fix compilation errrors Qian Cai
2019-08-15 21:02 ` Guenter Roeck
2019-08-22 20:53   ` Helge Deller
2019-08-22 23:04     ` Guenter Roeck
2019-08-22 23:15       ` Andrew Morton

Linux-parisc archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-parisc/0 linux-parisc/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-parisc linux-parisc/ https://lore.kernel.org/linux-parisc \
		linux-parisc@vger.kernel.org linux-parisc@archiver.kernel.org
	public-inbox-index linux-parisc


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-parisc


AGPL code for this site: git clone https://public-inbox.org/ public-inbox