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

Commit 91a13c28 authored by Claudio Scordino's avatar Claudio Scordino Committed by Greg Kroah-Hartman
Browse files

drivers/base/node.c: fix compilation error with older versions of gcc 



Patch to 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>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b2433d86

drivers/base/node.c

+8 −6
Original line number Diff line number Diff line
@@ -127,12 +127,13 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       nid, K(node_page_state(nid, NR_WRITEBACK)),

		       nid, K(node_page_state(nid, NR_FILE_PAGES)),

		       nid, K(node_page_state(nid, NR_FILE_MAPPED)),

		       nid, K(node_page_state(nid, NR_ANON_PAGES)

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		       nid, K(node_page_state(nid, NR_ANON_PAGES)

			+ node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *

			HPAGE_PMD_NR

			HPAGE_PMD_NR),

#else

		       nid, K(node_page_state(nid, NR_ANON_PAGES)),

#endif

		       ),

		       nid, K(node_page_state(nid, NR_SHMEM)),

		       nid, node_page_state(nid, NR_KERNEL_STACK) *

				THREAD_SIZE / 1024,
@@ -143,13 +144,14 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +

				node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),

		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))

			, nid,

			K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *

			HPAGE_PMD_NR)

			HPAGE_PMD_NR));

#else

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));

#endif

		       );

	n += hugetlb_report_node_meminfo(nid, buf + n);

	return n;

}