10 files changed, 28 insertions, 16 deletions

diff --git a/mm/Kconfig b/mm/Kconfig
index 91ee3922510a..1a501a4de95c 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -101,7 +101,7 @@ config HAVE_MEMORY_PRESENT
 # with gcc 3.4 and later.
 #
 config SPARSEMEM_STATIC
-        def_bool n
+        bool
 
 #
 # Architecture platforms which require a two level mem_section in SPARSEMEM
@@ -113,7 +113,7 @@ config SPARSEMEM_EXTREME
         depends on SPARSEMEM && !SPARSEMEM_STATIC
 
 config SPARSEMEM_VMEMMAP_ENABLE
-        def_bool n
+        bool
 
 config SPARSEMEM_VMEMMAP
         bool "Sparse Memory virtual memmap"
diff --git a/mm/bootmem.c b/mm/bootmem.c
index ad8eec6e44a8..ac5a891f142a 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -48,7 +48,7 @@ early_param("bootmem_debug", bootmem_debug_setup);
         if (unlikely(bootmem_debug))                    \
                 printk(KERN_INFO                        \
                         "bootmem::%s " fmt,             \
-                        __FUNCTION__, ## args);         \
+                        __func__, ## args);             \
 })
 
 static unsigned long __init bootmap_bytes(unsigned long pages)
diff --git a/mm/fadvise.c b/mm/fadvise.c
index 343cfdfebd9e..a1da969bd980 100644
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, Linus Torvalds
  *
- * 11Jan2003    akpm@digeo.com
+ * 11Jan2003    Andrew Morton
  *              Initial version.
  */
 
diff --git a/mm/filemap.c b/mm/filemap.c
index 494ff20b6cfa..903bf316912a 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1187,8 +1187,7 @@ out:
         ra->prev_pos |= prev_offset;
 
         *ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset;
-        if (filp)
-                file_accessed(filp);
+        file_accessed(filp);
 }
 
 int file_read_actor(read_descriptor_t *desc, struct page *page,
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 67a71191136e..38633864a93e 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2008,7 +2008,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
         entry = huge_ptep_get(ptep);
         if (huge_pte_none(entry)) {
                 ret = hugetlb_no_page(mm, vma, address, ptep, write_access);
-                goto out_unlock;
+                goto out_mutex;
         }
 
         ret = 0;
@@ -2024,7 +2024,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
         if (write_access && !pte_write(entry)) {
                 if (vma_needs_reservation(h, vma, address) < 0) {
                         ret = VM_FAULT_OOM;
-                        goto out_unlock;
+                        goto out_mutex;
                 }
 
                 if (!(vma->vm_flags & VM_SHARED))
@@ -2034,10 +2034,23 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 
         spin_lock(&mm->page_table_lock);
         /* Check for a racing update before calling hugetlb_cow */
-        if (likely(pte_same(entry, huge_ptep_get(ptep))))
-                if (write_access && !pte_write(entry))
+        if (unlikely(!pte_same(entry, huge_ptep_get(ptep))))
+                goto out_page_table_lock;
+
+
+        if (write_access) {
+                if (!pte_write(entry)) {
                         ret = hugetlb_cow(mm, vma, address, ptep, entry,
                                                         pagecache_page);
+                        goto out_page_table_lock;
+                }
+                entry = pte_mkdirty(entry);
+        }
+        entry = pte_mkyoung(entry);
+        if (huge_ptep_set_access_flags(vma, address, ptep, entry, write_access))
+                update_mmu_cache(vma, address, entry);
+
+out_page_table_lock:
         spin_unlock(&mm->page_table_lock);
 
         if (pagecache_page) {
@@ -2045,7 +2058,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                 put_page(pagecache_page);
         }
 
-out_unlock:
+out_mutex:
         mutex_unlock(&hugetlb_instantiation_mutex);
 
         return ret;
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 24de8b65fdbd..c130a137c129 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -7,7 +7,7 @@
  * Contains functions related to writing back dirty pages at the
  * address_space level.
  *
- * 10Apr2002    akpm@zip.com.au
+ * 10Apr2002    Andrew Morton
  *              Initial version
  */
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 27b8681139fd..9eb9eb928285 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3952,7 +3952,7 @@ static void check_for_regular_memory(pg_data_t *pgdat)
 void __init free_area_init_nodes(unsigned long *max_zone_pfn)
 {
         unsigned long nid;
-        enum zone_type i;
+        int i;
 
         /* Sort early_node_map as initialisation assumes it is sorted */
         sort_node_map();
diff --git a/mm/pdflush.c b/mm/pdflush.c
index 0cbe0c60c6bf..a0a14c4d5072 100644
--- a/mm/pdflush.c
+++ b/mm/pdflush.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, Linus Torvalds.
  *
- * 09Apr2002    akpm@zip.com.au
+ * 09Apr2002    Andrew Morton
  *              Initial version
  * 29Feb2004    kaos@sgi.com
  *              Move worker thread creation to kthread to avoid chewing
diff --git a/mm/readahead.c b/mm/readahead.c
index 77e8ddf945e9..6cbd9a72fde2 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, Linus Torvalds
  *
- * 09Apr2002    akpm@zip.com.au
+ * 09Apr2002    Andrew Morton
  *              Initial version.
  */
 
diff --git a/mm/truncate.c b/mm/truncate.c
index 6650c1d878b4..e83e4b114ef1 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, Linus Torvalds
  *
- * 10Sep2002    akpm@zip.com.au
+ * 10Sep2002    Andrew Morton
  *              Initial version.
  */