diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-07-17 05:45:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-17 05:45:29 -0400 |
| commit | b5e4111f027c4be85dbe97e090530d03c55c4cf4 (patch) | |
| tree | 11e0a37cb59314f4e9a7b2810124a4a7a33140e5 /arch/sparc/mm/tsb.c | |
| parent | 72d5305dcb3637913c2c37e847a4de9028e49244 (diff) | |
| parent | 9de8033f1bbcce5ed23fe5da9ca1a5060207f7ed (diff) | |
Merge branch 'locking/urgent' into locking/core, before applying larger changes and to refresh the branch with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/mm/tsb.c')
| -rw-r--r-- | arch/sparc/mm/tsb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c index fe19b81acc09..a06576683c38 100644 --- a/arch/sparc/mm/tsb.c +++ b/arch/sparc/mm/tsb.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <asm/page.h> | 9 | #include <asm/page.h> |
| 10 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
| 11 | #include <asm/mmu_context.h> | 11 | #include <asm/mmu_context.h> |
| 12 | #include <asm/setup.h> | ||
| 12 | #include <asm/tsb.h> | 13 | #include <asm/tsb.h> |
| 13 | #include <asm/tlb.h> | 14 | #include <asm/tlb.h> |
| 14 | #include <asm/oplib.h> | 15 | #include <asm/oplib.h> |