| Message ID | 20201214071306.346399-1-aneesh.kumar@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc/kup: Mark the kuap/keup function non __init | expand |
Le 14/12/2020 à 08:13, Aneesh Kumar K.V a écrit : > Kernel call these functions on cpu online and hence they should > not be marked __init. This is PPC64 only. See commit https://github.com/linuxppc/linux/commit/67d53f30e23ec66aa7bbdd1592d5e64d46876190#diff-9799ddc8e77e666295031a560afc2a754d2f5fa0ddfb96335495b26a07511ad4 Christophe > > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> > --- > arch/powerpc/mm/book3s32/mmu.c | 4 ++-- > arch/powerpc/mm/book3s64/pkeys.c | 4 ++-- > arch/powerpc/mm/init-common.c | 2 +- > arch/powerpc/mm/nohash/8xx.c | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c > index 23f60e97196e..8d9e90a99b51 100644 > --- a/arch/powerpc/mm/book3s32/mmu.c > +++ b/arch/powerpc/mm/book3s32/mmu.c > @@ -449,7 +449,7 @@ void __init print_system_hash_info(void) > } > > #ifdef CONFIG_PPC_KUEP > -void __init setup_kuep(bool disabled) > +void setup_kuep(bool disabled) > { > pr_info("Activating Kernel Userspace Execution Prevention\n"); > > @@ -459,7 +459,7 @@ void __init setup_kuep(bool disabled) > #endif > > #ifdef CONFIG_PPC_KUAP > -void __init setup_kuap(bool disabled) > +void setup_kuap(bool disabled) > { > pr_info("Activating Kernel Userspace Access Protection\n"); > > diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c > index 2b7ded396db4..f1c6f264ed91 100644 > --- a/arch/powerpc/mm/book3s64/pkeys.c > +++ b/arch/powerpc/mm/book3s64/pkeys.c > @@ -251,7 +251,7 @@ void __init pkey_early_init_devtree(void) > } > > #ifdef CONFIG_PPC_KUEP > -void __init setup_kuep(bool disabled) > +void setup_kuep(bool disabled) > { > if (disabled) > return; > @@ -277,7 +277,7 @@ void __init setup_kuep(bool disabled) > #endif > > #ifdef CONFIG_PPC_KUAP > -void __init setup_kuap(bool disabled) > +void setup_kuap(bool disabled) > { > if (disabled) > return; > diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c > index afdebb95bcae..c71af3978496 100644 > --- a/arch/powerpc/mm/init-common.c > +++ b/arch/powerpc/mm/init-common.c > @@ -47,7 +47,7 @@ static int __init parse_nosmap(char *p) > } > early_param("nosmap", parse_nosmap); > > -void __ref setup_kup(void) > +void setup_kup(void) > { > setup_kuep(disable_kuep); > setup_kuap(disable_kuap); > diff --git a/arch/powerpc/mm/nohash/8xx.c b/arch/powerpc/mm/nohash/8xx.c > index 231ca95f9ffb..9fba29b95b5a 100644 > --- a/arch/powerpc/mm/nohash/8xx.c > +++ b/arch/powerpc/mm/nohash/8xx.c > @@ -245,7 +245,7 @@ void set_context(unsigned long id, pgd_t *pgd) > } > > #ifdef CONFIG_PPC_KUEP > -void __init setup_kuep(bool disabled) > +void setup_kuep(bool disabled) > { > if (disabled) > return; > @@ -257,7 +257,7 @@ void __init setup_kuep(bool disabled) > #endif > > #ifdef CONFIG_PPC_KUAP > -void __init setup_kuap(bool disabled) > +void setup_kuap(bool disabled) > { > pr_info("Activating Kernel Userspace Access Protection\n"); > >
diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c index 23f60e97196e..8d9e90a99b51 100644 --- a/arch/powerpc/mm/book3s32/mmu.c +++ b/arch/powerpc/mm/book3s32/mmu.c @@ -449,7 +449,7 @@ void __init print_system_hash_info(void) } #ifdef CONFIG_PPC_KUEP -void __init setup_kuep(bool disabled) +void setup_kuep(bool disabled) { pr_info("Activating Kernel Userspace Execution Prevention\n"); @@ -459,7 +459,7 @@ void __init setup_kuep(bool disabled) #endif #ifdef CONFIG_PPC_KUAP -void __init setup_kuap(bool disabled) +void setup_kuap(bool disabled) { pr_info("Activating Kernel Userspace Access Protection\n"); diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c index 2b7ded396db4..f1c6f264ed91 100644 --- a/arch/powerpc/mm/book3s64/pkeys.c +++ b/arch/powerpc/mm/book3s64/pkeys.c @@ -251,7 +251,7 @@ void __init pkey_early_init_devtree(void) } #ifdef CONFIG_PPC_KUEP -void __init setup_kuep(bool disabled) +void setup_kuep(bool disabled) { if (disabled) return; @@ -277,7 +277,7 @@ void __init setup_kuep(bool disabled) #endif #ifdef CONFIG_PPC_KUAP -void __init setup_kuap(bool disabled) +void setup_kuap(bool disabled) { if (disabled) return; diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c index afdebb95bcae..c71af3978496 100644 --- a/arch/powerpc/mm/init-common.c +++ b/arch/powerpc/mm/init-common.c @@ -47,7 +47,7 @@ static int __init parse_nosmap(char *p) } early_param("nosmap", parse_nosmap); -void __ref setup_kup(void) +void setup_kup(void) { setup_kuep(disable_kuep); setup_kuap(disable_kuap); diff --git a/arch/powerpc/mm/nohash/8xx.c b/arch/powerpc/mm/nohash/8xx.c index 231ca95f9ffb..9fba29b95b5a 100644 --- a/arch/powerpc/mm/nohash/8xx.c +++ b/arch/powerpc/mm/nohash/8xx.c @@ -245,7 +245,7 @@ void set_context(unsigned long id, pgd_t *pgd) } #ifdef CONFIG_PPC_KUEP -void __init setup_kuep(bool disabled) +void setup_kuep(bool disabled) { if (disabled) return; @@ -257,7 +257,7 @@ void __init setup_kuep(bool disabled) #endif #ifdef CONFIG_PPC_KUAP -void __init setup_kuap(bool disabled) +void setup_kuap(bool disabled) { pr_info("Activating Kernel Userspace Access Protection\n");
Kernel call these functions on cpu online and hence they should not be marked __init. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> --- arch/powerpc/mm/book3s32/mmu.c | 4 ++-- arch/powerpc/mm/book3s64/pkeys.c | 4 ++-- arch/powerpc/mm/init-common.c | 2 +- arch/powerpc/mm/nohash/8xx.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)