diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 07:08:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 07:08:16 -0400 |
| commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
| tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /include/asm-alpha/page.h | |
| parent | 510b37258dfd61693ca6c039865c78bd996e3718 (diff) | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-alpha/page.h')
| -rw-r--r-- | include/asm-alpha/page.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h index 22ff9762d17..0995f9d1341 100644 --- a/include/asm-alpha/page.h +++ b/include/asm-alpha/page.h | |||
| @@ -80,9 +80,6 @@ typedef struct page *pgtable_t; | |||
| 80 | 80 | ||
| 81 | #endif /* !__ASSEMBLY__ */ | 81 | #endif /* !__ASSEMBLY__ */ |
| 82 | 82 | ||
| 83 | /* to align the pointer to the (next) page boundary */ | ||
| 84 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | ||
| 85 | |||
| 86 | #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) | 83 | #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) |
| 87 | #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET)) | 84 | #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET)) |
| 88 | #ifndef CONFIG_DISCONTIGMEM | 85 | #ifndef CONFIG_DISCONTIGMEM |