]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
x86: acpi: Fix build error with certain configuration
authorBin Meng <bmeng.cn@gmail.com>
Tue, 8 Aug 2017 11:35:07 +0000 (04:35 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Tue, 8 Aug 2017 13:13:05 +0000 (21:13 +0800)
When CONFIG_EFI_PARTITION is not set, the following build error is
seen in arch/x86/lib/acpi_s3.c:

  error: expected declaration specifiers or '...' before '*' token
  static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void*)WAKEUP_BASE;

This is actually caused by missing asmlinkage declaration, but with
CONFIG_EFI_PARTITION on, the declaration comes from part.h which
is included from common.h.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
arch/x86/lib/acpi_s3.c

index 3175da828bdbe64d9b9c79fb684e61fd39559825..182379b4397f3ff5fa984f28957c5a1e6f2d8efd 100644 (file)
@@ -8,6 +8,7 @@
 #include <asm/acpi_s3.h>
 #include <asm/acpi_table.h>
 #include <asm/post.h>
+#include <linux/linkage.h>
 
 DECLARE_GLOBAL_DATA_PTR;