git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
misc_32.S
diff --git
a/arch/powerpc/kernel/misc_32.S
b/arch/powerpc/kernel/misc_32.S
index
01d0d97
..
be98202
100644
(file)
--- a/
arch/powerpc/kernel/misc_32.S
+++ b/
arch/powerpc/kernel/misc_32.S
@@
-68,7
+68,7
@@
_GLOBAL(reloc_offset)
mflr r0
bl 1f
1: mflr r3
- LOAD
ADDR
(r4,1b)
+ LOAD
_REG_IMMEDIATE
(r4,1b)
subf r3,r4,r3
mtlr r0
blr
@@
-80,7
+80,7
@@
_GLOBAL(add_reloc_offset)
mflr r0
bl 1f
1: mflr r5
- LOAD
ADDR
(r4,1b)
+ LOAD
_REG_IMMEDIATE
(r4,1b)
subf r5,r4,r5
add r3,r3,r5
mtlr r0