diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
| commit | 15a6affec4449b54afba15ab7edbad0cac2736d3 (patch) | |
| tree | f2fa815f74be0b56acd05e62113600a7113d48a9 /arch/blackfin/kernel/cplbinfo.c | |
| parent | cd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (diff) | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
Merge tag 'v3.10-rc1' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130518.0
Linux 3.10-rc1
Diffstat (limited to 'arch/blackfin/kernel/cplbinfo.c')
| -rw-r--r-- | arch/blackfin/kernel/cplbinfo.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/cplbinfo.c b/arch/blackfin/kernel/cplbinfo.c index 404045dcc5e4..5b80d59e66e5 100644 --- a/arch/blackfin/kernel/cplbinfo.c +++ b/arch/blackfin/kernel/cplbinfo.c @@ -17,8 +17,13 @@ #include <asm/cplbinit.h> #include <asm/blackfin.h> -static char const page_strtbl[][3] = { "1K", "4K", "1M", "4M" }; -#define page(flags) (((flags) & 0x30000) >> 16) +static char const page_strtbl[][4] = { + "1K", "4K", "1M", "4M", +#ifdef CONFIG_BF60x + "16K", "64K", "16M", "64M", +#endif +}; +#define page(flags) (((flags) & 0x70000) >> 16) #define strpage(flags) page_strtbl[page(flags)] struct cplbinfo_data { |