GuillaumeHemmen/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 04:53:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge 0401bbf56d into 0fc810ae3a

Browse source
This commit is contained in:
Shubham Gaur 2024-10-31 13:29:56 +00:00 committed by GitHub
commit f6a637405a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kernel/reboot.c
View file

@ -34,7 +34,11 @@ EXPORT_SYMBOL(cad_pid);
#endif #endif
enum reboot_mode reboot_mode DEFAULT_REBOOT_MODE; enum reboot_mode reboot_mode DEFAULT_REBOOT_MODE;
EXPORT_SYMBOL_GPL(reboot_mode); EXPORT_SYMBOL_GPL(reboot_mode);
#if defined(CONFIG_ARM64)
enum reboot_mode panic_reboot_mode = REBOOT_HARD;
#else
enum reboot_mode panic_reboot_mode = REBOOT_UNDEFINED; enum reboot_mode panic_reboot_mode = REBOOT_UNDEFINED;
#endif
/* /*
* This variable is used privately to keep track of whether or not * This variable is used privately to keep track of whether or not
@ -43,7 +47,7 @@ enum reboot_mode panic_reboot_mode = REBOOT_UNDEFINED;
* suppress DMI scanning for reboot quirks. Without it, it's * suppress DMI scanning for reboot quirks. Without it, it's
* impossible to override a faulty reboot quirk without recompiling. * impossible to override a faulty reboot quirk without recompiling.
*/ */
int reboot_default = 1; bool reboot_default = true;
int reboot_cpu; int reboot_cpu;
enum reboot_type reboot_type = BOOT_ACPI; enum reboot_type reboot_type = BOOT_ACPI;
int reboot_force; int reboot_force;
@ -1016,10 +1020,10 @@ static int __init reboot_setup(char *str)
/* /*
* Having anything passed on the command line via * Having anything passed on the command line via
* reboot= will cause us to disable DMI checking * reboot= will cause us to skip DMI checking
* below. * below.
*/ */
reboot_default = 0; reboot_default = false;
if (!strncmp(str, "panic_", 6)) { if (!strncmp(str, "panic_", 6)) {
mode = &panic_reboot_mode; mode = &panic_reboot_mode;
@ -1151,7 +1155,7 @@ static ssize_t mode_store(struct kobject *kobj, struct kobj_attribute *attr,
else else
return -EINVAL; return -EINVAL;
reboot_default = 0; reboot_default = false;
return count; return count;
} }
@ -1173,7 +1177,7 @@ static ssize_t force_store(struct kobject *kobj, struct kobj_attribute *attr,
if (kstrtobool(buf, &res)) if (kstrtobool(buf, &res))
return -EINVAL; return -EINVAL;
reboot_default = 0; reboot_default = false;
reboot_force = res; reboot_force = res;
return count; return count;
@ -1230,7 +1234,7 @@ static ssize_t type_store(struct kobject *kobj, struct kobj_attribute *attr,
else else
return -EINVAL; return -EINVAL;
reboot_default = 0; reboot_default = false;
return count; return count;
} }
@ -1259,7 +1263,7 @@ static ssize_t cpu_store(struct kobject *kobj, struct kobj_attribute *attr,
if (cpunum >= num_possible_cpus()) if (cpunum >= num_possible_cpus())
return -ERANGE; return -ERANGE;
reboot_default = 0; reboot_default = false;
reboot_cpu = cpunum; reboot_cpu = cpunum;
return count; return count;