aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include/um_malloc.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/include/um_malloc.h')
-rw-r--r--arch/um/include/um_malloc.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/um/include/um_malloc.h b/arch/um/include/um_malloc.h
index e6d7c5aa3f4e..0ad17cb83d96 100644
--- a/arch/um/include/um_malloc.h
+++ b/arch/um/include/um_malloc.h
@@ -6,11 +6,17 @@
6#ifndef __UM_MALLOC_H__ 6#ifndef __UM_MALLOC_H__
7#define __UM_MALLOC_H__ 7#define __UM_MALLOC_H__
8 8
9extern void *um_kmalloc(int size); 9#include "kern_constants.h"
10extern void *um_kmalloc_atomic(int size); 10
11extern void *__kmalloc(int size, int flags);
12static inline void *kmalloc(int size, int flags)
13{
14 return __kmalloc(size, flags);
15}
16
11extern void kfree(const void *ptr); 17extern void kfree(const void *ptr);
12 18
13extern void *um_vmalloc(int size); 19extern void *vmalloc(unsigned long size);
14extern void vfree(void *ptr); 20extern void vfree(void *ptr);
15 21
16#endif /* __UM_MALLOC_H__ */ 22#endif /* __UM_MALLOC_H__ */