X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fmadvise.c;h=2221491ed5038dcdcbe3c19bc65172eeb4380a75;hb=HEAD;hp=319528b8db74c8d0c7cd10c8468acb5539aea7dd;hpb=b0f969009f647cd473c5e559aeec9c4229d12f87;p=mv-sheeva.git

diff --git a/mm/madvise.c b/mm/madvise.c
index 319528b8db7..2221491ed50 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -71,6 +71,12 @@ static long madvise_behavior(struct vm_area_struct * vma,
 		if (error)
 			goto out;
 		break;
+	case MADV_HUGEPAGE:
+	case MADV_NOHUGEPAGE:
+		error = hugepage_madvise(vma, &new_flags, behavior);
+		if (error)
+			goto out;
+		break;
 	}
 
 	if (new_flags == vma->vm_flags) {
@@ -282,6 +288,10 @@ madvise_behavior_valid(int behavior)
 #ifdef CONFIG_KSM
 	case MADV_MERGEABLE:
 	case MADV_UNMERGEABLE:
+#endif
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+	case MADV_HUGEPAGE:
+	case MADV_NOHUGEPAGE:
 #endif
 		return 1;