The patch titled
usbatm: Update to use the kthread api
has been removed from the -mm tree. Its filename was
usbatm-update-to-use-the-kthread-api.patch
This patch was dropped because it was nacked by the maintainer
------------------------------------------------------
Subject: usbatm: Update to use the kthread api
From: Eric W. Biederman <[EMAIL PROTECTED]>
During driver initialization if the driver has an expensive initialization
routine usbatm starts a separate kernel thread for it.
In the driver cleanup routine the code waits to ensure the initialization
routine has finished.
Switching to the kthread api allowed some of the thread management code to be
removed.
In addition the kill_proc(SIGTERM, ...) in usbatm_usb_disconnect was removed
because it was absolutely pointless. The kernel thread did not handle SIGTERM
or any pending signals, so despite marking the signal as pending it would
never have been handled.
Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
Cc: Greg KH <[EMAIL PROTECTED]>
Cc: Duncan Sands <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/usb/atm/usbatm.c | 24 ++++++------------------
drivers/usb/atm/usbatm.h | 2 --
2 files changed, 6 insertions(+), 20 deletions(-)
diff -puN drivers/usb/atm/usbatm.c~usbatm-update-to-use-the-kthread-api
drivers/usb/atm/usbatm.c
--- a/drivers/usb/atm/usbatm.c~usbatm-update-to-use-the-kthread-api
+++ a/drivers/usb/atm/usbatm.c
@@ -81,6 +81,7 @@
#include <linux/stat.h>
#include <linux/timer.h>
#include <linux/wait.h>
+#include <linux/kthread.h>
#ifdef VERBOSE_DEBUG
static int usbatm_print_packet(const unsigned char *data, int len);
@@ -999,35 +1000,26 @@ static int usbatm_do_heavy_init(void *ar
struct usbatm_data *instance = arg;
int ret;
- daemonize(instance->driver->driver_name);
- allow_signal(SIGTERM);
- instance->thread_pid = current->pid;
-
- complete(&instance->thread_started);
-
ret = instance->driver->heavy_init(instance, instance->usb_intf);
if (!ret)
ret = usbatm_atm_init(instance);
- mutex_lock(&instance->serialize);
- instance->thread_pid = -1;
- mutex_unlock(&instance->serialize);
complete_and_exit(&instance->thread_exited, ret);
}
static int usbatm_heavy_init(struct usbatm_data *instance)
{
- int ret = kernel_thread(usbatm_do_heavy_init, instance, CLONE_KERNEL);
-
- if (ret < 0) {
+ struct task_struct *thread;
+ thread = kthread_run(usbatm_do_heavy_init, instance,
+ instance->driver->driver_name);
+ if (IS_ERR(thread)) {
+ int ret = PTR_ERR(thread);
usb_err(instance, "%s: failed to create kernel_thread (%d)!\n",
__func__, ret);
return ret;
}
- wait_for_completion(&instance->thread_started);
-
return 0;
}
@@ -1109,8 +1101,6 @@ int usbatm_usb_probe(struct usb_interfac
kref_init(&instance->refcount); /* dropped in
usbatm_usb_disconnect */
mutex_init(&instance->serialize);
- instance->thread_pid = -1;
- init_completion(&instance->thread_started);
init_completion(&instance->thread_exited);
INIT_LIST_HEAD(&instance->vcc_list);
@@ -1272,8 +1262,6 @@ void usbatm_usb_disconnect(struct usb_in
mutex_lock(&instance->serialize);
instance->disconnected = 1;
- if (instance->thread_pid >= 0)
- kill_proc(instance->thread_pid, SIGTERM, 1);
mutex_unlock(&instance->serialize);
wait_for_completion(&instance->thread_exited);
diff -puN drivers/usb/atm/usbatm.h~usbatm-update-to-use-the-kthread-api
drivers/usb/atm/usbatm.h
--- a/drivers/usb/atm/usbatm.h~usbatm-update-to-use-the-kthread-api
+++ a/drivers/usb/atm/usbatm.h
@@ -176,8 +176,6 @@ struct usbatm_data {
int disconnected;
/* heavy init */
- int thread_pid;
- struct completion thread_started;
struct completion thread_exited;
/* ATM device */
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
kthread-api-conversion-for-dvb_frontend-and-av7110.patch
usbatm-update-to-use-the-kthread-api.patch
genapic-optimize-fix-apic-mode-setup-2.patch
genapic-always-use-physical-delivery-mode-on-8-cpus.patch
genapic-remove-es7000-workaround.patch
genapic-remove-clustered-apic-mode.patch
genapic-default-to-physical-mode-on-hotplug-cpu-kernels.patch
vt-refactor-console-sak-processing.patch
sysctl_ms_jiffies-fix-oldlen-semantics.patch
9p-use-kthread_stop-instead-of-sending-a-sigkill.patch
tty-make-__proc_set_tty-static.patch
tty-clarify-disassociate_ctty.patch
tty-fix-the-locking-for-signal-session-in-disassociate_ctty.patch
signal-use-kill_pgrp-not-kill_pg-in-the-sunos-compatibility-code.patch
signal-rewrite-kill_something_info-so-it-uses-newer-helpers.patch
pid-make-session_of_pgrp-use-struct-pid-instead-of-pid_t.patch
pid-use-struct-pid-for-talking-about-process-groups-in-exitc.patch
pid-replace-is_orphaned_pgrp-with-is_current_pgrp_orphaned.patch
tty-update-the-tty-layer-to-work-with-struct-pid.patch
pid-replace-do-while_each_task_pid-with-do-while_each_pid_task.patch
pid-remove-now-unused-do_each_task_pid-and-while_each_task_pid.patch
pid-remove-the-now-unused-kill_pg-kill_pg_info-and-__kill_pg_info.patch
i386-apic-clean-up-the-apic-code.patch
i386-apic-rework-and-fix-local-apic-calibration.patch
dynticks-i386-prepare-nmi-watchdog.patch
sched2-sched-domain-sysctl-use-ctl_unnumbered.patch
mm-implement-swap-prefetching-use-ctl_unnumbered.patch
readahead-sysctl-parameters-use-ctl_unnumbered.patch
pidhash-temporary-debug-checks.patch
vdso-print-fatal-signals-use-ctl_unnumbered.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
