diff options
author | David Howells <dhowells@redhat.com> | 2006-11-22 09:57:56 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2006-11-22 09:57:56 -0500 |
commit | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (patch) | |
tree | 1c4c89652c62a75da09f9b9442012007e4ac6250 /net/xfrm | |
parent | 65f27f38446e1976cc98fd3004b110fedcddd189 (diff) |
WorkStruct: make allyesconfig
Fix up for make allyesconfig.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 8 | ||||
-rw-r--r-- | net/xfrm/xfrm_state.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 7736b23c3f03..ba924d40df7d 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -358,7 +358,7 @@ static void xfrm_policy_gc_kill(struct xfrm_policy *policy) | |||
358 | xfrm_pol_put(policy); | 358 | xfrm_pol_put(policy); |
359 | } | 359 | } |
360 | 360 | ||
361 | static void xfrm_policy_gc_task(void *data) | 361 | static void xfrm_policy_gc_task(struct work_struct *work) |
362 | { | 362 | { |
363 | struct xfrm_policy *policy; | 363 | struct xfrm_policy *policy; |
364 | struct hlist_node *entry, *tmp; | 364 | struct hlist_node *entry, *tmp; |
@@ -546,7 +546,7 @@ static inline int xfrm_byidx_should_resize(int total) | |||
546 | 546 | ||
547 | static DEFINE_MUTEX(hash_resize_mutex); | 547 | static DEFINE_MUTEX(hash_resize_mutex); |
548 | 548 | ||
549 | static void xfrm_hash_resize(void *__unused) | 549 | static void xfrm_hash_resize(struct work_struct *__unused) |
550 | { | 550 | { |
551 | int dir, total; | 551 | int dir, total; |
552 | 552 | ||
@@ -563,7 +563,7 @@ static void xfrm_hash_resize(void *__unused) | |||
563 | mutex_unlock(&hash_resize_mutex); | 563 | mutex_unlock(&hash_resize_mutex); |
564 | } | 564 | } |
565 | 565 | ||
566 | static DECLARE_WORK(xfrm_hash_work, xfrm_hash_resize, NULL); | 566 | static DECLARE_WORK(xfrm_hash_work, xfrm_hash_resize); |
567 | 567 | ||
568 | /* Generate new index... KAME seems to generate them ordered by cost | 568 | /* Generate new index... KAME seems to generate them ordered by cost |
569 | * of an absolute inpredictability of ordering of rules. This will not pass. */ | 569 | * of an absolute inpredictability of ordering of rules. This will not pass. */ |
@@ -2080,7 +2080,7 @@ static void __init xfrm_policy_init(void) | |||
2080 | panic("XFRM: failed to allocate bydst hash\n"); | 2080 | panic("XFRM: failed to allocate bydst hash\n"); |
2081 | } | 2081 | } |
2082 | 2082 | ||
2083 | INIT_WORK(&xfrm_policy_gc_work, xfrm_policy_gc_task, NULL); | 2083 | INIT_WORK(&xfrm_policy_gc_work, xfrm_policy_gc_task); |
2084 | register_netdevice_notifier(&xfrm_dev_notifier); | 2084 | register_netdevice_notifier(&xfrm_dev_notifier); |
2085 | } | 2085 | } |
2086 | 2086 | ||
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 899de9ed22a6..40c527179843 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -115,7 +115,7 @@ static unsigned long xfrm_hash_new_size(void) | |||
115 | 115 | ||
116 | static DEFINE_MUTEX(hash_resize_mutex); | 116 | static DEFINE_MUTEX(hash_resize_mutex); |
117 | 117 | ||
118 | static void xfrm_hash_resize(void *__unused) | 118 | static void xfrm_hash_resize(struct work_struct *__unused) |
119 | { | 119 | { |
120 | struct hlist_head *ndst, *nsrc, *nspi, *odst, *osrc, *ospi; | 120 | struct hlist_head *ndst, *nsrc, *nspi, *odst, *osrc, *ospi; |
121 | unsigned long nsize, osize; | 121 | unsigned long nsize, osize; |
@@ -168,7 +168,7 @@ out_unlock: | |||
168 | mutex_unlock(&hash_resize_mutex); | 168 | mutex_unlock(&hash_resize_mutex); |
169 | } | 169 | } |
170 | 170 | ||
171 | static DECLARE_WORK(xfrm_hash_work, xfrm_hash_resize, NULL); | 171 | static DECLARE_WORK(xfrm_hash_work, xfrm_hash_resize); |
172 | 172 | ||
173 | DECLARE_WAIT_QUEUE_HEAD(km_waitq); | 173 | DECLARE_WAIT_QUEUE_HEAD(km_waitq); |
174 | EXPORT_SYMBOL(km_waitq); | 174 | EXPORT_SYMBOL(km_waitq); |
@@ -207,7 +207,7 @@ static void xfrm_state_gc_destroy(struct xfrm_state *x) | |||
207 | kfree(x); | 207 | kfree(x); |
208 | } | 208 | } |
209 | 209 | ||
210 | static void xfrm_state_gc_task(void *data) | 210 | static void xfrm_state_gc_task(struct work_struct *data) |
211 | { | 211 | { |
212 | struct xfrm_state *x; | 212 | struct xfrm_state *x; |
213 | struct hlist_node *entry, *tmp; | 213 | struct hlist_node *entry, *tmp; |
@@ -1568,6 +1568,6 @@ void __init xfrm_state_init(void) | |||
1568 | panic("XFRM: Cannot allocate bydst/bysrc/byspi hashes."); | 1568 | panic("XFRM: Cannot allocate bydst/bysrc/byspi hashes."); |
1569 | xfrm_state_hmask = ((sz / sizeof(struct hlist_head)) - 1); | 1569 | xfrm_state_hmask = ((sz / sizeof(struct hlist_head)) - 1); |
1570 | 1570 | ||
1571 | INIT_WORK(&xfrm_state_gc_work, xfrm_state_gc_task, NULL); | 1571 | INIT_WORK(&xfrm_state_gc_work, xfrm_state_gc_task); |
1572 | } | 1572 | } |
1573 | 1573 | ||