tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

fs/proc/meminfo.c: fix compilation error

Fix the error message "directives may not be used inside a macro argument"
which appears when the kernel is compiled for the cris architecture.

Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Claudio Scordino and committed by
Linus Torvalds b53fc7c2 83aeeada

+4 -3
+4 -3
fs/proc/meminfo.c
··· 131 131 K(i.freeswap), 132 132 K(global_page_state(NR_FILE_DIRTY)), 133 133 K(global_page_state(NR_WRITEBACK)), 134 - K(global_page_state(NR_ANON_PAGES) 135 134 #ifdef CONFIG_TRANSPARENT_HUGEPAGE 135 + K(global_page_state(NR_ANON_PAGES) 136 136 + global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * 137 - HPAGE_PMD_NR 137 + HPAGE_PMD_NR), 138 + #else 139 + K(global_page_state(NR_ANON_PAGES)), 138 140 #endif 139 - ), 140 141 K(global_page_state(NR_FILE_MAPPED)), 141 142 K(global_page_state(NR_SHMEM)), 142 143 K(global_page_state(NR_SLAB_RECLAIMABLE) +