mirror of
https://git.proxmox.com/git/systemd
synced 2026-02-03 16:42:27 +00:00
87c3557857
This commit was created using the following commands and then fixing up debian/patches/series manually. $ git config diff.renames false $ git rebase --onto debian/208-5 v208 stable/v208-stable $ git checkout -b patch-queue/experimental HEAD $ gbp-pq export --no-patch-numbers $ git add --ignore-removal debian/patches/
26 lines
841 B
Diff
26 lines
841 B
Diff
From: =?utf-8?q?Cristian_Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
|
|
Date: Tue, 11 Feb 2014 09:54:49 -0300
|
|
Subject: efi: fix Undefined reference efi_loader_get_boot_usec when EFI
|
|
support is disabled
|
|
|
|
(cherry picked from commit 70d9b9fc0a4fa1698ff00e364c61bb875244efa1)
|
|
---
|
|
src/shared/boot-timestamps.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
|
|
index 9449965..d656685 100644
|
|
--- a/src/shared/boot-timestamps.c
|
|
+++ b/src/shared/boot-timestamps.c
|
|
@@ -40,8 +40,10 @@ int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_time
|
|
|
|
r = acpi_get_boot_usec(&x, &y);
|
|
if (r < 0) {
|
|
+#ifdef ENABLE_EFI
|
|
r = efi_loader_get_boot_usec(&x, &y);
|
|
if (r < 0)
|
|
+#endif
|
|
return r;
|
|
}
|
|
|