summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/boot
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2005-10-28 17:46:45 -0700
committerPaul Mackerras <paulus@samba.org>2005-10-29 15:07:38 +1000
commit9b0cbe97566dd7123eee0462d91703434fe61090 (patch)
tree816d6f93e2b84741c891e5edd600c6fdab91b675 /arch/ppc64/boot
parent06cf26beffc54bb43aebbefa60f84e0dffde3141 (diff)
downloadop-kernel-dev-9b0cbe97566dd7123eee0462d91703434fe61090.zip
op-kernel-dev-9b0cbe97566dd7123eee0462d91703434fe61090.tar.gz
[PATCH] ppc64 boot: use memset to clear bss
Use memset to clear bss, instead of own version. Signed-off-by: Olaf Hering <olh@suse.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/boot')
-rw-r--r--arch/ppc64/boot/crt0.S19
-rw-r--r--arch/ppc64/boot/main.c3
2 files changed, 3 insertions, 19 deletions
diff --git a/arch/ppc64/boot/crt0.S b/arch/ppc64/boot/crt0.S
index 3861e7f..da6618a 100644
--- a/arch/ppc64/boot/crt0.S
+++ b/arch/ppc64/boot/crt0.S
@@ -25,24 +25,5 @@ _start:
sync
isync
- ## Clear out the BSS as per ANSI C requirements
-
- lis r7,_end@ha
- addi r7,r7,_end@l # r7 = &_end
- lis r8,__bss_start@ha #
- addi r8,r8,__bss_start@l # r8 = &_bss_start
-
- ## Determine how large an area, in number of words, to clear
-
- subf r7,r8,r7 # r7 = &_end - &_bss_start + 1
- addi r7,r7,3 # r7 += 3
- srwi. r7,r7,2 # r7 = size in words.
- beq 3f # If the size is zero, don't bother
- addi r8,r8,-4 # r8 -= 4
- mtctr r7 # SPRN_CTR = number of words to clear
- li r0,0 # r0 = 0
-2: stwu r0,4(r8) # Clear out a word
- bdnz 2b # Keep clearing until done
-3:
b start
diff --git a/arch/ppc64/boot/main.c b/arch/ppc64/boot/main.c
index d039c47..c2c1f33 100644
--- a/arch/ppc64/boot/main.c
+++ b/arch/ppc64/boot/main.c
@@ -26,6 +26,7 @@ extern void flush_cache(void *, unsigned long);
#define ONE_MB 0x100000
extern char _start[];
+extern char __bss_start[];
extern char _end[];
extern char _vmlinux_start[];
extern char _vmlinux_end[];
@@ -138,6 +139,8 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
Elf64_Ehdr *elf64;
Elf64_Phdr *elf64ph;
+ memset(__bss_start, 0, _end - __bss_start);
+
prom = (int (*)(void *)) promptr;
chosen_handle = finddevice("/chosen");
if (chosen_handle == (void *) -1)
OpenPOWER on IntegriCloud