diff options
Diffstat (limited to 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/dvma.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/page.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-m68k/dvma.h b/include/asm-m68k/dvma.h index 4fff408d0150..890bbf7e7758 100644 --- a/include/asm-m68k/dvma.h +++ b/include/asm-m68k/dvma.h | |||
@@ -13,7 +13,7 @@ | |||
13 | #define DVMA_PAGE_SHIFT 13 | 13 | #define DVMA_PAGE_SHIFT 13 |
14 | #define DVMA_PAGE_SIZE (1UL << DVMA_PAGE_SHIFT) | 14 | #define DVMA_PAGE_SIZE (1UL << DVMA_PAGE_SHIFT) |
15 | #define DVMA_PAGE_MASK (~(DVMA_PAGE_SIZE-1)) | 15 | #define DVMA_PAGE_MASK (~(DVMA_PAGE_SIZE-1)) |
16 | #define DVMA_PAGE_ALIGN(addr) (((addr)+DVMA_PAGE_SIZE-1)&DVMA_PAGE_MASK) | 16 | #define DVMA_PAGE_ALIGN(addr) ALIGN(addr, DVMA_PAGE_SIZE) |
17 | 17 | ||
18 | extern void dvma_init(void); | 18 | extern void dvma_init(void); |
19 | extern int dvma_map_iommu(unsigned long kaddr, unsigned long baddr, | 19 | extern int dvma_map_iommu(unsigned long kaddr, unsigned long baddr, |
diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h index 880c2cbff8a6..a34b8bad7847 100644 --- a/include/asm-m68k/page.h +++ b/include/asm-m68k/page.h | |||
@@ -103,9 +103,6 @@ typedef struct page *pgtable_t; | |||
103 | #define __pgd(x) ((pgd_t) { (x) } ) | 103 | #define __pgd(x) ((pgd_t) { (x) } ) |
104 | #define __pgprot(x) ((pgprot_t) { (x) } ) | 104 | #define __pgprot(x) ((pgprot_t) { (x) } ) |
105 | 105 | ||
106 | /* to align the pointer to the (next) page boundary */ | ||
107 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | ||
108 | |||
109 | #endif /* !__ASSEMBLY__ */ | 106 | #endif /* !__ASSEMBLY__ */ |
110 | 107 | ||
111 | #include <asm/page_offset.h> | 108 | #include <asm/page_offset.h> |