3 files changed, 6 insertions, 3 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index cdef6cea890..b65187f0c74 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -208,8 +208,10 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm)
                 struct file *file;
 
                 if (mpnt->vm_flags & VM_DONTCOPY) {
+                        long pages = vma_pages(mpnt);
+                        mm->total_vm -= pages;
                         __vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
-                                                        -vma_pages(mpnt));
+                                                                -pages);
                         continue;
                 }
                 charge = 0;
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index c51a4d96d4e..3ec789c6b53 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -16,6 +16,8 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
+#include <linux/mount.h>
+
 #include "power.h"
 
 
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 7d7801cd01f..f2bc71b9fe8 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -63,6 +63,7 @@
 #include <linux/console.h>
 #include <linux/highmem.h>
 #include <linux/bio.h>
+#include <linux/mount.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -1260,8 +1261,6 @@ static int data_read(struct pbe *pblist)
         return error;
 }
 
-extern dev_t name_to_dev_t(const char *line);
-
 /**
  *      read_pagedir - Read page backup list pages from swap
  */