aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/process.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-07-16 02:38:56 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:38 -0400
commite4c4bf9968cb4f0fceb1b8fb54790ccae73caf4e (patch)
treefe9892123214821c37a7b615fe52db7f6d46e148 /arch/um/kernel/process.c
parentc43990162fc7f9d2f15a12797fdc6f9c0905f704 (diff)
uml: Eliminate kernel allocator wrappers
UML had two wrapper procedures for kmalloc, um_kmalloc and um_kmalloc_atomic because the flag constants weren't available in userspace code. kern_constants.h had made kernel constants available for a long time, so there is no need for these wrappers any more. Rather, userspace code calls kmalloc directly with the userspace versions of the gfp flags. kmalloc isn't a real procedure, so I had to essentially copy the inline wrapper around __kmalloc. vmalloc also had its own wrapper for no good reason. This is now gone. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel/process.c')
-rw-r--r--arch/um/kernel/process.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 8d2c5496532..bfa52f206bb 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -46,7 +46,6 @@
46#include "mode.h" 46#include "mode.h"
47#include "mode_kern.h" 47#include "mode_kern.h"
48#include "choose-mode.h" 48#include "choose-mode.h"
49#include "um_malloc.h"
50 49
51/* This is a per-cpu array. A processor only modifies its entry and it only 50/* This is a per-cpu array. A processor only modifies its entry and it only
52 * cares about its entry, so it's OK if another processor is modifying its 51 * cares about its entry, so it's OK if another processor is modifying its
@@ -262,21 +261,6 @@ void dump_thread(struct pt_regs *regs, struct user *u)
262{ 261{
263} 262}
264 263
265void *um_kmalloc(int size)
266{
267 return kmalloc(size, GFP_KERNEL);
268}
269
270void *um_kmalloc_atomic(int size)
271{
272 return kmalloc(size, GFP_ATOMIC);
273}
274
275void *um_vmalloc(int size)
276{
277 return vmalloc(size);
278}
279
280int __cant_sleep(void) { 264int __cant_sleep(void) {
281 return in_atomic() || irqs_disabled() || in_interrupt(); 265 return in_atomic() || irqs_disabled() || in_interrupt();
282 /* Is in_interrupt() really needed? */ 266 /* Is in_interrupt() really needed? */