aboutsummaryrefslogtreecommitdiff
path: root/arch/ppc/kernel/head_4xx.S
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-10-18 17:42:41 -0500
committerPaul Mackerras <paulus@samba.org>2005-10-20 09:43:34 +1000
commit3d904eef54fd145e2ae5fadb52d2c39bc49339ae (patch)
tree08c783f78f353aa54f5edee4542d0d6daabdfc6e /arch/ppc/kernel/head_4xx.S
parentb15125fa81a522882247242e569bc7035e28cc82 (diff)
[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: Kumar K. Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/kernel/head_4xx.S')
-rw-r--r--arch/ppc/kernel/head_4xx.S16
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/ppc/kernel/head_4xx.S b/arch/ppc/kernel/head_4xx.S
index 5772ce97e24..10c261c6702 100644
--- a/arch/ppc/kernel/head_4xx.S
+++ b/arch/ppc/kernel/head_4xx.S
@@ -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