2 files changed, 2 insertions, 1 deletions

diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 3dba666151db..ecec2f85c4cd 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -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);
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 04ddab2bd876..eea3f50743d5 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -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;