Merge branch 'upstream'

[linux-2.6-omap-h63xx.git] / include / asm-parisc / mmzone.h

diff --git a/include/asm-parisc/mmzone.h b/include/asm-parisc/mmzone.h
index 595d3dce120a66477f512dfddc6ff83159c5654c..ae039f4fd71121d1d1710d5cfeda926e8f4a6d82 100644 (file)
--- a/include/asm-parisc/mmzone.h
+++ b/include/asm-parisc/mmzone.h
@@ -27,12 +27,6 @@ extern struct node_map_data node_data[];
 })
 #define node_localnr(pfn, nid)         ((pfn) - node_start_pfn(nid))
 
-#define local_mapnr(kvaddr)                                            \
-({                                                                     \
-       unsigned long __pfn = __pa(kvaddr) >> PAGE_SHIFT;               \
-       (__pfn - node_start_pfn(pfn_to_nid(__pfn)));                    \
-})
-
 #define pfn_to_page(pfn)                                               \
 ({                                                                     \
        unsigned long __pfn = (pfn);                                    \