Merge git://git.infradead.org/embedded-2.6

[linux-2.6-omap-h63xx.git] / include / asm-s390 / page.h

diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h
index f0f4579eac13144b01f43eaf401428dfb2d8c5db..991ba939408c5f9c6b1f9bcdfbc159e715f13554 100644 (file)
--- a/include/asm-s390/page.h
+++ b/include/asm-s390/page.h
@@ -125,10 +125,18 @@ page_get_storage_key(unsigned long addr)
        return skey;
 }
 
-#endif /* !__ASSEMBLY__ */
+#ifdef CONFIG_PAGE_STATES
+
+struct page;
+void arch_free_page(struct page *page, int order);
+void arch_alloc_page(struct page *page, int order);
+
+#define HAVE_ARCH_FREE_PAGE
+#define HAVE_ARCH_ALLOC_PAGE
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)        (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#endif
+
+#endif /* !__ASSEMBLY__ */
 
 #define __PAGE_OFFSET           0x0UL
 #define PAGE_OFFSET             0x0UL