X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=mm%2Fmadvise.c;h=5c065bc8b5f6c13fcf5296a47c63fdb53f3d7ecc;hb=b9a6ac4e4ede4172d165c133398b93e3233b0ba7;hp=6d3d348b17f47d15e3880eecbcc6f52f2798ec44;hpb=f02bf8578bd8dd400903291ccebc69665adc911c;p=linux-2.6-microblaze.git

diff --git a/mm/madvise.c b/mm/madvise.c
index 6d3d348b17f4..5c065bc8b5f6 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -862,10 +862,12 @@ static long madvise_populate(struct vm_area_struct *vma,
 			switch (pages) {
 			case -EINTR:
 				return -EINTR;
-			case -EFAULT: /* Incompatible mappings / permissions. */
+			case -EINVAL: /* Incompatible mappings / permissions. */
 				return -EINVAL;
 			case -EHWPOISON:
 				return -EHWPOISON;
+			case -EFAULT: /* VM_FAULT_SIGBUS or VM_FAULT_SIGSEGV */
+				return -EFAULT;
 			default:
 				pr_warn_once("%s: unhandled return value: %ld\n",
 					     __func__, pages);