[PATCH 2/2] reboot: hide from sysfs not applicable settings

From: Matteo Croce
Date: Mon Nov 30 2020 - 12:38:22 EST


From: Matteo Croce <mcroce@xxxxxxxxxxxxx>

Not all the reboot settings from both the kernel command line or sysfs
interface are available to all platforms.

Filter out reboot_type and reboot_force which are x86 only, and also
remove reboot_cpu on kernels without SMP support.

This saves some space, and avoid confusing the user with settings which
will have no effect.

Signed-off-by: Matteo Croce <mcroce@xxxxxxxxxxxxx>
---
kernel/reboot.c | 54 ++++++++++++++++++++++++++++---------------------
1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/kernel/reboot.c b/kernel/reboot.c
index d80e3d64fe23..f9c192bb49d0 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -662,6 +662,29 @@ static ssize_t mode_store(struct kobject *kobj, struct kobj_attribute *attr,
}
static struct kobj_attribute reboot_mode_attr = __ATTR_RW(mode);

+#ifdef CONFIG_X86
+static ssize_t force_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
+{
+ return sprintf(buf, "%d\n", reboot_force);
+}
+static ssize_t force_store(struct kobject *kobj, struct kobj_attribute *attr,
+ const char *buf, size_t count)
+{
+ bool res;
+
+ if (!capable(CAP_SYS_BOOT))
+ return -EPERM;
+
+ if (kstrtobool(buf, &res))
+ return -EINVAL;
+
+ reboot_default = 0;
+ reboot_force = res;
+
+ return count;
+}
+static struct kobj_attribute reboot_force_attr = __ATTR_RW(force);
+
static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
const char *val;
@@ -717,7 +740,9 @@ static ssize_t type_store(struct kobject *kobj, struct kobj_attribute *attr,
return count;
}
static struct kobj_attribute reboot_type_attr = __ATTR_RW(type);
+#endif

+#ifdef CONFIG_SMP
static ssize_t cpu_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
return sprintf(buf, "%d\n", reboot_cpu);
@@ -745,34 +770,17 @@ static ssize_t cpu_store(struct kobject *kobj, struct kobj_attribute *attr,
return count;
}
static struct kobj_attribute reboot_cpu_attr = __ATTR_RW(cpu);
-
-static ssize_t force_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
-{
- return sprintf(buf, "%d\n", reboot_force);
-}
-static ssize_t force_store(struct kobject *kobj, struct kobj_attribute *attr,
- const char *buf, size_t count)
-{
- bool res;
-
- if (!capable(CAP_SYS_BOOT))
- return -EPERM;
-
- if (kstrtobool(buf, &res))
- return -EINVAL;
-
- reboot_default = 0;
- reboot_force = res;
-
- return count;
-}
-static struct kobj_attribute reboot_force_attr = __ATTR_RW(force);
+#endif

static struct attribute *reboot_attrs[] = {
&reboot_mode_attr.attr,
+#ifdef CONFIG_X86
+ &reboot_force_attr.attr,
&reboot_type_attr.attr,
+#endif
+#ifdef CONFIG_SMP
&reboot_cpu_attr.attr,
- &reboot_force_attr.attr,
+#endif
NULL,
};

--
2.28.0