From b0e507f39dbbca89c462912a2f03e8422f89f096 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 25 Mar 2016 23:48:48 +0000 Subject: [PATCH] sparc64: fix decoding of mknod and mknodat syscalls for sparc personality Remove remnants of solaris personality support in mknod parser that resulted to sparc personality being decoded as old solaris personality. This complements commit v4.10-45-gdf4dd8b and fixes commit v4.10-46-g588a90f. * mknod.c (decode_mknod) [SPARC || SPARC64]: Remove. --- mknod.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mknod.c b/mknod.c index ca19068f..14d9ddd7 100644 --- a/mknod.c +++ b/mknod.c @@ -54,14 +54,7 @@ decode_mknod(struct tcb *tcp, int offset) switch (mode & S_IFMT) { case S_IFCHR: case S_IFBLK: -#if defined(SPARC) || defined(SPARC64) - if (current_personality == 1) - tprintf(", makedev(%lu, %lu)", - (unsigned long) ((tcp->u_arg[offset + 2] >> 18) & 0x3fff), - (unsigned long) (tcp->u_arg[offset + 2] & 0x3ffff)); - else -#endif /* SPARC || SPARC64 */ - tprintf(", makedev(%lu, %lu)", + tprintf(", makedev(%lu, %lu)", (unsigned long) major(tcp->u_arg[offset + 2]), (unsigned long) minor(tcp->u_arg[offset + 2])); break; -- 2.50.1