Merge pull request #1243 from stgraber/master

s390x: Fix seccomp handling of personalities
lxc · Oct 20, 2016 · 0fa4e36 · 0fa4e36
2 parents 514120e + 2b097b7
commit 0fa4e36
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
@@ -377,15 +377,6 @@ static int parse_config_v2(FILE *f, char *line, struct lxc_conf *conf)
 				default_policy_action);
 		if (!compat_ctx[0] || !compat_ctx[1])
 			goto bad;
-#endif
-#ifdef SCMP_ARCH_S390X
-	} else if (native_arch == lxc_seccomp_arch_s390x) {
-		cur_rule_arch = lxc_seccomp_arch_all;
-		compat_arch[0] = SCMP_ARCH_S390X;
-		compat_ctx[0] = get_new_ctx(lxc_seccomp_arch_s390x,
-				default_policy_action);
-		if (!compat_ctx[0])
-			goto bad;
 #endif
 	}