Index: edk2/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
===================================================================
--- edk2/MdeModulePkg/Core/PiSmmCore/Dispatcher.c	(revision 15579)
+++ edk2/MdeModulePkg/Core/PiSmmCore/Dispatcher.c	(working copy)
@@ -26,8 +26,9 @@
   is the state diagram for the DXE dispatcher
 
   Depex - Dependency Expresion.
-
-  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+   
+  Copyright (c) 2014, Hewlett-Packard Development Company, L.P.
+  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials are licensed and made available 
   under the terms and conditions of the BSD License which accompanies this 
   distribution.  The full text of the license may be found at        
@@ -590,10 +591,12 @@
   }
   CopyMem (DriverEntry->LoadedImage->FilePath, FilePath, GetDevicePathSize (FilePath));
 
-  DriverEntry->LoadedImage->ImageBase     = (VOID *)(UINTN)DriverEntry->ImageBuffer;
-  DriverEntry->LoadedImage->ImageSize     = ImageContext.ImageSize;
-  DriverEntry->LoadedImage->ImageCodeType = EfiRuntimeServicesCode;
-  DriverEntry->LoadedImage->ImageDataType = EfiRuntimeServicesData;
+  DriverEntry->LoadedImage->ImageBase       = (VOID *)(UINTN)DriverEntry->ImageBuffer;
+  DriverEntry->LoadedImage->ImageSize       = ImageContext.ImageSize;
+  DriverEntry->LoadedImage->ImageCodeType   = EfiRuntimeServicesCode;
+  DriverEntry->LoadedImage->ImageDataType   = EfiRuntimeServicesData;
+  DriverEntry->LoadedImage->LoadOptionsSize = 0;
+  DriverEntry->LoadedImage->LoadOptions     = NULL;
 
   //
   // Create a new image handle in the UEFI handle database for the SMM Driver