| Message ID | 20201109141948.25412-1-chrubis@suse.cz |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [COMMITTED] security/umip_basic_test: Fix config constraints | expand |
Thanks a lot, Cyril! On 2020-11-09 at 15:19:48 +0100, Cyril Hrubis wrote: > 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. > > Signed-off-by: Cyril Hrubis <chrubis@suse.cz> > Reported-by: Pengfei Xu <pengfei.xu@intel.com> > --- > testcases/kernel/security/umip/umip_basic_test.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/testcases/kernel/security/umip/umip_basic_test.c b/testcases/kernel/security/umip/umip_basic_test.c > index 1baa26c52..13c317022 100644 > --- a/testcases/kernel/security/umip/umip_basic_test.c > +++ b/testcases/kernel/security/umip/umip_basic_test.c > @@ -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, > -- > 2.26.2 >
diff --git a/testcases/kernel/security/umip/umip_basic_test.c b/testcases/kernel/security/umip/umip_basic_test.c index 1baa26c52..13c317022 100644 --- a/testcases/kernel/security/umip/umip_basic_test.c +++ b/testcases/kernel/security/umip/umip_basic_test.c @@ -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,
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. Signed-off-by: Cyril Hrubis <chrubis@suse.cz> Reported-by: Pengfei Xu <pengfei.xu@intel.com> --- testcases/kernel/security/umip/umip_basic_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)