diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /arch/um/os-Linux/helper.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/um/os-Linux/helper.c')
| -rw-r--r-- | arch/um/os-Linux/helper.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index 30860b89ec58..b6b1096152aa 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include "os.h" | 15 | #include "os.h" |
| 16 | #include "um_malloc.h" | 16 | #include "um_malloc.h" |
| 17 | #include "user.h" | 17 | #include "user.h" |
| 18 | #include <linux/limits.h> | ||
| 19 | 18 | ||
| 20 | struct helper_data { | 19 | struct helper_data { |
| 21 | void (*pre_exec)(void*); | 20 | void (*pre_exec)(void*); |