lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-12-08 19:30:19 -08:00
parent fbf07eac7b c95b4502ad 6ce51c4310
commit 2b876f95d0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/timex.h
View File

@@ -115,13 +115,16 @@ struct timex {
#define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */ #define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */
#endif #endif
/* xntp 3.4 compatibility names */ /* NTP userland likes the MOD_ prefix better */
#define MOD_OFFSET ADJ_OFFSET #define MOD_OFFSET ADJ_OFFSET
#define MOD_FREQUENCY ADJ_FREQUENCY #define MOD_FREQUENCY ADJ_FREQUENCY
#define MOD_MAXERROR ADJ_MAXERROR #define MOD_MAXERROR ADJ_MAXERROR
#define MOD_ESTERROR ADJ_ESTERROR #define MOD_ESTERROR ADJ_ESTERROR
#define MOD_STATUS ADJ_STATUS #define MOD_STATUS ADJ_STATUS
#define MOD_TIMECONST ADJ_TIMECONST #define MOD_TIMECONST ADJ_TIMECONST
#define MOD_TAI ADJ_TAI
#define MOD_MICRO ADJ_MICRO
#define MOD_NANO ADJ_NANO
/* /*

2
kernel/irq/manage.c
View File

@@ -1067,7 +1067,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler,
kfree(action); kfree(action);
#ifdef CONFIG_DEBUG_SHIRQ #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 * It's a shared IRQ -- the driver ought to be prepared for it
* to happen immediately, so let's make sure.... * to happen immediately, so let's make sure....