diff mbox series

[SRU,J/realtime,1/1] x86/mm: Include spinlock_t definition in pgtable.

Message ID 20220510200546.197176-2-joseph.salisbury@canonical.com
State New
Headers show
Series Fix for LP:1972899 | expand

Commit Message

Joseph Salisbury May 10, 2022, 8:05 p.m. UTC 
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

BugLink: https://bugs.launchpad.net/bugs/1972899

This header file provides forward declartion for pgd_lock but does not
include the header defining its type. This works since the definition of
spinlock_t is usually included somehow via printk.

By trying to avoid recursive includes on PREEMPT_RT I avoided the loop
in printk and as a consequnce kernel/intel.c failed to compile due to
missing type definition.

Include the needed definition for spinlock_t.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20211102165224.wpz4zyhsvwccx5p3@linutronix.de
(cherry picked from commit 35fa745286ac44ee26ed100c2bd2553368ad193b)
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 arch/x86/include/asm/pgtable.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Cengiz Can May 11, 2022, 12:55 a.m. UTC | #1 
May 10, 2022 23:09:01 Joseph Salisbury <joseph.salisbury@canonical.com>:

> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>
> BugLink: https://bugs.launchpad.net/bugs/1972899
>
> This header file provides forward declartion for pgd_lock but does not
> include the header defining its type. This works since the definition of
> spinlock_t is usually included somehow via printk.
>
> By trying to avoid recursive includes on PREEMPT_RT I avoided the loop
> in printk and as a consequnce kernel/intel.c failed to compile due to
> missing type definition.
>
> Include the needed definition for spinlock_t.
>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
> Link: https://lkml.kernel.org/r/20211102165224.wpz4zyhsvwccx5p3@linutronix.de
> (cherry picked from commit 35fa745286ac44ee26ed100c2bd2553368ad193b)
> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>

Excellent investigation!

Acked-by: Cengiz Can <cengiz.can@canonical.com>

> ---
> arch/x86/include/asm/pgtable.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
> index 448cd01eb3ec..a34430b7af4a 100644
> --- a/arch/x86/include/asm/pgtable.h
> +++ b/arch/x86/include/asm/pgtable.h
> @@ -22,6 +22,7 @@
> #define pgprot_decrypted(prot) __pgprot(__sme_clr(pgprot_val(prot)))
>
> #ifndef __ASSEMBLY__
> +#include <linux/spinlock.h>
> #include <asm/x86_init.h>
> #include <asm/pkru.h>
> #include <asm/fpu/api.h>
> --
> 2.34.1
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox series

Patch

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 448cd01eb3ec..a34430b7af4a 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -22,6 +22,7 @@ 
 #define pgprot_decrypted(prot)	__pgprot(__sme_clr(pgprot_val(prot)))
 
 #ifndef __ASSEMBLY__
+#include <linux/spinlock.h>
 #include <asm/x86_init.h>
 #include <asm/pkru.h>
 #include <asm/fpu/api.h>