diff options
| author |   Chuansheng Liu <chuansheng.liu@intel.com> | 2013-09-24 15:27:43 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-24 17:00:26 -0700 |
| commit | e2f0b88e84eed9cf9797f0a88c8012ee0b885a6d (patch) | |
| tree | f5c9fda1a8289a61f18ecf553e5469d6a28d9efd /kernel/seccomp.c | |
| parent | audit: fix endless wait in audit_log_start() (diff) | |
| download | linux-dev-e2f0b88e84eed9cf9797f0a88c8012ee0b885a6d.tar.xz linux-dev-e2f0b88e84eed9cf9797f0a88c8012ee0b885a6d.zip | |
kernel/reboot.c: re-enable the function of variable reboot_default
Commit 1b3a5d02ee07 ("reboot: move arch/x86 reboot= handling to generic
kernel") did some cleanup for reboot= command line, but it made the
reboot_default inoperative.
The default value of variable reboot_default should be 1, and if command
line reboot= is not set, system will use the default reboot mode.
[akpm@linux-foundation.org: fix comment layout]
Signed-off-by: Li Fei <fei.li@intel.com>
Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
Acked-by: Robin Holt <robinmholt@linux.com>
Cc: <stable@vger.kernel.org> [3.11.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/seccomp.c')
0 files changed, 0 insertions, 0 deletions