From 268ffc1cde5d9a5ba1a2e808859d4d304ed0a195 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 26 May 2010 14:43:44 -0700
Subject: [PATCH] --- yaml --- r: 198787 b: refs/heads/master c:
 4de85cd6d6018825e19f76f1208775f23ecc393f h: refs/heads/master i:   198785:
 af66caaafc408fe33f6cb9b8daac1311bda438db   198783:
 33c2bbbfc4734f0b0010c00a4b8e3a28341a36c8 v: v3

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

diff --git a/[refs] b/[refs]
index 2f7ce98f8280..e80afbf74acf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5cf6359ad1d322c16e159011247341849cc0d3a
+refs/heads/master: 4de85cd6d6018825e19f76f1208775f23ecc393f
diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c
index 5b33228db798..506c8491a8d1 100644
--- a/trunk/ipc/sem.c
+++ b/trunk/ipc/sem.c
@@ -1208,7 +1208,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)
 	/* step 1: figure out the size of the semaphore array */
 	sma = sem_lock_check(ns, semid);
 	if (IS_ERR(sma))
-		return ERR_PTR(PTR_ERR(sma));
+		return ERR_CAST(sma);
 
 	nsems = sma->sem_nsems;
 	sem_getref_and_unlock(sma);