From: Matteo Croce <mcroce@linux.microsoft.com>
To: linux-kernel@vger.kernel.org
Cc: Petr Mladek <pmladek@suse.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 2/2] reboot: hide from sysfs not applicable settings
Date: Mon, 30 Nov 2020 18:37:17 +0100 [thread overview]
Message-ID: <20201130173717.198952-3-mcroce@linux.microsoft.com> (raw)
In-Reply-To: <20201130173717.198952-1-mcroce@linux.microsoft.com>
From: Matteo Croce <mcroce@microsoft.com>
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@microsoft.com>
---
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
next prev parent reply other threads:[~2020-11-30 17:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 17:37 [PATCH 0/2] reboot: sysfs improvements Matteo Croce
2020-11-30 17:37 ` [PATCH 1/2] reboot: allow to override reboot type if quirks are found Matteo Croce
2020-12-01 10:46 ` Petr Mladek
2020-11-30 17:37 ` Matteo Croce [this message]
2020-12-01 10:52 ` [PATCH 2/2] reboot: hide from sysfs not applicable settings Petr Mladek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201130173717.198952-3-mcroce@linux.microsoft.com \
--to=mcroce@linux.microsoft.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.