aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/char
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>2013-09-11 17:24:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 18:59:15 -0400
commit6f79d33228fa7cf900826738a39f287cae96cd91 (patch)
tree219851a19eb86c91c77241cb00b3889719fdab23 /drivers/s390/char
parent11e376a3f9ffa85bf444b65df5326612b083c501 (diff)
s390/vmcore: use vmcore for zfcpdump
Modify the s390 copy_oldmem_page() and remap_oldmem_pfn_range() function for zfcpdump to read from the HSA memory if memory below HSA_SIZE bytes is requested. Otherwise real memory is used. Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> Cc: Jan Willeke <willeke@de.ibm.com> Cc: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/s390/char')
-rw-r--r--drivers/s390/char/zcore.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 9e5e14686e75..794820a123d0 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -30,8 +30,8 @@
30 30
31#define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x) 31#define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x)
32 32
33#define TO_USER 0 33#define TO_USER 1
34#define TO_KERNEL 1 34#define TO_KERNEL 0
35#define CHUNK_INFO_SIZE 34 /* 2 16-byte char, each followed by blank */ 35#define CHUNK_INFO_SIZE 34 /* 2 16-byte char, each followed by blank */
36 36
37enum arch_id { 37enum arch_id {
@@ -73,7 +73,7 @@ static struct ipl_parameter_block *ipl_block;
73 * @count: Size of buffer, which should be copied 73 * @count: Size of buffer, which should be copied
74 * @mode: Either TO_KERNEL or TO_USER 74 * @mode: Either TO_KERNEL or TO_USER
75 */ 75 */
76static int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode) 76int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode)
77{ 77{
78 int offs, blk_num; 78 int offs, blk_num;
79 static char buf[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); 79 static char buf[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));