aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/nommu.c
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2005-10-24 10:55:29 -0700
committerRoland Dreier <rolandd@cisco.com>2005-10-24 10:55:29 -0700
commitec329a135974f1c400214dab02f09584d4beeba9 (patch)
tree235be754f76f4e7d51975d2434f226cfc75cdd08 /fs/proc/nommu.c
parentbbf207860931b6a033d0fbcd170ae2332c0d8216 (diff)
parent5d7edb3c1a01310725d86f0d83fb3be45685dc82 (diff)
downloadkernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.zip
kernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.tar.gz
kernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.tar.bz2
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
Diffstat (limited to 'fs/proc/nommu.c')
-rw-r--r--fs/proc/nommu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index f3bf016..cff10ab 100644
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -91,6 +91,7 @@ static void *nommu_vma_list_start(struct seq_file *m, loff_t *_pos)
next = _rb;
break;
}
+ pos--;
}
return next;