projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
kernel
/
ksysfs.c
diff --git
a/kernel/ksysfs.c
b/kernel/ksysfs.c
index
99af8b0
..
e0ffe4a
100644
(file)
--- a/
kernel/ksysfs.c
+++ b/
kernel/ksysfs.c
@@
-8,15
+8,12
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/kobject.h>
#include <linux/string.h>
#include <linux/sysfs.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kobject.h>
#include <linux/string.h>
#include <linux/sysfs.h>
#include <linux/module.h>
#include <linux/init.h>
-
-u64 uevent_seqnum;
-char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
+#include <linux/kexec.h>
#define KERNEL_ATTR_RO(_name) \
static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
#define KERNEL_ATTR_RO(_name) \
static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
@@
-25,7
+22,7
@@
static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
static struct subsys_attribute _name##_attr = \
__ATTR(_name, 0644, _name##_show, _name##_store)
static struct subsys_attribute _name##_attr = \
__ATTR(_name, 0644, _name##_show, _name##_store)
-#if
def CONFIG_HOTPLUG
+#if
defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
/* current uevent sequence number */
static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page)
{
/* current uevent sequence number */
static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page)
{
@@
-52,25
+49,30
@@
KERNEL_ATTR_RW(uevent_helper);
#endif
#ifdef CONFIG_KEXEC
#endif
#ifdef CONFIG_KEXEC
-#include <asm/kexec.h>
+static ssize_t kexec_loaded_show(struct subsystem *subsys, char *page)
+{
+ return sprintf(page, "%d\n", !!kexec_image);
+}
+KERNEL_ATTR_RO(kexec_loaded);
-static ssize_t
crash_notes
_show(struct subsystem *subsys, char *page)
+static ssize_t
kexec_crash_loaded
_show(struct subsystem *subsys, char *page)
{
{
- return sprintf(page, "%
p\n", (void *)crash_notes
);
+ return sprintf(page, "%
d\n", !!kexec_crash_image
);
}
}
-KERNEL_ATTR_RO(
crash_notes
);
-#endif
+KERNEL_ATTR_RO(
kexec_crash_loaded
);
+#endif
/* CONFIG_KEXEC */
decl_subsys(kernel, NULL, NULL);
EXPORT_SYMBOL_GPL(kernel_subsys);
static struct attribute * kernel_attrs[] = {
decl_subsys(kernel, NULL, NULL);
EXPORT_SYMBOL_GPL(kernel_subsys);
static struct attribute * kernel_attrs[] = {
-#if
def CONFIG_HOTPLUG
+#if
defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
&uevent_seqnum_attr.attr,
&uevent_helper_attr.attr,
#endif
#ifdef CONFIG_KEXEC
&uevent_seqnum_attr.attr,
&uevent_helper_attr.attr,
#endif
#ifdef CONFIG_KEXEC
- &crash_notes_attr.attr,
+ &kexec_loaded_attr.attr,
+ &kexec_crash_loaded_attr.attr,
#endif
NULL
};
#endif
NULL
};