projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...
[cascardo/linux.git]
/
kernel
/
ksysfs.c
diff --git
a/kernel/ksysfs.c
b/kernel/ksysfs.c
index
152da4a
..
ee1bc1b
100644
(file)
--- a/
kernel/ksysfs.c
+++ b/
kernel/ksysfs.c
@@
-101,7
+101,7
@@
KERNEL_ATTR_RO(kexec_loaded);
static ssize_t kexec_crash_loaded_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
static ssize_t kexec_crash_loaded_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
- return sprintf(buf, "%d\n",
!!kexec_crash_image
);
+ return sprintf(buf, "%d\n",
kexec_crash_loaded()
);
}
KERNEL_ATTR_RO(kexec_crash_loaded);
}
KERNEL_ATTR_RO(kexec_crash_loaded);
@@
-128,8
+128,8
@@
KERNEL_ATTR_RW(kexec_crash_size);
static ssize_t vmcoreinfo_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
static ssize_t vmcoreinfo_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
- return sprintf(buf, "%lx %x\n",
-
paddr_vmcoreinfo_note()
,
+ phys_addr_t vmcore_base = paddr_vmcoreinfo_note();
+
return sprintf(buf, "%pa %x\n", &vmcore_base
,
(unsigned int)sizeof(vmcoreinfo_note));
}
KERNEL_ATTR_RO(vmcoreinfo);
(unsigned int)sizeof(vmcoreinfo_note));
}
KERNEL_ATTR_RO(vmcoreinfo);