diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-30 10:47:19 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-30 10:50:06 +0400 |
| commit | 186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch) | |
| tree | 9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /arch/tile/kernel/process.c | |
| parent | 99dd5497e5be4fe4194cad181d45fd6569a930db (diff) | |
| parent | 4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff) | |
| download | linux-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.tar.xz | |
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/tile/kernel/process.c')
| -rw-r--r-- | arch/tile/kernel/process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c index 6ae495ef2b99..30caecac94dc 100644 --- a/arch/tile/kernel/process.c +++ b/arch/tile/kernel/process.c @@ -27,16 +27,17 @@ #include <linux/kernel.h> #include <linux/tracehook.h> #include <linux/signal.h> -#include <asm/system.h> #include <asm/stack.h> #include <asm/homecache.h> #include <asm/syscalls.h> #include <asm/traps.h> +#include <asm/setup.h> #ifdef CONFIG_HARDWALL #include <asm/hardwall.h> #endif #include <arch/chip.h> #include <arch/abi.h> +#include <arch/sim_def.h> /* |