X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fum%2Finclude%2Fum_malloc.h;h=c554d706d1060b9a1e9502f33525a23c64aed60b;hb=c02a5119e862dea9a1361182840d41ae1fe24227;hp=0ad17cb83d96ef6b0ace0a4ea800113a8cc05040;hpb=492559af235eb56884d62553f191c0b5c4def990;p=linux-2.6 diff --git a/arch/um/include/um_malloc.h b/arch/um/include/um_malloc.h index 0ad17cb83d..c554d706d1 100644 --- a/arch/um/include/um_malloc.h +++ b/arch/um/include/um_malloc.h @@ -8,15 +8,12 @@ #include "kern_constants.h" -extern void *__kmalloc(int size, int flags); -static inline void *kmalloc(int size, int flags) -{ - return __kmalloc(size, flags); -} - +extern void *uml_kmalloc(int size, int flags); extern void kfree(const void *ptr); extern void *vmalloc(unsigned long size); extern void vfree(void *ptr); #endif /* __UM_MALLOC_H__ */ + +