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

Commit 2b876f95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of... 

Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ntp: Provide compability defines (You say MOD_NANO, I say ADJ_NANO)

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: do not execute DEBUG_SHIRQ when irq setup failed
parents fbf07eac c95b4502 6ce51c43

include/linux/timex.h

+4 −1
Original line number Diff line number Diff line
@@ -115,13 +115,16 @@ struct timex { 
#define ADJ_OFFSET_SS_READ	0xa001	/* read-only adjtime */

#endif



/* xntp 3.4 compatibility names */

/* NTP userland likes the MOD_ prefix better */

#define MOD_OFFSET	ADJ_OFFSET

#define MOD_FREQUENCY	ADJ_FREQUENCY

#define MOD_MAXERROR	ADJ_MAXERROR

#define MOD_ESTERROR	ADJ_ESTERROR

#define MOD_STATUS	ADJ_STATUS

#define MOD_TIMECONST	ADJ_TIMECONST

#define MOD_TAI	ADJ_TAI

#define MOD_MICRO	ADJ_MICRO

#define MOD_NANO	ADJ_NANO





/*

kernel/irq/manage.c

+1 −1
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, 
		kfree(action);



#ifdef CONFIG_DEBUG_SHIRQ

	if (irqflags & IRQF_SHARED) {

	if (!retval && (irqflags & IRQF_SHARED)) {

		/*

		 * It's a shared IRQ -- the driver ought to be prepared for it

		 * to happen immediately, so let's make sure....