This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/asm-parisc/mmzone.h b/include/asm-parisc/mmzone.h
index 928bf50..221a7ef 100644 (file)
--- a/include/asm-parisc/mmzone.h
+++ b/include/asm-parisc/mmzone.h
@@ -1,102 +1,31 @@
 #ifndef _PARISC_MMZONE_H
 #define _PARISC_MMZONE_H
 
-#ifdef CONFIG_DISCONTIGMEM
-
-#define MAX_PHYSMEM_RANGES 8 /* Fix the size for now (current known max is 3) */
-extern int npmem_ranges;
-
 struct node_map_data {
     pg_data_t pg_data;
+    struct page *adj_node_mem_map;
 };
 
 extern struct node_map_data node_data[];
+extern unsigned char *chunkmap;
 
-#define NODE_DATA(nid)          (&node_data[nid].pg_data)
-
-/*
- * Given a kernel address, find the home node of the underlying memory.
- */
-#define kvaddr_to_nid(kaddr)   pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT)
-
-#define node_mem_map(nid)      (NODE_DATA(nid)->node_mem_map)
-#define node_start_pfn(nid)    (NODE_DATA(nid)->node_start_pfn)
-#define node_end_pfn(nid)                                              \
-({                                                                     \
-       pg_data_t *__pgdat = NODE_DATA(nid);                            \
-       __pgdat->node_start_pfn + __pgdat->node_spanned_pages;          \
-})
-#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);                                    \
-       int __node  = pfn_to_nid(__pfn);                                \
-       &node_mem_map(__node)[node_localnr(__pfn,__node)];              \
-})
-
-#define page_to_pfn(pg)                                                        \
-({                                                                     \
-       struct page *__page = pg;                                       \
-       struct zone *__zone = page_zone(__page);                        \
-       BUG_ON(__zone == NULL);                                         \
-       (unsigned long)(__page - __zone->zone_mem_map)                  \
-               + __zone->zone_start_pfn;                               \
-})
+#define BADCHUNK                ((unsigned char)0xff)
+#define CHUNKSZ                 (256*1024*1024)
+#define CHUNKSHIFT              28
+#define CHUNKMASK               (~(CHUNKSZ - 1))
+#define CHUNKNUM(paddr)         ((paddr) >> CHUNKSHIFT)
 
-/* We have these possible memory map layouts:
- * Astro: 0-3.75, 67.75-68, 4-64
- * zx1: 0-1, 257-260, 4-256
- * Stretch (N-class): 0-2, 4-32, 34-xxx
- */
-
-/* Since each 1GB can only belong to one region (node), we can create
- * an index table for pfn to nid lookup; each entry in pfnnid_map 
- * represents 1GB, and contains the node that the memory belongs to. */
-
-#define PFNNID_SHIFT (30 - PAGE_SHIFT)
-#define PFNNID_MAP_MAX  512     /* support 512GB */
-extern unsigned char pfnnid_map[PFNNID_MAP_MAX];
-
-#ifndef __LP64__
-#define pfn_is_io(pfn) ((pfn & (0xf0000000UL >> PAGE_SHIFT)) == (0xf0000000UL >> PAGE_SHIFT))
-#else
-/* io can be 0xf0f0f0f0f0xxxxxx or 0xfffffffff0000000 */
-#define pfn_is_io(pfn) ((pfn & (0xf000000000000000UL >> PAGE_SHIFT)) == (0xf000000000000000UL >> PAGE_SHIFT))
-#endif
-
-static inline int pfn_to_nid(unsigned long pfn)
-{
-       unsigned int i;
-       unsigned char r;
-
-       if (unlikely(pfn_is_io(pfn)))
-               return 0;
-
-       i = pfn >> PFNNID_SHIFT;
-       BUG_ON(i >= sizeof(pfnnid_map) / sizeof(pfnnid_map[0]));
-       r = pfnnid_map[i];
-       BUG_ON(r == 0xff);
+#define NODE_DATA(nid)          (&node_data[nid].pg_data)
+#define NODE_MEM_MAP(nid)       (NODE_DATA(nid)->node_mem_map)
+#define ADJ_NODE_MEM_MAP(nid)   (node_data[nid].adj_node_mem_map)
 
-       return (int)r;
-}
+#define phys_to_page(paddr) \
+       (ADJ_NODE_MEM_MAP(chunkmap[CHUNKNUM((paddr))]) \
+       + ((paddr) >> PAGE_SHIFT))
 
-static inline int pfn_valid(int pfn)
-{
-       int nid = pfn_to_nid(pfn);
+#define virt_to_page(kvaddr) phys_to_page(__pa(kvaddr))
 
-       if (nid >= 0)
-               return (pfn < node_end_pfn(nid));
-       return 0;
-}
+/* This is kind of bogus, need to investigate performance of doing it right */
+#define VALID_PAGE(page)       ((page - mem_map) < max_mapnr)
 
-#else /* !CONFIG_DISCONTIGMEM */
-#define MAX_PHYSMEM_RANGES     1 
-#endif
-#endif /* _PARISC_MMZONE_H */
+#endif /* !_PARISC_MMZONE_H */