diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-15 08:00:09 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-15 08:00:09 (GMT) |
| commit | c9572f010d369d9905309f63e31180f291b66a8a (patch) | |
| tree | fbca2a0576c4223790e23a3c1d5f50e2bdf64e10 /arch/arc/include/asm/entry.h | |
| parent | 58cea307432e3376293e6b2be88d1f6e6e99274a (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| download | linux-fsl-qoriq-c9572f010d369d9905309f63e31180f291b66a8a.tar.xz | |
Merge tag 'v3.11-rc5' into perf/core
Merge Linux 3.11-rc5, to sync up with the latest upstream fixes since -rc1.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/include/asm/entry.h')
| -rw-r--r-- | arch/arc/include/asm/entry.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h index 8943c02..df57611 100644 --- a/arch/arc/include/asm/entry.h +++ b/arch/arc/include/asm/entry.h @@ -38,6 +38,7 @@ #include <asm/ptrace.h> #include <asm/processor.h> /* For VMALLOC_START */ #include <asm/thread_info.h> /* For THREAD_SIZE */ +#include <asm/mmu.h> /* Note on the LD/ST addr modes with addr reg wback * |