diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/manage.c | 1 | ||||
-rw-r--r-- | kernel/sys.c | 15 | ||||
-rw-r--r-- | kernel/sysctl.c | 1 |
3 files changed, 11 insertions, 6 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 1cfdb08ddf20..3bd7226d15fa 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -24,6 +24,7 @@ cpumask_t __cacheline_aligned pending_irq_cpumask[NR_IRQS]; | |||
24 | 24 | ||
25 | /** | 25 | /** |
26 | * synchronize_irq - wait for pending IRQ handlers (on other CPUs) | 26 | * synchronize_irq - wait for pending IRQ handlers (on other CPUs) |
27 | * @irq: interrupt number to wait for | ||
27 | * | 28 | * |
28 | * This function waits for any pending IRQ handlers for this interrupt | 29 | * This function waits for any pending IRQ handlers for this interrupt |
29 | * to complete before returning. If you use this function while | 30 | * to complete before returning. If you use this function while |
diff --git a/kernel/sys.c b/kernel/sys.c index 1e1f41b3fdf6..3e332131000e 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -376,18 +376,21 @@ void emergency_restart(void) | |||
376 | } | 376 | } |
377 | EXPORT_SYMBOL_GPL(emergency_restart); | 377 | EXPORT_SYMBOL_GPL(emergency_restart); |
378 | 378 | ||
379 | /** | ||
380 | * kernel_restart - reboot the system | ||
381 | * | ||
382 | * Shutdown everything and perform a clean reboot. | ||
383 | * This is not safe to call in interrupt context. | ||
384 | */ | ||
385 | void kernel_restart_prepare(char *cmd) | 379 | void kernel_restart_prepare(char *cmd) |
386 | { | 380 | { |
387 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); | 381 | notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd); |
388 | system_state = SYSTEM_RESTART; | 382 | system_state = SYSTEM_RESTART; |
389 | device_shutdown(); | 383 | device_shutdown(); |
390 | } | 384 | } |
385 | |||
386 | /** | ||
387 | * kernel_restart - reboot the system | ||
388 | * @cmd: pointer to buffer containing command to execute for restart | ||
389 | * or NULL | ||
390 | * | ||
391 | * Shutdown everything and perform a clean reboot. | ||
392 | * This is not safe to call in interrupt context. | ||
393 | */ | ||
391 | void kernel_restart(char *cmd) | 394 | void kernel_restart(char *cmd) |
392 | { | 395 | { |
393 | kernel_restart_prepare(cmd); | 396 | kernel_restart_prepare(cmd); |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index e1351200ce85..c4f35f96884d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -1997,6 +1997,7 @@ int proc_dointvec_jiffies(ctl_table *table, int write, struct file *filp, | |||
1997 | * @filp: the file structure | 1997 | * @filp: the file structure |
1998 | * @buffer: the user buffer | 1998 | * @buffer: the user buffer |
1999 | * @lenp: the size of the user buffer | 1999 | * @lenp: the size of the user buffer |
2000 | * @ppos: pointer to the file position | ||
2000 | * | 2001 | * |
2001 | * Reads/writes up to table->maxlen/sizeof(unsigned int) integer | 2002 | * Reads/writes up to table->maxlen/sizeof(unsigned int) integer |
2002 | * values from/to the user buffer, treated as an ASCII string. | 2003 | * values from/to the user buffer, treated as an ASCII string. |