[PATCH] Dynamic kernel command-line: fixups
Remove in-source externs, linux/init.h is included in all cases. This is a fixups for "Dynamic kernel command-line" patch. It also includes some uml __init fixups so that we can __initdata also its command_line. Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
d3e9cceafd
commit
7a3a06d0e1
@@ -43,9 +43,9 @@
|
||||
#define DEFAULT_COMMAND_LINE "root=98:0"
|
||||
|
||||
/* Changed in linux_main and setup_arch, which run before SMP is started */
|
||||
static char command_line[COMMAND_LINE_SIZE] = { 0 };
|
||||
static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 };
|
||||
|
||||
static void add_arg(char *arg)
|
||||
static void __init add_arg(char *arg)
|
||||
{
|
||||
if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) {
|
||||
printf("add_arg: Too many command line arguments!\n");
|
||||
@@ -330,7 +330,7 @@ EXPORT_SYMBOL(end_iomem);
|
||||
|
||||
extern char __binary_start;
|
||||
|
||||
int linux_main(int argc, char **argv)
|
||||
int __init linux_main(int argc, char **argv)
|
||||
{
|
||||
unsigned long avail, diff;
|
||||
unsigned long virtmem_size, max_physmem;
|
||||
|
Reference in New Issue
Block a user