| From bba0a0f1b10708f2d4a10ae2be7575eab6267dcc Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun, 17 Jul 2011 21:25:03 +0200 |
| Subject: [PATCH 052/274] locking-various-init-fixes.patch |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| drivers/char/random.c | 6 +++--- |
| drivers/usb/gadget/ci13xxx_udc.c | 2 +- |
| fs/file.c | 2 +- |
| include/linux/idr.h | 2 +- |
| kernel/cred.c | 2 +- |
| 5 files changed, 7 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/char/random.c b/drivers/char/random.c |
| index b4f6af6..feae549 100644 |
| --- a/drivers/char/random.c |
| +++ b/drivers/char/random.c |
| @@ -448,7 +448,7 @@ static struct entropy_store input_pool = { |
| .poolinfo = &poolinfo_table[0], |
| .name = "input", |
| .limit = 1, |
| - .lock = __SPIN_LOCK_UNLOCKED(&input_pool.lock), |
| + .lock = __SPIN_LOCK_UNLOCKED(input_pool.lock), |
| .pool = input_pool_data |
| }; |
| |
| @@ -457,7 +457,7 @@ static struct entropy_store blocking_pool = { |
| .name = "blocking", |
| .limit = 1, |
| .pull = &input_pool, |
| - .lock = __SPIN_LOCK_UNLOCKED(&blocking_pool.lock), |
| + .lock = __SPIN_LOCK_UNLOCKED(blocking_pool.lock), |
| .pool = blocking_pool_data |
| }; |
| |
| @@ -465,7 +465,7 @@ static struct entropy_store nonblocking_pool = { |
| .poolinfo = &poolinfo_table[1], |
| .name = "nonblocking", |
| .pull = &input_pool, |
| - .lock = __SPIN_LOCK_UNLOCKED(&nonblocking_pool.lock), |
| + .lock = __SPIN_LOCK_UNLOCKED(nonblocking_pool.lock), |
| .pool = nonblocking_pool_data |
| }; |
| |
| diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c |
| index 243ef1a..238372e 100644 |
| --- a/drivers/usb/gadget/ci13xxx_udc.c |
| +++ b/drivers/usb/gadget/ci13xxx_udc.c |
| @@ -834,7 +834,7 @@ static struct { |
| } dbg_data = { |
| .idx = 0, |
| .tty = 0, |
| - .lck = __RW_LOCK_UNLOCKED(lck) |
| + .lck = __RW_LOCK_UNLOCKED(dbg_data.lck) |
| }; |
| |
| /** |
| diff --git a/fs/file.c b/fs/file.c |
| index ba3f605..6f176f5 100644 |
| --- a/fs/file.c |
| +++ b/fs/file.c |
| @@ -421,7 +421,7 @@ struct files_struct init_files = { |
| .close_on_exec = init_files.close_on_exec_init, |
| .open_fds = init_files.open_fds_init, |
| }, |
| - .file_lock = __SPIN_LOCK_UNLOCKED(init_task.file_lock), |
| + .file_lock = __SPIN_LOCK_UNLOCKED(init_files.file_lock), |
| }; |
| |
| /* |
| diff --git a/include/linux/idr.h b/include/linux/idr.h |
| index 255491c..4eaacf0 100644 |
| --- a/include/linux/idr.h |
| +++ b/include/linux/idr.h |
| @@ -136,7 +136,7 @@ struct ida { |
| struct ida_bitmap *free_bitmap; |
| }; |
| |
| -#define IDA_INIT(name) { .idr = IDR_INIT(name), .free_bitmap = NULL, } |
| +#define IDA_INIT(name) { .idr = IDR_INIT((name).idr), .free_bitmap = NULL, } |
| #define DEFINE_IDA(name) struct ida name = IDA_INIT(name) |
| |
| int ida_pre_get(struct ida *ida, gfp_t gfp_mask); |
| diff --git a/kernel/cred.c b/kernel/cred.c |
| index e70683d..fed7c3f 100644 |
| --- a/kernel/cred.c |
| +++ b/kernel/cred.c |
| @@ -36,7 +36,7 @@ static struct kmem_cache *cred_jar; |
| static struct thread_group_cred init_tgcred = { |
| .usage = ATOMIC_INIT(2), |
| .tgid = 0, |
| - .lock = __SPIN_LOCK_UNLOCKED(init_cred.tgcred.lock), |
| + .lock = __SPIN_LOCK_UNLOCKED(init_tgcred.lock), |
| }; |
| #endif |
| |
| -- |
| 1.7.10.4 |
| |