From b29f8c533cd485f6e1d01772effd5511ad909e54 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Thu, 11 Jun 2009 21:59:21 +0200 Subject: [PATCH] --- yaml --- r: 148682 b: refs/heads/master c: 5818a6e2519b34cd6d0220d89f5729ab2725e1bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/interrupt.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fe1335aafc3b..a39742a17776 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fce2b111fae9151a53dabb36513b398d03337a19 +refs/heads/master: 5818a6e2519b34cd6d0220d89f5729ab2725e1bf diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h index ff374ceface0..c41e812e9d5e 100644 --- a/trunk/include/linux/interrupt.h +++ b/trunk/include/linux/interrupt.h @@ -183,6 +183,7 @@ extern void disable_irq(unsigned int irq); extern void enable_irq(unsigned int irq); /* The following three functions are for the core kernel use only. */ +#ifdef CONFIG_GENERIC_HARDIRQS extern void suspend_device_irqs(void); extern void resume_device_irqs(void); #ifdef CONFIG_PM_SLEEP @@ -190,6 +191,11 @@ extern int check_wakeup_irqs(void); #else static inline int check_wakeup_irqs(void) { return 0; } #endif +#else +static inline void suspend_device_irqs(void) { }; +static inline void resume_device_irqs(void) { }; +static inline int check_wakeup_irqs(void) { return 0; } +#endif #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)