| commit | 7cf712db6087342e5e7e259d3883a7b5ac3212d1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Feb 10 12:03:57 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Feb 10 12:03:57 2008 -0800 |
| tree | 8f60eb59c29b81dafdc60ad5e04e957fc8f3cdee | |
| parent | 58a14ee9c49aa2b9742c56a0477666335368e05e [diff] | |
| parent | 30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [PKT_SCHED] ematch: Fix build warning.
diff --git a/net/sched/ematch.c b/net/sched/ematch.c index b29439d..5e6f82e 100644 --- a/net/sched/ematch.c +++ b/net/sched/ematch.c
@@ -410,7 +410,7 @@ if (em->ops->destroy) em->ops->destroy(tp, em); else if (!tcf_em_is_simple(em)) - kfree(em->data); + kfree((void *) em->data); module_put(em->ops->owner); } }