Skip to content

Commit

Permalink
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…
Browse files Browse the repository at this point in the history
…it/aegl/linux-2.6
  • Loading branch information
Linus Torvalds committed Nov 8, 2005
2 parents 9cfccee + 0ad3a96 commit e3d8b77
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/ia64/Kconfig
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions include/asm-ia64/page.h
Original file line number Diff line number Diff line change
@@ -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 {

0 comments on commit e3d8b77

Please sign in to comment.