projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 931f3697 GKH |
1 | From foo@baz Tue Oct 28 11:19:22 CST 2014 |
| 2 | From: "David S. Miller" <davem@davemloft.net> | |
| 3 | Date: Wed, 24 Sep 2014 21:05:30 -0700 | |
| 4 | Subject: sparc64: Fix hibernation code refrence to PAGE_OFFSET. | |
| 5 | ||
| 6 | From: "David S. Miller" <davem@davemloft.net> | |
| 7 | ||
| 8 | We changed PAGE_OFFSET to be a variable rather than a constant, | |
| 9 | but this reference here in the hibernate assembler got missed. | |
| 10 | ||
| 11 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 12 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 13 | --- | |
| 14 | arch/sparc/power/hibernate_asm.S | 4 ++-- | |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 16 | ||
| 17 | --- a/arch/sparc/power/hibernate_asm.S | |
| 18 | +++ b/arch/sparc/power/hibernate_asm.S | |
| 19 | @@ -54,8 +54,8 @@ ENTRY(swsusp_arch_resume) | |
| 20 | nop | |
| 21 | ||
| 22 | /* Write PAGE_OFFSET to %g7 */ | |
| 23 | - sethi %uhi(PAGE_OFFSET), %g7 | |
| 24 | - sllx %g7, 32, %g7 | |
| 25 | + sethi %hi(PAGE_OFFSET), %g7 | |
| 26 | + ldx [%g7 + %lo(PAGE_OFFSET)], %g7 | |
| 27 | ||
| 28 | setuw (PAGE_SIZE-8), %g3 | |
| 29 |