uClibc: fix ubicom32 compile error with 0.9.32

[openwrt.git] / target / linux / brcm47xx / patches-2.6.34 / 011-MIPS-BCM47xx-Really-fix-128MB-RAM-problem.patch

diff --git a/target/linux/brcm47xx/patches-2.6.34/011-MIPS-BCM47xx-Really-fix-128MB-RAM-problem.patch b/target/linux/brcm47xx/patches-2.6.34/011-MIPS-BCM47xx-Really-fix-128MB-RAM-problem.patch
index 0030a7d..dfa4b41 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.34/011-MIPS-BCM47xx-Really-fix-128MB-RAM-problem.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/011-MIPS-BCM47xx-Really-fix-128MB-RAM-problem.patch
@@ -1,7 +1,7 @@
-From b6d850fe4035d6bee7199119358e06f802aa19ed Mon Sep 17 00:00:00 2001
+From f65eb52ea6c0ec939fd44e74b6b873e0b549e3c9 Mon Sep 17 00:00:00 2001
 From: Hauke Mehrtens <hauke@hauke-m.de>
 Date: Sun, 18 Jul 2010 12:49:41 +0200
-Subject: [PATCH 1/5] MIPS: BCM47xx: Really fix 128MB RAM problem
+Subject: [PATCH 1/6] MIPS: BCM47xx: Really fix 128MB RAM problem
 
 The previews patch 84a6fcb368a080620d12fc4d79e07902dbee7335 was wrong,
 I got wrong success reports.
@@ -33,7 +33,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
         * want to reuse the memory used by CFE (around 4MB). That means cfe_*
         * functions stop to work at some point during the boot, we should only
         * call them at the beginning of the boot.
-+       * 
++       *
 +       * BCM47XX uses 128MB for addressing the ram, if the system contains
 +       * less that that amount of ram it remaps the ram more often into the
 +       * available space.
@@ -45,7 +45,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
 +              if (((unsigned long)(prom_init) + mem) > max) {
 +                      mem = (128 << 20);
-+                      printk("assume 128MB RAM\n");
++                      printk(KERN_DEBUG "assume 128MB RAM\n");
 +                      break;
 +              }
                if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==