aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS6
-rw-r--r--arch/arm/mach-shmobile/board-ag5evm.c1
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c2
-rw-r--r--arch/arm/mach-shmobile/board-bonito.c3
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c4
-rw-r--r--arch/sh/kernel/cpu/sh2a/ex.S1
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7757.c4
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7785.c2
-rw-r--r--arch/sparc/Makefile2
-rw-r--r--arch/tile/configs/tilegx_defconfig600
-rw-r--r--arch/tile/configs/tilepro_defconfig1442
-rw-r--r--arch/tile/kernel/compat_signal.c5
-rw-r--r--arch/tile/kernel/signal.c13
-rw-r--r--arch/tile/kernel/sysfs.c2
-rw-r--r--arch/tile/lib/spinlock_32.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h12
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c8
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c12
-rw-r--r--drivers/net/tun.c15
-rw-r--r--drivers/net/usb/asix.c4
-rw-r--r--drivers/net/wireless/iwlegacy/3945-mac.c2
-rw-r--r--drivers/net/wireless/iwlegacy/3945.c7
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c6
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c9
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00queue.c3
-rw-r--r--drivers/pci/pcie/aspm.c3
-rw-r--r--drivers/platform/x86/Kconfig24
-rw-r--r--drivers/platform/x86/Makefile2
-rw-r--r--drivers/platform/x86/acer-wmi.c30
-rw-r--r--drivers/platform/x86/amilo-rfkill.c173
-rw-r--r--drivers/platform/x86/fujitsu-tablet.c478
-rw-r--r--drivers/platform/x86/panasonic-laptop.c4
-rw-r--r--drivers/tty/serial/sh-sci.c5
-rw-r--r--fs/cifs/file.c69
-rw-r--r--fs/cifs/xattr.c6
-rw-r--r--fs/inode.c4
-rw-r--r--fs/namei.c4
-rw-r--r--fs/udf/file.c2
-rw-r--r--lib/dynamic_queue_limits.c1
-rw-r--r--net/ipv4/syncookies.c30
-rw-r--r--net/ipv4/tcp_ipv4.c10
-rw-r--r--tools/perf/Makefile2
-rw-r--r--tools/perf/arch/powerpc/util/header.c2
-rw-r--r--tools/perf/arch/x86/util/header.c2
-rw-r--r--tools/perf/perf.h6
-rw-r--r--tools/perf/util/color.c9
-rw-r--r--tools/perf/util/header.c4
-rw-r--r--tools/perf/util/hist.c30
-rw-r--r--tools/perf/util/include/asm/unistd_32.h1
-rw-r--r--tools/perf/util/include/asm/unistd_64.h1
-rw-r--r--tools/perf/util/parse-events.c2
-rw-r--r--tools/perf/util/sort.c3
-rw-r--r--tools/perf/util/strbuf.c7
-rw-r--r--tools/perf/util/ui/browsers/hists.c12
-rw-r--r--tools/perf/util/ui/helpline.c2
57 files changed, 2414 insertions, 685 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3321d75c6c7f..95e4e43a12b4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2845,6 +2845,12 @@ S: Maintained
2845F: drivers/media/video/m5mols/ 2845F: drivers/media/video/m5mols/
2846F: include/media/m5mols.h 2846F: include/media/m5mols.h
2847 2847
2848FUJITSU TABLET EXTRAS
2849M: Robert Gerlach <khnz@gmx.de>
2850L: platform-driver-x86@vger.kernel.org
2851S: Maintained
2852F: drivers/platform/x86/fujitsu-tablet.c
2853
2848FUSE: FILESYSTEM IN USERSPACE 2854FUSE: FILESYSTEM IN USERSPACE
2849M: Miklos Szeredi <miklos@szeredi.hu> 2855M: Miklos Szeredi <miklos@szeredi.hu>
2850L: fuse-devel@lists.sourceforge.net 2856L: fuse-devel@lists.sourceforge.net
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 068b754bc348..8aea3a2dd889 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -38,6 +38,7 @@
38#include <linux/mmc/sh_mobile_sdhi.h> 38#include <linux/mmc/sh_mobile_sdhi.h>
39#include <linux/mfd/tmio.h> 39#include <linux/mfd/tmio.h>
40#include <linux/sh_clk.h> 40#include <linux/sh_clk.h>
41#include <linux/videodev2.h>
41#include <video/sh_mobile_lcdc.h> 42#include <video/sh_mobile_lcdc.h>
42#include <video/sh_mipi_dsi.h> 43#include <video/sh_mipi_dsi.h>
43#include <sound/sh_fsi.h> 44#include <sound/sh_fsi.h>
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index eeb4d9664584..b4718b00e827 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -794,7 +794,7 @@ static struct fsi_ak4642_info fsi2_ak4643_info = {
794static struct platform_device fsi_ak4643_device = { 794static struct platform_device fsi_ak4643_device = {
795 .name = "fsi-ak4642-audio", 795 .name = "fsi-ak4642-audio",
796 .dev = { 796 .dev = {
797 .platform_data = &fsi_info, 797 .platform_data = &fsi2_ak4643_info,
798 }, 798 },
799}; 799};
800 800
diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c
index 4d2201622323..4bd1162ce0df 100644
--- a/arch/arm/mach-shmobile/board-bonito.c
+++ b/arch/arm/mach-shmobile/board-bonito.c
@@ -27,6 +27,7 @@
27#include <linux/platform_device.h> 27#include <linux/platform_device.h>
28#include <linux/gpio.h> 28#include <linux/gpio.h>
29#include <linux/smsc911x.h> 29#include <linux/smsc911x.h>
30#include <linux/videodev2.h>
30#include <mach/common.h> 31#include <mach/common.h>
31#include <asm/mach-types.h> 32#include <asm/mach-types.h>
32#include <asm/mach/arch.h> 33#include <asm/mach/arch.h>
@@ -241,7 +242,7 @@ static struct sh_mobile_lcdc_info lcdc0_info = {
241 .clock_source = LCDC_CLK_BUS, 242 .clock_source = LCDC_CLK_BUS,
242 .ch[0] = { 243 .ch[0] = {
243 .chan = LCDC_CHAN_MAINLCD, 244 .chan = LCDC_CHAN_MAINLCD,
244 .bpp = 16, 245 .fourcc = V4L2_PIX_FMT_RGB565,
245 .interface_type = RGB24, 246 .interface_type = RGB24,
246 .clock_divider = 5, 247 .clock_divider = 5,
247 .flags = 0, 248 .flags = 0,
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index a2813247b455..7b53cda41851 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1352,6 +1352,10 @@ static struct map_desc mackerel_io_desc[] __initdata = {
1352static void __init mackerel_map_io(void) 1352static void __init mackerel_map_io(void)
1353{ 1353{
1354 iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc)); 1354 iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));
1355 /* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't
1356 * enough to allocate the frame buffer memory.
1357 */
1358 init_consistent_dma_size(12 << 20);
1355 1359
1356 /* setup early devices and console here as well */ 1360 /* setup early devices and console here as well */
1357 sh7372_add_early_devices(); 1361 sh7372_add_early_devices();
diff --git a/arch/sh/kernel/cpu/sh2a/ex.S b/arch/sh/kernel/cpu/sh2a/ex.S
index 3ead9e63965a..4568066700cf 100644
--- a/arch/sh/kernel/cpu/sh2a/ex.S
+++ b/arch/sh/kernel/cpu/sh2a/ex.S
@@ -66,6 +66,7 @@ vector = 0
66 .long exception_entry0 + vector * 6 66 .long exception_entry0 + vector * 6
67vector = vector + 1 67vector = vector + 1
68 .endr 68 .endr
69vector = 0
69 .rept 256 70 .rept 256
70 .long exception_entry1 + vector * 6 71 .long exception_entry1 + vector * 6
71vector = vector + 1 72vector = vector + 1
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
index 0fbff1422f54..0bd21c82151b 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
@@ -79,7 +79,7 @@ struct clk div4_clks[DIV4_NR] = {
79#define MSTPCR1 0xffc80034 79#define MSTPCR1 0xffc80034
80#define MSTPCR2 0xffc10028 80#define MSTPCR2 0xffc10028
81 81
82enum { MSTP004, MSTP000, MSTP114, MSTP113, MSTP112, 82enum { MSTP004, MSTP000, MSTP127, MSTP114, MSTP113, MSTP112,
83 MSTP111, MSTP110, MSTP103, MSTP102, MSTP220, 83 MSTP111, MSTP110, MSTP103, MSTP102, MSTP220,
84 MSTP_NR }; 84 MSTP_NR };
85 85
@@ -89,6 +89,7 @@ static struct clk mstp_clks[MSTP_NR] = {
89 [MSTP000] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 0, 0), 89 [MSTP000] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 0, 0),
90 90
91 /* MSTPCR1 */ 91 /* MSTPCR1 */
92 [MSTP127] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 27, 0),
92 [MSTP114] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 14, 0), 93 [MSTP114] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 14, 0),
93 [MSTP113] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 13, 0), 94 [MSTP113] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 13, 0),
94 [MSTP112] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 12, 0), 95 [MSTP112] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 12, 0),
@@ -131,6 +132,7 @@ static struct clk_lookup lookups[] = {
131 CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]), 132 CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]),
132 CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]), 133 CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]),
133 CLKDEV_CON_ID("mmc0", &mstp_clks[MSTP220]), 134 CLKDEV_CON_ID("mmc0", &mstp_clks[MSTP220]),
135 CLKDEV_CON_ID("rspi2", &mstp_clks[MSTP127]),
134}; 136};
135 137
136int __init arch_clk_init(void) 138int __init arch_clk_init(void)
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
index e5b420cc1265..2b314439d359 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
@@ -156,7 +156,7 @@ static struct clk_lookup lookups[] = {
156 CLKDEV_CON_ID("siof_fck", &mstp_clks[MSTP003]), 156 CLKDEV_CON_ID("siof_fck", &mstp_clks[MSTP003]),
157 CLKDEV_CON_ID("hspi_fck", &mstp_clks[MSTP002]), 157 CLKDEV_CON_ID("hspi_fck", &mstp_clks[MSTP002]),
158 CLKDEV_CON_ID("hudi_fck", &mstp_clks[MSTP119]), 158 CLKDEV_CON_ID("hudi_fck", &mstp_clks[MSTP119]),
159 CLKDEV_CON_ID("ubc_fck", &mstp_clks[MSTP117]), 159 CLKDEV_CON_ID("ubc0", &mstp_clks[MSTP117]),
160 CLKDEV_CON_ID("dmac_11_6_fck", &mstp_clks[MSTP105]), 160 CLKDEV_CON_ID("dmac_11_6_fck", &mstp_clks[MSTP105]),
161 CLKDEV_CON_ID("dmac_5_0_fck", &mstp_clks[MSTP104]), 161 CLKDEV_CON_ID("dmac_5_0_fck", &mstp_clks[MSTP104]),
162 CLKDEV_CON_ID("gdta_fck", &mstp_clks[MSTP100]), 162 CLKDEV_CON_ID("gdta_fck", &mstp_clks[MSTP100]),
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index ad1fb5d969f3..eddcfb36aafb 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -31,7 +31,7 @@ UTS_MACHINE := sparc
31 31
32#KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7 32#KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7
33KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7 33KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
34KBUILD_AFLAGS += -m32 34KBUILD_AFLAGS += -m32 -Wa,-Av8
35 35
36#LDFLAGS_vmlinux = -N -Ttext 0xf0004000 36#LDFLAGS_vmlinux = -N -Ttext 0xf0004000
37# Since 2.5.40, the first stage is left not btfix-ed. 37# Since 2.5.40, the first stage is left not btfix-ed.
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index dafdbbae1124..7960d5896504 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -1,7 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated file; DO NOT EDIT.
3# Linux/tilegx 2.6.39-rc5 Kernel Configuration 3# Linux/tilegx 3.3.0-rc7 Kernel Configuration
4# Wed May 4 11:08:04 2011
5# 4#
6CONFIG_TILE=y 5CONFIG_TILE=y
7CONFIG_MMU=y 6CONFIG_MMU=y
@@ -30,7 +29,6 @@ CONFIG_TILEGX=y
30CONFIG_64BIT=y 29CONFIG_64BIT=y
31CONFIG_ARCH_DEFCONFIG="arch/tile/configs/tilegx_defconfig" 30CONFIG_ARCH_DEFCONFIG="arch/tile/configs/tilegx_defconfig"
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
34 32
35# 33#
36# General setup 34# General setup
@@ -40,6 +38,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
40CONFIG_CROSS_COMPILE="" 38CONFIG_CROSS_COMPILE=""
41CONFIG_LOCALVERSION="" 39CONFIG_LOCALVERSION=""
42# CONFIG_LOCALVERSION_AUTO is not set 40# CONFIG_LOCALVERSION_AUTO is not set
41CONFIG_DEFAULT_HOSTNAME="(none)"
43CONFIG_SWAP=y 42CONFIG_SWAP=y
44CONFIG_SYSVIPC=y 43CONFIG_SYSVIPC=y
45CONFIG_SYSVIPC_SYSCTL=y 44CONFIG_SYSVIPC_SYSCTL=y
@@ -53,6 +52,7 @@ CONFIG_TASK_DELAY_ACCT=y
53CONFIG_TASK_XACCT=y 52CONFIG_TASK_XACCT=y
54CONFIG_TASK_IO_ACCOUNTING=y 53CONFIG_TASK_IO_ACCOUNTING=y
55CONFIG_AUDIT=y 54CONFIG_AUDIT=y
55# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
56CONFIG_HAVE_GENERIC_HARDIRQS=y 56CONFIG_HAVE_GENERIC_HARDIRQS=y
57 57
58# 58#
@@ -77,7 +77,6 @@ CONFIG_RCU_FANOUT=64
77CONFIG_LOG_BUF_SHIFT=19 77CONFIG_LOG_BUF_SHIFT=19
78CONFIG_CGROUPS=y 78CONFIG_CGROUPS=y
79CONFIG_CGROUP_DEBUG=y 79CONFIG_CGROUP_DEBUG=y
80CONFIG_CGROUP_NS=y
81# CONFIG_CGROUP_FREEZER is not set 80# CONFIG_CGROUP_FREEZER is not set
82CONFIG_CGROUP_DEVICE=y 81CONFIG_CGROUP_DEVICE=y
83CONFIG_CPUSETS=y 82CONFIG_CPUSETS=y
@@ -87,11 +86,14 @@ CONFIG_RESOURCE_COUNTERS=y
87CONFIG_CGROUP_MEM_RES_CTLR=y 86CONFIG_CGROUP_MEM_RES_CTLR=y
88CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y 87CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
89CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y 88CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
89# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
90CONFIG_CGROUP_SCHED=y 90CONFIG_CGROUP_SCHED=y
91CONFIG_FAIR_GROUP_SCHED=y 91CONFIG_FAIR_GROUP_SCHED=y
92# CONFIG_CFS_BANDWIDTH is not set
92CONFIG_RT_GROUP_SCHED=y 93CONFIG_RT_GROUP_SCHED=y
93CONFIG_BLK_CGROUP=y 94CONFIG_BLK_CGROUP=y
94# CONFIG_DEBUG_BLK_CGROUP is not set 95# CONFIG_DEBUG_BLK_CGROUP is not set
96# CONFIG_CHECKPOINT_RESTORE is not set
95CONFIG_NAMESPACES=y 97CONFIG_NAMESPACES=y
96CONFIG_UTS_NS=y 98CONFIG_UTS_NS=y
97CONFIG_IPC_NS=y 99CONFIG_IPC_NS=y
@@ -103,16 +105,12 @@ CONFIG_MM_OWNER=y
103# CONFIG_SYSFS_DEPRECATED is not set 105# CONFIG_SYSFS_DEPRECATED is not set
104CONFIG_RELAY=y 106CONFIG_RELAY=y
105CONFIG_BLK_DEV_INITRD=y 107CONFIG_BLK_DEV_INITRD=y
106CONFIG_INITRAMFS_SOURCE="usr/contents.txt" 108CONFIG_INITRAMFS_SOURCE=""
107CONFIG_INITRAMFS_ROOT_UID=0
108CONFIG_INITRAMFS_ROOT_GID=0
109CONFIG_RD_GZIP=y 109CONFIG_RD_GZIP=y
110# CONFIG_RD_BZIP2 is not set 110# CONFIG_RD_BZIP2 is not set
111# CONFIG_RD_LZMA is not set 111# CONFIG_RD_LZMA is not set
112# CONFIG_RD_XZ is not set 112# CONFIG_RD_XZ is not set
113# CONFIG_RD_LZO is not set 113# CONFIG_RD_LZO is not set
114CONFIG_INITRAMFS_COMPRESSION_NONE=y
115# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
116CONFIG_CC_OPTIMIZE_FOR_SIZE=y 114CONFIG_CC_OPTIMIZE_FOR_SIZE=y
117CONFIG_SYSCTL=y 115CONFIG_SYSCTL=y
118CONFIG_ANON_INODES=y 116CONFIG_ANON_INODES=y
@@ -120,7 +118,6 @@ CONFIG_EXPERT=y
120CONFIG_SYSCTL_SYSCALL=y 118CONFIG_SYSCTL_SYSCALL=y
121CONFIG_KALLSYMS=y 119CONFIG_KALLSYMS=y
122# CONFIG_KALLSYMS_ALL is not set 120# CONFIG_KALLSYMS_ALL is not set
123# CONFIG_KALLSYMS_EXTRA_PASS is not set
124CONFIG_HOTPLUG=y 121CONFIG_HOTPLUG=y
125CONFIG_PRINTK=y 122CONFIG_PRINTK=y
126CONFIG_BUG=y 123CONFIG_BUG=y
@@ -147,6 +144,7 @@ CONFIG_SLUB=y
147# CONFIG_SLOB is not set 144# CONFIG_SLOB is not set
148CONFIG_PROFILING=y 145CONFIG_PROFILING=y
149CONFIG_USE_GENERIC_SMP_HELPERS=y 146CONFIG_USE_GENERIC_SMP_HELPERS=y
147CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
150 148
151# 149#
152# GCOV-based kernel profiling 150# GCOV-based kernel profiling
@@ -165,8 +163,31 @@ CONFIG_MODULE_UNLOAD=y
165CONFIG_STOP_MACHINE=y 163CONFIG_STOP_MACHINE=y
166CONFIG_BLOCK=y 164CONFIG_BLOCK=y
167CONFIG_BLK_DEV_BSG=y 165CONFIG_BLK_DEV_BSG=y
166# CONFIG_BLK_DEV_BSGLIB is not set
168CONFIG_BLK_DEV_INTEGRITY=y 167CONFIG_BLK_DEV_INTEGRITY=y
169# CONFIG_BLK_DEV_THROTTLING is not set 168# CONFIG_BLK_DEV_THROTTLING is not set
169
170#
171# Partition Types
172#
173CONFIG_PARTITION_ADVANCED=y
174# CONFIG_ACORN_PARTITION is not set
175CONFIG_OSF_PARTITION=y
176CONFIG_AMIGA_PARTITION=y
177# CONFIG_ATARI_PARTITION is not set
178CONFIG_MAC_PARTITION=y
179CONFIG_MSDOS_PARTITION=y
180CONFIG_BSD_DISKLABEL=y
181CONFIG_MINIX_SUBPARTITION=y
182CONFIG_SOLARIS_X86_PARTITION=y
183CONFIG_UNIXWARE_DISKLABEL=y
184# CONFIG_LDM_PARTITION is not set
185CONFIG_SGI_PARTITION=y
186# CONFIG_ULTRIX_PARTITION is not set
187CONFIG_SUN_PARTITION=y
188CONFIG_KARMA_PARTITION=y
189CONFIG_EFI_PARTITION=y
190# CONFIG_SYSV68_PARTITION is not set
170CONFIG_BLOCK_COMPAT=y 191CONFIG_BLOCK_COMPAT=y
171 192
172# 193#
@@ -246,6 +267,7 @@ CONFIG_ZONE_DMA_FLAG=0
246CONFIG_VIRT_TO_BUS=y 267CONFIG_VIRT_TO_BUS=y
247# CONFIG_KSM is not set 268# CONFIG_KSM is not set
248CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
270# CONFIG_CLEANCACHE is not set
249# CONFIG_CMDLINE_BOOL is not set 271# CONFIG_CMDLINE_BOOL is not set
250CONFIG_VMALLOC_RESERVE=0x1000000 272CONFIG_VMALLOC_RESERVE=0x1000000
251CONFIG_HARDWALL=y 273CONFIG_HARDWALL=y
@@ -262,6 +284,8 @@ CONFIG_PCI_DOMAINS=y
262CONFIG_PCI_DEBUG=y 284CONFIG_PCI_DEBUG=y
263# CONFIG_PCI_STUB is not set 285# CONFIG_PCI_STUB is not set
264# CONFIG_PCI_IOV is not set 286# CONFIG_PCI_IOV is not set
287# CONFIG_PCI_PRI is not set
288# CONFIG_PCI_PASID is not set
265# CONFIG_HOTPLUG_PCI is not set 289# CONFIG_HOTPLUG_PCI is not set
266 290
267# 291#
@@ -280,6 +304,7 @@ CONFIG_NET=y
280# 304#
281CONFIG_PACKET=y 305CONFIG_PACKET=y
282CONFIG_UNIX=y 306CONFIG_UNIX=y
307# CONFIG_UNIX_DIAG is not set
283CONFIG_XFRM=y 308CONFIG_XFRM=y
284CONFIG_XFRM_USER=y 309CONFIG_XFRM_USER=y
285CONFIG_XFRM_SUB_POLICY=y 310CONFIG_XFRM_SUB_POLICY=y
@@ -316,6 +341,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
316CONFIG_INET_LRO=y 341CONFIG_INET_LRO=y
317CONFIG_INET_DIAG=m 342CONFIG_INET_DIAG=m
318CONFIG_INET_TCP_DIAG=m 343CONFIG_INET_TCP_DIAG=m
344# CONFIG_INET_UDP_DIAG is not set
319CONFIG_TCP_CONG_ADVANCED=y 345CONFIG_TCP_CONG_ADVANCED=y
320CONFIG_TCP_CONG_BIC=m 346CONFIG_TCP_CONG_BIC=m
321CONFIG_TCP_CONG_CUBIC=y 347CONFIG_TCP_CONG_CUBIC=y
@@ -369,12 +395,14 @@ CONFIG_BRIDGE_NETFILTER=y
369# Core Netfilter Configuration 395# Core Netfilter Configuration
370# 396#
371CONFIG_NETFILTER_NETLINK=m 397CONFIG_NETFILTER_NETLINK=m
398# CONFIG_NETFILTER_NETLINK_ACCT is not set
372CONFIG_NETFILTER_NETLINK_QUEUE=m 399CONFIG_NETFILTER_NETLINK_QUEUE=m
373CONFIG_NETFILTER_NETLINK_LOG=m 400CONFIG_NETFILTER_NETLINK_LOG=m
374CONFIG_NF_CONNTRACK=y 401CONFIG_NF_CONNTRACK=m
375CONFIG_NF_CONNTRACK_MARK=y 402CONFIG_NF_CONNTRACK_MARK=y
376CONFIG_NF_CONNTRACK_SECMARK=y 403CONFIG_NF_CONNTRACK_SECMARK=y
377CONFIG_NF_CONNTRACK_ZONES=y 404CONFIG_NF_CONNTRACK_ZONES=y
405CONFIG_NF_CONNTRACK_PROCFS=y
378CONFIG_NF_CONNTRACK_EVENTS=y 406CONFIG_NF_CONNTRACK_EVENTS=y
379# CONFIG_NF_CONNTRACK_TIMESTAMP is not set 407# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
380CONFIG_NF_CT_PROTO_DCCP=m 408CONFIG_NF_CT_PROTO_DCCP=m
@@ -435,11 +463,12 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m
435CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 463CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
436CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 464CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
437CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 465CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
438CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y 466CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
439# CONFIG_NETFILTER_XT_MATCH_CPU is not set 467# CONFIG_NETFILTER_XT_MATCH_CPU is not set
440CONFIG_NETFILTER_XT_MATCH_DCCP=m 468CONFIG_NETFILTER_XT_MATCH_DCCP=m
441# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set 469# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
442CONFIG_NETFILTER_XT_MATCH_DSCP=m 470CONFIG_NETFILTER_XT_MATCH_DSCP=m
471CONFIG_NETFILTER_XT_MATCH_ECN=m
443CONFIG_NETFILTER_XT_MATCH_ESP=m 472CONFIG_NETFILTER_XT_MATCH_ESP=m
444CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 473CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
445CONFIG_NETFILTER_XT_MATCH_HELPER=m 474CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -451,6 +480,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
451CONFIG_NETFILTER_XT_MATCH_MAC=m 480CONFIG_NETFILTER_XT_MATCH_MAC=m
452CONFIG_NETFILTER_XT_MATCH_MARK=m 481CONFIG_NETFILTER_XT_MATCH_MARK=m
453CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 482CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
483# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
454CONFIG_NETFILTER_XT_MATCH_OSF=m 484CONFIG_NETFILTER_XT_MATCH_OSF=m
455CONFIG_NETFILTER_XT_MATCH_OWNER=m 485CONFIG_NETFILTER_XT_MATCH_OWNER=m
456CONFIG_NETFILTER_XT_MATCH_POLICY=m 486CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -462,7 +492,7 @@ CONFIG_NETFILTER_XT_MATCH_REALM=m
462CONFIG_NETFILTER_XT_MATCH_RECENT=m 492CONFIG_NETFILTER_XT_MATCH_RECENT=m
463CONFIG_NETFILTER_XT_MATCH_SCTP=m 493CONFIG_NETFILTER_XT_MATCH_SCTP=m
464CONFIG_NETFILTER_XT_MATCH_SOCKET=m 494CONFIG_NETFILTER_XT_MATCH_SOCKET=m
465CONFIG_NETFILTER_XT_MATCH_STATE=y 495CONFIG_NETFILTER_XT_MATCH_STATE=m
466CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 496CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
467CONFIG_NETFILTER_XT_MATCH_STRING=m 497CONFIG_NETFILTER_XT_MATCH_STRING=m
468CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 498CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -499,6 +529,11 @@ CONFIG_IP_VS_SED=m
499CONFIG_IP_VS_NQ=m 529CONFIG_IP_VS_NQ=m
500 530
501# 531#
532# IPVS SH scheduler
533#
534CONFIG_IP_VS_SH_TAB_BITS=8
535
536#
502# IPVS application helper 537# IPVS application helper
503# 538#
504# CONFIG_IP_VS_NFCT is not set 539# CONFIG_IP_VS_NFCT is not set
@@ -507,13 +542,14 @@ CONFIG_IP_VS_NQ=m
507# 542#
508# IP: Netfilter Configuration 543# IP: Netfilter Configuration
509# 544#
510CONFIG_NF_DEFRAG_IPV4=y 545CONFIG_NF_DEFRAG_IPV4=m
511CONFIG_NF_CONNTRACK_IPV4=y 546CONFIG_NF_CONNTRACK_IPV4=m
512# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 547# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
513CONFIG_IP_NF_QUEUE=m 548CONFIG_IP_NF_QUEUE=m
514CONFIG_IP_NF_IPTABLES=y 549CONFIG_IP_NF_IPTABLES=y
515CONFIG_IP_NF_MATCH_AH=m 550CONFIG_IP_NF_MATCH_AH=m
516CONFIG_IP_NF_MATCH_ECN=m 551CONFIG_IP_NF_MATCH_ECN=m
552# CONFIG_IP_NF_MATCH_RPFILTER is not set
517CONFIG_IP_NF_MATCH_TTL=m 553CONFIG_IP_NF_MATCH_TTL=m
518CONFIG_IP_NF_FILTER=y 554CONFIG_IP_NF_FILTER=y
519CONFIG_IP_NF_TARGET_REJECT=y 555CONFIG_IP_NF_TARGET_REJECT=y
@@ -544,6 +580,7 @@ CONFIG_IP6_NF_MATCH_OPTS=m
544CONFIG_IP6_NF_MATCH_HL=m 580CONFIG_IP6_NF_MATCH_HL=m
545CONFIG_IP6_NF_MATCH_IPV6HEADER=m 581CONFIG_IP6_NF_MATCH_IPV6HEADER=m
546CONFIG_IP6_NF_MATCH_MH=m 582CONFIG_IP6_NF_MATCH_MH=m
583# CONFIG_IP6_NF_MATCH_RPFILTER is not set
547CONFIG_IP6_NF_MATCH_RT=m 584CONFIG_IP6_NF_MATCH_RT=m
548CONFIG_IP6_NF_TARGET_HL=m 585CONFIG_IP6_NF_TARGET_HL=m
549CONFIG_IP6_NF_TARGET_LOG=m 586CONFIG_IP6_NF_TARGET_LOG=m
@@ -595,11 +632,6 @@ CONFIG_NET_DSA=y
595CONFIG_NET_DSA_TAG_DSA=y 632CONFIG_NET_DSA_TAG_DSA=y
596CONFIG_NET_DSA_TAG_EDSA=y 633CONFIG_NET_DSA_TAG_EDSA=y
597CONFIG_NET_DSA_TAG_TRAILER=y 634CONFIG_NET_DSA_TAG_TRAILER=y
598CONFIG_NET_DSA_MV88E6XXX=y
599CONFIG_NET_DSA_MV88E6060=y
600CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
601CONFIG_NET_DSA_MV88E6131=y
602CONFIG_NET_DSA_MV88E6123_61_65=y
603CONFIG_VLAN_8021Q=m 635CONFIG_VLAN_8021Q=m
604CONFIG_VLAN_8021Q_GVRP=y 636CONFIG_VLAN_8021Q_GVRP=y
605# CONFIG_DECNET is not set 637# CONFIG_DECNET is not set
@@ -634,6 +666,7 @@ CONFIG_NET_SCH_NETEM=m
634CONFIG_NET_SCH_DRR=m 666CONFIG_NET_SCH_DRR=m
635# CONFIG_NET_SCH_MQPRIO is not set 667# CONFIG_NET_SCH_MQPRIO is not set
636# CONFIG_NET_SCH_CHOKE is not set 668# CONFIG_NET_SCH_CHOKE is not set
669# CONFIG_NET_SCH_QFQ is not set
637CONFIG_NET_SCH_INGRESS=m 670CONFIG_NET_SCH_INGRESS=m
638 671
639# 672#
@@ -674,9 +707,12 @@ CONFIG_NET_SCH_FIFO=y
674CONFIG_DCB=y 707CONFIG_DCB=y
675CONFIG_DNS_RESOLVER=y 708CONFIG_DNS_RESOLVER=y
676# CONFIG_BATMAN_ADV is not set 709# CONFIG_BATMAN_ADV is not set
710# CONFIG_OPENVSWITCH is not set
677CONFIG_RPS=y 711CONFIG_RPS=y
678CONFIG_RFS_ACCEL=y 712CONFIG_RFS_ACCEL=y
679CONFIG_XPS=y 713CONFIG_XPS=y
714# CONFIG_NETPRIO_CGROUP is not set
715CONFIG_BQL=y
680 716
681# 717#
682# Network testing 718# Network testing
@@ -694,6 +730,7 @@ CONFIG_FIB_RULES=y
694# CONFIG_NET_9P is not set 730# CONFIG_NET_9P is not set
695# CONFIG_CAIF is not set 731# CONFIG_CAIF is not set
696# CONFIG_CEPH_LIB is not set 732# CONFIG_CEPH_LIB is not set
733# CONFIG_NFC is not set
697 734
698# 735#
699# Device Drivers 736# Device Drivers
@@ -712,7 +749,9 @@ CONFIG_FW_LOADER=y
712CONFIG_EXTRA_FIRMWARE="" 749CONFIG_EXTRA_FIRMWARE=""
713# CONFIG_DEBUG_DRIVER is not set 750# CONFIG_DEBUG_DRIVER is not set
714# CONFIG_DEBUG_DEVRES is not set 751# CONFIG_DEBUG_DEVRES is not set
715# CONFIG_SYS_HYPERVISOR is not set 752CONFIG_SYS_HYPERVISOR=y
753# CONFIG_GENERIC_CPU_DEVICES is not set
754# CONFIG_DMA_SHARED_BUFFER is not set
716CONFIG_CONNECTOR=y 755CONFIG_CONNECTOR=y
717CONFIG_PROC_EVENTS=y 756CONFIG_PROC_EVENTS=y
718# CONFIG_MTD is not set 757# CONFIG_MTD is not set
@@ -724,21 +763,28 @@ CONFIG_BLK_DEV=y
724# CONFIG_BLK_DEV_UMEM is not set 763# CONFIG_BLK_DEV_UMEM is not set
725# CONFIG_BLK_DEV_COW_COMMON is not set 764# CONFIG_BLK_DEV_COW_COMMON is not set
726CONFIG_BLK_DEV_LOOP=y 765CONFIG_BLK_DEV_LOOP=y
766CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
727CONFIG_BLK_DEV_CRYPTOLOOP=m 767CONFIG_BLK_DEV_CRYPTOLOOP=m
728# CONFIG_BLK_DEV_DRBD is not set 768# CONFIG_BLK_DEV_DRBD is not set
729# CONFIG_BLK_DEV_NBD is not set 769# CONFIG_BLK_DEV_NBD is not set
770# CONFIG_BLK_DEV_NVME is not set
730CONFIG_BLK_DEV_SX8=m 771CONFIG_BLK_DEV_SX8=m
772# CONFIG_BLK_DEV_UB is not set
731CONFIG_BLK_DEV_RAM=y 773CONFIG_BLK_DEV_RAM=y
732CONFIG_BLK_DEV_RAM_COUNT=16 774CONFIG_BLK_DEV_RAM_COUNT=16
733CONFIG_BLK_DEV_RAM_SIZE=16384 775CONFIG_BLK_DEV_RAM_SIZE=16384
734# CONFIG_BLK_DEV_XIP is not set 776# CONFIG_BLK_DEV_XIP is not set
735# CONFIG_CDROM_PKTCDVD is not set 777# CONFIG_CDROM_PKTCDVD is not set
736CONFIG_ATA_OVER_ETH=y 778CONFIG_ATA_OVER_ETH=m
737# CONFIG_BLK_DEV_RBD is not set 779# CONFIG_BLK_DEV_RBD is not set
780
781#
782# Misc devices
783#
738# CONFIG_SENSORS_LIS3LV02D is not set 784# CONFIG_SENSORS_LIS3LV02D is not set
739CONFIG_MISC_DEVICES=y
740# CONFIG_AD525X_DPOT is not set 785# CONFIG_AD525X_DPOT is not set
741# CONFIG_PHANTOM is not set 786# CONFIG_PHANTOM is not set
787# CONFIG_INTEL_MID_PTI is not set
742# CONFIG_SGI_IOC4 is not set 788# CONFIG_SGI_IOC4 is not set
743# CONFIG_TIFM_CORE is not set 789# CONFIG_TIFM_CORE is not set
744# CONFIG_ICS932S401 is not set 790# CONFIG_ICS932S401 is not set
@@ -755,6 +801,7 @@ CONFIG_MISC_DEVICES=y
755# CONFIG_DS1682 is not set 801# CONFIG_DS1682 is not set
756# CONFIG_BMP085 is not set 802# CONFIG_BMP085 is not set
757# CONFIG_PCH_PHUB is not set 803# CONFIG_PCH_PHUB is not set
804# CONFIG_USB_SWITCH_FSA9480 is not set
758# CONFIG_C2PORT is not set 805# CONFIG_C2PORT is not set
759 806
760# 807#
@@ -772,11 +819,16 @@ CONFIG_MISC_DEVICES=y
772# CONFIG_SENSORS_LIS3_I2C is not set 819# CONFIG_SENSORS_LIS3_I2C is not set
773 820
774# 821#
822# Altera FPGA firmware download module
823#
824# CONFIG_ALTERA_STAPL is not set
825
826#
775# SCSI device support 827# SCSI device support
776# 828#
777CONFIG_SCSI_MOD=m 829CONFIG_SCSI_MOD=y
778CONFIG_RAID_ATTRS=m 830CONFIG_RAID_ATTRS=m
779CONFIG_SCSI=m 831CONFIG_SCSI=y
780CONFIG_SCSI_DMA=y 832CONFIG_SCSI_DMA=y
781CONFIG_SCSI_TGT=m 833CONFIG_SCSI_TGT=m
782# CONFIG_SCSI_NETLINK is not set 834# CONFIG_SCSI_NETLINK is not set
@@ -785,7 +837,7 @@ CONFIG_SCSI_PROC_FS=y
785# 837#
786# SCSI support type (disk, tape, CD-ROM) 838# SCSI support type (disk, tape, CD-ROM)
787# 839#
788CONFIG_BLK_DEV_SD=m 840CONFIG_BLK_DEV_SD=y
789# CONFIG_CHR_DEV_ST is not set 841# CONFIG_CHR_DEV_ST is not set
790# CONFIG_CHR_DEV_OSST is not set 842# CONFIG_CHR_DEV_OSST is not set
791# CONFIG_BLK_DEV_SR is not set 843# CONFIG_BLK_DEV_SR is not set
@@ -803,8 +855,10 @@ CONFIG_SCSI_WAIT_SCAN=m
803# CONFIG_SCSI_SPI_ATTRS is not set 855# CONFIG_SCSI_SPI_ATTRS is not set
804# CONFIG_SCSI_FC_ATTRS is not set 856# CONFIG_SCSI_FC_ATTRS is not set
805# CONFIG_SCSI_ISCSI_ATTRS is not set 857# CONFIG_SCSI_ISCSI_ATTRS is not set
806CONFIG_SCSI_SAS_ATTRS=m 858CONFIG_SCSI_SAS_ATTRS=y
807# CONFIG_SCSI_SAS_LIBSAS is not set 859CONFIG_SCSI_SAS_LIBSAS=y
860CONFIG_SCSI_SAS_ATA=y
861CONFIG_SCSI_SAS_HOST_SMP=y
808# CONFIG_SCSI_SRP_ATTRS is not set 862# CONFIG_SCSI_SRP_ATTRS is not set
809CONFIG_SCSI_LOWLEVEL=y 863CONFIG_SCSI_LOWLEVEL=y
810# CONFIG_ISCSI_TCP is not set 864# CONFIG_ISCSI_TCP is not set
@@ -824,7 +878,10 @@ CONFIG_SCSI_LOWLEVEL=y
824# CONFIG_SCSI_AIC7XXX_OLD is not set 878# CONFIG_SCSI_AIC7XXX_OLD is not set
825# CONFIG_SCSI_AIC79XX is not set 879# CONFIG_SCSI_AIC79XX is not set
826# CONFIG_SCSI_AIC94XX is not set 880# CONFIG_SCSI_AIC94XX is not set
827# CONFIG_SCSI_MVSAS is not set 881CONFIG_SCSI_MVSAS=y
882# CONFIG_SCSI_MVSAS_DEBUG is not set
883CONFIG_SCSI_MVSAS_TASKLET=y
884# CONFIG_SCSI_MVUMI is not set
828# CONFIG_SCSI_DPT_I2O is not set 885# CONFIG_SCSI_DPT_I2O is not set
829# CONFIG_SCSI_ADVANSYS is not set 886# CONFIG_SCSI_ADVANSYS is not set
830# CONFIG_SCSI_ARCMSR is not set 887# CONFIG_SCSI_ARCMSR is not set
@@ -858,7 +915,7 @@ CONFIG_SCSI_LOWLEVEL=y
858# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 915# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
859# CONFIG_SCSI_DH is not set 916# CONFIG_SCSI_DH is not set
860# CONFIG_SCSI_OSD_INITIATOR is not set 917# CONFIG_SCSI_OSD_INITIATOR is not set
861CONFIG_ATA=m 918CONFIG_ATA=y
862# CONFIG_ATA_NONSTANDARD is not set 919# CONFIG_ATA_NONSTANDARD is not set
863CONFIG_ATA_VERBOSE_ERROR=y 920CONFIG_ATA_VERBOSE_ERROR=y
864CONFIG_SATA_PMP=y 921CONFIG_SATA_PMP=y
@@ -870,88 +927,8 @@ CONFIG_SATA_PMP=y
870# CONFIG_SATA_AHCI_PLATFORM is not set 927# CONFIG_SATA_AHCI_PLATFORM is not set
871# CONFIG_SATA_INIC162X is not set 928# CONFIG_SATA_INIC162X is not set
872# CONFIG_SATA_ACARD_AHCI is not set 929# CONFIG_SATA_ACARD_AHCI is not set
873CONFIG_SATA_SIL24=m 930CONFIG_SATA_SIL24=y
874CONFIG_ATA_SFF=y 931# CONFIG_ATA_SFF is not set
875
876#
877# SFF controllers with custom DMA interface
878#
879# CONFIG_PDC_ADMA is not set
880# CONFIG_SATA_QSTOR is not set
881# CONFIG_SATA_SX4 is not set
882CONFIG_ATA_BMDMA=y
883
884#
885# SATA SFF controllers with BMDMA
886#
887# CONFIG_ATA_PIIX is not set
888# CONFIG_SATA_MV is not set
889# CONFIG_SATA_NV is not set
890# CONFIG_SATA_PROMISE is not set
891# CONFIG_SATA_SIL is not set
892# CONFIG_SATA_SIS is not set
893# CONFIG_SATA_SVW is not set
894# CONFIG_SATA_ULI is not set
895# CONFIG_SATA_VIA is not set
896# CONFIG_SATA_VITESSE is not set
897
898#
899# PATA SFF controllers with BMDMA
900#
901# CONFIG_PATA_ALI is not set
902# CONFIG_PATA_AMD is not set
903# CONFIG_PATA_ARASAN_CF is not set
904# CONFIG_PATA_ARTOP is not set
905# CONFIG_PATA_ATIIXP is not set
906# CONFIG_PATA_ATP867X is not set
907# CONFIG_PATA_CMD64X is not set
908# CONFIG_PATA_CS5520 is not set
909# CONFIG_PATA_CS5530 is not set
910# CONFIG_PATA_CS5536 is not set
911# CONFIG_PATA_CYPRESS is not set
912# CONFIG_PATA_EFAR is not set
913# CONFIG_PATA_HPT366 is not set
914# CONFIG_PATA_HPT37X is not set
915# CONFIG_PATA_HPT3X2N is not set
916# CONFIG_PATA_HPT3X3 is not set
917# CONFIG_PATA_IT8213 is not set
918# CONFIG_PATA_IT821X is not set
919# CONFIG_PATA_JMICRON is not set
920# CONFIG_PATA_MARVELL is not set
921# CONFIG_PATA_NETCELL is not set
922# CONFIG_PATA_NINJA32 is not set
923# CONFIG_PATA_NS87415 is not set
924# CONFIG_PATA_OLDPIIX is not set
925# CONFIG_PATA_OPTIDMA is not set
926# CONFIG_PATA_PDC2027X is not set
927# CONFIG_PATA_PDC_OLD is not set
928# CONFIG_PATA_RADISYS is not set
929# CONFIG_PATA_RDC is not set
930# CONFIG_PATA_SC1200 is not set
931# CONFIG_PATA_SCH is not set
932# CONFIG_PATA_SERVERWORKS is not set
933# CONFIG_PATA_SIL680 is not set
934# CONFIG_PATA_SIS is not set
935# CONFIG_PATA_TOSHIBA is not set
936# CONFIG_PATA_TRIFLEX is not set
937# CONFIG_PATA_VIA is not set
938# CONFIG_PATA_WINBOND is not set
939
940#
941# PIO-only SFF controllers
942#
943# CONFIG_PATA_CMD640_PCI is not set
944# CONFIG_PATA_MPIIX is not set
945# CONFIG_PATA_NS87410 is not set
946# CONFIG_PATA_OPTI is not set
947# CONFIG_PATA_PLATFORM is not set
948# CONFIG_PATA_RZ1000 is not set
949
950#
951# Generic fallback / legacy drivers
952#
953# CONFIG_ATA_GENERIC is not set
954# CONFIG_PATA_LEGACY is not set
955CONFIG_MD=y 932CONFIG_MD=y
956CONFIG_BLK_DEV_MD=y 933CONFIG_BLK_DEV_MD=y
957CONFIG_MD_AUTODETECT=y 934CONFIG_MD_AUTODETECT=y
@@ -967,6 +944,7 @@ CONFIG_BLK_DEV_DM=m
967CONFIG_DM_DEBUG=y 944CONFIG_DM_DEBUG=y
968CONFIG_DM_CRYPT=m 945CONFIG_DM_CRYPT=m
969CONFIG_DM_SNAPSHOT=m 946CONFIG_DM_SNAPSHOT=m
947# CONFIG_DM_THIN_PROVISIONING is not set
970CONFIG_DM_MIRROR=m 948CONFIG_DM_MIRROR=m
971# CONFIG_DM_RAID is not set 949# CONFIG_DM_RAID is not set
972CONFIG_DM_LOG_USERSPACE=m 950CONFIG_DM_LOG_USERSPACE=m
@@ -978,7 +956,13 @@ CONFIG_DM_DELAY=m
978CONFIG_DM_UEVENT=y 956CONFIG_DM_UEVENT=y
979# CONFIG_DM_FLAKEY is not set 957# CONFIG_DM_FLAKEY is not set
980# CONFIG_TARGET_CORE is not set 958# CONFIG_TARGET_CORE is not set
981# CONFIG_FUSION is not set 959CONFIG_FUSION=y
960# CONFIG_FUSION_SPI is not set
961# CONFIG_FUSION_FC is not set
962CONFIG_FUSION_SAS=y
963CONFIG_FUSION_MAX_SGE=128
964# CONFIG_FUSION_CTL is not set
965# CONFIG_FUSION_LOGGING is not set
982 966
983# 967#
984# IEEE 1394 (FireWire) support 968# IEEE 1394 (FireWire) support
@@ -987,16 +971,83 @@ CONFIG_DM_UEVENT=y
987# CONFIG_FIREWIRE_NOSY is not set 971# CONFIG_FIREWIRE_NOSY is not set
988# CONFIG_I2O is not set 972# CONFIG_I2O is not set
989CONFIG_NETDEVICES=y 973CONFIG_NETDEVICES=y
990CONFIG_IFB=m 974CONFIG_NET_CORE=y
991CONFIG_DUMMY=m
992CONFIG_BONDING=m 975CONFIG_BONDING=m
976CONFIG_DUMMY=m
977# CONFIG_EQUALIZER is not set
978# CONFIG_NET_FC is not set
979# CONFIG_MII is not set
980CONFIG_IFB=m
981# CONFIG_NET_TEAM is not set
993CONFIG_MACVLAN=m 982CONFIG_MACVLAN=m
994CONFIG_MACVTAP=m 983CONFIG_MACVTAP=m
995# CONFIG_EQUALIZER is not set 984CONFIG_NETCONSOLE=m
985CONFIG_NETCONSOLE_DYNAMIC=y
986CONFIG_NETPOLL=y
987CONFIG_NETPOLL_TRAP=y
988CONFIG_NET_POLL_CONTROLLER=y
996CONFIG_TUN=y 989CONFIG_TUN=y
997CONFIG_VETH=m 990CONFIG_VETH=m
998# CONFIG_ARCNET is not set 991# CONFIG_ARCNET is not set
999# CONFIG_MII 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
1002CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
1003CONFIG_NET_DSA_MV88E6131=y
1004CONFIG_NET_DSA_MV88E6123_61_65=y
1005CONFIG_ETHERNET=y
1006# CONFIG_NET_VENDOR_3COM is not set
1007# CONFIG_NET_VENDOR_ADAPTEC is not set
1008# CONFIG_NET_VENDOR_ALTEON is not set
1009# CONFIG_NET_VENDOR_AMD is not set
1010# CONFIG_NET_VENDOR_ATHEROS is not set
1011# CONFIG_NET_VENDOR_BROADCOM is not set
1012# CONFIG_NET_VENDOR_BROCADE is not set
1013# CONFIG_NET_CALXEDA_XGMAC is not set
1014# CONFIG_NET_VENDOR_CHELSIO is not set
1015# CONFIG_NET_VENDOR_CISCO is not set
1016# CONFIG_DNET is not set
1017# CONFIG_NET_VENDOR_DEC is not set
1018# CONFIG_NET_VENDOR_DLINK is not set
1019# CONFIG_NET_VENDOR_EMULEX is not set
1020# CONFIG_NET_VENDOR_EXAR is not set
1021# CONFIG_NET_VENDOR_HP is not set
1022# 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
1026# CONFIG_NET_VENDOR_MELLANOX is not set
1027# CONFIG_NET_VENDOR_MICREL is not set
1028# CONFIG_NET_VENDOR_MYRI is not set
1029# CONFIG_FEALNX is not set
1030# CONFIG_NET_VENDOR_NATSEMI is not set
1031# CONFIG_NET_VENDOR_NVIDIA is not set
1032# CONFIG_NET_VENDOR_OKI is not set
1033# CONFIG_ETHOC is not set
1034# CONFIG_NET_PACKET_ENGINE is not set
1035# CONFIG_NET_VENDOR_QLOGIC is not set
1036# CONFIG_NET_VENDOR_REALTEK is not set
1037# CONFIG_NET_VENDOR_RDC is not set
1038# CONFIG_NET_VENDOR_SEEQ is not set
1039# CONFIG_NET_VENDOR_SILAN is not set
1040# CONFIG_NET_VENDOR_SIS is not set
1041# CONFIG_SFC is not set
1042# CONFIG_NET_VENDOR_SMSC is not set
1043# CONFIG_NET_VENDOR_STMICRO is not set
1044# CONFIG_NET_VENDOR_SUN is not set
1045# CONFIG_NET_VENDOR_TEHUTI is not set
1046# CONFIG_NET_VENDOR_TI is not set
1047# CONFIG_TILE_NET is not set
1048# CONFIG_NET_VENDOR_VIA is not set
1049# CONFIG_FDDI is not set
1050# CONFIG_HIPPI is not set
1000CONFIG_PHYLIB=y 1051CONFIG_PHYLIB=y
1001 1052
1002# 1053#
@@ -1010,7 +1061,6 @@ CONFIG_PHYLIB=y
1010# CONFIG_VITESSE_PHY is not set 1061# CONFIG_VITESSE_PHY is not set
1011# CONFIG_SMSC_PHY is not set 1062# CONFIG_SMSC_PHY is not set
1012# CONFIG_BROADCOM_PHY is not set 1063# CONFIG_BROADCOM_PHY is not set
1013# CONFIG_BCM63XX_PHY is not set
1014# CONFIG_ICPLUS_PHY is not set 1064# CONFIG_ICPLUS_PHY is not set
1015# CONFIG_REALTEK_PHY is not set 1065# CONFIG_REALTEK_PHY is not set
1016# CONFIG_NATIONAL_PHY is not set 1066# CONFIG_NATIONAL_PHY is not set
@@ -1019,54 +1069,26 @@ CONFIG_PHYLIB=y
1019# CONFIG_MICREL_PHY is not set 1069# CONFIG_MICREL_PHY is not set
1020# CONFIG_FIXED_PHY is not set 1070# CONFIG_FIXED_PHY is not set
1021# CONFIG_MDIO_BITBANG is not set 1071# CONFIG_MDIO_BITBANG is not set
1022# CONFIG_NET_ETHERNET is not set 1072# CONFIG_PPP is not set
1023CONFIG_NETDEV_1000=y 1073# CONFIG_SLIP is not set
1024# CONFIG_ACENIC is not set
1025# CONFIG_DL2K is not set
1026# CONFIG_E1000 is not set
1027CONFIG_E1000E=m
1028# CONFIG_IP1000 is not set
1029# CONFIG_IGB is not set
1030# CONFIG_IGBVF is not set
1031# CONFIG_NS83820 is not set
1032# CONFIG_HAMACHI is not set
1033# CONFIG_YELLOWFIN is not set
1034# CONFIG_R8169 is not set
1035# CONFIG_SIS190 is not set
1036# CONFIG_SKGE is not set
1037# CONFIG_SKY2 is not set
1038# CONFIG_VIA_VELOCITY is not set
1039# CONFIG_TIGON3 is not set
1040# CONFIG_BNX2 is not set
1041# CONFIG_CNIC is not set
1042# CONFIG_QLA3XXX is not set
1043# CONFIG_ATL1 is not set
1044# CONFIG_ATL1E is not set
1045# CONFIG_ATL1C is not set
1046# CONFIG_JME is not set
1047# CONFIG_STMMAC_ETH is not set
1048# CONFIG_PCH_GBE is not set
1049# CONFIG_NETDEV_10000 is not set
1050# CONFIG_TR is not set 1074# CONFIG_TR is not set
1051# CONFIG_WLAN is not set
1052 1075
1053# 1076#
1054# Enable WiMAX (Networking options) to see the WiMAX drivers 1077# USB Network Adapters
1055# 1078#
1056# CONFIG_WAN is not set 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
1057 1087
1058# 1088#
1059# CAIF transport drivers 1089# Enable WiMAX (Networking options) to see the WiMAX drivers
1060# 1090#
1061# CONFIG_TILE_NET is not set 1091# CONFIG_WAN is not set
1062# CONFIG_FDDI is not set
1063# CONFIG_HIPPI is not set
1064# CONFIG_PPP is not set
1065# CONFIG_SLIP is not set
1066# CONFIG_NET_FC is not set
1067# CONFIG_NETCONSOLE is not set
1068# CONFIG_NETPOLL is not set
1069# CONFIG_NET_POLL_CONTROLLER is not set
1070# CONFIG_VMXNET3 is not set 1092# CONFIG_VMXNET3 is not set
1071# CONFIG_ISDN is not set 1093# CONFIG_ISDN is not set
1072# CONFIG_PHONE is not set 1094# CONFIG_PHONE is not set
@@ -1113,6 +1135,7 @@ CONFIG_UNIX98_PTYS=y
1113# CONFIG_SERIAL_NONSTANDARD is not set 1135# CONFIG_SERIAL_NONSTANDARD is not set
1114# CONFIG_NOZOMI is not set 1136# CONFIG_NOZOMI is not set
1115# CONFIG_N_GSM is not set 1137# CONFIG_N_GSM is not set
1138# CONFIG_TRACE_SINK is not set
1116CONFIG_DEVKMEM=y 1139CONFIG_DEVKMEM=y
1117 1140
1118# 1141#
@@ -1129,6 +1152,7 @@ CONFIG_DEVKMEM=y
1129# CONFIG_SERIAL_ALTERA_JTAGUART is not set 1152# CONFIG_SERIAL_ALTERA_JTAGUART is not set
1130# CONFIG_SERIAL_ALTERA_UART is not set 1153# CONFIG_SERIAL_ALTERA_UART is not set
1131# CONFIG_SERIAL_PCH_UART is not set 1154# CONFIG_SERIAL_PCH_UART is not set
1155# CONFIG_SERIAL_XILINX_PS_UART is not set
1132# CONFIG_TTY_PRINTK is not set 1156# CONFIG_TTY_PRINTK is not set
1133CONFIG_HVC_DRIVER=y 1157CONFIG_HVC_DRIVER=y
1134# CONFIG_IPMI_HANDLER is not set 1158# CONFIG_IPMI_HANDLER is not set
@@ -1144,6 +1168,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
1144# CONFIG_TCG_TPM is not set 1168# CONFIG_TCG_TPM is not set
1145CONFIG_DEVPORT=y 1169CONFIG_DEVPORT=y
1146# CONFIG_RAMOOPS is not set 1170# CONFIG_RAMOOPS is not set
1171CONFIG_TILE_SROM=y
1147CONFIG_I2C=y 1172CONFIG_I2C=y
1148CONFIG_I2C_BOARDINFO=y 1173CONFIG_I2C_BOARDINFO=y
1149CONFIG_I2C_COMPAT=y 1174CONFIG_I2C_COMPAT=y
@@ -1176,6 +1201,7 @@ CONFIG_I2C_HELPER_AUTO=y
1176# 1201#
1177# I2C system bus drivers (mostly embedded / system-on-chip) 1202# I2C system bus drivers (mostly embedded / system-on-chip)
1178# 1203#
1204# CONFIG_I2C_DESIGNWARE_PCI is not set
1179# CONFIG_I2C_INTEL_MID is not set 1205# CONFIG_I2C_INTEL_MID is not set
1180# CONFIG_I2C_OCORES is not set 1206# CONFIG_I2C_OCORES is not set
1181# CONFIG_I2C_PCA_PLATFORM is not set 1207# CONFIG_I2C_PCA_PLATFORM is not set
@@ -1187,8 +1213,10 @@ CONFIG_I2C_HELPER_AUTO=y
1187# 1213#
1188# External I2C/SMBus adapter drivers 1214# External I2C/SMBus adapter drivers
1189# 1215#
1216# CONFIG_I2C_DIOLAN_U2C is not set
1190# CONFIG_I2C_PARPORT_LIGHT is not set 1217# CONFIG_I2C_PARPORT_LIGHT is not set
1191# CONFIG_I2C_TAOS_EVM is not set 1218# CONFIG_I2C_TAOS_EVM is not set
1219# CONFIG_I2C_TINY_USB is not set
1192 1220
1193# 1221#
1194# Other I2C/SMBus bus drivers 1222# Other I2C/SMBus bus drivers
@@ -1207,18 +1235,54 @@ CONFIG_I2C_HELPER_AUTO=y
1207# 1235#
1208# PPS generators support 1236# PPS generators support
1209# 1237#
1238
1239#
1240# PTP clock support
1241#
1242
1243#
1244# Enable Device Drivers -> PPS to see the PTP clock options.
1245#
1210# CONFIG_W1 is not set 1246# CONFIG_W1 is not set
1211# CONFIG_POWER_SUPPLY is not set 1247# CONFIG_POWER_SUPPLY is not set
1212# CONFIG_HWMON is not set 1248# CONFIG_HWMON is not set
1213# CONFIG_THERMAL is not set 1249# CONFIG_THERMAL is not set
1214# CONFIG_WATCHDOG is not set 1250CONFIG_WATCHDOG=y
1251# CONFIG_WATCHDOG_CORE is not set
1252CONFIG_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
1215CONFIG_SSB_POSSIBLE=y 1270CONFIG_SSB_POSSIBLE=y
1216 1271
1217# 1272#
1218# Sonics Silicon Backplane 1273# Sonics Silicon Backplane
1219# 1274#
1220# CONFIG_SSB is not set 1275# CONFIG_SSB is not set
1221CONFIG_MFD_SUPPORT=y 1276CONFIG_BCMA_POSSIBLE=y
1277
1278#
1279# Broadcom specific AMBA
1280#
1281# CONFIG_BCMA is not set
1282
1283#
1284# Multifunction device drivers
1285#
1222# CONFIG_MFD_CORE is not set 1286# CONFIG_MFD_CORE is not set
1223# CONFIG_MFD_88PM860X is not set 1287# CONFIG_MFD_88PM860X is not set
1224# CONFIG_MFD_SM501 is not set 1288# CONFIG_MFD_SM501 is not set
@@ -1230,10 +1294,12 @@ CONFIG_MFD_SUPPORT=y
1230# CONFIG_MFD_TC3589X is not set 1294# CONFIG_MFD_TC3589X is not set
1231# CONFIG_MFD_TMIO is not set 1295# CONFIG_MFD_TMIO is not set
1232# CONFIG_PMIC_DA903X is not set 1296# CONFIG_PMIC_DA903X is not set
1297# CONFIG_MFD_DA9052_I2C is not set
1233# CONFIG_PMIC_ADP5520 is not set 1298# CONFIG_PMIC_ADP5520 is not set
1234# CONFIG_MFD_MAX8925 is not set 1299# CONFIG_MFD_MAX8925 is not set
1235# CONFIG_MFD_MAX8997 is not set 1300# CONFIG_MFD_MAX8997 is not set
1236# CONFIG_MFD_MAX8998 is not set 1301# CONFIG_MFD_MAX8998 is not set
1302# CONFIG_MFD_S5M_CORE is not set
1237# CONFIG_MFD_WM8400 is not set 1303# CONFIG_MFD_WM8400 is not set
1238# CONFIG_MFD_WM831X_I2C is not set 1304# CONFIG_MFD_WM831X_I2C is not set
1239# CONFIG_MFD_WM8350_I2C is not set 1305# CONFIG_MFD_WM8350_I2C is not set
@@ -1258,22 +1324,137 @@ CONFIG_MFD_SUPPORT=y
1258# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1324# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1259# CONFIG_FB is not set 1325# CONFIG_FB is not set
1260# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1326# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1261
1262#
1263# Display device support
1264#
1265# CONFIG_DISPLAY_SUPPORT is not set
1266# CONFIG_SOUND is not set 1327# CONFIG_SOUND is not set
1267# CONFIG_HID_SUPPORT is not set 1328# CONFIG_HID_SUPPORT is not set
1268# CONFIG_USB_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
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
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
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
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
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
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
1269# CONFIG_UWB is not set 1444# CONFIG_UWB is not set
1270# CONFIG_MMC is not set 1445# CONFIG_MMC is not set
1271# CONFIG_MEMSTICK is not set 1446# CONFIG_MEMSTICK is not set
1272# CONFIG_NEW_LEDS is not set 1447# CONFIG_NEW_LEDS is not set
1273# CONFIG_NFC_DEVICES is not set
1274# CONFIG_ACCESSIBILITY is not set 1448# CONFIG_ACCESSIBILITY is not set
1275# CONFIG_INFINIBAND is not set 1449# CONFIG_INFINIBAND is not set
1276# CONFIG_EDAC is not set 1450CONFIG_EDAC=y
1451
1452#
1453# Reporting subsystems
1454#
1455# CONFIG_EDAC_DEBUG is not set
1456CONFIG_EDAC_MM_EDAC=y
1457CONFIG_EDAC_TILE=y
1277CONFIG_RTC_LIB=y 1458CONFIG_RTC_LIB=y
1278CONFIG_RTC_CLASS=y 1459CONFIG_RTC_CLASS=y
1279CONFIG_RTC_HCTOSYS=y 1460CONFIG_RTC_HCTOSYS=y
@@ -1309,6 +1490,8 @@ CONFIG_RTC_INTF_DEV=y
1309# CONFIG_RTC_DRV_FM3130 is not set 1490# CONFIG_RTC_DRV_FM3130 is not set
1310# CONFIG_RTC_DRV_RX8581 is not set 1491# CONFIG_RTC_DRV_RX8581 is not set
1311# CONFIG_RTC_DRV_RX8025 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
1312 1495
1313# 1496#
1314# SPI RTC drivers 1497# SPI RTC drivers
@@ -1337,9 +1520,27 @@ CONFIG_RTC_DRV_TILE=y
1337# CONFIG_DMADEVICES is not set 1520# CONFIG_DMADEVICES is not set
1338# CONFIG_AUXDISPLAY is not set 1521# CONFIG_AUXDISPLAY is not set
1339# CONFIG_UIO 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#
1340# CONFIG_STAGING is not set 1534# CONFIG_STAGING is not set
1341 1535
1342# 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#
1343# File systems 1544# File systems
1344# 1545#
1345CONFIG_EXT2_FS=y 1546CONFIG_EXT2_FS=y
@@ -1361,11 +1562,11 @@ CONFIG_FS_XIP=y
1361CONFIG_JBD=y 1562CONFIG_JBD=y
1362# CONFIG_JBD_DEBUG is not set 1563# CONFIG_JBD_DEBUG is not set
1363CONFIG_JBD2=y 1564CONFIG_JBD2=y
1364CONFIG_JBD2_DEBUG=y 1565# CONFIG_JBD2_DEBUG is not set
1365CONFIG_FS_MBCACHE=y 1566CONFIG_FS_MBCACHE=y
1366# CONFIG_REISERFS_FS is not set 1567# CONFIG_REISERFS_FS is not set
1367# CONFIG_JFS_FS is not set 1568# CONFIG_JFS_FS is not set
1368CONFIG_XFS_FS=m 1569CONFIG_XFS_FS=y
1369CONFIG_XFS_QUOTA=y 1570CONFIG_XFS_QUOTA=y
1370CONFIG_XFS_POSIX_ACL=y 1571CONFIG_XFS_POSIX_ACL=y
1371# CONFIG_XFS_RT is not set 1572# CONFIG_XFS_RT is not set
@@ -1375,6 +1576,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=y
1375# CONFIG_OCFS2_FS is not set 1576# CONFIG_OCFS2_FS is not set
1376CONFIG_BTRFS_FS=m 1577CONFIG_BTRFS_FS=m
1377CONFIG_BTRFS_FS_POSIX_ACL=y 1578CONFIG_BTRFS_FS_POSIX_ACL=y
1579# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
1378# CONFIG_NILFS2_FS is not set 1580# CONFIG_NILFS2_FS is not set
1379CONFIG_FS_POSIX_ACL=y 1581CONFIG_FS_POSIX_ACL=y
1380CONFIG_EXPORTFS=y 1582CONFIG_EXPORTFS=y
@@ -1391,7 +1593,7 @@ CONFIG_QUOTA_TREE=y
1391# CONFIG_QFMT_V1 is not set 1593# CONFIG_QFMT_V1 is not set
1392CONFIG_QFMT_V2=y 1594CONFIG_QFMT_V2=y
1393CONFIG_QUOTACTL=y 1595CONFIG_QUOTACTL=y
1394# CONFIG_AUTOFS4_FS is not set 1596CONFIG_AUTOFS4_FS=m
1395CONFIG_FUSE_FS=y 1597CONFIG_FUSE_FS=y
1396CONFIG_CUSE=m 1598CONFIG_CUSE=m
1397CONFIG_GENERIC_ACL=y 1599CONFIG_GENERIC_ACL=y
@@ -1437,6 +1639,7 @@ CONFIG_PROC_PAGE_MONITOR=y
1437CONFIG_SYSFS=y 1639CONFIG_SYSFS=y
1438CONFIG_TMPFS=y 1640CONFIG_TMPFS=y
1439CONFIG_TMPFS_POSIX_ACL=y 1641CONFIG_TMPFS_POSIX_ACL=y
1642CONFIG_TMPFS_XATTR=y
1440CONFIG_HUGETLBFS=y 1643CONFIG_HUGETLBFS=y
1441CONFIG_HUGETLB_PAGE=y 1644CONFIG_HUGETLB_PAGE=y
1442CONFIG_CONFIGFS_FS=m 1645CONFIG_CONFIGFS_FS=m
@@ -1453,8 +1656,10 @@ CONFIG_ECRYPT_FS=m
1453CONFIG_CRAMFS=m 1656CONFIG_CRAMFS=m
1454CONFIG_SQUASHFS=m 1657CONFIG_SQUASHFS=m
1455# CONFIG_SQUASHFS_XATTR is not set 1658# CONFIG_SQUASHFS_XATTR is not set
1659CONFIG_SQUASHFS_ZLIB=y
1456# CONFIG_SQUASHFS_LZO is not set 1660# CONFIG_SQUASHFS_LZO is not set
1457# CONFIG_SQUASHFS_XZ is not set 1661# CONFIG_SQUASHFS_XZ is not set
1662# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
1458# CONFIG_SQUASHFS_EMBEDDED is not set 1663# CONFIG_SQUASHFS_EMBEDDED is not set
1459CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 1664CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
1460# CONFIG_VXFS_FS is not set 1665# CONFIG_VXFS_FS is not set
@@ -1473,6 +1678,7 @@ CONFIG_NFS_V3_ACL=y
1473CONFIG_NFS_V4=y 1678CONFIG_NFS_V4=y
1474CONFIG_NFS_V4_1=y 1679CONFIG_NFS_V4_1=y
1475CONFIG_PNFS_FILE_LAYOUT=m 1680CONFIG_PNFS_FILE_LAYOUT=m
1681CONFIG_PNFS_BLOCK=m
1476CONFIG_NFS_FSCACHE=y 1682CONFIG_NFS_FSCACHE=y
1477# CONFIG_NFS_USE_LEGACY_DNS is not set 1683# CONFIG_NFS_USE_LEGACY_DNS is not set
1478CONFIG_NFS_USE_KERNEL_DNS=y 1684CONFIG_NFS_USE_KERNEL_DNS=y
@@ -1482,12 +1688,14 @@ CONFIG_NFSD_V2_ACL=y
1482CONFIG_NFSD_V3=y 1688CONFIG_NFSD_V3=y
1483CONFIG_NFSD_V3_ACL=y 1689CONFIG_NFSD_V3_ACL=y
1484CONFIG_NFSD_V4=y 1690CONFIG_NFSD_V4=y
1691# CONFIG_NFSD_FAULT_INJECTION is not set
1485CONFIG_LOCKD=m 1692CONFIG_LOCKD=m
1486CONFIG_LOCKD_V4=y 1693CONFIG_LOCKD_V4=y
1487CONFIG_NFS_ACL_SUPPORT=m 1694CONFIG_NFS_ACL_SUPPORT=m
1488CONFIG_NFS_COMMON=y 1695CONFIG_NFS_COMMON=y
1489CONFIG_SUNRPC=m 1696CONFIG_SUNRPC=m
1490CONFIG_SUNRPC_GSS=m 1697CONFIG_SUNRPC_GSS=m
1698CONFIG_SUNRPC_BACKCHANNEL=y
1491CONFIG_RPCSEC_GSS_KRB5=m 1699CONFIG_RPCSEC_GSS_KRB5=m
1492# CONFIG_CEPH_FS is not set 1700# CONFIG_CEPH_FS is not set
1493CONFIG_CIFS=m 1701CONFIG_CIFS=m
@@ -1501,32 +1709,9 @@ CONFIG_CIFS_POSIX=y
1501CONFIG_CIFS_DFS_UPCALL=y 1709CONFIG_CIFS_DFS_UPCALL=y
1502CONFIG_CIFS_FSCACHE=y 1710CONFIG_CIFS_FSCACHE=y
1503# CONFIG_CIFS_ACL is not set 1711# CONFIG_CIFS_ACL is not set
1504CONFIG_CIFS_EXPERIMENTAL=y
1505# CONFIG_NCP_FS is not set 1712# CONFIG_NCP_FS is not set
1506# CONFIG_CODA_FS is not set 1713# CONFIG_CODA_FS is not set
1507# CONFIG_AFS_FS is not set 1714# CONFIG_AFS_FS is not set
1508
1509#
1510# Partition Types
1511#
1512CONFIG_PARTITION_ADVANCED=y
1513# CONFIG_ACORN_PARTITION is not set
1514CONFIG_OSF_PARTITION=y
1515CONFIG_AMIGA_PARTITION=y
1516# CONFIG_ATARI_PARTITION is not set
1517CONFIG_MAC_PARTITION=y
1518CONFIG_MSDOS_PARTITION=y
1519CONFIG_BSD_DISKLABEL=y
1520CONFIG_MINIX_SUBPARTITION=y
1521CONFIG_SOLARIS_X86_PARTITION=y
1522CONFIG_UNIXWARE_DISKLABEL=y
1523# CONFIG_LDM_PARTITION is not set
1524CONFIG_SGI_PARTITION=y
1525# CONFIG_ULTRIX_PARTITION is not set
1526CONFIG_SUN_PARTITION=y
1527CONFIG_KARMA_PARTITION=y
1528CONFIG_EFI_PARTITION=y
1529# CONFIG_SYSV68_PARTITION is not set
1530CONFIG_NLS=y 1715CONFIG_NLS=y
1531CONFIG_NLS_DEFAULT="utf8" 1716CONFIG_NLS_DEFAULT="utf8"
1532CONFIG_NLS_CODEPAGE_437=y 1717CONFIG_NLS_CODEPAGE_437=y
@@ -1585,7 +1770,7 @@ CONFIG_DEBUG_FS=y
1585CONFIG_HEADERS_CHECK=y 1770CONFIG_HEADERS_CHECK=y
1586# CONFIG_DEBUG_SECTION_MISMATCH is not set 1771# CONFIG_DEBUG_SECTION_MISMATCH is not set
1587CONFIG_DEBUG_KERNEL=y 1772CONFIG_DEBUG_KERNEL=y
1588CONFIG_DEBUG_SHIRQ=y 1773# CONFIG_DEBUG_SHIRQ is not set
1589CONFIG_LOCKUP_DETECTOR=y 1774CONFIG_LOCKUP_DETECTOR=y
1590# CONFIG_HARDLOCKUP_DETECTOR is not set 1775# CONFIG_HARDLOCKUP_DETECTOR is not set
1591# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set 1776# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
@@ -1593,6 +1778,7 @@ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
1593# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1778# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1594CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1779CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1595CONFIG_DETECT_HUNG_TASK=y 1780CONFIG_DETECT_HUNG_TASK=y
1781CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
1596# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set 1782# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1597CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 1783CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1598CONFIG_SCHED_DEBUG=y 1784CONFIG_SCHED_DEBUG=y
@@ -1610,10 +1796,12 @@ CONFIG_TIMER_STATS=y
1610# CONFIG_PROVE_LOCKING is not set 1796# CONFIG_PROVE_LOCKING is not set
1611# CONFIG_SPARSE_RCU_POINTER is not set 1797# CONFIG_SPARSE_RCU_POINTER is not set
1612# CONFIG_LOCK_STAT is not set 1798# CONFIG_LOCK_STAT is not set
1613CONFIG_DEBUG_SPINLOCK_SLEEP=y 1799# CONFIG_DEBUG_ATOMIC_SLEEP is not set
1614# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1800# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1615CONFIG_STACKTRACE=y 1801CONFIG_STACKTRACE=y
1802# CONFIG_DEBUG_STACK_USAGE is not set
1616# CONFIG_DEBUG_KOBJECT is not set 1803# CONFIG_DEBUG_KOBJECT is not set
1804CONFIG_DEBUG_BUGVERBOSE=y
1617CONFIG_DEBUG_INFO=y 1805CONFIG_DEBUG_INFO=y
1618CONFIG_DEBUG_INFO_REDUCED=y 1806CONFIG_DEBUG_INFO_REDUCED=y
1619CONFIG_DEBUG_VM=y 1807CONFIG_DEBUG_VM=y
@@ -1625,10 +1813,11 @@ CONFIG_DEBUG_LIST=y
1625# CONFIG_DEBUG_NOTIFIERS is not set 1813# CONFIG_DEBUG_NOTIFIERS is not set
1626CONFIG_DEBUG_CREDENTIALS=y 1814CONFIG_DEBUG_CREDENTIALS=y
1627# CONFIG_RCU_TORTURE_TEST is not set 1815# CONFIG_RCU_TORTURE_TEST is not set
1628# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1816CONFIG_RCU_CPU_STALL_TIMEOUT=60
1629# CONFIG_BACKTRACE_SELF_TEST is not set 1817# CONFIG_BACKTRACE_SELF_TEST is not set
1630# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1818# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1631CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y 1819CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
1820# CONFIG_DEBUG_PER_CPU_MAPS is not set
1632# CONFIG_LKDTM is not set 1821# CONFIG_LKDTM is not set
1633# CONFIG_FAULT_INJECTION is not set 1822# CONFIG_FAULT_INJECTION is not set
1634# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1823# CONFIG_SYSCTL_SYSCALL_CHECK is not set
@@ -1650,13 +1839,13 @@ CONFIG_ASYNC_RAID6_TEST=m
1650# CONFIG_TEST_KSTRTOX is not set 1839# CONFIG_TEST_KSTRTOX is not set
1651CONFIG_EARLY_PRINTK=y 1840CONFIG_EARLY_PRINTK=y
1652CONFIG_DEBUG_STACKOVERFLOW=y 1841CONFIG_DEBUG_STACKOVERFLOW=y
1653# CONFIG_DEBUG_STACK_USAGE is not set
1654CONFIG_DEBUG_EXTRA_FLAGS="" 1842CONFIG_DEBUG_EXTRA_FLAGS=""
1655 1843
1656# 1844#
1657# Security options 1845# Security options
1658# 1846#
1659CONFIG_KEYS=y 1847CONFIG_KEYS=y
1848# CONFIG_ENCRYPTED_KEYS is not set
1660CONFIG_KEYS_DEBUG_PROC_KEYS=y 1849CONFIG_KEYS_DEBUG_PROC_KEYS=y
1661# CONFIG_SECURITY_DMESG_RESTRICT is not set 1850# CONFIG_SECURITY_DMESG_RESTRICT is not set
1662CONFIG_SECURITY=y 1851CONFIG_SECURITY=y
@@ -1677,6 +1866,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
1677# CONFIG_SECURITY_TOMOYO is not set 1866# CONFIG_SECURITY_TOMOYO is not set
1678# CONFIG_SECURITY_APPARMOR is not set 1867# CONFIG_SECURITY_APPARMOR is not set
1679# CONFIG_IMA is not set 1868# CONFIG_IMA is not set
1869# CONFIG_EVM is not set
1680CONFIG_DEFAULT_SECURITY_SELINUX=y 1870CONFIG_DEFAULT_SECURITY_SELINUX=y
1681# CONFIG_DEFAULT_SECURITY_DAC is not set 1871# CONFIG_DEFAULT_SECURITY_DAC is not set
1682CONFIG_DEFAULT_SECURITY="selinux" 1872CONFIG_DEFAULT_SECURITY="selinux"
@@ -1705,6 +1895,7 @@ CONFIG_CRYPTO_PCOMP=m
1705CONFIG_CRYPTO_PCOMP2=y 1895CONFIG_CRYPTO_PCOMP2=y
1706CONFIG_CRYPTO_MANAGER=y 1896CONFIG_CRYPTO_MANAGER=y
1707CONFIG_CRYPTO_MANAGER2=y 1897CONFIG_CRYPTO_MANAGER2=y
1898# CONFIG_CRYPTO_USER is not set
1708CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y 1899CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
1709CONFIG_CRYPTO_GF128MUL=m 1900CONFIG_CRYPTO_GF128MUL=m
1710CONFIG_CRYPTO_NULL=m 1901CONFIG_CRYPTO_NULL=m
@@ -1764,6 +1955,7 @@ CONFIG_CRYPTO_AES=m
1764CONFIG_CRYPTO_ANUBIS=m 1955CONFIG_CRYPTO_ANUBIS=m
1765CONFIG_CRYPTO_ARC4=m 1956CONFIG_CRYPTO_ARC4=m
1766CONFIG_CRYPTO_BLOWFISH=m 1957CONFIG_CRYPTO_BLOWFISH=m
1958CONFIG_CRYPTO_BLOWFISH_COMMON=m
1767CONFIG_CRYPTO_CAMELLIA=m 1959CONFIG_CRYPTO_CAMELLIA=m
1768CONFIG_CRYPTO_CAST5=m 1960CONFIG_CRYPTO_CAST5=m
1769CONFIG_CRYPTO_CAST6=m 1961CONFIG_CRYPTO_CAST6=m
@@ -1791,8 +1983,6 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
1791# CONFIG_CRYPTO_USER_API_HASH is not set 1983# CONFIG_CRYPTO_USER_API_HASH is not set
1792# CONFIG_CRYPTO_USER_API_SKCIPHER is not set 1984# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
1793CONFIG_CRYPTO_HW=y 1985CONFIG_CRYPTO_HW=y
1794CONFIG_CRYPTO_DEV_HIFN_795X=m
1795CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
1796# CONFIG_BINARY_PRINTF is not set 1986# CONFIG_BINARY_PRINTF is not set
1797 1987
1798# 1988#
@@ -1801,8 +1991,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
1801CONFIG_RAID6_PQ=m 1991CONFIG_RAID6_PQ=m
1802CONFIG_BITREVERSE=y 1992CONFIG_BITREVERSE=y
1803CONFIG_GENERIC_FIND_FIRST_BIT=y 1993CONFIG_GENERIC_FIND_FIRST_BIT=y
1804CONFIG_GENERIC_FIND_NEXT_BIT=y 1994CONFIG_GENERIC_PCI_IOMAP=y
1805CONFIG_GENERIC_FIND_LAST_BIT=y
1806# CONFIG_CRC_CCITT is not set 1995# CONFIG_CRC_CCITT is not set
1807CONFIG_CRC16=y 1996CONFIG_CRC16=y
1808CONFIG_CRC_T10DIF=y 1997CONFIG_CRC_T10DIF=y
@@ -1810,6 +1999,7 @@ CONFIG_CRC_ITU_T=m
1810CONFIG_CRC32=y 1999CONFIG_CRC32=y
1811# CONFIG_CRC7 is not set 2000# CONFIG_CRC7 is not set
1812CONFIG_LIBCRC32C=m 2001CONFIG_LIBCRC32C=m
2002# CONFIG_CRC8 is not set
1813CONFIG_AUDIT_GENERIC=y 2003CONFIG_AUDIT_GENERIC=y
1814CONFIG_ZLIB_INFLATE=y 2004CONFIG_ZLIB_INFLATE=y
1815CONFIG_ZLIB_DEFLATE=m 2005CONFIG_ZLIB_DEFLATE=m
@@ -1826,6 +2016,8 @@ CONFIG_HAS_IOMEM=y
1826CONFIG_HAS_IOPORT=y 2016CONFIG_HAS_IOPORT=y
1827CONFIG_HAS_DMA=y 2017CONFIG_HAS_DMA=y
1828CONFIG_CPU_RMAP=y 2018CONFIG_CPU_RMAP=y
2019CONFIG_DQL=y
1829CONFIG_NLATTR=y 2020CONFIG_NLATTR=y
1830# CONFIG_AVERAGE is not set 2021# CONFIG_AVERAGE is not set
2022# CONFIG_CORDIC is not set
1831# CONFIG_VIRTUALIZATION is not set 2023# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 6f05f969b564..87829912c045 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -1,7 +1,6 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated file; DO NOT EDIT.
3# Linux/tile 2.6.39-rc5 Kernel Configuration 3# Linux/tilepro 3.3.0-rc7 Kernel Configuration
4# Tue May 3 09:15:02 2011
5# 4#
6CONFIG_TILE=y 5CONFIG_TILE=y
7CONFIG_MMU=y 6CONFIG_MMU=y
@@ -29,7 +28,6 @@ CONFIG_HVC_TILE=y
29# CONFIG_TILEGX is not set 28# CONFIG_TILEGX is not set
30CONFIG_ARCH_DEFCONFIG="arch/tile/configs/tile_defconfig" 29CONFIG_ARCH_DEFCONFIG="arch/tile/configs/tile_defconfig"
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
32CONFIG_CONSTRUCTORS=y
33 31
34# 32#
35# General setup 33# General setup
@@ -38,15 +36,22 @@ CONFIG_EXPERIMENTAL=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 36CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_CROSS_COMPILE="" 37CONFIG_CROSS_COMPILE=""
40CONFIG_LOCALVERSION="" 38CONFIG_LOCALVERSION=""
41CONFIG_LOCALVERSION_AUTO=y 39# CONFIG_LOCALVERSION_AUTO is not set
42# CONFIG_SWAP is not set 40CONFIG_DEFAULT_HOSTNAME="(none)"
41CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 42CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y 43CONFIG_SYSVIPC_SYSCTL=y
45# CONFIG_POSIX_MQUEUE is not set 44CONFIG_POSIX_MQUEUE=y
46# CONFIG_BSD_PROCESS_ACCT is not set 45CONFIG_POSIX_MQUEUE_SYSCTL=y
47CONFIG_FHANDLE=y 46CONFIG_BSD_PROCESS_ACCT=y
48# CONFIG_TASKSTATS is not set 47CONFIG_BSD_PROCESS_ACCT_V3=y
49# CONFIG_AUDIT is not set 48# CONFIG_FHANDLE is not set
49CONFIG_TASKSTATS=y
50CONFIG_TASK_DELAY_ACCT=y
51CONFIG_TASK_XACCT=y
52CONFIG_TASK_IO_ACCOUNTING=y
53CONFIG_AUDIT=y
54# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
50CONFIG_HAVE_GENERIC_HARDIRQS=y 55CONFIG_HAVE_GENERIC_HARDIRQS=y
51 56
52# 57#
@@ -68,23 +73,43 @@ CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FAST_NO_HZ is not set 73# CONFIG_RCU_FAST_NO_HZ is not set
69# CONFIG_TREE_RCU_TRACE is not set 74# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 75# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=17 76CONFIG_LOG_BUF_SHIFT=19
72# CONFIG_CGROUPS is not set 77CONFIG_CGROUPS=y
73# CONFIG_NAMESPACES is not set 78CONFIG_CGROUP_DEBUG=y
79# CONFIG_CGROUP_FREEZER is not set
80CONFIG_CGROUP_DEVICE=y
81CONFIG_CPUSETS=y
82CONFIG_PROC_PID_CPUSET=y
83CONFIG_CGROUP_CPUACCT=y
84CONFIG_RESOURCE_COUNTERS=y
85CONFIG_CGROUP_MEM_RES_CTLR=y
86CONFIG_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
90CONFIG_FAIR_GROUP_SCHED=y
91# CONFIG_CFS_BANDWIDTH is not set
92CONFIG_RT_GROUP_SCHED=y
93CONFIG_BLK_CGROUP=y
94# CONFIG_DEBUG_BLK_CGROUP is not set
95# CONFIG_CHECKPOINT_RESTORE is not set
96CONFIG_NAMESPACES=y
97CONFIG_UTS_NS=y
98CONFIG_IPC_NS=y
99CONFIG_USER_NS=y
100CONFIG_PID_NS=y
101CONFIG_NET_NS=y
74# CONFIG_SCHED_AUTOGROUP is not set 102# CONFIG_SCHED_AUTOGROUP is not set
103CONFIG_MM_OWNER=y
75# CONFIG_SYSFS_DEPRECATED is not set 104# CONFIG_SYSFS_DEPRECATED is not set
76# CONFIG_RELAY is not set 105CONFIG_RELAY=y
77CONFIG_BLK_DEV_INITRD=y 106CONFIG_BLK_DEV_INITRD=y
78CONFIG_INITRAMFS_SOURCE="usr/contents.txt" 107CONFIG_INITRAMFS_SOURCE=""
79CONFIG_INITRAMFS_ROOT_UID=0
80CONFIG_INITRAMFS_ROOT_GID=0
81CONFIG_RD_GZIP=y 108CONFIG_RD_GZIP=y
82# CONFIG_RD_BZIP2 is not set 109# CONFIG_RD_BZIP2 is not set
83# CONFIG_RD_LZMA is not set 110# CONFIG_RD_LZMA is not set
84# CONFIG_RD_XZ is not set 111# CONFIG_RD_XZ is not set
85# CONFIG_RD_LZO is not set 112# CONFIG_RD_LZO is not set
86CONFIG_INITRAMFS_COMPRESSION_NONE=y
87# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
88CONFIG_CC_OPTIMIZE_FOR_SIZE=y 113CONFIG_CC_OPTIMIZE_FOR_SIZE=y
89CONFIG_SYSCTL=y 114CONFIG_SYSCTL=y
90CONFIG_ANON_INODES=y 115CONFIG_ANON_INODES=y
@@ -92,7 +117,6 @@ CONFIG_EXPERT=y
92CONFIG_SYSCTL_SYSCALL=y 117CONFIG_SYSCTL_SYSCALL=y
93CONFIG_KALLSYMS=y 118CONFIG_KALLSYMS=y
94# CONFIG_KALLSYMS_ALL is not set 119# CONFIG_KALLSYMS_ALL is not set
95# CONFIG_KALLSYMS_EXTRA_PASS is not set
96CONFIG_HOTPLUG=y 120CONFIG_HOTPLUG=y
97CONFIG_PRINTK=y 121CONFIG_PRINTK=y
98CONFIG_BUG=y 122CONFIG_BUG=y
@@ -119,16 +143,18 @@ CONFIG_SLUB=y
119# CONFIG_SLOB is not set 143# CONFIG_SLOB is not set
120CONFIG_PROFILING=y 144CONFIG_PROFILING=y
121CONFIG_USE_GENERIC_SMP_HELPERS=y 145CONFIG_USE_GENERIC_SMP_HELPERS=y
146CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
122 147
123# 148#
124# GCOV-based kernel profiling 149# GCOV-based kernel profiling
125# 150#
151# CONFIG_GCOV_KERNEL is not set
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 152# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 153CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 154CONFIG_RT_MUTEXES=y
129CONFIG_BASE_SMALL=0 155CONFIG_BASE_SMALL=0
130CONFIG_MODULES=y 156CONFIG_MODULES=y
131# CONFIG_MODULE_FORCE_LOAD is not set 157CONFIG_MODULE_FORCE_LOAD=y
132CONFIG_MODULE_UNLOAD=y 158CONFIG_MODULE_UNLOAD=y
133# CONFIG_MODULE_FORCE_UNLOAD is not set 159# CONFIG_MODULE_FORCE_UNLOAD is not set
134# CONFIG_MODVERSIONS is not set 160# CONFIG_MODVERSIONS is not set
@@ -136,17 +162,45 @@ CONFIG_MODULE_UNLOAD=y
136CONFIG_STOP_MACHINE=y 162CONFIG_STOP_MACHINE=y
137CONFIG_BLOCK=y 163CONFIG_BLOCK=y
138CONFIG_LBDAF=y 164CONFIG_LBDAF=y
139# CONFIG_BLK_DEV_BSG is not set 165CONFIG_BLK_DEV_BSG=y
140# CONFIG_BLK_DEV_INTEGRITY is not set 166# CONFIG_BLK_DEV_BSGLIB is not set
167CONFIG_BLK_DEV_INTEGRITY=y
168# CONFIG_BLK_DEV_THROTTLING is not set
169
170#
171# Partition Types
172#
173CONFIG_PARTITION_ADVANCED=y
174# CONFIG_ACORN_PARTITION is not set
175CONFIG_OSF_PARTITION=y
176CONFIG_AMIGA_PARTITION=y
177# CONFIG_ATARI_PARTITION is not set
178CONFIG_MAC_PARTITION=y
179CONFIG_MSDOS_PARTITION=y
180CONFIG_BSD_DISKLABEL=y
181CONFIG_MINIX_SUBPARTITION=y
182CONFIG_SOLARIS_X86_PARTITION=y
183CONFIG_UNIXWARE_DISKLABEL=y
184# CONFIG_LDM_PARTITION is not set
185CONFIG_SGI_PARTITION=y
186# CONFIG_ULTRIX_PARTITION is not set
187CONFIG_SUN_PARTITION=y
188CONFIG_KARMA_PARTITION=y
189CONFIG_EFI_PARTITION=y
190# CONFIG_SYSV68_PARTITION is not set
141 191
142# 192#
143# IO Schedulers 193# IO Schedulers
144# 194#
145CONFIG_IOSCHED_NOOP=y 195CONFIG_IOSCHED_NOOP=y
146# CONFIG_IOSCHED_DEADLINE is not set 196CONFIG_IOSCHED_DEADLINE=y
147# CONFIG_IOSCHED_CFQ is not set 197CONFIG_IOSCHED_CFQ=y
148CONFIG_DEFAULT_NOOP=y 198CONFIG_CFQ_GROUP_IOSCHED=y
149CONFIG_DEFAULT_IOSCHED="noop" 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
150# CONFIG_INLINE_SPIN_TRYLOCK is not set 204# CONFIG_INLINE_SPIN_TRYLOCK is not set
151# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set 205# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
152# CONFIG_INLINE_SPIN_LOCK is not set 206# CONFIG_INLINE_SPIN_LOCK is not set
@@ -219,6 +273,7 @@ CONFIG_BOUNCE=y
219CONFIG_VIRT_TO_BUS=y 273CONFIG_VIRT_TO_BUS=y
220# CONFIG_KSM is not set 274# CONFIG_KSM is not set
221CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276# CONFIG_CLEANCACHE is not set
222# CONFIG_CMDLINE_BOOL is not set 277# CONFIG_CMDLINE_BOOL is not set
223CONFIG_VMALLOC_RESERVE=0x1000000 278CONFIG_VMALLOC_RESERVE=0x1000000
224CONFIG_HARDWALL=y 279CONFIG_HARDWALL=y
@@ -232,9 +287,11 @@ CONFIG_PCI_DOMAINS=y
232# CONFIG_NO_IOMEM is not set 287# CONFIG_NO_IOMEM is not set
233# CONFIG_NO_IOPORT is not set 288# CONFIG_NO_IOPORT is not set
234# CONFIG_ARCH_SUPPORTS_MSI is not set 289# CONFIG_ARCH_SUPPORTS_MSI is not set
235# CONFIG_PCI_DEBUG is not set 290CONFIG_PCI_DEBUG=y
236# CONFIG_PCI_STUB is not set 291# CONFIG_PCI_STUB is not set
237# CONFIG_PCI_IOV is not set 292# CONFIG_PCI_IOV is not set
293# CONFIG_PCI_PRI is not set
294# CONFIG_PCI_PASID is not set
238# CONFIG_HOTPLUG_PCI is not set 295# CONFIG_HOTPLUG_PCI is not set
239 296
240# 297#
@@ -244,7 +301,7 @@ CONFIG_KCORE_ELF=y
244CONFIG_BINFMT_ELF=y 301CONFIG_BINFMT_ELF=y
245# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 302# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
246# CONFIG_HAVE_AOUT is not set 303# CONFIG_HAVE_AOUT is not set
247# CONFIG_BINFMT_MISC is not set 304CONFIG_BINFMT_MISC=y
248CONFIG_NET=y 305CONFIG_NET=y
249 306
250# 307#
@@ -252,68 +309,338 @@ CONFIG_NET=y
252# 309#
253CONFIG_PACKET=y 310CONFIG_PACKET=y
254CONFIG_UNIX=y 311CONFIG_UNIX=y
312# CONFIG_UNIX_DIAG is not set
255CONFIG_XFRM=y 313CONFIG_XFRM=y
256# CONFIG_XFRM_USER is not set 314CONFIG_XFRM_USER=y
257# CONFIG_XFRM_SUB_POLICY is not set 315CONFIG_XFRM_SUB_POLICY=y
258# CONFIG_XFRM_MIGRATE is not set 316CONFIG_XFRM_MIGRATE=y
259# CONFIG_XFRM_STATISTICS is not set 317CONFIG_XFRM_STATISTICS=y
260# CONFIG_NET_KEY is not set 318CONFIG_XFRM_IPCOMP=m
319CONFIG_NET_KEY=m
320CONFIG_NET_KEY_MIGRATE=y
261CONFIG_INET=y 321CONFIG_INET=y
262CONFIG_IP_MULTICAST=y 322CONFIG_IP_MULTICAST=y
263# CONFIG_IP_ADVANCED_ROUTER is not set 323CONFIG_IP_ADVANCED_ROUTER=y
324# CONFIG_IP_FIB_TRIE_STATS is not set
325CONFIG_IP_MULTIPLE_TABLES=y
326CONFIG_IP_ROUTE_MULTIPATH=y
327CONFIG_IP_ROUTE_VERBOSE=y
328CONFIG_IP_ROUTE_CLASSID=y
264# CONFIG_IP_PNP is not set 329# CONFIG_IP_PNP is not set
265# CONFIG_NET_IPIP is not set 330CONFIG_NET_IPIP=m
266# CONFIG_NET_IPGRE_DEMUX is not set 331# CONFIG_NET_IPGRE_DEMUX is not set
267# CONFIG_IP_MROUTE is not set 332CONFIG_IP_MROUTE=y
333# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
334CONFIG_IP_PIMSM_V1=y
335CONFIG_IP_PIMSM_V2=y
268# CONFIG_ARPD is not set 336# CONFIG_ARPD is not set
269# CONFIG_SYN_COOKIES is not set 337CONFIG_SYN_COOKIES=y
270# CONFIG_INET_AH is not set 338CONFIG_INET_AH=m
271# CONFIG_INET_ESP is not set 339CONFIG_INET_ESP=m
272# CONFIG_INET_IPCOMP is not set 340CONFIG_INET_IPCOMP=m
273# CONFIG_INET_XFRM_TUNNEL is not set 341CONFIG_INET_XFRM_TUNNEL=m
274CONFIG_INET_TUNNEL=y 342CONFIG_INET_TUNNEL=m
275# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 343CONFIG_INET_XFRM_MODE_TRANSPORT=m
276# CONFIG_INET_XFRM_MODE_TUNNEL is not set 344CONFIG_INET_XFRM_MODE_TUNNEL=m
277CONFIG_INET_XFRM_MODE_BEET=y 345CONFIG_INET_XFRM_MODE_BEET=m
278# CONFIG_INET_LRO is not set 346CONFIG_INET_LRO=y
279# CONFIG_INET_DIAG is not set 347CONFIG_INET_DIAG=m
280# CONFIG_TCP_CONG_ADVANCED is not set 348CONFIG_INET_TCP_DIAG=m
349# CONFIG_INET_UDP_DIAG is not set
350CONFIG_TCP_CONG_ADVANCED=y
351CONFIG_TCP_CONG_BIC=m
281CONFIG_TCP_CONG_CUBIC=y 352CONFIG_TCP_CONG_CUBIC=y
353CONFIG_TCP_CONG_WESTWOOD=m
354CONFIG_TCP_CONG_HTCP=m
355CONFIG_TCP_CONG_HSTCP=m
356CONFIG_TCP_CONG_HYBLA=m
357CONFIG_TCP_CONG_VEGAS=m
358CONFIG_TCP_CONG_SCALABLE=m
359CONFIG_TCP_CONG_LP=m
360CONFIG_TCP_CONG_VENO=m
361CONFIG_TCP_CONG_YEAH=m
362CONFIG_TCP_CONG_ILLINOIS=m
363CONFIG_DEFAULT_CUBIC=y
364# CONFIG_DEFAULT_RENO is not set
282CONFIG_DEFAULT_TCP_CONG="cubic" 365CONFIG_DEFAULT_TCP_CONG="cubic"
283# CONFIG_TCP_MD5SIG is not set 366CONFIG_TCP_MD5SIG=y
284CONFIG_IPV6=y 367CONFIG_IPV6=y
285# CONFIG_IPV6_PRIVACY is not set 368CONFIG_IPV6_PRIVACY=y
286# CONFIG_IPV6_ROUTER_PREF is not set 369CONFIG_IPV6_ROUTER_PREF=y
287# CONFIG_IPV6_OPTIMISTIC_DAD is not set 370CONFIG_IPV6_ROUTE_INFO=y
288# CONFIG_INET6_AH is not set 371CONFIG_IPV6_OPTIMISTIC_DAD=y
289# CONFIG_INET6_ESP is not set 372CONFIG_INET6_AH=m
290# CONFIG_INET6_IPCOMP is not set 373CONFIG_INET6_ESP=m
291# CONFIG_IPV6_MIP6 is not set 374CONFIG_INET6_IPCOMP=m
292# CONFIG_INET6_XFRM_TUNNEL is not set 375CONFIG_IPV6_MIP6=m
293# CONFIG_INET6_TUNNEL is not set 376CONFIG_INET6_XFRM_TUNNEL=m
294CONFIG_INET6_XFRM_MODE_TRANSPORT=y 377CONFIG_INET6_TUNNEL=m
295CONFIG_INET6_XFRM_MODE_TUNNEL=y 378CONFIG_INET6_XFRM_MODE_TRANSPORT=m
296CONFIG_INET6_XFRM_MODE_BEET=y 379CONFIG_INET6_XFRM_MODE_TUNNEL=m
297# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 380CONFIG_INET6_XFRM_MODE_BEET=m
298CONFIG_IPV6_SIT=y 381CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
382CONFIG_IPV6_SIT=m
299# CONFIG_IPV6_SIT_6RD is not set 383# CONFIG_IPV6_SIT_6RD is not set
300CONFIG_IPV6_NDISC_NODETYPE=y 384CONFIG_IPV6_NDISC_NODETYPE=y
301# CONFIG_IPV6_TUNNEL is not set 385CONFIG_IPV6_TUNNEL=m
302# CONFIG_IPV6_MULTIPLE_TABLES is not set 386CONFIG_IPV6_MULTIPLE_TABLES=y
303# CONFIG_IPV6_MROUTE is not set 387# CONFIG_IPV6_SUBTREES is not set
304# CONFIG_NETWORK_SECMARK is not set 388CONFIG_IPV6_MROUTE=y
389# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
390CONFIG_IPV6_PIMSM_V2=y
391CONFIG_NETLABEL=y
392CONFIG_NETWORK_SECMARK=y
305# CONFIG_NETWORK_PHY_TIMESTAMPING is not set 393# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
306# CONFIG_NETFILTER is not set 394CONFIG_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
407CONFIG_NF_CONNTRACK_MARK=y
408CONFIG_NF_CONNTRACK_SECMARK=y
409CONFIG_NF_CONNTRACK_ZONES=y
410CONFIG_NF_CONNTRACK_PROCFS=y
411CONFIG_NF_CONNTRACK_EVENTS=y
412# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
413CONFIG_NF_CT_PROTO_DCCP=m
414CONFIG_NF_CT_PROTO_GRE=m
415CONFIG_NF_CT_PROTO_SCTP=m
416CONFIG_NF_CT_PROTO_UDPLITE=m
417CONFIG_NF_CONNTRACK_AMANDA=m
418CONFIG_NF_CONNTRACK_FTP=m
419CONFIG_NF_CONNTRACK_H323=m
420CONFIG_NF_CONNTRACK_IRC=m
421CONFIG_NF_CONNTRACK_BROADCAST=m
422CONFIG_NF_CONNTRACK_NETBIOS_NS=m
423# CONFIG_NF_CONNTRACK_SNMP is not set
424CONFIG_NF_CONNTRACK_PPTP=m
425CONFIG_NF_CONNTRACK_SANE=m
426CONFIG_NF_CONNTRACK_SIP=m
427CONFIG_NF_CONNTRACK_TFTP=m
428# CONFIG_NF_CT_NETLINK is not set
429CONFIG_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
444CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
445CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
446CONFIG_NETFILTER_XT_TARGET_CT=m
447CONFIG_NETFILTER_XT_TARGET_DSCP=m
448CONFIG_NETFILTER_XT_TARGET_HL=m
449CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
450CONFIG_NETFILTER_XT_TARGET_MARK=m
451CONFIG_NETFILTER_XT_TARGET_NFLOG=m
452CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
453CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
454CONFIG_NETFILTER_XT_TARGET_RATEEST=m
455CONFIG_NETFILTER_XT_TARGET_TEE=m
456CONFIG_NETFILTER_XT_TARGET_TPROXY=m
457CONFIG_NETFILTER_XT_TARGET_TRACE=m
458CONFIG_NETFILTER_XT_TARGET_SECMARK=m
459CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
460CONFIG_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
467CONFIG_NETFILTER_XT_MATCH_COMMENT=m
468CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
469CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
470CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
471CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
472# CONFIG_NETFILTER_XT_MATCH_CPU is not set
473CONFIG_NETFILTER_XT_MATCH_DCCP=m
474# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
475CONFIG_NETFILTER_XT_MATCH_DSCP=m
476CONFIG_NETFILTER_XT_MATCH_ECN=m
477CONFIG_NETFILTER_XT_MATCH_ESP=m
478CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
479CONFIG_NETFILTER_XT_MATCH_HELPER=m
480CONFIG_NETFILTER_XT_MATCH_HL=m
481CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
482CONFIG_NETFILTER_XT_MATCH_IPVS=m
483CONFIG_NETFILTER_XT_MATCH_LENGTH=m
484CONFIG_NETFILTER_XT_MATCH_LIMIT=m
485CONFIG_NETFILTER_XT_MATCH_MAC=m
486CONFIG_NETFILTER_XT_MATCH_MARK=m
487CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
488# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
489CONFIG_NETFILTER_XT_MATCH_OSF=m
490CONFIG_NETFILTER_XT_MATCH_OWNER=m
491CONFIG_NETFILTER_XT_MATCH_POLICY=m
492CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
493CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
494CONFIG_NETFILTER_XT_MATCH_QUOTA=m
495CONFIG_NETFILTER_XT_MATCH_RATEEST=m
496CONFIG_NETFILTER_XT_MATCH_REALM=m
497CONFIG_NETFILTER_XT_MATCH_RECENT=m
498CONFIG_NETFILTER_XT_MATCH_SCTP=m
499CONFIG_NETFILTER_XT_MATCH_SOCKET=m
500CONFIG_NETFILTER_XT_MATCH_STATE=m
501CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
502CONFIG_NETFILTER_XT_MATCH_STRING=m
503CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
504CONFIG_NETFILTER_XT_MATCH_TIME=m
505CONFIG_NETFILTER_XT_MATCH_U32=m
506# CONFIG_IP_SET is not set
507CONFIG_IP_VS=m
508CONFIG_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
516CONFIG_IP_VS_PROTO_UDP=y
517CONFIG_IP_VS_PROTO_AH_ESP=y
518CONFIG_IP_VS_PROTO_ESP=y
519CONFIG_IP_VS_PROTO_AH=y
520CONFIG_IP_VS_PROTO_SCTP=y
521
522#
523# IPVS scheduler
524#
525CONFIG_IP_VS_RR=m
526CONFIG_IP_VS_WRR=m
527CONFIG_IP_VS_LC=m
528CONFIG_IP_VS_WLC=m
529CONFIG_IP_VS_LBLC=m
530CONFIG_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
534CONFIG_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
552# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
553CONFIG_IP_NF_QUEUE=m
554CONFIG_IP_NF_IPTABLES=y
555CONFIG_IP_NF_MATCH_AH=m
556CONFIG_IP_NF_MATCH_ECN=m
557# CONFIG_IP_NF_MATCH_RPFILTER is not set
558CONFIG_IP_NF_MATCH_TTL=m
559CONFIG_IP_NF_FILTER=y
560CONFIG_IP_NF_TARGET_REJECT=y
561CONFIG_IP_NF_TARGET_LOG=m
562CONFIG_IP_NF_TARGET_ULOG=m
563# CONFIG_NF_NAT is not set
564CONFIG_IP_NF_MANGLE=m
565# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
566CONFIG_IP_NF_TARGET_ECN=m
567CONFIG_IP_NF_TARGET_TTL=m
568CONFIG_IP_NF_RAW=m
569CONFIG_IP_NF_SECURITY=m
570CONFIG_IP_NF_ARPTABLES=m
571CONFIG_IP_NF_ARPFILTER=m
572CONFIG_IP_NF_ARP_MANGLE=m
573
574#
575# IPv6: Netfilter Configuration
576#
577CONFIG_NF_DEFRAG_IPV6=m
578CONFIG_NF_CONNTRACK_IPV6=m
579CONFIG_IP6_NF_QUEUE=m
580CONFIG_IP6_NF_IPTABLES=m
581CONFIG_IP6_NF_MATCH_AH=m
582CONFIG_IP6_NF_MATCH_EUI64=m
583CONFIG_IP6_NF_MATCH_FRAG=m
584CONFIG_IP6_NF_MATCH_OPTS=m
585CONFIG_IP6_NF_MATCH_HL=m
586CONFIG_IP6_NF_MATCH_IPV6HEADER=m
587CONFIG_IP6_NF_MATCH_MH=m
588# CONFIG_IP6_NF_MATCH_RPFILTER is not set
589CONFIG_IP6_NF_MATCH_RT=m
590CONFIG_IP6_NF_TARGET_HL=m
591CONFIG_IP6_NF_TARGET_LOG=m
592CONFIG_IP6_NF_FILTER=m
593CONFIG_IP6_NF_TARGET_REJECT=m
594CONFIG_IP6_NF_MANGLE=m
595CONFIG_IP6_NF_RAW=m
596CONFIG_IP6_NF_SECURITY=m
597CONFIG_BRIDGE_NF_EBTABLES=m
598CONFIG_BRIDGE_EBT_BROUTE=m
599CONFIG_BRIDGE_EBT_T_FILTER=m
600CONFIG_BRIDGE_EBT_T_NAT=m
601CONFIG_BRIDGE_EBT_802_3=m
602CONFIG_BRIDGE_EBT_AMONG=m
603CONFIG_BRIDGE_EBT_ARP=m
604CONFIG_BRIDGE_EBT_IP=m
605CONFIG_BRIDGE_EBT_IP6=m
606CONFIG_BRIDGE_EBT_LIMIT=m
607CONFIG_BRIDGE_EBT_MARK=m
608CONFIG_BRIDGE_EBT_PKTTYPE=m
609CONFIG_BRIDGE_EBT_STP=m
610CONFIG_BRIDGE_EBT_VLAN=m
611CONFIG_BRIDGE_EBT_ARPREPLY=m
612CONFIG_BRIDGE_EBT_DNAT=m
613CONFIG_BRIDGE_EBT_MARK_T=m
614CONFIG_BRIDGE_EBT_REDIRECT=m
615CONFIG_BRIDGE_EBT_SNAT=m
616CONFIG_BRIDGE_EBT_LOG=m
617CONFIG_BRIDGE_EBT_ULOG=m
618CONFIG_BRIDGE_EBT_NFLOG=m
307# CONFIG_IP_DCCP is not set 619# CONFIG_IP_DCCP is not set
308# CONFIG_IP_SCTP is not set 620CONFIG_IP_SCTP=m
309# CONFIG_RDS is not set 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
627CONFIG_RDS_TCP=m
628# CONFIG_RDS_DEBUG is not set
310# CONFIG_TIPC is not set 629# CONFIG_TIPC is not set
311# CONFIG_ATM is not set 630# CONFIG_ATM is not set
312# CONFIG_L2TP is not set 631# CONFIG_L2TP is not set
313# CONFIG_BRIDGE is not set 632CONFIG_STP=m
314# CONFIG_NET_DSA is not set 633CONFIG_GARP=m
315# CONFIG_VLAN_8021Q is not set 634CONFIG_BRIDGE=m
635CONFIG_BRIDGE_IGMP_SNOOPING=y
636CONFIG_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
641CONFIG_VLAN_8021Q_GVRP=y
316# CONFIG_DECNET is not set 642# CONFIG_DECNET is not set
643CONFIG_LLC=m
317# CONFIG_LLC2 is not set 644# CONFIG_LLC2 is not set
318# CONFIG_IPX is not set 645# CONFIG_IPX is not set
319# CONFIG_ATALK is not set 646# CONFIG_ATALK is not set
@@ -321,14 +648,76 @@ CONFIG_IPV6_NDISC_NODETYPE=y
321# CONFIG_LAPB is not set 648# CONFIG_LAPB is not set
322# CONFIG_ECONET is not set 649# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 650# CONFIG_WAN_ROUTER is not set
324# CONFIG_PHONET is not set 651CONFIG_PHONET=m
325# CONFIG_IEEE802154 is not set 652# CONFIG_IEEE802154 is not set
326# CONFIG_NET_SCHED is not set 653CONFIG_NET_SCHED=y
327# CONFIG_DCB is not set 654
655#
656# Queueing/Scheduling
657#
658CONFIG_NET_SCH_CBQ=m
659CONFIG_NET_SCH_HTB=m
660CONFIG_NET_SCH_HFSC=m
661CONFIG_NET_SCH_PRIO=m
662CONFIG_NET_SCH_MULTIQ=m
663CONFIG_NET_SCH_RED=m
664# CONFIG_NET_SCH_SFB is not set
665CONFIG_NET_SCH_SFQ=m
666CONFIG_NET_SCH_TEQL=m
667CONFIG_NET_SCH_TBF=m
668CONFIG_NET_SCH_GRED=m
669CONFIG_NET_SCH_DSMARK=m
670CONFIG_NET_SCH_NETEM=m
671CONFIG_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
676
677#
678# Classification
679#
680CONFIG_NET_CLS=y
681CONFIG_NET_CLS_BASIC=m
682CONFIG_NET_CLS_TCINDEX=m
683CONFIG_NET_CLS_ROUTE4=m
684CONFIG_NET_CLS_FW=m
685CONFIG_NET_CLS_U32=m
686CONFIG_CLS_U32_PERF=y
687CONFIG_CLS_U32_MARK=y
688CONFIG_NET_CLS_RSVP=m
689CONFIG_NET_CLS_RSVP6=m
690CONFIG_NET_CLS_FLOW=m
691CONFIG_NET_CLS_CGROUP=y
692CONFIG_NET_EMATCH=y
693CONFIG_NET_EMATCH_STACK=32
694CONFIG_NET_EMATCH_CMP=m
695CONFIG_NET_EMATCH_NBYTE=m
696CONFIG_NET_EMATCH_U32=m
697CONFIG_NET_EMATCH_META=m
698CONFIG_NET_EMATCH_TEXT=m
699CONFIG_NET_CLS_ACT=y
700CONFIG_NET_ACT_POLICE=m
701CONFIG_NET_ACT_GACT=m
702CONFIG_GACT_PROB=y
703CONFIG_NET_ACT_MIRRED=m
704CONFIG_NET_ACT_IPT=m
705CONFIG_NET_ACT_NAT=m
706CONFIG_NET_ACT_PEDIT=m
707CONFIG_NET_ACT_SIMP=m
708CONFIG_NET_ACT_SKBEDIT=m
709# CONFIG_NET_ACT_CSUM is not set
710CONFIG_NET_CLS_IND=y
711CONFIG_NET_SCH_FIFO=y
712CONFIG_DCB=y
713CONFIG_DNS_RESOLVER=y
328# CONFIG_BATMAN_ADV is not set 714# CONFIG_BATMAN_ADV is not set
715# CONFIG_OPENVSWITCH is not set
329CONFIG_RPS=y 716CONFIG_RPS=y
330CONFIG_RFS_ACCEL=y 717CONFIG_RFS_ACCEL=y
331CONFIG_XPS=y 718CONFIG_XPS=y
719# CONFIG_NETPRIO_CGROUP is not set
720CONFIG_BQL=y
332 721
333# 722#
334# Network testing 723# Network testing
@@ -339,12 +728,14 @@ CONFIG_XPS=y
339# CONFIG_IRDA is not set 728# CONFIG_IRDA is not set
340# CONFIG_BT is not set 729# CONFIG_BT is not set
341# CONFIG_AF_RXRPC is not set 730# CONFIG_AF_RXRPC is not set
731CONFIG_FIB_RULES=y
342# CONFIG_WIRELESS is not set 732# CONFIG_WIRELESS is not set
343# CONFIG_WIMAX is not set 733# CONFIG_WIMAX is not set
344# CONFIG_RFKILL is not set 734# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 735# CONFIG_NET_9P is not set
346# CONFIG_CAIF is not set 736# CONFIG_CAIF is not set
347# CONFIG_CEPH_LIB is not set 737# CONFIG_CEPH_LIB is not set
738# CONFIG_NFC is not set
348 739
349# 740#
350# Device Drivers 741# Device Drivers
@@ -354,16 +745,20 @@ CONFIG_XPS=y
354# Generic Driver Options 745# Generic Driver Options
355# 746#
356CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 747CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
357# CONFIG_DEVTMPFS is not set 748CONFIG_DEVTMPFS=y
749CONFIG_DEVTMPFS_MOUNT=y
358CONFIG_STANDALONE=y 750CONFIG_STANDALONE=y
359CONFIG_PREVENT_FIRMWARE_BUILD=y 751CONFIG_PREVENT_FIRMWARE_BUILD=y
360CONFIG_FW_LOADER=y 752CONFIG_FW_LOADER=y
361CONFIG_FIRMWARE_IN_KERNEL=y 753# CONFIG_FIRMWARE_IN_KERNEL is not set
362CONFIG_EXTRA_FIRMWARE="" 754CONFIG_EXTRA_FIRMWARE=""
363# CONFIG_DEBUG_DRIVER is not set 755# CONFIG_DEBUG_DRIVER is not set
364# CONFIG_DEBUG_DEVRES is not set 756# CONFIG_DEBUG_DEVRES is not set
365# CONFIG_SYS_HYPERVISOR is not set 757CONFIG_SYS_HYPERVISOR=y
366# CONFIG_CONNECTOR is not set 758# CONFIG_GENERIC_CPU_DEVICES is not set
759# CONFIG_DMA_SHARED_BUFFER is not set
760CONFIG_CONNECTOR=y
761CONFIG_PROC_EVENTS=y
367# CONFIG_MTD is not set 762# CONFIG_MTD is not set
368# CONFIG_PARPORT is not set 763# CONFIG_PARPORT is not set
369CONFIG_BLK_DEV=y 764CONFIG_BLK_DEV=y
@@ -372,45 +767,74 @@ CONFIG_BLK_DEV=y
372# CONFIG_BLK_DEV_DAC960 is not set 767# CONFIG_BLK_DEV_DAC960 is not set
373# CONFIG_BLK_DEV_UMEM is not set 768# CONFIG_BLK_DEV_UMEM is not set
374# CONFIG_BLK_DEV_COW_COMMON is not set 769# CONFIG_BLK_DEV_COW_COMMON is not set
375# CONFIG_BLK_DEV_LOOP is not set 770CONFIG_BLK_DEV_LOOP=y
376 771CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
377# 772CONFIG_BLK_DEV_CRYPTOLOOP=m
378# DRBD disabled because PROC_FS, INET or CONNECTOR not selected 773# CONFIG_BLK_DEV_DRBD is not set
379#
380# CONFIG_BLK_DEV_NBD is not set 774# CONFIG_BLK_DEV_NBD is not set
381# CONFIG_BLK_DEV_SX8 is not set 775# CONFIG_BLK_DEV_NVME is not set
382# CONFIG_BLK_DEV_RAM is not set 776CONFIG_BLK_DEV_SX8=m
777CONFIG_BLK_DEV_RAM=y
778CONFIG_BLK_DEV_RAM_COUNT=16
779CONFIG_BLK_DEV_RAM_SIZE=16384
780# CONFIG_BLK_DEV_XIP is not set
383# CONFIG_CDROM_PKTCDVD is not set 781# CONFIG_CDROM_PKTCDVD is not set
384# CONFIG_ATA_OVER_ETH is not set 782CONFIG_ATA_OVER_ETH=m
385# CONFIG_BLK_DEV_RBD is not set 783# CONFIG_BLK_DEV_RBD is not set
784
785#
786# Misc devices
787#
386# CONFIG_SENSORS_LIS3LV02D is not set 788# CONFIG_SENSORS_LIS3LV02D is not set
387CONFIG_MISC_DEVICES=y 789# CONFIG_AD525X_DPOT is not set
388# CONFIG_PHANTOM is not set 790# CONFIG_PHANTOM is not set
791# CONFIG_INTEL_MID_PTI is not set
389# CONFIG_SGI_IOC4 is not set 792# CONFIG_SGI_IOC4 is not set
390# CONFIG_TIFM_CORE is not set 793# CONFIG_TIFM_CORE is not set
794# CONFIG_ICS932S401 is not set
391# CONFIG_ENCLOSURE_SERVICES is not set 795# CONFIG_ENCLOSURE_SERVICES is not set
392# CONFIG_HP_ILO 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
393# CONFIG_PCH_PHUB is not set 807# CONFIG_PCH_PHUB is not set
808# CONFIG_USB_SWITCH_FSA9480 is not set
394# CONFIG_C2PORT is not set 809# CONFIG_C2PORT is not set
395 810
396# 811#
397# EEPROM support 812# EEPROM support
398# 813#
814# CONFIG_EEPROM_AT24 is not set
815# CONFIG_EEPROM_LEGACY is not set
816# CONFIG_EEPROM_MAX6875 is not set
399# CONFIG_EEPROM_93CX6 is not set 817# CONFIG_EEPROM_93CX6 is not set
400# CONFIG_CB710_CORE is not set 818# CONFIG_CB710_CORE is not set
401 819
402# 820#
403# Texas Instruments shared transport line discipline 821# Texas Instruments shared transport line discipline
404# 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
405 829
406# 830#
407# SCSI device support 831# SCSI device support
408# 832#
409CONFIG_SCSI_MOD=y 833CONFIG_SCSI_MOD=y
410# CONFIG_RAID_ATTRS is not set 834CONFIG_RAID_ATTRS=m
411CONFIG_SCSI=y 835CONFIG_SCSI=y
412CONFIG_SCSI_DMA=y 836CONFIG_SCSI_DMA=y
413# CONFIG_SCSI_TGT is not set 837CONFIG_SCSI_TGT=m
414# CONFIG_SCSI_NETLINK is not set 838# CONFIG_SCSI_NETLINK is not set
415CONFIG_SCSI_PROC_FS=y 839CONFIG_SCSI_PROC_FS=y
416 840
@@ -435,7 +859,7 @@ CONFIG_SCSI_WAIT_SCAN=m
435# CONFIG_SCSI_SPI_ATTRS is not set 859# CONFIG_SCSI_SPI_ATTRS is not set
436# CONFIG_SCSI_FC_ATTRS is not set 860# CONFIG_SCSI_FC_ATTRS is not set
437# CONFIG_SCSI_ISCSI_ATTRS is not set 861# CONFIG_SCSI_ISCSI_ATTRS is not set
438# CONFIG_SCSI_SAS_ATTRS is not set 862CONFIG_SCSI_SAS_ATTRS=y
439# CONFIG_SCSI_SAS_LIBSAS is not set 863# CONFIG_SCSI_SAS_LIBSAS is not set
440# CONFIG_SCSI_SRP_ATTRS is not set 864# CONFIG_SCSI_SRP_ATTRS is not set
441CONFIG_SCSI_LOWLEVEL=y 865CONFIG_SCSI_LOWLEVEL=y
@@ -457,6 +881,7 @@ CONFIG_SCSI_LOWLEVEL=y
457# CONFIG_SCSI_AIC79XX is not set 881# CONFIG_SCSI_AIC79XX is not set
458# CONFIG_SCSI_AIC94XX is not set 882# CONFIG_SCSI_AIC94XX is not set
459# CONFIG_SCSI_MVSAS is not set 883# CONFIG_SCSI_MVSAS is not set
884# CONFIG_SCSI_MVUMI is not set
460# CONFIG_SCSI_DPT_I2O is not set 885# CONFIG_SCSI_DPT_I2O is not set
461# CONFIG_SCSI_ADVANSYS is not set 886# CONFIG_SCSI_ADVANSYS is not set
462# CONFIG_SCSI_ARCMSR is not set 887# CONFIG_SCSI_ARCMSR is not set
@@ -475,6 +900,7 @@ CONFIG_SCSI_LOWLEVEL=y
475# CONFIG_SCSI_INIA100 is not set 900# CONFIG_SCSI_INIA100 is not set
476# CONFIG_SCSI_STEX is not set 901# CONFIG_SCSI_STEX is not set
477# CONFIG_SCSI_SYM53C8XX_2 is not set 902# CONFIG_SCSI_SYM53C8XX_2 is not set
903# CONFIG_SCSI_IPR is not set
478# CONFIG_SCSI_QLOGIC_1280 is not set 904# CONFIG_SCSI_QLOGIC_1280 is not set
479# CONFIG_SCSI_QLA_FC is not set 905# CONFIG_SCSI_QLA_FC is not set
480# CONFIG_SCSI_QLA_ISCSI is not set 906# CONFIG_SCSI_QLA_ISCSI is not set
@@ -490,10 +916,54 @@ CONFIG_SCSI_LOWLEVEL=y
490# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 916# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
491# CONFIG_SCSI_DH is not set 917# CONFIG_SCSI_DH is not set
492# CONFIG_SCSI_OSD_INITIATOR is not set 918# CONFIG_SCSI_OSD_INITIATOR is not set
493# CONFIG_ATA is not set 919CONFIG_ATA=y
494# CONFIG_MD is not set 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
932# CONFIG_ATA_SFF is not set
933CONFIG_MD=y
934CONFIG_BLK_DEV_MD=y
935CONFIG_MD_AUTODETECT=y
936CONFIG_MD_LINEAR=m
937CONFIG_MD_RAID0=m
938CONFIG_MD_RAID1=m
939CONFIG_MD_RAID10=m
940CONFIG_MD_RAID456=m
941CONFIG_MULTICORE_RAID456=y
942# CONFIG_MD_MULTIPATH is not set
943CONFIG_MD_FAULTY=m
944CONFIG_BLK_DEV_DM=m
945CONFIG_DM_DEBUG=y
946CONFIG_DM_CRYPT=m
947CONFIG_DM_SNAPSHOT=m
948# CONFIG_DM_THIN_PROVISIONING is not set
949CONFIG_DM_MIRROR=m
950# CONFIG_DM_RAID is not set
951CONFIG_DM_LOG_USERSPACE=m
952CONFIG_DM_ZERO=m
953CONFIG_DM_MULTIPATH=m
954CONFIG_DM_MULTIPATH_QL=m
955CONFIG_DM_MULTIPATH_ST=m
956CONFIG_DM_DELAY=m
957CONFIG_DM_UEVENT=y
958# CONFIG_DM_FLAKEY is not set
495# CONFIG_TARGET_CORE is not set 959# CONFIG_TARGET_CORE is not set
496# CONFIG_FUSION is not set 960CONFIG_FUSION=y
961# CONFIG_FUSION_SPI is not set
962# CONFIG_FUSION_FC is not set
963CONFIG_FUSION_SAS=y
964CONFIG_FUSION_MAX_SGE=128
965# CONFIG_FUSION_CTL is not set
966# CONFIG_FUSION_LOGGING is not set
497 967
498# 968#
499# IEEE 1394 (FireWire) support 969# IEEE 1394 (FireWire) support
@@ -502,63 +972,113 @@ CONFIG_SCSI_LOWLEVEL=y
502# CONFIG_FIREWIRE_NOSY is not set 972# CONFIG_FIREWIRE_NOSY is not set
503# CONFIG_I2O is not set 973# CONFIG_I2O is not set
504CONFIG_NETDEVICES=y 974CONFIG_NETDEVICES=y
505# CONFIG_DUMMY is not set 975CONFIG_NET_CORE=y
506# CONFIG_BONDING is not set 976CONFIG_BONDING=m
507# CONFIG_MACVLAN is not set 977CONFIG_DUMMY=m
508# CONFIG_EQUALIZER is not set 978# CONFIG_EQUALIZER is not set
979# CONFIG_NET_FC is not set
980# CONFIG_MII is not set
981CONFIG_IFB=m
982# CONFIG_NET_TEAM is not set
983CONFIG_MACVLAN=m
984CONFIG_MACVTAP=m
985CONFIG_NETCONSOLE=m
986CONFIG_NETCONSOLE_DYNAMIC=y
987CONFIG_NETPOLL=y
988CONFIG_NETPOLL_TRAP=y
989CONFIG_NET_POLL_CONTROLLER=y
509CONFIG_TUN=y 990CONFIG_TUN=y
510# CONFIG_VETH is not set 991CONFIG_VETH=m
511# CONFIG_ARCNET is not set 992# CONFIG_ARCNET is not set
512# CONFIG_MII is not set
513# CONFIG_PHYLIB is not set
514# CONFIG_NET_ETHERNET is not set
515CONFIG_NETDEV_1000=y
516# CONFIG_ACENIC is not set
517# CONFIG_DL2K is not set
518# CONFIG_E1000 is not set
519# CONFIG_E1000E is not set
520# CONFIG_IP1000 is not set
521# CONFIG_IGB is not set
522# CONFIG_IGBVF is not set
523# CONFIG_NS83820 is not set
524# CONFIG_HAMACHI is not set
525# CONFIG_YELLOWFIN is not set
526# CONFIG_R8169 is not set
527# CONFIG_SIS190 is not set
528# CONFIG_SKGE is not set
529# CONFIG_SKY2 is not set
530# CONFIG_VIA_VELOCITY is not set
531# CONFIG_TIGON3 is not set
532# CONFIG_BNX2 is not set
533# CONFIG_CNIC is not set
534# CONFIG_QLA3XXX is not set
535# CONFIG_ATL1 is not set
536# CONFIG_ATL1E is not set
537# CONFIG_ATL1C is not set
538# CONFIG_JME is not set
539# CONFIG_STMMAC_ETH is not set
540# CONFIG_PCH_GBE is not set
541# CONFIG_NETDEV_10000 is not set
542# CONFIG_TR is not set
543# CONFIG_WLAN is not set
544 993
545# 994#
546# Enable WiMAX (Networking options) to see the WiMAX drivers 995# CAIF transport drivers
547# 996#
548# CONFIG_WAN is not set
549 997
550# 998#
551# CAIF transport drivers 999# Distributed Switch Architecture drivers
552# 1000#
1001CONFIG_NET_DSA_MV88E6XXX=y
1002CONFIG_NET_DSA_MV88E6060=y
1003CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
1004CONFIG_NET_DSA_MV88E6131=y
1005CONFIG_NET_DSA_MV88E6123_61_65=y
1006CONFIG_ETHERNET=y
1007# CONFIG_NET_VENDOR_3COM is not set
1008# CONFIG_NET_VENDOR_ADAPTEC is not set
1009# CONFIG_NET_VENDOR_ALTEON is not set
1010# CONFIG_NET_VENDOR_AMD is not set
1011# CONFIG_NET_VENDOR_ATHEROS is not set
1012# CONFIG_NET_VENDOR_BROADCOM is not set
1013# CONFIG_NET_VENDOR_BROCADE is not set
1014# CONFIG_NET_CALXEDA_XGMAC is not set
1015# CONFIG_NET_VENDOR_CHELSIO is not set
1016# CONFIG_NET_VENDOR_CISCO is not set
1017# CONFIG_DNET is not set
1018# CONFIG_NET_VENDOR_DEC is not set
1019# CONFIG_NET_VENDOR_DLINK is not set
1020# CONFIG_NET_VENDOR_EMULEX is not set
1021# CONFIG_NET_VENDOR_EXAR is not set
1022# CONFIG_NET_VENDOR_HP is not set
1023# 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
1027# CONFIG_NET_VENDOR_MELLANOX is not set
1028# CONFIG_NET_VENDOR_MICREL is not set
1029# CONFIG_NET_VENDOR_MYRI is not set
1030# CONFIG_FEALNX is not set
1031# CONFIG_NET_VENDOR_NATSEMI is not set
1032# CONFIG_NET_VENDOR_NVIDIA is not set
1033# CONFIG_NET_VENDOR_OKI is not set
1034# CONFIG_ETHOC is not set
1035# CONFIG_NET_PACKET_ENGINE is not set
1036# CONFIG_NET_VENDOR_QLOGIC is not set
1037# CONFIG_NET_VENDOR_REALTEK is not set
1038# CONFIG_NET_VENDOR_RDC is not set
1039# CONFIG_NET_VENDOR_SEEQ is not set
1040# CONFIG_NET_VENDOR_SILAN is not set
1041# CONFIG_NET_VENDOR_SIS is not set
1042# CONFIG_SFC is not set
1043# CONFIG_NET_VENDOR_SMSC is not set
1044# CONFIG_NET_VENDOR_STMICRO is not set
1045# CONFIG_NET_VENDOR_SUN is not set
1046# CONFIG_NET_VENDOR_TEHUTI is not set
1047# CONFIG_NET_VENDOR_TI is not set
553CONFIG_TILE_NET=y 1048CONFIG_TILE_NET=y
1049# CONFIG_NET_VENDOR_VIA is not set
554# CONFIG_FDDI is not set 1050# CONFIG_FDDI is not set
555# CONFIG_HIPPI 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
556# CONFIG_PPP is not set 1073# CONFIG_PPP is not set
557# CONFIG_SLIP is not set 1074# CONFIG_SLIP is not set
558# CONFIG_NET_FC is not set 1075# CONFIG_TR is not set
559# CONFIG_NETCONSOLE is not set 1076# CONFIG_WLAN is not set
560# CONFIG_NETPOLL is not set 1077
561# CONFIG_NET_POLL_CONTROLLER is not set 1078#
1079# Enable WiMAX (Networking options) to see the WiMAX drivers
1080#
1081# CONFIG_WAN is not set
562# CONFIG_VMXNET3 is not set 1082# CONFIG_VMXNET3 is not set
563# CONFIG_ISDN is not set 1083# CONFIG_ISDN is not set
564# CONFIG_PHONE is not set 1084# CONFIG_PHONE is not set
@@ -605,6 +1125,7 @@ CONFIG_UNIX98_PTYS=y
605# CONFIG_SERIAL_NONSTANDARD is not set 1125# CONFIG_SERIAL_NONSTANDARD is not set
606# CONFIG_NOZOMI is not set 1126# CONFIG_NOZOMI is not set
607# CONFIG_N_GSM is not set 1127# CONFIG_N_GSM is not set
1128# CONFIG_TRACE_SINK is not set
608CONFIG_DEVKMEM=y 1129CONFIG_DEVKMEM=y
609 1130
610# 1131#
@@ -621,10 +1142,12 @@ CONFIG_DEVKMEM=y
621# CONFIG_SERIAL_ALTERA_JTAGUART is not set 1142# CONFIG_SERIAL_ALTERA_JTAGUART is not set
622# CONFIG_SERIAL_ALTERA_UART is not set 1143# CONFIG_SERIAL_ALTERA_UART is not set
623# CONFIG_SERIAL_PCH_UART is not set 1144# CONFIG_SERIAL_PCH_UART is not set
1145# CONFIG_SERIAL_XILINX_PS_UART is not set
624# CONFIG_TTY_PRINTK is not set 1146# CONFIG_TTY_PRINTK is not set
625CONFIG_HVC_DRIVER=y 1147CONFIG_HVC_DRIVER=y
626# CONFIG_IPMI_HANDLER is not set 1148# CONFIG_IPMI_HANDLER is not set
627# CONFIG_HW_RANDOM is not set 1149CONFIG_HW_RANDOM=y
1150CONFIG_HW_RANDOM_TIMERIOMEM=m
628# CONFIG_R3964 is not set 1151# CONFIG_R3964 is not set
629# CONFIG_APPLICOM is not set 1152# CONFIG_APPLICOM is not set
630 1153
@@ -635,7 +1158,61 @@ CONFIG_HVC_DRIVER=y
635# CONFIG_TCG_TPM is not set 1158# CONFIG_TCG_TPM is not set
636CONFIG_DEVPORT=y 1159CONFIG_DEVPORT=y
637# CONFIG_RAMOOPS is not set 1160# CONFIG_RAMOOPS is not set
638# CONFIG_I2C is not set 1161CONFIG_TILE_SROM=y
1162CONFIG_I2C=y
1163CONFIG_I2C_BOARDINFO=y
1164CONFIG_I2C_COMPAT=y
1165CONFIG_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
639# CONFIG_SPI is not set 1216# CONFIG_SPI is not set
640 1217
641# 1218#
@@ -646,32 +1223,20 @@ CONFIG_DEVPORT=y
646# 1223#
647# PPS generators support 1224# PPS generators support
648# 1225#
1226
1227#
1228# PTP clock support
1229#
1230
1231#
1232# Enable Device Drivers -> PPS to see the PTP clock options.
1233#
649# CONFIG_W1 is not set 1234# CONFIG_W1 is not set
650# CONFIG_POWER_SUPPLY is not set 1235# CONFIG_POWER_SUPPLY is not set
651CONFIG_HWMON=y 1236# CONFIG_HWMON is not set
652# CONFIG_HWMON_VID is not set
653# CONFIG_HWMON_DEBUG_CHIP is not set
654
655#
656# Native drivers
657#
658# CONFIG_SENSORS_I5K_AMB is not set
659# CONFIG_SENSORS_F71805F is not set
660# CONFIG_SENSORS_F71882FG is not set
661# CONFIG_SENSORS_IT87 is not set
662# CONFIG_SENSORS_PC87360 is not set
663# CONFIG_SENSORS_PC87427 is not set
664# CONFIG_SENSORS_SIS5595 is not set
665# CONFIG_SENSORS_SMSC47M1 is not set
666# CONFIG_SENSORS_SMSC47B397 is not set
667# CONFIG_SENSORS_SCH5627 is not set
668# CONFIG_SENSORS_VIA686A is not set
669# CONFIG_SENSORS_VT1211 is not set
670# CONFIG_SENSORS_VT8231 is not set
671# CONFIG_SENSORS_W83627HF is not set
672# CONFIG_SENSORS_W83627EHF is not set
673# CONFIG_THERMAL is not set 1237# CONFIG_THERMAL is not set
674CONFIG_WATCHDOG=y 1238CONFIG_WATCHDOG=y
1239# CONFIG_WATCHDOG_CORE is not set
675CONFIG_WATCHDOG_NOWAYOUT=y 1240CONFIG_WATCHDOG_NOWAYOUT=y
676 1241
677# 1242#
@@ -691,62 +1256,64 @@ CONFIG_SSB_POSSIBLE=y
691# Sonics Silicon Backplane 1256# Sonics Silicon Backplane
692# 1257#
693# CONFIG_SSB is not set 1258# CONFIG_SSB is not set
694CONFIG_MFD_SUPPORT=y 1259CONFIG_BCMA_POSSIBLE=y
1260
1261#
1262# Broadcom specific AMBA
1263#
1264# CONFIG_BCMA is not set
1265
1266#
1267# Multifunction device drivers
1268#
695# CONFIG_MFD_CORE is not set 1269# CONFIG_MFD_CORE is not set
1270# CONFIG_MFD_88PM860X is not set
696# CONFIG_MFD_SM501 is not set 1271# CONFIG_MFD_SM501 is not set
697# CONFIG_HTC_PASIC3 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
698# CONFIG_MFD_TMIO 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
699# CONFIG_ABX500_CORE is not set 1291# CONFIG_ABX500_CORE is not set
700# CONFIG_LPC_SCH is not set 1292# CONFIG_LPC_SCH is not set
701# CONFIG_MFD_RDC321X is not set 1293# CONFIG_MFD_RDC321X is not set
702# CONFIG_MFD_JANZ_CMODIO is not set 1294# CONFIG_MFD_JANZ_CMODIO is not set
703# CONFIG_MFD_VX855 is not set 1295# CONFIG_MFD_VX855 is not set
1296# CONFIG_MFD_WL1273_CORE is not set
704# CONFIG_REGULATOR is not set 1297# CONFIG_REGULATOR is not set
705# CONFIG_MEDIA_SUPPORT is not set 1298# CONFIG_MEDIA_SUPPORT is not set
706 1299
707# 1300#
708# Graphics support 1301# Graphics support
709# 1302#
710CONFIG_VGA_ARB=y 1303# CONFIG_VGA_ARB is not set
711CONFIG_VGA_ARB_MAX_GPUS=16
712# CONFIG_DRM is not set 1304# CONFIG_DRM is not set
713# CONFIG_STUB_POULSBO is not set 1305# CONFIG_STUB_POULSBO is not set
714# CONFIG_VGASTATE is not set 1306# CONFIG_VGASTATE is not set
715# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1307# CONFIG_VIDEO_OUTPUT_CONTROL is not set
716# CONFIG_FB is not set 1308# CONFIG_FB is not set
717# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1309# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
718
719#
720# Display device support
721#
722# CONFIG_DISPLAY_SUPPORT is not set
723# CONFIG_SOUND is not set 1310# CONFIG_SOUND is not set
724# CONFIG_HID_SUPPORT is not set 1311# CONFIG_HID_SUPPORT is not set
725CONFIG_USB_SUPPORT=y 1312# CONFIG_USB_SUPPORT is not set
726CONFIG_USB_ARCH_HAS_HCD=y
727CONFIG_USB_ARCH_HAS_OHCI=y
728CONFIG_USB_ARCH_HAS_EHCI=y
729# CONFIG_USB is not set
730# CONFIG_USB_OTG_WHITELIST is not set
731# CONFIG_USB_OTG_BLACKLIST_HUB is not set
732
733#
734# Enable Host or Gadget support to see Inventra options
735#
736
737#
738# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
739#
740# CONFIG_USB_GADGET is not set
741
742#
743# OTG and related infrastructure
744#
745# CONFIG_UWB is not set 1313# CONFIG_UWB is not set
746# CONFIG_MMC is not set 1314# CONFIG_MMC is not set
747# CONFIG_MEMSTICK is not set 1315# CONFIG_MEMSTICK is not set
748# CONFIG_NEW_LEDS is not set 1316# CONFIG_NEW_LEDS is not set
749# CONFIG_NFC_DEVICES is not set
750# CONFIG_ACCESSIBILITY is not set 1317# CONFIG_ACCESSIBILITY is not set
751# CONFIG_INFINIBAND is not set 1318# CONFIG_INFINIBAND is not set
752CONFIG_EDAC=y 1319CONFIG_EDAC=y
@@ -766,13 +1333,36 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
766# 1333#
767# RTC interfaces 1334# RTC interfaces
768# 1335#
769# CONFIG_RTC_INTF_SYSFS is not set 1336CONFIG_RTC_INTF_SYSFS=y
770# CONFIG_RTC_INTF_PROC is not set 1337CONFIG_RTC_INTF_PROC=y
771CONFIG_RTC_INTF_DEV=y 1338CONFIG_RTC_INTF_DEV=y
772# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 1339# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
773# CONFIG_RTC_DRV_TEST is not set 1340# CONFIG_RTC_DRV_TEST is not set
774 1341
775# 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#
776# SPI RTC drivers 1366# SPI RTC drivers
777# 1367#
778 1368
@@ -799,86 +1389,148 @@ CONFIG_RTC_DRV_TILE=y
799# CONFIG_DMADEVICES is not set 1389# CONFIG_DMADEVICES is not set
800# CONFIG_AUXDISPLAY is not set 1390# CONFIG_AUXDISPLAY is not set
801# CONFIG_UIO 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#
802# CONFIG_STAGING is not set 1403# CONFIG_STAGING is not set
803 1404
804# 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#
805# File systems 1413# File systems
806# 1414#
807CONFIG_EXT2_FS=y 1415CONFIG_EXT2_FS=y
808# CONFIG_EXT2_FS_XATTR is not set 1416CONFIG_EXT2_FS_XATTR=y
809# CONFIG_EXT2_FS_XIP is not set 1417CONFIG_EXT2_FS_POSIX_ACL=y
1418CONFIG_EXT2_FS_SECURITY=y
1419CONFIG_EXT2_FS_XIP=y
810CONFIG_EXT3_FS=y 1420CONFIG_EXT3_FS=y
811# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 1421CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
812CONFIG_EXT3_FS_XATTR=y 1422CONFIG_EXT3_FS_XATTR=y
813# CONFIG_EXT3_FS_POSIX_ACL is not set 1423CONFIG_EXT3_FS_POSIX_ACL=y
814# CONFIG_EXT3_FS_SECURITY is not set 1424CONFIG_EXT3_FS_SECURITY=y
815# CONFIG_EXT4_FS is not set 1425CONFIG_EXT4_FS=y
1426CONFIG_EXT4_FS_XATTR=y
1427CONFIG_EXT4_FS_POSIX_ACL=y
1428CONFIG_EXT4_FS_SECURITY=y
1429# CONFIG_EXT4_DEBUG is not set
1430CONFIG_FS_XIP=y
816CONFIG_JBD=y 1431CONFIG_JBD=y
1432# CONFIG_JBD_DEBUG is not set
1433CONFIG_JBD2=y
1434# CONFIG_JBD2_DEBUG is not set
817CONFIG_FS_MBCACHE=y 1435CONFIG_FS_MBCACHE=y
818# CONFIG_REISERFS_FS is not set 1436# CONFIG_REISERFS_FS is not set
819# CONFIG_JFS_FS is not set 1437# CONFIG_JFS_FS is not set
820# CONFIG_XFS_FS is not set 1438CONFIG_XFS_FS=y
821# CONFIG_GFS2_FS is not set 1439CONFIG_XFS_QUOTA=y
822# CONFIG_BTRFS_FS is not set 1440CONFIG_XFS_POSIX_ACL=y
1441# CONFIG_XFS_RT is not set
1442# CONFIG_XFS_DEBUG is not set
1443CONFIG_GFS2_FS=m
1444CONFIG_GFS2_FS_LOCKING_DLM=y
1445# CONFIG_OCFS2_FS is not set
1446CONFIG_BTRFS_FS=m
1447CONFIG_BTRFS_FS_POSIX_ACL=y
1448# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
823# CONFIG_NILFS2_FS is not set 1449# CONFIG_NILFS2_FS is not set
824# CONFIG_FS_POSIX_ACL is not set 1450CONFIG_FS_POSIX_ACL=y
825CONFIG_EXPORTFS=y 1451CONFIG_EXPORTFS=y
826CONFIG_FILE_LOCKING=y 1452CONFIG_FILE_LOCKING=y
827CONFIG_FSNOTIFY=y 1453CONFIG_FSNOTIFY=y
828CONFIG_DNOTIFY=y 1454CONFIG_DNOTIFY=y
829CONFIG_INOTIFY_USER=y 1455CONFIG_INOTIFY_USER=y
830# CONFIG_FANOTIFY is not set 1456# CONFIG_FANOTIFY is not set
831# CONFIG_QUOTA is not set 1457CONFIG_QUOTA=y
832# CONFIG_QUOTACTL is not set 1458CONFIG_QUOTA_NETLINK_INTERFACE=y
833# CONFIG_AUTOFS4_FS is not set 1459# 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
1464CONFIG_QUOTACTL=y
1465CONFIG_AUTOFS4_FS=m
834CONFIG_FUSE_FS=y 1466CONFIG_FUSE_FS=y
835# CONFIG_CUSE is not set 1467CONFIG_CUSE=m
1468CONFIG_GENERIC_ACL=y
836 1469
837# 1470#
838# Caches 1471# Caches
839# 1472#
840# CONFIG_FSCACHE is not set 1473CONFIG_FSCACHE=m
1474CONFIG_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
1479# CONFIG_CACHEFILES_DEBUG is not set
1480# CONFIG_CACHEFILES_HISTOGRAM is not set
841 1481
842# 1482#
843# CD-ROM/DVD Filesystems 1483# CD-ROM/DVD Filesystems
844# 1484#
845# CONFIG_ISO9660_FS is not set 1485CONFIG_ISO9660_FS=m
846# CONFIG_UDF_FS is not set 1486CONFIG_JOLIET=y
1487CONFIG_ZISOFS=y
1488CONFIG_UDF_FS=m
1489CONFIG_UDF_NLS=y
847 1490
848# 1491#
849# DOS/FAT/NT Filesystems 1492# DOS/FAT/NT Filesystems
850# 1493#
851CONFIG_FAT_FS=y 1494CONFIG_FAT_FS=m
852CONFIG_MSDOS_FS=y 1495CONFIG_MSDOS_FS=m
853CONFIG_VFAT_FS=m 1496CONFIG_VFAT_FS=m
854CONFIG_FAT_DEFAULT_CODEPAGE=437 1497CONFIG_FAT_DEFAULT_CODEPAGE=437
855CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 1498CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
856# CONFIG_NTFS_FS is not set 1499# CONFIG_NTFS_FS is not set
857 1500
858# 1501#
859# Pseudo filesystems 1502# Pseudo filesystems
860# 1503#
861CONFIG_PROC_FS=y 1504CONFIG_PROC_FS=y
862# CONFIG_PROC_KCORE is not set 1505CONFIG_PROC_KCORE=y
863CONFIG_PROC_SYSCTL=y 1506CONFIG_PROC_SYSCTL=y
864CONFIG_PROC_PAGE_MONITOR=y 1507CONFIG_PROC_PAGE_MONITOR=y
865CONFIG_SYSFS=y 1508CONFIG_SYSFS=y
866CONFIG_TMPFS=y 1509CONFIG_TMPFS=y
867# CONFIG_TMPFS_POSIX_ACL is not set 1510CONFIG_TMPFS_POSIX_ACL=y
1511CONFIG_TMPFS_XATTR=y
868CONFIG_HUGETLBFS=y 1512CONFIG_HUGETLBFS=y
869CONFIG_HUGETLB_PAGE=y 1513CONFIG_HUGETLB_PAGE=y
870# CONFIG_CONFIGFS_FS is not set 1514CONFIG_CONFIGFS_FS=m
871CONFIG_MISC_FILESYSTEMS=y 1515CONFIG_MISC_FILESYSTEMS=y
872# CONFIG_ADFS_FS is not set 1516# CONFIG_ADFS_FS is not set
873# CONFIG_AFFS_FS is not set 1517# CONFIG_AFFS_FS is not set
1518CONFIG_ECRYPT_FS=m
874# CONFIG_HFS_FS is not set 1519# CONFIG_HFS_FS is not set
875# CONFIG_HFSPLUS_FS is not set 1520# CONFIG_HFSPLUS_FS is not set
876# CONFIG_BEFS_FS is not set 1521# CONFIG_BEFS_FS is not set
877# CONFIG_BFS_FS is not set 1522# CONFIG_BFS_FS is not set
878# CONFIG_EFS_FS is not set 1523# CONFIG_EFS_FS is not set
879# CONFIG_LOGFS is not set 1524# CONFIG_LOGFS is not set
880# CONFIG_CRAMFS is not set 1525CONFIG_CRAMFS=m
881# CONFIG_SQUASHFS is not set 1526CONFIG_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
882# CONFIG_VXFS_FS is not set 1534# CONFIG_VXFS_FS is not set
883# CONFIG_MINIX_FS is not set 1535# CONFIG_MINIX_FS is not set
884# CONFIG_OMFS_FS is not set 1536# CONFIG_OMFS_FS is not set
@@ -891,90 +1543,116 @@ CONFIG_MISC_FILESYSTEMS=y
891CONFIG_NETWORK_FILESYSTEMS=y 1543CONFIG_NETWORK_FILESYSTEMS=y
892CONFIG_NFS_FS=m 1544CONFIG_NFS_FS=m
893CONFIG_NFS_V3=y 1545CONFIG_NFS_V3=y
894# CONFIG_NFS_V3_ACL is not set 1546CONFIG_NFS_V3_ACL=y
895# CONFIG_NFS_V4 is not set 1547CONFIG_NFS_V4=y
896# CONFIG_NFSD is not set 1548CONFIG_NFS_V4_1=y
1549CONFIG_PNFS_FILE_LAYOUT=m
1550CONFIG_PNFS_BLOCK=m
1551CONFIG_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
1556CONFIG_NFSD_V2_ACL=y
1557CONFIG_NFSD_V3=y
1558CONFIG_NFSD_V3_ACL=y
1559CONFIG_NFSD_V4=y
1560# CONFIG_NFSD_FAULT_INJECTION is not set
897CONFIG_LOCKD=m 1561CONFIG_LOCKD=m
898CONFIG_LOCKD_V4=y 1562CONFIG_LOCKD_V4=y
1563CONFIG_NFS_ACL_SUPPORT=m
899CONFIG_NFS_COMMON=y 1564CONFIG_NFS_COMMON=y
900CONFIG_SUNRPC=m 1565CONFIG_SUNRPC=m
901# CONFIG_RPCSEC_GSS_KRB5 is not set 1566CONFIG_SUNRPC_GSS=m
1567CONFIG_SUNRPC_BACKCHANNEL=y
1568CONFIG_RPCSEC_GSS_KRB5=m
902# CONFIG_CEPH_FS is not set 1569# CONFIG_CEPH_FS is not set
903# CONFIG_CIFS is not set 1570CONFIG_CIFS=m
1571CONFIG_CIFS_STATS=y
1572# CONFIG_CIFS_STATS2 is not set
1573CONFIG_CIFS_WEAK_PW_HASH=y
1574CONFIG_CIFS_UPCALL=y
1575CONFIG_CIFS_XATTR=y
1576CONFIG_CIFS_POSIX=y
1577# CONFIG_CIFS_DEBUG2 is not set
1578CONFIG_CIFS_DFS_UPCALL=y
1579CONFIG_CIFS_FSCACHE=y
1580# CONFIG_CIFS_ACL is not set
904# CONFIG_NCP_FS is not set 1581# CONFIG_NCP_FS is not set
905# CONFIG_CODA_FS is not set 1582# CONFIG_CODA_FS is not set
906# CONFIG_AFS_FS is not set 1583# CONFIG_AFS_FS is not set
907
908#
909# Partition Types
910#
911# CONFIG_PARTITION_ADVANCED is not set
912CONFIG_MSDOS_PARTITION=y
913CONFIG_NLS=y 1584CONFIG_NLS=y
914CONFIG_NLS_DEFAULT="iso8859-1" 1585CONFIG_NLS_DEFAULT="utf8"
915CONFIG_NLS_CODEPAGE_437=y 1586CONFIG_NLS_CODEPAGE_437=y
916# CONFIG_NLS_CODEPAGE_737 is not set 1587CONFIG_NLS_CODEPAGE_737=m
917# CONFIG_NLS_CODEPAGE_775 is not set 1588CONFIG_NLS_CODEPAGE_775=m
918# CONFIG_NLS_CODEPAGE_850 is not set 1589CONFIG_NLS_CODEPAGE_850=m
919# CONFIG_NLS_CODEPAGE_852 is not set 1590CONFIG_NLS_CODEPAGE_852=m
920# CONFIG_NLS_CODEPAGE_855 is not set 1591CONFIG_NLS_CODEPAGE_855=m
921# CONFIG_NLS_CODEPAGE_857 is not set 1592CONFIG_NLS_CODEPAGE_857=m
922# CONFIG_NLS_CODEPAGE_860 is not set 1593CONFIG_NLS_CODEPAGE_860=m
923# CONFIG_NLS_CODEPAGE_861 is not set 1594CONFIG_NLS_CODEPAGE_861=m
924# CONFIG_NLS_CODEPAGE_862 is not set 1595CONFIG_NLS_CODEPAGE_862=m
925# CONFIG_NLS_CODEPAGE_863 is not set 1596CONFIG_NLS_CODEPAGE_863=m
926# CONFIG_NLS_CODEPAGE_864 is not set 1597CONFIG_NLS_CODEPAGE_864=m
927# CONFIG_NLS_CODEPAGE_865 is not set 1598CONFIG_NLS_CODEPAGE_865=m
928# CONFIG_NLS_CODEPAGE_866 is not set 1599CONFIG_NLS_CODEPAGE_866=m
929# CONFIG_NLS_CODEPAGE_869 is not set 1600CONFIG_NLS_CODEPAGE_869=m
930# CONFIG_NLS_CODEPAGE_936 is not set 1601CONFIG_NLS_CODEPAGE_936=m
931# CONFIG_NLS_CODEPAGE_950 is not set 1602CONFIG_NLS_CODEPAGE_950=m
932# CONFIG_NLS_CODEPAGE_932 is not set 1603CONFIG_NLS_CODEPAGE_932=m
933# CONFIG_NLS_CODEPAGE_949 is not set 1604CONFIG_NLS_CODEPAGE_949=m
934# CONFIG_NLS_CODEPAGE_874 is not set 1605CONFIG_NLS_CODEPAGE_874=m
935# CONFIG_NLS_ISO8859_8 is not set 1606CONFIG_NLS_ISO8859_8=m
936# CONFIG_NLS_CODEPAGE_1250 is not set 1607CONFIG_NLS_CODEPAGE_1250=m
937# CONFIG_NLS_CODEPAGE_1251 is not set 1608CONFIG_NLS_CODEPAGE_1251=m
938# CONFIG_NLS_ASCII is not set 1609CONFIG_NLS_ASCII=y
939CONFIG_NLS_ISO8859_1=y 1610CONFIG_NLS_ISO8859_1=m
940# CONFIG_NLS_ISO8859_2 is not set 1611CONFIG_NLS_ISO8859_2=m
941# CONFIG_NLS_ISO8859_3 is not set 1612CONFIG_NLS_ISO8859_3=m
942# CONFIG_NLS_ISO8859_4 is not set 1613CONFIG_NLS_ISO8859_4=m
943# CONFIG_NLS_ISO8859_5 is not set 1614CONFIG_NLS_ISO8859_5=m
944# CONFIG_NLS_ISO8859_6 is not set 1615CONFIG_NLS_ISO8859_6=m
945# CONFIG_NLS_ISO8859_7 is not set 1616CONFIG_NLS_ISO8859_7=m
946# CONFIG_NLS_ISO8859_9 is not set 1617CONFIG_NLS_ISO8859_9=m
947# CONFIG_NLS_ISO8859_13 is not set 1618CONFIG_NLS_ISO8859_13=m
948# CONFIG_NLS_ISO8859_14 is not set 1619CONFIG_NLS_ISO8859_14=m
949# CONFIG_NLS_ISO8859_15 is not set 1620CONFIG_NLS_ISO8859_15=m
950# CONFIG_NLS_KOI8_R is not set 1621CONFIG_NLS_KOI8_R=m
951# CONFIG_NLS_KOI8_U is not set 1622CONFIG_NLS_KOI8_U=m
952# CONFIG_NLS_UTF8 is not set 1623CONFIG_NLS_UTF8=m
1624CONFIG_DLM=m
1625CONFIG_DLM_DEBUG=y
953 1626
954# 1627#
955# Kernel hacking 1628# Kernel hacking
956# 1629#
957# CONFIG_PRINTK_TIME is not set 1630# CONFIG_PRINTK_TIME is not set
958CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 1631CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
959CONFIG_ENABLE_WARN_DEPRECATED=y 1632# CONFIG_ENABLE_WARN_DEPRECATED is not set
960CONFIG_ENABLE_MUST_CHECK=y 1633CONFIG_ENABLE_MUST_CHECK=y
961CONFIG_FRAME_WARN=2048 1634CONFIG_FRAME_WARN=2048
962CONFIG_MAGIC_SYSRQ=y 1635CONFIG_MAGIC_SYSRQ=y
963# CONFIG_STRIP_ASM_SYMS is not set 1636CONFIG_STRIP_ASM_SYMS=y
964# CONFIG_UNUSED_SYMBOLS is not set 1637# CONFIG_UNUSED_SYMBOLS is not set
965# CONFIG_DEBUG_FS is not set 1638CONFIG_DEBUG_FS=y
966# CONFIG_HEADERS_CHECK is not set 1639CONFIG_HEADERS_CHECK=y
967# CONFIG_DEBUG_SECTION_MISMATCH is not set 1640# CONFIG_DEBUG_SECTION_MISMATCH is not set
968CONFIG_DEBUG_KERNEL=y 1641CONFIG_DEBUG_KERNEL=y
969# CONFIG_DEBUG_SHIRQ is not set 1642# CONFIG_DEBUG_SHIRQ is not set
970# CONFIG_LOCKUP_DETECTOR is not set 1643CONFIG_LOCKUP_DETECTOR=y
971# CONFIG_HARDLOCKUP_DETECTOR is not set 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
972CONFIG_DETECT_HUNG_TASK=y 1649CONFIG_DETECT_HUNG_TASK=y
1650CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
973# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set 1651# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
974CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 1652CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
975CONFIG_SCHED_DEBUG=y 1653CONFIG_SCHED_DEBUG=y
976# CONFIG_SCHEDSTATS is not set 1654CONFIG_SCHEDSTATS=y
977# CONFIG_TIMER_STATS is not set 1655CONFIG_TIMER_STATS=y
978# CONFIG_DEBUG_OBJECTS is not set 1656# CONFIG_DEBUG_OBJECTS is not set
979# CONFIG_SLUB_DEBUG_ON is not set 1657# CONFIG_SLUB_DEBUG_ON is not set
980# CONFIG_SLUB_STATS is not set 1658# CONFIG_SLUB_STATS is not set
@@ -987,26 +1665,30 @@ CONFIG_SCHED_DEBUG=y
987# CONFIG_PROVE_LOCKING is not set 1665# CONFIG_PROVE_LOCKING is not set
988# CONFIG_SPARSE_RCU_POINTER is not set 1666# CONFIG_SPARSE_RCU_POINTER is not set
989# CONFIG_LOCK_STAT is not set 1667# CONFIG_LOCK_STAT is not set
990CONFIG_DEBUG_SPINLOCK_SLEEP=y 1668# CONFIG_DEBUG_ATOMIC_SLEEP is not set
991# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1669# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
992CONFIG_STACKTRACE=y 1670CONFIG_STACKTRACE=y
1671# CONFIG_DEBUG_STACK_USAGE is not set
993# CONFIG_DEBUG_KOBJECT is not set 1672# CONFIG_DEBUG_KOBJECT is not set
994# CONFIG_DEBUG_HIGHMEM is not set 1673# CONFIG_DEBUG_HIGHMEM is not set
1674CONFIG_DEBUG_BUGVERBOSE=y
995CONFIG_DEBUG_INFO=y 1675CONFIG_DEBUG_INFO=y
996# CONFIG_DEBUG_INFO_REDUCED is not set 1676CONFIG_DEBUG_INFO_REDUCED=y
997CONFIG_DEBUG_VM=y 1677CONFIG_DEBUG_VM=y
998# CONFIG_DEBUG_WRITECOUNT is not set 1678# CONFIG_DEBUG_WRITECOUNT is not set
999# CONFIG_DEBUG_MEMORY_INIT is not set 1679CONFIG_DEBUG_MEMORY_INIT=y
1000# CONFIG_DEBUG_LIST is not set 1680CONFIG_DEBUG_LIST=y
1001# CONFIG_TEST_LIST_SORT is not set 1681# CONFIG_TEST_LIST_SORT is not set
1002# CONFIG_DEBUG_SG is not set 1682# CONFIG_DEBUG_SG is not set
1003# CONFIG_DEBUG_NOTIFIERS is not set 1683# CONFIG_DEBUG_NOTIFIERS is not set
1004# CONFIG_DEBUG_CREDENTIALS is not set 1684CONFIG_DEBUG_CREDENTIALS=y
1005# CONFIG_RCU_TORTURE_TEST is not set 1685# CONFIG_RCU_TORTURE_TEST is not set
1006# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1686CONFIG_RCU_CPU_STALL_TIMEOUT=60
1007# CONFIG_BACKTRACE_SELF_TEST is not set 1687# CONFIG_BACKTRACE_SELF_TEST is not set
1008# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1688# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1009# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1689CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
1690# CONFIG_DEBUG_PER_CPU_MAPS is not set
1691# CONFIG_LKDTM is not set
1010# CONFIG_FAULT_INJECTION is not set 1692# CONFIG_FAULT_INJECTION is not set
1011# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1693# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1012# CONFIG_DEBUG_PAGEALLOC is not set 1694# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1019,110 +1701,150 @@ CONFIG_BRANCH_PROFILE_NONE=y
1019# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1701# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1020# CONFIG_PROFILE_ALL_BRANCHES is not set 1702# CONFIG_PROFILE_ALL_BRANCHES is not set
1021# CONFIG_BLK_DEV_IO_TRACE is not set 1703# CONFIG_BLK_DEV_IO_TRACE is not set
1704# CONFIG_BUILD_DOCSRC is not set
1705CONFIG_DYNAMIC_DEBUG=y
1022# CONFIG_ATOMIC64_SELFTEST is not set 1706# CONFIG_ATOMIC64_SELFTEST is not set
1707CONFIG_ASYNC_RAID6_TEST=m
1023# CONFIG_SAMPLES is not set 1708# CONFIG_SAMPLES is not set
1024# CONFIG_TEST_KSTRTOX is not set 1709# CONFIG_TEST_KSTRTOX is not set
1025CONFIG_EARLY_PRINTK=y 1710CONFIG_EARLY_PRINTK=y
1026CONFIG_DEBUG_STACKOVERFLOW=y 1711CONFIG_DEBUG_STACKOVERFLOW=y
1027# CONFIG_DEBUG_STACK_USAGE is not set 1712CONFIG_DEBUG_EXTRA_FLAGS=""
1028CONFIG_DEBUG_EXTRA_FLAGS="-femit-struct-debug-baseonly"
1029 1713
1030# 1714#
1031# Security options 1715# Security options
1032# 1716#
1033# CONFIG_KEYS is not set 1717CONFIG_KEYS=y
1718# CONFIG_ENCRYPTED_KEYS is not set
1719CONFIG_KEYS_DEBUG_PROC_KEYS=y
1034# CONFIG_SECURITY_DMESG_RESTRICT is not set 1720# CONFIG_SECURITY_DMESG_RESTRICT is not set
1035# CONFIG_SECURITY is not set 1721CONFIG_SECURITY=y
1036# CONFIG_SECURITYFS is not set 1722CONFIG_SECURITYFS=y
1037CONFIG_DEFAULT_SECURITY_DAC=y 1723CONFIG_SECURITY_NETWORK=y
1038CONFIG_DEFAULT_SECURITY="" 1724CONFIG_SECURITY_NETWORK_XFRM=y
1725# CONFIG_SECURITY_PATH is not set
1726CONFIG_LSM_MMAP_MIN_ADDR=65536
1727CONFIG_SECURITY_SELINUX=y
1728CONFIG_SECURITY_SELINUX_BOOTPARAM=y
1729CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
1730CONFIG_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
1039CONFIG_CRYPTO=y 1749CONFIG_CRYPTO=y
1040 1750
1041# 1751#
1042# Crypto core or helper 1752# Crypto core or helper
1043# 1753#
1044# CONFIG_CRYPTO_FIPS is not set 1754CONFIG_CRYPTO_ALGAPI=y
1045CONFIG_CRYPTO_ALGAPI=m 1755CONFIG_CRYPTO_ALGAPI2=y
1046CONFIG_CRYPTO_ALGAPI2=m 1756CONFIG_CRYPTO_AEAD=m
1757CONFIG_CRYPTO_AEAD2=y
1758CONFIG_CRYPTO_BLKCIPHER=m
1759CONFIG_CRYPTO_BLKCIPHER2=y
1760CONFIG_CRYPTO_HASH=y
1761CONFIG_CRYPTO_HASH2=y
1047CONFIG_CRYPTO_RNG=m 1762CONFIG_CRYPTO_RNG=m
1048CONFIG_CRYPTO_RNG2=m 1763CONFIG_CRYPTO_RNG2=y
1049# CONFIG_CRYPTO_MANAGER is not set 1764CONFIG_CRYPTO_PCOMP=m
1050# CONFIG_CRYPTO_MANAGER2 is not set 1765CONFIG_CRYPTO_PCOMP2=y
1051# CONFIG_CRYPTO_GF128MUL is not set 1766CONFIG_CRYPTO_MANAGER=y
1052# CONFIG_CRYPTO_NULL is not set 1767CONFIG_CRYPTO_MANAGER2=y
1053# CONFIG_CRYPTO_PCRYPT is not set 1768# CONFIG_CRYPTO_USER is not set
1054# CONFIG_CRYPTO_CRYPTD is not set 1769CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
1055# CONFIG_CRYPTO_AUTHENC is not set 1770CONFIG_CRYPTO_GF128MUL=m
1056# CONFIG_CRYPTO_TEST is not set 1771CONFIG_CRYPTO_NULL=m
1772CONFIG_CRYPTO_PCRYPT=m
1773CONFIG_CRYPTO_WORKQUEUE=y
1774CONFIG_CRYPTO_CRYPTD=m
1775CONFIG_CRYPTO_AUTHENC=m
1776CONFIG_CRYPTO_TEST=m
1057 1777
1058# 1778#
1059# Authenticated Encryption with Associated Data 1779# Authenticated Encryption with Associated Data
1060# 1780#
1061# CONFIG_CRYPTO_CCM is not set 1781CONFIG_CRYPTO_CCM=m
1062# CONFIG_CRYPTO_GCM is not set 1782CONFIG_CRYPTO_GCM=m
1063# CONFIG_CRYPTO_SEQIV is not set 1783CONFIG_CRYPTO_SEQIV=m
1064 1784
1065# 1785#
1066# Block modes 1786# Block modes
1067# 1787#
1068# CONFIG_CRYPTO_CBC is not set 1788CONFIG_CRYPTO_CBC=m
1069# CONFIG_CRYPTO_CTR is not set 1789CONFIG_CRYPTO_CTR=m
1070# CONFIG_CRYPTO_CTS is not set 1790CONFIG_CRYPTO_CTS=m
1071# CONFIG_CRYPTO_ECB is not set 1791CONFIG_CRYPTO_ECB=m
1072# CONFIG_CRYPTO_LRW is not set 1792CONFIG_CRYPTO_LRW=m
1073# CONFIG_CRYPTO_PCBC is not set 1793CONFIG_CRYPTO_PCBC=m
1074# CONFIG_CRYPTO_XTS is not set 1794CONFIG_CRYPTO_XTS=m
1075 1795
1076# 1796#
1077# Hash modes 1797# Hash modes
1078# 1798#
1079# CONFIG_CRYPTO_HMAC is not set 1799CONFIG_CRYPTO_HMAC=y
1080# CONFIG_CRYPTO_XCBC is not set 1800CONFIG_CRYPTO_XCBC=m
1081# CONFIG_CRYPTO_VMAC is not set 1801CONFIG_CRYPTO_VMAC=m
1082 1802
1083# 1803#
1084# Digest 1804# Digest
1085# 1805#
1086# CONFIG_CRYPTO_CRC32C is not set 1806CONFIG_CRYPTO_CRC32C=y
1087# CONFIG_CRYPTO_GHASH is not set 1807CONFIG_CRYPTO_GHASH=m
1088# CONFIG_CRYPTO_MD4 is not set 1808CONFIG_CRYPTO_MD4=m
1089# CONFIG_CRYPTO_MD5 is not set 1809CONFIG_CRYPTO_MD5=y
1090# CONFIG_CRYPTO_MICHAEL_MIC is not set 1810CONFIG_CRYPTO_MICHAEL_MIC=m
1091# CONFIG_CRYPTO_RMD128 is not set 1811CONFIG_CRYPTO_RMD128=m
1092# CONFIG_CRYPTO_RMD160 is not set 1812CONFIG_CRYPTO_RMD160=m
1093# CONFIG_CRYPTO_RMD256 is not set 1813CONFIG_CRYPTO_RMD256=m
1094# CONFIG_CRYPTO_RMD320 is not set 1814CONFIG_CRYPTO_RMD320=m
1095# CONFIG_CRYPTO_SHA1 is not set 1815CONFIG_CRYPTO_SHA1=y
1096# CONFIG_CRYPTO_SHA256 is not set 1816CONFIG_CRYPTO_SHA256=m
1097# CONFIG_CRYPTO_SHA512 is not set 1817CONFIG_CRYPTO_SHA512=m
1098# CONFIG_CRYPTO_TGR192 is not set 1818CONFIG_CRYPTO_TGR192=m
1099# CONFIG_CRYPTO_WP512 is not set 1819CONFIG_CRYPTO_WP512=m
1100 1820
1101# 1821#
1102# Ciphers 1822# Ciphers
1103# 1823#
1104CONFIG_CRYPTO_AES=m 1824CONFIG_CRYPTO_AES=m
1105# CONFIG_CRYPTO_ANUBIS is not set 1825CONFIG_CRYPTO_ANUBIS=m
1106# CONFIG_CRYPTO_ARC4 is not set 1826CONFIG_CRYPTO_ARC4=m
1107# CONFIG_CRYPTO_BLOWFISH is not set 1827CONFIG_CRYPTO_BLOWFISH=m
1108# CONFIG_CRYPTO_CAMELLIA is not set 1828CONFIG_CRYPTO_BLOWFISH_COMMON=m
1109# CONFIG_CRYPTO_CAST5 is not set 1829CONFIG_CRYPTO_CAMELLIA=m
1110# CONFIG_CRYPTO_CAST6 is not set 1830CONFIG_CRYPTO_CAST5=m
1111# CONFIG_CRYPTO_DES is not set 1831CONFIG_CRYPTO_CAST6=m
1112# CONFIG_CRYPTO_FCRYPT is not set 1832CONFIG_CRYPTO_DES=m
1113# CONFIG_CRYPTO_KHAZAD is not set 1833CONFIG_CRYPTO_FCRYPT=m
1834CONFIG_CRYPTO_KHAZAD=m
1114# CONFIG_CRYPTO_SALSA20 is not set 1835# CONFIG_CRYPTO_SALSA20 is not set
1115# CONFIG_CRYPTO_SEED is not set 1836CONFIG_CRYPTO_SEED=m
1116# CONFIG_CRYPTO_SERPENT is not set 1837CONFIG_CRYPTO_SERPENT=m
1117# CONFIG_CRYPTO_TEA is not set 1838CONFIG_CRYPTO_TEA=m
1118# CONFIG_CRYPTO_TWOFISH is not set 1839CONFIG_CRYPTO_TWOFISH=m
1840CONFIG_CRYPTO_TWOFISH_COMMON=m
1119 1841
1120# 1842#
1121# Compression 1843# Compression
1122# 1844#
1123# CONFIG_CRYPTO_DEFLATE is not set 1845CONFIG_CRYPTO_DEFLATE=m
1124# CONFIG_CRYPTO_ZLIB is not set 1846CONFIG_CRYPTO_ZLIB=m
1125# CONFIG_CRYPTO_LZO is not set 1847CONFIG_CRYPTO_LZO=m
1126 1848
1127# 1849#
1128# Random Number Generation 1850# Random Number Generation
@@ -1131,32 +1853,42 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
1131# CONFIG_CRYPTO_USER_API_HASH is not set 1853# CONFIG_CRYPTO_USER_API_HASH is not set
1132# CONFIG_CRYPTO_USER_API_SKCIPHER is not set 1854# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
1133CONFIG_CRYPTO_HW=y 1855CONFIG_CRYPTO_HW=y
1134# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1135# CONFIG_BINARY_PRINTF is not set 1856# CONFIG_BINARY_PRINTF is not set
1136 1857
1137# 1858#
1138# Library routines 1859# Library routines
1139# 1860#
1861CONFIG_RAID6_PQ=m
1140CONFIG_BITREVERSE=y 1862CONFIG_BITREVERSE=y
1141CONFIG_GENERIC_FIND_FIRST_BIT=y 1863CONFIG_GENERIC_FIND_FIRST_BIT=y
1142CONFIG_GENERIC_FIND_NEXT_BIT=y 1864CONFIG_GENERIC_PCI_IOMAP=y
1143CONFIG_GENERIC_FIND_LAST_BIT=y 1865CONFIG_CRC_CCITT=m
1144# CONFIG_CRC_CCITT is not set 1866CONFIG_CRC16=y
1145# CONFIG_CRC16 is not set 1867CONFIG_CRC_T10DIF=y
1146# CONFIG_CRC_T10DIF is not set 1868CONFIG_CRC_ITU_T=m
1147# CONFIG_CRC_ITU_T is not set
1148CONFIG_CRC32=y 1869CONFIG_CRC32=y
1149# CONFIG_CRC7 is not set 1870CONFIG_CRC7=m
1150# CONFIG_LIBCRC32C is not set 1871CONFIG_LIBCRC32C=m
1872# CONFIG_CRC8 is not set
1873CONFIG_AUDIT_GENERIC=y
1151CONFIG_ZLIB_INFLATE=y 1874CONFIG_ZLIB_INFLATE=y
1875CONFIG_ZLIB_DEFLATE=m
1876CONFIG_LZO_COMPRESS=m
1877CONFIG_LZO_DECOMPRESS=m
1152# CONFIG_XZ_DEC is not set 1878# CONFIG_XZ_DEC is not set
1153# CONFIG_XZ_DEC_BCJ is not set 1879# CONFIG_XZ_DEC_BCJ is not set
1154CONFIG_DECOMPRESS_GZIP=y 1880CONFIG_DECOMPRESS_GZIP=y
1881CONFIG_TEXTSEARCH=y
1882CONFIG_TEXTSEARCH_KMP=m
1883CONFIG_TEXTSEARCH_BM=m
1884CONFIG_TEXTSEARCH_FSM=m
1155CONFIG_HAS_IOMEM=y 1885CONFIG_HAS_IOMEM=y
1156CONFIG_HAS_IOPORT=y 1886CONFIG_HAS_IOPORT=y
1157CONFIG_HAS_DMA=y 1887CONFIG_HAS_DMA=y
1158CONFIG_CPU_RMAP=y 1888CONFIG_CPU_RMAP=y
1889CONFIG_DQL=y
1159CONFIG_NLATTR=y 1890CONFIG_NLATTR=y
1160# CONFIG_AVERAGE is not set 1891# CONFIG_AVERAGE is not set
1892# CONFIG_CORDIC is not set
1161CONFIG_HAVE_KVM=y 1893CONFIG_HAVE_KVM=y
1162# CONFIG_VIRTUALIZATION is not set 1894# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index a7869ad62776..77763ccd5a7d 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -303,10 +303,7 @@ long compat_sys_rt_sigreturn(struct pt_regs *regs)
303 goto badframe; 303 goto badframe;
304 304
305 sigdelsetmask(&set, ~_BLOCKABLE); 305 sigdelsetmask(&set, ~_BLOCKABLE);
306 spin_lock_irq(&current->sighand->siglock); 306 set_current_blocked(&set);
307 current->blocked = set;
308 recalc_sigpending();
309 spin_unlock_irq(&current->sighand->siglock);
310 307
311 if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) 308 if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
312 goto badframe; 309 goto badframe;
diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index bedaf4e9f3a7..f79d4b88c747 100644
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -97,10 +97,7 @@ SYSCALL_DEFINE1(rt_sigreturn, struct pt_regs *, regs)
97 goto badframe; 97 goto badframe;
98 98
99 sigdelsetmask(&set, ~_BLOCKABLE); 99 sigdelsetmask(&set, ~_BLOCKABLE);
100 spin_lock_irq(&current->sighand->siglock); 100 set_current_blocked(&set);
101 current->blocked = set;
102 recalc_sigpending();
103 spin_unlock_irq(&current->sighand->siglock);
104 101
105 if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) 102 if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
106 goto badframe; 103 goto badframe;
@@ -286,13 +283,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
286 * the work_pending path in the return-to-user code, and 283 * the work_pending path in the return-to-user code, and
287 * either way we can re-enable interrupts unconditionally. 284 * either way we can re-enable interrupts unconditionally.
288 */ 285 */
289 spin_lock_irq(&current->sighand->siglock); 286 block_sigmask(ka, sig);
290 sigorsets(&current->blocked,
291 &current->blocked, &ka->sa.sa_mask);
292 if (!(ka->sa.sa_flags & SA_NODEFER))
293 sigaddset(&current->blocked, sig);
294 recalc_sigpending();
295 spin_unlock_irq(&current->sighand->siglock);
296 } 287 }
297 288
298 return ret; 289 return ret;
diff --git a/arch/tile/kernel/sysfs.c b/arch/tile/kernel/sysfs.c
index f862b005eb73..71ae728e9d0b 100644
--- a/arch/tile/kernel/sysfs.c
+++ b/arch/tile/kernel/sysfs.c
@@ -163,7 +163,7 @@ static int __init create_sysfs_entries(void)
163 163
164#define create_hv_attr(name) \ 164#define create_hv_attr(name) \
165 if (!err) \ 165 if (!err) \
166 err = sysfs_create_file(hypervisor_kobj, &dev_attr_##name); 166 err = sysfs_create_file(hypervisor_kobj, &dev_attr_##name.attr);
167 create_hv_attr(type); 167 create_hv_attr(type);
168 create_hv_attr(version); 168 create_hv_attr(version);
169 create_hv_attr(config_version); 169 create_hv_attr(config_version);
diff --git a/arch/tile/lib/spinlock_32.c b/arch/tile/lib/spinlock_32.c
index cb0999fb64b4..b16ac49a968e 100644
--- a/arch/tile/lib/spinlock_32.c
+++ b/arch/tile/lib/spinlock_32.c
@@ -144,7 +144,7 @@ void arch_read_unlock(arch_rwlock_t *rwlock)
144 for (;;) { 144 for (;;) {
145 __insn_mtspr(SPR_INTERRUPT_CRITICAL_SECTION, 1); 145 __insn_mtspr(SPR_INTERRUPT_CRITICAL_SECTION, 1);
146 val = __insn_tns((int *)&rwlock->lock); 146 val = __insn_tns((int *)&rwlock->lock);
147 if (likely(val & 1) == 0) { 147 if (likely((val & 1) == 0)) {
148 rwlock->lock = val - (1 << _RD_COUNT_SHIFT); 148 rwlock->lock = val - (1 << _RD_COUNT_SHIFT);
149 __insn_mtspr(SPR_INTERRUPT_CRITICAL_SECTION, 0); 149 __insn_mtspr(SPR_INTERRUPT_CRITICAL_SECTION, 0);
150 break; 150 break;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 7aee46983be4..99389c8dda21 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1934,7 +1934,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
1934 } 1934 }
1935 1935
1936 if (bp->port.pmf) 1936 if (bp->port.pmf)
1937 bnx2x_update_drv_flags(bp, DRV_FLAGS_DCB_CONFIGURED, 0); 1937 bnx2x_update_drv_flags(bp, 1 << DRV_FLAGS_DCB_CONFIGURED, 0);
1938 else 1938 else
1939 bnx2x__link_status_update(bp); 1939 bnx2x__link_status_update(bp);
1940 1940
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index bf27c54ff2e0..4f40f7d7d8c6 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -1179,10 +1179,16 @@ static inline int bnx2x_alloc_rx_bds(struct bnx2x_fastpath *fp,
1179 */ 1179 */
1180static inline u8 bnx2x_stats_id(struct bnx2x_fastpath *fp) 1180static inline u8 bnx2x_stats_id(struct bnx2x_fastpath *fp)
1181{ 1181{
1182 if (!CHIP_IS_E1x(fp->bp)) 1182 struct bnx2x *bp = fp->bp;
1183 if (!CHIP_IS_E1x(bp)) {
1184#ifdef BCM_CNIC
1185 /* there are special statistics counters for FCoE 136..140 */
1186 if (IS_FCOE_FP(fp))
1187 return bp->cnic_base_cl_id + (bp->pf_num >> 1);
1188#endif
1183 return fp->cl_id; 1189 return fp->cl_id;
1184 else 1190 }
1185 return fp->cl_id + BP_PORT(fp->bp) * FP_SB_MAX_E1x; 1191 return fp->cl_id + BP_PORT(bp) * FP_SB_MAX_E1x;
1186} 1192}
1187 1193
1188static inline void bnx2x_init_vlan_mac_fp_objs(struct bnx2x_fastpath *fp, 1194static inline void bnx2x_init_vlan_mac_fp_objs(struct bnx2x_fastpath *fp,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
index 5051cf3deb20..6d82ade4c31c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
@@ -735,7 +735,9 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
735 bp->dcbx_error); 735 bp->dcbx_error);
736 736
737 /* mark DCBX result for PMF migration */ 737 /* mark DCBX result for PMF migration */
738 bnx2x_update_drv_flags(bp, DRV_FLAGS_DCB_CONFIGURED, 1); 738 bnx2x_update_drv_flags(bp,
739 1 << DRV_FLAGS_DCB_CONFIGURED,
740 1);
739#ifdef BCM_DCBNL 741#ifdef BCM_DCBNL
740 /* 742 /*
741 * Add new app tlvs to dcbnl 743 * Add new app tlvs to dcbnl
@@ -1020,7 +1022,7 @@ void bnx2x_dcbx_init(struct bnx2x *bp)
1020 DP(NETIF_MSG_LINK, "dcbx_lldp_params_offset 0x%x\n", 1022 DP(NETIF_MSG_LINK, "dcbx_lldp_params_offset 0x%x\n",
1021 dcbx_lldp_params_offset); 1023 dcbx_lldp_params_offset);
1022 1024
1023 bnx2x_update_drv_flags(bp, DRV_FLAGS_DCB_CONFIGURED, 0); 1025 bnx2x_update_drv_flags(bp, 1 << DRV_FLAGS_DCB_CONFIGURED, 0);
1024 1026
1025 if (SHMEM_LLDP_DCBX_PARAMS_NONE != dcbx_lldp_params_offset) { 1027 if (SHMEM_LLDP_DCBX_PARAMS_NONE != dcbx_lldp_params_offset) {
1026 bnx2x_dcbx_admin_mib_updated_params(bp, 1028 bnx2x_dcbx_admin_mib_updated_params(bp,
@@ -1857,7 +1859,7 @@ void bnx2x_dcbx_pmf_update(struct bnx2x *bp)
1857 * read it from shmem and update bp and netdev accordingly 1859 * read it from shmem and update bp and netdev accordingly
1858 */ 1860 */
1859 if (SHMEM2_HAS(bp, drv_flags) && 1861 if (SHMEM2_HAS(bp, drv_flags) &&
1860 GET_FLAGS(SHMEM2_RD(bp, drv_flags), DRV_FLAGS_DCB_CONFIGURED)) { 1862 GET_FLAGS(SHMEM2_RD(bp, drv_flags), 1 << DRV_FLAGS_DCB_CONFIGURED)) {
1861 /* Read neg results if dcbx is in the FW */ 1863 /* Read neg results if dcbx is in the FW */
1862 if (bnx2x_dcbx_read_shmem_neg_results(bp)) 1864 if (bnx2x_dcbx_read_shmem_neg_results(bp))
1863 return; 1865 return;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index cb6339c35571..94110e9ce51d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -5601,7 +5601,7 @@ static inline int bnx2x_func_send_start(struct bnx2x *bp,
5601 5601
5602 /* Fill the ramrod data with provided parameters */ 5602 /* Fill the ramrod data with provided parameters */
5603 rdata->function_mode = cpu_to_le16(start_params->mf_mode); 5603 rdata->function_mode = cpu_to_le16(start_params->mf_mode);
5604 rdata->sd_vlan_tag = start_params->sd_vlan_tag; 5604 rdata->sd_vlan_tag = cpu_to_le16(start_params->sd_vlan_tag);
5605 rdata->path_id = BP_PATH(bp); 5605 rdata->path_id = BP_PATH(bp);
5606 rdata->network_cos_mode = start_params->network_cos_mode; 5606 rdata->network_cos_mode = start_params->network_cos_mode;
5607 5607
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 1adef266fcd5..a766b25eec5f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -554,23 +554,11 @@ static void bnx2x_bmac_stats_update(struct bnx2x *bp)
554 UPDATE_STAT64(tx_stat_gtufl, tx_stat_mac_ufl); 554 UPDATE_STAT64(tx_stat_gtufl, tx_stat_mac_ufl);
555 555
556 /* collect PFC stats */ 556 /* collect PFC stats */
557 DIFF_64(diff.hi, new->tx_stat_gtpp_hi,
558 pstats->pfc_frames_tx_hi,
559 diff.lo, new->tx_stat_gtpp_lo,
560 pstats->pfc_frames_tx_lo);
561 pstats->pfc_frames_tx_hi = new->tx_stat_gtpp_hi; 557 pstats->pfc_frames_tx_hi = new->tx_stat_gtpp_hi;
562 pstats->pfc_frames_tx_lo = new->tx_stat_gtpp_lo; 558 pstats->pfc_frames_tx_lo = new->tx_stat_gtpp_lo;
563 ADD_64(pstats->pfc_frames_tx_hi, diff.hi,
564 pstats->pfc_frames_tx_lo, diff.lo);
565 559
566 DIFF_64(diff.hi, new->rx_stat_grpp_hi,
567 pstats->pfc_frames_rx_hi,
568 diff.lo, new->rx_stat_grpp_lo,
569 pstats->pfc_frames_rx_lo);
570 pstats->pfc_frames_rx_hi = new->rx_stat_grpp_hi; 560 pstats->pfc_frames_rx_hi = new->rx_stat_grpp_hi;
571 pstats->pfc_frames_rx_lo = new->rx_stat_grpp_lo; 561 pstats->pfc_frames_rx_lo = new->rx_stat_grpp_lo;
572 ADD_64(pstats->pfc_frames_rx_hi, diff.hi,
573 pstats->pfc_frames_rx_lo, diff.lo);
574 } 562 }
575 563
576 estats->pause_frames_received_hi = 564 estats->pause_frames_received_hi =
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 93c5d72711b0..2d7601dd6660 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -359,7 +359,7 @@ static void tun_free_netdev(struct net_device *dev)
359{ 359{
360 struct tun_struct *tun = netdev_priv(dev); 360 struct tun_struct *tun = netdev_priv(dev);
361 361
362 sock_put(tun->socket.sk); 362 sk_release_kernel(tun->socket.sk);
363} 363}
364 364
365/* Net device open. */ 365/* Net device open. */
@@ -980,10 +980,18 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
980 return ret; 980 return ret;
981} 981}
982 982
983static int tun_release(struct socket *sock)
984{
985 if (sock->sk)
986 sock_put(sock->sk);
987 return 0;
988}
989
983/* Ops structure to mimic raw sockets with tun */ 990/* Ops structure to mimic raw sockets with tun */
984static const struct proto_ops tun_socket_ops = { 991static const struct proto_ops tun_socket_ops = {
985 .sendmsg = tun_sendmsg, 992 .sendmsg = tun_sendmsg,
986 .recvmsg = tun_recvmsg, 993 .recvmsg = tun_recvmsg,
994 .release = tun_release,
987}; 995};
988 996
989static struct proto tun_proto = { 997static struct proto tun_proto = {
@@ -1110,10 +1118,11 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
1110 tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr); 1118 tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr);
1111 1119
1112 err = -ENOMEM; 1120 err = -ENOMEM;
1113 sk = sk_alloc(net, AF_UNSPEC, GFP_KERNEL, &tun_proto); 1121 sk = sk_alloc(&init_net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
1114 if (!sk) 1122 if (!sk)
1115 goto err_free_dev; 1123 goto err_free_dev;
1116 1124
1125 sk_change_net(sk, net);
1117 tun->socket.wq = &tun->wq; 1126 tun->socket.wq = &tun->wq;
1118 init_waitqueue_head(&tun->wq.wait); 1127 init_waitqueue_head(&tun->wq.wait);
1119 tun->socket.ops = &tun_socket_ops; 1128 tun->socket.ops = &tun_socket_ops;
@@ -1174,7 +1183,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
1174 return 0; 1183 return 0;
1175 1184
1176 err_free_sk: 1185 err_free_sk:
1177 sock_put(sk); 1186 tun_free_netdev(dev);
1178 err_free_dev: 1187 err_free_dev:
1179 free_netdev(dev); 1188 free_netdev(dev);
1180 failed: 1189 failed:
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 8e84f5bdd6ca..d6da5eed5453 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1599,6 +1599,10 @@ static const struct usb_device_id products [] = {
1599 USB_DEVICE (0x6189, 0x182d), 1599 USB_DEVICE (0x6189, 0x182d),
1600 .driver_info = (unsigned long) &ax8817x_info, 1600 .driver_info = (unsigned long) &ax8817x_info,
1601}, { 1601}, {
1602 // Sitecom LN-031 "USB 2.0 10/100/1000 Ethernet adapter"
1603 USB_DEVICE (0x0df6, 0x0056),
1604 .driver_info = (unsigned long) &ax88178_info,
1605}, {
1602 // corega FEther USB2-TX 1606 // corega FEther USB2-TX
1603 USB_DEVICE (0x07aa, 0x0017), 1607 USB_DEVICE (0x07aa, 0x0017),
1604 .driver_info = (unsigned long) &ax8817x_info, 1608 .driver_info = (unsigned long) &ax8817x_info,
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 54b2d391e91a..a7dfba8d164e 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -2475,7 +2475,7 @@ il3945_bg_alive_start(struct work_struct *data)
2475 container_of(data, struct il_priv, alive_start.work); 2475 container_of(data, struct il_priv, alive_start.work);
2476 2476
2477 mutex_lock(&il->mutex); 2477 mutex_lock(&il->mutex);
2478 if (test_bit(S_EXIT_PENDING, &il->status)) 2478 if (test_bit(S_EXIT_PENDING, &il->status) || il->txq == NULL)
2479 goto out; 2479 goto out;
2480 2480
2481 il3945_alive_start(il); 2481 il3945_alive_start(il);
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index 1489b1573a6a..c80eb9b31551 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -1870,11 +1870,12 @@ il3945_bg_reg_txpower_periodic(struct work_struct *work)
1870 struct il_priv *il = container_of(work, struct il_priv, 1870 struct il_priv *il = container_of(work, struct il_priv,
1871 _3945.thermal_periodic.work); 1871 _3945.thermal_periodic.work);
1872 1872
1873 if (test_bit(S_EXIT_PENDING, &il->status))
1874 return;
1875
1876 mutex_lock(&il->mutex); 1873 mutex_lock(&il->mutex);
1874 if (test_bit(S_EXIT_PENDING, &il->status) || il->txq == NULL)
1875 goto out;
1876
1877 il3945_reg_txpower_periodic(il); 1877 il3945_reg_txpower_periodic(il);
1878out:
1878 mutex_unlock(&il->mutex); 1879 mutex_unlock(&il->mutex);
1879} 1880}
1880 1881
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index d2a1ea98d0f2..fd356b7c0476 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -426,10 +426,14 @@ void rt2x00lib_txdone(struct queue_entry *entry,
426 /* 426 /*
427 * If the data queue was below the threshold before the txdone 427 * If the data queue was below the threshold before the txdone
428 * handler we must make sure the packet queue in the mac80211 stack 428 * handler we must make sure the packet queue in the mac80211 stack
429 * is reenabled when the txdone handler has finished. 429 * is reenabled when the txdone handler has finished. This has to be
430 * serialized with rt2x00mac_tx(), otherwise we can wake up queue
431 * before it was stopped.
430 */ 432 */
433 spin_lock_bh(&entry->queue->tx_lock);
431 if (!rt2x00queue_threshold(entry->queue)) 434 if (!rt2x00queue_threshold(entry->queue))
432 rt2x00queue_unpause_queue(entry->queue); 435 rt2x00queue_unpause_queue(entry->queue);
436 spin_unlock_bh(&entry->queue->tx_lock);
433} 437}
434EXPORT_SYMBOL_GPL(rt2x00lib_txdone); 438EXPORT_SYMBOL_GPL(rt2x00lib_txdone);
435 439
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index ede3c58e6783..2df2eb6d3e06 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -152,13 +152,22 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
152 if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false))) 152 if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false)))
153 goto exit_fail; 153 goto exit_fail;
154 154
155 /*
156 * Pausing queue has to be serialized with rt2x00lib_txdone(). Note
157 * we should not use spin_lock_bh variant as bottom halve was already
158 * disabled before ieee80211_xmit() call.
159 */
160 spin_lock(&queue->tx_lock);
155 if (rt2x00queue_threshold(queue)) 161 if (rt2x00queue_threshold(queue))
156 rt2x00queue_pause_queue(queue); 162 rt2x00queue_pause_queue(queue);
163 spin_unlock(&queue->tx_lock);
157 164
158 return; 165 return;
159 166
160 exit_fail: 167 exit_fail:
168 spin_lock(&queue->tx_lock);
161 rt2x00queue_pause_queue(queue); 169 rt2x00queue_pause_queue(queue);
170 spin_unlock(&queue->tx_lock);
162 exit_free_skb: 171 exit_free_skb:
163 ieee80211_free_txskb(hw, skb); 172 ieee80211_free_txskb(hw, skb);
164} 173}
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 5adfb3eab9cd..9b1b2b7a7807 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -619,6 +619,9 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
619 else if (test_bit(REQUIRE_DMA, &queue->rt2x00dev->cap_flags)) 619 else if (test_bit(REQUIRE_DMA, &queue->rt2x00dev->cap_flags))
620 rt2x00queue_align_frame(skb); 620 rt2x00queue_align_frame(skb);
621 621
622 /*
623 * That function must be called with bh disabled.
624 */
622 spin_lock(&queue->tx_lock); 625 spin_lock(&queue->tx_lock);
623 626
624 if (unlikely(rt2x00queue_full(queue))) { 627 if (unlikely(rt2x00queue_full(queue))) {
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 1cfbf228fbb1..24f049e73952 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -500,6 +500,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
500 int pos; 500 int pos;
501 u32 reg32; 501 u32 reg32;
502 502
503 if (aspm_disabled)
504 return 0;
505
503 /* 506 /*
504 * Some functions in a slot might not all be PCIe functions, 507 * Some functions in a slot might not all be PCIe functions,
505 * very strange. Disable ASPM for the whole slot 508 * very strange. Disable ASPM for the whole slot
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f995e6e2f78c..15dbd8cc445f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -143,6 +143,30 @@ config FUJITSU_LAPTOP_DEBUG
143 143
144 If you are not sure, say N here. 144 If you are not sure, say N here.
145 145
146config FUJITSU_TABLET
147 tristate "Fujitsu Tablet Extras"
148 depends on ACPI
149 depends on INPUT
150 ---help---
151 This is a driver for tablets built by Fujitsu:
152
153 * Lifebook P1510/P1610/P1620/Txxxx
154 * Stylistic ST5xxx
155 * Possibly other Fujitsu tablet models
156
157 It adds support for the panel buttons, docking station detection,
158 tablet/notebook mode detection for convertible and
159 orientation detection for docked slates.
160
161 If you have a Fujitsu convertible or slate, say Y or M here.
162
163config AMILO_RFKILL
164 tristate "Fujitsu-Siemens Amilo rfkill support"
165 depends on RFKILL
166 ---help---
167 This is a driver for enabling wifi on some Fujitsu-Siemens Amilo
168 laptops.
169
146config TC1100_WMI 170config TC1100_WMI
147 tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)" 171 tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
148 depends on !X86_64 172 depends on !X86_64
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 293a320d9faa..d328f21e9fdd 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -17,12 +17,14 @@ obj-$(CONFIG_ACER_WMI) += acer-wmi.o
17obj-$(CONFIG_ACERHDF) += acerhdf.o 17obj-$(CONFIG_ACERHDF) += acerhdf.o
18obj-$(CONFIG_HP_ACCEL) += hp_accel.o 18obj-$(CONFIG_HP_ACCEL) += hp_accel.o
19obj-$(CONFIG_HP_WMI) += hp-wmi.o 19obj-$(CONFIG_HP_WMI) += hp-wmi.o
20obj-$(CONFIG_AMILO_RFKILL) += amilo-rfkill.o
20obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o 21obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
21obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o 22obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
22obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o 23obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o
23obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o 24obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
24obj-$(CONFIG_SENSORS_HDAPS) += hdaps.o 25obj-$(CONFIG_SENSORS_HDAPS) += hdaps.o
25obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o 26obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o
27obj-$(CONFIG_FUJITSU_TABLET) += fujitsu-tablet.o
26obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o 28obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o
27obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o 29obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
28obj-$(CONFIG_ACPI_WMI) += wmi.o 30obj-$(CONFIG_ACPI_WMI) += wmi.o
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index b848277171a4..1e5290b5396d 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -679,6 +679,32 @@ static acpi_status AMW0_find_mailled(void)
679 return AE_OK; 679 return AE_OK;
680} 680}
681 681
682static int AMW0_set_cap_acpi_check_device_found;
683
684static acpi_status AMW0_set_cap_acpi_check_device_cb(acpi_handle handle,
685 u32 level, void *context, void **retval)
686{
687 AMW0_set_cap_acpi_check_device_found = 1;
688 return AE_OK;
689}
690
691static const struct acpi_device_id norfkill_ids[] = {
692 { "VPC2004", 0},
693 { "IBM0068", 0},
694 { "LEN0068", 0},
695 { "", 0},
696};
697
698static int AMW0_set_cap_acpi_check_device(void)
699{
700 const struct acpi_device_id *id;
701
702 for (id = norfkill_ids; id->id[0]; id++)
703 acpi_get_devices(id->id, AMW0_set_cap_acpi_check_device_cb,
704 NULL, NULL);
705 return AMW0_set_cap_acpi_check_device_found;
706}
707
682static acpi_status AMW0_set_capabilities(void) 708static acpi_status AMW0_set_capabilities(void)
683{ 709{
684 struct wmab_args args; 710 struct wmab_args args;
@@ -692,7 +718,9 @@ static acpi_status AMW0_set_capabilities(void)
692 * work. 718 * work.
693 */ 719 */
694 if (wmi_has_guid(AMW0_GUID2)) { 720 if (wmi_has_guid(AMW0_GUID2)) {
695 interface->capability |= ACER_CAP_WIRELESS; 721 if ((quirks != &quirk_unknown) ||
722 !AMW0_set_cap_acpi_check_device())
723 interface->capability |= ACER_CAP_WIRELESS;
696 return AE_OK; 724 return AE_OK;
697 } 725 }
698 726
diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c
new file mode 100644
index 000000000000..19170bb7700b
--- /dev/null
+++ b/drivers/platform/x86/amilo-rfkill.c
@@ -0,0 +1,173 @@
1/*
2 * Support for rfkill on some Fujitsu-Siemens Amilo laptops.
3 * Copyright 2011 Ben Hutchings.
4 *
5 * Based in part on the fsam7440 driver, which is:
6 * Copyright 2005 Alejandro Vidal Mata & Javier Vidal Mata.
7 * and on the fsaa1655g driver, which is:
8 * Copyright 2006 Martin Večeřa.
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version.
14 */
15
16#include <linux/module.h>
17#include <linux/dmi.h>
18#include <linux/i8042.h>
19#include <linux/io.h>
20#include <linux/moduleparam.h>
21#include <linux/platform_device.h>
22#include <linux/rfkill.h>
23
24/*
25 * These values were obtained from disassembling and debugging the
26 * PM.exe program installed in the Fujitsu-Siemens AMILO A1655G
27 */
28#define A1655_WIFI_COMMAND 0x10C5
29#define A1655_WIFI_ON 0x25
30#define A1655_WIFI_OFF 0x45
31
32static int amilo_a1655_rfkill_set_block(void *data, bool blocked)
33{
34 u8 param = blocked ? A1655_WIFI_OFF : A1655_WIFI_ON;
35 int rc;
36
37 i8042_lock_chip();
38 rc = i8042_command(&param, A1655_WIFI_COMMAND);
39 i8042_unlock_chip();
40 return rc;
41}
42
43static const struct rfkill_ops amilo_a1655_rfkill_ops = {
44 .set_block = amilo_a1655_rfkill_set_block
45};
46
47/*
48 * These values were obtained from disassembling the PM.exe program
49 * installed in the Fujitsu-Siemens AMILO M 7440
50 */
51#define M7440_PORT1 0x118f
52#define M7440_PORT2 0x118e
53#define M7440_RADIO_ON1 0x12
54#define M7440_RADIO_ON2 0x80
55#define M7440_RADIO_OFF1 0x10
56#define M7440_RADIO_OFF2 0x00
57
58static int amilo_m7440_rfkill_set_block(void *data, bool blocked)
59{
60 u8 val1 = blocked ? M7440_RADIO_OFF1 : M7440_RADIO_ON1;
61 u8 val2 = blocked ? M7440_RADIO_OFF2 : M7440_RADIO_ON2;
62
63 outb(val1, M7440_PORT1);
64 outb(val2, M7440_PORT2);
65
66 /* Check whether the state has changed correctly */
67 if (inb(M7440_PORT1) != val1 || inb(M7440_PORT2) != val2)
68 return -EIO;
69
70 return 0;
71}
72
73static const struct rfkill_ops amilo_m7440_rfkill_ops = {
74 .set_block = amilo_m7440_rfkill_set_block
75};
76
77static const struct dmi_system_id __devinitdata amilo_rfkill_id_table[] = {
78 {
79 .matches = {
80 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
81 DMI_MATCH(DMI_BOARD_NAME, "AMILO A1655"),
82 },
83 .driver_data = (void *)&amilo_a1655_rfkill_ops
84 },
85 {
86 .matches = {
87 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
88 DMI_MATCH(DMI_BOARD_NAME, "AMILO M7440"),
89 },
90 .driver_data = (void *)&amilo_m7440_rfkill_ops
91 },
92 {}
93};
94
95static struct platform_device *amilo_rfkill_pdev;
96static struct rfkill *amilo_rfkill_dev;
97
98static int __devinit amilo_rfkill_probe(struct platform_device *device)
99{
100 const struct dmi_system_id *system_id =
101 dmi_first_match(amilo_rfkill_id_table);
102 int rc;
103
104 amilo_rfkill_dev = rfkill_alloc(KBUILD_MODNAME, &device->dev,
105 RFKILL_TYPE_WLAN,
106 system_id->driver_data, NULL);
107 if (!amilo_rfkill_dev)
108 return -ENOMEM;
109
110 rc = rfkill_register(amilo_rfkill_dev);
111 if (rc)
112 goto fail;
113
114 return 0;
115
116fail:
117 rfkill_destroy(amilo_rfkill_dev);
118 return rc;
119}
120
121static int amilo_rfkill_remove(struct platform_device *device)
122{
123 rfkill_unregister(amilo_rfkill_dev);
124 rfkill_destroy(amilo_rfkill_dev);
125 return 0;
126}
127
128static struct platform_driver amilo_rfkill_driver = {
129 .driver = {
130 .name = KBUILD_MODNAME,
131 .owner = THIS_MODULE,
132 },
133 .probe = amilo_rfkill_probe,
134 .remove = amilo_rfkill_remove,
135};
136
137static int __init amilo_rfkill_init(void)
138{
139 int rc;
140
141 if (dmi_first_match(amilo_rfkill_id_table) == NULL)
142 return -ENODEV;
143
144 rc = platform_driver_register(&amilo_rfkill_driver);
145 if (rc)
146 return rc;
147
148 amilo_rfkill_pdev = platform_device_register_simple(KBUILD_MODNAME, -1,
149 NULL, 0);
150 if (IS_ERR(amilo_rfkill_pdev)) {
151 rc = PTR_ERR(amilo_rfkill_pdev);
152 goto fail;
153 }
154
155 return 0;
156
157fail:
158 platform_driver_unregister(&amilo_rfkill_driver);
159 return rc;
160}
161
162static void __exit amilo_rfkill_exit(void)
163{
164 platform_device_unregister(amilo_rfkill_pdev);
165 platform_driver_unregister(&amilo_rfkill_driver);
166}
167
168MODULE_AUTHOR("Ben Hutchings <ben@decadent.org.uk>");
169MODULE_LICENSE("GPL");
170MODULE_DEVICE_TABLE(dmi, amilo_rfkill_id_table);
171
172module_init(amilo_rfkill_init);
173module_exit(amilo_rfkill_exit);
diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c
new file mode 100644
index 000000000000..580d80a73c3a
--- /dev/null
+++ b/drivers/platform/x86/fujitsu-tablet.c
@@ -0,0 +1,478 @@
1/*
2 * Copyright (C) 2006-2012 Robert Gerlach <khnz@gmx.de>
3 * Copyright (C) 2005-2006 Jan Rychter <jan@rychter.com>
4 *
5 * You can redistribute and/or modify this program under the terms of the
6 * GNU General Public License version 2 as published by the Free Software
7 * Foundation.
8 *
9 * This program is distributed in the hope that it will be useful, but
10 * WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
12 * Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License along
15 * with this program; if not, write to the Free Software Foundation, Inc.,
16 * 59 Temple Place Suite 330, Boston, MA 02111-1307, USA.
17 */
18
19#include <linux/kernel.h>
20#include <linux/module.h>
21#include <linux/init.h>
22#include <linux/bitops.h>
23#include <linux/io.h>
24#include <linux/ioport.h>
25#include <linux/acpi.h>
26#include <linux/device.h>
27#include <linux/interrupt.h>
28#include <linux/input.h>
29#include <linux/delay.h>
30#include <linux/dmi.h>
31
32#define MODULENAME "fujitsu-tablet"
33
34#define ACPI_FUJITSU_CLASS "fujitsu"
35
36#define INVERT_TABLET_MODE_BIT 0x01
37#define FORCE_TABLET_MODE_IF_UNDOCK 0x02
38
39#define KEYMAP_LEN 16
40
41static const struct acpi_device_id fujitsu_ids[] = {
42 { .id = "FUJ02BD" },
43 { .id = "FUJ02BF" },
44 { .id = "" }
45};
46
47struct fujitsu_config {
48 unsigned short keymap[KEYMAP_LEN];
49 unsigned int quirks;
50};
51
52static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = {
53 KEY_RESERVED,
54 KEY_RESERVED,
55 KEY_RESERVED,
56 KEY_RESERVED,
57 KEY_SCROLLDOWN,
58 KEY_SCROLLUP,
59 KEY_DIRECTION,
60 KEY_LEFTCTRL,
61 KEY_BRIGHTNESSUP,
62 KEY_BRIGHTNESSDOWN,
63 KEY_BRIGHTNESS_ZERO,
64 KEY_RESERVED,
65 KEY_RESERVED,
66 KEY_RESERVED,
67 KEY_RESERVED,
68 KEY_LEFTALT
69};
70
71static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = {
72 KEY_RESERVED,
73 KEY_RESERVED,
74 KEY_RESERVED,
75 KEY_RESERVED,
76 KEY_PROG1,
77 KEY_PROG2,
78 KEY_DIRECTION,
79 KEY_RESERVED,
80 KEY_RESERVED,
81 KEY_RESERVED,
82 KEY_UP,
83 KEY_DOWN,
84 KEY_RESERVED,
85 KEY_RESERVED,
86 KEY_LEFTCTRL,
87 KEY_LEFTALT
88};
89
90static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = {
91 KEY_RESERVED,
92 KEY_RESERVED,
93 KEY_RESERVED,
94 KEY_RESERVED,
95 KEY_PRINT,
96 KEY_BACKSPACE,
97 KEY_SPACE,
98 KEY_ENTER,
99 KEY_BRIGHTNESSUP,
100 KEY_BRIGHTNESSDOWN,
101 KEY_DOWN,
102 KEY_UP,
103 KEY_SCROLLUP,
104 KEY_SCROLLDOWN,
105 KEY_LEFTCTRL,
106 KEY_LEFTALT
107};
108
109static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initconst = {
110 KEY_RESERVED,
111 KEY_RESERVED,
112 KEY_RESERVED,
113 KEY_RESERVED,
114 KEY_MAIL,
115 KEY_DIRECTION,
116 KEY_ESC,
117 KEY_ENTER,
118 KEY_BRIGHTNESSUP,
119 KEY_BRIGHTNESSDOWN,
120 KEY_DOWN,
121 KEY_UP,
122 KEY_SCROLLUP,
123 KEY_SCROLLDOWN,
124 KEY_LEFTCTRL,
125 KEY_LEFTALT
126};
127
128static struct {
129 struct input_dev *idev;
130 struct fujitsu_config config;
131 unsigned long prev_keymask;
132
133 char phys[21];
134
135 int irq;
136 int io_base;
137 int io_length;
138} fujitsu;
139
140static u8 fujitsu_ack(void)
141{
142 return inb(fujitsu.io_base + 2);
143}
144
145static u8 fujitsu_status(void)
146{
147 return inb(fujitsu.io_base + 6);
148}
149
150static u8 fujitsu_read_register(const u8 addr)
151{
152 outb(addr, fujitsu.io_base);
153 return inb(fujitsu.io_base + 4);
154}
155
156static void fujitsu_send_state(void)
157{
158 int state;
159 int dock, tablet_mode;
160
161 state = fujitsu_read_register(0xdd);
162
163 dock = state & 0x02;
164
165 if ((fujitsu.config.quirks & FORCE_TABLET_MODE_IF_UNDOCK) && (!dock)) {
166 tablet_mode = 1;
167 } else{
168 tablet_mode = state & 0x01;
169 if (fujitsu.config.quirks & INVERT_TABLET_MODE_BIT)
170 tablet_mode = !tablet_mode;
171 }
172
173 input_report_switch(fujitsu.idev, SW_DOCK, dock);
174 input_report_switch(fujitsu.idev, SW_TABLET_MODE, tablet_mode);
175 input_sync(fujitsu.idev);
176}
177
178static void fujitsu_reset(void)
179{
180 int timeout = 50;
181
182 fujitsu_ack();
183
184 while ((fujitsu_status() & 0x02) && (--timeout))
185 msleep(20);
186
187 fujitsu_send_state();
188}
189
190static int __devinit input_fujitsu_setup(struct device *parent,
191 const char *name, const char *phys)
192{
193 struct input_dev *idev;
194 int error;
195 int i;
196
197 idev = input_allocate_device();
198 if (!idev)
199 return -ENOMEM;
200
201 idev->dev.parent = parent;
202 idev->phys = phys;
203 idev->name = name;
204 idev->id.bustype = BUS_HOST;
205 idev->id.vendor = 0x1734; /* Fujitsu Siemens Computer GmbH */
206 idev->id.product = 0x0001;
207 idev->id.version = 0x0101;
208
209 idev->keycode = fujitsu.config.keymap;
210 idev->keycodesize = sizeof(fujitsu.config.keymap[0]);
211 idev->keycodemax = ARRAY_SIZE(fujitsu.config.keymap);
212
213 __set_bit(EV_REP, idev->evbit);
214
215 for (i = 0; i < ARRAY_SIZE(fujitsu.config.keymap); i++)
216 if (fujitsu.config.keymap[i])
217 input_set_capability(idev, EV_KEY, fujitsu.config.keymap[i]);
218
219 input_set_capability(idev, EV_MSC, MSC_SCAN);
220
221 input_set_capability(idev, EV_SW, SW_DOCK);
222 input_set_capability(idev, EV_SW, SW_TABLET_MODE);
223
224 input_set_capability(idev, EV_SW, SW_DOCK);
225 input_set_capability(idev, EV_SW, SW_TABLET_MODE);
226
227 error = input_register_device(idev);
228 if (error) {
229 input_free_device(idev);
230 return error;
231 }
232
233 fujitsu.idev = idev;
234 return 0;
235}
236
237static void input_fujitsu_remove(void)
238{
239 input_unregister_device(fujitsu.idev);
240}
241
242static irqreturn_t fujitsu_interrupt(int irq, void *dev_id)
243{
244 unsigned long keymask, changed;
245 unsigned int keycode;
246 int pressed;
247 int i;
248
249 if (unlikely(!(fujitsu_status() & 0x01)))
250 return IRQ_NONE;
251
252 fujitsu_send_state();
253
254 keymask = fujitsu_read_register(0xde);
255 keymask |= fujitsu_read_register(0xdf) << 8;
256 keymask ^= 0xffff;
257
258 changed = keymask ^ fujitsu.prev_keymask;
259 if (changed) {
260 fujitsu.prev_keymask = keymask;
261
262 for_each_set_bit(i, &changed, KEYMAP_LEN) {
263 keycode = fujitsu.config.keymap[i];
264 pressed = keymask & changed & BIT(i);
265
266 if (pressed)
267 input_event(fujitsu.idev, EV_MSC, MSC_SCAN, i);
268
269 input_report_key(fujitsu.idev, keycode, pressed);
270 input_sync(fujitsu.idev);
271 }
272 }
273
274 fujitsu_ack();
275 return IRQ_HANDLED;
276}
277
278static int __devinit fujitsu_dmi_default(const struct dmi_system_id *dmi)
279{
280 printk(KERN_INFO MODULENAME ": %s\n", dmi->ident);
281 memcpy(fujitsu.config.keymap, dmi->driver_data,
282 sizeof(fujitsu.config.keymap));
283 return 1;
284}
285
286static int __devinit fujitsu_dmi_stylistic(const struct dmi_system_id *dmi)
287{
288 fujitsu_dmi_default(dmi);
289 fujitsu.config.quirks |= FORCE_TABLET_MODE_IF_UNDOCK;
290 fujitsu.config.quirks |= INVERT_TABLET_MODE_BIT;
291 return 1;
292}
293
294static struct dmi_system_id dmi_ids[] __initconst = {
295 {
296 .callback = fujitsu_dmi_default,
297 .ident = "Fujitsu Siemens P/T Series",
298 .matches = {
299 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
300 DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK")
301 },
302 .driver_data = keymap_Lifebook_Tseries
303 },
304 {
305 .callback = fujitsu_dmi_default,
306 .ident = "Fujitsu Lifebook T Series",
307 .matches = {
308 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
309 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook T")
310 },
311 .driver_data = keymap_Lifebook_Tseries
312 },
313 {
314 .callback = fujitsu_dmi_stylistic,
315 .ident = "Fujitsu Siemens Stylistic T Series",
316 .matches = {
317 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
318 DMI_MATCH(DMI_PRODUCT_NAME, "Stylistic T")
319 },
320 .driver_data = keymap_Stylistic_Tseries
321 },
322 {
323 .callback = fujitsu_dmi_default,
324 .ident = "Fujitsu LifeBook U810",
325 .matches = {
326 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
327 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook U810")
328 },
329 .driver_data = keymap_Lifebook_U810
330 },
331 {
332 .callback = fujitsu_dmi_stylistic,
333 .ident = "Fujitsu Siemens Stylistic ST5xxx Series",
334 .matches = {
335 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
336 DMI_MATCH(DMI_PRODUCT_NAME, "STYLISTIC ST5")
337 },
338 .driver_data = keymap_Stylistic_ST5xxx
339 },
340 {
341 .callback = fujitsu_dmi_stylistic,
342 .ident = "Fujitsu Siemens Stylistic ST5xxx Series",
343 .matches = {
344 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
345 DMI_MATCH(DMI_PRODUCT_NAME, "Stylistic ST5")
346 },
347 .driver_data = keymap_Stylistic_ST5xxx
348 },
349 {
350 .callback = fujitsu_dmi_default,
351 .ident = "Unknown (using defaults)",
352 .matches = {
353 DMI_MATCH(DMI_SYS_VENDOR, ""),
354 DMI_MATCH(DMI_PRODUCT_NAME, "")
355 },
356 .driver_data = keymap_Lifebook_Tseries
357 },
358 { NULL }
359};
360
361static acpi_status __devinit
362fujitsu_walk_resources(struct acpi_resource *res, void *data)
363{
364 switch (res->type) {
365 case ACPI_RESOURCE_TYPE_IRQ:
366 fujitsu.irq = res->data.irq.interrupts[0];
367 return AE_OK;
368
369 case ACPI_RESOURCE_TYPE_IO:
370 fujitsu.io_base = res->data.io.minimum;
371 fujitsu.io_length = res->data.io.address_length;
372 return AE_OK;
373
374 case ACPI_RESOURCE_TYPE_END_TAG:
375 if (fujitsu.irq && fujitsu.io_base)
376 return AE_OK;
377 else
378 return AE_NOT_FOUND;
379
380 default:
381 return AE_ERROR;
382 }
383}
384
385static int __devinit acpi_fujitsu_add(struct acpi_device *adev)
386{
387 acpi_status status;
388 int error;
389
390 if (!adev)
391 return -EINVAL;
392
393 status = acpi_walk_resources(adev->handle, METHOD_NAME__CRS,
394 fujitsu_walk_resources, NULL);
395 if (ACPI_FAILURE(status) || !fujitsu.irq || !fujitsu.io_base)
396 return -ENODEV;
397
398 sprintf(acpi_device_name(adev), "Fujitsu %s", acpi_device_hid(adev));
399 sprintf(acpi_device_class(adev), "%s", ACPI_FUJITSU_CLASS);
400
401 snprintf(fujitsu.phys, sizeof(fujitsu.phys),
402 "%s/input0", acpi_device_hid(adev));
403
404 error = input_fujitsu_setup(&adev->dev,
405 acpi_device_name(adev), fujitsu.phys);
406 if (error)
407 return error;
408
409 if (!request_region(fujitsu.io_base, fujitsu.io_length, MODULENAME)) {
410 input_fujitsu_remove();
411 return -EBUSY;
412 }
413
414 fujitsu_reset();
415
416 error = request_irq(fujitsu.irq, fujitsu_interrupt,
417 IRQF_SHARED, MODULENAME, fujitsu_interrupt);
418 if (error) {
419 release_region(fujitsu.io_base, fujitsu.io_length);
420 input_fujitsu_remove();
421 return error;
422 }
423
424 return 0;
425}
426
427static int __devexit acpi_fujitsu_remove(struct acpi_device *adev, int type)
428{
429 free_irq(fujitsu.irq, fujitsu_interrupt);
430 release_region(fujitsu.io_base, fujitsu.io_length);
431 input_fujitsu_remove();
432 return 0;
433}
434
435static int acpi_fujitsu_resume(struct acpi_device *adev)
436{
437 fujitsu_reset();
438 return 0;
439}
440
441static struct acpi_driver acpi_fujitsu_driver = {
442 .name = MODULENAME,
443 .class = "hotkey",
444 .ids = fujitsu_ids,
445 .ops = {
446 .add = acpi_fujitsu_add,
447 .remove = acpi_fujitsu_remove,
448 .resume = acpi_fujitsu_resume,
449 }
450};
451
452static int __init fujitsu_module_init(void)
453{
454 int error;
455
456 dmi_check_system(dmi_ids);
457
458 error = acpi_bus_register_driver(&acpi_fujitsu_driver);
459 if (error)
460 return error;
461
462 return 0;
463}
464
465static void __exit fujitsu_module_exit(void)
466{
467 acpi_bus_unregister_driver(&acpi_fujitsu_driver);
468}
469
470module_init(fujitsu_module_init);
471module_exit(fujitsu_module_exit);
472
473MODULE_AUTHOR("Robert Gerlach <khnz@gmx.de>");
474MODULE_DESCRIPTION("Fujitsu tablet pc extras driver");
475MODULE_LICENSE("GPL");
476MODULE_VERSION("2.4");
477
478MODULE_DEVICE_TABLE(acpi, fujitsu_ids);
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 05be30ee158b..ffff8b4b4949 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -562,8 +562,8 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
562 562
563 num_sifr = acpi_pcc_get_sqty(device); 563 num_sifr = acpi_pcc_get_sqty(device);
564 564
565 if (num_sifr > 255) { 565 if (num_sifr < 0 || num_sifr > 255) {
566 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "num_sifr too large")); 566 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "num_sifr out of range"));
567 return -ENODEV; 567 return -ENODEV;
568 } 568 }
569 569
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 75085795528e..61b7fd2729cd 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1710,6 +1710,8 @@ static int sci_startup(struct uart_port *port)
1710 1710
1711 dev_dbg(port->dev, "%s(%d)\n", __func__, port->line); 1711 dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
1712 1712
1713 pm_runtime_put_noidle(port->dev);
1714
1713 sci_port_enable(s); 1715 sci_port_enable(s);
1714 1716
1715 ret = sci_request_irq(s); 1717 ret = sci_request_irq(s);
@@ -1737,6 +1739,8 @@ static void sci_shutdown(struct uart_port *port)
1737 sci_free_irq(s); 1739 sci_free_irq(s);
1738 1740
1739 sci_port_disable(s); 1741 sci_port_disable(s);
1742
1743 pm_runtime_get_noresume(port->dev);
1740} 1744}
1741 1745
1742static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps, 1746static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps,
@@ -2075,6 +2079,7 @@ static int __devinit sci_init_single(struct platform_device *dev,
2075 sci_init_gpios(sci_port); 2079 sci_init_gpios(sci_port);
2076 2080
2077 pm_runtime_irq_safe(&dev->dev); 2081 pm_runtime_irq_safe(&dev->dev);
2082 pm_runtime_get_noresume(&dev->dev);
2078 pm_runtime_enable(&dev->dev); 2083 pm_runtime_enable(&dev->dev);
2079 } 2084 }
2080 2085
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 4dd9283885e7..5e64748a2917 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -920,16 +920,26 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
920 for (lockp = &inode->i_flock; *lockp != NULL; \ 920 for (lockp = &inode->i_flock; *lockp != NULL; \
921 lockp = &(*lockp)->fl_next) 921 lockp = &(*lockp)->fl_next)
922 922
923struct lock_to_push {
924 struct list_head llist;
925 __u64 offset;
926 __u64 length;
927 __u32 pid;
928 __u16 netfid;
929 __u8 type;
930};
931
923static int 932static int
924cifs_push_posix_locks(struct cifsFileInfo *cfile) 933cifs_push_posix_locks(struct cifsFileInfo *cfile)
925{ 934{
926 struct cifsInodeInfo *cinode = CIFS_I(cfile->dentry->d_inode); 935 struct cifsInodeInfo *cinode = CIFS_I(cfile->dentry->d_inode);
927 struct cifs_tcon *tcon = tlink_tcon(cfile->tlink); 936 struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
928 struct file_lock *flock, **before; 937 struct file_lock *flock, **before;
929 struct cifsLockInfo *lck, *tmp; 938 unsigned int count = 0, i = 0;
930 int rc = 0, xid, type; 939 int rc = 0, xid, type;
940 struct list_head locks_to_send, *el;
941 struct lock_to_push *lck, *tmp;
931 __u64 length; 942 __u64 length;
932 struct list_head locks_to_send;
933 943
934 xid = GetXid(); 944 xid = GetXid();
935 945
@@ -940,29 +950,55 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
940 return rc; 950 return rc;
941 } 951 }
942 952
953 lock_flocks();
954 cifs_for_each_lock(cfile->dentry->d_inode, before) {
955 if ((*before)->fl_flags & FL_POSIX)
956 count++;
957 }
958 unlock_flocks();
959
943 INIT_LIST_HEAD(&locks_to_send); 960 INIT_LIST_HEAD(&locks_to_send);
944 961
962 /*
963 * Allocating count locks is enough because no locks can be added to
964 * the list while we are holding cinode->lock_mutex that protects
965 * locking operations of this inode.
966 */
967 for (; i < count; i++) {
968 lck = kmalloc(sizeof(struct lock_to_push), GFP_KERNEL);
969 if (!lck) {
970 rc = -ENOMEM;
971 goto err_out;
972 }
973 list_add_tail(&lck->llist, &locks_to_send);
974 }
975
976 i = 0;
977 el = locks_to_send.next;
945 lock_flocks(); 978 lock_flocks();
946 cifs_for_each_lock(cfile->dentry->d_inode, before) { 979 cifs_for_each_lock(cfile->dentry->d_inode, before) {
980 if (el == &locks_to_send) {
981 /* something is really wrong */
982 cERROR(1, "Can't push all brlocks!");
983 break;
984 }
947 flock = *before; 985 flock = *before;
986 if ((flock->fl_flags & FL_POSIX) == 0)
987 continue;
948 length = 1 + flock->fl_end - flock->fl_start; 988 length = 1 + flock->fl_end - flock->fl_start;
949 if (flock->fl_type == F_RDLCK || flock->fl_type == F_SHLCK) 989 if (flock->fl_type == F_RDLCK || flock->fl_type == F_SHLCK)
950 type = CIFS_RDLCK; 990 type = CIFS_RDLCK;
951 else 991 else
952 type = CIFS_WRLCK; 992 type = CIFS_WRLCK;
953 993 lck = list_entry(el, struct lock_to_push, llist);
954 lck = cifs_lock_init(flock->fl_start, length, type,
955 cfile->netfid);
956 if (!lck) {
957 rc = -ENOMEM;
958 goto send_locks;
959 }
960 lck->pid = flock->fl_pid; 994 lck->pid = flock->fl_pid;
961 995 lck->netfid = cfile->netfid;
962 list_add_tail(&lck->llist, &locks_to_send); 996 lck->length = length;
997 lck->type = type;
998 lck->offset = flock->fl_start;
999 i++;
1000 el = el->next;
963 } 1001 }
964
965send_locks:
966 unlock_flocks(); 1002 unlock_flocks();
967 1003
968 list_for_each_entry_safe(lck, tmp, &locks_to_send, llist) { 1004 list_for_each_entry_safe(lck, tmp, &locks_to_send, llist) {
@@ -979,11 +1015,18 @@ send_locks:
979 kfree(lck); 1015 kfree(lck);
980 } 1016 }
981 1017
1018out:
982 cinode->can_cache_brlcks = false; 1019 cinode->can_cache_brlcks = false;
983 mutex_unlock(&cinode->lock_mutex); 1020 mutex_unlock(&cinode->lock_mutex);
984 1021
985 FreeXid(xid); 1022 FreeXid(xid);
986 return rc; 1023 return rc;
1024err_out:
1025 list_for_each_entry_safe(lck, tmp, &locks_to_send, llist) {
1026 list_del(&lck->llist);
1027 kfree(lck);
1028 }
1029 goto out;
987} 1030}
988 1031
989static int 1032static int
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
index 45f07c46f3ed..10d92cf57ab6 100644
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
@@ -105,7 +105,6 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
105 struct cifs_tcon *pTcon; 105 struct cifs_tcon *pTcon;
106 struct super_block *sb; 106 struct super_block *sb;
107 char *full_path; 107 char *full_path;
108 struct cifs_ntsd *pacl;
109 108
110 if (direntry == NULL) 109 if (direntry == NULL)
111 return -EIO; 110 return -EIO;
@@ -164,23 +163,24 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
164 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); 163 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
165 } else if (strncmp(ea_name, CIFS_XATTR_CIFS_ACL, 164 } else if (strncmp(ea_name, CIFS_XATTR_CIFS_ACL,
166 strlen(CIFS_XATTR_CIFS_ACL)) == 0) { 165 strlen(CIFS_XATTR_CIFS_ACL)) == 0) {
166#ifdef CONFIG_CIFS_ACL
167 struct cifs_ntsd *pacl;
167 pacl = kmalloc(value_size, GFP_KERNEL); 168 pacl = kmalloc(value_size, GFP_KERNEL);
168 if (!pacl) { 169 if (!pacl) {
169 cFYI(1, "%s: Can't allocate memory for ACL", 170 cFYI(1, "%s: Can't allocate memory for ACL",
170 __func__); 171 __func__);
171 rc = -ENOMEM; 172 rc = -ENOMEM;
172 } else { 173 } else {
173#ifdef CONFIG_CIFS_ACL
174 memcpy(pacl, ea_value, value_size); 174 memcpy(pacl, ea_value, value_size);
175 rc = set_cifs_acl(pacl, value_size, 175 rc = set_cifs_acl(pacl, value_size,
176 direntry->d_inode, full_path, CIFS_ACL_DACL); 176 direntry->d_inode, full_path, CIFS_ACL_DACL);
177 if (rc == 0) /* force revalidate of the inode */ 177 if (rc == 0) /* force revalidate of the inode */
178 CIFS_I(direntry->d_inode)->time = 0; 178 CIFS_I(direntry->d_inode)->time = 0;
179 kfree(pacl); 179 kfree(pacl);
180 }
180#else 181#else
181 cFYI(1, "Set CIFS ACL not supported yet"); 182 cFYI(1, "Set CIFS ACL not supported yet");
182#endif /* CONFIG_CIFS_ACL */ 183#endif /* CONFIG_CIFS_ACL */
183 }
184 } else { 184 } else {
185 int temp; 185 int temp;
186 temp = strncmp(ea_name, POSIX_ACL_XATTR_ACCESS, 186 temp = strncmp(ea_name, POSIX_ACL_XATTR_ACCESS,
diff --git a/fs/inode.c b/fs/inode.c
index d3ebdbe723d0..83ab215baab1 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -938,8 +938,7 @@ void lockdep_annotate_inode_mutex_key(struct inode *inode)
938 struct file_system_type *type = inode->i_sb->s_type; 938 struct file_system_type *type = inode->i_sb->s_type;
939 939
940 /* Set new key only if filesystem hasn't already changed it */ 940 /* Set new key only if filesystem hasn't already changed it */
941 if (!lockdep_match_class(&inode->i_mutex, 941 if (lockdep_match_class(&inode->i_mutex, &type->i_mutex_key)) {
942 &type->i_mutex_key)) {
943 /* 942 /*
944 * ensure nobody is actually holding i_mutex 943 * ensure nobody is actually holding i_mutex
945 */ 944 */
@@ -966,6 +965,7 @@ void unlock_new_inode(struct inode *inode)
966 spin_lock(&inode->i_lock); 965 spin_lock(&inode->i_lock);
967 WARN_ON(!(inode->i_state & I_NEW)); 966 WARN_ON(!(inode->i_state & I_NEW));
968 inode->i_state &= ~I_NEW; 967 inode->i_state &= ~I_NEW;
968 smp_mb();
969 wake_up_bit(&inode->i_state, __I_NEW); 969 wake_up_bit(&inode->i_state, __I_NEW);
970 spin_unlock(&inode->i_lock); 970 spin_unlock(&inode->i_lock);
971} 971}
diff --git a/fs/namei.c b/fs/namei.c
index e2ba62820a0f..46ea9cc16647 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2162,7 +2162,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
2162 /* sayonara */ 2162 /* sayonara */
2163 error = complete_walk(nd); 2163 error = complete_walk(nd);
2164 if (error) 2164 if (error)
2165 return ERR_PTR(-ECHILD); 2165 return ERR_PTR(error);
2166 2166
2167 error = -ENOTDIR; 2167 error = -ENOTDIR;
2168 if (nd->flags & LOOKUP_DIRECTORY) { 2168 if (nd->flags & LOOKUP_DIRECTORY) {
@@ -2261,7 +2261,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
2261 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */ 2261 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
2262 error = complete_walk(nd); 2262 error = complete_walk(nd);
2263 if (error) 2263 if (error)
2264 goto exit; 2264 return ERR_PTR(error);
2265 error = -EISDIR; 2265 error = -EISDIR;
2266 if (S_ISDIR(nd->inode->i_mode)) 2266 if (S_ISDIR(nd->inode->i_mode))
2267 goto exit; 2267 goto exit;
diff --git a/fs/udf/file.c b/fs/udf/file.c
index dca0c3881e82..d567b8448dfc 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -201,12 +201,10 @@ out:
201static int udf_release_file(struct inode *inode, struct file *filp) 201static int udf_release_file(struct inode *inode, struct file *filp)
202{ 202{
203 if (filp->f_mode & FMODE_WRITE) { 203 if (filp->f_mode & FMODE_WRITE) {
204 mutex_lock(&inode->i_mutex);
205 down_write(&UDF_I(inode)->i_data_sem); 204 down_write(&UDF_I(inode)->i_data_sem);
206 udf_discard_prealloc(inode); 205 udf_discard_prealloc(inode);
207 udf_truncate_tail_extent(inode); 206 udf_truncate_tail_extent(inode);
208 up_write(&UDF_I(inode)->i_data_sem); 207 up_write(&UDF_I(inode)->i_data_sem);
209 mutex_unlock(&inode->i_mutex);
210 } 208 }
211 return 0; 209 return 0;
212} 210}
diff --git a/lib/dynamic_queue_limits.c b/lib/dynamic_queue_limits.c
index 3d1bdcdd7db4..6ab4587d052b 100644
--- a/lib/dynamic_queue_limits.c
+++ b/lib/dynamic_queue_limits.c
@@ -7,6 +7,7 @@
7#include <linux/types.h> 7#include <linux/types.h>
8#include <linux/ctype.h> 8#include <linux/ctype.h>
9#include <linux/kernel.h> 9#include <linux/kernel.h>
10#include <linux/jiffies.h>
10#include <linux/dynamic_queue_limits.h> 11#include <linux/dynamic_queue_limits.h>
11 12
12#define POSDIFF(A, B) ((A) > (B) ? (A) - (B) : 0) 13#define POSDIFF(A, B) ((A) > (B) ? (A) - (B) : 0)
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 51fdbb490437..eab2a7fb15d1 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -278,6 +278,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
278 struct rtable *rt; 278 struct rtable *rt;
279 __u8 rcv_wscale; 279 __u8 rcv_wscale;
280 bool ecn_ok = false; 280 bool ecn_ok = false;
281 struct flowi4 fl4;
281 282
282 if (!sysctl_tcp_syncookies || !th->ack || th->rst) 283 if (!sysctl_tcp_syncookies || !th->ack || th->rst)
283 goto out; 284 goto out;
@@ -346,20 +347,16 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
346 * hasn't changed since we received the original syn, but I see 347 * hasn't changed since we received the original syn, but I see
347 * no easy way to do this. 348 * no easy way to do this.
348 */ 349 */
349 { 350 flowi4_init_output(&fl4, 0, sk->sk_mark, RT_CONN_FLAGS(sk),
350 struct flowi4 fl4; 351 RT_SCOPE_UNIVERSE, IPPROTO_TCP,
351 352 inet_sk_flowi_flags(sk),
352 flowi4_init_output(&fl4, 0, sk->sk_mark, RT_CONN_FLAGS(sk), 353 (opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
353 RT_SCOPE_UNIVERSE, IPPROTO_TCP, 354 ireq->loc_addr, th->source, th->dest);
354 inet_sk_flowi_flags(sk), 355 security_req_classify_flow(req, flowi4_to_flowi(&fl4));
355 (opt && opt->srr) ? opt->faddr : ireq->rmt_addr, 356 rt = ip_route_output_key(sock_net(sk), &fl4);
356 ireq->loc_addr, th->source, th->dest); 357 if (IS_ERR(rt)) {
357 security_req_classify_flow(req, flowi4_to_flowi(&fl4)); 358 reqsk_free(req);
358 rt = ip_route_output_key(sock_net(sk), &fl4); 359 goto out;
359 if (IS_ERR(rt)) {
360 reqsk_free(req);
361 goto out;
362 }
363 } 360 }
364 361
365 /* Try to redo what tcp_v4_send_synack did. */ 362 /* Try to redo what tcp_v4_send_synack did. */
@@ -373,5 +370,10 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
373 ireq->rcv_wscale = rcv_wscale; 370 ireq->rcv_wscale = rcv_wscale;
374 371
375 ret = get_cookie_sock(sk, skb, req, &rt->dst); 372 ret = get_cookie_sock(sk, skb, req, &rt->dst);
373 /* ip_queue_xmit() depends on our flow being setup
374 * Normal sockets get it right from inet_csk_route_child_sock()
375 */
376 if (ret)
377 inet_sk(ret)->cork.fl.u.ip4 = fl4;
376out: return ret; 378out: return ret;
377} 379}
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 94d683a61cba..fd54c5f8a255 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1466,9 +1466,13 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
1466 inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen; 1466 inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen;
1467 newinet->inet_id = newtp->write_seq ^ jiffies; 1467 newinet->inet_id = newtp->write_seq ^ jiffies;
1468 1468
1469 if (!dst && (dst = inet_csk_route_child_sock(sk, newsk, req)) == NULL) 1469 if (!dst) {
1470 goto put_and_exit; 1470 dst = inet_csk_route_child_sock(sk, newsk, req);
1471 1471 if (!dst)
1472 goto put_and_exit;
1473 } else {
1474 /* syncookie case : see end of cookie_v4_check() */
1475 }
1472 sk_setup_caps(newsk, dst); 1476 sk_setup_caps(newsk, dst);
1473 1477
1474 tcp_mtup_init(newsk); 1478 tcp_mtup_init(newsk);
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index cc27148635cd..b492e3a51268 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -268,6 +268,8 @@ LIB_H += util/include/asm/uaccess.h
268LIB_H += util/include/dwarf-regs.h 268LIB_H += util/include/dwarf-regs.h
269LIB_H += util/include/asm/dwarf2.h 269LIB_H += util/include/asm/dwarf2.h
270LIB_H += util/include/asm/cpufeature.h 270LIB_H += util/include/asm/cpufeature.h
271LIB_H += util/include/asm/unistd_32.h
272LIB_H += util/include/asm/unistd_64.h
271LIB_H += perf.h 273LIB_H += perf.h
272LIB_H += util/annotate.h 274LIB_H += util/annotate.h
273LIB_H += util/cache.h 275LIB_H += util/cache.h
diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
index eba80c292945..2f7073d107fd 100644
--- a/tools/perf/arch/powerpc/util/header.c
+++ b/tools/perf/arch/powerpc/util/header.c
@@ -25,7 +25,7 @@ get_cpuid(char *buffer, size_t sz)
25 25
26 pvr = mfspr(SPRN_PVR); 26 pvr = mfspr(SPRN_PVR);
27 27
28 nb = snprintf(buffer, sz, "%lu,%lu$", PVR_VER(pvr), PVR_REV(pvr)); 28 nb = scnprintf(buffer, sz, "%lu,%lu$", PVR_VER(pvr), PVR_REV(pvr));
29 29
30 /* look for end marker to ensure the entire data fit */ 30 /* look for end marker to ensure the entire data fit */
31 if (strchr(buffer, '$')) { 31 if (strchr(buffer, '$')) {
diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c
index f94006068d2b..146d12a1cec0 100644
--- a/tools/perf/arch/x86/util/header.c
+++ b/tools/perf/arch/x86/util/header.c
@@ -48,7 +48,7 @@ get_cpuid(char *buffer, size_t sz)
48 if (family >= 0x6) 48 if (family >= 0x6)
49 model += ((a >> 16) & 0xf) << 4; 49 model += ((a >> 16) & 0xf) << 4;
50 } 50 }
51 nb = snprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step); 51 nb = scnprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step);
52 52
53 /* look for end marker to ensure the entire data fit */ 53 /* look for end marker to ensure the entire data fit */
54 if (strchr(buffer, '$')) { 54 if (strchr(buffer, '$')) {
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index eec392e48067..89e3355ab173 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -10,6 +10,9 @@ void get_term_dimensions(struct winsize *ws);
10#define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory") 10#define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
11#define cpu_relax() asm volatile("rep; nop" ::: "memory"); 11#define cpu_relax() asm volatile("rep; nop" ::: "memory");
12#define CPUINFO_PROC "model name" 12#define CPUINFO_PROC "model name"
13#ifndef __NR_perf_event_open
14# define __NR_perf_event_open 336
15#endif
13#endif 16#endif
14 17
15#if defined(__x86_64__) 18#if defined(__x86_64__)
@@ -17,6 +20,9 @@ void get_term_dimensions(struct winsize *ws);
17#define rmb() asm volatile("lfence" ::: "memory") 20#define rmb() asm volatile("lfence" ::: "memory")
18#define cpu_relax() asm volatile("rep; nop" ::: "memory"); 21#define cpu_relax() asm volatile("rep; nop" ::: "memory");
19#define CPUINFO_PROC "model name" 22#define CPUINFO_PROC "model name"
23#ifndef __NR_perf_event_open
24# define __NR_perf_event_open 298
25#endif
20#endif 26#endif
21 27
22#ifdef __powerpc__ 28#ifdef __powerpc__
diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
index 521c38a79190..11e46da17bbb 100644
--- a/tools/perf/util/color.c
+++ b/tools/perf/util/color.c
@@ -1,3 +1,4 @@
1#include <linux/kernel.h>
1#include "cache.h" 2#include "cache.h"
2#include "color.h" 3#include "color.h"
3 4
@@ -182,12 +183,12 @@ static int __color_vsnprintf(char *bf, size_t size, const char *color,
182 } 183 }
183 184
184 if (perf_use_color_default && *color) 185 if (perf_use_color_default && *color)
185 r += snprintf(bf, size, "%s", color); 186 r += scnprintf(bf, size, "%s", color);
186 r += vsnprintf(bf + r, size - r, fmt, args); 187 r += vscnprintf(bf + r, size - r, fmt, args);
187 if (perf_use_color_default && *color) 188 if (perf_use_color_default && *color)
188 r += snprintf(bf + r, size - r, "%s", PERF_COLOR_RESET); 189 r += scnprintf(bf + r, size - r, "%s", PERF_COLOR_RESET);
189 if (trail) 190 if (trail)
190 r += snprintf(bf + r, size - r, "%s", trail); 191 r += scnprintf(bf + r, size - r, "%s", trail);
191 return r; 192 return r;
192} 193}
193 194
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 0d9b6da86a39..fcd9cf3ea63e 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -291,7 +291,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
291 if (realname == NULL || filename == NULL || linkname == NULL) 291 if (realname == NULL || filename == NULL || linkname == NULL)
292 goto out_free; 292 goto out_free;
293 293
294 len = snprintf(filename, size, "%s%s%s", 294 len = scnprintf(filename, size, "%s%s%s",
295 debugdir, is_kallsyms ? "/" : "", realname); 295 debugdir, is_kallsyms ? "/" : "", realname);
296 if (mkdir_p(filename, 0755)) 296 if (mkdir_p(filename, 0755))
297 goto out_free; 297 goto out_free;
@@ -306,7 +306,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
306 goto out_free; 306 goto out_free;
307 } 307 }
308 308
309 len = snprintf(linkname, size, "%s/.build-id/%.2s", 309 len = scnprintf(linkname, size, "%s/.build-id/%.2s",
310 debugdir, sbuild_id); 310 debugdir, sbuild_id);
311 311
312 if (access(linkname, X_OK) && mkdir_p(linkname, 0755)) 312 if (access(linkname, X_OK) && mkdir_p(linkname, 0755))
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 2c624ad371a7..5fb19013ca0c 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -840,7 +840,7 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
840 sep ? "%.2f" : " %6.2f%%", 840 sep ? "%.2f" : " %6.2f%%",
841 (period * 100.0) / total); 841 (period * 100.0) / total);
842 else 842 else
843 ret = snprintf(s, size, sep ? "%.2f" : " %6.2f%%", 843 ret = scnprintf(s, size, sep ? "%.2f" : " %6.2f%%",
844 (period * 100.0) / total); 844 (period * 100.0) / total);
845 if (symbol_conf.show_cpu_utilization) { 845 if (symbol_conf.show_cpu_utilization) {
846 ret += percent_color_snprintf(s + ret, size - ret, 846 ret += percent_color_snprintf(s + ret, size - ret,
@@ -863,20 +863,20 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
863 } 863 }
864 } 864 }
865 } else 865 } else
866 ret = snprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period); 866 ret = scnprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period);
867 867
868 if (symbol_conf.show_nr_samples) { 868 if (symbol_conf.show_nr_samples) {
869 if (sep) 869 if (sep)
870 ret += snprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events); 870 ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events);
871 else 871 else
872 ret += snprintf(s + ret, size - ret, "%11" PRIu64, nr_events); 872 ret += scnprintf(s + ret, size - ret, "%11" PRIu64, nr_events);
873 } 873 }
874 874
875 if (symbol_conf.show_total_period) { 875 if (symbol_conf.show_total_period) {
876 if (sep) 876 if (sep)
877 ret += snprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period); 877 ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period);
878 else 878 else
879 ret += snprintf(s + ret, size - ret, " %12" PRIu64, period); 879 ret += scnprintf(s + ret, size - ret, " %12" PRIu64, period);
880 } 880 }
881 881
882 if (pair_hists) { 882 if (pair_hists) {
@@ -891,25 +891,25 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
891 diff = new_percent - old_percent; 891 diff = new_percent - old_percent;
892 892
893 if (fabs(diff) >= 0.01) 893 if (fabs(diff) >= 0.01)
894 snprintf(bf, sizeof(bf), "%+4.2F%%", diff); 894 ret += scnprintf(bf, sizeof(bf), "%+4.2F%%", diff);
895 else 895 else
896 snprintf(bf, sizeof(bf), " "); 896 ret += scnprintf(bf, sizeof(bf), " ");
897 897
898 if (sep) 898 if (sep)
899 ret += snprintf(s + ret, size - ret, "%c%s", *sep, bf); 899 ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
900 else 900 else
901 ret += snprintf(s + ret, size - ret, "%11.11s", bf); 901 ret += scnprintf(s + ret, size - ret, "%11.11s", bf);
902 902
903 if (show_displacement) { 903 if (show_displacement) {
904 if (displacement) 904 if (displacement)
905 snprintf(bf, sizeof(bf), "%+4ld", displacement); 905 ret += scnprintf(bf, sizeof(bf), "%+4ld", displacement);
906 else 906 else
907 snprintf(bf, sizeof(bf), " "); 907 ret += scnprintf(bf, sizeof(bf), " ");
908 908
909 if (sep) 909 if (sep)
910 ret += snprintf(s + ret, size - ret, "%c%s", *sep, bf); 910 ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
911 else 911 else
912 ret += snprintf(s + ret, size - ret, "%6.6s", bf); 912 ret += scnprintf(s + ret, size - ret, "%6.6s", bf);
913 } 913 }
914 } 914 }
915 915
@@ -927,7 +927,7 @@ int hist_entry__snprintf(struct hist_entry *he, char *s, size_t size,
927 if (se->elide) 927 if (se->elide)
928 continue; 928 continue;
929 929
930 ret += snprintf(s + ret, size - ret, "%s", sep ?: " "); 930 ret += scnprintf(s + ret, size - ret, "%s", sep ?: " ");
931 ret += se->se_snprintf(he, s + ret, size - ret, 931 ret += se->se_snprintf(he, s + ret, size - ret,
932 hists__col_len(hists, se->se_width_idx)); 932 hists__col_len(hists, se->se_width_idx));
933 } 933 }
diff --git a/tools/perf/util/include/asm/unistd_32.h b/tools/perf/util/include/asm/unistd_32.h
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/tools/perf/util/include/asm/unistd_32.h
@@ -0,0 +1 @@
diff --git a/tools/perf/util/include/asm/unistd_64.h b/tools/perf/util/include/asm/unistd_64.h
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/tools/perf/util/include/asm/unistd_64.h
@@ -0,0 +1 @@
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index bec1cc6a1f38..201b40f0ca0b 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -165,7 +165,7 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
165 struct tracepoint_path *path = NULL; 165 struct tracepoint_path *path = NULL;
166 DIR *sys_dir, *evt_dir; 166 DIR *sys_dir, *evt_dir;
167 struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent; 167 struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;
168 char id_buf[4]; 168 char id_buf[24];
169 int fd; 169 int fd;
170 u64 id; 170 u64 id;
171 char evt_path[MAXPATHLEN]; 171 char evt_path[MAXPATHLEN];
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 88dbcf6f9575..a27237430c5f 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -34,6 +34,9 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
34 } 34 }
35 } 35 }
36 va_end(ap); 36 va_end(ap);
37
38 if (n >= (int)size)
39 return size - 1;
37 return n; 40 return n;
38} 41}
39 42
diff --git a/tools/perf/util/strbuf.c b/tools/perf/util/strbuf.c
index 92e068517c1a..2eeb51baf077 100644
--- a/tools/perf/util/strbuf.c
+++ b/tools/perf/util/strbuf.c
@@ -1,4 +1,5 @@
1#include "cache.h" 1#include "cache.h"
2#include <linux/kernel.h>
2 3
3int prefixcmp(const char *str, const char *prefix) 4int prefixcmp(const char *str, const char *prefix)
4{ 5{
@@ -89,14 +90,14 @@ void strbuf_addf(struct strbuf *sb, const char *fmt, ...)
89 if (!strbuf_avail(sb)) 90 if (!strbuf_avail(sb))
90 strbuf_grow(sb, 64); 91 strbuf_grow(sb, 64);
91 va_start(ap, fmt); 92 va_start(ap, fmt);
92 len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap); 93 len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
93 va_end(ap); 94 va_end(ap);
94 if (len < 0) 95 if (len < 0)
95 die("your vsnprintf is broken"); 96 die("your vscnprintf is broken");
96 if (len > strbuf_avail(sb)) { 97 if (len > strbuf_avail(sb)) {
97 strbuf_grow(sb, len); 98 strbuf_grow(sb, len);
98 va_start(ap, fmt); 99 va_start(ap, fmt);
99 len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap); 100 len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
100 va_end(ap); 101 va_end(ap);
101 if (len > strbuf_avail(sb)) { 102 if (len > strbuf_avail(sb)) {
102 die("this should not happen, your snprintf is broken"); 103 die("this should not happen, your snprintf is broken");
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index c4173c9733bb..d7a1c4afe28b 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -840,18 +840,18 @@ static int hists__browser_title(struct hists *self, char *bf, size_t size,
840 unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE]; 840 unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE];
841 841
842 nr_events = convert_unit(nr_events, &unit); 842 nr_events = convert_unit(nr_events, &unit);
843 printed = snprintf(bf, size, "Events: %lu%c %s", nr_events, unit, ev_name); 843 printed = scnprintf(bf, size, "Events: %lu%c %s", nr_events, unit, ev_name);
844 844
845 if (self->uid_filter_str) 845 if (self->uid_filter_str)
846 printed += snprintf(bf + printed, size - printed, 846 printed += snprintf(bf + printed, size - printed,
847 ", UID: %s", self->uid_filter_str); 847 ", UID: %s", self->uid_filter_str);
848 if (thread) 848 if (thread)
849 printed += snprintf(bf + printed, size - printed, 849 printed += scnprintf(bf + printed, size - printed,
850 ", Thread: %s(%d)", 850 ", Thread: %s(%d)",
851 (thread->comm_set ? thread->comm : ""), 851 (thread->comm_set ? thread->comm : ""),
852 thread->pid); 852 thread->pid);
853 if (dso) 853 if (dso)
854 printed += snprintf(bf + printed, size - printed, 854 printed += scnprintf(bf + printed, size - printed,
855 ", DSO: %s", dso->short_name); 855 ", DSO: %s", dso->short_name);
856 return printed; 856 return printed;
857} 857}
@@ -1174,7 +1174,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
1174 HE_COLORSET_NORMAL); 1174 HE_COLORSET_NORMAL);
1175 1175
1176 nr_events = convert_unit(nr_events, &unit); 1176 nr_events = convert_unit(nr_events, &unit);
1177 printed = snprintf(bf, sizeof(bf), "%lu%c%s%s", nr_events, 1177 printed = scnprintf(bf, sizeof(bf), "%lu%c%s%s", nr_events,
1178 unit, unit == ' ' ? "" : " ", ev_name); 1178 unit, unit == ' ' ? "" : " ", ev_name);
1179 slsmg_printf("%s", bf); 1179 slsmg_printf("%s", bf);
1180 1180
@@ -1184,8 +1184,8 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
1184 if (!current_entry) 1184 if (!current_entry)
1185 ui_browser__set_color(browser, HE_COLORSET_TOP); 1185 ui_browser__set_color(browser, HE_COLORSET_TOP);
1186 nr_events = convert_unit(nr_events, &unit); 1186 nr_events = convert_unit(nr_events, &unit);
1187 snprintf(bf, sizeof(bf), ": %ld%c%schunks LOST!", nr_events, 1187 printed += scnprintf(bf, sizeof(bf), ": %ld%c%schunks LOST!",
1188 unit, unit == ' ' ? "" : " "); 1188 nr_events, unit, unit == ' ' ? "" : " ");
1189 warn = bf; 1189 warn = bf;
1190 } 1190 }
1191 1191
diff --git a/tools/perf/util/ui/helpline.c b/tools/perf/util/ui/helpline.c
index 4f48f5901b30..2f950c2641c8 100644
--- a/tools/perf/util/ui/helpline.c
+++ b/tools/perf/util/ui/helpline.c
@@ -64,7 +64,7 @@ int ui_helpline__show_help(const char *format, va_list ap)
64 static int backlog; 64 static int backlog;
65 65
66 pthread_mutex_lock(&ui__lock); 66 pthread_mutex_lock(&ui__lock);
67 ret = vsnprintf(ui_helpline__last_msg + backlog, 67 ret = vscnprintf(ui_helpline__last_msg + backlog,
68 sizeof(ui_helpline__last_msg) - backlog, format, ap); 68 sizeof(ui_helpline__last_msg) - backlog, format, ap);
69 backlog += ret; 69 backlog += ret;
70 70
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-13 09:15:54 -0500