]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
nios2: Extend !__ASSEMBLY__ section in asm/page.h
authorTobias Klauser <tklauser@distanz.ch>
Wed, 9 Nov 2016 07:31:00 +0000 (15:31 +0800)
committerLey Foon Tan <ley.foon.tan@intel.com>
Tue, 13 Dec 2016 09:13:17 +0000 (17:13 +0800)
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>
arch/nios2/include/asm/page.h

index c1683f51ad0f82009c065c61cbda8a9f3ce853a2..74477ab66f6515fa20ced6f69a1f2271a8f5e0be 100644 (file)
@@ -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 */