diff -Naur -X exclude-files ac_cur/arch/um/config.in ac/arch/um/config.in --- ac_cur/arch/um/config.in Sat Aug 4 21:52:48 2001 +++ ac/arch/um/config.in Sat Aug 4 21:57:41 2001 @@ -16,10 +16,8 @@ mainmenu_option next_comment comment 'Processor features' -bool 'Symmetric multi-processing support' CONFIG_SMP comment 'General Setup' define_bool CONFIG_STDIO_CONSOLE y -bool 'Enable loadable module support' CONFIG_MODULES bool 'Networking support' CONFIG_NET bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT @@ -30,14 +28,30 @@ bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256 +fi bool 'Virtual serial line' CONFIG_SSL tristate 'Host filesystem' CONFIG_HOSTFS bool 'Management console' CONFIG_MCONSOLE +endmenu + +mainmenu_option next_comment +comment 'Loadable module support' +bool 'Enable loadable module support' CONFIG_MODULES +if [ "$CONFIG_MODULES" = "y" ]; then +# MODVERSIONS does not yet work in this architecture +# bool ' Set version information on all module symbols' CONFIG_MODVERSIONS + bool ' Kernel module loader' CONFIG_KMOD fi endmenu +# SMP doesn't work in UML yet +#mainmenu_option next_comment +#comment 'Processor features' +# bool 'Symmetric multi-processing support' CONFIG_SMP +#endmenu + mainmenu_option next_comment -comment 'Block devices' +comment 'Devices' define_bool CONFIG_BLK_DEV_UBD y bool 'Always do synchronous disk IO for UBD' CONFIG_BLK_DEV_UBD_SYNC tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP @@ -47,6 +61,7 @@ int ' Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096 fi dep_bool ' Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM +tristate 'IO memory driver' CONFIG_IOMEM endmenu if [ "$CONFIG_NET" = "y" ]; then @@ -57,12 +72,18 @@ mainmenu_option next_comment comment 'Network device support' - bool 'Network device support' CONFIG_UML_NET - if [ "$CONFIG_UML_NET" = "y" ]; then - bool 'Ethertap transport' CONFIG_NET_ETHERTAP - bool 'Daemon transport' CONFIG_NET_DAEMON - bool 'Slip transport' CONFIG_NET_SLIP - bool 'Multicast transport' CONFIG_NET_MCAST + bool 'Network device support' CONFIG_NETDEVICES + if [ "$CONFIG_NETDEVICES" = "y" ]; then + bool ' Virtual network device' CONFIG_UML_NET + if [ "$CONFIG_UML_NET" != "n" ]; then + bool ' Ethertap transport' CONFIG_UML_NET_ETHERTAP + bool ' SLIP transport' CONFIG_UML_NET_SLIP + bool ' Daemon transport' CONFIG_UML_NET_DAEMON + bool ' Multicast transport' CONFIG_UML_NET_MCAST + fi + + dep_tristate ' Ethertap network tap (EXPERIMENTAL)' CONFIG_ETHERTAP $CONFIG_NETLINK + tristate ' Universal TUN/TAP device driver support' CONFIG_TUN fi endmenu fi diff -Naur -X exclude-files ac_cur/arch/um/defconfig ac/arch/um/defconfig --- ac_cur/arch/um/defconfig Sat Aug 4 21:52:48 2001 +++ ac/arch/um/defconfig Sat Aug 4 21:58:32 2001 @@ -16,9 +16,7 @@ # # General Setup # -# CONFIG_SMP is not set CONFIG_STDIO_CONSOLE=y -CONFIG_MODULES=y CONFIG_NET=y CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y @@ -33,7 +31,13 @@ CONFIG_MCONSOLE=y # -# Block devices +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_KMOD is not set + +# +# Devices # CONFIG_BLK_DEV_UBD=y # CONFIG_BLK_DEV_UBD_SYNC is not set @@ -42,12 +46,15 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_INITRD=y +CONFIG_IOMEM=y # # Networking options # # CONFIG_PACKET is not set -# CONFIG_NETLINK is not set +CONFIG_NETLINK=y +# CONFIG_RTNETLINK is not set +# CONFIG_NETLINK_DEV is not set # CONFIG_NETFILTER is not set # CONFIG_FILTER is not set CONFIG_UNIX=y @@ -87,11 +94,14 @@ # # Network device support # +CONFIG_NETDEVICES=y CONFIG_UML_NET=y -CONFIG_NET_ETHERTAP=y -CONFIG_NET_DAEMON=y -CONFIG_NET_SLIP=y -CONFIG_NET_MCAST=y +CONFIG_UML_NET_ETHERTAP=y +CONFIG_UML_NET_SLIP=y +CONFIG_UML_NET_DAEMON=y +CONFIG_UML_NET_MCAST=y +CONFIG_ETHERTAP=y +CONFIG_TUN=y # # File systems diff -Naur -X exclude-files ac_cur/arch/um/drivers/Makefile ac/arch/um/drivers/Makefile --- ac_cur/arch/um/drivers/Makefile Sat Aug 4 21:52:48 2001 +++ ac/arch/um/drivers/Makefile Sat Aug 4 21:57:41 2001 @@ -5,7 +5,7 @@ O_TARGET := um_drivers.o -obj-y = +obj-y = obj-m = EXTRA_CFLAGS = -I../include @@ -38,10 +38,10 @@ obj-$(CONFIG_STDIO_CONSOLE) += chan_user.o chan_kern.o obj-$(CONFIG_BLK_DEV_UBD) += ubd.o ubd_user.o obj-$(CONFIG_UML_NET) += net_kern.o -obj-$(CONFIG_NET_SLIP) += slip_user.o slip_kern.o -obj-$(CONFIG_NET_ETHERTAP) += ethertap_user.o ethertap_kern.o -obj-$(CONFIG_NET_DAEMON) += daemon_kern.o daemon_user.o -obj-$(CONFIG_NET_MCAST) += mcast_user.o mcast_kern.o +obj-$(CONFIG_UML_NET_SLIP) += slip_user.o slip_kern.o +obj-$(CONFIG_UML_NET_ETHERTAP) += ethertap_user.o ethertap_kern.o +obj-$(CONFIG_UML_NET_DAEMON) += daemon_kern.o daemon_user.o +obj-$(CONFIG_UML_NET_MCAST) += mcast_user.o mcast_kern.o obj-$(CONFIG_MCONSOLE) += mconsole_kern.o mconsole_user.o override CFLAGS = diff -Naur -X exclude-files ac_cur/arch/um/drivers/net_kern.c ac/arch/um/drivers/net_kern.c --- ac_cur/arch/um/drivers/net_kern.c Sat Aug 4 21:52:48 2001 +++ ac/arch/um/drivers/net_kern.c Sat Aug 4 21:57:41 2001 @@ -54,25 +54,25 @@ return(1); } str++; -#ifdef CONFIG_NET_ETHERTAP +#ifdef CONFIG_UML_NET_ETHERTAP if(!strncmp(str, "ethertap", strlen("ethertap"))){ ethertap_setup(&str[strlen("ethertap")], &devices[n]); return(1); } #endif -#ifdef CONFIG_NET_DAEMON +#ifdef CONFIG_UML_NET_DAEMON if(!strncmp(str, "daemon", strlen("daemon"))){ daemon_setup(&str[strlen("daemon")], &devices[n]); return(1); } #endif -#ifdef CONFIG_NET_SLIP +#ifdef CONFIG_UML_NET_SLIP if(!strncmp(str, "slip", strlen("slip"))){ slip_setup(&str[strlen("slip")], &devices[n]); return(1); } #endif -#ifdef CONFIG_NET_MCAST +#ifdef CONFIG_UML_NET_MCAST if(!strncmp(str, "mcast", strlen("mcast"))){ mcast_setup(&str[strlen("mcast")], &devices[n]); return(1);