diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 9f2093c1f44b0ed9507633c5f8c8bd0ad696437d..d4de8a4814be36781c9b266c8205d01123e0ad9f 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -191,6 +191,7 @@ config IOSAPIC
 
 config IA64_SGI_SN_XP
 	tristate "Support communication between SGI SSIs"
+	depends on IA64_GENERIC || IA64_SGI_SN2
 	select IA64_UNCACHED_ALLOCATOR
 	help
 	  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 ef436b9d06ad4580923f65c78c9ceac3a14e8942..9d41548b7fef43d1f98abbbb1a5dfaa371c9a031 100644
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -120,6 +120,7 @@ extern unsigned long max_low_pfn;
 
 #define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)
 #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
+#define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)
 
 typedef union ia64_va {
 	struct {