diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2018-05-14 00:17:30 +0200 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-05-17 08:32:26 -0700 |
| commit | e22a87046f51e40972d732377505e62f9940d874 (patch) | |
| tree | c92282737f71711b9cb65cb9f3566f4d46ff5a3a /meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch | |
| parent | b4d849f5dbd7c0919e6fc64ece4394dee911e4cd (diff) | |
| download | meta-openembedded-e22a87046f51e40972d732377505e62f9940d874.tar.gz | |
kexec-tools-klibc: upgrade from v. 2.0.2 to 2.0.17
This version does support aarch64.
Ad klibc-specific patchset and track the git repository
to get the (many) fixes for the warnings.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch')
| -rw-r--r-- | meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch new file mode 100644 index 0000000000..4a8968bcc6 --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | From e6aa1f18dc44dc71be3ceada2a96383d22454399 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andrea Adami <andrea.adami@gmail.com> | ||
| 3 | Date: Thu, 19 Apr 2018 00:25:01 +0200 | ||
| 4 | Subject: [PATCH] kexec-syscall.h: work around missing syscall() wrapper | ||
| 5 | |||
| 6 | Fix | ||
| 7 | |||
| 8 | kexec-syscall.h: In function 'kexec_load': | ||
| 9 | kexec-syscall.h:80:16: warning: implicit declaration of function 'syscall' | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [klibc specific] | ||
| 12 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | ||
| 13 | |||
| 14 | --- | ||
| 15 | kexec/kexec-syscall.h | 8 ++++++++ | ||
| 16 | 1 file changed, 8 insertions(+) | ||
| 17 | |||
| 18 | diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h | ||
| 19 | index 33638c2..6b633e4 100644 | ||
| 20 | --- a/kexec/kexec-syscall.h | ||
| 21 | +++ b/kexec/kexec-syscall.h | ||
| 22 | @@ -77,7 +77,11 @@ struct kexec_segment; | ||
| 23 | static inline long kexec_load(void *entry, unsigned long nr_segments, | ||
| 24 | struct kexec_segment *segments, unsigned long flags) | ||
| 25 | { | ||
| 26 | +#ifndef __KLIBC__ | ||
| 27 | return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags); | ||
| 28 | +#else | ||
| 29 | + return (long) kexec_load(entry, nr_segments, segments, flags); | ||
| 30 | +#endif | ||
| 31 | } | ||
| 32 | |||
| 33 | static inline int is_kexec_file_load_implemented(void) { | ||
| 34 | @@ -90,8 +94,12 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, | ||
| 35 | unsigned long cmdline_len, const char *cmdline_ptr, | ||
| 36 | unsigned long flags) | ||
| 37 | { | ||
| 38 | +#ifndef __KLIBC__ | ||
| 39 | return (long) syscall(__NR_kexec_file_load, kernel_fd, initrd_fd, | ||
| 40 | cmdline_len, cmdline_ptr, flags); | ||
| 41 | +#else | ||
| 42 | + return -1; | ||
| 43 | +#endif | ||
| 44 | } | ||
| 45 | |||
| 46 | #define KEXEC_ON_CRASH 0x00000001 | ||
| 47 | -- | ||
| 48 | 2.7.4 | ||
| 49 | |||
