Commit 6455c66a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4567/1: Fix 'Oops - undefined instruction' when CONFIG_VFP=y on non VFP device
  [ARM] realview: disable second GIC on RevB MPCore platforms
parents 7eeac505 b9338a78

arch/arm/mach-realview/realview_eb.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void __init gic_init_irq(void) 
#endif

	gic_dist_init(0, __io_address(REALVIEW_GIC_DIST_BASE), 29);

	gic_cpu_init(0, __io_address(REALVIEW_GIC_CPU_BASE));

#ifdef CONFIG_REALVIEW_MPCORE

#if defined(CONFIG_REALVIEW_MPCORE) && !defined(CONFIG_REALVIEW_MPCORE_REVB)

	gic_dist_init(1, __io_address(REALVIEW_GIC1_DIST_BASE), 64);

	gic_cpu_init(1, __io_address(REALVIEW_GIC1_CPU_BASE));

	gic_cascade_irq(1, IRQ_EB_IRQ1);

arch/arm/vfp/vfpmodule.c

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ static int __init vfp_init(void) 
	 * we just need to read the VFPSID register.

	 */

	vfp_vector = vfp_testing_entry;

	barrier();

	vfpsid = fmrx(FPSID);

	barrier();

	vfp_vector = vfp_null_entry;