From 22e259d6b2be1210889e2a770fa267fd9df830e8 Mon Sep 17 00:00:00 2001
From: Manfred Spraul <manfred@colorfullife.com>
Date: Wed, 2 Nov 2011 13:38:56 -0700
Subject: [PATCH] --- yaml --- r: 273255 b: refs/heads/master c:
 f567a18590742b811287b7512fb0908deac4eef7 h: refs/heads/master i:   273253:
 9f3025bacf783e3b18bd88855a4e2683487fd9bf   273251:
 5b86a72d6a73a11b26becfd118f4a35b006791e0   273247:
 3772410e69a4b590b540c14ac65d103eced428e3 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/sem.h | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6603d24edbab..74fe04655f86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e57940d719e9fc5223d133b631f8cb5232d6064e
+refs/heads/master: f567a18590742b811287b7512fb0908deac4eef7
diff --git a/trunk/include/linux/sem.h b/trunk/include/linux/sem.h
index 464842621a4a..10d6b226afc5 100644
--- a/trunk/include/linux/sem.h
+++ b/trunk/include/linux/sem.h
@@ -96,16 +96,21 @@ struct sem_array {
 	int			complex_count;	/* pending complex operations */
 };
 
+#ifdef CONFIG_SYSVIPC
+
 struct sysv_sem {
 	struct sem_undo_list *undo_list;
 };
 
-#ifdef CONFIG_SYSVIPC
-
 extern int copy_semundo(unsigned long clone_flags, struct task_struct *tsk);
 extern void exit_sem(struct task_struct *tsk);
 
 #else
+
+struct sysv_sem {
+	/* empty */
+};
+
 static inline int copy_semundo(unsigned long clone_flags, struct task_struct *tsk)
 {
 	return 0;