| From 5e68b4b2a6a2e6b151a7c6fdd87080fc52111a83 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 16 Jan 2011 21:09:44 -0500 |
| Subject: [PATCH] hp_sdc: init_MUTEX_LOCKED --> sema_init |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c |
| index 997f9b6..8c0b51c 100644 |
| --- a/drivers/input/serio/hp_sdc.c |
| +++ b/drivers/input/serio/hp_sdc.c |
| @@ -905,7 +905,7 @@ static int __init hp_sdc_init(void) |
| ts_sync[1] = 0x0f; |
| ts_sync[2] = ts_sync[3] = ts_sync[4] = ts_sync[5] = 0; |
| t_sync.act.semaphore = &s_sync; |
| - init_MUTEX_LOCKED(&s_sync); |
| + sema_init(&s_sync, 0); |
| hp_sdc_enqueue_transaction(&t_sync); |
| down(&s_sync); /* Wait for t_sync to complete */ |
| |
| -- |
| 1.7.1.1 |
| |
