Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc96d62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'nommu-fixes-for-linus' of... 

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.
parents c816d7c6 29c185e5

mm/nommu.c

+27 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 *  Copyright (c) 2000-2003 David McCullough <davidm@snapgear.com>

 *  Copyright (c) 2000-2001 D Jeff Dionne <jeff@uClinux.org>

 *  Copyright (c) 2002      Greg Ungerer <gerg@snapgear.com>

 *  Copyright (c) 2007-2009 Paul Mundt <lethal@linux-sh.org>

 *  Copyright (c) 2007-2010 Paul Mundt <lethal@linux-sh.org>

 */



#include <linux/module.h>
@@ -328,6 +328,7 @@ void *vmalloc_node(unsigned long size, int node) 
{

	return vmalloc(size);

}

EXPORT_SYMBOL(vmalloc_node);



/**

 * vzalloc_node - allocate memory on a specific node with zero fill
@@ -440,6 +441,31 @@ void __attribute__((weak)) vmalloc_sync_all(void) 
{

}



/**

 *	alloc_vm_area - allocate a range of kernel address space

 *	@size:		size of the area

 *

 *	Returns:	NULL on failure, vm_struct on success

 *

 *	This function reserves a range of kernel address space, and

 *	allocates pagetables to map that range.  No actual mappings

 *	are created.  If the kernel address space is not shared

 *	between processes, it syncs the pagetable across all

 *	processes.

 */

struct vm_struct *alloc_vm_area(size_t size)

{

	BUG();

	return NULL;

}

EXPORT_SYMBOL_GPL(alloc_vm_area);



void free_vm_area(struct vm_struct *area)

{

	BUG();

}

EXPORT_SYMBOL_GPL(free_vm_area);



int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,

		   struct page *page)

{