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;