2 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 0bf04a0bca9d..09e740f58b27 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -51,7 +51,7 @@ config ARCH_TEGRA_3x_SOC
 
 config ARCH_TEGRA_114_SOC
         bool "Enable support for Tegra114 family"
-        select ARM_ERRATA_798181
+        select ARM_ERRATA_798181 if SMP
         select ARM_L1_CACHE_SHIFT_6
         select HAVE_ARM_ARCH_TIMER
         select PINCTRL_TEGRA114
diff --git a/arch/arm/mach-tegra/apbio.c b/arch/arm/mach-tegra/apbio.c
index d7aa52ea6cfc..bc471973cf04 100644
--- a/arch/arm/mach-tegra/apbio.c
+++ b/arch/arm/mach-tegra/apbio.c
@@ -114,7 +114,7 @@ static int do_dma_transfer(unsigned long apb_add,
         dma_desc->callback = apb_dma_complete;
         dma_desc->callback_param = NULL;
 
-        INIT_COMPLETION(tegra_apb_wait);
+        reinit_completion(&tegra_apb_wait);
 
         dmaengine_submit(dma_desc);
         dma_async_issue_pending(tegra_apb_dma_chan);