diff options
author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-06-26 23:20:36 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-06-26 23:20:36 +0200 |
commit | 7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch) | |
tree | 82d934ebf07f22a2c64c3b6d82ec24082878b43a /include/asm-ia64/mmzone.h | |
parent | [MTD] NAND: Add Hynix to manufacturer list (diff) | |
parent | [PATCH] ppc32: Fix MPC83xx IPIC external interrupt pending register offset (diff) | |
download | linux-7ca6448dbfb398bba36eda3c01bc14b86c3675be.tar.xz linux-7ca6448dbfb398bba36eda3c01bc14b86c3675be.zip |
Merge with rsync://fileserver/linux
Update to Linus latest
Diffstat (limited to '')
-rw-r--r-- | include/asm-ia64/mmzone.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h index 9491dacc89cf..d32f51e3d6c2 100644 --- a/include/asm-ia64/mmzone.h +++ b/include/asm-ia64/mmzone.h @@ -17,6 +17,20 @@ #ifdef CONFIG_DISCONTIGMEM +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 */ # define MAX_PHYSNODE_ID 8 # define NR_NODE_MEMBLKS (MAX_NUMNODES * 8) |