diff options
| author | Hans-Joachim Picht | 2009-06-16 10:30:52 +0200 |
|---|---|---|
| committer | Martin Schwidefsky | 2009-06-16 10:31:22 +0200 |
| commit | 155af2f95f905c830688dd0ca7c7cac4107334fd (patch) | |
| tree | 4304a39e713d1594903e838830c4029715cc7a2a /arch/s390/kernel/mem_detect.c | |
| parent | [S390] pm: dcssblk power management callbacks. (diff) | |
| download | kernel-qcow2-linux-155af2f95f905c830688dd0ca7c7cac4107334fd.tar.gz kernel-qcow2-linux-155af2f95f905c830688dd0ca7c7cac4107334fd.tar.xz kernel-qcow2-linux-155af2f95f905c830688dd0ca7c7cac4107334fd.zip | |
[S390] s390: hibernation support for s390
This patch introduces the hibernation backend support to the
s390 architecture. Now it is possible to suspend a mainframe Linux
guest using the following command:
echo disk > /sys/power/state
Signed-off-by: Hans-Joachim Picht <hans@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/mem_detect.c')
| -rw-r--r-- | arch/s390/kernel/mem_detect.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/s390/kernel/mem_detect.c b/arch/s390/kernel/mem_detect.c index 9872999c66d1..559af0d07878 100644 --- a/arch/s390/kernel/mem_detect.c +++ b/arch/s390/kernel/mem_detect.c @@ -1,6 +1,7 @@ /* - * Copyright IBM Corp. 2008 - * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> + * Copyright IBM Corp. 2008, 2009 + * + * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> */ #include <linux/kernel.h> @@ -9,20 +10,6 @@ #include <asm/sclp.h> #include <asm/setup.h> -static inline int tprot(unsigned long addr) -{ - int rc = -EFAULT; - - asm volatile( - " tprot 0(%1),0\n" - "0: ipm %0\n" - " srl %0,28\n" - "1:\n" - EX_TABLE(0b,1b) - : "+d" (rc) : "a" (addr) : "cc"); - return rc; -} - #define ADDR2G (1ULL << 31) static void find_memory_chunks(struct mem_chunk chunk[]) |