From 631bb0e74e811e0d9ad23e7462a02d4767b4dd9d Mon Sep 17 00:00:00 2001 From: Bob Picco Date: Mon, 31 Oct 2005 13:25:25 -0500 Subject: [IA64] Recent SPARSEMEM and DISCONTIG changes break some builds My only objection to pfn_to_kaddr, which was introduced for HotPlug memory, is that all arches have an identical implementation. I haven't had a chance to pursue why yet. There is probably some arch issue I'm unaware of. Signed-off-by: Bob Picco Signed-off-by: Tony Luck --- include/asm-ia64/page.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index ef436b9d06a..9d41548b7fe 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 { -- cgit v1.2.3-70-g09d2 From f79b348856fbaf77e4a0c5cb08a808e5879967a9 Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Tue, 1 Nov 2005 10:21:51 -0600 Subject: [IA64] restrict CONFIG_SGI_SN_XP to IA64_GENERIC or IA64_SGI_SN2 Restrict CONFIG_SGI_SN_XP to IA64_GENERIC or IA64_SGI_SN2 kernels. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck --- arch/ia64/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 3b4248cff9a..eb784046130 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 -- cgit v1.2.3-70-g09d2