git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (Andrew's incoming - part two)
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
cow_sys.h
diff --git
a/arch/um/drivers/cow_sys.h
b/arch/um/drivers/cow_sys.h
index
ca8c9e1
..
7f2ed0b
100644
(file)
--- a/
arch/um/drivers/cow_sys.h
+++ b/
arch/um/drivers/cow_sys.h
@@
-3,12
+3,11
@@
#include "kern_util.h"
#include "os.h"
-#include "user.h"
#include "um_malloc.h"
static inline void *cow_malloc(int size)
{
- return kmalloc(size, UM_GFP_KERNEL);
+ return
uml_
kmalloc(size, UM_GFP_KERNEL);
}
static inline void cow_free(void *ptr)