The patch titled
remove kernel/kthread.c:kthread_stop_sem()
has been added to the -mm tree. Its filename is
remove-kernel-kthreadckthread_stop_sem.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: remove kernel/kthread.c:kthread_stop_sem()
From: Adrian Bunk <bunk@xxxxxxxxx>
Remove the now-unneeded kthread_stop_sem().
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/kthread.h | 1 -
kernel/kthread.c | 24 ++----------------------
2 files changed, 2 insertions(+), 23 deletions(-)
diff -puN include/linux/kthread.h~remove-kernel-kthreadckthread_stop_sem include/linux/kthread.h
--- a/include/linux/kthread.h~remove-kernel-kthreadckthread_stop_sem
+++ a/include/linux/kthread.h
@@ -28,7 +28,6 @@ struct task_struct *kthread_create(int (
void kthread_bind(struct task_struct *k, unsigned int cpu);
int kthread_stop(struct task_struct *k);
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s);
int kthread_should_stop(void);
#endif /* _LINUX_KTHREAD_H */
diff -puN kernel/kthread.c~remove-kernel-kthreadckthread_stop_sem kernel/kthread.c
--- a/kernel/kthread.c~remove-kernel-kthreadckthread_stop_sem
+++ a/kernel/kthread.c
@@ -216,23 +216,6 @@ EXPORT_SYMBOL(kthread_bind);
*/
int kthread_stop(struct task_struct *k)
{
- return kthread_stop_sem(k, NULL);
-}
-EXPORT_SYMBOL(kthread_stop);
-
-/**
- * kthread_stop_sem - stop a thread created by kthread_create().
- * @k: thread created by kthread_create().
- * @s: semaphore that @k waits on while idle.
- *
- * Does essentially the same thing as kthread_stop() above, but wakes
- * @k by calling up(@s).
- *
- * Returns the result of threadfn(), or %-EINTR if wake_up_process()
- * was never called.
- */
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
-{
int ret;
mutex_lock(&kthread_stop_lock);
@@ -246,10 +229,7 @@ int kthread_stop_sem(struct task_struct
/* Now set kthread_should_stop() to true, and wake it up. */
kthread_stop_info.k = k;
- if (s)
- up(s);
- else
- wake_up_process(k);
+ wake_up_process(k);
put_task_struct(k);
/* Once it dies, reset stop ptr, gather result and we're done. */
@@ -260,7 +240,7 @@ int kthread_stop_sem(struct task_struct
return ret;
}
-EXPORT_SYMBOL(kthread_stop_sem);
+EXPORT_SYMBOL(kthread_stop);
static __init int helper_init(void)
{
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
kernel-printkc-export_symbol_unused.patch
mm-bootmemc-export_unused_symbol.patch
mm-memoryc-export_unused_symbol.patch
mm-mmzonec-export_unused_symbol.patch
fs-read_writec-export_unused_symbol.patch
kernel-softirqc-export_unused_symbol.patch
git-alsa.patch
git-gfs2.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
make-variables-static-after-klibc-merge.patch
git-libata-all.patch
drivers-net-e1000-possible-cleanups.patch
fs-nfs-make-2-functions-static.patch
fs-nfs-make-code-static.patch
git-pcmcia.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-arcmsr-cleanups.patch
mm-make-functions-static.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch
reiserfs-warn-about-the-useless-nolargeio-option.patch
remove-kernel-kthreadckthread_stop_sem.patch
task-watchers-register-semundo-task-watcher.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-implement-clone_newuts-flag.patch
fs-reiser4-possible-cleanups.patch
the-scheduled-removal-of-some-oss-drivers.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
