5 files changed, 28 insertions, 63 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index e70d0483fb4..b1eb834bc0f 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1277,6 +1277,19 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_4xx,
                 .platform               = "ppc405",
         },
+        {
+                /* 405EZ */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x41510000,
+                .cpu_name               = "405EZ",
+                .cpu_features           = CPU_FTRS_40X,
+                .cpu_user_features      = PPC_FEATURE_32 |
+                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .machine_check          = machine_check_4xx,
+                .platform               = "ppc405",
+        },
         {       /* default match */
                 .pvr_mask               = 0x00000000,
                 .pvr_value              = 0x00000000,
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index a168514d860..4bd8b4f5e70 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -312,11 +312,24 @@ static struct property kernel_end_prop = {
 static void __init export_htab_values(void)
 {
         struct device_node *node;
+        struct property *prop;
 
         node = of_find_node_by_path("/chosen");
         if (!node)
                 return;
 
+        /* remove any stale propertys so ours can be found */
+        prop = of_find_property(node, kernel_end_prop.name, NULL);
+        if (prop)
+                prom_remove_property(node, prop);
+        prop = of_find_property(node, htab_base_prop.name, NULL);
+        if (prop)
+                prom_remove_property(node, prop);
+        prop = of_find_property(node, htab_size_prop.name, NULL);
+        if (prop)
+                prom_remove_property(node, prop);
+
+        /* information needed by userspace when using default_machine_kexec */
         kernel_end = __pa(_end);
         prom_add_property(node, &kernel_end_prop);
 
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 2fdbc18ae94..23e0db20332 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -487,67 +487,6 @@ static int __init prom_setprop(phandle node, const char *nodename,
         return call_prom("interpret", 1, 1, (u32)(unsigned long) cmd);
 }
 
-/* We can't use the standard versions because of RELOC headaches. */
-#define isxdigit(c)     (('0' <= (c) && (c) <= '9') \
-                         || ('a' <= (c) && (c) <= 'f') \
-                         || ('A' <= (c) && (c) <= 'F'))
-
-#define isdigit(c)      ('0' <= (c) && (c) <= '9')
-#define islower(c)      ('a' <= (c) && (c) <= 'z')
-#define toupper(c)      (islower(c) ? ((c) - 'a' + 'A') : (c))
-
-unsigned long prom_strtoul(const char *cp, const char **endp)
-{
-        unsigned long result = 0, base = 10, value;
-
-        if (*cp == '0') {
-                base = 8;
-                cp++;
-                if (toupper(*cp) == 'X') {
-                        cp++;
-                        base = 16;
-                }
-        }
-
-        while (isxdigit(*cp) &&
-               (value = isdigit(*cp) ? *cp - '0' : toupper(*cp) - 'A' + 10) < base) {
-                result = result * base + value;
-                cp++;
-        }
-
-        if (endp)
-                *endp = cp;
-
-        return result;
-}
-
-unsigned long prom_memparse(const char *ptr, const char **retptr)
-{
-        unsigned long ret = prom_strtoul(ptr, retptr);
-        int shift = 0;
-
-        /*
-         * We can't use a switch here because GCC *may* generate a
-         * jump table which won't work, because we're not running at
-         * the address we're linked at.
-         */
-        if ('G' == **retptr || 'g' == **retptr)
-                shift = 30;
-
-        if ('M' == **retptr || 'm' == **retptr)
-                shift = 20;
-
-        if ('K' == **retptr || 'k' == **retptr)
-                shift = 10;
-
-        if (shift) {
-                ret <<= shift;
-                (*retptr)++;
-        }
-
-        return ret;
-}
-
 /*
  * Early parsing of the command line passed to the kernel, used for
  * "mem=x" and the options that affect the iommu
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 2c7e8e87f77..ea3a2ec03ff 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush
 _end enter_prom memcpy memset reloc_offset __secondary_hold
 __secondary_hold_acknowledge __secondary_hold_spinloop __start
 strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224
-reloc_got2 kernstart_addr"
+reloc_got2 kernstart_addr memstart_addr"
 
 NM="$1"
 OBJ="$2"
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index cb01ebc5938..7b7da8cfd5e 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -142,7 +142,7 @@ unsigned int udbg_probe_uart_speed(void __iomem *comport, unsigned int clock)
         speed = (clock / prescaler) / (divisor * 16);
 
         /* sanity check */
-        if (speed < 0 || speed > (clock / 16))
+        if (speed > (clock / 16))
                 speed = 9600;
 
         return speed;