From 4bd090869a69c86ba320a9b4dc767a211c06cfcd Mon Sep 17 00:00:00 2001 From: Pekka J Enberg Date: Wed, 27 Sep 2006 01:51:03 -0700 Subject: [PATCH] --- yaml --- r: 36207 b: refs/heads/master c: 571817849c76aabf34d534c905b5e604f2e824c5 h: refs/heads/master i: 36205: 7b7c2c3c8e10ccfb25ce6c5a83b682d3fc30872e 36203: 9a88fae5ebc2872e7f7360a74591c318a025ce13 36199: 107ee6ec340efbbcb4b19af7677e873b25c17c10 36191: 916781ad7b63e960ca7f294da3a2b0c3ef9105db v: v3 --- [refs] | 2 +- trunk/drivers/pci/msi.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 8188ee6ed285..3177571f0572 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7583ddfd3aae1007bc4fc67ea4c07d573d376e9e +refs/heads/master: 571817849c76aabf34d534c905b5e604f2e824c5 diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c index 008235947aa4..27a057409eca 100644 --- a/trunk/drivers/pci/msi.c +++ b/trunk/drivers/pci/msi.c @@ -45,16 +45,10 @@ msi_register(struct msi_ops *ops) return 0; } -static void msi_cache_ctor(void *p, kmem_cache_t *cache, unsigned long flags) -{ - memset(p, 0, sizeof(struct msi_desc)); -} - static int msi_cache_init(void) { - msi_cachep = kmem_cache_create("msi_cache", - sizeof(struct msi_desc), - 0, SLAB_HWCACHE_ALIGN, msi_cache_ctor, NULL); + msi_cachep = kmem_cache_create("msi_cache", sizeof(struct msi_desc), + 0, SLAB_HWCACHE_ALIGN, NULL, NULL); if (!msi_cachep) return -ENOMEM; @@ -402,11 +396,10 @@ static struct msi_desc* alloc_msi_entry(void) { struct msi_desc *entry; - entry = kmem_cache_alloc(msi_cachep, SLAB_KERNEL); + entry = kmem_cache_zalloc(msi_cachep, GFP_KERNEL); if (!entry) return NULL; - memset(entry, 0, sizeof(struct msi_desc)); entry->link.tail = entry->link.head = 0; /* single message */ entry->dev = NULL;