diff options
| author | Ingo Molnar | 2021-02-12 13:36:43 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2021-02-12 13:36:43 +0100 |
| commit | a3251c1a36f595046bea03935ebe37a1e1f1f1d7 (patch) | |
| tree | 14b51f8bf1d7e1bb35697cb4704255b51b15baa9 /arch/parisc/Kconfig | |
| parent | 72f40a2823d6e16229ab58b898c6f22044e5222f (diff) | |
| parent | ab234a260b1f625b26cbefa93ca365b0ae66df33 (diff) | |
Merge branch 'x86/paravirt' into x86/entry
Merge in the recent paravirt changes to resolve conflicts caused
by objtool annotations.
Conflicts:
arch/x86/xen/xen-asm.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/Kconfig')
| -rw-r--r-- | arch/parisc/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 7cd88c0a9a32..0840b7e5be65 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -203,9 +203,8 @@ config PREFETCH depends on PA8X00 || PA7200 config MLONGCALLS - bool "Enable the -mlong-calls compiler option for big kernels" - default y if !MODULES || UBSAN || FTRACE - default n + def_bool y if !MODULES || UBSAN || FTRACE + bool "Enable the -mlong-calls compiler option for big kernels" if MODULES && !UBSAN && !FTRACE depends on PA8X00 help If you configure the kernel to include many drivers built-in instead |