Commit 3d904eef authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

[PATCH] ppc32: replace use of _GLOBAL with .globl for ppc32 



The _GLOBAL() macro is for text symbols only. Changed to using
.globl for .data symbols.  This is also needed in ppc32 land
to allow FSL Book-E, 40x, and 44x to work.

Signed-off-by: default avatarKumar K. Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b15125fa

arch/ppc/kernel/head_44x.S

+11 −7
Original line number Diff line number Diff line
@@ -743,14 +743,18 @@ _GLOBAL(set_context) 
 * goes at the beginning of the data segment, which is page-aligned.

 */

	.data

_GLOBAL(sdata)

_GLOBAL(empty_zero_page)

	.align	12

	.globl	sdata

sdata:

	.globl	empty_zero_page

empty_zero_page:

	.space	4096



/*

 * To support >32-bit physical addresses, we use an 8KB pgdir.

 */

_GLOBAL(swapper_pg_dir)

	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	8192



/* Reserved 4k for the critical exception stack & 4k for the machine
@@ -759,13 +763,15 @@ _GLOBAL(swapper_pg_dir) 
        .align 12

exception_stack_bottom:

	.space	BOOKE_EXCEPTION_STACK_SIZE

_GLOBAL(exception_stack_top)

	.globl	exception_stack_top

exception_stack_top:



/*

 * This space gets a copy of optional info passed to us by the bootstrap

 * which is used to pass parameters into the kernel like root=/dev/sda1, etc.

 */

_GLOBAL(cmd_line)

	.globl	cmd_line

cmd_line:

	.space	512



/*
@@ -774,5 +780,3 @@ _GLOBAL(cmd_line) 
 */

abatron_pteptrs:

	.space	8

arch/ppc/kernel/head_4xx.S

+11 −5
Original line number Diff line number Diff line
@@ -988,10 +988,14 @@ _GLOBAL(set_context) 
 * goes at the beginning of the data segment, which is page-aligned.

 */

	.data

_GLOBAL(sdata)

_GLOBAL(empty_zero_page)

	.align	12

	.globl	sdata

sdata:

	.globl	empty_zero_page

empty_zero_page:

	.space	4096

_GLOBAL(swapper_pg_dir)

	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	4096
@@ -1001,12 +1005,14 @@ _GLOBAL(swapper_pg_dir) 
exception_stack_bottom:

	.space	4096

critical_stack_top:

_GLOBAL(exception_stack_top)

	.globl	exception_stack_top

exception_stack_top:



/* This space gets a copy of optional info passed to us by the bootstrap

 * which is used to pass parameters into the kernel like root=/dev/sda1, etc.

 */

_GLOBAL(cmd_line)

	.globl	cmd_line

cmd_line:

	.space	512



/* Room for two PTE pointers, usually the kernel and current user pointers

arch/ppc/kernel/head_fsl_booke.S

+11 −6
Original line number Diff line number Diff line
@@ -1028,10 +1028,14 @@ _GLOBAL(set_context) 
 * goes at the beginning of the data segment, which is page-aligned.

 */

	.data

_GLOBAL(sdata)

_GLOBAL(empty_zero_page)

	.align	12

	.globl	sdata

sdata:

	.globl	empty_zero_page

empty_zero_page:

	.space	4096

_GLOBAL(swapper_pg_dir)

	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	4096



/* Reserved 4k for the critical exception stack & 4k for the machine
@@ -1040,13 +1044,15 @@ _GLOBAL(swapper_pg_dir) 
        .align 12

exception_stack_bottom:

	.space	BOOKE_EXCEPTION_STACK_SIZE * NR_CPUS

_GLOBAL(exception_stack_top)

	.globl	exception_stack_top

exception_stack_top:



/*

 * This space gets a copy of optional info passed to us by the bootstrap

 * which is used to pass parameters into the kernel like root=/dev/sda1, etc.

 */

_GLOBAL(cmd_line)

	.globl	cmd_line

cmd_line:

	.space	512



/*
@@ -1055,4 +1061,3 @@ _GLOBAL(cmd_line) 
 */

abatron_pteptrs:

	.space	8