diff options
Diffstat (limited to 'arch/x86/mm/pageattr.c')
| -rw-r--r-- | arch/x86/mm/pageattr.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index ba24537d69dd..f5f5154ea11e 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
| @@ -55,13 +55,19 @@ static void split_page_count(int level) | |||
| 55 | 55 | ||
| 56 | int arch_report_meminfo(char *page) | 56 | int arch_report_meminfo(char *page) |
| 57 | { | 57 | { |
| 58 | int n = sprintf(page, "DirectMap4k: %8lu\n" | 58 | int n = sprintf(page, "DirectMap4k: %8lu kB\n", |
| 59 | "DirectMap2M: %8lu\n", | 59 | direct_pages_count[PG_LEVEL_4K] << 2); |
| 60 | direct_pages_count[PG_LEVEL_4K], | 60 | #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) |
| 61 | direct_pages_count[PG_LEVEL_2M]); | 61 | n += sprintf(page + n, "DirectMap2M: %8lu kB\n", |
| 62 | direct_pages_count[PG_LEVEL_2M] << 11); | ||
| 63 | #else | ||
| 64 | n += sprintf(page + n, "DirectMap4M: %8lu kB\n", | ||
| 65 | direct_pages_count[PG_LEVEL_2M] << 12); | ||
| 66 | #endif | ||
| 62 | #ifdef CONFIG_X86_64 | 67 | #ifdef CONFIG_X86_64 |
| 63 | n += sprintf(page + n, "DirectMap1G: %8lu\n", | 68 | if (direct_gbpages) |
| 64 | direct_pages_count[PG_LEVEL_1G]); | 69 | n += sprintf(page + n, "DirectMap1G: %8lu kB\n", |
| 70 | direct_pages_count[PG_LEVEL_1G] << 20); | ||
| 65 | #endif | 71 | #endif |
| 66 | return n; | 72 | return n; |
| 67 | } | 73 | } |