Messages in this thread Patch in this message | | | Subject | [PATCH] irqtrace-option-off-compile-fix | From | Tim Chen <> | Date | Mon, 10 Jul 2006 17:18:40 -0700 |
| |
When CONFIG_TRACE_IRQFLAGS_SUPPORT is turned off, the latest kernel has compile errors. The patch below fix the problems.
Regards, Tim Chen
Signed-off-by: Tim Chen <tim.c.chen@intel.com> diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h index 412e025..2dd865f 100644 --- a/include/linux/irqflags.h +++ b/include/linux/irqflags.h @@ -41,10 +41,10 @@ # define INIT_TRACE_IRQFLAGS #endif -#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT - #include <asm/irqflags.h> +#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT + #define local_irq_enable() \ do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0) #define local_irq_disable() \ @@ -62,24 +62,24 @@ raw_local_irq_restore(flags); \ } \ } while (0) +#define safe_halt() \ + do { \ + trace_hardirqs_on(); \ + raw_safe_halt(); \ + } while (0) + #else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */ /* * The local_irq_*() APIs are equal to the raw_local_irq*() * if !TRACE_IRQFLAGS. */ -# define raw_local_irq_disable() local_irq_disable() -# define raw_local_irq_enable() local_irq_enable() -# define raw_local_irq_save(flags) local_irq_save(flags) -# define raw_local_irq_restore(flags) local_irq_restore(flags) +#define local_irq_disable() raw_local_irq_disable() +#define local_irq_enable() raw_local_irq_enable() +#define local_irq_save(flags) raw_local_irq_save(flags) +#define local_irq_restore(flags) raw_local_irq_restore(flags) +#define safe_halt() raw_safe_halt() #endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */ -#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT -#define safe_halt() \ - do { \ - trace_hardirqs_on(); \ - raw_safe_halt(); \ - } while (0) - #define local_save_flags(flags) raw_local_save_flags(flags) #define irqs_disabled() \ @@ -91,6 +91,5 @@ }) #define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags) -#endif /* CONFIG_X86 */ #endif
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |