From c38bfdc85aae0c6d1458269c0e063c2f4a116711 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 26 Jun 2006 13:58:44 +0200 Subject: [PATCH] [PATCH] x86_64: Move VM86 config into arch/i386/Kconfig Architecture specific configs like this have no business at all in init/Kconfig. This prevents it from being set on x86-64 Pointed out by H.Peter Anvin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- arch/i386/Kconfig | 9 +++++++++ init/Kconfig | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 2206bf6637de..0f8da3bea1d1 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -324,6 +324,15 @@ config X86_MCE_P4THERMAL Enabling this feature will cause a message to be printed when the P4 enters thermal throttling. +config VM86 + default y + bool "Enable VM86 support" if EMBEDDED + help + This option is required by programs like DOSEMU to run 16-bit legacy + code on X86 processors. It also may be needed by software like + XFree86 to initialize some video cards via BIOS. Disabling this + option saves about 6k. + config TOSHIBA tristate "Toshiba Laptop support" ---help--- diff --git a/init/Kconfig b/init/Kconfig index e0358f3946a1..36b02d5924e9 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -236,16 +236,6 @@ config UID16 help This enables the legacy 16-bit UID syscall wrappers. -config VM86 - depends X86 - default y - bool "Enable VM86 support" if EMBEDDED - help - This option is required by programs like DOSEMU to run 16-bit legacy - code on X86 processors. It also may be needed by software like - XFree86 to initialize some video cards via BIOS. Disabling this - option saves about 6k. - config CC_OPTIMIZE_FOR_SIZE bool "Optimize for size (Look out for broken compilers!)" default y -- 2.11.0