Page MenuHomeFreeBSD
Files F161353460

D16972.id47589.diff
No OneTemporary
Actions

D16972.id47589.diff
View Options

Index: head/sys/amd64/include/efi.h
===================================================================
--- head/sys/amd64/include/efi.h
+++ head/sys/amd64/include/efi.h
@@ -48,9 +48,9 @@
#ifdef _KERNEL
#include <isa/rtc.h>
-#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock);
-#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock);
-#define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED);
+#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock)
+#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock)
+#define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED)
#endif
#endif /* __AMD64_INCLUDE_EFI_H_ */
Index: head/sys/dev/efidev/efirt.c
===================================================================
--- head/sys/dev/efidev/efirt.c
+++ head/sys/dev/efidev/efirt.c
@@ -299,7 +299,7 @@
efi_status status;
int error;
- EFI_TIME_OWNED()
+ EFI_TIME_OWNED();
error = efi_enter();
if (error != 0)
return (error);
@@ -317,7 +317,7 @@
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
/*
* UEFI spec states that the Capabilities argument to GetTime is
* optional, but some UEFI implementations choke when passed a NULL
@@ -325,7 +325,7 @@
* to workaround such implementations.
*/
error = efi_get_time_locked(tm, &dummy);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}
@@ -337,9 +337,9 @@
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
error = efi_get_time_locked(&dummy, tmcap);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}
@@ -379,9 +379,9 @@
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
error = efi_set_time_locked(tm);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 4, 2:31 AM (10 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34646858
Default Alt Text
D16972.id47589.diff (1 KB)

Event Timeline