diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:20 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:20 +0200 |
| commit | 3856aa0c642dc34af7939e30f93e81eefbe0b935 (patch) | |
| tree | e55e69097c7f3186e38dc1d3b3d4a05f4e68b1e2 /arch/um/drivers/cow_sys.h | |
| parent | aaaf92ba88d5a2664185ba20fd34308c8581d59f (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/cpatip-x86-cpa-2008-05-17-15-12-20
Diffstat (limited to 'arch/um/drivers/cow_sys.h')
| -rw-r--r-- | arch/um/drivers/cow_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h index ca8c9e11a39b..f5701fd2ef90 100644 --- 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 kmalloc(size, UM_GFP_KERNEL); + return uml_kmalloc(size, UM_GFP_KERNEL); } static inline void cow_free(void *ptr) |