git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
arm26
/
mm
/
init.c
diff --git
a/arch/arm26/mm/init.c
b/arch/arm26/mm/init.c
index
ad41ceb
..
1dba6bf
100644
(file)
--- a/
arch/arm26/mm/init.c
+++ b/
arch/arm26/mm/init.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/arch/arm/mm/init.c
+ * linux/arch/arm
26
/mm/init.c
*
* Copyright (C) 1995-2002 Russell King
*
*
* Copyright (C) 1995-2002 Russell King
*
@@
-26,7
+26,6
@@
#include <asm/segment.h>
#include <asm/mach-types.h>
#include <asm/segment.h>
#include <asm/mach-types.h>
-#include <asm/pgalloc.h>
#include <asm/dma.h>
#include <asm/hardware.h>
#include <asm/setup.h>
#include <asm/dma.h>
#include <asm/hardware.h>
#include <asm/setup.h>
@@
-84,7
+83,7
@@
void show_mem(void)
else if (!page_count(page))
free++;
else
else if (!page_count(page))
free++;
else
- shared +=
atomic_read(&page->count
) - 1;
+ shared +=
page_count(page
) - 1;
page++;
} while (page < end);
page++;
} while (page < end);
@@
-156,7
+155,8
@@
find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
{
unsigned int memend_pfn = 0;
{
unsigned int memend_pfn = 0;
- numnodes = 1;
+ nodes_clear(node_online_map);
+ node_set_online(0);
np->bootmap_pages = 0;
np->bootmap_pages = 0;
@@
-305,8
+305,8
@@
void __init paging_init(struct meminfo *mi)
(bdata->node_boot_start >> PAGE_SHIFT);
if (!zone_size[0])
BUG();
(bdata->node_boot_start >> PAGE_SHIFT);
if (!zone_size[0])
BUG();
-
- free_area_init_node(0, pgdat,
0,
zone_size,
+ pgdat->node_mem_map = NULL;
+ free_area_init_node(0, pgdat, zone_size,
bdata->node_boot_start >> PAGE_SHIFT, zhole_size);
mem_map = NODE_DATA(0)->node_mem_map;
bdata->node_boot_start >> PAGE_SHIFT, zhole_size);
mem_map = NODE_DATA(0)->node_mem_map;
@@
-376,7
+376,7
@@
void __init mem_init(void)
* Turn on overcommit on tiny machines
*/
if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
* Turn on overcommit on tiny machines
*/
if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
- sysctl_overcommit_memory =
1
;
+ sysctl_overcommit_memory =
OVERCOMMIT_ALWAYS
;
printk("Turning on overcommit\n");
}
}
printk("Turning on overcommit\n");
}
}