Skip to contentSkip to conversation

security/umip_basic_test: Fix config constraints

PATCH New Cyril Hrubis 2 participants 2 messages Nov 9, 2020 – Nov 10, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 security/umip_basic_test: Fix config constraints

Since linux-5.5 UMIP kconfig changed from "CONFIG_X86_INTEL_UMIP=y" to "CONFIG_X86_UMIP=y" fix this by accepting either of these two.

---
 testcases/kernel/security/umip/umip_basic_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
testcases/kernel/security/umip/umip_basic_test.c +1 -1
index 1baa26c52..13c317022 100644
@@ -171,7 +171,7 @@ static struct tst_test test = {
 	.forks_child = 1,
 	.test = verify_umip_instruction,
 	.needs_kconfigs = (const char *[]){
-		"CONFIG_X86_INTEL_UMIP=y",
+		"CONFIG_X86_INTEL_UMIP=y | CONFIG_X86_UMIP=y",
 		NULL
 	},
 	.needs_root = 1,
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 security/umip_basic_test: Fix config constraints

Thanks a lot, Cyril!

Quoted 25 lines · Cyril Hrubis

Since linux-5.5 UMIP kconfig changed from "CONFIG_X86_INTEL_UMIP=y" to "CONFIG_X86_UMIP=y" fix this by accepting either of these two.

---
 testcases/kernel/security/umip/umip_basic_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
testcases/kernel/security/umip/umip_basic_test.c +1 -1
index 1baa26c52..13c317022 100644
@@ -171,7 +171,7 @@ static struct tst_test test = {
 	.forks_child = 1,
 	.test = verify_umip_instruction,
 	.needs_kconfigs = (const char *[]){
-		"CONFIG_X86_INTEL_UMIP=y",
+		"CONFIG_X86_INTEL_UMIP=y | CONFIG_X86_UMIP=y",
 		NULL
 	},
 	.needs_root = 1,
Signature · 1 line
2.26.2