lkml.org 
[lkml]   [2005]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/3] sh64: remove cli()/sti() in arch/sh64/mach-cayman/irq.c
Date
Signed-off-by: James Nelson <james4765@gmail.com>

diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/sh64/mach-cayman/irq.c linux-2.6.10-mm1/arch/sh64/mach-cayman/irq.c
--- linux-2.6.10-mm1-original/arch/sh64/mach-cayman/irq.c 2004-12-24 16:35:40.000000000 -0500
+++ linux-2.6.10-mm1/arch/sh64/mach-cayman/irq.c 2005-01-04 21:07:39.756694978 -0500
@@ -64,11 +64,11 @@
irq -= START_EXT_IRQS;
reg = EPLD_MASK_BASE + ((irq / 8) << 2);
bit = 1<<(irq % 8);
- save_and_cli(flags);
+ local_irq_save(flags);
mask = ctrl_inl(reg);
mask |= bit;
ctrl_outl(mask, reg);
- restore_flags(flags);
+ local_irq_restore(flags);
}

void disable_cayman_irq(unsigned int irq)
@@ -81,11 +81,11 @@
irq -= START_EXT_IRQS;
reg = EPLD_MASK_BASE + ((irq / 8) << 2);
bit = 1<<(irq % 8);
- save_and_cli(flags);
+ local_irq_save(flags);
mask = ctrl_inl(reg);
mask &= ~bit;
ctrl_outl(mask, reg);
- restore_flags(flags);
+ local_irq_restore(flags);
}

static void ack_cayman_irq(unsigned int irq)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:09    [W:0.161 / U:0.228 seconds]
©2003-2014 Jasper Spaans. Advertise on this site