diff --git a/[refs] b/[refs]
index 9337801d504a..a30d683b630e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e71af49d46e4c25f17a2c8f53d62ffd14f01007
+refs/heads/master: f6fdd7d9c273bb2a20ab467cb57067494f932fa3
diff --git a/trunk/fs/ioprio.c b/trunk/fs/ioprio.c
index 97e1f088ba00..d1c1f2b2c9da 100644
--- a/trunk/fs/ioprio.c
+++ b/trunk/fs/ioprio.c
@@ -62,6 +62,8 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
 
 			break;
 		case IOPRIO_CLASS_IDLE:
+			if (!capable(CAP_SYS_ADMIN))
+				return -EPERM;
 			break;
 		default:
 			return -EINVAL;