52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
|
From 96bc9caf3216b391a1da88b92ca507fa617177f7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Thu, 23 Apr 2020 08:49:10 +0200
|
||
|
|
Subject: [PATCH] acpi-fpdt: mark structures as packed
|
||
|
|
|
||
|
|
Let's make sure the alignment doesn't matter.
|
||
|
|
|
||
|
|
(cherry picked from commit 49490c1d353bc920cbf73f4c71e9c35d2e3eb8b1)
|
||
|
|
|
||
|
|
Related: #2084052
|
||
|
|
---
|
||
|
|
src/shared/acpi-fpdt.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
|
||
|
|
index d565ebd43e..38c464c912 100644
|
||
|
|
--- a/src/shared/acpi-fpdt.c
|
||
|
|
+++ b/src/shared/acpi-fpdt.c
|
||
|
|
@@ -23,7 +23,7 @@ struct acpi_table_header {
|
||
|
|
uint32_t oem_revision;
|
||
|
|
char asl_compiler_id[4];
|
||
|
|
uint32_t asl_compiler_revision;
|
||
|
|
-};
|
||
|
|
+} _packed_;
|
||
|
|
|
||
|
|
enum {
|
||
|
|
ACPI_FPDT_TYPE_BOOT = 0,
|
||
|
|
@@ -36,12 +36,12 @@ struct acpi_fpdt_header {
|
||
|
|
uint8_t revision;
|
||
|
|
uint8_t reserved[4];
|
||
|
|
uint64_t ptr;
|
||
|
|
-};
|
||
|
|
+} _packed_;
|
||
|
|
|
||
|
|
struct acpi_fpdt_boot_header {
|
||
|
|
char signature[4];
|
||
|
|
uint32_t length;
|
||
|
|
-};
|
||
|
|
+} _packed_;
|
||
|
|
|
||
|
|
enum {
|
||
|
|
ACPI_FPDT_S3PERF_RESUME_REC = 0,
|
||
|
|
@@ -59,7 +59,7 @@ struct acpi_fpdt_boot {
|
||
|
|
uint64_t startup_start;
|
||
|
|
uint64_t exit_services_entry;
|
||
|
|
uint64_t exit_services_exit;
|
||
|
|
-};
|
||
|
|
+} _packed;
|
||
|
|
|
||
|
|
int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
|
||
|
|
_cleanup_free_ char *buf = NULL;
|