On Sun, 28 Oct 2007, Ralf Baechle wrote:
> The timer code always calls the clock_event_device set_net_event and
> set_mode methods with interrupts disabled, so no need to use
> spin_lock_irqsave / spin_unlock_irqrestore for those.
Good point,
Acked-by:Thomas Gleixner <[email protected]>
> diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c
> index 5d9830d..1b54674 100644
> --- a/arch/mips/kernel/i8253.c
> +++ b/arch/mips/kernel/i8253.c
> @@ -23,9 +23,7 @@ static DEFINE_SPINLOCK(i8253_lock);
> static void init_pit_timer(enum clock_event_mode mode,
> struct clock_event_device *evt)
> {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&i8253_lock, flags);
> + spin_lock(&i8253_lock);
>
> switch(mode) {
> case CLOCK_EVT_MODE_PERIODIC:
> @@ -54,7 +52,7 @@ static void init_pit_timer(enum clock_event_mode mode,
> /* Nothing to do here */
> break;
> }
> - spin_unlock_irqrestore(&i8253_lock, flags);
> + spin_unlock(&i8253_lock);
> }
>
> /*
> @@ -64,12 +62,10 @@ static void init_pit_timer(enum clock_event_mode mode,
> */
> static int pit_next_event(unsigned long delta, struct clock_event_device *evt)
> {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&i8253_lock, flags);
> + spin_lock(&i8253_lock);
> outb_p(delta & 0xff , PIT_CH0); /* LSB */
> outb(delta >> 8 , PIT_CH0); /* MSB */
> - spin_unlock_irqrestore(&i8253_lock, flags);
> + spin_unlock(&i8253_lock);
>
> return 0;
> }
> diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
> index a42c807..5246515 100644
> --- a/arch/x86/kernel/i8253.c
> +++ b/arch/x86/kernel/i8253.c
> @@ -31,9 +31,7 @@ struct clock_event_device *global_clock_event;
> static void init_pit_timer(enum clock_event_mode mode,
> struct clock_event_device *evt)
> {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&i8253_lock, flags);
> + spin_lock(&i8253_lock);
>
> switch(mode) {
> case CLOCK_EVT_MODE_PERIODIC:
> @@ -62,7 +60,7 @@ static void init_pit_timer(enum clock_event_mode mode,
> /* Nothing to do here */
> break;
> }
> - spin_unlock_irqrestore(&i8253_lock, flags);
> + spin_unlock(&i8253_lock);
> }
>
> /*
> @@ -72,12 +70,10 @@ static void init_pit_timer(enum clock_event_mode mode,
> */
> static int pit_next_event(unsigned long delta, struct clock_event_device *evt)
> {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&i8253_lock, flags);
> + spin_lock(&i8253_lock);
> outb_p(delta & 0xff , PIT_CH0); /* LSB */
> outb(delta >> 8 , PIT_CH0); /* MSB */
> - spin_unlock_irqrestore(&i8253_lock, flags);
> + spin_unlock(&i8253_lock);
>
> return 0;
> }
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]