git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
simple
/
relocate.S
diff --git
a/arch/ppc/boot/simple/relocate.S
b/arch/ppc/boot/simple/relocate.S
index
2533113
..
1bbbcd2
100644
(file)
--- a/
arch/ppc/boot/simple/relocate.S
+++ b/
arch/ppc/boot/simple/relocate.S
@@
-13,7
+13,6
@@
* or implied.
*/
* or implied.
*/
-#include <linux/config.h>
#include <asm/cache.h>
#include <asm/ppc_asm.h>
#include <asm/cache.h>
#include <asm/ppc_asm.h>
@@
-155,8
+154,8
@@
do_relocate_out:
start_ldr:
/* Clear all of BSS and set up stack for C calls */
start_ldr:
/* Clear all of BSS and set up stack for C calls */
- lis r3,
edata
@h
- ori r3,r3,
edata
@l
+ lis r3,
__bss_start
@h
+ ori r3,r3,
__bss_start
@l
lis r4,end@h
ori r4,r4,end@l
subi r3,r3,4
lis r4,end@h
ori r4,r4,end@l
subi r3,r3,4
@@
-164,7
+163,7
@@
start_ldr:
li r0,0
50: stwu r0,4(r3)
cmpw cr0,r3,r4
li r0,0
50: stwu r0,4(r3)
cmpw cr0,r3,r4
- b
ne
50b
+ b
lt
50b
90: mr r9,r1 /* Save old stack pointer (in case it matters) */
lis r1,.stack@h
ori r1,r1,.stack@l
90: mr r9,r1 /* Save old stack pointer (in case it matters) */
lis r1,.stack@h
ori r1,r1,.stack@l