aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-05-14 11:26:46 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-05-14 11:41:08 +0000
commit37dd916d0be592107dd319b9aadc8760126da2e1 (patch)
treee2449b98b07b2c4621efe606284c07eb1544d20a
parent2f9a5f16ad381b9aa8d16d5a3e88703247c84b93 (diff)
downloadaports-37dd916d0be592107dd319b9aadc8760126da2e1.tar.bz2
aports-37dd916d0be592107dd319b9aadc8760126da2e1.tar.xz
main/linux-vserver: downgrade to LTS kernel 3.4.45
-rw-r--r--main/linux-vserver/APKBUILD40
-rw-r--r--main/linux-vserver/kernelconfig.x861065
-rw-r--r--main/linux-vserver/kernelconfig.x86_641043
-rw-r--r--main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff (renamed from main/linux-vserver/patch-3.6.11-vs2.3.4.6.diff)4385
-rw-r--r--main/linux-vserver/patch-3.6.11-al4.patch16533
5 files changed, 2493 insertions, 20573 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 2939f7cf71..0069ca5d7b 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,9 +2,9 @@
_flavor=vserver
pkgname=linux-${_flavor}
-pkgver=3.6.11
-pkgrel=3
-_vsver=vs2.3.4.6
+pkgver=3.4.45
+pkgrel=0
+_vsver=vs2.3.3.9
if [ "${pkgver##*.*.*}" = "$pkgver" ]; then
_kernver=$pkgver
@@ -21,7 +21,6 @@ _config=${config:-kernelconfig.${CARCH}}
install=
source="http://www.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
http://www.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
- patch-3.6.11-al4.patch
patch-$pkgver-$_vsver.diff
kernelconfig.x86
kernelconfig.x86_64
@@ -136,21 +135,18 @@ dev() {
"$subpkgdir"/lib/modules/${_abi_release}/build
}
-md5sums="1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz
-bd4bba74093405887d521309a74c19e9 patch-3.6.11.xz
-fa0ca65fb8e9f9d08c04f06ae5c316ec patch-3.6.11-al4.patch
-27809872b8bc0dffce4e383d68d1c989 patch-3.6.11-vs2.3.4.6.diff
-b28263bb0d529a80d4f13fbdd76520b2 kernelconfig.x86
-1e9e12d5bd63552127331b875a554992 kernelconfig.x86_64"
-sha256sums="4ab9a6ef1c1735713f9f659d67f92efa7c1dfbffb2a2ad544005b30f9791784f linux-3.6.tar.xz
-4bdc3822571a4a765bf6f347aad8b899730acef549ae4236813fd17f254f4327 patch-3.6.11.xz
-897ed38d778dfd76256f065f81ad02f16d126dc2e67631253520b8fe0685b444 patch-3.6.11-al4.patch
-31184cf84567765be061a8ad43e82c7a24e2dadbb514c6e42a19d750118658f2 patch-3.6.11-vs2.3.4.6.diff
-596d797f0e57414d3a887bcb1f302f5831e148d486eb82bc3c871710691af4c4 kernelconfig.x86
-ee8bdb887f8890f1a3457267b8595b3f61043bae0feb86933870d2c6f9139b82 kernelconfig.x86_64"
-sha512sums="6e3354184d1799228a2d33b92e4a6b743cc24352b8ccc1fd487fab07ab97be2aa03ba87b8406a177581692db1fd40674fbd4e213a782cbe0a6a969b10c4c17a1 linux-3.6.tar.xz
-08423f145ee7aef49f50d95032595ee79250135b6ecfa72f802502a277f215b63c4dc04ed149fe4ed7cdaa5ef063b8003b7f72f41d8417e45efbe7e30e621387 patch-3.6.11.xz
-477ee6c8bdf8884355efafc29e58810c097a4b1e3ecd84890bf582cf513510266d85a26e38d05ae463429ccfe9dd84cedc2fb1ed0a5fcf662a8a489ca30e6495 patch-3.6.11-al4.patch
-23acb52b46175dc3de27cdf1cde620190f32d77e1b3bb1169efd83f6e8a307113e7b08bc1e0652ad080ff5af25262c972368ac4871bba10c1122732e51f9b186 patch-3.6.11-vs2.3.4.6.diff
-ea766a9c24aba7320f57d9afa51f64e45de31ef38f19f4144994b22cae92689c2f7351cb31646123b1aedd1f2a65ccf84f2261e65cb7586bd8e21c3c0cd15b26 kernelconfig.x86
-440ac34e9fac04d5b7a417ad49e05c80ab19f9828b61a2dd4491a79da2ac0764dfbf9f0d854e56213e7fe2899af9e81a73d1c62ef599096fbce38688ddfc130a kernelconfig.x86_64"
+md5sums="967f72983655e2479f951195953e8480 linux-3.4.tar.xz
+adb183c04b48eb1276abcae46858dc29 patch-3.4.45.xz
+45c7f894c242dfb02c9d9485b252a98f patch-3.4.45-vs2.3.3.9.diff
+17038c80855fa0131db7021225184844 kernelconfig.x86
+ca6fce288664a05fed7c91883cf96dde kernelconfig.x86_64"
+sha256sums="ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 linux-3.4.tar.xz
+1eee23dc5a2f6a2448030e4d89e8d2883037c10cfd38eb1d59ee1d8848202ca4 patch-3.4.45.xz
+ab0de3bf5e4c381fb55d7494426bbf4a32a56d5002e6cf99c8a9451e4b0a0a6e patch-3.4.45-vs2.3.3.9.diff
+d5b45035e40e05a7f387027fbfb46fe8cb80f655204d768b937b1b5ff7f28397 kernelconfig.x86
+b6c68df7f4e6a7571839857c18896580da0393369aa7f4d4ee88182309e12376 kernelconfig.x86_64"
+sha512sums="1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c linux-3.4.tar.xz
+3a7abeae48a6731d76165071f76e83f67a88705de0f6fef88d1dd901e50e8776406d610256aab91f2650176f46ec3fef6e25196c9b25b969b8ba0293728d0b36 patch-3.4.45.xz
+8c3b9d0d93abdd9821595a849a7fae070147ed5013e2b6f31e8a659642586affef5f038fbed5696e447e145a5b0c2a339e7a2479b8579ea953766b9b712df8be patch-3.4.45-vs2.3.3.9.diff
+08d8cf139e3833631f3c53276ace72741fd9dfef99df2a0a8b0d8204222c3715788ee33d1601bdd27ba39aa9352a2ce8e23bdfde5c60a4a8b82eeea77aadae32 kernelconfig.x86
+766f93ef3e2d9ee131811a85179bdeb5e090eefa2adea4fc813f57b275016f37f7b9baf8761177c2431c38da2e0f421f92c08f5156195280f297296b0aa6acf0 kernelconfig.x86_64"
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86
index a445394ddf..641a31178c 100644
--- a/main/linux-vserver/kernelconfig.x86
+++ b/main/linux-vserver/kernelconfig.x86
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.6.10-vs2.3.4.6 Kernel Configuration
+# Linux/i386 3.4.45-vs2.3.3.9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -9,6 +9,10 @@ CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -22,7 +26,9 @@ CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -41,12 +47,11 @@ CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_32_LAZY_GS=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
@@ -89,24 +94,8 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_KTIME_SCALAR=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
#
# RCU Subsystem
@@ -114,7 +103,6 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_TREE_RCU=y
# CONFIG_PREEMPT_RCU is not set
CONFIG_RCU_FANOUT=32
-CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
@@ -129,7 +117,9 @@ CONFIG_CGROUP_DEVICE=y
# CONFIG_CPUSETS is not set
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
@@ -144,6 +134,7 @@ CONFIG_IPC_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
@@ -182,6 +173,7 @@ CONFIG_HAVE_PERF_EVENTS=y
# Kernel Performance Events And Counters
#
CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
@@ -207,9 +199,7 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
@@ -221,8 +211,6 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
#
# GCOV-based kernel profiling
@@ -313,6 +301,11 @@ CONFIG_FREEZER=y
# Processor type and features
#
CONFIG_ZONE_DMA=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_SMP=y
CONFIG_X86_MPPARSE=y
CONFIG_X86_BIGSMP=y
@@ -360,16 +353,17 @@ CONFIG_M686=y
# CONFIG_MVIAC7 is not set
# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_XADD=y
# CONFIG_X86_PPRO_FENCE is not set
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
+CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y
@@ -400,7 +394,7 @@ CONFIG_X86_IO_APIC=y
# CONFIG_X86_MCE is not set
CONFIG_VM86=y
# CONFIG_TOSHIBA is not set
-CONFIG_I8K=m
+# CONFIG_I8K is not set
# CONFIG_X86_REBOOTFIXUPS is not set
CONFIG_MICROCODE=m
CONFIG_MICROCODE_INTEL=y
@@ -448,9 +442,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
# CONFIG_HIGHPTE is not set
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_RESERVE_LOW=64
@@ -489,8 +481,6 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_HIBERNATION is not set
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
# CONFIG_PM_RUNTIME is not set
CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
@@ -572,7 +562,6 @@ CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
CONFIG_INTEL_IDLE=y
#
@@ -610,29 +599,14 @@ CONFIG_PCI_IOAPIC=y
CONFIG_PCI_LABEL=y
CONFIG_ISA_DMA_API=y
# CONFIG_ISA is not set
+# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
# CONFIG_OLPC is not set
CONFIG_ALIX=y
# CONFIG_NET5501 is not set
# CONFIG_GEOS is not set
CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_PCCARD is not set
CONFIG_HOTPLUG_PCI=m
CONFIG_HOTPLUG_PCI_FAKE=m
# CONFIG_HOTPLUG_PCI_COMPAQ is not set
@@ -665,7 +639,6 @@ CONFIG_PACKET=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
CONFIG_XFRM_USER=m
CONFIG_XFRM_SUB_POLICY=y
CONFIG_XFRM_MIGRATE=y
@@ -695,7 +668,6 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_PIMSM_V2=y
CONFIG_ARPD=y
CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
@@ -789,7 +761,6 @@ CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XTABLES=m
@@ -810,7 +781,6 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_TARGET_CT=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -971,6 +941,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1043,6 +1014,7 @@ CONFIG_RDS=m
# CONFIG_RDS_DEBUG is not set
CONFIG_TIPC=m
# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
CONFIG_ATM=m
CONFIG_ATM_CLIP=m
# CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1074,11 +1046,11 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
CONFIG_X25=m
CONFIG_LAPB=m
+# CONFIG_ECONET is not set
CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
+# CONFIG_PHONET is not set
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
CONFIG_NET_SCHED=y
#
@@ -1102,8 +1074,6 @@ CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1129,7 +1099,6 @@ CONFIG_NET_EMATCH_NBYTE=m
CONFIG_NET_EMATCH_U32=m
CONFIG_NET_EMATCH_META=m
CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
CONFIG_NET_CLS_ACT=y
CONFIG_NET_ACT_POLICE=m
CONFIG_NET_ACT_GACT=m
@@ -1223,7 +1192,6 @@ CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1236,14 +1204,9 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
-# CONFIG_BT_HCIUART_3WIRE is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
@@ -1263,11 +1226,11 @@ CONFIG_CFG80211=m
# CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
# CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEBUGFS is not set
# CONFIG_CFG80211_INTERNAL_REGDB is not set
CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
CONFIG_LIB80211=m
CONFIG_LIB80211_CRYPT_WEP=m
CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1284,7 +1247,6 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
CONFIG_WIMAX=m
CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1324,7 +1286,6 @@ CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_SPI=m
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
CONFIG_CONNECTOR=m
CONFIG_MTD=m
CONFIG_MTD_TESTS=m
@@ -1395,8 +1356,6 @@ CONFIG_MTD_SCB2_FLASH=m
CONFIG_MTD_NETtel=m
CONFIG_MTD_L440GX=m
CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
# CONFIG_MTD_GPIO_ADDR is not set
CONFIG_MTD_INTEL_VR_NOR=m
CONFIG_MTD_PLATRAM=m
@@ -1471,12 +1430,12 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
# CONFIG_PARPORT_GSC is not set
CONFIG_PARPORT_AX88796=m
# CONFIG_PARPORT_1284 is not set
@@ -1551,8 +1510,7 @@ CONFIG_HMC6352=m
CONFIG_DS1682=m
CONFIG_TI_DAC7512=m
CONFIG_VMWARE_BALLOON=m
-# CONFIG_BMP085_I2C is not set
-# CONFIG_BMP085_SPI is not set
+CONFIG_BMP085=m
CONFIG_PCH_PHUB=m
# CONFIG_USB_SWITCH_FSA9480 is not set
CONFIG_C2PORT=m
@@ -1570,6 +1528,9 @@ CONFIG_EEPROM_93XX46=m
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
#
# Texas Instruments shared transport line discipline
@@ -1581,7 +1542,6 @@ CONFIG_SENSORS_LIS3_I2C=m
# Altera FPGA firmware download module
#
# CONFIG_ALTERA_STAPL is not set
-# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1611,6 +1571,7 @@ CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
#
# SCSI Transports
@@ -1705,7 +1666,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPR_DUMP is not set
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
CONFIG_SCSI_QLA_ISCSI=m
CONFIG_SCSI_LPFC=m
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1718,12 +1678,6 @@ CONFIG_SCSI_PM8001=m
CONFIG_SCSI_SRP=m
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
CONFIG_SCSI_DH=m
CONFIG_SCSI_DH_RDAC=m
CONFIG_SCSI_DH_HP_SW=m
@@ -1822,7 +1776,6 @@ CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PLATFORM=m
CONFIG_PATA_RZ1000=m
@@ -1851,6 +1804,7 @@ CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
@@ -1869,7 +1823,6 @@ CONFIG_TCM_PSCSI=m
CONFIG_LOOPBACK_TARGET=m
CONFIG_TCM_FC=m
CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
@@ -1905,14 +1858,10 @@ CONFIG_EQUALIZER=m
CONFIG_MII=m
CONFIG_IEEE802154_DRIVERS=m
CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
CONFIG_IFB=m
CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
CONFIG_NETCONSOLE=m
@@ -1934,7 +1883,6 @@ CONFIG_ARCNET_COM90xxIO=m
CONFIG_ARCNET_RIM_I=m
CONFIG_ARCNET_COM20020=m
CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
CONFIG_ATM_DRIVERS=y
CONFIG_ATM_DUMMY=m
CONFIG_ATM_TCP=m
@@ -1972,8 +1920,6 @@ CONFIG_ATM_SOLOS=m
CONFIG_ETHERNET=y
CONFIG_MDIO=m
CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
CONFIG_NET_VENDOR_ADAPTEC=y
@@ -1984,7 +1930,6 @@ CONFIG_ACENIC=m
CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_ATL2=m
CONFIG_ATL1=m
@@ -2023,7 +1968,6 @@ CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
CONFIG_NET_VENDOR_DLINK=y
CONFIG_DE600=m
CONFIG_DE620=m
@@ -2036,8 +1980,6 @@ CONFIG_NET_VENDOR_EXAR=y
CONFIG_S2IO=m
CONFIG_VXGE=m
# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
CONFIG_NET_VENDOR_HP=y
CONFIG_HP100=m
CONFIG_NET_VENDOR_INTEL=y
@@ -2046,13 +1988,10 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
-# CONFIG_IGB_PTP is not set
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-# CONFIG_IXGBE_PTP is not set
# CONFIG_IXGBEVF is not set
CONFIG_NET_VENDOR_I825XX=y
# CONFIG_ZNET is not set
@@ -2084,9 +2023,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NATSEMI=m
CONFIG_NS83820=m
CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
@@ -2122,7 +2059,6 @@ CONFIG_SFC=m
CONFIG_SFC_MTD=y
CONFIG_SFC_MCDI_MON=y
CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
@@ -2146,14 +2082,6 @@ CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
CONFIG_FDDI=y
CONFIG_DEFXX=m
# CONFIG_DEFXX_MMIO is not set
@@ -2176,7 +2104,6 @@ CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
CONFIG_REALTEK_PHY=m
CONFIG_NATIONAL_PHY=m
@@ -2204,6 +2131,7 @@ CONFIG_SLHC=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=y
CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_TR is not set
#
# USB Network Adapters
@@ -2238,22 +2166,17 @@ CONFIG_USB_NET_KALMIA=m
CONFIG_USB_NET_QMI_WWAN=m
CONFIG_USB_HSO=m
CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
CONFIG_USB_IPHETH=m
CONFIG_USB_SIERRA_NET=m
CONFIG_USB_VL600=m
CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_AIRO=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
CONFIG_PRISM54=m
CONFIG_USB_ZD1201=m
CONFIG_USB_NET_RNDIS_WLAN=m
@@ -2275,6 +2198,7 @@ CONFIG_ATH9K=m
CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DFS_CERTIFIED is not set
CONFIG_ATH9K_RATE_CONTROL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -2290,7 +2214,6 @@ CONFIG_B43=m
CONFIG_B43_SSB=y
CONFIG_B43_PCI_AUTOSELECT=y
CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_PIO=y
CONFIG_B43_PHY_N=y
@@ -2316,7 +2239,6 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
# CONFIG_IPW2100_DEBUG is not set
@@ -2329,7 +2251,6 @@ CONFIG_IPW2200_QOS=y
CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLDVM=m
#
# Debugging Options
@@ -2345,9 +2266,10 @@ CONFIG_IWL3945=m
# iwl3945 / iwl4965 Debugging Options
#
# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
CONFIG_LIBERTAS_SPI=m
# CONFIG_LIBERTAS_DEBUG is not set
@@ -2358,8 +2280,6 @@ CONFIG_HERMES_CACHE_FW_ON_INIT=y
CONFIG_PLX_HERMES=m
CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
CONFIG_ORINOCO_USB=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
@@ -2375,7 +2295,6 @@ CONFIG_RT2800PCI=m
CONFIG_RT2800PCI_RT33XX=y
# CONFIG_RT2800PCI_RT35XX is not set
CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
CONFIG_RT2500USB=m
CONFIG_RT73USB=m
CONFIG_RT2800USB=m
@@ -2398,28 +2317,27 @@ CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
CONFIG_WL1251=m
CONFIG_WL1251_SPI=m
CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
#
# WiMAX Wireless Broadband devices
#
CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_IWMC3200_SDIO=y
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
CONFIG_WAN=y
CONFIG_LANMEDIA=m
@@ -2449,56 +2367,7 @@ CONFIG_SBNI=m
CONFIG_SBNI_MULTILINE=y
CONFIG_VMXNET3=m
CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
-CONFIG_ISDN_CAPI=m
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
+# CONFIG_ISDN is not set
#
# Input device support
@@ -2507,7 +2376,6 @@ CONFIG_INPUT=y
CONFIG_INPUT_FF_MEMLESS=m
CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_MATRIXKMAP is not set
#
# Userland interfaces
@@ -2536,7 +2404,6 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_TCA8418 is not set
# CONFIG_KEYBOARD_MATRIX is not set
# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
# CONFIG_KEYBOARD_MAX7359 is not set
# CONFIG_KEYBOARD_MCS is not set
# CONFIG_KEYBOARD_MPR121 is not set
@@ -2585,18 +2452,14 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GUNZE=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WM97XX=m
CONFIG_TOUCHSCREEN_WM9705=y
@@ -2648,7 +2511,6 @@ CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_INPUT_ADXL34X=m
@@ -2709,7 +2571,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=16
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
@@ -2725,7 +2586,6 @@ CONFIG_SERIAL_MAX3100=m
CONFIG_SERIAL_MAX3107=m
CONFIG_SERIAL_MRST_MAX3110=m
CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
@@ -2760,14 +2620,6 @@ CONFIG_NVRAM=m
CONFIG_R3964=m
CONFIG_APPLICOM=m
# CONFIG_SONYPI is not set
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
CONFIG_MWAVE=m
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
@@ -2783,6 +2635,7 @@ CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -2875,7 +2728,6 @@ CONFIG_SPI_LM70_LLP=m
CONFIG_SPI_PXA2XX=m
CONFIG_SPI_PXA2XX_PCI=y
CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XCOMM=m
# CONFIG_SPI_XILINX is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DW_PCI=m
@@ -2915,7 +2767,6 @@ CONFIG_GPIO_MAX730X=m
# CONFIG_GPIO_GENERIC_PLATFORM is not set
CONFIG_GPIO_IT8761E=m
CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
CONFIG_GPIO_VX855=m
#
@@ -2931,12 +2782,10 @@ CONFIG_GPIO_ADP5588=m
# PCI GPIO expanders:
#
CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_BT8XX=m
-CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_LANGWELL is not set
CONFIG_GPIO_PCH=m
CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_TIMBERDALE=y
CONFIG_GPIO_RDC321X=m
#
@@ -2950,12 +2799,10 @@ CONFIG_GPIO_74X164=m
#
# AC97 GPIO expanders:
#
-# CONFIG_GPIO_UCB1400 is not set
#
# MODULbus GPIO expanders:
#
-CONFIG_GPIO_JANZ_TTL=m
# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -2968,13 +2815,11 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_POWER_AVS is not set
CONFIG_HWMON=m
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3015,7 +2860,6 @@ CONFIG_SENSORS_G760A=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_GPIO_FAN=m
-# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3082,7 +2926,6 @@ CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_INA2XX is not set
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
CONFIG_SENSORS_TMP401=m
@@ -3131,7 +2974,6 @@ CONFIG_IB700_WDT=m
CONFIG_IBMASR=m
CONFIG_WAFER_WDT=m
CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
CONFIG_ITCO_WDT=m
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_IT8712F_WDT=m
@@ -3176,8 +3018,6 @@ CONFIG_SSB_BLOCKIO=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_PCIHOST=y
CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST_POSSIBLE=y
CONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_SILENT is not set
@@ -3195,528 +3035,32 @@ CONFIG_BCMA_POSSIBLE=y
# Multifunction device drivers
#
CONFIG_MFD_CORE=m
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_UCB1400_CORE is not set
# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
# CONFIG_MFD_TPS65217 is not set
# CONFIG_MFD_TPS65912_SPI is not set
# CONFIG_MFD_STMPE is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM831X_SPI is not set
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-CONFIG_ABX500_CORE=y
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_ABX500_CORE is not set
# CONFIG_EZX_PCAP is not set
CONFIG_MFD_CS5535=m
-CONFIG_MFD_TIMBERDALE=m
+# CONFIG_MFD_TIMBERDALE is not set
CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
+# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
CONFIG_MFD_WL1273_CORE=m
# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-
-#
-# Media drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-# CONFIG_LIRC is not set
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGUANA=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_ADV7183=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-# CONFIG_VIDEO_SR030PC30 is not set
-CONFIG_VIDEO_NOON010PC30=m
-# CONFIG_VIDEO_M5MOLS is not set
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_AS3645A is not set
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_V4L_USB_DRIVERS=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-# CONFIG_USB_GSPCA_SQ930X is not set
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-
-#
-# Webcam and/or TV USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX_RC=m
-# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-# CONFIG_SMS_USB_DRV is not set
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-CONFIG_DVB_DDBRIDGE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_MEDIA_SUPPORT is not set
#
# Graphics support
@@ -3760,14 +3104,10 @@ CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_GMA500=m
CONFIG_DRM_GMA600=y
CONFIG_DRM_GMA3600=y
# CONFIG_DRM_UDL is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
# CONFIG_STUB_POULSBO is not set
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3869,7 +3209,6 @@ CONFIG_FB_GEODE_GX=m
CONFIG_FB_GEODE_GX1=m
CONFIG_FB_TMIO=m
CONFIG_FB_TMIO_ACCELL=y
-CONFIG_FB_SM501=m
# CONFIG_FB_SMSCUFX is not set
# CONFIG_FB_UDL is not set
# CONFIG_FB_VIRTUAL is not set
@@ -3878,7 +3217,6 @@ CONFIG_FB_MB862XX=m
CONFIG_FB_MB862XX_PCI_GDC=y
CONFIG_FB_MB862XX_I2C=y
CONFIG_FB_BROADSHEET=m
-# CONFIG_FB_AUO_K190X is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
@@ -3896,12 +3234,10 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_PWM=m
# CONFIG_BACKLIGHT_APPLE is not set
CONFIG_BACKLIGHT_SAHARA=m
CONFIG_BACKLIGHT_ADP8860=m
# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
@@ -3967,7 +3303,6 @@ CONFIG_SND_AC97_POWER_SAVE=y
CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
CONFIG_SND_SB_COMMON=m
CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
@@ -4014,9 +3349,7 @@ CONFIG_SND_ENS1371=m
CONFIG_SND_ES1938=m
CONFIG_SND_ES1968=m
CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FM801=m
-# CONFIG_SND_FM801_TEA575X_BOOL is not set
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_PREALLOC_SIZE=4096
CONFIG_SND_HDA_HWDEP=y
@@ -4026,6 +3359,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_JACK=y
# CONFIG_SND_HDA_PATCH_LOADER is not set
CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_ANALOG=y
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
@@ -4077,14 +3411,10 @@ CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
CONFIG_SND_SOC=m
CONFIG_SND_SOC_I2C_AND_SPI=m
CONFIG_SND_SOC_ALL_CODECS=m
CONFIG_SND_SOC_WM_HUBS=m
-CONFIG_SND_SOC_AB8500_CODEC=m
CONFIG_SND_SOC_AD1836=m
CONFIG_SND_SOC_AD193X=m
CONFIG_SND_SOC_AD73311=m
@@ -4099,7 +3429,6 @@ CONFIG_SND_SOC_AK4671=m
CONFIG_SND_SOC_ALC5623=m
CONFIG_SND_SOC_ALC5632=m
CONFIG_SND_SOC_CS42L51=m
-CONFIG_SND_SOC_CS42L52=m
CONFIG_SND_SOC_CS42L73=m
CONFIG_SND_SOC_CS4270=m
CONFIG_SND_SOC_CS4271=m
@@ -4107,10 +3436,7 @@ CONFIG_SND_SOC_CX20442=m
CONFIG_SND_SOC_JZ4740_CODEC=m
CONFIG_SND_SOC_L3=m
CONFIG_SND_SOC_DA7210=m
-CONFIG_SND_SOC_DA732X=m
CONFIG_SND_SOC_DFBMCS320=m
-CONFIG_SND_SOC_ISABELLE=m
-CONFIG_SND_SOC_LM49453=m
CONFIG_SND_SOC_MAX98088=m
CONFIG_SND_SOC_MAX98095=m
CONFIG_SND_SOC_MAX9850=m
@@ -4120,7 +3446,6 @@ CONFIG_SND_SOC_SGTL5000=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_SSM2602=m
CONFIG_SND_SOC_STA32X=m
-CONFIG_SND_SOC_STA529=m
CONFIG_SND_SOC_TLV320AIC23=m
CONFIG_SND_SOC_TLV320AIC26=m
CONFIG_SND_SOC_TLV320AIC32X4=m
@@ -4172,19 +3497,25 @@ CONFIG_SND_SOC_WM9090=m
CONFIG_SND_SOC_LM4857=m
CONFIG_SND_SOC_MAX9768=m
CONFIG_SND_SOC_MAX9877=m
-CONFIG_SND_SOC_ML26124=m
CONFIG_SND_SOC_TPA6130A2=m
-CONFIG_SND_SIMPLE_CARD=m
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
#
-# HID support
+# USB Input Devices
#
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
#
# Special HID drivers
@@ -4192,7 +3523,6 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_A4TECH is not set
# CONFIG_HID_ACRUX is not set
CONFIG_HID_APPLE=m
-# CONFIG_HID_AUREAL is not set
# CONFIG_HID_BELKIN is not set
# CONFIG_HID_CHERRY is not set
# CONFIG_HID_CHICONY is not set
@@ -4211,7 +3541,6 @@ CONFIG_HID_KEYTOUCH=m
# CONFIG_HID_TWINHAN is not set
# CONFIG_HID_KENSINGTON is not set
CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
# CONFIG_HID_LOGITECH is not set
CONFIG_HID_MAGICMOUSE=m
# CONFIG_HID_MICROSOFT is not set
@@ -4243,19 +3572,6 @@ CONFIG_HID_HYPERV_MOUSE=m
# CONFIG_HID_WIIMOTE is not set
# CONFIG_HID_ZEROPLUS is not set
CONFIG_HID_ZYDACRON=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4269,11 +3585,12 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
# Miscellaneous USB options
#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
# CONFIG_USB_WUSB_CBAF_DEBUG is not set
@@ -4298,15 +3615,9 @@ CONFIG_USB_EHCI_HCD_PLATFORM=y
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_HCD_ISO=y
-CONFIG_USB_SL811_CS=m
CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_CHIPIDEA is not set
#
# USB Device Class drivers
@@ -4338,7 +3649,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
CONFIG_USB_LIBUSUAL=y
#
@@ -4365,37 +3675,37 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
CONFIG_USB_SERIAL_IR=m
CONFIG_USB_SERIAL_EDGEPORT=m
CONFIG_USB_SERIAL_EDGEPORT_TI=m
# CONFIG_USB_SERIAL_F81232 is not set
-CONFIG_USB_SERIAL_GARMIN=m
+# CONFIG_USB_SERIAL_GARMIN is not set
CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
+# CONFIG_USB_SERIAL_HP4X is not set
CONFIG_USB_SERIAL_SAFE=m
CONFIG_USB_SERIAL_SAFE_PADDED=y
CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
+# CONFIG_USB_SERIAL_SYMBOL is not set
CONFIG_USB_SERIAL_TI=m
CONFIG_USB_SERIAL_CYBERJACK=m
CONFIG_USB_SERIAL_XIRCOM=m
@@ -4406,38 +3716,31 @@ CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_ZIO=m
# CONFIG_USB_SERIAL_SSU100 is not set
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_DEBUG=m
+# CONFIG_USB_SERIAL_DEBUG is not set
#
# USB Miscellaneous drivers
#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
+# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
CONFIG_USB_LCD=m
CONFIG_USB_LED=m
CONFIG_USB_CYPRESS_CY7C63=m
CONFIG_USB_CYTHERM=m
CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
+# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_IOWARRIOR is not set
CONFIG_USB_TEST=m
CONFIG_USB_ISIGHTFW=m
# CONFIG_USB_YUREX is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_USB_ISP1301 is not set
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4451,10 +3754,7 @@ CONFIG_USB_XUSBATM=m
CONFIG_USB_OTG_UTILS=y
CONFIG_USB_GPIO_VBUS=m
CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
+# CONFIG_UWB is not set
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -4478,7 +3778,6 @@ CONFIG_MMC_RICOH_MMC=y
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
@@ -4520,16 +3819,13 @@ CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
# CONFIG_LEDS_TCA6507 is not set
-CONFIG_LEDS_LM3556=m
# CONFIG_LEDS_OT200 is not set
-CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_TRIGGERS=y
#
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4538,7 +3834,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
#
# iptables trigger is under Netfilter config (LED target)
#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
CONFIG_ACCESSIBILITY=y
# CONFIG_A11Y_BRAILLE_CONSOLE is not set
CONFIG_INFINIBAND=m
@@ -4556,7 +3851,6 @@ CONFIG_INFINIBAND_CXGB4=m
CONFIG_MLX4_INFINIBAND=m
CONFIG_INFINIBAND_NES=m
# CONFIG_INFINIBAND_NES_DEBUG is not set
-# CONFIG_INFINIBAND_OCRDMA is not set
CONFIG_INFINIBAND_IPOIB=m
# CONFIG_INFINIBAND_IPOIB_CM is not set
# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@@ -4632,7 +3926,6 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
#
# on-CPU RTC drivers
@@ -4670,9 +3963,6 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
# CONFIG_UIO_PCI_GENERIC is not set
CONFIG_UIO_NETX=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
CONFIG_VIRTIO=m
CONFIG_VIRTIO_RING=m
@@ -4682,125 +3972,16 @@ CONFIG_VIRTIO_RING=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
#
# Microsoft Hyper-V guest support
#
CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
-CONFIG_STAGING=y
-# CONFIG_ET131X is not set
-# CONFIG_SLICOSS is not set
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-# CONFIG_W35UND is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_ECHO is not set
-# CONFIG_COMEDI is not set
-# CONFIG_ASUS_OLED is not set
-# CONFIG_PANEL is not set
-# CONFIG_R8187SE is not set
-# CONFIG_RTL8192U is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8192E is not set
-# CONFIG_R8712U is not set
-# CONFIG_RTS_PSTOR is not set
-# CONFIG_RTS5139 is not set
-# CONFIG_TRANZPORT is not set
-# CONFIG_IDE_PHISON is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_DX_SEP is not set
-# CONFIG_ZSMALLOC is not set
-# CONFIG_WLAGS49_H2 is not set
-# CONFIG_WLAGS49_H25 is not set
-# CONFIG_FB_SM7XX is not set
-# CONFIG_CRYSTALHD is not set
-# CONFIG_CXT1E1 is not set
-# CONFIG_FB_XGI is not set
-# CONFIG_ACPI_QUICKSTART is not set
-# CONFIG_SBE_2T3E3 is not set
-# CONFIG_USB_ENESTORAGE is not set
-# CONFIG_BCM_WIMAX is not set
-# CONFIG_FT1000 is not set
-
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
-# CONFIG_USB_WPAN_HCD is not set
-# CONFIG_IPACK_BUS is not set
-CONFIG_WIMAX_GDM72XX=m
-# CONFIG_WIMAX_GDM72XX_QOS is not set
-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
-# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-# CONFIG_CSR_WIFI is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-# CONFIG_FUJITSU_TABLET is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_TC1100_WMI is not set
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
+# CONFIG_STAGING is not set
+# CONFIG_X86_PLATFORM_DEVICES is not set
CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-# CONFIG_TOPSTAR_LAPTOP is not set
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-# CONFIG_INTEL_IPS is not set
-# CONFIG_IBM_RTL is not set
-CONFIG_XO15_EBOOK=m
-# CONFIG_SAMSUNG_LAPTOP is not set
CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-# CONFIG_SAMSUNG_Q10 is not set
-# CONFIG_APPLE_GMUX is not set
#
# Hardware Spinlock drivers
@@ -4825,16 +4006,6 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
#
CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
#
# Firmware Drivers
@@ -4992,9 +4163,11 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
@@ -5017,8 +4190,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
# CONFIG_ROMFS_BACKED_BY_BOTH is not set
CONFIG_ROMFS_ON_BLOCK=y
CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-CONFIG_PSTORE_RAM=m
CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -5028,11 +4199,9 @@ CONFIG_EXOFS_FS=m
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
+CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_V4=y
# CONFIG_NFS_V4_1 is not set
# CONFIG_NFS_FSCACHE is not set
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5107,17 +4276,6 @@ CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_DLM=m
# CONFIG_DLM_DEBUG is not set
@@ -5133,7 +4291,6 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
@@ -5146,8 +4303,6 @@ CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
# CONFIG_DETECT_HUNG_TASK is not set
CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
@@ -5193,7 +4348,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_LKDTM is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
# CONFIG_FAULT_INJECTION is not set
CONFIG_LATENCYTOP=y
# CONFIG_DEBUG_PAGEALLOC is not set
@@ -5231,7 +4386,6 @@ CONFIG_DEBUG_RODATA=y
CONFIG_DEBUG_SET_MODULE_RONX=y
CONFIG_DEBUG_NX_TEST=m
CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
CONFIG_X86_DECODER_SELFTEST=y
@@ -5270,7 +4424,6 @@ CONFIG_VSERVER_CONTEXTS=256
CONFIG_VSERVER_WARN=y
CONFIG_VSERVER_WARN_DEVPTS=y
# CONFIG_VSERVER_DEBUG is not set
-# CONFIG_VSERVER_EXTRA_MNT_CHECK is not set
CONFIG_QUOTES_ISO8859=y
# CONFIG_QUOTES_UTF8 is not set
# CONFIG_QUOTES_ASCII is not set
@@ -5333,8 +4486,6 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
# Authenticated Encryption with Associated Data
@@ -5433,13 +4584,11 @@ CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
# CONFIG_LGUEST is not set
# CONFIG_BINARY_PRINTF is not set
@@ -5448,8 +4597,6 @@ CONFIG_TCM_VHOST=m
#
CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
@@ -5487,8 +4634,6 @@ CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
@@ -5502,8 +4647,6 @@ CONFIG_CHECK_SIGNATURE=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
-CONFIG_DDR=y
diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64
index 83ecfcb222..92bdd3da3a 100644
--- a/main/linux-vserver/kernelconfig.x86_64
+++ b/main/linux-vserver/kernelconfig.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.10-vs2.3.4.6 Kernel Configuration
+# Linux/x86_64 3.4.45-vs2.3.3.9 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -9,6 +9,11 @@ CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -23,7 +28,9 @@ CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -41,12 +48,11 @@ CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
@@ -89,25 +95,8 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
#
# RCU Subsystem
@@ -115,7 +104,6 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_TREE_RCU=y
# CONFIG_PREEMPT_RCU is not set
CONFIG_RCU_FANOUT=32
-CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
@@ -131,7 +119,9 @@ CONFIG_CPUSETS=y
# CONFIG_PROC_PID_CPUSET is not set
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
@@ -146,6 +136,7 @@ CONFIG_IPC_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
@@ -184,6 +175,7 @@ CONFIG_HAVE_PERF_EVENTS=y
# Kernel Performance Events And Counters
#
CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
@@ -210,7 +202,6 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
@@ -222,9 +213,7 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
#
# GCOV-based kernel profiling
@@ -315,6 +304,11 @@ CONFIG_FREEZER=y
# Processor type and features
#
CONFIG_ZONE_DMA=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_SMP=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
@@ -417,9 +411,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_RESERVE_LOW=64
CONFIG_MTRR=y
@@ -457,8 +449,6 @@ CONFIG_HIBERNATE_CALLBACKS=y
# CONFIG_HIBERNATION is not set
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
# CONFIG_PM_RUNTIME is not set
CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
@@ -529,7 +519,6 @@ CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
CONFIG_INTEL_IDLE=y
#
@@ -570,23 +559,7 @@ CONFIG_PCI_IOAPIC=y
CONFIG_PCI_LABEL=y
CONFIG_ISA_DMA_API=y
CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_PCCARD is not set
CONFIG_HOTPLUG_PCI=m
CONFIG_HOTPLUG_PCI_FAKE=m
CONFIG_HOTPLUG_PCI_ACPI=m
@@ -614,7 +587,6 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_X86_DEV_DMA_OPS=y
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -625,7 +597,6 @@ CONFIG_PACKET=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
CONFIG_XFRM_USER=m
CONFIG_XFRM_SUB_POLICY=y
CONFIG_XFRM_MIGRATE=y
@@ -655,7 +626,6 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_PIMSM_V2=y
CONFIG_ARPD=y
CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
@@ -749,7 +719,6 @@ CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XTABLES=m
@@ -770,7 +739,6 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_TARGET_CT=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -931,6 +899,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1003,6 +972,7 @@ CONFIG_RDS=m
# CONFIG_RDS_DEBUG is not set
CONFIG_TIPC=m
# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
CONFIG_ATM=m
CONFIG_ATM_CLIP=m
# CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1034,11 +1004,11 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
CONFIG_X25=m
CONFIG_LAPB=m
+# CONFIG_ECONET is not set
CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
+# CONFIG_PHONET is not set
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
CONFIG_NET_SCHED=y
#
@@ -1062,8 +1032,6 @@ CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1089,7 +1057,6 @@ CONFIG_NET_EMATCH_NBYTE=m
CONFIG_NET_EMATCH_U32=m
CONFIG_NET_EMATCH_META=m
CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
CONFIG_NET_CLS_ACT=y
CONFIG_NET_ACT_POLICE=m
CONFIG_NET_ACT_GACT=m
@@ -1112,6 +1079,7 @@ CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_NETPRIO_CGROUP=m
CONFIG_BQL=y
+CONFIG_HAVE_BPF_JIT=y
CONFIG_BPF_JIT=y
#
@@ -1121,69 +1089,13 @@ CONFIG_NET_PKTGEN=m
CONFIG_NET_TCPPROBE=m
# CONFIG_HAMRADIO is not set
# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
+# CONFIG_IRDA is not set
CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1196,14 +1108,9 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
-# CONFIG_BT_HCIUART_3WIRE is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
@@ -1223,11 +1130,11 @@ CONFIG_CFG80211=m
# CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
# CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEBUGFS is not set
# CONFIG_CFG80211_INTERNAL_REGDB is not set
CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
CONFIG_LIB80211=m
CONFIG_LIB80211_CRYPT_WEP=m
CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1244,7 +1151,6 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
CONFIG_WIMAX=m
CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1260,7 +1166,6 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
# CONFIG_NFC is not set
-CONFIG_HAVE_BPF_JIT=y
#
# Device Drivers
@@ -1355,8 +1260,6 @@ CONFIG_MTD_SCB2_FLASH=m
CONFIG_MTD_NETtel=m
CONFIG_MTD_L440GX=m
CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
# CONFIG_MTD_GPIO_ADDR is not set
CONFIG_MTD_INTEL_VR_NOR=m
CONFIG_MTD_PLATRAM=m
@@ -1430,12 +1333,12 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
# CONFIG_PARPORT_GSC is not set
CONFIG_PARPORT_AX88796=m
# CONFIG_PARPORT_1284 is not set
@@ -1512,8 +1415,7 @@ CONFIG_HMC6352=m
CONFIG_DS1682=m
CONFIG_TI_DAC7512=m
CONFIG_VMWARE_BALLOON=m
-# CONFIG_BMP085_I2C is not set
-# CONFIG_BMP085_SPI is not set
+CONFIG_BMP085=m
CONFIG_PCH_PHUB=m
# CONFIG_USB_SWITCH_FSA9480 is not set
CONFIG_C2PORT=m
@@ -1531,6 +1433,9 @@ CONFIG_EEPROM_93XX46=m
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
#
# Texas Instruments shared transport line discipline
@@ -1542,7 +1447,6 @@ CONFIG_SENSORS_LIS3_I2C=m
# Altera FPGA firmware download module
#
# CONFIG_ALTERA_STAPL is not set
-# CONFIG_INTEL_MEI is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1572,6 +1476,7 @@ CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
#
# SCSI Transports
@@ -1665,7 +1570,6 @@ CONFIG_SCSI_IPR_TRACE=y
# CONFIG_SCSI_IPR_DUMP is not set
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
CONFIG_SCSI_QLA_ISCSI=m
CONFIG_SCSI_LPFC=m
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1677,7 +1581,6 @@ CONFIG_SCSI_PM8001=m
CONFIG_SCSI_SRP=m
# CONFIG_SCSI_BFA_FC is not set
CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_SCSI_DH=m
CONFIG_SCSI_DH_RDAC=m
CONFIG_SCSI_DH_HP_SW=m
@@ -1775,7 +1678,6 @@ CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PLATFORM=m
CONFIG_PATA_RZ1000=m
@@ -1804,6 +1706,7 @@ CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
@@ -1822,7 +1725,6 @@ CONFIG_TCM_PSCSI=m
CONFIG_LOOPBACK_TARGET=m
CONFIG_TCM_FC=m
CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
@@ -1859,14 +1761,10 @@ CONFIG_EQUALIZER=m
CONFIG_MII=m
CONFIG_IEEE802154_DRIVERS=m
CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
CONFIG_IFB=m
CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
CONFIG_NETCONSOLE=m
@@ -1888,7 +1786,6 @@ CONFIG_ARCNET_COM90xxIO=m
CONFIG_ARCNET_RIM_I=m
CONFIG_ARCNET_COM20020=m
CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
CONFIG_ATM_DRIVERS=y
CONFIG_ATM_DUMMY=m
CONFIG_ATM_TCP=m
@@ -1926,8 +1823,6 @@ CONFIG_ATM_SOLOS=m
CONFIG_ETHERNET=y
CONFIG_MDIO=m
CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
CONFIG_NET_VENDOR_ADAPTEC=y
@@ -1938,7 +1833,6 @@ CONFIG_ACENIC=m
CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_ATL2=m
CONFIG_ATL1=m
@@ -1977,7 +1871,6 @@ CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
CONFIG_NET_VENDOR_DLINK=y
CONFIG_DE600=m
CONFIG_DE620=m
@@ -1990,8 +1883,6 @@ CONFIG_NET_VENDOR_EXAR=y
CONFIG_S2IO=m
CONFIG_VXGE=m
# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
CONFIG_NET_VENDOR_HP=y
CONFIG_HP100=m
CONFIG_NET_VENDOR_INTEL=y
@@ -2000,13 +1891,10 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
-# CONFIG_IGB_PTP is not set
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-# CONFIG_IXGBE_PTP is not set
# CONFIG_IXGBEVF is not set
CONFIG_NET_VENDOR_I825XX=y
# CONFIG_ZNET is not set
@@ -2038,9 +1926,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NATSEMI=m
CONFIG_NS83820=m
CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
@@ -2077,7 +1963,6 @@ CONFIG_SFC_MTD=y
CONFIG_SFC_MCDI_MON=y
CONFIG_SFC_SRIOV=y
CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
@@ -2101,14 +1986,6 @@ CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
CONFIG_FDDI=y
CONFIG_DEFXX=m
# CONFIG_DEFXX_MMIO is not set
@@ -2131,7 +2008,6 @@ CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
CONFIG_REALTEK_PHY=m
CONFIG_NATIONAL_PHY=m
@@ -2159,6 +2035,7 @@ CONFIG_SLHC=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=y
CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_TR is not set
#
# USB Network Adapters
@@ -2193,22 +2070,17 @@ CONFIG_USB_NET_KALMIA=m
CONFIG_USB_NET_QMI_WWAN=m
CONFIG_USB_HSO=m
CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
CONFIG_USB_IPHETH=m
CONFIG_USB_SIERRA_NET=m
CONFIG_USB_VL600=m
CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_AIRO=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
CONFIG_PRISM54=m
CONFIG_USB_ZD1201=m
CONFIG_USB_NET_RNDIS_WLAN=m
@@ -2230,6 +2102,7 @@ CONFIG_ATH9K=m
CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DFS_CERTIFIED is not set
CONFIG_ATH9K_RATE_CONTROL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -2245,7 +2118,6 @@ CONFIG_B43=m
CONFIG_B43_SSB=y
CONFIG_B43_PCI_AUTOSELECT=y
CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_PIO=y
CONFIG_B43_PHY_N=y
@@ -2271,7 +2143,6 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
# CONFIG_IPW2100_DEBUG is not set
@@ -2284,7 +2155,6 @@ CONFIG_IPW2200_QOS=y
CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
CONFIG_IWLWIFI=m
-CONFIG_IWLDVM=m
#
# Debugging Options
@@ -2300,9 +2170,10 @@ CONFIG_IWL3945=m
# iwl3945 / iwl4965 Debugging Options
#
# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
CONFIG_LIBERTAS_SPI=m
# CONFIG_LIBERTAS_DEBUG is not set
@@ -2313,8 +2184,6 @@ CONFIG_HERMES_CACHE_FW_ON_INIT=y
CONFIG_PLX_HERMES=m
CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
CONFIG_ORINOCO_USB=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
@@ -2330,7 +2199,6 @@ CONFIG_RT2800PCI=m
CONFIG_RT2800PCI_RT33XX=y
# CONFIG_RT2800PCI_RT35XX is not set
CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
CONFIG_RT2500USB=m
CONFIG_RT73USB=m
CONFIG_RT2800USB=m
@@ -2353,28 +2221,27 @@ CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
CONFIG_WL1251=m
CONFIG_WL1251_SPI=m
CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
#
# WiMAX Wireless Broadband devices
#
CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_IWMC3200_SDIO=y
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
CONFIG_WAN=y
CONFIG_LANMEDIA=m
@@ -2406,56 +2273,7 @@ CONFIG_XEN_NETDEV_FRONTEND=y
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_VMXNET3=m
CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
-CONFIG_ISDN_CAPI=m
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
+# CONFIG_ISDN is not set
#
# Input device support
@@ -2464,7 +2282,6 @@ CONFIG_INPUT=y
CONFIG_INPUT_FF_MEMLESS=m
CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_MATRIXKMAP is not set
#
# Userland interfaces
@@ -2493,7 +2310,6 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_TCA8418 is not set
# CONFIG_KEYBOARD_MATRIX is not set
# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
# CONFIG_KEYBOARD_MAX7359 is not set
# CONFIG_KEYBOARD_MCS is not set
# CONFIG_KEYBOARD_MPR121 is not set
@@ -2542,15 +2358,12 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GUNZE=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
# CONFIG_TOUCHSCREEN_MAX11801 is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2560,6 +2373,7 @@ CONFIG_TOUCHSCREEN_WM9705=y
CONFIG_TOUCHSCREEN_WM9712=y
CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_MC13783 is not set
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2590,6 +2404,7 @@ CONFIG_INPUT_AD714X_I2C=m
CONFIG_INPUT_AD714X_SPI=m
# CONFIG_INPUT_BMA150 is not set
CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_MC13783_PWRBUTTON is not set
CONFIG_INPUT_MMA8450=m
CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_APANEL=m
@@ -2604,7 +2419,7 @@ CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
+# CONFIG_INPUT_PCF50633_PMU is not set
CONFIG_INPUT_PCF8574=m
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_INPUT_ADXL34X=m
@@ -2666,7 +2481,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=16
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
@@ -2682,7 +2496,7 @@ CONFIG_SERIAL_MAX3100=m
CONFIG_SERIAL_MAX3107=m
CONFIG_SERIAL_MRST_MAX3110=m
CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
+# CONFIG_SERIAL_UARTLITE is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
@@ -2718,14 +2532,6 @@ CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_NVRAM=m
CONFIG_R3964=m
CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
CONFIG_MWAVE=m
CONFIG_RAW_DRIVER=m
CONFIG_MAX_RAW_DEVS=256
@@ -2739,6 +2545,7 @@ CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -2829,7 +2636,6 @@ CONFIG_SPI_LM70_LLP=m
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX_PCI is not set
CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XCOMM=m
# CONFIG_SPI_XILINX is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DW_PCI=m
@@ -2869,7 +2675,6 @@ CONFIG_GPIO_MAX730X=m
# CONFIG_GPIO_GENERIC_PLATFORM is not set
CONFIG_GPIO_IT8761E=m
CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
CONFIG_GPIO_VX855=m
#
@@ -2885,8 +2690,7 @@ CONFIG_GPIO_ADP5588=m
# PCI GPIO expanders:
#
CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_BT8XX=m
-CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_LANGWELL is not set
CONFIG_GPIO_PCH=m
CONFIG_GPIO_ML_IOH=m
@@ -2909,7 +2713,7 @@ CONFIG_GPIO_74X164=m
#
# MODULbus GPIO expanders:
#
-CONFIG_GPIO_JANZ_TTL=m
+# CONFIG_GPIO_JANZ_TTL is not set
# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -2928,7 +2732,6 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_POWER_AVS is not set
CONFIG_HWMON=m
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2969,7 +2772,6 @@ CONFIG_SENSORS_G760A=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_GPIO_FAN=m
-# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3036,7 +2838,6 @@ CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_INA2XX is not set
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
CONFIG_SENSORS_TMP401=m
@@ -3056,6 +2857,7 @@ CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_APPLESMC=m
+# CONFIG_SENSORS_MC13783_ADC is not set
#
# ACPI drivers
@@ -3085,7 +2887,6 @@ CONFIG_IB700_WDT=m
CONFIG_IBMASR=m
CONFIG_WAFER_WDT=m
CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
CONFIG_ITCO_WDT=m
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_IT8712F_WDT=m
@@ -3130,8 +2931,6 @@ CONFIG_SSB_BLOCKIO=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_PCIHOST=y
CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST_POSSIBLE=y
CONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_SILENT is not set
@@ -3153,7 +2952,6 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SM501_GPIO is not set
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
-# CONFIG_MFD_LM3533 is not set
# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
@@ -3162,515 +2960,25 @@ CONFIG_TPS6507X=m
# CONFIG_MFD_STMPE is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM8400=m
# CONFIG_MFD_WM831X_SPI is not set
CONFIG_MFD_PCF50633=m
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
CONFIG_ABX500_CORE=y
# CONFIG_EZX_PCAP is not set
+# CONFIG_AB8500_CORE is not set
CONFIG_MFD_CS5535=m
CONFIG_MFD_TIMBERDALE=m
CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
CONFIG_MFD_RDC321X=m
CONFIG_MFD_JANZ_CMODIO=m
CONFIG_MFD_VX855=m
CONFIG_MFD_WL1273_CORE=m
# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-
-#
-# Media drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-# CONFIG_LIRC is not set
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGUANA=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_ADV7183=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-# CONFIG_VIDEO_SR030PC30 is not set
-CONFIG_VIDEO_NOON010PC30=m
-# CONFIG_VIDEO_M5MOLS is not set
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_AS3645A is not set
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_V4L_USB_DRIVERS=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-# CONFIG_USB_GSPCA_SQ930X is not set
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-
-#
-# Webcam and/or TV USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX_RC=m
-# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-# CONFIG_SMS_USB_DRV is not set
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-CONFIG_DVB_DDBRIDGE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_MEDIA_SUPPORT is not set
#
# Graphics support
@@ -3708,14 +3016,10 @@ CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_GMA500=m
CONFIG_DRM_GMA600=y
CONFIG_DRM_GMA3600=y
# CONFIG_DRM_UDL is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
# CONFIG_STUB_POULSBO is not set
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3816,7 +3120,7 @@ CONFIG_FB_GEODE_GX=m
CONFIG_FB_GEODE_GX1=m
CONFIG_FB_TMIO=m
CONFIG_FB_TMIO_ACCELL=y
-CONFIG_FB_SM501=m
+# CONFIG_FB_SM501 is not set
# CONFIG_FB_SMSCUFX is not set
# CONFIG_FB_UDL is not set
# CONFIG_FB_VIRTUAL is not set
@@ -3826,7 +3130,6 @@ CONFIG_FB_MB862XX=m
CONFIG_FB_MB862XX_PCI_GDC=y
CONFIG_FB_MB862XX_I2C=y
CONFIG_FB_BROADSHEET=m
-# CONFIG_FB_AUO_K190X is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
@@ -3844,7 +3147,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_PWM=m
# CONFIG_BACKLIGHT_APPLE is not set
CONFIG_BACKLIGHT_SAHARA=m
CONFIG_BACKLIGHT_ADP8860=m
@@ -3915,7 +3217,6 @@ CONFIG_SND_AC97_POWER_SAVE=y
CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
CONFIG_SND_SB_COMMON=m
CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
@@ -3962,9 +3263,7 @@ CONFIG_SND_ENS1371=m
CONFIG_SND_ES1938=m
CONFIG_SND_ES1968=m
CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FM801=m
-# CONFIG_SND_FM801_TEA575X_BOOL is not set
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_PREALLOC_SIZE=4096
CONFIG_SND_HDA_HWDEP=y
@@ -3974,6 +3273,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_JACK=y
# CONFIG_SND_HDA_PATCH_LOADER is not set
CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_ANALOG=y
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
@@ -4024,14 +3324,10 @@ CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
CONFIG_SND_SOC=m
CONFIG_SND_SOC_I2C_AND_SPI=m
CONFIG_SND_SOC_ALL_CODECS=m
CONFIG_SND_SOC_WM_HUBS=m
-CONFIG_SND_SOC_AB8500_CODEC=m
CONFIG_SND_SOC_AD1836=m
CONFIG_SND_SOC_AD193X=m
CONFIG_SND_SOC_AD73311=m
@@ -4046,7 +3342,6 @@ CONFIG_SND_SOC_AK4671=m
CONFIG_SND_SOC_ALC5623=m
CONFIG_SND_SOC_ALC5632=m
CONFIG_SND_SOC_CS42L51=m
-CONFIG_SND_SOC_CS42L52=m
CONFIG_SND_SOC_CS42L73=m
CONFIG_SND_SOC_CS4270=m
CONFIG_SND_SOC_CS4271=m
@@ -4054,10 +3349,7 @@ CONFIG_SND_SOC_CX20442=m
CONFIG_SND_SOC_JZ4740_CODEC=m
CONFIG_SND_SOC_L3=m
CONFIG_SND_SOC_DA7210=m
-CONFIG_SND_SOC_DA732X=m
CONFIG_SND_SOC_DFBMCS320=m
-CONFIG_SND_SOC_ISABELLE=m
-CONFIG_SND_SOC_LM49453=m
CONFIG_SND_SOC_MAX98088=m
CONFIG_SND_SOC_MAX98095=m
CONFIG_SND_SOC_MAX9850=m
@@ -4067,7 +3359,6 @@ CONFIG_SND_SOC_SGTL5000=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_SSM2602=m
CONFIG_SND_SOC_STA32X=m
-CONFIG_SND_SOC_STA529=m
CONFIG_SND_SOC_TLV320AIC23=m
CONFIG_SND_SOC_TLV320AIC26=m
CONFIG_SND_SOC_TLV320AIC32X4=m
@@ -4080,6 +3371,7 @@ CONFIG_SND_SOC_WM1250_EV1=m
CONFIG_SND_SOC_WM2000=m
CONFIG_SND_SOC_WM2200=m
CONFIG_SND_SOC_WM5100=m
+CONFIG_SND_SOC_WM8400=m
CONFIG_SND_SOC_WM8510=m
CONFIG_SND_SOC_WM8523=m
CONFIG_SND_SOC_WM8580=m
@@ -4119,19 +3411,25 @@ CONFIG_SND_SOC_WM9090=m
CONFIG_SND_SOC_LM4857=m
CONFIG_SND_SOC_MAX9768=m
CONFIG_SND_SOC_MAX9877=m
-CONFIG_SND_SOC_ML26124=m
CONFIG_SND_SOC_TPA6130A2=m
-CONFIG_SND_SIMPLE_CARD=m
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
#
-# HID support
+# USB Input Devices
#
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
#
# Special HID drivers
@@ -4139,7 +3437,6 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_A4TECH is not set
# CONFIG_HID_ACRUX is not set
CONFIG_HID_APPLE=m
-# CONFIG_HID_AUREAL is not set
# CONFIG_HID_BELKIN is not set
# CONFIG_HID_CHERRY is not set
# CONFIG_HID_CHICONY is not set
@@ -4158,7 +3455,6 @@ CONFIG_HID_KEYTOUCH=m
# CONFIG_HID_TWINHAN is not set
# CONFIG_HID_KENSINGTON is not set
CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
# CONFIG_HID_LOGITECH is not set
CONFIG_HID_MAGICMOUSE=m
# CONFIG_HID_MICROSOFT is not set
@@ -4190,19 +3486,6 @@ CONFIG_HID_HYPERV_MOUSE=m
# CONFIG_HID_WIIMOTE is not set
# CONFIG_HID_ZEROPLUS is not set
CONFIG_HID_ZYDACRON=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4216,11 +3499,12 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
# Miscellaneous USB options
#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
# CONFIG_USB_WUSB_CBAF_DEBUG is not set
@@ -4248,12 +3532,7 @@ CONFIG_USB_UHCI_HCD=m
CONFIG_USB_U132_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_HCD_ISO=y
-CONFIG_USB_SL811_CS=m
CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_CHIPIDEA is not set
#
# USB Device Class drivers
@@ -4285,7 +3564,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
CONFIG_USB_LIBUSUAL=y
#
@@ -4312,37 +3590,37 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
CONFIG_USB_SERIAL_IR=m
CONFIG_USB_SERIAL_EDGEPORT=m
CONFIG_USB_SERIAL_EDGEPORT_TI=m
# CONFIG_USB_SERIAL_F81232 is not set
-CONFIG_USB_SERIAL_GARMIN=m
+# CONFIG_USB_SERIAL_GARMIN is not set
CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
+# CONFIG_USB_SERIAL_HP4X is not set
CONFIG_USB_SERIAL_SAFE=m
CONFIG_USB_SERIAL_SAFE_PADDED=y
CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
+# CONFIG_USB_SERIAL_SYMBOL is not set
CONFIG_USB_SERIAL_TI=m
CONFIG_USB_SERIAL_CYBERJACK=m
CONFIG_USB_SERIAL_XIRCOM=m
@@ -4353,7 +3631,6 @@ CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_ZIO=m
# CONFIG_USB_SERIAL_SSU100 is not set
-CONFIG_USB_SERIAL_QT2=m
CONFIG_USB_SERIAL_DEBUG=m
#
@@ -4380,11 +3657,6 @@ CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
CONFIG_USB_ISIGHTFW=m
# CONFIG_USB_YUREX is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_USB_ISP1301 is not set
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4398,10 +3670,7 @@ CONFIG_USB_XUSBATM=m
CONFIG_USB_OTG_UTILS=y
CONFIG_USB_GPIO_VBUS=m
CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
+# CONFIG_UWB is not set
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -4426,7 +3695,6 @@ CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
# CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
@@ -4467,17 +3735,15 @@ CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
+# CONFIG_LEDS_MC13783 is not set
# CONFIG_LEDS_TCA6507 is not set
-CONFIG_LEDS_LM3556=m
# CONFIG_LEDS_OT200 is not set
-CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_TRIGGERS=y
#
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4486,7 +3752,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
#
# iptables trigger is under Netfilter config (LED target)
#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
CONFIG_ACCESSIBILITY=y
# CONFIG_A11Y_BRAILLE_CONSOLE is not set
CONFIG_INFINIBAND=m
@@ -4506,7 +3771,6 @@ CONFIG_INFINIBAND_CXGB4=m
CONFIG_MLX4_INFINIBAND=m
CONFIG_INFINIBAND_NES=m
# CONFIG_INFINIBAND_NES_DEBUG is not set
-# CONFIG_INFINIBAND_OCRDMA is not set
CONFIG_INFINIBAND_IPOIB=m
# CONFIG_INFINIBAND_IPOIB_CM is not set
# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@@ -4582,11 +3846,12 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
+# CONFIG_RTC_DRV_PCF50633 is not set
#
# on-CPU RTC drivers
#
+# CONFIG_RTC_DRV_MC13XXX is not set
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4620,9 +3885,6 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
CONFIG_VIRTIO=m
CONFIG_VIRTIO_RING=m
@@ -4632,7 +3894,6 @@ CONFIG_VIRTIO_RING=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
#
# Microsoft Hyper-V guest support
@@ -4660,10 +3921,7 @@ CONFIG_XEN_ACPI_PROCESSOR=m
CONFIG_STAGING=y
# CONFIG_ET131X is not set
# CONFIG_SLICOSS is not set
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
+# CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set
@@ -4672,11 +3930,7 @@ CONFIG_USBIP_HOST=m
# CONFIG_PANEL is not set
# CONFIG_R8187SE is not set
# CONFIG_RTL8192U is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8192E is not set
+# CONFIG_RTLLIB is not set
# CONFIG_R8712U is not set
# CONFIG_RTS_PSTOR is not set
# CONFIG_RTS5139 is not set
@@ -4684,12 +3938,14 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
# CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set
# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
# CONFIG_VT6655 is not set
# CONFIG_VT6656 is not set
+# CONFIG_VME_BUS is not set
# CONFIG_DX_SEP is not set
+# CONFIG_IIO is not set
+# CONFIG_ZRAM is not set
# CONFIG_ZSMALLOC is not set
-# CONFIG_WLAGS49_H2 is not set
-# CONFIG_WLAGS49_H25 is not set
# CONFIG_FB_SM7XX is not set
# CONFIG_CRYSTALHD is not set
# CONFIG_CXT1E1 is not set
@@ -4706,6 +3962,7 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
# CONFIG_SPEAKUP is not set
# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_INTEL_MEI is not set
# CONFIG_STAGING_MEDIA is not set
#
@@ -4714,58 +3971,42 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
# CONFIG_ANDROID is not set
# CONFIG_PHONE is not set
# CONFIG_USB_WPAN_HCD is not set
-# CONFIG_IPACK_BUS is not set
-CONFIG_WIMAX_GDM72XX=m
-# CONFIG_WIMAX_GDM72XX_QOS is not set
-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
-# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-# CONFIG_CSR_WIFI is not set
CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
+# CONFIG_ACER_WMI is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_DELL_LAPTOP is not set
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+# CONFIG_FUJITSU_LAPTOP is not set
# CONFIG_FUJITSU_TABLET is not set
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_HP_ACCEL is not set
CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+# CONFIG_MSI_LAPTOP is not set
+# CONFIG_PANASONIC_LAPTOP is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
CONFIG_SENSORS_HDAPS=m
CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
+# CONFIG_EEEPC_LAPTOP is not set
CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
+# CONFIG_ASUS_NB_WMI is not set
+# CONFIG_EEEPC_WMI is not set
CONFIG_ACPI_WMI=m
CONFIG_MSI_WMI=m
# CONFIG_TOPSTAR_LAPTOP is not set
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
+# CONFIG_ACPI_TOSHIBA is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_ACPI_CMPC is not set
# CONFIG_INTEL_IPS is not set
# CONFIG_IBM_RTL is not set
-CONFIG_XO15_EBOOK=m
+# CONFIG_XO15_EBOOK is not set
# CONFIG_SAMSUNG_LAPTOP is not set
CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
+# CONFIG_INTEL_OAKTRAIL is not set
# CONFIG_SAMSUNG_Q10 is not set
# CONFIG_APPLE_GMUX is not set
@@ -4795,16 +4036,6 @@ CONFIG_IRQ_REMAP=y
#
CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
#
# Firmware Drivers
@@ -4963,9 +4194,11 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
@@ -4988,8 +4221,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
# CONFIG_ROMFS_BACKED_BY_BOTH is not set
CONFIG_ROMFS_ON_BLOCK=y
CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-CONFIG_PSTORE_RAM=m
CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -4999,11 +4230,9 @@ CONFIG_EXOFS_FS=m
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
+CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_V4=y
# CONFIG_NFS_V4_1 is not set
# CONFIG_NFS_FSCACHE is not set
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5078,17 +4307,6 @@ CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_DLM=m
# CONFIG_DLM_DEBUG is not set
@@ -5104,7 +4322,6 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
@@ -5117,8 +4334,6 @@ CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
# CONFIG_DETECT_HUNG_TASK is not set
CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
@@ -5163,7 +4378,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_LKDTM is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
# CONFIG_FAULT_INJECTION is not set
CONFIG_LATENCYTOP=y
# CONFIG_DEBUG_PAGEALLOC is not set
@@ -5200,7 +4415,6 @@ CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
CONFIG_DEBUG_SET_MODULE_RONX=y
CONFIG_DEBUG_NX_TEST=m
-# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -5240,7 +4454,6 @@ CONFIG_VSERVER_CONTEXTS=768
CONFIG_VSERVER_WARN=y
CONFIG_VSERVER_WARN_DEVPTS=y
# CONFIG_VSERVER_DEBUG is not set
-# CONFIG_VSERVER_EXTRA_MNT_CHECK is not set
CONFIG_QUOTES_ISO8859=y
# CONFIG_QUOTES_UTF8 is not set
# CONFIG_QUOTES_ASCII is not set
@@ -5303,8 +4516,6 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
# Authenticated Encryption with Associated Data
@@ -5375,13 +4586,11 @@ CONFIG_CRYPTO_SALSA20_X86_64=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_TWOFISH_COMMON=m
CONFIG_CRYPTO_TWOFISH_X86_64=m
CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
#
# Compression
@@ -5407,13 +4616,11 @@ CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
# CONFIG_BINARY_PRINTF is not set
#
@@ -5421,8 +4628,6 @@ CONFIG_TCM_VHOST=m
#
CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
@@ -5460,8 +4665,6 @@ CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
@@ -5475,8 +4678,6 @@ CONFIG_CHECK_SIGNATURE=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
-CONFIG_DDR=y
diff --git a/main/linux-vserver/patch-3.6.11-vs2.3.4.6.diff b/main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff
index f6813e4940..4d74b9b229 100644
--- a/main/linux-vserver/patch-3.6.11-vs2.3.4.6.diff
+++ b/main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.6.10/Documentation/vserver/debug.txt linux-3.6.10-vs2.3.4.6/Documentation/vserver/debug.txt
---- linux-3.6.10/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/Documentation/vserver/debug.txt 2012-10-04 16:46:59.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/Documentation/vserver/debug.txt linux-3.4.45-vs2.3.3.9/Documentation/vserver/debug.txt
+--- linux-3.4.45/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/Documentation/vserver/debug.txt 2012-05-21 16:15:04.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,22 +156,22 @@ diff -NurpP --minimal linux-3.6.10/Documentation/vserver/debug.txt linux-3.6.10-
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.6.10/Makefile linux-3.6.10-vs2.3.4.6/Makefile
---- linux-3.6.10/Makefile 2012-12-11 11:36:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/Makefile 2012-12-12 12:58:35.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/Makefile linux-3.4.45-vs2.3.3.9/Makefile
+--- linux-3.4.45/Makefile 2013-05-13 17:36:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/Makefile 2013-05-13 18:41:34.000000000 +0000
@@ -1,7 +1,7 @@
VERSION = 3
- PATCHLEVEL = 6
- SUBLEVEL = 11
+ PATCHLEVEL = 4
+ SUBLEVEL = 45
-EXTRAVERSION =
-+EXTRAVERSION = -vs2.3.4.6
- NAME = Terrified Chipmunk
++EXTRAVERSION = -vs2.3.3.9
+ NAME = Saber-toothed Squirrel
# *DOCUMENTATION*
-diff -NurpP --minimal linux-3.6.10/arch/alpha/Kconfig linux-3.6.10-vs2.3.4.6/arch/alpha/Kconfig
---- linux-3.6.10/arch/alpha/Kconfig 2012-10-04 13:26:43.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/alpha/Kconfig 2012-10-04 16:46:59.000000000 +0000
-@@ -664,6 +664,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-3.4.45/arch/alpha/Kconfig linux-3.4.45-vs2.3.3.9/arch/alpha/Kconfig
+--- linux-3.4.45/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -180,9 +180,44 @@ diff -NurpP --minimal linux-3.6.10/arch/alpha/Kconfig linux-3.6.10-vs2.3.4.6/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/alpha/kernel/ptrace.c linux-3.6.10-vs2.3.4.6/arch/alpha/kernel/ptrace.c
---- linux-3.6.10/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/alpha/kernel/ptrace.c 2012-10-04 16:46:59.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/entry.S linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/entry.S
+--- linux-3.4.45/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000
+@@ -860,24 +860,15 @@ sys_getxgid:
+ .globl sys_getxpid
+ .ent sys_getxpid
+ sys_getxpid:
++ lda $sp, -16($sp)
++ stq $26, 0($sp)
+ .prologue 0
+- ldq $2, TI_TASK($8)
+
+- /* See linux/kernel/timer.c sys_getppid for discussion
+- about this loop. */
+- ldq $3, TASK_GROUP_LEADER($2)
+- ldq $4, TASK_REAL_PARENT($3)
+- ldl $0, TASK_TGID($2)
+-1: ldl $1, TASK_TGID($4)
+-#ifdef CONFIG_SMP
+- mov $4, $5
+- mb
+- ldq $3, TASK_GROUP_LEADER($2)
+- ldq $4, TASK_REAL_PARENT($3)
+- cmpeq $4, $5, $5
+- beq $5, 1b
+-#endif
+- stq $1, 80($sp)
++ lda $16, 96($sp)
++ jsr $26, do_getxpid
++ ldq $26, 0($sp)
++
++ lda $sp, 16($sp)
+ ret
+ .end sys_getxpid
+
+diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/ptrace.c
+--- linux-3.4.45/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -191,9 +226,9 @@ diff -NurpP --minimal linux-3.6.10/arch/alpha/kernel/ptrace.c linux-3.6.10-vs2.3
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.6.10/arch/alpha/kernel/systbls.S linux-3.6.10-vs2.3.4.6/arch/alpha/kernel/systbls.S
---- linux-3.6.10/arch/alpha/kernel/systbls.S 2012-10-04 13:26:43.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/alpha/kernel/systbls.S 2012-10-04 16:46:59.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/systbls.S linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/systbls.S
+--- linux-3.4.45/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/systbls.S 2012-05-21 16:15:04.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -203,9 +238,9 @@ diff -NurpP --minimal linux-3.6.10/arch/alpha/kernel/systbls.S linux-3.6.10-vs2.
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.6.10/arch/alpha/kernel/traps.c linux-3.6.10-vs2.3.4.6/arch/alpha/kernel/traps.c
---- linux-3.6.10/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/alpha/kernel/traps.c 2012-10-04 16:46:59.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/traps.c
+--- linux-3.4.45/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -216,10 +251,10 @@ diff -NurpP --minimal linux-3.6.10/arch/alpha/kernel/traps.c linux-3.6.10-vs2.3.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.6.10/arch/arm/Kconfig linux-3.6.10-vs2.3.4.6/arch/arm/Kconfig
---- linux-3.6.10/arch/arm/Kconfig 2012-12-11 11:36:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/arm/Kconfig 2012-12-11 11:45:19.000000000 +0000
-@@ -2342,6 +2342,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/arm/Kconfig linux-3.4.45-vs2.3.3.9/arch/arm/Kconfig
+--- linux-3.4.45/arch/arm/Kconfig 2013-05-13 17:36:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/arm/Kconfig 2012-12-11 11:42:38.000000000 +0000
+@@ -2311,6 +2311,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -228,9 +263,9 @@ diff -NurpP --minimal linux-3.6.10/arch/arm/Kconfig linux-3.6.10-vs2.3.4.6/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/arm/kernel/calls.S linux-3.6.10-vs2.3.4.6/arch/arm/kernel/calls.S
---- linux-3.6.10/arch/arm/kernel/calls.S 2012-10-04 13:26:43.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/arm/kernel/calls.S 2012-10-04 16:46:59.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/calls.S linux-3.4.45-vs2.3.3.9/arch/arm/kernel/calls.S
+--- linux-3.4.45/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/arm/kernel/calls.S 2012-05-21 16:15:04.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -240,10 +275,10 @@ diff -NurpP --minimal linux-3.6.10/arch/arm/kernel/calls.S linux-3.6.10-vs2.3.4.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.6.10/arch/arm/kernel/process.c linux-3.6.10-vs2.3.4.6/arch/arm/kernel/process.c
---- linux-3.6.10/arch/arm/kernel/process.c 2012-10-04 13:26:43.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/arm/kernel/process.c 2012-10-04 16:46:59.000000000 +0000
-@@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/arm/kernel/process.c
+--- linux-3.4.45/arch/arm/kernel/process.c 2013-05-13 17:36:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/arm/kernel/process.c 2012-09-01 08:50:48.000000000 +0000
+@@ -357,7 +357,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
@@ -253,24 +288,24 @@ diff -NurpP --minimal linux-3.6.10/arch/arm/kernel/process.c linux-3.6.10-vs2.3.
__show_regs(regs);
dump_stack();
}
-diff -NurpP --minimal linux-3.6.10/arch/arm/kernel/traps.c linux-3.6.10-vs2.3.4.6/arch/arm/kernel/traps.c
---- linux-3.6.10/arch/arm/kernel/traps.c 2012-10-04 13:26:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/arm/kernel/traps.c 2012-10-04 17:03:56.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/arm/kernel/traps.c
+--- linux-3.4.45/arch/arm/kernel/traps.c 2013-05-13 17:36:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/arm/kernel/traps.c 2012-10-22 13:09:53.000000000 +0000
@@ -249,8 +249,8 @@ static int __die(const char *str, int er
print_modules();
__show_regs(regs);
- printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
-- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
+- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
+ printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
-+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.6.10/arch/cris/Kconfig linux-3.6.10-vs2.3.4.6/arch/cris/Kconfig
---- linux-3.6.10/arch/cris/Kconfig 2012-10-04 13:26:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/cris/Kconfig 2012-10-04 16:46:59.000000000 +0000
-@@ -673,6 +673,8 @@ source "drivers/staging/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/cris/Kconfig linux-3.4.45-vs2.3.3.9/arch/cris/Kconfig
+--- linux-3.4.45/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/cris/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -675,6 +675,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -279,9 +314,9 @@ diff -NurpP --minimal linux-3.6.10/arch/cris/Kconfig linux-3.6.10-vs2.3.4.6/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/frv/kernel/kernel_thread.S linux-3.6.10-vs2.3.4.6/arch/frv/kernel/kernel_thread.S
---- linux-3.6.10/arch/frv/kernel/kernel_thread.S 2012-10-04 13:26:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/frv/kernel/kernel_thread.S 2012-10-04 16:46:59.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/frv/kernel/kernel_thread.S linux-3.4.45-vs2.3.3.9/arch/frv/kernel/kernel_thread.S
+--- linux-3.4.45/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/frv/kernel/kernel_thread.S 2012-05-21 16:15:04.000000000 +0000
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -291,10 +326,10 @@ diff -NurpP --minimal linux-3.6.10/arch/frv/kernel/kernel_thread.S linux-3.6.10-
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-3.6.10/arch/h8300/Kconfig linux-3.6.10-vs2.3.4.6/arch/h8300/Kconfig
---- linux-3.6.10/arch/h8300/Kconfig 2012-10-04 13:26:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/h8300/Kconfig 2012-10-04 16:46:59.000000000 +0000
-@@ -215,6 +215,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/h8300/Kconfig linux-3.4.45-vs2.3.3.9/arch/h8300/Kconfig
+--- linux-3.4.45/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/h8300/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -214,6 +214,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -303,10 +338,10 @@ diff -NurpP --minimal linux-3.6.10/arch/h8300/Kconfig linux-3.6.10-vs2.3.4.6/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/ia64/Kconfig linux-3.6.10-vs2.3.4.6/arch/ia64/Kconfig
---- linux-3.6.10/arch/ia64/Kconfig 2012-10-04 13:26:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/ia64/Kconfig 2012-10-04 16:46:59.000000000 +0000
-@@ -652,6 +652,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/ia64/Kconfig linux-3.4.45-vs2.3.3.9/arch/ia64/Kconfig
+--- linux-3.4.45/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -654,6 +654,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -315,9 +350,9 @@ diff -NurpP --minimal linux-3.6.10/arch/ia64/Kconfig linux-3.6.10-vs2.3.4.6/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/ia64/kernel/entry.S linux-3.6.10-vs2.3.4.6/arch/ia64/kernel/entry.S
---- linux-3.6.10/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/ia64/kernel/entry.S 2012-10-04 16:46:59.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/entry.S linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/entry.S
+--- linux-3.4.45/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -327,9 +362,9 @@ diff -NurpP --minimal linux-3.6.10/arch/ia64/kernel/entry.S linux-3.6.10-vs2.3.4
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.6.10/arch/ia64/kernel/process.c linux-3.6.10-vs2.3.4.6/arch/ia64/kernel/process.c
---- linux-3.6.10/arch/ia64/kernel/process.c 2012-12-11 11:36:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/ia64/kernel/process.c 2012-11-06 17:43:40.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/process.c
+--- linux-3.4.45/arch/ia64/kernel/process.c 2013-05-13 17:36:17.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/process.c 2012-10-22 13:09:53.000000000 +0000
@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -341,9 +376,9 @@ diff -NurpP --minimal linux-3.6.10/arch/ia64/kernel/process.c linux-3.6.10-vs2.3
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-3.6.10/arch/ia64/kernel/ptrace.c linux-3.6.10-vs2.3.4.6/arch/ia64/kernel/ptrace.c
---- linux-3.6.10/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/ia64/kernel/ptrace.c 2012-10-04 16:46:59.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/ptrace.c
+--- linux-3.4.45/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -352,9 +387,9 @@ diff -NurpP --minimal linux-3.6.10/arch/ia64/kernel/ptrace.c linux-3.6.10-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.6.10/arch/ia64/kernel/traps.c linux-3.6.10-vs2.3.4.6/arch/ia64/kernel/traps.c
---- linux-3.6.10/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/ia64/kernel/traps.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/traps.c
+--- linux-3.4.45/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -379,9 +414,9 @@ diff -NurpP --minimal linux-3.6.10/arch/ia64/kernel/traps.c linux-3.6.10-vs2.3.4
}
}
}
-diff -NurpP --minimal linux-3.6.10/arch/m32r/kernel/traps.c linux-3.6.10-vs2.3.4.6/arch/m32r/kernel/traps.c
---- linux-3.6.10/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/m32r/kernel/traps.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/m32r/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/m32r/kernel/traps.c
+--- linux-3.4.45/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/m32r/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -394,10 +429,10 @@ diff -NurpP --minimal linux-3.6.10/arch/m32r/kernel/traps.c linux-3.6.10-vs2.3.4
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.6.10/arch/m68k/Kconfig linux-3.6.10-vs2.3.4.6/arch/m68k/Kconfig
---- linux-3.6.10/arch/m68k/Kconfig 2012-10-04 13:26:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/m68k/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -129,6 +129,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/m68k/Kconfig linux-3.4.45-vs2.3.3.9/arch/m68k/Kconfig
+--- linux-3.4.45/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/m68k/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -146,6 +146,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -406,10 +441,10 @@ diff -NurpP --minimal linux-3.6.10/arch/m68k/Kconfig linux-3.6.10-vs2.3.4.6/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/mips/Kconfig linux-3.6.10-vs2.3.4.6/arch/mips/Kconfig
---- linux-3.6.10/arch/mips/Kconfig 2012-10-04 13:26:52.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/mips/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -2554,6 +2554,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/mips/Kconfig linux-3.4.45-vs2.3.3.9/arch/mips/Kconfig
+--- linux-3.4.45/arch/mips/Kconfig 2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -2516,6 +2516,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -418,9 +453,9 @@ diff -NurpP --minimal linux-3.6.10/arch/mips/Kconfig linux-3.6.10-vs2.3.4.6/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/ptrace.c linux-3.6.10-vs2.3.4.6/arch/mips/kernel/ptrace.c
---- linux-3.6.10/arch/mips/kernel/ptrace.c 2012-07-22 21:38:52.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/mips/kernel/ptrace.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/mips/kernel/ptrace.c
+--- linux-3.4.45/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -439,9 +474,9 @@ diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/ptrace.c linux-3.6.10-vs2.3.
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/scall32-o32.S linux-3.6.10-vs2.3.4.6/arch/mips/kernel/scall32-o32.S
---- linux-3.6.10/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/mips/kernel/scall32-o32.S 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall32-o32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall32-o32.S
+--- linux-3.4.45/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall32-o32.S 2012-05-21 16:15:04.000000000 +0000
@@ -523,7 +523,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -451,9 +486,9 @@ diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/scall32-o32.S linux-3.6.10-v
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/scall64-64.S linux-3.6.10-vs2.3.4.6/arch/mips/kernel/scall64-64.S
---- linux-3.6.10/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/mips/kernel/scall64-64.S 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-64.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-64.S
+--- linux-3.4.45/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-64.S 2012-05-21 16:15:04.000000000 +0000
@@ -362,7 +362,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -463,9 +498,9 @@ diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/scall64-64.S linux-3.6.10-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/scall64-n32.S linux-3.6.10-vs2.3.4.6/arch/mips/kernel/scall64-n32.S
---- linux-3.6.10/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/mips/kernel/scall64-n32.S 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-n32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-n32.S
+--- linux-3.4.45/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-n32.S 2012-05-21 16:15:04.000000000 +0000
@@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -475,9 +510,9 @@ diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/scall64-n32.S linux-3.6.10-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/scall64-o32.S linux-3.6.10-vs2.3.4.6/arch/mips/kernel/scall64-o32.S
---- linux-3.6.10/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/mips/kernel/scall64-o32.S 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-o32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-o32.S
+--- linux-3.4.45/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-o32.S 2012-05-21 16:15:04.000000000 +0000
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -487,10 +522,10 @@ diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/scall64-o32.S linux-3.6.10-v
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/traps.c linux-3.6.10-vs2.3.4.6/arch/mips/kernel/traps.c
---- linux-3.6.10/arch/mips/kernel/traps.c 2012-10-04 13:26:53.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/mips/kernel/traps.c 2012-10-04 16:47:00.000000000 +0000
-@@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/mips/kernel/traps.c
+--- linux-3.4.45/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
+@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
print_modules();
@@ -504,10 +539,10 @@ diff -NurpP --minimal linux-3.6.10/arch/mips/kernel/traps.c linux-3.6.10-vs2.3.4
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.6.10/arch/parisc/Kconfig linux-3.6.10-vs2.3.4.6/arch/parisc/Kconfig
---- linux-3.6.10/arch/parisc/Kconfig 2012-07-22 21:38:52.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/parisc/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -281,6 +281,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/parisc/Kconfig linux-3.4.45-vs2.3.3.9/arch/parisc/Kconfig
+--- linux-3.4.45/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/parisc/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -279,6 +279,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -516,9 +551,9 @@ diff -NurpP --minimal linux-3.6.10/arch/parisc/Kconfig linux-3.6.10-vs2.3.4.6/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/parisc/kernel/syscall_table.S linux-3.6.10-vs2.3.4.6/arch/parisc/kernel/syscall_table.S
---- linux-3.6.10/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/parisc/kernel/syscall_table.S 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/parisc/kernel/syscall_table.S linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/syscall_table.S
+--- linux-3.4.45/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/syscall_table.S 2012-05-21 16:15:04.000000000 +0000
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -528,9 +563,9 @@ diff -NurpP --minimal linux-3.6.10/arch/parisc/kernel/syscall_table.S linux-3.6.
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.6.10/arch/parisc/kernel/traps.c linux-3.6.10-vs2.3.4.6/arch/parisc/kernel/traps.c
---- linux-3.6.10/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/parisc/kernel/traps.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/parisc/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/traps.c
+--- linux-3.4.45/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -554,9 +589,9 @@ diff -NurpP --minimal linux-3.6.10/arch/parisc/kernel/traps.c linux-3.6.10-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.6.10/arch/parisc/mm/fault.c linux-3.6.10-vs2.3.4.6/arch/parisc/mm/fault.c
---- linux-3.6.10/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/parisc/mm/fault.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/parisc/mm/fault.c linux-3.4.45-vs2.3.3.9/arch/parisc/mm/fault.c
+--- linux-3.4.45/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/parisc/mm/fault.c 2012-05-21 16:15:04.000000000 +0000
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -569,10 +604,10 @@ diff -NurpP --minimal linux-3.6.10/arch/parisc/mm/fault.c linux-3.6.10-vs2.3.4.6
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-3.6.10/arch/powerpc/Kconfig linux-3.6.10-vs2.3.4.6/arch/powerpc/Kconfig
---- linux-3.6.10/arch/powerpc/Kconfig 2012-10-04 13:26:53.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/powerpc/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -996,6 +996,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/powerpc/Kconfig linux-3.4.45-vs2.3.3.9/arch/powerpc/Kconfig
+--- linux-3.4.45/arch/powerpc/Kconfig 2012-05-21 16:06:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/powerpc/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -1002,6 +1002,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -581,9 +616,9 @@ diff -NurpP --minimal linux-3.6.10/arch/powerpc/Kconfig linux-3.6.10-vs2.3.4.6/a
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.6.10/arch/powerpc/include/asm/unistd.h linux-3.6.10-vs2.3.4.6/arch/powerpc/include/asm/unistd.h
---- linux-3.6.10/arch/powerpc/include/asm/unistd.h 2012-10-04 13:26:53.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/powerpc/include/asm/unistd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/powerpc/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/powerpc/include/asm/unistd.h
+--- linux-3.4.45/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/powerpc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -593,9 +628,9 @@ diff -NurpP --minimal linux-3.6.10/arch/powerpc/include/asm/unistd.h linux-3.6.1
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.6.10/arch/powerpc/kernel/process.c linux-3.6.10-vs2.3.4.6/arch/powerpc/kernel/process.c
---- linux-3.6.10/arch/powerpc/kernel/process.c 2012-10-04 13:26:54.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/powerpc/kernel/process.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/powerpc/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/process.c
+--- linux-3.4.45/arch/powerpc/kernel/process.c 2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/process.c 2012-09-16 18:49:11.000000000 +0000
@@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -608,10 +643,10 @@ diff -NurpP --minimal linux-3.6.10/arch/powerpc/kernel/process.c linux-3.6.10-vs
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.6.10/arch/powerpc/kernel/traps.c linux-3.6.10-vs2.3.4.6/arch/powerpc/kernel/traps.c
---- linux-3.6.10/arch/powerpc/kernel/traps.c 2012-10-04 13:26:54.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/powerpc/kernel/traps.c 2012-10-04 16:47:00.000000000 +0000
-@@ -1119,8 +1119,9 @@ void nonrecoverable_exception(struct pt_
+diff -NurpP --minimal linux-3.4.45/arch/powerpc/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/traps.c
+--- linux-3.4.45/arch/powerpc/kernel/traps.c 2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/traps.c 2013-05-13 18:16:08.000000000 +0000
+@@ -1125,8 +1125,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
{
@@ -623,10 +658,10 @@ diff -NurpP --minimal linux-3.6.10/arch/powerpc/kernel/traps.c linux-3.6.10-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.6.10/arch/s390/Kconfig linux-3.6.10-vs2.3.4.6/arch/s390/Kconfig
---- linux-3.6.10/arch/s390/Kconfig 2012-10-04 13:26:54.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/s390/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -634,6 +634,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/s390/Kconfig linux-3.4.45-vs2.3.3.9/arch/s390/Kconfig
+--- linux-3.4.45/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -639,6 +639,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -635,9 +670,9 @@ diff -NurpP --minimal linux-3.6.10/arch/s390/Kconfig linux-3.6.10-vs2.3.4.6/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/s390/include/asm/tlb.h linux-3.6.10-vs2.3.4.6/arch/s390/include/asm/tlb.h
---- linux-3.6.10/arch/s390/include/asm/tlb.h 2012-07-22 21:38:59.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/s390/include/asm/tlb.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/s390/include/asm/tlb.h linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/tlb.h
+--- linux-3.4.45/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/tlb.h 2012-05-21 16:15:04.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -646,10 +681,10 @@ diff -NurpP --minimal linux-3.6.10/arch/s390/include/asm/tlb.h linux-3.6.10-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.6.10/arch/s390/include/asm/unistd.h linux-3.6.10-vs2.3.4.6/arch/s390/include/asm/unistd.h
---- linux-3.6.10/arch/s390/include/asm/unistd.h 2012-10-04 13:26:55.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/s390/include/asm/unistd.h 2012-10-04 16:47:00.000000000 +0000
-@@ -200,7 +200,7 @@
+diff -NurpP --minimal linux-3.4.45/arch/s390/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/unistd.h
+--- linux-3.4.45/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000
+@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_clock_nanosleep (__NR_timer_create+8)
@@ -658,9 +693,9 @@ diff -NurpP --minimal linux-3.6.10/arch/s390/include/asm/unistd.h linux-3.6.10-v
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.6.10/arch/s390/kernel/ptrace.c linux-3.6.10-vs2.3.4.6/arch/s390/kernel/ptrace.c
---- linux-3.6.10/arch/s390/kernel/ptrace.c 2012-10-04 13:26:55.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/s390/kernel/ptrace.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/s390/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/s390/kernel/ptrace.c
+--- linux-3.4.45/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -669,9 +704,9 @@ diff -NurpP --minimal linux-3.6.10/arch/s390/kernel/ptrace.c linux-3.6.10-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.6.10/arch/s390/kernel/syscalls.S linux-3.6.10-vs2.3.4.6/arch/s390/kernel/syscalls.S
---- linux-3.6.10/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/s390/kernel/syscalls.S 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/s390/kernel/syscalls.S linux-3.4.45-vs2.3.3.9/arch/s390/kernel/syscalls.S
+--- linux-3.4.45/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/kernel/syscalls.S 2012-05-21 16:15:04.000000000 +0000
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
@@ -681,10 +716,10 @@ diff -NurpP --minimal linux-3.6.10/arch/s390/kernel/syscalls.S linux-3.6.10-vs2.
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-3.6.10/arch/sh/Kconfig linux-3.6.10-vs2.3.4.6/arch/sh/Kconfig
---- linux-3.6.10/arch/sh/Kconfig 2012-10-04 13:26:55.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/sh/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -940,6 +940,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/sh/Kconfig linux-3.4.45-vs2.3.3.9/arch/sh/Kconfig
+--- linux-3.4.45/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sh/Kconfig 2012-05-21 16:15:04.000000000 +0000
+@@ -905,6 +905,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -693,9 +728,9 @@ diff -NurpP --minimal linux-3.6.10/arch/sh/Kconfig linux-3.6.10-vs2.3.4.6/arch/s
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/sh/kernel/irq.c linux-3.6.10-vs2.3.4.6/arch/sh/kernel/irq.c
---- linux-3.6.10/arch/sh/kernel/irq.c 2012-10-04 13:26:56.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/sh/kernel/irq.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/sh/kernel/irq.c linux-3.4.45-vs2.3.3.9/arch/sh/kernel/irq.c
+--- linux-3.4.45/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sh/kernel/irq.c 2012-05-21 16:15:04.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -704,10 +739,10 @@ diff -NurpP --minimal linux-3.6.10/arch/sh/kernel/irq.c linux-3.6.10-vs2.3.4.6/a
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.6.10/arch/sparc/Kconfig linux-3.6.10-vs2.3.4.6/arch/sparc/Kconfig
---- linux-3.6.10/arch/sparc/Kconfig 2012-10-04 13:26:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/sparc/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -593,6 +593,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/sparc/Kconfig linux-3.4.45-vs2.3.3.9/arch/sparc/Kconfig
+--- linux-3.4.45/arch/sparc/Kconfig 2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sparc/Kconfig 2012-06-08 13:57:24.000000000 +0000
+@@ -599,6 +599,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -716,9 +751,9 @@ diff -NurpP --minimal linux-3.6.10/arch/sparc/Kconfig linux-3.6.10-vs2.3.4.6/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/sparc/include/asm/unistd.h linux-3.6.10-vs2.3.4.6/arch/sparc/include/asm/unistd.h
---- linux-3.6.10/arch/sparc/include/asm/unistd.h 2012-10-04 13:26:59.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/sparc/include/asm/unistd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/sparc/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/sparc/include/asm/unistd.h
+--- linux-3.4.45/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sparc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -728,9 +763,9 @@ diff -NurpP --minimal linux-3.6.10/arch/sparc/include/asm/unistd.h linux-3.6.10-
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.6.10/arch/sparc/kernel/systbls_32.S linux-3.6.10-vs2.3.4.6/arch/sparc/kernel/systbls_32.S
---- linux-3.6.10/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/sparc/kernel/systbls_32.S 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/sparc/kernel/systbls_32.S linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_32.S
+--- linux-3.4.45/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_32.S 2012-05-21 16:15:04.000000000 +0000
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -740,9 +775,9 @@ diff -NurpP --minimal linux-3.6.10/arch/sparc/kernel/systbls_32.S linux-3.6.10-v
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.6.10/arch/sparc/kernel/systbls_64.S linux-3.6.10-vs2.3.4.6/arch/sparc/kernel/systbls_64.S
---- linux-3.6.10/arch/sparc/kernel/systbls_64.S 2012-07-22 21:39:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/sparc/kernel/systbls_64.S 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/sparc/kernel/systbls_64.S linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_64.S
+--- linux-3.4.45/arch/sparc/kernel/systbls_64.S 2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_64.S 2012-06-08 13:57:24.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -761,9 +796,9 @@ diff -NurpP --minimal linux-3.6.10/arch/sparc/kernel/systbls_64.S linux-3.6.10-v
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.6.10/arch/um/Kconfig.rest linux-3.6.10-vs2.3.4.6/arch/um/Kconfig.rest
---- linux-3.6.10/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/um/Kconfig.rest 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/um/Kconfig.rest linux-3.4.45-vs2.3.3.9/arch/um/Kconfig.rest
+--- linux-3.4.45/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/um/Kconfig.rest 2012-05-21 16:15:04.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -773,14 +808,14 @@ diff -NurpP --minimal linux-3.6.10/arch/um/Kconfig.rest linux-3.6.10-vs2.3.4.6/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/um/include/shared/kern_constants.h linux-3.6.10-vs2.3.4.6/arch/um/include/shared/kern_constants.h
---- linux-3.6.10/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/um/include/shared/kern_constants.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/um/include/shared/kern_constants.h linux-3.4.45-vs2.3.3.9/arch/um/include/shared/kern_constants.h
+--- linux-3.4.45/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/um/include/shared/kern_constants.h 2012-05-21 16:15:04.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.6.10/arch/um/include/shared/user_constants.h linux-3.6.10-vs2.3.4.6/arch/um/include/shared/user_constants.h
---- linux-3.6.10/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/um/include/shared/user_constants.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/um/include/shared/user_constants.h linux-3.4.45-vs2.3.3.9/arch/um/include/shared/user_constants.h
+--- linux-3.4.45/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/um/include/shared/user_constants.h 2012-05-21 16:15:04.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * DO NOT MODIFY.
@@ -822,10 +857,10 @@ diff -NurpP --minimal linux-3.6.10/arch/um/include/shared/user_constants.h linux
+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
+
-diff -NurpP --minimal linux-3.6.10/arch/x86/Kconfig linux-3.6.10-vs2.3.4.6/arch/x86/Kconfig
---- linux-3.6.10/arch/x86/Kconfig 2012-10-04 13:27:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/x86/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -2228,6 +2228,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/x86/Kconfig linux-3.4.45-vs2.3.3.9/arch/x86/Kconfig
+--- linux-3.4.45/arch/x86/Kconfig 2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/x86/Kconfig 2013-03-02 15:26:44.000000000 +0000
+@@ -2221,6 +2221,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -834,9 +869,9 @@ diff -NurpP --minimal linux-3.6.10/arch/x86/Kconfig linux-3.6.10-vs2.3.4.6/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.6.10/arch/x86/syscalls/syscall_32.tbl linux-3.6.10-vs2.3.4.6/arch/x86/syscalls/syscall_32.tbl
---- linux-3.6.10/arch/x86/syscalls/syscall_32.tbl 2012-07-22 21:39:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/x86/syscalls/syscall_32.tbl 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/x86/syscalls/syscall_32.tbl linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.4.45/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:15:04.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -846,9 +881,9 @@ diff -NurpP --minimal linux-3.6.10/arch/x86/syscalls/syscall_32.tbl linux-3.6.10
274 i386 mbind sys_mbind
275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
276 i386 set_mempolicy sys_set_mempolicy
-diff -NurpP --minimal linux-3.6.10/arch/x86/syscalls/syscall_64.tbl linux-3.6.10-vs2.3.4.6/arch/x86/syscalls/syscall_64.tbl
---- linux-3.6.10/arch/x86/syscalls/syscall_64.tbl 2012-10-04 13:27:01.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/arch/x86/syscalls/syscall_64.tbl 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/arch/x86/syscalls/syscall_64.tbl linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.4.45/arch/x86/syscalls/syscall_64.tbl 2013-05-13 17:36:19.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl 2012-09-16 18:49:11.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -858,9 +893,9 @@ diff -NurpP --minimal linux-3.6.10/arch/x86/syscalls/syscall_64.tbl linux-3.6.10
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-3.6.10/drivers/block/Kconfig linux-3.6.10-vs2.3.4.6/drivers/block/Kconfig
---- linux-3.6.10/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/block/Kconfig 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/block/Kconfig linux-3.4.45-vs2.3.3.9/drivers/block/Kconfig
+--- linux-3.4.45/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/block/Kconfig 2012-05-21 16:15:04.000000000 +0000
@@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -875,9 +910,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/block/Kconfig linux-3.6.10-vs2.3.4.6/
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.6.10/drivers/block/Makefile linux-3.6.10-vs2.3.4.6/drivers/block/Makefile
---- linux-3.6.10/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/block/Makefile 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/block/Makefile linux-3.4.45-vs2.3.3.9/drivers/block/Makefile
+--- linux-3.4.45/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/block/Makefile 2012-05-21 16:15:04.000000000 +0000
@@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
@@ -886,9 +921,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/block/Makefile linux-3.6.10-vs2.3.4.6
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.6.10/drivers/block/loop.c linux-3.6.10-vs2.3.4.6/drivers/block/loop.c
---- linux-3.6.10/drivers/block/loop.c 2012-07-22 21:39:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/block/loop.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/block/loop.c linux-3.4.45-vs2.3.3.9/drivers/block/loop.c
+--- linux-3.4.45/drivers/block/loop.c 2013-05-13 17:36:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/block/loop.c 2013-05-13 18:16:08.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
@@ -905,7 +940,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/block/loop.c linux-3.6.10-vs2.3.4.6/d
lo->lo_backing_file = file;
lo->transfer = transfer_none;
lo->ioctl = NULL;
-@@ -1001,6 +1003,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -1006,6 +1008,7 @@ static int loop_clr_fd(struct loop_devic
lo->lo_sizelimit = 0;
lo->lo_encrypt_key_size = 0;
lo->lo_thread = NULL;
@@ -913,7 +948,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/block/loop.c linux-3.6.10-vs2.3.4.6/d
memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -1042,7 +1045,7 @@ loop_set_status(struct loop_device *lo,
+@@ -1049,7 +1052,7 @@ loop_set_status(struct loop_device *lo,
if (lo->lo_encrypt_key_size &&
lo->lo_key_owner != uid &&
@@ -922,7 +957,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/block/loop.c linux-3.6.10-vs2.3.4.6/d
return -EPERM;
if (lo->lo_state != Lo_bound)
return -ENXIO;
-@@ -1132,7 +1135,8 @@ loop_get_status(struct loop_device *lo,
+@@ -1139,7 +1142,8 @@ loop_get_status(struct loop_device *lo,
memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
info->lo_encrypt_type =
lo->lo_encryption ? lo->lo_encryption->number : 0;
@@ -932,7 +967,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/block/loop.c linux-3.6.10-vs2.3.4.6/d
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1492,6 +1496,11 @@ static int lo_open(struct block_device *
+@@ -1497,6 +1501,11 @@ static int lo_open(struct block_device *
goto out;
}
@@ -944,9 +979,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/block/loop.c linux-3.6.10-vs2.3.4.6/d
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.6.10/drivers/block/vroot.c linux-3.6.10-vs2.3.4.6/drivers/block/vroot.c
---- linux-3.6.10/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/block/vroot.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/block/vroot.c linux-3.4.45-vs2.3.3.9/drivers/block/vroot.c
+--- linux-3.4.45/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/block/vroot.c 2012-05-21 16:15:04.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1239,9 +1274,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/block/vroot.c linux-3.6.10-vs2.3.4.6/
+
+#endif
+
-diff -NurpP --minimal linux-3.6.10/drivers/infiniband/Kconfig linux-3.6.10-vs2.3.4.6/drivers/infiniband/Kconfig
---- linux-3.6.10/drivers/infiniband/Kconfig 2012-07-22 21:39:06.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/infiniband/Kconfig 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/infiniband/Kconfig linux-3.4.45-vs2.3.3.9/drivers/infiniband/Kconfig
+--- linux-3.4.45/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/infiniband/Kconfig 2012-05-21 16:15:04.000000000 +0000
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
@@ -1251,9 +1286,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/infiniband/Kconfig linux-3.6.10-vs2.3
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.6.10/drivers/infiniband/core/addr.c linux-3.6.10-vs2.3.4.6/drivers/infiniband/core/addr.c
---- linux-3.6.10/drivers/infiniband/core/addr.c 2012-10-04 13:27:10.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/infiniband/core/addr.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/infiniband/core/addr.c linux-3.4.45-vs2.3.3.9/drivers/infiniband/core/addr.c
+--- linux-3.4.45/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/infiniband/core/addr.c 2012-05-21 16:15:04.000000000 +0000
@@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1263,9 +1298,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/infiniband/core/addr.c linux-3.6.10-v
if (ret)
goto put;
-diff -NurpP --minimal linux-3.6.10/drivers/md/dm-ioctl.c linux-3.6.10-vs2.3.4.6/drivers/md/dm-ioctl.c
---- linux-3.6.10/drivers/md/dm-ioctl.c 2012-10-04 13:27:11.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/md/dm-ioctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/md/dm-ioctl.c linux-3.4.45-vs2.3.3.9/drivers/md/dm-ioctl.c
+--- linux-3.4.45/drivers/md/dm-ioctl.c 2013-05-13 17:36:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/md/dm-ioctl.c 2013-02-11 23:37:30.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1340,7 +1375,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/md/dm-ioctl.c linux-3.6.10-vs2.3.4.6/
if (old_nl)
old_nl->next = (uint32_t) ((void *) nl -
(void *) old_nl);
-@@ -1619,8 +1631,8 @@ static int ctl_ioctl(uint command, struc
+@@ -1624,8 +1636,8 @@ static int ctl_ioctl(uint command, struc
ioctl_fn fn = NULL;
size_t input_param_size;
@@ -1351,9 +1386,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/md/dm-ioctl.c linux-3.6.10-vs2.3.4.6/
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.6.10/drivers/md/dm.c linux-3.6.10-vs2.3.4.6/drivers/md/dm.c
---- linux-3.6.10/drivers/md/dm.c 2012-12-11 11:36:52.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/md/dm.c 2012-12-08 00:36:32.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/md/dm.c linux-3.4.45-vs2.3.3.9/drivers/md/dm.c
+--- linux-3.4.45/drivers/md/dm.c 2013-05-13 17:36:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/md/dm.c 2012-12-08 00:53:53.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1419,7 +1454,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/md/dm.c linux-3.6.10-vs2.3.4.6/driver
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -1898,6 +1910,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1876,6 +1888,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
@@ -1427,10 +1462,10 @@ diff -NurpP --minimal linux-3.6.10/drivers/md/dm.c linux-3.6.10-vs2.3.4.6/driver
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.6.10/drivers/md/dm.h linux-3.6.10-vs2.3.4.6/drivers/md/dm.h
---- linux-3.6.10/drivers/md/dm.h 2012-10-04 13:27:11.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/md/dm.h 2012-10-04 16:47:00.000000000 +0000
-@@ -46,6 +46,8 @@ struct dm_dev_internal {
+diff -NurpP --minimal linux-3.4.45/drivers/md/dm.h linux-3.4.45-vs2.3.3.9/drivers/md/dm.h
+--- linux-3.4.45/drivers/md/dm.h 2012-01-09 15:14:21.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/md/dm.h 2012-05-21 16:15:04.000000000 +0000
+@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1439,9 +1474,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/md/dm.h linux-3.6.10-vs2.3.4.6/driver
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.6.10/drivers/net/tun.c linux-3.6.10-vs2.3.4.6/drivers/net/tun.c
---- linux-3.6.10/drivers/net/tun.c 2012-10-04 13:27:20.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/net/tun.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/net/tun.c linux-3.4.45-vs2.3.3.9/drivers/net/tun.c
+--- linux-3.4.45/drivers/net/tun.c 2013-05-13 17:36:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/net/tun.c 2013-03-30 21:29:17.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1450,7 +1485,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/net/tun.c linux-3.6.10-vs2.3.4.6/driv
#include <net/net_namespace.h>
#include <net/netns/generic.h>
#include <net/rtnetlink.h>
-@@ -122,6 +123,7 @@ struct tun_struct {
+@@ -120,6 +121,7 @@ struct tun_struct {
unsigned int flags;
uid_t owner;
gid_t group;
@@ -1458,7 +1493,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/net/tun.c linux-3.6.10-vs2.3.4.6/driv
struct net_device *dev;
netdev_features_t set_features;
-@@ -1033,6 +1035,7 @@ static void tun_setup(struct net_device
+@@ -912,6 +914,7 @@ static void tun_setup(struct net_device
tun->owner = -1;
tun->group = -1;
@@ -1466,7 +1501,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/net/tun.c linux-3.6.10-vs2.3.4.6/driv
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1191,7 +1194,7 @@ static int tun_set_iff(struct net *net,
+@@ -1070,7 +1073,7 @@ static int tun_set_iff(struct net *net,
if (((tun->owner != -1 && cred->euid != tun->owner) ||
(tun->group != -1 && !in_egroup_p(tun->group))) &&
@@ -1475,7 +1510,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/net/tun.c linux-3.6.10-vs2.3.4.6/driv
return -EPERM;
err = security_tun_dev_attach(tun->socket.sk);
if (err < 0)
-@@ -1205,7 +1208,7 @@ static int tun_set_iff(struct net *net,
+@@ -1084,7 +1087,7 @@ static int tun_set_iff(struct net *net,
char *name;
unsigned long flags = 0;
@@ -1484,7 +1519,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/net/tun.c linux-3.6.10-vs2.3.4.6/driv
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -1276,6 +1279,9 @@ static int tun_set_iff(struct net *net,
+@@ -1154,6 +1157,9 @@ static int tun_set_iff(struct net *net,
sk->sk_destruct = tun_sock_destruct;
@@ -1494,7 +1529,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/net/tun.c linux-3.6.10-vs2.3.4.6/driv
err = tun_attach(tun, file);
if (err < 0)
goto failed;
-@@ -1459,6 +1465,16 @@ static long __tun_chr_ioctl(struct file
+@@ -1337,6 +1343,16 @@ static long __tun_chr_ioctl(struct file
tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
break;
@@ -1511,48 +1546,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/net/tun.c linux-3.6.10-vs2.3.4.6/driv
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.6.10/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.6.10-vs2.3.4.6/drivers/staging/csr/csr_wifi_hip_xbv.c
---- linux-3.6.10/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-10-04 13:27:30.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-10 16:33:14.000000000 +0000
-@@ -55,7 +55,7 @@ typedef struct
- {
- char t_name[4];
- u32 t_len;
--} tag_t;
-+} ctag_t;
-
-
- #define TAG_EQ(i, v) (((i)[0] == (v)[0]) && \
-@@ -90,7 +90,7 @@ typedef struct
- u32 ptr;
- } xbv_stack_t;
-
--static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag);
-+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag);
- static s32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len);
- static s32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len);
- static s32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack,
-@@ -160,7 +160,7 @@ static u32 write_fwdl_to_ptdl(void *buf,
- CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo)
- {
- ct_t ct;
-- tag_t tag;
-+ ctag_t tag;
- xbv_stack_t stack;
-
- ct.dlpriv = dlpriv;
-@@ -505,7 +505,7 @@ static u32 xbv2uint(u8 *ptr, s32 len)
- }
-
-
--static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag)
-+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag)
- {
- u8 buf[8];
- s32 n;
-diff -NurpP --minimal linux-3.6.10/drivers/tty/sysrq.c linux-3.6.10-vs2.3.4.6/drivers/tty/sysrq.c
---- linux-3.6.10/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/tty/sysrq.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/tty/sysrq.c linux-3.4.45-vs2.3.3.9/drivers/tty/sysrq.c
+--- linux-3.4.45/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/tty/sysrq.c 2012-05-21 16:15:04.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/input.h>
@@ -1604,9 +1600,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/tty/sysrq.c linux-3.6.10-vs2.3.4.6/dr
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.6.10/drivers/tty/tty_io.c linux-3.6.10-vs2.3.4.6/drivers/tty/tty_io.c
---- linux-3.6.10/drivers/tty/tty_io.c 2012-07-22 21:39:32.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/drivers/tty/tty_io.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/drivers/tty/tty_io.c linux-3.4.45-vs2.3.3.9/drivers/tty/tty_io.c
+--- linux-3.4.45/drivers/tty/tty_io.c 2013-05-13 17:36:30.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/tty/tty_io.c 2013-05-13 18:16:08.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1615,7 +1611,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/tty/tty_io.c linux-3.6.10-vs2.3.4.6/d
#undef TTY_DEBUG_HANGUP
-@@ -2123,7 +2124,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2128,7 +2129,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
@@ -1625,7 +1621,7 @@ diff -NurpP --minimal linux-3.6.10/drivers/tty/tty_io.c linux-3.6.10-vs2.3.4.6/d
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2411,6 +2413,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2416,6 +2418,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
@@ -1633,9 +1629,9 @@ diff -NurpP --minimal linux-3.6.10/drivers/tty/tty_io.c linux-3.6.10-vs2.3.4.6/d
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.6.10/fs/attr.c linux-3.6.10-vs2.3.4.6/fs/attr.c
---- linux-3.6.10/fs/attr.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/attr.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/attr.c linux-3.4.45-vs2.3.3.9/fs/attr.c
+--- linux-3.4.45/fs/attr.c 2013-05-13 17:36:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/attr.c 2012-06-28 14:45:07.000000000 +0000
@@ -14,6 +14,9 @@
#include <linux/fcntl.h>
#include <linux/security.h>
@@ -1666,9 +1662,9 @@ diff -NurpP --minimal linux-3.6.10/fs/attr.c linux-3.6.10-vs2.3.4.6/fs/attr.c
if (ia_valid & ATTR_ATIME)
inode->i_atime = timespec_trunc(attr->ia_atime,
inode->i_sb->s_time_gran);
-@@ -173,7 +182,8 @@ int notify_change(struct dentry * dentry
-
- WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex));
+@@ -171,7 +180,8 @@ int notify_change(struct dentry * dentry
+ struct timespec now;
+ unsigned int ia_valid = attr->ia_valid;
- if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
+ if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
@@ -1676,9 +1672,9 @@ diff -NurpP --minimal linux-3.6.10/fs/attr.c linux-3.6.10-vs2.3.4.6/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.6.10/fs/block_dev.c linux-3.6.10-vs2.3.4.6/fs/block_dev.c
---- linux-3.6.10/fs/block_dev.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/block_dev.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/block_dev.c linux-3.4.45-vs2.3.3.9/fs/block_dev.c
+--- linux-3.4.45/fs/block_dev.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/block_dev.c 2013-05-13 18:16:08.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -1695,7 +1691,7 @@ diff -NurpP --minimal linux-3.6.10/fs/block_dev.c linux-3.6.10-vs2.3.4.6/fs/bloc
inode->i_bdev = bdev;
inode->i_data.a_ops = &def_blk_aops;
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
-@@ -627,6 +629,11 @@ EXPORT_SYMBOL(bdput);
+@@ -628,6 +630,11 @@ EXPORT_SYMBOL(bdput);
static struct block_device *bd_acquire(struct inode *inode)
{
struct block_device *bdev;
@@ -1707,7 +1703,7 @@ diff -NurpP --minimal linux-3.6.10/fs/block_dev.c linux-3.6.10-vs2.3.4.6/fs/bloc
spin_lock(&bdev_lock);
bdev = inode->i_bdev;
-@@ -637,7 +644,7 @@ static struct block_device *bd_acquire(s
+@@ -638,7 +645,7 @@ static struct block_device *bd_acquire(s
}
spin_unlock(&bdev_lock);
@@ -1716,10 +1712,10 @@ diff -NurpP --minimal linux-3.6.10/fs/block_dev.c linux-3.6.10-vs2.3.4.6/fs/bloc
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.6.10/fs/btrfs/ctree.h linux-3.6.10-vs2.3.4.6/fs/btrfs/ctree.h
---- linux-3.6.10/fs/btrfs/ctree.h 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/btrfs/ctree.h 2012-10-04 16:47:00.000000000 +0000
-@@ -674,11 +674,14 @@ struct btrfs_inode_item {
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/ctree.h linux-3.4.45-vs2.3.3.9/fs/btrfs/ctree.h
+--- linux-3.4.45/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/ctree.h 2012-05-21 16:15:04.000000000 +0000
+@@ -668,11 +668,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1735,7 +1731,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ctree.h linux-3.6.10-vs2.3.4.6/fs/bt
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-@@ -1727,6 +1730,8 @@ struct btrfs_ioctl_defrag_range_args {
+@@ -1542,6 +1545,8 @@ struct btrfs_ioctl_defrag_range_args {
#define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21)
#define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR (1 << 22)
@@ -1744,7 +1740,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ctree.h linux-3.6.10-vs2.3.4.6/fs/bt
#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
#define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \
-@@ -1988,6 +1993,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -1762,6 +1767,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
@@ -1752,7 +1748,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ctree.h linux-3.6.10-vs2.3.4.6/fs/bt
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -2041,6 +2047,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -1815,6 +1821,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
@@ -1763,7 +1759,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ctree.h linux-3.6.10-vs2.3.4.6/fs/bt
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -3305,6 +3315,7 @@ extern const struct dentry_operations bt
+@@ -2959,6 +2969,7 @@ extern const struct dentry_operations bt
long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
@@ -1771,10 +1767,10 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ctree.h linux-3.6.10-vs2.3.4.6/fs/bt
int btrfs_defrag_file(struct inode *inode, struct file *file,
struct btrfs_ioctl_defrag_range_args *range,
u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-3.6.10/fs/btrfs/disk-io.c linux-3.6.10-vs2.3.4.6/fs/btrfs/disk-io.c
---- linux-3.6.10/fs/btrfs/disk-io.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/btrfs/disk-io.c 2012-10-04 16:47:00.000000000 +0000
-@@ -2187,6 +2187,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/disk-io.c linux-3.4.45-vs2.3.3.9/fs/btrfs/disk-io.c
+--- linux-3.4.45/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/disk-io.c 2012-05-21 16:15:04.000000000 +0000
+@@ -2083,6 +2083,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1784,9 +1780,9 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/disk-io.c linux-3.6.10-vs2.3.4.6/fs/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.6.10/fs/btrfs/inode.c linux-3.6.10-vs2.3.4.6/fs/btrfs/inode.c
---- linux-3.6.10/fs/btrfs/inode.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/btrfs/inode.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/inode.c linux-3.4.45-vs2.3.3.9/fs/btrfs/inode.c
+--- linux-3.4.45/fs/btrfs/inode.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/inode.c 2013-05-13 18:16:08.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -1795,7 +1791,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/inode.c linux-3.6.10-vs2.3.4.6/fs/bt
#include "compat.h"
#include "ctree.h"
#include "disk-io.h"
-@@ -2545,6 +2546,8 @@ static void btrfs_read_locked_inode(stru
+@@ -2482,6 +2483,8 @@ static void btrfs_read_locked_inode(stru
struct btrfs_key location;
int maybe_acls;
u32 rdev;
@@ -1804,7 +1800,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/inode.c linux-3.6.10-vs2.3.4.6/fs/bt
int ret;
bool filled = false;
-@@ -2572,8 +2575,13 @@ static void btrfs_read_locked_inode(stru
+@@ -2509,8 +2512,13 @@ static void btrfs_read_locked_inode(stru
struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
@@ -1820,7 +1816,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/inode.c linux-3.6.10-vs2.3.4.6/fs/bt
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
tspec = btrfs_inode_atime(inode_item);
-@@ -2651,8 +2659,14 @@ static void fill_inode_item(struct btrfs
+@@ -2588,8 +2596,14 @@ static void fill_inode_item(struct btrfs
struct btrfs_inode_item *item,
struct inode *inode)
{
@@ -1837,7 +1833,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/inode.c linux-3.6.10-vs2.3.4.6/fs/bt
btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
btrfs_set_inode_mode(leaf, item, inode->i_mode);
btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
-@@ -7636,11 +7650,13 @@ static const struct inode_operations btr
+@@ -7590,11 +7604,13 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
@@ -1851,10 +1847,10 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/inode.c linux-3.6.10-vs2.3.4.6/fs/bt
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.6.10/fs/btrfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/btrfs/ioctl.c
---- linux-3.6.10/fs/btrfs/ioctl.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/btrfs/ioctl.c 2012-10-04 16:47:00.000000000 +0000
-@@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/btrfs/ioctl.c
+--- linux-3.4.45/fs/btrfs/ioctl.c 2012-05-21 16:07:19.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/ioctl.c 2012-05-21 16:15:04.000000000 +0000
+@@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1870,7 +1866,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/bt
if (flags & BTRFS_INODE_APPEND)
iflags |= FS_APPEND_FL;
if (flags & BTRFS_INODE_NODUMP)
-@@ -94,28 +97,78 @@ static unsigned int btrfs_flags_to_ioctl
+@@ -91,28 +94,78 @@ static unsigned int btrfs_flags_to_ioctl
else if (flags & BTRFS_INODE_NOCOMPRESS)
iflags |= FS_NOCOMP_FL;
@@ -1953,7 +1949,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/bt
}
/*
-@@ -131,6 +184,7 @@ void btrfs_inherit_iflags(struct inode *
+@@ -128,6 +181,7 @@ void btrfs_inherit_iflags(struct inode *
return;
flags = BTRFS_I(dir)->flags;
@@ -1961,7 +1957,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/bt
if (flags & BTRFS_INODE_NOCOMPRESS) {
BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
-@@ -146,6 +200,30 @@ void btrfs_inherit_iflags(struct inode *
+@@ -143,6 +197,30 @@ void btrfs_inherit_iflags(struct inode *
btrfs_update_iflags(inode);
}
@@ -1992,7 +1988,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/bt
static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
{
struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
-@@ -206,21 +284,27 @@ static int btrfs_ioctl_setflags(struct f
+@@ -199,7 +277,8 @@ static int btrfs_ioctl_setflags(struct f
flags = btrfs_mask_flags(inode->i_mode, flags);
oldflags = btrfs_flags_to_ioctl(ip->flags);
@@ -2002,8 +1998,9 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/bt
if (!capable(CAP_LINUX_IMMUTABLE)) {
ret = -EPERM;
goto out_unlock;
- }
- }
+@@ -210,14 +289,19 @@ static int btrfs_ioctl_setflags(struct f
+ if (ret)
+ goto out_unlock;
- if (flags & FS_SYNC_FL)
- ip->flags |= BTRFS_INODE_SYNC;
@@ -2025,10 +2022,10 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/bt
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.6.10/fs/btrfs/super.c linux-3.6.10-vs2.3.4.6/fs/btrfs/super.c
---- linux-3.6.10/fs/btrfs/super.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/btrfs/super.c 2012-10-04 16:47:00.000000000 +0000
-@@ -306,7 +306,7 @@ enum {
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/super.c linux-3.4.45-vs2.3.3.9/fs/btrfs/super.c
+--- linux-3.4.45/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/super.c 2012-05-21 16:15:04.000000000 +0000
+@@ -279,7 +279,7 @@ enum {
Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
Opt_check_integrity, Opt_check_integrity_including_extent_data,
Opt_check_integrity_print_mask, Opt_fatal_errors,
@@ -2037,7 +2034,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/super.c linux-3.6.10-vs2.3.4.6/fs/bt
};
static match_table_t tokens = {
-@@ -346,6 +346,9 @@ static match_table_t tokens = {
+@@ -319,6 +319,9 @@ static match_table_t tokens = {
{Opt_check_integrity_including_extent_data, "check_int_data"},
{Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
{Opt_fatal_errors, "fatal_errors=%s"},
@@ -2047,7 +2044,7 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/super.c linux-3.6.10-vs2.3.4.6/fs/bt
{Opt_err, NULL},
};
-@@ -596,6 +599,22 @@ int btrfs_parse_options(struct btrfs_roo
+@@ -564,6 +567,22 @@ int btrfs_parse_options(struct btrfs_roo
goto out;
}
break;
@@ -2070,9 +2067,9 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/super.c linux-3.6.10-vs2.3.4.6/fs/bt
case Opt_err:
printk(KERN_INFO "btrfs: unrecognized mount option "
"'%s'\n", p);
-@@ -1196,6 +1215,12 @@ static int btrfs_remount(struct super_bl
- btrfs_resize_thread_pool(fs_info,
- fs_info->thread_pool_size, old_thread_pool_size);
+@@ -1137,6 +1156,12 @@ static int btrfs_remount(struct super_bl
+ goto restore;
+ }
+ if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
+ printk("btrfs: %s: tagging not permitted on remount.\n",
@@ -2083,9 +2080,9 @@ diff -NurpP --minimal linux-3.6.10/fs/btrfs/super.c linux-3.6.10-vs2.3.4.6/fs/bt
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.6.10/fs/char_dev.c linux-3.6.10-vs2.3.4.6/fs/char_dev.c
---- linux-3.6.10/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/char_dev.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/char_dev.c linux-3.4.45-vs2.3.3.9/fs/char_dev.c
+--- linux-3.4.45/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/char_dev.c 2012-05-21 16:15:04.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -2118,9 +2115,9 @@ diff -NurpP --minimal linux-3.6.10/fs/char_dev.c linux-3.6.10-vs2.3.4.6/fs/char_
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.6.10/fs/dcache.c linux-3.6.10-vs2.3.4.6/fs/dcache.c
---- linux-3.6.10/fs/dcache.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/dcache.c 2012-12-07 21:49:54.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/dcache.c linux-3.4.45-vs2.3.3.9/fs/dcache.c
+--- linux-3.4.45/fs/dcache.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/dcache.c 2013-05-13 18:16:08.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
@@ -2129,7 +2126,7 @@ diff -NurpP --minimal linux-3.6.10/fs/dcache.c linux-3.6.10-vs2.3.4.6/fs/dcache.
#include "internal.h"
#include "mount.h"
-@@ -617,6 +618,8 @@ int d_invalidate(struct dentry * dentry)
+@@ -601,6 +602,8 @@ int d_invalidate(struct dentry * dentry)
spin_lock(&dentry->d_lock);
}
@@ -2138,7 +2135,7 @@ diff -NurpP --minimal linux-3.6.10/fs/dcache.c linux-3.6.10-vs2.3.4.6/fs/dcache.
/*
* Somebody else still using it?
*
-@@ -646,6 +649,7 @@ EXPORT_SYMBOL(d_invalidate);
+@@ -630,6 +633,7 @@ EXPORT_SYMBOL(d_invalidate);
static inline void __dget_dlock(struct dentry *dentry)
{
dentry->d_count++;
@@ -2146,7 +2143,7 @@ diff -NurpP --minimal linux-3.6.10/fs/dcache.c linux-3.6.10-vs2.3.4.6/fs/dcache.
}
static inline void __dget(struct dentry *dentry)
-@@ -1276,6 +1280,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1260,6 +1264,9 @@ struct dentry *__d_alloc(struct super_bl
struct dentry *dentry;
char *dname;
@@ -2156,7 +2153,7 @@ diff -NurpP --minimal linux-3.6.10/fs/dcache.c linux-3.6.10-vs2.3.4.6/fs/dcache.
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1308,6 +1315,7 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1282,6 +1289,7 @@ struct dentry *__d_alloc(struct super_bl
dentry->d_count = 1;
dentry->d_flags = 0;
@@ -2164,7 +2161,7 @@ diff -NurpP --minimal linux-3.6.10/fs/dcache.c linux-3.6.10-vs2.3.4.6/fs/dcache.
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -2012,6 +2020,7 @@ struct dentry *__d_lookup(struct dentry
+@@ -1943,6 +1951,7 @@ struct dentry *__d_lookup(struct dentry
}
dentry->d_count++;
@@ -2172,9 +2169,9 @@ diff -NurpP --minimal linux-3.6.10/fs/dcache.c linux-3.6.10-vs2.3.4.6/fs/dcache.
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.6.10/fs/devpts/inode.c linux-3.6.10-vs2.3.4.6/fs/devpts/inode.c
---- linux-3.6.10/fs/devpts/inode.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/devpts/inode.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/devpts/inode.c linux-3.4.45-vs2.3.3.9/fs/devpts/inode.c
+--- linux-3.4.45/fs/devpts/inode.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/devpts/inode.c 2012-05-21 16:15:04.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2205,7 +2202,7 @@ diff -NurpP --minimal linux-3.6.10/fs/devpts/inode.c linux-3.6.10-vs2.3.4.6/fs/d
/*
* sysctl support for setting limits on the number of Unix98 ptys allocated.
* Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
-@@ -336,6 +352,34 @@ static int devpts_show_options(struct se
+@@ -328,6 +344,34 @@ static int devpts_show_options(struct se
return 0;
}
@@ -2240,7 +2237,7 @@ diff -NurpP --minimal linux-3.6.10/fs/devpts/inode.c linux-3.6.10-vs2.3.4.6/fs/d
static const struct super_operations devpts_sops = {
.statfs = simple_statfs,
.remount_fs = devpts_remount,
-@@ -379,8 +423,10 @@ devpts_fill_super(struct super_block *s,
+@@ -371,8 +415,10 @@ devpts_fill_super(struct super_block *s,
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
inode->i_op = &simple_dir_inode_operations;
@@ -2252,7 +2249,7 @@ diff -NurpP --minimal linux-3.6.10/fs/devpts/inode.c linux-3.6.10-vs2.3.4.6/fs/d
s->s_root = d_make_root(inode);
if (s->s_root)
-@@ -572,6 +618,9 @@ int devpts_pty_new(struct inode *ptmx_in
+@@ -564,6 +610,9 @@ int devpts_pty_new(struct inode *ptmx_in
inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|opts->mode, device);
@@ -2262,10 +2259,10 @@ diff -NurpP --minimal linux-3.6.10/fs/devpts/inode.c linux-3.6.10-vs2.3.4.6/fs/d
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.6.10/fs/ext2/balloc.c linux-3.6.10-vs2.3.4.6/fs/ext2/balloc.c
---- linux-3.6.10/fs/ext2/balloc.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext2/balloc.c 2012-10-04 16:47:00.000000000 +0000
-@@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block
+diff -NurpP --minimal linux-3.4.45/fs/ext2/balloc.c linux-3.4.45-vs2.3.3.9/fs/ext2/balloc.c
+--- linux-3.4.45/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/balloc.c 2012-05-21 16:15:04.000000000 +0000
+@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
}
@@ -2273,9 +2270,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/balloc.c linux-3.6.10-vs2.3.4.6/fs/ex
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.6.10/fs/ext2/ext2.h linux-3.6.10-vs2.3.4.6/fs/ext2/ext2.h
---- linux-3.6.10/fs/ext2/ext2.h 2012-07-22 21:39:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext2/ext2.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext2/ext2.h linux-3.4.45-vs2.3.3.9/fs/ext2/ext2.h
+--- linux-3.4.45/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/ext2.h 2012-05-21 16:15:05.000000000 +0000
@@ -244,8 +244,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
@@ -2323,18 +2320,18 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/ext2.h linux-3.6.10-vs2.3.4.6/fs/ext2
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.6.10/fs/ext2/file.c linux-3.6.10-vs2.3.4.6/fs/ext2/file.c
---- linux-3.6.10/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext2/file.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext2/file.c linux-3.4.45-vs2.3.3.9/fs/ext2/file.c
+--- linux-3.4.45/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/file.c 2012-05-21 16:15:05.000000000 +0000
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.get_acl = ext2_get_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-3.6.10/fs/ext2/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ext2/ialloc.c
---- linux-3.6.10/fs/ext2/ialloc.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext2/ialloc.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext2/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext2/ialloc.c
+--- linux-3.4.45/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/ialloc.c 2012-05-21 16:15:05.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2343,7 +2340,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ex
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -547,6 +548,7 @@ got:
+@@ -549,6 +550,7 @@ got:
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
@@ -2351,9 +2348,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.6.10/fs/ext2/inode.c linux-3.6.10-vs2.3.4.6/fs/ext2/inode.c
---- linux-3.6.10/fs/ext2/inode.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext2/inode.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext2/inode.c linux-3.4.45-vs2.3.3.9/fs/ext2/inode.c
+--- linux-3.4.45/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
@@ -2362,7 +2359,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
#include "ext2.h"
#include "acl.h"
#include "xip.h"
-@@ -1165,7 +1166,7 @@ static void ext2_truncate_blocks(struct
+@@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct
return;
if (ext2_inode_is_fast_symlink(inode))
return;
@@ -2371,7 +2368,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
return;
__ext2_truncate_blocks(inode, offset);
}
-@@ -1256,36 +1257,61 @@ void ext2_set_inode_flags(struct inode *
+@@ -1253,36 +1254,61 @@ void ext2_set_inode_flags(struct inode *
{
unsigned int flags = EXT2_I(inode)->i_flags;
@@ -2440,31 +2437,48 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
}
struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
-@@ -1321,8 +1347,10 @@ struct inode *ext2_iget (struct super_bl
- i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
- i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+@@ -1292,6 +1318,8 @@ struct inode *ext2_iget (struct super_bl
+ struct ext2_inode *raw_inode;
+ struct inode *inode;
+ long ret = -EIO;
++ uid_t uid;
++ gid_t gid;
+ int n;
+
+ inode = iget_locked(sb, ino);
+@@ -1310,12 +1338,16 @@ struct inode *ext2_iget (struct super_bl
+ }
+
+ inode->i_mode = le16_to_cpu(raw_inode->i_mode);
+- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
+- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
++ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
++ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
+ if (!(test_opt (inode->i_sb, NO_UID32))) {
+- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
++ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
++ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
-- i_uid_write(inode, i_uid);
-- i_gid_write(inode, i_gid);
-+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
-+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
-+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
+ le16_to_cpu(raw_inode->i_raw_tag));
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -1420,8 +1448,8 @@ static int __ext2_write_inode(struct ino
+@@ -1413,8 +1445,8 @@ static int __ext2_write_inode(struct ino
struct ext2_inode_info *ei = EXT2_I(inode);
struct super_block *sb = inode->i_sb;
ino_t ino = inode->i_ino;
-- uid_t uid = i_uid_read(inode);
-- gid_t gid = i_gid_read(inode);
-+ uid_t uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
-+ gid_t gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
+- uid_t uid = inode->i_uid;
+- gid_t gid = inode->i_gid;
++ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
struct buffer_head * bh;
struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
int n;
-@@ -1457,6 +1485,9 @@ static int __ext2_write_inode(struct ino
+@@ -1450,6 +1482,9 @@ static int __ext2_write_inode(struct ino
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
@@ -2474,19 +2488,19 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(inode->i_size);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -1537,7 +1568,8 @@ int ext2_setattr(struct dentry *dentry,
+@@ -1530,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry,
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
- if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
-- (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
-+ (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
+ if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
+- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
++ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
+ (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.6.10/fs/ext2/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ext2/ioctl.c
---- linux-3.6.10/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext2/ioctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext2/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext2/ioctl.c
+--- linux-3.4.45/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2536,9 +2550,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ext
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.6.10/fs/ext2/namei.c linux-3.6.10-vs2.3.4.6/fs/ext2/namei.c
---- linux-3.6.10/fs/ext2/namei.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext2/namei.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext2/namei.c linux-3.4.45-vs2.3.3.9/fs/ext2/namei.c
+--- linux-3.4.45/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2563,10 +2577,10 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/namei.c linux-3.6.10-vs2.3.4.6/fs/ext
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.6.10/fs/ext2/super.c linux-3.6.10-vs2.3.4.6/fs/ext2/super.c
---- linux-3.6.10/fs/ext2/super.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext2/super.c 2012-10-04 16:47:00.000000000 +0000
-@@ -390,7 +390,8 @@ enum {
+diff -NurpP --minimal linux-3.4.45/fs/ext2/super.c linux-3.4.45-vs2.3.3.9/fs/ext2/super.c
+--- linux-3.4.45/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/super.c 2012-05-21 16:15:05.000000000 +0000
+@@ -393,7 +393,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
@@ -2576,7 +2590,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/super.c linux-3.6.10-vs2.3.4.6/fs/ext
};
static const match_table_t tokens = {
-@@ -418,6 +419,9 @@ static const match_table_t tokens = {
+@@ -421,6 +422,9 @@ static const match_table_t tokens = {
{Opt_acl, "acl"},
{Opt_noacl, "noacl"},
{Opt_xip, "xip"},
@@ -2586,7 +2600,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/super.c linux-3.6.10-vs2.3.4.6/fs/ext
{Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
{Opt_quota, "quota"},
-@@ -501,6 +505,20 @@ static int parse_options(char *options,
+@@ -491,6 +495,20 @@ static int parse_options(char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
@@ -2607,7 +2621,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/super.c linux-3.6.10-vs2.3.4.6/fs/ext
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -859,6 +877,8 @@ static int ext2_fill_super(struct super_
+@@ -849,6 +867,8 @@ static int ext2_fill_super(struct super_
if (!parse_options((char *) data, sb))
goto failed_mount;
@@ -2616,7 +2630,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/super.c linux-3.6.10-vs2.3.4.6/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1264,6 +1284,14 @@ static int ext2_remount (struct super_bl
+@@ -1222,6 +1242,14 @@ static int ext2_remount (struct super_bl
err = -EINVAL;
goto restore_opts;
}
@@ -2631,9 +2645,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext2/super.c linux-3.6.10-vs2.3.4.6/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.6.10/fs/ext3/ext3.h linux-3.6.10-vs2.3.4.6/fs/ext3/ext3.h
---- linux-3.6.10/fs/ext3/ext3.h 2012-07-22 21:39:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext3/ext3.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext3/ext3.h linux-3.4.45-vs2.3.3.9/fs/ext3/ext3.h
+--- linux-3.4.45/fs/ext3/ext3.h 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/ext3.h 2012-05-21 17:13:31.000000000 +0000
@@ -151,10 +151,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -2677,7 +2691,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/ext3.h linux-3.6.10-vs2.3.4.6/fs/ext3
/* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
#ifndef _LINUX_EXT2_FS_H
-@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct
+@@ -1057,6 +1064,7 @@ extern void ext3_get_inode_flags(struct
extern void ext3_set_aops(struct inode *inode);
extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len);
@@ -2685,9 +2699,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/ext3.h linux-3.6.10-vs2.3.4.6/fs/ext3
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.6.10/fs/ext3/file.c linux-3.6.10-vs2.3.4.6/fs/ext3/file.c
---- linux-3.6.10/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext3/file.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext3/file.c linux-3.4.45-vs2.3.3.9/fs/ext3/file.c
+--- linux-3.4.45/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/file.c 2012-05-21 16:15:05.000000000 +0000
@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
#endif
.get_acl = ext3_get_acl,
@@ -2695,9 +2709,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/file.c linux-3.6.10-vs2.3.4.6/fs/ext3
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.6.10/fs/ext3/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ext3/ialloc.c
---- linux-3.6.10/fs/ext3/ialloc.c 2012-07-22 21:39:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext3/ialloc.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext3/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext3/ialloc.c
+--- linux-3.4.45/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 16:15:05.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2706,7 +2720,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ex
#include "ext3.h"
#include "xattr.h"
-@@ -469,6 +470,7 @@ got:
+@@ -485,6 +486,7 @@ got:
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
@@ -2714,9 +2728,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.6.10/fs/ext3/inode.c linux-3.6.10-vs2.3.4.6/fs/ext3/inode.c
---- linux-3.6.10/fs/ext3/inode.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext3/inode.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext3/inode.c linux-3.4.45-vs2.3.3.9/fs/ext3/inode.c
+--- linux-3.4.45/fs/ext3/inode.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/inode.c 2012-09-16 18:49:11.000000000 +0000
@@ -27,6 +27,8 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
@@ -2794,31 +2808,75 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
}
struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
-@@ -2915,8 +2941,10 @@ struct inode *ext3_iget(struct super_blo
- i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
- i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+@@ -2891,6 +2917,8 @@ struct inode *ext3_iget(struct super_blo
+ transaction_t *transaction;
+ long ret;
+ int block;
++ uid_t uid;
++ gid_t gid;
+
+ inode = iget_locked(sb, ino);
+ if (!inode)
+@@ -2907,12 +2935,16 @@ struct inode *ext3_iget(struct super_blo
+ bh = iloc.bh;
+ raw_inode = ext3_raw_inode(&iloc);
+ inode->i_mode = le16_to_cpu(raw_inode->i_mode);
+- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
+- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
++ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
++ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
+ if(!(test_opt (inode->i_sb, NO_UID32))) {
+- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
++ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
++ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
-- i_uid_write(inode, i_uid);
-- i_gid_write(inode, i_gid);
-+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
-+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
-+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
+ le16_to_cpu(raw_inode->i_raw_tag));
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -3088,8 +3116,8 @@ again:
-
+@@ -3067,6 +3099,8 @@ static int ext3_do_update_inode(handle_t
+ struct ext3_inode *raw_inode = ext3_raw_inode(iloc);
+ struct ext3_inode_info *ei = EXT3_I(inode);
+ struct buffer_head *bh = iloc->bh;
++ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+ int err = 0, rc, block;
+ int need_datasync = 0;
+ __le32 disksize;
+@@ -3083,29 +3117,32 @@ again:
ext3_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
-- i_uid = i_uid_read(inode);
-- i_gid = i_gid_read(inode);
-+ i_uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
-+ i_gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
if(!(test_opt(inode->i_sb, NO_UID32))) {
- raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
-@@ -3114,6 +3142,9 @@ again:
+- raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
+- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
++ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid));
++ raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid));
+ /*
+ * Fix up interoperability with old kernels. Otherwise, old inodes get
+ * re-used with the upper 16 bits of the uid/gid intact
+ */
+ if(!ei->i_dtime) {
+ raw_inode->i_uid_high =
+- cpu_to_le16(high_16_bits(inode->i_uid));
++ cpu_to_le16(high_16_bits(uid));
+ raw_inode->i_gid_high =
+- cpu_to_le16(high_16_bits(inode->i_gid));
++ cpu_to_le16(high_16_bits(gid));
+ } else {
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
+ }
+ } else {
+ raw_inode->i_uid_low =
+- cpu_to_le16(fs_high2lowuid(inode->i_uid));
++ cpu_to_le16(fs_high2lowuid(uid));
+ raw_inode->i_gid_low =
+- cpu_to_le16(fs_high2lowgid(inode->i_gid));
++ cpu_to_le16(fs_high2lowgid(gid));
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
@@ -2828,17 +2886,17 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
disksize = cpu_to_le32(ei->i_disksize);
if (disksize != raw_inode->i_size) {
-@@ -3282,7 +3313,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3274,7 +3311,8 @@ int ext3_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
- if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
-- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
-+ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
-+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
+ if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
+- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
++ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
++ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -3304,6 +3336,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3296,6 +3334,8 @@ int ext3_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -2847,9 +2905,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.6.10/fs/ext3/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ext3/ioctl.c
---- linux-3.6.10/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext3/ioctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext3/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext3/ioctl.c
+--- linux-3.4.45/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
@@ -2917,9 +2975,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ext
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.6.10/fs/ext3/namei.c linux-3.6.10-vs2.3.4.6/fs/ext3/namei.c
---- linux-3.6.10/fs/ext3/namei.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext3/namei.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext3/namei.c linux-3.4.45-vs2.3.3.9/fs/ext3/namei.c
+--- linux-3.4.45/fs/ext3/namei.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -25,6 +25,8 @@
*/
@@ -2945,10 +3003,10 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/namei.c linux-3.6.10-vs2.3.4.6/fs/ext
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.6.10/fs/ext3/super.c linux-3.6.10-vs2.3.4.6/fs/ext3/super.c
---- linux-3.6.10/fs/ext3/super.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext3/super.c 2012-10-04 16:47:00.000000000 +0000
-@@ -811,7 +811,8 @@ enum {
+diff -NurpP --minimal linux-3.4.45/fs/ext3/super.c linux-3.4.45-vs2.3.3.9/fs/ext3/super.c
+--- linux-3.4.45/fs/ext3/super.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/super.c 2013-03-30 21:29:17.000000000 +0000
+@@ -820,7 +820,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
@@ -2958,7 +3016,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/super.c linux-3.6.10-vs2.3.4.6/fs/ext
};
static const match_table_t tokens = {
-@@ -868,6 +869,9 @@ static const match_table_t tokens = {
+@@ -877,6 +878,9 @@ static const match_table_t tokens = {
{Opt_barrier, "barrier"},
{Opt_nobarrier, "nobarrier"},
{Opt_resize, "resize"},
@@ -2968,7 +3026,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/super.c linux-3.6.10-vs2.3.4.6/fs/ext
{Opt_err, NULL},
};
-@@ -1033,6 +1037,20 @@ static int parse_options (char *options,
+@@ -1029,6 +1033,20 @@ static int parse_options (char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
@@ -2989,7 +3047,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/super.c linux-3.6.10-vs2.3.4.6/fs/ext
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -1731,6 +1749,9 @@ static int ext3_fill_super (struct super
+@@ -1727,6 +1745,9 @@ static int ext3_fill_super (struct super
NULL, 0))
goto failed_mount;
@@ -2999,7 +3057,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/super.c linux-3.6.10-vs2.3.4.6/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -2618,6 +2639,14 @@ static int ext3_remount (struct super_bl
+@@ -2608,6 +2629,14 @@ static int ext3_remount (struct super_bl
if (test_opt(sb, ABORT))
ext3_abort(sb, __func__, "Abort forced by user");
@@ -3014,10 +3072,10 @@ diff -NurpP --minimal linux-3.6.10/fs/ext3/super.c linux-3.6.10-vs2.3.4.6/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.6.10/fs/ext4/ext4.h linux-3.6.10-vs2.3.4.6/fs/ext4/ext4.h
---- linux-3.6.10/fs/ext4/ext4.h 2012-12-11 11:36:57.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext4/ext4.h 2012-12-08 00:36:33.000000000 +0000
-@@ -393,8 +393,12 @@ struct flex_groups {
+diff -NurpP --minimal linux-3.4.45/fs/ext4/ext4.h linux-3.4.45-vs2.3.3.9/fs/ext4/ext4.h
+--- linux-3.4.45/fs/ext4/ext4.h 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/ext4.h 2013-05-13 18:16:08.000000000 +0000
+@@ -380,8 +380,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
@@ -3030,24 +3088,25 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/ext4.h linux-3.6.10-vs2.3.4.6/fs/ext4
#define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */
#define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */
-@@ -666,7 +670,7 @@ struct ext4_inode {
+@@ -650,7 +654,8 @@ struct ext4_inode {
+ __le16 l_i_file_acl_high;
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
- __le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
-- __le16 l_i_reserved;
+- __u32 l_i_reserved2;
+ __le16 l_i_tag; /* Context Tag */
++ __u16 l_i_reserved2;
} linux2;
struct {
__le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-@@ -784,6 +788,7 @@ do { \
+@@ -768,6 +773,7 @@ do { \
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
+#define i_raw_tag osd2.linux2.l_i_tag
- #define i_checksum_lo osd2.linux2.l_i_checksum_lo
+ #define i_reserved2 osd2.linux2.l_i_reserved2
#elif defined(__GNU__)
-@@ -964,6 +969,7 @@ struct ext4_inode_info {
+@@ -945,6 +951,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
@@ -3055,7 +3114,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/ext4.h linux-3.6.10-vs2.3.4.6/fs/ext4
#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-@@ -2392,6 +2398,7 @@ extern int ext4_map_blocks(handle_t *han
+@@ -2294,6 +2301,7 @@ extern int ext4_map_blocks(handle_t *han
struct ext4_map_blocks *map, int flags);
extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
__u64 start, __u64 len);
@@ -3063,19 +3122,19 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/ext4.h linux-3.6.10-vs2.3.4.6/fs/ext4
/* move_extent.c */
extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.6.10/fs/ext4/file.c linux-3.6.10-vs2.3.4.6/fs/ext4/file.c
---- linux-3.6.10/fs/ext4/file.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext4/file.c 2012-10-04 16:47:00.000000000 +0000
-@@ -334,5 +334,6 @@ const struct inode_operations ext4_file_
+diff -NurpP --minimal linux-3.4.45/fs/ext4/file.c linux-3.4.45-vs2.3.3.9/fs/ext4/file.c
+--- linux-3.4.45/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/file.c 2012-05-21 16:15:05.000000000 +0000
+@@ -258,5 +258,6 @@ const struct inode_operations ext4_file_
#endif
.get_acl = ext4_get_acl,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.6.10/fs/ext4/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ext4/ialloc.c
---- linux-3.6.10/fs/ext4/ialloc.c 2012-12-11 11:36:57.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext4/ialloc.c 2012-11-06 17:43:41.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext4/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext4/ialloc.c
+--- linux-3.4.45/fs/ext4/ialloc.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/ialloc.c 2013-05-13 18:16:08.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -3084,7 +3143,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ex
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -839,6 +840,7 @@ got:
+@@ -815,6 +816,7 @@ got:
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
@@ -3092,9 +3151,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/ialloc.c linux-3.6.10-vs2.3.4.6/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.6.10/fs/ext4/inode.c linux-3.6.10-vs2.3.4.6/fs/ext4/inode.c
---- linux-3.6.10/fs/ext4/inode.c 2012-12-11 11:36:57.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext4/inode.c 2012-11-06 17:43:41.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext4/inode.c linux-3.4.45-vs2.3.3.9/fs/ext4/inode.c
+--- linux-3.4.45/fs/ext4/inode.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/inode.c 2013-03-30 21:29:17.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -3103,7 +3162,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -3715,41 +3716,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -3585,41 +3586,64 @@ void ext4_set_inode_flags(struct inode *
{
unsigned int flags = EXT4_I(inode)->i_flags;
@@ -3175,31 +3234,75 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -3841,8 +3865,10 @@ struct inode *ext4_iget(struct super_blo
- i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
- i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+@@ -3655,6 +3679,8 @@ struct inode *ext4_iget(struct super_blo
+ journal_t *journal = EXT4_SB(sb)->s_journal;
+ long ret;
+ int block;
++ uid_t uid;
++ gid_t gid;
+
+ inode = iget_locked(sb, ino);
+ if (!inode)
+@@ -3670,12 +3696,16 @@ struct inode *ext4_iget(struct super_blo
+ goto bad_inode;
+ raw_inode = ext4_raw_inode(&iloc);
+ inode->i_mode = le16_to_cpu(raw_inode->i_mode);
+- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
+- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
++ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
++ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
+ if (!(test_opt(inode->i_sb, NO_UID32))) {
+- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
++ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
++ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
-- i_uid_write(inode, i_uid);
-- i_gid_write(inode, i_gid);
-+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
-+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
-+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
+ le16_to_cpu(raw_inode->i_raw_tag));
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -4066,8 +4092,8 @@ static int ext4_do_update_inode(handle_t
+@@ -3894,6 +3924,8 @@ static int ext4_do_update_inode(handle_t
+ struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
+ struct ext4_inode_info *ei = EXT4_I(inode);
+ struct buffer_head *bh = iloc->bh;
++ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+ int err = 0, rc, block;
+ int need_datasync = 0;
+@@ -3905,29 +3937,32 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
-- i_uid = i_uid_read(inode);
-- i_gid = i_gid_read(inode);
-+ i_uid = TAGINO_UID(DX_TAG(inode), i_uid_read(inode), inode->i_tag);
-+ i_gid = TAGINO_GID(DX_TAG(inode), i_gid_read(inode), inode->i_tag);
if (!(test_opt(inode->i_sb, NO_UID32))) {
- raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
-@@ -4090,6 +4116,9 @@ static int ext4_do_update_inode(handle_t
+- raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
+- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
++ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid));
++ raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid));
+ /*
+ * Fix up interoperability with old kernels. Otherwise, old inodes get
+ * re-used with the upper 16 bits of the uid/gid intact
+ */
+ if (!ei->i_dtime) {
+ raw_inode->i_uid_high =
+- cpu_to_le16(high_16_bits(inode->i_uid));
++ cpu_to_le16(high_16_bits(uid));
+ raw_inode->i_gid_high =
+- cpu_to_le16(high_16_bits(inode->i_gid));
++ cpu_to_le16(high_16_bits(gid));
+ } else {
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
+ }
+ } else {
+ raw_inode->i_uid_low =
+- cpu_to_le16(fs_high2lowuid(inode->i_uid));
++ cpu_to_le16(fs_high2lowuid(uid));
+ raw_inode->i_gid_low =
+- cpu_to_le16(fs_high2lowgid(inode->i_gid));
++ cpu_to_le16(fs_high2lowgid(gid));
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
@@ -3209,17 +3312,17 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4278,7 +4307,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4114,7 +4149,8 @@ int ext4_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
- if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
-- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
-+ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
-+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
+ if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
+- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
++ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
++ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4300,6 +4330,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4136,6 +4172,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -3228,9 +3331,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/inode.c linux-3.6.10-vs2.3.4.6/fs/ext
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.6.10/fs/ext4/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ext4/ioctl.c
---- linux-3.6.10/fs/ext4/ioctl.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext4/ioctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext4/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext4/ioctl.c
+--- linux-3.4.45/fs/ext4/ioctl.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/ioctl.c 2012-09-01 08:50:49.000000000 +0000
@@ -14,12 +14,40 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3295,9 +3398,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ext
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.6.10/fs/ext4/namei.c linux-3.6.10-vs2.3.4.6/fs/ext4/namei.c
---- linux-3.6.10/fs/ext4/namei.c 2012-12-11 11:36:57.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext4/namei.c 2012-11-06 17:43:41.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ext4/namei.c linux-3.4.45-vs2.3.3.9/fs/ext4/namei.c
+--- linux-3.4.45/fs/ext4/namei.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/namei.c 2012-10-22 13:09:53.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3306,7 +3409,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/namei.c linux-3.6.10-vs2.3.4.6/fs/ext
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -1199,6 +1200,7 @@ restart:
+@@ -925,6 +926,7 @@ restart:
ll_rw_block(READ | REQ_META | REQ_PRIO,
1, &bh);
}
@@ -3314,7 +3417,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/namei.c linux-3.6.10-vs2.3.4.6/fs/ext
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -2982,6 +2984,7 @@ const struct inode_operations ext4_dir_i
+@@ -2591,6 +2593,7 @@ const struct inode_operations ext4_dir_i
#endif
.get_acl = ext4_get_acl,
.fiemap = ext4_fiemap,
@@ -3322,10 +3425,10 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/namei.c linux-3.6.10-vs2.3.4.6/fs/ext
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.6.10/fs/ext4/super.c linux-3.6.10-vs2.3.4.6/fs/ext4/super.c
---- linux-3.6.10/fs/ext4/super.c 2012-12-11 11:36:57.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ext4/super.c 2012-12-08 00:36:33.000000000 +0000
-@@ -1220,6 +1220,7 @@ enum {
+diff -NurpP --minimal linux-3.4.45/fs/ext4/super.c linux-3.4.45-vs2.3.3.9/fs/ext4/super.c
+--- linux-3.4.45/fs/ext4/super.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/super.c 2013-05-13 18:16:08.000000000 +0000
+@@ -1191,6 +1191,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
@@ -3333,7 +3436,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/super.c linux-3.6.10-vs2.3.4.6/fs/ext
};
static const match_table_t tokens = {
-@@ -1298,6 +1299,9 @@ static const match_table_t tokens = {
+@@ -1269,6 +1270,9 @@ static const match_table_t tokens = {
{Opt_removed, "reservation"}, /* mount option from ext2/3 */
{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
{Opt_removed, "journal=%u"}, /* mount option from ext2/3 */
@@ -3343,7 +3446,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/super.c linux-3.6.10-vs2.3.4.6/fs/ext
{Opt_err, NULL},
};
-@@ -1544,6 +1548,20 @@ static int handle_mount_opt(struct super
+@@ -1503,6 +1507,20 @@ static int handle_mount_opt(struct super
return -1;
*journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
return 1;
@@ -3364,8 +3467,8 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/super.c linux-3.6.10-vs2.3.4.6/fs/ext
}
for (m = ext4_mount_opts; m->token != Opt_err; m++) {
-@@ -3418,6 +3436,9 @@ static int ext4_fill_super(struct super_
- }
+@@ -3239,6 +3257,9 @@ static int ext4_fill_super(struct super_
+ clear_opt(sb, DELALLOC);
}
+ if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
@@ -3374,7 +3477,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/super.c linux-3.6.10-vs2.3.4.6/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4583,6 +4604,14 @@ static int ext4_remount(struct super_blo
+@@ -4400,6 +4421,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -3389,18 +3492,18 @@ diff -NurpP --minimal linux-3.6.10/fs/ext4/super.c linux-3.6.10-vs2.3.4.6/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.6.10/fs/fcntl.c linux-3.6.10-vs2.3.4.6/fs/fcntl.c
---- linux-3.6.10/fs/fcntl.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/fcntl.c 2012-10-04 17:05:02.000000000 +0000
-@@ -21,6 +21,7 @@
+diff -NurpP --minimal linux-3.4.45/fs/fcntl.c linux-3.4.45-vs2.3.3.9/fs/fcntl.c
+--- linux-3.4.45/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/fcntl.c 2012-05-21 16:15:05.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <linux/signal.h>
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
- #include <linux/user_namespace.h>
+#include <linux/vs_limit.h>
#include <asm/poll.h>
#include <asm/siginfo.h>
-@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
+@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
if (tofree)
filp_close(tofree, files);
@@ -3409,18 +3512,18 @@ diff -NurpP --minimal linux-3.6.10/fs/fcntl.c linux-3.6.10-vs2.3.4.6/fs/fcntl.c
return newfd;
-@@ -477,6 +480,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
- filp = fget_raw_light(fd, &fput_needed);
+@@ -447,6 +450,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
+ filp = fget_raw(fd);
if (!filp)
goto out;
+ if (!vx_files_avail(1))
+ goto out;
if (unlikely(filp->f_mode & FMODE_PATH)) {
- if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.6.10/fs/file.c linux-3.6.10-vs2.3.4.6/fs/file.c
---- linux-3.6.10/fs/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/file.c 2012-10-04 16:47:00.000000000 +0000
+ if (!check_fcntl_cmd(cmd)) {
+diff -NurpP --minimal linux-3.4.45/fs/file.c linux-3.4.45-vs2.3.3.9/fs/file.c
+--- linux-3.4.45/fs/file.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/file.c 2012-05-21 16:15:05.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3446,19 +3549,19 @@ diff -NurpP --minimal linux-3.6.10/fs/file.c linux-3.6.10-vs2.3.4.6/fs/file.c
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.6.10/fs/file_table.c linux-3.6.10-vs2.3.4.6/fs/file_table.c
---- linux-3.6.10/fs/file_table.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/file_table.c 2012-11-17 13:36:19.000000000 +0000
-@@ -26,6 +26,8 @@
- #include <linux/hardirq.h>
- #include <linux/task_work.h>
+diff -NurpP --minimal linux-3.4.45/fs/file_table.c linux-3.4.45-vs2.3.3.9/fs/file_table.c
+--- linux-3.4.45/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/file_table.c 2012-05-21 16:15:05.000000000 +0000
+@@ -24,6 +24,8 @@
+ #include <linux/percpu_counter.h>
+ #include <linux/percpu.h>
#include <linux/ima.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
#include <linux/atomic.h>
-@@ -136,6 +138,8 @@ struct file *get_empty_filp(void)
+@@ -135,6 +137,8 @@ struct file *get_empty_filp(void)
spin_lock_init(&f->f_lock);
eventpoll_init_file(f);
/* f->f_version: 0 */
@@ -3467,16 +3570,16 @@ diff -NurpP --minimal linux-3.6.10/fs/file_table.c linux-3.6.10-vs2.3.4.6/fs/fil
return f;
over:
-@@ -257,6 +261,8 @@ static void __fput(struct file *file)
- i_readcount_dec(inode);
- if (file->f_mode & FMODE_WRITE)
- drop_file_write_access(file);
+@@ -252,6 +256,8 @@ static void __fput(struct file *file)
+ }
+ fops_put(file->f_op);
+ put_pid(file->f_owner.pid);
+ vx_files_dec(file);
+ file->f_xid = 0;
- file->f_path.dentry = NULL;
- file->f_path.mnt = NULL;
- file_free(file);
-@@ -449,6 +455,8 @@ void put_filp(struct file *file)
+ file_sb_list_del(file);
+ if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
+ i_readcount_dec(inode);
+@@ -382,6 +388,8 @@ void put_filp(struct file *file)
{
if (atomic_long_dec_and_test(&file->f_count)) {
security_file_free(file);
@@ -3485,9 +3588,9 @@ diff -NurpP --minimal linux-3.6.10/fs/file_table.c linux-3.6.10-vs2.3.4.6/fs/fil
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.6.10/fs/fs_struct.c linux-3.6.10-vs2.3.4.6/fs/fs_struct.c
---- linux-3.6.10/fs/fs_struct.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/fs_struct.c 2012-10-04 17:08:56.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/fs_struct.c linux-3.4.45-vs2.3.3.9/fs/fs_struct.c
+--- linux-3.4.45/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/fs_struct.c 2012-05-21 16:15:05.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3495,39 +3598,39 @@ diff -NurpP --minimal linux-3.6.10/fs/fs_struct.c linux-3.6.10-vs2.3.4.6/fs/fs_s
+#include <linux/vserver/global.h>
#include "internal.h"
- /*
-@@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
+ static inline void path_get_longterm(struct path *path)
+@@ -99,6 +100,7 @@ void free_fs_struct(struct fs_struct *fs
{
- path_put(&fs->root);
- path_put(&fs->pwd);
+ path_put_longterm(&fs->root);
+ path_put_longterm(&fs->pwd);
+ atomic_dec(&vs_global_fs);
kmem_cache_free(fs_cachep, fs);
}
-@@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct
+@@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct
fs->pwd = old->pwd;
- path_get(&fs->pwd);
+ path_get_longterm(&fs->pwd);
spin_unlock(&old->lock);
+ atomic_inc(&vs_global_fs);
}
return fs;
}
-diff -NurpP --minimal linux-3.6.10/fs/gfs2/file.c linux-3.6.10-vs2.3.4.6/fs/gfs2/file.c
---- linux-3.6.10/fs/gfs2/file.c 2012-12-11 11:36:57.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/gfs2/file.c 2012-12-08 00:36:33.000000000 +0000
-@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = {
+diff -NurpP --minimal linux-3.4.45/fs/gfs2/file.c linux-3.4.45-vs2.3.3.9/fs/gfs2/file.c
+--- linux-3.4.45/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/gfs2/file.c 2012-05-21 16:15:05.000000000 +0000
+@@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = {
+ [7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
- [17] = GFS2_DIF_TOPDIR,
+ [27] = GFS2_DIF_IXUNLINK,
+ [26] = GFS2_DIF_BARRIER,
+ [29] = GFS2_DIF_COW,
};
static const u32 gfs2_to_fsflags[32] = {
-@@ -153,6 +156,9 @@ static const u32 gfs2_to_fsflags[32] = {
+@@ -151,6 +154,9 @@ static const u32 gfs2_to_fsflags[32] = {
+ [gfs2fl_NoAtime] = FS_NOATIME_FL,
[gfs2fl_ExHash] = FS_INDEX_FL,
- [gfs2fl_TopLevel] = FS_TOPDIR_FL,
[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
+ [gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
+ [gfs2fl_Barrier] = FS_BARRIER_FL,
@@ -3535,7 +3638,7 @@ diff -NurpP --minimal linux-3.6.10/fs/gfs2/file.c linux-3.6.10-vs2.3.4.6/fs/gfs2
};
static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
-@@ -183,12 +189,18 @@ void gfs2_set_inode_flags(struct inode *
+@@ -181,12 +187,18 @@ void gfs2_set_inode_flags(struct inode *
{
struct gfs2_inode *ip = GFS2_I(inode);
unsigned int flags = inode->i_flags;
@@ -3555,7 +3658,7 @@ diff -NurpP --minimal linux-3.6.10/fs/gfs2/file.c linux-3.6.10-vs2.3.4.6/fs/gfs2
if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
flags |= S_APPEND;
if (ip->i_diskflags & GFS2_DIF_NOATIME)
-@@ -196,6 +208,43 @@ void gfs2_set_inode_flags(struct inode *
+@@ -194,6 +206,43 @@ void gfs2_set_inode_flags(struct inode *
if (ip->i_diskflags & GFS2_DIF_SYNC)
flags |= S_SYNC;
inode->i_flags = flags;
@@ -3599,7 +3702,7 @@ diff -NurpP --minimal linux-3.6.10/fs/gfs2/file.c linux-3.6.10-vs2.3.4.6/fs/gfs2
}
/* Flags that can be set by user space */
-@@ -309,6 +358,37 @@ static int gfs2_set_flags(struct file *f
+@@ -305,6 +354,37 @@ static int gfs2_set_flags(struct file *f
return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
}
@@ -3637,10 +3740,10 @@ diff -NurpP --minimal linux-3.6.10/fs/gfs2/file.c linux-3.6.10-vs2.3.4.6/fs/gfs2
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.6.10/fs/gfs2/inode.h linux-3.6.10-vs2.3.4.6/fs/gfs2/inode.h
---- linux-3.6.10/fs/gfs2/inode.h 2012-07-22 21:39:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/gfs2/inode.h 2012-10-04 16:47:00.000000000 +0000
-@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
+diff -NurpP --minimal linux-3.4.45/fs/gfs2/inode.h linux-3.4.45-vs2.3.3.9/fs/gfs2/inode.h
+--- linux-3.4.45/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/gfs2/inode.h 2012-05-21 16:15:05.000000000 +0000
+@@ -120,6 +120,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
extern void gfs2_set_inode_flags(struct inode *inode);
@@ -3648,9 +3751,9 @@ diff -NurpP --minimal linux-3.6.10/fs/gfs2/inode.h linux-3.6.10-vs2.3.4.6/fs/gfs
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.6.10/fs/inode.c linux-3.6.10-vs2.3.4.6/fs/inode.c
---- linux-3.6.10/fs/inode.c 2012-12-11 11:36:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/inode.c 2012-12-08 00:36:33.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/inode.c linux-3.4.45-vs2.3.3.9/fs/inode.c
+--- linux-3.4.45/fs/inode.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/inode.c 2013-05-13 18:16:08.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3677,7 +3780,7 @@ diff -NurpP --minimal linux-3.6.10/fs/inode.c linux-3.6.10-vs2.3.4.6/fs/inode.c
inode->dirtied_when = 0;
if (security_inode_alloc(inode))
-@@ -483,6 +488,8 @@ void __insert_inode_hash(struct inode *i
+@@ -470,6 +475,8 @@ void __insert_inode_hash(struct inode *i
}
EXPORT_SYMBOL(__insert_inode_hash);
@@ -3686,7 +3789,7 @@ diff -NurpP --minimal linux-3.6.10/fs/inode.c linux-3.6.10-vs2.3.4.6/fs/inode.c
/**
* __remove_inode_hash - remove an inode from the hash
* @inode: inode to unhash
-@@ -1804,9 +1811,11 @@ void init_special_inode(struct inode *in
+@@ -1689,9 +1696,11 @@ void init_special_inode(struct inode *in
if (S_ISCHR(mode)) {
inode->i_fop = &def_chr_fops;
inode->i_rdev = rdev;
@@ -3698,7 +3801,7 @@ diff -NurpP --minimal linux-3.6.10/fs/inode.c linux-3.6.10-vs2.3.4.6/fs/inode.c
} else if (S_ISFIFO(mode))
inode->i_fop = &def_fifo_fops;
else if (S_ISSOCK(mode))
-@@ -1835,6 +1844,7 @@ void inode_init_owner(struct inode *inod
+@@ -1720,6 +1729,7 @@ void inode_init_owner(struct inode *inod
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
@@ -3706,9 +3809,9 @@ diff -NurpP --minimal linux-3.6.10/fs/inode.c linux-3.6.10-vs2.3.4.6/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.6.10/fs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ioctl.c
---- linux-3.6.10/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ioctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ioctl.c
+--- linux-3.4.45/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3719,9 +3822,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ioctl.c
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.6.10/fs/ioprio.c linux-3.6.10-vs2.3.4.6/fs/ioprio.c
---- linux-3.6.10/fs/ioprio.c 2012-07-22 21:39:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ioprio.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ioprio.c linux-3.4.45-vs2.3.3.9/fs/ioprio.c
+--- linux-3.4.45/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ioprio.c 2012-05-21 16:15:05.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3730,7 +3833,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ioprio.c linux-3.6.10-vs2.3.4.6/fs/ioprio.
int set_task_ioprio(struct task_struct *task, int ioprio)
{
-@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
+@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
else
pgrp = find_vpid(who);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -3739,7 +3842,7 @@ diff -NurpP --minimal linux-3.6.10/fs/ioprio.c linux-3.6.10-vs2.3.4.6/fs/ioprio.
ret = set_task_ioprio(p, ioprio);
if (ret)
break;
-@@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+@@ -193,6 +196,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
else
pgrp = find_vpid(who);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -3748,9 +3851,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ioprio.c linux-3.6.10-vs2.3.4.6/fs/ioprio.
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.6.10/fs/jfs/file.c linux-3.6.10-vs2.3.4.6/fs/jfs/file.c
---- linux-3.6.10/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/file.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/file.c linux-3.4.45-vs2.3.3.9/fs/jfs/file.c
+--- linux-3.4.45/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/file.c 2012-05-21 16:15:05.000000000 +0000
@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
@@ -3769,9 +3872,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/file.c linux-3.6.10-vs2.3.4.6/fs/jfs/f
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.6.10/fs/jfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/jfs/ioctl.c
---- linux-3.6.10/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/ioctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/jfs/ioctl.c
+--- linux-3.4.45/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
@@ -3829,9 +3932,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/jfs/
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_dinode.h linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_dinode.h
---- linux-3.6.10/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_dinode.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_dinode.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_dinode.h
+--- linux-3.4.45/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_dinode.h 2012-05-21 16:15:05.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3848,9 +3951,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_dinode.h linux-3.6.10-vs2.3.4.6/fs
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_filsys.h linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_filsys.h
---- linux-3.6.10/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_filsys.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_filsys.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_filsys.h
+--- linux-3.4.45/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_filsys.h 2012-05-21 16:15:05.000000000 +0000
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3859,9 +3962,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_filsys.h linux-3.6.10-vs2.3.4.6/fs
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_imap.c linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_imap.c
---- linux-3.6.10/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_imap.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_imap.c linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_imap.c
+--- linux-3.4.45/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_imap.c 2012-05-21 16:15:05.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3921,9 +4024,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_imap.c linux-3.6.10-vs2.3.4.6/fs/j
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_inode.c linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_inode.c
---- linux-3.6.10/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_inode.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_inode.c linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.c
+--- linux-3.4.45/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3997,9 +4100,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
}
/*
-diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_inode.h linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_inode.h
---- linux-3.6.10/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/jfs_inode.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_inode.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.h
+--- linux-3.4.45/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.h 2012-05-21 16:15:05.000000000 +0000
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
@@ -4008,9 +4111,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/jfs_inode.h linux-3.6.10-vs2.3.4.6/fs/
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-3.6.10/fs/jfs/namei.c linux-3.6.10-vs2.3.4.6/fs/jfs/namei.c
---- linux-3.6.10/fs/jfs/namei.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/namei.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/namei.c linux-3.4.45-vs2.3.3.9/fs/jfs/namei.c
+--- linux-3.4.45/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -4035,9 +4138,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/namei.c linux-3.6.10-vs2.3.4.6/fs/jfs/
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.6.10/fs/jfs/super.c linux-3.6.10-vs2.3.4.6/fs/jfs/super.c
---- linux-3.6.10/fs/jfs/super.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/jfs/super.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/jfs/super.c linux-3.4.45-vs2.3.3.9/fs/jfs/super.c
+--- linux-3.4.45/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/super.c 2012-05-21 16:15:05.000000000 +0000
@@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4103,9 +4206,9 @@ diff -NurpP --minimal linux-3.6.10/fs/jfs/super.c linux-3.6.10-vs2.3.4.6/fs/jfs/
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.6.10/fs/libfs.c linux-3.6.10-vs2.3.4.6/fs/libfs.c
---- linux-3.6.10/fs/libfs.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/libfs.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/libfs.c linux-3.4.45-vs2.3.3.9/fs/libfs.c
+--- linux-3.4.45/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/libfs.c 2012-05-21 16:15:05.000000000 +0000
@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4151,9 +4254,9 @@ diff -NurpP --minimal linux-3.6.10/fs/libfs.c linux-3.6.10-vs2.3.4.6/fs/libfs.c
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
---- linux-3.6.10/fs/locks.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/locks.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/locks.c linux-3.4.45-vs2.3.3.9/fs/locks.c
+--- linux-3.4.45/fs/locks.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/locks.c 2012-09-01 08:50:49.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4184,7 +4287,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
return fl;
}
EXPORT_SYMBOL_GPL(locks_alloc_lock);
-@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f
+@@ -216,6 +224,7 @@ void locks_free_lock(struct file_lock *f
BUG_ON(!list_empty(&fl->fl_block));
BUG_ON(!list_empty(&fl->fl_link));
@@ -4192,7 +4295,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
locks_release_private(fl);
kmem_cache_free(filelock_cache, fl);
}
-@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f
+@@ -225,6 +234,7 @@ void locks_init_lock(struct file_lock *f
{
memset(fl, 0, sizeof(struct file_lock));
locks_init_lock_heads(fl);
@@ -4200,7 +4303,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
}
EXPORT_SYMBOL(locks_init_lock);
-@@ -261,6 +271,7 @@ void locks_copy_lock(struct file_lock *n
+@@ -265,6 +275,7 @@ void locks_copy_lock(struct file_lock *n
new->fl_file = fl->fl_file;
new->fl_ops = fl->fl_ops;
new->fl_lmops = fl->fl_lmops;
@@ -4208,7 +4311,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
locks_copy_private(new, fl);
}
-@@ -299,6 +310,11 @@ static int flock_make_lock(struct file *
+@@ -303,6 +314,11 @@ static int flock_make_lock(struct file *
fl->fl_flags = FL_FLOCK;
fl->fl_type = type;
fl->fl_end = OFFSET_MAX;
@@ -4220,7 +4323,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
*lock = fl;
return 0;
-@@ -438,6 +454,7 @@ static int lease_init(struct file *filp,
+@@ -452,6 +468,7 @@ static int lease_init(struct file *filp,
fl->fl_owner = current->files;
fl->fl_pid = current->tgid;
@@ -4228,7 +4331,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
fl->fl_file = filp;
fl->fl_flags = FL_LEASE;
-@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str
+@@ -471,6 +488,11 @@ static struct file_lock *lease_alloc(str
if (fl == NULL)
return ERR_PTR(error);
@@ -4240,7 +4343,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
error = lease_init(filp, type, fl);
if (error) {
locks_free_lock(fl);
-@@ -753,6 +775,7 @@ static int flock_lock_file(struct file *
+@@ -773,6 +795,7 @@ static int flock_lock_file(struct file *
lock_flocks();
}
@@ -4248,7 +4351,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
find_conflict:
for_each_lock(inode, before) {
struct file_lock *fl = *before;
-@@ -773,6 +796,7 @@ find_conflict:
+@@ -793,6 +816,7 @@ find_conflict:
goto out;
locks_copy_lock(new_fl, request);
locks_insert_lock(before, new_fl);
@@ -4256,7 +4359,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
new_fl = NULL;
error = 0;
-@@ -783,7 +807,8 @@ out:
+@@ -803,7 +827,8 @@ out:
return error;
}
@@ -4266,7 +4369,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
{
struct file_lock *fl;
struct file_lock *new_fl = NULL;
-@@ -793,6 +818,8 @@ static int __posix_lock_file(struct inod
+@@ -813,6 +838,8 @@ static int __posix_lock_file(struct inod
struct file_lock **before;
int error, added = 0;
@@ -4275,7 +4378,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
/*
* We may need two file_lock structures for this operation,
* so we get them in advance to avoid races.
-@@ -803,7 +830,11 @@ static int __posix_lock_file(struct inod
+@@ -823,7 +850,11 @@ static int __posix_lock_file(struct inod
(request->fl_type != F_UNLCK ||
request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
new_fl = locks_alloc_lock();
@@ -4287,7 +4390,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
}
lock_flocks();
-@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod
+@@ -1022,7 +1053,8 @@ static int __posix_lock_file(struct inod
int posix_lock_file(struct file *filp, struct file_lock *fl,
struct file_lock *conflock)
{
@@ -4297,7 +4400,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
}
EXPORT_SYMBOL(posix_lock_file);
-@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write,
+@@ -1112,7 +1144,7 @@ int locks_mandatory_area(int read_write,
fl.fl_end = offset + count - 1;
for (;;) {
@@ -4306,7 +4409,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
-@@ -1397,6 +1429,7 @@ int generic_add_lease(struct file *filp,
+@@ -1407,6 +1439,7 @@ int generic_add_lease(struct file *filp,
goto out;
locks_insert_lock(before, lease);
@@ -4314,7 +4417,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
return 0;
out:
-@@ -1838,6 +1871,11 @@ int fcntl_setlk(unsigned int fd, struct
+@@ -1847,6 +1880,11 @@ int fcntl_setlk(unsigned int fd, struct
if (file_lock == NULL)
return -ENOLCK;
@@ -4326,7 +4429,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
/*
* This might block, so we do it before checking the inode.
*/
-@@ -1956,6 +1994,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -1965,6 +2003,11 @@ int fcntl_setlk64(unsigned int fd, struc
if (file_lock == NULL)
return -ENOLCK;
@@ -4338,7 +4441,7 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2221,8 +2264,11 @@ static int locks_show(struct seq_file *f
+@@ -2230,8 +2273,11 @@ static int locks_show(struct seq_file *f
lock_get_status(f, fl, *((loff_t *)f->private), "");
@@ -4351,21 +4454,21 @@ diff -NurpP --minimal linux-3.6.10/fs/locks.c linux-3.6.10-vs2.3.4.6/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-3.6.10/fs/mount.h linux-3.6.10-vs2.3.4.6/fs/mount.h
---- linux-3.6.10/fs/mount.h 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/mount.h 2012-10-04 16:47:00.000000000 +0000
-@@ -46,6 +46,7 @@ struct mount {
+diff -NurpP --minimal linux-3.4.45/fs/mount.h linux-3.4.45-vs2.3.3.9/fs/mount.h
+--- linux-3.4.45/fs/mount.h 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/mount.h 2012-05-21 16:15:05.000000000 +0000
+@@ -47,6 +47,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
int mnt_pinned;
int mnt_ghosts;
+ tag_t mnt_tag; /* tagging used for vfsmount */
};
- #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
---- linux-3.6.10/fs/namei.c 2012-12-11 11:36:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/namei.c 2012-12-08 00:08:53.000000000 +0000
-@@ -34,6 +34,14 @@
+ static inline struct mount *real_mount(struct vfsmount *mnt)
+diff -NurpP --minimal linux-3.4.45/fs/namei.c linux-3.4.45-vs2.3.3.9/fs/namei.c
+--- linux-3.4.45/fs/namei.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/namei.c 2012-05-21 16:15:05.000000000 +0000
+@@ -33,6 +33,14 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
#include <linux/posix_acl.h>
@@ -4380,7 +4483,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
#include <asm/uaccess.h>
#include "internal.h"
-@@ -212,6 +220,89 @@ static int check_acl(struct inode *inode
+@@ -221,6 +229,89 @@ static int check_acl(struct inode *inode
return -EAGAIN;
}
@@ -4470,7 +4573,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
/*
* This does the basic permission checking
*/
-@@ -334,10 +425,14 @@ int __inode_permission(struct inode *ino
+@@ -356,10 +447,14 @@ int inode_permission(struct inode *inode
/*
* Nobody gets write access to an immutable file.
*/
@@ -4486,7 +4589,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -1189,7 +1284,8 @@ static void follow_dotdot(struct nameida
+@@ -1038,7 +1133,8 @@ static void follow_dotdot(struct nameida
if (nd->path.dentry == nd->root.dentry &&
nd->path.mnt == nd->root.mnt) {
@@ -4496,7 +4599,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
}
if (nd->path.dentry != nd->path.mnt->mnt_root) {
/* rare case of legitimate dget_parent()... */
-@@ -1338,6 +1434,9 @@ static int lookup_fast(struct nameidata
+@@ -1174,6 +1270,9 @@ static int do_lookup(struct nameidata *n
goto unlazy;
}
}
@@ -4506,16 +4609,17 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
path->mnt = mnt;
path->dentry = dentry;
if (unlikely(!__follow_mount_rcu(nd, path, inode)))
-@@ -1373,6 +1472,8 @@ unlazy:
+@@ -1208,6 +1307,9 @@ unlazy:
+ goto need_lookup;
}
}
-
++
+ /* FIXME: check dx permission */
+
+ done:
path->mnt = mnt;
path->dentry = dentry;
- err = follow_managed(path, nd->flags);
-@@ -2192,7 +2293,7 @@ static int may_delete(struct inode *dir,
+@@ -1981,7 +2083,7 @@ static int may_delete(struct inode *dir,
if (IS_APPEND(dir))
return -EPERM;
if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
@@ -4524,15 +4628,14 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
return -EPERM;
if (isdir) {
if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -2271,19 +2372,25 @@ int vfs_create(struct inode *dir, struct
- bool want_excl)
+@@ -2061,19 +2163,25 @@ int vfs_create(struct inode *dir, struct
{
int error = may_create(dir, dentry);
+
- if (error)
-- return error;
+ if (error) {
+ vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
-+ return error;
+ return error;
+ }
if (!dir->i_op->create)
@@ -4541,12 +4644,11 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
mode |= S_IFREG;
error = security_inode_create(dir, dentry, mode);
- if (error)
-- return error;
+ if (error) {
+ vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
-+ return error;
+ return error;
+ }
- error = dir->i_op->create(dir, dentry, mode, want_excl);
+ error = dir->i_op->create(dir, dentry, mode, nd);
if (!error)
fsnotify_create(dir, dentry);
+ else
@@ -4554,7 +4656,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
return error;
}
-@@ -2318,6 +2425,15 @@ static int may_open(struct path *path, i
+@@ -2108,6 +2216,15 @@ static int may_open(struct path *path, i
break;
}
@@ -4570,9 +4672,9 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -2820,6 +2936,16 @@ finish_open:
+@@ -2332,6 +2449,16 @@ ok:
}
- finish_open_created:
+ common:
error = may_open(&nd->path, acc_mode, open_flag);
+#ifdef CONFIG_VSERVER_COWBL
+ if (error == -EMLINK) {
@@ -4585,34 +4687,35 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ }
+#endif
if (error)
- goto out;
- file->f_path.mnt = nd->path.mnt;
-@@ -2884,6 +3010,7 @@ static struct file *path_openat(int dfd,
- int opened = 0;
+ goto exit;
+ filp = nameidata_to_filp(nd);
+@@ -2374,6 +2501,7 @@ static struct file *path_openat(int dfd,
+ struct path path;
int error;
+restart:
- file = get_empty_filp();
- if (!file)
+ filp = get_empty_filp();
+ if (!filp)
return ERR_PTR(-ENFILE);
-@@ -2920,6 +3047,16 @@ static struct file *path_openat(int dfd,
- error = do_last(nd, &path, file, op, &opened, pathname);
+@@ -2411,6 +2539,17 @@ static struct file *path_openat(int dfd,
+ filp = do_last(nd, &path, op, pathname);
put_link(nd, &link, cookie);
}
+
+#ifdef CONFIG_VSERVER_COWBL
-+ if (error == -EMLINK) {
++ if (filp == ERR_PTR(-EMLINK)) {
+ if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
+ path_put(&nd->root);
+ if (base)
+ fput(base);
++ release_open_intent(nd);
+ goto restart;
+ }
+#endif
out:
if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
path_put(&nd->root);
-@@ -3023,6 +3160,11 @@ struct dentry *kern_path_create(int dfd,
+@@ -2500,6 +2639,11 @@ struct dentry *kern_path_create(int dfd,
goto fail;
}
*path = nd.path;
@@ -4622,9 +4725,9 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ dentry->d_name.len, dentry->d_name.name,
+ path->dentry->d_inode);
return dentry;
- fail:
+ eexist:
dput(dentry);
-@@ -3489,7 +3631,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -2986,7 +3130,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
@@ -4633,7 +4736,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
return -EPERM;
if (!dir->i_op->link)
return -EPERM;
-@@ -3874,6 +4016,275 @@ int vfs_follow_link(struct nameidata *nd
+@@ -3375,6 +3519,253 @@ int vfs_follow_link(struct nameidata *nd
return __vfs_follow_link(nd, link);
}
@@ -4648,11 +4751,13 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ return do_splice_direct(in, &ppos, out, len, 0);
+}
+
++extern unsigned int mnt_get_count(struct mount *mnt);
++
+struct dentry *cow_break_link(const char *pathname)
+{
+ int ret, mode, pathlen, redo = 0;
+ struct nameidata old_nd, dir_nd;
-+ struct path dir_path, *old_path, *new_path;
++ struct path old_path, dir_path;
+ struct dentry *dir, *old_dentry, *new_dentry = NULL;
+ struct file *old_file;
+ struct file *new_file;
@@ -4661,26 +4766,24 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+
+ vxdprintk(VXD_CBIT(misc, 1),
+ "cow_break_link(" VS_Q("%s") ")", pathname);
-+
+ path = kmalloc(PATH_MAX, GFP_KERNEL);
+ ret = -ENOMEM;
+ if (!path)
+ goto out;
+
-+ /* old_nd.path will have refs to dentry and mnt */
++ /* old_nd will have refs to dentry and mnt */
+ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
+ vxdprintk(VXD_CBIT(misc, 2),
-+ "do_path_lookup(old): %d", ret);
++ "do_path_lookup(old): %d [r=%d]",
++ ret, mnt_get_count(real_mount(old_nd.path.mnt)));
+ if (ret < 0)
+ goto out_free_path;
+
-+ /* dentry/mnt refs handed over to old_path */
-+ old_path = &old_nd.path;
-+ /* no explicit reference for old_dentry here */
-+ old_dentry = old_path->dentry;
-+
++ old_path = old_nd.path;
++ old_dentry = old_path.dentry;
+ mode = old_dentry->d_inode->i_mode;
-+ to = d_path(old_path, path, PATH_MAX-2);
++
++ to = d_path(&old_path, path, PATH_MAX-2);
+ pathlen = strlen(to);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to,
@@ -4697,17 +4800,14 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ goto out_rel_old;
+
+ vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
-+
-+ /* dir_nd.path will have refs to dentry and mnt */
++ /* dir_nd will have refs to dentry and mnt */
+ ret = do_path_lookup(AT_FDCWD, to,
+ LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd);
+ vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret);
+ if (ret < 0)
+ goto retry;
+
-+ /* this puppy downs the dir inode mutex if successful.
-+ dir_path will hold refs to dentry and mnt and
-+ we'll have get write access to the mnt */
++ /* this puppy downs the dir inode mutex if successful */
+ new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0);
+ if (!new_dentry || IS_ERR(new_dentry)) {
+ path_put(&dir_nd.path);
@@ -4716,36 +4816,22 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ PTR_ERR(new_dentry));
+ goto retry;
+ }
++ path_put(&dir_path);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "kern_path_create(new): %p [" VS_Q("%.*s") ":%d]",
+ new_dentry,
+ new_dentry->d_name.len, new_dentry->d_name.name,
+ new_dentry->d_name.len);
+
-+ /* take a reference on new_dentry */
-+ dget(new_dentry);
-+
-+ /* dentry/mnt refs handed over to new_path */
-+ new_path = &dir_path;
-+
-+ /* dentry for old/new dir */
+ dir = dir_nd.path.dentry;
+
-+ /* give up reference on dir */
-+ dput(new_path->dentry);
-+
-+ /* new_dentry already has a reference */
-+ new_path->dentry = new_dentry;
-+
-+ ret = vfs_create(dir->d_inode, new_dentry, mode, 1);
++ ret = vfs_create(dir->d_inode, new_dentry, mode, &dir_nd);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "vfs_create(new): %d", ret);
+ if (ret == -EEXIST) {
+ mutex_unlock(&dir->d_inode->i_mutex);
+ path_put(&dir_nd.path);
-+ mnt_drop_write(new_path->mnt);
-+ path_put(new_path);
-+ new_dentry = NULL;
++ dput(new_dentry);
+ goto retry;
+ }
+ else if (ret < 0)
@@ -4756,8 +4842,10 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ if ((redo = d_unhashed(old_dentry)))
+ goto out_unlock_new;
+
-+ /* doesn't change refs for old_path */
-+ old_file = dentry_open(old_path, O_RDONLY, current_cred());
++ path_get(&old_path);
++ /* this one cleans up the dentry/mnt in case of failure */
++ old_file = dentry_open(old_dentry, old_path.mnt,
++ O_RDONLY, current_cred());
+ vxdprintk(VXD_CBIT(misc, 2),
+ "dentry_open(old): %p", old_file);
+ if (IS_ERR(old_file)) {
@@ -4765,8 +4853,11 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ goto out_unlock_new;
+ }
+
-+ /* doesn't change refs for new_path */
-+ new_file = dentry_open(new_path, O_WRONLY, current_cred());
++ dget(new_dentry);
++ mntget(old_path.mnt);
++ /* this one cleans up the dentry/mnt in case of failure */
++ new_file = dentry_open(new_dentry, old_path.mnt,
++ O_WRONLY, current_cred());
+ vxdprintk(VXD_CBIT(misc, 2),
+ "dentry_open(new): %p", new_file);
+ if (IS_ERR(new_file)) {
@@ -4795,7 +4886,6 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ mark_inode_dirty(new_inode);
+ }
+
-+ /* lock rename mutex */
+ mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
+
+ /* drop out late */
@@ -4829,13 +4919,6 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ fput(old_file);
+
+out_unlock_new:
-+ /* drop references from dir_nd.path */
-+ path_put(&dir_nd.path);
-+
-+ /* drop write access to mnt */
-+ mnt_drop_write(new_path->mnt);
-+
-+ /* unlock the inode mutex from kern_path_create() */
+ mutex_unlock(&dir->d_inode->i_mutex);
+ if (!ret)
+ goto out_redo;
@@ -4846,28 +4929,25 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+out_redo:
+ if (!redo)
+ goto out_rel_both;
-+
-+ /* lookup dentry once again
-+ old_nd.path will be freed as old_path in out_rel_old */
++ /* lookup dentry once again */
++ /* old_nd.path is freed as old_path in out_rel_old */
+ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
+ if (ret)
+ goto out_rel_both;
+
-+ /* drop reference on new_dentry */
+ dput(new_dentry);
-+ new_dentry = old_path->dentry;
-+ dget(new_dentry);
++ new_dentry = old_nd.path.dentry;
+ vxdprintk(VXD_CBIT(misc, 2),
+ "do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]",
+ new_dentry,
+ new_dentry->d_name.len, new_dentry->d_name.name,
+ new_dentry->d_name.len);
++ dget(new_dentry);
+
+out_rel_both:
-+ if (new_path)
-+ path_put(new_path);
++ path_put(&dir_nd.path);
+out_rel_old:
-+ path_put(old_path);
++ path_put(&old_path);
+out_free_path:
+ kfree(path);
+out:
@@ -4876,7 +4956,8 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
+ new_dentry = ERR_PTR(ret);
+ }
+ vxdprintk(VXD_CBIT(misc, 3),
-+ "cow_break_link returning with %p", new_dentry);
++ "cow_break_link returning with %p [r=%d]",
++ new_dentry, mnt_get_count(real_mount(old_nd.path.mnt)));
+ return new_dentry;
+}
+
@@ -4909,14 +4990,14 @@ diff -NurpP --minimal linux-3.6.10/fs/namei.c linux-3.6.10-vs2.3.4.6/fs/namei.c
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-@@ -3998,3 +4409,4 @@ EXPORT_SYMBOL(vfs_symlink);
+@@ -3499,3 +3890,4 @@ EXPORT_SYMBOL(vfs_symlink);
EXPORT_SYMBOL(vfs_unlink);
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
+EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/namespace.c
---- linux-3.6.10/fs/namespace.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/namespace.c 2012-12-08 00:10:23.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/namespace.c linux-3.4.45-vs2.3.3.9/fs/namespace.c
+--- linux-3.4.45/fs/namespace.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/namespace.c 2012-06-28 14:45:07.000000000 +0000
@@ -20,6 +20,11 @@
#include <linux/fs_struct.h> /* get_fs_root et.al. */
#include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */
@@ -4929,7 +5010,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
#include "pnode.h"
#include "internal.h"
-@@ -749,6 +754,10 @@ vfs_kern_mount(struct file_system_type *
+@@ -697,6 +702,10 @@ vfs_kern_mount(struct file_system_type *
if (!type)
return ERR_PTR(-ENODEV);
@@ -4940,15 +5021,15 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
mnt = alloc_vfsmnt(name);
if (!mnt)
return ERR_PTR(-ENOMEM);
-@@ -801,6 +810,7 @@ static struct mount *clone_mnt(struct mo
- mnt->mnt.mnt_root = dget(root);
- mnt->mnt_mountpoint = mnt->mnt.mnt_root;
- mnt->mnt_parent = mnt;
+@@ -745,6 +754,7 @@ static struct mount *clone_mnt(struct mo
+ mnt->mnt.mnt_root = dget(root);
+ mnt->mnt_mountpoint = mnt->mnt.mnt_root;
+ mnt->mnt_parent = mnt;
+ mnt->mnt_tag = old->mnt_tag;
- br_write_lock(&vfsmount_lock);
- list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
- br_write_unlock(&vfsmount_lock);
-@@ -1266,7 +1276,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
+ br_write_lock(vfsmount_lock);
+ list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
+ br_write_unlock(vfsmount_lock);
+@@ -1210,7 +1220,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
goto dput_and_out;
retval = -EPERM;
@@ -4957,7 +5038,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
goto dput_and_out;
retval = do_umount(mnt, flags);
-@@ -1292,7 +1302,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
+@@ -1236,7 +1246,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
static int mount_is_safe(struct path *path)
{
@@ -4966,7 +5047,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
return 0;
return -EPERM;
#ifdef notyet
-@@ -1610,7 +1620,7 @@ static int do_change_type(struct path *p
+@@ -1549,7 +1559,7 @@ static int do_change_type(struct path *p
int type;
int err = 0;
@@ -4975,15 +5056,15 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
return -EPERM;
if (path->dentry != path->mnt->mnt_root)
-@@ -1626,6 +1636,7 @@ static int do_change_type(struct path *p
+@@ -1565,6 +1575,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
+ // mnt->mnt_flags = mnt_flags;
- br_write_lock(&vfsmount_lock);
+ br_write_lock(vfsmount_lock);
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -1641,12 +1652,14 @@ static int do_change_type(struct path *p
+@@ -1580,12 +1591,14 @@ static int do_change_type(struct path *p
* do loopback mount.
*/
static int do_loopback(struct path *path, char *old_name,
@@ -4999,7 +5080,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
if (err)
return err;
if (!old_name || !*old_name)
-@@ -1715,13 +1728,13 @@ static int change_mount_flags(struct vfs
+@@ -1653,13 +1666,13 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
@@ -5015,7 +5096,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
return -EPERM;
if (!check_mnt(mnt))
-@@ -1770,7 +1783,7 @@ static int do_move_mount(struct path *pa
+@@ -1708,7 +1721,7 @@ static int do_move_mount(struct path *pa
struct mount *p;
struct mount *old;
int err = 0;
@@ -5024,7 +5105,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
return -EPERM;
if (!old_name || !*old_name)
return -EINVAL;
-@@ -1927,7 +1940,7 @@ static int do_new_mount(struct path *pat
+@@ -1859,7 +1872,7 @@ static int do_new_mount(struct path *pat
return -EINVAL;
/* we need capabilities... */
@@ -5033,7 +5114,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
return -EPERM;
mnt = do_kern_mount(type, flags, name, data);
-@@ -2197,6 +2210,7 @@ long do_mount(char *dev_name, char *dir_
+@@ -2129,6 +2142,7 @@ long do_mount(char *dev_name, char *dir_
struct path path;
int retval = 0;
int mnt_flags = 0;
@@ -5041,7 +5122,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2224,6 +2238,12 @@ long do_mount(char *dev_name, char *dir_
+@@ -2156,6 +2170,12 @@ long do_mount(char *dev_name, char *dir_
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
@@ -5054,7 +5135,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2240,15 +2260,17 @@ long do_mount(char *dev_name, char *dir_
+@@ -2172,15 +2192,17 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_RDONLY)
mnt_flags |= MNT_READONLY;
@@ -5074,7 +5155,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2329,6 +2351,7 @@ static struct mnt_namespace *dup_mnt_ns(
+@@ -2283,6 +2305,7 @@ static struct mnt_namespace *dup_mnt_ns(
q = next_mnt(q, new);
}
up_write(&namespace_sem);
@@ -5082,7 +5163,7 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
if (rootmnt)
mntput(rootmnt);
-@@ -2524,9 +2547,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2479,9 +2502,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
error = -EINVAL;
new_mnt = real_mount(new.mnt);
root_mnt = real_mount(root.mnt);
@@ -5095,18 +5176,18 @@ diff -NurpP --minimal linux-3.6.10/fs/namespace.c linux-3.6.10-vs2.3.4.6/fs/name
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -2647,6 +2671,7 @@ void put_mnt_ns(struct mnt_namespace *ns
- br_write_unlock(&vfsmount_lock);
+@@ -2602,6 +2626,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+ br_write_unlock(vfsmount_lock);
up_write(&namespace_sem);
release_mounts(&umount_list);
+ atomic_dec(&vs_global_mnt_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-3.6.10/fs/nfs/client.c linux-3.6.10-vs2.3.4.6/fs/nfs/client.c
---- linux-3.6.10/fs/nfs/client.c 2012-12-11 11:36:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfs/client.c 2012-11-06 17:43:41.000000000 +0000
-@@ -692,6 +692,9 @@ int nfs_init_server_rpcclient(struct nfs
+diff -NurpP --minimal linux-3.4.45/fs/nfs/client.c linux-3.4.45-vs2.3.3.9/fs/nfs/client.c
+--- linux-3.4.45/fs/nfs/client.c 2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/client.c 2013-01-16 00:15:57.000000000 +0000
+@@ -801,6 +801,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -5115,8 +5196,8 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/client.c linux-3.6.10-vs2.3.4.6/fs/nfs
+ server->client->cl_tag = 1;
return 0;
}
- EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
-@@ -869,6 +872,10 @@ static void nfs_server_set_fsinfo(struct
+
+@@ -976,6 +979,10 @@ static void nfs_server_set_fsinfo(struct
server->acdirmin = server->acdirmax = 0;
}
@@ -5127,10 +5208,10 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/client.c linux-3.6.10-vs2.3.4.6/fs/nfs
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.6.10/fs/nfs/dir.c linux-3.6.10-vs2.3.4.6/fs/nfs/dir.c
---- linux-3.6.10/fs/nfs/dir.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfs/dir.c 2012-10-04 16:47:00.000000000 +0000
-@@ -36,6 +36,7 @@
+diff -NurpP --minimal linux-3.4.45/fs/nfs/dir.c linux-3.4.45-vs2.3.3.9/fs/nfs/dir.c
+--- linux-3.4.45/fs/nfs/dir.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/dir.c 2013-01-16 00:15:57.000000000 +0000
+@@ -35,6 +35,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
#include <linux/xattr.h>
@@ -5138,18 +5219,18 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/dir.c linux-3.6.10-vs2.3.4.6/fs/nfs/di
#include "delegation.h"
#include "iostat.h"
-@@ -1251,6 +1252,7 @@ struct dentry *nfs_lookup(struct inode *
- /* Success: notify readdir to use READDIRPLUS */
- nfs_advise_use_readdirplus(dir);
+@@ -1314,6 +1315,7 @@ static struct dentry *nfs_lookup(struct
+ if (IS_ERR(res))
+ goto out_unblock_sillyrename;
+ dx_propagate_tag(nd, inode);
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/inode.c
---- linux-3.6.10/fs/nfs/inode.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfs/inode.c 2012-10-04 16:47:00.000000000 +0000
-@@ -39,6 +39,7 @@
+diff -NurpP --minimal linux-3.4.45/fs/nfs/inode.c linux-3.4.45-vs2.3.3.9/fs/nfs/inode.c
+--- linux-3.4.45/fs/nfs/inode.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/inode.c 2012-10-22 13:09:53.000000000 +0000
+@@ -40,6 +40,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
#include <linux/crc32.h>
@@ -5157,7 +5238,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
#include <asm/uaccess.h>
-@@ -279,6 +280,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -275,6 +276,8 @@ nfs_fhget(struct super_block *sb, struct
if (inode->i_state & I_NEW) {
struct nfs_inode *nfsi = NFS_I(inode);
unsigned long now = jiffies;
@@ -5176,22 +5257,24 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
+ gid = -2;
inode->i_blocks = 0;
memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
- nfsi->write_io = 0;
-@@ -358,11 +361,11 @@ nfs_fhget(struct super_block *sb, struct
+
+@@ -361,13 +364,13 @@ nfs_fhget(struct super_block *sb, struct
else if (nfs_server_capable(inode, NFS_CAP_NLINK))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
if (fattr->valid & NFS_ATTR_FATTR_OWNER)
- inode->i_uid = fattr->uid;
+ uid = fattr->uid;
else if (nfs_server_capable(inode, NFS_CAP_OWNER))
- nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ nfsi->cache_validity |= NFS_INO_INVALID_ATTR
+ | NFS_INO_INVALID_ACCESS
+ | NFS_INO_INVALID_ACL;
if (fattr->valid & NFS_ATTR_FATTR_GROUP)
- inode->i_gid = fattr->gid;
+ gid = fattr->gid;
else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
- nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
- if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
-@@ -373,6 +376,11 @@ nfs_fhget(struct super_block *sb, struct
+ nfsi->cache_validity |= NFS_INO_INVALID_ATTR
+ | NFS_INO_INVALID_ACCESS
+@@ -380,6 +383,11 @@ nfs_fhget(struct super_block *sb, struct
*/
inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
}
@@ -5203,7 +5286,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
nfsi->attrtimeo_timestamp = now;
nfsi->access_cache = RB_ROOT;
-@@ -494,6 +502,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -497,6 +505,8 @@ void nfs_setattr_update_inode(struct ino
inode->i_uid = attr->ia_uid;
if ((attr->ia_valid & ATTR_GID) != 0)
inode->i_gid = attr->ia_gid;
@@ -5212,7 +5295,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
spin_unlock(&inode->i_lock);
}
-@@ -965,6 +975,9 @@ static int nfs_check_inode_attributes(st
+@@ -946,6 +956,9 @@ static int nfs_check_inode_attributes(st
struct nfs_inode *nfsi = NFS_I(inode);
loff_t cur_size, new_isize;
unsigned long invalid = 0;
@@ -5221,8 +5304,8 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
+ tag_t tag;
- if (nfs_have_delegated_attributes(inode))
-@@ -990,13 +1003,18 @@ static int nfs_check_inode_attributes(st
+ /* Has the inode gone and changed behind our back? */
+@@ -969,13 +982,18 @@ static int nfs_check_inode_attributes(st
invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
}
@@ -5243,7 +5326,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1300,6 +1318,9 @@ static int nfs_update_inode(struct inode
+@@ -1273,6 +1291,9 @@ static int nfs_update_inode(struct inode
unsigned long invalid = 0;
unsigned long now = jiffies;
unsigned long save_cache_validity;
@@ -5253,7 +5336,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1401,6 +1422,9 @@ static int nfs_update_inode(struct inode
+@@ -1381,6 +1402,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_PAGECACHE
| NFS_INO_REVAL_FORCED);
@@ -5263,7 +5346,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1422,9 +1446,9 @@ static int nfs_update_inode(struct inode
+@@ -1402,9 +1426,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
@@ -5275,7 +5358,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
}
} else if (server->caps & NFS_CAP_OWNER)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1433,9 +1457,9 @@ static int nfs_update_inode(struct inode
+@@ -1413,9 +1437,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
@@ -5287,7 +5370,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
}
} else if (server->caps & NFS_CAP_OWNER_GROUP)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1443,6 +1467,10 @@ static int nfs_update_inode(struct inode
+@@ -1423,6 +1447,10 @@ static int nfs_update_inode(struct inode
| NFS_INO_INVALID_ACL
| NFS_INO_REVAL_FORCED);
@@ -5298,9 +5381,9 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/inode.c linux-3.6.10-vs2.3.4.6/fs/nfs/
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nfs/nfs3xdr.c
---- linux-3.6.10/fs/nfs/nfs3xdr.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfs/nfs3xdr.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/nfs/nfs3xdr.c linux-3.4.45-vs2.3.3.9/fs/nfs/nfs3xdr.c
+--- linux-3.4.45/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5309,7 +5392,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
#include "internal.h"
#define NFSDBG_FACILITY NFSDBG_XDR
-@@ -560,7 +561,8 @@ static __be32 *xdr_decode_nfstime3(__be3
+@@ -562,7 +563,8 @@ static __be32 *xdr_decode_nfstime3(__be3
* set_mtime mtime;
* };
*/
@@ -5319,7 +5402,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
{
u32 nbytes;
__be32 *p;
-@@ -592,15 +594,19 @@ static void encode_sattr3(struct xdr_str
+@@ -594,15 +596,19 @@ static void encode_sattr3(struct xdr_str
} else
*p++ = xdr_zero;
@@ -5343,7 +5426,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
} else
*p++ = xdr_zero;
-@@ -879,7 +885,7 @@ static void nfs3_xdr_enc_setattr3args(st
+@@ -878,7 +884,7 @@ static void nfs3_xdr_enc_setattr3args(st
const struct nfs3_sattrargs *args)
{
encode_nfs_fh3(xdr, args->fh);
@@ -5352,7 +5435,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
encode_sattrguard3(xdr, args);
}
-@@ -1029,13 +1035,13 @@ static void nfs3_xdr_enc_write3args(stru
+@@ -1028,13 +1034,13 @@ static void nfs3_xdr_enc_write3args(stru
* };
*/
static void encode_createhow3(struct xdr_stream *xdr,
@@ -5368,7 +5451,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
break;
case NFS3_CREATE_EXCLUSIVE:
encode_createverf3(xdr, args->verifier);
-@@ -1050,7 +1056,7 @@ static void nfs3_xdr_enc_create3args(str
+@@ -1049,7 +1055,7 @@ static void nfs3_xdr_enc_create3args(str
const struct nfs3_createargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5377,7 +5460,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
}
/*
-@@ -1066,7 +1072,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1065,7 +1071,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
const struct nfs3_mkdirargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5386,7 +5469,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
}
/*
-@@ -1083,9 +1089,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1082,9 +1088,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
* };
*/
static void encode_symlinkdata3(struct xdr_stream *xdr,
@@ -5398,7 +5481,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
encode_nfspath3(xdr, args->pages, args->pathlen);
}
-@@ -1094,7 +1100,7 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1093,7 +1099,7 @@ static void nfs3_xdr_enc_symlink3args(st
const struct nfs3_symlinkargs *args)
{
encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
@@ -5407,7 +5490,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
}
/*
-@@ -1122,24 +1128,24 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1121,24 +1127,24 @@ static void nfs3_xdr_enc_symlink3args(st
* };
*/
static void encode_devicedata3(struct xdr_stream *xdr,
@@ -5437,7 +5520,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
break;
case NF3REG:
case NF3DIR:
-@@ -1154,7 +1160,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+@@ -1153,7 +1159,7 @@ static void nfs3_xdr_enc_mknod3args(stru
const struct nfs3_mknodargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5446,9 +5529,9 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nf
}
/*
-diff -NurpP --minimal linux-3.6.10/fs/nfs/super.c linux-3.6.10-vs2.3.4.6/fs/nfs/super.c
---- linux-3.6.10/fs/nfs/super.c 2012-12-11 11:36:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfs/super.c 2012-12-08 00:36:33.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/nfs/super.c linux-3.4.45-vs2.3.3.9/fs/nfs/super.c
+--- linux-3.4.45/fs/nfs/super.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/super.c 2013-01-16 00:15:57.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -5457,7 +5540,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/super.c linux-3.6.10-vs2.3.4.6/fs/nfs/
#include <asm/uaccess.h>
-@@ -88,6 +89,7 @@ enum {
+@@ -86,6 +87,7 @@ enum {
Opt_sharecache, Opt_nosharecache,
Opt_resvport, Opt_noresvport,
Opt_fscache, Opt_nofscache,
@@ -5465,7 +5548,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/super.c linux-3.6.10-vs2.3.4.6/fs/nfs/
/* Mount options that take integer arguments */
Opt_port,
-@@ -100,6 +102,7 @@ enum {
+@@ -98,6 +100,7 @@ enum {
Opt_mountport,
Opt_mountvers,
Opt_minorversion,
@@ -5473,7 +5556,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/super.c linux-3.6.10-vs2.3.4.6/fs/nfs/
/* Mount options that take string arguments */
Opt_nfsvers,
-@@ -182,6 +185,10 @@ static const match_table_t nfs_mount_opt
+@@ -180,6 +183,10 @@ static const match_table_t nfs_mount_opt
/* The following needs to be listed after all other options */
{ Opt_nfsvers, "v%s" },
@@ -5484,7 +5567,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/super.c linux-3.6.10-vs2.3.4.6/fs/nfs/
{ Opt_err, NULL }
};
-@@ -626,6 +633,7 @@ static void nfs_show_mount_options(struc
+@@ -674,6 +681,7 @@ static void nfs_show_mount_options(struc
{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
@@ -5492,7 +5575,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/super.c linux-3.6.10-vs2.3.4.6/fs/nfs/
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-@@ -1243,6 +1251,14 @@ static int nfs_parse_mount_options(char
+@@ -1286,6 +1294,14 @@ static int nfs_parse_mount_options(char
kfree(mnt->fscache_uniq);
mnt->fscache_uniq = NULL;
break;
@@ -5507,7 +5590,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/super.c linux-3.6.10-vs2.3.4.6/fs/nfs/
/*
* options that take numeric values
-@@ -1329,6 +1345,12 @@ static int nfs_parse_mount_options(char
+@@ -1372,6 +1388,12 @@ static int nfs_parse_mount_options(char
goto out_invalid_value;
mnt->minorversion = option;
break;
@@ -5520,18 +5603,18 @@ diff -NurpP --minimal linux-3.6.10/fs/nfs/super.c linux-3.6.10-vs2.3.4.6/fs/nfs/
/*
* options that take text values
-diff -NurpP --minimal linux-3.6.10/fs/nfsd/auth.c linux-3.6.10-vs2.3.4.6/fs/nfsd/auth.c
---- linux-3.6.10/fs/nfsd/auth.c 2012-07-22 21:39:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfsd/auth.c 2012-10-04 16:47:00.000000000 +0000
-@@ -2,6 +2,7 @@
+diff -NurpP --minimal linux-3.4.45/fs/nfsd/auth.c linux-3.4.45-vs2.3.3.9/fs/nfsd/auth.c
+--- linux-3.4.45/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfsd/auth.c 2012-05-21 16:15:05.000000000 +0000
+@@ -1,6 +1,7 @@
+ /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
#include <linux/sched.h>
- #include <linux/user_namespace.h>
+#include <linux/vs_tag.h>
#include "nfsd.h"
#include "auth.h"
-@@ -37,6 +38,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+@@ -36,6 +37,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
new->fsuid = rqstp->rq_cred.cr_uid;
new->fsgid = rqstp->rq_cred.cr_gid;
@@ -5541,9 +5624,9 @@ diff -NurpP --minimal linux-3.6.10/fs/nfsd/auth.c linux-3.6.10-vs2.3.4.6/fs/nfsd
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.6.10/fs/nfsd/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/nfsd/nfs3xdr.c
---- linux-3.6.10/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfsd/nfs3xdr.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfs3xdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs3xdr.c
+--- linux-3.4.45/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000
@@ -7,6 +7,7 @@
*/
@@ -5594,9 +5677,9 @@ diff -NurpP --minimal linux-3.6.10/fs/nfsd/nfs3xdr.c linux-3.6.10-vs2.3.4.6/fs/n
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.6.10/fs/nfsd/nfs4xdr.c linux-3.6.10-vs2.3.4.6/fs/nfsd/nfs4xdr.c
---- linux-3.6.10/fs/nfsd/nfs4xdr.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfsd/nfs4xdr.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfs4xdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs4xdr.c
+--- linux-3.4.45/fs/nfsd/nfs4xdr.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2013-05-13 18:16:08.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5605,7 +5688,7 @@ diff -NurpP --minimal linux-3.6.10/fs/nfsd/nfs4xdr.c linux-3.6.10-vs2.3.4.6/fs/n
#include "idmap.h"
#include "acl.h"
-@@ -2351,14 +2352,18 @@ out_acl:
+@@ -2319,14 +2320,18 @@ out_acl:
WRITE32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
@@ -5626,9 +5709,9 @@ diff -NurpP --minimal linux-3.6.10/fs/nfsd/nfs4xdr.c linux-3.6.10-vs2.3.4.6/fs/n
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.6.10/fs/nfsd/nfsxdr.c linux-3.6.10-vs2.3.4.6/fs/nfsd/nfsxdr.c
---- linux-3.6.10/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/nfsd/nfsxdr.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfsxdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfsxdr.c
+--- linux-3.4.45/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 16:15:05.000000000 +0000
@@ -6,6 +6,7 @@
#include "xdr.h"
@@ -5677,9 +5760,9 @@ diff -NurpP --minimal linux-3.6.10/fs/nfsd/nfsxdr.c linux-3.6.10-vs2.3.4.6/fs/nf
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/dlmglue.c linux-3.6.10-vs2.3.4.6/fs/ocfs2/dlmglue.c
---- linux-3.6.10/fs/ocfs2/dlmglue.c 2012-07-22 21:39:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/dlmglue.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/dlmglue.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.c
+--- linux-3.4.45/fs/ocfs2/dlmglue.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.c 2013-03-02 15:26:44.000000000 +0000
@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
@@ -5696,9 +5779,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/dlmglue.c linux-3.6.10-vs2.3.4.6/fs/
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/dlmglue.h linux-3.6.10-vs2.3.4.6/fs/ocfs2/dlmglue.h
---- linux-3.6.10/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/dlmglue.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/dlmglue.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.h
+--- linux-3.4.45/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.h 2012-05-21 16:15:05.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5709,9 +5792,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/dlmglue.h linux-3.6.10-vs2.3.4.6/fs/
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/file.c linux-3.6.10-vs2.3.4.6/fs/ocfs2/file.c
---- linux-3.6.10/fs/ocfs2/file.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/file.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/file.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/file.c
+--- linux-3.4.45/fs/ocfs2/file.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/file.c 2012-07-17 22:29:43.000000000 +0000
@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5721,9 +5804,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/file.c linux-3.6.10-vs2.3.4.6/fs/ocf
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/inode.c linux-3.6.10-vs2.3.4.6/fs/ocfs2/inode.c
---- linux-3.6.10/fs/ocfs2/inode.c 2012-07-22 21:39:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/inode.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/inode.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.c
+--- linux-3.4.45/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5819,10 +5902,10 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/inode.c linux-3.6.10-vs2.3.4.6/fs/oc
+ /* le16_to_cpu(raw_inode->i_raw_tag)i */ 0);
/* Fast symlinks will have i_size but no allocated clusters. */
- if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/inode.h linux-3.6.10-vs2.3.4.6/fs/ocfs2/inode.h
---- linux-3.6.10/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/inode.h 2012-10-04 16:47:00.000000000 +0000
+ if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/inode.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.h
+--- linux-3.4.45/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.h 2012-05-21 16:15:05.000000000 +0000
@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -5831,9 +5914,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/inode.h linux-3.6.10-vs2.3.4.6/fs/oc
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/ioctl.c linux-3.6.10-vs2.3.4.6/fs/ocfs2/ioctl.c
---- linux-3.6.10/fs/ocfs2/ioctl.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/ioctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/ioctl.c
+--- linux-3.4.45/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5897,9 +5980,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/ioctl.c linux-3.6.10-vs2.3.4.6/fs/oc
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/namei.c linux-3.6.10-vs2.3.4.6/fs/ocfs2/namei.c
---- linux-3.6.10/fs/ocfs2/namei.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/namei.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/namei.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/namei.c
+--- linux-3.4.45/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5930,9 +6013,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/namei.c linux-3.6.10-vs2.3.4.6/fs/oc
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/ocfs2.h linux-3.6.10-vs2.3.4.6/fs/ocfs2/ocfs2.h
---- linux-3.6.10/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/ocfs2.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ocfs2.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2.h
+--- linux-3.4.45/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2.h 2012-05-21 16:15:05.000000000 +0000
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -5941,9 +6024,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/ocfs2.h linux-3.6.10-vs2.3.4.6/fs/oc
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/ocfs2_fs.h linux-3.6.10-vs2.3.4.6/fs/ocfs2/ocfs2_fs.h
---- linux-3.6.10/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/ocfs2_fs.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ocfs2_fs.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h
+--- linux-3.4.45/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h 2012-05-21 16:15:05.000000000 +0000
@@ -266,6 +266,11 @@
#define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
#define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
@@ -5956,9 +6039,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/ocfs2_fs.h linux-3.6.10-vs2.3.4.6/fs
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -NurpP --minimal linux-3.6.10/fs/ocfs2/super.c linux-3.6.10-vs2.3.4.6/fs/ocfs2/super.c
---- linux-3.6.10/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/ocfs2/super.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/super.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/super.c
+--- linux-3.4.45/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/super.c 2012-05-21 16:15:05.000000000 +0000
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
@@ -6022,9 +6105,9 @@ diff -NurpP --minimal linux-3.6.10/fs/ocfs2/super.c linux-3.6.10-vs2.3.4.6/fs/oc
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.6.10/fs/open.c linux-3.6.10-vs2.3.4.6/fs/open.c
---- linux-3.6.10/fs/open.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/open.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/open.c linux-3.4.45-vs2.3.3.9/fs/open.c
+--- linux-3.4.45/fs/open.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/open.c 2012-09-16 18:49:11.000000000 +0000
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
@@ -6050,7 +6133,7 @@ diff -NurpP --minimal linux-3.6.10/fs/open.c linux-3.6.10-vs2.3.4.6/fs/open.c
inode = path.dentry->d_inode;
/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
-@@ -495,6 +506,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -489,6 +500,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
if (!error) {
@@ -6061,23 +6144,21 @@ diff -NurpP --minimal linux-3.6.10/fs/open.c linux-3.6.10-vs2.3.4.6/fs/open.c
error = chmod_common(&path, mode);
path_put(&path);
}
-@@ -522,13 +537,13 @@ static int chown_common(struct path *pat
- if (!uid_valid(uid))
- return -EINVAL;
+@@ -509,11 +524,11 @@ static int chown_common(struct path *pat
+ newattrs.ia_valid = ATTR_CTIME;
+ if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
-- newattrs.ia_uid = uid;
+- newattrs.ia_uid = user;
+ newattrs.ia_uid = dx_map_uid(user);
}
if (group != (gid_t) -1) {
- if (!gid_valid(gid))
- return -EINVAL;
newattrs.ia_valid |= ATTR_GID;
-- newattrs.ia_gid = gid;
+- newattrs.ia_gid = group;
+ newattrs.ia_gid = dx_map_gid(group);
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |=
-@@ -561,6 +576,18 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
+@@ -538,6 +553,10 @@ SYSCALL_DEFINE3(chown, const char __user
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
@@ -6085,10 +6166,24 @@ diff -NurpP --minimal linux-3.6.10/fs/open.c linux-3.6.10-vs2.3.4.6/fs/open.c
+ error = cow_check_and_break(&path);
+ if (!error)
+#endif
+ error = chown_common(&path, user, group);
+ mnt_drop_write(path.mnt);
+ out_release:
+@@ -565,6 +584,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
+ error = mnt_want_write(path.mnt);
+ if (error)
+ goto out_release;
+#ifdef CONFIG_VSERVER_COWBL
+ error = cow_check_and_break(&path);
+ if (!error)
+#endif
+ error = chown_common(&path, user, group);
+ mnt_drop_write(path.mnt);
+ out_release:
+@@ -584,6 +607,10 @@ SYSCALL_DEFINE3(lchown, const char __use
+ error = mnt_want_write(path.mnt);
+ if (error)
+ goto out_release;
+#ifdef CONFIG_VSERVER_COWBL
+ error = cow_check_and_break(&path);
+ if (!error)
@@ -6096,7 +6191,7 @@ diff -NurpP --minimal linux-3.6.10/fs/open.c linux-3.6.10-vs2.3.4.6/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-@@ -809,6 +836,7 @@ static void __put_unused_fd(struct files
+@@ -839,6 +866,7 @@ static void __put_unused_fd(struct files
__clear_open_fd(fd, fdt);
if (fd < files->next_fd)
files->next_fd = fd;
@@ -6104,19 +6199,19 @@ diff -NurpP --minimal linux-3.6.10/fs/open.c linux-3.6.10-vs2.3.4.6/fs/open.c
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.6.10/fs/proc/array.c linux-3.6.10-vs2.3.4.6/fs/proc/array.c
---- linux-3.6.10/fs/proc/array.c 2012-07-22 21:39:42.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/array.c 2012-10-04 16:47:00.000000000 +0000
-@@ -82,6 +82,8 @@
+diff -NurpP --minimal linux-3.4.45/fs/proc/array.c linux-3.4.45-vs2.3.3.9/fs/proc/array.c
+--- linux-3.4.45/fs/proc/array.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/array.c 2012-05-21 16:15:05.000000000 +0000
+@@ -81,6 +81,8 @@
+ #include <linux/pid_namespace.h>
#include <linux/ptrace.h>
#include <linux/tracehook.h>
- #include <linux/user_namespace.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -172,6 +174,9 @@ static inline void task_state(struct seq
+@@ -170,6 +172,9 @@ static inline void task_state(struct seq
rcu_read_lock();
ppid = pid_alive(p) ?
task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
@@ -6126,7 +6221,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/array.c linux-3.6.10-vs2.3.4.6/fs/pro
tpid = 0;
if (pid_alive(p)) {
struct task_struct *tracer = ptrace_parent(p);
-@@ -296,7 +301,7 @@ static inline void task_sig(struct seq_f
+@@ -287,7 +292,7 @@ static inline void task_sig(struct seq_f
}
static void render_cap_t(struct seq_file *m, const char *header,
@@ -6135,7 +6230,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/array.c linux-3.6.10-vs2.3.4.6/fs/pro
{
unsigned __capi;
-@@ -321,10 +326,11 @@ static inline void task_cap(struct seq_f
+@@ -312,10 +317,11 @@ static inline void task_cap(struct seq_f
cap_bset = cred->cap_bset;
rcu_read_unlock();
@@ -6151,7 +6246,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/array.c linux-3.6.10-vs2.3.4.6/fs/pro
}
static inline void task_context_switch_counts(struct seq_file *m,
-@@ -346,6 +352,42 @@ static void task_cpus_allowed(struct seq
+@@ -337,6 +343,42 @@ static void task_cpus_allowed(struct seq
seq_putc(m, '\n');
}
@@ -6194,7 +6289,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/array.c linux-3.6.10-vs2.3.4.6/fs/pro
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -362,6 +404,7 @@ int proc_pid_status(struct seq_file *m,
+@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m,
task_cap(m, task);
task_cpus_allowed(m, task);
cpuset_task_status_allowed(m, task);
@@ -6202,7 +6297,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/array.c linux-3.6.10-vs2.3.4.6/fs/pro
task_context_switch_counts(m, task);
return 0;
}
-@@ -471,6 +514,17 @@ static int do_task_stat(struct seq_file
+@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(start_time);
@@ -6220,10 +6315,10 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/array.c linux-3.6.10-vs2.3.4.6/fs/pro
seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
seq_put_decimal_ll(m, ' ', ppid);
seq_put_decimal_ll(m, ' ', pgid);
-diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc/base.c
---- linux-3.6.10/fs/proc/base.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/base.c 2012-10-04 16:47:00.000000000 +0000
-@@ -85,6 +85,8 @@
+diff -NurpP --minimal linux-3.4.45/fs/proc/base.c linux-3.4.45-vs2.3.3.9/fs/proc/base.c
+--- linux-3.4.45/fs/proc/base.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/base.c 2012-06-28 14:45:07.000000000 +0000
+@@ -84,6 +84,8 @@
#include <linux/fs_struct.h>
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -6232,7 +6327,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
#ifdef CONFIG_HARDWALL
#include <asm/hardwall.h>
#endif
-@@ -941,11 +943,16 @@ static ssize_t oom_adjust_write(struct f
+@@ -937,11 +939,16 @@ static ssize_t oom_adjust_write(struct f
goto err_task_lock;
}
@@ -6250,7 +6345,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
/*
* Warn that /proc/pid/oom_adj is deprecated, see
* Documentation/feature-removal-schedule.txt.
-@@ -1548,6 +1555,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1541,6 +1548,8 @@ struct inode *proc_pid_make_inode(struct
inode->i_gid = cred->egid;
rcu_read_unlock();
}
@@ -6259,7 +6354,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
security_task_to_inode(task, inode);
out:
-@@ -1593,6 +1602,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1586,6 +1595,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
@@ -6268,7 +6363,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1621,6 +1632,12 @@ int pid_revalidate(struct dentry *dentry
+@@ -1614,6 +1625,12 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
@@ -6281,7 +6376,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -1637,6 +1654,7 @@ int pid_revalidate(struct dentry *dentry
+@@ -1630,6 +1647,7 @@ int pid_revalidate(struct dentry *dentry
put_task_struct(task);
return 1;
}
@@ -6289,7 +6384,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
d_drop(dentry);
return 0;
}
-@@ -2457,6 +2475,13 @@ static struct dentry *proc_pident_lookup
+@@ -2452,6 +2470,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -6303,7 +6398,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2842,7 +2867,7 @@ out_iput:
+@@ -2837,7 +2862,7 @@ out_iput:
static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
{
struct dentry *error;
@@ -6312,7 +6407,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
const struct pid_entry *p, *last;
error = ERR_PTR(-ENOENT);
-@@ -3017,6 +3042,9 @@ static int proc_pid_personality(struct s
+@@ -2944,6 +2969,9 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
@@ -6322,7 +6417,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -3083,6 +3111,8 @@ static const struct pid_entry tgid_base_
+@@ -3010,6 +3038,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
REG("cgroup", S_IRUGO, proc_cgroup_operations),
#endif
@@ -6331,15 +6426,15 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
INF("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -3106,6 +3136,7 @@ static const struct pid_entry tgid_base_
- REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
- REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
+@@ -3029,6 +3059,7 @@ static const struct pid_entry tgid_base_
+ #ifdef CONFIG_HARDWALL
+ INF("hardwall", S_IRUGO, proc_pid_hardwall),
#endif
+ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy),
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -3300,7 +3331,7 @@ retry:
+@@ -3222,7 +3253,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
@@ -6348,7 +6443,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -3330,7 +3361,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -3252,7 +3283,7 @@ static int proc_pid_fill_cache(struct fi
struct tgid_iter iter)
{
char name[PROC_NUMBUF];
@@ -6357,7 +6452,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
return proc_fill_cache(filp, dirent, filldir, name, len,
proc_pid_instantiate, iter.task, NULL);
}
-@@ -3354,7 +3385,7 @@ int proc_pid_readdir(struct file * filp,
+@@ -3276,7 +3307,7 @@ int proc_pid_readdir(struct file * filp,
goto out_no_task;
nr = filp->f_pos - FIRST_PROCESS_ENTRY;
@@ -6366,7 +6461,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
if (!reaper)
goto out_no_task;
-@@ -3376,6 +3407,8 @@ int proc_pid_readdir(struct file * filp,
+@@ -3298,6 +3329,8 @@ int proc_pid_readdir(struct file * filp,
__filldir = fake_filldir;
filp->f_pos = iter.tgid + TGID_OFFSET;
@@ -6375,7 +6470,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
put_task_struct(iter.task);
goto out;
-@@ -3537,6 +3570,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3451,6 +3484,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
@@ -6384,9 +6479,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/base.c linux-3.6.10-vs2.3.4.6/fs/proc
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.6.10/fs/proc/generic.c linux-3.6.10-vs2.3.4.6/fs/proc/generic.c
---- linux-3.6.10/fs/proc/generic.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/generic.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc/generic.c linux-3.4.45-vs2.3.3.9/fs/proc/generic.c
+--- linux-3.4.45/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/generic.c 2012-05-21 16:15:05.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6446,9 +6541,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/generic.c linux-3.6.10-vs2.3.4.6/fs/p
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.6.10/fs/proc/inode.c linux-3.6.10-vs2.3.4.6/fs/proc/inode.c
---- linux-3.6.10/fs/proc/inode.c 2012-07-22 21:39:42.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/inode.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc/inode.c linux-3.4.45-vs2.3.3.9/fs/proc/inode.c
+--- linux-3.4.45/fs/proc/inode.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6458,9 +6553,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/inode.c linux-3.6.10-vs2.3.4.6/fs/pro
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.6.10/fs/proc/internal.h linux-3.6.10-vs2.3.4.6/fs/proc/internal.h
---- linux-3.6.10/fs/proc/internal.h 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/internal.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc/internal.h linux-3.4.45-vs2.3.3.9/fs/proc/internal.h
+--- linux-3.4.45/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/internal.h 2012-05-21 16:15:05.000000000 +0000
@@ -10,6 +10,8 @@
*/
@@ -6470,7 +6565,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/internal.h linux-3.6.10-vs2.3.4.6/fs/
struct ctl_table_header;
extern struct proc_dir_entry proc_root;
-@@ -52,6 +54,9 @@ extern int proc_pid_status(struct seq_fi
+@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_fi
struct pid *pid, struct task_struct *task);
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task);
@@ -6479,8 +6574,8 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/internal.h linux-3.6.10-vs2.3.4.6/fs/
+
extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
- extern const struct file_operations proc_tid_children_operations;
-@@ -81,11 +86,16 @@ static inline struct pid *proc_pid(struc
+ extern const struct file_operations proc_pid_maps_operations;
+@@ -82,11 +87,16 @@ static inline struct pid *proc_pid(struc
return PROC_I(inode)->pid;
}
@@ -6498,9 +6593,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/internal.h linux-3.6.10-vs2.3.4.6/fs/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.6.10/fs/proc/loadavg.c linux-3.6.10-vs2.3.4.6/fs/proc/loadavg.c
---- linux-3.6.10/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/loadavg.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc/loadavg.c linux-3.4.45-vs2.3.3.9/fs/proc/loadavg.c
+--- linux-3.4.45/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/loadavg.c 2012-05-21 16:15:05.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6530,9 +6625,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/loadavg.c linux-3.6.10-vs2.3.4.6/fs/p
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.6.10/fs/proc/meminfo.c linux-3.6.10-vs2.3.4.6/fs/proc/meminfo.c
---- linux-3.6.10/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/meminfo.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc/meminfo.c linux-3.4.45-vs2.3.3.9/fs/proc/meminfo.c
+--- linux-3.4.45/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/meminfo.c 2012-05-21 16:15:05.000000000 +0000
@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -6543,9 +6638,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/meminfo.c linux-3.6.10-vs2.3.4.6/fs/p
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.6.10/fs/proc/root.c linux-3.6.10-vs2.3.4.6/fs/proc/root.c
---- linux-3.6.10/fs/proc/root.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/root.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc/root.c linux-3.4.45-vs2.3.3.9/fs/proc/root.c
+--- linux-3.4.45/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/root.c 2012-05-21 16:15:05.000000000 +0000
@@ -19,9 +19,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6561,7 +6656,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/root.c linux-3.6.10-vs2.3.4.6/fs/proc
static int proc_test_super(struct super_block *sb, void *data)
{
return sb->s_fs_info == data;
-@@ -189,6 +194,7 @@ void __init proc_root_init(void)
+@@ -190,6 +195,7 @@ void __init proc_root_init(void)
#endif
proc_mkdir("bus", NULL);
proc_sys_init();
@@ -6569,7 +6664,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/root.c linux-3.6.10-vs2.3.4.6/fs/proc
}
static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-@@ -255,6 +261,7 @@ struct proc_dir_entry proc_root = {
+@@ -257,6 +263,7 @@ struct proc_dir_entry proc_root = {
.proc_iops = &proc_root_inode_operations,
.proc_fops = &proc_root_operations,
.parent = &proc_root,
@@ -6577,9 +6672,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/root.c linux-3.6.10-vs2.3.4.6/fs/proc
.name = "/proc",
};
-diff -NurpP --minimal linux-3.6.10/fs/proc/stat.c linux-3.6.10-vs2.3.4.6/fs/proc/stat.c
---- linux-3.6.10/fs/proc/stat.c 2012-12-11 11:36:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/stat.c 2012-11-06 17:43:41.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc/stat.c linux-3.4.45-vs2.3.3.9/fs/proc/stat.c
+--- linux-3.4.45/fs/proc/stat.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/stat.c 2012-11-06 17:02:35.000000000 +0000
@@ -9,6 +9,7 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6599,9 +6694,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/stat.c linux-3.6.10-vs2.3.4.6/fs/proc
jif = boottime.tv_sec;
for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-3.6.10/fs/proc/uptime.c linux-3.6.10-vs2.3.4.6/fs/proc/uptime.c
---- linux-3.6.10/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc/uptime.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc/uptime.c linux-3.4.45-vs2.3.3.9/fs/proc/uptime.c
+--- linux-3.4.45/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/uptime.c 2012-05-21 16:15:05.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6621,9 +6716,9 @@ diff -NurpP --minimal linux-3.6.10/fs/proc/uptime.c linux-3.6.10-vs2.3.4.6/fs/pr
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs/proc_namespace.c
---- linux-3.6.10/fs/proc_namespace.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/proc_namespace.c 2012-12-10 17:17:40.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/proc_namespace.c linux-3.4.45-vs2.3.3.9/fs/proc_namespace.c
+--- linux-3.4.45/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc_namespace.c 2012-05-21 16:15:05.000000000 +0000
@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
{ MS_SYNCHRONOUS, ",sync" },
{ MS_DIRSYNC, ",dirsync" },
@@ -6633,12 +6728,10 @@ diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs
{ 0, NULL }
};
const struct proc_fs_info *fs_infop;
-@@ -80,6 +82,40 @@ static inline void mangle(struct seq_fil
+@@ -80,6 +82,34 @@ static inline void mangle(struct seq_fil
seq_escape(m, s, " \t\n\\");
}
-+#ifdef CONFIG_VSERVER_EXTRA_MNT_CHECK
-+
+static int mnt_is_reachable(struct vfsmount *vfsmnt)
+{
+ struct path root;
@@ -6650,7 +6743,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs
+ if (mnt == mnt->mnt_ns->root)
+ return 1;
+
-+ br_read_lock(&vfsmount_lock);
++ br_read_lock(vfsmount_lock);
+ root = current->fs->root;
+ root_mnt = real_mount(root.mnt);
+ point = root.dentry;
@@ -6662,19 +6755,15 @@ diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs
+
+ ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
+
-+ br_read_unlock(&vfsmount_lock);
++ br_read_unlock(vfsmount_lock);
+
+ return ret;
+}
+
-+#else
-+#define mnt_is_reachable(v) (1)
-+#endif
-+
static void show_type(struct seq_file *m, struct super_block *sb)
{
mangle(m, sb->s_type->name);
-@@ -96,6 +132,17 @@ static int show_vfsmnt(struct seq_file *
+@@ -96,6 +126,17 @@ static int show_vfsmnt(struct seq_file *
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
struct super_block *sb = mnt_path.dentry->d_sb;
@@ -6692,7 +6781,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs
if (sb->s_op->show_devname) {
err = sb->s_op->show_devname(m, mnt_path.dentry);
if (err)
-@@ -106,6 +153,7 @@ static int show_vfsmnt(struct seq_file *
+@@ -106,6 +147,7 @@ static int show_vfsmnt(struct seq_file *
seq_putc(m, ' ');
seq_path(m, &mnt_path, " \t\n\\");
seq_putc(m, ' ');
@@ -6700,7 +6789,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs
show_type(m, sb);
seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
err = show_sb_opts(m, sb);
-@@ -128,6 +176,11 @@ static int show_mountinfo(struct seq_fil
+@@ -128,6 +170,11 @@ static int show_mountinfo(struct seq_fil
struct path root = p->root;
int err = 0;
@@ -6712,7 +6801,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs
seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path)
-@@ -187,6 +240,17 @@ static int show_vfsstat(struct seq_file
+@@ -187,6 +234,17 @@ static int show_vfsstat(struct seq_file
struct super_block *sb = mnt_path.dentry->d_sb;
int err = 0;
@@ -6730,7 +6819,7 @@ diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs
/* device */
if (sb->s_op->show_devname) {
seq_puts(m, "device ");
-@@ -203,7 +267,7 @@ static int show_vfsstat(struct seq_file
+@@ -203,7 +261,7 @@ static int show_vfsstat(struct seq_file
seq_puts(m, " mounted on ");
seq_path(m, &mnt_path, " \t\n\\");
seq_putc(m, ' ');
@@ -6739,10 +6828,10 @@ diff -NurpP --minimal linux-3.6.10/fs/proc_namespace.c linux-3.6.10-vs2.3.4.6/fs
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.6.10/fs/quota/dquot.c linux-3.6.10-vs2.3.4.6/fs/quota/dquot.c
---- linux-3.6.10/fs/quota/dquot.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/quota/dquot.c 2012-10-04 16:47:00.000000000 +0000
-@@ -1580,6 +1580,9 @@ int __dquot_alloc_space(struct inode *in
+diff -NurpP --minimal linux-3.4.45/fs/quota/dquot.c linux-3.4.45-vs2.3.3.9/fs/quota/dquot.c
+--- linux-3.4.45/fs/quota/dquot.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/quota/dquot.c 2012-05-21 16:15:05.000000000 +0000
+@@ -1563,6 +1563,9 @@ int __dquot_alloc_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6752,7 +6841,7 @@ diff -NurpP --minimal linux-3.6.10/fs/quota/dquot.c linux-3.6.10-vs2.3.4.6/fs/qu
/*
* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex
-@@ -1635,6 +1638,9 @@ int dquot_alloc_inode(const struct inode
+@@ -1618,6 +1621,9 @@ int dquot_alloc_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
@@ -6762,7 +6851,7 @@ diff -NurpP --minimal linux-3.6.10/fs/quota/dquot.c linux-3.6.10-vs2.3.4.6/fs/qu
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-@@ -1706,6 +1712,8 @@ void __dquot_free_space(struct inode *in
+@@ -1689,6 +1695,8 @@ void __dquot_free_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6771,7 +6860,7 @@ diff -NurpP --minimal linux-3.6.10/fs/quota/dquot.c linux-3.6.10-vs2.3.4.6/fs/qu
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode)) {
-@@ -1750,6 +1758,8 @@ void dquot_free_inode(const struct inode
+@@ -1733,6 +1741,8 @@ void dquot_free_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
@@ -6780,16 +6869,16 @@ diff -NurpP --minimal linux-3.6.10/fs/quota/dquot.c linux-3.6.10-vs2.3.4.6/fs/qu
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-diff -NurpP --minimal linux-3.6.10/fs/quota/quota.c linux-3.6.10-vs2.3.4.6/fs/quota/quota.c
---- linux-3.6.10/fs/quota/quota.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/quota/quota.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/quota/quota.c linux-3.4.45-vs2.3.3.9/fs/quota/quota.c
+--- linux-3.4.45/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/quota/quota.c 2012-05-21 16:15:05.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/slab.h>
+#include <linux/vs_context.h>
#include <asm/current.h>
- #include <linux/uaccess.h>
+ #include <asm/uaccess.h>
#include <linux/kernel.h>
@@ -37,7 +38,7 @@ static int check_quotactl_permission(str
break;
@@ -6870,9 +6959,9 @@ diff -NurpP --minimal linux-3.6.10/fs/quota/quota.c linux-3.6.10-vs2.3.4.6/fs/qu
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.6.10/fs/reiserfs/file.c linux-3.6.10-vs2.3.4.6/fs/reiserfs/file.c
---- linux-3.6.10/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/reiserfs/file.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/file.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/file.c
+--- linux-3.4.45/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/file.c 2012-05-21 16:15:05.000000000 +0000
@@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
@@ -6880,9 +6969,9 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/file.c linux-3.6.10-vs2.3.4.6/fs/
+ .sync_flags = reiserfs_sync_flags,
.get_acl = reiserfs_get_acl,
};
-diff -NurpP --minimal linux-3.6.10/fs/reiserfs/inode.c linux-3.6.10-vs2.3.4.6/fs/reiserfs/inode.c
---- linux-3.6.10/fs/reiserfs/inode.c 2012-12-11 11:36:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/reiserfs/inode.c 2012-12-08 00:36:33.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/inode.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/inode.c
+--- linux-3.4.45/fs/reiserfs/inode.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/inode.c 2012-12-08 00:53:53.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
@@ -6960,7 +7049,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/inode.c linux-3.6.10-vs2.3.4.6/fs
set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec);
set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec);
set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec);
-@@ -2869,14 +2880,19 @@ int reiserfs_commit_write(struct file *f
+@@ -2875,14 +2886,19 @@ int reiserfs_commit_write(struct file *f
void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
{
if (reiserfs_attrs(inode->i_sb)) {
@@ -6984,7 +7073,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/inode.c linux-3.6.10-vs2.3.4.6/fs
if (sd_attrs & REISERFS_APPEND_FL)
inode->i_flags |= S_APPEND;
else
-@@ -2889,6 +2905,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
+@@ -2895,6 +2911,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
REISERFS_I(inode)->i_flags |= i_nopack_mask;
else
REISERFS_I(inode)->i_flags &= ~i_nopack_mask;
@@ -7000,7 +7089,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/inode.c linux-3.6.10-vs2.3.4.6/fs
}
}
-@@ -2899,6 +2924,11 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2905,6 +2930,11 @@ void i_attrs_to_sd_attrs(struct inode *i
*sd_attrs |= REISERFS_IMMUTABLE_FL;
else
*sd_attrs &= ~REISERFS_IMMUTABLE_FL;
@@ -7012,7 +7101,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/inode.c linux-3.6.10-vs2.3.4.6/fs
if (inode->i_flags & S_SYNC)
*sd_attrs |= REISERFS_SYNC_FL;
else
-@@ -2911,6 +2941,15 @@ void i_attrs_to_sd_attrs(struct inode *i
+@@ -2917,6 +2947,15 @@ void i_attrs_to_sd_attrs(struct inode *i
*sd_attrs |= REISERFS_NOTAIL_FL;
else
*sd_attrs &= ~REISERFS_NOTAIL_FL;
@@ -7028,7 +7117,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/inode.c linux-3.6.10-vs2.3.4.6/fs
}
}
-@@ -3155,7 +3194,8 @@ int reiserfs_setattr(struct dentry *dent
+@@ -3161,7 +3200,8 @@ int reiserfs_setattr(struct dentry *dent
}
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -7038,7 +7127,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/inode.c linux-3.6.10-vs2.3.4.6/fs
struct reiserfs_transaction_handle th;
int jbegin_count =
2 *
-@@ -3186,6 +3226,9 @@ int reiserfs_setattr(struct dentry *dent
+@@ -3192,6 +3232,9 @@ int reiserfs_setattr(struct dentry *dent
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -7048,9 +7137,9 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/inode.c linux-3.6.10-vs2.3.4.6/fs
mark_inode_dirty(inode);
error = journal_end(&th, inode->i_sb, jbegin_count);
if (error)
-diff -NurpP --minimal linux-3.6.10/fs/reiserfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs/reiserfs/ioctl.c
---- linux-3.6.10/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/reiserfs/ioctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/ioctl.c
+--- linux-3.4.45/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -11,6 +11,21 @@
#include <linux/pagemap.h>
#include <linux/compat.h>
@@ -7112,9 +7201,9 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/ioctl.c linux-3.6.10-vs2.3.4.6/fs
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.6.10/fs/reiserfs/namei.c linux-3.6.10-vs2.3.4.6/fs/reiserfs/namei.c
---- linux-3.6.10/fs/reiserfs/namei.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/reiserfs/namei.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/namei.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/namei.c
+--- linux-3.4.45/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -18,6 +18,7 @@
#include "acl.h"
#include "xattr.h"
@@ -7131,10 +7220,10 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/namei.c linux-3.6.10-vs2.3.4.6/fs
return d_splice_alias(inode, dentry);
}
-diff -NurpP --minimal linux-3.6.10/fs/reiserfs/reiserfs.h linux-3.6.10-vs2.3.4.6/fs/reiserfs/reiserfs.h
---- linux-3.6.10/fs/reiserfs/reiserfs.h 2012-07-22 21:39:42.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/reiserfs/reiserfs.h 2012-10-04 16:47:00.000000000 +0000
-@@ -549,6 +549,7 @@ enum reiserfs_mount_options {
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/reiserfs.h linux-3.4.45-vs2.3.3.9/fs/reiserfs/reiserfs.h
+--- linux-3.4.45/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/reiserfs.h 2012-05-21 17:19:33.000000000 +0000
+@@ -544,6 +544,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
REISERFS_BARRIER_FLUSH,
@@ -7142,7 +7231,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/reiserfs.h linux-3.6.10-vs2.3.4.6
/* Actions on error */
REISERFS_ERROR_PANIC,
-@@ -1548,6 +1549,11 @@ struct stat_data_v1 {
+@@ -1543,6 +1544,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
@@ -7154,7 +7243,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/reiserfs.h linux-3.6.10-vs2.3.4.6
/* persistent flags that file inherits from the parent directory */
#define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
REISERFS_SYNC_FL | \
-@@ -1557,6 +1563,9 @@ struct stat_data_v1 {
+@@ -1552,6 +1558,9 @@ struct stat_data_v1 {
REISERFS_COMPR_FL | \
REISERFS_NOTAIL_FL )
@@ -7164,7 +7253,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/reiserfs.h linux-3.6.10-vs2.3.4.6
/* Stat Data on disk (reiserfs version of UFS disk inode minus the
address blocks) */
struct stat_data {
-@@ -2647,6 +2656,7 @@ static inline void reiserfs_update_sd(st
+@@ -2641,6 +2650,7 @@ static inline void reiserfs_update_sd(st
void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
@@ -7172,10 +7261,10 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/reiserfs.h linux-3.6.10-vs2.3.4.6
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-3.6.10/fs/reiserfs/super.c linux-3.6.10-vs2.3.4.6/fs/reiserfs/super.c
---- linux-3.6.10/fs/reiserfs/super.c 2012-12-11 11:36:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/reiserfs/super.c 2012-12-08 00:36:33.000000000 +0000
-@@ -1020,6 +1020,14 @@ static int reiserfs_parse_options(struct
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/super.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/super.c
+--- linux-3.4.45/fs/reiserfs/super.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/super.c 2012-12-08 00:53:53.000000000 +0000
+@@ -982,6 +982,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
#endif
@@ -7190,7 +7279,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/super.c linux-3.6.10-vs2.3.4.6/fs
#ifdef CONFIG_REISERFS_FS_POSIX_ACL
{"acl",.setmask = 1 << REISERFS_POSIXACL},
{"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -1338,6 +1346,14 @@ static int reiserfs_remount(struct super
+@@ -1300,6 +1308,14 @@ static int reiserfs_remount(struct super
handle_quota_files(s, qf_names, &qfmt);
#endif
@@ -7205,7 +7294,7 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/super.c linux-3.6.10-vs2.3.4.6/fs
handle_attrs(s);
/* Add options that are safe here */
-@@ -1831,6 +1847,10 @@ static int reiserfs_fill_super(struct su
+@@ -1792,6 +1808,10 @@ static int reiserfs_fill_super(struct su
goto error_unlocked;
}
@@ -7216,9 +7305,9 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/super.c linux-3.6.10-vs2.3.4.6/fs
rs = SB_DISK_SUPER_BLOCK(s);
/* Let's do basic sanity check to verify that underlying device is not
smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-3.6.10/fs/reiserfs/xattr.c linux-3.6.10-vs2.3.4.6/fs/reiserfs/xattr.c
---- linux-3.6.10/fs/reiserfs/xattr.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/reiserfs/xattr.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/xattr.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/xattr.c
+--- linux-3.4.45/fs/reiserfs/xattr.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/xattr.c 2013-05-13 18:16:08.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
@@ -7227,9 +7316,9 @@ diff -NurpP --minimal linux-3.6.10/fs/reiserfs/xattr.c linux-3.6.10-vs2.3.4.6/fs
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-3.6.10/fs/stat.c linux-3.6.10-vs2.3.4.6/fs/stat.c
---- linux-3.6.10/fs/stat.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/stat.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/stat.c linux-3.4.45-vs2.3.3.9/fs/stat.c
+--- linux-3.4.45/fs/stat.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/stat.c 2012-10-22 13:09:53.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -7238,9 +7327,9 @@ diff -NurpP --minimal linux-3.6.10/fs/stat.c linux-3.6.10-vs2.3.4.6/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.6.10/fs/statfs.c linux-3.6.10-vs2.3.4.6/fs/statfs.c
---- linux-3.6.10/fs/statfs.c 2012-07-22 21:39:42.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/statfs.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/statfs.c linux-3.4.45-vs2.3.3.9/fs/statfs.c
+--- linux-3.4.45/fs/statfs.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/statfs.c 2012-05-21 16:15:05.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -7259,19 +7348,19 @@ diff -NurpP --minimal linux-3.6.10/fs/statfs.c linux-3.6.10-vs2.3.4.6/fs/statfs.
return retval;
}
-diff -NurpP --minimal linux-3.6.10/fs/super.c linux-3.6.10-vs2.3.4.6/fs/super.c
---- linux-3.6.10/fs/super.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/super.c 2012-10-04 17:06:05.000000000 +0000
-@@ -34,6 +34,8 @@
+diff -NurpP --minimal linux-3.4.45/fs/super.c linux-3.4.45-vs2.3.3.9/fs/super.c
+--- linux-3.4.45/fs/super.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/super.c 2012-05-21 16:59:38.000000000 +0000
+@@ -33,6 +33,8 @@
+ #include <linux/rculist_bl.h>
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
- #include <linux/lockdep.h>
+#include <linux/magic.h>
+#include <linux/vs_context.h>
#include "internal.h"
-@@ -1148,6 +1150,13 @@ mount_fs(struct file_system_type *type,
+@@ -1138,6 +1140,13 @@ mount_fs(struct file_system_type *type,
WARN_ON(sb->s_bdi == &default_backing_dev_info);
sb->s_flags |= MS_BORN;
@@ -7285,9 +7374,9 @@ diff -NurpP --minimal linux-3.6.10/fs/super.c linux-3.6.10-vs2.3.4.6/fs/super.c
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.6.10/fs/sysfs/mount.c linux-3.6.10-vs2.3.4.6/fs/sysfs/mount.c
---- linux-3.6.10/fs/sysfs/mount.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/sysfs/mount.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/sysfs/mount.c linux-3.4.45-vs2.3.3.9/fs/sysfs/mount.c
+--- linux-3.4.45/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/sysfs/mount.c 2012-05-21 16:15:05.000000000 +0000
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -7297,9 +7386,9 @@ diff -NurpP --minimal linux-3.6.10/fs/sysfs/mount.c linux-3.6.10-vs2.3.4.6/fs/sy
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.6.10/fs/utimes.c linux-3.6.10-vs2.3.4.6/fs/utimes.c
---- linux-3.6.10/fs/utimes.c 2012-07-22 21:39:42.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/utimes.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/utimes.c linux-3.4.45-vs2.3.3.9/fs/utimes.c
+--- linux-3.4.45/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/utimes.c 2012-05-21 16:15:05.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -7329,9 +7418,9 @@ diff -NurpP --minimal linux-3.6.10/fs/utimes.c linux-3.6.10-vs2.3.4.6/fs/utimes.
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.6.10/fs/xattr.c linux-3.6.10-vs2.3.4.6/fs/xattr.c
---- linux-3.6.10/fs/xattr.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xattr.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/xattr.c linux-3.4.45-vs2.3.3.9/fs/xattr.c
+--- linux-3.4.45/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xattr.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/fsnotify.h>
#include <linux/audit.h>
@@ -7349,9 +7438,9 @@ diff -NurpP --minimal linux-3.6.10/fs/xattr.c linux-3.6.10-vs2.3.4.6/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_dinode.h linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_dinode.h
---- linux-3.6.10/fs/xfs/xfs_dinode.h 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_dinode.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_dinode.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_dinode.h
+--- linux-3.4.45/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_dinode.h 2012-05-21 16:15:05.000000000 +0000
@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
__be32 di_nlink; /* number of links to file */
__be16 di_projid_lo; /* lower part of owner's project id */
@@ -7392,9 +7481,9 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_dinode.h linux-3.6.10-vs2.3.4.6/fs
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_fs.h linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_fs.h
---- linux-3.6.10/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_fs.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_fs.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_fs.h
+--- linux-3.4.45/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_fs.h 2012-05-21 16:15:05.000000000 +0000
@@ -67,6 +67,9 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
@@ -7415,9 +7504,9 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_fs.h linux-3.6.10-vs2.3.4.6/fs/xfs
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ialloc.c linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_ialloc.c
---- linux-3.6.10/fs/xfs/xfs_ialloc.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_ialloc.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ialloc.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ialloc.c
+--- linux-3.4.45/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ialloc.c 2012-05-21 16:15:05.000000000 +0000
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
@@ -7426,24 +7515,24 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ialloc.c linux-3.6.10-vs2.3.4.6/fs
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_inode.c
---- linux-3.6.10/fs/xfs/xfs_inode.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_inode.c 2012-11-16 21:43:16.000000000 +0000
-@@ -16,6 +16,7 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- #include <linux/log2.h>
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_inode.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.c
+--- linux-3.4.45/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.c 2012-05-21 16:15:05.000000000 +0000
+@@ -236,6 +236,7 @@ xfs_inotobp(
+ return 0;
+ }
+
+#include <linux/vs_tag.h>
- #include "xfs.h"
- #include "xfs_fs.h"
-@@ -563,15 +564,25 @@ xfs_iformat_btree(
+ /*
+ * This routine is called to map an inode to the buffer containing
+@@ -631,15 +632,25 @@ xfs_iformat_btree(
STATIC void
xfs_dinode_from_disk(
xfs_icdinode_t *to,
- xfs_dinode_t *from)
+ xfs_dinode_t *from,
-+ int tagged)
++ int tagged)
{
+ uint32_t uid, gid, tag;
+
@@ -7466,7 +7555,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
to->di_nlink = be32_to_cpu(from->di_nlink);
to->di_projid_lo = be16_to_cpu(from->di_projid_lo);
to->di_projid_hi = be16_to_cpu(from->di_projid_hi);
-@@ -593,21 +604,26 @@ xfs_dinode_from_disk(
+@@ -661,21 +672,26 @@ xfs_dinode_from_disk(
to->di_dmevmask = be32_to_cpu(from->di_dmevmask);
to->di_dmstate = be16_to_cpu(from->di_dmstate);
to->di_flags = be16_to_cpu(from->di_flags);
@@ -7479,7 +7568,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
xfs_dinode_t *to,
- xfs_icdinode_t *from)
+ xfs_icdinode_t *from,
-+ int tagged)
++ int tagged)
{
to->di_magic = cpu_to_be16(from->di_magic);
to->di_mode = cpu_to_be16(from->di_mode);
@@ -7496,7 +7585,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
to->di_nlink = cpu_to_be32(from->di_nlink);
to->di_projid_lo = cpu_to_be16(from->di_projid_lo);
to->di_projid_hi = cpu_to_be16(from->di_projid_hi);
-@@ -629,12 +645,14 @@ xfs_dinode_to_disk(
+@@ -697,12 +713,14 @@ xfs_dinode_to_disk(
to->di_dmevmask = cpu_to_be32(from->di_dmevmask);
to->di_dmstate = cpu_to_be16(from->di_dmstate);
to->di_flags = cpu_to_be16(from->di_flags);
@@ -7512,7 +7601,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
{
uint flags = 0;
-@@ -645,6 +663,8 @@ _xfs_dic2xflags(
+@@ -713,6 +731,8 @@ _xfs_dic2xflags(
flags |= XFS_XFLAG_PREALLOC;
if (di_flags & XFS_DIFLAG_IMMUTABLE)
flags |= XFS_XFLAG_IMMUTABLE;
@@ -7521,7 +7610,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
if (di_flags & XFS_DIFLAG_APPEND)
flags |= XFS_XFLAG_APPEND;
if (di_flags & XFS_DIFLAG_SYNC)
-@@ -669,6 +689,10 @@ _xfs_dic2xflags(
+@@ -737,6 +757,10 @@ _xfs_dic2xflags(
flags |= XFS_XFLAG_FILESTREAM;
}
@@ -7532,7 +7621,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
return flags;
}
-@@ -678,7 +702,7 @@ xfs_ip2xflags(
+@@ -746,7 +770,7 @@ xfs_ip2xflags(
{
xfs_icdinode_t *dic = &ip->i_d;
@@ -7541,7 +7630,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
(XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
}
-@@ -686,7 +710,8 @@ uint
+@@ -754,7 +778,8 @@ uint
xfs_dic2xflags(
xfs_dinode_t *dip)
{
@@ -7551,7 +7640,15 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
}
-@@ -740,7 +765,8 @@ xfs_iread(
+@@ -787,7 +812,6 @@ xfs_iread(
+ if (error)
+ return error;
+ dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
+-
+ /*
+ * If we got something that isn't an inode it means someone
+ * (nfs or dmi) has a stale handle.
+@@ -810,7 +834,8 @@ xfs_iread(
* Otherwise, just get the truly permanent information.
*/
if (dip->di_mode) {
@@ -7561,7 +7658,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
error = xfs_iformat(ip, dip);
if (error) {
#ifdef DEBUG
-@@ -927,6 +953,7 @@ xfs_ialloc(
+@@ -998,6 +1023,7 @@ xfs_ialloc(
ASSERT(ip->i_d.di_nlink == nlink);
ip->i_d.di_uid = current_fsuid();
ip->i_d.di_gid = current_fsgid();
@@ -7569,7 +7666,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
xfs_set_projid(ip, prid);
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
-@@ -986,6 +1013,7 @@ xfs_ialloc(
+@@ -1057,6 +1083,7 @@ xfs_ialloc(
ip->i_d.di_dmevmask = 0;
ip->i_d.di_dmstate = 0;
ip->i_d.di_flags = 0;
@@ -7577,7 +7674,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
flags = XFS_ILOG_CORE;
switch (mode & S_IFMT) {
case S_IFIFO:
-@@ -1667,6 +1695,7 @@ xfs_ifree(
+@@ -1725,6 +1752,7 @@ xfs_ifree(
}
ip->i_d.di_mode = 0; /* mark incore inode as free */
ip->i_d.di_flags = 0;
@@ -7585,15 +7682,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
ip->i_d.di_dmevmask = 0;
ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */
ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS;
-@@ -1833,6 +1862,7 @@ xfs_iroot_realloc(
- return;
- }
-
-+#include <linux/vs_tag.h>
-
- /*
- * This is called when the amount of space needed for if_data
-@@ -2521,7 +2551,8 @@ xfs_iflush_int(
+@@ -2598,7 +2626,8 @@ xfs_iflush_int(
* because if the inode is dirty at all the core must
* be.
*/
@@ -7603,9 +7692,9 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.c linux-3.6.10-vs2.3.4.6/fs/
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.h linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_inode.h
---- linux-3.6.10/fs/xfs/xfs_inode.h 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_inode.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_inode.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.h
+--- linux-3.4.45/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.h 2012-05-21 16:15:05.000000000 +0000
@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
__uint32_t di_nlink; /* number of links to file */
__uint16_t di_projid_lo; /* lower part of owner's project id */
@@ -7617,7 +7706,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.h linux-3.6.10-vs2.3.4.6/fs/
__uint16_t di_flushiter; /* incremented on flush */
xfs_ictimestamp_t di_atime; /* time last accessed */
xfs_ictimestamp_t di_mtime; /* time last modified */
-@@ -561,7 +563,7 @@ int xfs_imap_to_bp(struct xfs_mount *,
+@@ -565,7 +567,7 @@ int xfs_itobp(struct xfs_mount *, struc
int xfs_iread(struct xfs_mount *, struct xfs_trans *,
struct xfs_inode *, uint);
void xfs_dinode_to_disk(struct xfs_dinode *,
@@ -7626,10 +7715,10 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_inode.h linux-3.6.10-vs2.3.4.6/fs/
void xfs_idestroy_fork(struct xfs_inode *, int);
void xfs_idata_realloc(struct xfs_inode *, int, int);
void xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.c linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_ioctl.c
---- linux-3.6.10/fs/xfs/xfs_ioctl.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_ioctl.c 2012-10-04 16:47:00.000000000 +0000
-@@ -26,7 +26,7 @@
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ioctl.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.c
+--- linux-3.4.45/fs/xfs/xfs_ioctl.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.c 2012-05-21 16:15:05.000000000 +0000
+@@ -28,7 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
#include "xfs_inode.h"
@@ -7638,7 +7727,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.c linux-3.6.10-vs2.3.4.6/fs/
#include "xfs_rtalloc.h"
#include "xfs_itable.h"
#include "xfs_error.h"
-@@ -762,6 +762,10 @@ xfs_merge_ioc_xflags(
+@@ -750,6 +750,10 @@ xfs_merge_ioc_xflags(
xflags |= XFS_XFLAG_IMMUTABLE;
else
xflags &= ~XFS_XFLAG_IMMUTABLE;
@@ -7649,7 +7738,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.c linux-3.6.10-vs2.3.4.6/fs/
if (flags & FS_APPEND_FL)
xflags |= XFS_XFLAG_APPEND;
else
-@@ -790,6 +794,8 @@ xfs_di2lxflags(
+@@ -778,6 +782,8 @@ xfs_di2lxflags(
if (di_flags & XFS_DIFLAG_IMMUTABLE)
flags |= FS_IMMUTABLE_FL;
@@ -7658,7 +7747,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.c linux-3.6.10-vs2.3.4.6/fs/
if (di_flags & XFS_DIFLAG_APPEND)
flags |= FS_APPEND_FL;
if (di_flags & XFS_DIFLAG_SYNC)
-@@ -850,6 +856,8 @@ xfs_set_diflags(
+@@ -838,6 +844,8 @@ xfs_set_diflags(
di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
if (xflags & XFS_XFLAG_IMMUTABLE)
di_flags |= XFS_DIFLAG_IMMUTABLE;
@@ -7667,7 +7756,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.c linux-3.6.10-vs2.3.4.6/fs/
if (xflags & XFS_XFLAG_APPEND)
di_flags |= XFS_DIFLAG_APPEND;
if (xflags & XFS_XFLAG_SYNC)
-@@ -892,6 +900,10 @@ xfs_diflags_to_linux(
+@@ -880,6 +888,10 @@ xfs_diflags_to_linux(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
@@ -7678,7 +7767,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.c linux-3.6.10-vs2.3.4.6/fs/
if (xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-@@ -1396,10 +1408,18 @@ xfs_file_ioctl(
+@@ -1372,10 +1384,18 @@ xfs_file_ioctl(
case XFS_IOC_FSGETXATTRA:
return xfs_ioc_fsgetxattr(ip, 1, arg);
case XFS_IOC_FSSETXATTR:
@@ -7697,9 +7786,9 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.c linux-3.6.10-vs2.3.4.6/fs/
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.h linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_ioctl.h
---- linux-3.6.10/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_ioctl.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ioctl.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.h
+--- linux-3.4.45/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.h 2012-05-21 16:15:05.000000000 +0000
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
@@ -7713,10 +7802,10 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_ioctl.h linux-3.6.10-vs2.3.4.6/fs/
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_iops.c linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_iops.c
---- linux-3.6.10/fs/xfs/xfs_iops.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_iops.c 2012-11-16 21:14:53.000000000 +0000
-@@ -28,6 +28,7 @@
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_iops.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_iops.c
+--- linux-3.4.45/fs/xfs/xfs_iops.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_iops.c 2012-05-21 16:15:05.000000000 +0000
+@@ -30,6 +30,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
#include "xfs_inode.h"
@@ -7724,7 +7813,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_iops.c linux-3.6.10-vs2.3.4.6/fs/x
#include "xfs_bmap.h"
#include "xfs_rtalloc.h"
#include "xfs_error.h"
-@@ -46,6 +47,7 @@
+@@ -49,6 +50,7 @@
#include <linux/security.h>
#include <linux/fiemap.h>
#include <linux/slab.h>
@@ -7732,7 +7821,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_iops.c linux-3.6.10-vs2.3.4.6/fs/x
static int
xfs_initxattrs(
-@@ -421,6 +423,7 @@ xfs_vn_getattr(
+@@ -424,6 +426,7 @@ xfs_vn_getattr(
stat->nlink = ip->i_d.di_nlink;
stat->uid = ip->i_d.di_uid;
stat->gid = ip->i_d.di_gid;
@@ -7740,23 +7829,23 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_iops.c linux-3.6.10-vs2.3.4.6/fs/x
stat->ino = ip->i_ino;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-@@ -1033,6 +1036,7 @@ static const struct inode_operations xfs
+@@ -996,6 +999,7 @@ static const struct inode_operations xfs
+ .removexattr = generic_removexattr,
.listxattr = xfs_vn_listxattr,
.fiemap = xfs_vn_fiemap,
- .update_time = xfs_vn_update_time,
+ .sync_flags = xfs_sync_flags,
};
static const struct inode_operations xfs_dir_inode_operations = {
-@@ -1059,6 +1063,7 @@ static const struct inode_operations xfs
+@@ -1021,6 +1025,7 @@ static const struct inode_operations xfs
+ .getxattr = generic_getxattr,
.removexattr = generic_removexattr,
.listxattr = xfs_vn_listxattr,
- .update_time = xfs_vn_update_time,
+ .sync_flags = xfs_sync_flags,
};
static const struct inode_operations xfs_dir_ci_inode_operations = {
-@@ -1110,6 +1115,10 @@ xfs_diflags_to_iflags(
+@@ -1070,6 +1075,10 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
@@ -7767,7 +7856,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_iops.c linux-3.6.10-vs2.3.4.6/fs/x
if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-@@ -1122,6 +1131,15 @@ xfs_diflags_to_iflags(
+@@ -1082,6 +1091,15 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_NOATIME;
else
inode->i_flags &= ~S_NOATIME;
@@ -7783,7 +7872,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_iops.c linux-3.6.10-vs2.3.4.6/fs/x
}
/*
-@@ -1153,6 +1171,7 @@ xfs_setup_inode(
+@@ -1113,6 +1131,7 @@ xfs_setup_inode(
set_nlink(inode, ip->i_d.di_nlink);
inode->i_uid = ip->i_d.di_uid;
inode->i_gid = ip->i_d.di_gid;
@@ -7791,10 +7880,10 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_iops.c linux-3.6.10-vs2.3.4.6/fs/x
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_itable.c linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_itable.c
---- linux-3.6.10/fs/xfs/xfs_itable.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_itable.c 2012-10-04 16:47:00.000000000 +0000
-@@ -96,6 +96,7 @@ xfs_bulkstat_one_int(
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_itable.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_itable.c
+--- linux-3.4.45/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_itable.c 2012-05-21 16:15:05.000000000 +0000
+@@ -97,6 +97,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_gid = dic->di_gid;
@@ -7802,9 +7891,9 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_itable.c linux-3.6.10-vs2.3.4.6/fs
buf->bs_size = dic->di_size;
buf->bs_atime.tv_sec = dic->di_atime.t_sec;
buf->bs_atime.tv_nsec = dic->di_atime.t_nsec;
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_linux.h linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_linux.h
---- linux-3.6.10/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_linux.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_linux.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_linux.h
+--- linux-3.4.45/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_linux.h 2012-05-21 16:15:05.000000000 +0000
@@ -121,6 +121,7 @@
#define current_cpu() (raw_smp_processor_id())
@@ -7813,10 +7902,10 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_linux.h linux-3.6.10-vs2.3.4.6/fs/
#define current_test_flags(f) (current->flags & (f))
#define current_set_flags_nested(sp, f) \
(*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_log_recover.c linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_log_recover.c
---- linux-3.6.10/fs/xfs/xfs_log_recover.c 2012-12-11 11:36:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_log_recover.c 2012-12-08 00:36:33.000000000 +0000
-@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2(
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_log_recover.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_log_recover.c
+--- linux-3.4.45/fs/xfs/xfs_log_recover.c 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_log_recover.c 2012-11-18 23:52:29.000000000 +0000
+@@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2(
}
/* The core is in in-core format */
@@ -7826,9 +7915,9 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_log_recover.c linux-3.6.10-vs2.3.4
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_mount.h linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_mount.h
---- linux-3.6.10/fs/xfs/xfs_mount.h 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_mount.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_mount.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_mount.h
+--- linux-3.4.45/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_mount.h 2012-05-21 16:15:05.000000000 +0000
@@ -251,6 +251,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -7837,10 +7926,10 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_mount.h linux-3.6.10-vs2.3.4.6/fs/
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_super.c linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_super.c
---- linux-3.6.10/fs/xfs/xfs_super.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_super.c 2012-10-04 16:47:00.000000000 +0000
-@@ -112,6 +112,9 @@ mempool_t *xfs_ioend_pool;
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_super.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_super.c
+--- linux-3.4.45/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_super.c 2012-05-21 16:15:05.000000000 +0000
+@@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
#define MNTOPT_DISCARD "discard" /* Discard unused blocks */
#define MNTOPT_NODISCARD "nodiscard" /* Do not discard unused blocks */
@@ -7850,7 +7939,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_super.c linux-3.6.10-vs2.3.4.6/fs/
/*
* Table driven mount option parser.
-@@ -120,10 +123,14 @@ mempool_t *xfs_ioend_pool;
+@@ -121,10 +124,14 @@ mempool_t *xfs_ioend_pool;
* in the future, too.
*/
enum {
@@ -7865,7 +7954,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_super.c linux-3.6.10-vs2.3.4.6/fs/
{Opt_barrier, "barrier"},
{Opt_nobarrier, "nobarrier"},
{Opt_err, NULL}
-@@ -371,6 +378,19 @@ xfs_parseargs(
+@@ -372,6 +379,19 @@ xfs_parseargs(
} else if (!strcmp(this_char, "irixsgid")) {
xfs_warn(mp,
"irixsgid is now a sysctl(2) variable, option is deprecated.");
@@ -7885,7 +7974,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_super.c linux-3.6.10-vs2.3.4.6/fs/
} else {
xfs_warn(mp, "unknown mount option [%s].", this_char);
return EINVAL;
-@@ -1056,6 +1076,16 @@ xfs_fs_remount(
+@@ -1127,6 +1147,16 @@ xfs_fs_remount(
case Opt_nobarrier:
mp->m_flags &= ~XFS_MOUNT_BARRIER;
break;
@@ -7902,7 +7991,7 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_super.c linux-3.6.10-vs2.3.4.6/fs/
default:
/*
* Logically we would return an error here to prevent
-@@ -1275,6 +1305,9 @@ xfs_fs_fill_super(
+@@ -1346,6 +1376,9 @@ xfs_fs_fill_super(
if (error)
goto out_free_sb;
@@ -7912,10 +8001,10 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_super.c linux-3.6.10-vs2.3.4.6/fs/
/*
* we must configure the block size in the superblock before we run the
* full mount process as the mount process can lookup and cache inodes.
-diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_vnodeops.c linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_vnodeops.c
---- linux-3.6.10/fs/xfs/xfs_vnodeops.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/fs/xfs/xfs_vnodeops.c 2012-10-04 16:47:00.000000000 +0000
-@@ -103,6 +103,77 @@ xfs_readlink_bmap(
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_vnodeops.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_vnodeops.c
+--- linux-3.4.45/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_vnodeops.c 2012-05-21 16:15:05.000000000 +0000
+@@ -106,6 +106,77 @@ xfs_readlink_bmap(
return error;
}
@@ -7993,9 +8082,9 @@ diff -NurpP --minimal linux-3.6.10/fs/xfs/xfs_vnodeops.c linux-3.6.10-vs2.3.4.6/
int
xfs_readlink(
xfs_inode_t *ip,
-diff -NurpP --minimal linux-3.6.10/include/linux/Kbuild linux-3.6.10-vs2.3.4.6/include/linux/Kbuild
---- linux-3.6.10/include/linux/Kbuild 2012-10-04 13:27:45.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/Kbuild 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/Kbuild linux-3.4.45-vs2.3.3.9/include/linux/Kbuild
+--- linux-3.4.45/include/linux/Kbuild 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/Kbuild 2012-07-24 09:52:30.000000000 +0000
@@ -18,6 +18,7 @@ header-y += netfilter_bridge/
header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
@@ -8004,9 +8093,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/Kbuild linux-3.6.10-vs2.3.4.6/i
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-3.6.10/include/linux/capability.h linux-3.6.10-vs2.3.4.6/include/linux/capability.h
---- linux-3.6.10/include/linux/capability.h 2012-07-22 21:39:43.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/capability.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/capability.h linux-3.4.45-vs2.3.3.9/include/linux/capability.h
+--- linux-3.4.45/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/capability.h 2012-05-21 16:15:05.000000000 +0000
@@ -280,6 +280,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -8015,9 +8104,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/capability.h linux-3.6.10-vs2.3
#define CAP_SYS_ADMIN 21
-@@ -366,7 +367,12 @@ struct cpu_vfs_cap_data {
+@@ -363,7 +364,12 @@ struct cpu_vfs_cap_data {
- #define CAP_LAST_CAP CAP_BLOCK_SUSPEND
+ #define CAP_LAST_CAP CAP_WAKE_ALARM
-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
+/* Allow context manipulations */
@@ -8029,10 +8118,10 @@ diff -NurpP --minimal linux-3.6.10/include/linux/capability.h linux-3.6.10-vs2.3
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.6.10/include/linux/cred.h linux-3.6.10-vs2.3.4.6/include/linux/cred.h
---- linux-3.6.10/include/linux/cred.h 2012-07-22 21:39:43.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/cred.h 2012-10-04 16:47:00.000000000 +0000
-@@ -157,6 +157,7 @@ extern void exit_creds(struct task_struc
+diff -NurpP --minimal linux-3.4.45/include/linux/cred.h linux-3.4.45-vs2.3.3.9/include/linux/cred.h
+--- linux-3.4.45/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/cred.h 2012-05-21 16:15:05.000000000 +0000
+@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
extern struct cred *cred_alloc_blank(void);
@@ -8040,7 +8129,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/cred.h linux-3.6.10-vs2.3.4.6/i
extern struct cred *prepare_creds(void);
extern struct cred *prepare_exec_creds(void);
extern int commit_creds(struct cred *);
-@@ -210,6 +211,31 @@ static inline void validate_process_cred
+@@ -209,6 +210,31 @@ static inline void validate_process_cred
}
#endif
@@ -8072,19 +8161,19 @@ diff -NurpP --minimal linux-3.6.10/include/linux/cred.h linux-3.6.10-vs2.3.4.6/i
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.6.10/include/linux/devpts_fs.h linux-3.6.10-vs2.3.4.6/include/linux/devpts_fs.h
---- linux-3.6.10/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/devpts_fs.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/devpts_fs.h linux-3.4.45-vs2.3.3.9/include/linux/devpts_fs.h
+--- linux-3.4.45/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/devpts_fs.h 2012-05-21 16:15:05.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/include/linux/fs.h
---- linux-3.6.10/include/linux/fs.h 2012-10-04 13:27:45.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/fs.h 2012-10-04 16:47:00.000000000 +0000
-@@ -225,6 +225,9 @@ struct inodes_stat_t {
+diff -NurpP --minimal linux-3.4.45/include/linux/fs.h linux-3.4.45-vs2.3.3.9/include/linux/fs.h
+--- linux-3.4.45/include/linux/fs.h 2012-05-21 16:07:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/fs.h 2012-05-21 16:15:05.000000000 +0000
+@@ -214,6 +214,9 @@ struct inodes_stat_t {
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
#define MS_STRICTATIME (1<<24) /* Always perform atime updates */
@@ -8094,7 +8183,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
#define MS_NOSEC (1<<28)
#define MS_BORN (1<<29)
#define MS_ACTIVE (1<<30)
-@@ -256,6 +259,14 @@ struct inodes_stat_t {
+@@ -245,6 +248,14 @@ struct inodes_stat_t {
#define S_IMA 1024 /* Inode has an associated IMA struct */
#define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */
#define S_NOSEC 4096 /* no suid or xattr security attributes */
@@ -8109,7 +8198,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -278,12 +289,15 @@ struct inodes_stat_t {
+@@ -267,12 +278,15 @@ struct inodes_stat_t {
#define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
@@ -8127,7 +8216,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -294,6 +308,16 @@ struct inodes_stat_t {
+@@ -283,6 +297,16 @@ struct inodes_stat_t {
#define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT)
#define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC)
@@ -8144,7 +8233,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
/* the read-only stuff doesn't really belong here, but any other place is
probably as bad and I don't want to create yet another include file. */
-@@ -380,11 +404,14 @@ struct inodes_stat_t {
+@@ -369,11 +393,14 @@ struct inodes_stat_t {
#define FS_EXTENT_FL 0x00080000 /* Extents */
#define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */
#define FS_NOCOW_FL 0x00800000 /* Do not cow file */
@@ -8161,7 +8250,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-@@ -472,6 +499,7 @@ typedef void (dio_iodone_t)(struct kiocb
+@@ -456,6 +483,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
@@ -8169,15 +8258,15 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
/*
* This is the Inode Attributes structure, used for notify_change(). It
-@@ -487,6 +515,7 @@ struct iattr {
+@@ -471,6 +499,7 @@ struct iattr {
umode_t ia_mode;
- kuid_t ia_uid;
- kgid_t ia_gid;
+ uid_t ia_uid;
+ gid_t ia_gid;
+ tag_t ia_tag;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -500,6 +529,9 @@ struct iattr {
+@@ -484,6 +513,9 @@ struct iattr {
struct file *ia_file;
};
@@ -8187,10 +8276,10 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
/*
* Includes for diskquotas.
*/
-@@ -784,7 +816,9 @@ struct inode {
+@@ -763,7 +795,9 @@ struct inode {
unsigned short i_opflags;
- kuid_t i_uid;
- kgid_t i_gid;
+ uid_t i_uid;
+ gid_t i_gid;
- unsigned int i_flags;
+ tag_t i_tag;
+ unsigned short i_flags;
@@ -8198,15 +8287,15 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *i_acl;
-@@ -813,6 +847,7 @@ struct inode {
+@@ -792,6 +826,7 @@ struct inode {
unsigned int __i_nlink;
};
dev_t i_rdev;
+ dev_t i_mdev;
- loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
-@@ -975,12 +1010,12 @@ static inline void i_gid_write(struct in
+ struct timespec i_ctime;
+@@ -929,12 +964,12 @@ static inline void i_size_write(struct i
static inline unsigned iminor(const struct inode *inode)
{
@@ -8221,7 +8310,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
}
extern struct block_device *I_BDEV(struct inode *inode);
-@@ -1047,6 +1082,7 @@ struct file {
+@@ -1001,6 +1036,7 @@ struct file {
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
@@ -8229,7 +8318,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
struct file_ra_state f_ra;
u64 f_version;
-@@ -1194,6 +1230,7 @@ struct file_lock {
+@@ -1148,6 +1184,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
@@ -8237,15 +8326,15 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
-@@ -1829,6 +1866,7 @@ struct inode_operations {
+@@ -1661,6 +1698,7 @@ struct inode_operations {
ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*removexattr) (struct dentry *, const char *);
+ int (*sync_flags) (struct inode *, int, int);
+ void (*truncate_range)(struct inode *, loff_t, loff_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
- int (*update_time)(struct inode *, struct timespec *, int);
-@@ -1850,6 +1888,7 @@ extern ssize_t vfs_readv(struct file *,
+@@ -1680,6 +1718,7 @@ extern ssize_t vfs_readv(struct file *,
unsigned long, loff_t *);
extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
unsigned long, loff_t *);
@@ -8253,7 +8342,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
struct super_operations {
struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2692,6 +2731,7 @@ extern int dcache_dir_open(struct inode
+@@ -2509,6 +2548,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, void *, filldir_t);
@@ -8261,32 +8350,32 @@ diff -NurpP --minimal linux-3.6.10/include/linux/fs.h linux-3.6.10-vs2.3.4.6/inc
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.6.10/include/linux/gfs2_ondisk.h linux-3.6.10-vs2.3.4.6/include/linux/gfs2_ondisk.h
---- linux-3.6.10/include/linux/gfs2_ondisk.h 2012-10-04 13:27:45.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/gfs2_ondisk.h 2012-10-04 16:54:29.000000000 +0000
-@@ -225,6 +225,9 @@ enum {
+diff -NurpP --minimal linux-3.4.45/include/linux/gfs2_ondisk.h linux-3.4.45-vs2.3.3.9/include/linux/gfs2_ondisk.h
+--- linux-3.4.45/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/gfs2_ondisk.h 2012-05-21 16:15:05.000000000 +0000
+@@ -214,6 +214,9 @@ enum {
+ gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
gfs2fl_System = 9,
- gfs2fl_TopLevel = 10,
+ gfs2fl_IXUnlink = 16,
+ gfs2fl_Barrier = 17,
+ gfs2fl_Cow = 18,
gfs2fl_TruncInProg = 29,
gfs2fl_InheritDirectio = 30,
gfs2fl_InheritJdata = 31,
-@@ -242,6 +245,9 @@ enum {
+@@ -230,6 +233,9 @@ enum {
+ #define GFS2_DIF_NOATIME 0x00000080
#define GFS2_DIF_SYNC 0x00000100
#define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */
- #define GFS2_DIF_TOPDIR 0x00000400 /* New in gfs2 */
+#define GFS2_DIF_IXUNLINK 0x00010000
+#define GFS2_DIF_BARRIER 0x00020000
+#define GFS2_DIF_COW 0x00040000
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
- #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */
+ #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.6.10/include/linux/if_tun.h linux-3.6.10-vs2.3.4.6/include/linux/if_tun.h
---- linux-3.6.10/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/if_tun.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/if_tun.h linux-3.4.45-vs2.3.3.9/include/linux/if_tun.h
+--- linux-3.4.45/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/if_tun.h 2012-05-21 16:15:05.000000000 +0000
@@ -53,6 +53,7 @@
#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
@@ -8295,9 +8384,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/if_tun.h linux-3.6.10-vs2.3.4.6
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.6.10/include/linux/init_task.h linux-3.6.10-vs2.3.4.6/include/linux/init_task.h
---- linux-3.6.10/include/linux/init_task.h 2012-10-04 13:27:45.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/init_task.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/init_task.h linux-3.4.45-vs2.3.3.9/include/linux/init_task.h
+--- linux-3.4.45/include/linux/init_task.h 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/init_task.h 2012-10-22 13:09:53.000000000 +0000
@@ -210,6 +210,10 @@ extern struct task_group root_task_group
INIT_TRACE_RECURSION \
INIT_TASK_RCU_PREEMPT(tsk) \
@@ -8309,9 +8398,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/init_task.h linux-3.6.10-vs2.3.
}
-diff -NurpP --minimal linux-3.6.10/include/linux/ipc.h linux-3.6.10-vs2.3.4.6/include/linux/ipc.h
---- linux-3.6.10/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/ipc.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/ipc.h linux-3.4.45-vs2.3.3.9/include/linux/ipc.h
+--- linux-3.4.45/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/ipc.h 2012-05-21 16:15:05.000000000 +0000
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
@@ -8320,10 +8409,10 @@ diff -NurpP --minimal linux-3.6.10/include/linux/ipc.h linux-3.6.10-vs2.3.4.6/in
uid_t cuid;
gid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.6.10/include/linux/ipc_namespace.h linux-3.6.10-vs2.3.4.6/include/linux/ipc_namespace.h
---- linux-3.6.10/include/linux/ipc_namespace.h 2012-07-22 21:39:43.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/ipc_namespace.h 2012-10-04 16:47:00.000000000 +0000
-@@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_
+diff -NurpP --minimal linux-3.4.45/include/linux/ipc_namespace.h linux-3.4.45-vs2.3.3.9/include/linux/ipc_namespace.h
+--- linux-3.4.45/include/linux/ipc_namespace.h 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/ipc_namespace.h 2013-05-13 18:16:08.000000000 +0000
+@@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_
#if defined(CONFIG_IPC_NS)
extern struct ipc_namespace *copy_ipcs(unsigned long flags,
@@ -8333,7 +8422,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/ipc_namespace.h linux-3.6.10-vs
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
{
if (ns)
-@@ -144,12 +145,13 @@ static inline struct ipc_namespace *get_
+@@ -112,12 +113,13 @@ static inline struct ipc_namespace *get_
extern void put_ipc_ns(struct ipc_namespace *ns);
#else
static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
@@ -8349,9 +8438,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/ipc_namespace.h linux-3.6.10-vs
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.6.10/include/linux/loop.h linux-3.6.10-vs2.3.4.6/include/linux/loop.h
---- linux-3.6.10/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/loop.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/loop.h linux-3.4.45-vs2.3.3.9/include/linux/loop.h
+--- linux-3.4.45/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/loop.h 2012-05-21 16:15:05.000000000 +0000
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -8360,9 +8449,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/loop.h linux-3.6.10-vs2.3.4.6/i
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.6.10/include/linux/magic.h linux-3.6.10-vs2.3.4.6/include/linux/magic.h
---- linux-3.6.10/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/magic.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/magic.h linux-3.4.45-vs2.3.3.9/include/linux/magic.h
+--- linux-3.4.45/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/magic.h 2012-05-21 16:15:05.000000000 +0000
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
@@ -8372,9 +8461,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/magic.h linux-3.6.10-vs2.3.4.6/
#define AUTOFS_SUPER_MAGIC 0x0187
#define CODA_SUPER_MAGIC 0x73757245
#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
-diff -NurpP --minimal linux-3.6.10/include/linux/major.h linux-3.6.10-vs2.3.4.6/include/linux/major.h
---- linux-3.6.10/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/major.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/major.h linux-3.4.45-vs2.3.3.9/include/linux/major.h
+--- linux-3.4.45/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/major.h 2012-05-21 16:15:05.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -8383,10 +8472,10 @@ diff -NurpP --minimal linux-3.6.10/include/linux/major.h linux-3.6.10-vs2.3.4.6/
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.6.10/include/linux/memcontrol.h linux-3.6.10-vs2.3.4.6/include/linux/memcontrol.h
---- linux-3.6.10/include/linux/memcontrol.h 2012-10-04 13:27:45.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/memcontrol.h 2012-10-04 16:47:00.000000000 +0000
-@@ -83,6 +83,13 @@ extern struct mem_cgroup *try_get_mem_cg
+diff -NurpP --minimal linux-3.4.45/include/linux/memcontrol.h linux-3.4.45-vs2.3.3.9/include/linux/memcontrol.h
+--- linux-3.4.45/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/memcontrol.h 2012-05-21 16:15:05.000000000 +0000
+@@ -88,6 +88,13 @@ extern struct mem_cgroup *try_get_mem_cg
extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
@@ -8400,21 +8489,21 @@ diff -NurpP --minimal linux-3.6.10/include/linux/memcontrol.h linux-3.6.10-vs2.3
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-3.6.10/include/linux/mm_types.h linux-3.6.10-vs2.3.4.6/include/linux/mm_types.h
---- linux-3.6.10/include/linux/mm_types.h 2012-10-04 13:27:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/mm_types.h 2012-10-04 16:47:00.000000000 +0000
-@@ -370,6 +370,7 @@ struct mm_struct {
+diff -NurpP --minimal linux-3.4.45/include/linux/mm_types.h linux-3.4.45-vs2.3.3.9/include/linux/mm_types.h
+--- linux-3.4.45/include/linux/mm_types.h 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/mm_types.h 2012-07-17 22:29:43.000000000 +0000
+@@ -353,6 +353,7 @@ struct mm_struct {
/* Architecture-specific MM context */
mm_context_t context;
+ struct vx_info *mm_vx_info;
- unsigned long flags; /* Must use atomic bitops to access the bits */
-
-diff -NurpP --minimal linux-3.6.10/include/linux/mmzone.h linux-3.6.10-vs2.3.4.6/include/linux/mmzone.h
---- linux-3.6.10/include/linux/mmzone.h 2012-12-11 11:36:59.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/mmzone.h 2012-12-08 00:36:33.000000000 +0000
-@@ -727,6 +727,13 @@ typedef struct pglist_data {
+ /* Swap token stuff */
+ /*
+diff -NurpP --minimal linux-3.4.45/include/linux/mmzone.h linux-3.4.45-vs2.3.3.9/include/linux/mmzone.h
+--- linux-3.4.45/include/linux/mmzone.h 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/mmzone.h 2012-07-17 22:29:43.000000000 +0000
+@@ -684,6 +684,13 @@ typedef struct pglist_data {
__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
})
@@ -8428,9 +8517,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/mmzone.h linux-3.6.10-vs2.3.4.6
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.6.10/include/linux/mount.h linux-3.6.10-vs2.3.4.6/include/linux/mount.h
---- linux-3.6.10/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/mount.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/mount.h linux-3.4.45-vs2.3.3.9/include/linux/mount.h
+--- linux-3.4.45/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/mount.h 2012-05-21 16:15:05.000000000 +0000
@@ -47,6 +47,9 @@ struct mnt_namespace;
#define MNT_INTERNAL 0x4000
@@ -8441,9 +8530,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/mount.h linux-3.6.10-vs2.3.4.6/
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-3.6.10/include/linux/net.h linux-3.6.10-vs2.3.4.6/include/linux/net.h
---- linux-3.6.10/include/linux/net.h 2012-10-04 13:27:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/net.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/net.h linux-3.4.45-vs2.3.3.9/include/linux/net.h
+--- linux-3.4.45/include/linux/net.h 2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/net.h 2012-09-01 08:51:18.000000000 +0000
@@ -73,6 +73,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
@@ -8452,10 +8541,10 @@ diff -NurpP --minimal linux-3.6.10/include/linux/net.h linux-3.6.10-vs2.3.4.6/in
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.6.10/include/linux/netdevice.h linux-3.6.10-vs2.3.4.6/include/linux/netdevice.h
---- linux-3.6.10/include/linux/netdevice.h 2012-10-04 13:27:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/netdevice.h 2012-10-04 16:47:00.000000000 +0000
-@@ -1651,6 +1651,7 @@ extern void netdev_resync_ops(struct ne
+diff -NurpP --minimal linux-3.4.45/include/linux/netdevice.h linux-3.4.45-vs2.3.3.9/include/linux/netdevice.h
+--- linux-3.4.45/include/linux/netdevice.h 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/netdevice.h 2013-05-13 18:16:08.000000000 +0000
+@@ -1624,6 +1624,7 @@ extern void netdev_resync_ops(struct ne
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
extern struct net_device *__dev_get_by_index(struct net *net, int ifindex);
@@ -8463,9 +8552,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/netdevice.h linux-3.6.10-vs2.3.
extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
extern int dev_restart(struct net_device *dev);
#ifdef CONFIG_NETPOLL_TRAP
-diff -NurpP --minimal linux-3.6.10/include/linux/nfs_mount.h linux-3.6.10-vs2.3.4.6/include/linux/nfs_mount.h
---- linux-3.6.10/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/nfs_mount.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/nfs_mount.h linux-3.4.45-vs2.3.3.9/include/linux/nfs_mount.h
+--- linux-3.4.45/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/nfs_mount.h 2012-05-21 16:15:05.000000000 +0000
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -8476,9 +8565,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/nfs_mount.h linux-3.6.10-vs2.3.
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.6.10/include/linux/nsproxy.h linux-3.6.10-vs2.3.4.6/include/linux/nsproxy.h
---- linux-3.6.10/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/nsproxy.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/nsproxy.h linux-3.4.45-vs2.3.3.9/include/linux/nsproxy.h
+--- linux-3.4.45/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 16:15:05.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -8528,9 +8617,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/nsproxy.h linux-3.6.10-vs2.3.4.
}
#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/pid.h linux-3.6.10-vs2.3.4.6/include/linux/pid.h
---- linux-3.6.10/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/pid.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/pid.h linux-3.4.45-vs2.3.3.9/include/linux/pid.h
+--- linux-3.4.45/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/pid.h 2012-05-21 16:15:05.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -8549,13 +8638,13 @@ diff -NurpP --minimal linux-3.6.10/include/linux/pid.h linux-3.6.10-vs2.3.4.6/in
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.6.10/include/linux/proc_fs.h linux-3.6.10-vs2.3.4.6/include/linux/proc_fs.h
---- linux-3.6.10/include/linux/proc_fs.h 2012-07-22 21:39:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/proc_fs.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/proc_fs.h linux-3.4.45-vs2.3.3.9/include/linux/proc_fs.h
+--- linux-3.4.45/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/proc_fs.h 2012-05-21 16:15:05.000000000 +0000
@@ -54,6 +54,7 @@ struct proc_dir_entry {
nlink_t nlink;
- kuid_t uid;
- kgid_t gid;
+ uid_t uid;
+ gid_t gid;
+ int vx_flags;
loff_t size;
const struct inode_operations *proc_iops;
@@ -8587,9 +8676,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/proc_fs.h linux-3.6.10-vs2.3.4.
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.6.10/include/linux/quotaops.h linux-3.6.10-vs2.3.4.6/include/linux/quotaops.h
---- linux-3.6.10/include/linux/quotaops.h 2012-10-04 13:27:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/quotaops.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/quotaops.h linux-3.4.45-vs2.3.3.9/include/linux/quotaops.h
+--- linux-3.4.45/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 16:15:05.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -8598,7 +8687,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/quotaops.h linux-3.6.10-vs2.3.4
#define DQUOT_SPACE_WARN 0x1
#define DQUOT_SPACE_RESERVE 0x2
-@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino
+@@ -204,11 +205,12 @@ static inline void dquot_drop(struct ino
static inline int dquot_alloc_inode(const struct inode *inode)
{
@@ -8612,7 +8701,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/quotaops.h linux-3.6.10-vs2.3.4
}
static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
-@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct
+@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct
static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
int flags)
{
@@ -8623,7 +8712,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/quotaops.h linux-3.6.10-vs2.3.4
if (!(flags & DQUOT_SPACE_RESERVE))
inode_add_bytes(inode, number);
return 0;
-@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st
+@@ -229,6 +235,7 @@ static inline void __dquot_free_space(st
{
if (!(flags & DQUOT_SPACE_RESERVE))
inode_sub_bytes(inode, number);
@@ -8631,9 +8720,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/quotaops.h linux-3.6.10-vs2.3.4
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.6.10/include/linux/reboot.h linux-3.6.10-vs2.3.4.6/include/linux/reboot.h
---- linux-3.6.10/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/reboot.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/reboot.h linux-3.4.45-vs2.3.3.9/include/linux/reboot.h
+--- linux-3.4.45/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/reboot.h 2012-05-21 16:15:05.000000000 +0000
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -8642,12 +8731,12 @@ diff -NurpP --minimal linux-3.6.10/include/linux/reboot.h linux-3.6.10-vs2.3.4.6
#ifdef __KERNEL__
-diff -NurpP --minimal linux-3.6.10/include/linux/sched.h linux-3.6.10-vs2.3.4.6/include/linux/sched.h
---- linux-3.6.10/include/linux/sched.h 2012-10-04 13:27:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/sched.h 2012-10-04 16:47:00.000000000 +0000
-@@ -1422,6 +1422,14 @@ struct task_struct {
+diff -NurpP --minimal linux-3.4.45/include/linux/sched.h linux-3.4.45-vs2.3.3.9/include/linux/sched.h
+--- linux-3.4.45/include/linux/sched.h 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sched.h 2013-02-11 23:37:30.000000000 +0000
+@@ -1455,6 +1455,14 @@ struct task_struct {
#endif
- struct seccomp seccomp;
+ seccomp_t seccomp;
+/* vserver context data */
+ struct vx_info *vx_info;
@@ -8660,7 +8749,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/sched.h linux-3.6.10-vs2.3.4.6/
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1668,6 +1676,11 @@ struct pid_namespace;
+@@ -1699,6 +1707,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
@@ -8672,7 +8761,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/sched.h linux-3.6.10-vs2.3.4.6/
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1681,7 +1694,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1712,7 +1725,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
@@ -8682,7 +8771,7 @@ diff -NurpP --minimal linux-3.6.10/include/linux/sched.h linux-3.6.10-vs2.3.4.6/
}
-@@ -1694,7 +1708,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1725,7 +1739,7 @@ pid_t task_tgid_nr_ns(struct task_struct
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
{
@@ -8691,9 +8780,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/sched.h linux-3.6.10-vs2.3.4.6/
}
-diff -NurpP --minimal linux-3.6.10/include/linux/shmem_fs.h linux-3.6.10-vs2.3.4.6/include/linux/shmem_fs.h
---- linux-3.6.10/include/linux/shmem_fs.h 2012-07-22 21:39:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/shmem_fs.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/shmem_fs.h linux-3.4.45-vs2.3.3.9/include/linux/shmem_fs.h
+--- linux-3.4.45/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/shmem_fs.h 2012-05-21 16:15:05.000000000 +0000
@@ -8,6 +8,9 @@
/* inode in-kernel data */
@@ -8704,20 +8793,20 @@ diff -NurpP --minimal linux-3.6.10/include/linux/shmem_fs.h linux-3.6.10-vs2.3.4
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.6.10/include/linux/stat.h linux-3.6.10-vs2.3.4.6/include/linux/stat.h
---- linux-3.6.10/include/linux/stat.h 2012-07-22 21:39:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/stat.h 2012-10-04 16:47:00.000000000 +0000
-@@ -67,6 +67,7 @@ struct kstat {
+diff -NurpP --minimal linux-3.4.45/include/linux/stat.h linux-3.4.45-vs2.3.3.9/include/linux/stat.h
+--- linux-3.4.45/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/stat.h 2012-05-21 16:15:05.000000000 +0000
+@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
- kuid_t uid;
- kgid_t gid;
+ uid_t uid;
+ gid_t gid;
+ tag_t tag;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.6.10/include/linux/sunrpc/auth.h linux-3.6.10-vs2.3.4.6/include/linux/sunrpc/auth.h
---- linux-3.6.10/include/linux/sunrpc/auth.h 2012-10-04 13:27:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/sunrpc/auth.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/sunrpc/auth.h linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/auth.h
+--- linux-3.4.45/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/auth.h 2012-05-21 16:15:05.000000000 +0000
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
@@ -8726,9 +8815,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/sunrpc/auth.h linux-3.6.10-vs2.
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.6.10/include/linux/sunrpc/clnt.h linux-3.6.10-vs2.3.4.6/include/linux/sunrpc/clnt.h
---- linux-3.6.10/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/sunrpc/clnt.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/sunrpc/clnt.h linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/clnt.h
+--- linux-3.4.45/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/clnt.h 2012-05-21 16:15:05.000000000 +0000
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
@@ -8739,9 +8828,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/sunrpc/clnt.h linux-3.6.10-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.6.10/include/linux/sysctl.h linux-3.6.10-vs2.3.4.6/include/linux/sysctl.h
---- linux-3.6.10/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/sysctl.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/sysctl.h linux-3.4.45-vs2.3.3.9/include/linux/sysctl.h
+--- linux-3.4.45/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sysctl.h 2012-05-21 16:15:05.000000000 +0000
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -8758,9 +8847,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/sysctl.h linux-3.6.10-vs2.3.4.6
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.6.10/include/linux/sysfs.h linux-3.6.10-vs2.3.4.6/include/linux/sysfs.h
---- linux-3.6.10/include/linux/sysfs.h 2012-07-22 21:39:44.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/sysfs.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/sysfs.h linux-3.4.45-vs2.3.3.9/include/linux/sysfs.h
+--- linux-3.4.45/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sysfs.h 2012-05-21 16:15:05.000000000 +0000
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <linux/atomic.h>
@@ -8770,10 +8859,10 @@ diff -NurpP --minimal linux-3.6.10/include/linux/sysfs.h linux-3.6.10-vs2.3.4.6/
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.6.10/include/linux/time.h linux-3.6.10-vs2.3.4.6/include/linux/time.h
---- linux-3.6.10/include/linux/time.h 2012-10-04 13:27:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/time.h 2012-10-04 16:47:00.000000000 +0000
-@@ -280,6 +280,8 @@ static __always_inline void timespec_add
+diff -NurpP --minimal linux-3.4.45/include/linux/time.h linux-3.4.45-vs2.3.3.9/include/linux/time.h
+--- linux-3.4.45/include/linux/time.h 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/time.h 2012-10-22 13:09:53.000000000 +0000
+@@ -281,6 +281,8 @@ static __always_inline void timespec_add
a->tv_nsec = ns;
}
@@ -8782,9 +8871,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/time.h linux-3.6.10-vs2.3.4.6/i
#endif /* __KERNEL__ */
/*
-diff -NurpP --minimal linux-3.6.10/include/linux/types.h linux-3.6.10-vs2.3.4.6/include/linux/types.h
---- linux-3.6.10/include/linux/types.h 2012-10-04 13:27:47.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/types.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/types.h linux-3.4.45-vs2.3.3.9/include/linux/types.h
+--- linux-3.4.45/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/types.h 2012-05-21 16:15:05.000000000 +0000
@@ -41,6 +41,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -8795,9 +8884,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/types.h linux-3.6.10-vs2.3.4.6/
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.6.10/include/linux/utsname.h linux-3.6.10-vs2.3.4.6/include/linux/utsname.h
---- linux-3.6.10/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/utsname.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/utsname.h linux-3.4.45-vs2.3.3.9/include/linux/utsname.h
+--- linux-3.4.45/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/utsname.h 2012-05-21 16:15:05.000000000 +0000
@@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts
}
@@ -8824,9 +8913,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/utsname.h linux-3.6.10-vs2.3.4.
}
#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vroot.h linux-3.6.10-vs2.3.4.6/include/linux/vroot.h
---- linux-3.6.10/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vroot.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vroot.h linux-3.4.45-vs2.3.3.9/include/linux/vroot.h
+--- linux-3.4.45/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vroot.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -8879,9 +8968,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vroot.h linux-3.6.10-vs2.3.4.6/
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_base.h linux-3.6.10-vs2.3.4.6/include/linux/vs_base.h
---- linux-3.6.10/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_base.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_base.h linux-3.4.45-vs2.3.3.9/include/linux/vs_base.h
+--- linux-3.4.45/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_base.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -8893,9 +8982,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_base.h linux-3.6.10-vs2.3.4.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_context.h linux-3.6.10-vs2.3.4.6/include/linux/vs_context.h
---- linux-3.6.10/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_context.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_context.h linux-3.4.45-vs2.3.3.9/include/linux/vs_context.h
+--- linux-3.4.45/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_context.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -9139,9 +9228,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_context.h linux-3.6.10-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_cowbl.h linux-3.6.10-vs2.3.4.6/include/linux/vs_cowbl.h
---- linux-3.6.10/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_cowbl.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_cowbl.h linux-3.4.45-vs2.3.3.9/include/linux/vs_cowbl.h
+--- linux-3.4.45/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_cowbl.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -9191,9 +9280,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_cowbl.h linux-3.6.10-vs2.3.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_cvirt.h linux-3.6.10-vs2.3.4.6/include/linux/vs_cvirt.h
---- linux-3.6.10/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_cvirt.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_cvirt.h linux-3.4.45-vs2.3.3.9/include/linux/vs_cvirt.h
+--- linux-3.4.45/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_cvirt.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -9245,9 +9334,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_cvirt.h linux-3.6.10-vs2.3.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_device.h linux-3.6.10-vs2.3.4.6/include/linux/vs_device.h
---- linux-3.6.10/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_device.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_device.h linux-3.4.45-vs2.3.3.9/include/linux/vs_device.h
+--- linux-3.4.45/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_device.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -9294,9 +9383,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_device.h linux-3.6.10-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_dlimit.h linux-3.6.10-vs2.3.4.6/include/linux/vs_dlimit.h
---- linux-3.6.10/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_dlimit.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_dlimit.h linux-3.4.45-vs2.3.3.9/include/linux/vs_dlimit.h
+--- linux-3.4.45/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_dlimit.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -9513,9 +9602,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_dlimit.h linux-3.6.10-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_inet.h linux-3.6.10-vs2.3.4.6/include/linux/vs_inet.h
---- linux-3.6.10/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_inet.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_inet.h linux-3.4.45-vs2.3.3.9/include/linux/vs_inet.h
+--- linux-3.4.45/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_inet.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,353 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -9870,9 +9959,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_inet.h linux-3.6.10-vs2.3.4.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_inet6.h linux-3.6.10-vs2.3.4.6/include/linux/vs_inet6.h
---- linux-3.6.10/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_inet6.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_inet6.h linux-3.4.45-vs2.3.3.9/include/linux/vs_inet6.h
+--- linux-3.4.45/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_inet6.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -10120,9 +10209,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_inet6.h linux-3.6.10-vs2.3.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_limit.h linux-3.6.10-vs2.3.4.6/include/linux/vs_limit.h
---- linux-3.6.10/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_limit.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_limit.h linux-3.4.45-vs2.3.3.9/include/linux/vs_limit.h
+--- linux-3.4.45/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_limit.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -10264,9 +10353,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_limit.h linux-3.6.10-vs2.3.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_network.h linux-3.6.10-vs2.3.4.6/include/linux/vs_network.h
---- linux-3.6.10/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_network.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_network.h linux-3.4.45-vs2.3.3.9/include/linux/vs_network.h
+--- linux-3.4.45/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_network.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -10437,9 +10526,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_network.h linux-3.6.10-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_pid.h linux-3.6.10-vs2.3.4.6/include/linux/vs_pid.h
---- linux-3.6.10/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_pid.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_pid.h linux-3.4.45-vs2.3.3.9/include/linux/vs_pid.h
+--- linux-3.4.45/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_pid.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -10491,9 +10580,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_pid.h linux-3.6.10-vs2.3.4.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_sched.h linux-3.6.10-vs2.3.4.6/include/linux/vs_sched.h
---- linux-3.6.10/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_sched.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_sched.h linux-3.4.45-vs2.3.3.9/include/linux/vs_sched.h
+--- linux-3.4.45/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_sched.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -10535,9 +10624,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_sched.h linux-3.6.10-vs2.3.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_socket.h linux-3.6.10-vs2.3.4.6/include/linux/vs_socket.h
---- linux-3.6.10/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_socket.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_socket.h linux-3.4.45-vs2.3.3.9/include/linux/vs_socket.h
+--- linux-3.4.45/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_socket.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -10606,9 +10695,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_socket.h linux-3.6.10-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_tag.h linux-3.6.10-vs2.3.4.6/include/linux/vs_tag.h
---- linux-3.6.10/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_tag.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_tag.h linux-3.4.45-vs2.3.3.9/include/linux/vs_tag.h
+--- linux-3.4.45/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_tag.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -10657,9 +10746,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_tag.h linux-3.6.10-vs2.3.4.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vs_time.h linux-3.6.10-vs2.3.4.6/include/linux/vs_time.h
---- linux-3.6.10/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vs_time.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_time.h linux-3.4.45-vs2.3.3.9/include/linux/vs_time.h
+--- linux-3.4.45/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_time.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -10680,9 +10769,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vs_time.h linux-3.6.10-vs2.3.4.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/Kbuild linux-3.6.10-vs2.3.4.6/include/linux/vserver/Kbuild
---- linux-3.6.10/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/Kbuild 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/Kbuild linux-3.4.45-vs2.3.3.9/include/linux/vserver/Kbuild
+--- linux-3.4.45/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/Kbuild 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,8 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -10692,9 +10781,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/Kbuild linux-3.6.10-vs2
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/base.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/base.h
---- linux-3.6.10/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/base.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/base.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/base.h
+--- linux-3.4.45/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/base.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,178 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
@@ -10874,9 +10963,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/base.h linux-3.6.10-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cacct.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/cacct.h
---- linux-3.6.10/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/cacct.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct.h
+--- linux-3.4.45/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
@@ -10893,9 +10982,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cacct.h linux-3.6.10-vs
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cacct_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/cacct_cmd.h
---- linux-3.6.10/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/cacct_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_cmd.h
+--- linux-3.4.45/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
@@ -10920,9 +11009,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cacct_cmd.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cacct_def.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/cacct_def.h
---- linux-3.6.10/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/cacct_def.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_def.h
+--- linux-3.4.45/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_def.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
@@ -10967,9 +11056,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cacct_def.h linux-3.6.1
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cacct_int.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/cacct_int.h
---- linux-3.6.10/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/cacct_int.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_int.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_int.h
+--- linux-3.4.45/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_int.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
@@ -10992,9 +11081,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cacct_int.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/check.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/check.h
---- linux-3.6.10/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/check.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/check.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/check.h
+--- linux-3.4.45/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/check.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
@@ -11085,9 +11174,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/check.h linux-3.6.10-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/context.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/context.h
---- linux-3.6.10/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/context.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/context.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/context.h
+--- linux-3.4.45/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/context.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,188 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
@@ -11277,9 +11366,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/context.h linux-3.6.10-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/context_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/context_cmd.h
---- linux-3.6.10/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/context_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/context_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/context_cmd.h
+--- linux-3.4.45/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/context_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,162 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
@@ -11443,9 +11532,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/context_cmd.h linux-3.6
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cvirt.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/cvirt.h
---- linux-3.6.10/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/cvirt.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt.h
+--- linux-3.4.45/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,22 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -11469,9 +11558,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cvirt.h linux-3.6.10-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cvirt_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/cvirt_cmd.h
---- linux-3.6.10/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/cvirt_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h
+--- linux-3.4.45/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
@@ -11526,9 +11615,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cvirt_cmd.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cvirt_def.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/cvirt_def.h
---- linux-3.6.10/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/cvirt_def.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_def.h
+--- linux-3.4.45/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_def.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
@@ -11610,9 +11699,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/cvirt_def.h linux-3.6.1
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/debug.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/debug.h
---- linux-3.6.10/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/debug.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/debug.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug.h
+--- linux-3.4.45/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,145 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
@@ -11759,9 +11848,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/debug.h linux-3.6.10-vs
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/debug_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/debug_cmd.h
---- linux-3.6.10/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/debug_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/debug_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug_cmd.h
+--- linux-3.4.45/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
@@ -11821,9 +11910,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/debug_cmd.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/device.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/device.h
---- linux-3.6.10/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/device.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device.h
+--- linux-3.4.45/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/device.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
@@ -11840,9 +11929,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/device.h linux-3.6.10-v
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/device_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/device_cmd.h
---- linux-3.6.10/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/device_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_cmd.h
+--- linux-3.4.45/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,44 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
@@ -11888,9 +11977,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/device_cmd.h linux-3.6.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/device_def.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/device_def.h
---- linux-3.6.10/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/device_def.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_def.h
+--- linux-3.4.45/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_def.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
@@ -11909,9 +11998,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/device_def.h linux-3.6.
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/dlimit.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/dlimit.h
---- linux-3.6.10/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/dlimit.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/dlimit.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit.h
+--- linux-3.4.45/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
@@ -11967,9 +12056,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/dlimit.h linux-3.6.10-v
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/dlimit_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/dlimit_cmd.h
---- linux-3.6.10/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/dlimit_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/dlimit_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h
+--- linux-3.4.45/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,109 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
@@ -12080,9 +12169,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/dlimit_cmd.h linux-3.6.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/global.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/global.h
---- linux-3.6.10/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/global.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/global.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/global.h
+--- linux-3.4.45/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/global.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
@@ -12103,9 +12192,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/global.h linux-3.6.10-v
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/history.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/history.h
---- linux-3.6.10/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/history.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/history.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/history.h
+--- linux-3.4.45/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/history.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
@@ -12304,9 +12393,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/history.h linux-3.6.10-
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/inode.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/inode.h
---- linux-3.6.10/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/inode.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/inode.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode.h
+--- linux-3.4.45/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,39 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
@@ -12347,9 +12436,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/inode.h linux-3.6.10-vs
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/inode_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/inode_cmd.h
---- linux-3.6.10/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/inode_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/inode_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode_cmd.h
+--- linux-3.4.45/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
@@ -12410,9 +12499,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/inode_cmd.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/limit.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/limit.h
---- linux-3.6.10/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/limit.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit.h
+--- linux-3.4.45/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
@@ -12485,9 +12574,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/limit.h linux-3.6.10-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/limit_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/limit_cmd.h
---- linux-3.6.10/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/limit_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_cmd.h
+--- linux-3.4.45/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
@@ -12560,9 +12649,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/limit_cmd.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/limit_def.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/limit_def.h
---- linux-3.6.10/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/limit_def.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_def.h
+--- linux-3.4.45/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_def.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
@@ -12611,9 +12700,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/limit_def.h linux-3.6.1
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/limit_int.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/limit_int.h
---- linux-3.6.10/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/limit_int.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_int.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_int.h
+--- linux-3.4.45/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_int.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
@@ -12813,9 +12902,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/limit_int.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/monitor.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/monitor.h
---- linux-3.6.10/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/monitor.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/monitor.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/monitor.h
+--- linux-3.4.45/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/monitor.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
@@ -12913,9 +13002,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/monitor.h linux-3.6.10-
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/network.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/network.h
---- linux-3.6.10/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/network.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/network.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/network.h
+--- linux-3.4.45/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/network.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,148 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
@@ -13065,9 +13154,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/network.h linux-3.6.10-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/network_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/network_cmd.h
---- linux-3.6.10/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/network_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/network_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/network_cmd.h
+--- linux-3.4.45/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/network_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,164 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
@@ -13233,9 +13322,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/network_cmd.h linux-3.6
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/percpu.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/percpu.h
---- linux-3.6.10/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/percpu.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/percpu.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/percpu.h
+--- linux-3.4.45/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/percpu.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VX_PERCPU_H
+#define _VX_PERCPU_H
@@ -13251,9 +13340,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/percpu.h linux-3.6.10-v
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/pid.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/pid.h
---- linux-3.6.10/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/pid.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/pid.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/pid.h
+--- linux-3.4.45/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/pid.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
@@ -13306,9 +13395,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/pid.h linux-3.6.10-vs2.
+}
+
+#endif
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/sched.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/sched.h
---- linux-3.6.10/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/sched.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched.h
+--- linux-3.4.45/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
@@ -13333,9 +13422,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/sched.h linux-3.6.10-vs
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/sched_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/sched_cmd.h
---- linux-3.6.10/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/sched_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_cmd.h
+--- linux-3.4.45/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,21 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
@@ -13358,9 +13447,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/sched_cmd.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/sched_def.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/sched_def.h
---- linux-3.6.10/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/sched_def.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_def.h
+--- linux-3.4.45/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_def.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
@@ -13400,9 +13489,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/sched_def.h linux-3.6.1
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/signal.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/signal.h
---- linux-3.6.10/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/signal.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/signal.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal.h
+--- linux-3.4.45/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
@@ -13418,9 +13507,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/signal.h linux-3.6.10-v
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/signal_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/signal_cmd.h
---- linux-3.6.10/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/signal_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/signal_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal_cmd.h
+--- linux-3.4.45/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
@@ -13465,9 +13554,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/signal_cmd.h linux-3.6.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/space.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/space.h
---- linux-3.6.10/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/space.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/space.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/space.h
+--- linux-3.4.45/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/space.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _VX_SPACE_H
+#define _VX_SPACE_H
@@ -13481,9 +13570,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/space.h linux-3.6.10-vs
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/space_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/space_cmd.h
---- linux-3.6.10/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/space_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/space_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/space_cmd.h
+--- linux-3.4.45/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/space_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VX_SPACE_CMD_H
+#define _VX_SPACE_CMD_H
@@ -13523,9 +13612,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/space_cmd.h linux-3.6.1
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/switch.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/switch.h
---- linux-3.6.10/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/switch.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/switch.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/switch.h
+--- linux-3.4.45/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/switch.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
@@ -13625,9 +13714,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/switch.h linux-3.6.10-v
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/tag.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/tag.h
---- linux-3.6.10/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/tag.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/tag.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag.h
+--- linux-3.4.45/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,143 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
@@ -13772,9 +13861,9 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/tag.h linux-3.6.10-vs2.
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.6.10/include/linux/vserver/tag_cmd.h linux-3.6.10-vs2.3.4.6/include/linux/vserver/tag_cmd.h
---- linux-3.6.10/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/linux/vserver/tag_cmd.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/tag_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag_cmd.h
+--- linux-3.4.45/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag_cmd.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,22 @@
+#ifndef _VX_TAG_CMD_H
+#define _VX_TAG_CMD_H
@@ -13798,10 +13887,10 @@ diff -NurpP --minimal linux-3.6.10/include/linux/vserver/tag_cmd.h linux-3.6.10-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.6.10/include/net/addrconf.h linux-3.6.10-vs2.3.4.6/include/net/addrconf.h
---- linux-3.6.10/include/net/addrconf.h 2012-10-04 13:27:47.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/net/addrconf.h 2012-10-04 16:47:00.000000000 +0000
-@@ -81,7 +81,8 @@ extern int ipv6_dev_get_saddr(struct n
+diff -NurpP --minimal linux-3.4.45/include/net/addrconf.h linux-3.4.45-vs2.3.3.9/include/net/addrconf.h
+--- linux-3.4.45/include/net/addrconf.h 2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/addrconf.h 2012-05-21 16:15:05.000000000 +0000
+@@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n
struct net_device *dev,
const struct in6_addr *daddr,
unsigned int srcprefs,
@@ -13811,9 +13900,9 @@ diff -NurpP --minimal linux-3.6.10/include/net/addrconf.h linux-3.6.10-vs2.3.4.6
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-3.6.10/include/net/af_unix.h linux-3.6.10-vs2.3.4.6/include/net/af_unix.h
---- linux-3.6.10/include/net/af_unix.h 2012-10-04 13:27:47.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/net/af_unix.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/net/af_unix.h linux-3.4.45-vs2.3.3.9/include/net/af_unix.h
+--- linux-3.4.45/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/af_unix.h 2012-05-21 16:15:05.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
@@ -13822,9 +13911,9 @@ diff -NurpP --minimal linux-3.6.10/include/net/af_unix.h linux-3.6.10-vs2.3.4.6/
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.6.10/include/net/inet_timewait_sock.h linux-3.6.10-vs2.3.4.6/include/net/inet_timewait_sock.h
---- linux-3.6.10/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/net/inet_timewait_sock.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/include/net/inet_timewait_sock.h linux-3.4.45-vs2.3.3.9/include/net/inet_timewait_sock.h
+--- linux-3.4.45/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/inet_timewait_sock.h 2012-05-21 16:15:05.000000000 +0000
@@ -112,6 +112,10 @@ struct inet_timewait_sock {
#define tw_net __tw_common.skc_net
#define tw_daddr __tw_common.skc_daddr
@@ -13836,10 +13925,10 @@ diff -NurpP --minimal linux-3.6.10/include/net/inet_timewait_sock.h linux-3.6.10
int tw_timeout;
volatile unsigned char tw_substate;
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-3.6.10/include/net/ip6_route.h linux-3.6.10-vs2.3.4.6/include/net/ip6_route.h
---- linux-3.6.10/include/net/ip6_route.h 2012-10-04 13:27:47.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/net/ip6_route.h 2012-10-04 16:47:00.000000000 +0000
-@@ -97,7 +97,8 @@ extern int ip6_route_get_saddr(struct
+diff -NurpP --minimal linux-3.4.45/include/net/ip6_route.h linux-3.4.45-vs2.3.3.9/include/net/ip6_route.h
+--- linux-3.4.45/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/ip6_route.h 2012-05-21 16:15:05.000000000 +0000
+@@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct
struct rt6_info *rt,
const struct in6_addr *daddr,
unsigned int prefs,
@@ -13849,10 +13938,10 @@ diff -NurpP --minimal linux-3.6.10/include/net/ip6_route.h linux-3.6.10-vs2.3.4.
extern struct rt6_info *rt6_lookup(struct net *net,
const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.6.10/include/net/route.h linux-3.6.10-vs2.3.4.6/include/net/route.h
---- linux-3.6.10/include/net/route.h 2012-12-11 11:36:59.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/net/route.h 2012-11-06 17:43:41.000000000 +0000
-@@ -204,6 +204,9 @@ static inline void ip_rt_put(struct rtab
+diff -NurpP --minimal linux-3.4.45/include/net/route.h linux-3.4.45-vs2.3.3.9/include/net/route.h
+--- linux-3.4.45/include/net/route.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/route.h 2012-05-21 16:15:05.000000000 +0000
+@@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
@@ -13899,10 +13988,10 @@ diff -NurpP --minimal linux-3.6.10/include/net/route.h linux-3.6.10-vs2.3.4.6/in
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.6.10/include/net/sock.h linux-3.6.10-vs2.3.4.6/include/net/sock.h
---- linux-3.6.10/include/net/sock.h 2012-10-04 13:27:47.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/include/net/sock.h 2012-10-04 16:47:00.000000000 +0000
-@@ -171,6 +171,10 @@ struct sock_common {
+diff -NurpP --minimal linux-3.4.45/include/net/sock.h linux-3.4.45-vs2.3.3.9/include/net/sock.h
+--- linux-3.4.45/include/net/sock.h 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/sock.h 2013-03-02 15:26:44.000000000 +0000
+@@ -170,6 +170,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
#endif
@@ -13913,7 +14002,7 @@ diff -NurpP --minimal linux-3.6.10/include/net/sock.h linux-3.6.10-vs2.3.4.6/inc
/*
* fields between dontcopy_begin/dontcopy_end
* are not copied in sock_copy()
-@@ -284,6 +288,10 @@ struct sock {
+@@ -282,6 +286,10 @@ struct sock {
#define sk_bind_node __sk_common.skc_bind_node
#define sk_prot __sk_common.skc_prot
#define sk_net __sk_common.skc_net
@@ -13924,10 +14013,10 @@ diff -NurpP --minimal linux-3.6.10/include/net/sock.h linux-3.6.10-vs2.3.4.6/inc
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-diff -NurpP --minimal linux-3.6.10/init/Kconfig linux-3.6.10-vs2.3.4.6/init/Kconfig
---- linux-3.6.10/init/Kconfig 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/init/Kconfig 2012-10-04 16:47:00.000000000 +0000
-@@ -624,6 +624,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
+diff -NurpP --minimal linux-3.4.45/init/Kconfig linux-3.4.45-vs2.3.3.9/init/Kconfig
+--- linux-3.4.45/init/Kconfig 2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/init/Kconfig 2012-05-21 16:15:05.000000000 +0000
+@@ -579,6 +579,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
menuconfig CGROUPS
boolean "Control Group support"
depends on EVENTFD
@@ -13935,29 +14024,29 @@ diff -NurpP --minimal linux-3.6.10/init/Kconfig linux-3.6.10-vs2.3.4.6/init/Kcon
help
This option adds support for grouping sets of processes together, for
use with process control subsystems such as Cpusets, CFS, memory
-@@ -889,6 +890,7 @@ config USER_NS
+@@ -828,6 +829,7 @@ config IPC_NS
+ config USER_NS
bool "User namespace (EXPERIMENTAL)"
depends on EXPERIMENTAL
- depends on UIDGID_CONVERTED
+ depends on VSERVER_DISABLED
- select UIDGID_STRICT_TYPE_CHECKS
-
- default n
-diff -NurpP --minimal linux-3.6.10/init/main.c linux-3.6.10-vs2.3.4.6/init/main.c
---- linux-3.6.10/init/main.c 2012-12-11 11:36:59.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/init/main.c 2012-11-06 17:43:41.000000000 +0000
-@@ -69,6 +69,7 @@
+ default y
+ help
+ This allows containers, i.e. vservers, to use user namespaces
+diff -NurpP --minimal linux-3.4.45/init/main.c linux-3.4.45-vs2.3.3.9/init/main.c
+--- linux-3.4.45/init/main.c 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/init/main.c 2013-02-19 14:42:56.000000000 +0000
+@@ -68,6 +68,7 @@
+ #include <linux/shmem_fs.h>
#include <linux/slab.h>
#include <linux/perf_event.h>
- #include <linux/file.h>
+#include <linux/vserver/percpu.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.6.10/ipc/mqueue.c linux-3.6.10-vs2.3.4.6/ipc/mqueue.c
---- linux-3.6.10/ipc/mqueue.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/ipc/mqueue.c 2012-10-04 16:47:00.000000000 +0000
-@@ -35,6 +35,8 @@
+diff -NurpP --minimal linux-3.4.45/ipc/mqueue.c linux-3.4.45-vs2.3.3.9/ipc/mqueue.c
+--- linux-3.4.45/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/mqueue.c 2012-05-21 16:15:05.000000000 +0000
+@@ -34,6 +34,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
#include <linux/slab.h>
@@ -13966,31 +14055,31 @@ diff -NurpP --minimal linux-3.6.10/ipc/mqueue.c linux-3.6.10-vs2.3.4.6/ipc/mqueu
#include <net/sock.h>
#include "util.h"
-@@ -76,6 +78,7 @@ struct mqueue_inode_info {
+@@ -67,6 +69,7 @@ struct mqueue_inode_info {
+ struct sigevent notify;
struct pid* notify_owner;
- struct user_namespace *notify_user_ns;
struct user_struct *user; /* user who created, for accounting */
+ struct vx_info *vxi;
struct sock *notify_sock;
struct sk_buff *notify_cookie;
-@@ -235,6 +238,7 @@ static struct inode *mqueue_get_inode(st
+@@ -129,6 +132,7 @@ static struct inode *mqueue_get_inode(st
if (S_ISREG(mode)) {
struct mqueue_inode_info *info;
- unsigned long mq_bytes, mq_treesize;
+ unsigned long mq_bytes, mq_msg_tblsz;
+ struct vx_info *vxi = current_vx_info();
inode->i_fop = &mqueue_file_operations;
inode->i_size = FILENT_SIZE;
-@@ -248,6 +252,7 @@ static struct inode *mqueue_get_inode(st
- info->notify_user_ns = NULL;
+@@ -141,6 +145,7 @@ static struct inode *mqueue_get_inode(st
+ info->notify_owner = NULL;
info->qsize = 0;
info->user = NULL; /* set when all is ok */
+ info->vxi = NULL;
- info->msg_tree = RB_ROOT;
- info->node_cache = NULL;
memset(&info->attr, 0, sizeof(info->attr));
-@@ -281,17 +286,20 @@ static struct inode *mqueue_get_inode(st
+ info->attr.mq_maxmsg = ipc_ns->mq_msg_max;
+ info->attr.mq_msgsize = ipc_ns->mq_msgsize_max;
+@@ -158,17 +163,20 @@ static struct inode *mqueue_get_inode(st
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
@@ -14012,8 +14101,8 @@ diff -NurpP --minimal linux-3.6.10/ipc/mqueue.c linux-3.6.10-vs2.3.4.6/ipc/mqueu
} else if (S_ISDIR(mode)) {
inc_nlink(inode);
/* Some things misbehave if size == 0 on a directory */
-@@ -395,8 +403,11 @@ static void mqueue_evict_inode(struct in
-
+@@ -267,8 +275,11 @@ static void mqueue_evict_inode(struct in
+ + info->attr.mq_msgsize);
user = info->user;
if (user) {
+ struct vx_info *vxi = info->vxi;
@@ -14024,7 +14113,7 @@ diff -NurpP --minimal linux-3.6.10/ipc/mqueue.c linux-3.6.10-vs2.3.4.6/ipc/mqueu
/*
* get_ns_from_inode() ensures that the
* (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
-@@ -406,6 +417,7 @@ static void mqueue_evict_inode(struct in
+@@ -278,6 +289,7 @@ static void mqueue_evict_inode(struct in
if (ipc_ns)
ipc_ns->mq_queues_count--;
spin_unlock(&mq_lock);
@@ -14032,9 +14121,9 @@ diff -NurpP --minimal linux-3.6.10/ipc/mqueue.c linux-3.6.10-vs2.3.4.6/ipc/mqueu
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.6.10/ipc/msg.c linux-3.6.10-vs2.3.4.6/ipc/msg.c
---- linux-3.6.10/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/ipc/msg.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/ipc/msg.c linux-3.4.45-vs2.3.3.9/ipc/msg.c
+--- linux-3.4.45/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/msg.c 2012-05-21 16:15:05.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -14051,9 +14140,9 @@ diff -NurpP --minimal linux-3.6.10/ipc/msg.c linux-3.6.10-vs2.3.4.6/ipc/msg.c
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.6.10/ipc/namespace.c linux-3.6.10-vs2.3.4.6/ipc/namespace.c
---- linux-3.6.10/ipc/namespace.c 2012-07-22 21:39:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/ipc/namespace.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/ipc/namespace.c linux-3.4.45-vs2.3.3.9/ipc/namespace.c
+--- linux-3.4.45/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/namespace.c 2012-05-21 16:15:05.000000000 +0000
@@ -13,11 +13,12 @@
#include <linux/mount.h>
#include <linux/user_namespace.h>
@@ -14069,12 +14158,11 @@ diff -NurpP --minimal linux-3.6.10/ipc/namespace.c linux-3.6.10-vs2.3.4.6/ipc/na
{
struct ipc_namespace *ns;
int err;
-@@ -46,19 +47,19 @@ static struct ipc_namespace *create_ipc_
+@@ -46,19 +47,18 @@ static struct ipc_namespace *create_ipc_
ipcns_notify(IPCNS_CREATED);
register_ipcns_notifier(ns);
-- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
-+ // ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
+- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
+ ns->user_ns = get_user_ns(user_ns);
return ns;
@@ -14095,9 +14183,9 @@ diff -NurpP --minimal linux-3.6.10/ipc/namespace.c linux-3.6.10-vs2.3.4.6/ipc/na
}
/*
-diff -NurpP --minimal linux-3.6.10/ipc/sem.c linux-3.6.10-vs2.3.4.6/ipc/sem.c
---- linux-3.6.10/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/ipc/sem.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/ipc/sem.c linux-3.4.45-vs2.3.3.9/ipc/sem.c
+--- linux-3.4.45/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/sem.c 2012-05-21 16:15:05.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -14135,9 +14223,9 @@ diff -NurpP --minimal linux-3.6.10/ipc/sem.c linux-3.6.10-vs2.3.4.6/ipc/sem.c
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-3.6.10/ipc/shm.c linux-3.6.10-vs2.3.4.6/ipc/shm.c
---- linux-3.6.10/ipc/shm.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/ipc/shm.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/ipc/shm.c linux-3.4.45-vs2.3.3.9/ipc/shm.c
+--- linux-3.4.45/ipc/shm.c 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/shm.c 2013-05-13 18:16:08.000000000 +0000
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
@@ -14169,7 +14257,7 @@ diff -NurpP --minimal linux-3.6.10/ipc/shm.c linux-3.6.10-vs2.3.4.6/ipc/shm.c
ipc_rcu_putref(shp);
}
-@@ -474,11 +482,15 @@ static int newseg(struct ipc_namespace *
+@@ -462,11 +470,15 @@ static int newseg(struct ipc_namespace *
if (ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
@@ -14185,7 +14273,7 @@ diff -NurpP --minimal linux-3.6.10/ipc/shm.c linux-3.6.10-vs2.3.4.6/ipc/shm.c
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -533,6 +545,7 @@ static int newseg(struct ipc_namespace *
+@@ -521,6 +533,7 @@ static int newseg(struct ipc_namespace *
ns->shm_tot += numpages;
error = shp->shm_perm.id;
shm_unlock(shp);
@@ -14193,21 +14281,21 @@ diff -NurpP --minimal linux-3.6.10/ipc/shm.c linux-3.6.10-vs2.3.4.6/ipc/shm.c
return error;
no_id:
-diff -NurpP --minimal linux-3.6.10/kernel/Makefile linux-3.6.10-vs2.3.4.6/kernel/Makefile
---- linux-3.6.10/kernel/Makefile 2012-07-22 21:39:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/Makefile 2012-10-04 16:47:00.000000000 +0000
-@@ -24,6 +24,7 @@ endif
-
+diff -NurpP --minimal linux-3.4.45/kernel/Makefile linux-3.4.45-vs2.3.3.9/kernel/Makefile
+--- linux-3.4.45/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/Makefile 2012-05-21 16:15:05.000000000 +0000
+@@ -25,6 +25,7 @@ endif
obj-y += sched/
obj-y += power/
-+obj-y += vserver/
- ifeq ($(CONFIG_CHECKPOINT_RESTORE),y)
- obj-$(CONFIG_X86) += kcmp.o
-diff -NurpP --minimal linux-3.6.10/kernel/auditsc.c linux-3.6.10-vs2.3.4.6/kernel/auditsc.c
---- linux-3.6.10/kernel/auditsc.c 2012-07-22 21:39:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/auditsc.c 2012-10-04 16:47:00.000000000 +0000
-@@ -2309,7 +2309,7 @@ int audit_set_loginuid(uid_t loginuid)
++obj-y += vserver/
+ obj-$(CONFIG_FREEZER) += freezer.o
+ obj-$(CONFIG_PROFILING) += profile.o
+ obj-$(CONFIG_STACKTRACE) += stacktrace.o
+diff -NurpP --minimal linux-3.4.45/kernel/auditsc.c linux-3.4.45-vs2.3.3.9/kernel/auditsc.c
+--- linux-3.4.45/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/auditsc.c 2012-05-21 16:15:05.000000000 +0000
+@@ -2308,7 +2308,7 @@ int audit_set_loginuid(uid_t loginuid)
if (task->loginuid != -1)
return -EPERM;
#else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
@@ -14216,9 +14304,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/auditsc.c linux-3.6.10-vs2.3.4.6/kerne
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
-diff -NurpP --minimal linux-3.6.10/kernel/capability.c linux-3.6.10-vs2.3.4.6/kernel/capability.c
---- linux-3.6.10/kernel/capability.c 2012-07-22 21:39:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/capability.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/capability.c linux-3.4.45-vs2.3.3.9/kernel/capability.c
+--- linux-3.4.45/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/capability.c 2012-05-21 16:15:05.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
@@ -14244,9 +14332,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/capability.c linux-3.6.10-vs2.3.4.6/ke
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-3.6.10/kernel/compat.c linux-3.6.10-vs2.3.4.6/kernel/compat.c
---- linux-3.6.10/kernel/compat.c 2012-07-22 21:39:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/compat.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/compat.c linux-3.4.45-vs2.3.3.9/kernel/compat.c
+--- linux-3.4.45/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/compat.c 2012-05-21 16:15:05.000000000 +0000
@@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_
if (err)
return err;
@@ -14256,10 +14344,10 @@ diff -NurpP --minimal linux-3.6.10/kernel/compat.c linux-3.6.10-vs2.3.4.6/kernel
return 0;
}
-diff -NurpP --minimal linux-3.6.10/kernel/cred.c linux-3.6.10-vs2.3.4.6/kernel/cred.c
---- linux-3.6.10/kernel/cred.c 2012-07-22 21:39:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/cred.c 2012-10-04 16:47:00.000000000 +0000
-@@ -70,31 +70,6 @@ struct cred init_cred = {
+diff -NurpP --minimal linux-3.4.45/kernel/cred.c linux-3.4.45-vs2.3.3.9/kernel/cred.c
+--- linux-3.4.45/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/cred.c 2012-05-21 16:15:05.000000000 +0000
+@@ -62,31 +62,6 @@ struct cred init_cred = {
#endif
};
@@ -14291,7 +14379,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/cred.c linux-3.6.10-vs2.3.4.6/kernel/c
/*
* Dispose of the shared task group credentials
*/
-@@ -284,21 +259,16 @@ error:
+@@ -282,21 +257,16 @@ error:
*
* Call commit_creds() or abort_creds() to clean up.
*/
@@ -14314,7 +14402,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/cred.c linux-3.6.10-vs2.3.4.6/kernel/c
memcpy(new, old, sizeof(struct cred));
atomic_set(&new->usage, 1);
-@@ -326,6 +296,13 @@ error:
+@@ -323,6 +293,13 @@ error:
abort_creds(new);
return NULL;
}
@@ -14328,9 +14416,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/cred.c linux-3.6.10-vs2.3.4.6/kernel/c
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.6.10/kernel/exit.c linux-3.6.10-vs2.3.4.6/kernel/exit.c
---- linux-3.6.10/kernel/exit.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/exit.c 2012-12-08 00:20:39.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/exit.c linux-3.4.45-vs2.3.3.9/kernel/exit.c
+--- linux-3.4.45/kernel/exit.c 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/exit.c 2012-12-08 00:54:06.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
@@ -14342,7 +14430,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/exit.c linux-3.6.10-vs2.3.4.6/kernel/e
#include <trace/events/sched.h>
#include <linux/hw_breakpoint.h>
#include <linux/oom.h>
-@@ -494,9 +498,11 @@ static void close_files(struct files_str
+@@ -482,9 +486,11 @@ static void close_files(struct files_str
filp_close(file, files);
cond_resched();
}
@@ -14354,7 +14442,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/exit.c linux-3.6.10-vs2.3.4.6/kernel/e
}
}
}
-@@ -711,15 +717,25 @@ static struct task_struct *find_new_reap
+@@ -699,15 +705,25 @@ static struct task_struct *find_new_reap
__acquires(&tasklist_lock)
{
struct pid_namespace *pid_ns = task_active_pid_ns(father);
@@ -14383,7 +14471,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/exit.c linux-3.6.10-vs2.3.4.6/kernel/e
}
if (unlikely(pid_ns->child_reaper == father)) {
-@@ -757,7 +773,9 @@ static struct task_struct *find_new_reap
+@@ -751,7 +767,9 @@ static struct task_struct *find_new_reap
}
}
@@ -14394,7 +14482,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/exit.c linux-3.6.10-vs2.3.4.6/kernel/e
}
/*
-@@ -808,10 +826,15 @@ static void forget_original_parent(struc
+@@ -802,10 +820,15 @@ static void forget_original_parent(struc
list_for_each_entry_safe(p, n, &father->children, sibling) {
struct task_struct *t = p;
do {
@@ -14412,7 +14500,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/exit.c linux-3.6.10-vs2.3.4.6/kernel/e
}
if (t->pdeath_signal)
group_send_sig_info(t->pdeath_signal,
-@@ -1018,6 +1041,9 @@ void do_exit(long code)
+@@ -1013,6 +1036,9 @@ void do_exit(long code)
*/
ptrace_put_breakpoints(tsk);
@@ -14422,7 +14510,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/exit.c linux-3.6.10-vs2.3.4.6/kernel/e
exit_notify(tsk, group_dead);
#ifdef CONFIG_NUMA
task_lock(tsk);
-@@ -1068,10 +1094,15 @@ void do_exit(long code)
+@@ -1063,10 +1089,15 @@ void do_exit(long code)
smp_mb();
raw_spin_unlock_wait(&tsk->pi_lock);
@@ -14438,29 +14526,29 @@ diff -NurpP --minimal linux-3.6.10/kernel/exit.c linux-3.6.10-vs2.3.4.6/kernel/e
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.6.10/kernel/fork.c linux-3.6.10-vs2.3.4.6/kernel/fork.c
---- linux-3.6.10/kernel/fork.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/fork.c 2012-10-04 16:47:00.000000000 +0000
-@@ -70,6 +70,9 @@
+diff -NurpP --minimal linux-3.4.45/kernel/fork.c linux-3.4.45-vs2.3.3.9/kernel/fork.c
+--- linux-3.4.45/kernel/fork.c 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/fork.c 2012-06-28 14:45:07.000000000 +0000
+@@ -68,6 +68,9 @@
+ #include <linux/oom.h>
#include <linux/khugepaged.h>
#include <linux/signalfd.h>
- #include <linux/uprobes.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -210,6 +213,8 @@ void free_task(struct task_struct *tsk)
- arch_release_thread_info(tsk->stack);
+@@ -170,6 +173,8 @@ void free_task(struct task_struct *tsk)
+ account_kernel_stack(tsk->stack, -1);
free_thread_info(tsk->stack);
rt_mutex_debug_task_free(tsk);
+ clr_vx_info(&tsk->vx_info);
+ clr_nx_info(&tsk->nx_info);
ftrace_graph_exit_task(tsk);
- put_seccomp_filter(tsk);
- arch_release_task_struct(tsk);
-@@ -541,6 +546,7 @@ static struct mm_struct *mm_init(struct
+ free_task_struct(tsk);
+ }
+@@ -507,6 +512,7 @@ static struct mm_struct *mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
mmu_notifier_mm_init(mm);
@@ -14468,7 +14556,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/fork.c linux-3.6.10-vs2.3.4.6/kernel/f
return mm;
}
-@@ -593,6 +599,7 @@ void __mmdrop(struct mm_struct *mm)
+@@ -559,6 +565,7 @@ void __mmdrop(struct mm_struct *mm)
destroy_context(mm);
mmu_notifier_mm_destroy(mm);
check_mm(mm);
@@ -14476,15 +14564,15 @@ diff -NurpP --minimal linux-3.6.10/kernel/fork.c linux-3.6.10-vs2.3.4.6/kernel/f
free_mm(mm);
}
EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -834,6 +841,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -794,6 +801,7 @@ struct mm_struct *dup_mm(struct task_str
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
+ mm->mm_vx_info = NULL;
mm_init_cpumask(mm);
- #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-@@ -874,6 +882,7 @@ fail_nocontext:
+ /* Initializing for Swap token stuff */
+@@ -837,6 +845,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
@@ -14492,7 +14580,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/fork.c linux-3.6.10-vs2.3.4.6/kernel/f
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -1157,6 +1166,8 @@ static struct task_struct *copy_process(
+@@ -1125,6 +1134,8 @@ static struct task_struct *copy_process(
int retval;
struct task_struct *p;
int cgroup_callbacks_done = 0;
@@ -14501,7 +14589,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/fork.c linux-3.6.10-vs2.3.4.6/kernel/f
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -1204,7 +1215,12 @@ static struct task_struct *copy_process(
+@@ -1171,7 +1182,12 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
@@ -14514,7 +14602,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/fork.c linux-3.6.10-vs2.3.4.6/kernel/f
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-@@ -1483,6 +1499,18 @@ static struct task_struct *copy_process(
+@@ -1448,6 +1464,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(&current->sighand->siglock);
@@ -14533,9 +14621,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/fork.c linux-3.6.10-vs2.3.4.6/kernel/f
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.6.10/kernel/kthread.c linux-3.6.10-vs2.3.4.6/kernel/kthread.c
---- linux-3.6.10/kernel/kthread.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/kthread.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/kthread.c linux-3.4.45-vs2.3.3.9/kernel/kthread.c
+--- linux-3.4.45/kernel/kthread.c 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/kthread.c 2012-10-22 13:09:53.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
@@ -14544,9 +14632,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/kthread.c linux-3.6.10-vs2.3.4.6/kerne
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.6.10/kernel/nsproxy.c linux-3.6.10-vs2.3.4.6/kernel/nsproxy.c
---- linux-3.6.10/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/nsproxy.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/nsproxy.c linux-3.4.45-vs2.3.3.9/kernel/nsproxy.c
+--- linux-3.4.45/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/nsproxy.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
@@ -14634,7 +14722,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/nsproxy.c linux-3.6.10-vs2.3.4.6/kerne
+ struct task_struct *tsk, struct fs_struct *new_fs)
+{
+ return unshare_namespaces(flags, tsk->nsproxy,
-+ new_fs, task_cred_xxx(tsk, user_ns),
++ new_fs, task_cred_xxx(tsk, user)->user_ns,
+ task_active_pid_ns(tsk));
+}
+
@@ -14728,9 +14816,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/nsproxy.c linux-3.6.10-vs2.3.4.6/kerne
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.6.10/kernel/pid.c linux-3.6.10-vs2.3.4.6/kernel/pid.c
---- linux-3.6.10/kernel/pid.c 2012-07-22 21:39:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/pid.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/pid.c linux-3.4.45-vs2.3.3.9/kernel/pid.c
+--- linux-3.4.45/kernel/pid.c 2012-03-19 18:47:30.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/pid.c 2012-05-21 16:15:05.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
@@ -14788,9 +14876,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/pid.c linux-3.6.10-vs2.3.4.6/kernel/pi
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.6.10/kernel/pid_namespace.c linux-3.6.10-vs2.3.4.6/kernel/pid_namespace.c
---- linux-3.6.10/kernel/pid_namespace.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/pid_namespace.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/pid_namespace.c linux-3.4.45-vs2.3.3.9/kernel/pid_namespace.c
+--- linux-3.4.45/kernel/pid_namespace.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/pid_namespace.c 2012-05-21 16:15:05.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/slab.h>
#include <linux/proc_fs.h>
@@ -14815,9 +14903,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/pid_namespace.c linux-3.6.10-vs2.3.4.6
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-3.6.10/kernel/posix-timers.c linux-3.6.10-vs2.3.4.6/kernel/posix-timers.c
---- linux-3.6.10/kernel/posix-timers.c 2012-01-09 15:15:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/posix-timers.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/posix-timers.c linux-3.4.45-vs2.3.3.9/kernel/posix-timers.c
+--- linux-3.4.45/kernel/posix-timers.c 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/posix-timers.c 2013-03-30 21:29:17.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
@@ -14853,18 +14941,18 @@ diff -NurpP --minimal linux-3.6.10/kernel/posix-timers.c linux-3.6.10-vs2.3.4.6/
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-3.6.10/kernel/printk.c linux-3.6.10-vs2.3.4.6/kernel/printk.c
---- linux-3.6.10/kernel/printk.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/printk.c 2012-10-04 16:47:00.000000000 +0000
-@@ -42,6 +42,7 @@
+diff -NurpP --minimal linux-3.4.45/kernel/printk.c linux-3.4.45-vs2.3.3.9/kernel/printk.c
+--- linux-3.4.45/kernel/printk.c 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/printk.c 2013-03-02 15:26:44.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <linux/cpu.h>
#include <linux/notifier.h>
#include <linux/rculist.h>
- #include <linux/poll.h>
+#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
-@@ -818,7 +819,7 @@ static int check_syslog_permissions(int
+@@ -317,7 +318,7 @@ static int check_syslog_permissions(int
return 0;
if (syslog_action_restricted(type)) {
@@ -14873,7 +14961,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/printk.c linux-3.6.10-vs2.3.4.6/kernel
return 0;
/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
if (capable(CAP_SYS_ADMIN)) {
-@@ -1111,12 +1112,9 @@ int do_syslog(int type, char __user *buf
+@@ -347,12 +348,9 @@ int do_syslog(int type, char __user *buf
if (error)
return error;
@@ -14889,7 +14977,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/printk.c linux-3.6.10-vs2.3.4.6/kernel
error = -EINVAL;
if (!buf || len < 0)
goto out;
-@@ -1127,6 +1125,16 @@ int do_syslog(int type, char __user *buf
+@@ -363,6 +361,16 @@ int do_syslog(int type, char __user *buf
error = -EFAULT;
goto out;
}
@@ -14904,9 +14992,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/printk.c linux-3.6.10-vs2.3.4.6/kernel
+ break;
+ case SYSLOG_ACTION_READ: /* Read from log */
error = wait_event_interruptible(log_wait,
- syslog_seq != log_next_seq);
+ (log_start - log_end));
if (error)
-@@ -1139,16 +1147,6 @@ int do_syslog(int type, char __user *buf
+@@ -389,16 +397,6 @@ int do_syslog(int type, char __user *buf
/* FALL THRU */
/* Read last kernel messages */
case SYSLOG_ACTION_READ_ALL:
@@ -14920,12 +15008,12 @@ diff -NurpP --minimal linux-3.6.10/kernel/printk.c linux-3.6.10-vs2.3.4.6/kernel
- error = -EFAULT;
- goto out;
- }
- error = syslog_print_all(buf, len, clear);
- break;
- /* Clear ring buffer */
-diff -NurpP --minimal linux-3.6.10/kernel/ptrace.c linux-3.6.10-vs2.3.4.6/kernel/ptrace.c
---- linux-3.6.10/kernel/ptrace.c 2012-07-22 21:39:46.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/ptrace.c 2012-10-04 16:47:00.000000000 +0000
+ count = len;
+ if (count > log_buf_len)
+ count = log_buf_len;
+diff -NurpP --minimal linux-3.4.45/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/kernel/ptrace.c
+--- linux-3.4.45/kernel/ptrace.c 2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/ptrace.c 2013-02-11 23:37:30.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
@@ -14934,7 +15022,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/ptrace.c linux-3.6.10-vs2.3.4.6/kernel
#include <linux/hw_breakpoint.h>
#include <linux/cn_proc.h>
-@@ -216,6 +217,11 @@ ok:
+@@ -256,6 +257,11 @@ ok:
dumpable = get_dumpable(task->mm);
if (!dumpable && !ptrace_has_cap(task_user_ns(task), mode))
return -EPERM;
@@ -14946,9 +15034,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/ptrace.c linux-3.6.10-vs2.3.4.6/kernel
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.6.10/kernel/sched/core.c linux-3.6.10-vs2.3.4.6/kernel/sched/core.c
---- linux-3.6.10/kernel/sched/core.c 2012-12-11 11:37:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/sched/core.c 2012-11-06 17:43:41.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/sched/core.c linux-3.4.45-vs2.3.3.9/kernel/sched/core.c
+--- linux-3.4.45/kernel/sched/core.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sched/core.c 2013-05-13 18:16:08.000000000 +0000
@@ -72,6 +72,8 @@
#include <linux/slab.h>
#include <linux/init_task.h>
@@ -14958,7 +15046,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sched/core.c linux-3.6.10-vs2.3.4.6/ke
#include <asm/switch_to.h>
#include <asm/tlb.h>
-@@ -2223,9 +2225,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
+@@ -2228,9 +2230,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
*/
void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
{
@@ -14979,7 +15067,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sched/core.c linux-3.6.10-vs2.3.4.6/ke
}
static long calc_load_fold_active(struct rq *this_rq)
-@@ -2854,14 +2864,17 @@ static inline void task_group_account_fi
+@@ -2799,14 +2809,17 @@ static inline void task_group_account_fi
void account_user_time(struct task_struct *p, cputime_t cputime,
cputime_t cputime_scaled)
{
@@ -14998,7 +15086,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sched/core.c linux-3.6.10-vs2.3.4.6/ke
/* Add user time to cpustat. */
task_group_account_field(p, index, (__force u64) cputime);
-@@ -2908,9 +2921,12 @@ static inline
+@@ -2853,9 +2866,12 @@ static inline
void __account_system_time(struct task_struct *p, cputime_t cputime,
cputime_t cputime_scaled, int index)
{
@@ -15011,7 +15099,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sched/core.c linux-3.6.10-vs2.3.4.6/ke
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-@@ -4137,7 +4153,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4081,7 +4097,7 @@ SYSCALL_DEFINE1(nice, int, increment)
nice = 19;
if (increment < 0 && !can_nice(current, nice))
@@ -15020,9 +15108,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/sched/core.c linux-3.6.10-vs2.3.4.6/ke
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-3.6.10/kernel/sched/fair.c linux-3.6.10-vs2.3.4.6/kernel/sched/fair.c
---- linux-3.6.10/kernel/sched/fair.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/sched/fair.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/sched/fair.c linux-3.4.45-vs2.3.3.9/kernel/sched/fair.c
+--- linux-3.4.45/kernel/sched/fair.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sched/fair.c 2012-05-21 16:15:05.000000000 +0000
@@ -26,6 +26,7 @@
#include <linux/slab.h>
#include <linux/profile.h>
@@ -15049,19 +15137,19 @@ diff -NurpP --minimal linux-3.6.10/kernel/sched/fair.c linux-3.6.10-vs2.3.4.6/ke
update_cfs_load(cfs_rq, 0);
account_entity_dequeue(cfs_rq, se);
-diff -NurpP --minimal linux-3.6.10/kernel/signal.c linux-3.6.10-vs2.3.4.6/kernel/signal.c
---- linux-3.6.10/kernel/signal.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/signal.c 2012-10-04 16:47:00.000000000 +0000
-@@ -30,6 +30,8 @@
+diff -NurpP --minimal linux-3.4.45/kernel/signal.c linux-3.4.45-vs2.3.3.9/kernel/signal.c
+--- linux-3.4.45/kernel/signal.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/signal.c 2013-05-13 18:16:08.000000000 +0000
+@@ -29,6 +29,8 @@
+ #include <linux/pid_namespace.h>
#include <linux/nsproxy.h>
#include <linux/user_namespace.h>
- #include <linux/uprobes.h>
+#include <linux/vs_context.h>
+#include <linux/vs_pid.h>
#define CREATE_TRACE_POINTS
#include <trace/events/signal.h>
-@@ -790,9 +792,18 @@ static int check_kill_permission(int sig
+@@ -787,9 +789,18 @@ static int check_kill_permission(int sig
struct pid *sid;
int error;
@@ -15080,7 +15168,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/signal.c linux-3.6.10-vs2.3.4.6/kernel
if (!si_fromuser(info))
return 0;
-@@ -816,6 +827,20 @@ static int check_kill_permission(int sig
+@@ -813,6 +824,20 @@ static int check_kill_permission(int sig
}
}
@@ -15101,7 +15189,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/signal.c linux-3.6.10-vs2.3.4.6/kernel
return security_task_kill(t, info, sig, 0);
}
-@@ -1351,7 +1376,7 @@ int kill_pid_info(int sig, struct siginf
+@@ -1355,7 +1380,7 @@ int kill_pid_info(int sig, struct siginf
rcu_read_lock();
retry:
p = pid_task(pid, PIDTYPE_PID);
@@ -15110,7 +15198,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/signal.c linux-3.6.10-vs2.3.4.6/kernel
error = group_send_sig_info(sig, info, p);
if (unlikely(error == -ESRCH))
/*
-@@ -1399,7 +1424,7 @@ int kill_pid_info_as_cred(int sig, struc
+@@ -1405,7 +1430,7 @@ int kill_pid_info_as_cred(int sig, struc
rcu_read_lock();
p = pid_task(pid, PIDTYPE_PID);
@@ -15119,7 +15207,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/signal.c linux-3.6.10-vs2.3.4.6/kernel
ret = -ESRCH;
goto out_unlock;
}
-@@ -1451,8 +1476,10 @@ static int kill_something_info(int sig,
+@@ -1457,8 +1482,10 @@ static int kill_something_info(int sig,
struct task_struct * p;
for_each_process(p) {
@@ -15132,7 +15220,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/signal.c linux-3.6.10-vs2.3.4.6/kernel
int err = group_send_sig_info(sig, info, p);
++count;
if (err != -EPERM)
-@@ -2317,6 +2344,11 @@ relock:
+@@ -2312,6 +2339,11 @@ relock:
!sig_kernel_only(signr))
continue;
@@ -15144,9 +15232,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/signal.c linux-3.6.10-vs2.3.4.6/kernel
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.6.10/kernel/softirq.c linux-3.6.10-vs2.3.4.6/kernel/softirq.c
---- linux-3.6.10/kernel/softirq.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/softirq.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/softirq.c linux-3.4.45-vs2.3.3.9/kernel/softirq.c
+--- linux-3.4.45/kernel/softirq.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/softirq.c 2012-05-21 16:15:05.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/ftrace.h>
#include <linux/smp.h>
@@ -15155,10 +15243,10 @@ diff -NurpP --minimal linux-3.6.10/kernel/softirq.c linux-3.6.10-vs2.3.4.6/kerne
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sys.c
---- linux-3.6.10/kernel/sys.c 2012-12-11 11:37:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/sys.c 2012-11-06 17:43:41.000000000 +0000
-@@ -47,6 +47,7 @@
+diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sys.c
+--- linux-3.4.45/kernel/sys.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sys.c 2013-05-13 18:16:08.000000000 +0000
+@@ -45,6 +45,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
#include <linux/user_namespace.h>
@@ -15166,7 +15254,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sy
#include <linux/kmsg_dump.h>
/* Move somewhere else to avoid recompiling? */
-@@ -154,7 +155,10 @@ static int set_one_prio(struct task_stru
+@@ -155,7 +156,10 @@ static int set_one_prio(struct task_stru
goto out;
}
if (niceval < task_nice(p) && !can_nice(p, niceval)) {
@@ -15187,7 +15275,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sy
error = set_one_prio(p, niceval, error);
} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
break;
-@@ -270,6 +276,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+@@ -268,6 +274,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
else
pgrp = task_pgrp(current);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -15196,7 +15284,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sy
niceval = 20 - task_nice(p);
if (niceval > retval)
retval = niceval;
-@@ -422,6 +430,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
+@@ -420,6 +428,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
static DEFINE_MUTEX(reboot_mutex);
@@ -15205,7 +15293,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sy
/*
* Reboot system call: for obvious reasons only root may call it,
* and even root needs to set up some magic numbers in the registers
-@@ -463,6 +473,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+@@ -461,6 +471,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
cmd = LINUX_REBOOT_CMD_HALT;
@@ -15215,7 +15303,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sy
mutex_lock(&reboot_mutex);
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-@@ -1370,7 +1383,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+@@ -1286,7 +1299,8 @@ SYSCALL_DEFINE2(sethostname, char __user
int errno;
char tmp[__NEW_UTS_LEN];
@@ -15225,7 +15313,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sy
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
-@@ -1421,7 +1435,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+@@ -1337,7 +1351,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
int errno;
char tmp[__NEW_UTS_LEN];
@@ -15235,7 +15323,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sy
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1540,7 +1555,7 @@ int do_prlimit(struct task_struct *tsk,
+@@ -1456,7 +1471,7 @@ int do_prlimit(struct task_struct *tsk,
/* Keep the capable check against init_user_ns until
cgroups can contain all limits */
if (new_rlim->rlim_max > rlim->rlim_max &&
@@ -15244,20 +15332,20 @@ diff -NurpP --minimal linux-3.6.10/kernel/sys.c linux-3.6.10-vs2.3.4.6/kernel/sy
retval = -EPERM;
if (!retval)
retval = security_task_setrlimit(tsk->group_leader,
-@@ -1593,7 +1608,8 @@ static int check_prlimit_permission(stru
- gid_eq(cred->gid, tcred->sgid) &&
- gid_eq(cred->gid, tcred->gid))
+@@ -1510,7 +1525,8 @@ static int check_prlimit_permission(stru
+ cred->gid == tcred->sgid &&
+ cred->gid == tcred->gid))
return 0;
-- if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
-+ if (vx_ns_capable(tcred->user_ns,
+- if (ns_capable(tcred->user->user_ns, CAP_SYS_RESOURCE))
++ if (vx_ns_capable(tcred->user->user_ns,
+ CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
return 0;
return -EPERM;
-diff -NurpP --minimal linux-3.6.10/kernel/sysctl.c linux-3.6.10-vs2.3.4.6/kernel/sysctl.c
---- linux-3.6.10/kernel/sysctl.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/sysctl.c 2012-10-04 16:47:00.000000000 +0000
-@@ -82,6 +82,7 @@
+diff -NurpP --minimal linux-3.4.45/kernel/sysctl.c linux-3.4.45-vs2.3.3.9/kernel/sysctl.c
+--- linux-3.4.45/kernel/sysctl.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sysctl.c 2012-05-21 16:15:05.000000000 +0000
+@@ -81,6 +81,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#endif
@@ -15265,7 +15353,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/sysctl.c linux-3.6.10-vs2.3.4.6/kernel
#ifdef CONFIG_CHR_DEV_SG
#include <scsi/sg.h>
#endif
-@@ -568,6 +569,13 @@ static struct ctl_table kern_table[] = {
+@@ -562,6 +563,13 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dostring,
},
#endif
@@ -15279,9 +15367,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/sysctl.c linux-3.6.10-vs2.3.4.6/kernel
#ifdef CONFIG_CHR_DEV_SG
{
.procname = "sg-big-buff",
-diff -NurpP --minimal linux-3.6.10/kernel/sysctl_binary.c linux-3.6.10-vs2.3.4.6/kernel/sysctl_binary.c
---- linux-3.6.10/kernel/sysctl_binary.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/sysctl_binary.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/sysctl_binary.c linux-3.4.45-vs2.3.3.9/kernel/sysctl_binary.c
+--- linux-3.4.45/kernel/sysctl_binary.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sysctl_binary.c 2013-03-30 21:29:17.000000000 +0000
@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
@@ -15290,20 +15378,20 @@ diff -NurpP --minimal linux-3.6.10/kernel/sysctl_binary.c linux-3.6.10-vs2.3.4.6
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.6.10/kernel/time/timekeeping.c linux-3.6.10-vs2.3.4.6/kernel/time/timekeeping.c
---- linux-3.6.10/kernel/time/timekeeping.c 2012-12-11 11:37:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/time/timekeeping.c 2012-11-06 17:43:41.000000000 +0000
-@@ -309,6 +309,7 @@ void getnstimeofday(struct timespec *ts)
+diff -NurpP --minimal linux-3.4.45/kernel/time/timekeeping.c linux-3.4.45-vs2.3.3.9/kernel/time/timekeeping.c
+--- linux-3.4.45/kernel/time/timekeeping.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/time/timekeeping.c 2012-12-08 00:53:53.000000000 +0000
+@@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts)
+ } while (read_seqretry(&timekeeper.lock, seq));
- ts->tv_nsec = 0;
timespec_add_ns(ts, nsecs);
+ vx_adjust_timespec(ts);
}
- EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.6.10/kernel/time.c linux-3.6.10-vs2.3.4.6/kernel/time.c
---- linux-3.6.10/kernel/time.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/time.c 2012-10-04 16:47:00.000000000 +0000
+ EXPORT_SYMBOL(getnstimeofday);
+diff -NurpP --minimal linux-3.4.45/kernel/time.c linux-3.4.45-vs2.3.3.9/kernel/time.c
+--- linux-3.4.45/kernel/time.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/time.c 2012-05-21 16:15:05.000000000 +0000
@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
if (err)
return err;
@@ -15322,9 +15410,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/time.c linux-3.6.10-vs2.3.4.6/kernel/t
return 0;
}
-diff -NurpP --minimal linux-3.6.10/kernel/timer.c linux-3.6.10-vs2.3.4.6/kernel/timer.c
---- linux-3.6.10/kernel/timer.c 2012-12-11 11:37:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/timer.c 2012-11-06 17:43:41.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/timer.c linux-3.4.45-vs2.3.3.9/kernel/timer.c
+--- linux-3.4.45/kernel/timer.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/timer.c 2012-10-22 13:09:53.000000000 +0000
@@ -40,6 +40,10 @@
#include <linux/irq_work.h>
#include <linux/sched.h>
@@ -15336,38 +15424,75 @@ diff -NurpP --minimal linux-3.6.10/kernel/timer.c linux-3.6.10-vs2.3.4.6/kernel/
#include <asm/uaccess.h>
#include <asm/unistd.h>
-diff -NurpP --minimal linux-3.6.10/kernel/user_namespace.c linux-3.6.10-vs2.3.4.6/kernel/user_namespace.c
---- linux-3.6.10/kernel/user_namespace.c 2012-07-22 21:39:47.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/user_namespace.c 2012-10-04 16:47:00.000000000 +0000
-@@ -19,6 +19,7 @@
- #include <linux/fs.h>
- #include <linux/uaccess.h>
- #include <linux/ctype.h>
+@@ -1388,12 +1392,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
+
+ #endif
+
+-#ifndef __alpha__
+-
+-/*
+- * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
+- * should be moved into arch/i386 instead?
+- */
+
+ /**
+ * sys_getpid - return the thread group id of the current process
+@@ -1422,10 +1420,23 @@ SYSCALL_DEFINE0(getppid)
+ rcu_read_lock();
+ pid = task_tgid_vnr(rcu_dereference(current->real_parent));
+ rcu_read_unlock();
++ return vx_map_pid(pid);
++}
+
+- return pid;
++#ifdef __alpha__
++
++/*
++ * The Alpha uses getxpid, getxuid, and getxgid instead.
++ */
++
++asmlinkage long do_getxpid(long *ppid)
++{
++ *ppid = sys_getppid();
++ return sys_getpid();
+ }
+
++#else /* _alpha_ */
++
+ SYSCALL_DEFINE0(getuid)
+ {
+ /* Only we change this so SMP safe */
+diff -NurpP --minimal linux-3.4.45/kernel/user_namespace.c linux-3.4.45-vs2.3.3.9/kernel/user_namespace.c
+--- linux-3.4.45/kernel/user_namespace.c 2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/user_namespace.c 2012-05-21 16:15:05.000000000 +0000
+@@ -11,6 +11,7 @@
+ #include <linux/user_namespace.h>
+ #include <linux/highuid.h>
+ #include <linux/cred.h>
+#include <linux/vserver/global.h>
static struct kmem_cache *user_ns_cachep __read_mostly;
-@@ -52,6 +53,7 @@ int create_user_ns(struct cred *new)
+@@ -33,6 +34,7 @@ int create_user_ns(struct cred *new)
return -ENOMEM;
kref_init(&ns->kref);
+ atomic_inc(&vs_global_user_ns);
- ns->parent = parent_ns;
- ns->owner = owner;
- ns->group = group;
-@@ -84,6 +86,9 @@ void free_user_ns(struct kref *kref)
- parent = ns->parent;
- kmem_cache_free(user_ns_cachep, ns);
-+
+ for (n = 0; n < UIDHASH_SZ; ++n)
+ INIT_HLIST_HEAD(ns->uidhash_table + n);
+@@ -81,6 +83,8 @@ void free_user_ns(struct kref *kref)
+ struct user_namespace *ns =
+ container_of(kref, struct user_namespace, kref);
+
+ /* FIXME: maybe move into destroyer? */
+ atomic_dec(&vs_global_user_ns);
- put_user_ns(parent);
+ INIT_WORK(&ns->destroyer, free_user_ns_work);
+ schedule_work(&ns->destroyer);
}
- EXPORT_SYMBOL(free_user_ns);
-diff -NurpP --minimal linux-3.6.10/kernel/utsname.c linux-3.6.10-vs2.3.4.6/kernel/utsname.c
---- linux-3.6.10/kernel/utsname.c 2012-07-22 21:39:47.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/utsname.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/utsname.c linux-3.4.45-vs2.3.3.9/kernel/utsname.c
+--- linux-3.4.45/kernel/utsname.c 2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/utsname.c 2012-05-21 16:15:05.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
@@ -15402,7 +15527,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/utsname.c linux-3.6.10-vs2.3.4.6/kerne
down_read(&uts_sem);
memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
-- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
+- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
+ ns->user_ns = get_user_ns(old_user);
up_read(&uts_sem);
return ns;
@@ -15436,10 +15561,10 @@ diff -NurpP --minimal linux-3.6.10/kernel/utsname.c linux-3.6.10-vs2.3.4.6/kerne
kfree(ns);
}
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/Kconfig linux-3.6.10-vs2.3.4.6/kernel/vserver/Kconfig
---- linux-3.6.10/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/Kconfig 2012-12-10 17:21:15.000000000 +0000
-@@ -0,0 +1,233 @@
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/Kconfig linux-3.4.45-vs2.3.3.9/kernel/vserver/Kconfig
+--- linux-3.4.45/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/Kconfig 2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,224 @@
+#
+# Linux VServer configuration
+#
@@ -15618,15 +15743,6 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/Kconfig linux-3.6.10-vs2.3.4.6
+ This allows you to specify the number of entries in
+ the per-CPU history buffer.
+
-+config VSERVER_EXTRA_MNT_CHECK
-+ bool "Extra Checks for Reachability"
-+ default n
-+ help
-+ Set this to yes if you want to do extra checks for
-+ vfsmount reachability in the proc filesystem code.
-+ This shouldn't be required on any setup utilizing
-+ mnt namespaces.
-+
+choice
+ prompt "Quotes used in debug and warn messages"
+ default QUOTES_ISO8859
@@ -15673,9 +15789,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/Kconfig linux-3.6.10-vs2.3.4.6
+ bool
+ default n
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/Makefile linux-3.6.10-vs2.3.4.6/kernel/vserver/Makefile
---- linux-3.6.10/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/Makefile 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/Makefile linux-3.4.45-vs2.3.3.9/kernel/vserver/Makefile
+--- linux-3.4.45/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/Makefile 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
@@ -15695,9 +15811,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/Makefile linux-3.6.10-vs2.3.4.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/cacct.c linux-3.6.10-vs2.3.4.6/kernel/vserver/cacct.c
---- linux-3.6.10/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/cacct.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct.c linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct.c
+--- linux-3.4.45/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
@@ -15741,9 +15857,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/cacct.c linux-3.6.10-vs2.3.4.6
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/cacct_init.h linux-3.6.10-vs2.3.4.6/kernel/vserver/cacct_init.h
---- linux-3.6.10/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/cacct_init.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_init.h
+--- linux-3.4.45/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_init.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,25 @@
+
+
@@ -15770,9 +15886,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/cacct_init.h linux-3.6.10-vs2.
+ return;
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/cacct_proc.h linux-3.6.10-vs2.3.4.6/kernel/vserver/cacct_proc.h
---- linux-3.6.10/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/cacct_proc.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_proc.h
+--- linux-3.4.45/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_proc.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
@@ -15827,9 +15943,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/cacct_proc.h linux-3.6.10-vs2.
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/context.c linux-3.6.10-vs2.3.4.6/kernel/vserver/context.c
---- linux-3.6.10/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/context.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/context.c linux-3.4.45-vs2.3.3.9/kernel/vserver/context.c
+--- linux-3.4.45/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/context.c 2012-06-28 14:45:48.000000000 +0000
@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
@@ -16950,9 +17066,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/context.c linux-3.6.10-vs2.3.4
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/cvirt.c linux-3.6.10-vs2.3.4.6/kernel/vserver/cvirt.c
---- linux-3.6.10/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/cvirt.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt.c linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt.c
+--- linux-3.4.45/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
@@ -17267,9 +17383,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/cvirt.c linux-3.6.10-vs2.3.4.6
+
+#endif
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/cvirt_init.h linux-3.6.10-vs2.3.4.6/kernel/vserver/cvirt_init.h
---- linux-3.6.10/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/cvirt_init.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_init.h
+--- linux-3.4.45/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_init.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,70 @@
+
+
@@ -17341,9 +17457,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/cvirt_init.h linux-3.6.10-vs2.
+ return;
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/cvirt_proc.h linux-3.6.10-vs2.3.4.6/kernel/vserver/cvirt_proc.h
---- linux-3.6.10/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/cvirt_proc.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_proc.h
+--- linux-3.4.45/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_proc.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
@@ -17468,9 +17584,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/cvirt_proc.h linux-3.6.10-vs2.
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/debug.c linux-3.6.10-vs2.3.4.6/kernel/vserver/debug.c
---- linux-3.6.10/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/debug.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/debug.c linux-3.4.45-vs2.3.3.9/kernel/vserver/debug.c
+--- linux-3.4.45/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/debug.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
@@ -17504,9 +17620,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/debug.c linux-3.6.10-vs2.3.4.6
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/device.c linux-3.6.10-vs2.3.4.6/kernel/vserver/device.c
---- linux-3.6.10/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/device.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/device.c linux-3.4.45-vs2.3.3.9/kernel/vserver/device.c
+--- linux-3.4.45/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/device.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
@@ -17951,9 +18067,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/device.c linux-3.6.10-vs2.3.4.
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/dlimit.c linux-3.6.10-vs2.3.4.6/kernel/vserver/dlimit.c
---- linux-3.6.10/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/dlimit.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/dlimit.c linux-3.4.45-vs2.3.3.9/kernel/vserver/dlimit.c
+--- linux-3.4.45/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/dlimit.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/dlimit.c
@@ -18486,9 +18602,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/dlimit.c linux-3.6.10-vs2.3.4.
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/helper.c linux-3.6.10-vs2.3.4.6/kernel/vserver/helper.c
---- linux-3.6.10/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/helper.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/helper.c linux-3.4.45-vs2.3.3.9/kernel/vserver/helper.c
+--- linux-3.4.45/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/helper.c 2012-09-16 18:49:44.000000000 +0000
@@ -0,0 +1,229 @@
+/*
+ * linux/kernel/vserver/helper.c
@@ -18719,9 +18835,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/helper.c linux-3.6.10-vs2.3.4.
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/history.c linux-3.6.10-vs2.3.4.6/kernel/vserver/history.c
---- linux-3.6.10/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/history.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/history.c linux-3.4.45-vs2.3.3.9/kernel/vserver/history.c
+--- linux-3.4.45/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/history.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
@@ -18981,9 +19097,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/history.c linux-3.6.10-vs2.3.4
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/inet.c linux-3.6.10-vs2.3.4.6/kernel/vserver/inet.c
---- linux-3.6.10/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/inet.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/inet.c linux-3.4.45-vs2.3.3.9/kernel/vserver/inet.c
+--- linux-3.4.45/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/inet.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,226 @@
+
+#include <linux/in.h>
@@ -19211,9 +19327,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/inet.c linux-3.6.10-vs2.3.4.6/
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/init.c linux-3.6.10-vs2.3.4.6/kernel/vserver/init.c
---- linux-3.6.10/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/init.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/init.c linux-3.4.45-vs2.3.3.9/kernel/vserver/init.c
+--- linux-3.4.45/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/init.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
@@ -19260,9 +19376,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/init.c linux-3.6.10-vs2.3.4.6/
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/inode.c linux-3.6.10-vs2.3.4.6/kernel/vserver/inode.c
---- linux-3.6.10/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/inode.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/inode.c linux-3.4.45-vs2.3.3.9/kernel/vserver/inode.c
+--- linux-3.4.45/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,437 @@
+/*
+ * linux/kernel/vserver/inode.c
@@ -19701,9 +19817,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/inode.c linux-3.6.10-vs2.3.4.6
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/limit.c linux-3.6.10-vs2.3.4.6/kernel/vserver/limit.c
---- linux-3.6.10/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/limit.c 2012-12-12 12:09:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit.c linux-3.4.45-vs2.3.3.9/kernel/vserver/limit.c
+--- linux-3.4.45/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit.c 2012-09-01 09:15:21.000000000 +0000
@@ -0,0 +1,345 @@
+/*
+ * linux/kernel/vserver/limit.c
@@ -19964,13 +20080,12 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/limit.c linux-3.6.10-vs2.3.4.6
+
+void vx_vsi_meminfo(struct sysinfo *val)
+{
-+#ifdef CONFIG_MEMCG
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+ struct mem_cgroup *mcg;
+ u64 res_limit, res_usage;
+
+ rcu_read_lock();
+ mcg = mem_cgroup_from_task(current);
-+ rcu_read_unlock();
+ if (!mcg)
+ goto out;
+
@@ -19984,21 +20099,21 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/limit.c linux-3.6.10-vs2.3.4.6
+ val->totalhigh = 0;
+ val->freehigh = 0;
+out:
-+#endif /* CONFIG_MEMCG */
++ rcu_read_unlock();
++#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
+ return;
+}
+
+void vx_vsi_swapinfo(struct sysinfo *val)
+{
-+#ifdef CONFIG_MEMCG
-+#ifdef CONFIG_MEMCG_SWAP
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
+ struct mem_cgroup *mcg;
+ u64 res_limit, res_usage, memsw_limit, memsw_usage;
+ s64 swap_limit, swap_usage;
+
+ rcu_read_lock();
+ mcg = mem_cgroup_from_task(current);
-+ rcu_read_unlock();
+ if (!mcg)
+ goto out;
+
@@ -20024,35 +20139,36 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/limit.c linux-3.6.10-vs2.3.4.6
+ val->freeswap = (swap_usage < swap_limit) ?
+ val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
+out:
-+#else /* !CONFIG_MEMCG_SWAP */
++ rcu_read_unlock();
++#else /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
+ val->totalswap = 0;
+ val->freeswap = 0;
-+#endif /* !CONFIG_MEMCG_SWAP */
-+#endif /* CONFIG_MEMCG */
++#endif /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
++#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
+ return;
+}
+
+long vx_vsi_cached(struct sysinfo *val)
+{
+ long cache = 0;
-+#ifdef CONFIG_MEMCG
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+ struct mem_cgroup *mcg;
+
+ rcu_read_lock();
+ mcg = mem_cgroup_from_task(current);
-+ rcu_read_unlock();
+ if (!mcg)
+ goto out;
+
+ cache = mem_cgroup_stat_read_cache(mcg);
+out:
++ rcu_read_unlock();
+#endif
+ return cache;
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/limit_init.h linux-3.6.10-vs2.3.4.6/kernel/vserver/limit_init.h
---- linux-3.6.10/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/limit_init.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_init.h
+--- linux-3.4.45/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_init.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,31 @@
+
+
@@ -20085,9 +20201,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/limit_init.h linux-3.6.10-vs2.
+ }
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/limit_proc.h linux-3.6.10-vs2.3.4.6/kernel/vserver/limit_proc.h
---- linux-3.6.10/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/limit_proc.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_proc.h
+--- linux-3.4.45/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_proc.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
@@ -20146,9 +20262,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/limit_proc.h linux-3.6.10-vs2.
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/network.c linux-3.6.10-vs2.3.4.6/kernel/vserver/network.c
---- linux-3.6.10/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/network.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/network.c linux-3.4.45-vs2.3.3.9/kernel/vserver/network.c
+--- linux-3.4.45/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/network.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,912 @@
+/*
+ * linux/kernel/vserver/network.c
@@ -21062,10 +21178,10 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/network.c linux-3.6.10-vs2.3.4
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/kernel/vserver/proc.c
---- linux-3.6.10/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/proc.c 2012-10-09 12:19:59.000000000 +0000
-@@ -0,0 +1,1110 @@
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/proc.c linux-3.4.45-vs2.3.3.9/kernel/vserver/proc.c
+--- linux-3.4.45/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/proc.c 2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,1103 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
@@ -21088,7 +21204,6 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/
+#include <linux/proc_fs.h>
+#include <linux/fs_struct.h>
+#include <linux/mount.h>
-+#include <linux/namei.h>
+#include <asm/unistd.h>
+
+#include <linux/vs_context.h>
@@ -21448,14 +21563,11 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/
+ return lookup_vx_info(PROC_I(inode)->fd);
+}
+
-+static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags)
++static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd)
+{
+ struct inode *inode = dentry->d_inode;
+ xid_t xid = PROC_I(inode)->fd;
+
-+ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
-+ return -ECHILD;
-+
+ if (!xid || xid_is_hashed(xid))
+ return 1;
+ d_drop(dentry);
@@ -21465,14 +21577,11 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/
+
+/* get and revalidate nx_info/nid */
+
-+static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags)
++static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd)
+{
+ struct inode *inode = dentry->d_inode;
+ nid_t nid = PROC_I(inode)->fd;
+
-+ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
-+ return -ECHILD;
-+
+ if (!nid || nid_is_hashed(nid))
+ return 1;
+ d_drop(dentry);
@@ -21653,7 +21762,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/
+}
+
+static struct dentry *proc_xid_lookup(struct inode *dir,
-+ struct dentry *dentry, unsigned int flags)
++ struct dentry *dentry, struct nameidata *nd)
+{
+ struct vs_entry *p = vx_base_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
@@ -21737,7 +21846,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/
+}
+
+static struct dentry *proc_nid_lookup(struct inode *dir,
-+ struct dentry *dentry, unsigned int flags)
++ struct dentry *dentry, struct nameidata *nd)
+{
+ struct vs_entry *p = nx_base_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
@@ -21839,7 +21948,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/
+
+
+static struct dentry *proc_virtual_lookup(struct inode *dir,
-+ struct dentry *dentry, unsigned int flags)
++ struct dentry *dentry, struct nameidata *nd)
+{
+ struct vs_entry *p = vx_virtual_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
@@ -21881,7 +21990,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/
+
+
+static struct dentry *proc_virtnet_lookup(struct inode *dir,
-+ struct dentry *dentry, unsigned int flags)
++ struct dentry *dentry, struct nameidata *nd)
+{
+ struct vs_entry *p = nx_virtnet_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
@@ -22176,9 +22285,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/proc.c linux-3.6.10-vs2.3.4.6/
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/sched.c linux-3.6.10-vs2.3.4.6/kernel/vserver/sched.c
---- linux-3.6.10/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/sched.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched.c linux-3.4.45-vs2.3.3.9/kernel/vserver/sched.c
+--- linux-3.4.45/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched.c 2012-05-21 16:25:11.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
@@ -22263,9 +22372,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/sched.c linux-3.6.10-vs2.3.4.6
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/sched_init.h linux-3.6.10-vs2.3.4.6/kernel/vserver/sched_init.h
---- linux-3.6.10/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/sched_init.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_init.h
+--- linux-3.4.45/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_init.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -22294,9 +22403,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/sched_init.h linux-3.6.10-vs2.
+{
+ return;
+}
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/sched_proc.h linux-3.6.10-vs2.3.4.6/kernel/vserver/sched_proc.h
---- linux-3.6.10/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/sched_proc.h 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_proc.h
+--- linux-3.4.45/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_proc.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
@@ -22330,9 +22439,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/sched_proc.h linux-3.6.10-vs2.
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/signal.c linux-3.6.10-vs2.3.4.6/kernel/vserver/signal.c
---- linux-3.6.10/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/signal.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/signal.c linux-3.4.45-vs2.3.3.9/kernel/vserver/signal.c
+--- linux-3.4.45/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/signal.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
@@ -22468,9 +22577,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/signal.c linux-3.6.10-vs2.3.4.
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/space.c linux-3.6.10-vs2.3.4.6/kernel/vserver/space.c
---- linux-3.6.10/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/space.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/space.c linux-3.4.45-vs2.3.3.9/kernel/vserver/space.c
+--- linux-3.4.45/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/space.c 2013-02-12 00:16:04.000000000 +0000
@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
@@ -22769,7 +22878,7 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/space.c linux-3.6.10-vs2.3.4.6
+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
+{
+ struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
-+ struct fs_struct *fs_vxi, *fs;
++ struct fs_struct *fs_vxi, *fs = NULL;
+ struct _vx_space *space;
+ int ret, kill = 0;
+
@@ -22908,9 +23017,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/space.c linux-3.6.10-vs2.3.4.6
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/switch.c linux-3.6.10-vs2.3.4.6/kernel/vserver/switch.c
---- linux-3.6.10/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/switch.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/switch.c linux-3.4.45-vs2.3.3.9/kernel/vserver/switch.c
+--- linux-3.4.45/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/switch.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
@@ -23468,9 +23577,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/switch.c linux-3.6.10-vs2.3.4.
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/sysctl.c linux-3.6.10-vs2.3.4.6/kernel/vserver/sysctl.c
---- linux-3.6.10/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/sysctl.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/sysctl.c linux-3.4.45-vs2.3.3.9/kernel/vserver/sysctl.c
+--- linux-3.4.45/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sysctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
@@ -23719,9 +23828,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/sysctl.c linux-3.6.10-vs2.3.4.
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/tag.c linux-3.6.10-vs2.3.4.6/kernel/vserver/tag.c
---- linux-3.6.10/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/tag.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/tag.c linux-3.4.45-vs2.3.3.9/kernel/vserver/tag.c
+--- linux-3.4.45/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/tag.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
@@ -23786,10 +23895,10 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/tag.c linux-3.6.10-vs2.3.4.6/k
+}
+
+
-diff -NurpP --minimal linux-3.6.10/kernel/vserver/vci_config.h linux-3.6.10-vs2.3.4.6/kernel/vserver/vci_config.h
---- linux-3.6.10/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/kernel/vserver/vci_config.h 2012-12-12 12:10:25.000000000 +0000
-@@ -0,0 +1,80 @@
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/vci_config.h linux-3.4.45-vs2.3.3.9/kernel/vserver/vci_config.h
+--- linux-3.4.45/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/vci_config.h 2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,76 @@
+
+/* interface version */
+
@@ -23809,7 +23918,6 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/vci_config.h linux-3.6.10-vs2.
+ VCI_KCBIT_SPACES = 10,
+ VCI_KCBIT_NETV2 = 11,
+ VCI_KCBIT_MEMCG = 12,
-+ VCI_KCBIT_MEMCG_SWAP = 13,
+
+ VCI_KCBIT_DEBUG = 16,
+ VCI_KCBIT_HISTORY = 20,
@@ -23835,12 +23943,9 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/vci_config.h linux-3.6.10-vs2.
+#endif
+ (1 << VCI_KCBIT_SPACES) |
+ (1 << VCI_KCBIT_NETV2) |
-+#ifdef CONFIG_MEMCG
++#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+ (1 << VCI_KCBIT_MEMCG) |
+#endif
-+#ifdef CONFIG_MEMCG_SWAP
-+ (1 << VCI_KCBIT_MEMCG_SWAP) |
-+#endif
+
+ /* debug options */
+#ifdef CONFIG_VSERVER_DEBUG
@@ -23870,11 +23975,11 @@ diff -NurpP --minimal linux-3.6.10/kernel/vserver/vci_config.h linux-3.6.10-vs2.
+ 0;
+}
+
-diff -NurpP --minimal linux-3.6.10/mm/memcontrol.c linux-3.6.10-vs2.3.4.6/mm/memcontrol.c
---- linux-3.6.10/mm/memcontrol.c 2012-12-11 11:37:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/mm/memcontrol.c 2012-12-08 00:36:33.000000000 +0000
-@@ -885,6 +885,31 @@ struct mem_cgroup *mem_cgroup_from_task(
- return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
+diff -NurpP --minimal linux-3.4.45/mm/memcontrol.c linux-3.4.45-vs2.3.3.9/mm/memcontrol.c
+--- linux-3.4.45/mm/memcontrol.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/memcontrol.c 2012-12-08 00:53:53.000000000 +0000
+@@ -846,6 +846,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+ struct mem_cgroup, css);
}
+u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
@@ -23905,9 +24010,9 @@ diff -NurpP --minimal linux-3.6.10/mm/memcontrol.c linux-3.6.10-vs2.3.4.6/mm/mem
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *memcg = NULL;
-diff -NurpP --minimal linux-3.6.10/mm/oom_kill.c linux-3.6.10-vs2.3.4.6/mm/oom_kill.c
---- linux-3.6.10/mm/oom_kill.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/mm/oom_kill.c 2012-10-04 16:53:46.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/mm/oom_kill.c linux-3.4.45-vs2.3.3.9/mm/oom_kill.c
+--- linux-3.4.45/mm/oom_kill.c 2012-05-21 16:07:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/oom_kill.c 2012-05-21 16:15:05.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
@@ -23937,7 +24042,7 @@ diff -NurpP --minimal linux-3.6.10/mm/oom_kill.c linux-3.6.10-vs2.3.4.6/mm/oom_k
/* When mem_cgroup_out_of_memory() and p is not member of the group */
if (memcg && !task_in_mem_cgroup(p, memcg))
return true;
-@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct
+@@ -462,8 +471,8 @@ static void oom_kill_process(struct task
dump_header(p, gfp_mask, order, memcg, nodemask);
task_lock(p);
@@ -23948,7 +24053,7 @@ diff -NurpP --minimal linux-3.6.10/mm/oom_kill.c linux-3.6.10-vs2.3.4.6/mm/oom_k
task_unlock(p);
/*
-@@ -518,8 +527,8 @@ void oom_kill_process(struct task_struct
+@@ -496,8 +505,8 @@ static void oom_kill_process(struct task
/* mm cannot safely be dereferenced after task_unlock(victim) */
mm = victim->mm;
@@ -23959,7 +24064,7 @@ diff -NurpP --minimal linux-3.6.10/mm/oom_kill.c linux-3.6.10-vs2.3.4.6/mm/oom_k
K(get_mm_counter(victim->mm, MM_ANONPAGES)),
K(get_mm_counter(victim->mm, MM_FILEPAGES)));
task_unlock(victim);
-@@ -589,6 +598,8 @@ int unregister_oom_notifier(struct notif
+@@ -596,6 +605,8 @@ int unregister_oom_notifier(struct notif
}
EXPORT_SYMBOL_GPL(unregister_oom_notifier);
@@ -23968,10 +24073,10 @@ diff -NurpP --minimal linux-3.6.10/mm/oom_kill.c linux-3.6.10-vs2.3.4.6/mm/oom_k
/*
* Try to acquire the OOM killer lock for the zones in zonelist. Returns zero
* if a parallel OOM killing is already taking place that includes a zone in
-@@ -738,7 +749,12 @@ void out_of_memory(struct zonelist *zone
- /* Found nothing?!?! Either we hang forever, or we panic. */
+@@ -747,7 +758,12 @@ void out_of_memory(struct zonelist *zone
if (!p) {
dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
+ read_unlock(&tasklist_lock);
- panic("Out of memory and no killable processes...\n");
+
+ /* avoid panic for guest OOM */
@@ -23982,19 +24087,19 @@ diff -NurpP --minimal linux-3.6.10/mm/oom_kill.c linux-3.6.10-vs2.3.4.6/mm/oom_k
}
if (PTR_ERR(p) != -1UL) {
oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.6.10/mm/page_alloc.c linux-3.6.10-vs2.3.4.6/mm/page_alloc.c
---- linux-3.6.10/mm/page_alloc.c 2012-12-11 11:37:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/mm/page_alloc.c 2012-12-08 00:36:33.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/mm/page_alloc.c linux-3.4.45-vs2.3.3.9/mm/page_alloc.c
+--- linux-3.4.45/mm/page_alloc.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/page_alloc.c 2013-03-02 15:26:44.000000000 +0000
@@ -58,6 +58,8 @@
+ #include <linux/memcontrol.h>
#include <linux/prefetch.h>
- #include <linux/migrate.h>
#include <linux/page-debug-flags.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
#include <asm/tlbflush.h>
#include <asm/div64.h>
-@@ -2773,6 +2775,9 @@ void si_meminfo(struct sysinfo *val)
+@@ -2655,6 +2657,9 @@ void si_meminfo(struct sysinfo *val)
val->totalhigh = totalhigh_pages;
val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
@@ -24004,7 +24109,7 @@ diff -NurpP --minimal linux-3.6.10/mm/page_alloc.c linux-3.6.10-vs2.3.4.6/mm/pag
}
EXPORT_SYMBOL(si_meminfo);
-@@ -2793,6 +2798,9 @@ void si_meminfo_node(struct sysinfo *val
+@@ -2675,6 +2680,9 @@ void si_meminfo_node(struct sysinfo *val
val->freehigh = 0;
#endif
val->mem_unit = PAGE_SIZE;
@@ -24014,9 +24119,9 @@ diff -NurpP --minimal linux-3.6.10/mm/page_alloc.c linux-3.6.10-vs2.3.4.6/mm/pag
}
#endif
-diff -NurpP --minimal linux-3.6.10/mm/pgtable-generic.c linux-3.6.10-vs2.3.4.6/mm/pgtable-generic.c
---- linux-3.6.10/mm/pgtable-generic.c 2012-07-22 21:39:47.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/mm/pgtable-generic.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/mm/pgtable-generic.c linux-3.4.45-vs2.3.3.9/mm/pgtable-generic.c
+--- linux-3.4.45/mm/pgtable-generic.c 2012-05-21 16:07:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/pgtable-generic.c 2012-05-21 16:15:05.000000000 +0000
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
@@ -24026,10 +24131,10 @@ diff -NurpP --minimal linux-3.6.10/mm/pgtable-generic.c linux-3.6.10-vs2.3.4.6/m
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.6.10/mm/shmem.c linux-3.6.10-vs2.3.4.6/mm/shmem.c
---- linux-3.6.10/mm/shmem.c 2012-12-11 11:37:02.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/mm/shmem.c 2012-12-08 00:36:33.000000000 +0000
-@@ -1826,7 +1826,7 @@ static int shmem_statfs(struct dentry *d
+diff -NurpP --minimal linux-3.4.45/mm/shmem.c linux-3.4.45-vs2.3.3.9/mm/shmem.c
+--- linux-3.4.45/mm/shmem.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/shmem.c 2013-03-02 15:26:44.000000000 +0000
+@@ -1473,7 +1473,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -24038,7 +24143,7 @@ diff -NurpP --minimal linux-3.6.10/mm/shmem.c linux-3.6.10-vs2.3.4.6/mm/shmem.c
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
if (sbinfo->max_blocks) {
-@@ -2644,7 +2644,7 @@ int shmem_fill_super(struct super_block
+@@ -2287,7 +2287,7 @@ int shmem_fill_super(struct super_block
sb->s_maxbytes = MAX_LFS_FILESIZE;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -24047,10 +24152,10 @@ diff -NurpP --minimal linux-3.6.10/mm/shmem.c linux-3.6.10-vs2.3.4.6/mm/shmem.c
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.6.10/mm/slab.c linux-3.6.10-vs2.3.4.6/mm/slab.c
---- linux-3.6.10/mm/slab.c 2012-12-11 11:37:03.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/mm/slab.c 2012-11-06 17:43:41.000000000 +0000
-@@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_
+diff -NurpP --minimal linux-3.4.45/mm/slab.c linux-3.4.45-vs2.3.3.9/mm/slab.c
+--- linux-3.4.45/mm/slab.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/slab.c 2012-10-22 13:09:53.000000000 +0000
+@@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
@@ -24059,7 +24164,7 @@ diff -NurpP --minimal linux-3.6.10/mm/slab.c linux-3.6.10-vs2.3.4.6/mm/slab.c
#if DEBUG
/*
-@@ -3539,6 +3541,7 @@ retry:
+@@ -3466,6 +3468,7 @@ retry:
obj = slab_get_obj(cachep, slabp, nodeid);
check_slabp(cachep, slabp);
@@ -24067,25 +24172,25 @@ diff -NurpP --minimal linux-3.6.10/mm/slab.c linux-3.6.10-vs2.3.4.6/mm/slab.c
l3->free_objects--;
/* move slabp to correct slabp list: */
list_del(&slabp->list);
-@@ -3616,6 +3619,7 @@ __cache_alloc_node(struct kmem_cache *ca
+@@ -3543,6 +3546,7 @@ __cache_alloc_node(struct kmem_cache *ca
/* ___cache_alloc_node can fall back to other nodes */
ptr = ____cache_alloc_node(cachep, flags, nodeid);
out:
+ vx_slab_alloc(cachep, flags);
local_irq_restore(save_flags);
ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
- kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags,
-@@ -3806,6 +3810,7 @@ static inline void __cache_free(struct k
+ kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
+@@ -3730,6 +3734,7 @@ static inline void __cache_free(struct k
check_irq_off();
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
+ vx_slab_free(cachep);
- kmemcheck_slab_free(cachep, objp, cachep->object_size);
+ kmemcheck_slab_free(cachep, objp, obj_size(cachep));
-diff -NurpP --minimal linux-3.6.10/mm/slab_vs.h linux-3.6.10-vs2.3.4.6/mm/slab_vs.h
---- linux-3.6.10/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/mm/slab_vs.h 2012-10-09 14:28:11.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/mm/slab_vs.h linux-3.4.45-vs2.3.3.9/mm/slab_vs.h
+--- linux-3.4.45/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/slab_vs.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
@@ -24095,31 +24200,31 @@ diff -NurpP --minimal linux-3.6.10/mm/slab_vs.h linux-3.6.10-vs2.3.4.6/mm/slab_v
+static inline
+void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
+{
-+ int what = gfp_zone(cachep->allocflags);
++ int what = gfp_zone(cachep->gfpflags);
+ struct vx_info *vxi = current_vx_info();
+
+ if (!vxi)
+ return;
+
-+ atomic_add(cachep->size, &vxi->cacct.slab[what]);
++ atomic_add(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
+static inline
+void vx_slab_free(struct kmem_cache *cachep)
+{
-+ int what = gfp_zone(cachep->allocflags);
++ int what = gfp_zone(cachep->gfpflags);
+ struct vx_info *vxi = current_vx_info();
+
+ if (!vxi)
+ return;
+
-+ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
++ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.6.10/mm/swapfile.c linux-3.6.10-vs2.3.4.6/mm/swapfile.c
---- linux-3.6.10/mm/swapfile.c 2012-10-04 13:27:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/mm/swapfile.c 2012-10-04 16:47:00.000000000 +0000
-@@ -39,6 +39,7 @@
+diff -NurpP --minimal linux-3.4.45/mm/swapfile.c linux-3.4.45-vs2.3.3.9/mm/swapfile.c
+--- linux-3.4.45/mm/swapfile.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/swapfile.c 2012-06-28 14:45:07.000000000 +0000
+@@ -36,6 +36,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
#include <linux/page_cgroup.h>
@@ -24127,7 +24232,7 @@ diff -NurpP --minimal linux-3.6.10/mm/swapfile.c linux-3.6.10-vs2.3.4.6/mm/swapf
static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
unsigned char);
-@@ -1686,6 +1687,16 @@ static int swap_show(struct seq_file *sw
+@@ -1754,6 +1755,16 @@ static int swap_show(struct seq_file *sw
if (si == SEQ_START_TOKEN) {
seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
@@ -24144,7 +24249,7 @@ diff -NurpP --minimal linux-3.6.10/mm/swapfile.c linux-3.6.10-vs2.3.4.6/mm/swapf
return 0;
}
-@@ -2113,6 +2124,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -2176,6 +2187,8 @@ void si_swapinfo(struct sysinfo *val)
val->freeswap = nr_swap_pages + nr_to_be_unused;
val->totalswap = total_swap_pages + nr_to_be_unused;
spin_unlock(&swap_lock);
@@ -24153,10 +24258,10 @@ diff -NurpP --minimal linux-3.6.10/mm/swapfile.c linux-3.6.10-vs2.3.4.6/mm/swapf
}
/*
-diff -NurpP --minimal linux-3.6.10/net/bridge/br_multicast.c linux-3.6.10-vs2.3.4.6/net/bridge/br_multicast.c
---- linux-3.6.10/net/bridge/br_multicast.c 2012-10-04 13:27:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/bridge/br_multicast.c 2012-10-04 16:47:00.000000000 +0000
-@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
+diff -NurpP --minimal linux-3.4.45/net/bridge/br_multicast.c linux-3.4.45-vs2.3.3.9/net/bridge/br_multicast.c
+--- linux-3.4.45/net/bridge/br_multicast.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/bridge/br_multicast.c 2012-05-21 16:15:05.000000000 +0000
+@@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
@@ -24165,9 +24270,9 @@ diff -NurpP --minimal linux-3.6.10/net/bridge/br_multicast.c linux-3.6.10-vs2.3.
kfree_skb(skb);
return NULL;
}
-diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/core/dev.c
---- linux-3.6.10/net/core/dev.c 2012-12-11 11:37:03.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/core/dev.c 2012-12-08 00:36:33.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/core/dev.c linux-3.4.45-vs2.3.3.9/net/core/dev.c
+--- linux-3.4.45/net/core/dev.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/core/dev.c 2013-05-13 18:16:08.000000000 +0000
@@ -126,6 +126,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
@@ -24176,7 +24281,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
#include <trace/events/napi.h>
#include <trace/events/net.h>
#include <trace/events/skb.h>
-@@ -620,7 +621,8 @@ struct net_device *__dev_get_by_name(str
+@@ -621,7 +622,8 @@ struct net_device *__dev_get_by_name(str
struct hlist_head *head = dev_name_hash(net, name);
hlist_for_each_entry(dev, p, head, name_hlist)
@@ -24186,7 +24291,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
return dev;
return NULL;
-@@ -646,7 +648,8 @@ struct net_device *dev_get_by_name_rcu(s
+@@ -647,7 +649,8 @@ struct net_device *dev_get_by_name_rcu(s
struct hlist_head *head = dev_name_hash(net, name);
hlist_for_each_entry_rcu(dev, p, head, name_hlist)
@@ -24196,7 +24301,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
return dev;
return NULL;
-@@ -697,7 +700,8 @@ struct net_device *__dev_get_by_index(st
+@@ -698,7 +701,8 @@ struct net_device *__dev_get_by_index(st
struct hlist_head *head = dev_index_hash(net, ifindex);
hlist_for_each_entry(dev, p, head, index_hlist)
@@ -24206,7 +24311,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
return dev;
return NULL;
-@@ -715,7 +719,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+@@ -716,7 +720,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
* about locking. The caller must hold RCU lock.
*/
@@ -24215,7 +24320,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
{
struct hlist_node *p;
struct net_device *dev;
-@@ -727,6 +731,16 @@ struct net_device *dev_get_by_index_rcu(
+@@ -728,6 +732,16 @@ struct net_device *dev_get_by_index_rcu(
return NULL;
}
@@ -24232,7 +24337,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
EXPORT_SYMBOL(dev_get_by_index_rcu);
-@@ -775,7 +789,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
+@@ -776,7 +790,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
for_each_netdev_rcu(net, dev)
if (dev->type == type &&
@@ -24242,7 +24347,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
return dev;
return NULL;
-@@ -787,9 +802,11 @@ struct net_device *__dev_getfirstbyhwtyp
+@@ -788,9 +803,11 @@ struct net_device *__dev_getfirstbyhwtyp
struct net_device *dev;
ASSERT_RTNL();
@@ -24256,7 +24361,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
return NULL;
}
-@@ -907,6 +924,8 @@ static int __dev_alloc_name(struct net *
+@@ -908,6 +925,8 @@ static int __dev_alloc_name(struct net *
continue;
if (i < 0 || i >= max_netdevices)
continue;
@@ -24265,7 +24370,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-@@ -4076,6 +4095,8 @@ static int dev_ifconf(struct net *net, c
+@@ -4009,6 +4028,8 @@ static int dev_ifconf(struct net *net, c
total = 0;
for_each_netdev(net, dev) {
@@ -24274,7 +24379,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -4178,6 +4199,10 @@ static void dev_seq_printf_stats(struct
+@@ -4111,6 +4132,10 @@ static void dev_seq_printf_stats(struct
struct rtnl_link_stats64 temp;
const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
@@ -24285,10 +24390,10 @@ diff -NurpP --minimal linux-3.6.10/net/core/dev.c linux-3.6.10-vs2.3.4.6/net/cor
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-3.6.10/net/core/rtnetlink.c linux-3.6.10-vs2.3.4.6/net/core/rtnetlink.c
---- linux-3.6.10/net/core/rtnetlink.c 2012-10-04 13:27:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/core/rtnetlink.c 2012-10-04 16:47:00.000000000 +0000
-@@ -1080,6 +1080,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+diff -NurpP --minimal linux-3.4.45/net/core/rtnetlink.c linux-3.4.45-vs2.3.3.9/net/core/rtnetlink.c
+--- linux-3.4.45/net/core/rtnetlink.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/core/rtnetlink.c 2013-05-13 18:16:08.000000000 +0000
+@@ -1079,6 +1079,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
if (idx < s_idx)
goto cont;
@@ -24297,7 +24402,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/rtnetlink.c linux-3.6.10-vs2.3.4.6/n
if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, 0,
-@@ -1969,6 +1971,9 @@ void rtmsg_ifinfo(int type, struct net_d
+@@ -1962,6 +1964,9 @@ void rtmsg_ifinfo(int type, struct net_d
int err = -ENOBUFS;
size_t if_info_size;
@@ -24307,10 +24412,10 @@ diff -NurpP --minimal linux-3.6.10/net/core/rtnetlink.c linux-3.6.10-vs2.3.4.6/n
skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-3.6.10/net/core/sock.c linux-3.6.10-vs2.3.4.6/net/core/sock.c
---- linux-3.6.10/net/core/sock.c 2012-10-04 13:27:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/core/sock.c 2012-10-04 16:47:00.000000000 +0000
-@@ -132,6 +132,10 @@
+diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/core/sock.c
+--- linux-3.4.45/net/core/sock.c 2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/core/sock.c 2013-05-13 18:16:08.000000000 +0000
+@@ -129,6 +129,10 @@
#include <net/netprio_cgroup.h>
#include <linux/filter.h>
@@ -24321,7 +24426,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/sock.c linux-3.6.10-vs2.3.4.6/net/co
#include <trace/events/sock.h>
-@@ -1194,6 +1198,8 @@ static struct sock *sk_prot_alloc(struct
+@@ -1153,6 +1157,8 @@ static struct sock *sk_prot_alloc(struct
goto out_free_sec;
sk_tx_queue_clear(sk);
}
@@ -24330,7 +24435,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/sock.c linux-3.6.10-vs2.3.4.6/net/co
return sk;
-@@ -1302,6 +1308,11 @@ static void __sk_free(struct sock *sk)
+@@ -1261,6 +1267,11 @@ static void __sk_free(struct sock *sk)
put_cred(sk->sk_peer_cred);
put_pid(sk->sk_peer_pid);
put_net(sock_net(sk));
@@ -24342,7 +24447,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/sock.c linux-3.6.10-vs2.3.4.6/net/co
sk_prot_free(sk->sk_prot_creator, sk);
}
-@@ -1362,6 +1373,8 @@ struct sock *sk_clone_lock(const struct
+@@ -1321,6 +1332,8 @@ struct sock *sk_clone_lock(const struct
/* SANITY */
get_net(sock_net(newsk));
@@ -24351,7 +24456,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/sock.c linux-3.6.10-vs2.3.4.6/net/co
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -1418,6 +1431,12 @@ struct sock *sk_clone_lock(const struct
+@@ -1377,6 +1390,12 @@ struct sock *sk_clone_lock(const struct
smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
@@ -24364,7 +24469,7 @@ diff -NurpP --minimal linux-3.6.10/net/core/sock.c linux-3.6.10-vs2.3.4.6/net/co
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -2187,6 +2206,12 @@ void sock_init_data(struct socket *sock,
+@@ -2133,6 +2152,12 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp = ktime_set(-1L, 0);
@@ -24377,9 +24482,9 @@ diff -NurpP --minimal linux-3.6.10/net/core/sock.c linux-3.6.10-vs2.3.4.6/net/co
/*
* Before updating sk_refcnt, we must commit prior changes to memory
* (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.6.10/net/ipv4/af_inet.c linux-3.6.10-vs2.3.4.6/net/ipv4/af_inet.c
---- linux-3.6.10/net/ipv4/af_inet.c 2012-10-04 13:27:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/af_inet.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv4/af_inet.c linux-3.4.45-vs2.3.3.9/net/ipv4/af_inet.c
+--- linux-3.4.45/net/ipv4/af_inet.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/af_inet.c 2013-03-02 15:26:44.000000000 +0000
@@ -118,6 +118,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
@@ -24388,7 +24493,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/af_inet.c linux-3.6.10-vs2.3.4.6/net
/* The inetsw table contains everything that inet_create needs to
-@@ -326,9 +327,13 @@ lookup_protocol:
+@@ -332,9 +333,13 @@ lookup_protocol:
}
err = -EPERM;
@@ -24403,7 +24508,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/af_inet.c linux-3.6.10-vs2.3.4.6/net
err = -EAFNOSUPPORT;
if (!inet_netns_ok(net, protocol))
goto out_rcu_unlock;
-@@ -453,6 +458,7 @@ int inet_bind(struct socket *sock, struc
+@@ -459,6 +464,7 @@ int inet_bind(struct socket *sock, struc
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
struct sock *sk = sock->sk;
struct inet_sock *inet = inet_sk(sk);
@@ -24411,7 +24516,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/af_inet.c linux-3.6.10-vs2.3.4.6/net
unsigned short snum;
int chk_addr_ret;
int err;
-@@ -476,7 +482,11 @@ int inet_bind(struct socket *sock, struc
+@@ -482,7 +488,11 @@ int inet_bind(struct socket *sock, struc
goto out;
}
@@ -24424,7 +24529,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/af_inet.c linux-3.6.10-vs2.3.4.6/net
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -488,7 +498,7 @@ int inet_bind(struct socket *sock, struc
+@@ -494,7 +504,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
if (!sysctl_ip_nonlocal_bind &&
!(inet->freebind || inet->transparent) &&
@@ -24433,7 +24538,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/af_inet.c linux-3.6.10-vs2.3.4.6/net
chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST &&
chk_addr_ret != RTN_BROADCAST)
-@@ -513,7 +523,7 @@ int inet_bind(struct socket *sock, struc
+@@ -519,7 +529,7 @@ int inet_bind(struct socket *sock, struc
if (sk->sk_state != TCP_CLOSE || inet->inet_num)
goto out_release_sock;
@@ -24442,7 +24547,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/af_inet.c linux-3.6.10-vs2.3.4.6/net
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
-@@ -731,11 +741,13 @@ int inet_getname(struct socket *sock, st
+@@ -722,11 +732,13 @@ int inet_getname(struct socket *sock, st
peer == 1))
return -ENOTCONN;
sin->sin_port = inet->inet_dport;
@@ -24457,10 +24562,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/af_inet.c linux-3.6.10-vs2.3.4.6/net
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-3.6.10/net/ipv4/arp.c linux-3.6.10-vs2.3.4.6/net/ipv4/arp.c
---- linux-3.6.10/net/ipv4/arp.c 2012-10-04 13:27:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/arp.c 2012-10-04 16:47:00.000000000 +0000
-@@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc
+diff -NurpP --minimal linux-3.4.45/net/ipv4/arp.c linux-3.4.45-vs2.3.3.9/net/ipv4/arp.c
+--- linux-3.4.45/net/ipv4/arp.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/arp.c 2012-05-21 16:15:05.000000000 +0000
+@@ -1328,6 +1328,7 @@ static void arp_format_neigh_entry(struc
struct net_device *dev = n->dev;
int hatype = dev->type;
@@ -24468,7 +24573,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/arp.c linux-3.6.10-vs2.3.4.6/net/ipv
read_lock(&n->lock);
/* Convert hardware address to XX:XX:XX:XX ... form. */
#if IS_ENABLED(CONFIG_AX25)
-@@ -1349,6 +1350,7 @@ static void arp_format_pneigh_entry(stru
+@@ -1359,6 +1360,7 @@ static void arp_format_pneigh_entry(stru
int hatype = dev ? dev->type : 0;
char tbuf[16];
@@ -24476,10 +24581,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/arp.c linux-3.6.10-vs2.3.4.6/net/ipv
sprintf(tbuf, "%pI4", n->key);
seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
-diff -NurpP --minimal linux-3.6.10/net/ipv4/devinet.c linux-3.6.10-vs2.3.4.6/net/ipv4/devinet.c
---- linux-3.6.10/net/ipv4/devinet.c 2012-10-04 13:27:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/devinet.c 2012-10-04 16:47:00.000000000 +0000
-@@ -516,6 +516,7 @@ struct in_device *inetdev_by_index(struc
+diff -NurpP --minimal linux-3.4.45/net/ipv4/devinet.c linux-3.4.45-vs2.3.3.9/net/ipv4/devinet.c
+--- linux-3.4.45/net/ipv4/devinet.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/devinet.c 2012-05-21 16:15:05.000000000 +0000
+@@ -517,6 +517,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
@@ -24487,7 +24592,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/devinet.c linux-3.6.10-vs2.3.4.6/net
/* Called only from RTNL semaphored context. No locks. */
struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
-@@ -757,6 +758,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -758,6 +759,8 @@ int devinet_ioctl(struct net *net, unsig
in_dev = __in_dev_get_rtnl(dev);
if (in_dev) {
@@ -24496,7 +24601,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/devinet.c linux-3.6.10-vs2.3.4.6/net
if (tryaddrmatch) {
/* Matthias Andree */
/* compare label and address (4.4BSD style) */
-@@ -765,6 +768,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -766,6 +769,8 @@ int devinet_ioctl(struct net *net, unsig
This is checked above. */
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
ifap = &ifa->ifa_next) {
@@ -24505,7 +24610,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/devinet.c linux-3.6.10-vs2.3.4.6/net
if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
sin_orig.sin_addr.s_addr ==
ifa->ifa_local) {
-@@ -777,9 +782,12 @@ int devinet_ioctl(struct net *net, unsig
+@@ -778,9 +783,12 @@ int devinet_ioctl(struct net *net, unsig
comparing just the label */
if (!ifa) {
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
@@ -24519,7 +24624,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/devinet.c linux-3.6.10-vs2.3.4.6/net
}
}
-@@ -932,6 +940,8 @@ static int inet_gifconf(struct net_devic
+@@ -933,6 +941,8 @@ static int inet_gifconf(struct net_devic
goto out;
for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
@@ -24528,7 +24633,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/devinet.c linux-3.6.10-vs2.3.4.6/net
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1291,6 +1301,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1294,6 +1304,7 @@ static int inet_dump_ifaddr(struct sk_bu
struct net_device *dev;
struct in_device *in_dev;
struct in_ifaddr *ifa;
@@ -24536,7 +24641,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/devinet.c linux-3.6.10-vs2.3.4.6/net
struct hlist_head *head;
struct hlist_node *node;
-@@ -1313,6 +1324,8 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1316,6 +1327,8 @@ static int inet_dump_ifaddr(struct sk_bu
for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
ifa = ifa->ifa_next, ip_idx++) {
@@ -24545,10 +24650,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/devinet.c linux-3.6.10-vs2.3.4.6/net
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.6.10/net/ipv4/fib_trie.c linux-3.6.10-vs2.3.4.6/net/ipv4/fib_trie.c
---- linux-3.6.10/net/ipv4/fib_trie.c 2012-10-04 13:27:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/fib_trie.c 2012-10-04 16:47:00.000000000 +0000
-@@ -2554,6 +2554,7 @@ static int fib_route_seq_show(struct seq
+diff -NurpP --minimal linux-3.4.45/net/ipv4/fib_trie.c linux-3.4.45-vs2.3.3.9/net/ipv4/fib_trie.c
+--- linux-3.4.45/net/ipv4/fib_trie.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/fib_trie.c 2012-05-21 16:15:05.000000000 +0000
+@@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq
|| fa->fa_type == RTN_MULTICAST)
continue;
@@ -24556,10 +24661,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/fib_trie.c linux-3.6.10-vs2.3.4.6/ne
if (fi)
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_connection_sock.c linux-3.6.10-vs2.3.4.6/net/ipv4/inet_connection_sock.c
---- linux-3.6.10/net/ipv4/inet_connection_sock.c 2012-12-11 11:37:03.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/inet_connection_sock.c 2012-11-06 17:43:41.000000000 +0000
-@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
+diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_connection_sock.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_connection_sock.c
+--- linux-3.4.45/net/ipv4/inet_connection_sock.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_connection_sock.c 2013-01-16 00:15:57.000000000 +0000
+@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
@@ -24595,9 +24700,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_connection_sock.c linux-3.6.10-
+}
+
int inet_csk_bind_conflict(const struct sock *sk,
- const struct inet_bind_bucket *tb, bool relax)
+ const struct inet_bind_bucket *tb)
{
-@@ -75,9 +106,7 @@ int inet_csk_bind_conflict(const struct
+@@ -74,9 +105,7 @@ int inet_csk_bind_conflict(const struct
sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
if (!reuse || !sk2->sk_reuse ||
sk2->sk_state == TCP_LISTEN) {
@@ -24607,10 +24712,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_connection_sock.c linux-3.6.10-
+ if (ipv4_rcv_saddr_equal(sk, sk2))
break;
}
- if (!relax && reuse && sk2->sk_reuse &&
-diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_diag.c linux-3.6.10-vs2.3.4.6/net/ipv4/inet_diag.c
---- linux-3.6.10/net/ipv4/inet_diag.c 2012-12-11 11:37:03.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/inet_diag.c 2012-12-08 00:36:33.000000000 +0000
+ }
+diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_diag.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_diag.c
+--- linux-3.4.45/net/ipv4/inet_diag.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_diag.c 2013-01-16 00:18:21.000000000 +0000
@@ -31,6 +31,8 @@
#include <linux/inet.h>
@@ -24620,7 +24725,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_diag.c linux-3.6.10-vs2.3.4.6/n
#include <linux/inet_diag.h>
#include <linux/sock_diag.h>
-@@ -101,8 +103,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+@@ -110,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s
r->id.idiag_sport = inet->inet_sport;
r->id.idiag_dport = inet->inet_dport;
@@ -24633,7 +24738,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_diag.c linux-3.6.10-vs2.3.4.6/n
/* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
* hence this needs to be included regardless of socket family.
-@@ -233,8 +237,8 @@ static int inet_twsk_diag_fill(struct in
+@@ -231,8 +235,8 @@ static int inet_twsk_diag_fill(struct in
sock_diag_save_cookie(tw, r->id.idiag_cookie);
r->id.idiag_sport = tw->tw_sport;
r->id.idiag_dport = tw->tw_dport;
@@ -24649,17 +24754,17 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_diag.c linux-3.6.10-vs2.3.4.6/n
err = -EINVAL;
if (req->sdiag_family == AF_INET) {
+ /* TODO: lback */
- sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],
+ sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
req->id.idiag_dport, req->id.idiag_src[0],
req->id.idiag_sport, req->id.idiag_if);
}
#if IS_ENABLED(CONFIG_IPV6)
else if (req->sdiag_family == AF_INET6) {
+ /* TODO: lback */
- sk = inet6_lookup(net, hashinfo,
+ sk = inet6_lookup(&init_net, hashinfo,
(struct in6_addr *)req->id.idiag_dst,
req->id.idiag_dport,
-@@ -476,6 +482,7 @@ int inet_diag_bc_sk(const struct nlattr
+@@ -482,6 +488,7 @@ int inet_diag_bc_sk(const struct nlattr
} else
#endif
{
@@ -24667,7 +24772,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_diag.c linux-3.6.10-vs2.3.4.6/n
entry.saddr = &inet->inet_rcv_saddr;
entry.daddr = &inet->inet_daddr;
}
-@@ -574,6 +581,7 @@ static int inet_twsk_diag_dump(struct in
+@@ -639,6 +646,7 @@ static int inet_twsk_diag_dump(struct in
} else
#endif
{
@@ -24675,7 +24780,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_diag.c linux-3.6.10-vs2.3.4.6/n
entry.saddr = &tw->tw_rcv_saddr;
entry.daddr = &tw->tw_daddr;
}
-@@ -620,8 +628,8 @@ static int inet_diag_fill_req(struct sk_
+@@ -714,8 +722,8 @@ static int inet_diag_fill_req(struct sk_
r->id.idiag_sport = inet->inet_sport;
r->id.idiag_dport = ireq->rmt_port;
@@ -24686,37 +24791,44 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_diag.c linux-3.6.10-vs2.3.4.6/n
r->idiag_expires = jiffies_to_msecs(tmo);
r->idiag_rqueue = 0;
r->idiag_wqueue = 0;
-@@ -748,6 +757,8 @@ void inet_diag_dump_icsk(struct inet_has
- if (!net_eq(sock_net(sk), net))
- continue;
+@@ -784,6 +792,7 @@ static int inet_diag_dump_reqs(struct sk
+ continue;
+
+ if (bc) {
++ /* TODO: lback */
+ inet_diag_req_addrs(sk, req, &entry);
+ entry.dport = ntohs(ireq->rmt_port);
+
+@@ -834,6 +843,8 @@ void inet_diag_dump_icsk(struct inet_has
+ sk_nulls_for_each(sk, node, &ilb->head) {
+ struct inet_sock *inet = inet_sk(sk);
+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (num < s_num) {
num++;
continue;
-@@ -820,6 +831,8 @@ skip_listen_ht:
+@@ -904,6 +915,8 @@ skip_listen_ht:
+ sk_nulls_for_each(sk, node, &head->chain) {
+ struct inet_sock *inet = inet_sk(sk);
- if (!net_eq(sock_net(sk), net))
- continue;
+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (num < s_num)
goto next_normal;
if (!(r->idiag_states & (1 << sk->sk_state)))
-@@ -848,7 +861,8 @@ next_normal:
+@@ -931,6 +944,8 @@ next_normal:
+ inet_twsk_for_each(tw, node,
&head->twchain) {
- if (!net_eq(twsk_net(tw), net))
- continue;
--
+
+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (num < s_num)
goto next_dying;
if (r->sdiag_family != AF_UNSPEC &&
-diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_hashtables.c linux-3.6.10-vs2.3.4.6/net/ipv4/inet_hashtables.c
---- linux-3.6.10/net/ipv4/inet_hashtables.c 2012-07-22 21:39:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/inet_hashtables.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_hashtables.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_hashtables.c
+--- linux-3.4.45/net/ipv4/inet_hashtables.c 2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_hashtables.c 2012-05-21 16:15:05.000000000 +0000
@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
@@ -24753,9 +24865,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/inet_hashtables.c linux-3.6.10-vs2.3
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.6.10/net/ipv4/netfilter/nf_nat_helper.c linux-3.6.10-vs2.3.4.6/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.6.10/net/ipv4/netfilter/nf_nat_helper.c 2012-10-04 13:27:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/netfilter/nf_nat_helper.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.4.45/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,6 +20,7 @@
#include <net/route.h>
@@ -24764,9 +24876,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/netfilter/nf_nat_helper.c linux-3.6.
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.6.10/net/ipv4/netfilter.c linux-3.6.10-vs2.3.4.6/net/ipv4/netfilter.c
---- linux-3.6.10/net/ipv4/netfilter.c 2012-07-22 21:39:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/netfilter.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv4/netfilter.c linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter.c
+--- linux-3.4.45/net/ipv4/netfilter.c 2012-01-09 15:15:03.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter.c 2012-05-21 16:15:05.000000000 +0000
@@ -6,7 +6,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
@@ -24776,9 +24888,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/netfilter.c linux-3.6.10-vs2.3.4.6/n
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.6.10/net/ipv4/raw.c linux-3.6.10-vs2.3.4.6/net/ipv4/raw.c
---- linux-3.6.10/net/ipv4/raw.c 2012-10-04 13:27:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/raw.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv4/raw.c linux-3.4.45-vs2.3.3.9/net/ipv4/raw.c
+--- linux-3.4.45/net/ipv4/raw.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/raw.c 2012-10-22 13:09:53.000000000 +0000
@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
@@ -24788,7 +24900,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/raw.c linux-3.6.10-vs2.3.4.6/net/ipv
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
goto found; /* gotcha */
}
-@@ -397,6 +397,12 @@ static int raw_send_hdrinc(struct sock *
+@@ -392,6 +392,12 @@ static int raw_send_hdrinc(struct sock *
icmp_out_count(net, ((struct icmphdr *)
skb_transport_header(skb))->type);
@@ -24801,7 +24913,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/raw.c linux-3.6.10-vs2.3.4.6/net/ipv
err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
rt->dst.dev, dst_output);
if (err > 0)
-@@ -582,6 +588,16 @@ static int raw_sendmsg(struct kiocb *ioc
+@@ -577,6 +583,16 @@ static int raw_sendmsg(struct kiocb *ioc
goto done;
}
@@ -24818,7 +24930,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/raw.c linux-3.6.10-vs2.3.4.6/net/ipv
security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
if (IS_ERR(rt)) {
-@@ -658,17 +674,19 @@ static int raw_bind(struct sock *sk, str
+@@ -653,17 +669,19 @@ static int raw_bind(struct sock *sk, str
{
struct inet_sock *inet = inet_sk(sk);
struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
@@ -24841,7 +24953,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/raw.c linux-3.6.10-vs2.3.4.6/net/ipv
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
sk_dst_reset(sk);
-@@ -720,7 +738,8 @@ static int raw_recvmsg(struct kiocb *ioc
+@@ -715,7 +733,8 @@ static int raw_recvmsg(struct kiocb *ioc
/* Copy the address. */
if (sin) {
sin->sin_family = AF_INET;
@@ -24851,7 +24963,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/raw.c linux-3.6.10-vs2.3.4.6/net/ipv
sin->sin_port = 0;
memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
}
-@@ -916,7 +935,8 @@ static struct sock *raw_get_first(struct
+@@ -911,7 +930,8 @@ static struct sock *raw_get_first(struct
struct hlist_node *node;
sk_for_each(sk, node, &state->h->ht[state->bucket])
@@ -24861,7 +24973,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/raw.c linux-3.6.10-vs2.3.4.6/net/ipv
goto found;
}
sk = NULL;
-@@ -932,7 +952,8 @@ static struct sock *raw_get_next(struct
+@@ -927,7 +947,8 @@ static struct sock *raw_get_next(struct
sk = sk_next(sk);
try_again:
;
@@ -24871,10 +24983,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/raw.c linux-3.6.10-vs2.3.4.6/net/ipv
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.6.10/net/ipv4/route.c linux-3.6.10-vs2.3.4.6/net/ipv4/route.c
---- linux-3.6.10/net/ipv4/route.c 2012-12-11 11:37:03.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/route.c 2012-12-08 00:36:33.000000000 +0000
-@@ -1949,7 +1949,7 @@ struct rtable *__ip_route_output_key(str
+diff -NurpP --minimal linux-3.4.45/net/ipv4/route.c linux-3.4.45-vs2.3.3.9/net/ipv4/route.c
+--- linux-3.4.45/net/ipv4/route.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/route.c 2012-05-21 16:15:05.000000000 +0000
+@@ -2696,7 +2696,7 @@ static struct rtable *ip_route_output_sl
if (fl4->flowi4_oif) {
@@ -24883,9 +24995,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/route.c linux-3.6.10-vs2.3.4.6/net/i
rth = ERR_PTR(-ENODEV);
if (dev_out == NULL)
goto out;
-diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp.c linux-3.6.10-vs2.3.4.6/net/ipv4/tcp.c
---- linux-3.6.10/net/ipv4/tcp.c 2012-12-11 11:37:03.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/tcp.c 2012-12-08 00:36:33.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp.c
+--- linux-3.4.45/net/ipv4/tcp.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp.c 2013-03-30 21:29:17.000000000 +0000
@@ -268,6 +268,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
@@ -24893,11 +25005,11 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp.c linux-3.6.10-vs2.3.4.6/net/ipv
+#include <linux/in.h>
#include <net/icmp.h>
- #include <net/inet_common.h>
-diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/net/ipv4/tcp_ipv4.c
---- linux-3.6.10/net/ipv4/tcp_ipv4.c 2012-12-11 11:37:03.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/tcp_ipv4.c 2012-11-06 17:43:41.000000000 +0000
-@@ -2034,6 +2034,12 @@ static void *listening_get_next(struct s
+ #include <net/tcp.h>
+diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp_ipv4.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_ipv4.c
+--- linux-3.4.45/net/ipv4/tcp_ipv4.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_ipv4.c 2013-01-16 00:15:57.000000000 +0000
+@@ -2037,6 +2037,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
@@ -24910,7 +25022,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -2058,6 +2064,10 @@ get_req:
+@@ -2061,6 +2067,10 @@ get_req:
}
get_sk:
sk_nulls_for_each_from(sk, node) {
@@ -24921,7 +25033,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == st->family) {
-@@ -2134,6 +2144,11 @@ static void *established_get_first(struc
+@@ -2137,6 +2147,11 @@ static void *established_get_first(struc
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
@@ -24933,7 +25045,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
if (sk->sk_family != st->family ||
!net_eq(sock_net(sk), net)) {
continue;
-@@ -2144,6 +2159,11 @@ static void *established_get_first(struc
+@@ -2147,6 +2162,11 @@ static void *established_get_first(struc
st->state = TCP_SEQ_STATE_TIME_WAIT;
inet_twsk_for_each(tw, node,
&tcp_hashinfo.ehash[st->bucket].twchain) {
@@ -24945,7 +25057,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
if (tw->tw_family != st->family ||
!net_eq(twsk_net(tw), net)) {
continue;
-@@ -2173,7 +2193,9 @@ static void *established_get_next(struct
+@@ -2176,7 +2196,9 @@ static void *established_get_next(struct
tw = cur;
tw = tw_next(tw);
get_tw:
@@ -24956,7 +25068,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
tw = tw_next(tw);
}
if (tw) {
-@@ -2197,6 +2219,11 @@ get_tw:
+@@ -2200,6 +2222,11 @@ get_tw:
sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) {
@@ -24968,7 +25080,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
goto found;
}
-@@ -2402,9 +2429,9 @@ static void get_openreq4(const struct so
+@@ -2405,9 +2432,9 @@ static void get_openreq4(const struct so
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
i,
@@ -24980,7 +25092,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
ntohs(ireq->rmt_port),
TCP_SYN_RECV,
0, 0, /* could print option size, but that is af dependent. */
-@@ -2426,8 +2453,8 @@ static void get_tcp4_sock(struct sock *s
+@@ -2429,8 +2456,8 @@ static void get_tcp4_sock(struct sock *s
const struct tcp_sock *tp = tcp_sk(sk);
const struct inet_connection_sock *icsk = inet_csk(sk);
const struct inet_sock *inet = inet_sk(sk);
@@ -24991,7 +25103,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
int rx_queue;
-@@ -2484,8 +2511,8 @@ static void get_timewait4_sock(const str
+@@ -2487,8 +2514,8 @@ static void get_timewait4_sock(const str
if (ttd < 0)
ttd = 0;
@@ -25002,9 +25114,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_ipv4.c linux-3.6.10-vs2.3.4.6/ne
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_minisocks.c linux-3.6.10-vs2.3.4.6/net/ipv4/tcp_minisocks.c
---- linux-3.6.10/net/ipv4/tcp_minisocks.c 2012-10-04 13:27:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/tcp_minisocks.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp_minisocks.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_minisocks.c
+--- linux-3.4.45/net/ipv4/tcp_minisocks.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_minisocks.c 2012-05-21 16:15:05.000000000 +0000
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
@@ -25015,7 +25127,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_minisocks.c linux-3.6.10-vs2.3.4
#include <net/tcp.h>
#include <net/inet_common.h>
#include <net/xfrm.h>
-@@ -287,6 +290,11 @@ void tcp_time_wait(struct sock *sk, int
+@@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int
tcptw->tw_ts_recent = tp->rx_opt.ts_recent;
tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
@@ -25027,10 +25139,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/tcp_minisocks.c linux-3.6.10-vs2.3.4
#if IS_ENABLED(CONFIG_IPV6)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv4/udp.c
---- linux-3.6.10/net/ipv4/udp.c 2012-10-04 13:27:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv4/udp.c 2012-10-04 16:47:00.000000000 +0000
-@@ -300,14 +300,7 @@ fail:
+diff -NurpP --minimal linux-3.4.45/net/ipv4/udp.c linux-3.4.45-vs2.3.3.9/net/ipv4/udp.c
+--- linux-3.4.45/net/ipv4/udp.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/udp.c 2012-06-28 14:45:36.000000000 +0000
+@@ -298,14 +298,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
@@ -25046,7 +25158,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
unsigned int port)
-@@ -342,6 +335,11 @@ static inline int compute_score(struct s
+@@ -340,6 +333,11 @@ static inline int compute_score(struct s
if (inet->inet_rcv_saddr != daddr)
return -1;
score += 2;
@@ -25058,7 +25170,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
}
if (inet->inet_daddr) {
if (inet->inet_daddr != saddr)
-@@ -445,6 +443,7 @@ exact_match:
+@@ -443,6 +441,7 @@ exact_match:
return result;
}
@@ -25066,7 +25178,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
/* UDP is nearly always wildcards out the wazoo, it makes no sense to try
* harder than this. -DaveM
*/
-@@ -490,6 +489,11 @@ begin:
+@@ -488,6 +487,11 @@ begin:
sk_nulls_for_each_rcu(sk, node, &hslot->head) {
score = compute_score(sk, net, saddr, hnum, sport,
daddr, dport, dif);
@@ -25078,7 +25190,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
if (score > badness) {
result = sk;
badness = score;
-@@ -503,6 +507,7 @@ begin:
+@@ -501,6 +505,7 @@ begin:
if (get_nulls_value(node) != slot)
goto begin;
@@ -25086,7 +25198,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
if (result) {
if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
result = NULL;
-@@ -512,6 +517,7 @@ begin:
+@@ -510,6 +515,7 @@ begin:
goto begin;
}
}
@@ -25094,7 +25206,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
rcu_read_unlock();
return result;
}
-@@ -555,8 +561,7 @@ static inline struct sock *udp_v4_mcast_
+@@ -553,8 +559,7 @@ static inline struct sock *udp_v4_mcast_
udp_sk(s)->udp_port_hash != hnum ||
(inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
(inet->inet_dport != rmt_port && inet->inet_dport) ||
@@ -25104,7 +25216,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
ipv6_only_sock(s) ||
(s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
continue;
-@@ -939,6 +944,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -933,6 +938,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
faddr, saddr, dport, inet->inet_sport);
@@ -25121,7 +25233,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
rt = ip_route_output_flow(net, fl4, sk);
if (IS_ERR(rt)) {
-@@ -1244,7 +1259,8 @@ try_again:
+@@ -1231,7 +1246,8 @@ try_again:
if (sin) {
sin->sin_family = AF_INET;
sin->sin_port = udp_hdr(skb)->source;
@@ -25131,7 +25243,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
}
if (inet->cmsg_flags)
-@@ -1992,6 +2008,8 @@ static struct sock *udp_get_first(struct
+@@ -1970,6 +1986,8 @@ static struct sock *udp_get_first(struct
sk_nulls_for_each(sk, node, &hslot->head) {
if (!net_eq(sock_net(sk), net))
continue;
@@ -25140,7 +25252,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
if (sk->sk_family == state->family)
goto found;
}
-@@ -2009,7 +2027,9 @@ static struct sock *udp_get_next(struct
+@@ -1987,7 +2005,9 @@ static struct sock *udp_get_next(struct
do {
sk = sk_nulls_next(sk);
@@ -25151,7 +25263,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
if (!sk) {
if (state->bucket <= state->udp_table->mask)
-@@ -2105,8 +2125,8 @@ static void udp4_format_sock(struct sock
+@@ -2083,8 +2103,8 @@ static void udp4_format_sock(struct sock
int bucket, int *len)
{
struct inet_sock *inet = inet_sk(sp);
@@ -25162,9 +25274,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv4/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
-diff -NurpP --minimal linux-3.6.10/net/ipv6/Kconfig linux-3.6.10-vs2.3.4.6/net/ipv6/Kconfig
---- linux-3.6.10/net/ipv6/Kconfig 2012-07-22 21:39:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/Kconfig 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv6/Kconfig linux-3.4.45-vs2.3.3.9/net/ipv6/Kconfig
+--- linux-3.4.45/net/ipv6/Kconfig 2010-08-02 14:52:59.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/Kconfig 2012-05-21 16:15:05.000000000 +0000
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
@@ -25176,10 +25288,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/Kconfig linux-3.6.10-vs2.3.4.6/net/i
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/net/ipv6/addrconf.c
---- linux-3.6.10/net/ipv6/addrconf.c 2012-12-11 11:37:04.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/addrconf.c 2012-11-06 17:43:41.000000000 +0000
-@@ -92,6 +92,8 @@
+diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/net/ipv6/addrconf.c
+--- linux-3.4.45/net/ipv6/addrconf.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/addrconf.c 2013-05-13 18:16:08.000000000 +0000
+@@ -88,6 +88,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/export.h>
@@ -25188,7 +25300,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
/* Set to 3 to get tracing... */
#define ACONF_DEBUG 2
-@@ -1101,7 +1103,7 @@ out:
+@@ -1108,7 +1110,7 @@ out:
int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
const struct in6_addr *daddr, unsigned int prefs,
@@ -25197,7 +25309,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
{
struct ipv6_saddr_score scores[2],
*score = &scores[0], *hiscore = &scores[1];
-@@ -1173,6 +1175,8 @@ int ipv6_dev_get_saddr(struct net *net,
+@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net,
dev->name);
continue;
}
@@ -25206,7 +25318,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
score->rule = -1;
bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3159,7 +3163,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3193,7 +3197,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
@@ -25218,7 +25330,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -3665,6 +3672,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3699,6 +3706,11 @@ static int in6_dump_addrs(struct inet6_d
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;
@@ -25230,7 +25342,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
read_lock_bh(&idev->lock);
switch (type) {
-@@ -3675,6 +3687,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3709,6 +3721,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
@@ -25239,7 +25351,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3691,6 +3705,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3725,6 +3739,8 @@ static int in6_dump_addrs(struct inet6_d
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
@@ -25248,7 +25360,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3706,6 +3722,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3740,6 +3756,8 @@ static int in6_dump_addrs(struct inet6_d
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
@@ -25257,7 +25369,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -4089,6 +4107,11 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4125,6 +4143,11 @@ static int inet6_dump_ifinfo(struct sk_b
struct inet6_dev *idev;
struct hlist_head *head;
struct hlist_node *node;
@@ -25269,7 +25381,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
s_h = cb->args[0];
s_idx = cb->args[1];
-@@ -4100,6 +4123,8 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4136,6 +4159,8 @@ static int inet6_dump_ifinfo(struct sk_b
hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
if (idx < s_idx)
goto cont;
@@ -25278,10 +25390,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/addrconf.c linux-3.6.10-vs2.3.4.6/ne
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/net/ipv6/af_inet6.c
---- linux-3.6.10/net/ipv6/af_inet6.c 2012-12-11 11:37:04.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/af_inet6.c 2012-11-06 17:43:41.000000000 +0000
-@@ -43,6 +43,8 @@
+diff -NurpP --minimal linux-3.4.45/net/ipv6/af_inet6.c linux-3.4.45-vs2.3.3.9/net/ipv6/af_inet6.c
+--- linux-3.4.45/net/ipv6/af_inet6.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/af_inet6.c 2012-09-01 09:15:04.000000000 +0000
+@@ -42,6 +42,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
#include <linux/netfilter_ipv6.h>
@@ -25290,7 +25402,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
#include <net/ip.h>
#include <net/ipv6.h>
-@@ -160,9 +162,12 @@ lookup_protocol:
+@@ -159,9 +161,12 @@ lookup_protocol:
}
err = -EPERM;
@@ -25304,7 +25416,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_no_check = answer->no_check;
-@@ -262,6 +267,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -261,6 +266,7 @@ int inet6_bind(struct socket *sock, stru
struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk);
struct net *net = sock_net(sk);
@@ -25312,7 +25424,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
__be32 v4addr = 0;
unsigned short snum;
int addr_type = 0;
-@@ -277,6 +283,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -276,6 +282,10 @@ int inet6_bind(struct socket *sock, stru
if (addr->sin6_family != AF_INET6)
return -EAFNOSUPPORT;
@@ -25323,7 +25435,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
addr_type = ipv6_addr_type(&addr->sin6_addr);
if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
return -EINVAL;
-@@ -308,6 +318,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -307,6 +317,7 @@ int inet6_bind(struct socket *sock, stru
/* Reproduce AF_INET checks to make the bindings consistent */
v4addr = addr->sin6_addr.s6_addr32[3];
chk_addr_ret = inet_addr_type(net, v4addr);
@@ -25331,7 +25443,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
if (!sysctl_ip_nonlocal_bind &&
!(inet->freebind || inet->transparent) &&
v4addr != htonl(INADDR_ANY) &&
-@@ -317,6 +328,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -316,6 +327,10 @@ int inet6_bind(struct socket *sock, stru
err = -EADDRNOTAVAIL;
goto out;
}
@@ -25342,7 +25454,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
} else {
if (addr_type != IPV6_ADDR_ANY) {
struct net_device *dev = NULL;
-@@ -343,6 +358,11 @@ int inet6_bind(struct socket *sock, stru
+@@ -342,6 +357,11 @@ int inet6_bind(struct socket *sock, stru
}
}
@@ -25354,7 +25466,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-@@ -359,6 +379,9 @@ int inet6_bind(struct socket *sock, stru
+@@ -358,6 +378,9 @@ int inet6_bind(struct socket *sock, stru
}
}
@@ -25364,7 +25476,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
inet->inet_rcv_saddr = v4addr;
inet->inet_saddr = v4addr;
-@@ -460,9 +483,11 @@ int inet6_getname(struct socket *sock, s
+@@ -459,9 +482,11 @@ int inet6_getname(struct socket *sock, s
return -ENOTCONN;
sin->sin6_port = inet->inet_dport;
sin->sin6_addr = np->daddr;
@@ -25376,10 +25488,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/af_inet6.c linux-3.6.10-vs2.3.4.6/ne
if (ipv6_addr_any(&np->rcv_saddr))
sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-3.6.10/net/ipv6/datagram.c linux-3.6.10-vs2.3.4.6/net/ipv6/datagram.c
---- linux-3.6.10/net/ipv6/datagram.c 2012-07-22 21:39:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/datagram.c 2012-10-04 16:47:00.000000000 +0000
-@@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s
+diff -NurpP --minimal linux-3.4.45/net/ipv6/datagram.c linux-3.4.45-vs2.3.3.9/net/ipv6/datagram.c
+--- linux-3.4.45/net/ipv6/datagram.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/datagram.c 2012-05-21 16:15:05.000000000 +0000
+@@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s
rcu_read_lock();
if (fl6->flowi6_oif) {
@@ -25388,10 +25500,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/datagram.c linux-3.6.10-vs2.3.4.6/ne
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-3.6.10/net/ipv6/fib6_rules.c linux-3.6.10-vs2.3.4.6/net/ipv6/fib6_rules.c
---- linux-3.6.10/net/ipv6/fib6_rules.c 2012-07-22 21:39:48.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/fib6_rules.c 2012-10-04 16:47:00.000000000 +0000
-@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
+diff -NurpP --minimal linux-3.4.45/net/ipv6/fib6_rules.c linux-3.4.45-vs2.3.3.9/net/ipv6/fib6_rules.c
+--- linux-3.4.45/net/ipv6/fib6_rules.c 2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/fib6_rules.c 2012-05-21 16:15:05.000000000 +0000
+@@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp6->daddr,
rt6_flags2srcprefs(flags),
@@ -25400,9 +25512,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/fib6_rules.c linux-3.6.10-vs2.3.4.6/
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-3.6.10/net/ipv6/inet6_hashtables.c linux-3.6.10-vs2.3.4.6/net/ipv6/inet6_hashtables.c
---- linux-3.6.10/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/inet6_hashtables.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv6/inet6_hashtables.c linux-3.4.45-vs2.3.3.9/net/ipv6/inet6_hashtables.c
+--- linux-3.4.45/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/inet6_hashtables.c 2012-05-21 16:15:05.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/module.h>
@@ -25438,9 +25550,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/inet6_hashtables.c linux-3.6.10-vs2.
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.6.10/net/ipv6/ip6_output.c linux-3.6.10-vs2.3.4.6/net/ipv6/ip6_output.c
---- linux-3.6.10/net/ipv6/ip6_output.c 2012-10-04 13:27:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/ip6_output.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv6/ip6_output.c linux-3.4.45-vs2.3.3.9/net/ipv6/ip6_output.c
+--- linux-3.4.45/net/ipv6/ip6_output.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/ip6_output.c 2013-02-19 14:42:56.000000000 +0000
@@ -966,7 +966,8 @@ static int ip6_dst_lookup_tail(struct so
struct rt6_info *rt = (struct rt6_info *) *dst;
err = ip6_route_get_saddr(net, rt, &fl6->daddr,
@@ -25451,10 +25563,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/ip6_output.c linux-3.6.10-vs2.3.4.6/
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-3.6.10/net/ipv6/ndisc.c linux-3.6.10-vs2.3.4.6/net/ipv6/ndisc.c
---- linux-3.6.10/net/ipv6/ndisc.c 2012-12-11 11:37:04.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/ndisc.c 2012-12-08 00:36:33.000000000 +0000
-@@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev
+diff -NurpP --minimal linux-3.4.45/net/ipv6/ndisc.c linux-3.4.45-vs2.3.3.9/net/ipv6/ndisc.c
+--- linux-3.4.45/net/ipv6/ndisc.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/ndisc.c 2012-11-18 23:52:30.000000000 +0000
+@@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
@@ -25463,9 +25575,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/ndisc.c linux-3.6.10-vs2.3.4.6/net/i
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-3.6.10/net/ipv6/raw.c linux-3.6.10-vs2.3.4.6/net/ipv6/raw.c
---- linux-3.6.10/net/ipv6/raw.c 2012-10-04 13:27:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/raw.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv6/raw.c linux-3.4.45-vs2.3.3.9/net/ipv6/raw.c
+--- linux-3.4.45/net/ipv6/raw.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/raw.c 2012-10-22 13:09:53.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
@@ -25488,10 +25600,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/raw.c linux-3.6.10-vs2.3.4.6/net/ipv
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-3.6.10/net/ipv6/route.c linux-3.6.10-vs2.3.4.6/net/ipv6/route.c
---- linux-3.6.10/net/ipv6/route.c 2012-12-11 11:37:04.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/route.c 2012-12-08 00:36:33.000000000 +0000
-@@ -57,6 +57,7 @@
+diff -NurpP --minimal linux-3.4.45/net/ipv6/route.c linux-3.4.45-vs2.3.3.9/net/ipv6/route.c
+--- linux-3.4.45/net/ipv6/route.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/route.c 2013-03-30 21:29:17.000000000 +0000
+@@ -55,6 +55,7 @@
#include <net/xfrm.h>
#include <net/netevent.h>
#include <net/netlink.h>
@@ -25499,7 +25611,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/route.c linux-3.6.10-vs2.3.4.6/net/i
#include <asm/uaccess.h>
-@@ -2112,15 +2113,17 @@ int ip6_route_get_saddr(struct net *net,
+@@ -2147,15 +2148,17 @@ int ip6_route_get_saddr(struct net *net,
struct rt6_info *rt,
const struct in6_addr *daddr,
unsigned int prefs,
@@ -25520,17 +25632,17 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/route.c linux-3.6.10-vs2.3.4.6/net/i
return err;
}
-@@ -2456,7 +2459,8 @@ static int rt6_fill_node(struct net *net
- goto nla_put_failure;
+@@ -2486,7 +2489,8 @@ static int rt6_fill_node(struct net *net
+ NLA_PUT_U32(skb, RTA_IIF, iif);
} else if (dst) {
struct in6_addr saddr_buf;
-- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
+- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0)
+ if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
-+ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
- nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
- goto nla_put_failure;
++ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0)
+ NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
}
-@@ -2674,6 +2678,7 @@ static int rt6_info_route(struct rt6_inf
+
+@@ -2713,6 +2717,7 @@ static int rt6_info_route(struct rt6_inf
struct seq_file *m = p_arg;
struct neighbour *n;
@@ -25538,9 +25650,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/route.c linux-3.6.10-vs2.3.4.6/net/i
seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.6.10/net/ipv6/tcp_ipv6.c linux-3.6.10-vs2.3.4.6/net/ipv6/tcp_ipv6.c
---- linux-3.6.10/net/ipv6/tcp_ipv6.c 2012-12-11 11:37:04.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/tcp_ipv6.c 2012-11-06 17:43:41.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv6/tcp_ipv6.c linux-3.4.45-vs2.3.3.9/net/ipv6/tcp_ipv6.c
+--- linux-3.4.45/net/ipv6/tcp_ipv6.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/tcp_ipv6.c 2013-01-16 00:15:57.000000000 +0000
@@ -71,6 +71,7 @@
#include <linux/crypto.h>
@@ -25549,7 +25661,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/tcp_ipv6.c linux-3.6.10-vs2.3.4.6/ne
static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
-@@ -175,8 +176,15 @@ static int tcp_v6_connect(struct sock *s
+@@ -163,8 +164,15 @@ static int tcp_v6_connect(struct sock *s
* connect() to INADDR_ANY means loopback (BSD'ism).
*/
@@ -25567,10 +25679,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/tcp_ipv6.c linux-3.6.10-vs2.3.4.6/ne
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-3.6.10/net/ipv6/udp.c linux-3.6.10-vs2.3.4.6/net/ipv6/udp.c
---- linux-3.6.10/net/ipv6/udp.c 2012-10-04 13:27:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/udp.c 2012-10-04 16:56:03.000000000 +0000
-@@ -45,42 +45,68 @@
+diff -NurpP --minimal linux-3.4.45/net/ipv6/udp.c linux-3.4.45-vs2.3.3.9/net/ipv6/udp.c
+--- linux-3.4.45/net/ipv6/udp.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/udp.c 2012-05-21 16:15:05.000000000 +0000
+@@ -45,41 +45,67 @@
#include <net/tcp_states.h>
#include <net/ip6_checksum.h>
#include <net/xfrm.h>
@@ -25578,7 +25690,6 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
- #include <trace/events/skb.h>
#include "udp_impl.h"
-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
@@ -25652,7 +25763,7 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
}
static unsigned int udp6_portaddr_hash(struct net *net,
-@@ -144,6 +170,10 @@ static inline int compute_score(struct s
+@@ -143,6 +169,10 @@ static inline int compute_score(struct s
if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
return -1;
score++;
@@ -25663,9 +25774,9 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/udp.c linux-3.6.10-vs2.3.4.6/net/ipv
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.6.10/net/ipv6/xfrm6_policy.c linux-3.6.10-vs2.3.4.6/net/ipv6/xfrm6_policy.c
---- linux-3.6.10/net/ipv6/xfrm6_policy.c 2012-10-04 13:27:50.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/ipv6/xfrm6_policy.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/ipv6/xfrm6_policy.c linux-3.4.45-vs2.3.3.9/net/ipv6/xfrm6_policy.c
+--- linux-3.4.45/net/ipv6/xfrm6_policy.c 2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/xfrm6_policy.c 2012-05-21 16:15:05.000000000 +0000
@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
dev = ip6_dst_idev(dst)->dev;
ipv6_dev_get_saddr(dev_net(dev), dev,
@@ -25675,10 +25786,10 @@ diff -NurpP --minimal linux-3.6.10/net/ipv6/xfrm6_policy.c linux-3.6.10-vs2.3.4.
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-3.6.10/net/netfilter/ipvs/ip_vs_xmit.c linux-3.6.10-vs2.3.4.6/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.6.10/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-11 11:37:04.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/netfilter/ipvs/ip_vs_xmit.c 2012-11-06 17:43:41.000000000 +0000
-@@ -231,7 +231,7 @@ __ip_vs_route_output_v6(struct net *net,
+diff -NurpP --minimal linux-3.4.45/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.45-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.4.45/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2012-05-21 16:15:05.000000000 +0000
+@@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl6.saddr) &&
ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
@@ -25687,9 +25798,9 @@ diff -NurpP --minimal linux-3.6.10/net/netfilter/ipvs/ip_vs_xmit.c linux-3.6.10-
goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.6.10/net/netlink/af_netlink.c linux-3.6.10-vs2.3.4.6/net/netlink/af_netlink.c
---- linux-3.6.10/net/netlink/af_netlink.c 2012-12-11 11:37:04.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/netlink/af_netlink.c 2012-12-08 00:36:33.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/netlink/af_netlink.c linux-3.4.45-vs2.3.3.9/net/netlink/af_netlink.c
+--- linux-3.4.45/net/netlink/af_netlink.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/netlink/af_netlink.c 2012-11-18 23:52:30.000000000 +0000
@@ -55,6 +55,9 @@
#include <linux/types.h>
#include <linux/audit.h>
@@ -25700,7 +25811,7 @@ diff -NurpP --minimal linux-3.6.10/net/netlink/af_netlink.c linux-3.6.10-vs2.3.4
#include <net/net_namespace.h>
#include <net/sock.h>
-@@ -1983,6 +1986,8 @@ static struct sock *netlink_seq_socket_i
+@@ -1951,6 +1954,8 @@ static struct sock *netlink_seq_socket_i
sk_for_each(s, node, &hash->table[j]) {
if (sock_net(s) != seq_file_net(seq))
continue;
@@ -25709,7 +25820,7 @@ diff -NurpP --minimal linux-3.6.10/net/netlink/af_netlink.c linux-3.6.10-vs2.3.4
if (off == pos) {
iter->link = i;
iter->hash_idx = j;
-@@ -2017,7 +2022,8 @@ static void *netlink_seq_next(struct seq
+@@ -1985,7 +1990,8 @@ static void *netlink_seq_next(struct seq
s = v;
do {
s = sk_next(s);
@@ -25719,7 +25830,7 @@ diff -NurpP --minimal linux-3.6.10/net/netlink/af_netlink.c linux-3.6.10-vs2.3.4
if (s)
return s;
-@@ -2029,7 +2035,8 @@ static void *netlink_seq_next(struct seq
+@@ -1997,7 +2003,8 @@ static void *netlink_seq_next(struct seq
for (; j <= hash->mask; j++) {
s = sk_head(&hash->table[j]);
@@ -25729,9 +25840,9 @@ diff -NurpP --minimal linux-3.6.10/net/netlink/af_netlink.c linux-3.6.10-vs2.3.4
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socket.c
---- linux-3.6.10/net/socket.c 2012-10-04 13:27:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/socket.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/socket.c linux-3.4.45-vs2.3.3.9/net/socket.c
+--- linux-3.4.45/net/socket.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/socket.c 2012-10-22 13:09:53.000000000 +0000
@@ -98,6 +98,10 @@
#include <net/sock.h>
@@ -25743,7 +25854,7 @@ diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socke
#include <linux/if_tun.h>
#include <linux/ipv6_route.h>
-@@ -552,6 +556,7 @@ static inline int __sock_sendmsg_nosec(s
+@@ -551,6 +555,7 @@ static inline int __sock_sendmsg_nosec(s
struct msghdr *msg, size_t size)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -25751,7 +25862,7 @@ diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socke
sock_update_classid(sock->sk);
-@@ -560,7 +565,22 @@ static inline int __sock_sendmsg_nosec(s
+@@ -561,7 +566,22 @@ static inline int __sock_sendmsg_nosec(s
si->msg = msg;
si->size = size;
@@ -25775,7 +25886,7 @@ diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socke
}
static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-@@ -716,6 +736,7 @@ static inline int __sock_recvmsg_nosec(s
+@@ -717,6 +737,7 @@ static inline int __sock_recvmsg_nosec(s
struct msghdr *msg, size_t size, int flags)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -25783,7 +25894,7 @@ diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socke
sock_update_classid(sock->sk);
-@@ -725,7 +746,18 @@ static inline int __sock_recvmsg_nosec(s
+@@ -726,7 +747,18 @@ static inline int __sock_recvmsg_nosec(s
si->size = size;
si->flags = flags;
@@ -25803,7 +25914,7 @@ diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socke
}
static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-@@ -1210,6 +1242,13 @@ int __sock_create(struct net *net, int f
+@@ -1211,6 +1243,13 @@ int __sock_create(struct net *net, int f
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
@@ -25817,7 +25928,7 @@ diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socke
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1344,6 +1383,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1346,6 +1385,7 @@ SYSCALL_DEFINE3(socket, int, family, int
if (retval < 0)
goto out;
@@ -25825,7 +25936,7 @@ diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socke
retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
if (retval < 0)
goto out_release;
-@@ -1385,10 +1425,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+@@ -1387,10 +1427,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
@@ -25838,18 +25949,18 @@ diff -NurpP --minimal linux-3.6.10/net/socket.c linux-3.6.10-vs2.3.4.6/net/socke
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.6.10/net/sunrpc/auth.c linux-3.6.10-vs2.3.4.6/net/sunrpc/auth.c
---- linux-3.6.10/net/sunrpc/auth.c 2012-10-04 13:27:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/sunrpc/auth.c 2012-10-04 16:47:00.000000000 +0000
-@@ -15,6 +15,7 @@
+diff -NurpP --minimal linux-3.4.45/net/sunrpc/auth.c linux-3.4.45-vs2.3.3.9/net/sunrpc/auth.c
+--- linux-3.4.45/net/sunrpc/auth.c 2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/sunrpc/auth.c 2012-05-21 16:15:05.000000000 +0000
+@@ -14,6 +14,7 @@
+ #include <linux/hash.h>
#include <linux/sunrpc/clnt.h>
- #include <linux/sunrpc/gss_api.h>
#include <linux/spinlock.h>
+#include <linux/vs_tag.h>
#ifdef RPC_DEBUG
# define RPCDBG_FACILITY RPCDBG_AUTH
-@@ -481,6 +482,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
+@@ -427,6 +428,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
memset(&acred, 0, sizeof(acred));
acred.uid = cred->fsuid;
acred.gid = cred->fsgid;
@@ -25857,7 +25968,7 @@ diff -NurpP --minimal linux-3.6.10/net/sunrpc/auth.c linux-3.6.10-vs2.3.4.6/net/
acred.group_info = get_group_info(((struct cred *)cred)->group_info);
ret = auth->au_ops->lookup_cred(auth, &acred, flags);
-@@ -521,6 +523,7 @@ rpcauth_bind_root_cred(struct rpc_task *
+@@ -467,6 +469,7 @@ rpcauth_bind_root_cred(struct rpc_task *
struct auth_cred acred = {
.uid = 0,
.gid = 0,
@@ -25865,32 +25976,33 @@ diff -NurpP --minimal linux-3.6.10/net/sunrpc/auth.c linux-3.6.10-vs2.3.4.6/net/
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.6.10/net/sunrpc/auth_unix.c linux-3.6.10-vs2.3.4.6/net/sunrpc/auth_unix.c
---- linux-3.6.10/net/sunrpc/auth_unix.c 2012-07-22 21:39:49.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/sunrpc/auth_unix.c 2012-10-04 16:47:00.000000000 +0000
-@@ -13,11 +13,13 @@
+diff -NurpP --minimal linux-3.4.45/net/sunrpc/auth_unix.c linux-3.4.45-vs2.3.3.9/net/sunrpc/auth_unix.c
+--- linux-3.4.45/net/sunrpc/auth_unix.c 2012-01-09 15:15:04.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/sunrpc/auth_unix.c 2012-05-21 16:15:05.000000000 +0000
+@@ -12,12 +12,14 @@
+ #include <linux/module.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
- #include <linux/user_namespace.h>
+#include <linux/vs_tag.h>
#define NFS_NGROUPS 16
struct unx_cred {
struct rpc_cred uc_base;
-+ tag_t uc_tag;
gid_t uc_gid;
++ tag_t uc_tag;
gid_t uc_gids[NFS_NGROUPS];
};
-@@ -79,6 +81,7 @@ unx_create_cred(struct rpc_auth *auth, s
+ #define uc_uid uc_base.cr_uid
+@@ -78,6 +80,7 @@ unx_create_cred(struct rpc_auth *auth, s
groups = NFS_NGROUPS;
cred->uc_gid = acred->gid;
+ cred->uc_tag = acred->tag;
- for (i = 0; i < groups; i++) {
- gid_t gid;
- gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
-@@ -123,7 +126,9 @@ unx_match(struct auth_cred *acred, struc
+ for (i = 0; i < groups; i++)
+ cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
+ if (i < NFS_NGROUPS)
+@@ -119,7 +122,9 @@ unx_match(struct auth_cred *acred, struc
unsigned int i;
@@ -25901,7 +26013,7 @@ diff -NurpP --minimal linux-3.6.10/net/sunrpc/auth_unix.c linux-3.6.10-vs2.3.4.6
return 0;
if (acred->group_info != NULL)
-@@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3
+@@ -145,7 +150,7 @@ unx_marshal(struct rpc_task *task, __be3
struct rpc_clnt *clnt = task->tk_client;
struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
__be32 *base, *hold;
@@ -25910,7 +26022,7 @@ diff -NurpP --minimal linux-3.6.10/net/sunrpc/auth_unix.c linux-3.6.10-vs2.3.4.6
*p++ = htonl(RPC_AUTH_UNIX);
base = p++;
-@@ -162,9 +167,12 @@ unx_marshal(struct rpc_task *task, __be3
+@@ -155,9 +160,12 @@ unx_marshal(struct rpc_task *task, __be3
* Copy the UTS nodename captured when the client was created.
*/
p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
@@ -25925,9 +26037,9 @@ diff -NurpP --minimal linux-3.6.10/net/sunrpc/auth_unix.c linux-3.6.10-vs2.3.4.6
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.6.10/net/sunrpc/clnt.c linux-3.6.10-vs2.3.4.6/net/sunrpc/clnt.c
---- linux-3.6.10/net/sunrpc/clnt.c 2012-10-04 13:27:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/sunrpc/clnt.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/sunrpc/clnt.c linux-3.4.45-vs2.3.3.9/net/sunrpc/clnt.c
+--- linux-3.4.45/net/sunrpc/clnt.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/sunrpc/clnt.c 2013-02-11 23:37:30.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/in6.h>
#include <linux/un.h>
@@ -25936,7 +26048,7 @@ diff -NurpP --minimal linux-3.6.10/net/sunrpc/clnt.c linux-3.6.10-vs2.3.4.6/net/
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/rpc_pipe_fs.h>
-@@ -481,6 +482,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
+@@ -483,6 +484,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
if (!(args->flags & RPC_CLNT_CREATE_QUIET))
clnt->cl_chatty = 1;
@@ -25946,9 +26058,9 @@ diff -NurpP --minimal linux-3.6.10/net/sunrpc/clnt.c linux-3.6.10-vs2.3.4.6/net/
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.6.10/net/unix/af_unix.c linux-3.6.10-vs2.3.4.6/net/unix/af_unix.c
---- linux-3.6.10/net/unix/af_unix.c 2012-10-04 13:27:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/net/unix/af_unix.c 2012-10-04 16:59:36.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/net/unix/af_unix.c linux-3.4.45-vs2.3.3.9/net/unix/af_unix.c
+--- linux-3.4.45/net/unix/af_unix.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/unix/af_unix.c 2013-05-13 18:16:08.000000000 +0000
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
@@ -25956,9 +26068,9 @@ diff -NurpP --minimal linux-3.6.10/net/unix/af_unix.c linux-3.6.10-vs2.3.4.6/net
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
- struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
+ struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
EXPORT_SYMBOL_GPL(unix_socket_table);
-@@ -271,6 +273,8 @@ static struct sock *__unix_find_socket_b
+@@ -261,6 +263,8 @@ static struct sock *__unix_find_socket_b
if (!net_eq(sock_net(s), net))
continue;
@@ -25967,27 +26079,28 @@ diff -NurpP --minimal linux-3.6.10/net/unix/af_unix.c linux-3.6.10-vs2.3.4.6/net
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2258,6 +2262,8 @@ static struct sock *unix_from_bucket(str
- for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
- if (sock_net(sk) != seq_file_net(seq))
+@@ -2265,6 +2269,8 @@ static struct sock *unix_seq_idx(struct
+ for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
+ if (sock_net(s) != seq_file_net(seq))
continue;
-+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
-+ continue;
- if (++count == offset)
- break;
- }
-@@ -2275,6 +2281,8 @@ static struct sock *unix_next_socket(str
- sk = sk_next(sk);
- if (!sk)
- goto next_bucket;
-+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
- if (sock_net(sk) == seq_file_net(seq))
- return sk;
- }
-diff -NurpP --minimal linux-3.6.10/scripts/checksyscalls.sh linux-3.6.10-vs2.3.4.6/scripts/checksyscalls.sh
---- linux-3.6.10/scripts/checksyscalls.sh 2012-10-04 13:27:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/scripts/checksyscalls.sh 2012-10-04 16:47:00.000000000 +0000
+ if (off == pos)
+ return s;
+ ++off;
+@@ -2289,7 +2295,8 @@ static void *unix_seq_next(struct seq_fi
+ sk = first_unix_socket(&iter->i);
+ else
+ sk = next_unix_socket(&iter->i, sk);
+- while (sk && (sock_net(sk) != seq_file_net(seq)))
++ while (sk && (sock_net(sk) != seq_file_net(seq) ||
++ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)))
+ sk = next_unix_socket(&iter->i, sk);
+ return sk;
+ }
+diff -NurpP --minimal linux-3.4.45/scripts/checksyscalls.sh linux-3.4.45-vs2.3.3.9/scripts/checksyscalls.sh
+--- linux-3.4.45/scripts/checksyscalls.sh 2012-03-19 18:47:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/scripts/checksyscalls.sh 2012-05-21 16:15:05.000000000 +0000
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
@@ -25996,9 +26109,9 @@ diff -NurpP --minimal linux-3.6.10/scripts/checksyscalls.sh linux-3.6.10-vs2.3.4
EOF
}
-diff -NurpP --minimal linux-3.6.10/security/commoncap.c linux-3.6.10-vs2.3.4.6/security/commoncap.c
---- linux-3.6.10/security/commoncap.c 2012-07-22 21:39:51.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/security/commoncap.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/security/commoncap.c linux-3.4.45-vs2.3.3.9/security/commoncap.c
+--- linux-3.4.45/security/commoncap.c 2012-05-21 16:07:41.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/security/commoncap.c 2012-05-21 16:15:05.000000000 +0000
@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st
int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
int cap, int audit)
@@ -26006,14 +26119,14 @@ diff -NurpP --minimal linux-3.6.10/security/commoncap.c linux-3.6.10-vs2.3.4.6/s
+ struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
+
for (;;) {
- /* The owner of the user namespace has all caps. */
- if (targ_ns != &init_user_ns && uid_eq(targ_ns->owner, cred->euid))
+ /* The creator of the user namespace has all caps. */
+ if (targ_ns != &init_user_ns && targ_ns->creator == cred->user)
return 0;
/* Do we have the necessary capabilities? */
-- if (targ_ns == cred->user_ns)
+- if (targ_ns == cred->user->user_ns)
- return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
-+ if (targ_ns == cred->user_ns) {
++ if (targ_ns == cred->user->user_ns) {
+ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
+ cap_raised(cred->cap_effective, cap))
+ return 0;
@@ -26022,7 +26135,7 @@ diff -NurpP --minimal linux-3.6.10/security/commoncap.c linux-3.6.10-vs2.3.4.6/s
/* Have we tried all of the parent namespaces? */
if (targ_ns == &init_user_ns)
-@@ -619,7 +625,7 @@ int cap_inode_setxattr(struct dentry *de
+@@ -612,7 +618,7 @@ int cap_inode_setxattr(struct dentry *de
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
@@ -26031,7 +26144,7 @@ diff -NurpP --minimal linux-3.6.10/security/commoncap.c linux-3.6.10-vs2.3.4.6/s
return -EPERM;
return 0;
}
-@@ -645,7 +651,7 @@ int cap_inode_removexattr(struct dentry
+@@ -638,7 +644,7 @@ int cap_inode_removexattr(struct dentry
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
@@ -26040,9 +26153,9 @@ diff -NurpP --minimal linux-3.6.10/security/commoncap.c linux-3.6.10-vs2.3.4.6/s
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-3.6.10/security/selinux/hooks.c linux-3.6.10-vs2.3.4.6/security/selinux/hooks.c
---- linux-3.6.10/security/selinux/hooks.c 2012-10-04 13:27:53.000000000 +0000
-+++ linux-3.6.10-vs2.3.4.6/security/selinux/hooks.c 2012-10-04 16:47:00.000000000 +0000
+diff -NurpP --minimal linux-3.4.45/security/selinux/hooks.c linux-3.4.45-vs2.3.3.9/security/selinux/hooks.c
+--- linux-3.4.45/security/selinux/hooks.c 2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/security/selinux/hooks.c 2012-09-01 08:50:49.000000000 +0000
@@ -66,7 +66,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
diff --git a/main/linux-vserver/patch-3.6.11-al4.patch b/main/linux-vserver/patch-3.6.11-al4.patch
deleted file mode 100644
index 70802f6815..0000000000
--- a/main/linux-vserver/patch-3.6.11-al4.patch
+++ /dev/null
@@ -1,16533 +0,0 @@
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 9a6c4da..61ed6f7 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2697,7 +2697,7 @@ S: Maintained
- F: drivers/net/ethernet/i825xx/eexpress.*
-
- ETHERNET BRIDGE
--M: Stephen Hemminger <shemminger@vyatta.com>
-+M: Stephen Hemminger <stephen@networkplumber.org>
- L: bridge@lists.linux-foundation.org
- L: netdev@vger.kernel.org
- W: http://www.linuxfoundation.org/en/Net:Bridge
-@@ -4420,7 +4420,7 @@ S: Maintained
-
- MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
- M: Mirko Lindner <mlindner@marvell.com>
--M: Stephen Hemminger <shemminger@vyatta.com>
-+M: Stephen Hemminger <stephen@networkplumber.org>
- L: netdev@vger.kernel.org
- S: Maintained
- F: drivers/net/ethernet/marvell/sk*
-@@ -4664,7 +4664,7 @@ S: Supported
- F: drivers/infiniband/hw/nes/
-
- NETEM NETWORK EMULATOR
--M: Stephen Hemminger <shemminger@vyatta.com>
-+M: Stephen Hemminger <stephen@networkplumber.org>
- L: netem@lists.linux-foundation.org
- S: Maintained
- F: net/sched/sch_netem.c
-diff --git a/arch/arm/kernel/sched_clock.c b/arch/arm/kernel/sched_clock.c
-index f451539..63bc22c 100644
---- a/arch/arm/kernel/sched_clock.c
-+++ b/arch/arm/kernel/sched_clock.c
-@@ -89,11 +89,11 @@ static void notrace update_sched_clock(void)
- * detectable in cyc_to_fixed_sched_clock().
- */
- raw_local_irq_save(flags);
-- cd.epoch_cyc = cyc;
-+ cd.epoch_cyc_copy = cyc;
- smp_wmb();
- cd.epoch_ns = ns;
- smp_wmb();
-- cd.epoch_cyc_copy = cyc;
-+ cd.epoch_cyc = cyc;
- raw_local_irq_restore(flags);
- }
-
-diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
-index df74518..ab1017b 100644
---- a/arch/arm/kernel/swp_emulate.c
-+++ b/arch/arm/kernel/swp_emulate.c
-@@ -109,10 +109,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr)
- {
- siginfo_t info;
-
-+ down_read(&current->mm->mmap_sem);
- if (find_vma(current->mm, addr) == NULL)
- info.si_code = SEGV_MAPERR;
- else
- info.si_code = SEGV_ACCERR;
-+ up_read(&current->mm->mmap_sem);
-
- info.si_signo = SIGSEGV;
- info.si_errno = 0;
-diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
-index bd0e88c..c2ff99c 100644
---- a/arch/arm/mach-at91/setup.c
-+++ b/arch/arm/mach-at91/setup.c
-@@ -104,6 +104,8 @@ static void __init soc_detect(u32 dbgu_base)
- switch (socid) {
- case ARCH_ID_AT91RM9200:
- at91_soc_initdata.type = AT91_SOC_RM9200;
-+ if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_NONE)
-+ at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
- at91_boot_soc = at91rm9200_soc;
- break;
-
-diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
-index a611ad3..b6132aa 100644
---- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
-+++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
-@@ -463,6 +463,9 @@
- GPIO76_LCD_PCLK, \
- GPIO77_LCD_BIAS
-
-+/* these enable a work-around for a hw bug in pxa27x during ac97 warm reset */
-+#define GPIO113_AC97_nRESET_GPIO_HIGH MFP_CFG_OUT(GPIO113, AF0, DEFAULT)
-+#define GPIO95_AC97_nRESET_GPIO_HIGH MFP_CFG_OUT(GPIO95, AF0, DEFAULT)
-
- extern int keypad_set_wake(unsigned int on);
- #endif /* __ASM_ARCH_MFP_PXA27X_H */
-diff --git a/arch/arm/mach-pxa/include/mach/smemc.h b/arch/arm/mach-pxa/include/mach/smemc.h
-index b7de471..b802f28 100644
---- a/arch/arm/mach-pxa/include/mach/smemc.h
-+++ b/arch/arm/mach-pxa/include/mach/smemc.h
-@@ -37,6 +37,7 @@
- #define CSADRCFG1 (SMEMC_VIRT + 0x84) /* Address Configuration Register for CS1 */
- #define CSADRCFG2 (SMEMC_VIRT + 0x88) /* Address Configuration Register for CS2 */
- #define CSADRCFG3 (SMEMC_VIRT + 0x8C) /* Address Configuration Register for CS3 */
-+#define CSMSADRCFG (SMEMC_VIRT + 0xA0) /* Chip Select Configuration Register */
-
- /*
- * More handy macros for PCMCIA
-diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
-index 4726c24..a2fe795 100644
---- a/arch/arm/mach-pxa/pxa27x.c
-+++ b/arch/arm/mach-pxa/pxa27x.c
-@@ -47,9 +47,9 @@ void pxa27x_clear_otgph(void)
- EXPORT_SYMBOL(pxa27x_clear_otgph);
-
- static unsigned long ac97_reset_config[] = {
-- GPIO113_GPIO,
-+ GPIO113_AC97_nRESET_GPIO_HIGH,
- GPIO113_AC97_nRESET,
-- GPIO95_GPIO,
-+ GPIO95_AC97_nRESET_GPIO_HIGH,
- GPIO95_AC97_nRESET,
- };
-
-diff --git a/arch/arm/mach-pxa/smemc.c b/arch/arm/mach-pxa/smemc.c
-index 7992305..f38aa89 100644
---- a/arch/arm/mach-pxa/smemc.c
-+++ b/arch/arm/mach-pxa/smemc.c
-@@ -40,6 +40,8 @@ static void pxa3xx_smemc_resume(void)
- __raw_writel(csadrcfg[1], CSADRCFG1);
- __raw_writel(csadrcfg[2], CSADRCFG2);
- __raw_writel(csadrcfg[3], CSADRCFG3);
-+ /* CSMSADRCFG wakes up in its default state (0), so we need to set it */
-+ __raw_writel(0x2, CSMSADRCFG);
- }
-
- static struct syscore_ops smemc_syscore_ops = {
-@@ -49,8 +51,19 @@ static struct syscore_ops smemc_syscore_ops = {
-
- static int __init smemc_init(void)
- {
-- if (cpu_is_pxa3xx())
-+ if (cpu_is_pxa3xx()) {
-+ /*
-+ * The only documentation we have on the
-+ * Chip Select Configuration Register (CSMSADRCFG) is that
-+ * it must be programmed to 0x2.
-+ * Moreover, in the bit definitions, the second bit
-+ * (CSMSADRCFG[1]) is called "SETALWAYS".
-+ * Other bits are reserved in this register.
-+ */
-+ __raw_writel(0x2, CSMSADRCFG);
-+
- register_syscore_ops(&smemc_syscore_ops);
-+ }
-
- return 0;
- }
-diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h
-index 124bce6..a301e61 100644
---- a/arch/arm/mach-realview/include/mach/board-eb.h
-+++ b/arch/arm/mach-realview/include/mach/board-eb.h
-@@ -47,7 +47,7 @@
- #define REALVIEW_EB_USB_BASE 0x4F000000 /* USB */
-
- #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
--#define REALVIEW_EB11MP_PRIV_MEM_BASE 0x1F000000
-+#define REALVIEW_EB11MP_PRIV_MEM_BASE 0x10100000
- #define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */
- #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */
- #else
-diff --git a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
-index 4135de8..13ed33c 100644
---- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
-+++ b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
-@@ -40,17 +40,17 @@
- addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
- addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
- bic \rd, \rd, #0xff000
-- ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
-+ ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
- and \rd, \rd, #0x00ff0000
- teq \rd, #0x00440000 @ is it 2440?
- 1004:
-- ldr \rd, [ \rx, # S3C2410_UFSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UFSTAT]
- moveq \rd, \rd, lsr #SHIFT_2440TXF
- tst \rd, #S3C2410_UFSTAT_TXFULL
- .endm
-
- .macro fifo_full_s3c2410 rd, rx
-- ldr \rd, [ \rx, # S3C2410_UFSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UFSTAT]
- tst \rd, #S3C2410_UFSTAT_TXFULL
- .endm
-
-@@ -68,18 +68,18 @@
- addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
- addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
- bic \rd, \rd, #0xff000
-- ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
-+ ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
- and \rd, \rd, #0x00ff0000
- teq \rd, #0x00440000 @ is it 2440?
-
- 10000:
-- ldr \rd, [ \rx, # S3C2410_UFSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UFSTAT]
- andne \rd, \rd, #S3C2410_UFSTAT_TXMASK
- andeq \rd, \rd, #S3C2440_UFSTAT_TXMASK
- .endm
-
- .macro fifo_level_s3c2410 rd, rx
-- ldr \rd, [ \rx, # S3C2410_UFSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UFSTAT]
- and \rd, \rd, #S3C2410_UFSTAT_TXMASK
- .endm
-
-diff --git a/arch/arm/mach-s3c24xx/include/mach/entry-macro.S b/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
-index 7615a14..6a21bee 100644
---- a/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
-+++ b/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
-@@ -31,10 +31,10 @@
-
- @@ try the interrupt offset register, since it is there
-
-- ldr \irqstat, [ \base, #INTPND ]
-+ ldr \irqstat, [\base, #INTPND ]
- teq \irqstat, #0
- beq 1002f
-- ldr \irqnr, [ \base, #INTOFFSET ]
-+ ldr \irqnr, [\base, #INTOFFSET ]
- mov \tmp, #1
- tst \irqstat, \tmp, lsl \irqnr
- bne 1001f
-diff --git a/arch/arm/mach-s3c24xx/pm-h1940.S b/arch/arm/mach-s3c24xx/pm-h1940.S
-index c93bf2d..6183a68 100644
---- a/arch/arm/mach-s3c24xx/pm-h1940.S
-+++ b/arch/arm/mach-s3c24xx/pm-h1940.S
-@@ -30,4 +30,4 @@
-
- h1940_pm_return:
- mov r0, #S3C2410_PA_GPIO
-- ldr pc, [ r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO ]
-+ ldr pc, [r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO]
-diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
-index dd5b638..65200ae 100644
---- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S
-+++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
-@@ -45,9 +45,9 @@ ENTRY(s3c2410_cpu_suspend)
- ldr r4, =S3C2410_REFRESH
- ldr r5, =S3C24XX_MISCCR
- ldr r6, =S3C2410_CLKCON
-- ldr r7, [ r4 ] @ get REFRESH (and ensure in TLB)
-- ldr r8, [ r5 ] @ get MISCCR (and ensure in TLB)
-- ldr r9, [ r6 ] @ get CLKCON (and ensure in TLB)
-+ ldr r7, [r4] @ get REFRESH (and ensure in TLB)
-+ ldr r8, [r5] @ get MISCCR (and ensure in TLB)
-+ ldr r9, [r6] @ get CLKCON (and ensure in TLB)
-
- orr r7, r7, #S3C2410_REFRESH_SELF @ SDRAM sleep command
- orr r8, r8, #S3C2410_MISCCR_SDSLEEP @ SDRAM power-down signals
-@@ -61,8 +61,8 @@ ENTRY(s3c2410_cpu_suspend)
- @@ align next bit of code to cache line
- .align 5
- s3c2410_do_sleep:
-- streq r7, [ r4 ] @ SDRAM sleep command
-- streq r8, [ r5 ] @ SDRAM power-down config
-- streq r9, [ r6 ] @ CPU sleep
-+ streq r7, [r4] @ SDRAM sleep command
-+ streq r8, [r5] @ SDRAM power-down config
-+ streq r9, [r6] @ CPU sleep
- 1: beq 1b
- mov pc, r14
-diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
-index c82418e..5adaceb 100644
---- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S
-+++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
-@@ -57,12 +57,12 @@ s3c2412_sleep_enter1:
- * retry, as simply returning causes the system to lock.
- */
-
-- ldrne r9, [ r1 ]
-- strne r9, [ r1 ]
-- ldrne r9, [ r2 ]
-- strne r9, [ r2 ]
-- ldrne r9, [ r3 ]
-- strne r9, [ r3 ]
-+ ldrne r9, [r1]
-+ strne r9, [r1]
-+ ldrne r9, [r2]
-+ strne r9, [r2]
-+ ldrne r9, [r3]
-+ strne r9, [r3]
- bne s3c2412_sleep_enter1
-
- mov pc, r14
-diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
-index 13f555d..357fc03 100644
---- a/arch/arm/mm/dma-mapping.c
-+++ b/arch/arm/mm/dma-mapping.c
-@@ -729,25 +729,27 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,
- size_t size, enum dma_data_direction dir,
- void (*op)(const void *, size_t, int))
- {
-+ unsigned long pfn;
-+ size_t left = size;
-+
-+ pfn = page_to_pfn(page) + offset / PAGE_SIZE;
-+ offset %= PAGE_SIZE;
-+
- /*
- * A single sg entry may refer to multiple physically contiguous
- * pages. But we still need to process highmem pages individually.
- * If highmem is not configured then the bulk of this loop gets
- * optimized out.
- */
-- size_t left = size;
- do {
- size_t len = left;
- void *vaddr;
-
-+ page = pfn_to_page(pfn);
-+
- if (PageHighMem(page)) {
-- if (len + offset > PAGE_SIZE) {
-- if (offset >= PAGE_SIZE) {
-- page += offset / PAGE_SIZE;
-- offset %= PAGE_SIZE;
-- }
-+ if (len + offset > PAGE_SIZE)
- len = PAGE_SIZE - offset;
-- }
- vaddr = kmap_high_get(page);
- if (vaddr) {
- vaddr += offset;
-@@ -764,7 +766,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,
- op(vaddr, len, dir);
- }
- offset = 0;
-- page++;
-+ pfn++;
- left -= len;
- } while (left);
- }
-diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
-index c2fa21d..b68b531 100644
---- a/arch/arm/mm/mmu.c
-+++ b/arch/arm/mm/mmu.c
-@@ -498,7 +498,7 @@ static void __init build_mem_type_table(void)
- #endif
-
- for (i = 0; i < 16; i++) {
-- unsigned long v = pgprot_val(protection_map[i]);
-+ pteval_t v = pgprot_val(protection_map[i]);
- protection_map[i] = __pgprot(v | user_pgprot);
- }
-
-diff --git a/arch/arm/plat-samsung/include/plat/debug-macro.S b/arch/arm/plat-samsung/include/plat/debug-macro.S
-index 207e275..f3a9cff 100644
---- a/arch/arm/plat-samsung/include/plat/debug-macro.S
-+++ b/arch/arm/plat-samsung/include/plat/debug-macro.S
-@@ -14,12 +14,12 @@
- /* The S5PV210/S5PC110 implementations are as belows. */
-
- .macro fifo_level_s5pv210 rd, rx
-- ldr \rd, [ \rx, # S3C2410_UFSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UFSTAT]
- and \rd, \rd, #S5PV210_UFSTAT_TXMASK
- .endm
-
- .macro fifo_full_s5pv210 rd, rx
-- ldr \rd, [ \rx, # S3C2410_UFSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UFSTAT]
- tst \rd, #S5PV210_UFSTAT_TXFULL
- .endm
-
-@@ -27,7 +27,7 @@
- * most widely re-used */
-
- .macro fifo_level_s3c2440 rd, rx
-- ldr \rd, [ \rx, # S3C2410_UFSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UFSTAT]
- and \rd, \rd, #S3C2440_UFSTAT_TXMASK
- .endm
-
-@@ -36,7 +36,7 @@
- #endif
-
- .macro fifo_full_s3c2440 rd, rx
-- ldr \rd, [ \rx, # S3C2410_UFSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UFSTAT]
- tst \rd, #S3C2440_UFSTAT_TXFULL
- .endm
-
-@@ -45,11 +45,11 @@
- #endif
-
- .macro senduart,rd,rx
-- strb \rd, [\rx, # S3C2410_UTXH ]
-+ strb \rd, [\rx, # S3C2410_UTXH]
- .endm
-
- .macro busyuart, rd, rx
-- ldr \rd, [ \rx, # S3C2410_UFCON ]
-+ ldr \rd, [\rx, # S3C2410_UFCON]
- tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled?
- beq 1001f @
- @ FIFO enabled...
-@@ -60,7 +60,7 @@
-
- 1001:
- @ busy waiting for non fifo
-- ldr \rd, [ \rx, # S3C2410_UTRSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UTRSTAT]
- tst \rd, #S3C2410_UTRSTAT_TXFE
- beq 1001b
-
-@@ -68,7 +68,7 @@
- .endm
-
- .macro waituart,rd,rx
-- ldr \rd, [ \rx, # S3C2410_UFCON ]
-+ ldr \rd, [\rx, # S3C2410_UFCON]
- tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled?
- beq 1001f @
- @ FIFO enabled...
-@@ -79,7 +79,7 @@
- b 1002f
- 1001:
- @ idle waiting for non fifo
-- ldr \rd, [ \rx, # S3C2410_UTRSTAT ]
-+ ldr \rd, [\rx, # S3C2410_UTRSTAT]
- tst \rd, #S3C2410_UTRSTAT_TXFE
- beq 1001b
-
-diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
-index cc926c9..323ce1a 100644
---- a/arch/arm/vfp/entry.S
-+++ b/arch/arm/vfp/entry.S
-@@ -22,7 +22,7 @@
- @ IRQs disabled.
- @
- ENTRY(do_vfp)
--#ifdef CONFIG_PREEMPT
-+#ifdef CONFIG_PREEMPT_COUNT
- ldr r4, [r10, #TI_PREEMPT] @ get preempt count
- add r11, r4, #1 @ increment it
- str r11, [r10, #TI_PREEMPT]
-@@ -35,7 +35,7 @@ ENTRY(do_vfp)
- ENDPROC(do_vfp)
-
- ENTRY(vfp_null_entry)
--#ifdef CONFIG_PREEMPT
-+#ifdef CONFIG_PREEMPT_COUNT
- get_thread_info r10
- ldr r4, [r10, #TI_PREEMPT] @ get preempt count
- sub r11, r4, #1 @ decrement it
-@@ -53,7 +53,7 @@ ENDPROC(vfp_null_entry)
-
- __INIT
- ENTRY(vfp_testing_entry)
--#ifdef CONFIG_PREEMPT
-+#ifdef CONFIG_PREEMPT_COUNT
- get_thread_info r10
- ldr r4, [r10, #TI_PREEMPT] @ get preempt count
- sub r11, r4, #1 @ decrement it
-diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
-index ea0349f..dd5e56f 100644
---- a/arch/arm/vfp/vfphw.S
-+++ b/arch/arm/vfp/vfphw.S
-@@ -168,7 +168,7 @@ vfp_hw_state_valid:
- @ else it's one 32-bit instruction, so
- @ always subtract 4 from the following
- @ instruction address.
--#ifdef CONFIG_PREEMPT
-+#ifdef CONFIG_PREEMPT_COUNT
- get_thread_info r10
- ldr r4, [r10, #TI_PREEMPT] @ get preempt count
- sub r11, r4, #1 @ decrement it
-@@ -192,7 +192,7 @@ look_for_VFP_exceptions:
- @ not recognised by VFP
-
- DBGSTR "not VFP"
--#ifdef CONFIG_PREEMPT
-+#ifdef CONFIG_PREEMPT_COUNT
- get_thread_info r10
- ldr r4, [r10, #TI_PREEMPT] @ get preempt count
- sub r11, r4, #1 @ decrement it
-diff --git a/arch/cris/include/asm/io.h b/arch/cris/include/asm/io.h
-index 32567bc..ac12ae2 100644
---- a/arch/cris/include/asm/io.h
-+++ b/arch/cris/include/asm/io.h
-@@ -133,12 +133,39 @@ static inline void writel(unsigned int b, volatile void __iomem *addr)
- #define insb(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,1,count) : 0)
- #define insw(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,2,count) : 0)
- #define insl(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,4,count) : 0)
--#define outb(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,1,1)
--#define outw(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,2,1)
--#define outl(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,4,1)
--#define outsb(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,1,count)
--#define outsw(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,2,count)
--#define outsl(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,3,count)
-+static inline void outb(unsigned char data, unsigned int port)
-+{
-+ if (cris_iops)
-+ cris_iops->write_io(port, (void *) &data, 1, 1);
-+}
-+static inline void outw(unsigned short data, unsigned int port)
-+{
-+ if (cris_iops)
-+ cris_iops->write_io(port, (void *) &data, 2, 1);
-+}
-+static inline void outl(unsigned int data, unsigned int port)
-+{
-+ if (cris_iops)
-+ cris_iops->write_io(port, (void *) &data, 4, 1);
-+}
-+static inline void outsb(unsigned int port, const void *addr,
-+ unsigned long count)
-+{
-+ if (cris_iops)
-+ cris_iops->write_io(port, (void *)addr, 1, count);
-+}
-+static inline void outsw(unsigned int port, const void *addr,
-+ unsigned long count)
-+{
-+ if (cris_iops)
-+ cris_iops->write_io(port, (void *)addr, 2, count);
-+}
-+static inline void outsl(unsigned int port, const void *addr,
-+ unsigned long count)
-+{
-+ if (cris_iops)
-+ cris_iops->write_io(port, (void *)addr, 4, count);
-+}
-
- /*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
-diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
-index e9a5fd7..69b17a9 100644
---- a/arch/mips/kernel/process.c
-+++ b/arch/mips/kernel/process.c
-@@ -72,9 +72,7 @@ void __noreturn cpu_idle(void)
- }
- }
- #ifdef CONFIG_HOTPLUG_CPU
-- if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map) &&
-- (system_state == SYSTEM_RUNNING ||
-- system_state == SYSTEM_BOOTING))
-+ if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map))
- play_dead();
- #endif
- rcu_idle_exit();
-diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
-index ee99f23..7df49fa 100644
---- a/arch/parisc/include/asm/pgtable.h
-+++ b/arch/parisc/include/asm/pgtable.h
-@@ -12,11 +12,10 @@
-
- #include <linux/bitops.h>
- #include <linux/spinlock.h>
-+#include <linux/mm_types.h>
- #include <asm/processor.h>
- #include <asm/cache.h>
-
--struct vm_area_struct;
--
- /*
- * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel
- * memory. For the return value to be meaningful, ADDR must be >=
-@@ -40,7 +39,14 @@ struct vm_area_struct;
- do{ \
- *(pteptr) = (pteval); \
- } while(0)
--#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-+
-+extern void purge_tlb_entries(struct mm_struct *, unsigned long);
-+
-+#define set_pte_at(mm, addr, ptep, pteval) \
-+ do { \
-+ set_pte(ptep, pteval); \
-+ purge_tlb_entries(mm, addr); \
-+ } while (0)
-
- #endif /* !__ASSEMBLY__ */
-
-@@ -466,6 +472,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
- old = pte_val(*ptep);
- new = pte_val(pte_wrprotect(__pte (old)));
- } while (cmpxchg((unsigned long *) ptep, old, new) != old);
-+ purge_tlb_entries(mm, addr);
- #else
- pte_t old_pte = *ptep;
- set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
-diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
-index 9d18189..fa21463 100644
---- a/arch/parisc/kernel/cache.c
-+++ b/arch/parisc/kernel/cache.c
-@@ -420,6 +420,24 @@ void kunmap_parisc(void *addr)
- EXPORT_SYMBOL(kunmap_parisc);
- #endif
-
-+void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
-+{
-+ unsigned long flags;
-+
-+ /* Note: purge_tlb_entries can be called at startup with
-+ no context. */
-+
-+ /* Disable preemption while we play with %sr1. */
-+ preempt_disable();
-+ mtsp(mm->context, 1);
-+ purge_tlb_start(flags);
-+ pdtlb(addr);
-+ pitlb(addr);
-+ purge_tlb_end(flags);
-+ preempt_enable();
-+}
-+EXPORT_SYMBOL(purge_tlb_entries);
-+
- void __flush_tlb_range(unsigned long sid, unsigned long start,
- unsigned long end)
- {
-diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
-index 58bddee..9e07bd0 100644
---- a/arch/powerpc/kernel/head_64.S
-+++ b/arch/powerpc/kernel/head_64.S
-@@ -422,7 +422,7 @@ _STATIC(__after_prom_start)
- tovirt(r6,r6) /* on booke, we already run at PAGE_OFFSET */
- #endif
-
--#ifdef CONFIG_CRASH_DUMP
-+#ifdef CONFIG_RELOCATABLE
- /*
- * Check if the kernel has to be running as relocatable kernel based on the
- * variable __run_at_load, if it is set the kernel is treated as relocatable
-diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
-index d7f6090..39833e0 100644
---- a/arch/powerpc/kernel/machine_kexec_64.c
-+++ b/arch/powerpc/kernel/machine_kexec_64.c
-@@ -162,6 +162,8 @@ static int kexec_all_irq_disabled = 0;
- static void kexec_smp_down(void *arg)
- {
- local_irq_disable();
-+ hard_irq_disable();
-+
- mb(); /* make sure our irqs are disabled before we say they are */
- get_paca()->kexec_state = KEXEC_STATE_IRQS_OFF;
- while(kexec_all_irq_disabled == 0)
-@@ -244,6 +246,8 @@ static void kexec_prepare_cpus(void)
- wake_offline_cpus();
- smp_call_function(kexec_smp_down, NULL, /* wait */0);
- local_irq_disable();
-+ hard_irq_disable();
-+
- mb(); /* make sure IRQs are disabled before we say they are */
- get_paca()->kexec_state = KEXEC_STATE_IRQS_OFF;
-
-@@ -281,6 +285,7 @@ static void kexec_prepare_cpus(void)
- if (ppc_md.kexec_cpu_down)
- ppc_md.kexec_cpu_down(0, 0);
- local_irq_disable();
-+ hard_irq_disable();
- }
-
- #endif /* SMP */
-diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
-index e49e931..5395666 100644
---- a/arch/powerpc/kernel/time.c
-+++ b/arch/powerpc/kernel/time.c
-@@ -759,13 +759,8 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
-
- void update_vsyscall_tz(void)
- {
-- /* Make userspace gettimeofday spin until we're done. */
-- ++vdso_data->tb_update_count;
-- smp_mb();
- vdso_data->tz_minuteswest = sys_tz.tz_minuteswest;
- vdso_data->tz_dsttime = sys_tz.tz_dsttime;
-- smp_mb();
-- ++vdso_data->tb_update_count;
- }
-
- static void __init clocksource_init(void)
-diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
-index c8c6157..c39cd0b 100644
---- a/arch/powerpc/kvm/44x_emulate.c
-+++ b/arch/powerpc/kvm/44x_emulate.c
-@@ -76,6 +76,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
- run->dcr.dcrn = dcrn;
- run->dcr.data = 0;
- run->dcr.is_write = 0;
-+ vcpu->arch.dcr_is_write = 0;
- vcpu->arch.io_gpr = rt;
- vcpu->arch.dcr_needed = 1;
- kvmppc_account_exit(vcpu, DCR_EXITS);
-@@ -94,6 +95,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
- run->dcr.dcrn = dcrn;
- run->dcr.data = kvmppc_get_gpr(vcpu, rs);
- run->dcr.is_write = 1;
-+ vcpu->arch.dcr_is_write = 1;
- vcpu->arch.dcr_needed = 1;
- kvmppc_account_exit(vcpu, DCR_EXITS);
- emulated = EMULATE_DO_DCR;
-diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
-index 9761206..f0eee75 100644
---- a/arch/powerpc/platforms/40x/ppc40x_simple.c
-+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -57,7 +57,8 @@ static const char *board[] __initdata = {
- "amcc,makalu",
- "apm,klondike",
- "est,hotfoot",
-- "plathome,obs600"
-+ "plathome,obs600",
-+ NULL
- };
-
- static int __init ppc40x_probe(void)
-diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h
-index fba4d66..4c060bb 100644
---- a/arch/s390/include/asm/timex.h
-+++ b/arch/s390/include/asm/timex.h
-@@ -128,4 +128,32 @@ static inline unsigned long long get_clock_monotonic(void)
- return get_clock_xt() - sched_clock_base_cc;
- }
-
-+/**
-+ * tod_to_ns - convert a TOD format value to nanoseconds
-+ * @todval: to be converted TOD format value
-+ * Returns: number of nanoseconds that correspond to the TOD format value
-+ *
-+ * Converting a 64 Bit TOD format value to nanoseconds means that the value
-+ * must be divided by 4.096. In order to achieve that we multiply with 125
-+ * and divide by 512:
-+ *
-+ * ns = (todval * 125) >> 9;
-+ *
-+ * In order to avoid an overflow with the multiplication we can rewrite this.
-+ * With a split todval == 2^32 * th + tl (th upper 32 bits, tl lower 32 bits)
-+ * we end up with
-+ *
-+ * ns = ((2^32 * th + tl) * 125 ) >> 9;
-+ * -> ns = (2^23 * th * 125) + ((tl * 125) >> 9);
-+ *
-+ */
-+static inline unsigned long long tod_to_ns(unsigned long long todval)
-+{
-+ unsigned long long ns;
-+
-+ ns = ((todval >> 32) << 23) * 125;
-+ ns += ((todval & 0xffffffff) * 125) >> 9;
-+ return ns;
-+}
-+
- #endif
-diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
-index dcec960..18c39ad 100644
---- a/arch/s390/kernel/time.c
-+++ b/arch/s390/kernel/time.c
-@@ -63,7 +63,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators);
- */
- unsigned long long notrace __kprobes sched_clock(void)
- {
-- return (get_clock_monotonic() * 125) >> 9;
-+ return tod_to_ns(get_clock_monotonic());
- }
-
- /*
-@@ -120,6 +120,9 @@ static int s390_next_ktime(ktime_t expires,
- nsecs = ktime_to_ns(ktime_add(timespec_to_ktime(ts), expires));
- do_div(nsecs, 125);
- S390_lowcore.clock_comparator = sched_clock_base_cc + (nsecs << 9);
-+ /* Program the maximum value if we have an overflow (== year 2042) */
-+ if (unlikely(S390_lowcore.clock_comparator < sched_clock_base_cc))
-+ S390_lowcore.clock_comparator = -1ULL;
- set_clock_comparator(S390_lowcore.clock_comparator);
- return 0;
- }
-diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
-index b7bc1aa..a80b585 100644
---- a/arch/s390/kvm/interrupt.c
-+++ b/arch/s390/kvm/interrupt.c
-@@ -390,7 +390,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu)
- return 0;
- }
-
-- sltime = ((vcpu->arch.sie_block->ckc - now)*125)>>9;
-+ sltime = tod_to_ns(vcpu->arch.sie_block->ckc - now);
-
- hrtimer_start(&vcpu->arch.ckc_timer, ktime_set (0, sltime) , HRTIMER_MODE_REL);
- VCPU_EVENT(vcpu, 5, "enabled wait via clock comparator: %llx ns", sltime);
-diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
-index d470ccb..ef49b98 100644
---- a/arch/s390/kvm/kvm-s390.c
-+++ b/arch/s390/kvm/kvm-s390.c
-@@ -753,6 +753,14 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
- } else
- prefix = 0;
-
-+ /*
-+ * The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy
-+ * copying in vcpu load/put. Lets update our copies before we save
-+ * it into the save area
-+ */
-+ save_fp_regs(&vcpu->arch.guest_fpregs);
-+ save_access_regs(vcpu->run->s.regs.acrs);
-+
- if (__guestcopy(vcpu, addr + offsetof(struct save_area, fp_regs),
- vcpu->arch.guest_fpregs.fprs, 128, prefix))
- return -EFAULT;
-diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
-index f38112b..978b7fd 100644
---- a/arch/sh/include/asm/elf.h
-+++ b/arch/sh/include/asm/elf.h
-@@ -202,9 +202,9 @@ extern void __kernel_vsyscall;
- if (vdso_enabled) \
- NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \
- else \
-- NEW_AUX_ENT(AT_IGNORE, 0);
-+ NEW_AUX_ENT(AT_IGNORE, 0)
- #else
--#define VSYSCALL_AUX_ENT
-+#define VSYSCALL_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0)
- #endif /* CONFIG_VSYSCALL */
-
- #ifdef CONFIG_SH_FPU
-diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
-index 1770610..f368cef 100644
---- a/arch/sparc/include/asm/hugetlb.h
-+++ b/arch/sparc/include/asm/hugetlb.h
-@@ -58,14 +58,20 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)
- static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
- unsigned long addr, pte_t *ptep)
- {
-- ptep_set_wrprotect(mm, addr, ptep);
-+ pte_t old_pte = *ptep;
-+ set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
- }
-
- static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
- unsigned long addr, pte_t *ptep,
- pte_t pte, int dirty)
- {
-- return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
-+ int changed = !pte_same(*ptep, pte);
-+ if (changed) {
-+ set_huge_pte_at(vma->vm_mm, addr, ptep, pte);
-+ flush_tlb_page(vma, addr);
-+ }
-+ return changed;
- }
-
- static inline pte_t huge_ptep_get(pte_t *ptep)
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 50a1d1f..01897ac 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1246,10 +1246,6 @@ config NODES_SHIFT
- Specify the maximum number of NUMA Nodes available on the target
- system. Increases memory reserved to accommodate various tables.
-
--config HAVE_ARCH_ALLOC_REMAP
-- def_bool y
-- depends on X86_32 && NUMA
--
- config ARCH_HAVE_MEMORY_PRESENT
- def_bool y
- depends on X86_32 && DISCONTIGMEM
-diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index 20e5f7b..f6d477a 100644
---- a/arch/x86/ia32/ia32entry.S
-+++ b/arch/x86/ia32/ia32entry.S
-@@ -204,7 +204,7 @@ sysexit_from_sys_call:
- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
- jnz ia32_ret_from_sys_call
- TRACE_IRQS_ON
-- sti
-+ ENABLE_INTERRUPTS(CLBR_NONE)
- movl %eax,%esi /* second arg, syscall return value */
- cmpl $-MAX_ERRNO,%eax /* is it an error ? */
- jbe 1f
-@@ -214,7 +214,7 @@ sysexit_from_sys_call:
- call __audit_syscall_exit
- movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
- movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
-- cli
-+ DISABLE_INTERRUPTS(CLBR_NONE)
- TRACE_IRQS_OFF
- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
- jz \exit
-diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
-index 029189d..da37433 100644
---- a/arch/x86/include/asm/efi.h
-+++ b/arch/x86/include/asm/efi.h
-@@ -94,6 +94,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
- #endif /* CONFIG_X86_32 */
-
- extern int add_efi_memmap;
-+extern unsigned long x86_efi_facility;
- extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
- extern int efi_memblock_x86_reserve_range(void);
- extern void efi_call_phys_prelog(void);
-diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
-index eb05fb3..8a9b3e2 100644
---- a/arch/x86/include/asm/mmzone_32.h
-+++ b/arch/x86/include/asm/mmzone_32.h
-@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[];
-
- #include <asm/numaq.h>
-
--extern void resume_map_numa_kva(pgd_t *pgd);
--
--#else /* !CONFIG_NUMA */
--
--static inline void resume_map_numa_kva(pgd_t *pgd) {}
--
- #endif /* CONFIG_NUMA */
-
- #ifdef CONFIG_DISCONTIGMEM
-diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index c3520d7..3f3dd52 100644
---- a/arch/x86/include/asm/pgtable.h
-+++ b/arch/x86/include/asm/pgtable.h
-@@ -142,6 +142,11 @@ static inline unsigned long pmd_pfn(pmd_t pmd)
- return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;
- }
-
-+static inline unsigned long pud_pfn(pud_t pud)
-+{
-+ return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
-+}
-+
- #define pte_page(pte) pfn_to_page(pte_pfn(pte))
-
- static inline int pmd_large(pmd_t pte)
-diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
-index e03a1e1..562a76d 100644
---- a/arch/x86/kernel/apic/x2apic_phys.c
-+++ b/arch/x86/kernel/apic/x2apic_phys.c
-@@ -20,18 +20,19 @@ static int set_x2apic_phys_mode(char *arg)
- }
- early_param("x2apic_phys", set_x2apic_phys_mode);
-
--static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-+static bool x2apic_fadt_phys(void)
- {
-- if (x2apic_phys)
-- return x2apic_enabled();
-- else if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
-- (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) &&
-- x2apic_enabled()) {
-+ if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
-+ (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL)) {
- printk(KERN_DEBUG "System requires x2apic physical mode\n");
-- return 1;
-+ return true;
- }
-- else
-- return 0;
-+ return false;
-+}
-+
-+static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-+{
-+ return x2apic_enabled() && (x2apic_phys || x2apic_fadt_phys());
- }
-
- static void
-@@ -82,7 +83,7 @@ static void init_x2apic_ldr(void)
-
- static int x2apic_phys_probe(void)
- {
-- if (x2apic_mode && x2apic_phys)
-+ if (x2apic_mode && (x2apic_phys || x2apic_fadt_phys()))
- return 1;
-
- return apic == &apic_x2apic_phys;
-diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
-index 0a630dd..646d192 100644
---- a/arch/x86/kernel/cpu/mshyperv.c
-+++ b/arch/x86/kernel/cpu/mshyperv.c
-@@ -68,7 +68,8 @@ static void __init ms_hyperv_init_platform(void)
- printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n",
- ms_hyperv.features, ms_hyperv.hints);
-
-- clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
-+ if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)
-+ clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
- }
-
- const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
-diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
-index 8f8e8ee..2a6919e 100644
---- a/arch/x86/kernel/entry_32.S
-+++ b/arch/x86/kernel/entry_32.S
-@@ -1065,7 +1065,6 @@ ENTRY(xen_failsafe_callback)
- lea 16(%esp),%esp
- CFI_ADJUST_CFA_OFFSET -16
- jz 5f
-- addl $16,%esp
- jmp iret_exc
- 5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */
- SAVE_ALL
-diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
-index eb11369..8563b64 100644
---- a/arch/x86/kernel/msr.c
-+++ b/arch/x86/kernel/msr.c
-@@ -174,6 +174,9 @@ static int msr_open(struct inode *inode, struct file *file)
- unsigned int cpu;
- struct cpuinfo_x86 *c;
-
-+ if (!capable(CAP_SYS_RAWIO))
-+ return -EPERM;
-+
- cpu = iminor(file->f_path.dentry->d_inode);
- if (cpu >= nr_cpu_ids || !cpu_online(cpu))
- return -ENXIO; /* No such CPU */
-diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 52190a9..3f20ab4 100644
---- a/arch/x86/kernel/reboot.c
-+++ b/arch/x86/kernel/reboot.c
-@@ -592,7 +592,7 @@ static void native_machine_emergency_restart(void)
- break;
-
- case BOOT_EFI:
-- if (efi_enabled)
-+ if (efi_enabled(EFI_RUNTIME_SERVICES))
- efi.reset_system(reboot_mode ?
- EFI_RESET_WARM :
- EFI_RESET_COLD,
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 5cee802..771ff4d 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -613,6 +613,83 @@ static __init void reserve_ibft_region(void)
-
- static unsigned reserve_low = CONFIG_X86_RESERVE_LOW << 10;
-
-+static bool __init snb_gfx_workaround_needed(void)
-+{
-+#ifdef CONFIG_PCI
-+ int i;
-+ u16 vendor, devid;
-+ static const u16 snb_ids[] = {
-+ 0x0102,
-+ 0x0112,
-+ 0x0122,
-+ 0x0106,
-+ 0x0116,
-+ 0x0126,
-+ 0x010a,
-+ };
-+
-+ /* Assume no if something weird is going on with PCI */
-+ if (!early_pci_allowed())
-+ return false;
-+
-+ vendor = read_pci_config_16(0, 2, 0, PCI_VENDOR_ID);
-+ if (vendor != 0x8086)
-+ return false;
-+
-+ devid = read_pci_config_16(0, 2, 0, PCI_DEVICE_ID);
-+ for (i = 0; i < ARRAY_SIZE(snb_ids); i++)
-+ if (devid == snb_ids[i])
-+ return true;
-+#endif
-+
-+ return false;
-+}
-+
-+/*
-+ * Sandy Bridge graphics has trouble with certain ranges, exclude
-+ * them from allocation.
-+ */
-+static void __init trim_snb_memory(void)
-+{
-+ static const unsigned long bad_pages[] = {
-+ 0x20050000,
-+ 0x20110000,
-+ 0x20130000,
-+ 0x20138000,
-+ 0x40004000,
-+ };
-+ int i;
-+
-+ if (!snb_gfx_workaround_needed())
-+ return;
-+
-+ printk(KERN_DEBUG "reserving inaccessible SNB gfx pages\n");
-+
-+ /