From 15590b1f298d88cdbd10bb225098e83cea21d256 Mon Sep 17 00:00:00 2001 From: Thomas Meyer Date: Thu, 17 Nov 2011 23:43:40 +0100 Subject: [PATCH] --- yaml --- r: 279755 b: refs/heads/master c: b82a3ecdc54465c792326522d804d2eebaae9a23 h: refs/heads/master i: 279753: b7c33d5ab68c1b782fa2660cf7d627a0ef7dd7d3 279751: 8e08cffd5f1550b3a487562b61c1c7c450be6876 v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/irq.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f855403d7cb7..ac5e3d2a2559 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac0d1a48d8b18c4808ab73d990b83bb032f21c25 +refs/heads/master: b82a3ecdc54465c792326522d804d2eebaae9a23 diff --git a/trunk/arch/ia64/sn/kernel/irq.c b/trunk/arch/ia64/sn/kernel/irq.c index 485c42d97e83..dfac09ab027a 100644 --- a/trunk/arch/ia64/sn/kernel/irq.c +++ b/trunk/arch/ia64/sn/kernel/irq.c @@ -150,12 +150,11 @@ struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info, * PROM does not support SAL_INTR_REDIRECT, or it failed. * Revert to old method. */ - new_irq_info = kmalloc(sizeof(struct sn_irq_info), GFP_ATOMIC); + new_irq_info = kmemdup(sn_irq_info, sizeof(struct sn_irq_info), + GFP_ATOMIC); if (new_irq_info == NULL) return NULL; - memcpy(new_irq_info, sn_irq_info, sizeof(struct sn_irq_info)); - /* Free the old PROM new_irq_info structure */ sn_intr_free(local_nasid, local_widget, new_irq_info); unregister_intr_pda(new_irq_info);