ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev

[~andy/linux] / net / x25 / x25_in.c

diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index a49cd4ec551a58f7a6b8bdcdaeb2da273687196a..d1b0dc79bb6f15874bd520c41d08f96bd9ff31bb 100644 (file)
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -23,6 +23,8 @@
  *                                       i-frames.
  */
 
+#define pr_fmt(fmt) "X25: " fmt
+
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
@@ -317,7 +319,7 @@ static int x25_state3_machine(struct sock *sk, struct sk_buff *skb, int frametyp
                        break;
 
                default:
-                       printk(KERN_WARNING "x25: unknown %02X in state 3\n", frametype);
+                       pr_warn("unknown %02X in state 3\n", frametype);
                        break;
        }