diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
index ad2fa37b895ea2679fc6d723f4ee44349ca5ab07..1011b6dabdef5bbace56286f1f9f5dc51cb47fe9 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
@@ -1776,7 +1776,7 @@ gckEVENT_Notify(
 
         if ((pending & 0x40000000) && Event->kernel->hardware->mmuVersion)
         {
-            gctUINT64 mmuException = 0;
+            gctUINT64 mmuException = 1;
             gckOS_QueryOption(Event->os, "mmuException", &mmuException);
             if (mmuException)
             {
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
index ab3dad8ae1d371eacf2d5851bff70c107cd2b7cb..579a4c759d2b3d1094660e74456536c22bada356 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
@@ -1607,7 +1607,7 @@ _Construct(
     gcePOOL pool;
     gctUINT64 data;
     gctUINT32 allocFlag = gcvALLOC_FLAG_CONTIGUOUS;
-    gctUINT64 mmuEnabled;
+    gctUINT64 mmuEnabled = 1;
 
     gcmkHEADER_ARG("Kernel=0x%x MmuSize=%lu", Kernel, MmuSize);
 
@@ -1652,7 +1652,7 @@ _Construct(
     /* Create the page table mutex. */
     gcmkONERROR(gckOS_CreateMutex(os, &mmu->pageTableMutex));
 
-    gcmkONERROR(gckOS_QueryOption(os, "mmuException", &mmuEnabled));
+    gckOS_QueryOption(os, "mmuException", &mmuEnabled);
     mmu->mmuException = (gctUINT) mmuEnabled;
     gcmkONERROR(gckOS_QueryOption(os, "mmu", &mmuEnabled));
 
diff --git a/drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c b/drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c
index 83e4c8b9ce98f09327f5d6f0c3d716591e353776..eeb29d5c1ad8c0ef9963e5a69c1e526a3144d532 100644
--- a/drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c
+++ b/drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c
@@ -202,7 +202,7 @@ _AllocateStlb(
     gceSTATUS status;
     gcsMMU_STLB_PTR stlb;
     gctPOINTER pointer = gcvNULL;
-    gctUINT64 mmuException = 0;
+    gctUINT64 mmuException = 1;
 
     /* Allocate slave TLB record. */
     gcmkONERROR(gctaOS_Allocate(gcmSIZEOF(gcsMMU_STLB), &pointer));
@@ -250,7 +250,7 @@ gctaMMU_Construct(
     gctSIZE_T bytes = 4096;
 
     gcTA_MMU mmu = gcvNULL;
-    gctUINT64 mmuException = 0;
+    gctUINT64 mmuException = 1;
 
     gcmkONERROR(gctaOS_Allocate(
         gcmSIZEOF(gcsTA_MMU),