2 files changed, 3 insertions, 19 deletions

diff --git a/arch/ppc64/boot/crt0.S b/arch/ppc64/boot/crt0.S
index 3861e7f9cf19..da6618a865c9 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 d039c47f8e5a..c2c1f3309113 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)