lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kumar Gala
2005-10-18 17:42:41 -05:00
committed by Paul Mackerras
parent b15125fa81
commit 3d904eef54
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/ppc/kernel/head_44x.S
View File

@@ -743,14 +743,18 @@ _GLOBAL(set_context)
* goes at the beginning of the data segment, which is page-aligned. * goes at the beginning of the data segment, which is page-aligned.
*/ */
.data .data
_GLOBAL(sdata) .align 12
_GLOBAL(empty_zero_page) .globl sdata
sdata:
.globl empty_zero_page
empty_zero_page:
.space 4096 .space 4096
/* /*
* To support >32-bit physical addresses, we use an 8KB pgdir. * To support >32-bit physical addresses, we use an 8KB pgdir.
*/ */
_GLOBAL(swapper_pg_dir) .globl swapper_pg_dir
swapper_pg_dir:
.space 8192 .space 8192
/* Reserved 4k for the critical exception stack & 4k for the machine /* Reserved 4k for the critical exception stack & 4k for the machine
@@ -759,13 +763,15 @@ _GLOBAL(swapper_pg_dir)
.align 12 .align 12
exception_stack_bottom: exception_stack_bottom:
.space BOOKE_EXCEPTION_STACK_SIZE .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 * 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. * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
*/ */
_GLOBAL(cmd_line) .globl cmd_line
cmd_line:
.space 512 .space 512
/* /*
@@ -774,5 +780,3 @@ _GLOBAL(cmd_line)
*/ */
abatron_pteptrs: abatron_pteptrs:
.space 8 .space 8

16
arch/ppc/kernel/head_4xx.S
View File

@@ -988,10 +988,14 @@ _GLOBAL(set_context)
* goes at the beginning of the data segment, which is page-aligned. * goes at the beginning of the data segment, which is page-aligned.
*/ */
.data .data
_GLOBAL(sdata) .align 12
_GLOBAL(empty_zero_page) .globl sdata
sdata:
.globl empty_zero_page
empty_zero_page:
.space 4096 .space 4096
_GLOBAL(swapper_pg_dir) .globl swapper_pg_dir
swapper_pg_dir:
.space 4096 .space 4096
@@ -1001,12 +1005,14 @@ _GLOBAL(swapper_pg_dir)
exception_stack_bottom: exception_stack_bottom:
.space 4096 .space 4096
critical_stack_top: 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 /* 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. * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
*/ */
_GLOBAL(cmd_line) .globl cmd_line
cmd_line:
.space 512 .space 512
/* Room for two PTE pointers, usually the kernel and current user pointers /* Room for two PTE pointers, usually the kernel and current user pointers

17
arch/ppc/kernel/head_fsl_booke.S
View File

@@ -1028,10 +1028,14 @@ _GLOBAL(set_context)
* goes at the beginning of the data segment, which is page-aligned. * goes at the beginning of the data segment, which is page-aligned.
*/ */
.data .data
_GLOBAL(sdata) .align 12
_GLOBAL(empty_zero_page) .globl sdata
sdata:
.globl empty_zero_page
empty_zero_page:
.space 4096 .space 4096
_GLOBAL(swapper_pg_dir) .globl swapper_pg_dir
swapper_pg_dir:
.space 4096 .space 4096
/* Reserved 4k for the critical exception stack & 4k for the machine /* Reserved 4k for the critical exception stack & 4k for the machine
@@ -1040,13 +1044,15 @@ _GLOBAL(swapper_pg_dir)
.align 12 .align 12
exception_stack_bottom: exception_stack_bottom:
.space BOOKE_EXCEPTION_STACK_SIZE * NR_CPUS .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 * 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. * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
*/ */
_GLOBAL(cmd_line) .globl cmd_line
cmd_line:
.space 512 .space 512
/* /*
@@ -1055,4 +1061,3 @@ _GLOBAL(cmd_line)
*/ */
abatron_pteptrs: abatron_pteptrs:
.space 8 .space 8