Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Blackfin: only build irqpanic.c when needed

Browse source 
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.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2009-06-13 10:14:24 -04:00
parent abea0bc3d9
commit cf8d943260
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/blackfin/mach-common/Makefile
View file

@ -4,7 +4,7 @@
obj-y := \ obj-y := \
cache.o cache-c.o entry.o head.o \ 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_BFIN_ICACHE_LOCK) += lock.o
obj-$(CONFIG_PM) += pm.o dpmc_modes.o obj-$(CONFIG_PM) += pm.o dpmc_modes.o
@ -12,3 +12,4 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o
obj-$(CONFIG_DEBUG_ICACHE_CHECK) += irqpanic.o

11
arch/blackfin/mach-common/irqpanic.c
View file

@ -30,21 +30,17 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/traps.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#ifdef CONFIG_DEBUG_ICACHE_CHECK
#define L1_ICACHE_START 0xffa10000 #define L1_ICACHE_START 0xffa10000
#define L1_ICACHE_END 0xffa13fff #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 * irq_panic - calls panic with string setup
*/ */
__attribute__ ((l1_text))
asmlinkage void irq_panic(int reason, struct pt_regs *regs) 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 int cmd, tag, ca, cache_hi, cache_lo, *pa;
unsigned short i, j, die; unsigned short i, j, die;
unsigned int bad[10][6]; unsigned int bad[10][6];
@ -126,9 +122,6 @@ asmlinkage void irq_panic(int reason, struct pt_regs *regs)
bad[j][3], bad[j][4], bad[j][5]); bad[j][3], bad[j][4], bad[j][5]);
} }
panic("icache coherency error"); panic("icache coherency error");
} else { } else
printk(KERN_EMERG "icache checked, and OK\n"); printk(KERN_EMERG "icache checked, and OK\n");
}
#endif
} }