Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: fix up section mismatch warning
  Blackfin arch: fix bug - kernel boot fails when Spinlock and rw-lock debugging enabled
This commit is contained in:
Linus Torvalds 2008-06-29 12:16:07 -07:00
commit db6c24fdf1
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/blackfin/kernel/cplb-nompu/cplbinit.c
View File

@ -254,7 +254,8 @@ close_cplbtab(struct cplb_tab *table)
} }
/* helper function */ /* helper function */
static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) static void __init
__fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end)
{ {
if (cplb_data[i].psize) { if (cplb_data[i].psize) {
fill_cplbtab(t, fill_cplbtab(t,
@ -291,7 +292,8 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_en
} }
} }
static void __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) static void __init
__fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end)
{ {
if (cplb_data[i].psize) { if (cplb_data[i].psize) {
fill_cplbtab(t, fill_cplbtab(t,

5
arch/blackfin/kernel/irqchip.c
View File

@ -60,9 +60,14 @@ static struct irq_chip bad_chip = {
}; };
static struct irq_desc bad_irq_desc = { static struct irq_desc bad_irq_desc = {
.status = IRQ_DISABLED,
.chip = &bad_chip, .chip = &bad_chip,
.handle_irq = handle_bad_irq, .handle_irq = handle_bad_irq,
.depth = 1, .depth = 1,
.lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock),
#ifdef CONFIG_SMP
.affinity = CPU_MASK_ALL
#endif
}; };
int show_interrupts(struct seq_file *p, void *v) int show_interrupts(struct seq_file *p, void *v)