[3.13.y.z extended stable] Patch "sparc64: Fix hibernation code refrence to PAGE_OFFSET." has been added to staging queue

Kamal Mostafa kamal at canonical.com
Fri Oct 31 20:53:28 UTC 2014


This is a note to let you know that I have just added a patch titled

    sparc64: Fix hibernation code refrence to PAGE_OFFSET.

to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11.11.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From df2a98c27b6bbc9db4bcd1fee8381023fddb10cf Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem at davemloft.net>
Date: Wed, 24 Sep 2014 21:05:30 -0700
Subject: sparc64: Fix hibernation code refrence to PAGE_OFFSET.

[ Upstream commit 9d0713edf72461438bc3526e4ea55fec47754cd9 ]

We changed PAGE_OFFSET to be a variable rather than a constant,
but this reference here in the hibernate assembler got missed.

Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 arch/sparc/power/hibernate_asm.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/power/hibernate_asm.S b/arch/sparc/power/hibernate_asm.S
index 7994216..d7d9017 100644
--- a/arch/sparc/power/hibernate_asm.S
+++ b/arch/sparc/power/hibernate_asm.S
@@ -54,8 +54,8 @@ ENTRY(swsusp_arch_resume)
 	 nop

 	/* Write PAGE_OFFSET to %g7 */
-	sethi	%uhi(PAGE_OFFSET), %g7
-	sllx	%g7, 32, %g7
+	sethi	%hi(PAGE_OFFSET), %g7
+	ldx	[%g7 + %lo(PAGE_OFFSET)], %g7

 	setuw	(PAGE_SIZE-8), %g3

--
1.9.1





More information about the kernel-team mailing list