diff --git a/[refs] b/[refs]
index a62dcf42d930..8a2d5d491bc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13df635f080d411a152c92087a384135c1562fac
+refs/heads/master: 586c7e6a280580fd94b662bf486f9bb31098d14b
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index faa46da99ebe..425971600485 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -969,10 +969,13 @@ SYSCALL_DEFINE3(shmat, int, shmid, char __user *, shmaddr, int, shmflg)
 SYSCALL_DEFINE1(shmdt, char __user *, shmaddr)
 {
 	struct mm_struct *mm = current->mm;
-	struct vm_area_struct *vma, *next;
+	struct vm_area_struct *vma;
 	unsigned long addr = (unsigned long)shmaddr;
-	loff_t size = 0;
 	int retval = -EINVAL;
+#ifdef CONFIG_MMU
+	loff_t size = 0;
+	struct vm_area_struct *next;
+#endif
 
 	if (addr & ~PAGE_MASK)
 		return retval;