Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ec723c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc: Move {d,i,u}cache_bsize definitions to a common place 



The variables are defined twice in setup_32.c and setup_64.c, do it
once in setup-common.c instead

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2a196e24

arch/powerpc/kernel/setup-common.c

+9 −0
Original line number Diff line number Diff line
@@ -87,6 +87,15 @@ EXPORT_SYMBOL(machine_id); 
int boot_cpuid = -1;

EXPORT_SYMBOL_GPL(boot_cpuid);



/*

 * These are used in binfmt_elf.c to put aux entries on the stack

 * for each elf executable being started.

 */

int dcache_bsize;

int icache_bsize;

int ucache_bsize;





unsigned long klimit = (unsigned long) _end;



/*

arch/powerpc/kernel/setup_32.c

+0 −8
Original line number Diff line number Diff line
@@ -58,14 +58,6 @@ EXPORT_SYMBOL(ISA_DMA_THRESHOLD); 
EXPORT_SYMBOL(DMA_MODE_READ);

EXPORT_SYMBOL(DMA_MODE_WRITE);



/*

 * These are used in binfmt_elf.c to put aux entries on the stack

 * for each elf executable being started.

 */

int dcache_bsize;

int icache_bsize;

int ucache_bsize;



/*

 * We're called here very early in the boot.

 *

arch/powerpc/kernel/setup_64.c

+0 −8
Original line number Diff line number Diff line
@@ -88,14 +88,6 @@ struct ppc64_caches ppc64_caches = { 
};

EXPORT_SYMBOL_GPL(ppc64_caches);



/*

 * These are used in binfmt_elf.c to put aux entries on the stack

 * for each elf executable being started.

 */

int dcache_bsize;

int icache_bsize;

int ucache_bsize;



#if defined(CONFIG_PPC_BOOK3E) && defined(CONFIG_SMP)

void __init setup_tlb_core_data(void)

{