diff options
author | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-09 16:17:52 +0530 |
---|---|---|
committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-09 16:17:52 +0530 |
commit | a71cc679dd9dccfe62ecd8c8a95bd510719541bf (patch) | |
tree | fed481a688ec16a6159d4af5d13c4a4003cdb121 /init | |
parent | 17552bd68071f74c82438b86dbd9dcd419379c03 (diff) | |
parent | ff74ae50f01ee67764564815c023c362c87ce18b (diff) |
Merge commit 'v3.4.4' into android-tegra-nv-3.4
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index cb54cd3dbf05..b08c5f75974f 100644 --- a/init/main.c +++ b/init/main.c @@ -508,7 +508,7 @@ asmlinkage void __init start_kernel(void) parse_early_param(); parse_args("Booting kernel", static_command_line, __start___param, __stop___param - __start___param, - 0, 0, &unknown_bootoption); + -1, -1, &unknown_bootoption); jump_label_init(); |