From 931dd771d7d78a14ba6d2d74a46328907a04fd14 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 25 May 2012 11:39:13 +0100
Subject: [PATCH] --- yaml --- r: 310029 b: refs/heads/master c:
 46ce341b2f176c2611f12ac390adf862e932eb02 h: refs/heads/master i:   310027:
 e2eb2402d9284e05317d36619304d6a2f4ad5fb6 v: v3

---
 [refs]          | 2 +-
 trunk/fs/pipe.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c7672b529c0c..a7ac7642e718 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f50fff4dace23d3cfeb195d5cd4ee813cee68b7
+refs/heads/master: 46ce341b2f176c2611f12ac390adf862e932eb02
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
index fec5e4ad071a..95ebb56de494 100644
--- a/trunk/fs/pipe.c
+++ b/trunk/fs/pipe.c
@@ -693,7 +693,7 @@ static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
 			return put_user(count, (int __user *)arg);
 		default:
-			return -EINVAL;
+			return -ENOIOCTLCMD;
 	}
 }