From: akpm@linux-foundation.org
To: arnd@arndb.de, keescook@chromium.org, linux@roeck-us.net,
mcroce@microsoft.com, mm-commits@vger.kernel.org,
natechancellor@gmail.com, pasha.tatashin@soleen.com,
pmladek@suse.com, rppt@kernel.org, tyhicks@linux.microsoft.com
Subject: [merged] reboot-remove-cf9_safe-from-allowed-types-and-rename-cf9_force.patch removed from -mm tree
Date: Wed, 16 Dec 2020 09:11:47 -0800 [thread overview]
Message-ID: <20201216171147.N-d7BgQwf%akpm@linux-foundation.org> (raw)
The patch titled
Subject: reboot: remove cf9_safe from allowed types and rename cf9_force
has been removed from the -mm tree. Its filename was
reboot-remove-cf9_safe-from-allowed-types-and-rename-cf9_force.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Matteo Croce <mcroce@microsoft.com>
Subject: reboot: remove cf9_safe from allowed types and rename cf9_force
BOOT_CF9_SAFE_STR is an internal value used only by the x86 code and it's
not possible to set it from userspace.
Remove it, and rename 'cf9_force' to 'pci', so to make it coherent with
the kernel command line reboot= option.
Tested with this script:
cd /sys/kernel/reboot/
for i in cold warm hard soft gpio; do
echo $i >mode
read j <mode
[ $i = $j ] || echo "mode $i != $j"
done
for i in bios acpi kbd triple efi pci; do
echo $i >type
read j <type
[ $i = $j ] || echo "type $i != $j"
done
for i in $(seq 0 $(nproc --ignore=1)); do
echo $i >cpu
read j <cpu
[ $i = $j ] || echo "cpu $i != $j"
done
for i in 0 1; do
echo $i >force
read j <force
[ $i = $j ] || echo "force $i != $j"
done
Link: https://lkml.kernel.org/r/20201113015900.543923-1-mcroce@linux.microsoft.com
Fixes: eab8da48579d ("reboot: allow to specify reboot mode via sysfs")
Signed-off-by: Matteo Croce <mcroce@microsoft.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Tyler Hicks <tyhicks@linux.microsoft.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
kernel/reboot.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
--- a/kernel/reboot.c~reboot-remove-cf9_safe-from-allowed-types-and-rename-cf9_force
+++ a/kernel/reboot.c
@@ -615,8 +615,7 @@ __setup("reboot=", reboot_setup);
#define BOOT_BIOS_STR "bios"
#define BOOT_ACPI_STR "acpi"
#define BOOT_EFI_STR "efi"
-#define BOOT_CF9_FORCE_STR "cf9_force"
-#define BOOT_CF9_SAFE_STR "cf9_safe"
+#define BOOT_PCI_STR "pci"
static ssize_t mode_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
{
@@ -688,10 +687,7 @@ static ssize_t type_show(struct kobject
val = BOOT_EFI_STR;
break;
case BOOT_CF9_FORCE:
- val = BOOT_CF9_FORCE_STR;
- break;
- case BOOT_CF9_SAFE:
- val = BOOT_CF9_SAFE_STR;
+ val = BOOT_PCI_STR;
break;
default:
val = REBOOT_UNDEFINED_STR;
@@ -715,10 +711,8 @@ static ssize_t type_store(struct kobject
reboot_type = BOOT_ACPI;
else if (!strncmp(buf, BOOT_EFI_STR, strlen(BOOT_EFI_STR)))
reboot_type = BOOT_EFI;
- else if (!strncmp(buf, BOOT_CF9_FORCE_STR, strlen(BOOT_CF9_FORCE_STR)))
+ else if (!strncmp(buf, BOOT_PCI_STR, strlen(BOOT_PCI_STR)))
reboot_type = BOOT_CF9_FORCE;
- else if (!strncmp(buf, BOOT_CF9_SAFE_STR, strlen(BOOT_CF9_SAFE_STR)))
- reboot_type = BOOT_CF9_SAFE;
else
return -EINVAL;
_
Patches currently in -mm which might be from mcroce@microsoft.com are
reply other threads:[~2020-12-16 17:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20201216171147.N-d7BgQwf%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mcroce@microsoft.com \
--cc=mm-commits@vger.kernel.org \
--cc=natechancellor@gmail.com \
--cc=pasha.tatashin@soleen.com \
--cc=pmladek@suse.com \
--cc=rppt@kernel.org \
--cc=tyhicks@linux.microsoft.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.