diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-06 14:18:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 17:51:14 -0500 |
commit | 4927b3f74c6a2fd92226dcf1542a598be9738808 (patch) | |
tree | aee712f33f32a6dc992434773fd0de41e335078e /drivers/s390/net/qeth_main.c | |
parent | f9e9dcb38f5106fa8cdac04a9e967d5487f1cd20 (diff) |
[PATCH] More work_struct induced breakage (s390)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390/net/qeth_main.c')
-rw-r--r-- | drivers/s390/net/qeth_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 7fdc5272c446..2bde4f1fb9c2 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
@@ -1039,8 +1039,9 @@ qeth_do_start_thread(struct qeth_card *card, unsigned long thread) | |||
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | static void | 1041 | static void |
1042 | qeth_start_kernel_thread(struct qeth_card *card) | 1042 | qeth_start_kernel_thread(struct work_struct *work) |
1043 | { | 1043 | { |
1044 | struct qeth_card *card = container_of(work, struct qeth_card, kernel_thread_starter); | ||
1044 | QETH_DBF_TEXT(trace , 2, "strthrd"); | 1045 | QETH_DBF_TEXT(trace , 2, "strthrd"); |
1045 | 1046 | ||
1046 | if (card->read.state != CH_STATE_UP && | 1047 | if (card->read.state != CH_STATE_UP && |
@@ -1103,8 +1104,7 @@ qeth_setup_card(struct qeth_card *card) | |||
1103 | card->thread_start_mask = 0; | 1104 | card->thread_start_mask = 0; |
1104 | card->thread_allowed_mask = 0; | 1105 | card->thread_allowed_mask = 0; |
1105 | card->thread_running_mask = 0; | 1106 | card->thread_running_mask = 0; |
1106 | INIT_WORK(&card->kernel_thread_starter, | 1107 | INIT_WORK(&card->kernel_thread_starter, qeth_start_kernel_thread); |
1107 | (void *)qeth_start_kernel_thread,card); | ||
1108 | INIT_LIST_HEAD(&card->ip_list); | 1108 | INIT_LIST_HEAD(&card->ip_list); |
1109 | card->ip_tbd_list = kmalloc(sizeof(struct list_head), GFP_KERNEL); | 1109 | card->ip_tbd_list = kmalloc(sizeof(struct list_head), GFP_KERNEL); |
1110 | if (!card->ip_tbd_list) { | 1110 | if (!card->ip_tbd_list) { |