UML 2.5.34
UML has been updated to 2.5.34 and UML 2.4.19-3.
There have been only a few minor changes since UML 2.5.33. This is mostly an update to 2.5.34.
The patch is available at
http://uml-pub.ists.dartmouth.edu/uml/uml-patch-2.5.34-1.bz2
For the other UML mirrors and other downloads, see
http://user-mode-linux.sourceforge.net/dl-sf.html
Other links of interest:
The UML project home page : http://user-mode-linux.sourceforge.net
The UML Community site : http://usermodelinux.org
Jeff
Quoted 3 lines · Jeff Dike
UML has been updated to 2.5.34 and UML 2.4.19-3.
And Linus has merged it.
Congratulations, Jeff.
Quoted 2 lines · [email protected] said:
And Linus has merged it.
Congratulations, Jeff.
Thanks! It's great to finally have it in.
Jeff
Quoted 1 line · Jeff Dike
Thanks! It's great to finally have it in.
Now to get it in 2.4.20 :-)
David
Signature · 2 lines
David Coulson http://davidcoulson.net/ [email protected] http://journal.davidcoulson.net/
Quoted 8 lines · Jeff Dike
UML has been updated to 2.5.34 and UML 2.4.19-3.
There have been only a few minor changes since UML 2.5.33. This is mostly an update to 2.5.34.
The patch is available at
http://uml-pub.ists.dartmouth.edu/uml/uml-patch-2.5.34-1.bz2
Quoted 7 lines
For the other UML mirrors and other downloads, see
http://user-mode-linux.sourceforge.net/dl-sf.htmlOther links of interest:
The UML project home page : http://user-mode-linux.sourceforge.net
The UML Community site : http://usermodelinux.org
And this is a patch to make it compilable (not sure about CLOCK_TICK_RATE and pte_addr_t parts though):
It even boots, great!
----------------------------------------------------------------------
===== include/asm-um/percpu.h 1.1 vs edited =====
include/asm-um/percpu.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef __UM_CACHEFLUSH_H -#define __UM_CACHEFLUSH_H +#ifndef __UM_PERCPU_H +#define __UM_PERCPU_H#include "asm/arch/percpu.h"
===== include/asm-um/pgtable.h 1.1 vs edited =====
include/asm-um/pgtable.h +4 -0
@@ -372,6 +372,10 @@#define kern_addr_valid (addr) (1) +#if !defined(CONFIG_HIGHPTE ) +typedef pte_t *pte_addr_t ; +#endif +#include <asm-generic/pgtable.h> #endif
===== include/asm-um/timex.h 1.1 vs edited =====
include/asm-um/timex.h +2 -0
@@ -7,6 +7,8 @@#define cacheflush_time (0) +#define CLOCK_TICK_RATE 1193180/* Underlying HZ */ +static inline cycles_t get_cycles (void ) {return 0 ;
----------------------------------------------------------------------
Quoted 3 lines
Jeff
Nikita.
Quoted 2 lines · [email protected] said:
And this is a patch to make it compilable (not sure about
CLOCK_TICK_RATEandpte_addr_tparts though):
Where did you get compilation problems? It compiled for me fine.
Jeff
Quoted 4 lines · Jeff Dike
Quoted 2 lines · [email protected] said:
And this is a patch to make it compilable (not sure about
CLOCK_TICK_RATEandpte_addr_tparts though):
pte_addr_t and CLOCK_TICK_RATE were undefined.
Wrong macro in include/asm-um/percpu.h resulted in include/asm-um/cacheflush.h never being included and a macros from the latter undefined also.
By the way, I am talking about Linus BK tree, rather than patches you have posted. Sorry for not mentioning this from the beginning.
Quoted 3 lines
Where did you get compilation problems? It compiled for me fine.
Jeff
Nikita.
Quoted 1 line · [email protected] said:
pte_addr_tandCLOCK_TICK_RATEwere undefined.
Undefined WHERE? You could send me a snippet of your build log.
Quoted 2 lines
By the way, I am talking about Linus BK tree, rather than patches you have posted.
I would not have sent it to Linus if it didn't build. Like I said, it builds here fine. I want to know where it breaks, so I can see it for myself, so I can be sure the fix is right.
Jeff
Quoted 4 lines · Jeff Dike
Quoted 1 line · [email protected] said:
pte_addr_tandCLOCK_TICK_RATEwere undefined.Undefined WHERE? You could send me a snippet of your build log.
Oops, sorry. See below.
Quoted 8 lines
Quoted 3 lines
By the way, I am talking about Linus BK tree, rather than patches you have posted.
I would not have sent it to Linus if it didn't build. Like I said, it builds here fine. I want to know where it breaks, so I can see it for myself, so I can be sure the fix is right.
make[1]: Entering directory /home/nikita/projects/2.5/scripts' make[1]: Leaving directory /home/nikita/projects/2.5/scripts' make -C arch/um/sys-i386/util mk_sc
make[1]: Entering directory /home/nikita/projects/2.5/arch/um/sys-i386/util' make[1]: mk_sc' is up to date.
make[1]: Leaving directory `/home/nikita/projects/2.5/arch/um/sys-i386/util'
Generating include/linux/version.h (unchanged)
Starting the build. KBUILD_BUILTIN=1 KBUILD_MODULES=
make[1]: Entering directory `/home/nikita/projects/2.5/init'
gcc -Wp,-MD,./.main.o.d -D__KERNEL__ -I/home/nikita/projects/2.5/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -g -U__i386__ -Ui386 -D__arch_um__ -DSUBARCH=\"i386\" -D_LARGEFILE64_SOURCE -I/home/nikita/projects/2.5/arch/um/include -Derrno=kernel_errno -nostdinc -iwithprefix include -DKBUILD_BASENAME=main -c -o main.o main.c
In file included from /home/nikita/projects/2.5/include/linux/pagemap.h:7,
from /home/nikita/projects/2.5/include/linux/blkdev.h:9,
from /home/nikita/projects/2.5/include/linux/blk.h:4,
from main.c:25:/home/nikita/projects/2.5/include/linux/mm.h:164: parse error before `pte_addr_t' /home/nikita/projects/2.5/include/linux/mm.h:164: warning: no semicolon at end of struct or union /home/nikita/projects/2.5/include/linux/mm.h:164: warning: no semicolon at end of struct or union /home/nikita/projects/2.5/include/linux/mm.h:165: warning: type defaults to int' in declaration of pte' /home/nikita/projects/2.5/include/linux/mm.h:165: warning: data definition has no type or storage class /home/nikita/projects/2.5/include/linux/mm.h:182: parse error before `}'
In file included from /home/nikita/projects/2.5/include/linux/pagemap.h:7,
from /home/nikita/projects/2.5/include/linux/blkdev.h:9,
from /home/nikita/projects/2.5/include/linux/blk.h:4,
from main.c:25:/home/nikita/projects/2.5/include/linux/mm.h: In function `put_page':/home/nikita/projects/2.5/include/linux/mm.h:217: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h:217: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h:217: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h:217: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h: In function `page_zone':/home/nikita/projects/2.5/include/linux/mm.h:282: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h:283: warning: control reaches end of non-void function /home/nikita/projects/2.5/include/linux/mm.h: In function `set_page_zone':/home/nikita/projects/2.5/include/linux/mm.h:287: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h:288: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h: In function `page_mapped':/home/nikita/projects/2.5/include/linux/mm.h:331: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h:332: warning: control reaches end of non-void function /home/nikita/projects/2.5/include/linux/mm.h: In function `set_page_dirty':/home/nikita/projects/2.5/include/linux/mm.h:387: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/mm.h:390: dereferencing pointer to incomplete type In file included from /home/nikita/projects/2.5/include/linux/pagemap.h:10,
from /home/nikita/projects/2.5/include/linux/blkdev.h:9,
from /home/nikita/projects/2.5/include/linux/blk.h:4,
from main.c:25:/home/nikita/projects/2.5/include/linux/highmem.h: In function `kmap':/home/nikita/projects/2.5/include/linux/highmem.h:23: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h:23: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h: In function `clear_user_highpage':/home/nikita/projects/2.5/include/linux/highmem.h:36: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h:36: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h: In function `clear_highpage':/home/nikita/projects/2.5/include/linux/highmem.h:43: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h:43: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h: In function `memclear_highpage_flush':/home/nikita/projects/2.5/include/linux/highmem.h:58: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h:58: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h: In function `copy_user_highpage':/home/nikita/projects/2.5/include/linux/highmem.h:69: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h:69: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h:70: arithmetic on pointer to an incomplete type /home/nikita/projects/2.5/include/linux/highmem.h:70: arithmetic on pointer to an incomplete type In file included from /home/nikita/projects/2.5/include/linux/blkdev.h:9,
from /home/nikita/projects/2.5/include/linux/blk.h:4,
from main.c:25:/home/nikita/projects/2.5/include/linux/pagemap.h: In function `___add_to_page_cache':/home/nikita/projects/2.5/include/linux/pagemap.h:69: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/pagemap.h:70: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/pagemap.h:71: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/pagemap.h: In function `wait_on_page_locked':/home/nikita/projects/2.5/include/linux/pagemap.h:95: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/pagemap.h:95: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/pagemap.h: In function `wait_on_page_writeback':/home/nikita/projects/2.5/include/linux/pagemap.h:104: dereferencing pointer to incomplete type /home/nikita/projects/2.5/include/linux/pagemap.h:104: dereferencing pointer to incomplete type make[1]: *** [main.o] Error 1
make[1]: Leaving directory `/home/nikita/projects/2.5/init'
make: *** [init] Error 2
I am attaching .config
Quoted 2 lines
Jeff
Nikita.
#
# Automatically generated by make menuconfig: don't edit #CONFIG_USERMODE=y
# CONFIG_ISA is not set
# CONFIG_SBUS is not set
# CONFIG_PCI is not setCONFIG_UID16=yCONFIG_RWSEM_GENERIC_SPINLOCK=y
#
# Code maturity level options
#CONFIG_EXPERIMENTAL=y
#
# General Setup
#CONFIG_NET=y
# CONFIG_SYSVIPC is not set
# CONFIG_BSD_PROCESS_ACCT is not setCONFIG_SYSCTL=y
# CONFIG_BINFMT_AOUT is not setCONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not setCONFIG_HOSTFS=yCONFIG_MCONSOLE=yCONFIG_MAGIC_SYSRQ=y
# CONFIG_HOST_2G_2G is not set
# CONFIG_UML_SMP is not set
# CONFIG_SMP is not setCONFIG_NEST_LEVEL=0CONFIG_KERNEL_HALF_GIGS=1
#
# Loadable module support
#
# CONFIG_MODULES is not set
#
# Character Devices
#CONFIG_STDIO_CONSOLE=yCONFIG_SSL=yCONFIG_FD_CHAN=yCONFIG_NULL_CHAN=yCONFIG_PORT_CHAN=yCONFIG_PTY_CHAN=yCONFIG_TTY_CHAN=yCONFIG_XTERM_CHAN=yCONFIG_CON_ZERO_CHAN="fd:0,fd:1"CONFIG_CON_CHAN="xterm"CONFIG_SSL_CHAN="pty"CONFIG_UNIX98_PTYS=yCONFIG_UNIX98_PTY_COUNT=256
# CONFIG_WATCHDOG is not set
# CONFIG_WATCHDOG_NOWAYOUT is not set
# CONFIG_SOFT_WATCHDOG is not set
# CONFIG_UML_WATCHDOG is not setCONFIG_UML_SOUND=yCONFIG_SOUND=yCONFIG_HOSTAUDIO=y
# CONFIG_TTY_LOG is not set
#
# Block Devices
#CONFIG_BLK_DEV_UBD=y
# CONFIG_BLK_DEV_UBD_SYNC is not setCONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_NBD is not setCONFIG_BLK_DEV_RAM=yCONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_MMAPPER is not setCONFIG_NETDEVICES=y
#
# Network Devices
#CONFIG_UML_NET=yCONFIG_UML_NET_ETHERTAP=yCONFIG_UML_NET_TUNTAP=yCONFIG_UML_NET_SLIP=yCONFIG_UML_NET_DAEMON=yCONFIG_UML_NET_MCAST=yCONFIG_DUMMY=y
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not setCONFIG_TUN=yCONFIG_PPP=y
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
# CONFIG_PPP_ASYNC is not set
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_DEFLATE is not set
# CONFIG_PPP_BSDCOMP is not set
# CONFIG_PPPOE is not setCONFIG_SLIP=y
# CONFIG_SLIP_COMPRESSED is not set
# CONFIG_SLIP_SMART is not set
# CONFIG_SLIP_MODE_SLIP6 is not set
#
# Networking options
#CONFIG_PACKET=yCONFIG_PACKET_MMAP=y
# CONFIG_NETLINK_DEV is not set
# CONFIG_NETFILTER is not set
# CONFIG_FILTER is not setCONFIG_UNIX=yCONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
#
# SCTP Configuration (EXPERIMENTAL)
#CONFIG_IPV6_SCTP__=y
# CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_LLC is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_DEV_APPLETALK is not set
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_FASTROUTE is not set
# CONFIG_NET_HW_FLOWCONTROL is not set
#
# QoS and/or fair queueing
#
# CONFIG_NET_SCHED is not set
#
# File systems
#
# CONFIG_QUOTA is not set
# CONFIG_QFMT_V1 is not set
# CONFIG_QFMT_V2 is not set
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not setCONFIG_REISER4_FS=yCONFIG_REISER4_CHECK=y
# CONFIG_ADFS_FS is not set
# CONFIG_ADFS_FS_RW is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EXT3_FS is not set
# CONFIG_JBD is not set
# CONFIG_JBD_DEBUG is not set
# CONFIG_FAT_FS is not set
# CONFIG_MSDOS_FS is not set
# CONFIG_UMSDOS_FS is not set
# CONFIG_VFAT_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_JFFS_FS is not set
# CONFIG_JFFS2_FS is not set
# CONFIG_CRAMFS is not setCONFIG_TMPFS=yCONFIG_RAMFS=y
# CONFIG_ISO9660_FS is not set
# CONFIG_JOLIET is not set
# CONFIG_ZISOFS is not set
# CONFIG_JFS_FS is not set
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_STATISTICS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS_DEBUG is not set
# CONFIG_NTFS_RW is not set
# CONFIG_HPFS_FS is not setCONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_MOUNT is not set
# CONFIG_DEVFS_DEBUG is not setCONFIG_DEVPTS_FS=y
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
# CONFIG_ROMFS_FS is not setCONFIG_EXT2_FS=y
# CONFIG_SYSV_FS is not set
# CONFIG_UDF_FS is not set
# CONFIG_UDF_RW is not set
# CONFIG_UFS_FS is not set
# CONFIG_UFS_FS_WRITE is not set
#
# Network File Systems
#
# CONFIG_CODA_FS is not set
# CONFIG_INTERMEZZO_FS is not set
# CONFIG_NFS_FS is not set
# CONFIG_NFS_V3 is not set
# CONFIG_ROOT_NFS is not set
# CONFIG_NFSD is not set
# CONFIG_NFSD_V3 is not set
# CONFIG_NFSD_TCP is not set
# CONFIG_SUNRPC is not set
# CONFIG_LOCKD is not set
# CONFIG_EXPORTFS is not set
# CONFIG_SMB_FS is not set
# CONFIG_NCP_FS is not set
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
# CONFIG_NCPFS_STRONG is not set
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
# CONFIG_ZISOFS_FS is not set
#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not setCONFIG_MSDOS_PARTITION=y
# CONFIG_SMB_NLS is not set
# CONFIG_NLS is not set
#
# SCSI support
#
# CONFIG_SCSI is not set
#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set
# CONFIG_BLK_DEV_MD is not set
# CONFIG_MD_LINEAR is not set
# CONFIG_MD_RAID0 is not set
# CONFIG_MD_RAID1 is not set
# CONFIG_MD_RAID5 is not set
# CONFIG_MD_MULTIPATH is not set
# CONFIG_BLK_DEV_LVM is not set
#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set
#
# Kernel hacking
#
# CONFIG_DEBUG_SLAB is not setCONFIG_DEBUGSYM=yCONFIG_PT_PROXY=y
# CONFIG_GPROF is not set
# CONFIG_GCOV is not set
Quoted 2 lines · [email protected] said:
By the way, I am talking about Linus BK tree, rather than patches you have posted.
It only just occurred to me that the breakage is likely due to stuff that wasn't in 2.5.34, which I haven't seen yet since I haven't pulled the latest Linus tree.
That being the case, thanks for the heads-up and the patch.
Jeff
Jeff Dike writes:
[not sure what, got trimmed/mangled somewhere]
Quoted 6 lines · Nikita Danilov
pte_addr_tandCLOCK_TICK_RATEwere undefined.
Wrong macro ininclude/asm-um/percpu.hresulted ininclude/asm-um/cacheflush.hnever being included and a macros from the latter undefined also.
By the way, I am talking about Linus BK tree, rather than patches you have posted. Sorry for not mentioning this from the beginning.
This isn't Jeff's fault. pte_addr_t is from pte-highmem bits I did merged after he did his mergework.
Cheers,
Bill