xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init/main.c: code clean-up

Browse Source 
Fixing some checkpatch warnings(remove global initialization, move
__initdata, coalesce formats ...)

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Fabian Frederick
2014-08-08 14:23:44 -07:00
committed by Linus Torvalds
parent 934fc295b3
commit dd4d9fecbe
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
init/main.c
View File

@@ -136,7 +136,7 @@ static char *ramdisk_execute_command;
* Used to generate warnings if static_key manipulation functions are used * Used to generate warnings if static_key manipulation functions are used
* before jump_label_init is called. * before jump_label_init is called.
*/ */
bool static_key_initialized __read_mostly = false; bool static_key_initialized __read_mostly;
EXPORT_SYMBOL_GPL(static_key_initialized); EXPORT_SYMBOL_GPL(static_key_initialized);
/* /*
@@ -159,8 +159,8 @@ static int __init set_reset_devices(char *str)
__setup("reset_devices", set_reset_devices); __setup("reset_devices", set_reset_devices);
static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
static const char *panic_later, *panic_param; static const char *panic_later, *panic_param;
extern const struct obs_kernel_param __setup_start[], __setup_end[]; extern const struct obs_kernel_param __setup_start[], __setup_end[];
@@ -199,7 +199,6 @@ static int __init obsolete_checksetup(char *line)
* still work even if initially too large, it will just take slightly longer * still work even if initially too large, it will just take slightly longer
*/ */
unsigned long loops_per_jiffy = (1<<12); unsigned long loops_per_jiffy = (1<<12);
EXPORT_SYMBOL(loops_per_jiffy); EXPORT_SYMBOL(loops_per_jiffy);
static int __init debug_kernel(char *str) static int __init debug_kernel(char *str)
@@ -376,8 +375,8 @@ static void __init setup_command_line(char *command_line)
initcall_command_line = initcall_command_line =
memblock_virt_alloc(strlen(boot_command_line) + 1, 0); memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
static_command_line = memblock_virt_alloc(strlen(command_line) + 1, 0); static_command_line = memblock_virt_alloc(strlen(command_line) + 1, 0);
strcpy (saved_command_line, boot_command_line); strcpy(saved_command_line, boot_command_line);
strcpy (static_command_line, command_line); strcpy(static_command_line, command_line);
} }
/* /*
@@ -445,8 +444,8 @@ void __init parse_early_options(char *cmdline)
/* Arch code calls this early on, or if not, just before other parsing. */ /* Arch code calls this early on, or if not, just before other parsing. */
void __init parse_early_param(void) void __init parse_early_param(void)
{ {
static __initdata int done = 0; static int done __initdata;
static __initdata char tmp_cmdline[COMMAND_LINE_SIZE]; static char tmp_cmdline[COMMAND_LINE_SIZE] __initdata;
if (done) if (done)
return; return;
@@ -500,7 +499,8 @@ static void __init mm_init(void)
asmlinkage __visible void __init start_kernel(void) asmlinkage __visible void __init start_kernel(void)
{ {
char * command_line, *after_dashes; char *command_line;
char *after_dashes;
extern const struct kernel_param __start___param[], __stop___param[]; extern const struct kernel_param __start___param[], __stop___param[];
/* /*
@@ -572,7 +572,8 @@ asmlinkage __visible void __init start_kernel(void)
* fragile until we cpu_idle() for the first time. * fragile until we cpu_idle() for the first time.
*/ */
preempt_disable(); preempt_disable();
if (WARN(!irqs_disabled(), "Interrupts were enabled *very* early, fixing it\n")) if (WARN(!irqs_disabled(),
"Interrupts were enabled *very* early, fixing it\n"))
local_irq_disable(); local_irq_disable();
idr_init_cache(); idr_init_cache();
rcu_init(); rcu_init();