From bdbb89a9c6a70608993d4778eeef0402134ef526 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 26 Jul 2008 20:27:45 +0000
Subject: fix kernel oops in the redboot partition parser when
CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is set and there is some free space
after the rootfs partition
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11948 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'target/linux/generic-2.6/patches-2.6.24')
diff --git a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
index 2f31555884..b4d57cb535 100644
--- a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
@@ -15,15 +15,15 @@
+ parts[i].size = fl->next->img->flash_base;
+ parts[i].size &= ~(master->erasesize - 1);
+ parts[i].size -= parts[i].offset;
-+ }
+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+ else {
++ nrparts--;
++ } else {
+ i++;
+ parts[i].offset = parts[i-1].size + parts[i-1].offset;
+ parts[i].size = fl->next->img->flash_base - parts[i].offset;
+ parts[i].name = nullname;
-+ }
#endif
++ }
+ }
tmp_fl = fl;
fl = fl->next;
--
cgit v1.2.3