diff mbox

[2/2] systemd: Properly define the __NR_memfd_create macro for MIPS

Message ID 1415103861-64413-2-git-send-email-Vincent.Riera@imgtec.com
State Accepted
Commit fc902d92d7dbb23936ecc2df3dfba7f96f8ae7be
Headers show

Commit Message

Vicente Olivert Riera Nov. 4, 2014, 12:24 p.m. UTC 
This is an upstream patch which has been applied to the master branch
and I have adapted it to make it apply to the v216 version.

v217 is not fixed. This patch can be removed when we bump to v218.

Upstream commit:
  http://cgit.freedesktop.org/systemd/systemd/commit/?id=e6c019026b8cfd27a997e6e6ed1349f8f289b7e2

Fixes:
  http://autobuild.buildroot.net/results/596/59617a822fb2c8961881dd78a0dc8e41bdb14ede/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 ...fine-the-__NR_memfd_create-macro-for-MIPS.patch |   60 ++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)
 create mode 100644 package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch

Comments

Peter Korsgaard Nov. 7, 2014, 1:35 p.m. UTC | #1 
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > This is an upstream patch which has been applied to the master branch
 > and I have adapted it to make it apply to the v216 version.

 > v217 is not fixed. This patch can be removed when we bump to v218.

 > Upstream commit:
 >   http://cgit.freedesktop.org/systemd/systemd/commit/?id=e6c019026b8cfd27a997e6e6ed1349f8f289b7e2

 > Fixes:
 >   http://autobuild.buildroot.net/results/596/59617a822fb2c8961881dd78a0dc8e41bdb14ede/

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Committed, thanks.
diff mbox

Patch

diff --git a/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch b/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch
new file mode 100644
index 0000000..6aca13c
--- /dev/null
+++ b/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch
@@ -0,0 +1,60 @@ 
+Properly define the __NR_memfd_create macro for MIPS
+
+This is an upstream patch which has been applied to the master branch
+and I have adapted it to make it apply to the v216 version.
+
+Upstream commit:
+  http://cgit.freedesktop.org/systemd/systemd/commit/?id=e6c019026b8cfd27a997e6e6ed1349f8f289b7e2
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+From cdd25569e583ccfff3aef0eda175a2d07c00f859 Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date: Tue, 4 Nov 2014 10:49:58 +0000
+Subject: [PATCH] Properly define the __NR_memfd_create macro for MIPS
+
+This macro exists for MIPS since v3.17:
+  https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=42944521af97a3b25516f15f3149aec3779656dc
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ src/shared/missing.h |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index 3ff1a21..6888163 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -152,6 +152,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
+ #    ifndef __NR_fanotify_mark
+ #      define __NR_fanotify_mark 4337
+ #    endif
++#    ifndef __NR_memfd_create
++#      define __NR_memfd_create 4354
++#    endif
+ #  elif _MIPS_SIM == _MIPS_SIM_NABI32
+ #    ifndef __NR_fanotify_init
+ #      define __NR_fanotify_init 6300
+@@ -159,6 +162,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
+ #    ifndef __NR_fanotify_mark
+ #      define __NR_fanotify_mark 6301
+ #    endif
++#    ifndef __NR_memfd_create
++#      define __NR_memfd_create 6318
++#    endif
+ #  elif _MIPS_SIM == _MIPS_SIM_ABI64
+ #    ifndef __NR_fanotify_init
+ #      define __NR_fanotify_init 5295
+@@ -166,6 +172,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
+ #    ifndef __NR_fanotify_mark
+ #      define __NR_fanotify_mark 5296
+ #    endif
++#    ifndef __NR_memfd_create
++#      define __NR_memfd_create 5314
++#    endif
+ #  endif
+ #else
+ #  ifndef __NR_fanotify_init
+-- 
+1.7.1
+