diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
| commit | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (patch) | |
| tree | 5c66ddaf0a6ab6d898931a5ed58c7aa844b94740 /include/asm-um/page.h | |
| parent | 7022b15e2a9f878fd5184586064c63352c3dd225 (diff) | |
| parent | 8033c6e9736c29cce5f0d0abbca9a44dffb20c39 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-um/page.h')
| -rw-r--r-- | include/asm-um/page.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/asm-um/page.h b/include/asm-um/page.h index 381f96b1c82..916e1a61999 100644 --- a/include/asm-um/page.h +++ b/include/asm-um/page.h @@ -7,16 +7,20 @@ #ifndef __UM_PAGE_H #define __UM_PAGE_H -struct page; - -#include <linux/types.h> -#include <asm/vm-flags.h> +#include <linux/const.h> /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) +#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) +#ifndef __ASSEMBLY__ + +struct page; + +#include <linux/types.h> +#include <asm/vm-flags.h> + /* * These are used to make use of C type-checking.. */ @@ -120,4 +124,5 @@ extern struct page *arch_validate(struct page *page, gfp_t mask, int order); #include <asm-generic/memory_model.h> #include <asm-generic/page.h> -#endif +#endif /* __ASSEMBLY__ */ +#endif /* __UM_PAGE_H */ |