diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-29 17:00:04 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-29 17:00:04 -0500 |
| commit | 356954e0178abd2f4a5f8bb6607cf55366b4a614 (patch) | |
| tree | 8eee346466cc6638ddc1f70d7564fce03fe1083d | |
| parent | 002d5959d615dbf7d14ed9fa0d267946dacdc4d5 (diff) | |
| download | rt-patches-356954e0178abd2f4a5f8bb6607cf55366b4a614.tar.gz | |
drop s390 part of more-semaphore_init-removals.patchv2.6.33-1451-gf91b22cv2.6.33-1443-g847f9c6v2.6.33-1418-g7981164
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | more-semaphore_init-removals.patch | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/more-semaphore_init-removals.patch b/more-semaphore_init-removals.patch index 0627112..807230e 100644 --- a/more-semaphore_init-removals.patch +++ b/more-semaphore_init-removals.patch @@ -1,4 +1,4 @@ -From c37b24a587ec84be6d6b73680e4a2f462b479aa6 Mon Sep 17 00:00:00 2001 +From 1fc4f64704743974340c753ed4e016cd8fed1a57 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Wed, 19 Jan 2011 22:17:23 -0500 Subject: [PATCH] more semaphore_init removals @@ -140,37 +140,6 @@ index 5bef6a9..a525eb8 100644 mq->thread = kthread_run(mmc_queue_thread, mq, "mmcqd"); if (IS_ERR(mq->thread)) { -diff --git a/drivers/s390/cio/crw.c b/drivers/s390/cio/crw.c -index dde3d10..2a932c5 100644 ---- a/drivers/s390/cio/crw.c -+++ b/drivers/s390/cio/crw.c -@@ -14,7 +14,7 @@ - #include <linux/init.h> - #include <asm/crw.h> - --static struct semaphore crw_semaphore; -+static DEFINE_SEMAPHORE(crw_semaphore, 0); - static DEFINE_MUTEX(crw_handler_mutex); - static crw_handler_t crw_handlers[NR_RSCS]; - -@@ -132,17 +132,6 @@ void crw_handle_channel_report(void) - } - - /* -- * Separate initcall needed for semaphore initialization since -- * crw_handle_channel_report might be called before crw_machine_check_init. -- */ --static int __init crw_init_semaphore(void) --{ -- semaphore_init_locked(&crw_semaphore); -- return 0; --} --pure_initcall(crw_init_semaphore); -- --/* - * Machine checks for the channel subsystem must be enabled - * after the channel subsystem is initialized - */ diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index d20cb67..d5e0bdb 100644 --- a/drivers/usb/misc/ftdi-elan.c @@ -185,5 +154,5 @@ index d20cb67..d5e0bdb 100644 ftdi->interface = interface; mutex_init(&ftdi->u132_lock); -- -1.7.1.1 +1.7.1 |