mirror of https://github.com/hak5/openwrt-owl.git
uml: update to linux 4.1
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 47061owl
parent
439669b49c
commit
110a74dd71
|
@ -1146,6 +1146,7 @@ CONFIG_FRAME_WARN=1024
|
|||
# CONFIG_FSL_EDMA is not set
|
||||
# CONFIG_FSL_XGMAC_MDIO is not set
|
||||
CONFIG_FSNOTIFY=y
|
||||
# CONFIG_FS_DAX is not set
|
||||
# CONFIG_FS_POSIX_ACL is not set
|
||||
# CONFIG_FT1000 is not set
|
||||
# CONFIG_FTGMAC100 is not set
|
||||
|
|
|
@ -23,10 +23,16 @@ BOARDNAME:=User Mode Linux
|
|||
FEATURES:=ext4 audio
|
||||
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
||||
|
||||
KERNEL_PATCHVER:=3.18
|
||||
KERNEL_PATCHVER:=4.1
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
define Kernel/Patch
|
||||
mkdir -p $(LINUX_DIR)/arch/um/include/uapi
|
||||
mv $(LINUX_DIR)/arch/um/include/asm $(LINUX_DIR)/arch/um/include/uapi/
|
||||
$(Kernel/Patch/Default)
|
||||
endef
|
||||
|
||||
LINUX_TARGET_CONFIG:=$(CURDIR)/config/$(ARCH)
|
||||
|
||||
DEFAULT_PACKAGES += wpad-mini kmod-mac80211-hwsim
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
# CONFIG_3_LEVEL_PGTABLES is not set
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_ARCH_DEFCONFIG="arch/um/configs/i386_defconfig"
|
||||
# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set
|
||||
CONFIG_ARCH_HAS_SC_SIGNALS=y
|
||||
# CONFIG_ARCH_HAS_SG_CHAIN is not set
|
||||
CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
|
||||
CONFIG_BKL=y
|
||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
|
||||
CONFIG_BLK_DEV_COW_COMMON=y
|
||||
CONFIG_BLK_DEV_UBD=y
|
||||
CONFIG_BLK_DEV_UBD_SYNC=y
|
||||
# CONFIG_CFQ_GROUP_IOSCHED is not set
|
||||
CONFIG_CLONE_BACKWARDS=y
|
||||
CONFIG_CON_CHAN="xterm"
|
||||
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
|
||||
CONFIG_CPU_SUP_AMD=y
|
||||
|
@ -18,42 +21,49 @@ CONFIG_CPU_SUP_UMC_32=y
|
|||
CONFIG_CRAMFS=y
|
||||
# CONFIG_CRASHLOG is not set
|
||||
CONFIG_CRC16=y
|
||||
CONFIG_CRYPTO_CRC32C=y
|
||||
CONFIG_CRYPTO_HASH=y
|
||||
CONFIG_CRYPTO_HASH2=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_WORKQUEUE=y
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_DECOMPRESS_BZIP2=y
|
||||
CONFIG_DECOMPRESS_GZIP=y
|
||||
CONFIG_DECOMPRESS_LZMA=y
|
||||
CONFIG_DEFAULT_CFQ=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
|
||||
CONFIG_DNOTIFY=y
|
||||
CONFIG_ELF_CORE=y
|
||||
# CONFIG_EMBEDDED is not set
|
||||
# CONFIG_EARLY_PRINTK is not set
|
||||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_FS_MBCACHE=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CPU_DEVICES=y
|
||||
CONFIG_GENERIC_FIND_FIRST_BIT=y
|
||||
CONFIG_GENERIC_FIND_LAST_BIT=y
|
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
||||
CONFIG_GENERIC_IO=y
|
||||
CONFIG_GENERIC_IRQ_SHOW=y
|
||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
|
||||
CONFIG_HAVE_AOUT=y
|
||||
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
|
||||
# CONFIG_HAVE_ARCH_BITREVERSE is not set
|
||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
||||
CONFIG_HAVE_FUTEX_CMPXCHG=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
# CONFIG_HAVE_GENERIC_HARDIRQS is not set
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_HAVE_UID16=y
|
||||
CONFIG_HOSTAUDIO=m
|
||||
CONFIG_HOSTFS=y
|
||||
# CONFIG_HPPFS is not set
|
||||
CONFIG_HZ_PERIODIC=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INIT_ENV_ARG_LIMIT=128
|
||||
CONFIG_IOSCHED_CFQ=y
|
||||
CONFIG_IRQ_RELEASE_METHOD=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_ISO9660_FS=y
|
||||
CONFIG_JBD=y
|
||||
CONFIG_JBD2=y
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_KALLSYMS_EXTRA_PASS=y
|
||||
CONFIG_KERNEL_STACK_ORDER=2
|
||||
CONFIG_LD_SCRIPT_STATIC=y
|
||||
CONFIG_LEGACY_PTYS=y
|
||||
|
@ -70,13 +80,14 @@ CONFIG_MCONSOLE=y
|
|||
# CONFIG_MCRUSOE is not set
|
||||
# CONFIG_MCYRIXIII is not set
|
||||
# CONFIG_MEFFICEON is not set
|
||||
# CONFIG_MELAN is not set
|
||||
# CONFIG_MGEODEGX1 is not set
|
||||
# CONFIG_MGEODE_LX is not set
|
||||
# CONFIG_MINI_FO is not set
|
||||
# CONFIG_MK6 is not set
|
||||
# CONFIG_MK7 is not set
|
||||
# CONFIG_MK8 is not set
|
||||
# CONFIG_MMAPPER is not set
|
||||
CONFIG_MODULES_USE_ELF_REL=y
|
||||
# CONFIG_MPENTIUM4 is not set
|
||||
CONFIG_MPENTIUMII=y
|
||||
# CONFIG_MPENTIUMIII is not set
|
||||
|
@ -92,15 +103,18 @@ CONFIG_NLS=y
|
|||
# CONFIG_NOCONFIG_CHAN is not set
|
||||
CONFIG_NO_DMA=y
|
||||
CONFIG_NO_IOMEM=y
|
||||
# CONFIG_NSC_GPIO is not set
|
||||
CONFIG_NULL_CHAN=y
|
||||
CONFIG_OLD_SIGACTION=y
|
||||
CONFIG_OLD_SIGSUSPEND3=y
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_PGTABLE_LEVELS=2
|
||||
CONFIG_PORT_CHAN=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
||||
# CONFIG_PREEMPT_RCU is not set
|
||||
CONFIG_PRINT_QUOTA_WARNING=y
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_PROCESSOR_SELECT is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
CONFIG_PTY_CHAN=y
|
||||
CONFIG_QFMT_V1=y
|
||||
CONFIG_QFMT_V2=y
|
||||
|
@ -108,24 +122,25 @@ CONFIG_QUOTA=y
|
|||
CONFIG_QUOTACTL=y
|
||||
# CONFIG_QUOTA_NETLINK_INTERFACE is not set
|
||||
CONFIG_QUOTA_TREE=y
|
||||
# CONFIG_RCU_STALL_COMMON is not set
|
||||
CONFIG_RD_BZIP2=y
|
||||
CONFIG_RD_GZIP=y
|
||||
CONFIG_RELAY=y
|
||||
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
|
||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
|
||||
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
|
||||
# CONFIG_SBC8360_WDT is not set
|
||||
# CONFIG_SCSI_DMA is not set
|
||||
# CONFIG_SMP_BROKEN is not set
|
||||
CONFIG_SOFT_WATCHDOG=m
|
||||
CONFIG_SOUND=m
|
||||
CONFIG_SOUND_OSS_CORE=y
|
||||
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
|
||||
CONFIG_SQUASHFS_EMBEDDED=y
|
||||
CONFIG_SRCU=y
|
||||
CONFIG_SSL=y
|
||||
CONFIG_SSL_CHAN="pty"
|
||||
# CONFIG_STACKTRACE_SUPPORT is not set
|
||||
CONFIG_STACKTRACE=y
|
||||
CONFIG_STATIC_LINK=y
|
||||
CONFIG_STDERR_CONSOLE=y
|
||||
CONFIG_STDIO_CONSOLE=y
|
||||
CONFIG_TICK_CPU_ACCOUNTING=y
|
||||
# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
|
||||
CONFIG_TTY_CHAN=y
|
||||
CONFIG_UID16=y
|
||||
|
@ -135,6 +150,7 @@ CONFIG_UML_NET_DAEMON=y
|
|||
CONFIG_UML_NET_ETHERTAP=y
|
||||
CONFIG_UML_NET_MCAST=y
|
||||
# CONFIG_UML_NET_PCAP is not set
|
||||
# CONFIG_UML_NET_RANDOM_MAC is not set
|
||||
CONFIG_UML_NET_SLIP=y
|
||||
CONFIG_UML_NET_SLIRP=y
|
||||
CONFIG_UML_NET_TUNTAP=y
|
||||
|
@ -145,22 +161,18 @@ CONFIG_UML_WATCHDOG=m
|
|||
CONFIG_UML_X86=y
|
||||
# CONFIG_USER_NS is not set
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
CONFIG_WATCHDOG_CORE=y
|
||||
CONFIG_X86_32=y
|
||||
CONFIG_X86_BSWAP=y
|
||||
# CONFIG_X86_64 is not set
|
||||
CONFIG_X86_CMOV=y
|
||||
CONFIG_X86_CMPXCHG=y
|
||||
CONFIG_X86_CMPXCHG64=y
|
||||
CONFIG_X86_CPU=y
|
||||
CONFIG_X86_GENERIC=y
|
||||
CONFIG_X86_INTEL_USERCOPY=y
|
||||
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
|
||||
CONFIG_X86_INVLPG=y
|
||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
||||
CONFIG_X86_MINIMUM_CPU_FAMILY=5
|
||||
CONFIG_X86_POPAD_OK=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
||||
CONFIG_X86_WP_WORKS_OK=y
|
||||
CONFIG_X86_XADD=y
|
||||
CONFIG_XTERM_CHAN=y
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
CONFIG_3_LEVEL_PGTABLES=y
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_ARCH_DEFCONFIG="arch/um/configs/x86_64_defconfig"
|
||||
# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set
|
||||
# CONFIG_ARCH_HAS_SC_SIGNALS is not set
|
||||
# CONFIG_ARCH_HAS_SG_CHAIN is not set
|
||||
# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set
|
||||
CONFIG_BINFMT_MISC=m
|
||||
CONFIG_BLK_DEV_COW_COMMON=y
|
||||
CONFIG_BLK_DEV_UBD=y
|
||||
CONFIG_BLK_DEV_UBD_SYNC=y
|
||||
# CONFIG_CFQ_GROUP_IOSCHED is not set
|
||||
CONFIG_CON_CHAN="xterm"
|
||||
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
|
||||
CONFIG_CPU_SUP_AMD=y
|
||||
|
@ -19,11 +21,12 @@ CONFIG_CRC16=y
|
|||
CONFIG_CRYPTO_CRC32C=y
|
||||
CONFIG_CRYPTO_HASH=y
|
||||
CONFIG_CRYPTO_HASH2=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
# CONFIG_CRYPTO_SALSA20_X86_64 is not set
|
||||
CONFIG_CRYPTO_SHA1=y
|
||||
# CONFIG_CRYPTO_SKEIN is not set
|
||||
# CONFIG_CRYPTO_THREEFISH is not set
|
||||
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
|
||||
CONFIG_CRYPTO_WORKQUEUE=y
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_DECOMPRESS_BZIP2=y
|
||||
|
@ -31,25 +34,26 @@ CONFIG_DECOMPRESS_GZIP=y
|
|||
CONFIG_DEFAULT_CFQ=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
|
||||
CONFIG_DNOTIFY=y
|
||||
# CONFIG_EARLY_PRINTK is not set
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_FS_MBCACHE=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_GENERIC_CPU_DEVICES=y
|
||||
CONFIG_GENERIC_FIND_FIRST_BIT=y
|
||||
CONFIG_GENERIC_IO=y
|
||||
CONFIG_GENERIC_IRQ_SHOW=y
|
||||
CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
|
||||
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
|
||||
# CONFIG_HAVE_ARCH_BITREVERSE is not set
|
||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
||||
CONFIG_HAVE_FUTEX_CMPXCHG=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_HAVE_GENERIC_HARDIRQS=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_HAVE_UID16=y
|
||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
||||
CONFIG_HOSTAUDIO=m
|
||||
CONFIG_HOSTFS=y
|
||||
# CONFIG_HPPFS is not set
|
||||
|
@ -59,7 +63,6 @@ CONFIG_INIT_ENV_ARG_LIMIT=128
|
|||
CONFIG_IOSCHED_CFQ=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_ISO9660_FS=y
|
||||
CONFIG_JBD=y
|
||||
CONFIG_JBD2=y
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_KERNEL_STACK_ORDER=2
|
||||
|
@ -82,11 +85,11 @@ CONFIG_NO_DMA=y
|
|||
CONFIG_NO_IOMEM=y
|
||||
CONFIG_NULL_CHAN=y
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_PGTABLE_LEVELS=3
|
||||
CONFIG_PHYS_ADDR_T_64BIT=y
|
||||
CONFIG_PORT_CHAN=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
||||
# CONFIG_PREEMPT_RCU is not set
|
||||
# CONFIG_PRINT_QUOTA_WARNING is not set
|
||||
# CONFIG_PROCESSOR_SELECT is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
|
@ -109,17 +112,16 @@ CONFIG_SOUND=m
|
|||
CONFIG_SOUND_OSS_CORE=y
|
||||
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
|
||||
CONFIG_SQUASHFS_EMBEDDED=y
|
||||
CONFIG_SRCU=y
|
||||
CONFIG_SSL=y
|
||||
CONFIG_SSL_CHAN="pty"
|
||||
# CONFIG_STACKTRACE_SUPPORT is not set
|
||||
CONFIG_STACKTRACE=y
|
||||
CONFIG_STATIC_LINK=y
|
||||
CONFIG_STDERR_CONSOLE=y
|
||||
CONFIG_STDIO_CONSOLE=y
|
||||
CONFIG_TICK_CPU_ACCOUNTING=y
|
||||
# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
|
||||
CONFIG_TTY_CHAN=y
|
||||
CONFIG_UID16=y
|
||||
CONFIG_UIDGID_CONVERTED=y
|
||||
CONFIG_UML=y
|
||||
CONFIG_UML_NET=y
|
||||
CONFIG_UML_NET_DAEMON=y
|
||||
|
@ -136,9 +138,6 @@ CONFIG_UML_SOUND=m
|
|||
CONFIG_UML_WATCHDOG=m
|
||||
CONFIG_UML_X86=y
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
||||
# CONFIG_USB_ARCH_HAS_OHCI is not set
|
||||
# CONFIG_USB_ARCH_HAS_XHCI is not set
|
||||
# CONFIG_USER_NS is not set
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
CONFIG_WATCHDOG_CORE=y
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -159,7 +159,7 @@
|
|||
#include <asm/uaccess.h>
|
||||
|
||||
#include <trace/events/module.h>
|
||||
@@ -231,6 +232,28 @@ static int ____call_usermodehelper(void
|
||||
@@ -223,6 +224,28 @@ static int ____call_usermodehelper(void
|
||||
flush_signal_handlers(current, 1);
|
||||
spin_unlock_irq(¤t->sighand->siglock);
|
||||
|
||||
|
@ -188,7 +188,7 @@
|
|||
/* We can run anywhere, unlike our parent keventd(). */
|
||||
set_cpus_allowed_ptr(current, cpu_all_mask);
|
||||
|
||||
@@ -544,6 +567,20 @@ struct subprocess_info *call_usermodehel
|
||||
@@ -522,6 +545,20 @@ struct subprocess_info *call_usermodehel
|
||||
}
|
||||
EXPORT_SYMBOL(call_usermodehelper_setup);
|
||||
|
Loading…
Reference in New Issue