From: Tobias Klauser <tklauser@distanz.ch>
Date: Wed, 9 Nov 2016 07:31:00 +0000 (+0800)
Subject: nios2: Extend !__ASSEMBLY__ section in asm/page.h
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c98fd266b76e04fd59d294f2fb588cc5cb4c212;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

nios2: Extend !__ASSEMBLY__ section in asm/page.h

Some C-only definition from nios2 asm/page.h are exposed to assembly code.
Extend the !__ASSEMBLY__ section to prevent this.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Ley Foon Tan <ley.foon.tan@intel.com>
---

diff --git a/arch/nios2/include/asm/page.h b/arch/nios2/include/asm/page.h
index c1683f51ad0f..74477ab66f65 100644
--- a/arch/nios2/include/asm/page.h
+++ b/arch/nios2/include/asm/page.h
@@ -76,8 +76,6 @@ extern unsigned long memory_size;
 
 extern struct page *mem_map;
 
-#endif /* !__ASSEMBLY__ */
-
 # define __pa(x)		\
 	((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
 # define __va(x)		\
@@ -106,4 +104,6 @@ extern struct page *mem_map;
 
 #include <asm-generic/getorder.h>
 
+#endif /* !__ASSEMBLY__ */
+
 #endif /* _ASM_NIOS2_PAGE_H */