git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
blackfin
/
mach-bf561
/
smp.c
diff --git
a/arch/blackfin/mach-bf561/smp.c
b/arch/blackfin/mach-bf561/smp.c
index
5d68bf6
..
7b07740
100644
(file)
--- a/
arch/blackfin/mach-bf561/smp.c
+++ b/
arch/blackfin/mach-bf561/smp.c
@@
-154,13
+154,13
@@
void platform_clear_ipi(unsigned int cpu, int irq)
void __cpuinit bfin_local_timer_setup(void)
{
#if defined(CONFIG_TICKSOURCE_CORETMR)
void __cpuinit bfin_local_timer_setup(void)
{
#if defined(CONFIG_TICKSOURCE_CORETMR)
- struct irq_
chip *chip = get_irq_chip
(IRQ_CORETMR);
- struct irq_
desc *desc = irq_to_desc(IRQ_CORETMR
);
+ struct irq_
data *data = irq_get_irq_data
(IRQ_CORETMR);
+ struct irq_
chip *chip = irq_data_get_irq_chip(data
);
bfin_coretmr_init();
bfin_coretmr_clockevent_init();
bfin_coretmr_init();
bfin_coretmr_clockevent_init();
- chip->irq_unmask(
&desc->irq_
data);
+ chip->irq_unmask(data);
#else
/* Power down the core timer, just to play safe. */
bfin_write_TCNTL(0);
#else
/* Power down the core timer, just to play safe. */
bfin_write_TCNTL(0);