Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db6c24fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents a4480ac4 8d0a6003

arch/blackfin/kernel/cplb-nompu/cplbinit.c

+4 −2
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ close_cplbtab(struct cplb_tab *table) 
}



/* 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) {

		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) {

		fill_cplbtab(t,

arch/blackfin/kernel/irqchip.c

+5 −0
Original line number Diff line number Diff line
@@ -60,9 +60,14 @@ static struct irq_chip bad_chip = { 
};



static struct irq_desc bad_irq_desc = {

	.status = IRQ_DISABLED,

	.chip = &bad_chip,

	.handle_irq = handle_bad_irq,

	.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)