Merge branch 'linux-2.6'

2 files changed, 23 insertions, 4 deletions

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 8508f973d9cc..1f07f70ac89f 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -566,6 +566,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
         if (len > TASK_SIZE)
                 return -ENOMEM;
 
+        /* handle fixed mapping: prevent overlap with huge pages */
+        if (flags & MAP_FIXED) {
+                if (is_hugepage_only_range(mm, addr, len))
+                        return -EINVAL;
+                return addr;
+        }
+
         if (addr) {
                 addr = PAGE_ALIGN(addr);
                 vma = find_vma(mm, addr);
@@ -641,6 +648,13 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
         if (len > TASK_SIZE)
                 return -ENOMEM;
 
+        /* handle fixed mapping: prevent overlap with huge pages */
+        if (flags & MAP_FIXED) {
+                if (is_hugepage_only_range(mm, addr, len))
+                        return -EINVAL;
+                return addr;
+        }
+
         /* dont allow allocations above current base */
         if (mm->free_area_cache > base)
                 mm->free_area_cache = base;
@@ -823,6 +837,13 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
         /* Paranoia, caller should have dealt with this */
         BUG_ON((addr + len)  < addr);
 
+        /* Handle MAP_FIXED */
+        if (flags & MAP_FIXED) {
+                if (prepare_hugepage_range(addr, len, pgoff))
+                        return -EINVAL;
+                return addr;
+        }
+
         if (test_thread_flag(TIF_32BIT)) {
                 curareas = current->mm->context.low_htlb_areas;
 
@@ -1057,8 +1078,7 @@ static int __init hugetlbpage_init(void)
         huge_pgtable_cache = kmem_cache_create("hugepte_cache",
                                                HUGEPTE_TABLE_SIZE,
                                                HUGEPTE_TABLE_SIZE,
-                                               SLAB_HWCACHE_ALIGN |
-                                               SLAB_MUST_HWCACHE_ALIGN,
+                                               0,
                                                zero_ctor, NULL);
         if (! huge_pgtable_cache)
                 panic("hugetlbpage_init(): could not create hugepte cache\n");
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index d12a87ec5ae9..4416d5140c53 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -183,8 +183,7 @@ void pgtable_cache_init(void)
                     "for size: %08x...\n", name, i, size);
                 pgtable_cache[i] = kmem_cache_create(name,
                                                      size, size,
-                                                     SLAB_HWCACHE_ALIGN |
-                                                     SLAB_MUST_HWCACHE_ALIGN,
+                                                     0,
                                                      zero_ctor,
                                                      NULL);
                 if (! pgtable_cache[i])