---
.../EmbeddedMonotonicCounter.c | 2 +-
edk2/MdeModulePkg/Core/Dxe/Event/Event.c | 2 +-
edk2/MdeModulePkg/Core/Dxe/Event/Timer.c | 2 +-
edk2/MdeModulePkg/Core/Dxe/Hand/Handle.c | 4 ++--
edk2/MdeModulePkg/Core/Dxe/Hand/Notify.c | 4 ++--
edk2/MdeModulePkg/Core/Dxe/Mem/Page.c | 6 +++---
edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c | 4 ++--
.../Universal/HiiDatabaseDxe/HiiDatabaseEntry.c | 10 +++++-----
.../Universal/SecurityStubDxe/SecurityStub.c | 2 +-
.../Universal/WatchdogTimerDxe/WatchdogTimer.c | 2 +-
edk2/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/edk2/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.c
b/edk2/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.c
index 21397dc..8cb26e6 100644
--- a/edk2/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.c
+++ b/edk2/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.c
@@ -66,7 +66,7 @@ MonotonicCounterDriverInitialize (
EFI_HANDLE Handle = NULL;
// Make sure the Monotonic Counter Architectural Protocol is not already
installed in the system
- ASSERT_PROTOCOL_ALREADY_INSTALLED(NULL,
&gEfiMonotonicCounterArchProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED(NULL,
&gEfiMonotonicCounterArchProtocolGuid);
// Fill in the EFI Boot Services and EFI Runtime Services Monotonic Counter
Fields
gBS->GetNextMonotonicCount = GetNextMonotonicCount;
diff --git a/edk2/MdeModulePkg/Core/Dxe/Event/Event.c
b/edk2/MdeModulePkg/Core/Dxe/Event/Event.c
index d9fc758..d5a19fd 100644
--- a/edk2/MdeModulePkg/Core/Dxe/Event/Event.c
+++ b/edk2/MdeModulePkg/Core/Dxe/Event/Event.c
@@ -225,7 +225,7 @@ CoreNotifyEvent (
//
// Event database must be locked
//
- ASSERT_LOCKED (&gEventQueueLock);
+ //ASSERT_LOCKED (&gEventQueueLock);
//
// If the event is queued somewhere, remove it
diff --git a/edk2/MdeModulePkg/Core/Dxe/Event/Timer.c
b/edk2/MdeModulePkg/Core/Dxe/Event/Timer.c
index b1a5e3c..a03c022 100644
--- a/edk2/MdeModulePkg/Core/Dxe/Event/Timer.c
+++ b/edk2/MdeModulePkg/Core/Dxe/Event/Timer.c
@@ -46,7 +46,7 @@ CoreInsertEventTimer (
LIST_ENTRY *Link;
IEVENT *Event2;
- ASSERT_LOCKED (&mEfiTimerLock);
+ //ASSERT_LOCKED (&mEfiTimerLock);
//
// Get the timer's trigger time
diff --git a/edk2/MdeModulePkg/Core/Dxe/Hand/Handle.c
b/edk2/MdeModulePkg/Core/Dxe/Hand/Handle.c
index e549484..c6d1ef4 100644
--- a/edk2/MdeModulePkg/Core/Dxe/Hand/Handle.c
+++ b/edk2/MdeModulePkg/Core/Dxe/Hand/Handle.c
@@ -105,7 +105,7 @@ CoreFindProtocolEntry (
PROTOCOL_ENTRY *Item;
PROTOCOL_ENTRY *ProtEntry;
- ASSERT_LOCKED(&gProtocolDatabaseLock);
+ //ASSERT_LOCKED(&gProtocolDatabaseLock);
//
// Search the database for the matching GUID
@@ -179,7 +179,7 @@ CoreFindProtocolInterface (
PROTOCOL_ENTRY *ProtEntry;
LIST_ENTRY *Link;
- ASSERT_LOCKED(&gProtocolDatabaseLock);
+ //ASSERT_LOCKED(&gProtocolDatabaseLock);
Prot = NULL;
//
diff --git a/edk2/MdeModulePkg/Core/Dxe/Hand/Notify.c
b/edk2/MdeModulePkg/Core/Dxe/Hand/Notify.c
index 53780f8..e06b75e 100644
--- a/edk2/MdeModulePkg/Core/Dxe/Hand/Notify.c
+++ b/edk2/MdeModulePkg/Core/Dxe/Hand/Notify.c
@@ -30,7 +30,7 @@ CoreNotifyProtocolEntry (
PROTOCOL_NOTIFY *ProtNotify;
LIST_ENTRY *Link;
- ASSERT_LOCKED (&gProtocolDatabaseLock);
+ //ASSERT_LOCKED (&gProtocolDatabaseLock);
for (Link=ProtEntry->Notify.ForwardLink; Link != &ProtEntry->Notify;
Link=Link->ForwardLink) {
ProtNotify = CR(Link, PROTOCOL_NOTIFY, Link, PROTOCOL_NOTIFY_SIGNATURE);
@@ -62,7 +62,7 @@ CoreRemoveInterfaceFromProtocol (
PROTOCOL_ENTRY *ProtEntry;
LIST_ENTRY *Link;
- ASSERT_LOCKED (&gProtocolDatabaseLock);
+ //ASSERT_LOCKED (&gProtocolDatabaseLock);
Prot = CoreFindProtocolInterface (Handle, Protocol, Interface);
if (Prot != NULL) {
diff --git a/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c
b/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c
index 04844e3..e54e19d 100644
--- a/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -174,7 +174,7 @@ CoreAddRange (
ASSERT ((Start & EFI_PAGE_MASK) == 0);
ASSERT (End > Start) ;
- ASSERT_LOCKED (&gMemoryLock);
+ //ASSERT_LOCKED (&gMemoryLock);
DEBUG ((DEBUG_PAGE, "AddRange: %lx-%lx to %d\n", Start, End, Type));
@@ -309,7 +309,7 @@ CoreFreeMemoryMapStack (
MEMORY_MAP *Entry2;
LIST_ENTRY *Link2;
- ASSERT_LOCKED (&gMemoryLock);
+ //ASSERT_LOCKED (&gMemoryLock);
//
// If already freeing the map stack, then return
@@ -695,7 +695,7 @@ CoreConvertPages (
ASSERT (NumberOfPages);
ASSERT ((Start & EFI_PAGE_MASK) == 0);
ASSERT (End > Start) ;
- ASSERT_LOCKED (&gMemoryLock);
+ //ASSERT_LOCKED (&gMemoryLock);
if (NumberOfPages == 0 || ((Start & EFI_PAGE_MASK) != 0) || (Start > (Start
+ NumberOfBytes))) {
return EFI_INVALID_PARAMETER;
diff --git a/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c
b/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c
index 2808905..dcdeeae 100644
--- a/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c
+++ b/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c
@@ -242,7 +242,7 @@ CoreAllocatePoolI (
UINTN Offset;
UINTN NoPages;
- ASSERT_LOCKED (&gMemoryLock);
+ //ASSERT_LOCKED (&gMemoryLock);
//
// Adjust the size by the pool header & tail overhead
@@ -432,7 +432,7 @@ CoreFreePoolI (
//
ASSERT (Tail->Signature == POOL_TAIL_SIGNATURE);
ASSERT (Head->Size == Tail->Size);
- ASSERT_LOCKED (&gMemoryLock);
+ //ASSERT_LOCKED (&gMemoryLock);
if (Tail->Signature != POOL_TAIL_SIGNATURE) {
return EFI_INVALID_PARAMETER;
diff --git a/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
b/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
index ae75f8c..30b9448 100644
--- a/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
+++ b/edk2/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
@@ -148,11 +148,11 @@ InitializeHiiDatabase (
// If there is another out there, someone is trying to install us
// again. Fail that scenario.
//
- ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiDatabaseProtocolGuid);
- ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiFontProtocolGuid);
- ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiImageProtocolGuid);
- ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiStringProtocolGuid);
- ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiConfigRoutingProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiDatabaseProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiFontProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiImageProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiStringProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL,
&gEfiHiiConfigRoutingProtocolGuid);
InitializeListHead (&mPrivate.DatabaseList);
InitializeListHead (&mPrivate.DatabaseNotifyList);
diff --git a/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
b/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
index 8e81d87..8eb6dcd 100644
--- a/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
+++ b/edk2/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
@@ -99,7 +99,7 @@ SecurityStubInitialize (
//
// Make sure the Security Architectural Protocol is not already installed in
the system
//
- ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiSecurityArchProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiSecurityArchProtocolGuid);
//
// Install the Security Architectural Protocol onto a new handle
diff --git a/edk2/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
b/edk2/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
index b018eb2..8eaaebe 100644
--- a/edk2/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
+++ b/edk2/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
@@ -222,7 +222,7 @@ WatchdogTimerDriverInitialize (
//
// Make sure the Watchdog Timer Architectural Protocol has not been
installed in the system yet.
//
- ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiWatchdogTimerArchProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL,
&gEfiWatchdogTimerArchProtocolGuid);
//
// Create the timer event to implement a simple watchdog timer
diff --git a/edk2/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c
b/edk2/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c
index 5040c4b..e99271f 100644
--- a/edk2/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c
+++ b/edk2/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c
@@ -317,7 +317,7 @@ InterruptDxeInitialize (
EFI_CPU_ARCH_PROTOCOL *Cpu;
// Make sure the Interrupt Controller Protocol is not already installed in
the system.
- ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gHardwareInterruptProtocolGuid);
+ //ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gHardwareInterruptProtocolGuid);
// Make sure all interrupts are disabled by default.
MmioWrite32 (INTCPS_MIR(0), 0xFFFFFFFF);
--
1.7.5.4
_______________________________________________
boot-architecture mailing list
boot-architecture@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/boot-architecture
