From aec744cf9c3a20b760ccf6ce0f103858e9376b8d Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 27 Aug 2007 00:29:11 +0100 Subject: [PATCH] --- yaml --- r: 64525 b: refs/heads/master c: 52625caaee4930995ab25e0855713a7a2dd89151 h: refs/heads/master i: 64523: f0afd94d3f76c7825ca94a9d26b94ed7f1db7977 v: v3 --- [refs] | 2 +- trunk/arch/mips/sgi-ip27/ip27-irq.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aff4170cd1ab..01316697417c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84ced30675b1454f1c2dca1fe055ae75eb1df53e +refs/heads/master: 52625caaee4930995ab25e0855713a7a2dd89151 diff --git a/trunk/arch/mips/sgi-ip27/ip27-irq.c b/trunk/arch/mips/sgi-ip27/ip27-irq.c index 5cfbe1a1479c..856649cf9f1e 100644 --- a/trunk/arch/mips/sgi-ip27/ip27-irq.c +++ b/trunk/arch/mips/sgi-ip27/ip27-irq.c @@ -207,11 +207,9 @@ static int intr_connect_level(int cpu, int bit) { nasid_t nasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu)); struct slice_data *si = cpu_data[cpu].data; - unsigned long flags; set_bit(bit, si->irq_enable_mask); - local_irq_save(flags); if (!cputoslice(cpu)) { REMOTE_HUB_S(nasid, PI_INT_MASK0_A, si->irq_enable_mask[0]); REMOTE_HUB_S(nasid, PI_INT_MASK1_A, si->irq_enable_mask[1]); @@ -219,7 +217,6 @@ static int intr_connect_level(int cpu, int bit) REMOTE_HUB_S(nasid, PI_INT_MASK0_B, si->irq_enable_mask[0]); REMOTE_HUB_S(nasid, PI_INT_MASK1_B, si->irq_enable_mask[1]); } - local_irq_restore(flags); return 0; }