lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 20 Dec 2020 11:45:05 +0800 From: Xiaoming Ni <nixiaoming@...wei.com> To: <linux-kernel@...r.kernel.org>, <linux-leds@...r.kernel.org>, <pavel@....cz>, <dmurphy@...com>, <akpm@...ux-foundation.org>, <keescook@...omium.org>, <gpiccoli@...onical.com>, <penguin-kernel@...ove.sakura.ne.jp>, <rdunlap@...radead.org> CC: <nixiaoming@...wei.com>, <wangle6@...wei.com> Subject: [PATCH v2 4/4] leds:trigger:ledtrig-heartbeat: Replace "panic_heartbeats" with in_panic_state() Replace the global variable "panic_heartbeats" with in_panic_state() Signed-off-by: Xiaoming Ni <nixiaoming@...wei.com> --- drivers/leds/trigger/ledtrig-heartbeat.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c index 36b6709afe9f..f24d64cf0a62 100644 --- a/drivers/leds/trigger/ledtrig-heartbeat.c +++ b/drivers/leds/trigger/ledtrig-heartbeat.c @@ -19,8 +19,6 @@ #include <linux/reboot.h> #include "../leds.h" -static int panic_heartbeats; - struct heartbeat_trig_data { struct led_classdev *led_cdev; unsigned int phase; @@ -39,7 +37,7 @@ static void led_heartbeat_function(struct timer_list *t) led_cdev = heartbeat_data->led_cdev; - if (unlikely(panic_heartbeats)) { + if (unlikely(in_panic_state())) { led_set_brightness_nosleep(led_cdev, LED_OFF); return; } @@ -169,28 +167,15 @@ static int heartbeat_reboot_notifier(struct notifier_block *nb, return NOTIFY_DONE; } -static int heartbeat_panic_notifier(struct notifier_block *nb, - unsigned long code, void *unused) -{ - panic_heartbeats = 1; - return NOTIFY_DONE; -} - static struct notifier_block heartbeat_reboot_nb = { .notifier_call = heartbeat_reboot_notifier, }; -static struct notifier_block heartbeat_panic_nb = { - .notifier_call = heartbeat_panic_notifier, -}; - static int __init heartbeat_trig_init(void) { int rc = led_trigger_register(&heartbeat_led_trigger); if (!rc) { - atomic_notifier_chain_register(&panic_notifier_list, - &heartbeat_panic_nb); register_reboot_notifier(&heartbeat_reboot_nb); } return rc; @@ -199,8 +184,6 @@ static int __init heartbeat_trig_init(void) static void __exit heartbeat_trig_exit(void) { unregister_reboot_notifier(&heartbeat_reboot_nb); - atomic_notifier_chain_unregister(&panic_notifier_list, - &heartbeat_panic_nb); led_trigger_unregister(&heartbeat_led_trigger); } -- 2.27.0
Powered by blists - more mailing lists