diff -urN pfn-ref/arch/alpha/mm/numa.c pfn/arch/alpha/mm/numa.c
--- pfn-ref/arch/alpha/mm/numa.c Sat Apr 27 00:39:01 2002
+++ pfn/arch/alpha/mm/numa.c Sat Apr 27 00:39:15 2002
@@ -294,7 +294,7 @@
zones_size[ZONE_DMA] = dma_local_pfn;
zones_size[ZONE_NORMAL] = (end_pfn - start_pfn) - dma_local_pfn;
}
- free_area_init_node(nid, NODE_DATA(nid), NULL, zones_size, start_pfn<<PAGE_SHIFT, NULL);
+ free_area_init_node(nid, NODE_DATA(nid), NULL, zones_size, start_pfn, NULL);
lmax_mapnr = PLAT_NODE_DATA_STARTNR(nid) + PLAT_NODE_DATA_SIZE(nid);
if (lmax_mapnr > max_mapnr) {
max_mapnr = lmax_mapnr;
@@ -372,7 +372,7 @@
totalram_pages += free_all_bootmem_node(NODE_DATA(nid));
lmem_map = NODE_MEM_MAP(nid);
- pfn = NODE_DATA(nid)->node_start_paddr >> PAGE_SHIFT;
+ pfn = NODE_DATA(nid)->node_start_pfn;
for (i = 0; i < PLAT_NODE_DATA_SIZE(nid); i++, pfn++)
if (page_is_ram(pfn) && PageReserved(lmem_map+i))
reservedpages++;
diff -urN pfn-ref/include/asm-alpha/mmzone.h pfn/include/asm-alpha/mmzone.h
--- pfn-ref/include/asm-alpha/mmzone.h Sat Apr 27 00:39:01 2002
+++ pfn/include/asm-alpha/mmzone.h Sat Apr 27 00:39:15 2002
@@ -56,14 +56,14 @@
#if 1
#define PLAT_NODE_DATA_LOCALNR(p, n) \
- (((p) - PLAT_NODE_DATA(n)->gendata.node_start_paddr) >> PAGE_SHIFT)
+ (((p) >> PAGE_SHIFT) - PLAT_NODE_DATA(n)->gendata.node_start_pfn)
#else
static inline unsigned long
PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)
{
unsigned long temp;
- temp = p - PLAT_NODE_DATA(n)->gendata.node_start_paddr;
- return (temp >> PAGE_SHIFT);
+ temp = p >> PAGE_SHIFT;
+ return temp - PLAT_NODE_DATA(n)->gendata.node_start_pfn;
}
#endif
@@ -98,7 +98,7 @@
* and returns the kaddr corresponding to first physical page in the
* node's mem_map.
*/
-#define LOCAL_BASE_ADDR(kaddr) ((unsigned long)__va(NODE_DATA(KVADDR_TO_NID(kaddr))->node_start_paddr))
+#define LOCAL_BASE_ADDR(kaddr) ((unsigned long)__va(NODE_DATA(KVADDR_TO_NID(kaddr))->node_start_pfn << PAGE_SHIFT))
#define LOCAL_MAP_NR(kvaddr) \
(((unsigned long)(kvaddr)-LOCAL_BASE_ADDR(kvaddr)) >> PAGE_SHIFT)
diff -urN pfn-ref/include/asm-alpha/pgtable.h pfn/include/asm-alpha/pgtable.h
--- pfn-ref/include/asm-alpha/pgtable.h Sat Apr 27 00:39:00 2002
+++ pfn/include/asm-alpha/pgtable.h Sat Apr 27 00:39:34 2002
@@ -193,9 +193,9 @@
#ifndef CONFIG_DISCONTIGMEM
#define PAGE_TO_PA(page) ((page - mem_map) << PAGE_SHIFT)
#else
-#define PAGE_TO_PA(page) \
- ((((page)-page_zone(page)->zone_mem_map) << PAGE_SHIFT) \
- + page_zone(page)->zone_start_paddr)
+#define PAGE_TO_PA(page) \
+ ((((page)-page_zone(page)->zone_mem_map) + \
+ page_zone(page)->zone_start_pfn) << PAGE_SHIFT)
#endif
#ifndef CONFIG_DISCONTIGMEM
@@ -214,7 +214,7 @@
unsigned long pfn; \
\
pfn = ((unsigned long)((page)-page_zone(page)->zone_mem_map)) << 32; \
- pfn += page_zone(page)->zone_start_paddr << (32-PAGE_SHIFT); \
+ pfn += page_zone(page)->zone_start_pfn << 32; \
pte_val(pte) = pfn | pgprot_val(pgprot); \
\
pte; \
@@ -237,7 +237,7 @@
unsigned long pfn; \
\
pfn = ((unsigned long)((page)-page_zone(page)->zone_mem_map)) << 32; \
- pfn += page_zone(page)->zone_start_paddr << (32-PAGE_SHIFT); \
+ pfn += page_zone(page)->zone_start_pfn << 32; \
pmd_val(pmd) = pfn | pgprot_val(pgprot); \
\
pmd; \
diff -urN pfn-ref/include/asm-mips64/mmzone.h pfn/include/asm-mips64/mmzone.h
--- pfn-ref/include/asm-mips64/mmzone.h Tue May 1 19:35:31 2001
+++ pfn/include/asm-mips64/mmzone.h Sat Apr 27 00:39:15 2002
@@ -27,7 +27,7 @@
#define PLAT_NODE_DATA_STARTNR(n) (PLAT_NODE_DATA(n)->gendata.node_start_mapnr)
#define PLAT_NODE_DATA_SIZE(n) (PLAT_NODE_DATA(n)->gendata.node_size)
#define PLAT_NODE_DATA_LOCALNR(p, n) \
- (((p) - PLAT_NODE_DATA(n)->gendata.node_start_paddr) >> PAGE_SHIFT)
+ (((p) >> PAGE_SHIFT) - PLAT_NODE_DATA(n)->gendata.node_start_pfn)
#define numa_node_id() cputocnode(current->processor)
diff -urN pfn-ref/include/asm-mips64/pgtable.h pfn/include/asm-mips64/pgtable.h
--- pfn-ref/include/asm-mips64/pgtable.h Tue Apr 16 08:12:03 2002
+++ pfn/include/asm-mips64/pgtable.h Sat Apr 27 00:39:15 2002
@@ -477,8 +477,8 @@
#define PAGE_TO_PA(page) ((page - mem_map) << PAGE_SHIFT)
#else
#define PAGE_TO_PA(page) \
- ((((page)-(page)->zone->zone_mem_map) << PAGE_SHIFT) \
- + ((page)->zone->zone_start_paddr))
+ (( ((page)-(page)->zone->zone_mem_map) + \
+ (page)->zone->zone_start_pfn) << PAGE_SHIFT)
#endif
#define mk_pte(page, pgprot) \
({ \
diff -urN pfn-ref/include/linux/blkdev.h pfn/include/linux/blkdev.h
--- pfn-ref/include/linux/blkdev.h Sat Apr 27 00:39:00 2002
+++ pfn/include/linux/blkdev.h Sat Apr 27 00:39:15 2002
@@ -156,7 +156,7 @@
#ifndef CONFIG_DISCONTIGMEM
if (page - mem_map <= q->bounce_pfn)
#else
- if ((page - page_zone(page)->zone_mem_map) + (page_zone(page)->zone_start_paddr >> PAGE_SHIFT) <= q->bounce_pfn)
+ if ((page - page_zone(page)->zone_mem_map) + page_zone(page)->zone_start_pfn <= q->bounce_pfn)
#endif
return bh;
diff -urN pfn-ref/include/linux/mm.h pfn/include/linux/mm.h
--- pfn-ref/include/linux/mm.h Sat Apr 27 00:39:04 2002
+++ pfn/include/linux/mm.h Sat Apr 27 00:39:15 2002
@@ -356,9 +356,9 @@
#define set_page_address(page, address) do { } while(0)
#ifdef CONFIG_DISCONTIGMEM
-#define page_address(page) \
- __va( (((page) - page_zone(page)->zone_mem_map) << PAGE_SHIFT) \
- + page_zone(page)->zone_start_paddr)
+#define page_address(page) \
+ __va( ((page) - page_zone(page)->zone_mem_map) + \
+ page_zone(page)->zone_start_pfn << PAGE_SHIFT)
#else
#define page_address(page) __va((page - mem_map) << PAGE_SHIFT)
#endif
@@ -522,7 +522,7 @@
extern void free_area_init(unsigned long * zones_size);
extern void free_area_init_node(int nid, pg_data_t *pgdat, struct page *pmap,
- unsigned long * zones_size, unsigned long zone_start_paddr,
+ unsigned long * zones_size, unsigned long zone_start_pfn,
unsigned long *zholes_size);
extern void mem_init(void);
extern void show_mem(void);
diff -urN pfn-ref/include/linux/mmzone.h pfn/include/linux/mmzone.h
--- pfn-ref/include/linux/mmzone.h Sat Apr 27 00:39:00 2002
+++ pfn/include/linux/mmzone.h Sat Apr 27 00:39:15 2002
@@ -81,7 +81,8 @@
*/
struct pglist_data *zone_pgdat;
struct page *zone_mem_map;
- unsigned long zone_start_paddr;
+ /* zone_start_pfn == zone_start_paddr >> PAGE_SHIFT */
+ unsigned long zone_start_pfn;
unsigned long zone_start_mapnr;
/*
@@ -160,7 +161,7 @@
struct page *node_mem_map;
unsigned long *valid_addr_bitmap;
struct bootmem_data *bdata;
- unsigned long node_start_paddr;
+ unsigned long node_start_pfn;
unsigned long node_start_mapnr;
unsigned long node_size;
int node_id;
diff -urN pfn-ref/mm/numa.c pfn/mm/numa.c
--- pfn-ref/mm/numa.c Sat Apr 27 00:39:00 2002
+++ pfn/mm/numa.c Sat Apr 27 00:39:15 2002
@@ -22,11 +22,11 @@
* Should be invoked with paramters (0, 0, unsigned long *[], start_paddr).
*/
void __init free_area_init_node(int nid, pg_data_t *pgdat, struct page *pmap,
- unsigned long *zones_size, unsigned long zone_start_paddr,
+ unsigned long *zones_size, unsigned long zone_start_pfn,
unsigned long *zholes_size)
{
free_area_init_core(0, &contig_page_data, &mem_map, zones_size,
- zone_start_paddr, zholes_size, pmap);
+ zone_start_pfn, zholes_size, pmap);
}
#endif /* !CONFIG_DISCONTIGMEM */
@@ -59,7 +59,7 @@
* Nodes can be initialized parallely, in no particular order.
*/
void __init free_area_init_node(int nid, pg_data_t *pgdat, struct page *pmap,
- unsigned long *zones_size, unsigned long zone_start_paddr,
+ unsigned long *zones_size, unsigned long zone_start_pfn,
unsigned long *zholes_size)
{
int i, size = 0;
@@ -68,7 +68,7 @@
if (mem_map == (mem_map_t *)NULL)
mem_map = (mem_map_t *)PAGE_OFFSET;
- free_area_init_core(nid, pgdat, &discard, zones_size, zone_start_paddr,
+ free_area_init_core(nid, pgdat, &discard, zones_size, zone_start_pfn,
zholes_size, pmap);
pgdat->node_id = nid;
diff -urN pfn-ref/mm/page_alloc.c pfn/mm/page_alloc.c
--- pfn-ref/mm/page_alloc.c Sat Apr 27 00:39:00 2002
+++ pfn/mm/page_alloc.c Sat Apr 27 00:39:15 2002
@@ -867,7 +867,7 @@
* - clear the memory bitmaps
*/
void __init free_area_init_core(int nid, pg_data_t *pgdat, struct page **gmap,
- unsigned long *zones_size, unsigned long zone_start_paddr,
+ unsigned long *zones_size, unsigned long zone_start_pfn,
unsigned long *zholes_size, struct page *lmem_map)
{
unsigned long i, j;
@@ -875,9 +875,6 @@
unsigned long totalpages, offset, realtotalpages;
const unsigned long zone_required_alignment = 1UL << (MAX_ORDER-1);
- if (zone_start_paddr & ~PAGE_MASK)
- BUG();
-
totalpages = 0;
for (i = 0; i < MAX_NR_ZONES; i++) {
unsigned long size = zones_size[i];
@@ -905,7 +902,7 @@
}
*gmap = pgdat->node_mem_map = lmem_map;
pgdat->node_size = totalpages;
- pgdat->node_start_paddr = zone_start_paddr;
+ pgdat->node_start_pfn = zone_start_pfn;
pgdat->node_start_mapnr = (lmem_map - mem_map);
pgdat->nr_zones = 0;
@@ -968,9 +965,9 @@
zone->zone_mem_map = mem_map + offset;
zone->zone_start_mapnr = offset;
- zone->zone_start_paddr = zone_start_paddr;
+ zone->zone_start_pfn = zone_start_pfn;
- if ((zone_start_paddr >> PAGE_SHIFT) & (zone_required_alignment-1))
+ if ((zone_start_pfn) & (zone_required_alignment-1))
printk("BUG: wrong zone alignment, it will crash\n");
/*
@@ -985,8 +982,12 @@
SetPageReserved(page);
memlist_init(&page->list);
if (j != ZONE_HIGHMEM)
- set_page_address(page, __va(zone_start_paddr));
- zone_start_paddr += PAGE_SIZE;
+ /*
+ * The shift left won't overflow because the
+ * ZONE_NORMAL is below 4G.
+ */
+ set_page_address(page, __va(zone_start_pfn << PAGE_SHIFT));
+ zone_start_pfn++;
}
offset += size;