diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-05 04:42:39 +0100 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-05 04:42:39 +0100 |
commit | 752c58a471c108d64da1676b2925dfbd83eb177e (patch) | |
tree | fbffa0d7c54cd812950dffc16d642c9d449f4faf /arch/um/kernel/process.c | |
parent | Input: drivers/char/keyboard.c - small cleanup in k_cur() (diff) | |
parent | Make sure "user->sigpending" count is in sync (diff) | |
download | linux-752c58a471c108d64da1676b2925dfbd83eb177e.tar.xz linux-752c58a471c108d64da1676b2925dfbd83eb177e.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/kernel/process.c')
-rw-r--r-- | arch/um/kernel/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index fe6c64abda5b..348b272bb766 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -46,6 +46,7 @@ #include "mode.h" #include "mode_kern.h" #include "choose-mode.h" +#include "um_malloc.h" /* This is a per-cpu array. A processor only modifies its entry and it only * cares about its entry, so it's OK if another processor is modifying its |