Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e707c74f1ebcdd02cbeb77f12e669a545a97c6d
commit 5e707c74f1ebcdd02cbeb77f12e669a545a97c6d Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Wed Apr 30 00:54:44 2008 +0200 user-mode-linux-2.6.25-1-i686 - version bump - updated config.* - added inline-hack.patch from crazy diff --git a/source/apps-extra/user-mode-linux/FrugalBuild b/source/apps-extra/user-mode-linux/FrugalBuild index 5804628..f14f10d 100644 --- a/source/apps-extra/user-mode-linux/FrugalBuild +++ b/source/apps-extra/user-mode-linux/FrugalBuild @@ -2,20 +2,19 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=user-mode-linux -pkgver=2.6.24 +pkgver=2.6.25 patchlevel= pkgrel=1 pkgdesc="A safe, secure way of running Linux versions and Linux processes." url="http://user-mode-linux.sourceforge.net/"; -depends=('uml_utilities') -makedepends=('libpcap') +rodepends=('uml_utilities') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.kernel.org/kdist/finger_banner |sed -n 's/.* \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/;1 p'" # check http://uml.nagafix.co.uk/kernels for configs source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/base/kernel/linux-$pkgver.tar.bz2 \ - config.i686 config.x86_64 README.Frugalware) -signatures=(${source[0]}.sign '' '' '') + config.i686 config.x86_64 README.Frugalware inline-hack.patch) +signatures=(${source[0]}.sign '' '' '' '') if [ -n "$patchlevel" ]; then source=([EMAIL PROTECTED] http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/base/kernel/patch-$pkgver$patchlevel.bz2) signatures=([EMAIL PROTECTED] ${source[3]}.sign) @@ -23,6 +22,7 @@ fi build() { + unset MAKEFLAGS Fcd linux-$pkgver [ -n "$patchlevel" ] && Fpatch patch-$pkgver$patchlevel Fpatchall diff --git a/source/apps-extra/user-mode-linux/config.i686 b/source/apps-extra/user-mode-linux/config.i686 index ef7b14d..a2232a2 100644 --- a/source/apps-extra/user-mode-linux/config.i686 +++ b/source/apps-extra/user-mode-linux/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24 -# Fri Jan 25 21:41:58 2008 +# Linux kernel version: 2.6.25 +# Thu Apr 17 22:53:38 2008 # CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig" CONFIG_GENERIC_HARDIRQS=y @@ -16,6 +16,7 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_IRQ_RELEASE_METHOD=y +CONFIG_HZ=100 # # UML-specific options @@ -66,20 +67,17 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_DEBUGCTLMSR=y CONFIG_UML_X86=y CONFIG_X86_32=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_64BIT is not set CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_HOST_VMSPLIT_3G=y -# CONFIG_HOST_VMSPLIT_3G_OPT is not set -# CONFIG_HOST_VMSPLIT_2G is not set -# CONFIG_HOST_VMSPLIT_1G is not set -CONFIG_TOP_ADDR=0xC0000000 # CONFIG_3_LEVEL_PGTABLES is not set CONFIG_ARCH_HAS_SC_SIGNALS=y CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -97,17 +95,13 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_LD_SCRIPT_STATIC=y -CONFIG_NET=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_MISC=y CONFIG_HOSTFS=y CONFIG_HPPFS=y CONFIG_MCONSOLE=y -CONFIG_MCONSOLE_EXEC=y CONFIG_MAGIC_SYSRQ=y -# CONFIG_SMP is not set -CONFIG_NEST_LEVEL=0 # CONFIG_HIGHMEM is not set CONFIG_KERNEL_STACK_ORDER=2 @@ -126,8 +120,6 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_TASKSTATS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_TREE=y @@ -135,11 +127,15 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_FAIR_USER_SCHED=y -# CONFIG_FAIR_CGROUP_SCHED is not set +# CONFIG_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -154,11 +150,13 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y +# CONFIG_COMPAT_BRK is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y @@ -166,6 +164,12 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set +# CONFIG_HAVE_OPROFILE is not set +# CONFIG_HAVE_KPROBES is not set +# CONFIG_HAVE_KRETPROBES is not set +CONFIG_PROC_PAGE_MONITOR=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set @@ -189,6 +193,7 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_CLASSIC_RCU=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_UBD=y CONFIG_BLK_DEV_UBD_SYNC=y @@ -199,7 +204,7 @@ CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_BLK_DEV_XIP is not set # CONFIG_ATA_OVER_ETH is not set # @@ -246,6 +251,7 @@ CONFIG_FW_LOADER=y # # Networking # +CONFIG_NET=y # # Networking options @@ -257,6 +263,7 @@ CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -303,6 +310,7 @@ CONFIG_NETLABEL=y CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y CONFIG_BRIDGE_NETFILTER=y # @@ -311,7 +319,6 @@ CONFIG_BRIDGE_NETFILTER=y CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_QUEUE=y CONFIG_NETFILTER_NETLINK_LOG=y -CONFIG_NF_CONNTRACK_ENABLED=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CT_ACCT=y CONFIG_NF_CONNTRACK_MARK=y @@ -337,9 +344,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=y CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y CONFIG_NETFILTER_XT_TARGET_NFLOG=y CONFIG_NETFILTER_XT_TARGET_NOTRACK=y +CONFIG_NETFILTER_XT_TARGET_RATEEST=y CONFIG_NETFILTER_XT_TARGET_TRACE=y CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y @@ -349,15 +358,18 @@ CONFIG_NETFILTER_XT_MATCH_DCCP=y CONFIG_NETFILTER_XT_MATCH_DSCP=y CONFIG_NETFILTER_XT_MATCH_ESP=y CONFIG_NETFILTER_XT_MATCH_HELPER=y +CONFIG_NETFILTER_XT_MATCH_IPRANGE=y CONFIG_NETFILTER_XT_MATCH_LENGTH=y CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MAC=y CONFIG_NETFILTER_XT_MATCH_MARK=y +CONFIG_NETFILTER_XT_MATCH_OWNER=y CONFIG_NETFILTER_XT_MATCH_POLICY=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y CONFIG_NETFILTER_XT_MATCH_QUOTA=y +CONFIG_NETFILTER_XT_MATCH_RATEEST=y CONFIG_NETFILTER_XT_MATCH_REALM=y CONFIG_NETFILTER_XT_MATCH_SCTP=y CONFIG_NETFILTER_XT_MATCH_STATE=y @@ -375,13 +387,10 @@ CONFIG_NF_CONNTRACK_IPV4=y CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_QUEUE=y CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_IPRANGE=y -CONFIG_IP_NF_MATCH_TOS=y CONFIG_IP_NF_MATCH_RECENT=y CONFIG_IP_NF_MATCH_ECN=y CONFIG_IP_NF_MATCH_AH=y CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_MATCH_OWNER=y CONFIG_IP_NF_MATCH_ADDRTYPE=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y @@ -392,7 +401,6 @@ CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_SAME=y CONFIG_NF_NAT_SNMP_BASIC=y CONFIG_NF_NAT_FTP=y CONFIG_NF_NAT_IRC=y @@ -402,7 +410,6 @@ CONFIG_NF_NAT_TFTP=y # CONFIG_NF_NAT_H323 is not set # CONFIG_NF_NAT_SIP is not set CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_TARGET_TOS=y CONFIG_IP_NF_TARGET_ECN=y CONFIG_IP_NF_TARGET_TTL=y CONFIG_IP_NF_TARGET_CLUSTERIP=y @@ -412,7 +419,7 @@ CONFIG_IP_NF_ARPFILTER=y CONFIG_IP_NF_ARP_MANGLE=y # -# IPv6: Netfilter Configuration (EXPERIMENTAL) +# IPv6: Netfilter Configuration # CONFIG_NF_CONNTRACK_IPV6=y CONFIG_IP6_NF_QUEUE=y @@ -421,7 +428,6 @@ CONFIG_IP6_NF_MATCH_RT=y CONFIG_IP6_NF_MATCH_OPTS=y CONFIG_IP6_NF_MATCH_FRAG=y CONFIG_IP6_NF_MATCH_HL=y -CONFIG_IP6_NF_MATCH_OWNER=y CONFIG_IP6_NF_MATCH_IPV6HEADER=y CONFIG_IP6_NF_MATCH_AH=y CONFIG_IP6_NF_MATCH_MH=y @@ -479,6 +485,7 @@ CONFIG_NET_CLS_ROUTE=y # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set @@ -535,7 +542,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLHC=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y -CONFIG_SHAPER=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -569,8 +575,7 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set +CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_QUOTA=y @@ -579,7 +584,6 @@ CONFIG_PRINT_QUOTA_WARNING=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y -CONFIG_DNOTIFY=y CONFIG_AUTOFS_FS=y CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=y @@ -631,8 +635,10 @@ CONFIG_CONFIGFS_FS=y # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y @@ -662,6 +668,7 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_EXPERIMENTAL=y CONFIG_CIFS_UPCALL=y +# CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -723,6 +730,7 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_CAPABILITIES=y CONFIG_SECURITY_FILE_CAPABILITIES=y +CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -732,11 +740,12 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set +# CONFIG_SECURITY_SMACK is not set CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ABLKCIPHER=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y @@ -755,6 +764,9 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_PCBC=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=y @@ -772,11 +784,14 @@ CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_SEED=y +CONFIG_CRYPTO_SALSA20=y +CONFIG_CRYPTO_SALSA20_586=y CONFIG_CRYPTO_DEFLATE=y # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_CRC32C is not set CONFIG_CRYPTO_CAMELLIA=y CONFIG_CRYPTO_AUTHENC=y +CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_HW=y # @@ -792,6 +807,8 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=y CONFIG_TEXTSEARCH_BM=y @@ -808,9 +825,6 @@ CONFIG_HAS_DMA=y # CONFIG_SCSI_NETLINK is not set # CONFIG_MD is not set # CONFIG_INPUT is not set -CONFIG_INSTRUMENTATION=y -# CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set # # Kernel hacking @@ -827,6 +841,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -840,8 +855,8 @@ CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y -# CONFIG_FORCED_INLINING is not set # CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set # CONFIG_GPROF is not set diff --git a/source/apps-extra/user-mode-linux/config.x86_64 b/source/apps-extra/user-mode-linux/config.x86_64 index b9dde4c..6a9efd3 100644 --- a/source/apps-extra/user-mode-linux/config.x86_64 +++ b/source/apps-extra/user-mode-linux/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24 -# Fri Jan 25 21:40:34 2008 +# Linux kernel version: 2.6.25 +# Thu Apr 17 22:54:06 2008 # CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig" CONFIG_GENERIC_HARDIRQS=y @@ -16,6 +16,7 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_IRQ_RELEASE_METHOD=y +CONFIG_HZ=100 # # UML-specific options @@ -25,12 +26,12 @@ CONFIG_UML_X86=y CONFIG_64BIT=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_TOP_ADDR=0x7fc0000000 CONFIG_3_LEVEL_PGTABLES=y # CONFIG_ARCH_HAS_SC_SIGNALS is not set # CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set CONFIG_SMP_BROKEN=y CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -48,15 +49,12 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_LD_SCRIPT_STATIC=y -CONFIG_NET=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=y CONFIG_HOSTFS=y CONFIG_HPPFS=y CONFIG_MCONSOLE=y -CONFIG_MCONSOLE_EXEC=y CONFIG_MAGIC_SYSRQ=y -CONFIG_NEST_LEVEL=0 CONFIG_KERNEL_STACK_ORDER=2 # @@ -74,8 +72,6 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_TASKSTATS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_TREE=y @@ -83,11 +79,15 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_FAIR_USER_SCHED=y -# CONFIG_FAIR_CGROUP_SCHED is not set +# CONFIG_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -102,11 +102,13 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y +# CONFIG_COMPAT_BRK is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y @@ -114,6 +116,12 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set +# CONFIG_HAVE_OPROFILE is not set +# CONFIG_HAVE_KPROBES is not set +# CONFIG_HAVE_KRETPROBES is not set +CONFIG_PROC_PAGE_MONITOR=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set @@ -135,6 +143,7 @@ CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_CLASSIC_RCU=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_UBD=y CONFIG_BLK_DEV_UBD_SYNC=y @@ -145,7 +154,7 @@ CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_BLK_DEV_XIP is not set # CONFIG_ATA_OVER_ETH is not set # @@ -192,6 +201,7 @@ CONFIG_FW_LOADER=y # # Networking # +CONFIG_NET=y # # Networking options @@ -231,6 +241,7 @@ CONFIG_NETLABEL=y CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y CONFIG_BRIDGE_NETFILTER=y # @@ -239,7 +250,6 @@ CONFIG_BRIDGE_NETFILTER=y CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_QUEUE=y CONFIG_NETFILTER_NETLINK_LOG=y -CONFIG_NF_CONNTRACK_ENABLED=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CT_ACCT=y CONFIG_NF_CONNTRACK_MARK=y @@ -265,9 +275,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=y CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y CONFIG_NETFILTER_XT_TARGET_NFLOG=y CONFIG_NETFILTER_XT_TARGET_NOTRACK=y +CONFIG_NETFILTER_XT_TARGET_RATEEST=y CONFIG_NETFILTER_XT_TARGET_TRACE=y CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y @@ -277,14 +289,17 @@ CONFIG_NETFILTER_XT_MATCH_DCCP=y CONFIG_NETFILTER_XT_MATCH_DSCP=y CONFIG_NETFILTER_XT_MATCH_ESP=y CONFIG_NETFILTER_XT_MATCH_HELPER=y +CONFIG_NETFILTER_XT_MATCH_IPRANGE=y CONFIG_NETFILTER_XT_MATCH_LENGTH=y CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MAC=y CONFIG_NETFILTER_XT_MATCH_MARK=y +CONFIG_NETFILTER_XT_MATCH_OWNER=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y CONFIG_NETFILTER_XT_MATCH_QUOTA=y +CONFIG_NETFILTER_XT_MATCH_RATEEST=y CONFIG_NETFILTER_XT_MATCH_REALM=y CONFIG_NETFILTER_XT_MATCH_SCTP=y CONFIG_NETFILTER_XT_MATCH_STATE=y @@ -302,13 +317,10 @@ CONFIG_NF_CONNTRACK_IPV4=y CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_QUEUE=y CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_IPRANGE=y -CONFIG_IP_NF_MATCH_TOS=y CONFIG_IP_NF_MATCH_RECENT=y CONFIG_IP_NF_MATCH_ECN=y CONFIG_IP_NF_MATCH_AH=y CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_MATCH_OWNER=y CONFIG_IP_NF_MATCH_ADDRTYPE=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y @@ -319,7 +331,6 @@ CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_SAME=y CONFIG_NF_NAT_SNMP_BASIC=y CONFIG_NF_NAT_FTP=y CONFIG_NF_NAT_IRC=y @@ -329,7 +340,6 @@ CONFIG_NF_NAT_TFTP=y # CONFIG_NF_NAT_H323 is not set # CONFIG_NF_NAT_SIP is not set CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_TARGET_TOS=y CONFIG_IP_NF_TARGET_ECN=y CONFIG_IP_NF_TARGET_TTL=y # CONFIG_IP_NF_TARGET_CLUSTERIP is not set @@ -384,6 +394,7 @@ CONFIG_NET_CLS_ROUTE=y # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set @@ -440,7 +451,6 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLHC=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y -CONFIG_SHAPER=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -474,8 +484,7 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set +CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_QUOTA=y @@ -484,7 +493,6 @@ CONFIG_PRINT_QUOTA_WARNING=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y -CONFIG_DNOTIFY=y CONFIG_AUTOFS_FS=y CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=y @@ -536,8 +544,10 @@ CONFIG_CONFIGFS_FS=y # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y @@ -567,6 +577,7 @@ CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_EXPERIMENTAL=y CONFIG_CIFS_UPCALL=y +# CONFIG_CIFS_DFS_UPCALL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -627,6 +638,7 @@ CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_CAPABILITIES=y CONFIG_SECURITY_FILE_CAPABILITIES=y +CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -636,11 +648,12 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set +# CONFIG_SECURITY_SMACK is not set CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ABLKCIPHER=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y @@ -659,6 +672,9 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_PCBC=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=y @@ -676,11 +692,14 @@ CONFIG_CRYPTO_ARC4=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_ANUBIS=y CONFIG_CRYPTO_SEED=y +CONFIG_CRYPTO_SALSA20=y +CONFIG_CRYPTO_SALSA20_X86_64=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CAMELLIA=y CONFIG_CRYPTO_AUTHENC=y +CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_HW=y # @@ -696,6 +715,8 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=y CONFIG_TEXTSEARCH_BM=y @@ -712,9 +733,6 @@ CONFIG_HAS_DMA=y # CONFIG_SCSI_NETLINK is not set # CONFIG_MD is not set # CONFIG_INPUT is not set -CONFIG_INSTRUMENTATION=y -# CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set # # Kernel hacking @@ -731,6 +749,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -744,8 +763,8 @@ CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y -# CONFIG_FORCED_INLINING is not set # CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set # CONFIG_GPROF is not set diff --git a/source/apps-extra/user-mode-linux/inline-hack.patch b/source/apps-extra/user-mode-linux/inline-hack.patch new file mode 100644 index 0000000..373416a --- /dev/null +++ b/source/apps-extra/user-mode-linux/inline-hack.patch @@ -0,0 +1,223 @@ +diff -Naur linux-2.6.25/block/blk-barrier.c linux-2.6.25-uml-hack/block/blk-barrier.c +--- linux-2.6.25/block/blk-barrier.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/block/blk-barrier.c 2008-04-29 01:09:53.000000000 +0200 +@@ -53,7 +53,7 @@ + /* + * Cache flushing for ordered writes handling + */ +-inline unsigned blk_ordered_cur_seq(struct request_queue *q) ++unsigned blk_ordered_cur_seq(struct request_queue *q) + { + if (!q->ordseq) + return 0; +diff -Naur linux-2.6.25/block/elevator.c linux-2.6.25-uml-hack/block/elevator.c +--- linux-2.6.25/block/elevator.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/block/elevator.c 2008-04-29 01:05:47.000000000 +0200 +@@ -69,7 +69,7 @@ + /* + * can we safely merge with this request? + */ +-inline int elv_rq_merge_ok(struct request *rq, struct bio *bio) ++int elv_rq_merge_ok(struct request *rq, struct bio *bio) + { + if (!rq_mergeable(rq)) + return 0; +diff -Naur linux-2.6.25/fs/block_dev.c linux-2.6.25-uml-hack/fs/block_dev.c +--- linux-2.6.25/fs/block_dev.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/fs/block_dev.c 2008-04-29 01:00:56.000000000 +0200 +@@ -38,7 +38,7 @@ + return container_of(inode, struct bdev_inode, vfs_inode); + } + +-inline struct block_device *I_BDEV(struct inode *inode) ++struct block_device *I_BDEV(struct inode *inode) + { + return &BDEV_I(inode)->bdev; + } +diff -Naur linux-2.6.25/fs/buffer.c linux-2.6.25-uml-hack/fs/buffer.c +--- linux-2.6.25/fs/buffer.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/fs/buffer.c 2008-04-29 00:55:45.000000000 +0200 +@@ -46,8 +46,7 @@ + + #define BH_ENTRY(list) list_entry((list), struct buffer_head, b_assoc_buffers) + +-inline void +-init_buffer(struct buffer_head *bh, bh_end_io_t *handler, void *private) ++void init_buffer(struct buffer_head *bh, bh_end_io_t *handler, void *private) + { + bh->b_end_io = handler; + bh->b_private = private; +diff -Naur linux-2.6.25/fs/reiserfs/do_balan.c linux-2.6.25-uml-hack/fs/reiserfs/do_balan.c +--- linux-2.6.25/fs/reiserfs/do_balan.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/fs/reiserfs/do_balan.c 2008-04-29 01:06:38.000000000 +0200 +@@ -29,7 +29,7 @@ + is interrupting do_balance */ + #endif + +-inline void do_balance_mark_leaf_dirty(struct tree_balance *tb, ++void do_balance_mark_leaf_dirty(struct tree_balance *tb, + struct buffer_head *bh, int flag) + { + journal_mark_dirty(tb->transaction_handle, +diff -Naur linux-2.6.25/fs/reiserfs/inode.c linux-2.6.25-uml-hack/fs/reiserfs/inode.c +--- linux-2.6.25/fs/reiserfs/inode.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/fs/reiserfs/inode.c 2008-04-29 01:20:30.000000000 +0200 +@@ -101,7 +101,7 @@ + // + // when key is 0, do not set version and short key + // +-inline void make_le_item_head(struct item_head *ih, const struct cpu_key *key, ++void make_le_item_head(struct item_head *ih, const struct cpu_key *key, + int version, + loff_t offset, int type, int length, + int entry_count /*or ih_free_space */ ) +diff -Naur linux-2.6.25/fs/reiserfs/namei.c linux-2.6.25-uml-hack/fs/reiserfs/namei.c +--- linux-2.6.25/fs/reiserfs/namei.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/fs/reiserfs/namei.c 2008-04-29 01:11:15.000000000 +0200 +@@ -62,7 +62,7 @@ + } + + // de_bh, de_ih, de_deh (points to first element of array), de_item_num is set +-inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de) ++void set_de_name_and_namelen(struct reiserfs_dir_entry *de) + { + struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num; + +diff -Naur linux-2.6.25/fs/reiserfs/stree.c linux-2.6.25-uml-hack/fs/reiserfs/stree.c +--- linux-2.6.25/fs/reiserfs/stree.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/fs/reiserfs/stree.c 2008-04-29 01:50:34.000000000 +0200 +@@ -57,7 +57,7 @@ + #include <linux/quotaops.h> + + /* Does the buffer contain a disk block which is in the tree. */ +-inline int B_IS_IN_TREE(const struct buffer_head *p_s_bh) ++int B_IS_IN_TREE(const struct buffer_head *p_s_bh) + { + + RFALSE(B_LEVEL(p_s_bh) > MAX_HEIGHT, +@@ -69,7 +69,7 @@ + // + // to gets item head in le form + // +-inline void copy_item_head(struct item_head *p_v_to, ++void copy_item_head(struct item_head *p_v_to, + const struct item_head *p_v_from) + { + memcpy(p_v_to, p_v_from, IH_SIZE); +@@ -81,7 +81,7 @@ + Returns: -1 if key1 < key2 + 0 if key1 == key2 + 1 if key1 > key2 */ +-inline int comp_short_keys(const struct reiserfs_key *le_key, ++int comp_short_keys(const struct reiserfs_key *le_key, + const struct cpu_key *cpu_key) + { + __u32 n; +@@ -133,7 +133,7 @@ + return 0; + } + +-inline int comp_short_le_keys(const struct reiserfs_key *key1, ++int comp_short_le_keys(const struct reiserfs_key *key1, + const struct reiserfs_key *key2) + { + __u32 *p_s_1_u32, *p_s_2_u32; +@@ -150,7 +150,7 @@ + return 0; + } + +-inline void le_key2cpu_key(struct cpu_key *to, const struct reiserfs_key *from) ++void le_key2cpu_key(struct cpu_key *to, const struct reiserfs_key *from) + { + int version; + to->on_disk_key.k_dir_id = le32_to_cpu(from->k_dir_id); +@@ -165,7 +165,7 @@ + + // this does not say which one is bigger, it only returns 1 if keys + // are not equal, 0 otherwise +-inline int comp_le_keys(const struct reiserfs_key *k1, ++int comp_le_keys(const struct reiserfs_key *k1, + const struct reiserfs_key *k2) + { + return memcmp(k1, k2, sizeof(struct reiserfs_key)); +@@ -289,7 +289,7 @@ + } + + /* Get delimiting key of the buffer at the path and its right neighbor. */ +-inline const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path, ++const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path, + const struct super_block *p_s_sb) + { + int n_position, n_path_offset = p_s_chk_path->path_length; +diff -Naur linux-2.6.25/fs/udf/partition.c linux-2.6.25-uml-hack/fs/udf/partition.c +--- linux-2.6.25/fs/udf/partition.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/fs/udf/partition.c 2008-04-29 01:31:15.000000000 +0200 +@@ -28,7 +28,7 @@ + #include <linux/slab.h> + #include <linux/buffer_head.h> + +-inline uint32_t udf_get_pblock(struct super_block *sb, uint32_t block, ++uint32_t udf_get_pblock(struct super_block *sb, uint32_t block, + uint16_t partition, uint32_t offset) + { + struct udf_sb_info *sbi = UDF_SB(sb); +diff -Naur linux-2.6.25/include/net/dst.h linux-2.6.25-uml-hack/include/net/dst.h +--- linux-2.6.25/include/net/dst.h 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/include/net/dst.h 2008-04-29 12:18:14.000000000 +0200 +@@ -240,7 +240,7 @@ + } + + /* Output packet to network from transport. */ +-static inline int dst_output(struct sk_buff *skb) ++static int dst_output(struct sk_buff *skb) + { + return skb->dst->output(skb); + } +diff -Naur linux-2.6.25/mm/filemap.c linux-2.6.25-uml-hack/mm/filemap.c +--- linux-2.6.25/mm/filemap.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/mm/filemap.c 2008-04-29 00:54:51.000000000 +0200 +@@ -1827,7 +1827,7 @@ + * Returns appropriate error code that caller should return or + * zero in case that write should be allowed. + */ +-inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk) ++int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk) + { + struct inode *inode = file->f_mapping->host; + unsigned long limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; +diff -Naur linux-2.6.25/net/ipv4/ip_output.c linux-2.6.25-uml-hack/net/ipv4/ip_output.c +--- linux-2.6.25/net/ipv4/ip_output.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/net/ipv4/ip_output.c 2008-04-29 01:19:38.000000000 +0200 +@@ -85,7 +85,7 @@ + int sysctl_ip_default_ttl __read_mostly = IPDEFTTL; + + /* Generate a checksum for an outgoing IP datagram. */ +-__inline__ void ip_send_check(struct iphdr *iph) ++void ip_send_check(struct iphdr *iph) + { + iph->check = 0; + iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); +diff -Naur linux-2.6.25/net/ipv6/ip6_input.c linux-2.6.25-uml-hack/net/ipv6/ip6_input.c +--- linux-2.6.25/net/ipv6/ip6_input.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/net/ipv6/ip6_input.c 2008-04-29 22:48:29.000000000 +0200 +@@ -47,7 +47,7 @@ + + + +-inline int ip6_rcv_finish( struct sk_buff *skb) ++int ip6_rcv_finish( struct sk_buff *skb) + { + if (skb->dst == NULL) + ip6_route_input(skb); +diff -Naur linux-2.6.25/net/ipv6/mcast.c linux-2.6.25-uml-hack/net/ipv6/mcast.c +--- linux-2.6.25/net/ipv6/mcast.c 2008-04-17 04:49:44.000000000 +0200 ++++ linux-2.6.25-uml-hack/net/ipv6/mcast.c 2008-04-29 22:57:04.000000000 +0200 +@@ -1446,7 +1446,7 @@ + return dev_queue_xmit(skb); + } + +-static inline int mld_dev_queue_xmit(struct sk_buff *skb) ++static int mld_dev_queue_xmit(struct sk_buff *skb) + { + return NF_HOOK(PF_INET6, NF_INET_POST_ROUTING, skb, NULL, skb->dev, + mld_dev_queue_xmit2); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
