Skip to content

L
linux-davinci
Commit e3d8b77b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents 9cfcceea 0ad3a96f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
arch/ia64/Kconfig
View file @ e3d8b77b
...@@ -191,6 +191,7 @@ config IOSAPIC ...@@ -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
......
include/asm-ia64/page.h
View file @ e3d8b77b
...@@ -120,6 +120,7 @@ extern unsigned long max_low_pfn; ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment