From 02daea469fba39f668c186114217d36c74e93f62 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 18 Sep 2006 20:12:23 -0700 Subject: [PATCH] --- yaml --- r: 33982 b: refs/heads/master c: 020d8c063b4d850b53dfbaee843c8335b7a90d26 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-m68k/page.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6cfdd9d9986a..7b82a1656ea0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 271fc18eead0aa330758a3b9d8a57ffe315a1978 +refs/heads/master: 020d8c063b4d850b53dfbaee843c8335b7a90d26 diff --git a/trunk/include/asm-m68k/page.h b/trunk/include/asm-m68k/page.h index db017f838c29..fcc165ddd09e 100644 --- a/trunk/include/asm-m68k/page.h +++ b/trunk/include/asm-m68k/page.h @@ -2,6 +2,8 @@ #define _M68K_PAGE_H +#ifdef __KERNEL__ + /* PAGE_SHIFT determines the page size */ #ifndef CONFIG_SUN3 #define PAGE_SHIFT (12) @@ -15,8 +17,6 @@ #endif #define PAGE_MASK (~(PAGE_SIZE-1)) -#ifdef __KERNEL__ - #include #if PAGE_SHIFT < 13 @@ -175,8 +175,8 @@ static inline void *__va(unsigned long x) #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ - #include +#endif /* __KERNEL__ */ + #endif /* _M68K_PAGE_H */