diff options
author | Kumar Gala <galak@freescale.com> | 2005-10-18 18:42:41 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-19 19:43:34 -0400 |
commit | 3d904eef54fd145e2ae5fadb52d2c39bc49339ae (patch) | |
tree | 08c783f78f353aa54f5edee4542d0d6daabdfc6e /arch/ppc/kernel/head_44x.S | |
parent | b15125fa81a522882247242e569bc7035e28cc82 (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_44x.S')
-rw-r--r-- | arch/ppc/kernel/head_44x.S | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S index b1b9dc08abca..8b49679fad54 100644 --- a/arch/ppc/kernel/head_44x.S +++ b/arch/ppc/kernel/head_44x.S | |||
@@ -743,14 +743,18 @@ _GLOBAL(set_context) | |||
743 | * goes at the beginning of the data segment, which is page-aligned. | 743 | * goes at the beginning of the data segment, which is page-aligned. |
744 | */ | 744 | */ |
745 | .data | 745 | .data |
746 | _GLOBAL(sdata) | 746 | .align 12 |
747 | _GLOBAL(empty_zero_page) | 747 | .globl sdata |
748 | sdata: | ||
749 | .globl empty_zero_page | ||
750 | empty_zero_page: | ||
748 | .space 4096 | 751 | .space 4096 |
749 | 752 | ||
750 | /* | 753 | /* |
751 | * To support >32-bit physical addresses, we use an 8KB pgdir. | 754 | * To support >32-bit physical addresses, we use an 8KB pgdir. |
752 | */ | 755 | */ |
753 | _GLOBAL(swapper_pg_dir) | 756 | .globl swapper_pg_dir |
757 | swapper_pg_dir: | ||
754 | .space 8192 | 758 | .space 8192 |
755 | 759 | ||
756 | /* Reserved 4k for the critical exception stack & 4k for the machine | 760 | /* Reserved 4k for the critical exception stack & 4k for the machine |
@@ -759,13 +763,15 @@ _GLOBAL(swapper_pg_dir) | |||
759 | .align 12 | 763 | .align 12 |
760 | exception_stack_bottom: | 764 | exception_stack_bottom: |
761 | .space BOOKE_EXCEPTION_STACK_SIZE | 765 | .space BOOKE_EXCEPTION_STACK_SIZE |
762 | _GLOBAL(exception_stack_top) | 766 | .globl exception_stack_top |
767 | exception_stack_top: | ||
763 | 768 | ||
764 | /* | 769 | /* |
765 | * This space gets a copy of optional info passed to us by the bootstrap | 770 | * This space gets a copy of optional info passed to us by the bootstrap |
766 | * which is used to pass parameters into the kernel like root=/dev/sda1, etc. | 771 | * which is used to pass parameters into the kernel like root=/dev/sda1, etc. |
767 | */ | 772 | */ |
768 | _GLOBAL(cmd_line) | 773 | .globl cmd_line |
774 | cmd_line: | ||
769 | .space 512 | 775 | .space 512 |
770 | 776 | ||
771 | /* | 777 | /* |
@@ -774,5 +780,3 @@ _GLOBAL(cmd_line) | |||
774 | */ | 780 | */ |
775 | abatron_pteptrs: | 781 | abatron_pteptrs: |
776 | .space 8 | 782 | .space 8 |
777 | |||
778 | |||