Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers

UAPI Disintegration 2012-10-09

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index 8bbfb444b895..f913d701a5b3 100644
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -121,10 +121,16 @@ void ubi_update_reserved(struct ubi_device *ubi)
  */
 void ubi_calculate_reserved(struct ubi_device *ubi)
 {
-        ubi->beb_rsvd_level = ubi->good_peb_count/100;
-        ubi->beb_rsvd_level *= CONFIG_MTD_UBI_BEB_RESERVE;
-        if (ubi->beb_rsvd_level < MIN_RESEVED_PEBS)
-                ubi->beb_rsvd_level = MIN_RESEVED_PEBS;
+        /*
+         * Calculate the actual number of PEBs currently needed to be reserved
+         * for future bad eraseblock handling.
+         */
+        ubi->beb_rsvd_level = ubi->bad_peb_limit - ubi->bad_peb_count;
+        if (ubi->beb_rsvd_level < 0) {
+                ubi->beb_rsvd_level = 0;
+                ubi_warn("number of bad PEBs (%d) is above the expected limit (%d), not reserving any PEBs for bad PEB handling, will use available PEBs (if any)",
+                         ubi->bad_peb_count, ubi->bad_peb_limit);
+        }
 }
 
 /**