diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-10-18 14:00:01 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-10-18 14:02:15 +0200 |
| commit | 183fff74671bb2089da8118b99c2916d7b0f6c98 (patch) | |
| tree | 506b0ceb751fd3846a5d6b17768b642bccaaedf1 | |
| parent | 6427125195cfbac84c38a10823ee20cafd3c1189 (diff) | |
| download | ptxdist-183fff74671bb2089da8118b99c2916d7b0f6c98.tar.gz ptxdist-183fff74671bb2089da8118b99c2916d7b0f6c98.tar.xz | |
systemd: add patch for correct __NR_name_to_handle_at on !x86
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
3 files changed, 41 insertions, 2 deletions
diff --git a/patches/systemd-194/0001-check-for-name_to_handle_at-declaration-instead-of-i.patch b/patches/systemd-194/0001-check-for-name_to_handle_at-declaration-instead-of-i.patch index 85aacac1f..324a2c174 100644 --- a/patches/systemd-194/0001-check-for-name_to_handle_at-declaration-instead-of-i.patch +++ b/patches/systemd-194/0001-check-for-name_to_handle_at-declaration-instead-of-i.patch @@ -33,7 +33,7 @@ index 5d7d0c2..b543dbc 100644 # This makes sure pkg.m4 is available. m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) diff --git a/src/shared/missing.h b/src/shared/missing.h -index 14abe4e..de68327 100644 +index 14abe4e..1a31066 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -218,7 +218,7 @@ static inline pid_t gettid(void) { diff --git a/patches/systemd-194/0002-make-sure-__NR_name_to_handle_at-is-correctly-define.patch b/patches/systemd-194/0002-make-sure-__NR_name_to_handle_at-is-correctly-define.patch new file mode 100644 index 000000000..ebe3524b0 --- /dev/null +++ b/patches/systemd-194/0002-make-sure-__NR_name_to_handle_at-is-correctly-define.patch @@ -0,0 +1,38 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 18 Oct 2012 12:59:36 +0200 +Subject: [PATCH] make sure __NR_name_to_handle_at is correctly defined + +341 is only valid for x86, so don't use it for other architectures. +Add the correct numbers for ARM and PowerPC while at it. +--- + src/shared/missing.h | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/src/shared/missing.h b/src/shared/missing.h +index 1a31066..1965319 100644 +--- a/src/shared/missing.h ++++ b/src/shared/missing.h +@@ -212,10 +212,22 @@ static inline pid_t gettid(void) { + # ifndef __NR_name_to_handle_at + # define __NR_name_to_handle_at 303 + # endif +-#else ++#elif __i386__ + # ifndef __NR_name_to_handle_at + # define __NR_name_to_handle_at 341 + # endif ++#elif defined __arm__ ++# ifndef __NR_name_to_handle_at ++# define __NR_name_to_handle_at 370 ++# endif ++#elif defined __powerpc__ ++# ifndef __NR_name_to_handle_at ++# define __NR_name_to_handle_at 345 ++# endif ++#else ++# ifndef __NR_name_to_handle_at ++# error __NR_name_to_handle_at is not defined ++# endif + #endif + + #if !HAVE_DECL_NAME_TO_HANDLE_AT diff --git a/patches/systemd-194/series b/patches/systemd-194/series index 64c625ffb..94ac8b80a 100644 --- a/patches/systemd-194/series +++ b/patches/systemd-194/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-check-for-name_to_handle_at-declaration-instead-of-i.patch -# 27884b55b2a65335a27300a6b0cad3bd - git-ptx-patches magic +0002-make-sure-__NR_name_to_handle_at-is-correctly-define.patch +# 322eedd8c9a71c198f80f585b0d63d4b - git-ptx-patches magic |