Commit 020d8c06 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] Fix 'make headers_check' on ia64

Fix 'make headers_check' on m68k
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 271fc18e
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#define _M68K_PAGE_H #define _M68K_PAGE_H
#ifdef __KERNEL__
/* PAGE_SHIFT determines the page size */ /* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3 #ifndef CONFIG_SUN3
#define PAGE_SHIFT (12) #define PAGE_SHIFT (12)
...@@ -15,8 +17,6 @@ ...@@ -15,8 +17,6 @@
#endif #endif
#define PAGE_MASK (~(PAGE_SIZE-1)) #define PAGE_MASK (~(PAGE_SIZE-1))
#ifdef __KERNEL__
#include <asm/setup.h> #include <asm/setup.h>
#if PAGE_SHIFT < 13 #if PAGE_SHIFT < 13
...@@ -175,8 +175,8 @@ static inline void *__va(unsigned long x) ...@@ -175,8 +175,8 @@ static inline void *__va(unsigned long x)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#endif /* __KERNEL__ */
#include <asm-generic/page.h> #include <asm-generic/page.h>
#endif /* __KERNEL__ */
#endif /* _M68K_PAGE_H */ #endif /* _M68K_PAGE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment