diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 | 
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 | 
| commit | 87b203079ed949de52f0d92aeae20e5e0116c12f (patch) | |
| tree | 1878756f936963822ed2d51a15db1da5814973e7 /mm/vmalloc.c | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
| download | olio-linux-3.10-87b203079ed949de52f0d92aeae20e5e0116c12f.tar.xz olio-linux-3.10-87b203079ed949de52f0d92aeae20e5e0116c12f.zip  | |
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 10 | 
1 files changed, 10 insertions, 0 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 75f49d312e8..903cad46e79 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1012,6 +1012,8 @@ void __init vmalloc_init(void)  void unmap_kernel_range(unsigned long addr, unsigned long size)  {  	unsigned long end = addr + size; + +	flush_cache_vunmap(addr, end);  	vunmap_page_range(addr, end);  	flush_tlb_kernel_range(addr, end);  } @@ -1106,6 +1108,14 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,  }  EXPORT_SYMBOL_GPL(__get_vm_area); +struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags, +				       unsigned long start, unsigned long end, +				       void *caller) +{ +	return __get_vm_area_node(size, flags, start, end, -1, GFP_KERNEL, +				  caller); +} +  /**   *	get_vm_area  -  reserve a contiguous kernel virtual area   *	@size:		size of the area  |