Commit 6c5da7ac authored by Russell King's avatar Russell King Committed by Russell King

[ARM] mm: move vmalloc= parsing to arch/arm/mm/mmu.c

There's no point scattering this around the tree, the parsing
of the parameter might as well live beside the code which uses
it.  That also means we can make vmalloc_reserve a static
variable.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent eca73214
...@@ -139,14 +139,6 @@ ...@@ -139,14 +139,6 @@
#define arch_adjust_zones(node,size,holes) do { } while (0) #define arch_adjust_zones(node,size,holes) do { } while (0)
#endif #endif
/*
* Amount of memory reserved for the vmalloc() area, and minimum
* address for vmalloc mappings.
*/
extern unsigned long vmalloc_reserve;
#define VMALLOC_MIN (void *)(VMALLOC_END - vmalloc_reserve)
/* /*
* PFNs are used to describe any physical page; this means * PFNs are used to describe any physical page; this means
* PFN 0 == physical address 0. * PFN 0 == physical address 0.
......
...@@ -84,8 +84,6 @@ EXPORT_SYMBOL(system_serial_high); ...@@ -84,8 +84,6 @@ EXPORT_SYMBOL(system_serial_high);
unsigned int elf_hwcap; unsigned int elf_hwcap;
EXPORT_SYMBOL(elf_hwcap); EXPORT_SYMBOL(elf_hwcap);
unsigned long __initdata vmalloc_reserve = 128 << 20;
#ifdef MULTI_CPU #ifdef MULTI_CPU
struct processor processor; struct processor processor;
...@@ -414,17 +412,6 @@ static void __init early_mem(char **p) ...@@ -414,17 +412,6 @@ static void __init early_mem(char **p)
} }
__early_param("mem=", early_mem); __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. * Initial parsing of the command line.
*/ */
......
...@@ -566,6 +566,28 @@ void __init iotable_init(struct map_desc *io_desc, int nr) ...@@ -566,6 +566,28 @@ void __init iotable_init(struct map_desc *io_desc, int nr)
create_mapping(io_desc + i); create_mapping(io_desc + i);
} }
static unsigned long __initdata vmalloc_reserve = SZ_128M;
/*
* 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);
if (vmalloc_reserve < SZ_16M) {
vmalloc_reserve = SZ_16M;
printk(KERN_WARNING
"vmalloc area too small, limiting to %luMB\n",
vmalloc_reserve >> 20);
}
}
__early_param("vmalloc=", early_vmalloc);
#define VMALLOC_MIN (void *)(VMALLOC_END - vmalloc_reserve)
static int __init check_membank_valid(struct membank *mb) static int __init check_membank_valid(struct membank *mb)
{ {
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment