Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / net / atm / proc.c

diff --git a/net/atm/proc.c b/net/atm/proc.c
index f85da0779e5ee162015ae88aa00e48e2114aa5e3..be3afdefec5832bb8e3861f883eff27e07bfcad0 100644 (file)
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -191,7 +191,7 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc)
 {
        struct sock *sk = sk_atm(vcc);
 
-       seq_printf(seq, "%p ", vcc);
+       seq_printf(seq, "%pK ", vcc);
        if (!vcc->dev)
                seq_printf(seq, "Unassigned    ");
        else
@@ -218,7 +218,7 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)
 {
        if (!vcc->dev)
                seq_printf(seq, sizeof(void *) == 4 ?
-                          "N/A@%p%10s" : "N/A@%p%2s", vcc, "");
+                          "N/A@%pK%10s" : "N/A@%pK%2s", vcc, "");
        else
                seq_printf(seq, "%3d %3d %5d         ",
                           vcc->dev->number, vcc->vpi, vcc->vci);