Skip to content

Commit b492425

Browse files
author
Alexander Gordeev
committed
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>
1 parent b378a98 commit b492425

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/s390/include/asm/page.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ int arch_make_page_accessible(struct page *page);
179179
#define HAVE_ARCH_MAKE_PAGE_ACCESSIBLE
180180
#endif
181181

182-
#endif /* !__ASSEMBLY__ */
183-
184182
#define __PAGE_OFFSET 0x0UL
185183
#define PAGE_OFFSET 0x0UL
186184

@@ -204,6 +202,8 @@ int arch_make_page_accessible(struct page *page);
204202

205203
#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_NON_EXEC
206204

205+
#endif /* !__ASSEMBLY__ */
206+
207207
#include <asm-generic/memory_model.h>
208208
#include <asm-generic/getorder.h>
209209

0 commit comments

Comments
 (0)