diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /arch/um/include/shared/um_malloc.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/include/shared/um_malloc.h')
| -rw-r--r-- | arch/um/include/shared/um_malloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/shared/um_malloc.h b/arch/um/include/shared/um_malloc.h index c554d706d106..6395fef6b69b 100644 --- a/arch/um/include/shared/um_malloc.h +++ b/arch/um/include/shared/um_malloc.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #ifndef __UM_MALLOC_H__ | 6 | #ifndef __UM_MALLOC_H__ |
| 7 | #define __UM_MALLOC_H__ | 7 | #define __UM_MALLOC_H__ |
| 8 | 8 | ||
| 9 | #include "kern_constants.h" | 9 | #include <generated/asm-offsets.h> |
| 10 | 10 | ||
| 11 | extern void *uml_kmalloc(int size, int flags); | 11 | extern void *uml_kmalloc(int size, int flags); |
| 12 | extern void kfree(const void *ptr); | 12 | extern void kfree(const void *ptr); |