diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
| commit | 34161db6b14d984fb9b06c735b7b42f8803f6851 (patch) | |
| tree | 99656278b6697f1cde5b05894b7c0ee22c63a00e /arch/s390/appldata/appldata_base.c | |
| parent | 5847e1f4d058677c5e46dc6c3e3c70e8855ea3ba (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Conflicts:
include/linux/sunrpc/xprt.h
net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
Diffstat (limited to 'arch/s390/appldata/appldata_base.c')
| -rw-r--r-- | arch/s390/appldata/appldata_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index af1e8fc7d985..67d5cf9cba83 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c | |||
| @@ -92,8 +92,8 @@ static int appldata_timer_active; | |||
| 92 | * Work queue | 92 | * Work queue |
| 93 | */ | 93 | */ |
| 94 | static struct workqueue_struct *appldata_wq; | 94 | static struct workqueue_struct *appldata_wq; |
| 95 | static void appldata_work_fn(void *data); | 95 | static void appldata_work_fn(struct work_struct *work); |
| 96 | static DECLARE_WORK(appldata_work, appldata_work_fn, NULL); | 96 | static DECLARE_WORK(appldata_work, appldata_work_fn); |
| 97 | 97 | ||
| 98 | 98 | ||
| 99 | /* | 99 | /* |
| @@ -125,7 +125,7 @@ static void appldata_timer_function(unsigned long data) | |||
| 125 | * | 125 | * |
| 126 | * call data gathering function for each (active) module | 126 | * call data gathering function for each (active) module |
| 127 | */ | 127 | */ |
| 128 | static void appldata_work_fn(void *data) | 128 | static void appldata_work_fn(struct work_struct *work) |
| 129 | { | 129 | { |
| 130 | struct list_head *lh; | 130 | struct list_head *lh; |
| 131 | struct appldata_ops *ops; | 131 | struct appldata_ops *ops; |