Merge tag 'asm-generic-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

[linux-2.6-microblaze.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5509c82..1146b85 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -119,6 +119,7 @@ config X86
        select ARCH_WANT_HUGE_PMD_SHARE
        select ARCH_WANT_LD_ORPHAN_WARN
        select ARCH_WANTS_THP_SWAP              if X86_64
+       select ARCH_HAS_PARANOID_L1D_FLUSH
        select BUILDTIME_TABLE_SORT
        select CLKEVT_I8253
        select CLOCKSOURCE_VALIDATE_LAST_CYCLE
@@ -200,7 +201,6 @@ config X86
        select HAVE_FUNCTION_TRACER
        select HAVE_GCC_PLUGINS
        select HAVE_HW_BREAKPOINT
-       select HAVE_IDE
        select HAVE_IOREMAP_PROT
        select HAVE_IRQ_EXIT_ON_IRQ_STACK       if X86_64
        select HAVE_IRQ_TIME_ACCOUNTING
@@ -2765,32 +2765,6 @@ config AMD_NB
        def_bool y
        depends on CPU_SUP_AMD && PCI
 
-config X86_SYSFB
-       bool "Mark VGA/VBE/EFI FB as generic system framebuffer"
-       help
-         Firmwares often provide initial graphics framebuffers so the BIOS,
-         bootloader or kernel can show basic video-output during boot for
-         user-guidance and debugging. Historically, x86 used the VESA BIOS
-         Extensions and EFI-framebuffers for this, which are mostly limited
-         to x86.
-         This option, if enabled, marks VGA/VBE/EFI framebuffers as generic
-         framebuffers so the new generic system-framebuffer drivers can be
-         used on x86. If the framebuffer is not compatible with the generic
-         modes, it is advertised as fallback platform framebuffer so legacy
-         drivers like efifb, vesafb and uvesafb can pick it up.
-         If this option is not selected, all system framebuffers are always
-         marked as fallback platform framebuffers as usual.
-
-         Note: Legacy fbdev drivers, including vesafb, efifb, uvesafb, will
-         not be able to pick up generic system framebuffers if this option
-         is selected. You are highly encouraged to enable simplefb as
-         replacement if you select this option. simplefb can correctly deal
-         with generic system framebuffers. But you should still keep vesafb
-         and others enabled as fallback if a system framebuffer is
-         incompatible with simplefb.
-
-         If unsure, say Y.
-
 endmenu