Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c
index 2bb1309003dd..4ccda77d08d6 100644
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@@ -22,6 +22,7 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/dma.h>
+#include <asm/oplib.h>
 
 /* #define IOUNIT_DEBUG */
 #ifdef IOUNIT_DEBUG
@@ -41,9 +42,12 @@ iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus)
         struct linux_prom_registers iommu_promregs[PROMREG_MAX];
         struct resource r;
 
-        iounit = kmalloc(sizeof(struct iounit_struct), GFP_ATOMIC);
+        iounit = kzalloc(sizeof(struct iounit_struct), GFP_ATOMIC);
+        if (!iounit) {
+                prom_printf("SUN4D: Cannot alloc iounit, halting.\n");
+                prom_halt();
+        }
 
-        memset(iounit, 0, sizeof(*iounit));
         iounit->limit[0] = IOUNIT_BMAP1_START;
         iounit->limit[1] = IOUNIT_BMAP2_START;
         iounit->limit[2] = IOUNIT_BMAPM_START;