On Wed, Feb 03, 2021 at 02:55:26PM -0800, Yu-cheng Yu wrote: > @@ -1252,6 +1260,13 @@ static void __init cpu_parse_early_param(void) > if (cmdline_find_option_bool(boot_command_line, "noxsaves")) > setup_clear_cpu_cap(X86_FEATURE_XSAVES); > > +#ifdef CONFIG_X86_CET > + if (cmdline_find_option_bool(boot_command_line, "no_user_shstk")) > + setup_clear_cpu_cap(X86_FEATURE_SHSTK); > + if (cmdline_find_option_bool(boot_command_line, "no_user_ibt")) > + setup_clear_cpu_cap(X86_FEATURE_IBT); > +#endif Any particular need for the ifdeffery? -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette