|
 |
05ad79 |
From bbea32299156308ba51a447dc775f320fe3c459b Mon Sep 17 00:00:00 2001
|
|
|
05ad79 |
From: Sami Kerola <kerolasa@iki.fi>
|
|
|
05ad79 |
Date: Sun, 7 Sep 2014 00:16:18 +0100
|
|
|
05ad79 |
Subject: [PATCH 188/189] setarch: use personality() system call when it is
|
|
|
05ad79 |
available
|
|
|
05ad79 |
|
|
|
05ad79 |
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
|
|
|
05ad79 |
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
|
05ad79 |
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1690102
|
|
|
05ad79 |
Upstream: http://github.com/karelzak/util-linux/commit/9ed11cc260a28a64de0c1fa5d94d7cd6273781a5
|
|
|
05ad79 |
---
|
|
|
05ad79 |
sys-utils/setarch.c | 11 +++++++----
|
|
|
05ad79 |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
05ad79 |
|
|
|
05ad79 |
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
|
|
|
05ad79 |
index b03406dd3..bcde78f4c 100644
|
|
|
05ad79 |
--- a/sys-utils/setarch.c
|
|
|
05ad79 |
+++ b/sys-utils/setarch.c
|
|
|
05ad79 |
@@ -24,8 +24,7 @@
|
|
|
05ad79 |
* sparc32 util by Jakub Jelinek (1998, 1999)
|
|
|
05ad79 |
*/
|
|
|
05ad79 |
|
|
|
05ad79 |
-#include <syscall.h>
|
|
|
05ad79 |
-#include <linux/personality.h>
|
|
|
05ad79 |
+#include <sys/personality.h>
|
|
|
05ad79 |
#include <unistd.h>
|
|
|
05ad79 |
#include <stdio.h>
|
|
|
05ad79 |
#include <string.h>
|
|
|
05ad79 |
@@ -37,7 +36,11 @@
|
|
|
05ad79 |
#include "c.h"
|
|
|
05ad79 |
#include "closestream.h"
|
|
|
05ad79 |
|
|
|
05ad79 |
-#define set_pers(pers) ((long)syscall(SYS_personality, pers))
|
|
|
05ad79 |
+#ifndef HAVE_PERSONALITY
|
|
|
05ad79 |
+# include <syscall.h>
|
|
|
05ad79 |
+# define personality(pers) ((long)syscall(SYS_personality, pers))
|
|
|
05ad79 |
+#endif
|
|
|
05ad79 |
+
|
|
|
05ad79 |
|
|
|
05ad79 |
/* Options without equivalent short options */
|
|
|
05ad79 |
enum {
|
|
|
05ad79 |
@@ -220,7 +223,7 @@ set_arch(const char *pers, unsigned long options, int list)
|
|
|
05ad79 |
errx(EXIT_FAILURE, _("%s: Unrecognized architecture"), pers);
|
|
|
05ad79 |
|
|
|
05ad79 |
pers_value = transitions[i].perval | options;
|
|
|
05ad79 |
- if (set_pers(pers_value) == -EINVAL)
|
|
|
05ad79 |
+ if (personality(pers_value) == -EINVAL)
|
|
|
05ad79 |
return 1;
|
|
|
05ad79 |
|
|
|
05ad79 |
uname(&un;;
|
|
|
05ad79 |
--
|
|
|
05ad79 |
2.21.0
|
|
|
05ad79 |
|