diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /include/asm-s390/page.h | |
| parent | fece418418f51e92dd7e67e17c5e3fe5a28d3279 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'include/asm-s390/page.h')
| -rw-r--r-- | include/asm-s390/page.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h index f0f4579eac1..991ba939408 100644 --- a/include/asm-s390/page.h +++ b/include/asm-s390/page.h | |||
| @@ -125,10 +125,18 @@ page_get_storage_key(unsigned long addr) | |||
| 125 | return skey; | 125 | return skey; |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | #endif /* !__ASSEMBLY__ */ | 128 | #ifdef CONFIG_PAGE_STATES |
| 129 | |||
| 130 | struct page; | ||
| 131 | void arch_free_page(struct page *page, int order); | ||
| 132 | void arch_alloc_page(struct page *page, int order); | ||
| 133 | |||
| 134 | #define HAVE_ARCH_FREE_PAGE | ||
| 135 | #define HAVE_ARCH_ALLOC_PAGE | ||
| 129 | 136 | ||
| 130 | /* to align the pointer to the (next) page boundary */ | 137 | #endif |
| 131 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | 138 | |
| 139 | #endif /* !__ASSEMBLY__ */ | ||
| 132 | 140 | ||
| 133 | #define __PAGE_OFFSET 0x0UL | 141 | #define __PAGE_OFFSET 0x0UL |
| 134 | #define PAGE_OFFSET 0x0UL | 142 | #define PAGE_OFFSET 0x0UL |