diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 05:41:53 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 05:41:53 +0300 |
| commit | e3d8b77bc7a89d190ee895d0570af10c026e5086 (patch) | |
| tree | 56f333679ac333abe2dcddce64e73fb211216044 | |
| parent | 9cfcceea8f7e8f5554e9c8130e568bcfa98a3a64 (diff) | |
| parent | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (diff) | |
| download | linux-e3d8b77bc7a89d190ee895d0570af10c026e5086.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
| -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 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 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; #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 { |