| Message ID | 20190717080621.40424-3-yanaijie@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | implement KASLR for powerpc/fsl_booke/32 | expand |
Le 17/07/2019 à 10:06, Jason Yan a écrit : > These two variables are both defined in init_32.c and init_64.c. Move > them to init-common.c. > > Signed-off-by: Jason Yan <yanaijie@huawei.com> > Cc: Diana Craciun <diana.craciun@nxp.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Christophe Leroy <christophe.leroy@c-s.fr> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Cc: Paul Mackerras <paulus@samba.org> > Cc: Nicholas Piggin <npiggin@gmail.com> > Cc: Kees Cook <keescook@chromium.org> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > arch/powerpc/mm/init-common.c | 5 +++++ > arch/powerpc/mm/init_32.c | 5 ----- > arch/powerpc/mm/init_64.c | 5 ----- > 3 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c > index a84da92920f7..9273c38009cb 100644 > --- a/arch/powerpc/mm/init-common.c > +++ b/arch/powerpc/mm/init-common.c > @@ -21,6 +21,11 @@ > #include <asm/pgtable.h> > #include <asm/kup.h> > > +phys_addr_t memstart_addr = (phys_addr_t)~0ull; > +EXPORT_SYMBOL(memstart_addr); > +phys_addr_t kernstart_addr; > +EXPORT_SYMBOL(kernstart_addr); > + > static bool disable_kuep = !IS_ENABLED(CONFIG_PPC_KUEP); > static bool disable_kuap = !IS_ENABLED(CONFIG_PPC_KUAP); > > diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c > index b04896a88d79..872df48ae41b 100644 > --- a/arch/powerpc/mm/init_32.c > +++ b/arch/powerpc/mm/init_32.c > @@ -56,11 +56,6 @@ > phys_addr_t total_memory; > phys_addr_t total_lowmem; > > -phys_addr_t memstart_addr = (phys_addr_t)~0ull; > -EXPORT_SYMBOL(memstart_addr); > -phys_addr_t kernstart_addr; > -EXPORT_SYMBOL(kernstart_addr); > - > #ifdef CONFIG_RELOCATABLE > /* Used in __va()/__pa() */ > long long virt_phys_offset; > diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c > index a44f6281ca3a..c836f1269ee7 100644 > --- a/arch/powerpc/mm/init_64.c > +++ b/arch/powerpc/mm/init_64.c > @@ -63,11 +63,6 @@ > > #include <mm/mmu_decl.h> > > -phys_addr_t memstart_addr = ~0; > -EXPORT_SYMBOL_GPL(memstart_addr); > -phys_addr_t kernstart_addr; > -EXPORT_SYMBOL_GPL(kernstart_addr); > - > #ifdef CONFIG_SPARSEMEM_VMEMMAP > /* > * Given an address within the vmemmap, determine the pfn of the page that >
I think you need to keep the more restrictive EXPORT_SYMBOL_GPL from the 64-bit code to keep the intention of all authors intact.
On 2019/7/29 22:31, Christoph Hellwig wrote: > I think you need to keep the more restrictive EXPORT_SYMBOL_GPL from > the 64-bit code to keep the intention of all authors intact. > Oh yes, I will fix in v2. Thanks. > . >
diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c index a84da92920f7..9273c38009cb 100644 --- a/arch/powerpc/mm/init-common.c +++ b/arch/powerpc/mm/init-common.c @@ -21,6 +21,11 @@ #include <asm/pgtable.h> #include <asm/kup.h> +phys_addr_t memstart_addr = (phys_addr_t)~0ull; +EXPORT_SYMBOL(memstart_addr); +phys_addr_t kernstart_addr; +EXPORT_SYMBOL(kernstart_addr); + static bool disable_kuep = !IS_ENABLED(CONFIG_PPC_KUEP); static bool disable_kuap = !IS_ENABLED(CONFIG_PPC_KUAP); diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index b04896a88d79..872df48ae41b 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c @@ -56,11 +56,6 @@ phys_addr_t total_memory; phys_addr_t total_lowmem; -phys_addr_t memstart_addr = (phys_addr_t)~0ull; -EXPORT_SYMBOL(memstart_addr); -phys_addr_t kernstart_addr; -EXPORT_SYMBOL(kernstart_addr); - #ifdef CONFIG_RELOCATABLE /* Used in __va()/__pa() */ long long virt_phys_offset; diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index a44f6281ca3a..c836f1269ee7 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -63,11 +63,6 @@ #include <mm/mmu_decl.h> -phys_addr_t memstart_addr = ~0; -EXPORT_SYMBOL_GPL(memstart_addr); -phys_addr_t kernstart_addr; -EXPORT_SYMBOL_GPL(kernstart_addr); - #ifdef CONFIG_SPARSEMEM_VMEMMAP /* * Given an address within the vmemmap, determine the pfn of the page that
These two variables are both defined in init_32.c and init_64.c. Move them to init-common.c. Signed-off-by: Jason Yan <yanaijie@huawei.com> Cc: Diana Craciun <diana.craciun@nxp.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Christophe Leroy <christophe.leroy@c-s.fr> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Kees Cook <keescook@chromium.org> --- arch/powerpc/mm/init-common.c | 5 +++++ arch/powerpc/mm/init_32.c | 5 ----- arch/powerpc/mm/init_64.c | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-)