3 files changed, 4 insertions, 3 deletions

diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 8a4f0d0d17a3..8f0a16a79a67 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -244,7 +244,8 @@ static void simscsi_fillresult(struct scsi_cmnd *sc, char *buf, unsigned len)
 
         if (scatterlen == 0)
                 memcpy(sc->request_buffer, buf, len);
-        else for (slp = (struct scatterlist *)sc->request_buffer; scatterlen-- > 0 && len > 0; slp++) {
+        else for (slp = (struct scatterlist *)sc->request_buffer;
+                  scatterlen-- > 0 && len > 0; slp++) {
                 unsigned thislen = min(len, slp->length);
 
                 memcpy(page_address(slp->page) + slp->offset, buf, thislen);
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 99761b81db44..0176556aeecc 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -55,7 +55,7 @@
 
 #define BAD_MADT_ENTRY(entry, end) (                                        \
                 (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
-                ((acpi_table_entry_header *)entry)->length != sizeof(*entry))
+                ((acpi_table_entry_header *)entry)->length < sizeof(*entry))
 
 #define PREFIX                  "ACPI: "
 
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 5a0420464c6c..fffa9e0826bc 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -118,7 +118,7 @@ die (const char *str, struct pt_regs *regs, long err)
         spin_unlock_irq(&die.lock);
 
         if (panic_on_oops)
-                panic("Fatal exception: panic_on_oops");
+                panic("Fatal exception");
 
         do_exit(SIGSEGV);
 }