From: Alexander Gordeev <agordeev@linux.ibm.com>
Date: Thu, 29 Oct 2020 14:29:23 +0000 (+0100)
Subject: s390/mm: fence off VM macros from asm and linker
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b492425c7073c308503eea9a1eec4b03d6e42ef0;p=linux.git

s390/mm: fence off VM macros from asm and linker

Prevent assembler and linker scripts compilation
errors by fencing it off with __ASSEMBLY__ define.

Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
---

diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 5ceee81e8b2da..a9c138fcd2ad3 100644
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -179,8 +179,6 @@ int arch_make_page_accessible(struct page *page);
 #define HAVE_ARCH_MAKE_PAGE_ACCESSIBLE
 #endif
 
-#endif /* !__ASSEMBLY__ */
-
 #define __PAGE_OFFSET		0x0UL
 #define PAGE_OFFSET		0x0UL
 
@@ -204,6 +202,8 @@ int arch_make_page_accessible(struct page *page);
 
 #define VM_DATA_DEFAULT_FLAGS	VM_DATA_FLAGS_NON_EXEC
 
+#endif /* !__ASSEMBLY__ */
+
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>