diff options
-rw-r--r-- | arch/ia64/Kconfig | 1 | ||||
-rw-r--r-- | include/asm-ia64/page.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9f2093c1f44b..d4de8a4814be 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -191,6 +191,7 @@ config IOSAPIC | |||
191 | 191 | ||
192 | config IA64_SGI_SN_XP | 192 | config IA64_SGI_SN_XP |
193 | tristate "Support communication between SGI SSIs" | 193 | tristate "Support communication between SGI SSIs" |
194 | depends on IA64_GENERIC || IA64_SGI_SN2 | ||
194 | select IA64_UNCACHED_ALLOCATOR | 195 | select IA64_UNCACHED_ALLOCATOR |
195 | help | 196 | help |
196 | An SGI machine can be divided into multiple Single System | 197 | An SGI machine can be divided into multiple Single System |
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index ef436b9d06ad..9d41548b7fef 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h | |||
@@ -120,6 +120,7 @@ extern unsigned long max_low_pfn; | |||
120 | 120 | ||
121 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | 121 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
122 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) | 122 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) |
123 | #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) | ||
123 | 124 | ||
124 | typedef union ia64_va { | 125 | typedef union ia64_va { |
125 | struct { | 126 | struct { |