summaryrefslogtreecommitdiffstats
path: root/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-07-21 00:45:40 -0700
committerKhem Raj <raj.khem@gmail.com>2019-07-21 09:40:20 -0700
commit4ee778798df2e30362f9138c8988d343a963ab2b (patch)
tree20d53aa5e91c387a477018e7d1e27522958a149c /meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch
parentb44a72a07e13862896e05169faeaebadf671779b (diff)
downloadmeta-openembedded-4ee778798df2e30362f9138c8988d343a963ab2b.tar.gz
kexec-tools-klibc: Refresh patch with no code change
Fixes kexec-tools-klibc-2.0.18+gitAUTOINC+5750980cdb: Patch log indicates that patches do not apply cleanly. [patch-fuzz] Signed-off-by: Khem Raj <raj.khem@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.patch13
1 files changed, 5 insertions, 8 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
index 3020f767ad..a607ce777e 100644
--- 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
@@ -1,4 +1,4 @@
1From 45a80fe7d247898d83edfeabe32b9de80a50a6be Mon Sep 17 00:00:00 2001 1From ab24f236cbc0aa8a3eadde5d71d9d7ea1d979a51 Mon Sep 17 00:00:00 2001
2From: Andrea Adami <andrea.adami@gmail.com> 2From: Andrea Adami <andrea.adami@gmail.com>
3Date: Fri, 31 Aug 2018 11:33:51 +0200 3Date: Fri, 31 Aug 2018 11:33:51 +0200
4Subject: [PATCH] kexec-syscall.h: work around missing syscall() wrapper 4Subject: [PATCH] kexec-syscall.h: work around missing syscall() wrapper
@@ -16,10 +16,10 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
16 1 file changed, 21 insertions(+) 16 1 file changed, 21 insertions(+)
17 17
18diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h 18diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h
19index 33638c2..204007d 100644 19index b96e02a..2a3794d 100644
20--- a/kexec/kexec-syscall.h 20--- a/kexec/kexec-syscall.h
21+++ b/kexec/kexec-syscall.h 21+++ b/kexec/kexec-syscall.h
22@@ -74,11 +74,16 @@ 22@@ -77,11 +77,16 @@
23 23
24 struct kexec_segment; 24 struct kexec_segment;
25 25
@@ -36,7 +36,7 @@ index 33638c2..204007d 100644
36 36
37 static inline int is_kexec_file_load_implemented(void) { 37 static inline int is_kexec_file_load_implemented(void) {
38 if (__NR_kexec_file_load != 0xffffffff) 38 if (__NR_kexec_file_load != 0xffffffff)
39@@ -86,6 +91,21 @@ static inline int is_kexec_file_load_implemented(void) { 39@@ -89,6 +94,21 @@ static inline int is_kexec_file_load_implemented(void) {
40 return 0; 40 return 0;
41 } 41 }
42 42
@@ -58,7 +58,7 @@ index 33638c2..204007d 100644
58 static inline long kexec_file_load(int kernel_fd, int initrd_fd, 58 static inline long kexec_file_load(int kernel_fd, int initrd_fd,
59 unsigned long cmdline_len, const char *cmdline_ptr, 59 unsigned long cmdline_len, const char *cmdline_ptr,
60 unsigned long flags) 60 unsigned long flags)
61@@ -93,6 +113,7 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, 61@@ -96,6 +116,7 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd,
62 return (long) syscall(__NR_kexec_file_load, kernel_fd, initrd_fd, 62 return (long) syscall(__NR_kexec_file_load, kernel_fd, initrd_fd,
63 cmdline_len, cmdline_ptr, flags); 63 cmdline_len, cmdline_ptr, flags);
64 } 64 }
@@ -66,6 +66,3 @@ index 33638c2..204007d 100644
66 66
67 #define KEXEC_ON_CRASH 0x00000001 67 #define KEXEC_ON_CRASH 0x00000001
68 #define KEXEC_PRESERVE_CONTEXT 0x00000002 68 #define KEXEC_PRESERVE_CONTEXT 0x00000002
69--
702.7.4
71