[folded-merged] reboot-add-support-for-configuring-emergency-hardware-protection-action-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The quilt patch titled
     Subject: reboot: hide unused hw_protection_attr
has been removed from the -mm tree.  Its filename was
     reboot-add-support-for-configuring-emergency-hardware-protection-action-fix.patch

This patch was dropped because it was folded into reboot-add-support-for-configuring-emergency-hardware-protection-action.patch

------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: reboot: hide unused hw_protection_attr
Date: Mon, 24 Feb 2025 15:16:09 +0100

The reference to hw_protection_attr is inside of an #ifdef block, but the
definition is not:

kernel/reboot.c:1092:30: error: unused variable 'hw_protection_attr' [-Werror,-Wunused-variable]
 1092 | static struct kobj_attribute hw_protection_attr = __ATTR_RW(hw_protection);
      |                              ^~~~~~~~~~~~~~~~~~

Add another #ifdef to match the first.

Link: https://lkml.kernel.org/r/20250224141849.1546019-1-arnd@xxxxxxxxxx
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Reviewed-by: Tzung-Bi Shih <tzungbi@xxxxxxxxxx>
Cc: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
Cc: Joel Granados <joel.granados@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/reboot.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/kernel/reboot.c~reboot-add-support-for-configuring-emergency-hardware-protection-action-fix
+++ a/kernel/reboot.c
@@ -1071,6 +1071,7 @@ static int __init hw_protection_setup(ch
 }
 __setup("hw_protection=", hw_protection_setup);
 
+#ifdef CONFIG_SYSFS
 static ssize_t hw_protection_show(struct kobject *kobj,
 				  struct kobj_attribute *attr, char *buf)
 {
@@ -1090,6 +1091,7 @@ static ssize_t hw_protection_store(struc
 	return count;
 }
 static struct kobj_attribute hw_protection_attr = __ATTR_RW(hw_protection);
+#endif
 
 static int __init reboot_setup(char *str)
 {
_

Patches currently in -mm which might be from arnd@xxxxxxxx are

mm-damon-sysfs-schemes-let-damon_sysfs_scheme_set_filters-be-used-for-different-named-directories-fix.patch
reboot-add-support-for-configuring-emergency-hardware-protection-action.patch





[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux