lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse Source
This commit is contained in:
Linus Torvalds
2005-11-07 18:41:53 -08:00
parent 9cfcceea8f 0ad3a96f8a
commit e3d8b77bc7
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/ia64/Kconfig
View File

@@ -191,6 +191,7 @@ config IOSAPIC
config IA64_SGI_SN_XP config IA64_SGI_SN_XP
tristate "Support communication between SGI SSIs" tristate "Support communication between SGI SSIs"
depends on IA64_GENERIC || IA64_SGI_SN2
select IA64_UNCACHED_ALLOCATOR select IA64_UNCACHED_ALLOCATOR
help help
An SGI machine can be divided into multiple Single System An SGI machine can be divided into multiple Single System

1
include/asm-ia64/page.h
View File

@@ -120,6 +120,7 @@ extern unsigned long max_low_pfn;
#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> 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 { typedef union ia64_va {
struct { struct {