Compile problems on ia64 with 2.6.17-rc5-mm1
cover Compile problems on ia64 with 2.6.17-rc5-mm1
2.6.17-rc5-mm1 had some minor compile problems on IA64. The following two patches should address them.
Signature · 4 lines
-- Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab
PATCH 1/2 2.6.17-rc5-mm1 compile-fix on ia64 for TRACE_IRQFLAGS
The patches lock-validator-irqtrace-* intoduce a file include/linux/trace_irqflags.h that includes asm/irqflags.h unconditionally. Not all arches have this flag and ia64 is one of them so it fails to compile. The following patch conditionally includes asm/irqflags if CONFIG_TRACE_IRQFLAGS is set.
trace_irqflags.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Signed-off-by Mel Gorman <[email protected]>
include/linux/trace_irqflags.h +2 -2
@@ -11,13 +11,13 @@#ifndef _LINUX_TRACE_IRQFLAGS_H#define _LINUX_TRACE_IRQFLAGS_H -#include <asm/irqflags.h> -/* * The local_irq_*() APIs are equal to the raw_local_irq*() * if !TRACE_IRQFLAGS. */ #ifdef CONFIG_TRACE_IRQFLAGS +#include <asm/irqflags.h> +extern void trace_hardirqs_on (void );extern void trace_hardirqs_off (void );extern void trace_softirqs_on (unsigned long ip);
PATCH 2/2 2.6.17-rc5-mm1 compile-fix on ia64 for desc->handler
In reply to Mel Gormangenirq-rename-desc-handler-to-desc-chip.patch renames a number of IRQ desc->handler to desk->chip. This patch renames one that was missed.
hpsim_irq.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Signed-off-by Mel Gorman <[email protected]>
arch/ia64/hp/sim/hpsim_irq.c +2 -2
@@ -45,7 +45,7 @@ hpsim_irq_init (void)for (i =0 ; i <NR_IRQS ; ++i) { idesc = irq_desc + i; -if (idesc->handler == &no_irq_type) - idesc->handler = &irq_type_hp_sim; +if (idesc->chip == &no_irq_type) + idesc->chip = &irq_type_hp_sim; } }