Commit f72a209a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'irq-urgent-for-linus', 'x86-urgent-for-linus' and... 

Merge branches 'irq-urgent-for-linus', 'x86-urgent-for-linus' and 'sched-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip

* 'irq-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
  irq: Fix check for already initialized irq_domain in irq_domain_add
  irq: Add declaration of irq_domain_simple_ops to irqdomain.h

* 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
  x86/rtc: Don't recursively acquire rtc_lock

* 'sched-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
  posix-cpu-timers: Cure SMP wobbles
  sched: Fix up wchan borkage
  sched/rt: Migrate equal priority tasks to available CPUs
parents 47ea91b4 eef24afb 47997d75 d670ec13

arch/x86/kernel/rtc.c

+12 −11
Original line number Diff line number Diff line
@@ -42,8 +42,11 @@ int mach_set_rtc_mmss(unsigned long nowtime) 
{

	int real_seconds, real_minutes, cmos_minutes;

	unsigned char save_control, save_freq_select;

	unsigned long flags;

	int retval = 0;



	spin_lock_irqsave(&rtc_lock, flags);



	 /* tell the clock it's being set */

	save_control = CMOS_READ(RTC_CONTROL);

	CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
@@ -93,12 +96,17 @@ int mach_set_rtc_mmss(unsigned long nowtime) 
	CMOS_WRITE(save_control, RTC_CONTROL);

	CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);



	spin_unlock_irqrestore(&rtc_lock, flags);



	return retval;

}



unsigned long mach_get_cmos_time(void)

{

	unsigned int status, year, mon, day, hour, min, sec, century = 0;

	unsigned long flags;



	spin_lock_irqsave(&rtc_lock, flags);



	/*

	 * If UIP is clear, then we have >= 244 microseconds before
@@ -125,6 +133,8 @@ unsigned long mach_get_cmos_time(void) 
	status = CMOS_READ(RTC_CONTROL);

	WARN_ON_ONCE(RTC_ALWAYS_BCD && (status & RTC_DM_BINARY));



	spin_unlock_irqrestore(&rtc_lock, flags);



	if (RTC_ALWAYS_BCD || !(status & RTC_DM_BINARY)) {

		sec = bcd2bin(sec);

		min = bcd2bin(min);
@@ -169,24 +179,15 @@ EXPORT_SYMBOL(rtc_cmos_write); 


int update_persistent_clock(struct timespec now)

{

	unsigned long flags;

	int retval;



	spin_lock_irqsave(&rtc_lock, flags);

	retval = x86_platform.set_wallclock(now.tv_sec);

	spin_unlock_irqrestore(&rtc_lock, flags);



	return retval;

	return x86_platform.set_wallclock(now.tv_sec);

}



/* not static: needed by APM */

void read_persistent_clock(struct timespec *ts)

{

	unsigned long retval, flags;

	unsigned long retval;



	spin_lock_irqsave(&rtc_lock, flags);

	retval = x86_platform.get_wallclock();

	spin_unlock_irqrestore(&rtc_lock, flags);



	ts->tv_sec = retval;

	ts->tv_nsec = 0;

arch/x86/platform/mrst/vrtc.c

+9 −0
Original line number Diff line number Diff line
@@ -58,8 +58,11 @@ EXPORT_SYMBOL_GPL(vrtc_cmos_write); 
unsigned long vrtc_get_time(void)

{

	u8 sec, min, hour, mday, mon;

	unsigned long flags;

	u32 year;



	spin_lock_irqsave(&rtc_lock, flags);



	while ((vrtc_cmos_read(RTC_FREQ_SELECT) & RTC_UIP))

		cpu_relax();
@@ -70,6 +73,8 @@ unsigned long vrtc_get_time(void) 
	mon = vrtc_cmos_read(RTC_MONTH);

	year = vrtc_cmos_read(RTC_YEAR);



	spin_unlock_irqrestore(&rtc_lock, flags);



	/* vRTC YEAR reg contains the offset to 1960 */

	year += 1960;
@@ -83,8 +88,10 @@ unsigned long vrtc_get_time(void) 
int vrtc_set_mmss(unsigned long nowtime)

{

	int real_sec, real_min;

	unsigned long flags;

	int vrtc_min;



	spin_lock_irqsave(&rtc_lock, flags);

	vrtc_min = vrtc_cmos_read(RTC_MINUTES);



	real_sec = nowtime % 60;
@@ -95,6 +102,8 @@ int vrtc_set_mmss(unsigned long nowtime) 


	vrtc_cmos_write(real_sec, RTC_SECONDS);

	vrtc_cmos_write(real_min, RTC_MINUTES);

	spin_unlock_irqrestore(&rtc_lock, flags);



	return 0;

}

include/linux/irqdomain.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ extern void irq_domain_del(struct irq_domain *domain); 
#endif /* CONFIG_IRQ_DOMAIN */



#if defined(CONFIG_IRQ_DOMAIN) && defined(CONFIG_OF_IRQ)

extern struct irq_domain_ops irq_domain_simple_ops;

extern void irq_domain_add_simple(struct device_node *controller, int irq_base);

extern void irq_domain_generate_simple(const struct of_device_id *match,

					u64 phys_base, unsigned int irq_start);

include/linux/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -1956,7 +1956,6 @@ static inline void disable_sched_clock_irqtime(void) {} 


extern unsigned long long

task_sched_runtime(struct task_struct *task);

extern unsigned long long thread_group_sched_runtime(struct task_struct *task);



/* sched_exec is called by processes performing an exec */

#ifdef CONFIG_SMP

kernel/irq/irqdomain.c

+5 −1
Original line number Diff line number Diff line
@@ -29,7 +29,11 @@ void irq_domain_add(struct irq_domain *domain) 
	 */

	for (hwirq = 0; hwirq < domain->nr_irq; hwirq++) {

		d = irq_get_irq_data(irq_domain_to_irq(domain, hwirq));

		if (d || d->domain) {

		if (!d) {

			WARN(1, "error: assigning domain to non existant irq_desc");

			return;

		}

		if (d->domain) {

			/* things are broken; just report, don't clean up */

			WARN(1, "error: irq_desc already assigned to a domain");

			return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE