Title: [6812] trunk/arch/blackfin/mach-common: Blackfin: only build irqpanic.c when needed
- Revision
- 6812
- Author
- vapier
- Date
- 2009-06-20 06:25:21 -0500 (Sat, 20 Jun 2009)
Log Message
Blackfin: only build irqpanic.c when needed
The irq_panic function is only used when CONFIG_DEBUG_ICACHE_CHECK is
enabled, so move the conditional build to the Makefile rather than
wrapping all of the contents of the file.
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-common/Makefile (6811 => 6812)
--- trunk/arch/blackfin/mach-common/Makefile 2009-06-20 11:24:59 UTC (rev 6811)
+++ trunk/arch/blackfin/mach-common/Makefile 2009-06-20 11:25:21 UTC (rev 6812)
@@ -4,7 +4,7 @@
obj-y := \
cache.o cache-c.o entry.o head.o \
- interrupt.o irqpanic.o arch_checks.o ints-priority.o
+ interrupt.o arch_checks.o ints-priority.o
obj-$(CONFIG_BFIN_ICACHE_LOCK) += lock.o
obj-$(CONFIG_PM) += pm.o dpmc_modes.o
@@ -12,3 +12,4 @@
obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o
+obj-$(CONFIG_DEBUG_ICACHE_CHECK) += irqpanic.o
Modified: trunk/arch/blackfin/mach-common/irqpanic.c (6811 => 6812)
--- trunk/arch/blackfin/mach-common/irqpanic.c 2009-06-20 11:24:59 UTC (rev 6811)
+++ trunk/arch/blackfin/mach-common/irqpanic.c 2009-06-20 11:25:21 UTC (rev 6812)
@@ -30,21 +30,17 @@
#include <linux/module.h>
#include <linux/kernel_stat.h>
#include <linux/sched.h>
-#include <asm/traps.h>
#include <asm/blackfin.h>
-#ifdef CONFIG_DEBUG_ICACHE_CHECK
#define L1_ICACHE_START 0xffa10000
#define L1_ICACHE_END 0xffa13fff
-void irq_panic(int reason, struct pt_regs *regs) __attribute__ ((l1_text));
-#endif
/*
* irq_panic - calls panic with string setup
*/
+__attribute__ ((l1_text))
asmlinkage void irq_panic(int reason, struct pt_regs *regs)
{
-#ifdef CONFIG_DEBUG_ICACHE_CHECK
unsigned int cmd, tag, ca, cache_hi, cache_lo, *pa;
unsigned short i, j, die;
unsigned int bad[10][6];
@@ -126,9 +122,6 @@
bad[j][3], bad[j][4], bad[j][5]);
}
panic("icache coherency error");
- } else {
+ } else
printk(KERN_EMERG "icache checked, and OK\n");
- }
-#endif
-
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
