Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / fs / proc / task_nommu.c

diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 0b63d68dedb2a018e716aa4cb4e93663a8b46992..36bf0f2e102e7811d8e8b6bee41a64cb64b65930 100644 (file)
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -64,7 +64,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
        else
                bytes += kobjsize(current->files);
 
-       if (current->sighand && atomic_read(&current->sighand->count) > 1)
+       if (current->sighand && refcount_read(&current->sighand->count) > 1)
                sbytes += kobjsize(current->sighand);
        else
                bytes += kobjsize(current->sighand);
@@ -178,7 +178,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
                seq_file_path(m, file, "");
        } else if (mm && is_stack(vma)) {
                seq_pad(m, ' ');
-               seq_printf(m, "[stack]");
+               seq_puts(m, "[stack]");
        }
 
        seq_putc(m, '\n');