diff options
Diffstat (limited to 'arch/um/kernel/process.c')
-rw-r--r-- | arch/um/kernel/process.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 8d2c5496532b..bfa52f206bb6 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 | ||
265 | void *um_kmalloc(int size) | ||
266 | { | ||
267 | return kmalloc(size, GFP_KERNEL); | ||
268 | } | ||
269 | |||
270 | void *um_kmalloc_atomic(int size) | ||
271 | { | ||
272 | return kmalloc(size, GFP_ATOMIC); | ||
273 | } | ||
274 | |||
275 | void *um_vmalloc(int size) | ||
276 | { | ||
277 | return vmalloc(size); | ||
278 | } | ||
279 | |||
280 | int __cant_sleep(void) { | 264 | int __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? */ |