iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] uml: Rename Kconfig files to be like the other arches

Browse Source 
To the extent that sub-Kconfig files exist elsewhere in the tree, they are
named Kconfig.foo, rather than the Kconfig_foo that UML has.  This patch
brings the names in line with the rest of the tree.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike 2005-09-03 15:57:12 -07:00 committed by Linus Torvalds
parent 96e59245e1
commit 08b178ebf3
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/um/Kconfig
View File

@ -73,7 +73,7 @@ config MODE_SKAS
to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this
option will shrink the UML binary slightly. option will shrink the UML binary slightly.
source "arch/um/Kconfig_arch" source "arch/um/Kconfig.arch"
source "mm/Kconfig" source "mm/Kconfig"
config LD_SCRIPT_STATIC config LD_SCRIPT_STATIC
@ -279,7 +279,7 @@ source "net/Kconfig"
source "drivers/base/Kconfig" source "drivers/base/Kconfig"
source "arch/um/Kconfig_char" source "arch/um/Kconfig.char"
source "drivers/block/Kconfig" source "drivers/block/Kconfig"
@ -287,7 +287,7 @@ config NETDEVICES
bool bool
default NET default NET
source "arch/um/Kconfig_net" source "arch/um/Kconfig.net"
source "drivers/net/Kconfig" source "drivers/net/Kconfig"
@ -311,7 +311,7 @@ config GENERIC_ISA_DMA
depends on SCSI depends on SCSI
default y default y
source "arch/um/Kconfig_scsi" source "arch/um/Kconfig.scsi"
endmenu endmenu

0
arch/um/Kconfig_char → arch/um/Kconfig.char
View File

0
arch/um/Kconfig_i386 → arch/um/Kconfig.i386
View File

12
arch/um/Kconfig_net → arch/um/Kconfig.net
View File

@ -34,7 +34,7 @@ config UML_NET_ETHERTAP
link with the host. link with the host.
To use this, your host kernel must have support for Ethertap To use this, your host kernel must have support for Ethertap
devices. Also, if your host kernel is 2.4.x, it must have devices. Also, if your host kernel is 2.4.x, it must have
CONFIG_NETLINK_DEV configured as Y or M. CONFIG_NETLINK_DEV configured as Y or M.
For more information, see For more information, see
@ -43,7 +43,7 @@ config UML_NET_ETHERTAP
networking. networking.
If you'd like to set up an IP network with the host and/or the If you'd like to set up an IP network with the host and/or the
outside world, say Y to this, the Daemon Transport and/or the outside world, say Y to this, the Daemon Transport and/or the
Slip Transport. You'll need at least one of them, but may choose Slip Transport. You'll need at least one of them, but may choose
more than one without conflict. If you don't need UML networking, more than one without conflict. If you don't need UML networking,
say N. say N.
@ -78,7 +78,7 @@ config UML_NET_SLIP
The Ethertap Transport is preferred over slip because of its The Ethertap Transport is preferred over slip because of its
limitations. If you prefer slip, however, say Y here. Otherwise limitations. If you prefer slip, however, say Y here. Otherwise
choose the Multicast transport (to network multiple UMLs on choose the Multicast transport (to network multiple UMLs on
multiple hosts), Ethertap (to network with the host and the multiple hosts), Ethertap (to network with the host and the
outside world), and/or the Daemon transport (to network multiple outside world), and/or the Daemon transport (to network multiple
UMLs on a single host). You may choose more than one without UMLs on a single host). You may choose more than one without
@ -138,7 +138,7 @@ config UML_NET_PCAP
depends on UML_NET && EXPERIMENTAL depends on UML_NET && EXPERIMENTAL
help help
The pcap transport makes a pcap packet stream on the host look The pcap transport makes a pcap packet stream on the host look
like an ethernet device inside UML. This is useful for making like an ethernet device inside UML. This is useful for making
UML act as a network monitor for the host. You must have libcap UML act as a network monitor for the host. You must have libcap
installed in order to build the pcap transport into UML. installed in order to build the pcap transport into UML.
@ -169,11 +169,11 @@ config UML_NET_SLIRP
setup string. The effect of this transport on the UML is similar setup string. The effect of this transport on the UML is similar
that of a host behind a firewall that masquerades all network that of a host behind a firewall that masquerades all network
connections passing through it (but is less secure). connections passing through it (but is less secure).
To use this you should first have slirp compiled somewhere To use this you should first have slirp compiled somewhere
accessible on the host, and have read its documentation. If you accessible on the host, and have read its documentation. If you
don't need UML networking, say N. don't need UML networking, say N.
Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp" Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
endmenu endmenu

0
arch/um/Kconfig_scsi → arch/um/Kconfig.scsi
View File

0
arch/um/Kconfig_x86_64 → arch/um/Kconfig.x86_64
View File

8
arch/um/Makefile
View File

@ -101,10 +101,10 @@ define archhelp
endef endef
ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),)
$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig_$(SUBARCH) $(ARCH_DIR)/Kconfig_arch) $(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
CLEAN_FILES += $(ARCH_DIR)/Kconfig_arch CLEAN_FILES += $(ARCH_DIR)/Kconfig.arch
else else
$(shell cd $(ARCH_DIR) && ln -sf Kconfig_$(SUBARCH) Kconfig_arch) $(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch)
endif endif
prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS)
@ -147,7 +147,7 @@ CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \
MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \ MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \
$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \ $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \
$(ARCH_DIR)/Kconfig_arch $(ARCH_DIR)/Kconfig.arch
archclean: archclean:
$(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util $(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util