Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[mv-sheeva.git] / mm / madvise.c

diff --git a/mm/madvise.c b/mm/madvise.c
index ecde40a401c1911df933949c26e35529e446cbcc..2221491ed5038dcdcbe3c19bc65172eeb4380a75 100644 (file)
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -72,7 +72,8 @@ static long madvise_behavior(struct vm_area_struct * vma,
                        goto out;
                break;
        case MADV_HUGEPAGE:
-               error = hugepage_madvise(&new_flags);
+       case MADV_NOHUGEPAGE:
+               error = hugepage_madvise(vma, &new_flags, behavior);
                if (error)
                        goto out;
                break;
@@ -290,6 +291,7 @@ madvise_behavior_valid(int behavior)
 #endif
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
        case MADV_HUGEPAGE:
+       case MADV_NOHUGEPAGE:
 #endif
                return 1;