Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
s390
/
char
/
zcore.c
diff --git
a/kernel/drivers/s390/char/zcore.c
b/kernel/drivers/s390/char/zcore.c
index
a68fcfd
..
823f41f
100644
(file)
--- a/
kernel/drivers/s390/char/zcore.c
+++ b/
kernel/drivers/s390/char/zcore.c
@@
-154,7
+154,7
@@
static int __init init_cpu_info(enum arch_id arch)
/* get info for boot cpu from lowcore, stored in the HSA */
/* get info for boot cpu from lowcore, stored in the HSA */
- sa_ext = dump_save_area
_create(0)
;
+ sa_ext = dump_save_area
s.areas[0]
;
if (!sa_ext)
return -ENOMEM;
if (memcpy_hsa_kernel(&sa_ext->sa, sys_info.sa_base,
if (!sa_ext)
return -ENOMEM;
if (memcpy_hsa_kernel(&sa_ext->sa, sys_info.sa_base,
@@
-330,9
+330,9
@@
static ssize_t zcore_read(struct file *file, char __user *buf, size_t count,
mem_offs = 0;
/* Copy from HSA data */
mem_offs = 0;
/* Copy from HSA data */
- if (*ppos < sclp
_get_hsa_size()
+ HEADER_SIZE) {
+ if (*ppos < sclp
.hsa_size
+ HEADER_SIZE) {
size = min((count - hdr_count),
size = min((count - hdr_count),
- (size_t) (sclp
_get_hsa_size()
- mem_start));
+ (size_t) (sclp
.hsa_size
- mem_start));
rc = memcpy_hsa_user(buf + hdr_count, mem_start, size);
if (rc)
goto fail;
rc = memcpy_hsa_user(buf + hdr_count, mem_start, size);
if (rc)
goto fail;
@@
-483,7
+483,7
@@
static ssize_t zcore_hsa_read(struct file *filp, char __user *buf,
static char str[18];
if (hsa_available)
static char str[18];
if (hsa_available)
- snprintf(str, sizeof(str), "%lx\n", sclp
_get_hsa_size()
);
+ snprintf(str, sizeof(str), "%lx\n", sclp
.hsa_size
);
else
snprintf(str, sizeof(str), "0\n");
return simple_read_from_buffer(buf, count, ppos, str, strlen(str));
else
snprintf(str, sizeof(str), "0\n");
return simple_read_from_buffer(buf, count, ppos, str, strlen(str));
@@
-558,7
+558,7
@@
static int __init sys_info_init(enum arch_id arch, unsigned long mem_end)
static int __init check_sdias(void)
{
static int __init check_sdias(void)
{
- if (!sclp
_get_hsa_size()
) {
+ if (!sclp
.hsa_size
) {
TRACE("Could not determine HSA size\n");
return -ENODEV;
}
TRACE("Could not determine HSA size\n");
return -ENODEV;
}
@@
-619,7
+619,7
@@
static int __init zcore_reipl_init(void)
ipl_block = (void *) __get_free_page(GFP_KERNEL);
if (!ipl_block)
return -ENOMEM;
ipl_block = (void *) __get_free_page(GFP_KERNEL);
if (!ipl_block)
return -ENOMEM;
- if (ipib_info.ipib < sclp
_get_hsa_size()
)
+ if (ipib_info.ipib < sclp
.hsa_size
)
rc = memcpy_hsa_kernel(ipl_block, ipib_info.ipib, PAGE_SIZE);
else
rc = memcpy_real(ipl_block, (void *) ipib_info.ipib, PAGE_SIZE);
rc = memcpy_hsa_kernel(ipl_block, ipib_info.ipib, PAGE_SIZE);
else
rc = memcpy_real(ipl_block, (void *) ipib_info.ipib, PAGE_SIZE);