On Wed, Jun 21, 2006 at 03:48:57AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.17-rc6-mm2:
>...
> +task-watchers-register-semundo-task-watcher.patch
>...
> API for registering against task lifecycle events.
>...
exit_sem() can now become static.
Signed-off-by: Adrian Bunk <[email protected]>
---
include/linux/sem.h | 5 -----
ipc/sem.c | 3 ++-
2 files changed, 2 insertions(+), 6 deletions(-)
--- linux-2.6.17-mm1-full/include/linux/sem.h.old 2006-06-22 17:10:52.000000000 +0200
+++ linux-2.6.17-mm1-full/include/linux/sem.h 2006-06-22 17:11:02.000000000 +0200
@@ -141,7 +141,6 @@
#ifdef CONFIG_SYSVIPC
extern int copy_semundo(unsigned long clone_flags, struct task_struct *tsk);
-extern void exit_sem(struct task_struct *tsk);
#else
static inline int copy_semundo(unsigned long clone_flags, struct task_struct *tsk)
@@ -149,10 +148,6 @@
return 0;
}
-static inline void exit_sem(struct task_struct *tsk)
-{
- return;
-}
#endif
#endif /* __KERNEL__ */
--- linux-2.6.17-mm1-full/ipc/sem.c.old 2006-06-22 17:11:17.000000000 +0200
+++ linux-2.6.17-mm1-full/ipc/sem.c 2006-06-22 17:12:16.000000000 +0200
@@ -103,6 +103,7 @@
static int newary (struct ipc_namespace *, key_t, int, int);
static void freeary (struct ipc_namespace *ns, struct sem_array *sma, int id);
+static void exit_sem(struct task_struct *tsk);
#ifdef CONFIG_PROC_FS
static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
#endif
@@ -1350,7 +1351,7 @@
* The current implementation does not do so. The POSIX standard
* and SVID should be consulted to determine what behavior is mandated.
*/
-void exit_sem(struct task_struct *tsk)
+static void exit_sem(struct task_struct *tsk)
{
struct sem_undo_list *undo_list;
struct sem_undo *u, **up;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]