Commit a2aa3e23 authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds

[PATCH] headers_check: fix userspace build of asm-mips/page.h

MIPS asm/page.h unconditionally includes <asm-generic/memory_model.h>, which
doesn't exist in userspace.  Move an #endif /* __KERNEL__ */ down a few lines
to prevent that.

Also, remove the broken definition of PAGE_SIZE which is never going to be
correct -- in the absence of PAGE_SIZE, non-broken userspace will fall back to
using sysconf() or getpagesize() instead.
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f01f0f05
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
#include <spaces.h> #include <spaces.h>
#endif
/* /*
* PAGE_SHIFT determines the page size * PAGE_SHIFT determines the page size
*/ */
...@@ -34,8 +32,6 @@ ...@@ -34,8 +32,6 @@
#define PAGE_SIZE (1UL << PAGE_SHIFT) #define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1))
#ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern void clear_page(void * page); extern void clear_page(void * page);
...@@ -168,8 +164,6 @@ typedef struct { unsigned long pgprot; } pgprot_t; ...@@ -168,8 +164,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE) #define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET) #define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
#endif /* defined (__KERNEL__) */
#ifdef CONFIG_LIMITED_DMA #ifdef CONFIG_LIMITED_DMA
#define WANT_PAGE_VIRTUAL #define WANT_PAGE_VIRTUAL
#endif #endif
...@@ -177,4 +171,6 @@ typedef struct { unsigned long pgprot; } pgprot_t; ...@@ -177,4 +171,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/page.h>
#endif /* defined (__KERNEL__) */
#endif /* _ASM_PAGE_H */ #endif /* _ASM_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