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

Commit c40b91b5 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] iSeries: Fix section mismatch warnings 



WARNING: vmlinux.o(.text+0x8124): Section mismatch: reference to .init.text:.iSeries_early_setup (between '.__start_initialization_iSeries' and '.__mmu_off')
WARNING: vmlinux.o(.text+0x8128): Section mismatch: reference to .init.text:.early_setup (between '.__start_initialization_iSeries' and '.__mmu_off')

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 56a4c6e3

arch/powerpc/kernel/head_64.S

+4 −3
Original line number Diff line number Diff line
@@ -809,8 +809,9 @@ system_reset_iSeries: 
	mtmsrd	r24			/* RI on */

	lhz	r24,PACAPACAINDEX(r13)	/* Get processor # */

	cmpwi	0,r24,0			/* Are we processor 0? */

	beq	.__start_initialization_iSeries	/* Start up the first processor */

	mfspr	r4,SPRN_CTRLF

	bne	1f

	b	.__start_initialization_iSeries	/* Start up the first processor */

1:	mfspr	r4,SPRN_CTRLF

	li	r5,CTRL_RUNLATCH	/* Turn off the run light */

	andc	r4,r4,r5

	mtspr	SPRN_CTRLT,r4
@@ -1611,7 +1612,7 @@ _GLOBAL(generic_secondary_smp_init) 
#endif



#ifdef CONFIG_PPC_ISERIES

_STATIC(__start_initialization_iSeries)

_INIT_STATIC(__start_initialization_iSeries)

	/* Clear out the BSS */

	LOAD_REG_IMMEDIATE(r11,__bss_stop)

	LOAD_REG_IMMEDIATE(r8,__bss_start)

include/asm-powerpc/ppc_asm.h

+12 −0
Original line number Diff line number Diff line
@@ -181,6 +181,18 @@ name: \ 
	.type GLUE(.,name),@function; \

GLUE(.,name):



#define _INIT_STATIC(name) \

	.section ".text.init.refok"; \

	.align 2 ; \

	.section ".opd","aw"; \

name: \

	.quad GLUE(.,name); \

	.quad .TOC.@tocbase; \

	.quad 0; \

	.previous; \

	.type GLUE(.,name),@function; \

GLUE(.,name):



#else /* 32-bit */



#define _GLOBAL(n)	\