[Linux-kernel-commits] [4142] trunk/arch/blackfin: more fix to bug [#3846].

[adamliyi]

Title: [4142] trunk/arch/blackfin: more fix to bug [#3846].

Revision

4142

Author

adamliyi

Date

2008-01-23 02:01:02 -0600 (Wed, 23 Jan 2008)

Log Message

more fix to bug [#3846].
- use _rambase as the start of kernel image. kernel is in the region [_rambase, _ramstart]
- count in pages in per-cpu-page list as available memory
- reserved memory now include: [0 - 4K] for bad pointer catching, memory reserved for abnormaly 05000263, memory reserved by kernel itself.

Diffstat
 kernel/setup.c |    1 +
 mm/init.c      |   33 +++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 12 deletions(-)

Modified Paths

trunk/arch/blackfin/kernel/setup.c
trunk/arch/blackfin/mm/init.c

Diff

Modified: trunk/arch/blackfin/kernel/setup.c (4141 => 4142)

--- trunk/arch/blackfin/kernel/setup.c	2008-01-23 07:45:09 UTC (rev 4141)
+++ trunk/arch/blackfin/kernel/setup.c	2008-01-23 08:01:02 UTC (rev 4142)
@@ -238,6 +238,7 @@
 	memory_end = _ramend - DMA_UNCACHED_REGION;
 
 	_ramstart = (unsigned long)__bss_stop;
+	_rambase = (unsigned long)_stext;
 #ifdef CONFIG_MPU
 	/* Round up to multiple of 4MB.  */
 	memory_start = (_ramstart + 0x3fffff) & ~0x3fffff;

Modified: trunk/arch/blackfin/mm/init.c (4141 => 4142)

--- trunk/arch/blackfin/mm/init.c	2008-01-23 07:45:09 UTC (rev 4141)
+++ trunk/arch/blackfin/mm/init.c	2008-01-23 08:01:02 UTC (rev 4142)
@@ -127,7 +127,8 @@
 
 void __init mem_init(void)
 {
-	unsigned int codek = 0, datak = 0, initk = 0, reservedpages = 0;
+	unsigned int codek = 0, datak = 0, initk = 0;
+	unsigned int reservedpages = 0, freepages = 0;
 	unsigned long tmp;
 	unsigned long start_mem = memory_start;
 	unsigned long end_mem = memory_end;
@@ -137,28 +138,36 @@
 
 	start_mem = PAGE_ALIGN(start_mem);
 	max_mapnr = num_physpages = MAP_NR(high_memory);
-	printk(KERN_INFO "Kernel managed physical pages: %lu\n", num_physpages);
+	printk(KERN_INFO "Kernel managed physical pages: %lu\n",
+		num_physpages);
 
 	/* This will put all memory onto the freelists. */
 	totalram_pages = free_all_bootmem();
 
-	codek = (_etext - _stext) >> 10;
-	initk = (__init_end - __init_begin) >> 10;
-	datak = ((_ramstart - CONFIG_BOOT_LOAD) >> 10) - codek - initk;
-
 	reservedpages = 0;
-	/* do not count kernel image */
-	for (tmp = (start_mem >> PAGE_SHIFT); tmp < max_mapnr; tmp++)
+	for (tmp = 0; tmp < max_mapnr; tmp++)
 		if (PageReserved(pfn_to_page(tmp)))
 			reservedpages++;
+	freepages =  max_mapnr - reservedpages;
+
+	/* do not count in kernel image between _rambase and _ramstart */
+	reservedpages -= (_ramstart - _rambase) >> PAGE_SHIFT;
 #if (defined(CONFIG_BFIN_ICACHE) && ANOMALY_05000263)
-	reservedpages += (_ramend - memory_end - DMA_UNCACHED_REGION) >> PAGE_SHIFT;
+	reservedpages += (_ramend - memory_end - DMA_UNCACHED_REGION) >>
+				PAGE_SHIFT;
 #endif
 
+	codek = (_etext - _stext) >> 10;
+	initk = (__init_end - __init_begin) >> 10;
+	datak = ((_ramstart - _rambase) >> 10) - codek - initk;
+
 	printk(KERN_INFO
-	     "Memory available: %luk/%luk RAM, (%uk init code, %uk kernel code, %uk data, %uk dma, %uk reserved)\n",
-	     (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), _ramend >> 10,
-	     initk, codek, datak, DMA_UNCACHED_REGION >> 10, reservedpages << (PAGE_SHIFT-10));
+	     "Memory available: %luk/%luk RAM, "
+		"(%uk init code, %uk kernel code, "
+		"%uk data, %uk dma, %uk reserved)\n",
+		(unsigned long) freepages << (PAGE_SHIFT-10), _ramend >> 10,
+		initk, codek, datak, DMA_UNCACHED_REGION >> 10,
+		(reservedpages << (PAGE_SHIFT-10)));
 
 	/* Initialize the blackfin L1 Memory. */
 	l1sram_init();

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits