summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-19 20:41:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-19 20:41:52 +0200
commitcf77e988ddfc7f047ac1ddc72cadb5eee7e09293 (patch)
treed4870b7290ea50fe01ed4d56febad449f1206172 /arch/ia64/include
parentMerge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[IA64] Drop duplicated "config IOMMU_HELPER" (diff)
downloadlinux-cf77e988ddfc7f047ac1ddc72cadb5eee7e09293.tar.xz
linux-cf77e988ddfc7f047ac1ddc72cadb5eee7e09293.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Drop duplicated "config IOMMU_HELPER" [IA64] invoke oom-killer from page fault [IA64] use __ratelimit [IA64] Use set_cpus_allowed_ptr [IA64] Use set_cpus_allowed_ptr [IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi [IA64] removing redundant ifdef
Diffstat (limited to 'arch/ia64/include')
-rw-r--r--arch/ia64/include/asm/mmzone.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/mmzone.h b/arch/ia64/include/asm/mmzone.h
index f2ca32069b3f..e0de61709cf1 100644
--- a/arch/ia64/include/asm/mmzone.h
+++ b/arch/ia64/include/asm/mmzone.h
@@ -19,16 +19,12 @@
static inline int pfn_to_nid(unsigned long pfn)
{
-#ifdef CONFIG_NUMA
extern int paddr_to_nid(unsigned long);
int nid = paddr_to_nid(pfn << PAGE_SHIFT);
if (nid < 0)
return 0;
else
return nid;
-#else
- return 0;
-#endif
}
#ifdef CONFIG_IA64_DIG /* DIG systems are small */