2 files changed, 4 insertions, 10 deletions

diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
index 6db08599ebb..776dd40397e 100644
--- a/arch/ia64/kernel/unaligned.c
+++ b/arch/ia64/kernel/unaligned.c
@@ -60,7 +60,6 @@ dump (const char *str, void *vp, size_t len)
  */
 int no_unaligned_warning;
 int unaligned_dump_stack;
-static int noprint_warning;
 
 /*
  * For M-unit:
@@ -1357,9 +1356,8 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs)
                         /* watch for command names containing %s */
                         printk(KERN_WARNING "%s", buf);
                 } else {
-                        if (no_unaligned_warning && !noprint_warning) {
-                                noprint_warning = 1;
-                                printk(KERN_WARNING "%s(%d) encountered an "
+                        if (no_unaligned_warning) {
+                                printk_once(KERN_WARNING "%s(%d) encountered an "
                                        "unaligned exception which required\n"
                                        "kernel assistance, which degrades "
                                        "the performance of the application.\n"
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 25831c47c57..308e6595110 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -119,7 +119,6 @@ sn_pcidev_info_get(struct pci_dev *dev)
  * Additionally note that the struct sn_flush_device_war also has to be
  * removed from arch/ia64/sn/include/xtalk/hubdev.h
  */
-static u8 war_implemented = 0;
 
 static s64 sn_device_fixup_war(u64 nasid, u64 widget, int device,
                                struct sn_flush_device_common *common)
@@ -128,11 +127,8 @@ static s64 sn_device_fixup_war(u64 nasid, u64 widget, int device,
         struct sn_flush_device_war *dev_entry;
         struct ia64_sal_retval isrv = {0,0,0,0};
 
-        if (!war_implemented) {
-                printk(KERN_WARNING "PROM version < 4.50 -- implementing old "
-                       "PROM flush WAR\n");
-                war_implemented = 1;
-        }
+        printk_once(KERN_WARNING
+                "PROM version < 4.50 -- implementing old PROM flush WAR\n");
 
         war_list = kzalloc(DEV_PER_WIDGET * sizeof(*war_list), GFP_KERNEL);
         BUG_ON(!war_list);