sparc .26 patches

diff --git a/queue-2.6.26/0001-sparc64-Fix-overshoot-in-nid_range.patch b/queue-2.6.26/0001-sparc64-Fix-overshoot-in-nid_range.patch
new file mode 100644 (file)
index 0000000..a43f72a
--- /dev/null
+++ b/queue-2.6.26/0001-sparc64-Fix-overshoot-in-nid_range.patch
@@ -0,0 +1,31 @@
+From d02baa7309b7ecd24505e52f20a29fbab00e0c46 Mon Sep 17 00:00:00 2001
+From: David S. Miller <davem@davemloft.net>
+Date: Wed, 3 Sep 2008 01:20:37 -0700
+Subject: sparc64: Fix overshoot in nid_range().
+
+From: David S. Miller <davem@davemloft.net>
+
+[ Upstream commit c918dcce92f76bb9903e4d049f4780bad384c207 ]
+
+If 'start' does not begin on a page boundary, we can overshoot
+past 'end'.
+
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/sparc64/mm/init.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/sparc64/mm/init.c
++++ b/arch/sparc64/mm/init.c
+@@ -842,6 +842,9 @@ static unsigned long nid_range(unsigned 
+               start += PAGE_SIZE;
+       }
+ 
++      if (start > end)
++              start = end;
++
+       return start;
+ }
+ #else

diff --git a/queue-2.6.26/0002-sparc64-Fix-cmdline_memory_size-handling-bugs.patch b/queue-2.6.26/0002-sparc64-Fix-cmdline_memory_size-handling-bugs.patch
new file mode 100644 (file)
index 0000000..92c0f62
--- /dev/null
+++ b/queue-2.6.26/0002-sparc64-Fix-cmdline_memory_size-handling-bugs.patch
@@ -0,0 +1,86 @@
+From be080848e82dbd364e27e88420aaab7cf55339e5 Mon Sep 17 00:00:00 2001
+From: David S. Miller <davem@davemloft.net>
+Date: Wed, 3 Sep 2008 01:21:23 -0700
+Subject: sparc64: Fix cmdline_memory_size handling bugs.
+
+From: David S. Miller <davem@davemloft.net>
+
+[ Upstream commit f2b6079464fc73cf12f08248180a618f05033a70 ]
+
+First, lmb_enforce_memory_limit() interprets it's argument
+(mostly, heh) as a size limit not an address limit.  So pass
+the raw cmdline_memory_size value into it.  And we don't
+need to check it against zero, lmb_enforce_memory_limit() does
+that for us.
+
+Next, free_initmem() needs special handling when the kernel
+command line trims the available memory.  The problem case is
+if the trimmed out memory is where the kernel image itself
+resides.
+
+When that memory is trimmed out, we don't add those physical
+ram areas to the sparsemem active ranges, amongst other things.
+Which means that this free_initmem() code will free up invalid
+page structs, resulting in either crashes or hangs.
+
+Just quick fix this by not freeing initmem at all if "mem="
+was given on the boot command line.
+
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/sparc64/mm/init.c |   27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+--- a/arch/sparc64/mm/init.c
++++ b/arch/sparc64/mm/init.c
+@@ -1772,8 +1772,7 @@ void __init paging_init(void)
+ 
+       find_ramdisk(phys_base);
+ 
+-      if (cmdline_memory_size)
+-              lmb_enforce_memory_limit(phys_base + cmdline_memory_size);
++      lmb_enforce_memory_limit(cmdline_memory_size);
+ 
+       lmb_analyze();
+       lmb_dump_all();
+@@ -2010,6 +2009,15 @@ void __init mem_init(void)
+ void free_initmem(void)
+ {
+       unsigned long addr, initend;
++      int do_free = 1;
++
++      /* If the physical memory maps were trimmed by kernel command
++       * line options, don't even try freeing this initmem stuff up.
++       * The kernel image could have been in the trimmed out region
++       * and if so the freeing below will free invalid page structs.
++       */
++      if (cmdline_memory_size)
++              do_free = 0;
+ 
+       /*
+        * The init section is aligned to 8k in vmlinux.lds. Page align for >8k pagesizes.
+@@ -2024,13 +2032,16 @@ void free_initmem(void)
+                       ((unsigned long) __va(kern_base)) -
+                       ((unsigned long) KERNBASE));
+               memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
+-              p = virt_to_page(page);
+ 
+-              ClearPageReserved(p);
+-              init_page_count(p);
+-              __free_page(p);
+-              num_physpages++;
+-              totalram_pages++;
++              if (do_free) {
++                      p = virt_to_page(page);
++
++                      ClearPageReserved(p);
++                      init_page_count(p);
++                      __free_page(p);
++                      num_physpages++;
++                      totalram_pages++;
++              }
+       }
+ }
+ 

diff --git a/queue-2.6.26/series b/queue-2.6.26/series
index ba5199d25f2aeb52211a738db39243e24dbc1c7e..07bd6cedb5dbe7afe1d5a31e23f61864735f0302 100644 (file)
--- a/queue-2.6.26/series
+++ b/queue-2.6.26/series
@@ -30,3 +30,5 @@ mm-make-setup_zone_migrate_reserve-aware-of-overlapping-nodes.patch
 0011-sctp-correct-bounds-check-in-sctp_setsockopt_auth_k.patch
 0012-sctp-fix-random-memory-dereference-with-SCTP_HMAC_I.patch
 0013-ipsec-Fix-deadlock-in-xfrm_state-management.patch
+0001-sparc64-Fix-overshoot-in-nid_range.patch
+0002-sparc64-Fix-cmdline_memory_size-handling-bugs.patch