diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/mips/lib/dump_tlb.c | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/mips/lib/dump_tlb.c')
| -rw-r--r-- | arch/mips/lib/dump_tlb.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/lib/dump_tlb.c b/arch/mips/lib/dump_tlb.c index 779821cd54ab..3f69725556af 100644 --- a/arch/mips/lib/dump_tlb.c +++ b/arch/mips/lib/dump_tlb.c | |||
| @@ -19,6 +19,15 @@ static inline const char *msk2str(unsigned int mask) | |||
| 19 | case PM_16K: return "16kb"; | 19 | case PM_16K: return "16kb"; |
| 20 | case PM_64K: return "64kb"; | 20 | case PM_64K: return "64kb"; |
| 21 | case PM_256K: return "256kb"; | 21 | case PM_256K: return "256kb"; |
| 22 | #ifdef CONFIG_CPU_CAVIUM_OCTEON | ||
| 23 | case PM_8K: return "8kb"; | ||
| 24 | case PM_32K: return "32kb"; | ||
| 25 | case PM_128K: return "128kb"; | ||
| 26 | case PM_512K: return "512kb"; | ||
| 27 | case PM_2M: return "2Mb"; | ||
| 28 | case PM_8M: return "8Mb"; | ||
| 29 | case PM_32M: return "32Mb"; | ||
| 30 | #endif | ||
| 22 | #ifndef CONFIG_CPU_VR41XX | 31 | #ifndef CONFIG_CPU_VR41XX |
| 23 | case PM_1M: return "1Mb"; | 32 | case PM_1M: return "1Mb"; |
| 24 | case PM_4M: return "4Mb"; | 33 | case PM_4M: return "4Mb"; |