patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / mm / hugetlb.c

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 6acf0d8..bce0d47 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -57,6 +57,7 @@ void free_huge_page(struct page *page)
        BUG_ON(page_count(page));
 
        INIT_LIST_HEAD(&page->lru);
+       page[1].mapping = NULL;
 
        spin_lock(&hugetlb_lock);
        enqueue_huge_page(page);
@@ -181,7 +182,8 @@ static unsigned long set_max_huge_pages(unsigned long count)
 
 #ifdef CONFIG_SYSCTL
 int hugetlb_sysctl_handler(struct ctl_table *table, int write,
-                          struct file *file, void *buffer, size_t *length)
+                          struct file *file, void __user *buffer,
+                          size_t *length)
 {
        proc_doulongvec_minmax(table, write, file, buffer, length);
        max_huge_pages = set_max_huge_pages(max_huge_pages);