Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1014cfe2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-locking-for-linus' of... 

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Reduce stack_trace usage
  lockdep: No need to disable preemption in debug atomic ops
  lockdep: Actually _dec_ in debug_atomic_dec
  lockdep: Provide off case for redundant_hardirqs_on increment
  lockdep: Simplify debug atomic ops
  lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
  lockstat: Make lockstat counting per cpu
  i8253: Convert i8253_lock to raw_spinlock
parents 8123d8f1 4726f2a6

arch/mips/include/asm/i8253.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#define PIT_CH0			0x40

#define PIT_CH2			0x42



extern spinlock_t i8253_lock;

extern raw_spinlock_t i8253_lock;



extern void setup_pit_timer(void);

arch/mips/kernel/i8253.c

+7 −7
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <asm/io.h>

#include <asm/time.h>



DEFINE_SPINLOCK(i8253_lock);

DEFINE_RAW_SPINLOCK(i8253_lock);

EXPORT_SYMBOL(i8253_lock);



/*
@@ -26,7 +26,7 @@ EXPORT_SYMBOL(i8253_lock); 
static void init_pit_timer(enum clock_event_mode mode,

			   struct clock_event_device *evt)

{

	spin_lock(&i8253_lock);

	raw_spin_lock(&i8253_lock);



	switch(mode) {

	case CLOCK_EVT_MODE_PERIODIC:
@@ -55,7 +55,7 @@ static void init_pit_timer(enum clock_event_mode mode, 
		/* Nothing to do here */

		break;

	}

	spin_unlock(&i8253_lock);

	raw_spin_unlock(&i8253_lock);

}



/*
@@ -65,10 +65,10 @@ static void init_pit_timer(enum clock_event_mode mode, 
 */

static int pit_next_event(unsigned long delta, struct clock_event_device *evt)

{

	spin_lock(&i8253_lock);

	raw_spin_lock(&i8253_lock);

	outb_p(delta & 0xff , PIT_CH0);	/* LSB */

	outb(delta >> 8 , PIT_CH0);	/* MSB */

	spin_unlock(&i8253_lock);

	raw_spin_unlock(&i8253_lock);



	return 0;

}
@@ -137,7 +137,7 @@ static cycle_t pit_read(struct clocksource *cs) 
	static int old_count;

	static u32 old_jifs;



	spin_lock_irqsave(&i8253_lock, flags);

	raw_spin_lock_irqsave(&i8253_lock, flags);

	/*

	 * Although our caller may have the read side of xtime_lock,

	 * this is now a seqlock, and we are cheating in this routine
@@ -183,7 +183,7 @@ static cycle_t pit_read(struct clocksource *cs) 
	old_count = count;

	old_jifs = jifs;



	spin_unlock_irqrestore(&i8253_lock, flags);

	raw_spin_unlock_irqrestore(&i8253_lock, flags);



	count = (LATCH - 1) - count;

arch/x86/include/asm/i8253.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#define PIT_CH0			0x40

#define PIT_CH2			0x42



extern spinlock_t i8253_lock;

extern raw_spinlock_t i8253_lock;



extern struct clock_event_device *global_clock_event;

arch/x86/kernel/apm_32.c

+2 −2
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static void reinit_timer(void) 
#ifdef INIT_TIMER_AFTER_SUSPEND

	unsigned long flags;



	spin_lock_irqsave(&i8253_lock, flags);

	raw_spin_lock_irqsave(&i8253_lock, flags);

	/* set the clock to HZ */

	outb_pit(0x34, PIT_MODE);		/* binary, mode 2, LSB/MSB, ch 0 */

	udelay(10);
@@ -1232,7 +1232,7 @@ static void reinit_timer(void) 
	udelay(10);

	outb_pit(LATCH >> 8, PIT_CH0);	/* MSB */

	udelay(10);

	spin_unlock_irqrestore(&i8253_lock, flags);

	raw_spin_unlock_irqrestore(&i8253_lock, flags);

#endif

}

arch/x86/kernel/i8253.c

+7 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <asm/hpet.h>

#include <asm/smp.h>



DEFINE_SPINLOCK(i8253_lock);

DEFINE_RAW_SPINLOCK(i8253_lock);

EXPORT_SYMBOL(i8253_lock);



/*
@@ -33,7 +33,7 @@ struct clock_event_device *global_clock_event; 
static void init_pit_timer(enum clock_event_mode mode,

			   struct clock_event_device *evt)

{

	spin_lock(&i8253_lock);

	raw_spin_lock(&i8253_lock);



	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:
@@ -62,7 +62,7 @@ static void init_pit_timer(enum clock_event_mode mode, 
		/* Nothing to do here */

		break;

	}

	spin_unlock(&i8253_lock);

	raw_spin_unlock(&i8253_lock);

}



/*
@@ -72,10 +72,10 @@ static void init_pit_timer(enum clock_event_mode mode, 
 */

static int pit_next_event(unsigned long delta, struct clock_event_device *evt)

{

	spin_lock(&i8253_lock);

	raw_spin_lock(&i8253_lock);

	outb_pit(delta & 0xff , PIT_CH0);	/* LSB */

	outb_pit(delta >> 8 , PIT_CH0);		/* MSB */

	spin_unlock(&i8253_lock);

	raw_spin_unlock(&i8253_lock);



	return 0;

}
@@ -130,7 +130,7 @@ static cycle_t pit_read(struct clocksource *cs) 
	int count;

	u32 jifs;



	spin_lock_irqsave(&i8253_lock, flags);

	raw_spin_lock_irqsave(&i8253_lock, flags);

	/*

	 * Although our caller may have the read side of xtime_lock,

	 * this is now a seqlock, and we are cheating in this routine
@@ -176,7 +176,7 @@ static cycle_t pit_read(struct clocksource *cs) 
	old_count = count;

	old_jifs = jifs;



	spin_unlock_irqrestore(&i8253_lock, flags);

	raw_spin_unlock_irqrestore(&i8253_lock, flags);



	count = (LATCH - 1) - count;