Merge branch 'nommu-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/nommu-2.6

* 'nommu-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/nommu-2.6:
nommu: Provide stubbed alloc/free_vm_area() implementation.
nommu: Fix up vmalloc_node() symbol export regression.

+27 -1
+27 -1
mm/nommu.c
··· 10 * Copyright (c) 2000-2003 David McCullough <davidm@snapgear.com> 11 * Copyright (c) 2000-2001 D Jeff Dionne <jeff@uClinux.org> 12 * Copyright (c) 2002 Greg Ungerer <gerg@snapgear.com> 13 - * Copyright (c) 2007-2009 Paul Mundt <lethal@linux-sh.org> 14 */ 15 16 #include <linux/module.h> ··· 328 { 329 return vmalloc(size); 330 } 331 332 /** 333 * vzalloc_node - allocate memory on a specific node with zero fill ··· 440 void __attribute__((weak)) vmalloc_sync_all(void) 441 { 442 } 443 444 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, 445 struct page *page)
··· 10 * Copyright (c) 2000-2003 David McCullough <davidm@snapgear.com> 11 * Copyright (c) 2000-2001 D Jeff Dionne <jeff@uClinux.org> 12 * Copyright (c) 2002 Greg Ungerer <gerg@snapgear.com> 13 + * Copyright (c) 2007-2010 Paul Mundt <lethal@linux-sh.org> 14 */ 15 16 #include <linux/module.h> ··· 328 { 329 return vmalloc(size); 330 } 331 + EXPORT_SYMBOL(vmalloc_node); 332 333 /** 334 * vzalloc_node - allocate memory on a specific node with zero fill ··· 439 void __attribute__((weak)) vmalloc_sync_all(void) 440 { 441 } 442 + 443 + /** 444 + * alloc_vm_area - allocate a range of kernel address space 445 + * @size: size of the area 446 + * 447 + * Returns: NULL on failure, vm_struct on success 448 + * 449 + * This function reserves a range of kernel address space, and 450 + * allocates pagetables to map that range. No actual mappings 451 + * are created. If the kernel address space is not shared 452 + * between processes, it syncs the pagetable across all 453 + * processes. 454 + */ 455 + struct vm_struct *alloc_vm_area(size_t size) 456 + { 457 + BUG(); 458 + return NULL; 459 + } 460 + EXPORT_SYMBOL_GPL(alloc_vm_area); 461 + 462 + void free_vm_area(struct vm_struct *area) 463 + { 464 + BUG(); 465 + } 466 + EXPORT_SYMBOL_GPL(free_vm_area); 467 468 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, 469 struct page *page)