| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 6f69f489a442b3a192e4c08748ee8c4d31c75dae Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrea Adami <andrea.adami@gmail.com> |
| 3 | Date: Sun, 29 Apr 2018 00:46:16 +0200 |
| 4 | Subject: [PATCH 5/6] arm64: crashdump-arm64.c: fix warning |
| 5 | |
| 6 | from ../git/kexec/kexec.h:6, |
| 7 | from ../git/kexec/arch/arm64/crashdump-arm64.c:18: |
| 8 | /tmp/build/tmp-musl/work/aarch64-oe-linux-musl/kexec-tools-klibc/0.6+gitAUTOINC+ |
| 9 | 0481e9ed61-r0/recipe-sysroot/usr/lib/klibc/include/klibc/compiler.h:144:0: warni |
| 10 | ng: "__bitwise" redefined |
| 11 | # define __bitwise |
| 12 | |
| 13 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
| 14 | --- |
| 15 | kexec/arch/arm64/crashdump-arm64.c | 3 +++ |
| 16 | 1 file changed, 3 insertions(+) |
| 17 | |
| 18 | diff --git a/kexec/arch/arm64/crashdump-arm64.c b/kexec/arch/arm64/crashdump-arm64.c |
| 19 | index 4fd7aa8..890d88f 100644 |
| 20 | --- a/kexec/arch/arm64/crashdump-arm64.c |
| 21 | +++ b/kexec/arch/arm64/crashdump-arm64.c |
| 22 | @@ -13,6 +13,9 @@ |
| 23 | #define _GNU_SOURCE |
| 24 | |
| 25 | #include <errno.h> |
| 26 | +#ifdef __KLIBC__ |
| 27 | +#include <sys/types.h> |
| 28 | +#endif |
| 29 | #include <linux/elf.h> |
| 30 | |
| 31 | #include "kexec.h" |
| 32 | -- |
| 33 | 2.7.4 |
| 34 | |