tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

um: allow disabling NO_IOMEM

Adjust the kconfig a little to allow disabling NO_IOMEM in UML. To
make an "allyesconfig" with CONFIG_NO_IOMEM=n build, adjust a few
Kconfig things elsewhere and add dummy asm/fb.h and asm/vga.h files.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

authored by

Johannes Berg and committed by
Richard Weinberger 0bbadafd 009c9aa5

+11 -5
+4
arch/um/Kconfig
··· 27 27 default y 28 28 29 29 config NO_IOMEM 30 + bool "disable IOMEM" if EXPERT 31 + default y 32 + 33 + config NO_IOPORT_MAP 30 34 def_bool y 31 35 32 36 config ISA
+2
arch/um/include/asm/Kbuild
··· 7 7 generic-y += emergency-restart.h 8 8 generic-y += exec.h 9 9 generic-y += extable.h 10 + generic-y += fb.h 10 11 generic-y += ftrace.h 11 12 generic-y += futex.h 12 13 generic-y += hw_irq.h ··· 28 27 generic-y += word-at-a-time.h 29 28 generic-y += kprobes.h 30 29 generic-y += mm_hooks.h 30 + generic-y += vga.h
-1
drivers/input/Kconfig
··· 4 4 # 5 5 6 6 menu "Input device support" 7 - depends on !UML 8 7 9 8 config INPUT 10 9 tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT
+1
drivers/input/gameport/Kconfig
··· 4 4 # 5 5 config GAMEPORT 6 6 tristate "Gameport support" 7 + depends on !UML 7 8 help 8 9 Gameport support is for the standard 15-pin PC gameport. If you 9 10 have a joystick, gamepad, gameport card, a soundcard with a gameport
+1
drivers/input/joystick/Kconfig
··· 4 4 # 5 5 menuconfig INPUT_JOYSTICK 6 6 bool "Joysticks/Gamepads" 7 + depends on !UML 7 8 help 8 9 If you have a joystick, 6dof controller, gamepad, steering wheel, 9 10 weapon control system or something like that you can say Y here
+2 -3
drivers/tty/Kconfig
··· 12 12 13 13 config VT 14 14 bool "Virtual terminal" if EXPERT 15 - depends on !UML 16 15 select INPUT 17 - default y 16 + default y if !UML 18 17 help 19 18 If you say Y here, you will get support for terminal devices with 20 19 display and keyboard devices. These are called "virtual" because you ··· 77 78 78 79 config HW_CONSOLE 79 80 bool 80 - depends on VT && !UML 81 + depends on VT 81 82 default y 82 83 83 84 config VT_HW_CONSOLE_BINDING
+1 -1
drivers/video/console/Kconfig
··· 9 9 bool "VGA text console" if EXPERT || !X86 10 10 depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !SUPERH && \ 11 11 (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ 12 - !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390 12 + !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390 && !UML 13 13 default y 14 14 help 15 15 Saying Y here will allow you to use Linux in text mode through a