diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /arch/mips/mm/sc-mips.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'arch/mips/mm/sc-mips.c')
| -rw-r--r-- | arch/mips/mm/sc-mips.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c index 5d01392e3518..08d05aee8788 100644 --- a/arch/mips/mm/sc-mips.c +++ b/arch/mips/mm/sc-mips.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 7 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
| 8 | 8 | ||
| 9 | #include <asm/cpu-type.h> | ||
| 9 | #include <asm/mipsregs.h> | 10 | #include <asm/mipsregs.h> |
| 10 | #include <asm/bcache.h> | 11 | #include <asm/bcache.h> |
| 11 | #include <asm/cacheops.h> | 12 | #include <asm/cacheops.h> |
| @@ -71,7 +72,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c) | |||
| 71 | unsigned int tmp; | 72 | unsigned int tmp; |
| 72 | 73 | ||
| 73 | /* Check the bypass bit (L2B) */ | 74 | /* Check the bypass bit (L2B) */ |
| 74 | switch (c->cputype) { | 75 | switch (current_cpu_type()) { |
| 75 | case CPU_34K: | 76 | case CPU_34K: |
| 76 | case CPU_74K: | 77 | case CPU_74K: |
| 77 | case CPU_1004K: | 78 | case CPU_1004K: |