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

Commit 748a7683 authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Fix modpost warnings from head*.S on ppc32 



We get warnings like the following from the various ppc32 head*.S files:

WARNING: vmlinux.o(.text+0x358): Section mismatch: reference to .init.text:early_init (between 'skpinv' and 'interrupt_base')
WARNING: vmlinux.o(.text+0x380): Section mismatch: reference to .init.text:machine_init (between 'skpinv' and 'interrupt_base')
WARNING: vmlinux.o(.text+0x384): Section mismatch: reference to .init.text:MMU_init (between 'skpinv' and 'interrupt_base')
WARNING: vmlinux.o(.text+0x3aa): Section mismatch: reference to .init.text:start_kernel (between 'skpinv' and 'interrupt_base')
WARNING: vmlinux.o(.text+0x3ae): Section mismatch: reference to .init.text:start_kernel (between 'skpinv' and 'interrupt_base')

Added a .text.head section simliar to what other architectures do since
modpost already excludes this from its warnings.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 5e14d21e

arch/powerpc/kernel/head_32.S

+7 −10
Original line number Diff line number Diff line
@@ -48,20 +48,17 @@ 
	mtspr	SPRN_DBAT##n##L,RB;	\

1:



	.text

	.section	.text.head, "ax"

	.stabs	"arch/powerpc/kernel/",N_SO,0,0,0f

	.stabs	"head_32.S",N_SO,0,0,0f

0:

	.globl	_stext

_stext:

_ENTRY(_stext);



/*

 * _start is defined this way because the XCOFF loader in the OpenFirmware

 * on the powermac expects the entry point to be a procedure descriptor.

 */

	.text

	.globl	_start

_start:

_ENTRY(_start);

	/*

	 * These are here for legacy reasons, the kernel used to

	 * need to look like a coff function entry for the pmac
@@ -841,7 +838,7 @@ relocate_kernel: 
 * r3 = dest addr, r4 = source addr, r5 = copy limit, r6 = start offset

 * on exit, r3, r4, r5 are unchanged, r6 is updated to be >= r5.

 */

_GLOBAL(copy_and_flush)

_ENTRY(copy_and_flush)

	addi	r5,r5,-4

	addi	r6,r6,-4

4:	li	r0,L1_CACHE_BYTES/4
@@ -954,9 +951,9 @@ __secondary_start: 
 * included in CONFIG_6xx

 */

#if !defined(CONFIG_6xx)

_GLOBAL(__save_cpu_setup)

_ENTRY(__save_cpu_setup)

	blr

_GLOBAL(__restore_cpu_setup)

_ENTRY(__restore_cpu_setup)

	blr

#endif /* !defined(CONFIG_6xx) */
@@ -1080,7 +1077,7 @@ start_here: 
/*

 * Set up the segment registers for a new context.

 */

_GLOBAL(set_context)

_ENTRY(set_context)

	mulli	r3,r3,897	/* multiply context by skew factor */

	rlwinm	r3,r3,4,8,27	/* VSID = (context & 0xfffff) << 4 */

	addis	r3,r3,0x6000	/* Set Ks, Ku bits */

arch/powerpc/kernel/head_40x.S

+6 −6
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ 
 *

 * This is all going to change RSN when we add bi_recs.......  -- Dan

 */

	.text

_GLOBAL(_stext)

_GLOBAL(_start)

	.section	.text.head, "ax"

_ENTRY(_stext);

_ENTRY(_start);



	/* Save parameters we are passed.

	*/
@@ -89,9 +89,9 @@ turn_on_mmu: 
 */

	. = 0xc0

crit_save:

_GLOBAL(crit_r10)

_ENTRY(crit_r10)

	.space	4

_GLOBAL(crit_r11)

_ENTRY(crit_r11)

	.space	4



/*
@@ -814,7 +814,7 @@ finish_tlb_load: 
 * The PowerPC 4xx family of processors do not have an FPU, so this just

 * returns.

 */

_GLOBAL(giveup_fpu)

_ENTRY(giveup_fpu)

	blr



/* This is where the main kernel code starts.

arch/powerpc/kernel/head_44x.S

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ 
 *   r7 - End of kernel command line string

 *

 */

	.text

_GLOBAL(_stext)

_GLOBAL(_start)

	.section	.text.head, "ax"

_ENTRY(_stext);

_ENTRY(_start);

	/*

	 * Reserve a word at a fixed location to store the address

	 * of abatron_pteptrs

arch/powerpc/kernel/head_8xx.S

+3 −6
Original line number Diff line number Diff line
@@ -38,12 +38,9 @@ 
#else

#define DO_8xx_CPU6(val, reg)

#endif

	.text

	.globl	_stext

_stext:

	.text

	.globl	_start

_start:

	.section	.text.head, "ax"

_ENTRY(_stext);

_ENTRY(_start);



/* MPC8xx

 * This port was done on an MBX board with an 860.  Right now I only

arch/powerpc/kernel/head_fsl_booke.S

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ 
 *   r7 - End of kernel command line string

 *

 */

	.text

_GLOBAL(_stext)

_GLOBAL(_start)

	.section	.text.head, "ax"

_ENTRY(_stext);

_ENTRY(_start);

	/*

	 * Reserve a word at a fixed location to store the address

	 * of abatron_pteptrs