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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
swsusp_asm64.S
diff --git
a/arch/powerpc/kernel/swsusp_asm64.S
b/arch/powerpc/kernel/swsusp_asm64.S
index
e092c3c
..
86ac1d9
100644
(file)
--- a/
arch/powerpc/kernel/swsusp_asm64.S
+++ b/
arch/powerpc/kernel/swsusp_asm64.S
@@
-133,7
+133,7
@@
END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
cmpdi r12,0
beq- nothing_to_copy
- li r15,
512
+ li r15,
PAGE_SIZE>>3
copyloop:
ld r13,pbe_address(r12)
ld r14,pbe_orig_address(r12)