Merge branch 'topic/ca0106-resume' into topic/ca0106

[linux-2.6-omap-h63xx.git] / arch / um / drivers / cow_sys.h

diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index aa7bef9c38d9dd2f0526cc63877e5e04e6ffe4bf..f5701fd2ef90b2d8d1964c3222ebb155c2594ec1 100644 (file)
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -8,7 +8,7 @@
 
 static inline void *cow_malloc(int size)
 {
-       return um_kmalloc(size);
+       return uml_kmalloc(size, UM_GFP_KERNEL);
 }
 
 static inline void cow_free(void *ptr)
@@ -35,7 +35,7 @@ static inline int cow_file_size(char *file, unsigned long long *size_out)
 
 static inline int cow_write_file(int fd, void *buf, int size)
 {
-       return os_write_file_k(fd, buf, size);
+       return os_write_file(fd, buf, size);
 }
 
 #endif