diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-09 18:03:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-09 18:03:13 +0100 |
| commit | 492c71dd545a54dc62df8780bd8d233d771748df (patch) | |
| tree | 73960c90dd47938000478b9b3b1228a8c860e65b /arch/arm/kernel | |
| parent | f0af7245f1725fdc39b32b59c20500448437ddbe (diff) | |
| parent | 18365d181fe7fee8b52cd12482200d3a4c48d05e (diff) | |
| download | blackbird-op-linux-492c71dd545a54dc62df8780bd8d233d771748df.tar.gz blackbird-op-linux-492c71dd545a54dc62df8780bd8d233d771748df.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/setup.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 38f0e7940a13..2ca7038b67a7 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -81,6 +81,8 @@ EXPORT_SYMBOL(system_serial_high); unsigned int elf_hwcap; EXPORT_SYMBOL(elf_hwcap); +unsigned long __initdata vmalloc_reserve = 128 << 20; + #ifdef MULTI_CPU struct processor processor; @@ -501,6 +503,17 @@ static void __init early_mem(char **p) __early_param("mem=", early_mem); /* + * vmalloc=size forces the vmalloc area to be exactly 'size' + * bytes. This can be used to increase (or decrease) the vmalloc + * area - the default is 128m. + */ +static void __init early_vmalloc(char **arg) +{ + vmalloc_reserve = memparse(*arg, arg); +} +__early_param("vmalloc=", early_vmalloc); + +/* * Initial parsing of the command line. */ static void __init parse_cmdline(char **cmdline_p, char *from) |
