aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/hwmon/w83627ehf9
-rw-r--r--Documentation/hwmon/zl610014
-rw-r--r--MAINTAINERS40
-rw-r--r--arch/c6x/kernel/entry.S27
-rw-r--r--arch/tile/configs/tilegx_defconfig1438
-rw-r--r--arch/tile/configs/tilepro_defconfig1317
-rw-r--r--block/blk-ioc.c135
-rw-r--r--block/cfq-iosched.c12
-rw-r--r--block/genhd.c42
-rw-r--r--block/partition-generic.c48
-rw-r--r--drivers/block/DAC960.c18
-rw-r--r--drivers/block/sx8.c2
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_connector.c16
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.c2
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fbdev.c28
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimd.c17
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h2
-rw-r--r--drivers/gpu/drm/i915/intel_display.c1
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c6
-rw-r--r--drivers/hwmon/pmbus/zl6100.c12
-rw-r--r--drivers/hwmon/w83627ehf.c17
-rw-r--r--drivers/i2c/algos/i2c-algo-bit.c8
-rw-r--r--drivers/i2c/i2c-core.c12
-rw-r--r--drivers/media/dvb/siano/smsdvb.c127
-rw-r--r--drivers/media/video/davinci/isif.c1
-rw-r--r--drivers/media/video/uvc/uvc_video.c14
-rw-r--r--drivers/rapidio/devices/tsi721.h30
-rw-r--r--drivers/regulator/da9052-regulator.c12
-rw-r--r--drivers/regulator/tps6524x-regulator.c2
-rw-r--r--drivers/target/iscsi/iscsi_target.c2
-rw-r--r--drivers/target/target_core_pr.c34
-rw-r--r--drivers/target/target_core_transport.c1
-rw-r--r--drivers/video/backlight/s6e63m0.c2
-rw-r--r--fs/afs/internal.h2
-rw-r--r--fs/afs/rxrpc.c3
-rw-r--r--fs/block_dev.c16
-rw-r--r--fs/nilfs2/the_nilfs.c7
-rw-r--r--include/linux/genhd.h1
-rw-r--r--include/linux/iocontext.h10
-rw-r--r--include/linux/workqueue.h4
-rw-r--r--kernel/sys.c2
-rw-r--r--kernel/workqueue.c7
-rw-r--r--mm/memcontrol.c53
43 files changed, 533 insertions, 3020 deletions
diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf
index 3f44dbdfda70..ceaf6f652b00 100644
--- a/Documentation/hwmon/w83627ehf
+++ b/Documentation/hwmon/w83627ehf
@@ -50,7 +50,7 @@ W83627DHG, W83627DHG-P, W83627UHG, W83667HG, W83667HG-B, W83667HG-I
50(NCT6775F), and NCT6776F super I/O chips. We will refer to them collectively 50(NCT6775F), and NCT6776F super I/O chips. We will refer to them collectively
51as Winbond chips. 51as Winbond chips.
52 52
53The chips implement 2 to 4 temperature sensors (9 for NCT6775F and NCT6776F), 53The chips implement 3 to 4 temperature sensors (9 for NCT6775F and NCT6776F),
542 to 5 fan rotation speed sensors, 8 to 10 analog voltage sensors, one VID 542 to 5 fan rotation speed sensors, 8 to 10 analog voltage sensors, one VID
55(except for 627UHG), alarms with beep warnings (control unimplemented), 55(except for 627UHG), alarms with beep warnings (control unimplemented),
56and some automatic fan regulation strategies (plus manual fan control mode). 56and some automatic fan regulation strategies (plus manual fan control mode).
@@ -143,8 +143,13 @@ pwm[1-4]_min_output - minimum fan speed (range 1 - 255), when the temperature
143pwm[1-4]_stop_time - how many milliseconds [ms] must elapse to switch 143pwm[1-4]_stop_time - how many milliseconds [ms] must elapse to switch
144 corresponding fan off. (when the temperature was below 144 corresponding fan off. (when the temperature was below
145 defined range). 145 defined range).
146pwm[1-4]_start_output-minimum fan speed (range 1 - 255) when spinning up
147pwm[1-4]_step_output- rate of fan speed change (1 - 255)
148pwm[1-4]_stop_output- minimum fan speed (range 1 - 255) when spinning down
149pwm[1-4]_max_output - maximum fan speed (range 1 - 255), when the temperature
150 is above defined range.
146 151
147Note: last two functions are influenced by other control bits, not yet exported 152Note: last six functions are influenced by other control bits, not yet exported
148 by the driver, so a change might not have any effect. 153 by the driver, so a change might not have any effect.
149 154
150Implementation Details 155Implementation Details
diff --git a/Documentation/hwmon/zl6100 b/Documentation/hwmon/zl6100
index 51f76a189fee..a4e8d90f59f6 100644
--- a/Documentation/hwmon/zl6100
+++ b/Documentation/hwmon/zl6100
@@ -88,14 +88,12 @@ Module parameters
88delay 88delay
89----- 89-----
90 90
91Some Intersil/Zilker Labs DC-DC controllers require a minimum interval between 91Intersil/Zilker Labs DC-DC controllers require a minimum interval between I2C
92I2C bus accesses. According to Intersil, the minimum interval is 2 ms, though 92bus accesses. According to Intersil, the minimum interval is 2 ms, though 1 ms
931 ms appears to be sufficient and has not caused any problems in testing. 93appears to be sufficient and has not caused any problems in testing. The problem
94The problem is known to affect ZL6100, ZL2105, and ZL2008. It is known not to 94is known to affect all currently supported chips. For manual override, the
95affect ZL2004 and ZL6105. The driver automatically sets the interval to 1 ms 95driver provides a writeable module parameter, 'delay', which can be used to set
96except for ZL2004 and ZL6105. To enable manual override, the driver provides a 96the interval to a value between 0 and 65,535 microseconds.
97writeable module parameter, 'delay', which can be used to set the interval to
98a value between 0 and 65,535 microseconds.
99 97
100 98
101Sysfs entries 99Sysfs entries
diff --git a/MAINTAINERS b/MAINTAINERS
index 95e4e43a12b4..9c63a43ab63a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1513,19 +1513,23 @@ F: drivers/mtd/devices/block2mtd.c
1513 1513
1514BLUETOOTH DRIVERS 1514BLUETOOTH DRIVERS
1515M: Marcel Holtmann <marcel@holtmann.org> 1515M: Marcel Holtmann <marcel@holtmann.org>
1516M: "Gustavo F. Padovan" <padovan@profusion.mobi> 1516M: Gustavo Padovan <gustavo@padovan.org>
1517M: Johan Hedberg <johan.hedberg@gmail.com>
1517L: linux-bluetooth@vger.kernel.org 1518L: linux-bluetooth@vger.kernel.org
1518W: http://www.bluez.org/ 1519W: http://www.bluez.org/
1519T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git 1520T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
1521T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
1520S: Maintained 1522S: Maintained
1521F: drivers/bluetooth/ 1523F: drivers/bluetooth/
1522 1524
1523BLUETOOTH SUBSYSTEM 1525BLUETOOTH SUBSYSTEM
1524M: Marcel Holtmann <marcel@holtmann.org> 1526M: Marcel Holtmann <marcel@holtmann.org>
1525M: "Gustavo F. Padovan" <padovan@profusion.mobi> 1527M: Gustavo Padovan <gustavo@padovan.org>
1528M: Johan Hedberg <johan.hedberg@gmail.com>
1526L: linux-bluetooth@vger.kernel.org 1529L: linux-bluetooth@vger.kernel.org
1527W: http://www.bluez.org/ 1530W: http://www.bluez.org/
1528T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git 1531T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
1532T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
1529S: Maintained 1533S: Maintained
1530F: net/bluetooth/ 1534F: net/bluetooth/
1531F: include/net/bluetooth/ 1535F: include/net/bluetooth/
@@ -1717,6 +1721,14 @@ F: include/linux/can/error.h
1717F: include/linux/can/netlink.h 1721F: include/linux/can/netlink.h
1718F: include/linux/can/platform/ 1722F: include/linux/can/platform/
1719 1723
1724CAPABILITIES
1725M: Serge Hallyn <serge.hallyn@canonical.com>
1726L: linux-security-module@vger.kernel.org
1727S: Supported
1728F: include/linux/capability.h
1729F: security/capability.c
1730F: security/commoncap.c
1731
1720CELL BROADBAND ENGINE ARCHITECTURE 1732CELL BROADBAND ENGINE ARCHITECTURE
1721M: Arnd Bergmann <arnd@arndb.de> 1733M: Arnd Bergmann <arnd@arndb.de>
1722L: linuxppc-dev@lists.ozlabs.org 1734L: linuxppc-dev@lists.ozlabs.org
@@ -2351,6 +2363,15 @@ S: Supported
2351F: drivers/gpu/drm/exynos 2363F: drivers/gpu/drm/exynos
2352F: include/drm/exynos* 2364F: include/drm/exynos*
2353 2365
2366EXYNOS MIPI DISPLAY DRIVERS
2367M: Inki Dae <inki.dae@samsung.com>
2368M: Donghwa Lee <dh09.lee@samsung.com>
2369M: Kyungmin Park <kyungmin.park@samsung.com>
2370L: linux-fbdev@vger.kernel.org
2371S: Maintained
2372F: drivers/video/exynos/exynos_mipi*
2373F: include/video/exynos_mipi*
2374
2354DSCC4 DRIVER 2375DSCC4 DRIVER
2355M: Francois Romieu <romieu@fr.zoreil.com> 2376M: Francois Romieu <romieu@fr.zoreil.com>
2356L: netdev@vger.kernel.org 2377L: netdev@vger.kernel.org
@@ -5859,6 +5880,7 @@ F: drivers/mmc/host/sdhci-s3c.c
5859 5880
5860SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER 5881SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
5861M: Viresh Kumar <viresh.kumar@st.com> 5882M: Viresh Kumar <viresh.kumar@st.com>
5883L: spear-devel@list.st.com
5862L: linux-mmc@vger.kernel.org 5884L: linux-mmc@vger.kernel.org
5863S: Maintained 5885S: Maintained
5864F: drivers/mmc/host/sdhci-spear.c 5886F: drivers/mmc/host/sdhci-spear.c
@@ -6201,24 +6223,32 @@ F: drivers/tty/serial/sunzilog.h
6201 6223
6202SPEAR PLATFORM SUPPORT 6224SPEAR PLATFORM SUPPORT
6203M: Viresh Kumar <viresh.kumar@st.com> 6225M: Viresh Kumar <viresh.kumar@st.com>
6226L: spear-devel@list.st.com
6227L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6204W: http://www.st.com/spear 6228W: http://www.st.com/spear
6205S: Maintained 6229S: Maintained
6206F: arch/arm/plat-spear/ 6230F: arch/arm/plat-spear/
6207 6231
6208SPEAR3XX MACHINE SUPPORT 6232SPEAR3XX MACHINE SUPPORT
6209M: Viresh Kumar <viresh.kumar@st.com> 6233M: Viresh Kumar <viresh.kumar@st.com>
6234L: spear-devel@list.st.com
6235L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6210W: http://www.st.com/spear 6236W: http://www.st.com/spear
6211S: Maintained 6237S: Maintained
6212F: arch/arm/mach-spear3xx/ 6238F: arch/arm/mach-spear3xx/
6213 6239
6214SPEAR6XX MACHINE SUPPORT 6240SPEAR6XX MACHINE SUPPORT
6215M: Rajeev Kumar <rajeev-dlh.kumar@st.com> 6241M: Rajeev Kumar <rajeev-dlh.kumar@st.com>
6242L: spear-devel@list.st.com
6243L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6216W: http://www.st.com/spear 6244W: http://www.st.com/spear
6217S: Maintained 6245S: Maintained
6218F: arch/arm/mach-spear6xx/ 6246F: arch/arm/mach-spear6xx/
6219 6247
6220SPEAR CLOCK FRAMEWORK SUPPORT 6248SPEAR CLOCK FRAMEWORK SUPPORT
6221M: Viresh Kumar <viresh.kumar@st.com> 6249M: Viresh Kumar <viresh.kumar@st.com>
6250L: spear-devel@list.st.com
6251L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6222W: http://www.st.com/spear 6252W: http://www.st.com/spear
6223S: Maintained 6253S: Maintained
6224F: arch/arm/mach-spear*/clock.c 6254F: arch/arm/mach-spear*/clock.c
@@ -6227,6 +6257,8 @@ F: arch/arm/plat-spear/include/plat/clock.h
6227 6257
6228SPEAR PAD MULTIPLEXING SUPPORT 6258SPEAR PAD MULTIPLEXING SUPPORT
6229M: Viresh Kumar <viresh.kumar@st.com> 6259M: Viresh Kumar <viresh.kumar@st.com>
6260L: spear-devel@list.st.com
6261L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6230W: http://www.st.com/spear 6262W: http://www.st.com/spear
6231S: Maintained 6263S: Maintained
6232F: arch/arm/plat-spear/include/plat/padmux.h 6264F: arch/arm/plat-spear/include/plat/padmux.h
diff --git a/arch/c6x/kernel/entry.S b/arch/c6x/kernel/entry.S
index 3e977ccda827..30b37e5f4a61 100644
--- a/arch/c6x/kernel/entry.S
+++ b/arch/c6x/kernel/entry.S
@@ -717,33 +717,6 @@ ENTRY(sys_ftruncate64_c6x)
717#endif 717#endif
718ENDPROC(sys_ftruncate64_c6x) 718ENDPROC(sys_ftruncate64_c6x)
719 719
720#ifdef __ARCH_WANT_SYSCALL_OFF_T
721;; On Entry
722;; A4 - fd
723;; B4 - offset_lo (LE), offset_hi (BE)
724;; A6 - offset_lo (BE), offset_hi (LE)
725;; B6 - len
726;; A8 - advice
727ENTRY(sys_fadvise64_c6x)
728#ifdef CONFIG_C6X_BIG_KERNEL
729 MVKL .S1 sys_fadvise64,A0
730 MVKH .S1 sys_fadvise64,A0
731 BNOP .S2X A0,2
732#else
733 B .S2 sys_fadvise64
734 NOP 2
735#endif
736#ifdef CONFIG_CPU_BIG_ENDIAN
737 MV .L2 B4,B5
738 || MV .D2X A6,B4
739#else
740 MV .D2X A6,B5
741#endif
742 MV .D1X B6,A6
743 MV .D2X A8,B6
744#endif
745ENDPROC(sys_fadvise64_c6x)
746
747;; On Entry 720;; On Entry
748;; A4 - fd 721;; A4 - fd
749;; B4 - offset_lo (LE), offset_hi (BE) 722;; B4 - offset_lo (LE), offset_hi (BE)
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 7960d5896504..b8d99aca5431 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -1,363 +1,93 @@
1#
2# Automatically generated file; DO NOT EDIT.
3# Linux/tilegx 3.3.0-rc7 Kernel Configuration
4#
5CONFIG_TILE=y
6CONFIG_MMU=y
7CONFIG_GENERIC_CSUM=y
8CONFIG_SEMAPHORE_SLEEPERS=y
9CONFIG_HAVE_ARCH_ALLOC_REMAP=y
10CONFIG_HAVE_SETUP_PER_CPU_AREA=y
11CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
12CONFIG_SYS_SUPPORTS_HUGETLBFS=y
13CONFIG_GENERIC_CLOCKEVENTS=y
14CONFIG_RWSEM_GENERIC_SPINLOCK=y
15CONFIG_DEFAULT_MIGRATION_COST=10000000
16CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
17CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
18CONFIG_ARCH_DMA_ADDR_T_64BIT=y
19CONFIG_LOCKDEP_SUPPORT=y
20CONFIG_STACKTRACE_SUPPORT=y
21CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
22CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
23CONFIG_TRACE_IRQFLAGS_SUPPORT=y
24CONFIG_STRICT_DEVMEM=y
25CONFIG_SMP=y
26# CONFIG_DEBUG_COPY_FROM_USER is not set
27CONFIG_HVC_TILE=y
28CONFIG_TILEGX=y 1CONFIG_TILEGX=y
29CONFIG_64BIT=y
30CONFIG_ARCH_DEFCONFIG="arch/tile/configs/tilegx_defconfig"
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
32
33#
34# General setup
35#
36CONFIG_EXPERIMENTAL=y 2CONFIG_EXPERIMENTAL=y
37CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_CROSS_COMPILE=""
39CONFIG_LOCALVERSION=""
40# CONFIG_LOCALVERSION_AUTO is not set 3# CONFIG_LOCALVERSION_AUTO is not set
41CONFIG_DEFAULT_HOSTNAME="(none)"
42CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y
45CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
46CONFIG_POSIX_MQUEUE_SYSCTL=y
47CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
48CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
49# CONFIG_FHANDLE is not set 8CONFIG_FHANDLE=y
50CONFIG_TASKSTATS=y 9CONFIG_TASKSTATS=y
51CONFIG_TASK_DELAY_ACCT=y 10CONFIG_TASK_DELAY_ACCT=y
52CONFIG_TASK_XACCT=y 11CONFIG_TASK_XACCT=y
53CONFIG_TASK_IO_ACCOUNTING=y 12CONFIG_TASK_IO_ACCOUNTING=y
54CONFIG_AUDIT=y 13CONFIG_AUDIT=y
55# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
56CONFIG_HAVE_GENERIC_HARDIRQS=y
57
58#
59# IRQ subsystem
60#
61CONFIG_GENERIC_HARDIRQS=y
62CONFIG_GENERIC_IRQ_PROBE=y
63CONFIG_GENERIC_IRQ_SHOW=y
64CONFIG_GENERIC_PENDING_IRQ=y
65
66#
67# RCU Subsystem
68#
69CONFIG_TREE_RCU=y
70# CONFIG_PREEMPT_RCU is not set
71# CONFIG_RCU_TRACE is not set
72CONFIG_RCU_FANOUT=64
73# CONFIG_RCU_FANOUT_EXACT is not set
74# CONFIG_RCU_FAST_NO_HZ is not set
75# CONFIG_TREE_RCU_TRACE is not set
76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=19 14CONFIG_LOG_BUF_SHIFT=19
78CONFIG_CGROUPS=y 15CONFIG_CGROUPS=y
79CONFIG_CGROUP_DEBUG=y 16CONFIG_CGROUP_DEBUG=y
80# CONFIG_CGROUP_FREEZER is not set
81CONFIG_CGROUP_DEVICE=y 17CONFIG_CGROUP_DEVICE=y
82CONFIG_CPUSETS=y 18CONFIG_CPUSETS=y
83CONFIG_PROC_PID_CPUSET=y
84CONFIG_CGROUP_CPUACCT=y 19CONFIG_CGROUP_CPUACCT=y
85CONFIG_RESOURCE_COUNTERS=y 20CONFIG_RESOURCE_COUNTERS=y
86CONFIG_CGROUP_MEM_RES_CTLR=y 21CONFIG_CGROUP_MEM_RES_CTLR=y
87CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y 22CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
88CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
89# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
90CONFIG_CGROUP_SCHED=y 23CONFIG_CGROUP_SCHED=y
91CONFIG_FAIR_GROUP_SCHED=y
92# CONFIG_CFS_BANDWIDTH is not set
93CONFIG_RT_GROUP_SCHED=y 24CONFIG_RT_GROUP_SCHED=y
94CONFIG_BLK_CGROUP=y 25CONFIG_BLK_CGROUP=y
95# CONFIG_DEBUG_BLK_CGROUP is not set
96# CONFIG_CHECKPOINT_RESTORE is not set
97CONFIG_NAMESPACES=y 26CONFIG_NAMESPACES=y
98CONFIG_UTS_NS=y
99CONFIG_IPC_NS=y
100CONFIG_USER_NS=y
101CONFIG_PID_NS=y
102CONFIG_NET_NS=y
103# CONFIG_SCHED_AUTOGROUP is not set
104CONFIG_MM_OWNER=y
105# CONFIG_SYSFS_DEPRECATED is not set
106CONFIG_RELAY=y 27CONFIG_RELAY=y
107CONFIG_BLK_DEV_INITRD=y 28CONFIG_BLK_DEV_INITRD=y
108CONFIG_INITRAMFS_SOURCE=""
109CONFIG_RD_GZIP=y
110# CONFIG_RD_BZIP2 is not set
111# CONFIG_RD_LZMA is not set
112# CONFIG_RD_XZ is not set
113# CONFIG_RD_LZO is not set
114CONFIG_CC_OPTIMIZE_FOR_SIZE=y
115CONFIG_SYSCTL=y
116CONFIG_ANON_INODES=y
117CONFIG_EXPERT=y
118CONFIG_SYSCTL_SYSCALL=y 29CONFIG_SYSCTL_SYSCALL=y
119CONFIG_KALLSYMS=y
120# CONFIG_KALLSYMS_ALL is not set
121CONFIG_HOTPLUG=y
122CONFIG_PRINTK=y
123CONFIG_BUG=y
124CONFIG_ELF_CORE=y
125CONFIG_BASE_FULL=y
126CONFIG_FUTEX=y
127CONFIG_EPOLL=y
128CONFIG_SIGNALFD=y
129CONFIG_TIMERFD=y
130CONFIG_EVENTFD=y
131CONFIG_SHMEM=y
132CONFIG_AIO=y
133CONFIG_EMBEDDED=y 30CONFIG_EMBEDDED=y
134
135#
136# Kernel Performance Events And Counters
137#
138CONFIG_VM_EVENT_COUNTERS=y
139CONFIG_PCI_QUIRKS=y
140CONFIG_SLUB_DEBUG=y
141# CONFIG_COMPAT_BRK is not set 31# CONFIG_COMPAT_BRK is not set
142# CONFIG_SLAB is not set
143CONFIG_SLUB=y
144# CONFIG_SLOB is not set
145CONFIG_PROFILING=y 32CONFIG_PROFILING=y
146CONFIG_USE_GENERIC_SMP_HELPERS=y
147CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
148
149#
150# GCOV-based kernel profiling
151#
152# CONFIG_GCOV_KERNEL is not set
153# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
154CONFIG_SLABINFO=y
155CONFIG_RT_MUTEXES=y
156CONFIG_BASE_SMALL=0
157CONFIG_MODULES=y 33CONFIG_MODULES=y
158CONFIG_MODULE_FORCE_LOAD=y 34CONFIG_MODULE_FORCE_LOAD=y
159CONFIG_MODULE_UNLOAD=y 35CONFIG_MODULE_UNLOAD=y
160# CONFIG_MODULE_FORCE_UNLOAD is not set
161# CONFIG_MODVERSIONS is not set
162# CONFIG_MODULE_SRCVERSION_ALL is not set
163CONFIG_STOP_MACHINE=y
164CONFIG_BLOCK=y
165CONFIG_BLK_DEV_BSG=y
166# CONFIG_BLK_DEV_BSGLIB is not set
167CONFIG_BLK_DEV_INTEGRITY=y 36CONFIG_BLK_DEV_INTEGRITY=y
168# CONFIG_BLK_DEV_THROTTLING is not set
169
170#
171# Partition Types
172#
173CONFIG_PARTITION_ADVANCED=y 37CONFIG_PARTITION_ADVANCED=y
174# CONFIG_ACORN_PARTITION is not set
175CONFIG_OSF_PARTITION=y 38CONFIG_OSF_PARTITION=y
176CONFIG_AMIGA_PARTITION=y 39CONFIG_AMIGA_PARTITION=y
177# CONFIG_ATARI_PARTITION is not set
178CONFIG_MAC_PARTITION=y 40CONFIG_MAC_PARTITION=y
179CONFIG_MSDOS_PARTITION=y
180CONFIG_BSD_DISKLABEL=y 41CONFIG_BSD_DISKLABEL=y
181CONFIG_MINIX_SUBPARTITION=y 42CONFIG_MINIX_SUBPARTITION=y
182CONFIG_SOLARIS_X86_PARTITION=y 43CONFIG_SOLARIS_X86_PARTITION=y
183CONFIG_UNIXWARE_DISKLABEL=y 44CONFIG_UNIXWARE_DISKLABEL=y
184# CONFIG_LDM_PARTITION is not set
185CONFIG_SGI_PARTITION=y 45CONFIG_SGI_PARTITION=y
186# CONFIG_ULTRIX_PARTITION is not set
187CONFIG_SUN_PARTITION=y 46CONFIG_SUN_PARTITION=y
188CONFIG_KARMA_PARTITION=y 47CONFIG_KARMA_PARTITION=y
189CONFIG_EFI_PARTITION=y 48CONFIG_EFI_PARTITION=y
190# CONFIG_SYSV68_PARTITION is not set
191CONFIG_BLOCK_COMPAT=y
192
193#
194# IO Schedulers
195#
196CONFIG_IOSCHED_NOOP=y
197CONFIG_IOSCHED_DEADLINE=y
198CONFIG_IOSCHED_CFQ=y
199CONFIG_CFQ_GROUP_IOSCHED=y 49CONFIG_CFQ_GROUP_IOSCHED=y
200# CONFIG_DEFAULT_DEADLINE is not set
201CONFIG_DEFAULT_CFQ=y
202# CONFIG_DEFAULT_NOOP is not set
203CONFIG_DEFAULT_IOSCHED="cfq"
204CONFIG_PADATA=y
205# CONFIG_INLINE_SPIN_TRYLOCK is not set
206# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
207# CONFIG_INLINE_SPIN_LOCK is not set
208# CONFIG_INLINE_SPIN_LOCK_BH is not set
209# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
210# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
211CONFIG_INLINE_SPIN_UNLOCK=y
212# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
213CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
214# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
215# CONFIG_INLINE_READ_TRYLOCK is not set
216# CONFIG_INLINE_READ_LOCK is not set
217# CONFIG_INLINE_READ_LOCK_BH is not set
218# CONFIG_INLINE_READ_LOCK_IRQ is not set
219# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
220CONFIG_INLINE_READ_UNLOCK=y
221# CONFIG_INLINE_READ_UNLOCK_BH is not set
222CONFIG_INLINE_READ_UNLOCK_IRQ=y
223# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
224# CONFIG_INLINE_WRITE_TRYLOCK is not set
225# CONFIG_INLINE_WRITE_LOCK is not set
226# CONFIG_INLINE_WRITE_LOCK_BH is not set
227# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
228# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
229CONFIG_INLINE_WRITE_UNLOCK=y
230# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
231CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
232# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
233CONFIG_MUTEX_SPIN_ON_OWNER=y
234
235#
236# Tilera-specific configuration
237#
238CONFIG_NR_CPUS=100 50CONFIG_NR_CPUS=100
239CONFIG_TICK_ONESHOT=y
240CONFIG_NO_HZ=y 51CONFIG_NO_HZ=y
241CONFIG_HIGH_RES_TIMERS=y 52CONFIG_HIGH_RES_TIMERS=y
242CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
243CONFIG_HZ_100=y 53CONFIG_HZ_100=y
244# CONFIG_HZ_250 is not set
245# CONFIG_HZ_300 is not set
246# CONFIG_HZ_1000 is not set
247CONFIG_HZ=100
248CONFIG_SCHED_HRTICK=y
249# CONFIG_KEXEC is not set
250CONFIG_COMPAT=y
251CONFIG_SYSVIPC_COMPAT=y
252# CONFIG_HIGHMEM is not set
253CONFIG_NUMA=y
254CONFIG_NODES_SHIFT=2
255CONFIG_PAGE_OFFSET=0xC0000000
256CONFIG_SELECT_MEMORY_MODEL=y
257CONFIG_DISCONTIGMEM_MANUAL=y
258CONFIG_DISCONTIGMEM=y
259CONFIG_FLAT_NODE_MEM_MAP=y
260CONFIG_NEED_MULTIPLE_NODES=y
261CONFIG_PAGEFLAGS_EXTENDED=y
262CONFIG_SPLIT_PTLOCK_CPUS=4
263# CONFIG_COMPACTION is not set
264CONFIG_MIGRATION=y
265CONFIG_PHYS_ADDR_T_64BIT=y
266CONFIG_ZONE_DMA_FLAG=0
267CONFIG_VIRT_TO_BUS=y
268# CONFIG_KSM is not set
269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
270# CONFIG_CLEANCACHE is not set
271# CONFIG_CMDLINE_BOOL is not set
272CONFIG_VMALLOC_RESERVE=0x1000000
273CONFIG_HARDWALL=y
274CONFIG_KERNEL_PL=1
275
276#
277# Bus options
278#
279CONFIG_PCI=y
280CONFIG_PCI_DOMAINS=y
281# CONFIG_NO_IOMEM is not set
282# CONFIG_NO_IOPORT is not set
283# CONFIG_ARCH_SUPPORTS_MSI is not set
284CONFIG_PCI_DEBUG=y 54CONFIG_PCI_DEBUG=y
285# CONFIG_PCI_STUB is not set
286# CONFIG_PCI_IOV is not set
287# CONFIG_PCI_PRI is not set
288# CONFIG_PCI_PASID is not set
289# CONFIG_HOTPLUG_PCI is not set
290
291#
292# Executable file formats
293#
294CONFIG_KCORE_ELF=y
295CONFIG_BINFMT_ELF=y
296CONFIG_COMPAT_BINFMT_ELF=y
297# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 55# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
298# CONFIG_HAVE_AOUT is not set
299CONFIG_BINFMT_MISC=y 56CONFIG_BINFMT_MISC=y
300CONFIG_NET=y 57CONFIG_NET=y
301
302#
303# Networking options
304#
305CONFIG_PACKET=y 58CONFIG_PACKET=y
306CONFIG_UNIX=y 59CONFIG_UNIX=y
307# CONFIG_UNIX_DIAG is not set
308CONFIG_XFRM=y
309CONFIG_XFRM_USER=y 60CONFIG_XFRM_USER=y
310CONFIG_XFRM_SUB_POLICY=y 61CONFIG_XFRM_SUB_POLICY=y
311CONFIG_XFRM_MIGRATE=y
312CONFIG_XFRM_STATISTICS=y 62CONFIG_XFRM_STATISTICS=y
313CONFIG_XFRM_IPCOMP=m
314CONFIG_NET_KEY=m 63CONFIG_NET_KEY=m
315CONFIG_NET_KEY_MIGRATE=y 64CONFIG_NET_KEY_MIGRATE=y
316CONFIG_INET=y 65CONFIG_INET=y
317CONFIG_IP_MULTICAST=y 66CONFIG_IP_MULTICAST=y
318CONFIG_IP_ADVANCED_ROUTER=y 67CONFIG_IP_ADVANCED_ROUTER=y
319# CONFIG_IP_FIB_TRIE_STATS is not set
320CONFIG_IP_MULTIPLE_TABLES=y 68CONFIG_IP_MULTIPLE_TABLES=y
321CONFIG_IP_ROUTE_MULTIPATH=y 69CONFIG_IP_ROUTE_MULTIPATH=y
322CONFIG_IP_ROUTE_VERBOSE=y 70CONFIG_IP_ROUTE_VERBOSE=y
323CONFIG_IP_ROUTE_CLASSID=y
324# CONFIG_IP_PNP is not set
325CONFIG_NET_IPIP=m 71CONFIG_NET_IPIP=m
326# CONFIG_NET_IPGRE_DEMUX is not set
327CONFIG_IP_MROUTE=y 72CONFIG_IP_MROUTE=y
328# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
329CONFIG_IP_PIMSM_V1=y 73CONFIG_IP_PIMSM_V1=y
330CONFIG_IP_PIMSM_V2=y 74CONFIG_IP_PIMSM_V2=y
331# CONFIG_ARPD is not set
332CONFIG_SYN_COOKIES=y 75CONFIG_SYN_COOKIES=y
333CONFIG_INET_AH=m 76CONFIG_INET_AH=m
334CONFIG_INET_ESP=m 77CONFIG_INET_ESP=m
335CONFIG_INET_IPCOMP=m 78CONFIG_INET_IPCOMP=m
336CONFIG_INET_XFRM_TUNNEL=m
337CONFIG_INET_TUNNEL=m
338CONFIG_INET_XFRM_MODE_TRANSPORT=m 79CONFIG_INET_XFRM_MODE_TRANSPORT=m
339CONFIG_INET_XFRM_MODE_TUNNEL=m 80CONFIG_INET_XFRM_MODE_TUNNEL=m
340CONFIG_INET_XFRM_MODE_BEET=m 81CONFIG_INET_XFRM_MODE_BEET=m
341CONFIG_INET_LRO=y
342CONFIG_INET_DIAG=m 82CONFIG_INET_DIAG=m
343CONFIG_INET_TCP_DIAG=m
344# CONFIG_INET_UDP_DIAG is not set
345CONFIG_TCP_CONG_ADVANCED=y 83CONFIG_TCP_CONG_ADVANCED=y
346CONFIG_TCP_CONG_BIC=m
347CONFIG_TCP_CONG_CUBIC=y
348CONFIG_TCP_CONG_WESTWOOD=m
349CONFIG_TCP_CONG_HTCP=m
350CONFIG_TCP_CONG_HSTCP=m 84CONFIG_TCP_CONG_HSTCP=m
351CONFIG_TCP_CONG_HYBLA=m 85CONFIG_TCP_CONG_HYBLA=m
352CONFIG_TCP_CONG_VEGAS=m
353CONFIG_TCP_CONG_SCALABLE=m 86CONFIG_TCP_CONG_SCALABLE=m
354CONFIG_TCP_CONG_LP=m 87CONFIG_TCP_CONG_LP=m
355CONFIG_TCP_CONG_VENO=m 88CONFIG_TCP_CONG_VENO=m
356CONFIG_TCP_CONG_YEAH=m 89CONFIG_TCP_CONG_YEAH=m
357CONFIG_TCP_CONG_ILLINOIS=m 90CONFIG_TCP_CONG_ILLINOIS=m
358CONFIG_DEFAULT_CUBIC=y
359# CONFIG_DEFAULT_RENO is not set
360CONFIG_DEFAULT_TCP_CONG="cubic"
361CONFIG_TCP_MD5SIG=y 91CONFIG_TCP_MD5SIG=y
362CONFIG_IPV6=y 92CONFIG_IPV6=y
363CONFIG_IPV6_PRIVACY=y 93CONFIG_IPV6_PRIVACY=y
@@ -368,111 +98,60 @@ CONFIG_INET6_AH=m
368CONFIG_INET6_ESP=m 98CONFIG_INET6_ESP=m
369CONFIG_INET6_IPCOMP=m 99CONFIG_INET6_IPCOMP=m
370CONFIG_IPV6_MIP6=m 100CONFIG_IPV6_MIP6=m
371CONFIG_INET6_XFRM_TUNNEL=m
372CONFIG_INET6_TUNNEL=m
373CONFIG_INET6_XFRM_MODE_TRANSPORT=m 101CONFIG_INET6_XFRM_MODE_TRANSPORT=m
374CONFIG_INET6_XFRM_MODE_TUNNEL=m 102CONFIG_INET6_XFRM_MODE_TUNNEL=m
375CONFIG_INET6_XFRM_MODE_BEET=m 103CONFIG_INET6_XFRM_MODE_BEET=m
376CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 104CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
377CONFIG_IPV6_SIT=m 105CONFIG_IPV6_SIT=m
378# CONFIG_IPV6_SIT_6RD is not set
379CONFIG_IPV6_NDISC_NODETYPE=y
380CONFIG_IPV6_TUNNEL=m 106CONFIG_IPV6_TUNNEL=m
381CONFIG_IPV6_MULTIPLE_TABLES=y 107CONFIG_IPV6_MULTIPLE_TABLES=y
382# CONFIG_IPV6_SUBTREES is not set
383CONFIG_IPV6_MROUTE=y 108CONFIG_IPV6_MROUTE=y
384# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
385CONFIG_IPV6_PIMSM_V2=y 109CONFIG_IPV6_PIMSM_V2=y
386CONFIG_NETLABEL=y 110CONFIG_NETLABEL=y
387CONFIG_NETWORK_SECMARK=y
388# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
389CONFIG_NETFILTER=y 111CONFIG_NETFILTER=y
390# CONFIG_NETFILTER_DEBUG is not set
391CONFIG_NETFILTER_ADVANCED=y
392CONFIG_BRIDGE_NETFILTER=y
393
394#
395# Core Netfilter Configuration
396#
397CONFIG_NETFILTER_NETLINK=m
398# CONFIG_NETFILTER_NETLINK_ACCT is not set
399CONFIG_NETFILTER_NETLINK_QUEUE=m
400CONFIG_NETFILTER_NETLINK_LOG=m
401CONFIG_NF_CONNTRACK=m 112CONFIG_NF_CONNTRACK=m
402CONFIG_NF_CONNTRACK_MARK=y
403CONFIG_NF_CONNTRACK_SECMARK=y 113CONFIG_NF_CONNTRACK_SECMARK=y
404CONFIG_NF_CONNTRACK_ZONES=y 114CONFIG_NF_CONNTRACK_ZONES=y
405CONFIG_NF_CONNTRACK_PROCFS=y
406CONFIG_NF_CONNTRACK_EVENTS=y 115CONFIG_NF_CONNTRACK_EVENTS=y
407# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
408CONFIG_NF_CT_PROTO_DCCP=m 116CONFIG_NF_CT_PROTO_DCCP=m
409CONFIG_NF_CT_PROTO_GRE=m
410CONFIG_NF_CT_PROTO_SCTP=m
411CONFIG_NF_CT_PROTO_UDPLITE=m 117CONFIG_NF_CT_PROTO_UDPLITE=m
412CONFIG_NF_CONNTRACK_AMANDA=m 118CONFIG_NF_CONNTRACK_AMANDA=m
413CONFIG_NF_CONNTRACK_FTP=m 119CONFIG_NF_CONNTRACK_FTP=m
414CONFIG_NF_CONNTRACK_H323=m 120CONFIG_NF_CONNTRACK_H323=m
415CONFIG_NF_CONNTRACK_IRC=m 121CONFIG_NF_CONNTRACK_IRC=m
416CONFIG_NF_CONNTRACK_BROADCAST=m
417CONFIG_NF_CONNTRACK_NETBIOS_NS=m 122CONFIG_NF_CONNTRACK_NETBIOS_NS=m
418# CONFIG_NF_CONNTRACK_SNMP is not set
419CONFIG_NF_CONNTRACK_PPTP=m 123CONFIG_NF_CONNTRACK_PPTP=m
420CONFIG_NF_CONNTRACK_SANE=m 124CONFIG_NF_CONNTRACK_SANE=m
421CONFIG_NF_CONNTRACK_SIP=m 125CONFIG_NF_CONNTRACK_SIP=m
422CONFIG_NF_CONNTRACK_TFTP=m 126CONFIG_NF_CONNTRACK_TFTP=m
423# CONFIG_NF_CT_NETLINK is not set
424CONFIG_NETFILTER_TPROXY=m 127CONFIG_NETFILTER_TPROXY=m
425CONFIG_NETFILTER_XTABLES=y
426
427#
428# Xtables combined modules
429#
430CONFIG_NETFILTER_XT_MARK=m
431CONFIG_NETFILTER_XT_CONNMARK=m
432
433#
434# Xtables targets
435#
436# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
437# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
438CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 128CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
439CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 129CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
440CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 130CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
441CONFIG_NETFILTER_XT_TARGET_CT=m 131CONFIG_NETFILTER_XT_TARGET_CT=m
442CONFIG_NETFILTER_XT_TARGET_DSCP=m 132CONFIG_NETFILTER_XT_TARGET_DSCP=m
443CONFIG_NETFILTER_XT_TARGET_HL=m
444CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 133CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
445CONFIG_NETFILTER_XT_TARGET_MARK=m 134CONFIG_NETFILTER_XT_TARGET_MARK=m
446CONFIG_NETFILTER_XT_TARGET_NFLOG=m 135CONFIG_NETFILTER_XT_TARGET_NFLOG=m
447CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 136CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
448CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 137CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
449CONFIG_NETFILTER_XT_TARGET_RATEEST=m
450CONFIG_NETFILTER_XT_TARGET_TEE=m 138CONFIG_NETFILTER_XT_TARGET_TEE=m
451CONFIG_NETFILTER_XT_TARGET_TPROXY=m 139CONFIG_NETFILTER_XT_TARGET_TPROXY=m
452CONFIG_NETFILTER_XT_TARGET_TRACE=m 140CONFIG_NETFILTER_XT_TARGET_TRACE=m
453CONFIG_NETFILTER_XT_TARGET_SECMARK=m 141CONFIG_NETFILTER_XT_TARGET_SECMARK=m
454CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 142CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
455CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 143CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
456
457#
458# Xtables matches
459#
460# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
461CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 144CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
462CONFIG_NETFILTER_XT_MATCH_COMMENT=m 145CONFIG_NETFILTER_XT_MATCH_COMMENT=m
463CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 146CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
464CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 147CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
465CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 148CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
466CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 149CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
467# CONFIG_NETFILTER_XT_MATCH_CPU is not set
468CONFIG_NETFILTER_XT_MATCH_DCCP=m 150CONFIG_NETFILTER_XT_MATCH_DCCP=m
469# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
470CONFIG_NETFILTER_XT_MATCH_DSCP=m 151CONFIG_NETFILTER_XT_MATCH_DSCP=m
471CONFIG_NETFILTER_XT_MATCH_ECN=m
472CONFIG_NETFILTER_XT_MATCH_ESP=m 152CONFIG_NETFILTER_XT_MATCH_ESP=m
473CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 153CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
474CONFIG_NETFILTER_XT_MATCH_HELPER=m 154CONFIG_NETFILTER_XT_MATCH_HELPER=m
475CONFIG_NETFILTER_XT_MATCH_HL=m
476CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 155CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
477CONFIG_NETFILTER_XT_MATCH_IPVS=m 156CONFIG_NETFILTER_XT_MATCH_IPVS=m
478CONFIG_NETFILTER_XT_MATCH_LENGTH=m 157CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -480,7 +159,6 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
480CONFIG_NETFILTER_XT_MATCH_MAC=m 159CONFIG_NETFILTER_XT_MATCH_MAC=m
481CONFIG_NETFILTER_XT_MATCH_MARK=m 160CONFIG_NETFILTER_XT_MATCH_MARK=m
482CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 161CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
483# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
484CONFIG_NETFILTER_XT_MATCH_OSF=m 162CONFIG_NETFILTER_XT_MATCH_OSF=m
485CONFIG_NETFILTER_XT_MATCH_OWNER=m 163CONFIG_NETFILTER_XT_MATCH_OWNER=m
486CONFIG_NETFILTER_XT_MATCH_POLICY=m 164CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -490,7 +168,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
490CONFIG_NETFILTER_XT_MATCH_RATEEST=m 168CONFIG_NETFILTER_XT_MATCH_RATEEST=m
491CONFIG_NETFILTER_XT_MATCH_REALM=m 169CONFIG_NETFILTER_XT_MATCH_REALM=m
492CONFIG_NETFILTER_XT_MATCH_RECENT=m 170CONFIG_NETFILTER_XT_MATCH_RECENT=m
493CONFIG_NETFILTER_XT_MATCH_SCTP=m
494CONFIG_NETFILTER_XT_MATCH_SOCKET=m 171CONFIG_NETFILTER_XT_MATCH_SOCKET=m
495CONFIG_NETFILTER_XT_MATCH_STATE=m 172CONFIG_NETFILTER_XT_MATCH_STATE=m
496CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 173CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -498,66 +175,33 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
498CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 175CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
499CONFIG_NETFILTER_XT_MATCH_TIME=m 176CONFIG_NETFILTER_XT_MATCH_TIME=m
500CONFIG_NETFILTER_XT_MATCH_U32=m 177CONFIG_NETFILTER_XT_MATCH_U32=m
501# CONFIG_IP_SET is not set
502CONFIG_IP_VS=m 178CONFIG_IP_VS=m
503CONFIG_IP_VS_IPV6=y 179CONFIG_IP_VS_IPV6=y
504# CONFIG_IP_VS_DEBUG is not set
505CONFIG_IP_VS_TAB_BITS=12
506
507#
508# IPVS transport protocol load balancing support
509#
510CONFIG_IP_VS_PROTO_TCP=y 180CONFIG_IP_VS_PROTO_TCP=y
511CONFIG_IP_VS_PROTO_UDP=y 181CONFIG_IP_VS_PROTO_UDP=y
512CONFIG_IP_VS_PROTO_AH_ESP=y
513CONFIG_IP_VS_PROTO_ESP=y 182CONFIG_IP_VS_PROTO_ESP=y
514CONFIG_IP_VS_PROTO_AH=y 183CONFIG_IP_VS_PROTO_AH=y
515CONFIG_IP_VS_PROTO_SCTP=y 184CONFIG_IP_VS_PROTO_SCTP=y
516
517#
518# IPVS scheduler
519#
520CONFIG_IP_VS_RR=m 185CONFIG_IP_VS_RR=m
521CONFIG_IP_VS_WRR=m 186CONFIG_IP_VS_WRR=m
522CONFIG_IP_VS_LC=m 187CONFIG_IP_VS_LC=m
523CONFIG_IP_VS_WLC=m 188CONFIG_IP_VS_WLC=m
524CONFIG_IP_VS_LBLC=m 189CONFIG_IP_VS_LBLC=m
525CONFIG_IP_VS_LBLCR=m 190CONFIG_IP_VS_LBLCR=m
526# CONFIG_IP_VS_DH is not set
527# CONFIG_IP_VS_SH is not set
528CONFIG_IP_VS_SED=m 191CONFIG_IP_VS_SED=m
529CONFIG_IP_VS_NQ=m 192CONFIG_IP_VS_NQ=m
530
531#
532# IPVS SH scheduler
533#
534CONFIG_IP_VS_SH_TAB_BITS=8
535
536#
537# IPVS application helper
538#
539# CONFIG_IP_VS_NFCT is not set
540# CONFIG_IP_VS_PE_SIP is not set
541
542#
543# IP: Netfilter Configuration
544#
545CONFIG_NF_DEFRAG_IPV4=m
546CONFIG_NF_CONNTRACK_IPV4=m 193CONFIG_NF_CONNTRACK_IPV4=m
547# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 194# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
548CONFIG_IP_NF_QUEUE=m 195CONFIG_IP_NF_QUEUE=m
549CONFIG_IP_NF_IPTABLES=y 196CONFIG_IP_NF_IPTABLES=y
550CONFIG_IP_NF_MATCH_AH=m 197CONFIG_IP_NF_MATCH_AH=m
551CONFIG_IP_NF_MATCH_ECN=m 198CONFIG_IP_NF_MATCH_ECN=m
552# CONFIG_IP_NF_MATCH_RPFILTER is not set
553CONFIG_IP_NF_MATCH_TTL=m 199CONFIG_IP_NF_MATCH_TTL=m
554CONFIG_IP_NF_FILTER=y 200CONFIG_IP_NF_FILTER=y
555CONFIG_IP_NF_TARGET_REJECT=y 201CONFIG_IP_NF_TARGET_REJECT=y
556CONFIG_IP_NF_TARGET_LOG=m 202CONFIG_IP_NF_TARGET_LOG=m
557CONFIG_IP_NF_TARGET_ULOG=m 203CONFIG_IP_NF_TARGET_ULOG=m
558# CONFIG_NF_NAT is not set
559CONFIG_IP_NF_MANGLE=m 204CONFIG_IP_NF_MANGLE=m
560# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
561CONFIG_IP_NF_TARGET_ECN=m 205CONFIG_IP_NF_TARGET_ECN=m
562CONFIG_IP_NF_TARGET_TTL=m 206CONFIG_IP_NF_TARGET_TTL=m
563CONFIG_IP_NF_RAW=m 207CONFIG_IP_NF_RAW=m
@@ -565,11 +209,6 @@ CONFIG_IP_NF_SECURITY=m
565CONFIG_IP_NF_ARPTABLES=m 209CONFIG_IP_NF_ARPTABLES=m
566CONFIG_IP_NF_ARPFILTER=m 210CONFIG_IP_NF_ARPFILTER=m
567CONFIG_IP_NF_ARP_MANGLE=m 211CONFIG_IP_NF_ARP_MANGLE=m
568
569#
570# IPv6: Netfilter Configuration
571#
572CONFIG_NF_DEFRAG_IPV6=m
573CONFIG_NF_CONNTRACK_IPV6=m 212CONFIG_NF_CONNTRACK_IPV6=m
574CONFIG_IP6_NF_QUEUE=m 213CONFIG_IP6_NF_QUEUE=m
575CONFIG_IP6_NF_IPTABLES=m 214CONFIG_IP6_NF_IPTABLES=m
@@ -580,7 +219,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
580CONFIG_IP6_NF_MATCH_HL=m 219CONFIG_IP6_NF_MATCH_HL=m
581CONFIG_IP6_NF_MATCH_IPV6HEADER=m 220CONFIG_IP6_NF_MATCH_IPV6HEADER=m
582CONFIG_IP6_NF_MATCH_MH=m 221CONFIG_IP6_NF_MATCH_MH=m
583# CONFIG_IP6_NF_MATCH_RPFILTER is not set
584CONFIG_IP6_NF_MATCH_RT=m 222CONFIG_IP6_NF_MATCH_RT=m
585CONFIG_IP6_NF_TARGET_HL=m 223CONFIG_IP6_NF_TARGET_HL=m
586CONFIG_IP6_NF_TARGET_LOG=m 224CONFIG_IP6_NF_TARGET_LOG=m
@@ -611,52 +249,20 @@ CONFIG_BRIDGE_EBT_SNAT=m
611CONFIG_BRIDGE_EBT_LOG=m 249CONFIG_BRIDGE_EBT_LOG=m
612CONFIG_BRIDGE_EBT_ULOG=m 250CONFIG_BRIDGE_EBT_ULOG=m
613CONFIG_BRIDGE_EBT_NFLOG=m 251CONFIG_BRIDGE_EBT_NFLOG=m
614# CONFIG_IP_DCCP is not set
615CONFIG_IP_SCTP=m
616# CONFIG_SCTP_DBG_MSG is not set
617# CONFIG_SCTP_DBG_OBJCNT is not set
618# CONFIG_SCTP_HMAC_NONE is not set
619# CONFIG_SCTP_HMAC_SHA1 is not set
620CONFIG_SCTP_HMAC_MD5=y
621CONFIG_RDS=m 252CONFIG_RDS=m
622CONFIG_RDS_TCP=m 253CONFIG_RDS_TCP=m
623# CONFIG_RDS_DEBUG is not set
624# CONFIG_TIPC is not set
625# CONFIG_ATM is not set
626# CONFIG_L2TP is not set
627CONFIG_STP=m
628CONFIG_GARP=m
629CONFIG_BRIDGE=m 254CONFIG_BRIDGE=m
630CONFIG_BRIDGE_IGMP_SNOOPING=y
631CONFIG_NET_DSA=y 255CONFIG_NET_DSA=y
632CONFIG_NET_DSA_TAG_DSA=y
633CONFIG_NET_DSA_TAG_EDSA=y
634CONFIG_NET_DSA_TAG_TRAILER=y
635CONFIG_VLAN_8021Q=m 256CONFIG_VLAN_8021Q=m
636CONFIG_VLAN_8021Q_GVRP=y 257CONFIG_VLAN_8021Q_GVRP=y
637# CONFIG_DECNET is not set
638CONFIG_LLC=m
639# CONFIG_LLC2 is not set
640# CONFIG_IPX is not set
641# CONFIG_ATALK is not set
642# CONFIG_X25 is not set
643# CONFIG_LAPB is not set
644# CONFIG_ECONET is not set
645# CONFIG_WAN_ROUTER is not set
646CONFIG_PHONET=m 258CONFIG_PHONET=m
647# CONFIG_IEEE802154 is not set
648CONFIG_NET_SCHED=y 259CONFIG_NET_SCHED=y
649
650#
651# Queueing/Scheduling
652#
653CONFIG_NET_SCH_CBQ=m 260CONFIG_NET_SCH_CBQ=m
654CONFIG_NET_SCH_HTB=m 261CONFIG_NET_SCH_HTB=m
655CONFIG_NET_SCH_HFSC=m 262CONFIG_NET_SCH_HFSC=m
656CONFIG_NET_SCH_PRIO=m 263CONFIG_NET_SCH_PRIO=m
657CONFIG_NET_SCH_MULTIQ=m 264CONFIG_NET_SCH_MULTIQ=m
658CONFIG_NET_SCH_RED=m 265CONFIG_NET_SCH_RED=m
659# CONFIG_NET_SCH_SFB is not set
660CONFIG_NET_SCH_SFQ=m 266CONFIG_NET_SCH_SFQ=m
661CONFIG_NET_SCH_TEQL=m 267CONFIG_NET_SCH_TEQL=m
662CONFIG_NET_SCH_TBF=m 268CONFIG_NET_SCH_TBF=m
@@ -664,15 +270,7 @@ CONFIG_NET_SCH_GRED=m
664CONFIG_NET_SCH_DSMARK=m 270CONFIG_NET_SCH_DSMARK=m
665CONFIG_NET_SCH_NETEM=m 271CONFIG_NET_SCH_NETEM=m
666CONFIG_NET_SCH_DRR=m 272CONFIG_NET_SCH_DRR=m
667# CONFIG_NET_SCH_MQPRIO is not set
668# CONFIG_NET_SCH_CHOKE is not set
669# CONFIG_NET_SCH_QFQ is not set
670CONFIG_NET_SCH_INGRESS=m 273CONFIG_NET_SCH_INGRESS=m
671
672#
673# Classification
674#
675CONFIG_NET_CLS=y
676CONFIG_NET_CLS_BASIC=m 274CONFIG_NET_CLS_BASIC=m
677CONFIG_NET_CLS_TCINDEX=m 275CONFIG_NET_CLS_TCINDEX=m
678CONFIG_NET_CLS_ROUTE4=m 276CONFIG_NET_CLS_ROUTE4=m
@@ -685,7 +283,6 @@ CONFIG_NET_CLS_RSVP6=m
685CONFIG_NET_CLS_FLOW=m 283CONFIG_NET_CLS_FLOW=m
686CONFIG_NET_CLS_CGROUP=y 284CONFIG_NET_CLS_CGROUP=y
687CONFIG_NET_EMATCH=y 285CONFIG_NET_EMATCH=y
688CONFIG_NET_EMATCH_STACK=32
689CONFIG_NET_EMATCH_CMP=m 286CONFIG_NET_EMATCH_CMP=m
690CONFIG_NET_EMATCH_NBYTE=m 287CONFIG_NET_EMATCH_NBYTE=m
691CONFIG_NET_EMATCH_U32=m 288CONFIG_NET_EMATCH_U32=m
@@ -701,252 +298,46 @@ CONFIG_NET_ACT_NAT=m
701CONFIG_NET_ACT_PEDIT=m 298CONFIG_NET_ACT_PEDIT=m
702CONFIG_NET_ACT_SIMP=m 299CONFIG_NET_ACT_SIMP=m
703CONFIG_NET_ACT_SKBEDIT=m 300CONFIG_NET_ACT_SKBEDIT=m
704# CONFIG_NET_ACT_CSUM is not set
705CONFIG_NET_CLS_IND=y 301CONFIG_NET_CLS_IND=y
706CONFIG_NET_SCH_FIFO=y
707CONFIG_DCB=y 302CONFIG_DCB=y
708CONFIG_DNS_RESOLVER=y
709# CONFIG_BATMAN_ADV is not set
710# CONFIG_OPENVSWITCH is not set
711CONFIG_RPS=y
712CONFIG_RFS_ACCEL=y
713CONFIG_XPS=y
714# CONFIG_NETPRIO_CGROUP is not set
715CONFIG_BQL=y
716
717#
718# Network testing
719#
720# CONFIG_NET_PKTGEN is not set
721# CONFIG_HAMRADIO is not set
722# CONFIG_CAN is not set
723# CONFIG_IRDA is not set
724# CONFIG_BT is not set
725# CONFIG_AF_RXRPC is not set
726CONFIG_FIB_RULES=y
727# CONFIG_WIRELESS is not set 303# CONFIG_WIRELESS is not set
728# CONFIG_WIMAX is not set
729# CONFIG_RFKILL is not set
730# CONFIG_NET_9P is not set
731# CONFIG_CAIF is not set
732# CONFIG_CEPH_LIB is not set
733# CONFIG_NFC is not set
734
735#
736# Device Drivers
737#
738
739#
740# Generic Driver Options
741#
742CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 304CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
743CONFIG_DEVTMPFS=y 305CONFIG_DEVTMPFS=y
744CONFIG_DEVTMPFS_MOUNT=y 306CONFIG_DEVTMPFS_MOUNT=y
745CONFIG_STANDALONE=y
746CONFIG_PREVENT_FIRMWARE_BUILD=y
747CONFIG_FW_LOADER=y
748# CONFIG_FIRMWARE_IN_KERNEL is not set 307# CONFIG_FIRMWARE_IN_KERNEL is not set
749CONFIG_EXTRA_FIRMWARE=""
750# CONFIG_DEBUG_DRIVER is not set
751# CONFIG_DEBUG_DEVRES is not set
752CONFIG_SYS_HYPERVISOR=y
753# CONFIG_GENERIC_CPU_DEVICES is not set
754# CONFIG_DMA_SHARED_BUFFER is not set
755CONFIG_CONNECTOR=y 308CONFIG_CONNECTOR=y
756CONFIG_PROC_EVENTS=y
757# CONFIG_MTD is not set
758# CONFIG_PARPORT is not set
759CONFIG_BLK_DEV=y
760# CONFIG_BLK_CPQ_DA is not set
761# CONFIG_BLK_CPQ_CISS_DA is not set
762# CONFIG_BLK_DEV_DAC960 is not set
763# CONFIG_BLK_DEV_UMEM is not set
764# CONFIG_BLK_DEV_COW_COMMON is not set
765CONFIG_BLK_DEV_LOOP=y 309CONFIG_BLK_DEV_LOOP=y
766CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
767CONFIG_BLK_DEV_CRYPTOLOOP=m 310CONFIG_BLK_DEV_CRYPTOLOOP=m
768# CONFIG_BLK_DEV_DRBD is not set
769# CONFIG_BLK_DEV_NBD is not set
770# CONFIG_BLK_DEV_NVME is not set
771CONFIG_BLK_DEV_SX8=m 311CONFIG_BLK_DEV_SX8=m
772# CONFIG_BLK_DEV_UB is not set
773CONFIG_BLK_DEV_RAM=y 312CONFIG_BLK_DEV_RAM=y
774CONFIG_BLK_DEV_RAM_COUNT=16
775CONFIG_BLK_DEV_RAM_SIZE=16384 313CONFIG_BLK_DEV_RAM_SIZE=16384
776# CONFIG_BLK_DEV_XIP is not set
777# CONFIG_CDROM_PKTCDVD is not set
778CONFIG_ATA_OVER_ETH=m 314CONFIG_ATA_OVER_ETH=m
779# CONFIG_BLK_DEV_RBD is not set
780
781#
782# Misc devices
783#
784# CONFIG_SENSORS_LIS3LV02D is not set
785# CONFIG_AD525X_DPOT is not set
786# CONFIG_PHANTOM is not set
787# CONFIG_INTEL_MID_PTI is not set
788# CONFIG_SGI_IOC4 is not set
789# CONFIG_TIFM_CORE is not set
790# CONFIG_ICS932S401 is not set
791# CONFIG_ENCLOSURE_SERVICES is not set
792# CONFIG_HP_ILO is not set
793# CONFIG_APDS9802ALS is not set
794# CONFIG_ISL29003 is not set
795# CONFIG_ISL29020 is not set
796# CONFIG_SENSORS_TSL2550 is not set
797# CONFIG_SENSORS_BH1780 is not set
798# CONFIG_SENSORS_BH1770 is not set
799# CONFIG_SENSORS_APDS990X is not set
800# CONFIG_HMC6352 is not set
801# CONFIG_DS1682 is not set
802# CONFIG_BMP085 is not set
803# CONFIG_PCH_PHUB is not set
804# CONFIG_USB_SWITCH_FSA9480 is not set
805# CONFIG_C2PORT is not set
806
807#
808# EEPROM support
809#
810# CONFIG_EEPROM_AT24 is not set
811# CONFIG_EEPROM_LEGACY is not set
812# CONFIG_EEPROM_MAX6875 is not set
813# CONFIG_EEPROM_93CX6 is not set
814# CONFIG_CB710_CORE is not set
815
816#
817# Texas Instruments shared transport line discipline
818#
819# CONFIG_SENSORS_LIS3_I2C is not set
820
821#
822# Altera FPGA firmware download module
823#
824# CONFIG_ALTERA_STAPL is not set
825
826#
827# SCSI device support
828#
829CONFIG_SCSI_MOD=y
830CONFIG_RAID_ATTRS=m 315CONFIG_RAID_ATTRS=m
831CONFIG_SCSI=y
832CONFIG_SCSI_DMA=y
833CONFIG_SCSI_TGT=m 316CONFIG_SCSI_TGT=m
834# CONFIG_SCSI_NETLINK is not set
835CONFIG_SCSI_PROC_FS=y
836
837#
838# SCSI support type (disk, tape, CD-ROM)
839#
840CONFIG_BLK_DEV_SD=y 317CONFIG_BLK_DEV_SD=y
841# CONFIG_CHR_DEV_ST is not set
842# CONFIG_CHR_DEV_OSST is not set
843# CONFIG_BLK_DEV_SR is not set
844# CONFIG_CHR_DEV_SG is not set
845# CONFIG_CHR_DEV_SCH is not set
846# CONFIG_SCSI_MULTI_LUN is not set
847CONFIG_SCSI_CONSTANTS=y 318CONFIG_SCSI_CONSTANTS=y
848CONFIG_SCSI_LOGGING=y 319CONFIG_SCSI_LOGGING=y
849# CONFIG_SCSI_SCAN_ASYNC is not set
850CONFIG_SCSI_WAIT_SCAN=m
851
852#
853# SCSI Transports
854#
855# CONFIG_SCSI_SPI_ATTRS is not set
856# CONFIG_SCSI_FC_ATTRS is not set
857# CONFIG_SCSI_ISCSI_ATTRS is not set
858CONFIG_SCSI_SAS_ATTRS=y
859CONFIG_SCSI_SAS_LIBSAS=y
860CONFIG_SCSI_SAS_ATA=y 320CONFIG_SCSI_SAS_ATA=y
861CONFIG_SCSI_SAS_HOST_SMP=y
862# CONFIG_SCSI_SRP_ATTRS is not set
863CONFIG_SCSI_LOWLEVEL=y
864# CONFIG_ISCSI_TCP is not set
865# CONFIG_ISCSI_BOOT_SYSFS is not set
866# CONFIG_SCSI_CXGB3_ISCSI is not set
867# CONFIG_SCSI_CXGB4_ISCSI is not set
868# CONFIG_SCSI_BNX2_ISCSI is not set
869# CONFIG_SCSI_BNX2X_FCOE is not set
870# CONFIG_BE2ISCSI is not set
871# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
872# CONFIG_SCSI_HPSA is not set
873# CONFIG_SCSI_3W_9XXX is not set
874# CONFIG_SCSI_3W_SAS is not set
875# CONFIG_SCSI_ACARD is not set
876# CONFIG_SCSI_AACRAID is not set
877# CONFIG_SCSI_AIC7XXX is not set
878# CONFIG_SCSI_AIC7XXX_OLD is not set
879# CONFIG_SCSI_AIC79XX is not set
880# CONFIG_SCSI_AIC94XX is not set
881CONFIG_SCSI_MVSAS=y 321CONFIG_SCSI_MVSAS=y
882# CONFIG_SCSI_MVSAS_DEBUG is not set 322# CONFIG_SCSI_MVSAS_DEBUG is not set
883CONFIG_SCSI_MVSAS_TASKLET=y 323CONFIG_SCSI_MVSAS_TASKLET=y
884# CONFIG_SCSI_MVUMI is not set
885# CONFIG_SCSI_DPT_I2O is not set
886# CONFIG_SCSI_ADVANSYS is not set
887# CONFIG_SCSI_ARCMSR is not set
888# CONFIG_MEGARAID_NEWGEN is not set
889# CONFIG_MEGARAID_LEGACY is not set
890# CONFIG_MEGARAID_SAS is not set
891# CONFIG_SCSI_MPT2SAS is not set
892# CONFIG_SCSI_HPTIOP is not set
893# CONFIG_LIBFC is not set
894# CONFIG_LIBFCOE is not set
895# CONFIG_FCOE is not set
896# CONFIG_SCSI_DMX3191D is not set
897# CONFIG_SCSI_FUTURE_DOMAIN is not set
898# CONFIG_SCSI_IPS is not set
899# CONFIG_SCSI_INITIO is not set
900# CONFIG_SCSI_INIA100 is not set
901# CONFIG_SCSI_STEX is not set
902# CONFIG_SCSI_SYM53C8XX_2 is not set
903# CONFIG_SCSI_IPR is not set
904# CONFIG_SCSI_QLOGIC_1280 is not set
905# CONFIG_SCSI_QLA_FC is not set
906# CONFIG_SCSI_QLA_ISCSI is not set
907# CONFIG_SCSI_LPFC is not set
908# CONFIG_SCSI_DC395x is not set
909# CONFIG_SCSI_DC390T is not set
910# CONFIG_SCSI_DEBUG is not set
911# CONFIG_SCSI_PMCRAID is not set
912# CONFIG_SCSI_PM8001 is not set
913# CONFIG_SCSI_SRP is not set
914# CONFIG_SCSI_BFA_FC is not set
915# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
916# CONFIG_SCSI_DH is not set
917# CONFIG_SCSI_OSD_INITIATOR is not set
918CONFIG_ATA=y 324CONFIG_ATA=y
919# CONFIG_ATA_NONSTANDARD is not set
920CONFIG_ATA_VERBOSE_ERROR=y
921CONFIG_SATA_PMP=y
922
923#
924# Controllers with non-SFF native interface
925#
926# CONFIG_SATA_AHCI is not set
927# CONFIG_SATA_AHCI_PLATFORM is not set
928# CONFIG_SATA_INIC162X is not set
929# CONFIG_SATA_ACARD_AHCI is not set
930CONFIG_SATA_SIL24=y 325CONFIG_SATA_SIL24=y
931# CONFIG_ATA_SFF is not set 326# CONFIG_ATA_SFF is not set
932CONFIG_MD=y 327CONFIG_MD=y
933CONFIG_BLK_DEV_MD=y 328CONFIG_BLK_DEV_MD=y
934CONFIG_MD_AUTODETECT=y
935CONFIG_MD_LINEAR=m 329CONFIG_MD_LINEAR=m
936CONFIG_MD_RAID0=m 330CONFIG_MD_RAID0=m
937CONFIG_MD_RAID1=m 331CONFIG_MD_RAID1=m
938CONFIG_MD_RAID10=m 332CONFIG_MD_RAID10=m
939CONFIG_MD_RAID456=m 333CONFIG_MD_RAID456=m
940CONFIG_MULTICORE_RAID456=y 334CONFIG_MULTICORE_RAID456=y
941# CONFIG_MD_MULTIPATH is not set
942CONFIG_MD_FAULTY=m 335CONFIG_MD_FAULTY=m
943CONFIG_BLK_DEV_DM=m 336CONFIG_BLK_DEV_DM=m
944CONFIG_DM_DEBUG=y 337CONFIG_DM_DEBUG=y
945CONFIG_DM_CRYPT=m 338CONFIG_DM_CRYPT=m
946CONFIG_DM_SNAPSHOT=m 339CONFIG_DM_SNAPSHOT=m
947# CONFIG_DM_THIN_PROVISIONING is not set
948CONFIG_DM_MIRROR=m 340CONFIG_DM_MIRROR=m
949# CONFIG_DM_RAID is not set
950CONFIG_DM_LOG_USERSPACE=m 341CONFIG_DM_LOG_USERSPACE=m
951CONFIG_DM_ZERO=m 342CONFIG_DM_ZERO=m
952CONFIG_DM_MULTIPATH=m 343CONFIG_DM_MULTIPATH=m
@@ -954,55 +345,22 @@ CONFIG_DM_MULTIPATH_QL=m
954CONFIG_DM_MULTIPATH_ST=m 345CONFIG_DM_MULTIPATH_ST=m
955CONFIG_DM_DELAY=m 346CONFIG_DM_DELAY=m
956CONFIG_DM_UEVENT=y 347CONFIG_DM_UEVENT=y
957# CONFIG_DM_FLAKEY is not set
958# CONFIG_TARGET_CORE is not set
959CONFIG_FUSION=y 348CONFIG_FUSION=y
960# CONFIG_FUSION_SPI is not set
961# CONFIG_FUSION_FC is not set
962CONFIG_FUSION_SAS=y 349CONFIG_FUSION_SAS=y
963CONFIG_FUSION_MAX_SGE=128
964# CONFIG_FUSION_CTL is not set
965# CONFIG_FUSION_LOGGING is not set
966
967#
968# IEEE 1394 (FireWire) support
969#
970# CONFIG_FIREWIRE is not set
971# CONFIG_FIREWIRE_NOSY is not set
972# CONFIG_I2O is not set
973CONFIG_NETDEVICES=y 350CONFIG_NETDEVICES=y
974CONFIG_NET_CORE=y
975CONFIG_BONDING=m 351CONFIG_BONDING=m
976CONFIG_DUMMY=m 352CONFIG_DUMMY=m
977# CONFIG_EQUALIZER is not set
978# CONFIG_NET_FC is not set
979# CONFIG_MII is not set
980CONFIG_IFB=m 353CONFIG_IFB=m
981# CONFIG_NET_TEAM is not set
982CONFIG_MACVLAN=m 354CONFIG_MACVLAN=m
983CONFIG_MACVTAP=m 355CONFIG_MACVTAP=m
984CONFIG_NETCONSOLE=m 356CONFIG_NETCONSOLE=m
985CONFIG_NETCONSOLE_DYNAMIC=y 357CONFIG_NETCONSOLE_DYNAMIC=y
986CONFIG_NETPOLL=y
987CONFIG_NETPOLL_TRAP=y 358CONFIG_NETPOLL_TRAP=y
988CONFIG_NET_POLL_CONTROLLER=y
989CONFIG_TUN=y 359CONFIG_TUN=y
990CONFIG_VETH=m 360CONFIG_VETH=m
991# CONFIG_ARCNET is not set
992
993#
994# CAIF transport drivers
995#
996
997#
998# Distributed Switch Architecture drivers
999#
1000CONFIG_NET_DSA_MV88E6XXX=y
1001CONFIG_NET_DSA_MV88E6060=y 361CONFIG_NET_DSA_MV88E6060=y
1002CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
1003CONFIG_NET_DSA_MV88E6131=y 362CONFIG_NET_DSA_MV88E6131=y
1004CONFIG_NET_DSA_MV88E6123_61_65=y 363CONFIG_NET_DSA_MV88E6123_61_65=y
1005CONFIG_ETHERNET=y
1006# CONFIG_NET_VENDOR_3COM is not set 364# CONFIG_NET_VENDOR_3COM is not set
1007# CONFIG_NET_VENDOR_ADAPTEC is not set 365# CONFIG_NET_VENDOR_ADAPTEC is not set
1008# CONFIG_NET_VENDOR_ALTEON is not set 366# CONFIG_NET_VENDOR_ALTEON is not set
@@ -1010,27 +368,21 @@ CONFIG_ETHERNET=y
1010# CONFIG_NET_VENDOR_ATHEROS is not set 368# CONFIG_NET_VENDOR_ATHEROS is not set
1011# CONFIG_NET_VENDOR_BROADCOM is not set 369# CONFIG_NET_VENDOR_BROADCOM is not set
1012# CONFIG_NET_VENDOR_BROCADE is not set 370# CONFIG_NET_VENDOR_BROCADE is not set
1013# CONFIG_NET_CALXEDA_XGMAC is not set
1014# CONFIG_NET_VENDOR_CHELSIO is not set 371# CONFIG_NET_VENDOR_CHELSIO is not set
1015# CONFIG_NET_VENDOR_CISCO is not set 372# CONFIG_NET_VENDOR_CISCO is not set
1016# CONFIG_DNET is not set
1017# CONFIG_NET_VENDOR_DEC is not set 373# CONFIG_NET_VENDOR_DEC is not set
1018# CONFIG_NET_VENDOR_DLINK is not set 374# CONFIG_NET_VENDOR_DLINK is not set
1019# CONFIG_NET_VENDOR_EMULEX is not set 375# CONFIG_NET_VENDOR_EMULEX is not set
1020# CONFIG_NET_VENDOR_EXAR is not set 376# CONFIG_NET_VENDOR_EXAR is not set
1021# CONFIG_NET_VENDOR_HP is not set 377# CONFIG_NET_VENDOR_HP is not set
1022# CONFIG_NET_VENDOR_INTEL is not set 378# CONFIG_NET_VENDOR_INTEL is not set
1023# CONFIG_IP1000 is not set
1024# CONFIG_JME is not set
1025# CONFIG_NET_VENDOR_MARVELL is not set 379# CONFIG_NET_VENDOR_MARVELL is not set
1026# CONFIG_NET_VENDOR_MELLANOX is not set 380# CONFIG_NET_VENDOR_MELLANOX is not set
1027# CONFIG_NET_VENDOR_MICREL is not set 381# CONFIG_NET_VENDOR_MICREL is not set
1028# CONFIG_NET_VENDOR_MYRI is not set 382# CONFIG_NET_VENDOR_MYRI is not set
1029# CONFIG_FEALNX is not set
1030# CONFIG_NET_VENDOR_NATSEMI is not set 383# CONFIG_NET_VENDOR_NATSEMI is not set
1031# CONFIG_NET_VENDOR_NVIDIA is not set 384# CONFIG_NET_VENDOR_NVIDIA is not set
1032# CONFIG_NET_VENDOR_OKI is not set 385# CONFIG_NET_VENDOR_OKI is not set
1033# CONFIG_ETHOC is not set
1034# CONFIG_NET_PACKET_ENGINE is not set 386# CONFIG_NET_PACKET_ENGINE is not set
1035# CONFIG_NET_VENDOR_QLOGIC is not set 387# CONFIG_NET_VENDOR_QLOGIC is not set
1036# CONFIG_NET_VENDOR_REALTEK is not set 388# CONFIG_NET_VENDOR_REALTEK is not set
@@ -1038,7 +390,6 @@ CONFIG_ETHERNET=y
1038# CONFIG_NET_VENDOR_SEEQ is not set 390# CONFIG_NET_VENDOR_SEEQ is not set
1039# CONFIG_NET_VENDOR_SILAN is not set 391# CONFIG_NET_VENDOR_SILAN is not set
1040# CONFIG_NET_VENDOR_SIS is not set 392# CONFIG_NET_VENDOR_SIS is not set
1041# CONFIG_SFC is not set
1042# CONFIG_NET_VENDOR_SMSC is not set 393# CONFIG_NET_VENDOR_SMSC is not set
1043# CONFIG_NET_VENDOR_STMICRO is not set 394# CONFIG_NET_VENDOR_STMICRO is not set
1044# CONFIG_NET_VENDOR_SUN is not set 395# CONFIG_NET_VENDOR_SUN is not set
@@ -1046,673 +397,91 @@ CONFIG_ETHERNET=y
1046# CONFIG_NET_VENDOR_TI is not set 397# CONFIG_NET_VENDOR_TI is not set
1047# CONFIG_TILE_NET is not set 398# CONFIG_TILE_NET is not set
1048# CONFIG_NET_VENDOR_VIA is not set 399# CONFIG_NET_VENDOR_VIA is not set
1049# CONFIG_FDDI is not set
1050# CONFIG_HIPPI is not set
1051CONFIG_PHYLIB=y
1052
1053#
1054# MII PHY device drivers
1055#
1056# CONFIG_MARVELL_PHY is not set
1057# CONFIG_DAVICOM_PHY is not set
1058# CONFIG_QSEMI_PHY is not set
1059# CONFIG_LXT_PHY is not set
1060# CONFIG_CICADA_PHY is not set
1061# CONFIG_VITESSE_PHY is not set
1062# CONFIG_SMSC_PHY is not set
1063# CONFIG_BROADCOM_PHY is not set
1064# CONFIG_ICPLUS_PHY is not set
1065# CONFIG_REALTEK_PHY is not set
1066# CONFIG_NATIONAL_PHY is not set
1067# CONFIG_STE10XP is not set
1068# CONFIG_LSI_ET1011C_PHY is not set
1069# CONFIG_MICREL_PHY is not set
1070# CONFIG_FIXED_PHY is not set
1071# CONFIG_MDIO_BITBANG is not set
1072# CONFIG_PPP is not set
1073# CONFIG_SLIP is not set
1074# CONFIG_TR is not set
1075
1076#
1077# USB Network Adapters
1078#
1079# CONFIG_USB_CATC is not set
1080# CONFIG_USB_KAWETH is not set
1081# CONFIG_USB_PEGASUS is not set
1082# CONFIG_USB_RTL8150 is not set
1083# CONFIG_USB_USBNET is not set
1084# CONFIG_USB_CDC_PHONET is not set
1085# CONFIG_USB_IPHETH is not set
1086# CONFIG_WLAN is not set 400# CONFIG_WLAN is not set
1087
1088#
1089# Enable WiMAX (Networking options) to see the WiMAX drivers
1090#
1091# CONFIG_WAN is not set
1092# CONFIG_VMXNET3 is not set
1093# CONFIG_ISDN is not set
1094# CONFIG_PHONE is not set
1095
1096#
1097# Input device support
1098#
1099CONFIG_INPUT=y
1100# CONFIG_INPUT_FF_MEMLESS is not set
1101# CONFIG_INPUT_POLLDEV is not set
1102# CONFIG_INPUT_SPARSEKMAP is not set
1103
1104#
1105# Userland interfaces
1106#
1107# CONFIG_INPUT_MOUSEDEV is not set 401# CONFIG_INPUT_MOUSEDEV is not set
1108# CONFIG_INPUT_JOYDEV is not set
1109# CONFIG_INPUT_EVDEV is not set
1110# CONFIG_INPUT_EVBUG is not set
1111
1112#
1113# Input Device Drivers
1114#
1115# CONFIG_INPUT_KEYBOARD is not set 402# CONFIG_INPUT_KEYBOARD is not set
1116# CONFIG_INPUT_MOUSE is not set 403# CONFIG_INPUT_MOUSE is not set
1117# CONFIG_INPUT_JOYSTICK is not set
1118# CONFIG_INPUT_TABLET is not set
1119# CONFIG_INPUT_TOUCHSCREEN is not set
1120# CONFIG_INPUT_MISC is not set
1121
1122#
1123# Hardware I/O ports
1124#
1125# CONFIG_SERIO is not set 404# CONFIG_SERIO is not set
1126# CONFIG_GAMEPORT is not set
1127
1128#
1129# Character devices
1130#
1131# CONFIG_VT is not set 405# CONFIG_VT is not set
1132CONFIG_UNIX98_PTYS=y
1133# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1134# CONFIG_LEGACY_PTYS is not set 406# CONFIG_LEGACY_PTYS is not set
1135# CONFIG_SERIAL_NONSTANDARD is not set
1136# CONFIG_NOZOMI is not set
1137# CONFIG_N_GSM is not set
1138# CONFIG_TRACE_SINK is not set
1139CONFIG_DEVKMEM=y
1140
1141#
1142# Serial drivers
1143#
1144# CONFIG_SERIAL_8250 is not set
1145
1146#
1147# Non-8250 serial port support
1148#
1149# CONFIG_SERIAL_MFD_HSU is not set
1150# CONFIG_SERIAL_JSM is not set
1151# CONFIG_SERIAL_TIMBERDALE is not set
1152# CONFIG_SERIAL_ALTERA_JTAGUART is not set
1153# CONFIG_SERIAL_ALTERA_UART is not set
1154# CONFIG_SERIAL_PCH_UART is not set
1155# CONFIG_SERIAL_XILINX_PS_UART is not set
1156# CONFIG_TTY_PRINTK is not set
1157CONFIG_HVC_DRIVER=y
1158# CONFIG_IPMI_HANDLER is not set
1159CONFIG_HW_RANDOM=y 407CONFIG_HW_RANDOM=y
1160CONFIG_HW_RANDOM_TIMERIOMEM=m 408CONFIG_HW_RANDOM_TIMERIOMEM=m
1161# CONFIG_R3964 is not set
1162# CONFIG_APPLICOM is not set
1163
1164#
1165# PCMCIA character devices
1166#
1167# CONFIG_RAW_DRIVER is not set
1168# CONFIG_TCG_TPM is not set
1169CONFIG_DEVPORT=y
1170# CONFIG_RAMOOPS is not set
1171CONFIG_TILE_SROM=y
1172CONFIG_I2C=y 409CONFIG_I2C=y
1173CONFIG_I2C_BOARDINFO=y
1174CONFIG_I2C_COMPAT=y
1175CONFIG_I2C_CHARDEV=y 410CONFIG_I2C_CHARDEV=y
1176# CONFIG_I2C_MUX is not set
1177CONFIG_I2C_HELPER_AUTO=y
1178
1179#
1180# I2C Hardware Bus support
1181#
1182
1183#
1184# PC SMBus host controller drivers
1185#
1186# CONFIG_I2C_ALI1535 is not set
1187# CONFIG_I2C_ALI1563 is not set
1188# CONFIG_I2C_ALI15X3 is not set
1189# CONFIG_I2C_AMD756 is not set
1190# CONFIG_I2C_AMD8111 is not set
1191# CONFIG_I2C_I801 is not set
1192# CONFIG_I2C_ISCH is not set
1193# CONFIG_I2C_PIIX4 is not set
1194# CONFIG_I2C_NFORCE2 is not set
1195# CONFIG_I2C_SIS5595 is not set
1196# CONFIG_I2C_SIS630 is not set
1197# CONFIG_I2C_SIS96X is not set
1198# CONFIG_I2C_VIA is not set
1199# CONFIG_I2C_VIAPRO is not set
1200
1201#
1202# I2C system bus drivers (mostly embedded / system-on-chip)
1203#
1204# CONFIG_I2C_DESIGNWARE_PCI is not set
1205# CONFIG_I2C_INTEL_MID is not set
1206# CONFIG_I2C_OCORES is not set
1207# CONFIG_I2C_PCA_PLATFORM is not set
1208# CONFIG_I2C_PXA_PCI is not set
1209# CONFIG_I2C_SIMTEC is not set
1210# CONFIG_I2C_XILINX is not set
1211# CONFIG_I2C_EG20T is not set
1212
1213#
1214# External I2C/SMBus adapter drivers
1215#
1216# CONFIG_I2C_DIOLAN_U2C is not set
1217# CONFIG_I2C_PARPORT_LIGHT is not set
1218# CONFIG_I2C_TAOS_EVM is not set
1219# CONFIG_I2C_TINY_USB is not set
1220
1221#
1222# Other I2C/SMBus bus drivers
1223#
1224# CONFIG_I2C_STUB is not set
1225# CONFIG_I2C_DEBUG_CORE is not set
1226# CONFIG_I2C_DEBUG_ALGO is not set
1227# CONFIG_I2C_DEBUG_BUS is not set
1228# CONFIG_SPI is not set
1229
1230#
1231# PPS support
1232#
1233# CONFIG_PPS is not set
1234
1235#
1236# PPS generators support
1237#
1238
1239#
1240# PTP clock support
1241#
1242
1243#
1244# Enable Device Drivers -> PPS to see the PTP clock options.
1245#
1246# CONFIG_W1 is not set
1247# CONFIG_POWER_SUPPLY is not set
1248# CONFIG_HWMON is not set 411# CONFIG_HWMON is not set
1249# CONFIG_THERMAL is not set
1250CONFIG_WATCHDOG=y 412CONFIG_WATCHDOG=y
1251# CONFIG_WATCHDOG_CORE is not set
1252CONFIG_WATCHDOG_NOWAYOUT=y 413CONFIG_WATCHDOG_NOWAYOUT=y
1253
1254#
1255# Watchdog Device Drivers
1256#
1257# CONFIG_SOFT_WATCHDOG is not set
1258# CONFIG_ALIM7101_WDT is not set
1259
1260#
1261# PCI-based Watchdog Cards
1262#
1263# CONFIG_PCIPCWATCHDOG is not set
1264# CONFIG_WDTPCI is not set
1265
1266#
1267# USB-based Watchdog Cards
1268#
1269# CONFIG_USBPCWATCHDOG is not set
1270CONFIG_SSB_POSSIBLE=y
1271
1272#
1273# Sonics Silicon Backplane
1274#
1275# CONFIG_SSB is not set
1276CONFIG_BCMA_POSSIBLE=y
1277
1278#
1279# Broadcom specific AMBA
1280#
1281# CONFIG_BCMA is not set
1282
1283#
1284# Multifunction device drivers
1285#
1286# CONFIG_MFD_CORE is not set
1287# CONFIG_MFD_88PM860X is not set
1288# CONFIG_MFD_SM501 is not set
1289# CONFIG_HTC_PASIC3 is not set
1290# CONFIG_TPS6105X is not set
1291# CONFIG_TPS6507X is not set
1292# CONFIG_TWL4030_CORE is not set
1293# CONFIG_MFD_STMPE is not set
1294# CONFIG_MFD_TC3589X is not set
1295# CONFIG_MFD_TMIO is not set
1296# CONFIG_PMIC_DA903X is not set
1297# CONFIG_MFD_DA9052_I2C is not set
1298# CONFIG_PMIC_ADP5520 is not set
1299# CONFIG_MFD_MAX8925 is not set
1300# CONFIG_MFD_MAX8997 is not set
1301# CONFIG_MFD_MAX8998 is not set
1302# CONFIG_MFD_S5M_CORE is not set
1303# CONFIG_MFD_WM8400 is not set
1304# CONFIG_MFD_WM831X_I2C is not set
1305# CONFIG_MFD_WM8350_I2C is not set
1306# CONFIG_MFD_WM8994 is not set
1307# CONFIG_MFD_PCF50633 is not set
1308# CONFIG_ABX500_CORE is not set
1309# CONFIG_LPC_SCH is not set
1310# CONFIG_MFD_RDC321X is not set
1311# CONFIG_MFD_JANZ_CMODIO is not set
1312# CONFIG_MFD_VX855 is not set
1313# CONFIG_MFD_WL1273_CORE is not set
1314# CONFIG_REGULATOR is not set
1315# CONFIG_MEDIA_SUPPORT is not set
1316
1317#
1318# Graphics support
1319#
1320# CONFIG_VGA_ARB is not set 414# CONFIG_VGA_ARB is not set
1321# CONFIG_DRM is not set
1322# CONFIG_STUB_POULSBO is not set
1323# CONFIG_VGASTATE is not set
1324# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1325# CONFIG_FB is not set
1326# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1327# CONFIG_SOUND is not set
1328# CONFIG_HID_SUPPORT is not set 415# CONFIG_HID_SUPPORT is not set
1329CONFIG_USB_SUPPORT=y
1330CONFIG_USB_COMMON=y
1331CONFIG_USB_ARCH_HAS_HCD=y
1332CONFIG_USB_ARCH_HAS_OHCI=y
1333CONFIG_USB_ARCH_HAS_EHCI=y
1334CONFIG_USB_ARCH_HAS_XHCI=y
1335CONFIG_USB=y 416CONFIG_USB=y
1336# CONFIG_USB_DEBUG is not set
1337# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1338
1339#
1340# Miscellaneous USB options
1341#
1342# CONFIG_USB_DEVICEFS is not set
1343# CONFIG_USB_DEVICE_CLASS is not set 417# CONFIG_USB_DEVICE_CLASS is not set
1344# CONFIG_USB_DYNAMIC_MINORS is not set
1345# CONFIG_USB_OTG_WHITELIST is not set
1346# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1347# CONFIG_USB_MON is not set
1348# CONFIG_USB_WUSB_CBAF is not set
1349
1350#
1351# USB Host Controller Drivers
1352#
1353# CONFIG_USB_C67X00_HCD is not set
1354# CONFIG_USB_XHCI_HCD is not set
1355CONFIG_USB_EHCI_HCD=y 418CONFIG_USB_EHCI_HCD=y
1356# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1357CONFIG_USB_EHCI_TT_NEWSCHED=y
1358# CONFIG_USB_EHCI_MV is not set
1359# CONFIG_USB_OXU210HP_HCD is not set
1360# CONFIG_USB_ISP116X_HCD is not set
1361# CONFIG_USB_ISP1760_HCD is not set
1362# CONFIG_USB_ISP1362_HCD is not set
1363CONFIG_USB_OHCI_HCD=y 419CONFIG_USB_OHCI_HCD=y
1364# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1365# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1366CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1367# CONFIG_USB_UHCI_HCD is not set
1368# CONFIG_USB_SL811_HCD is not set
1369# CONFIG_USB_R8A66597_HCD is not set
1370
1371#
1372# USB Device Class drivers
1373#
1374# CONFIG_USB_ACM is not set
1375# CONFIG_USB_PRINTER is not set
1376# CONFIG_USB_WDM is not set
1377# CONFIG_USB_TMC is not set
1378
1379#
1380# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1381#
1382
1383#
1384# also be needed; see USB_STORAGE Help for more info
1385#
1386CONFIG_USB_STORAGE=y 420CONFIG_USB_STORAGE=y
1387# CONFIG_USB_STORAGE_DEBUG is not set
1388# CONFIG_USB_STORAGE_REALTEK is not set
1389# CONFIG_USB_STORAGE_DATAFAB is not set
1390# CONFIG_USB_STORAGE_FREECOM is not set
1391# CONFIG_USB_STORAGE_ISD200 is not set
1392# CONFIG_USB_STORAGE_USBAT is not set
1393# CONFIG_USB_STORAGE_SDDR09 is not set
1394# CONFIG_USB_STORAGE_SDDR55 is not set
1395# CONFIG_USB_STORAGE_JUMPSHOT is not set
1396# CONFIG_USB_STORAGE_ALAUDA is not set
1397# CONFIG_USB_STORAGE_ONETOUCH is not set
1398# CONFIG_USB_STORAGE_KARMA is not set
1399# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1400# CONFIG_USB_STORAGE_ENE_UB6250 is not set
1401# CONFIG_USB_UAS is not set
1402CONFIG_USB_LIBUSUAL=y 421CONFIG_USB_LIBUSUAL=y
1403
1404#
1405# USB Imaging devices
1406#
1407# CONFIG_USB_MDC800 is not set
1408# CONFIG_USB_MICROTEK is not set
1409
1410#
1411# USB port drivers
1412#
1413# CONFIG_USB_SERIAL is not set
1414
1415#
1416# USB Miscellaneous drivers
1417#
1418# CONFIG_USB_EMI62 is not set
1419# CONFIG_USB_EMI26 is not set
1420# CONFIG_USB_ADUTUX is not set
1421# CONFIG_USB_SEVSEG is not set
1422# CONFIG_USB_RIO500 is not set
1423# CONFIG_USB_LEGOTOWER is not set
1424# CONFIG_USB_LCD is not set
1425# CONFIG_USB_LED is not set
1426# CONFIG_USB_CYPRESS_CY7C63 is not set
1427# CONFIG_USB_CYTHERM is not set
1428# CONFIG_USB_IDMOUSE is not set
1429# CONFIG_USB_FTDI_ELAN is not set
1430# CONFIG_USB_APPLEDISPLAY is not set
1431# CONFIG_USB_SISUSBVGA is not set
1432# CONFIG_USB_LD is not set
1433# CONFIG_USB_TRANCEVIBRATOR is not set
1434# CONFIG_USB_IOWARRIOR is not set
1435# CONFIG_USB_TEST is not set
1436# CONFIG_USB_ISIGHTFW is not set
1437# CONFIG_USB_YUREX is not set
1438# CONFIG_USB_GADGET is not set
1439
1440#
1441# OTG and related infrastructure
1442#
1443# CONFIG_NOP_USB_XCEIV is not set
1444# CONFIG_UWB is not set
1445# CONFIG_MMC is not set
1446# CONFIG_MEMSTICK is not set
1447# CONFIG_NEW_LEDS is not set
1448# CONFIG_ACCESSIBILITY is not set
1449# CONFIG_INFINIBAND is not set
1450CONFIG_EDAC=y 422CONFIG_EDAC=y
1451
1452#
1453# Reporting subsystems
1454#
1455# CONFIG_EDAC_DEBUG is not set
1456CONFIG_EDAC_MM_EDAC=y 423CONFIG_EDAC_MM_EDAC=y
1457CONFIG_EDAC_TILE=y
1458CONFIG_RTC_LIB=y
1459CONFIG_RTC_CLASS=y 424CONFIG_RTC_CLASS=y
1460CONFIG_RTC_HCTOSYS=y
1461CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1462# CONFIG_RTC_DEBUG is not set
1463
1464#
1465# RTC interfaces
1466#
1467CONFIG_RTC_INTF_SYSFS=y
1468CONFIG_RTC_INTF_PROC=y
1469CONFIG_RTC_INTF_DEV=y
1470# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1471# CONFIG_RTC_DRV_TEST is not set
1472
1473#
1474# I2C RTC drivers
1475#
1476# CONFIG_RTC_DRV_DS1307 is not set
1477# CONFIG_RTC_DRV_DS1374 is not set
1478# CONFIG_RTC_DRV_DS1672 is not set
1479# CONFIG_RTC_DRV_DS3232 is not set
1480# CONFIG_RTC_DRV_MAX6900 is not set
1481# CONFIG_RTC_DRV_RS5C372 is not set
1482# CONFIG_RTC_DRV_ISL1208 is not set
1483# CONFIG_RTC_DRV_ISL12022 is not set
1484# CONFIG_RTC_DRV_X1205 is not set
1485# CONFIG_RTC_DRV_PCF8563 is not set
1486# CONFIG_RTC_DRV_PCF8583 is not set
1487# CONFIG_RTC_DRV_M41T80 is not set
1488# CONFIG_RTC_DRV_BQ32K is not set
1489# CONFIG_RTC_DRV_S35390A is not set
1490# CONFIG_RTC_DRV_FM3130 is not set
1491# CONFIG_RTC_DRV_RX8581 is not set
1492# CONFIG_RTC_DRV_RX8025 is not set
1493# CONFIG_RTC_DRV_EM3027 is not set
1494# CONFIG_RTC_DRV_RV3029C2 is not set
1495
1496#
1497# SPI RTC drivers
1498#
1499
1500#
1501# Platform RTC drivers
1502#
1503# CONFIG_RTC_DRV_DS1286 is not set
1504# CONFIG_RTC_DRV_DS1511 is not set
1505# CONFIG_RTC_DRV_DS1553 is not set
1506# CONFIG_RTC_DRV_DS1742 is not set
1507# CONFIG_RTC_DRV_STK17TA8 is not set
1508# CONFIG_RTC_DRV_M48T86 is not set
1509# CONFIG_RTC_DRV_M48T35 is not set
1510# CONFIG_RTC_DRV_M48T59 is not set
1511# CONFIG_RTC_DRV_MSM6242 is not set
1512# CONFIG_RTC_DRV_BQ4802 is not set
1513# CONFIG_RTC_DRV_RP5C01 is not set
1514# CONFIG_RTC_DRV_V3020 is not set
1515
1516#
1517# on-CPU RTC drivers
1518#
1519CONFIG_RTC_DRV_TILE=y 425CONFIG_RTC_DRV_TILE=y
1520# CONFIG_DMADEVICES is not set
1521# CONFIG_AUXDISPLAY is not set
1522# CONFIG_UIO is not set
1523
1524#
1525# Virtio drivers
1526#
1527# CONFIG_VIRTIO_PCI is not set
1528# CONFIG_VIRTIO_BALLOON is not set
1529# CONFIG_VIRTIO_MMIO is not set
1530
1531#
1532# Microsoft Hyper-V guest support
1533#
1534# CONFIG_STAGING is not set
1535
1536#
1537# Hardware Spinlock drivers
1538#
1539CONFIG_IOMMU_SUPPORT=y
1540# CONFIG_VIRT_DRIVERS is not set
1541# CONFIG_PM_DEVFREQ is not set
1542
1543#
1544# File systems
1545#
1546CONFIG_EXT2_FS=y 426CONFIG_EXT2_FS=y
1547CONFIG_EXT2_FS_XATTR=y 427CONFIG_EXT2_FS_XATTR=y
1548CONFIG_EXT2_FS_POSIX_ACL=y 428CONFIG_EXT2_FS_POSIX_ACL=y
1549CONFIG_EXT2_FS_SECURITY=y 429CONFIG_EXT2_FS_SECURITY=y
1550CONFIG_EXT2_FS_XIP=y 430CONFIG_EXT2_FS_XIP=y
1551CONFIG_EXT3_FS=y 431CONFIG_EXT3_FS=y
1552CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
1553CONFIG_EXT3_FS_XATTR=y
1554CONFIG_EXT3_FS_POSIX_ACL=y 432CONFIG_EXT3_FS_POSIX_ACL=y
1555CONFIG_EXT3_FS_SECURITY=y 433CONFIG_EXT3_FS_SECURITY=y
1556CONFIG_EXT4_FS=y 434CONFIG_EXT4_FS=y
1557CONFIG_EXT4_FS_XATTR=y
1558CONFIG_EXT4_FS_POSIX_ACL=y 435CONFIG_EXT4_FS_POSIX_ACL=y
1559CONFIG_EXT4_FS_SECURITY=y 436CONFIG_EXT4_FS_SECURITY=y
1560# CONFIG_EXT4_DEBUG is not set
1561CONFIG_FS_XIP=y
1562CONFIG_JBD=y
1563# CONFIG_JBD_DEBUG is not set
1564CONFIG_JBD2=y
1565# CONFIG_JBD2_DEBUG is not set
1566CONFIG_FS_MBCACHE=y
1567# CONFIG_REISERFS_FS is not set
1568# CONFIG_JFS_FS is not set
1569CONFIG_XFS_FS=y 437CONFIG_XFS_FS=y
1570CONFIG_XFS_QUOTA=y 438CONFIG_XFS_QUOTA=y
1571CONFIG_XFS_POSIX_ACL=y 439CONFIG_XFS_POSIX_ACL=y
1572# CONFIG_XFS_RT is not set
1573# CONFIG_XFS_DEBUG is not set
1574CONFIG_GFS2_FS=m 440CONFIG_GFS2_FS=m
1575CONFIG_GFS2_FS_LOCKING_DLM=y 441CONFIG_GFS2_FS_LOCKING_DLM=y
1576# CONFIG_OCFS2_FS is not set
1577CONFIG_BTRFS_FS=m 442CONFIG_BTRFS_FS=m
1578CONFIG_BTRFS_FS_POSIX_ACL=y 443CONFIG_BTRFS_FS_POSIX_ACL=y
1579# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
1580# CONFIG_NILFS2_FS is not set
1581CONFIG_FS_POSIX_ACL=y
1582CONFIG_EXPORTFS=y
1583CONFIG_FILE_LOCKING=y
1584CONFIG_FSNOTIFY=y
1585CONFIG_DNOTIFY=y
1586CONFIG_INOTIFY_USER=y
1587# CONFIG_FANOTIFY is not set
1588CONFIG_QUOTA=y 444CONFIG_QUOTA=y
1589CONFIG_QUOTA_NETLINK_INTERFACE=y 445CONFIG_QUOTA_NETLINK_INTERFACE=y
1590# CONFIG_PRINT_QUOTA_WARNING is not set 446# CONFIG_PRINT_QUOTA_WARNING is not set
1591# CONFIG_QUOTA_DEBUG is not set
1592CONFIG_QUOTA_TREE=y
1593# CONFIG_QFMT_V1 is not set
1594CONFIG_QFMT_V2=y 447CONFIG_QFMT_V2=y
1595CONFIG_QUOTACTL=y
1596CONFIG_AUTOFS4_FS=m 448CONFIG_AUTOFS4_FS=m
1597CONFIG_FUSE_FS=y 449CONFIG_FUSE_FS=y
1598CONFIG_CUSE=m 450CONFIG_CUSE=m
1599CONFIG_GENERIC_ACL=y
1600
1601#
1602# Caches
1603#
1604CONFIG_FSCACHE=m 451CONFIG_FSCACHE=m
1605CONFIG_FSCACHE_STATS=y 452CONFIG_FSCACHE_STATS=y
1606# CONFIG_FSCACHE_HISTOGRAM is not set
1607# CONFIG_FSCACHE_DEBUG is not set
1608# CONFIG_FSCACHE_OBJECT_LIST is not set
1609CONFIG_CACHEFILES=m 453CONFIG_CACHEFILES=m
1610# CONFIG_CACHEFILES_DEBUG is not set
1611# CONFIG_CACHEFILES_HISTOGRAM is not set
1612
1613#
1614# CD-ROM/DVD Filesystems
1615#
1616CONFIG_ISO9660_FS=m 454CONFIG_ISO9660_FS=m
1617CONFIG_JOLIET=y 455CONFIG_JOLIET=y
1618CONFIG_ZISOFS=y 456CONFIG_ZISOFS=y
1619CONFIG_UDF_FS=m 457CONFIG_UDF_FS=m
1620CONFIG_UDF_NLS=y
1621
1622#
1623# DOS/FAT/NT Filesystems
1624#
1625CONFIG_FAT_FS=m
1626CONFIG_MSDOS_FS=m 458CONFIG_MSDOS_FS=m
1627CONFIG_VFAT_FS=m 459CONFIG_VFAT_FS=m
1628CONFIG_FAT_DEFAULT_CODEPAGE=437
1629CONFIG_FAT_DEFAULT_IOCHARSET="ascii" 460CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
1630# CONFIG_NTFS_FS is not set
1631
1632#
1633# Pseudo filesystems
1634#
1635CONFIG_PROC_FS=y
1636CONFIG_PROC_KCORE=y 461CONFIG_PROC_KCORE=y
1637CONFIG_PROC_SYSCTL=y
1638CONFIG_PROC_PAGE_MONITOR=y
1639CONFIG_SYSFS=y
1640CONFIG_TMPFS=y 462CONFIG_TMPFS=y
1641CONFIG_TMPFS_POSIX_ACL=y 463CONFIG_TMPFS_POSIX_ACL=y
1642CONFIG_TMPFS_XATTR=y
1643CONFIG_HUGETLBFS=y 464CONFIG_HUGETLBFS=y
1644CONFIG_HUGETLB_PAGE=y
1645CONFIG_CONFIGFS_FS=m
1646CONFIG_MISC_FILESYSTEMS=y
1647# CONFIG_ADFS_FS is not set
1648# CONFIG_AFFS_FS is not set
1649CONFIG_ECRYPT_FS=m 465CONFIG_ECRYPT_FS=m
1650# CONFIG_HFS_FS is not set
1651# CONFIG_HFSPLUS_FS is not set
1652# CONFIG_BEFS_FS is not set
1653# CONFIG_BFS_FS is not set
1654# CONFIG_EFS_FS is not set
1655# CONFIG_LOGFS is not set
1656CONFIG_CRAMFS=m 466CONFIG_CRAMFS=m
1657CONFIG_SQUASHFS=m 467CONFIG_SQUASHFS=m
1658# CONFIG_SQUASHFS_XATTR is not set
1659CONFIG_SQUASHFS_ZLIB=y
1660# CONFIG_SQUASHFS_LZO is not set
1661# CONFIG_SQUASHFS_XZ is not set
1662# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
1663# CONFIG_SQUASHFS_EMBEDDED is not set
1664CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
1665# CONFIG_VXFS_FS is not set
1666# CONFIG_MINIX_FS is not set
1667# CONFIG_OMFS_FS is not set
1668# CONFIG_HPFS_FS is not set
1669# CONFIG_QNX4FS_FS is not set
1670# CONFIG_ROMFS_FS is not set
1671# CONFIG_PSTORE is not set
1672# CONFIG_SYSV_FS is not set
1673# CONFIG_UFS_FS is not set
1674CONFIG_NETWORK_FILESYSTEMS=y
1675CONFIG_NFS_FS=m 468CONFIG_NFS_FS=m
1676CONFIG_NFS_V3=y 469CONFIG_NFS_V3=y
1677CONFIG_NFS_V3_ACL=y 470CONFIG_NFS_V3_ACL=y
1678CONFIG_NFS_V4=y 471CONFIG_NFS_V4=y
1679CONFIG_NFS_V4_1=y 472CONFIG_NFS_V4_1=y
1680CONFIG_PNFS_FILE_LAYOUT=m
1681CONFIG_PNFS_BLOCK=m
1682CONFIG_NFS_FSCACHE=y 473CONFIG_NFS_FSCACHE=y
1683# CONFIG_NFS_USE_LEGACY_DNS is not set
1684CONFIG_NFS_USE_KERNEL_DNS=y
1685# CONFIG_NFS_USE_NEW_IDMAPPER is not set
1686CONFIG_NFSD=m 474CONFIG_NFSD=m
1687CONFIG_NFSD_V2_ACL=y
1688CONFIG_NFSD_V3=y
1689CONFIG_NFSD_V3_ACL=y 475CONFIG_NFSD_V3_ACL=y
1690CONFIG_NFSD_V4=y 476CONFIG_NFSD_V4=y
1691# CONFIG_NFSD_FAULT_INJECTION is not set
1692CONFIG_LOCKD=m
1693CONFIG_LOCKD_V4=y
1694CONFIG_NFS_ACL_SUPPORT=m
1695CONFIG_NFS_COMMON=y
1696CONFIG_SUNRPC=m
1697CONFIG_SUNRPC_GSS=m
1698CONFIG_SUNRPC_BACKCHANNEL=y
1699CONFIG_RPCSEC_GSS_KRB5=m
1700# CONFIG_CEPH_FS is not set
1701CONFIG_CIFS=m 477CONFIG_CIFS=m
1702CONFIG_CIFS_STATS=y 478CONFIG_CIFS_STATS=y
1703# CONFIG_CIFS_STATS2 is not set
1704CONFIG_CIFS_WEAK_PW_HASH=y 479CONFIG_CIFS_WEAK_PW_HASH=y
1705CONFIG_CIFS_UPCALL=y 480CONFIG_CIFS_UPCALL=y
1706CONFIG_CIFS_XATTR=y 481CONFIG_CIFS_XATTR=y
1707CONFIG_CIFS_POSIX=y 482CONFIG_CIFS_POSIX=y
1708# CONFIG_CIFS_DEBUG2 is not set
1709CONFIG_CIFS_DFS_UPCALL=y 483CONFIG_CIFS_DFS_UPCALL=y
1710CONFIG_CIFS_FSCACHE=y 484CONFIG_CIFS_FSCACHE=y
1711# CONFIG_CIFS_ACL is not set
1712# CONFIG_NCP_FS is not set
1713# CONFIG_CODA_FS is not set
1714# CONFIG_AFS_FS is not set
1715CONFIG_NLS=y
1716CONFIG_NLS_DEFAULT="utf8" 485CONFIG_NLS_DEFAULT="utf8"
1717CONFIG_NLS_CODEPAGE_437=y 486CONFIG_NLS_CODEPAGE_437=y
1718CONFIG_NLS_CODEPAGE_737=m 487CONFIG_NLS_CODEPAGE_737=m
@@ -1752,191 +521,47 @@ CONFIG_NLS_ISO8859_15=m
1752CONFIG_NLS_KOI8_R=m 521CONFIG_NLS_KOI8_R=m
1753CONFIG_NLS_KOI8_U=m 522CONFIG_NLS_KOI8_U=m
1754CONFIG_NLS_UTF8=m 523CONFIG_NLS_UTF8=m
1755CONFIG_DLM=m
1756CONFIG_DLM_DEBUG=y 524CONFIG_DLM_DEBUG=y
1757
1758#
1759# Kernel hacking
1760#
1761# CONFIG_PRINTK_TIME is not set
1762CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
1763# CONFIG_ENABLE_WARN_DEPRECATED is not set 525# CONFIG_ENABLE_WARN_DEPRECATED is not set
1764CONFIG_ENABLE_MUST_CHECK=y
1765CONFIG_FRAME_WARN=2048
1766CONFIG_MAGIC_SYSRQ=y 526CONFIG_MAGIC_SYSRQ=y
1767CONFIG_STRIP_ASM_SYMS=y 527CONFIG_STRIP_ASM_SYMS=y
1768# CONFIG_UNUSED_SYMBOLS is not set
1769CONFIG_DEBUG_FS=y 528CONFIG_DEBUG_FS=y
1770CONFIG_HEADERS_CHECK=y 529CONFIG_HEADERS_CHECK=y
1771# CONFIG_DEBUG_SECTION_MISMATCH is not set
1772CONFIG_DEBUG_KERNEL=y
1773# CONFIG_DEBUG_SHIRQ is not set
1774CONFIG_LOCKUP_DETECTOR=y 530CONFIG_LOCKUP_DETECTOR=y
1775# CONFIG_HARDLOCKUP_DETECTOR is not set
1776# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
1777CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
1778# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1779CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1780CONFIG_DETECT_HUNG_TASK=y
1781CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
1782# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1783CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1784CONFIG_SCHED_DEBUG=y
1785CONFIG_SCHEDSTATS=y 531CONFIG_SCHEDSTATS=y
1786CONFIG_TIMER_STATS=y 532CONFIG_TIMER_STATS=y
1787# CONFIG_DEBUG_OBJECTS is not set
1788# CONFIG_SLUB_DEBUG_ON is not set
1789# CONFIG_SLUB_STATS is not set
1790# CONFIG_DEBUG_KMEMLEAK is not set
1791# CONFIG_DEBUG_RT_MUTEXES is not set
1792# CONFIG_RT_MUTEX_TESTER is not set
1793# CONFIG_DEBUG_SPINLOCK is not set
1794# CONFIG_DEBUG_MUTEXES is not set
1795# CONFIG_DEBUG_LOCK_ALLOC is not set
1796# CONFIG_PROVE_LOCKING is not set
1797# CONFIG_SPARSE_RCU_POINTER is not set
1798# CONFIG_LOCK_STAT is not set
1799# CONFIG_DEBUG_ATOMIC_SLEEP is not set
1800# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1801CONFIG_STACKTRACE=y
1802# CONFIG_DEBUG_STACK_USAGE is not set
1803# CONFIG_DEBUG_KOBJECT is not set
1804CONFIG_DEBUG_BUGVERBOSE=y
1805CONFIG_DEBUG_INFO=y 533CONFIG_DEBUG_INFO=y
1806CONFIG_DEBUG_INFO_REDUCED=y 534CONFIG_DEBUG_INFO_REDUCED=y
1807CONFIG_DEBUG_VM=y 535CONFIG_DEBUG_VM=y
1808# CONFIG_DEBUG_WRITECOUNT is not set
1809CONFIG_DEBUG_MEMORY_INIT=y 536CONFIG_DEBUG_MEMORY_INIT=y
1810CONFIG_DEBUG_LIST=y 537CONFIG_DEBUG_LIST=y
1811# CONFIG_TEST_LIST_SORT is not set
1812# CONFIG_DEBUG_SG is not set
1813# CONFIG_DEBUG_NOTIFIERS is not set
1814CONFIG_DEBUG_CREDENTIALS=y 538CONFIG_DEBUG_CREDENTIALS=y
1815# CONFIG_RCU_TORTURE_TEST is not set
1816CONFIG_RCU_CPU_STALL_TIMEOUT=60
1817# CONFIG_BACKTRACE_SELF_TEST is not set
1818# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1819CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y 539CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
1820# CONFIG_DEBUG_PER_CPU_MAPS is not set
1821# CONFIG_LKDTM is not set
1822# CONFIG_FAULT_INJECTION is not set
1823# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1824# CONFIG_DEBUG_PAGEALLOC is not set
1825CONFIG_TRACING_SUPPORT=y
1826CONFIG_FTRACE=y
1827# CONFIG_IRQSOFF_TRACER is not set
1828# CONFIG_SCHED_TRACER is not set
1829# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1830CONFIG_BRANCH_PROFILE_NONE=y
1831# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1832# CONFIG_PROFILE_ALL_BRANCHES is not set
1833# CONFIG_BLK_DEV_IO_TRACE is not set
1834# CONFIG_BUILD_DOCSRC is not set
1835CONFIG_DYNAMIC_DEBUG=y 540CONFIG_DYNAMIC_DEBUG=y
1836# CONFIG_ATOMIC64_SELFTEST is not set
1837CONFIG_ASYNC_RAID6_TEST=m 541CONFIG_ASYNC_RAID6_TEST=m
1838# CONFIG_SAMPLES is not set
1839# CONFIG_TEST_KSTRTOX is not set
1840CONFIG_EARLY_PRINTK=y
1841CONFIG_DEBUG_STACKOVERFLOW=y 542CONFIG_DEBUG_STACKOVERFLOW=y
1842CONFIG_DEBUG_EXTRA_FLAGS=""
1843
1844#
1845# Security options
1846#
1847CONFIG_KEYS=y
1848# CONFIG_ENCRYPTED_KEYS is not set
1849CONFIG_KEYS_DEBUG_PROC_KEYS=y 543CONFIG_KEYS_DEBUG_PROC_KEYS=y
1850# CONFIG_SECURITY_DMESG_RESTRICT is not set
1851CONFIG_SECURITY=y 544CONFIG_SECURITY=y
1852CONFIG_SECURITYFS=y 545CONFIG_SECURITYFS=y
1853CONFIG_SECURITY_NETWORK=y 546CONFIG_SECURITY_NETWORK=y
1854CONFIG_SECURITY_NETWORK_XFRM=y 547CONFIG_SECURITY_NETWORK_XFRM=y
1855# CONFIG_SECURITY_PATH is not set
1856CONFIG_LSM_MMAP_MIN_ADDR=65536
1857CONFIG_SECURITY_SELINUX=y 548CONFIG_SECURITY_SELINUX=y
1858CONFIG_SECURITY_SELINUX_BOOTPARAM=y 549CONFIG_SECURITY_SELINUX_BOOTPARAM=y
1859CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
1860CONFIG_SECURITY_SELINUX_DISABLE=y 550CONFIG_SECURITY_SELINUX_DISABLE=y
1861CONFIG_SECURITY_SELINUX_DEVELOP=y
1862CONFIG_SECURITY_SELINUX_AVC_STATS=y
1863CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
1864# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
1865# CONFIG_SECURITY_SMACK is not set
1866# CONFIG_SECURITY_TOMOYO is not set
1867# CONFIG_SECURITY_APPARMOR is not set
1868# CONFIG_IMA is not set
1869# CONFIG_EVM is not set
1870CONFIG_DEFAULT_SECURITY_SELINUX=y
1871# CONFIG_DEFAULT_SECURITY_DAC is not set
1872CONFIG_DEFAULT_SECURITY="selinux"
1873CONFIG_XOR_BLOCKS=m
1874CONFIG_ASYNC_CORE=m
1875CONFIG_ASYNC_MEMCPY=m
1876CONFIG_ASYNC_XOR=m
1877CONFIG_ASYNC_PQ=m
1878CONFIG_ASYNC_RAID6_RECOV=m
1879CONFIG_CRYPTO=y
1880
1881#
1882# Crypto core or helper
1883#
1884CONFIG_CRYPTO_ALGAPI=y
1885CONFIG_CRYPTO_ALGAPI2=y
1886CONFIG_CRYPTO_AEAD=m
1887CONFIG_CRYPTO_AEAD2=y
1888CONFIG_CRYPTO_BLKCIPHER=m
1889CONFIG_CRYPTO_BLKCIPHER2=y
1890CONFIG_CRYPTO_HASH=y
1891CONFIG_CRYPTO_HASH2=y
1892CONFIG_CRYPTO_RNG=m
1893CONFIG_CRYPTO_RNG2=y
1894CONFIG_CRYPTO_PCOMP=m
1895CONFIG_CRYPTO_PCOMP2=y
1896CONFIG_CRYPTO_MANAGER=y
1897CONFIG_CRYPTO_MANAGER2=y
1898# CONFIG_CRYPTO_USER is not set
1899CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
1900CONFIG_CRYPTO_GF128MUL=m
1901CONFIG_CRYPTO_NULL=m 551CONFIG_CRYPTO_NULL=m
1902CONFIG_CRYPTO_PCRYPT=m 552CONFIG_CRYPTO_PCRYPT=m
1903CONFIG_CRYPTO_WORKQUEUE=y
1904CONFIG_CRYPTO_CRYPTD=m 553CONFIG_CRYPTO_CRYPTD=m
1905CONFIG_CRYPTO_AUTHENC=m
1906CONFIG_CRYPTO_TEST=m 554CONFIG_CRYPTO_TEST=m
1907
1908#
1909# Authenticated Encryption with Associated Data
1910#
1911CONFIG_CRYPTO_CCM=m 555CONFIG_CRYPTO_CCM=m
1912CONFIG_CRYPTO_GCM=m 556CONFIG_CRYPTO_GCM=m
1913CONFIG_CRYPTO_SEQIV=m
1914
1915#
1916# Block modes
1917#
1918CONFIG_CRYPTO_CBC=m
1919CONFIG_CRYPTO_CTR=m
1920CONFIG_CRYPTO_CTS=m 557CONFIG_CRYPTO_CTS=m
1921CONFIG_CRYPTO_ECB=m
1922CONFIG_CRYPTO_LRW=m 558CONFIG_CRYPTO_LRW=m
1923CONFIG_CRYPTO_PCBC=m 559CONFIG_CRYPTO_PCBC=m
1924CONFIG_CRYPTO_XTS=m 560CONFIG_CRYPTO_XTS=m
1925
1926#
1927# Hash modes
1928#
1929CONFIG_CRYPTO_HMAC=y 561CONFIG_CRYPTO_HMAC=y
1930CONFIG_CRYPTO_XCBC=m 562CONFIG_CRYPTO_XCBC=m
1931CONFIG_CRYPTO_VMAC=m 563CONFIG_CRYPTO_VMAC=m
1932
1933#
1934# Digest
1935#
1936CONFIG_CRYPTO_CRC32C=y 564CONFIG_CRYPTO_CRC32C=y
1937CONFIG_CRYPTO_GHASH=m
1938CONFIG_CRYPTO_MD4=m
1939CONFIG_CRYPTO_MD5=y
1940CONFIG_CRYPTO_MICHAEL_MIC=m 565CONFIG_CRYPTO_MICHAEL_MIC=m
1941CONFIG_CRYPTO_RMD128=m 566CONFIG_CRYPTO_RMD128=m
1942CONFIG_CRYPTO_RMD160=m 567CONFIG_CRYPTO_RMD160=m
@@ -1947,77 +572,16 @@ CONFIG_CRYPTO_SHA256=m
1947CONFIG_CRYPTO_SHA512=m 572CONFIG_CRYPTO_SHA512=m
1948CONFIG_CRYPTO_TGR192=m 573CONFIG_CRYPTO_TGR192=m
1949CONFIG_CRYPTO_WP512=m 574CONFIG_CRYPTO_WP512=m
1950
1951#
1952# Ciphers
1953#
1954CONFIG_CRYPTO_AES=m
1955CONFIG_CRYPTO_ANUBIS=m 575CONFIG_CRYPTO_ANUBIS=m
1956CONFIG_CRYPTO_ARC4=m
1957CONFIG_CRYPTO_BLOWFISH=m 576CONFIG_CRYPTO_BLOWFISH=m
1958CONFIG_CRYPTO_BLOWFISH_COMMON=m
1959CONFIG_CRYPTO_CAMELLIA=m 577CONFIG_CRYPTO_CAMELLIA=m
1960CONFIG_CRYPTO_CAST5=m 578CONFIG_CRYPTO_CAST5=m
1961CONFIG_CRYPTO_CAST6=m 579CONFIG_CRYPTO_CAST6=m
1962CONFIG_CRYPTO_DES=m
1963CONFIG_CRYPTO_FCRYPT=m 580CONFIG_CRYPTO_FCRYPT=m
1964CONFIG_CRYPTO_KHAZAD=m 581CONFIG_CRYPTO_KHAZAD=m
1965# CONFIG_CRYPTO_SALSA20 is not set
1966CONFIG_CRYPTO_SEED=m 582CONFIG_CRYPTO_SEED=m
1967CONFIG_CRYPTO_SERPENT=m 583CONFIG_CRYPTO_SERPENT=m
1968CONFIG_CRYPTO_TEA=m 584CONFIG_CRYPTO_TEA=m
1969CONFIG_CRYPTO_TWOFISH=m 585CONFIG_CRYPTO_TWOFISH=m
1970CONFIG_CRYPTO_TWOFISH_COMMON=m
1971
1972#
1973# Compression
1974#
1975CONFIG_CRYPTO_DEFLATE=m
1976CONFIG_CRYPTO_ZLIB=m 586CONFIG_CRYPTO_ZLIB=m
1977CONFIG_CRYPTO_LZO=m 587CONFIG_CRYPTO_LZO=m
1978
1979#
1980# Random Number Generation
1981#
1982CONFIG_CRYPTO_ANSI_CPRNG=m
1983# CONFIG_CRYPTO_USER_API_HASH is not set
1984# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
1985CONFIG_CRYPTO_HW=y
1986# CONFIG_BINARY_PRINTF is not set
1987
1988#
1989# Library routines
1990#
1991CONFIG_RAID6_PQ=m
1992CONFIG_BITREVERSE=y
1993CONFIG_GENERIC_FIND_FIRST_BIT=y
1994CONFIG_GENERIC_PCI_IOMAP=y
1995# CONFIG_CRC_CCITT is not set
1996CONFIG_CRC16=y
1997CONFIG_CRC_T10DIF=y
1998CONFIG_CRC_ITU_T=m
1999CONFIG_CRC32=y
2000# CONFIG_CRC7 is not set
2001CONFIG_LIBCRC32C=m
2002# CONFIG_CRC8 is not set
2003CONFIG_AUDIT_GENERIC=y
2004CONFIG_ZLIB_INFLATE=y
2005CONFIG_ZLIB_DEFLATE=m
2006CONFIG_LZO_COMPRESS=m
2007CONFIG_LZO_DECOMPRESS=m
2008# CONFIG_XZ_DEC is not set
2009# CONFIG_XZ_DEC_BCJ is not set
2010CONFIG_DECOMPRESS_GZIP=y
2011CONFIG_TEXTSEARCH=y
2012CONFIG_TEXTSEARCH_KMP=m
2013CONFIG_TEXTSEARCH_BM=m
2014CONFIG_TEXTSEARCH_FSM=m
2015CONFIG_HAS_IOMEM=y
2016CONFIG_HAS_IOPORT=y
2017CONFIG_HAS_DMA=y
2018CONFIG_CPU_RMAP=y
2019CONFIG_DQL=y
2020CONFIG_NLATTR=y
2021# CONFIG_AVERAGE is not set
2022# CONFIG_CORDIC is not set
2023# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 87829912c045..2b1fd31894f1 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -1,368 +1,91 @@
1#
2# Automatically generated file; DO NOT EDIT.
3# Linux/tilepro 3.3.0-rc7 Kernel Configuration
4#
5CONFIG_TILE=y
6CONFIG_MMU=y
7CONFIG_GENERIC_CSUM=y
8CONFIG_SEMAPHORE_SLEEPERS=y
9CONFIG_HAVE_ARCH_ALLOC_REMAP=y
10CONFIG_HAVE_SETUP_PER_CPU_AREA=y
11CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
12CONFIG_SYS_SUPPORTS_HUGETLBFS=y
13CONFIG_GENERIC_CLOCKEVENTS=y
14CONFIG_RWSEM_GENERIC_SPINLOCK=y
15CONFIG_DEFAULT_MIGRATION_COST=10000000
16CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
17CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
18CONFIG_ARCH_DMA_ADDR_T_64BIT=y
19CONFIG_LOCKDEP_SUPPORT=y
20CONFIG_STACKTRACE_SUPPORT=y
21CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
22CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
23CONFIG_TRACE_IRQFLAGS_SUPPORT=y
24CONFIG_STRICT_DEVMEM=y
25CONFIG_SMP=y
26# CONFIG_DEBUG_COPY_FROM_USER is not set
27CONFIG_HVC_TILE=y
28# CONFIG_TILEGX is not set
29CONFIG_ARCH_DEFCONFIG="arch/tile/configs/tile_defconfig"
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
31
32#
33# General setup
34#
35CONFIG_EXPERIMENTAL=y 1CONFIG_EXPERIMENTAL=y
36CONFIG_INIT_ENV_ARG_LIMIT=32
37CONFIG_CROSS_COMPILE=""
38CONFIG_LOCALVERSION=""
39# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
40CONFIG_DEFAULT_HOSTNAME="(none)"
41CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y
44CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
45CONFIG_POSIX_MQUEUE_SYSCTL=y
46CONFIG_BSD_PROCESS_ACCT=y 5CONFIG_BSD_PROCESS_ACCT=y
47CONFIG_BSD_PROCESS_ACCT_V3=y 6CONFIG_BSD_PROCESS_ACCT_V3=y
48# CONFIG_FHANDLE is not set 7CONFIG_FHANDLE=y
49CONFIG_TASKSTATS=y 8CONFIG_TASKSTATS=y
50CONFIG_TASK_DELAY_ACCT=y 9CONFIG_TASK_DELAY_ACCT=y
51CONFIG_TASK_XACCT=y 10CONFIG_TASK_XACCT=y
52CONFIG_TASK_IO_ACCOUNTING=y 11CONFIG_TASK_IO_ACCOUNTING=y
53CONFIG_AUDIT=y 12CONFIG_AUDIT=y
54# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
55CONFIG_HAVE_GENERIC_HARDIRQS=y
56
57#
58# IRQ subsystem
59#
60CONFIG_GENERIC_HARDIRQS=y
61CONFIG_GENERIC_IRQ_PROBE=y
62CONFIG_GENERIC_IRQ_SHOW=y
63CONFIG_GENERIC_PENDING_IRQ=y
64
65#
66# RCU Subsystem
67#
68CONFIG_TREE_RCU=y
69# CONFIG_PREEMPT_RCU is not set
70# CONFIG_RCU_TRACE is not set
71CONFIG_RCU_FANOUT=32
72# CONFIG_RCU_FANOUT_EXACT is not set
73# CONFIG_RCU_FAST_NO_HZ is not set
74# CONFIG_TREE_RCU_TRACE is not set
75# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=19 13CONFIG_LOG_BUF_SHIFT=19
77CONFIG_CGROUPS=y 14CONFIG_CGROUPS=y
78CONFIG_CGROUP_DEBUG=y 15CONFIG_CGROUP_DEBUG=y
79# CONFIG_CGROUP_FREEZER is not set
80CONFIG_CGROUP_DEVICE=y 16CONFIG_CGROUP_DEVICE=y
81CONFIG_CPUSETS=y 17CONFIG_CPUSETS=y
82CONFIG_PROC_PID_CPUSET=y
83CONFIG_CGROUP_CPUACCT=y 18CONFIG_CGROUP_CPUACCT=y
84CONFIG_RESOURCE_COUNTERS=y 19CONFIG_RESOURCE_COUNTERS=y
85CONFIG_CGROUP_MEM_RES_CTLR=y 20CONFIG_CGROUP_MEM_RES_CTLR=y
86CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y 21CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
87CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
88# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
89CONFIG_CGROUP_SCHED=y 22CONFIG_CGROUP_SCHED=y
90CONFIG_FAIR_GROUP_SCHED=y
91# CONFIG_CFS_BANDWIDTH is not set
92CONFIG_RT_GROUP_SCHED=y 23CONFIG_RT_GROUP_SCHED=y
93CONFIG_BLK_CGROUP=y 24CONFIG_BLK_CGROUP=y
94# CONFIG_DEBUG_BLK_CGROUP is not set
95# CONFIG_CHECKPOINT_RESTORE is not set
96CONFIG_NAMESPACES=y 25CONFIG_NAMESPACES=y
97CONFIG_UTS_NS=y
98CONFIG_IPC_NS=y
99CONFIG_USER_NS=y
100CONFIG_PID_NS=y
101CONFIG_NET_NS=y
102# CONFIG_SCHED_AUTOGROUP is not set
103CONFIG_MM_OWNER=y
104# CONFIG_SYSFS_DEPRECATED is not set
105CONFIG_RELAY=y 26CONFIG_RELAY=y
106CONFIG_BLK_DEV_INITRD=y 27CONFIG_BLK_DEV_INITRD=y
107CONFIG_INITRAMFS_SOURCE=""
108CONFIG_RD_GZIP=y
109# CONFIG_RD_BZIP2 is not set
110# CONFIG_RD_LZMA is not set
111# CONFIG_RD_XZ is not set
112# CONFIG_RD_LZO is not set
113CONFIG_CC_OPTIMIZE_FOR_SIZE=y
114CONFIG_SYSCTL=y
115CONFIG_ANON_INODES=y
116CONFIG_EXPERT=y
117CONFIG_SYSCTL_SYSCALL=y 28CONFIG_SYSCTL_SYSCALL=y
118CONFIG_KALLSYMS=y
119# CONFIG_KALLSYMS_ALL is not set
120CONFIG_HOTPLUG=y
121CONFIG_PRINTK=y
122CONFIG_BUG=y
123CONFIG_ELF_CORE=y
124CONFIG_BASE_FULL=y
125CONFIG_FUTEX=y
126CONFIG_EPOLL=y
127CONFIG_SIGNALFD=y
128CONFIG_TIMERFD=y
129CONFIG_EVENTFD=y
130CONFIG_SHMEM=y
131CONFIG_AIO=y
132CONFIG_EMBEDDED=y 29CONFIG_EMBEDDED=y
133
134#
135# Kernel Performance Events And Counters
136#
137CONFIG_VM_EVENT_COUNTERS=y
138CONFIG_PCI_QUIRKS=y
139CONFIG_SLUB_DEBUG=y
140# CONFIG_COMPAT_BRK is not set 30# CONFIG_COMPAT_BRK is not set
141# CONFIG_SLAB is not set
142CONFIG_SLUB=y
143# CONFIG_SLOB is not set
144CONFIG_PROFILING=y 31CONFIG_PROFILING=y
145CONFIG_USE_GENERIC_SMP_HELPERS=y
146CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
147
148#
149# GCOV-based kernel profiling
150#
151# CONFIG_GCOV_KERNEL is not set
152# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
153CONFIG_SLABINFO=y
154CONFIG_RT_MUTEXES=y
155CONFIG_BASE_SMALL=0
156CONFIG_MODULES=y 32CONFIG_MODULES=y
157CONFIG_MODULE_FORCE_LOAD=y 33CONFIG_MODULE_FORCE_LOAD=y
158CONFIG_MODULE_UNLOAD=y 34CONFIG_MODULE_UNLOAD=y
159# CONFIG_MODULE_FORCE_UNLOAD is not set
160# CONFIG_MODVERSIONS is not set
161# CONFIG_MODULE_SRCVERSION_ALL is not set
162CONFIG_STOP_MACHINE=y
163CONFIG_BLOCK=y
164CONFIG_LBDAF=y
165CONFIG_BLK_DEV_BSG=y
166# CONFIG_BLK_DEV_BSGLIB is not set
167CONFIG_BLK_DEV_INTEGRITY=y 35CONFIG_BLK_DEV_INTEGRITY=y
168# CONFIG_BLK_DEV_THROTTLING is not set
169
170#
171# Partition Types
172#
173CONFIG_PARTITION_ADVANCED=y 36CONFIG_PARTITION_ADVANCED=y
174# CONFIG_ACORN_PARTITION is not set
175CONFIG_OSF_PARTITION=y 37CONFIG_OSF_PARTITION=y
176CONFIG_AMIGA_PARTITION=y 38CONFIG_AMIGA_PARTITION=y
177# CONFIG_ATARI_PARTITION is not set
178CONFIG_MAC_PARTITION=y 39CONFIG_MAC_PARTITION=y
179CONFIG_MSDOS_PARTITION=y
180CONFIG_BSD_DISKLABEL=y 40CONFIG_BSD_DISKLABEL=y
181CONFIG_MINIX_SUBPARTITION=y 41CONFIG_MINIX_SUBPARTITION=y
182CONFIG_SOLARIS_X86_PARTITION=y 42CONFIG_SOLARIS_X86_PARTITION=y
183CONFIG_UNIXWARE_DISKLABEL=y 43CONFIG_UNIXWARE_DISKLABEL=y
184# CONFIG_LDM_PARTITION is not set
185CONFIG_SGI_PARTITION=y 44CONFIG_SGI_PARTITION=y
186# CONFIG_ULTRIX_PARTITION is not set
187CONFIG_SUN_PARTITION=y 45CONFIG_SUN_PARTITION=y
188CONFIG_KARMA_PARTITION=y 46CONFIG_KARMA_PARTITION=y
189CONFIG_EFI_PARTITION=y 47CONFIG_EFI_PARTITION=y
190# CONFIG_SYSV68_PARTITION is not set
191
192#
193# IO Schedulers
194#
195CONFIG_IOSCHED_NOOP=y
196CONFIG_IOSCHED_DEADLINE=y
197CONFIG_IOSCHED_CFQ=y
198CONFIG_CFQ_GROUP_IOSCHED=y 48CONFIG_CFQ_GROUP_IOSCHED=y
199# CONFIG_DEFAULT_DEADLINE is not set
200CONFIG_DEFAULT_CFQ=y
201# CONFIG_DEFAULT_NOOP is not set
202CONFIG_DEFAULT_IOSCHED="cfq"
203CONFIG_PADATA=y
204# CONFIG_INLINE_SPIN_TRYLOCK is not set
205# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
206# CONFIG_INLINE_SPIN_LOCK is not set
207# CONFIG_INLINE_SPIN_LOCK_BH is not set
208# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
209# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
210CONFIG_INLINE_SPIN_UNLOCK=y
211# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
212CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
213# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
214# CONFIG_INLINE_READ_TRYLOCK is not set
215# CONFIG_INLINE_READ_LOCK is not set
216# CONFIG_INLINE_READ_LOCK_BH is not set
217# CONFIG_INLINE_READ_LOCK_IRQ is not set
218# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
219CONFIG_INLINE_READ_UNLOCK=y
220# CONFIG_INLINE_READ_UNLOCK_BH is not set
221CONFIG_INLINE_READ_UNLOCK_IRQ=y
222# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
223# CONFIG_INLINE_WRITE_TRYLOCK is not set
224# CONFIG_INLINE_WRITE_LOCK is not set
225# CONFIG_INLINE_WRITE_LOCK_BH is not set
226# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
227# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
228CONFIG_INLINE_WRITE_UNLOCK=y
229# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
230CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
231# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
232CONFIG_MUTEX_SPIN_ON_OWNER=y
233
234#
235# Tilera-specific configuration
236#
237CONFIG_NR_CPUS=64
238CONFIG_TICK_ONESHOT=y
239CONFIG_NO_HZ=y 49CONFIG_NO_HZ=y
240CONFIG_HIGH_RES_TIMERS=y 50CONFIG_HIGH_RES_TIMERS=y
241CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
242CONFIG_HZ_100=y 51CONFIG_HZ_100=y
243# CONFIG_HZ_250 is not set
244# CONFIG_HZ_300 is not set
245# CONFIG_HZ_1000 is not set
246CONFIG_HZ=100
247CONFIG_SCHED_HRTICK=y
248# CONFIG_KEXEC is not set
249CONFIG_HIGHMEM=y
250CONFIG_NUMA=y
251CONFIG_NODES_SHIFT=2
252# CONFIG_VMSPLIT_3_75G is not set
253# CONFIG_VMSPLIT_3_5G is not set
254CONFIG_VMSPLIT_3G=y
255# CONFIG_VMSPLIT_2_75G is not set
256# CONFIG_VMSPLIT_2_5G is not set
257# CONFIG_VMSPLIT_2_25G is not set
258# CONFIG_VMSPLIT_2G is not set
259# CONFIG_VMSPLIT_1G is not set
260CONFIG_PAGE_OFFSET=0xC0000000
261CONFIG_SELECT_MEMORY_MODEL=y
262CONFIG_DISCONTIGMEM_MANUAL=y
263CONFIG_DISCONTIGMEM=y
264CONFIG_FLAT_NODE_MEM_MAP=y
265CONFIG_NEED_MULTIPLE_NODES=y
266CONFIG_PAGEFLAGS_EXTENDED=y
267CONFIG_SPLIT_PTLOCK_CPUS=4
268# CONFIG_COMPACTION is not set
269CONFIG_MIGRATION=y
270CONFIG_PHYS_ADDR_T_64BIT=y
271CONFIG_ZONE_DMA_FLAG=0
272CONFIG_BOUNCE=y
273CONFIG_VIRT_TO_BUS=y
274# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276# CONFIG_CLEANCACHE is not set
277# CONFIG_CMDLINE_BOOL is not set
278CONFIG_VMALLOC_RESERVE=0x1000000
279CONFIG_HARDWALL=y
280CONFIG_KERNEL_PL=1
281
282#
283# Bus options
284#
285CONFIG_PCI=y
286CONFIG_PCI_DOMAINS=y
287# CONFIG_NO_IOMEM is not set
288# CONFIG_NO_IOPORT is not set
289# CONFIG_ARCH_SUPPORTS_MSI is not set
290CONFIG_PCI_DEBUG=y 52CONFIG_PCI_DEBUG=y
291# CONFIG_PCI_STUB is not set
292# CONFIG_PCI_IOV is not set
293# CONFIG_PCI_PRI is not set
294# CONFIG_PCI_PASID is not set
295# CONFIG_HOTPLUG_PCI is not set
296
297#
298# Executable file formats
299#
300CONFIG_KCORE_ELF=y
301CONFIG_BINFMT_ELF=y
302# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 53# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
303# CONFIG_HAVE_AOUT is not set
304CONFIG_BINFMT_MISC=y 54CONFIG_BINFMT_MISC=y
305CONFIG_NET=y 55CONFIG_NET=y
306
307#
308# Networking options
309#
310CONFIG_PACKET=y 56CONFIG_PACKET=y
311CONFIG_UNIX=y 57CONFIG_UNIX=y
312# CONFIG_UNIX_DIAG is not set
313CONFIG_XFRM=y
314CONFIG_XFRM_USER=y 58CONFIG_XFRM_USER=y
315CONFIG_XFRM_SUB_POLICY=y 59CONFIG_XFRM_SUB_POLICY=y
316CONFIG_XFRM_MIGRATE=y
317CONFIG_XFRM_STATISTICS=y 60CONFIG_XFRM_STATISTICS=y
318CONFIG_XFRM_IPCOMP=m
319CONFIG_NET_KEY=m 61CONFIG_NET_KEY=m
320CONFIG_NET_KEY_MIGRATE=y 62CONFIG_NET_KEY_MIGRATE=y
321CONFIG_INET=y 63CONFIG_INET=y
322CONFIG_IP_MULTICAST=y 64CONFIG_IP_MULTICAST=y
323CONFIG_IP_ADVANCED_ROUTER=y 65CONFIG_IP_ADVANCED_ROUTER=y
324# CONFIG_IP_FIB_TRIE_STATS is not set
325CONFIG_IP_MULTIPLE_TABLES=y 66CONFIG_IP_MULTIPLE_TABLES=y
326CONFIG_IP_ROUTE_MULTIPATH=y 67CONFIG_IP_ROUTE_MULTIPATH=y
327CONFIG_IP_ROUTE_VERBOSE=y 68CONFIG_IP_ROUTE_VERBOSE=y
328CONFIG_IP_ROUTE_CLASSID=y
329# CONFIG_IP_PNP is not set
330CONFIG_NET_IPIP=m 69CONFIG_NET_IPIP=m
331# CONFIG_NET_IPGRE_DEMUX is not set
332CONFIG_IP_MROUTE=y 70CONFIG_IP_MROUTE=y
333# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
334CONFIG_IP_PIMSM_V1=y 71CONFIG_IP_PIMSM_V1=y
335CONFIG_IP_PIMSM_V2=y 72CONFIG_IP_PIMSM_V2=y
336# CONFIG_ARPD is not set
337CONFIG_SYN_COOKIES=y 73CONFIG_SYN_COOKIES=y
338CONFIG_INET_AH=m 74CONFIG_INET_AH=m
339CONFIG_INET_ESP=m 75CONFIG_INET_ESP=m
340CONFIG_INET_IPCOMP=m 76CONFIG_INET_IPCOMP=m
341CONFIG_INET_XFRM_TUNNEL=m
342CONFIG_INET_TUNNEL=m
343CONFIG_INET_XFRM_MODE_TRANSPORT=m 77CONFIG_INET_XFRM_MODE_TRANSPORT=m
344CONFIG_INET_XFRM_MODE_TUNNEL=m 78CONFIG_INET_XFRM_MODE_TUNNEL=m
345CONFIG_INET_XFRM_MODE_BEET=m 79CONFIG_INET_XFRM_MODE_BEET=m
346CONFIG_INET_LRO=y
347CONFIG_INET_DIAG=m 80CONFIG_INET_DIAG=m
348CONFIG_INET_TCP_DIAG=m
349# CONFIG_INET_UDP_DIAG is not set
350CONFIG_TCP_CONG_ADVANCED=y 81CONFIG_TCP_CONG_ADVANCED=y
351CONFIG_TCP_CONG_BIC=m
352CONFIG_TCP_CONG_CUBIC=y
353CONFIG_TCP_CONG_WESTWOOD=m
354CONFIG_TCP_CONG_HTCP=m
355CONFIG_TCP_CONG_HSTCP=m 82CONFIG_TCP_CONG_HSTCP=m
356CONFIG_TCP_CONG_HYBLA=m 83CONFIG_TCP_CONG_HYBLA=m
357CONFIG_TCP_CONG_VEGAS=m
358CONFIG_TCP_CONG_SCALABLE=m 84CONFIG_TCP_CONG_SCALABLE=m
359CONFIG_TCP_CONG_LP=m 85CONFIG_TCP_CONG_LP=m
360CONFIG_TCP_CONG_VENO=m 86CONFIG_TCP_CONG_VENO=m
361CONFIG_TCP_CONG_YEAH=m 87CONFIG_TCP_CONG_YEAH=m
362CONFIG_TCP_CONG_ILLINOIS=m 88CONFIG_TCP_CONG_ILLINOIS=m
363CONFIG_DEFAULT_CUBIC=y
364# CONFIG_DEFAULT_RENO is not set
365CONFIG_DEFAULT_TCP_CONG="cubic"
366CONFIG_TCP_MD5SIG=y 89CONFIG_TCP_MD5SIG=y
367CONFIG_IPV6=y 90CONFIG_IPV6=y
368CONFIG_IPV6_PRIVACY=y 91CONFIG_IPV6_PRIVACY=y
@@ -373,111 +96,60 @@ CONFIG_INET6_AH=m
373CONFIG_INET6_ESP=m 96CONFIG_INET6_ESP=m
374CONFIG_INET6_IPCOMP=m 97CONFIG_INET6_IPCOMP=m
375CONFIG_IPV6_MIP6=m 98CONFIG_IPV6_MIP6=m
376CONFIG_INET6_XFRM_TUNNEL=m
377CONFIG_INET6_TUNNEL=m
378CONFIG_INET6_XFRM_MODE_TRANSPORT=m 99CONFIG_INET6_XFRM_MODE_TRANSPORT=m
379CONFIG_INET6_XFRM_MODE_TUNNEL=m 100CONFIG_INET6_XFRM_MODE_TUNNEL=m
380CONFIG_INET6_XFRM_MODE_BEET=m 101CONFIG_INET6_XFRM_MODE_BEET=m
381CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 102CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
382CONFIG_IPV6_SIT=m 103CONFIG_IPV6_SIT=m
383# CONFIG_IPV6_SIT_6RD is not set
384CONFIG_IPV6_NDISC_NODETYPE=y
385CONFIG_IPV6_TUNNEL=m 104CONFIG_IPV6_TUNNEL=m
386CONFIG_IPV6_MULTIPLE_TABLES=y 105CONFIG_IPV6_MULTIPLE_TABLES=y
387# CONFIG_IPV6_SUBTREES is not set
388CONFIG_IPV6_MROUTE=y 106CONFIG_IPV6_MROUTE=y
389# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
390CONFIG_IPV6_PIMSM_V2=y 107CONFIG_IPV6_PIMSM_V2=y
391CONFIG_NETLABEL=y 108CONFIG_NETLABEL=y
392CONFIG_NETWORK_SECMARK=y
393# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
394CONFIG_NETFILTER=y 109CONFIG_NETFILTER=y
395# CONFIG_NETFILTER_DEBUG is not set
396CONFIG_NETFILTER_ADVANCED=y
397CONFIG_BRIDGE_NETFILTER=y
398
399#
400# Core Netfilter Configuration
401#
402CONFIG_NETFILTER_NETLINK=m
403# CONFIG_NETFILTER_NETLINK_ACCT is not set
404CONFIG_NETFILTER_NETLINK_QUEUE=m
405CONFIG_NETFILTER_NETLINK_LOG=m
406CONFIG_NF_CONNTRACK=m 110CONFIG_NF_CONNTRACK=m
407CONFIG_NF_CONNTRACK_MARK=y
408CONFIG_NF_CONNTRACK_SECMARK=y 111CONFIG_NF_CONNTRACK_SECMARK=y
409CONFIG_NF_CONNTRACK_ZONES=y 112CONFIG_NF_CONNTRACK_ZONES=y
410CONFIG_NF_CONNTRACK_PROCFS=y
411CONFIG_NF_CONNTRACK_EVENTS=y 113CONFIG_NF_CONNTRACK_EVENTS=y
412# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
413CONFIG_NF_CT_PROTO_DCCP=m 114CONFIG_NF_CT_PROTO_DCCP=m
414CONFIG_NF_CT_PROTO_GRE=m
415CONFIG_NF_CT_PROTO_SCTP=m
416CONFIG_NF_CT_PROTO_UDPLITE=m 115CONFIG_NF_CT_PROTO_UDPLITE=m
417CONFIG_NF_CONNTRACK_AMANDA=m 116CONFIG_NF_CONNTRACK_AMANDA=m
418CONFIG_NF_CONNTRACK_FTP=m 117CONFIG_NF_CONNTRACK_FTP=m
419CONFIG_NF_CONNTRACK_H323=m 118CONFIG_NF_CONNTRACK_H323=m
420CONFIG_NF_CONNTRACK_IRC=m 119CONFIG_NF_CONNTRACK_IRC=m
421CONFIG_NF_CONNTRACK_BROADCAST=m
422CONFIG_NF_CONNTRACK_NETBIOS_NS=m 120CONFIG_NF_CONNTRACK_NETBIOS_NS=m
423# CONFIG_NF_CONNTRACK_SNMP is not set
424CONFIG_NF_CONNTRACK_PPTP=m 121CONFIG_NF_CONNTRACK_PPTP=m
425CONFIG_NF_CONNTRACK_SANE=m 122CONFIG_NF_CONNTRACK_SANE=m
426CONFIG_NF_CONNTRACK_SIP=m 123CONFIG_NF_CONNTRACK_SIP=m
427CONFIG_NF_CONNTRACK_TFTP=m 124CONFIG_NF_CONNTRACK_TFTP=m
428# CONFIG_NF_CT_NETLINK is not set
429CONFIG_NETFILTER_TPROXY=m 125CONFIG_NETFILTER_TPROXY=m
430CONFIG_NETFILTER_XTABLES=y
431
432#
433# Xtables combined modules
434#
435CONFIG_NETFILTER_XT_MARK=m
436CONFIG_NETFILTER_XT_CONNMARK=m
437
438#
439# Xtables targets
440#
441# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
442# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
443CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 126CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
444CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 127CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
445CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 128CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
446CONFIG_NETFILTER_XT_TARGET_CT=m 129CONFIG_NETFILTER_XT_TARGET_CT=m
447CONFIG_NETFILTER_XT_TARGET_DSCP=m 130CONFIG_NETFILTER_XT_TARGET_DSCP=m
448CONFIG_NETFILTER_XT_TARGET_HL=m
449CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 131CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
450CONFIG_NETFILTER_XT_TARGET_MARK=m 132CONFIG_NETFILTER_XT_TARGET_MARK=m
451CONFIG_NETFILTER_XT_TARGET_NFLOG=m 133CONFIG_NETFILTER_XT_TARGET_NFLOG=m
452CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 134CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
453CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 135CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
454CONFIG_NETFILTER_XT_TARGET_RATEEST=m
455CONFIG_NETFILTER_XT_TARGET_TEE=m 136CONFIG_NETFILTER_XT_TARGET_TEE=m
456CONFIG_NETFILTER_XT_TARGET_TPROXY=m 137CONFIG_NETFILTER_XT_TARGET_TPROXY=m
457CONFIG_NETFILTER_XT_TARGET_TRACE=m 138CONFIG_NETFILTER_XT_TARGET_TRACE=m
458CONFIG_NETFILTER_XT_TARGET_SECMARK=m 139CONFIG_NETFILTER_XT_TARGET_SECMARK=m
459CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 140CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
460CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 141CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
461
462#
463# Xtables matches
464#
465# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
466CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 142CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
467CONFIG_NETFILTER_XT_MATCH_COMMENT=m 143CONFIG_NETFILTER_XT_MATCH_COMMENT=m
468CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 144CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
469CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 145CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
470CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 146CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
471CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 147CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
472# CONFIG_NETFILTER_XT_MATCH_CPU is not set
473CONFIG_NETFILTER_XT_MATCH_DCCP=m 148CONFIG_NETFILTER_XT_MATCH_DCCP=m
474# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
475CONFIG_NETFILTER_XT_MATCH_DSCP=m 149CONFIG_NETFILTER_XT_MATCH_DSCP=m
476CONFIG_NETFILTER_XT_MATCH_ECN=m
477CONFIG_NETFILTER_XT_MATCH_ESP=m 150CONFIG_NETFILTER_XT_MATCH_ESP=m
478CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 151CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
479CONFIG_NETFILTER_XT_MATCH_HELPER=m 152CONFIG_NETFILTER_XT_MATCH_HELPER=m
480CONFIG_NETFILTER_XT_MATCH_HL=m
481CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 153CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
482CONFIG_NETFILTER_XT_MATCH_IPVS=m 154CONFIG_NETFILTER_XT_MATCH_IPVS=m
483CONFIG_NETFILTER_XT_MATCH_LENGTH=m 155CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -485,7 +157,6 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
485CONFIG_NETFILTER_XT_MATCH_MAC=m 157CONFIG_NETFILTER_XT_MATCH_MAC=m
486CONFIG_NETFILTER_XT_MATCH_MARK=m 158CONFIG_NETFILTER_XT_MATCH_MARK=m
487CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 159CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
488# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
489CONFIG_NETFILTER_XT_MATCH_OSF=m 160CONFIG_NETFILTER_XT_MATCH_OSF=m
490CONFIG_NETFILTER_XT_MATCH_OWNER=m 161CONFIG_NETFILTER_XT_MATCH_OWNER=m
491CONFIG_NETFILTER_XT_MATCH_POLICY=m 162CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -495,7 +166,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
495CONFIG_NETFILTER_XT_MATCH_RATEEST=m 166CONFIG_NETFILTER_XT_MATCH_RATEEST=m
496CONFIG_NETFILTER_XT_MATCH_REALM=m 167CONFIG_NETFILTER_XT_MATCH_REALM=m
497CONFIG_NETFILTER_XT_MATCH_RECENT=m 168CONFIG_NETFILTER_XT_MATCH_RECENT=m
498CONFIG_NETFILTER_XT_MATCH_SCTP=m
499CONFIG_NETFILTER_XT_MATCH_SOCKET=m 169CONFIG_NETFILTER_XT_MATCH_SOCKET=m
500CONFIG_NETFILTER_XT_MATCH_STATE=m 170CONFIG_NETFILTER_XT_MATCH_STATE=m
501CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 171CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -503,66 +173,33 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
503CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 173CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
504CONFIG_NETFILTER_XT_MATCH_TIME=m 174CONFIG_NETFILTER_XT_MATCH_TIME=m
505CONFIG_NETFILTER_XT_MATCH_U32=m 175CONFIG_NETFILTER_XT_MATCH_U32=m
506# CONFIG_IP_SET is not set
507CONFIG_IP_VS=m 176CONFIG_IP_VS=m
508CONFIG_IP_VS_IPV6=y 177CONFIG_IP_VS_IPV6=y
509# CONFIG_IP_VS_DEBUG is not set
510CONFIG_IP_VS_TAB_BITS=12
511
512#
513# IPVS transport protocol load balancing support
514#
515CONFIG_IP_VS_PROTO_TCP=y 178CONFIG_IP_VS_PROTO_TCP=y
516CONFIG_IP_VS_PROTO_UDP=y 179CONFIG_IP_VS_PROTO_UDP=y
517CONFIG_IP_VS_PROTO_AH_ESP=y
518CONFIG_IP_VS_PROTO_ESP=y 180CONFIG_IP_VS_PROTO_ESP=y
519CONFIG_IP_VS_PROTO_AH=y 181CONFIG_IP_VS_PROTO_AH=y
520CONFIG_IP_VS_PROTO_SCTP=y 182CONFIG_IP_VS_PROTO_SCTP=y
521
522#
523# IPVS scheduler
524#
525CONFIG_IP_VS_RR=m 183CONFIG_IP_VS_RR=m
526CONFIG_IP_VS_WRR=m 184CONFIG_IP_VS_WRR=m
527CONFIG_IP_VS_LC=m 185CONFIG_IP_VS_LC=m
528CONFIG_IP_VS_WLC=m 186CONFIG_IP_VS_WLC=m
529CONFIG_IP_VS_LBLC=m 187CONFIG_IP_VS_LBLC=m
530CONFIG_IP_VS_LBLCR=m 188CONFIG_IP_VS_LBLCR=m
531# CONFIG_IP_VS_DH is not set
532# CONFIG_IP_VS_SH is not set
533CONFIG_IP_VS_SED=m 189CONFIG_IP_VS_SED=m
534CONFIG_IP_VS_NQ=m 190CONFIG_IP_VS_NQ=m
535
536#
537# IPVS SH scheduler
538#
539CONFIG_IP_VS_SH_TAB_BITS=8
540
541#
542# IPVS application helper
543#
544# CONFIG_IP_VS_NFCT is not set
545# CONFIG_IP_VS_PE_SIP is not set
546
547#
548# IP: Netfilter Configuration
549#
550CONFIG_NF_DEFRAG_IPV4=m
551CONFIG_NF_CONNTRACK_IPV4=m 191CONFIG_NF_CONNTRACK_IPV4=m
552# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 192# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
553CONFIG_IP_NF_QUEUE=m 193CONFIG_IP_NF_QUEUE=m
554CONFIG_IP_NF_IPTABLES=y 194CONFIG_IP_NF_IPTABLES=y
555CONFIG_IP_NF_MATCH_AH=m 195CONFIG_IP_NF_MATCH_AH=m
556CONFIG_IP_NF_MATCH_ECN=m 196CONFIG_IP_NF_MATCH_ECN=m
557# CONFIG_IP_NF_MATCH_RPFILTER is not set
558CONFIG_IP_NF_MATCH_TTL=m 197CONFIG_IP_NF_MATCH_TTL=m
559CONFIG_IP_NF_FILTER=y 198CONFIG_IP_NF_FILTER=y
560CONFIG_IP_NF_TARGET_REJECT=y 199CONFIG_IP_NF_TARGET_REJECT=y
561CONFIG_IP_NF_TARGET_LOG=m 200CONFIG_IP_NF_TARGET_LOG=m
562CONFIG_IP_NF_TARGET_ULOG=m 201CONFIG_IP_NF_TARGET_ULOG=m
563# CONFIG_NF_NAT is not set
564CONFIG_IP_NF_MANGLE=m 202CONFIG_IP_NF_MANGLE=m
565# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
566CONFIG_IP_NF_TARGET_ECN=m 203CONFIG_IP_NF_TARGET_ECN=m
567CONFIG_IP_NF_TARGET_TTL=m 204CONFIG_IP_NF_TARGET_TTL=m
568CONFIG_IP_NF_RAW=m 205CONFIG_IP_NF_RAW=m
@@ -570,11 +207,6 @@ CONFIG_IP_NF_SECURITY=m
570CONFIG_IP_NF_ARPTABLES=m 207CONFIG_IP_NF_ARPTABLES=m
571CONFIG_IP_NF_ARPFILTER=m 208CONFIG_IP_NF_ARPFILTER=m
572CONFIG_IP_NF_ARP_MANGLE=m 209CONFIG_IP_NF_ARP_MANGLE=m
573
574#
575# IPv6: Netfilter Configuration
576#
577CONFIG_NF_DEFRAG_IPV6=m
578CONFIG_NF_CONNTRACK_IPV6=m 210CONFIG_NF_CONNTRACK_IPV6=m
579CONFIG_IP6_NF_QUEUE=m 211CONFIG_IP6_NF_QUEUE=m
580CONFIG_IP6_NF_IPTABLES=m 212CONFIG_IP6_NF_IPTABLES=m
@@ -585,7 +217,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
585CONFIG_IP6_NF_MATCH_HL=m 217CONFIG_IP6_NF_MATCH_HL=m
586CONFIG_IP6_NF_MATCH_IPV6HEADER=m 218CONFIG_IP6_NF_MATCH_IPV6HEADER=m
587CONFIG_IP6_NF_MATCH_MH=m 219CONFIG_IP6_NF_MATCH_MH=m
588# CONFIG_IP6_NF_MATCH_RPFILTER is not set
589CONFIG_IP6_NF_MATCH_RT=m 220CONFIG_IP6_NF_MATCH_RT=m
590CONFIG_IP6_NF_TARGET_HL=m 221CONFIG_IP6_NF_TARGET_HL=m
591CONFIG_IP6_NF_TARGET_LOG=m 222CONFIG_IP6_NF_TARGET_LOG=m
@@ -616,52 +247,20 @@ CONFIG_BRIDGE_EBT_SNAT=m
616CONFIG_BRIDGE_EBT_LOG=m 247CONFIG_BRIDGE_EBT_LOG=m
617CONFIG_BRIDGE_EBT_ULOG=m 248CONFIG_BRIDGE_EBT_ULOG=m
618CONFIG_BRIDGE_EBT_NFLOG=m 249CONFIG_BRIDGE_EBT_NFLOG=m
619# CONFIG_IP_DCCP is not set
620CONFIG_IP_SCTP=m
621# CONFIG_SCTP_DBG_MSG is not set
622# CONFIG_SCTP_DBG_OBJCNT is not set
623# CONFIG_SCTP_HMAC_NONE is not set
624# CONFIG_SCTP_HMAC_SHA1 is not set
625CONFIG_SCTP_HMAC_MD5=y
626CONFIG_RDS=m 250CONFIG_RDS=m
627CONFIG_RDS_TCP=m 251CONFIG_RDS_TCP=m
628# CONFIG_RDS_DEBUG is not set
629# CONFIG_TIPC is not set
630# CONFIG_ATM is not set
631# CONFIG_L2TP is not set
632CONFIG_STP=m
633CONFIG_GARP=m
634CONFIG_BRIDGE=m 252CONFIG_BRIDGE=m
635CONFIG_BRIDGE_IGMP_SNOOPING=y
636CONFIG_NET_DSA=y 253CONFIG_NET_DSA=y
637CONFIG_NET_DSA_TAG_DSA=y
638CONFIG_NET_DSA_TAG_EDSA=y
639CONFIG_NET_DSA_TAG_TRAILER=y
640CONFIG_VLAN_8021Q=m 254CONFIG_VLAN_8021Q=m
641CONFIG_VLAN_8021Q_GVRP=y 255CONFIG_VLAN_8021Q_GVRP=y
642# CONFIG_DECNET is not set
643CONFIG_LLC=m
644# CONFIG_LLC2 is not set
645# CONFIG_IPX is not set
646# CONFIG_ATALK is not set
647# CONFIG_X25 is not set
648# CONFIG_LAPB is not set
649# CONFIG_ECONET is not set
650# CONFIG_WAN_ROUTER is not set
651CONFIG_PHONET=m 256CONFIG_PHONET=m
652# CONFIG_IEEE802154 is not set
653CONFIG_NET_SCHED=y 257CONFIG_NET_SCHED=y
654
655#
656# Queueing/Scheduling
657#
658CONFIG_NET_SCH_CBQ=m 258CONFIG_NET_SCH_CBQ=m
659CONFIG_NET_SCH_HTB=m 259CONFIG_NET_SCH_HTB=m
660CONFIG_NET_SCH_HFSC=m 260CONFIG_NET_SCH_HFSC=m
661CONFIG_NET_SCH_PRIO=m 261CONFIG_NET_SCH_PRIO=m
662CONFIG_NET_SCH_MULTIQ=m 262CONFIG_NET_SCH_MULTIQ=m
663CONFIG_NET_SCH_RED=m 263CONFIG_NET_SCH_RED=m
664# CONFIG_NET_SCH_SFB is not set
665CONFIG_NET_SCH_SFQ=m 264CONFIG_NET_SCH_SFQ=m
666CONFIG_NET_SCH_TEQL=m 265CONFIG_NET_SCH_TEQL=m
667CONFIG_NET_SCH_TBF=m 266CONFIG_NET_SCH_TBF=m
@@ -669,15 +268,7 @@ CONFIG_NET_SCH_GRED=m
669CONFIG_NET_SCH_DSMARK=m 268CONFIG_NET_SCH_DSMARK=m
670CONFIG_NET_SCH_NETEM=m 269CONFIG_NET_SCH_NETEM=m
671CONFIG_NET_SCH_DRR=m 270CONFIG_NET_SCH_DRR=m
672# CONFIG_NET_SCH_MQPRIO is not set
673# CONFIG_NET_SCH_CHOKE is not set
674# CONFIG_NET_SCH_QFQ is not set
675CONFIG_NET_SCH_INGRESS=m 271CONFIG_NET_SCH_INGRESS=m
676
677#
678# Classification
679#
680CONFIG_NET_CLS=y
681CONFIG_NET_CLS_BASIC=m 272CONFIG_NET_CLS_BASIC=m
682CONFIG_NET_CLS_TCINDEX=m 273CONFIG_NET_CLS_TCINDEX=m
683CONFIG_NET_CLS_ROUTE4=m 274CONFIG_NET_CLS_ROUTE4=m
@@ -690,7 +281,6 @@ CONFIG_NET_CLS_RSVP6=m
690CONFIG_NET_CLS_FLOW=m 281CONFIG_NET_CLS_FLOW=m
691CONFIG_NET_CLS_CGROUP=y 282CONFIG_NET_CLS_CGROUP=y
692CONFIG_NET_EMATCH=y 283CONFIG_NET_EMATCH=y
693CONFIG_NET_EMATCH_STACK=32
694CONFIG_NET_EMATCH_CMP=m 284CONFIG_NET_EMATCH_CMP=m
695CONFIG_NET_EMATCH_NBYTE=m 285CONFIG_NET_EMATCH_NBYTE=m
696CONFIG_NET_EMATCH_U32=m 286CONFIG_NET_EMATCH_U32=m
@@ -706,248 +296,42 @@ CONFIG_NET_ACT_NAT=m
706CONFIG_NET_ACT_PEDIT=m 296CONFIG_NET_ACT_PEDIT=m
707CONFIG_NET_ACT_SIMP=m 297CONFIG_NET_ACT_SIMP=m
708CONFIG_NET_ACT_SKBEDIT=m 298CONFIG_NET_ACT_SKBEDIT=m
709# CONFIG_NET_ACT_CSUM is not set
710CONFIG_NET_CLS_IND=y 299CONFIG_NET_CLS_IND=y
711CONFIG_NET_SCH_FIFO=y
712CONFIG_DCB=y 300CONFIG_DCB=y
713CONFIG_DNS_RESOLVER=y
714# CONFIG_BATMAN_ADV is not set
715# CONFIG_OPENVSWITCH is not set
716CONFIG_RPS=y
717CONFIG_RFS_ACCEL=y
718CONFIG_XPS=y
719# CONFIG_NETPRIO_CGROUP is not set
720CONFIG_BQL=y
721
722#
723# Network testing
724#
725# CONFIG_NET_PKTGEN is not set
726# CONFIG_HAMRADIO is not set
727# CONFIG_CAN is not set
728# CONFIG_IRDA is not set
729# CONFIG_BT is not set
730# CONFIG_AF_RXRPC is not set
731CONFIG_FIB_RULES=y
732# CONFIG_WIRELESS is not set 301# CONFIG_WIRELESS is not set
733# CONFIG_WIMAX is not set
734# CONFIG_RFKILL is not set
735# CONFIG_NET_9P is not set
736# CONFIG_CAIF is not set
737# CONFIG_CEPH_LIB is not set
738# CONFIG_NFC is not set
739
740#
741# Device Drivers
742#
743
744#
745# Generic Driver Options
746#
747CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 302CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
748CONFIG_DEVTMPFS=y 303CONFIG_DEVTMPFS=y
749CONFIG_DEVTMPFS_MOUNT=y 304CONFIG_DEVTMPFS_MOUNT=y
750CONFIG_STANDALONE=y
751CONFIG_PREVENT_FIRMWARE_BUILD=y
752CONFIG_FW_LOADER=y
753# CONFIG_FIRMWARE_IN_KERNEL is not set 305# CONFIG_FIRMWARE_IN_KERNEL is not set
754CONFIG_EXTRA_FIRMWARE=""
755# CONFIG_DEBUG_DRIVER is not set
756# CONFIG_DEBUG_DEVRES is not set
757CONFIG_SYS_HYPERVISOR=y
758# CONFIG_GENERIC_CPU_DEVICES is not set
759# CONFIG_DMA_SHARED_BUFFER is not set
760CONFIG_CONNECTOR=y 306CONFIG_CONNECTOR=y
761CONFIG_PROC_EVENTS=y
762# CONFIG_MTD is not set
763# CONFIG_PARPORT is not set
764CONFIG_BLK_DEV=y
765# CONFIG_BLK_CPQ_DA is not set
766# CONFIG_BLK_CPQ_CISS_DA is not set
767# CONFIG_BLK_DEV_DAC960 is not set
768# CONFIG_BLK_DEV_UMEM is not set
769# CONFIG_BLK_DEV_COW_COMMON is not set
770CONFIG_BLK_DEV_LOOP=y 307CONFIG_BLK_DEV_LOOP=y
771CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
772CONFIG_BLK_DEV_CRYPTOLOOP=m 308CONFIG_BLK_DEV_CRYPTOLOOP=m
773# CONFIG_BLK_DEV_DRBD is not set
774# CONFIG_BLK_DEV_NBD is not set
775# CONFIG_BLK_DEV_NVME is not set
776CONFIG_BLK_DEV_SX8=m 309CONFIG_BLK_DEV_SX8=m
777CONFIG_BLK_DEV_RAM=y 310CONFIG_BLK_DEV_RAM=y
778CONFIG_BLK_DEV_RAM_COUNT=16
779CONFIG_BLK_DEV_RAM_SIZE=16384 311CONFIG_BLK_DEV_RAM_SIZE=16384
780# CONFIG_BLK_DEV_XIP is not set
781# CONFIG_CDROM_PKTCDVD is not set
782CONFIG_ATA_OVER_ETH=m 312CONFIG_ATA_OVER_ETH=m
783# CONFIG_BLK_DEV_RBD is not set
784
785#
786# Misc devices
787#
788# CONFIG_SENSORS_LIS3LV02D is not set
789# CONFIG_AD525X_DPOT is not set
790# CONFIG_PHANTOM is not set
791# CONFIG_INTEL_MID_PTI is not set
792# CONFIG_SGI_IOC4 is not set
793# CONFIG_TIFM_CORE is not set
794# CONFIG_ICS932S401 is not set
795# CONFIG_ENCLOSURE_SERVICES is not set
796# CONFIG_HP_ILO is not set
797# CONFIG_APDS9802ALS is not set
798# CONFIG_ISL29003 is not set
799# CONFIG_ISL29020 is not set
800# CONFIG_SENSORS_TSL2550 is not set
801# CONFIG_SENSORS_BH1780 is not set
802# CONFIG_SENSORS_BH1770 is not set
803# CONFIG_SENSORS_APDS990X is not set
804# CONFIG_HMC6352 is not set
805# CONFIG_DS1682 is not set
806# CONFIG_BMP085 is not set
807# CONFIG_PCH_PHUB is not set
808# CONFIG_USB_SWITCH_FSA9480 is not set
809# CONFIG_C2PORT is not set
810
811#
812# EEPROM support
813#
814# CONFIG_EEPROM_AT24 is not set
815# CONFIG_EEPROM_LEGACY is not set
816# CONFIG_EEPROM_MAX6875 is not set
817# CONFIG_EEPROM_93CX6 is not set
818# CONFIG_CB710_CORE is not set
819
820#
821# Texas Instruments shared transport line discipline
822#
823# CONFIG_SENSORS_LIS3_I2C is not set
824
825#
826# Altera FPGA firmware download module
827#
828# CONFIG_ALTERA_STAPL is not set
829
830#
831# SCSI device support
832#
833CONFIG_SCSI_MOD=y
834CONFIG_RAID_ATTRS=m 313CONFIG_RAID_ATTRS=m
835CONFIG_SCSI=y
836CONFIG_SCSI_DMA=y
837CONFIG_SCSI_TGT=m 314CONFIG_SCSI_TGT=m
838# CONFIG_SCSI_NETLINK is not set
839CONFIG_SCSI_PROC_FS=y
840
841#
842# SCSI support type (disk, tape, CD-ROM)
843#
844CONFIG_BLK_DEV_SD=y 315CONFIG_BLK_DEV_SD=y
845# CONFIG_CHR_DEV_ST is not set
846# CONFIG_CHR_DEV_OSST is not set
847# CONFIG_BLK_DEV_SR is not set
848# CONFIG_CHR_DEV_SG is not set
849# CONFIG_CHR_DEV_SCH is not set
850# CONFIG_SCSI_MULTI_LUN is not set
851CONFIG_SCSI_CONSTANTS=y 316CONFIG_SCSI_CONSTANTS=y
852CONFIG_SCSI_LOGGING=y 317CONFIG_SCSI_LOGGING=y
853# CONFIG_SCSI_SCAN_ASYNC is not set
854CONFIG_SCSI_WAIT_SCAN=m
855
856#
857# SCSI Transports
858#
859# CONFIG_SCSI_SPI_ATTRS is not set
860# CONFIG_SCSI_FC_ATTRS is not set
861# CONFIG_SCSI_ISCSI_ATTRS is not set
862CONFIG_SCSI_SAS_ATTRS=y
863# CONFIG_SCSI_SAS_LIBSAS is not set
864# CONFIG_SCSI_SRP_ATTRS is not set
865CONFIG_SCSI_LOWLEVEL=y
866# CONFIG_ISCSI_TCP is not set
867# CONFIG_ISCSI_BOOT_SYSFS is not set
868# CONFIG_SCSI_CXGB3_ISCSI is not set
869# CONFIG_SCSI_CXGB4_ISCSI is not set
870# CONFIG_SCSI_BNX2_ISCSI is not set
871# CONFIG_SCSI_BNX2X_FCOE is not set
872# CONFIG_BE2ISCSI is not set
873# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
874# CONFIG_SCSI_HPSA is not set
875# CONFIG_SCSI_3W_9XXX is not set
876# CONFIG_SCSI_3W_SAS is not set
877# CONFIG_SCSI_ACARD is not set
878# CONFIG_SCSI_AACRAID is not set
879# CONFIG_SCSI_AIC7XXX is not set
880# CONFIG_SCSI_AIC7XXX_OLD is not set
881# CONFIG_SCSI_AIC79XX is not set
882# CONFIG_SCSI_AIC94XX is not set
883# CONFIG_SCSI_MVSAS is not set
884# CONFIG_SCSI_MVUMI is not set
885# CONFIG_SCSI_DPT_I2O is not set
886# CONFIG_SCSI_ADVANSYS is not set
887# CONFIG_SCSI_ARCMSR is not set
888# CONFIG_MEGARAID_NEWGEN is not set
889# CONFIG_MEGARAID_LEGACY is not set
890# CONFIG_MEGARAID_SAS is not set
891# CONFIG_SCSI_MPT2SAS is not set
892# CONFIG_SCSI_HPTIOP is not set
893# CONFIG_LIBFC is not set
894# CONFIG_LIBFCOE is not set
895# CONFIG_FCOE is not set
896# CONFIG_SCSI_DMX3191D is not set
897# CONFIG_SCSI_FUTURE_DOMAIN is not set
898# CONFIG_SCSI_IPS is not set
899# CONFIG_SCSI_INITIO is not set
900# CONFIG_SCSI_INIA100 is not set
901# CONFIG_SCSI_STEX is not set
902# CONFIG_SCSI_SYM53C8XX_2 is not set
903# CONFIG_SCSI_IPR is not set
904# CONFIG_SCSI_QLOGIC_1280 is not set
905# CONFIG_SCSI_QLA_FC is not set
906# CONFIG_SCSI_QLA_ISCSI is not set
907# CONFIG_SCSI_LPFC is not set
908# CONFIG_SCSI_DC395x is not set
909# CONFIG_SCSI_DC390T is not set
910# CONFIG_SCSI_NSP32 is not set
911# CONFIG_SCSI_DEBUG is not set
912# CONFIG_SCSI_PMCRAID is not set
913# CONFIG_SCSI_PM8001 is not set
914# CONFIG_SCSI_SRP is not set
915# CONFIG_SCSI_BFA_FC is not set
916# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
917# CONFIG_SCSI_DH is not set
918# CONFIG_SCSI_OSD_INITIATOR is not set
919CONFIG_ATA=y 318CONFIG_ATA=y
920# CONFIG_ATA_NONSTANDARD is not set
921CONFIG_ATA_VERBOSE_ERROR=y
922CONFIG_SATA_PMP=y
923
924#
925# Controllers with non-SFF native interface
926#
927# CONFIG_SATA_AHCI is not set
928# CONFIG_SATA_AHCI_PLATFORM is not set
929# CONFIG_SATA_INIC162X is not set
930# CONFIG_SATA_ACARD_AHCI is not set
931CONFIG_SATA_SIL24=y 319CONFIG_SATA_SIL24=y
932# CONFIG_ATA_SFF is not set 320# CONFIG_ATA_SFF is not set
933CONFIG_MD=y 321CONFIG_MD=y
934CONFIG_BLK_DEV_MD=y 322CONFIG_BLK_DEV_MD=y
935CONFIG_MD_AUTODETECT=y
936CONFIG_MD_LINEAR=m 323CONFIG_MD_LINEAR=m
937CONFIG_MD_RAID0=m 324CONFIG_MD_RAID0=m
938CONFIG_MD_RAID1=m 325CONFIG_MD_RAID1=m
939CONFIG_MD_RAID10=m 326CONFIG_MD_RAID10=m
940CONFIG_MD_RAID456=m 327CONFIG_MD_RAID456=m
941CONFIG_MULTICORE_RAID456=y 328CONFIG_MULTICORE_RAID456=y
942# CONFIG_MD_MULTIPATH is not set
943CONFIG_MD_FAULTY=m 329CONFIG_MD_FAULTY=m
944CONFIG_BLK_DEV_DM=m 330CONFIG_BLK_DEV_DM=m
945CONFIG_DM_DEBUG=y 331CONFIG_DM_DEBUG=y
946CONFIG_DM_CRYPT=m 332CONFIG_DM_CRYPT=m
947CONFIG_DM_SNAPSHOT=m 333CONFIG_DM_SNAPSHOT=m
948# CONFIG_DM_THIN_PROVISIONING is not set
949CONFIG_DM_MIRROR=m 334CONFIG_DM_MIRROR=m
950# CONFIG_DM_RAID is not set
951CONFIG_DM_LOG_USERSPACE=m 335CONFIG_DM_LOG_USERSPACE=m
952CONFIG_DM_ZERO=m 336CONFIG_DM_ZERO=m
953CONFIG_DM_MULTIPATH=m 337CONFIG_DM_MULTIPATH=m
@@ -955,55 +339,22 @@ CONFIG_DM_MULTIPATH_QL=m
955CONFIG_DM_MULTIPATH_ST=m 339CONFIG_DM_MULTIPATH_ST=m
956CONFIG_DM_DELAY=m 340CONFIG_DM_DELAY=m
957CONFIG_DM_UEVENT=y 341CONFIG_DM_UEVENT=y
958# CONFIG_DM_FLAKEY is not set
959# CONFIG_TARGET_CORE is not set
960CONFIG_FUSION=y 342CONFIG_FUSION=y
961# CONFIG_FUSION_SPI is not set
962# CONFIG_FUSION_FC is not set
963CONFIG_FUSION_SAS=y 343CONFIG_FUSION_SAS=y
964CONFIG_FUSION_MAX_SGE=128
965# CONFIG_FUSION_CTL is not set
966# CONFIG_FUSION_LOGGING is not set
967
968#
969# IEEE 1394 (FireWire) support
970#
971# CONFIG_FIREWIRE is not set
972# CONFIG_FIREWIRE_NOSY is not set
973# CONFIG_I2O is not set
974CONFIG_NETDEVICES=y 344CONFIG_NETDEVICES=y
975CONFIG_NET_CORE=y
976CONFIG_BONDING=m 345CONFIG_BONDING=m
977CONFIG_DUMMY=m 346CONFIG_DUMMY=m
978# CONFIG_EQUALIZER is not set
979# CONFIG_NET_FC is not set
980# CONFIG_MII is not set
981CONFIG_IFB=m 347CONFIG_IFB=m
982# CONFIG_NET_TEAM is not set
983CONFIG_MACVLAN=m 348CONFIG_MACVLAN=m
984CONFIG_MACVTAP=m 349CONFIG_MACVTAP=m
985CONFIG_NETCONSOLE=m 350CONFIG_NETCONSOLE=m
986CONFIG_NETCONSOLE_DYNAMIC=y 351CONFIG_NETCONSOLE_DYNAMIC=y
987CONFIG_NETPOLL=y
988CONFIG_NETPOLL_TRAP=y 352CONFIG_NETPOLL_TRAP=y
989CONFIG_NET_POLL_CONTROLLER=y
990CONFIG_TUN=y 353CONFIG_TUN=y
991CONFIG_VETH=m 354CONFIG_VETH=m
992# CONFIG_ARCNET is not set
993
994#
995# CAIF transport drivers
996#
997
998#
999# Distributed Switch Architecture drivers
1000#
1001CONFIG_NET_DSA_MV88E6XXX=y
1002CONFIG_NET_DSA_MV88E6060=y 355CONFIG_NET_DSA_MV88E6060=y
1003CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
1004CONFIG_NET_DSA_MV88E6131=y 356CONFIG_NET_DSA_MV88E6131=y
1005CONFIG_NET_DSA_MV88E6123_61_65=y 357CONFIG_NET_DSA_MV88E6123_61_65=y
1006CONFIG_ETHERNET=y
1007# CONFIG_NET_VENDOR_3COM is not set 358# CONFIG_NET_VENDOR_3COM is not set
1008# CONFIG_NET_VENDOR_ADAPTEC is not set 359# CONFIG_NET_VENDOR_ADAPTEC is not set
1009# CONFIG_NET_VENDOR_ALTEON is not set 360# CONFIG_NET_VENDOR_ALTEON is not set
@@ -1011,27 +362,21 @@ CONFIG_ETHERNET=y
1011# CONFIG_NET_VENDOR_ATHEROS is not set 362# CONFIG_NET_VENDOR_ATHEROS is not set
1012# CONFIG_NET_VENDOR_BROADCOM is not set 363# CONFIG_NET_VENDOR_BROADCOM is not set
1013# CONFIG_NET_VENDOR_BROCADE is not set 364# CONFIG_NET_VENDOR_BROCADE is not set
1014# CONFIG_NET_CALXEDA_XGMAC is not set
1015# CONFIG_NET_VENDOR_CHELSIO is not set 365# CONFIG_NET_VENDOR_CHELSIO is not set
1016# CONFIG_NET_VENDOR_CISCO is not set 366# CONFIG_NET_VENDOR_CISCO is not set
1017# CONFIG_DNET is not set
1018# CONFIG_NET_VENDOR_DEC is not set 367# CONFIG_NET_VENDOR_DEC is not set
1019# CONFIG_NET_VENDOR_DLINK is not set 368# CONFIG_NET_VENDOR_DLINK is not set
1020# CONFIG_NET_VENDOR_EMULEX is not set 369# CONFIG_NET_VENDOR_EMULEX is not set
1021# CONFIG_NET_VENDOR_EXAR is not set 370# CONFIG_NET_VENDOR_EXAR is not set
1022# CONFIG_NET_VENDOR_HP is not set 371# CONFIG_NET_VENDOR_HP is not set
1023# CONFIG_NET_VENDOR_INTEL is not set 372# CONFIG_NET_VENDOR_INTEL is not set
1024# CONFIG_IP1000 is not set
1025# CONFIG_JME is not set
1026# CONFIG_NET_VENDOR_MARVELL is not set 373# CONFIG_NET_VENDOR_MARVELL is not set
1027# CONFIG_NET_VENDOR_MELLANOX is not set 374# CONFIG_NET_VENDOR_MELLANOX is not set
1028# CONFIG_NET_VENDOR_MICREL is not set 375# CONFIG_NET_VENDOR_MICREL is not set
1029# CONFIG_NET_VENDOR_MYRI is not set 376# CONFIG_NET_VENDOR_MYRI is not set
1030# CONFIG_FEALNX is not set
1031# CONFIG_NET_VENDOR_NATSEMI is not set 377# CONFIG_NET_VENDOR_NATSEMI is not set
1032# CONFIG_NET_VENDOR_NVIDIA is not set 378# CONFIG_NET_VENDOR_NVIDIA is not set
1033# CONFIG_NET_VENDOR_OKI is not set 379# CONFIG_NET_VENDOR_OKI is not set
1034# CONFIG_ETHOC is not set
1035# CONFIG_NET_PACKET_ENGINE is not set 380# CONFIG_NET_PACKET_ENGINE is not set
1036# CONFIG_NET_VENDOR_QLOGIC is not set 381# CONFIG_NET_VENDOR_QLOGIC is not set
1037# CONFIG_NET_VENDOR_REALTEK is not set 382# CONFIG_NET_VENDOR_REALTEK is not set
@@ -1039,548 +384,92 @@ CONFIG_ETHERNET=y
1039# CONFIG_NET_VENDOR_SEEQ is not set 384# CONFIG_NET_VENDOR_SEEQ is not set
1040# CONFIG_NET_VENDOR_SILAN is not set 385# CONFIG_NET_VENDOR_SILAN is not set
1041# CONFIG_NET_VENDOR_SIS is not set 386# CONFIG_NET_VENDOR_SIS is not set
1042# CONFIG_SFC is not set
1043# CONFIG_NET_VENDOR_SMSC is not set 387# CONFIG_NET_VENDOR_SMSC is not set
1044# CONFIG_NET_VENDOR_STMICRO is not set 388# CONFIG_NET_VENDOR_STMICRO is not set
1045# CONFIG_NET_VENDOR_SUN is not set 389# CONFIG_NET_VENDOR_SUN is not set
1046# CONFIG_NET_VENDOR_TEHUTI is not set 390# CONFIG_NET_VENDOR_TEHUTI is not set
1047# CONFIG_NET_VENDOR_TI is not set 391# CONFIG_NET_VENDOR_TI is not set
1048CONFIG_TILE_NET=y
1049# CONFIG_NET_VENDOR_VIA is not set 392# CONFIG_NET_VENDOR_VIA is not set
1050# CONFIG_FDDI is not set
1051# CONFIG_HIPPI is not set
1052CONFIG_PHYLIB=y
1053
1054#
1055# MII PHY device drivers
1056#
1057# CONFIG_MARVELL_PHY is not set
1058# CONFIG_DAVICOM_PHY is not set
1059# CONFIG_QSEMI_PHY is not set
1060# CONFIG_LXT_PHY is not set
1061# CONFIG_CICADA_PHY is not set
1062# CONFIG_VITESSE_PHY is not set
1063# CONFIG_SMSC_PHY is not set
1064# CONFIG_BROADCOM_PHY is not set
1065# CONFIG_ICPLUS_PHY is not set
1066# CONFIG_REALTEK_PHY is not set
1067# CONFIG_NATIONAL_PHY is not set
1068# CONFIG_STE10XP is not set
1069# CONFIG_LSI_ET1011C_PHY is not set
1070# CONFIG_MICREL_PHY is not set
1071# CONFIG_FIXED_PHY is not set
1072# CONFIG_MDIO_BITBANG is not set
1073# CONFIG_PPP is not set
1074# CONFIG_SLIP is not set
1075# CONFIG_TR is not set
1076# CONFIG_WLAN is not set 393# CONFIG_WLAN is not set
1077
1078#
1079# Enable WiMAX (Networking options) to see the WiMAX drivers
1080#
1081# CONFIG_WAN is not set
1082# CONFIG_VMXNET3 is not set
1083# CONFIG_ISDN is not set
1084# CONFIG_PHONE is not set
1085
1086#
1087# Input device support
1088#
1089CONFIG_INPUT=y
1090# CONFIG_INPUT_FF_MEMLESS is not set
1091# CONFIG_INPUT_POLLDEV is not set
1092# CONFIG_INPUT_SPARSEKMAP is not set
1093
1094#
1095# Userland interfaces
1096#
1097# CONFIG_INPUT_MOUSEDEV is not set 394# CONFIG_INPUT_MOUSEDEV is not set
1098# CONFIG_INPUT_JOYDEV is not set
1099# CONFIG_INPUT_EVDEV is not set
1100# CONFIG_INPUT_EVBUG is not set
1101
1102#
1103# Input Device Drivers
1104#
1105# CONFIG_INPUT_KEYBOARD is not set 395# CONFIG_INPUT_KEYBOARD is not set
1106# CONFIG_INPUT_MOUSE is not set 396# CONFIG_INPUT_MOUSE is not set
1107# CONFIG_INPUT_JOYSTICK is not set
1108# CONFIG_INPUT_TABLET is not set
1109# CONFIG_INPUT_TOUCHSCREEN is not set
1110# CONFIG_INPUT_MISC is not set
1111
1112#
1113# Hardware I/O ports
1114#
1115# CONFIG_SERIO is not set 397# CONFIG_SERIO is not set
1116# CONFIG_GAMEPORT is not set
1117
1118#
1119# Character devices
1120#
1121# CONFIG_VT is not set 398# CONFIG_VT is not set
1122CONFIG_UNIX98_PTYS=y
1123# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1124# CONFIG_LEGACY_PTYS is not set 399# CONFIG_LEGACY_PTYS is not set
1125# CONFIG_SERIAL_NONSTANDARD is not set
1126# CONFIG_NOZOMI is not set
1127# CONFIG_N_GSM is not set
1128# CONFIG_TRACE_SINK is not set
1129CONFIG_DEVKMEM=y
1130
1131#
1132# Serial drivers
1133#
1134# CONFIG_SERIAL_8250 is not set
1135
1136#
1137# Non-8250 serial port support
1138#
1139# CONFIG_SERIAL_MFD_HSU is not set
1140# CONFIG_SERIAL_JSM is not set
1141# CONFIG_SERIAL_TIMBERDALE is not set
1142# CONFIG_SERIAL_ALTERA_JTAGUART is not set
1143# CONFIG_SERIAL_ALTERA_UART is not set
1144# CONFIG_SERIAL_PCH_UART is not set
1145# CONFIG_SERIAL_XILINX_PS_UART is not set
1146# CONFIG_TTY_PRINTK is not set
1147CONFIG_HVC_DRIVER=y
1148# CONFIG_IPMI_HANDLER is not set
1149CONFIG_HW_RANDOM=y 400CONFIG_HW_RANDOM=y
1150CONFIG_HW_RANDOM_TIMERIOMEM=m 401CONFIG_HW_RANDOM_TIMERIOMEM=m
1151# CONFIG_R3964 is not set
1152# CONFIG_APPLICOM is not set
1153
1154#
1155# PCMCIA character devices
1156#
1157# CONFIG_RAW_DRIVER is not set
1158# CONFIG_TCG_TPM is not set
1159CONFIG_DEVPORT=y
1160# CONFIG_RAMOOPS is not set
1161CONFIG_TILE_SROM=y
1162CONFIG_I2C=y 402CONFIG_I2C=y
1163CONFIG_I2C_BOARDINFO=y
1164CONFIG_I2C_COMPAT=y
1165CONFIG_I2C_CHARDEV=y 403CONFIG_I2C_CHARDEV=y
1166# CONFIG_I2C_MUX is not set
1167CONFIG_I2C_HELPER_AUTO=y
1168
1169#
1170# I2C Hardware Bus support
1171#
1172
1173#
1174# PC SMBus host controller drivers
1175#
1176# CONFIG_I2C_ALI1535 is not set
1177# CONFIG_I2C_ALI1563 is not set
1178# CONFIG_I2C_ALI15X3 is not set
1179# CONFIG_I2C_AMD756 is not set
1180# CONFIG_I2C_AMD8111 is not set
1181# CONFIG_I2C_I801 is not set
1182# CONFIG_I2C_ISCH is not set
1183# CONFIG_I2C_PIIX4 is not set
1184# CONFIG_I2C_NFORCE2 is not set
1185# CONFIG_I2C_SIS5595 is not set
1186# CONFIG_I2C_SIS630 is not set
1187# CONFIG_I2C_SIS96X is not set
1188# CONFIG_I2C_VIA is not set
1189# CONFIG_I2C_VIAPRO is not set
1190
1191#
1192# I2C system bus drivers (mostly embedded / system-on-chip)
1193#
1194# CONFIG_I2C_DESIGNWARE_PCI is not set
1195# CONFIG_I2C_INTEL_MID is not set
1196# CONFIG_I2C_OCORES is not set
1197# CONFIG_I2C_PCA_PLATFORM is not set
1198# CONFIG_I2C_PXA_PCI is not set
1199# CONFIG_I2C_SIMTEC is not set
1200# CONFIG_I2C_XILINX is not set
1201# CONFIG_I2C_EG20T is not set
1202
1203#
1204# External I2C/SMBus adapter drivers
1205#
1206# CONFIG_I2C_PARPORT_LIGHT is not set
1207# CONFIG_I2C_TAOS_EVM is not set
1208
1209#
1210# Other I2C/SMBus bus drivers
1211#
1212# CONFIG_I2C_STUB is not set
1213# CONFIG_I2C_DEBUG_CORE is not set
1214# CONFIG_I2C_DEBUG_ALGO is not set
1215# CONFIG_I2C_DEBUG_BUS is not set
1216# CONFIG_SPI is not set
1217
1218#
1219# PPS support
1220#
1221# CONFIG_PPS is not set
1222
1223#
1224# PPS generators support
1225#
1226
1227#
1228# PTP clock support
1229#
1230
1231#
1232# Enable Device Drivers -> PPS to see the PTP clock options.
1233#
1234# CONFIG_W1 is not set
1235# CONFIG_POWER_SUPPLY is not set
1236# CONFIG_HWMON is not set 404# CONFIG_HWMON is not set
1237# CONFIG_THERMAL is not set
1238CONFIG_WATCHDOG=y 405CONFIG_WATCHDOG=y
1239# CONFIG_WATCHDOG_CORE is not set
1240CONFIG_WATCHDOG_NOWAYOUT=y 406CONFIG_WATCHDOG_NOWAYOUT=y
1241
1242#
1243# Watchdog Device Drivers
1244#
1245# CONFIG_SOFT_WATCHDOG is not set
1246# CONFIG_ALIM7101_WDT is not set
1247
1248#
1249# PCI-based Watchdog Cards
1250#
1251# CONFIG_PCIPCWATCHDOG is not set
1252# CONFIG_WDTPCI is not set
1253CONFIG_SSB_POSSIBLE=y
1254
1255#
1256# Sonics Silicon Backplane
1257#
1258# CONFIG_SSB is not set
1259CONFIG_BCMA_POSSIBLE=y
1260
1261#
1262# Broadcom specific AMBA
1263#
1264# CONFIG_BCMA is not set
1265
1266#
1267# Multifunction device drivers
1268#
1269# CONFIG_MFD_CORE is not set
1270# CONFIG_MFD_88PM860X is not set
1271# CONFIG_MFD_SM501 is not set
1272# CONFIG_HTC_PASIC3 is not set
1273# CONFIG_TPS6105X is not set
1274# CONFIG_TPS6507X is not set
1275# CONFIG_TWL4030_CORE is not set
1276# CONFIG_MFD_STMPE is not set
1277# CONFIG_MFD_TC3589X is not set
1278# CONFIG_MFD_TMIO is not set
1279# CONFIG_PMIC_DA903X is not set
1280# CONFIG_MFD_DA9052_I2C is not set
1281# CONFIG_PMIC_ADP5520 is not set
1282# CONFIG_MFD_MAX8925 is not set
1283# CONFIG_MFD_MAX8997 is not set
1284# CONFIG_MFD_MAX8998 is not set
1285# CONFIG_MFD_S5M_CORE is not set
1286# CONFIG_MFD_WM8400 is not set
1287# CONFIG_MFD_WM831X_I2C is not set
1288# CONFIG_MFD_WM8350_I2C is not set
1289# CONFIG_MFD_WM8994 is not set
1290# CONFIG_MFD_PCF50633 is not set
1291# CONFIG_ABX500_CORE is not set
1292# CONFIG_LPC_SCH is not set
1293# CONFIG_MFD_RDC321X is not set
1294# CONFIG_MFD_JANZ_CMODIO is not set
1295# CONFIG_MFD_VX855 is not set
1296# CONFIG_MFD_WL1273_CORE is not set
1297# CONFIG_REGULATOR is not set
1298# CONFIG_MEDIA_SUPPORT is not set
1299
1300#
1301# Graphics support
1302#
1303# CONFIG_VGA_ARB is not set 407# CONFIG_VGA_ARB is not set
1304# CONFIG_DRM is not set
1305# CONFIG_STUB_POULSBO is not set
1306# CONFIG_VGASTATE is not set
1307# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1308# CONFIG_FB is not set
1309# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1310# CONFIG_SOUND is not set
1311# CONFIG_HID_SUPPORT is not set 408# CONFIG_HID_SUPPORT is not set
1312# CONFIG_USB_SUPPORT is not set 409# CONFIG_USB_SUPPORT is not set
1313# CONFIG_UWB is not set
1314# CONFIG_MMC is not set
1315# CONFIG_MEMSTICK is not set
1316# CONFIG_NEW_LEDS is not set
1317# CONFIG_ACCESSIBILITY is not set
1318# CONFIG_INFINIBAND is not set
1319CONFIG_EDAC=y 410CONFIG_EDAC=y
1320
1321#
1322# Reporting subsystems
1323#
1324# CONFIG_EDAC_DEBUG is not set
1325CONFIG_EDAC_MM_EDAC=y 411CONFIG_EDAC_MM_EDAC=y
1326CONFIG_EDAC_TILE=y
1327CONFIG_RTC_LIB=y
1328CONFIG_RTC_CLASS=y 412CONFIG_RTC_CLASS=y
1329CONFIG_RTC_HCTOSYS=y
1330CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1331# CONFIG_RTC_DEBUG is not set
1332
1333#
1334# RTC interfaces
1335#
1336CONFIG_RTC_INTF_SYSFS=y
1337CONFIG_RTC_INTF_PROC=y
1338CONFIG_RTC_INTF_DEV=y
1339# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1340# CONFIG_RTC_DRV_TEST is not set
1341
1342#
1343# I2C RTC drivers
1344#
1345# CONFIG_RTC_DRV_DS1307 is not set
1346# CONFIG_RTC_DRV_DS1374 is not set
1347# CONFIG_RTC_DRV_DS1672 is not set
1348# CONFIG_RTC_DRV_DS3232 is not set
1349# CONFIG_RTC_DRV_MAX6900 is not set
1350# CONFIG_RTC_DRV_RS5C372 is not set
1351# CONFIG_RTC_DRV_ISL1208 is not set
1352# CONFIG_RTC_DRV_ISL12022 is not set
1353# CONFIG_RTC_DRV_X1205 is not set
1354# CONFIG_RTC_DRV_PCF8563 is not set
1355# CONFIG_RTC_DRV_PCF8583 is not set
1356# CONFIG_RTC_DRV_M41T80 is not set
1357# CONFIG_RTC_DRV_BQ32K is not set
1358# CONFIG_RTC_DRV_S35390A is not set
1359# CONFIG_RTC_DRV_FM3130 is not set
1360# CONFIG_RTC_DRV_RX8581 is not set
1361# CONFIG_RTC_DRV_RX8025 is not set
1362# CONFIG_RTC_DRV_EM3027 is not set
1363# CONFIG_RTC_DRV_RV3029C2 is not set
1364
1365#
1366# SPI RTC drivers
1367#
1368
1369#
1370# Platform RTC drivers
1371#
1372# CONFIG_RTC_DRV_DS1286 is not set
1373# CONFIG_RTC_DRV_DS1511 is not set
1374# CONFIG_RTC_DRV_DS1553 is not set
1375# CONFIG_RTC_DRV_DS1742 is not set
1376# CONFIG_RTC_DRV_STK17TA8 is not set
1377# CONFIG_RTC_DRV_M48T86 is not set
1378# CONFIG_RTC_DRV_M48T35 is not set
1379# CONFIG_RTC_DRV_M48T59 is not set
1380# CONFIG_RTC_DRV_MSM6242 is not set
1381# CONFIG_RTC_DRV_BQ4802 is not set
1382# CONFIG_RTC_DRV_RP5C01 is not set
1383# CONFIG_RTC_DRV_V3020 is not set
1384
1385#
1386# on-CPU RTC drivers
1387#
1388CONFIG_RTC_DRV_TILE=y 413CONFIG_RTC_DRV_TILE=y
1389# CONFIG_DMADEVICES is not set
1390# CONFIG_AUXDISPLAY is not set
1391# CONFIG_UIO is not set
1392
1393#
1394# Virtio drivers
1395#
1396# CONFIG_VIRTIO_PCI is not set
1397# CONFIG_VIRTIO_BALLOON is not set
1398# CONFIG_VIRTIO_MMIO is not set
1399
1400#
1401# Microsoft Hyper-V guest support
1402#
1403# CONFIG_STAGING is not set
1404
1405#
1406# Hardware Spinlock drivers
1407#
1408CONFIG_IOMMU_SUPPORT=y
1409# CONFIG_VIRT_DRIVERS is not set
1410# CONFIG_PM_DEVFREQ is not set
1411
1412#
1413# File systems
1414#
1415CONFIG_EXT2_FS=y 414CONFIG_EXT2_FS=y
1416CONFIG_EXT2_FS_XATTR=y 415CONFIG_EXT2_FS_XATTR=y
1417CONFIG_EXT2_FS_POSIX_ACL=y 416CONFIG_EXT2_FS_POSIX_ACL=y
1418CONFIG_EXT2_FS_SECURITY=y 417CONFIG_EXT2_FS_SECURITY=y
1419CONFIG_EXT2_FS_XIP=y 418CONFIG_EXT2_FS_XIP=y
1420CONFIG_EXT3_FS=y 419CONFIG_EXT3_FS=y
1421CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
1422CONFIG_EXT3_FS_XATTR=y
1423CONFIG_EXT3_FS_POSIX_ACL=y 420CONFIG_EXT3_FS_POSIX_ACL=y
1424CONFIG_EXT3_FS_SECURITY=y 421CONFIG_EXT3_FS_SECURITY=y
1425CONFIG_EXT4_FS=y 422CONFIG_EXT4_FS=y
1426CONFIG_EXT4_FS_XATTR=y
1427CONFIG_EXT4_FS_POSIX_ACL=y 423CONFIG_EXT4_FS_POSIX_ACL=y
1428CONFIG_EXT4_FS_SECURITY=y 424CONFIG_EXT4_FS_SECURITY=y
1429# CONFIG_EXT4_DEBUG is not set
1430CONFIG_FS_XIP=y
1431CONFIG_JBD=y
1432# CONFIG_JBD_DEBUG is not set
1433CONFIG_JBD2=y
1434# CONFIG_JBD2_DEBUG is not set
1435CONFIG_FS_MBCACHE=y
1436# CONFIG_REISERFS_FS is not set
1437# CONFIG_JFS_FS is not set
1438CONFIG_XFS_FS=y 425CONFIG_XFS_FS=y
1439CONFIG_XFS_QUOTA=y 426CONFIG_XFS_QUOTA=y
1440CONFIG_XFS_POSIX_ACL=y 427CONFIG_XFS_POSIX_ACL=y
1441# CONFIG_XFS_RT is not set
1442# CONFIG_XFS_DEBUG is not set
1443CONFIG_GFS2_FS=m 428CONFIG_GFS2_FS=m
1444CONFIG_GFS2_FS_LOCKING_DLM=y 429CONFIG_GFS2_FS_LOCKING_DLM=y
1445# CONFIG_OCFS2_FS is not set
1446CONFIG_BTRFS_FS=m 430CONFIG_BTRFS_FS=m
1447CONFIG_BTRFS_FS_POSIX_ACL=y 431CONFIG_BTRFS_FS_POSIX_ACL=y
1448# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
1449# CONFIG_NILFS2_FS is not set
1450CONFIG_FS_POSIX_ACL=y
1451CONFIG_EXPORTFS=y
1452CONFIG_FILE_LOCKING=y
1453CONFIG_FSNOTIFY=y
1454CONFIG_DNOTIFY=y
1455CONFIG_INOTIFY_USER=y
1456# CONFIG_FANOTIFY is not set
1457CONFIG_QUOTA=y 432CONFIG_QUOTA=y
1458CONFIG_QUOTA_NETLINK_INTERFACE=y 433CONFIG_QUOTA_NETLINK_INTERFACE=y
1459# CONFIG_PRINT_QUOTA_WARNING is not set 434# CONFIG_PRINT_QUOTA_WARNING is not set
1460# CONFIG_QUOTA_DEBUG is not set
1461CONFIG_QUOTA_TREE=y
1462# CONFIG_QFMT_V1 is not set
1463CONFIG_QFMT_V2=y 435CONFIG_QFMT_V2=y
1464CONFIG_QUOTACTL=y
1465CONFIG_AUTOFS4_FS=m 436CONFIG_AUTOFS4_FS=m
1466CONFIG_FUSE_FS=y 437CONFIG_FUSE_FS=y
1467CONFIG_CUSE=m 438CONFIG_CUSE=m
1468CONFIG_GENERIC_ACL=y
1469
1470#
1471# Caches
1472#
1473CONFIG_FSCACHE=m 439CONFIG_FSCACHE=m
1474CONFIG_FSCACHE_STATS=y 440CONFIG_FSCACHE_STATS=y
1475# CONFIG_FSCACHE_HISTOGRAM is not set
1476# CONFIG_FSCACHE_DEBUG is not set
1477# CONFIG_FSCACHE_OBJECT_LIST is not set
1478CONFIG_CACHEFILES=m 441CONFIG_CACHEFILES=m
1479# CONFIG_CACHEFILES_DEBUG is not set
1480# CONFIG_CACHEFILES_HISTOGRAM is not set
1481
1482#
1483# CD-ROM/DVD Filesystems
1484#
1485CONFIG_ISO9660_FS=m 442CONFIG_ISO9660_FS=m
1486CONFIG_JOLIET=y 443CONFIG_JOLIET=y
1487CONFIG_ZISOFS=y 444CONFIG_ZISOFS=y
1488CONFIG_UDF_FS=m 445CONFIG_UDF_FS=m
1489CONFIG_UDF_NLS=y
1490
1491#
1492# DOS/FAT/NT Filesystems
1493#
1494CONFIG_FAT_FS=m
1495CONFIG_MSDOS_FS=m 446CONFIG_MSDOS_FS=m
1496CONFIG_VFAT_FS=m 447CONFIG_VFAT_FS=m
1497CONFIG_FAT_DEFAULT_CODEPAGE=437
1498CONFIG_FAT_DEFAULT_IOCHARSET="ascii" 448CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
1499# CONFIG_NTFS_FS is not set
1500
1501#
1502# Pseudo filesystems
1503#
1504CONFIG_PROC_FS=y
1505CONFIG_PROC_KCORE=y 449CONFIG_PROC_KCORE=y
1506CONFIG_PROC_SYSCTL=y
1507CONFIG_PROC_PAGE_MONITOR=y
1508CONFIG_SYSFS=y
1509CONFIG_TMPFS=y 450CONFIG_TMPFS=y
1510CONFIG_TMPFS_POSIX_ACL=y 451CONFIG_TMPFS_POSIX_ACL=y
1511CONFIG_TMPFS_XATTR=y
1512CONFIG_HUGETLBFS=y 452CONFIG_HUGETLBFS=y
1513CONFIG_HUGETLB_PAGE=y
1514CONFIG_CONFIGFS_FS=m
1515CONFIG_MISC_FILESYSTEMS=y
1516# CONFIG_ADFS_FS is not set
1517# CONFIG_AFFS_FS is not set
1518CONFIG_ECRYPT_FS=m 453CONFIG_ECRYPT_FS=m
1519# CONFIG_HFS_FS is not set
1520# CONFIG_HFSPLUS_FS is not set
1521# CONFIG_BEFS_FS is not set
1522# CONFIG_BFS_FS is not set
1523# CONFIG_EFS_FS is not set
1524# CONFIG_LOGFS is not set
1525CONFIG_CRAMFS=m 454CONFIG_CRAMFS=m
1526CONFIG_SQUASHFS=m 455CONFIG_SQUASHFS=m
1527# CONFIG_SQUASHFS_XATTR is not set
1528CONFIG_SQUASHFS_ZLIB=y
1529# CONFIG_SQUASHFS_LZO is not set
1530# CONFIG_SQUASHFS_XZ is not set
1531# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
1532# CONFIG_SQUASHFS_EMBEDDED is not set
1533CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
1534# CONFIG_VXFS_FS is not set
1535# CONFIG_MINIX_FS is not set
1536# CONFIG_OMFS_FS is not set
1537# CONFIG_HPFS_FS is not set
1538# CONFIG_QNX4FS_FS is not set
1539# CONFIG_ROMFS_FS is not set
1540# CONFIG_PSTORE is not set
1541# CONFIG_SYSV_FS is not set
1542# CONFIG_UFS_FS is not set
1543CONFIG_NETWORK_FILESYSTEMS=y
1544CONFIG_NFS_FS=m 456CONFIG_NFS_FS=m
1545CONFIG_NFS_V3=y 457CONFIG_NFS_V3=y
1546CONFIG_NFS_V3_ACL=y 458CONFIG_NFS_V3_ACL=y
1547CONFIG_NFS_V4=y 459CONFIG_NFS_V4=y
1548CONFIG_NFS_V4_1=y 460CONFIG_NFS_V4_1=y
1549CONFIG_PNFS_FILE_LAYOUT=m
1550CONFIG_PNFS_BLOCK=m
1551CONFIG_NFS_FSCACHE=y 461CONFIG_NFS_FSCACHE=y
1552# CONFIG_NFS_USE_LEGACY_DNS is not set
1553CONFIG_NFS_USE_KERNEL_DNS=y
1554# CONFIG_NFS_USE_NEW_IDMAPPER is not set
1555CONFIG_NFSD=m 462CONFIG_NFSD=m
1556CONFIG_NFSD_V2_ACL=y
1557CONFIG_NFSD_V3=y
1558CONFIG_NFSD_V3_ACL=y 463CONFIG_NFSD_V3_ACL=y
1559CONFIG_NFSD_V4=y 464CONFIG_NFSD_V4=y
1560# CONFIG_NFSD_FAULT_INJECTION is not set
1561CONFIG_LOCKD=m
1562CONFIG_LOCKD_V4=y
1563CONFIG_NFS_ACL_SUPPORT=m
1564CONFIG_NFS_COMMON=y
1565CONFIG_SUNRPC=m
1566CONFIG_SUNRPC_GSS=m
1567CONFIG_SUNRPC_BACKCHANNEL=y
1568CONFIG_RPCSEC_GSS_KRB5=m
1569# CONFIG_CEPH_FS is not set
1570CONFIG_CIFS=m 465CONFIG_CIFS=m
1571CONFIG_CIFS_STATS=y 466CONFIG_CIFS_STATS=y
1572# CONFIG_CIFS_STATS2 is not set
1573CONFIG_CIFS_WEAK_PW_HASH=y 467CONFIG_CIFS_WEAK_PW_HASH=y
1574CONFIG_CIFS_UPCALL=y 468CONFIG_CIFS_UPCALL=y
1575CONFIG_CIFS_XATTR=y 469CONFIG_CIFS_XATTR=y
1576CONFIG_CIFS_POSIX=y 470CONFIG_CIFS_POSIX=y
1577# CONFIG_CIFS_DEBUG2 is not set
1578CONFIG_CIFS_DFS_UPCALL=y 471CONFIG_CIFS_DFS_UPCALL=y
1579CONFIG_CIFS_FSCACHE=y 472CONFIG_CIFS_FSCACHE=y
1580# CONFIG_CIFS_ACL is not set
1581# CONFIG_NCP_FS is not set
1582# CONFIG_CODA_FS is not set
1583# CONFIG_AFS_FS is not set
1584CONFIG_NLS=y 473CONFIG_NLS=y
1585CONFIG_NLS_DEFAULT="utf8" 474CONFIG_NLS_DEFAULT="utf8"
1586CONFIG_NLS_CODEPAGE_437=y 475CONFIG_NLS_CODEPAGE_437=y
@@ -1621,192 +510,48 @@ CONFIG_NLS_ISO8859_15=m
1621CONFIG_NLS_KOI8_R=m 510CONFIG_NLS_KOI8_R=m
1622CONFIG_NLS_KOI8_U=m 511CONFIG_NLS_KOI8_U=m
1623CONFIG_NLS_UTF8=m 512CONFIG_NLS_UTF8=m
1624CONFIG_DLM=m
1625CONFIG_DLM_DEBUG=y 513CONFIG_DLM_DEBUG=y
1626
1627#
1628# Kernel hacking
1629#
1630# CONFIG_PRINTK_TIME is not set
1631CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
1632# CONFIG_ENABLE_WARN_DEPRECATED is not set 514# CONFIG_ENABLE_WARN_DEPRECATED is not set
1633CONFIG_ENABLE_MUST_CHECK=y
1634CONFIG_FRAME_WARN=2048 515CONFIG_FRAME_WARN=2048
1635CONFIG_MAGIC_SYSRQ=y 516CONFIG_MAGIC_SYSRQ=y
1636CONFIG_STRIP_ASM_SYMS=y 517CONFIG_STRIP_ASM_SYMS=y
1637# CONFIG_UNUSED_SYMBOLS is not set
1638CONFIG_DEBUG_FS=y 518CONFIG_DEBUG_FS=y
1639CONFIG_HEADERS_CHECK=y 519CONFIG_HEADERS_CHECK=y
1640# CONFIG_DEBUG_SECTION_MISMATCH is not set
1641CONFIG_DEBUG_KERNEL=y
1642# CONFIG_DEBUG_SHIRQ is not set
1643CONFIG_LOCKUP_DETECTOR=y 520CONFIG_LOCKUP_DETECTOR=y
1644# CONFIG_HARDLOCKUP_DETECTOR is not set
1645# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
1646CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
1647# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1648CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1649CONFIG_DETECT_HUNG_TASK=y
1650CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
1651# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1652CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1653CONFIG_SCHED_DEBUG=y
1654CONFIG_SCHEDSTATS=y 521CONFIG_SCHEDSTATS=y
1655CONFIG_TIMER_STATS=y 522CONFIG_TIMER_STATS=y
1656# CONFIG_DEBUG_OBJECTS is not set
1657# CONFIG_SLUB_DEBUG_ON is not set
1658# CONFIG_SLUB_STATS is not set
1659# CONFIG_DEBUG_KMEMLEAK is not set
1660# CONFIG_DEBUG_RT_MUTEXES is not set
1661# CONFIG_RT_MUTEX_TESTER is not set
1662# CONFIG_DEBUG_SPINLOCK is not set
1663# CONFIG_DEBUG_MUTEXES is not set
1664# CONFIG_DEBUG_LOCK_ALLOC is not set
1665# CONFIG_PROVE_LOCKING is not set
1666# CONFIG_SPARSE_RCU_POINTER is not set
1667# CONFIG_LOCK_STAT is not set
1668# CONFIG_DEBUG_ATOMIC_SLEEP is not set
1669# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1670CONFIG_STACKTRACE=y
1671# CONFIG_DEBUG_STACK_USAGE is not set
1672# CONFIG_DEBUG_KOBJECT is not set
1673# CONFIG_DEBUG_HIGHMEM is not set
1674CONFIG_DEBUG_BUGVERBOSE=y
1675CONFIG_DEBUG_INFO=y 523CONFIG_DEBUG_INFO=y
1676CONFIG_DEBUG_INFO_REDUCED=y 524CONFIG_DEBUG_INFO_REDUCED=y
1677CONFIG_DEBUG_VM=y 525CONFIG_DEBUG_VM=y
1678# CONFIG_DEBUG_WRITECOUNT is not set
1679CONFIG_DEBUG_MEMORY_INIT=y 526CONFIG_DEBUG_MEMORY_INIT=y
1680CONFIG_DEBUG_LIST=y 527CONFIG_DEBUG_LIST=y
1681# CONFIG_TEST_LIST_SORT is not set
1682# CONFIG_DEBUG_SG is not set
1683# CONFIG_DEBUG_NOTIFIERS is not set
1684CONFIG_DEBUG_CREDENTIALS=y 528CONFIG_DEBUG_CREDENTIALS=y
1685# CONFIG_RCU_TORTURE_TEST is not set
1686CONFIG_RCU_CPU_STALL_TIMEOUT=60
1687# CONFIG_BACKTRACE_SELF_TEST is not set
1688# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1689CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y 529CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
1690# CONFIG_DEBUG_PER_CPU_MAPS is not set
1691# CONFIG_LKDTM is not set
1692# CONFIG_FAULT_INJECTION is not set
1693# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1694# CONFIG_DEBUG_PAGEALLOC is not set
1695CONFIG_TRACING_SUPPORT=y
1696CONFIG_FTRACE=y
1697# CONFIG_IRQSOFF_TRACER is not set
1698# CONFIG_SCHED_TRACER is not set
1699# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1700CONFIG_BRANCH_PROFILE_NONE=y
1701# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1702# CONFIG_PROFILE_ALL_BRANCHES is not set
1703# CONFIG_BLK_DEV_IO_TRACE is not set
1704# CONFIG_BUILD_DOCSRC is not set
1705CONFIG_DYNAMIC_DEBUG=y 530CONFIG_DYNAMIC_DEBUG=y
1706# CONFIG_ATOMIC64_SELFTEST is not set
1707CONFIG_ASYNC_RAID6_TEST=m 531CONFIG_ASYNC_RAID6_TEST=m
1708# CONFIG_SAMPLES is not set
1709# CONFIG_TEST_KSTRTOX is not set
1710CONFIG_EARLY_PRINTK=y
1711CONFIG_DEBUG_STACKOVERFLOW=y 532CONFIG_DEBUG_STACKOVERFLOW=y
1712CONFIG_DEBUG_EXTRA_FLAGS=""
1713
1714#
1715# Security options
1716#
1717CONFIG_KEYS=y
1718# CONFIG_ENCRYPTED_KEYS is not set
1719CONFIG_KEYS_DEBUG_PROC_KEYS=y 533CONFIG_KEYS_DEBUG_PROC_KEYS=y
1720# CONFIG_SECURITY_DMESG_RESTRICT is not set
1721CONFIG_SECURITY=y 534CONFIG_SECURITY=y
1722CONFIG_SECURITYFS=y 535CONFIG_SECURITYFS=y
1723CONFIG_SECURITY_NETWORK=y 536CONFIG_SECURITY_NETWORK=y
1724CONFIG_SECURITY_NETWORK_XFRM=y 537CONFIG_SECURITY_NETWORK_XFRM=y
1725# CONFIG_SECURITY_PATH is not set
1726CONFIG_LSM_MMAP_MIN_ADDR=65536
1727CONFIG_SECURITY_SELINUX=y 538CONFIG_SECURITY_SELINUX=y
1728CONFIG_SECURITY_SELINUX_BOOTPARAM=y 539CONFIG_SECURITY_SELINUX_BOOTPARAM=y
1729CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
1730CONFIG_SECURITY_SELINUX_DISABLE=y 540CONFIG_SECURITY_SELINUX_DISABLE=y
1731CONFIG_SECURITY_SELINUX_DEVELOP=y
1732CONFIG_SECURITY_SELINUX_AVC_STATS=y
1733CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
1734# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
1735# CONFIG_SECURITY_SMACK is not set
1736# CONFIG_SECURITY_TOMOYO is not set
1737# CONFIG_SECURITY_APPARMOR is not set
1738# CONFIG_IMA is not set
1739# CONFIG_EVM is not set
1740CONFIG_DEFAULT_SECURITY_SELINUX=y
1741# CONFIG_DEFAULT_SECURITY_DAC is not set
1742CONFIG_DEFAULT_SECURITY="selinux"
1743CONFIG_XOR_BLOCKS=m
1744CONFIG_ASYNC_CORE=m
1745CONFIG_ASYNC_MEMCPY=m
1746CONFIG_ASYNC_XOR=m
1747CONFIG_ASYNC_PQ=m
1748CONFIG_ASYNC_RAID6_RECOV=m
1749CONFIG_CRYPTO=y
1750
1751#
1752# Crypto core or helper
1753#
1754CONFIG_CRYPTO_ALGAPI=y
1755CONFIG_CRYPTO_ALGAPI2=y
1756CONFIG_CRYPTO_AEAD=m
1757CONFIG_CRYPTO_AEAD2=y
1758CONFIG_CRYPTO_BLKCIPHER=m
1759CONFIG_CRYPTO_BLKCIPHER2=y
1760CONFIG_CRYPTO_HASH=y
1761CONFIG_CRYPTO_HASH2=y
1762CONFIG_CRYPTO_RNG=m
1763CONFIG_CRYPTO_RNG2=y
1764CONFIG_CRYPTO_PCOMP=m
1765CONFIG_CRYPTO_PCOMP2=y
1766CONFIG_CRYPTO_MANAGER=y
1767CONFIG_CRYPTO_MANAGER2=y
1768# CONFIG_CRYPTO_USER is not set
1769CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
1770CONFIG_CRYPTO_GF128MUL=m
1771CONFIG_CRYPTO_NULL=m 541CONFIG_CRYPTO_NULL=m
1772CONFIG_CRYPTO_PCRYPT=m 542CONFIG_CRYPTO_PCRYPT=m
1773CONFIG_CRYPTO_WORKQUEUE=y
1774CONFIG_CRYPTO_CRYPTD=m 543CONFIG_CRYPTO_CRYPTD=m
1775CONFIG_CRYPTO_AUTHENC=m
1776CONFIG_CRYPTO_TEST=m 544CONFIG_CRYPTO_TEST=m
1777
1778#
1779# Authenticated Encryption with Associated Data
1780#
1781CONFIG_CRYPTO_CCM=m 545CONFIG_CRYPTO_CCM=m
1782CONFIG_CRYPTO_GCM=m 546CONFIG_CRYPTO_GCM=m
1783CONFIG_CRYPTO_SEQIV=m
1784
1785#
1786# Block modes
1787#
1788CONFIG_CRYPTO_CBC=m
1789CONFIG_CRYPTO_CTR=m
1790CONFIG_CRYPTO_CTS=m 547CONFIG_CRYPTO_CTS=m
1791CONFIG_CRYPTO_ECB=m
1792CONFIG_CRYPTO_LRW=m 548CONFIG_CRYPTO_LRW=m
1793CONFIG_CRYPTO_PCBC=m 549CONFIG_CRYPTO_PCBC=m
1794CONFIG_CRYPTO_XTS=m 550CONFIG_CRYPTO_XTS=m
1795
1796#
1797# Hash modes
1798#
1799CONFIG_CRYPTO_HMAC=y 551CONFIG_CRYPTO_HMAC=y
1800CONFIG_CRYPTO_XCBC=m 552CONFIG_CRYPTO_XCBC=m
1801CONFIG_CRYPTO_VMAC=m 553CONFIG_CRYPTO_VMAC=m
1802
1803#
1804# Digest
1805#
1806CONFIG_CRYPTO_CRC32C=y 554CONFIG_CRYPTO_CRC32C=y
1807CONFIG_CRYPTO_GHASH=m
1808CONFIG_CRYPTO_MD4=m
1809CONFIG_CRYPTO_MD5=y
1810CONFIG_CRYPTO_MICHAEL_MIC=m 555CONFIG_CRYPTO_MICHAEL_MIC=m
1811CONFIG_CRYPTO_RMD128=m 556CONFIG_CRYPTO_RMD128=m
1812CONFIG_CRYPTO_RMD160=m 557CONFIG_CRYPTO_RMD160=m
@@ -1817,78 +562,18 @@ CONFIG_CRYPTO_SHA256=m
1817CONFIG_CRYPTO_SHA512=m 562CONFIG_CRYPTO_SHA512=m
1818CONFIG_CRYPTO_TGR192=m 563CONFIG_CRYPTO_TGR192=m
1819CONFIG_CRYPTO_WP512=m 564CONFIG_CRYPTO_WP512=m
1820
1821#
1822# Ciphers
1823#
1824CONFIG_CRYPTO_AES=m
1825CONFIG_CRYPTO_ANUBIS=m 565CONFIG_CRYPTO_ANUBIS=m
1826CONFIG_CRYPTO_ARC4=m
1827CONFIG_CRYPTO_BLOWFISH=m 566CONFIG_CRYPTO_BLOWFISH=m
1828CONFIG_CRYPTO_BLOWFISH_COMMON=m
1829CONFIG_CRYPTO_CAMELLIA=m 567CONFIG_CRYPTO_CAMELLIA=m
1830CONFIG_CRYPTO_CAST5=m 568CONFIG_CRYPTO_CAST5=m
1831CONFIG_CRYPTO_CAST6=m 569CONFIG_CRYPTO_CAST6=m
1832CONFIG_CRYPTO_DES=m
1833CONFIG_CRYPTO_FCRYPT=m 570CONFIG_CRYPTO_FCRYPT=m
1834CONFIG_CRYPTO_KHAZAD=m 571CONFIG_CRYPTO_KHAZAD=m
1835# CONFIG_CRYPTO_SALSA20 is not set
1836CONFIG_CRYPTO_SEED=m 572CONFIG_CRYPTO_SEED=m
1837CONFIG_CRYPTO_SERPENT=m 573CONFIG_CRYPTO_SERPENT=m
1838CONFIG_CRYPTO_TEA=m 574CONFIG_CRYPTO_TEA=m
1839CONFIG_CRYPTO_TWOFISH=m 575CONFIG_CRYPTO_TWOFISH=m
1840CONFIG_CRYPTO_TWOFISH_COMMON=m
1841
1842#
1843# Compression
1844#
1845CONFIG_CRYPTO_DEFLATE=m
1846CONFIG_CRYPTO_ZLIB=m 576CONFIG_CRYPTO_ZLIB=m
1847CONFIG_CRYPTO_LZO=m 577CONFIG_CRYPTO_LZO=m
1848
1849#
1850# Random Number Generation
1851#
1852CONFIG_CRYPTO_ANSI_CPRNG=m
1853# CONFIG_CRYPTO_USER_API_HASH is not set
1854# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
1855CONFIG_CRYPTO_HW=y
1856# CONFIG_BINARY_PRINTF is not set
1857
1858#
1859# Library routines
1860#
1861CONFIG_RAID6_PQ=m
1862CONFIG_BITREVERSE=y
1863CONFIG_GENERIC_FIND_FIRST_BIT=y
1864CONFIG_GENERIC_PCI_IOMAP=y
1865CONFIG_CRC_CCITT=m 578CONFIG_CRC_CCITT=m
1866CONFIG_CRC16=y
1867CONFIG_CRC_T10DIF=y
1868CONFIG_CRC_ITU_T=m
1869CONFIG_CRC32=y
1870CONFIG_CRC7=m 579CONFIG_CRC7=m
1871CONFIG_LIBCRC32C=m
1872# CONFIG_CRC8 is not set
1873CONFIG_AUDIT_GENERIC=y
1874CONFIG_ZLIB_INFLATE=y
1875CONFIG_ZLIB_DEFLATE=m
1876CONFIG_LZO_COMPRESS=m
1877CONFIG_LZO_DECOMPRESS=m
1878# CONFIG_XZ_DEC is not set
1879# CONFIG_XZ_DEC_BCJ is not set
1880CONFIG_DECOMPRESS_GZIP=y
1881CONFIG_TEXTSEARCH=y
1882CONFIG_TEXTSEARCH_KMP=m
1883CONFIG_TEXTSEARCH_BM=m
1884CONFIG_TEXTSEARCH_FSM=m
1885CONFIG_HAS_IOMEM=y
1886CONFIG_HAS_IOPORT=y
1887CONFIG_HAS_DMA=y
1888CONFIG_CPU_RMAP=y
1889CONFIG_DQL=y
1890CONFIG_NLATTR=y
1891# CONFIG_AVERAGE is not set
1892# CONFIG_CORDIC is not set
1893CONFIG_HAVE_KVM=y
1894# CONFIG_VIRTUALIZATION is not set
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index 8b782a63c297..fb95dd2f889a 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -36,11 +36,23 @@ static void icq_free_icq_rcu(struct rcu_head *head)
36 kmem_cache_free(icq->__rcu_icq_cache, icq); 36 kmem_cache_free(icq->__rcu_icq_cache, icq);
37} 37}
38 38
39/* 39/* Exit an icq. Called with both ioc and q locked. */
40 * Exit and free an icq. Called with both ioc and q locked.
41 */
42static void ioc_exit_icq(struct io_cq *icq) 40static void ioc_exit_icq(struct io_cq *icq)
43{ 41{
42 struct elevator_type *et = icq->q->elevator->type;
43
44 if (icq->flags & ICQ_EXITED)
45 return;
46
47 if (et->ops.elevator_exit_icq_fn)
48 et->ops.elevator_exit_icq_fn(icq);
49
50 icq->flags |= ICQ_EXITED;
51}
52
53/* Release an icq. Called with both ioc and q locked. */
54static void ioc_destroy_icq(struct io_cq *icq)
55{
44 struct io_context *ioc = icq->ioc; 56 struct io_context *ioc = icq->ioc;
45 struct request_queue *q = icq->q; 57 struct request_queue *q = icq->q;
46 struct elevator_type *et = q->elevator->type; 58 struct elevator_type *et = q->elevator->type;
@@ -60,8 +72,7 @@ static void ioc_exit_icq(struct io_cq *icq)
60 if (rcu_dereference_raw(ioc->icq_hint) == icq) 72 if (rcu_dereference_raw(ioc->icq_hint) == icq)
61 rcu_assign_pointer(ioc->icq_hint, NULL); 73 rcu_assign_pointer(ioc->icq_hint, NULL);
62 74
63 if (et->ops.elevator_exit_icq_fn) 75 ioc_exit_icq(icq);
64 et->ops.elevator_exit_icq_fn(icq);
65 76
66 /* 77 /*
67 * @icq->q might have gone away by the time RCU callback runs 78 * @icq->q might have gone away by the time RCU callback runs
@@ -79,7 +90,6 @@ static void ioc_release_fn(struct work_struct *work)
79{ 90{
80 struct io_context *ioc = container_of(work, struct io_context, 91 struct io_context *ioc = container_of(work, struct io_context,
81 release_work); 92 release_work);
82 struct request_queue *last_q = NULL;
83 unsigned long flags; 93 unsigned long flags;
84 94
85 /* 95 /*
@@ -93,44 +103,19 @@ static void ioc_release_fn(struct work_struct *work)
93 while (!hlist_empty(&ioc->icq_list)) { 103 while (!hlist_empty(&ioc->icq_list)) {
94 struct io_cq *icq = hlist_entry(ioc->icq_list.first, 104 struct io_cq *icq = hlist_entry(ioc->icq_list.first,
95 struct io_cq, ioc_node); 105 struct io_cq, ioc_node);
96 struct request_queue *this_q = icq->q; 106 struct request_queue *q = icq->q;
97 107
98 if (this_q != last_q) { 108 if (spin_trylock(q->queue_lock)) {
99 /* 109 ioc_destroy_icq(icq);
100 * Need to switch to @this_q. Once we release 110 spin_unlock(q->queue_lock);
101 * @ioc->lock, it can go away along with @cic. 111 } else {
102 * Hold on to it. 112 spin_unlock_irqrestore(&ioc->lock, flags);
103 */ 113 cpu_relax();
104 __blk_get_queue(this_q); 114 spin_lock_irqsave_nested(&ioc->lock, flags, 1);
105
106 /*
107 * blk_put_queue() might sleep thanks to kobject
108 * idiocy. Always release both locks, put and
109 * restart.
110 */
111 if (last_q) {
112 spin_unlock(last_q->queue_lock);
113 spin_unlock_irqrestore(&ioc->lock, flags);
114 blk_put_queue(last_q);
115 } else {
116 spin_unlock_irqrestore(&ioc->lock, flags);
117 }
118
119 last_q = this_q;
120 spin_lock_irqsave(this_q->queue_lock, flags);
121 spin_lock_nested(&ioc->lock, 1);
122 continue;
123 } 115 }
124 ioc_exit_icq(icq);
125 } 116 }
126 117
127 if (last_q) { 118 spin_unlock_irqrestore(&ioc->lock, flags);
128 spin_unlock(last_q->queue_lock);
129 spin_unlock_irqrestore(&ioc->lock, flags);
130 blk_put_queue(last_q);
131 } else {
132 spin_unlock_irqrestore(&ioc->lock, flags);
133 }
134 119
135 kmem_cache_free(iocontext_cachep, ioc); 120 kmem_cache_free(iocontext_cachep, ioc);
136} 121}
@@ -145,6 +130,7 @@ static void ioc_release_fn(struct work_struct *work)
145void put_io_context(struct io_context *ioc) 130void put_io_context(struct io_context *ioc)
146{ 131{
147 unsigned long flags; 132 unsigned long flags;
133 bool free_ioc = false;
148 134
149 if (ioc == NULL) 135 if (ioc == NULL)
150 return; 136 return;
@@ -159,8 +145,13 @@ void put_io_context(struct io_context *ioc)
159 spin_lock_irqsave(&ioc->lock, flags); 145 spin_lock_irqsave(&ioc->lock, flags);
160 if (!hlist_empty(&ioc->icq_list)) 146 if (!hlist_empty(&ioc->icq_list))
161 schedule_work(&ioc->release_work); 147 schedule_work(&ioc->release_work);
148 else
149 free_ioc = true;
162 spin_unlock_irqrestore(&ioc->lock, flags); 150 spin_unlock_irqrestore(&ioc->lock, flags);
163 } 151 }
152
153 if (free_ioc)
154 kmem_cache_free(iocontext_cachep, ioc);
164} 155}
165EXPORT_SYMBOL(put_io_context); 156EXPORT_SYMBOL(put_io_context);
166 157
@@ -168,13 +159,41 @@ EXPORT_SYMBOL(put_io_context);
168void exit_io_context(struct task_struct *task) 159void exit_io_context(struct task_struct *task)
169{ 160{
170 struct io_context *ioc; 161 struct io_context *ioc;
162 struct io_cq *icq;
163 struct hlist_node *n;
164 unsigned long flags;
171 165
172 task_lock(task); 166 task_lock(task);
173 ioc = task->io_context; 167 ioc = task->io_context;
174 task->io_context = NULL; 168 task->io_context = NULL;
175 task_unlock(task); 169 task_unlock(task);
176 170
177 atomic_dec(&ioc->nr_tasks); 171 if (!atomic_dec_and_test(&ioc->nr_tasks)) {
172 put_io_context(ioc);
173 return;
174 }
175
176 /*
177 * Need ioc lock to walk icq_list and q lock to exit icq. Perform
178 * reverse double locking. Read comment in ioc_release_fn() for
179 * explanation on the nested locking annotation.
180 */
181retry:
182 spin_lock_irqsave_nested(&ioc->lock, flags, 1);
183 hlist_for_each_entry(icq, n, &ioc->icq_list, ioc_node) {
184 if (icq->flags & ICQ_EXITED)
185 continue;
186 if (spin_trylock(icq->q->queue_lock)) {
187 ioc_exit_icq(icq);
188 spin_unlock(icq->q->queue_lock);
189 } else {
190 spin_unlock_irqrestore(&ioc->lock, flags);
191 cpu_relax();
192 goto retry;
193 }
194 }
195 spin_unlock_irqrestore(&ioc->lock, flags);
196
178 put_io_context(ioc); 197 put_io_context(ioc);
179} 198}
180 199
@@ -194,7 +213,7 @@ void ioc_clear_queue(struct request_queue *q)
194 struct io_context *ioc = icq->ioc; 213 struct io_context *ioc = icq->ioc;
195 214
196 spin_lock(&ioc->lock); 215 spin_lock(&ioc->lock);
197 ioc_exit_icq(icq); 216 ioc_destroy_icq(icq);
198 spin_unlock(&ioc->lock); 217 spin_unlock(&ioc->lock);
199 } 218 }
200} 219}
@@ -363,13 +382,13 @@ struct io_cq *ioc_create_icq(struct request_queue *q, gfp_t gfp_mask)
363 return icq; 382 return icq;
364} 383}
365 384
366void ioc_set_changed(struct io_context *ioc, int which) 385void ioc_set_icq_flags(struct io_context *ioc, unsigned int flags)
367{ 386{
368 struct io_cq *icq; 387 struct io_cq *icq;
369 struct hlist_node *n; 388 struct hlist_node *n;
370 389
371 hlist_for_each_entry(icq, n, &ioc->icq_list, ioc_node) 390 hlist_for_each_entry(icq, n, &ioc->icq_list, ioc_node)
372 set_bit(which, &icq->changed); 391 icq->flags |= flags;
373} 392}
374 393
375/** 394/**
@@ -387,7 +406,7 @@ void ioc_ioprio_changed(struct io_context *ioc, int ioprio)
387 406
388 spin_lock_irqsave(&ioc->lock, flags); 407 spin_lock_irqsave(&ioc->lock, flags);
389 ioc->ioprio = ioprio; 408 ioc->ioprio = ioprio;
390 ioc_set_changed(ioc, ICQ_IOPRIO_CHANGED); 409 ioc_set_icq_flags(ioc, ICQ_IOPRIO_CHANGED);
391 spin_unlock_irqrestore(&ioc->lock, flags); 410 spin_unlock_irqrestore(&ioc->lock, flags);
392} 411}
393 412
@@ -404,11 +423,33 @@ void ioc_cgroup_changed(struct io_context *ioc)
404 unsigned long flags; 423 unsigned long flags;
405 424
406 spin_lock_irqsave(&ioc->lock, flags); 425 spin_lock_irqsave(&ioc->lock, flags);
407 ioc_set_changed(ioc, ICQ_CGROUP_CHANGED); 426 ioc_set_icq_flags(ioc, ICQ_CGROUP_CHANGED);
408 spin_unlock_irqrestore(&ioc->lock, flags); 427 spin_unlock_irqrestore(&ioc->lock, flags);
409} 428}
410EXPORT_SYMBOL(ioc_cgroup_changed); 429EXPORT_SYMBOL(ioc_cgroup_changed);
411 430
431/**
432 * icq_get_changed - fetch and clear icq changed mask
433 * @icq: icq of interest
434 *
435 * Fetch and clear ICQ_*_CHANGED bits from @icq. Grabs and releases
436 * @icq->ioc->lock.
437 */
438unsigned icq_get_changed(struct io_cq *icq)
439{
440 unsigned int changed = 0;
441 unsigned long flags;
442
443 if (unlikely(icq->flags & ICQ_CHANGED_MASK)) {
444 spin_lock_irqsave(&icq->ioc->lock, flags);
445 changed = icq->flags & ICQ_CHANGED_MASK;
446 icq->flags &= ~ICQ_CHANGED_MASK;
447 spin_unlock_irqrestore(&icq->ioc->lock, flags);
448 }
449 return changed;
450}
451EXPORT_SYMBOL(icq_get_changed);
452
412static int __init blk_ioc_init(void) 453static int __init blk_ioc_init(void)
413{ 454{
414 iocontext_cachep = kmem_cache_create("blkdev_ioc", 455 iocontext_cachep = kmem_cache_create("blkdev_ioc",
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index d0ba50533668..457295253566 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3470,20 +3470,20 @@ cfq_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask)
3470 const int rw = rq_data_dir(rq); 3470 const int rw = rq_data_dir(rq);
3471 const bool is_sync = rq_is_sync(rq); 3471 const bool is_sync = rq_is_sync(rq);
3472 struct cfq_queue *cfqq; 3472 struct cfq_queue *cfqq;
3473 unsigned int changed;
3473 3474
3474 might_sleep_if(gfp_mask & __GFP_WAIT); 3475 might_sleep_if(gfp_mask & __GFP_WAIT);
3475 3476
3476 spin_lock_irq(q->queue_lock); 3477 spin_lock_irq(q->queue_lock);
3477 3478
3478 /* handle changed notifications */ 3479 /* handle changed notifications */
3479 if (unlikely(cic->icq.changed)) { 3480 changed = icq_get_changed(&cic->icq);
3480 if (test_and_clear_bit(ICQ_IOPRIO_CHANGED, &cic->icq.changed)) 3481 if (unlikely(changed & ICQ_IOPRIO_CHANGED))
3481 changed_ioprio(cic); 3482 changed_ioprio(cic);
3482#ifdef CONFIG_CFQ_GROUP_IOSCHED 3483#ifdef CONFIG_CFQ_GROUP_IOSCHED
3483 if (test_and_clear_bit(ICQ_CGROUP_CHANGED, &cic->icq.changed)) 3484 if (unlikely(changed & ICQ_CGROUP_CHANGED))
3484 changed_cgroup(cic); 3485 changed_cgroup(cic);
3485#endif 3486#endif
3486 }
3487 3487
3488new_queue: 3488new_queue:
3489 cfqq = cic_to_cfqq(cic, is_sync); 3489 cfqq = cic_to_cfqq(cic, is_sync);
diff --git a/block/genhd.c b/block/genhd.c
index 23b4f7063322..df9816ede75b 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -35,6 +35,7 @@ static DEFINE_IDR(ext_devt_idr);
35 35
36static struct device_type disk_type; 36static struct device_type disk_type;
37 37
38static void disk_alloc_events(struct gendisk *disk);
38static void disk_add_events(struct gendisk *disk); 39static void disk_add_events(struct gendisk *disk);
39static void disk_del_events(struct gendisk *disk); 40static void disk_del_events(struct gendisk *disk);
40static void disk_release_events(struct gendisk *disk); 41static void disk_release_events(struct gendisk *disk);
@@ -601,6 +602,8 @@ void add_disk(struct gendisk *disk)
601 disk->major = MAJOR(devt); 602 disk->major = MAJOR(devt);
602 disk->first_minor = MINOR(devt); 603 disk->first_minor = MINOR(devt);
603 604
605 disk_alloc_events(disk);
606
604 /* Register BDI before referencing it from bdev */ 607 /* Register BDI before referencing it from bdev */
605 bdi = &disk->queue->backing_dev_info; 608 bdi = &disk->queue->backing_dev_info;
606 bdi_register_dev(bdi, disk_devt(disk)); 609 bdi_register_dev(bdi, disk_devt(disk));
@@ -1475,9 +1478,9 @@ static void __disk_unblock_events(struct gendisk *disk, bool check_now)
1475 intv = disk_events_poll_jiffies(disk); 1478 intv = disk_events_poll_jiffies(disk);
1476 set_timer_slack(&ev->dwork.timer, intv / 4); 1479 set_timer_slack(&ev->dwork.timer, intv / 4);
1477 if (check_now) 1480 if (check_now)
1478 queue_delayed_work(system_nrt_wq, &ev->dwork, 0); 1481 queue_delayed_work(system_nrt_freezable_wq, &ev->dwork, 0);
1479 else if (intv) 1482 else if (intv)
1480 queue_delayed_work(system_nrt_wq, &ev->dwork, intv); 1483 queue_delayed_work(system_nrt_freezable_wq, &ev->dwork, intv);
1481out_unlock: 1484out_unlock:
1482 spin_unlock_irqrestore(&ev->lock, flags); 1485 spin_unlock_irqrestore(&ev->lock, flags);
1483} 1486}
@@ -1521,7 +1524,7 @@ void disk_flush_events(struct gendisk *disk, unsigned int mask)
1521 ev->clearing |= mask; 1524 ev->clearing |= mask;
1522 if (!ev->block) { 1525 if (!ev->block) {
1523 cancel_delayed_work(&ev->dwork); 1526 cancel_delayed_work(&ev->dwork);
1524 queue_delayed_work(system_nrt_wq, &ev->dwork, 0); 1527 queue_delayed_work(system_nrt_freezable_wq, &ev->dwork, 0);
1525 } 1528 }
1526 spin_unlock_irq(&ev->lock); 1529 spin_unlock_irq(&ev->lock);
1527} 1530}
@@ -1558,7 +1561,7 @@ unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask)
1558 1561
1559 /* uncondtionally schedule event check and wait for it to finish */ 1562 /* uncondtionally schedule event check and wait for it to finish */
1560 disk_block_events(disk); 1563 disk_block_events(disk);
1561 queue_delayed_work(system_nrt_wq, &ev->dwork, 0); 1564 queue_delayed_work(system_nrt_freezable_wq, &ev->dwork, 0);
1562 flush_delayed_work(&ev->dwork); 1565 flush_delayed_work(&ev->dwork);
1563 __disk_unblock_events(disk, false); 1566 __disk_unblock_events(disk, false);
1564 1567
@@ -1595,7 +1598,7 @@ static void disk_events_workfn(struct work_struct *work)
1595 1598
1596 intv = disk_events_poll_jiffies(disk); 1599 intv = disk_events_poll_jiffies(disk);
1597 if (!ev->block && intv) 1600 if (!ev->block && intv)
1598 queue_delayed_work(system_nrt_wq, &ev->dwork, intv); 1601 queue_delayed_work(system_nrt_freezable_wq, &ev->dwork, intv);
1599 1602
1600 spin_unlock_irq(&ev->lock); 1603 spin_unlock_irq(&ev->lock);
1601 1604
@@ -1733,9 +1736,9 @@ module_param_cb(events_dfl_poll_msecs, &disk_events_dfl_poll_msecs_param_ops,
1733 &disk_events_dfl_poll_msecs, 0644); 1736 &disk_events_dfl_poll_msecs, 0644);
1734 1737
1735/* 1738/*
1736 * disk_{add|del|release}_events - initialize and destroy disk_events. 1739 * disk_{alloc|add|del|release}_events - initialize and destroy disk_events.
1737 */ 1740 */
1738static void disk_add_events(struct gendisk *disk) 1741static void disk_alloc_events(struct gendisk *disk)
1739{ 1742{
1740 struct disk_events *ev; 1743 struct disk_events *ev;
1741 1744
@@ -1748,16 +1751,6 @@ static void disk_add_events(struct gendisk *disk)
1748 return; 1751 return;
1749 } 1752 }
1750 1753
1751 if (sysfs_create_files(&disk_to_dev(disk)->kobj,
1752 disk_events_attrs) < 0) {
1753 pr_warn("%s: failed to create sysfs files for events\n",
1754 disk->disk_name);
1755 kfree(ev);
1756 return;
1757 }
1758
1759 disk->ev = ev;
1760
1761 INIT_LIST_HEAD(&ev->node); 1754 INIT_LIST_HEAD(&ev->node);
1762 ev->disk = disk; 1755 ev->disk = disk;
1763 spin_lock_init(&ev->lock); 1756 spin_lock_init(&ev->lock);
@@ -1766,8 +1759,21 @@ static void disk_add_events(struct gendisk *disk)
1766 ev->poll_msecs = -1; 1759 ev->poll_msecs = -1;
1767 INIT_DELAYED_WORK(&ev->dwork, disk_events_workfn); 1760 INIT_DELAYED_WORK(&ev->dwork, disk_events_workfn);
1768 1761
1762 disk->ev = ev;
1763}
1764
1765static void disk_add_events(struct gendisk *disk)
1766{
1767 if (!disk->ev)
1768 return;
1769
1770 /* FIXME: error handling */
1771 if (sysfs_create_files(&disk_to_dev(disk)->kobj, disk_events_attrs) < 0)
1772 pr_warn("%s: failed to create sysfs files for events\n",
1773 disk->disk_name);
1774
1769 mutex_lock(&disk_events_mutex); 1775 mutex_lock(&disk_events_mutex);
1770 list_add_tail(&ev->node, &disk_events); 1776 list_add_tail(&disk->ev->node, &disk_events);
1771 mutex_unlock(&disk_events_mutex); 1777 mutex_unlock(&disk_events_mutex);
1772 1778
1773 /* 1779 /*
diff --git a/block/partition-generic.c b/block/partition-generic.c
index d06ec1c829c2..6df5d6928a44 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -389,17 +389,11 @@ static bool disk_unlock_native_capacity(struct gendisk *disk)
389 } 389 }
390} 390}
391 391
392int rescan_partitions(struct gendisk *disk, struct block_device *bdev) 392static int drop_partitions(struct gendisk *disk, struct block_device *bdev)
393{ 393{
394 struct parsed_partitions *state = NULL;
395 struct disk_part_iter piter; 394 struct disk_part_iter piter;
396 struct hd_struct *part; 395 struct hd_struct *part;
397 int p, highest, res; 396 int res;
398rescan:
399 if (state && !IS_ERR(state)) {
400 kfree(state);
401 state = NULL;
402 }
403 397
404 if (bdev->bd_part_count) 398 if (bdev->bd_part_count)
405 return -EBUSY; 399 return -EBUSY;
@@ -412,6 +406,24 @@ rescan:
412 delete_partition(disk, part->partno); 406 delete_partition(disk, part->partno);
413 disk_part_iter_exit(&piter); 407 disk_part_iter_exit(&piter);
414 408
409 return 0;
410}
411
412int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
413{
414 struct parsed_partitions *state = NULL;
415 struct hd_struct *part;
416 int p, highest, res;
417rescan:
418 if (state && !IS_ERR(state)) {
419 kfree(state);
420 state = NULL;
421 }
422
423 res = drop_partitions(disk, bdev);
424 if (res)
425 return res;
426
415 if (disk->fops->revalidate_disk) 427 if (disk->fops->revalidate_disk)
416 disk->fops->revalidate_disk(disk); 428 disk->fops->revalidate_disk(disk);
417 check_disk_size_change(disk, bdev); 429 check_disk_size_change(disk, bdev);
@@ -515,6 +527,26 @@ rescan:
515 return 0; 527 return 0;
516} 528}
517 529
530int invalidate_partitions(struct gendisk *disk, struct block_device *bdev)
531{
532 int res;
533
534 if (!bdev->bd_invalidated)
535 return 0;
536
537 res = drop_partitions(disk, bdev);
538 if (res)
539 return res;
540
541 set_capacity(disk, 0);
542 check_disk_size_change(disk, bdev);
543 bdev->bd_invalidated = 0;
544 /* tell userspace that the media / partition table may have changed */
545 kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);
546
547 return 0;
548}
549
518unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p) 550unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
519{ 551{
520 struct address_space *mapping = bdev->bd_inode->i_mapping; 552 struct address_space *mapping = bdev->bd_inode->i_mapping;
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index e086fbbbe853..8db9089127c5 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -1177,7 +1177,8 @@ static bool DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T
1177 int TimeoutCounter; 1177 int TimeoutCounter;
1178 int i; 1178 int i;
1179 1179
1180 1180 memset(&CommandMailbox, 0, sizeof(DAC960_V1_CommandMailbox_T));
1181
1181 if (pci_set_dma_mask(Controller->PCIDevice, DMA_BIT_MASK(32))) 1182 if (pci_set_dma_mask(Controller->PCIDevice, DMA_BIT_MASK(32)))
1182 return DAC960_Failure(Controller, "DMA mask out of range"); 1183 return DAC960_Failure(Controller, "DMA mask out of range");
1183 Controller->BounceBufferLimit = DMA_BIT_MASK(32); 1184 Controller->BounceBufferLimit = DMA_BIT_MASK(32);
@@ -4627,7 +4628,8 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
4627 DAC960_Controller_T *Controller = Command->Controller; 4628 DAC960_Controller_T *Controller = Command->Controller;
4628 DAC960_CommandType_T CommandType = Command->CommandType; 4629 DAC960_CommandType_T CommandType = Command->CommandType;
4629 DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox; 4630 DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox;
4630 DAC960_V2_IOCTL_Opcode_T CommandOpcode = CommandMailbox->Common.IOCTL_Opcode; 4631 DAC960_V2_IOCTL_Opcode_T IOCTLOpcode = CommandMailbox->Common.IOCTL_Opcode;
4632 DAC960_V2_CommandOpcode_T CommandOpcode = CommandMailbox->SCSI_10.CommandOpcode;
4631 DAC960_V2_CommandStatus_T CommandStatus = Command->V2.CommandStatus; 4633 DAC960_V2_CommandStatus_T CommandStatus = Command->V2.CommandStatus;
4632 4634
4633 if (CommandType == DAC960_ReadCommand || 4635 if (CommandType == DAC960_ReadCommand ||
@@ -4699,7 +4701,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
4699 { 4701 {
4700 if (Controller->ShutdownMonitoringTimer) 4702 if (Controller->ShutdownMonitoringTimer)
4701 return; 4703 return;
4702 if (CommandOpcode == DAC960_V2_GetControllerInfo) 4704 if (IOCTLOpcode == DAC960_V2_GetControllerInfo)
4703 { 4705 {
4704 DAC960_V2_ControllerInfo_T *NewControllerInfo = 4706 DAC960_V2_ControllerInfo_T *NewControllerInfo =
4705 Controller->V2.NewControllerInformation; 4707 Controller->V2.NewControllerInformation;
@@ -4719,14 +4721,14 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
4719 memcpy(ControllerInfo, NewControllerInfo, 4721 memcpy(ControllerInfo, NewControllerInfo,
4720 sizeof(DAC960_V2_ControllerInfo_T)); 4722 sizeof(DAC960_V2_ControllerInfo_T));
4721 } 4723 }
4722 else if (CommandOpcode == DAC960_V2_GetEvent) 4724 else if (IOCTLOpcode == DAC960_V2_GetEvent)
4723 { 4725 {
4724 if (CommandStatus == DAC960_V2_NormalCompletion) { 4726 if (CommandStatus == DAC960_V2_NormalCompletion) {
4725 DAC960_V2_ReportEvent(Controller, Controller->V2.Event); 4727 DAC960_V2_ReportEvent(Controller, Controller->V2.Event);
4726 } 4728 }
4727 Controller->V2.NextEventSequenceNumber++; 4729 Controller->V2.NextEventSequenceNumber++;
4728 } 4730 }
4729 else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid && 4731 else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid &&
4730 CommandStatus == DAC960_V2_NormalCompletion) 4732 CommandStatus == DAC960_V2_NormalCompletion)
4731 { 4733 {
4732 DAC960_V2_PhysicalDeviceInfo_T *NewPhysicalDeviceInfo = 4734 DAC960_V2_PhysicalDeviceInfo_T *NewPhysicalDeviceInfo =
@@ -4915,7 +4917,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
4915 NewPhysicalDeviceInfo->LogicalUnit++; 4917 NewPhysicalDeviceInfo->LogicalUnit++;
4916 Controller->V2.PhysicalDeviceIndex++; 4918 Controller->V2.PhysicalDeviceIndex++;
4917 } 4919 }
4918 else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid) 4920 else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid)
4919 { 4921 {
4920 unsigned int DeviceIndex; 4922 unsigned int DeviceIndex;
4921 for (DeviceIndex = Controller->V2.PhysicalDeviceIndex; 4923 for (DeviceIndex = Controller->V2.PhysicalDeviceIndex;
@@ -4938,7 +4940,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
4938 } 4940 }
4939 Controller->V2.NeedPhysicalDeviceInformation = false; 4941 Controller->V2.NeedPhysicalDeviceInformation = false;
4940 } 4942 }
4941 else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid && 4943 else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid &&
4942 CommandStatus == DAC960_V2_NormalCompletion) 4944 CommandStatus == DAC960_V2_NormalCompletion)
4943 { 4945 {
4944 DAC960_V2_LogicalDeviceInfo_T *NewLogicalDeviceInfo = 4946 DAC960_V2_LogicalDeviceInfo_T *NewLogicalDeviceInfo =
@@ -5065,7 +5067,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
5065 [LogicalDeviceNumber] = true; 5067 [LogicalDeviceNumber] = true;
5066 NewLogicalDeviceInfo->LogicalDeviceNumber++; 5068 NewLogicalDeviceInfo->LogicalDeviceNumber++;
5067 } 5069 }
5068 else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid) 5070 else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid)
5069 { 5071 {
5070 int LogicalDriveNumber; 5072 int LogicalDriveNumber;
5071 for (LogicalDriveNumber = 0; 5073 for (LogicalDriveNumber = 0;
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index e7472f567c9d..3fb6ab4c8b4e 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1120,7 +1120,7 @@ static inline void carm_handle_resp(struct carm_host *host,
1120 break; 1120 break;
1121 case MISC_GET_FW_VER: { 1121 case MISC_GET_FW_VER: {
1122 struct carm_fw_ver *ver = (struct carm_fw_ver *) 1122 struct carm_fw_ver *ver = (struct carm_fw_ver *)
1123 mem + sizeof(struct carm_msg_get_fw_ver); 1123 (mem + sizeof(struct carm_msg_get_fw_ver));
1124 if (!error) { 1124 if (!error) {
1125 host->fw_ver = le32_to_cpu(ver->version); 1125 host->fw_ver = le32_to_cpu(ver->version);
1126 host->flags |= (ver->features & FL_FW_VER_MASK); 1126 host->flags |= (ver->features & FL_FW_VER_MASK);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c
index 618bd4d87d28..99d5527b2ca6 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_connector.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c
@@ -54,14 +54,14 @@ convert_to_display_mode(struct drm_display_mode *mode,
54 mode->vrefresh = timing->refresh; 54 mode->vrefresh = timing->refresh;
55 55
56 mode->hdisplay = timing->xres; 56 mode->hdisplay = timing->xres;
57 mode->hsync_start = mode->hdisplay + timing->left_margin; 57 mode->hsync_start = mode->hdisplay + timing->right_margin;
58 mode->hsync_end = mode->hsync_start + timing->hsync_len; 58 mode->hsync_end = mode->hsync_start + timing->hsync_len;
59 mode->htotal = mode->hsync_end + timing->right_margin; 59 mode->htotal = mode->hsync_end + timing->left_margin;
60 60
61 mode->vdisplay = timing->yres; 61 mode->vdisplay = timing->yres;
62 mode->vsync_start = mode->vdisplay + timing->upper_margin; 62 mode->vsync_start = mode->vdisplay + timing->lower_margin;
63 mode->vsync_end = mode->vsync_start + timing->vsync_len; 63 mode->vsync_end = mode->vsync_start + timing->vsync_len;
64 mode->vtotal = mode->vsync_end + timing->lower_margin; 64 mode->vtotal = mode->vsync_end + timing->upper_margin;
65 mode->width_mm = panel->width_mm; 65 mode->width_mm = panel->width_mm;
66 mode->height_mm = panel->height_mm; 66 mode->height_mm = panel->height_mm;
67 67
@@ -85,14 +85,14 @@ convert_to_video_timing(struct fb_videomode *timing,
85 timing->refresh = drm_mode_vrefresh(mode); 85 timing->refresh = drm_mode_vrefresh(mode);
86 86
87 timing->xres = mode->hdisplay; 87 timing->xres = mode->hdisplay;
88 timing->left_margin = mode->hsync_start - mode->hdisplay; 88 timing->right_margin = mode->hsync_start - mode->hdisplay;
89 timing->hsync_len = mode->hsync_end - mode->hsync_start; 89 timing->hsync_len = mode->hsync_end - mode->hsync_start;
90 timing->right_margin = mode->htotal - mode->hsync_end; 90 timing->left_margin = mode->htotal - mode->hsync_end;
91 91
92 timing->yres = mode->vdisplay; 92 timing->yres = mode->vdisplay;
93 timing->upper_margin = mode->vsync_start - mode->vdisplay; 93 timing->lower_margin = mode->vsync_start - mode->vdisplay;
94 timing->vsync_len = mode->vsync_end - mode->vsync_start; 94 timing->vsync_len = mode->vsync_end - mode->vsync_start;
95 timing->lower_margin = mode->vtotal - mode->vsync_end; 95 timing->upper_margin = mode->vtotal - mode->vsync_end;
96 96
97 if (mode->flags & DRM_MODE_FLAG_INTERLACE) 97 if (mode->flags & DRM_MODE_FLAG_INTERLACE)
98 timing->vmode = FB_VMODE_INTERLACED; 98 timing->vmode = FB_VMODE_INTERLACED;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 58820ebd3558..09cc13f791b3 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -246,7 +246,7 @@ static struct platform_driver exynos_drm_platform_driver = {
246 .remove = __devexit_p(exynos_drm_platform_remove), 246 .remove = __devexit_p(exynos_drm_platform_remove),
247 .driver = { 247 .driver = {
248 .owner = THIS_MODULE, 248 .owner = THIS_MODULE,
249 .name = DRIVER_NAME, 249 .name = "exynos-drm",
250 }, 250 },
251}; 251};
252 252
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index 3508700e529b..54f8f074822f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -46,39 +46,13 @@ struct exynos_drm_fbdev {
46 struct exynos_drm_gem_obj *exynos_gem_obj; 46 struct exynos_drm_gem_obj *exynos_gem_obj;
47}; 47};
48 48
49static int exynos_drm_fbdev_set_par(struct fb_info *info)
50{
51 struct fb_var_screeninfo *var = &info->var;
52
53 switch (var->bits_per_pixel) {
54 case 32:
55 case 24:
56 case 18:
57 case 16:
58 case 12:
59 info->fix.visual = FB_VISUAL_TRUECOLOR;
60 break;
61 case 1:
62 info->fix.visual = FB_VISUAL_MONO01;
63 break;
64 default:
65 info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
66 break;
67 }
68
69 info->fix.line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
70
71 return drm_fb_helper_set_par(info);
72}
73
74
75static struct fb_ops exynos_drm_fb_ops = { 49static struct fb_ops exynos_drm_fb_ops = {
76 .owner = THIS_MODULE, 50 .owner = THIS_MODULE,
77 .fb_fillrect = cfb_fillrect, 51 .fb_fillrect = cfb_fillrect,
78 .fb_copyarea = cfb_copyarea, 52 .fb_copyarea = cfb_copyarea,
79 .fb_imageblit = cfb_imageblit, 53 .fb_imageblit = cfb_imageblit,
80 .fb_check_var = drm_fb_helper_check_var, 54 .fb_check_var = drm_fb_helper_check_var,
81 .fb_set_par = exynos_drm_fbdev_set_par, 55 .fb_set_par = drm_fb_helper_set_par,
82 .fb_blank = drm_fb_helper_blank, 56 .fb_blank = drm_fb_helper_blank,
83 .fb_pan_display = drm_fb_helper_pan_display, 57 .fb_pan_display = drm_fb_helper_pan_display,
84 .fb_setcmap = drm_fb_helper_setcmap, 58 .fb_setcmap = drm_fb_helper_setcmap,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 360adf2bba04..56458eea0501 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -817,8 +817,6 @@ static int __devinit fimd_probe(struct platform_device *pdev)
817 goto err_clk_get; 817 goto err_clk_get;
818 } 818 }
819 819
820 clk_enable(ctx->bus_clk);
821
822 ctx->lcd_clk = clk_get(dev, "sclk_fimd"); 820 ctx->lcd_clk = clk_get(dev, "sclk_fimd");
823 if (IS_ERR(ctx->lcd_clk)) { 821 if (IS_ERR(ctx->lcd_clk)) {
824 dev_err(dev, "failed to get lcd clock\n"); 822 dev_err(dev, "failed to get lcd clock\n");
@@ -826,8 +824,6 @@ static int __devinit fimd_probe(struct platform_device *pdev)
826 goto err_bus_clk; 824 goto err_bus_clk;
827 } 825 }
828 826
829 clk_enable(ctx->lcd_clk);
830
831 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 827 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
832 if (!res) { 828 if (!res) {
833 dev_err(dev, "failed to find registers\n"); 829 dev_err(dev, "failed to find registers\n");
@@ -864,17 +860,11 @@ static int __devinit fimd_probe(struct platform_device *pdev)
864 goto err_req_irq; 860 goto err_req_irq;
865 } 861 }
866 862
867 ctx->clkdiv = fimd_calc_clkdiv(ctx, &panel->timing);
868 ctx->vidcon0 = pdata->vidcon0; 863 ctx->vidcon0 = pdata->vidcon0;
869 ctx->vidcon1 = pdata->vidcon1; 864 ctx->vidcon1 = pdata->vidcon1;
870 ctx->default_win = pdata->default_win; 865 ctx->default_win = pdata->default_win;
871 ctx->panel = panel; 866 ctx->panel = panel;
872 867
873 panel->timing.pixclock = clk_get_rate(ctx->lcd_clk) / ctx->clkdiv;
874
875 DRM_DEBUG_KMS("pixel clock = %d, clkdiv = %d\n",
876 panel->timing.pixclock, ctx->clkdiv);
877
878 subdrv = &ctx->subdrv; 868 subdrv = &ctx->subdrv;
879 869
880 subdrv->probe = fimd_subdrv_probe; 870 subdrv->probe = fimd_subdrv_probe;
@@ -889,10 +879,15 @@ static int __devinit fimd_probe(struct platform_device *pdev)
889 879
890 platform_set_drvdata(pdev, ctx); 880 platform_set_drvdata(pdev, ctx);
891 881
892 pm_runtime_set_active(dev);
893 pm_runtime_enable(dev); 882 pm_runtime_enable(dev);
894 pm_runtime_get_sync(dev); 883 pm_runtime_get_sync(dev);
895 884
885 ctx->clkdiv = fimd_calc_clkdiv(ctx, &panel->timing);
886 panel->timing.pixclock = clk_get_rate(ctx->lcd_clk) / ctx->clkdiv;
887
888 DRM_DEBUG_KMS("pixel clock = %d, clkdiv = %d\n",
889 panel->timing.pixclock, ctx->clkdiv);
890
896 for (win = 0; win < WINDOWS_NR; win++) 891 for (win = 0; win < WINDOWS_NR; win++)
897 fimd_clear_win(ctx, win); 892 fimd_clear_win(ctx, win);
898 893
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 03c53fcf8653..558ac716a328 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2689,7 +2689,7 @@
2689#define DVS_FORMAT_RGBX888 (2<<25) 2689#define DVS_FORMAT_RGBX888 (2<<25)
2690#define DVS_FORMAT_RGBX161616 (3<<25) 2690#define DVS_FORMAT_RGBX161616 (3<<25)
2691#define DVS_SOURCE_KEY (1<<22) 2691#define DVS_SOURCE_KEY (1<<22)
2692#define DVS_RGB_ORDER_RGBX (1<<20) 2692#define DVS_RGB_ORDER_XBGR (1<<20)
2693#define DVS_YUV_BYTE_ORDER_MASK (3<<16) 2693#define DVS_YUV_BYTE_ORDER_MASK (3<<16)
2694#define DVS_YUV_ORDER_YUYV (0<<16) 2694#define DVS_YUV_ORDER_YUYV (0<<16)
2695#define DVS_YUV_ORDER_UYVY (1<<16) 2695#define DVS_YUV_ORDER_UYVY (1<<16)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f851db7be2cc..397087cf689e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7828,6 +7828,7 @@ int intel_framebuffer_init(struct drm_device *dev,
7828 case DRM_FORMAT_RGB332: 7828 case DRM_FORMAT_RGB332:
7829 case DRM_FORMAT_RGB565: 7829 case DRM_FORMAT_RGB565:
7830 case DRM_FORMAT_XRGB8888: 7830 case DRM_FORMAT_XRGB8888:
7831 case DRM_FORMAT_XBGR8888:
7831 case DRM_FORMAT_ARGB8888: 7832 case DRM_FORMAT_ARGB8888:
7832 case DRM_FORMAT_XRGB2101010: 7833 case DRM_FORMAT_XRGB2101010:
7833 case DRM_FORMAT_ARGB2101010: 7834 case DRM_FORMAT_ARGB2101010:
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 2288abf88cce..a0835040c86b 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -225,16 +225,16 @@ snb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
225 225
226 /* Mask out pixel format bits in case we change it */ 226 /* Mask out pixel format bits in case we change it */
227 dvscntr &= ~DVS_PIXFORMAT_MASK; 227 dvscntr &= ~DVS_PIXFORMAT_MASK;
228 dvscntr &= ~DVS_RGB_ORDER_RGBX; 228 dvscntr &= ~DVS_RGB_ORDER_XBGR;
229 dvscntr &= ~DVS_YUV_BYTE_ORDER_MASK; 229 dvscntr &= ~DVS_YUV_BYTE_ORDER_MASK;
230 230
231 switch (fb->pixel_format) { 231 switch (fb->pixel_format) {
232 case DRM_FORMAT_XBGR8888: 232 case DRM_FORMAT_XBGR8888:
233 dvscntr |= DVS_FORMAT_RGBX888; 233 dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_XBGR;
234 pixel_size = 4; 234 pixel_size = 4;
235 break; 235 break;
236 case DRM_FORMAT_XRGB8888: 236 case DRM_FORMAT_XRGB8888:
237 dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_RGBX; 237 dvscntr |= DVS_FORMAT_RGBX888;
238 pixel_size = 4; 238 pixel_size = 4;
239 break; 239 break;
240 case DRM_FORMAT_YUYV: 240 case DRM_FORMAT_YUYV:
diff --git a/drivers/hwmon/pmbus/zl6100.c b/drivers/hwmon/pmbus/zl6100.c
index 880b90cf4d32..e3e8420b7b81 100644
--- a/drivers/hwmon/pmbus/zl6100.c
+++ b/drivers/hwmon/pmbus/zl6100.c
@@ -200,17 +200,11 @@ static int zl6100_probe(struct i2c_client *client,
200 data->id = mid->driver_data; 200 data->id = mid->driver_data;
201 201
202 /* 202 /*
203 * ZL2005, ZL2008, ZL2105, and ZL6100 are known to require a wait time 203 * According to information from the chip vendor, all currently
204 * between I2C accesses. ZL2004 and ZL6105 are known to be safe. 204 * supported chips are known to require a wait time between I2C
205 * Other chips have not yet been tested. 205 * accesses.
206 *
207 * Only clear the wait time for chips known to be safe. The wait time
208 * can be cleared later for additional chips if tests show that it
209 * is not needed (in other words, better be safe than sorry).
210 */ 206 */
211 data->delay = delay; 207 data->delay = delay;
212 if (data->id == zl2004 || data->id == zl6105)
213 data->delay = 0;
214 208
215 /* 209 /*
216 * Since there was a direct I2C device access above, wait before 210 * Since there was a direct I2C device access above, wait before
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 5276d1933dbc..a658d62c5e10 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -39,7 +39,7 @@
39 0x8860 0xa1 39 0x8860 0xa1
40 w83627dhg 9 5 4 3 0xa020 0xc1 0x5ca3 40 w83627dhg 9 5 4 3 0xa020 0xc1 0x5ca3
41 w83627dhg-p 9 5 4 3 0xb070 0xc1 0x5ca3 41 w83627dhg-p 9 5 4 3 0xb070 0xc1 0x5ca3
42 w83627uhg 8 2 2 2 0xa230 0xc1 0x5ca3 42 w83627uhg 8 2 2 3 0xa230 0xc1 0x5ca3
43 w83667hg 9 5 3 3 0xa510 0xc1 0x5ca3 43 w83667hg 9 5 3 3 0xa510 0xc1 0x5ca3
44 w83667hg-b 9 5 3 4 0xb350 0xc1 0x5ca3 44 w83667hg-b 9 5 3 4 0xb350 0xc1 0x5ca3
45 nct6775f 9 4 3 9 0xb470 0xc1 0x5ca3 45 nct6775f 9 4 3 9 0xb470 0xc1 0x5ca3
@@ -1607,7 +1607,7 @@ store_##reg(struct device *dev, struct device_attribute *attr, \
1607 val = step_time_to_reg(val, data->pwm_mode[nr]); \ 1607 val = step_time_to_reg(val, data->pwm_mode[nr]); \
1608 mutex_lock(&data->update_lock); \ 1608 mutex_lock(&data->update_lock); \
1609 data->reg[nr] = val; \ 1609 data->reg[nr] = val; \
1610 w83627ehf_write_value(data, W83627EHF_REG_##REG[nr], val); \ 1610 w83627ehf_write_value(data, data->REG_##REG[nr], val); \
1611 mutex_unlock(&data->update_lock); \ 1611 mutex_unlock(&data->update_lock); \
1612 return count; \ 1612 return count; \
1613} \ 1613} \
@@ -2004,7 +2004,8 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
2004 goto exit; 2004 goto exit;
2005 } 2005 }
2006 2006
2007 data = kzalloc(sizeof(struct w83627ehf_data), GFP_KERNEL); 2007 data = devm_kzalloc(&pdev->dev, sizeof(struct w83627ehf_data),
2008 GFP_KERNEL);
2008 if (!data) { 2009 if (!data) {
2009 err = -ENOMEM; 2010 err = -ENOMEM;
2010 goto exit_release; 2011 goto exit_release;
@@ -2157,16 +2158,16 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
2157 w83627ehf_set_temp_reg_ehf(data, 3); 2158 w83627ehf_set_temp_reg_ehf(data, 3);
2158 2159
2159 /* 2160 /*
2160 * Temperature sources for temp1 and temp2 are selected with 2161 * Temperature sources for temp2 and temp3 are selected with
2161 * bank 0, registers 0x49 and 0x4a. 2162 * bank 0, registers 0x49 and 0x4a.
2162 */ 2163 */
2163 data->temp_src[0] = 0; /* SYSTIN */ 2164 data->temp_src[0] = 0; /* SYSTIN */
2164 reg = w83627ehf_read_value(data, 0x49) & 0x07; 2165 reg = w83627ehf_read_value(data, 0x49) & 0x07;
2165 /* Adjust to have the same mapping as other source registers */ 2166 /* Adjust to have the same mapping as other source registers */
2166 if (reg == 0) 2167 if (reg == 0)
2167 data->temp_src[1]++; 2168 data->temp_src[1] = 1;
2168 else if (reg >= 2 && reg <= 5) 2169 else if (reg >= 2 && reg <= 5)
2169 data->temp_src[1] += 2; 2170 data->temp_src[1] = reg + 2;
2170 else /* should never happen */ 2171 else /* should never happen */
2171 data->have_temp &= ~(1 << 1); 2172 data->have_temp &= ~(1 << 1);
2172 reg = w83627ehf_read_value(data, 0x4a); 2173 reg = w83627ehf_read_value(data, 0x4a);
@@ -2493,9 +2494,8 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
2493 2494
2494exit_remove: 2495exit_remove:
2495 w83627ehf_device_remove_files(dev); 2496 w83627ehf_device_remove_files(dev);
2496 kfree(data);
2497 platform_set_drvdata(pdev, NULL);
2498exit_release: 2497exit_release:
2498 platform_set_drvdata(pdev, NULL);
2499 release_region(res->start, IOREGION_LENGTH); 2499 release_region(res->start, IOREGION_LENGTH);
2500exit: 2500exit:
2501 return err; 2501 return err;
@@ -2509,7 +2509,6 @@ static int __devexit w83627ehf_remove(struct platform_device *pdev)
2509 w83627ehf_device_remove_files(&pdev->dev); 2509 w83627ehf_device_remove_files(&pdev->dev);
2510 release_region(data->addr, IOREGION_LENGTH); 2510 release_region(data->addr, IOREGION_LENGTH);
2511 platform_set_drvdata(pdev, NULL); 2511 platform_set_drvdata(pdev, NULL);
2512 kfree(data);
2513 2512
2514 return 0; 2513 return 0;
2515} 2514}
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 525c7345fa0b..24f94f4ae395 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -103,8 +103,14 @@ static int sclhi(struct i2c_algo_bit_data *adap)
103 * chips may hold it low ("clock stretching") while they 103 * chips may hold it low ("clock stretching") while they
104 * are processing data internally. 104 * are processing data internally.
105 */ 105 */
106 if (time_after(jiffies, start + adap->timeout)) 106 if (time_after(jiffies, start + adap->timeout)) {
107 /* Test one last time, as we may have been preempted
108 * between last check and timeout test.
109 */
110 if (getscl(adap))
111 break;
107 return -ETIMEDOUT; 112 return -ETIMEDOUT;
113 }
108 cond_resched(); 114 cond_resched();
109 } 115 }
110#ifdef DEBUG 116#ifdef DEBUG
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 1e5606185b4f..e9c18939eda7 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1386,8 +1386,10 @@ int i2c_master_send(const struct i2c_client *client, const char *buf, int count)
1386 1386
1387 ret = i2c_transfer(adap, &msg, 1); 1387 ret = i2c_transfer(adap, &msg, 1);
1388 1388
1389 /* If everything went ok (i.e. 1 msg transmitted), return #bytes 1389 /*
1390 transmitted, else error code. */ 1390 * If everything went ok (i.e. 1 msg transmitted), return #bytes
1391 * transmitted, else error code.
1392 */
1391 return (ret == 1) ? count : ret; 1393 return (ret == 1) ? count : ret;
1392} 1394}
1393EXPORT_SYMBOL(i2c_master_send); 1395EXPORT_SYMBOL(i2c_master_send);
@@ -1414,8 +1416,10 @@ int i2c_master_recv(const struct i2c_client *client, char *buf, int count)
1414 1416
1415 ret = i2c_transfer(adap, &msg, 1); 1417 ret = i2c_transfer(adap, &msg, 1);
1416 1418
1417 /* If everything went ok (i.e. 1 msg transmitted), return #bytes 1419 /*
1418 transmitted, else error code. */ 1420 * If everything went ok (i.e. 1 msg received), return #bytes received,
1421 * else error code.
1422 */
1419 return (ret == 1) ? count : ret; 1423 return (ret == 1) ? count : ret;
1420} 1424}
1421EXPORT_SYMBOL(i2c_master_recv); 1425EXPORT_SYMBOL(i2c_master_recv);
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index 654685c9303e..aa77e54a8fae 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -49,9 +49,6 @@ struct smsdvb_client_t {
49 49
50 struct completion tune_done; 50 struct completion tune_done;
51 51
52 /* todo: save freq/band instead whole struct */
53 struct dtv_frontend_properties fe_params;
54
55 struct SMSHOSTLIB_STATISTICS_DVB_S sms_stat_dvb; 52 struct SMSHOSTLIB_STATISTICS_DVB_S sms_stat_dvb;
56 int event_fe_state; 53 int event_fe_state;
57 int event_unc_state; 54 int event_unc_state;
@@ -744,12 +741,124 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe)
744 struct dtv_frontend_properties *fep = &fe->dtv_property_cache; 741 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
745 struct smsdvb_client_t *client = 742 struct smsdvb_client_t *client =
746 container_of(fe, struct smsdvb_client_t, frontend); 743 container_of(fe, struct smsdvb_client_t, frontend);
744 struct smscore_device_t *coredev = client->coredev;
745 struct TRANSMISSION_STATISTICS_S *td =
746 &client->sms_stat_dvb.TransmissionData;
747 747
748 sms_debug(""); 748 switch (smscore_get_device_mode(coredev)) {
749 case DEVICE_MODE_DVBT:
750 case DEVICE_MODE_DVBT_BDA:
751 fep->frequency = td->Frequency;
752
753 switch (td->Bandwidth) {
754 case 6:
755 fep->bandwidth_hz = 6000000;
756 break;
757 case 7:
758 fep->bandwidth_hz = 7000000;
759 break;
760 case 8:
761 fep->bandwidth_hz = 8000000;
762 break;
763 }
764
765 switch (td->TransmissionMode) {
766 case 2:
767 fep->transmission_mode = TRANSMISSION_MODE_2K;
768 break;
769 case 8:
770 fep->transmission_mode = TRANSMISSION_MODE_8K;
771 }
772
773 switch (td->GuardInterval) {
774 case 0:
775 fep->guard_interval = GUARD_INTERVAL_1_32;
776 break;
777 case 1:
778 fep->guard_interval = GUARD_INTERVAL_1_16;
779 break;
780 case 2:
781 fep->guard_interval = GUARD_INTERVAL_1_8;
782 break;
783 case 3:
784 fep->guard_interval = GUARD_INTERVAL_1_4;
785 break;
786 }
787
788 switch (td->CodeRate) {
789 case 0:
790 fep->code_rate_HP = FEC_1_2;
791 break;
792 case 1:
793 fep->code_rate_HP = FEC_2_3;
794 break;
795 case 2:
796 fep->code_rate_HP = FEC_3_4;
797 break;
798 case 3:
799 fep->code_rate_HP = FEC_5_6;
800 break;
801 case 4:
802 fep->code_rate_HP = FEC_7_8;
803 break;
804 }
805
806 switch (td->LPCodeRate) {
807 case 0:
808 fep->code_rate_LP = FEC_1_2;
809 break;
810 case 1:
811 fep->code_rate_LP = FEC_2_3;
812 break;
813 case 2:
814 fep->code_rate_LP = FEC_3_4;
815 break;
816 case 3:
817 fep->code_rate_LP = FEC_5_6;
818 break;
819 case 4:
820 fep->code_rate_LP = FEC_7_8;
821 break;
822 }
823
824 switch (td->Constellation) {
825 case 0:
826 fep->modulation = QPSK;
827 break;
828 case 1:
829 fep->modulation = QAM_16;
830 break;
831 case 2:
832 fep->modulation = QAM_64;
833 break;
834 }
835
836 switch (td->Hierarchy) {
837 case 0:
838 fep->hierarchy = HIERARCHY_NONE;
839 break;
840 case 1:
841 fep->hierarchy = HIERARCHY_1;
842 break;
843 case 2:
844 fep->hierarchy = HIERARCHY_2;
845 break;
846 case 3:
847 fep->hierarchy = HIERARCHY_4;
848 break;
849 }
749 850
750 /* todo: */ 851 fep->inversion = INVERSION_AUTO;
751 memcpy(fep, &client->fe_params, 852 break;
752 sizeof(struct dtv_frontend_properties)); 853 case DEVICE_MODE_ISDBT:
854 case DEVICE_MODE_ISDBT_BDA:
855 fep->frequency = td->Frequency;
856 fep->bandwidth_hz = 6000000;
857 /* todo: retrive the other parameters */
858 break;
859 default:
860 return -EINVAL;
861 }
753 862
754 return 0; 863 return 0;
755} 864}
@@ -872,11 +981,11 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
872 switch (smscore_get_device_mode(coredev)) { 981 switch (smscore_get_device_mode(coredev)) {
873 case DEVICE_MODE_DVBT: 982 case DEVICE_MODE_DVBT:
874 case DEVICE_MODE_DVBT_BDA: 983 case DEVICE_MODE_DVBT_BDA:
875 smsdvb_fe_ops.delsys[0] = SYS_DVBT; 984 client->frontend.ops.delsys[0] = SYS_DVBT;
876 break; 985 break;
877 case DEVICE_MODE_ISDBT: 986 case DEVICE_MODE_ISDBT:
878 case DEVICE_MODE_ISDBT_BDA: 987 case DEVICE_MODE_ISDBT_BDA:
879 smsdvb_fe_ops.delsys[0] = SYS_ISDBT; 988 client->frontend.ops.delsys[0] = SYS_ISDBT;
880 break; 989 break;
881 } 990 }
882 991
diff --git a/drivers/media/video/davinci/isif.c b/drivers/media/video/davinci/isif.c
index 1e63852374be..5278fe7d6d0c 100644
--- a/drivers/media/video/davinci/isif.c
+++ b/drivers/media/video/davinci/isif.c
@@ -34,6 +34,7 @@
34#include <linux/videodev2.h> 34#include <linux/videodev2.h>
35#include <linux/clk.h> 35#include <linux/clk.h>
36#include <linux/err.h> 36#include <linux/err.h>
37#include <linux/module.h>
37 38
38#include <mach/mux.h> 39#include <mach/mux.h>
39 40
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index c7e69b8f81c9..4a44f9a1bae0 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -611,9 +611,11 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
611 delta_stc = buf->pts - (1UL << 31); 611 delta_stc = buf->pts - (1UL << 31);
612 x1 = first->dev_stc - delta_stc; 612 x1 = first->dev_stc - delta_stc;
613 x2 = last->dev_stc - delta_stc; 613 x2 = last->dev_stc - delta_stc;
614 if (x1 == x2)
615 goto done;
616
614 y1 = (first->dev_sof + 2048) << 16; 617 y1 = (first->dev_sof + 2048) << 16;
615 y2 = (last->dev_sof + 2048) << 16; 618 y2 = (last->dev_sof + 2048) << 16;
616
617 if (y2 < y1) 619 if (y2 < y1)
618 y2 += 2048 << 16; 620 y2 += 2048 << 16;
619 621
@@ -631,14 +633,16 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
631 x1, x2, y1, y2, clock->sof_offset); 633 x1, x2, y1, y2, clock->sof_offset);
632 634
633 /* Second step, SOF to host clock conversion. */ 635 /* Second step, SOF to host clock conversion. */
634 ts = timespec_sub(last->host_ts, first->host_ts);
635 x1 = (uvc_video_clock_host_sof(first) + 2048) << 16; 636 x1 = (uvc_video_clock_host_sof(first) + 2048) << 16;
636 x2 = (uvc_video_clock_host_sof(last) + 2048) << 16; 637 x2 = (uvc_video_clock_host_sof(last) + 2048) << 16;
637 y1 = NSEC_PER_SEC;
638 y2 = (ts.tv_sec + 1) * NSEC_PER_SEC + ts.tv_nsec;
639
640 if (x2 < x1) 638 if (x2 < x1)
641 x2 += 2048 << 16; 639 x2 += 2048 << 16;
640 if (x1 == x2)
641 goto done;
642
643 ts = timespec_sub(last->host_ts, first->host_ts);
644 y1 = NSEC_PER_SEC;
645 y2 = (ts.tv_sec + 1) * NSEC_PER_SEC + ts.tv_nsec;
642 646
643 /* Interpolated and host SOF timestamps can wrap around at slightly 647 /* Interpolated and host SOF timestamps can wrap around at slightly
644 * different times. Handle this by adding or removing 2048 to or from 648 * different times. Handle this by adding or removing 2048 to or from
diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h
index 822e54c394d5..1c226b31af13 100644
--- a/drivers/rapidio/devices/tsi721.h
+++ b/drivers/rapidio/devices/tsi721.h
@@ -118,34 +118,34 @@
118 118
119#define TSI721_IDB_ENTRY_SIZE 64 119#define TSI721_IDB_ENTRY_SIZE 64
120 120
121#define TSI721_IDQ_CTL(x) (0x20000 + (x) * 1000) 121#define TSI721_IDQ_CTL(x) (0x20000 + (x) * 0x1000)
122#define TSI721_IDQ_SUSPEND 0x00000002 122#define TSI721_IDQ_SUSPEND 0x00000002
123#define TSI721_IDQ_INIT 0x00000001 123#define TSI721_IDQ_INIT 0x00000001
124 124
125#define TSI721_IDQ_STS(x) (0x20004 + (x) * 1000) 125#define TSI721_IDQ_STS(x) (0x20004 + (x) * 0x1000)
126#define TSI721_IDQ_RUN 0x00200000 126#define TSI721_IDQ_RUN 0x00200000
127 127
128#define TSI721_IDQ_MASK(x) (0x20008 + (x) * 1000) 128#define TSI721_IDQ_MASK(x) (0x20008 + (x) * 0x1000)
129#define TSI721_IDQ_MASK_MASK 0xffff0000 129#define TSI721_IDQ_MASK_MASK 0xffff0000
130#define TSI721_IDQ_MASK_PATT 0x0000ffff 130#define TSI721_IDQ_MASK_PATT 0x0000ffff
131 131
132#define TSI721_IDQ_RP(x) (0x2000c + (x) * 1000) 132#define TSI721_IDQ_RP(x) (0x2000c + (x) * 0x1000)
133#define TSI721_IDQ_RP_PTR 0x0007ffff 133#define TSI721_IDQ_RP_PTR 0x0007ffff
134 134
135#define TSI721_IDQ_WP(x) (0x20010 + (x) * 1000) 135#define TSI721_IDQ_WP(x) (0x20010 + (x) * 0x1000)
136#define TSI721_IDQ_WP_PTR 0x0007ffff 136#define TSI721_IDQ_WP_PTR 0x0007ffff
137 137
138#define TSI721_IDQ_BASEL(x) (0x20014 + (x) * 1000) 138#define TSI721_IDQ_BASEL(x) (0x20014 + (x) * 0x1000)
139#define TSI721_IDQ_BASEL_ADDR 0xffffffc0 139#define TSI721_IDQ_BASEL_ADDR 0xffffffc0
140#define TSI721_IDQ_BASEU(x) (0x20018 + (x) * 1000) 140#define TSI721_IDQ_BASEU(x) (0x20018 + (x) * 0x1000)
141#define TSI721_IDQ_SIZE(x) (0x2001c + (x) * 1000) 141#define TSI721_IDQ_SIZE(x) (0x2001c + (x) * 0x1000)
142#define TSI721_IDQ_SIZE_VAL(size) (__fls(size) - 4) 142#define TSI721_IDQ_SIZE_VAL(size) (__fls(size) - 4)
143#define TSI721_IDQ_SIZE_MIN 512 143#define TSI721_IDQ_SIZE_MIN 512
144#define TSI721_IDQ_SIZE_MAX (512 * 1024) 144#define TSI721_IDQ_SIZE_MAX (512 * 1024)
145 145
146#define TSI721_SR_CHINT(x) (0x20040 + (x) * 1000) 146#define TSI721_SR_CHINT(x) (0x20040 + (x) * 0x1000)
147#define TSI721_SR_CHINTE(x) (0x20044 + (x) * 1000) 147#define TSI721_SR_CHINTE(x) (0x20044 + (x) * 0x1000)
148#define TSI721_SR_CHINTSET(x) (0x20048 + (x) * 1000) 148#define TSI721_SR_CHINTSET(x) (0x20048 + (x) * 0x1000)
149#define TSI721_SR_CHINT_ODBOK 0x00000020 149#define TSI721_SR_CHINT_ODBOK 0x00000020
150#define TSI721_SR_CHINT_IDBQRCV 0x00000010 150#define TSI721_SR_CHINT_IDBQRCV 0x00000010
151#define TSI721_SR_CHINT_SUSP 0x00000008 151#define TSI721_SR_CHINT_SUSP 0x00000008
@@ -156,7 +156,7 @@
156 156
157#define TSI721_IBWIN_NUM 8 157#define TSI721_IBWIN_NUM 8
158 158
159#define TSI721_IBWINLB(x) (0x29000 + (x) * 20) 159#define TSI721_IBWINLB(x) (0x29000 + (x) * 0x20)
160#define TSI721_IBWINLB_BA 0xfffff000 160#define TSI721_IBWINLB_BA 0xfffff000
161#define TSI721_IBWINLB_WEN 0x00000001 161#define TSI721_IBWINLB_WEN 0x00000001
162 162
@@ -187,13 +187,13 @@
187 */ 187 */
188#define TSI721_OBWIN_NUM TSI721_PC2SR_WINS 188#define TSI721_OBWIN_NUM TSI721_PC2SR_WINS
189 189
190#define TSI721_OBWINLB(x) (0x40000 + (x) * 20) 190#define TSI721_OBWINLB(x) (0x40000 + (x) * 0x20)
191#define TSI721_OBWINLB_BA 0xffff8000 191#define TSI721_OBWINLB_BA 0xffff8000
192#define TSI721_OBWINLB_WEN 0x00000001 192#define TSI721_OBWINLB_WEN 0x00000001
193 193
194#define TSI721_OBWINUB(x) (0x40004 + (x) * 20) 194#define TSI721_OBWINUB(x) (0x40004 + (x) * 0x20)
195 195
196#define TSI721_OBWINSZ(x) (0x40008 + (x) * 20) 196#define TSI721_OBWINSZ(x) (0x40008 + (x) * 0x20)
197#define TSI721_OBWINSZ_SIZE 0x00001f00 197#define TSI721_OBWINSZ_SIZE 0x00001f00
198#define TSI721_OBWIN_SIZE(size) (__fls(size) - 15) 198#define TSI721_OBWIN_SIZE(size) (__fls(size) - 15)
199 199
diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
index ea4d8f575ac6..09915e89705d 100644
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -226,7 +226,7 @@ static int da9052_regulator_set_voltage_int(struct regulator_dev *rdev,
226 if (min_uV < info->min_uV) 226 if (min_uV < info->min_uV)
227 min_uV = info->min_uV; 227 min_uV = info->min_uV;
228 228
229 *selector = (min_uV - info->min_uV) / info->step_uV; 229 *selector = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
230 230
231 ret = da9052_list_voltage(rdev, *selector); 231 ret = da9052_list_voltage(rdev, *selector);
232 if (ret < 0) 232 if (ret < 0)
@@ -318,10 +318,10 @@ static int da9052_set_buckperi_voltage(struct regulator_dev *rdev, int min_uV,
318 if ((regulator->da9052->chip_id == DA9052) && 318 if ((regulator->da9052->chip_id == DA9052) &&
319 (min_uV >= DA9052_CONST_3uV)) 319 (min_uV >= DA9052_CONST_3uV))
320 *selector = DA9052_BUCK_PERI_REG_MAP_UPTO_3uV + 320 *selector = DA9052_BUCK_PERI_REG_MAP_UPTO_3uV +
321 ((min_uV - DA9052_CONST_3uV) / 321 DIV_ROUND_UP(min_uV - DA9052_CONST_3uV,
322 (DA9052_BUCK_PERI_3uV_STEP)); 322 DA9052_BUCK_PERI_3uV_STEP);
323 else 323 else
324 *selector = (min_uV - info->min_uV) / info->step_uV; 324 *selector = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
325 325
326 ret = da9052_list_buckperi_voltage(rdev, *selector); 326 ret = da9052_list_buckperi_voltage(rdev, *selector);
327 if (ret < 0) 327 if (ret < 0)
@@ -400,6 +400,7 @@ static struct regulator_ops da9052_ldo_ops = {
400 .ops = &da9052_ldo5_6_ops,\ 400 .ops = &da9052_ldo5_6_ops,\
401 .type = REGULATOR_VOLTAGE,\ 401 .type = REGULATOR_VOLTAGE,\
402 .id = _id,\ 402 .id = _id,\
403 .n_voltages = (max - min) / step + 1, \
403 .owner = THIS_MODULE,\ 404 .owner = THIS_MODULE,\
404 },\ 405 },\
405 .min_uV = (min) * 1000,\ 406 .min_uV = (min) * 1000,\
@@ -417,6 +418,7 @@ static struct regulator_ops da9052_ldo_ops = {
417 .ops = &da9052_ldo_ops,\ 418 .ops = &da9052_ldo_ops,\
418 .type = REGULATOR_VOLTAGE,\ 419 .type = REGULATOR_VOLTAGE,\
419 .id = _id,\ 420 .id = _id,\
421 .n_voltages = (max - min) / step + 1, \
420 .owner = THIS_MODULE,\ 422 .owner = THIS_MODULE,\
421 },\ 423 },\
422 .min_uV = (min) * 1000,\ 424 .min_uV = (min) * 1000,\
@@ -434,6 +436,7 @@ static struct regulator_ops da9052_ldo_ops = {
434 .ops = &da9052_dcdc_ops,\ 436 .ops = &da9052_dcdc_ops,\
435 .type = REGULATOR_VOLTAGE,\ 437 .type = REGULATOR_VOLTAGE,\
436 .id = _id,\ 438 .id = _id,\
439 .n_voltages = (max - min) / step + 1, \
437 .owner = THIS_MODULE,\ 440 .owner = THIS_MODULE,\
438 },\ 441 },\
439 .min_uV = (min) * 1000,\ 442 .min_uV = (min) * 1000,\
@@ -451,6 +454,7 @@ static struct regulator_ops da9052_ldo_ops = {
451 .ops = &da9052_buckperi_ops,\ 454 .ops = &da9052_buckperi_ops,\
452 .type = REGULATOR_VOLTAGE,\ 455 .type = REGULATOR_VOLTAGE,\
453 .id = _id,\ 456 .id = _id,\
457 .n_voltages = (max - min) / step + 1, \
454 .owner = THIS_MODULE,\ 458 .owner = THIS_MODULE,\
455 },\ 459 },\
456 .min_uV = (min) * 1000,\ 460 .min_uV = (min) * 1000,\
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 70b7b1f4f000..2e94686b6fe6 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -481,7 +481,7 @@ static int set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
481 if (i >= info->n_voltages) 481 if (i >= info->n_voltages)
482 i = info->n_voltages - 1; 482 i = info->n_voltages - 1;
483 483
484 *selector = info->voltages[i]; 484 *selector = i;
485 485
486 return write_field(hw, &info->voltage, i); 486 return write_field(hw, &info->voltage, i);
487} 487}
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 44262908def5..501b27c18145 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1028,7 +1028,7 @@ done:
1028 return iscsit_add_reject_from_cmd( 1028 return iscsit_add_reject_from_cmd(
1029 ISCSI_REASON_BOOKMARK_NO_RESOURCES, 1029 ISCSI_REASON_BOOKMARK_NO_RESOURCES,
1030 1, 1, buf, cmd); 1030 1, 1, buf, cmd);
1031 } else if (transport_ret == -EINVAL) { 1031 } else if (transport_ret < 0) {
1032 /* 1032 /*
1033 * Unsupported SAM Opcode. CHECK_CONDITION will be sent 1033 * Unsupported SAM Opcode. CHECK_CONDITION will be sent
1034 * in iscsit_execute_cmd() during the CmdSN OOO Execution 1034 * in iscsit_execute_cmd() during the CmdSN OOO Execution
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index b7c779389eea..63e703bb6ac9 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -117,7 +117,7 @@ static struct t10_pr_registration *core_scsi3_locate_pr_reg(struct se_device *,
117 struct se_node_acl *, struct se_session *); 117 struct se_node_acl *, struct se_session *);
118static void core_scsi3_put_pr_reg(struct t10_pr_registration *); 118static void core_scsi3_put_pr_reg(struct t10_pr_registration *);
119 119
120static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret) 120static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd)
121{ 121{
122 struct se_session *se_sess = cmd->se_sess; 122 struct se_session *se_sess = cmd->se_sess;
123 struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev; 123 struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev;
@@ -127,7 +127,7 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret)
127 int conflict = 0; 127 int conflict = 0;
128 128
129 if (!crh) 129 if (!crh)
130 return false; 130 return -EINVAL;
131 131
132 pr_reg = core_scsi3_locate_pr_reg(cmd->se_dev, se_sess->se_node_acl, 132 pr_reg = core_scsi3_locate_pr_reg(cmd->se_dev, se_sess->se_node_acl,
133 se_sess); 133 se_sess);
@@ -155,16 +155,14 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret)
155 */ 155 */
156 if (pr_reg->pr_res_holder) { 156 if (pr_reg->pr_res_holder) {
157 core_scsi3_put_pr_reg(pr_reg); 157 core_scsi3_put_pr_reg(pr_reg);
158 *ret = 0; 158 return 1;
159 return false;
160 } 159 }
161 if ((pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_REGONLY) || 160 if ((pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_REGONLY) ||
162 (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_REGONLY) || 161 (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_REGONLY) ||
163 (pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) || 162 (pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
164 (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) { 163 (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) {
165 core_scsi3_put_pr_reg(pr_reg); 164 core_scsi3_put_pr_reg(pr_reg);
166 *ret = 0; 165 return 1;
167 return true;
168 } 166 }
169 core_scsi3_put_pr_reg(pr_reg); 167 core_scsi3_put_pr_reg(pr_reg);
170 conflict = 1; 168 conflict = 1;
@@ -189,10 +187,10 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret)
189 " while active SPC-3 registrations exist," 187 " while active SPC-3 registrations exist,"
190 " returning RESERVATION_CONFLICT\n"); 188 " returning RESERVATION_CONFLICT\n");
191 cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT; 189 cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
192 return true; 190 return -EBUSY;
193 } 191 }
194 192
195 return false; 193 return 0;
196} 194}
197 195
198int target_scsi2_reservation_release(struct se_task *task) 196int target_scsi2_reservation_release(struct se_task *task)
@@ -201,12 +199,18 @@ int target_scsi2_reservation_release(struct se_task *task)
201 struct se_device *dev = cmd->se_dev; 199 struct se_device *dev = cmd->se_dev;
202 struct se_session *sess = cmd->se_sess; 200 struct se_session *sess = cmd->se_sess;
203 struct se_portal_group *tpg = sess->se_tpg; 201 struct se_portal_group *tpg = sess->se_tpg;
204 int ret = 0; 202 int ret = 0, rc;
205 203
206 if (!sess || !tpg) 204 if (!sess || !tpg)
207 goto out; 205 goto out;
208 if (target_check_scsi2_reservation_conflict(cmd, &ret)) 206 rc = target_check_scsi2_reservation_conflict(cmd);
207 if (rc == 1)
208 goto out;
209 else if (rc < 0) {
210 cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
211 ret = -EINVAL;
209 goto out; 212 goto out;
213 }
210 214
211 ret = 0; 215 ret = 0;
212 spin_lock(&dev->dev_reservation_lock); 216 spin_lock(&dev->dev_reservation_lock);
@@ -243,7 +247,7 @@ int target_scsi2_reservation_reserve(struct se_task *task)
243 struct se_device *dev = cmd->se_dev; 247 struct se_device *dev = cmd->se_dev;
244 struct se_session *sess = cmd->se_sess; 248 struct se_session *sess = cmd->se_sess;
245 struct se_portal_group *tpg = sess->se_tpg; 249 struct se_portal_group *tpg = sess->se_tpg;
246 int ret = 0; 250 int ret = 0, rc;
247 251
248 if ((cmd->t_task_cdb[1] & 0x01) && 252 if ((cmd->t_task_cdb[1] & 0x01) &&
249 (cmd->t_task_cdb[1] & 0x02)) { 253 (cmd->t_task_cdb[1] & 0x02)) {
@@ -259,8 +263,14 @@ int target_scsi2_reservation_reserve(struct se_task *task)
259 */ 263 */
260 if (!sess || !tpg) 264 if (!sess || !tpg)
261 goto out; 265 goto out;
262 if (target_check_scsi2_reservation_conflict(cmd, &ret)) 266 rc = target_check_scsi2_reservation_conflict(cmd);
267 if (rc == 1)
263 goto out; 268 goto out;
269 else if (rc < 0) {
270 cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
271 ret = -EINVAL;
272 goto out;
273 }
264 274
265 ret = 0; 275 ret = 0;
266 spin_lock(&dev->dev_reservation_lock); 276 spin_lock(&dev->dev_reservation_lock);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 58cea07b12fb..cd5cd95812bb 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2539,6 +2539,7 @@ static int transport_generic_cmd_sequencer(
2539 cmd, cdb, pr_reg_type) != 0) { 2539 cmd, cdb, pr_reg_type) != 0) {
2540 cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION; 2540 cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
2541 cmd->se_cmd_flags |= SCF_SCSI_RESERVATION_CONFLICT; 2541 cmd->se_cmd_flags |= SCF_SCSI_RESERVATION_CONFLICT;
2542 cmd->scsi_status = SAM_STAT_RESERVATION_CONFLICT;
2542 cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT; 2543 cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
2543 return -EBUSY; 2544 return -EBUSY;
2544 } 2545 }
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index e132157d8545..516db703dd24 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -690,7 +690,7 @@ static ssize_t s6e63m0_sysfs_store_gamma_mode(struct device *dev,
690 struct backlight_device *bd = NULL; 690 struct backlight_device *bd = NULL;
691 int brightness, rc; 691 int brightness, rc;
692 692
693 rc = strict_strtoul(buf, 0, (unsigned long *)&lcd->gamma_mode); 693 rc = kstrtouint(buf, 0, &lcd->gamma_mode);
694 if (rc < 0) 694 if (rc < 0)
695 return rc; 695 return rc;
696 696
diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index d2b0888126d4..a306bb6d88d9 100644
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -109,7 +109,7 @@ struct afs_call {
109 unsigned reply_size; /* current size of reply */ 109 unsigned reply_size; /* current size of reply */
110 unsigned first_offset; /* offset into mapping[first] */ 110 unsigned first_offset; /* offset into mapping[first] */
111 unsigned last_to; /* amount of mapping[last] */ 111 unsigned last_to; /* amount of mapping[last] */
112 unsigned short offset; /* offset into received data store */ 112 unsigned offset; /* offset into received data store */
113 unsigned char unmarshall; /* unmarshalling phase */ 113 unsigned char unmarshall; /* unmarshalling phase */
114 bool incoming; /* T if incoming call */ 114 bool incoming; /* T if incoming call */
115 bool send_pages; /* T if data from mapping should be sent */ 115 bool send_pages; /* T if data from mapping should be sent */
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index e45a323aebb4..8ad8c2a0703a 100644
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -314,6 +314,7 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp,
314 struct msghdr msg; 314 struct msghdr msg;
315 struct kvec iov[1]; 315 struct kvec iov[1];
316 int ret; 316 int ret;
317 struct sk_buff *skb;
317 318
318 _enter("%x,{%d},", addr->s_addr, ntohs(call->port)); 319 _enter("%x,{%d},", addr->s_addr, ntohs(call->port));
319 320
@@ -380,6 +381,8 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp,
380 381
381error_do_abort: 382error_do_abort:
382 rxrpc_kernel_abort_call(rxcall, RX_USER_ABORT); 383 rxrpc_kernel_abort_call(rxcall, RX_USER_ABORT);
384 while ((skb = skb_dequeue(&call->rx_queue)))
385 afs_free_skb(skb);
383 rxrpc_kernel_end_call(rxcall); 386 rxrpc_kernel_end_call(rxcall);
384 call->rxcall = NULL; 387 call->rxcall = NULL;
385error_kill_call: 388error_kill_call:
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 0e575d1304b4..5e9f198f7712 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1183,8 +1183,12 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
1183 * The latter is necessary to prevent ghost 1183 * The latter is necessary to prevent ghost
1184 * partitions on a removed medium. 1184 * partitions on a removed medium.
1185 */ 1185 */
1186 if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM)) 1186 if (bdev->bd_invalidated) {
1187 rescan_partitions(disk, bdev); 1187 if (!ret)
1188 rescan_partitions(disk, bdev);
1189 else if (ret == -ENOMEDIUM)
1190 invalidate_partitions(disk, bdev);
1191 }
1188 if (ret) 1192 if (ret)
1189 goto out_clear; 1193 goto out_clear;
1190 } else { 1194 } else {
@@ -1214,8 +1218,12 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
1214 if (bdev->bd_disk->fops->open) 1218 if (bdev->bd_disk->fops->open)
1215 ret = bdev->bd_disk->fops->open(bdev, mode); 1219 ret = bdev->bd_disk->fops->open(bdev, mode);
1216 /* the same as first opener case, read comment there */ 1220 /* the same as first opener case, read comment there */
1217 if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM)) 1221 if (bdev->bd_invalidated) {
1218 rescan_partitions(bdev->bd_disk, bdev); 1222 if (!ret)
1223 rescan_partitions(bdev->bd_disk, bdev);
1224 else if (ret == -ENOMEDIUM)
1225 invalidate_partitions(bdev->bd_disk, bdev);
1226 }
1219 if (ret) 1227 if (ret)
1220 goto out_unlock_bdev; 1228 goto out_unlock_bdev;
1221 } 1229 }
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index d32714094375..501b7f8b739f 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -409,6 +409,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
409 nilfs->ns_first_data_block = le64_to_cpu(sbp->s_first_data_block); 409 nilfs->ns_first_data_block = le64_to_cpu(sbp->s_first_data_block);
410 nilfs->ns_r_segments_percentage = 410 nilfs->ns_r_segments_percentage =
411 le32_to_cpu(sbp->s_r_segments_percentage); 411 le32_to_cpu(sbp->s_r_segments_percentage);
412 if (nilfs->ns_r_segments_percentage < 1 ||
413 nilfs->ns_r_segments_percentage > 99) {
414 printk(KERN_ERR "NILFS: invalid reserved segments percentage.\n");
415 return -EINVAL;
416 }
417
412 nilfs_set_nsegments(nilfs, le64_to_cpu(sbp->s_nsegments)); 418 nilfs_set_nsegments(nilfs, le64_to_cpu(sbp->s_nsegments));
413 nilfs->ns_crc_seed = le32_to_cpu(sbp->s_crc_seed); 419 nilfs->ns_crc_seed = le32_to_cpu(sbp->s_crc_seed);
414 return 0; 420 return 0;
@@ -515,6 +521,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,
515 brelse(sbh[1]); 521 brelse(sbh[1]);
516 sbh[1] = NULL; 522 sbh[1] = NULL;
517 sbp[1] = NULL; 523 sbp[1] = NULL;
524 valid[1] = 0;
518 swp = 0; 525 swp = 0;
519 } 526 }
520 if (!valid[swp]) { 527 if (!valid[swp]) {
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index fe23ee768589..e61d3192448e 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -596,6 +596,7 @@ extern char *disk_name (struct gendisk *hd, int partno, char *buf);
596 596
597extern int disk_expand_part_tbl(struct gendisk *disk, int target); 597extern int disk_expand_part_tbl(struct gendisk *disk, int target);
598extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev); 598extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev);
599extern int invalidate_partitions(struct gendisk *disk, struct block_device *bdev);
599extern struct hd_struct * __must_check add_partition(struct gendisk *disk, 600extern struct hd_struct * __must_check add_partition(struct gendisk *disk,
600 int partno, sector_t start, 601 int partno, sector_t start,
601 sector_t len, int flags, 602 sector_t len, int flags,
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 119773eebe31..1a3018063034 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -6,8 +6,11 @@
6#include <linux/workqueue.h> 6#include <linux/workqueue.h>
7 7
8enum { 8enum {
9 ICQ_IOPRIO_CHANGED, 9 ICQ_IOPRIO_CHANGED = 1 << 0,
10 ICQ_CGROUP_CHANGED, 10 ICQ_CGROUP_CHANGED = 1 << 1,
11 ICQ_EXITED = 1 << 2,
12
13 ICQ_CHANGED_MASK = ICQ_IOPRIO_CHANGED | ICQ_CGROUP_CHANGED,
11}; 14};
12 15
13/* 16/*
@@ -88,7 +91,7 @@ struct io_cq {
88 struct rcu_head __rcu_head; 91 struct rcu_head __rcu_head;
89 }; 92 };
90 93
91 unsigned long changed; 94 unsigned int flags;
92}; 95};
93 96
94/* 97/*
@@ -139,6 +142,7 @@ struct io_context *get_task_io_context(struct task_struct *task,
139 gfp_t gfp_flags, int node); 142 gfp_t gfp_flags, int node);
140void ioc_ioprio_changed(struct io_context *ioc, int ioprio); 143void ioc_ioprio_changed(struct io_context *ioc, int ioprio);
141void ioc_cgroup_changed(struct io_context *ioc); 144void ioc_cgroup_changed(struct io_context *ioc);
145unsigned int icq_get_changed(struct io_cq *icq);
142#else 146#else
143struct io_context; 147struct io_context;
144static inline void put_io_context(struct io_context *ioc) { } 148static inline void put_io_context(struct io_context *ioc) { }
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index eb8b9f15f2e0..af155450cabb 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -289,12 +289,16 @@ enum {
289 * 289 *
290 * system_freezable_wq is equivalent to system_wq except that it's 290 * system_freezable_wq is equivalent to system_wq except that it's
291 * freezable. 291 * freezable.
292 *
293 * system_nrt_freezable_wq is equivalent to system_nrt_wq except that
294 * it's freezable.
292 */ 295 */
293extern struct workqueue_struct *system_wq; 296extern struct workqueue_struct *system_wq;
294extern struct workqueue_struct *system_long_wq; 297extern struct workqueue_struct *system_long_wq;
295extern struct workqueue_struct *system_nrt_wq; 298extern struct workqueue_struct *system_nrt_wq;
296extern struct workqueue_struct *system_unbound_wq; 299extern struct workqueue_struct *system_unbound_wq;
297extern struct workqueue_struct *system_freezable_wq; 300extern struct workqueue_struct *system_freezable_wq;
301extern struct workqueue_struct *system_nrt_freezable_wq;
298 302
299extern struct workqueue_struct * 303extern struct workqueue_struct *
300__alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, 304__alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,
diff --git a/kernel/sys.c b/kernel/sys.c
index 40701538fbd1..888d227fd195 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1706,7 +1706,7 @@ static int prctl_set_mm(int opt, unsigned long addr,
1706 if (arg4 | arg5) 1706 if (arg4 | arg5)
1707 return -EINVAL; 1707 return -EINVAL;
1708 1708
1709 if (!capable(CAP_SYS_ADMIN)) 1709 if (!capable(CAP_SYS_RESOURCE))
1710 return -EPERM; 1710 return -EPERM;
1711 1711
1712 if (addr >= TASK_SIZE) 1712 if (addr >= TASK_SIZE)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index bec7b5b53e03..f2c5638bb5ab 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -253,11 +253,13 @@ struct workqueue_struct *system_long_wq __read_mostly;
253struct workqueue_struct *system_nrt_wq __read_mostly; 253struct workqueue_struct *system_nrt_wq __read_mostly;
254struct workqueue_struct *system_unbound_wq __read_mostly; 254struct workqueue_struct *system_unbound_wq __read_mostly;
255struct workqueue_struct *system_freezable_wq __read_mostly; 255struct workqueue_struct *system_freezable_wq __read_mostly;
256struct workqueue_struct *system_nrt_freezable_wq __read_mostly;
256EXPORT_SYMBOL_GPL(system_wq); 257EXPORT_SYMBOL_GPL(system_wq);
257EXPORT_SYMBOL_GPL(system_long_wq); 258EXPORT_SYMBOL_GPL(system_long_wq);
258EXPORT_SYMBOL_GPL(system_nrt_wq); 259EXPORT_SYMBOL_GPL(system_nrt_wq);
259EXPORT_SYMBOL_GPL(system_unbound_wq); 260EXPORT_SYMBOL_GPL(system_unbound_wq);
260EXPORT_SYMBOL_GPL(system_freezable_wq); 261EXPORT_SYMBOL_GPL(system_freezable_wq);
262EXPORT_SYMBOL_GPL(system_nrt_freezable_wq);
261 263
262#define CREATE_TRACE_POINTS 264#define CREATE_TRACE_POINTS
263#include <trace/events/workqueue.h> 265#include <trace/events/workqueue.h>
@@ -3833,8 +3835,11 @@ static int __init init_workqueues(void)
3833 WQ_UNBOUND_MAX_ACTIVE); 3835 WQ_UNBOUND_MAX_ACTIVE);
3834 system_freezable_wq = alloc_workqueue("events_freezable", 3836 system_freezable_wq = alloc_workqueue("events_freezable",
3835 WQ_FREEZABLE, 0); 3837 WQ_FREEZABLE, 0);
3838 system_nrt_freezable_wq = alloc_workqueue("events_nrt_freezable",
3839 WQ_NON_REENTRANT | WQ_FREEZABLE, 0);
3836 BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq || 3840 BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq ||
3837 !system_unbound_wq || !system_freezable_wq); 3841 !system_unbound_wq || !system_freezable_wq ||
3842 !system_nrt_freezable_wq);
3838 return 0; 3843 return 0;
3839} 3844}
3840early_initcall(init_workqueues); 3845early_initcall(init_workqueues);
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d0e57a3cda18..58a08fc7414a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -230,10 +230,30 @@ struct mem_cgroup {
230 * the counter to account for memory usage 230 * the counter to account for memory usage
231 */ 231 */
232 struct res_counter res; 232 struct res_counter res;
233 /* 233
234 * the counter to account for mem+swap usage. 234 union {
235 */ 235 /*
236 struct res_counter memsw; 236 * the counter to account for mem+swap usage.
237 */
238 struct res_counter memsw;
239
240 /*
241 * rcu_freeing is used only when freeing struct mem_cgroup,
242 * so put it into a union to avoid wasting more memory.
243 * It must be disjoint from the css field. It could be
244 * in a union with the res field, but res plays a much
245 * larger part in mem_cgroup life than memsw, and might
246 * be of interest, even at time of free, when debugging.
247 * So share rcu_head with the less interesting memsw.
248 */
249 struct rcu_head rcu_freeing;
250 /*
251 * But when using vfree(), that cannot be done at
252 * interrupt time, so we must then queue the work.
253 */
254 struct work_struct work_freeing;
255 };
256
237 /* 257 /*
238 * Per cgroup active and inactive list, similar to the 258 * Per cgroup active and inactive list, similar to the
239 * per zone LRU lists. 259 * per zone LRU lists.
@@ -4780,6 +4800,27 @@ out_free:
4780} 4800}
4781 4801
4782/* 4802/*
4803 * Helpers for freeing a vzalloc()ed mem_cgroup by RCU,
4804 * but in process context. The work_freeing structure is overlaid
4805 * on the rcu_freeing structure, which itself is overlaid on memsw.
4806 */
4807static void vfree_work(struct work_struct *work)
4808{
4809 struct mem_cgroup *memcg;
4810
4811 memcg = container_of(work, struct mem_cgroup, work_freeing);
4812 vfree(memcg);
4813}
4814static void vfree_rcu(struct rcu_head *rcu_head)
4815{
4816 struct mem_cgroup *memcg;
4817
4818 memcg = container_of(rcu_head, struct mem_cgroup, rcu_freeing);
4819 INIT_WORK(&memcg->work_freeing, vfree_work);
4820 schedule_work(&memcg->work_freeing);
4821}
4822
4823/*
4783 * At destroying mem_cgroup, references from swap_cgroup can remain. 4824 * At destroying mem_cgroup, references from swap_cgroup can remain.
4784 * (scanning all at force_empty is too costly...) 4825 * (scanning all at force_empty is too costly...)
4785 * 4826 *
@@ -4802,9 +4843,9 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg)
4802 4843
4803 free_percpu(memcg->stat); 4844 free_percpu(memcg->stat);
4804 if (sizeof(struct mem_cgroup) < PAGE_SIZE) 4845 if (sizeof(struct mem_cgroup) < PAGE_SIZE)
4805 kfree(memcg); 4846 kfree_rcu(memcg, rcu_freeing);
4806 else 4847 else
4807 vfree(memcg); 4848 call_rcu(&memcg->rcu_freeing, vfree_rcu);
4808} 4849}
4809 4850
4810static void mem_cgroup_get(struct mem_cgroup *memcg) 4851static void mem_cgroup_get(struct mem_cgroup *memcg)
generated by cgit v1.2.2 (git 2.25.0) at 2026-01-06 15:43:25 -0500