Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b53fc7c2 authored by Claudio Scordino's avatar Claudio Scordino Committed by Linus Torvalds
Browse files

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: default avatarClaudio Scordino <claudio@evidence.eu.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 83aeeada

fs/proc/meminfo.c

+4 −3
Original line number Diff line number Diff line
@@ -131,12 +131,13 @@ static int meminfo_proc_show(struct seq_file *m, void *v) 
		K(i.freeswap),

		K(global_page_state(NR_FILE_DIRTY)),

		K(global_page_state(NR_WRITEBACK)),

		K(global_page_state(NR_ANON_PAGES)

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		K(global_page_state(NR_ANON_PAGES)

		  + global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *

		  HPAGE_PMD_NR

		  HPAGE_PMD_NR),

#else

		K(global_page_state(NR_ANON_PAGES)),

#endif

		  ),

		K(global_page_state(NR_FILE_MAPPED)),

		K(global_page_state(NR_SHMEM)),

		K(global_page_state(NR_SLAB_RECLAIMABLE) +