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
Jeff Dike wrote:
>
> UML has been updated to 2.5.34 and UML 2.4.19-3.
>
And Linus has merged it.
Congratulations, Jeff.
Jeff Dike wrote:
> Thanks! It's great to finally have it in.
Now to get it in 2.4.20 :-)
David
--
David Coulson http://davidcoulson.net/
[email protected] http://journal.davidcoulson.net/
[email protected] said:
> And Linus has merged it.
> Congratulations, Jeff.
Thanks! It's great to finally have it in.
Jeff
Jeff Dike writes:
> 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
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 =====
--- 1.1/include/asm-um/percpu.h Fri Sep 6 21:29:29 2002
+++ edited/include/asm-um/percpu.h Fri Sep 13 14:27:59 2002
@@ -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 =====
--- 1.1/include/asm-um/pgtable.h Fri Sep 6 21:29:29 2002
+++ edited/include/asm-um/pgtable.h Fri Sep 13 14:04:54 2002
@@ -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 =====
--- 1.1/include/asm-um/timex.h Fri Sep 6 21:29:29 2002
+++ edited/include/asm-um/timex.h Fri Sep 13 14:09:28 2002
@@ -7,6 +7,8 @@
#define cacheflush_time (0)
+#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
+
static inline cycles_t get_cycles (void)
{
return 0;
----------------------------------------------------------------------
>
> Jeff
>
Nikita.
[email protected] said:
> And this is a patch to make it compilable (not sure about
> CLOCK_TICK_RATE and pte_addr_t parts though):
Where did you get compilation problems? It compiled for me fine.
Jeff
Jeff Dike writes:
> [email protected] said:
> > And this is a patch to make it compilable (not sure about
> > CLOCK_TICK_RATE and pte_addr_t parts 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.
> Where did you get compilation problems? It compiled for me fine.
>
> Jeff
Nikita.
[email protected] said:
> pte_addr_t and CLOCK_TICK_RATE were undefined.
Undefined WHERE? You could send me a snippet of your build log.
> 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
#
# 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 set
CONFIG_UID16=y
CONFIG_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 set
CONFIG_SYSCTL=y
# CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
CONFIG_HOSTFS=y
CONFIG_MCONSOLE=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_HOST_2G_2G is not set
# CONFIG_UML_SMP is not set
# CONFIG_SMP is not set
CONFIG_NEST_LEVEL=0
CONFIG_KERNEL_HALF_GIGS=1
#
# Loadable module support
#
# CONFIG_MODULES is not set
#
# Character Devices
#
CONFIG_STDIO_CONSOLE=y
CONFIG_SSL=y
CONFIG_FD_CHAN=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
CONFIG_PTY_CHAN=y
CONFIG_TTY_CHAN=y
CONFIG_XTERM_CHAN=y
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
CONFIG_CON_CHAN="xterm"
CONFIG_SSL_CHAN="pty"
CONFIG_UNIX98_PTYS=y
CONFIG_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 set
CONFIG_UML_SOUND=y
CONFIG_SOUND=y
CONFIG_HOSTAUDIO=y
# CONFIG_TTY_LOG is not set
#
# Block Devices
#
CONFIG_BLK_DEV_UBD=y
# CONFIG_BLK_DEV_UBD_SYNC is not set
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=4096
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_MMAPPER is not set
CONFIG_NETDEVICES=y
#
# Network Devices
#
CONFIG_UML_NET=y
CONFIG_UML_NET_ETHERTAP=y
CONFIG_UML_NET_TUNTAP=y
CONFIG_UML_NET_SLIP=y
CONFIG_UML_NET_DAEMON=y
CONFIG_UML_NET_MCAST=y
CONFIG_DUMMY=y
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
CONFIG_TUN=y
CONFIG_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 set
CONFIG_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=y
CONFIG_PACKET_MMAP=y
# CONFIG_NETLINK_DEV is not set
# CONFIG_NETFILTER is not set
# CONFIG_FILTER is not set
CONFIG_UNIX=y
CONFIG_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 set
CONFIG_REISER4_FS=y
CONFIG_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 set
CONFIG_TMPFS=y
CONFIG_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 set
CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
# CONFIG_DEVFS_MOUNT is not set
# CONFIG_DEVFS_DEBUG is not set
CONFIG_DEVPTS_FS=y
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
# CONFIG_ROMFS_FS is not set
CONFIG_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 set
CONFIG_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 set
CONFIG_DEBUGSYM=y
CONFIG_PT_PROXY=y
# CONFIG_GPROF is not set
# CONFIG_GCOV is not set
[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]
On Fri, Sep 13, 2002 at 05:31:24PM +0400, Nikita Danilov wrote:
> 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.
This isn't Jeff's fault. pte_addr_t is from pte-highmem bits I did
merged after he did his mergework.
Cheers,
Bill