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/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
i386
/
power
/
swsusp.S
diff --git
a/arch/i386/power/swsusp.S
b/arch/i386/power/swsusp.S
index
c893b89
..
8a2b50a
100644
(file)
--- a/
arch/i386/power/swsusp.S
+++ b/
arch/i386/power/swsusp.S
@@
-32,7
+32,7
@@
ENTRY(swsusp_arch_resume)
movl $swsusp_pg_dir-__PAGE_OFFSET, %ecx
movl %ecx, %cr3
- movl
pagedir_nosave
, %edx
+ movl
restore_pblist
, %edx
.p2align 4,,7
copy_loop: