aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/local_ops.txt2
-rw-r--r--MAINTAINERS9
-rw-r--r--arch/mips/configs/fulong_defconfig921
-rw-r--r--arch/mips/configs/ip22_defconfig518
-rw-r--r--arch/mips/configs/malta_defconfig631
-rw-r--r--arch/mips/kernel/scall32-o32.S7
-rw-r--r--arch/mips/kernel/scall64-n32.S2
-rw-r--r--arch/mips/kernel/scall64-o32.S16
-rw-r--r--arch/mips/mti-malta/Makefile5
-rw-r--r--arch/mips/mti-malta/malta-mtd.c63
-rw-r--r--arch/mips/mti-malta/malta-platform.c107
-rw-r--r--arch/mn10300/kernel/gdb-io-serial.c2
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig2
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig2
-rw-r--r--arch/sparc/include/asm/bitops_32.h1
-rw-r--r--arch/sparc64/kernel/ptrace.c2
-rw-r--r--arch/sparc64/kernel/visemul.c6
-rw-r--r--arch/x86/include/asm/amd_iommu_types.h24
-rw-r--r--arch/x86/include/asm/dma-mapping.h6
-rw-r--r--arch/x86/include/asm/topology.h2
-rw-r--r--arch/x86/kernel/amd_iommu.c36
-rw-r--r--arch/x86/kernel/mpparse.c3
-rw-r--r--arch/x86/kernel/pci-gart_64.c2
-rw-r--r--arch/x86/oprofile/nmi_int.c5
-rw-r--r--arch/x86/oprofile/op_model_ppro.c4
-rw-r--r--drivers/acpi/battery.c17
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h15
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c637
-rw-r--r--drivers/gpu/drm/i915/i915_gem_proc.c5
-rw-r--r--drivers/gpu/drm/i915/i915_gem_tiling.c7
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h1
-rw-r--r--fs/xfs/xfs_rename.c2
-rw-r--r--kernel/posix-cpu-timers.c2
-rw-r--r--kernel/softlockup.c2
-rw-r--r--kernel/time/timekeeping.c22
35 files changed, 1922 insertions, 1166 deletions
diff --git a/Documentation/local_ops.txt b/Documentation/local_ops.txt
index f4f8b1c6c8ba..23045b8b50f0 100644
--- a/Documentation/local_ops.txt
+++ b/Documentation/local_ops.txt
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data)
149 int cpu; 149 int cpu;
150 150
151 /* Increment the counters */ 151 /* Increment the counters */
152 on_each_cpu(test_each, NULL, 0, 1); 152 on_each_cpu(test_each, NULL, 1);
153 /* Read all the counters */ 153 /* Read all the counters */
154 printk("Counters read from CPU %d\n", smp_processor_id()); 154 printk("Counters read from CPU %d\n", smp_processor_id());
155 for_each_online_cpu(cpu) { 155 for_each_online_cpu(cpu) {
diff --git a/MAINTAINERS b/MAINTAINERS
index 8f2b67ea0549..24741de12a39 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3759,6 +3759,15 @@ M: drzeus-sdhci@drzeus.cx
3759L: sdhci-devel@list.drzeus.cx 3759L: sdhci-devel@list.drzeus.cx
3760S: Maintained 3760S: Maintained
3761 3761
3762SECURITY SUBSYSTEM
3763F: security/
3764P: James Morris
3765M: jmorris@namei.org
3766L: linux-kernel@vger.kernel.org
3767L: linux-security-module@vger.kernel.org (suggested Cc:)
3768T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
3769S: Supported
3770
3762SECURITY CONTACT 3771SECURITY CONTACT
3763P: Security Officers 3772P: Security Officers
3764M: security@kernel.org 3773M: security@kernel.org
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig
index 620980081a30..b6698a232ae9 100644
--- a/arch/mips/configs/fulong_defconfig
+++ b/arch/mips/configs/fulong_defconfig
@@ -1,63 +1,78 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc4 3# Linux kernel version: 2.6.28-rc6
4# Mon Jun 11 00:23:51 2007 4# Fri Nov 28 17:53:48 2008
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_LEMOTE_FULONG=y
12# CONFIG_MACH_ALCHEMY is not set 11# CONFIG_MACH_ALCHEMY is not set
13# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
13# CONFIG_BCM47XX is not set
14# CONFIG_MIPS_COBALT is not set 14# CONFIG_MIPS_COBALT is not set
15# CONFIG_MACH_DECSTATION is not set 15# CONFIG_MACH_DECSTATION is not set
16# CONFIG_MACH_JAZZ is not set 16# CONFIG_MACH_JAZZ is not set
17# CONFIG_LASAT is not set
18CONFIG_LEMOTE_FULONG=y
17# CONFIG_MIPS_MALTA is not set 19# CONFIG_MIPS_MALTA is not set
18# CONFIG_WR_PPMC is not set
19# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
21# CONFIG_MACH_EMMA is not set
22# CONFIG_MACH_VR41XX is not set
23# CONFIG_NXP_STB220 is not set
24# CONFIG_NXP_STB225 is not set
20# CONFIG_PNX8550_JBS is not set 25# CONFIG_PNX8550_JBS is not set
21# CONFIG_PNX8550_STB810 is not set 26# CONFIG_PNX8550_STB810 is not set
22# CONFIG_MACH_VR41XX is not set 27# CONFIG_PMC_MSP is not set
23# CONFIG_PMC_YOSEMITE is not set 28# CONFIG_PMC_YOSEMITE is not set
24# CONFIG_MARKEINS is not set
25# CONFIG_SGI_IP22 is not set 29# CONFIG_SGI_IP22 is not set
26# CONFIG_SGI_IP27 is not set 30# CONFIG_SGI_IP27 is not set
31# CONFIG_SGI_IP28 is not set
27# CONFIG_SGI_IP32 is not set 32# CONFIG_SGI_IP32 is not set
28# CONFIG_SIBYTE_BIGSUR is not set
29# CONFIG_SIBYTE_SWARM is not set
30# CONFIG_SIBYTE_SENTOSA is not set
31# CONFIG_SIBYTE_RHONE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_LITTLESUR is not set
34# CONFIG_SIBYTE_CRHINE is not set 33# CONFIG_SIBYTE_CRHINE is not set
34# CONFIG_SIBYTE_CARMEL is not set
35# CONFIG_SIBYTE_CRHONE is not set 35# CONFIG_SIBYTE_CRHONE is not set
36# CONFIG_SIBYTE_RHONE is not set
37# CONFIG_SIBYTE_SWARM is not set
38# CONFIG_SIBYTE_LITTLESUR is not set
39# CONFIG_SIBYTE_SENTOSA is not set
40# CONFIG_SIBYTE_BIGSUR is not set
36# CONFIG_SNI_RM is not set 41# CONFIG_SNI_RM is not set
37# CONFIG_TOSHIBA_JMR3927 is not set 42# CONFIG_MACH_TX39XX is not set
38# CONFIG_TOSHIBA_RBTX4927 is not set 43# CONFIG_MACH_TX49XX is not set
39# CONFIG_TOSHIBA_RBTX4938 is not set 44# CONFIG_MIKROTIK_RB532 is not set
45# CONFIG_WR_PPMC is not set
40CONFIG_RWSEM_GENERIC_SPINLOCK=y 46CONFIG_RWSEM_GENERIC_SPINLOCK=y
41# CONFIG_ARCH_HAS_ILOG2_U32 is not set 47# CONFIG_ARCH_HAS_ILOG2_U32 is not set
42# CONFIG_ARCH_HAS_ILOG2_U64 is not set 48# CONFIG_ARCH_HAS_ILOG2_U64 is not set
49CONFIG_ARCH_SUPPORTS_OPROFILE=y
43CONFIG_GENERIC_FIND_NEXT_BIT=y 50CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_GENERIC_HWEIGHT=y 51CONFIG_GENERIC_HWEIGHT=y
45CONFIG_GENERIC_CALIBRATE_DELAY=y 52CONFIG_GENERIC_CALIBRATE_DELAY=y
53CONFIG_GENERIC_CLOCKEVENTS=y
46CONFIG_GENERIC_TIME=y 54CONFIG_GENERIC_TIME=y
55CONFIG_GENERIC_CMOS_UPDATE=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 56CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
48CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 57CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
58CONFIG_CEVT_R4K=y
59CONFIG_CSRC_R4K=y
49CONFIG_DMA_NONCOHERENT=y 60CONFIG_DMA_NONCOHERENT=y
50CONFIG_DMA_NEED_PCI_MAP_STATE=y 61CONFIG_DMA_NEED_PCI_MAP_STATE=y
51CONFIG_EARLY_PRINTK=y 62CONFIG_EARLY_PRINTK=y
52CONFIG_SYS_HAS_EARLY_PRINTK=y 63CONFIG_SYS_HAS_EARLY_PRINTK=y
64# CONFIG_HOTPLUG_CPU is not set
53CONFIG_I8259=y 65CONFIG_I8259=y
54# CONFIG_NO_IOPORT is not set 66# CONFIG_NO_IOPORT is not set
67CONFIG_GENERIC_ISA_DMA=y
68CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
55# CONFIG_CPU_BIG_ENDIAN is not set 69# CONFIG_CPU_BIG_ENDIAN is not set
56CONFIG_CPU_LITTLE_ENDIAN=y 70CONFIG_CPU_LITTLE_ENDIAN=y
57CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 71CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
58CONFIG_IRQ_CPU=y 72CONFIG_IRQ_CPU=y
59CONFIG_BOOT_ELF32=y 73CONFIG_BOOT_ELF32=y
60CONFIG_MIPS_L1_CACHE_SHIFT=5 74CONFIG_MIPS_L1_CACHE_SHIFT=5
75CONFIG_HAVE_STD_PC_SERIAL_PORT=y
61 76
62# 77#
63# CPU selection 78# CPU selection
@@ -75,6 +90,7 @@ CONFIG_CPU_LOONGSON2=y
75# CONFIG_CPU_TX49XX is not set 90# CONFIG_CPU_TX49XX is not set
76# CONFIG_CPU_R5000 is not set 91# CONFIG_CPU_R5000 is not set
77# CONFIG_CPU_R5432 is not set 92# CONFIG_CPU_R5432 is not set
93# CONFIG_CPU_R5500 is not set
78# CONFIG_CPU_R6000 is not set 94# CONFIG_CPU_R6000 is not set
79# CONFIG_CPU_NEVADA is not set 95# CONFIG_CPU_NEVADA is not set
80# CONFIG_CPU_R8000 is not set 96# CONFIG_CPU_R8000 is not set
@@ -101,7 +117,6 @@ CONFIG_BOARD_SCACHE=y
101CONFIG_MIPS_MT_DISABLED=y 117CONFIG_MIPS_MT_DISABLED=y
102# CONFIG_MIPS_MT_SMP is not set 118# CONFIG_MIPS_MT_SMP is not set
103# CONFIG_MIPS_MT_SMTC is not set 119# CONFIG_MIPS_MT_SMTC is not set
104# CONFIG_MIPS_VPE_LOADER is not set
105CONFIG_CPU_HAS_WB=y 120CONFIG_CPU_HAS_WB=y
106CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
107CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
@@ -109,6 +124,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
109CONFIG_CPU_SUPPORTS_HIGHMEM=y 124CONFIG_CPU_SUPPORTS_HIGHMEM=y
110CONFIG_SYS_SUPPORTS_HIGHMEM=y 125CONFIG_SYS_SUPPORTS_HIGHMEM=y
111CONFIG_ARCH_FLATMEM_ENABLE=y 126CONFIG_ARCH_FLATMEM_ENABLE=y
127CONFIG_ARCH_POPULATES_NODE_MAP=y
112CONFIG_ARCH_SPARSEMEM_ENABLE=y 128CONFIG_ARCH_SPARSEMEM_ENABLE=y
113CONFIG_SELECT_MEMORY_MODEL=y 129CONFIG_SELECT_MEMORY_MODEL=y
114CONFIG_FLATMEM_MANUAL=y 130CONFIG_FLATMEM_MANUAL=y
@@ -117,9 +133,17 @@ CONFIG_FLATMEM_MANUAL=y
117CONFIG_FLATMEM=y 133CONFIG_FLATMEM=y
118CONFIG_FLAT_NODE_MEM_MAP=y 134CONFIG_FLAT_NODE_MEM_MAP=y
119CONFIG_SPARSEMEM_STATIC=y 135CONFIG_SPARSEMEM_STATIC=y
136CONFIG_PAGEFLAGS_EXTENDED=y
120CONFIG_SPLIT_PTLOCK_CPUS=4 137CONFIG_SPLIT_PTLOCK_CPUS=4
121CONFIG_RESOURCES_64BIT=y 138CONFIG_RESOURCES_64BIT=y
139CONFIG_PHYS_ADDR_T_64BIT=y
122CONFIG_ZONE_DMA_FLAG=0 140CONFIG_ZONE_DMA_FLAG=0
141CONFIG_VIRT_TO_BUS=y
142CONFIG_UNEVICTABLE_LRU=y
143CONFIG_TICK_ONESHOT=y
144CONFIG_NO_HZ=y
145CONFIG_HIGH_RES_TIMERS=y
146CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
123# CONFIG_HZ_48 is not set 147# CONFIG_HZ_48 is not set
124# CONFIG_HZ_100 is not set 148# CONFIG_HZ_100 is not set
125# CONFIG_HZ_128 is not set 149# CONFIG_HZ_128 is not set
@@ -133,37 +157,40 @@ CONFIG_HZ=250
133CONFIG_PREEMPT_VOLUNTARY=y 157CONFIG_PREEMPT_VOLUNTARY=y
134# CONFIG_PREEMPT is not set 158# CONFIG_PREEMPT is not set
135# CONFIG_KEXEC is not set 159# CONFIG_KEXEC is not set
160CONFIG_SECCOMP=y
136CONFIG_LOCKDEP_SUPPORT=y 161CONFIG_LOCKDEP_SUPPORT=y
137CONFIG_STACKTRACE_SUPPORT=y 162CONFIG_STACKTRACE_SUPPORT=y
138CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 163CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
139 164
140# 165#
141# Code maturity level options 166# General setup
142# 167#
143CONFIG_EXPERIMENTAL=y 168CONFIG_EXPERIMENTAL=y
144CONFIG_BROKEN_ON_SMP=y 169CONFIG_BROKEN_ON_SMP=y
145CONFIG_INIT_ENV_ARG_LIMIT=32 170CONFIG_INIT_ENV_ARG_LIMIT=32
146
147#
148# General setup
149#
150CONFIG_LOCALVERSION="lm32" 171CONFIG_LOCALVERSION="lm32"
151# CONFIG_LOCALVERSION_AUTO is not set 172# CONFIG_LOCALVERSION_AUTO is not set
152CONFIG_SWAP=y 173CONFIG_SWAP=y
153CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
154# CONFIG_IPC_NS is not set
155CONFIG_SYSVIPC_SYSCTL=y 175CONFIG_SYSVIPC_SYSCTL=y
156CONFIG_POSIX_MQUEUE=y 176CONFIG_POSIX_MQUEUE=y
157CONFIG_BSD_PROCESS_ACCT=y 177CONFIG_BSD_PROCESS_ACCT=y
158# CONFIG_BSD_PROCESS_ACCT_V3 is not set 178# CONFIG_BSD_PROCESS_ACCT_V3 is not set
159# CONFIG_TASKSTATS is not set 179# CONFIG_TASKSTATS is not set
160# CONFIG_UTS_NS is not set
161# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
162CONFIG_IKCONFIG=y 181CONFIG_IKCONFIG=y
163CONFIG_IKCONFIG_PROC=y 182CONFIG_IKCONFIG_PROC=y
164CONFIG_LOG_BUF_SHIFT=14 183CONFIG_LOG_BUF_SHIFT=14
184# CONFIG_CGROUPS is not set
185# CONFIG_GROUP_SCHED is not set
165CONFIG_SYSFS_DEPRECATED=y 186CONFIG_SYSFS_DEPRECATED=y
187CONFIG_SYSFS_DEPRECATED_V2=y
166# CONFIG_RELAY is not set 188# CONFIG_RELAY is not set
189CONFIG_NAMESPACES=y
190# CONFIG_UTS_NS is not set
191# CONFIG_IPC_NS is not set
192CONFIG_USER_NS=y
193CONFIG_PID_NS=y
167# CONFIG_BLK_DEV_INITRD is not set 194# CONFIG_BLK_DEV_INITRD is not set
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 195# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SYSCTL=y 196CONFIG_SYSCTL=y
@@ -175,6 +202,8 @@ CONFIG_HOTPLUG=y
175CONFIG_PRINTK=y 202CONFIG_PRINTK=y
176CONFIG_BUG=y 203CONFIG_BUG=y
177CONFIG_ELF_CORE=y 204CONFIG_ELF_CORE=y
205# CONFIG_PCSPKR_PLATFORM is not set
206# CONFIG_COMPAT_BRK is not set
178CONFIG_BASE_FULL=y 207CONFIG_BASE_FULL=y
179CONFIG_FUTEX=y 208CONFIG_FUTEX=y
180CONFIG_ANON_INODES=y 209CONFIG_ANON_INODES=y
@@ -183,29 +212,33 @@ CONFIG_SIGNALFD=y
183CONFIG_TIMERFD=y 212CONFIG_TIMERFD=y
184CONFIG_EVENTFD=y 213CONFIG_EVENTFD=y
185CONFIG_SHMEM=y 214CONFIG_SHMEM=y
215CONFIG_AIO=y
186CONFIG_VM_EVENT_COUNTERS=y 216CONFIG_VM_EVENT_COUNTERS=y
217CONFIG_PCI_QUIRKS=y
187CONFIG_SLAB=y 218CONFIG_SLAB=y
188# CONFIG_SLUB is not set 219# CONFIG_SLUB is not set
189# CONFIG_SLOB is not set 220# CONFIG_SLOB is not set
221CONFIG_PROFILING=y
222# CONFIG_MARKERS is not set
223CONFIG_OPROFILE=m
224CONFIG_HAVE_OPROFILE=y
225# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
226CONFIG_SLABINFO=y
190CONFIG_RT_MUTEXES=y 227CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 228# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 229CONFIG_BASE_SMALL=0
193
194#
195# Loadable module support
196#
197CONFIG_MODULES=y 230CONFIG_MODULES=y
231# CONFIG_MODULE_FORCE_LOAD is not set
198CONFIG_MODULE_UNLOAD=y 232CONFIG_MODULE_UNLOAD=y
199CONFIG_MODULE_FORCE_UNLOAD=y 233CONFIG_MODULE_FORCE_UNLOAD=y
200# CONFIG_MODVERSIONS is not set 234# CONFIG_MODVERSIONS is not set
201# CONFIG_MODULE_SRCVERSION_ALL is not set 235# CONFIG_MODULE_SRCVERSION_ALL is not set
202CONFIG_KMOD=y 236CONFIG_KMOD=y
203
204#
205# Block layer
206#
207CONFIG_BLOCK=y 237CONFIG_BLOCK=y
208# CONFIG_BLK_DEV_IO_TRACE is not set 238# CONFIG_BLK_DEV_IO_TRACE is not set
239CONFIG_BLK_DEV_BSG=y
240# CONFIG_BLK_DEV_INTEGRITY is not set
241CONFIG_BLOCK_COMPAT=y
209 242
210# 243#
211# IO Schedulers 244# IO Schedulers
@@ -219,19 +252,19 @@ CONFIG_IOSCHED_CFQ=y
219CONFIG_DEFAULT_CFQ=y 252CONFIG_DEFAULT_CFQ=y
220# CONFIG_DEFAULT_NOOP is not set 253# CONFIG_DEFAULT_NOOP is not set
221CONFIG_DEFAULT_IOSCHED="cfq" 254CONFIG_DEFAULT_IOSCHED="cfq"
255CONFIG_CLASSIC_RCU=y
256CONFIG_FREEZER=y
222 257
223# 258#
224# Bus options (PCI, PCMCIA, EISA, ISA, TC) 259# Bus options (PCI, PCMCIA, EISA, ISA, TC)
225# 260#
226CONFIG_HW_HAS_PCI=y 261CONFIG_HW_HAS_PCI=y
227CONFIG_PCI=y 262CONFIG_PCI=y
263CONFIG_PCI_DOMAINS=y
228# CONFIG_ARCH_SUPPORTS_MSI is not set 264# CONFIG_ARCH_SUPPORTS_MSI is not set
265CONFIG_PCI_LEGACY=y
229CONFIG_ISA=y 266CONFIG_ISA=y
230CONFIG_MMU=y 267CONFIG_MMU=y
231
232#
233# PCCARD (PCMCIA/CardBus) support
234#
235# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
236# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
237 270
@@ -239,8 +272,9 @@ CONFIG_MMU=y
239# Executable file formats 272# Executable file formats
240# 273#
241CONFIG_BINFMT_ELF=y 274CONFIG_BINFMT_ELF=y
275# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
276# CONFIG_HAVE_AOUT is not set
242CONFIG_BINFMT_MISC=y 277CONFIG_BINFMT_MISC=y
243# CONFIG_BUILD_ELF64 is not set
244CONFIG_MIPS32_COMPAT=y 278CONFIG_MIPS32_COMPAT=y
245CONFIG_COMPAT=y 279CONFIG_COMPAT=y
246CONFIG_SYSVIPC_COMPAT=y 280CONFIG_SYSVIPC_COMPAT=y
@@ -251,14 +285,12 @@ CONFIG_BINFMT_ELF32=y
251# 285#
252# Power management options 286# Power management options
253# 287#
288CONFIG_ARCH_SUSPEND_POSSIBLE=y
254CONFIG_PM=y 289CONFIG_PM=y
255# CONFIG_PM_LEGACY is not set
256# CONFIG_PM_DEBUG is not set 290# CONFIG_PM_DEBUG is not set
257# CONFIG_PM_SYSFS_DEPRECATED is not set 291CONFIG_PM_SLEEP=y
258 292CONFIG_SUSPEND=y
259# 293CONFIG_SUSPEND_FREEZER=y
260# Networking
261#
262CONFIG_NET=y 294CONFIG_NET=y
263 295
264# 296#
@@ -271,6 +303,7 @@ CONFIG_XFRM=y
271# CONFIG_XFRM_USER is not set 303# CONFIG_XFRM_USER is not set
272# CONFIG_XFRM_SUB_POLICY is not set 304# CONFIG_XFRM_SUB_POLICY is not set
273# CONFIG_XFRM_MIGRATE is not set 305# CONFIG_XFRM_MIGRATE is not set
306# CONFIG_XFRM_STATISTICS is not set
274# CONFIG_NET_KEY is not set 307# CONFIG_NET_KEY is not set
275CONFIG_INET=y 308CONFIG_INET=y
276CONFIG_IP_MULTICAST=y 309CONFIG_IP_MULTICAST=y
@@ -294,18 +327,17 @@ CONFIG_INET_TUNNEL=m
294# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 327# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
295# CONFIG_INET_XFRM_MODE_TUNNEL is not set 328# CONFIG_INET_XFRM_MODE_TUNNEL is not set
296CONFIG_INET_XFRM_MODE_BEET=y 329CONFIG_INET_XFRM_MODE_BEET=y
330# CONFIG_INET_LRO is not set
297# CONFIG_INET_DIAG is not set 331# CONFIG_INET_DIAG is not set
298# CONFIG_TCP_CONG_ADVANCED is not set 332# CONFIG_TCP_CONG_ADVANCED is not set
299CONFIG_TCP_CONG_CUBIC=y 333CONFIG_TCP_CONG_CUBIC=y
300CONFIG_DEFAULT_TCP_CONG="cubic" 334CONFIG_DEFAULT_TCP_CONG="cubic"
301# CONFIG_TCP_MD5SIG is not set 335# CONFIG_TCP_MD5SIG is not set
302# CONFIG_IP_VS is not set
303# CONFIG_IPV6 is not set 336# CONFIG_IPV6 is not set
304# CONFIG_INET6_XFRM_TUNNEL is not set
305# CONFIG_INET6_TUNNEL is not set
306# CONFIG_NETWORK_SECMARK is not set 337# CONFIG_NETWORK_SECMARK is not set
307CONFIG_NETFILTER=y 338CONFIG_NETFILTER=y
308# CONFIG_NETFILTER_DEBUG is not set 339# CONFIG_NETFILTER_DEBUG is not set
340CONFIG_NETFILTER_ADVANCED=y
309 341
310# 342#
311# Core Netfilter Configuration 343# Core Netfilter Configuration
@@ -313,53 +345,59 @@ CONFIG_NETFILTER=y
313CONFIG_NETFILTER_NETLINK=m 345CONFIG_NETFILTER_NETLINK=m
314CONFIG_NETFILTER_NETLINK_QUEUE=m 346CONFIG_NETFILTER_NETLINK_QUEUE=m
315CONFIG_NETFILTER_NETLINK_LOG=m 347CONFIG_NETFILTER_NETLINK_LOG=m
316# CONFIG_NF_CONNTRACK_ENABLED is not set
317# CONFIG_NF_CONNTRACK is not set 348# CONFIG_NF_CONNTRACK is not set
318CONFIG_NETFILTER_XTABLES=m 349CONFIG_NETFILTER_XTABLES=m
319CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 350CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
320# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 351# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
321CONFIG_NETFILTER_XT_TARGET_MARK=m 352CONFIG_NETFILTER_XT_TARGET_MARK=m
322CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
323# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 353# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
354CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
355CONFIG_NETFILTER_XT_TARGET_RATEEST=m
356CONFIG_NETFILTER_XT_TARGET_TRACE=m
324# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 357# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
358CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
325CONFIG_NETFILTER_XT_MATCH_COMMENT=m 359CONFIG_NETFILTER_XT_MATCH_COMMENT=m
326CONFIG_NETFILTER_XT_MATCH_DCCP=m 360CONFIG_NETFILTER_XT_MATCH_DCCP=m
327# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 361# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
328CONFIG_NETFILTER_XT_MATCH_ESP=m 362CONFIG_NETFILTER_XT_MATCH_ESP=m
363# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
364CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
329CONFIG_NETFILTER_XT_MATCH_LENGTH=m 365CONFIG_NETFILTER_XT_MATCH_LENGTH=m
330CONFIG_NETFILTER_XT_MATCH_LIMIT=m 366CONFIG_NETFILTER_XT_MATCH_LIMIT=m
331CONFIG_NETFILTER_XT_MATCH_MAC=m 367CONFIG_NETFILTER_XT_MATCH_MAC=m
332CONFIG_NETFILTER_XT_MATCH_MARK=m 368CONFIG_NETFILTER_XT_MATCH_MARK=m
333# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
334CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 369CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
370CONFIG_NETFILTER_XT_MATCH_OWNER=m
371# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
335CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 372CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
336CONFIG_NETFILTER_XT_MATCH_QUOTA=m 373CONFIG_NETFILTER_XT_MATCH_QUOTA=m
374CONFIG_NETFILTER_XT_MATCH_RATEEST=m
337CONFIG_NETFILTER_XT_MATCH_REALM=m 375CONFIG_NETFILTER_XT_MATCH_REALM=m
376CONFIG_NETFILTER_XT_MATCH_RECENT=m
377# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
338CONFIG_NETFILTER_XT_MATCH_SCTP=m 378CONFIG_NETFILTER_XT_MATCH_SCTP=m
339CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 379CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
340CONFIG_NETFILTER_XT_MATCH_STRING=m 380CONFIG_NETFILTER_XT_MATCH_STRING=m
341CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 381CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
342# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 382CONFIG_NETFILTER_XT_MATCH_TIME=m
383CONFIG_NETFILTER_XT_MATCH_U32=m
384# CONFIG_IP_VS is not set
343 385
344# 386#
345# IP: Netfilter Configuration 387# IP: Netfilter Configuration
346# 388#
389# CONFIG_NF_DEFRAG_IPV4 is not set
347CONFIG_IP_NF_QUEUE=m 390CONFIG_IP_NF_QUEUE=m
348CONFIG_IP_NF_IPTABLES=m 391CONFIG_IP_NF_IPTABLES=m
349CONFIG_IP_NF_MATCH_IPRANGE=m 392CONFIG_IP_NF_MATCH_ADDRTYPE=m
350CONFIG_IP_NF_MATCH_TOS=m
351CONFIG_IP_NF_MATCH_RECENT=m
352CONFIG_IP_NF_MATCH_ECN=m
353CONFIG_IP_NF_MATCH_AH=m 393CONFIG_IP_NF_MATCH_AH=m
394CONFIG_IP_NF_MATCH_ECN=m
354CONFIG_IP_NF_MATCH_TTL=m 395CONFIG_IP_NF_MATCH_TTL=m
355CONFIG_IP_NF_MATCH_OWNER=m
356CONFIG_IP_NF_MATCH_ADDRTYPE=m
357CONFIG_IP_NF_FILTER=m 396CONFIG_IP_NF_FILTER=m
358CONFIG_IP_NF_TARGET_REJECT=m 397CONFIG_IP_NF_TARGET_REJECT=m
359CONFIG_IP_NF_TARGET_LOG=m 398CONFIG_IP_NF_TARGET_LOG=m
360CONFIG_IP_NF_TARGET_ULOG=m 399CONFIG_IP_NF_TARGET_ULOG=m
361CONFIG_IP_NF_MANGLE=m 400CONFIG_IP_NF_MANGLE=m
362CONFIG_IP_NF_TARGET_TOS=m
363CONFIG_IP_NF_TARGET_ECN=m 401CONFIG_IP_NF_TARGET_ECN=m
364CONFIG_IP_NF_TARGET_TTL=m 402CONFIG_IP_NF_TARGET_TTL=m
365CONFIG_IP_NF_RAW=m 403CONFIG_IP_NF_RAW=m
@@ -371,6 +409,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
371# CONFIG_TIPC is not set 409# CONFIG_TIPC is not set
372# CONFIG_ATM is not set 410# CONFIG_ATM is not set
373# CONFIG_BRIDGE is not set 411# CONFIG_BRIDGE is not set
412# CONFIG_NET_DSA is not set
374# CONFIG_VLAN_8021Q is not set 413# CONFIG_VLAN_8021Q is not set
375# CONFIG_DECNET is not set 414# CONFIG_DECNET is not set
376# CONFIG_LLC2 is not set 415# CONFIG_LLC2 is not set
@@ -380,10 +419,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
380# CONFIG_LAPB is not set 419# CONFIG_LAPB is not set
381# CONFIG_ECONET is not set 420# CONFIG_ECONET is not set
382# CONFIG_WAN_ROUTER is not set 421# CONFIG_WAN_ROUTER is not set
383
384#
385# QoS and/or fair queueing
386#
387# CONFIG_NET_SCHED is not set 422# CONFIG_NET_SCHED is not set
388CONFIG_NET_CLS_ROUTE=y 423CONFIG_NET_CLS_ROUTE=y
389 424
@@ -392,23 +427,25 @@ CONFIG_NET_CLS_ROUTE=y
392# 427#
393# CONFIG_NET_PKTGEN is not set 428# CONFIG_NET_PKTGEN is not set
394# CONFIG_HAMRADIO is not set 429# CONFIG_HAMRADIO is not set
430# CONFIG_CAN is not set
395# CONFIG_IRDA is not set 431# CONFIG_IRDA is not set
396# CONFIG_BT is not set 432# CONFIG_BT is not set
397# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
398 434CONFIG_PHONET=m
399# 435CONFIG_WIRELESS=y
400# Wireless
401#
402# CONFIG_CFG80211 is not set 436# CONFIG_CFG80211 is not set
437CONFIG_WIRELESS_OLD_REGULATORY=y
403CONFIG_WIRELESS_EXT=y 438CONFIG_WIRELESS_EXT=y
439CONFIG_WIRELESS_EXT_SYSFS=y
404# CONFIG_MAC80211 is not set 440# CONFIG_MAC80211 is not set
405CONFIG_IEEE80211=m 441CONFIG_IEEE80211=m
406# CONFIG_IEEE80211_DEBUG is not set 442# CONFIG_IEEE80211_DEBUG is not set
407CONFIG_IEEE80211_CRYPT_WEP=m 443CONFIG_IEEE80211_CRYPT_WEP=m
408# CONFIG_IEEE80211_CRYPT_CCMP is not set 444# CONFIG_IEEE80211_CRYPT_CCMP is not set
409# CONFIG_IEEE80211_CRYPT_TKIP is not set 445# CONFIG_IEEE80211_CRYPT_TKIP is not set
410# CONFIG_IEEE80211_SOFTMAC is not set
411# CONFIG_RFKILL is not set 446# CONFIG_RFKILL is not set
447CONFIG_NET_9P=m
448# CONFIG_NET_9P_DEBUG is not set
412 449
413# 450#
414# Device Drivers 451# Device Drivers
@@ -417,14 +454,13 @@ CONFIG_IEEE80211_CRYPT_WEP=m
417# 454#
418# Generic Driver Options 455# Generic Driver Options
419# 456#
457CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
420CONFIG_STANDALONE=y 458CONFIG_STANDALONE=y
421CONFIG_PREVENT_FIRMWARE_BUILD=y 459CONFIG_PREVENT_FIRMWARE_BUILD=y
422CONFIG_FW_LOADER=m 460CONFIG_FW_LOADER=m
461CONFIG_FIRMWARE_IN_KERNEL=y
462CONFIG_EXTRA_FIRMWARE=""
423# CONFIG_SYS_HYPERVISOR is not set 463# CONFIG_SYS_HYPERVISOR is not set
424
425#
426# Connector - unified userspace <-> kernelspace linker
427#
428# CONFIG_CONNECTOR is not set 464# CONFIG_CONNECTOR is not set
429CONFIG_MTD=m 465CONFIG_MTD=m
430# CONFIG_MTD_DEBUG is not set 466# CONFIG_MTD_DEBUG is not set
@@ -443,6 +479,7 @@ CONFIG_MTD_BLOCK=m
443# CONFIG_INFTL is not set 479# CONFIG_INFTL is not set
444# CONFIG_RFD_FTL is not set 480# CONFIG_RFD_FTL is not set
445# CONFIG_SSFDC is not set 481# CONFIG_SSFDC is not set
482# CONFIG_MTD_OOPS is not set
446 483
447# 484#
448# RAM/ROM/Flash chip drivers 485# RAM/ROM/Flash chip drivers
@@ -482,6 +519,7 @@ CONFIG_MTD_PHYSMAP=m
482CONFIG_MTD_PHYSMAP_START=0x1fc00000 519CONFIG_MTD_PHYSMAP_START=0x1fc00000
483CONFIG_MTD_PHYSMAP_LEN=0x80000 520CONFIG_MTD_PHYSMAP_LEN=0x80000
484CONFIG_MTD_PHYSMAP_BANKWIDTH=1 521CONFIG_MTD_PHYSMAP_BANKWIDTH=1
522# CONFIG_MTD_INTEL_VR_NOR is not set
485# CONFIG_MTD_PLATRAM is not set 523# CONFIG_MTD_PLATRAM is not set
486 524
487# 525#
@@ -506,21 +544,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
506# UBI - Unsorted block images 544# UBI - Unsorted block images
507# 545#
508# CONFIG_MTD_UBI is not set 546# CONFIG_MTD_UBI is not set
509
510#
511# Parallel port support
512#
513# CONFIG_PARPORT is not set 547# CONFIG_PARPORT is not set
514
515#
516# Plug and Play support
517#
518# CONFIG_PNP is not set 548# CONFIG_PNP is not set
519# CONFIG_PNPACPI is not set 549CONFIG_BLK_DEV=y
520
521#
522# Block devices
523#
524# CONFIG_BLK_CPQ_DA is not set 550# CONFIG_BLK_CPQ_DA is not set
525# CONFIG_BLK_CPQ_CISS_DA is not set 551# CONFIG_BLK_CPQ_CISS_DA is not set
526# CONFIG_BLK_DEV_DAC960 is not set 552# CONFIG_BLK_DEV_DAC960 is not set
@@ -534,32 +560,28 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
534CONFIG_BLK_DEV_RAM=m 560CONFIG_BLK_DEV_RAM=m
535CONFIG_BLK_DEV_RAM_COUNT=16 561CONFIG_BLK_DEV_RAM_COUNT=16
536CONFIG_BLK_DEV_RAM_SIZE=4096 562CONFIG_BLK_DEV_RAM_SIZE=4096
537CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 563# CONFIG_BLK_DEV_XIP is not set
538CONFIG_CDROM_PKTCDVD=m 564CONFIG_CDROM_PKTCDVD=m
539CONFIG_CDROM_PKTCDVD_BUFFERS=8 565CONFIG_CDROM_PKTCDVD_BUFFERS=8
540# CONFIG_CDROM_PKTCDVD_WCACHE is not set 566# CONFIG_CDROM_PKTCDVD_WCACHE is not set
541CONFIG_ATA_OVER_ETH=m 567CONFIG_ATA_OVER_ETH=m
542 568# CONFIG_BLK_DEV_HD is not set
543# 569# CONFIG_MISC_DEVICES is not set
544# Misc devices 570CONFIG_HAVE_IDE=y
545#
546# CONFIG_PHANTOM is not set
547# CONFIG_SGI_IOC4 is not set
548# CONFIG_TIFM_CORE is not set
549# CONFIG_BLINK is not set
550CONFIG_IDE=y 571CONFIG_IDE=y
551CONFIG_IDE_MAX_HWIFS=4
552CONFIG_BLK_DEV_IDE=y
553 572
554# 573#
555# Please see Documentation/ide.txt for help/info on IDE drives 574# Please see Documentation/ide/ide.txt for help/info on IDE drives
556# 575#
576CONFIG_IDE_TIMINGS=y
577CONFIG_IDE_ATAPI=y
557# CONFIG_BLK_DEV_IDE_SATA is not set 578# CONFIG_BLK_DEV_IDE_SATA is not set
558CONFIG_BLK_DEV_IDEDISK=y 579CONFIG_IDE_GD=y
559CONFIG_IDEDISK_MULTI_MODE=y 580CONFIG_IDE_GD_ATA=y
581# CONFIG_IDE_GD_ATAPI is not set
560CONFIG_BLK_DEV_IDECD=y 582CONFIG_BLK_DEV_IDECD=y
583CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
561# CONFIG_BLK_DEV_IDETAPE is not set 584# CONFIG_BLK_DEV_IDETAPE is not set
562# CONFIG_BLK_DEV_IDEFLOPPY is not set
563CONFIG_BLK_DEV_IDESCSI=y 585CONFIG_BLK_DEV_IDESCSI=y
564CONFIG_IDE_TASK_IOCTL=y 586CONFIG_IDE_TASK_IOCTL=y
565CONFIG_IDE_PROC_FS=y 587CONFIG_IDE_PROC_FS=y
@@ -568,24 +590,25 @@ CONFIG_IDE_PROC_FS=y
568# IDE chipset support/bugfixes 590# IDE chipset support/bugfixes
569# 591#
570CONFIG_IDE_GENERIC=y 592CONFIG_IDE_GENERIC=y
593# CONFIG_BLK_DEV_PLATFORM is not set
594CONFIG_BLK_DEV_IDEDMA_SFF=y
595
596#
597# PCI IDE chipsets support
598#
571CONFIG_BLK_DEV_IDEPCI=y 599CONFIG_BLK_DEV_IDEPCI=y
572CONFIG_IDEPCI_SHARE_IRQ=y
573CONFIG_IDEPCI_PCIBUS_ORDER=y 600CONFIG_IDEPCI_PCIBUS_ORDER=y
574# CONFIG_BLK_DEV_OFFBOARD is not set 601# CONFIG_BLK_DEV_OFFBOARD is not set
575CONFIG_BLK_DEV_GENERIC=y 602CONFIG_BLK_DEV_GENERIC=y
576# CONFIG_BLK_DEV_OPTI621 is not set 603# CONFIG_BLK_DEV_OPTI621 is not set
577CONFIG_BLK_DEV_IDEDMA_PCI=y 604CONFIG_BLK_DEV_IDEDMA_PCI=y
578# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
579# CONFIG_IDEDMA_ONLYDISK is not set
580# CONFIG_BLK_DEV_AEC62XX is not set 605# CONFIG_BLK_DEV_AEC62XX is not set
581# CONFIG_BLK_DEV_ALI15X3 is not set 606# CONFIG_BLK_DEV_ALI15X3 is not set
582# CONFIG_BLK_DEV_AMD74XX is not set 607# CONFIG_BLK_DEV_AMD74XX is not set
583# CONFIG_BLK_DEV_CMD64X is not set 608# CONFIG_BLK_DEV_CMD64X is not set
584# CONFIG_BLK_DEV_TRIFLEX is not set 609# CONFIG_BLK_DEV_TRIFLEX is not set
585# CONFIG_BLK_DEV_CY82C693 is not set
586# CONFIG_BLK_DEV_CS5520 is not set 610# CONFIG_BLK_DEV_CS5520 is not set
587# CONFIG_BLK_DEV_CS5530 is not set 611# CONFIG_BLK_DEV_CS5530 is not set
588# CONFIG_BLK_DEV_HPT34X is not set
589# CONFIG_BLK_DEV_HPT366 is not set 612# CONFIG_BLK_DEV_HPT366 is not set
590# CONFIG_BLK_DEV_JMICRON is not set 613# CONFIG_BLK_DEV_JMICRON is not set
591# CONFIG_BLK_DEV_SC1200 is not set 614# CONFIG_BLK_DEV_SC1200 is not set
@@ -601,17 +624,28 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
601# CONFIG_BLK_DEV_TRM290 is not set 624# CONFIG_BLK_DEV_TRM290 is not set
602CONFIG_BLK_DEV_VIA82CXXX=y 625CONFIG_BLK_DEV_VIA82CXXX=y
603# CONFIG_BLK_DEV_TC86C001 is not set 626# CONFIG_BLK_DEV_TC86C001 is not set
604# CONFIG_IDE_ARM is not set 627
605# CONFIG_IDE_CHIPSETS is not set 628#
629# Other IDE chipsets support
630#
631
632#
633# Note: most of these also require special kernel boot parameters
634#
635# CONFIG_BLK_DEV_4DRIVES is not set
636# CONFIG_BLK_DEV_ALI14XX is not set
637# CONFIG_BLK_DEV_DTC2278 is not set
638# CONFIG_BLK_DEV_HT6560B is not set
639# CONFIG_BLK_DEV_QD65XX is not set
640# CONFIG_BLK_DEV_UMC8672 is not set
606CONFIG_BLK_DEV_IDEDMA=y 641CONFIG_BLK_DEV_IDEDMA=y
607# CONFIG_IDEDMA_IVB is not set
608# CONFIG_BLK_DEV_HD is not set
609 642
610# 643#
611# SCSI device support 644# SCSI device support
612# 645#
613# CONFIG_RAID_ATTRS is not set 646# CONFIG_RAID_ATTRS is not set
614CONFIG_SCSI=y 647CONFIG_SCSI=y
648CONFIG_SCSI_DMA=y
615# CONFIG_SCSI_TGT is not set 649# CONFIG_SCSI_TGT is not set
616# CONFIG_SCSI_NETLINK is not set 650# CONFIG_SCSI_NETLINK is not set
617CONFIG_SCSI_PROC_FS=y 651CONFIG_SCSI_PROC_FS=y
@@ -644,88 +678,30 @@ CONFIG_SCSI_WAIT_SCAN=m
644# CONFIG_SCSI_ISCSI_ATTRS is not set 678# CONFIG_SCSI_ISCSI_ATTRS is not set
645# CONFIG_SCSI_SAS_ATTRS is not set 679# CONFIG_SCSI_SAS_ATTRS is not set
646# CONFIG_SCSI_SAS_LIBSAS is not set 680# CONFIG_SCSI_SAS_LIBSAS is not set
647 681# CONFIG_SCSI_SRP_ATTRS is not set
648# 682# CONFIG_SCSI_LOWLEVEL is not set
649# SCSI low-level drivers 683# CONFIG_SCSI_DH is not set
650#
651# CONFIG_ISCSI_TCP is not set
652# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
653# CONFIG_SCSI_3W_9XXX is not set
654# CONFIG_SCSI_ACARD is not set
655# CONFIG_SCSI_AACRAID is not set
656# CONFIG_SCSI_AIC7XXX is not set
657# CONFIG_SCSI_AIC7XXX_OLD is not set
658# CONFIG_SCSI_AIC79XX is not set
659# CONFIG_SCSI_AIC94XX is not set
660# CONFIG_SCSI_IN2000 is not set
661# CONFIG_SCSI_ARCMSR is not set
662# CONFIG_MEGARAID_NEWGEN is not set
663# CONFIG_MEGARAID_LEGACY is not set
664# CONFIG_MEGARAID_SAS is not set
665# CONFIG_SCSI_HPTIOP is not set
666# CONFIG_SCSI_DMX3191D is not set
667# CONFIG_SCSI_DTC3280 is not set
668# CONFIG_SCSI_FUTURE_DOMAIN is not set
669# CONFIG_SCSI_GENERIC_NCR5380 is not set
670# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
671# CONFIG_SCSI_IPS is not set
672# CONFIG_SCSI_INITIO is not set
673# CONFIG_SCSI_INIA100 is not set
674# CONFIG_SCSI_NCR53C406A is not set
675# CONFIG_SCSI_STEX is not set
676# CONFIG_SCSI_SYM53C8XX_2 is not set
677# CONFIG_SCSI_PAS16 is not set
678# CONFIG_SCSI_PSI240I is not set
679# CONFIG_SCSI_QLOGIC_FAS is not set
680# CONFIG_SCSI_QLOGIC_1280 is not set
681# CONFIG_SCSI_QLA_FC is not set
682# CONFIG_SCSI_QLA_ISCSI is not set
683# CONFIG_SCSI_LPFC is not set
684# CONFIG_SCSI_SYM53C416 is not set
685# CONFIG_SCSI_DC395x is not set
686# CONFIG_SCSI_DC390T is not set
687# CONFIG_SCSI_T128 is not set
688# CONFIG_SCSI_DEBUG is not set
689# CONFIG_SCSI_SRP is not set
690# CONFIG_ATA is not set 684# CONFIG_ATA is not set
691
692#
693# Old CD-ROM drivers (not SCSI, not IDE)
694#
695# CONFIG_CD_NO_IDESCSI is not set
696
697#
698# Multi-device support (RAID and LVM)
699#
700# CONFIG_MD is not set 685# CONFIG_MD is not set
701
702#
703# Fusion MPT device support
704#
705# CONFIG_FUSION is not set 686# CONFIG_FUSION is not set
706# CONFIG_FUSION_SPI is not set
707# CONFIG_FUSION_FC is not set
708# CONFIG_FUSION_SAS is not set
709 687
710# 688#
711# IEEE 1394 (FireWire) support 689# IEEE 1394 (FireWire) support
712# 690#
713# CONFIG_FIREWIRE is not set
714# CONFIG_IEEE1394 is not set
715 691
716# 692#
717# I2O device support 693# Enable only one of the two stacks, unless you know what you are doing
718# 694#
695# CONFIG_FIREWIRE is not set
696# CONFIG_IEEE1394 is not set
719# CONFIG_I2O is not set 697# CONFIG_I2O is not set
720
721#
722# Network device support
723#
724CONFIG_NETDEVICES=y 698CONFIG_NETDEVICES=y
725# CONFIG_DUMMY is not set 699# CONFIG_DUMMY is not set
726# CONFIG_BONDING is not set 700# CONFIG_BONDING is not set
701CONFIG_MACVLAN=m
727# CONFIG_EQUALIZER is not set 702# CONFIG_EQUALIZER is not set
728# CONFIG_TUN is not set 703# CONFIG_TUN is not set
704CONFIG_VETH=m
729# CONFIG_ARCNET is not set 705# CONFIG_ARCNET is not set
730CONFIG_PHYLIB=m 706CONFIG_PHYLIB=m
731 707
@@ -740,29 +716,32 @@ CONFIG_CICADA_PHY=m
740# CONFIG_VITESSE_PHY is not set 716# CONFIG_VITESSE_PHY is not set
741# CONFIG_SMSC_PHY is not set 717# CONFIG_SMSC_PHY is not set
742# CONFIG_BROADCOM_PHY is not set 718# CONFIG_BROADCOM_PHY is not set
743# CONFIG_FIXED_PHY is not set 719# CONFIG_ICPLUS_PHY is not set
744 720# CONFIG_REALTEK_PHY is not set
745# 721# CONFIG_MDIO_BITBANG is not set
746# Ethernet (10 or 100Mbit)
747#
748CONFIG_NET_ETHERNET=y 722CONFIG_NET_ETHERNET=y
749CONFIG_MII=y 723CONFIG_MII=y
724# CONFIG_AX88796 is not set
750# CONFIG_HAPPYMEAL is not set 725# CONFIG_HAPPYMEAL is not set
751# CONFIG_SUNGEM is not set 726# CONFIG_SUNGEM is not set
752# CONFIG_CASSINI is not set 727# CONFIG_CASSINI is not set
753# CONFIG_NET_VENDOR_3COM is not set 728# CONFIG_NET_VENDOR_3COM is not set
754# CONFIG_NET_VENDOR_SMC is not set 729# CONFIG_NET_VENDOR_SMC is not set
730# CONFIG_SMC91X is not set
755# CONFIG_DM9000 is not set 731# CONFIG_DM9000 is not set
756# CONFIG_NET_VENDOR_RACAL is not set 732# CONFIG_NET_VENDOR_RACAL is not set
757
758#
759# Tulip family network device support
760#
761# CONFIG_NET_TULIP is not set 733# CONFIG_NET_TULIP is not set
762# CONFIG_AT1700 is not set 734# CONFIG_AT1700 is not set
763# CONFIG_DEPCA is not set 735# CONFIG_DEPCA is not set
764# CONFIG_HP100 is not set 736# CONFIG_HP100 is not set
765# CONFIG_NET_ISA is not set 737# CONFIG_NET_ISA is not set
738# CONFIG_IBM_NEW_EMAC_ZMII is not set
739# CONFIG_IBM_NEW_EMAC_RGMII is not set
740# CONFIG_IBM_NEW_EMAC_TAH is not set
741# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
742# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
743# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
744# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
766CONFIG_NET_PCI=y 745CONFIG_NET_PCI=y
767# CONFIG_PCNET32 is not set 746# CONFIG_PCNET32 is not set
768# CONFIG_AMD8111_ETH is not set 747# CONFIG_AMD8111_ETH is not set
@@ -773,7 +752,6 @@ CONFIG_NET_PCI=y
773# CONFIG_FORCEDETH is not set 752# CONFIG_FORCEDETH is not set
774# CONFIG_CS89x0 is not set 753# CONFIG_CS89x0 is not set
775# CONFIG_TC35815 is not set 754# CONFIG_TC35815 is not set
776# CONFIG_DGRS is not set
777# CONFIG_EEPRO100 is not set 755# CONFIG_EEPRO100 is not set
778# CONFIG_E100 is not set 756# CONFIG_E100 is not set
779# CONFIG_FEALNX is not set 757# CONFIG_FEALNX is not set
@@ -785,15 +763,21 @@ CONFIG_8139TOO=y
785# CONFIG_8139TOO_TUNE_TWISTER is not set 763# CONFIG_8139TOO_TUNE_TWISTER is not set
786# CONFIG_8139TOO_8129 is not set 764# CONFIG_8139TOO_8129 is not set
787# CONFIG_8139_OLD_RX_RESET is not set 765# CONFIG_8139_OLD_RX_RESET is not set
766# CONFIG_R6040 is not set
788# CONFIG_SIS900 is not set 767# CONFIG_SIS900 is not set
789# CONFIG_EPIC100 is not set 768# CONFIG_EPIC100 is not set
790# CONFIG_SUNDANCE is not set 769# CONFIG_SUNDANCE is not set
770# CONFIG_TLAN is not set
791# CONFIG_VIA_RHINE is not set 771# CONFIG_VIA_RHINE is not set
792# CONFIG_SC92031 is not set 772# CONFIG_SC92031 is not set
773# CONFIG_ATL2 is not set
793CONFIG_NETDEV_1000=y 774CONFIG_NETDEV_1000=y
794# CONFIG_ACENIC is not set 775# CONFIG_ACENIC is not set
795# CONFIG_DL2K is not set 776# CONFIG_DL2K is not set
796# CONFIG_E1000 is not set 777# CONFIG_E1000 is not set
778# CONFIG_E1000E is not set
779# CONFIG_IP1000 is not set
780# CONFIG_IGB is not set
797# CONFIG_NS83820 is not set 781# CONFIG_NS83820 is not set
798# CONFIG_HAMACHI is not set 782# CONFIG_HAMACHI is not set
799# CONFIG_YELLOWFIN is not set 783# CONFIG_YELLOWFIN is not set
@@ -801,20 +785,29 @@ CONFIG_NETDEV_1000=y
801# CONFIG_SIS190 is not set 785# CONFIG_SIS190 is not set
802# CONFIG_SKGE is not set 786# CONFIG_SKGE is not set
803# CONFIG_SKY2 is not set 787# CONFIG_SKY2 is not set
804# CONFIG_SK98LIN is not set
805# CONFIG_VIA_VELOCITY is not set 788# CONFIG_VIA_VELOCITY is not set
806# CONFIG_TIGON3 is not set 789# CONFIG_TIGON3 is not set
807# CONFIG_BNX2 is not set 790# CONFIG_BNX2 is not set
808# CONFIG_QLA3XXX is not set 791# CONFIG_QLA3XXX is not set
809# CONFIG_ATL1 is not set 792# CONFIG_ATL1 is not set
793# CONFIG_ATL1E is not set
794# CONFIG_JME is not set
810CONFIG_NETDEV_10000=y 795CONFIG_NETDEV_10000=y
811# CONFIG_CHELSIO_T1 is not set 796# CONFIG_CHELSIO_T1 is not set
812# CONFIG_CHELSIO_T3 is not set 797# CONFIG_CHELSIO_T3 is not set
798# CONFIG_ENIC is not set
799# CONFIG_IXGBE is not set
813# CONFIG_IXGB is not set 800# CONFIG_IXGB is not set
814# CONFIG_S2IO is not set 801# CONFIG_S2IO is not set
815# CONFIG_MYRI10GE is not set 802# CONFIG_MYRI10GE is not set
816# CONFIG_NETXEN_NIC is not set 803# CONFIG_NETXEN_NIC is not set
804# CONFIG_NIU is not set
805# CONFIG_MLX4_EN is not set
817# CONFIG_MLX4_CORE is not set 806# CONFIG_MLX4_CORE is not set
807# CONFIG_TEHUTI is not set
808# CONFIG_BNX2X is not set
809# CONFIG_QLGE is not set
810# CONFIG_SFC is not set
818# CONFIG_TR is not set 811# CONFIG_TR is not set
819 812
820# 813#
@@ -822,6 +815,7 @@ CONFIG_NETDEV_10000=y
822# 815#
823# CONFIG_WLAN_PRE80211 is not set 816# CONFIG_WLAN_PRE80211 is not set
824# CONFIG_WLAN_80211 is not set 817# CONFIG_WLAN_80211 is not set
818# CONFIG_IWLWIFI_LEDS is not set
825 819
826# 820#
827# USB Network Adapters 821# USB Network Adapters
@@ -830,7 +824,6 @@ CONFIG_NETDEV_10000=y
830# CONFIG_USB_KAWETH is not set 824# CONFIG_USB_KAWETH is not set
831# CONFIG_USB_PEGASUS is not set 825# CONFIG_USB_PEGASUS is not set
832# CONFIG_USB_RTL8150 is not set 826# CONFIG_USB_RTL8150 is not set
833# CONFIG_USB_USBNET_MII is not set
834# CONFIG_USB_USBNET is not set 827# CONFIG_USB_USBNET is not set
835# CONFIG_WAN is not set 828# CONFIG_WAN is not set
836# CONFIG_FDDI is not set 829# CONFIG_FDDI is not set
@@ -844,25 +837,17 @@ CONFIG_PPP_DEFLATE=m
844CONFIG_PPP_BSDCOMP=m 837CONFIG_PPP_BSDCOMP=m
845CONFIG_PPP_MPPE=m 838CONFIG_PPP_MPPE=m
846CONFIG_PPPOE=m 839CONFIG_PPPOE=m
840CONFIG_PPPOL2TP=m
847CONFIG_SLIP=m 841CONFIG_SLIP=m
848CONFIG_SLIP_COMPRESSED=y 842CONFIG_SLIP_COMPRESSED=y
849CONFIG_SLHC=m 843CONFIG_SLHC=m
850CONFIG_SLIP_SMART=y 844CONFIG_SLIP_SMART=y
851CONFIG_SLIP_MODE_SLIP6=y 845CONFIG_SLIP_MODE_SLIP6=y
852CONFIG_NET_FC=y 846CONFIG_NET_FC=y
853# CONFIG_SHAPER is not set
854# CONFIG_NETCONSOLE is not set 847# CONFIG_NETCONSOLE is not set
855# CONFIG_NETPOLL is not set 848# CONFIG_NETPOLL is not set
856# CONFIG_NET_POLL_CONTROLLER is not set 849# CONFIG_NET_POLL_CONTROLLER is not set
857
858#
859# ISDN subsystem
860#
861# CONFIG_ISDN is not set 850# CONFIG_ISDN is not set
862
863#
864# Telephony Support
865#
866# CONFIG_PHONE is not set 851# CONFIG_PHONE is not set
867 852
868# 853#
@@ -870,6 +855,7 @@ CONFIG_NET_FC=y
870# 855#
871CONFIG_INPUT=y 856CONFIG_INPUT=y
872CONFIG_INPUT_FF_MEMLESS=y 857CONFIG_INPUT_FF_MEMLESS=y
858# CONFIG_INPUT_POLLDEV is not set
873 859
874# 860#
875# Userland interfaces 861# Userland interfaces
@@ -879,7 +865,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
879CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 865CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
880CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 866CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
881# CONFIG_INPUT_JOYDEV is not set 867# CONFIG_INPUT_JOYDEV is not set
882# CONFIG_INPUT_TSDEV is not set
883# CONFIG_INPUT_EVDEV is not set 868# CONFIG_INPUT_EVDEV is not set
884# CONFIG_INPUT_EVBUG is not set 869# CONFIG_INPUT_EVBUG is not set
885 870
@@ -900,9 +885,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
900CONFIG_MOUSE_PS2_SYNAPTICS=y 885CONFIG_MOUSE_PS2_SYNAPTICS=y
901CONFIG_MOUSE_PS2_LIFEBOOK=y 886CONFIG_MOUSE_PS2_LIFEBOOK=y
902CONFIG_MOUSE_PS2_TRACKPOINT=y 887CONFIG_MOUSE_PS2_TRACKPOINT=y
888# CONFIG_MOUSE_PS2_ELANTECH is not set
903# CONFIG_MOUSE_PS2_TOUCHKIT is not set 889# CONFIG_MOUSE_PS2_TOUCHKIT is not set
904CONFIG_MOUSE_SERIAL=y 890CONFIG_MOUSE_SERIAL=y
905# CONFIG_MOUSE_APPLETOUCH is not set 891# CONFIG_MOUSE_APPLETOUCH is not set
892# CONFIG_MOUSE_BCM5974 is not set
906# CONFIG_MOUSE_INPORT is not set 893# CONFIG_MOUSE_INPORT is not set
907# CONFIG_MOUSE_LOGIBM is not set 894# CONFIG_MOUSE_LOGIBM is not set
908# CONFIG_MOUSE_PC110PAD is not set 895# CONFIG_MOUSE_PC110PAD is not set
@@ -927,10 +914,13 @@ CONFIG_SERIO_LIBPS2=y
927# Character devices 914# Character devices
928# 915#
929CONFIG_VT=y 916CONFIG_VT=y
917CONFIG_CONSOLE_TRANSLATIONS=y
930CONFIG_VT_CONSOLE=y 918CONFIG_VT_CONSOLE=y
931CONFIG_HW_CONSOLE=y 919CONFIG_HW_CONSOLE=y
932# CONFIG_VT_HW_CONSOLE_BINDING is not set 920# CONFIG_VT_HW_CONSOLE_BINDING is not set
921CONFIG_DEVKMEM=y
933# CONFIG_SERIAL_NONSTANDARD is not set 922# CONFIG_SERIAL_NONSTANDARD is not set
923# CONFIG_NOZOMI is not set
934 924
935# 925#
936# Serial drivers 926# Serial drivers
@@ -951,105 +941,152 @@ CONFIG_SERIAL_CORE_CONSOLE=y
951CONFIG_UNIX98_PTYS=y 941CONFIG_UNIX98_PTYS=y
952CONFIG_LEGACY_PTYS=y 942CONFIG_LEGACY_PTYS=y
953CONFIG_LEGACY_PTY_COUNT=256 943CONFIG_LEGACY_PTY_COUNT=256
954
955#
956# IPMI
957#
958# CONFIG_IPMI_HANDLER is not set 944# CONFIG_IPMI_HANDLER is not set
959# CONFIG_WATCHDOG is not set
960CONFIG_HW_RANDOM=y 945CONFIG_HW_RANDOM=y
961CONFIG_RTC=y
962# CONFIG_DTLK is not set 946# CONFIG_DTLK is not set
963# CONFIG_R3964 is not set 947# CONFIG_R3964 is not set
964# CONFIG_APPLICOM is not set 948# CONFIG_APPLICOM is not set
965# CONFIG_DRM is not set
966# CONFIG_RAW_DRIVER is not set 949# CONFIG_RAW_DRIVER is not set
967
968#
969# TPM devices
970#
971# CONFIG_TCG_TPM is not set 950# CONFIG_TCG_TPM is not set
972CONFIG_DEVPORT=y 951CONFIG_DEVPORT=y
973CONFIG_I2C=m 952CONFIG_I2C=m
974CONFIG_I2C_BOARDINFO=y 953CONFIG_I2C_BOARDINFO=y
975CONFIG_I2C_CHARDEV=m 954CONFIG_I2C_CHARDEV=m
955CONFIG_I2C_HELPER_AUTO=y
976 956
977# 957#
978# I2C Algorithms 958# I2C Hardware Bus support
979# 959#
980# CONFIG_I2C_ALGOBIT is not set
981# CONFIG_I2C_ALGOPCF is not set
982# CONFIG_I2C_ALGOPCA is not set
983 960
984# 961#
985# I2C Hardware Bus support 962# PC SMBus host controller drivers
986# 963#
987# CONFIG_I2C_ALI1535 is not set 964# CONFIG_I2C_ALI1535 is not set
988# CONFIG_I2C_ALI1563 is not set 965# CONFIG_I2C_ALI1563 is not set
989# CONFIG_I2C_ALI15X3 is not set 966# CONFIG_I2C_ALI15X3 is not set
990# CONFIG_I2C_AMD756 is not set 967# CONFIG_I2C_AMD756 is not set
991# CONFIG_I2C_AMD8111 is not set 968# CONFIG_I2C_AMD8111 is not set
992# CONFIG_I2C_ELEKTOR is not set
993# CONFIG_I2C_I801 is not set 969# CONFIG_I2C_I801 is not set
994# CONFIG_I2C_I810 is not set 970# CONFIG_I2C_ISCH is not set
995# CONFIG_I2C_PIIX4 is not set 971# CONFIG_I2C_PIIX4 is not set
996# CONFIG_I2C_NFORCE2 is not set 972# CONFIG_I2C_NFORCE2 is not set
997# CONFIG_I2C_OCORES is not set
998# CONFIG_I2C_PARPORT_LIGHT is not set
999# CONFIG_I2C_PROSAVAGE is not set
1000# CONFIG_I2C_SAVAGE4 is not set
1001# CONFIG_I2C_SIMTEC is not set
1002# CONFIG_I2C_SIS5595 is not set 973# CONFIG_I2C_SIS5595 is not set
1003# CONFIG_I2C_SIS630 is not set 974# CONFIG_I2C_SIS630 is not set
1004# CONFIG_I2C_SIS96X is not set 975# CONFIG_I2C_SIS96X is not set
1005# CONFIG_I2C_STUB is not set
1006# CONFIG_I2C_TINY_USB is not set
1007# CONFIG_I2C_VIA is not set 976# CONFIG_I2C_VIA is not set
1008CONFIG_I2C_VIAPRO=m 977CONFIG_I2C_VIAPRO=m
978
979#
980# I2C system bus drivers (mostly embedded / system-on-chip)
981#
982# CONFIG_I2C_OCORES is not set
983# CONFIG_I2C_SIMTEC is not set
984
985#
986# External I2C/SMBus adapter drivers
987#
988# CONFIG_I2C_PARPORT_LIGHT is not set
989# CONFIG_I2C_TAOS_EVM is not set
990# CONFIG_I2C_TINY_USB is not set
991
992#
993# Graphics adapter I2C/DDC channel drivers
994#
1009# CONFIG_I2C_VOODOO3 is not set 995# CONFIG_I2C_VOODOO3 is not set
996
997#
998# Other I2C/SMBus bus drivers
999#
1000# CONFIG_I2C_ELEKTOR is not set
1010# CONFIG_I2C_PCA_ISA is not set 1001# CONFIG_I2C_PCA_ISA is not set
1002# CONFIG_I2C_PCA_PLATFORM is not set
1003# CONFIG_I2C_STUB is not set
1011 1004
1012# 1005#
1013# Miscellaneous I2C Chip support 1006# Miscellaneous I2C Chip support
1014# 1007#
1015# CONFIG_SENSORS_DS1337 is not set 1008# CONFIG_DS1682 is not set
1016# CONFIG_SENSORS_DS1374 is not set 1009# CONFIG_AT24 is not set
1017# CONFIG_SENSORS_EEPROM is not set 1010# CONFIG_SENSORS_EEPROM is not set
1018# CONFIG_SENSORS_PCF8574 is not set 1011# CONFIG_SENSORS_PCF8574 is not set
1012# CONFIG_PCF8575 is not set
1019# CONFIG_SENSORS_PCA9539 is not set 1013# CONFIG_SENSORS_PCA9539 is not set
1020# CONFIG_SENSORS_PCF8591 is not set 1014# CONFIG_SENSORS_PCF8591 is not set
1021# CONFIG_SENSORS_MAX6875 is not set 1015# CONFIG_SENSORS_MAX6875 is not set
1016# CONFIG_SENSORS_TSL2550 is not set
1022# CONFIG_I2C_DEBUG_CORE is not set 1017# CONFIG_I2C_DEBUG_CORE is not set
1023# CONFIG_I2C_DEBUG_ALGO is not set 1018# CONFIG_I2C_DEBUG_ALGO is not set
1024# CONFIG_I2C_DEBUG_BUS is not set 1019# CONFIG_I2C_DEBUG_BUS is not set
1025# CONFIG_I2C_DEBUG_CHIP is not set 1020# CONFIG_I2C_DEBUG_CHIP is not set
1026
1027#
1028# SPI support
1029#
1030# CONFIG_SPI is not set 1021# CONFIG_SPI is not set
1031# CONFIG_SPI_MASTER is not set 1022# CONFIG_W1 is not set
1023# CONFIG_POWER_SUPPLY is not set
1024# CONFIG_HWMON is not set
1025# CONFIG_THERMAL is not set
1026# CONFIG_THERMAL_HWMON is not set
1027# CONFIG_WATCHDOG is not set
1028CONFIG_SSB_POSSIBLE=y
1032 1029
1033# 1030#
1034# Dallas's 1-wire bus 1031# Sonics Silicon Backplane
1035# 1032#
1036# CONFIG_W1 is not set 1033# CONFIG_SSB is not set
1037# CONFIG_HWMON is not set
1038 1034
1039# 1035#
1040# Multifunction device drivers 1036# Multifunction device drivers
1041# 1037#
1038# CONFIG_MFD_CORE is not set
1042# CONFIG_MFD_SM501 is not set 1039# CONFIG_MFD_SM501 is not set
1040# CONFIG_HTC_PASIC3 is not set
1041# CONFIG_MFD_TMIO is not set
1042# CONFIG_MFD_WM8400 is not set
1043# CONFIG_MFD_WM8350_I2C is not set
1044# CONFIG_REGULATOR is not set
1043 1045
1044# 1046#
1045# Multimedia devices 1047# Multimedia devices
1046# 1048#
1049
1050#
1051# Multimedia core support
1052#
1047CONFIG_VIDEO_DEV=m 1053CONFIG_VIDEO_DEV=m
1048CONFIG_VIDEO_V4L1=y 1054CONFIG_VIDEO_V4L2_COMMON=m
1055CONFIG_VIDEO_ALLOW_V4L1=y
1049CONFIG_VIDEO_V4L1_COMPAT=y 1056CONFIG_VIDEO_V4L1_COMPAT=y
1050CONFIG_VIDEO_V4L2=y 1057# CONFIG_DVB_CORE is not set
1058CONFIG_VIDEO_MEDIA=m
1059
1060#
1061# Multimedia drivers
1062#
1063CONFIG_MEDIA_ATTACH=y
1064CONFIG_MEDIA_TUNER=m
1065CONFIG_MEDIA_TUNER_CUSTOMIZE=y
1066CONFIG_MEDIA_TUNER_SIMPLE=m
1067CONFIG_MEDIA_TUNER_TDA8290=m
1068CONFIG_MEDIA_TUNER_TDA827X=m
1069CONFIG_MEDIA_TUNER_TDA18271=m
1070CONFIG_MEDIA_TUNER_TDA9887=m
1071CONFIG_MEDIA_TUNER_TEA5761=m
1072CONFIG_MEDIA_TUNER_TEA5767=m
1073CONFIG_MEDIA_TUNER_MT20XX=m
1074CONFIG_MEDIA_TUNER_MT2060=m
1075CONFIG_MEDIA_TUNER_MT2266=m
1076CONFIG_MEDIA_TUNER_MT2131=m
1077CONFIG_MEDIA_TUNER_QT1010=m
1078CONFIG_MEDIA_TUNER_XC2028=m
1079CONFIG_MEDIA_TUNER_XC5000=m
1080CONFIG_MEDIA_TUNER_MXL5005S=m
1081CONFIG_MEDIA_TUNER_MXL5007T=m
1082CONFIG_VIDEO_V4L2=m
1083CONFIG_VIDEO_V4L1=m
1084CONFIG_VIDEOBUF_GEN=m
1085CONFIG_VIDEOBUF_VMALLOC=m
1086CONFIG_VIDEOBUF_DMA_CONTIG=m
1051CONFIG_VIDEO_CAPTURE_DRIVERS=y 1087CONFIG_VIDEO_CAPTURE_DRIVERS=y
1052# CONFIG_VIDEO_ADV_DEBUG is not set 1088# CONFIG_VIDEO_ADV_DEBUG is not set
1089# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
1053CONFIG_VIDEO_HELPER_CHIPS_AUTO=y 1090CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
1054# CONFIG_VIDEO_VIVI is not set 1091# CONFIG_VIDEO_VIVI is not set
1055# CONFIG_VIDEO_BT848 is not set 1092# CONFIG_VIDEO_BT848 is not set
@@ -1058,17 +1095,46 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
1058# CONFIG_VIDEO_CPIA2 is not set 1095# CONFIG_VIDEO_CPIA2 is not set
1059# CONFIG_VIDEO_SAA5246A is not set 1096# CONFIG_VIDEO_SAA5246A is not set
1060# CONFIG_VIDEO_SAA5249 is not set 1097# CONFIG_VIDEO_SAA5249 is not set
1061# CONFIG_TUNER_3036 is not set
1062# CONFIG_VIDEO_STRADIS is not set 1098# CONFIG_VIDEO_STRADIS is not set
1063# CONFIG_VIDEO_SAA7134 is not set 1099# CONFIG_VIDEO_SAA7134 is not set
1064# CONFIG_VIDEO_MXB is not set 1100# CONFIG_VIDEO_MXB is not set
1065# CONFIG_VIDEO_DPC is not set
1066# CONFIG_VIDEO_HEXIUM_ORION is not set 1101# CONFIG_VIDEO_HEXIUM_ORION is not set
1067# CONFIG_VIDEO_HEXIUM_GEMINI is not set 1102# CONFIG_VIDEO_HEXIUM_GEMINI is not set
1068# CONFIG_VIDEO_CX88 is not set 1103# CONFIG_VIDEO_CX88 is not set
1069# CONFIG_VIDEO_IVTV is not set 1104# CONFIG_VIDEO_IVTV is not set
1070# CONFIG_VIDEO_CAFE_CCIC is not set 1105# CONFIG_VIDEO_CAFE_CCIC is not set
1106CONFIG_SOC_CAMERA=m
1107CONFIG_SOC_CAMERA_MT9M001=m
1108CONFIG_SOC_CAMERA_MT9M111=m
1109CONFIG_SOC_CAMERA_MT9V022=m
1110CONFIG_SOC_CAMERA_PLATFORM=m
1111CONFIG_VIDEO_SH_MOBILE_CEU=m
1071CONFIG_V4L_USB_DRIVERS=y 1112CONFIG_V4L_USB_DRIVERS=y
1113CONFIG_USB_VIDEO_CLASS=m
1114CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
1115CONFIG_USB_GSPCA=m
1116CONFIG_USB_M5602=m
1117CONFIG_USB_GSPCA_CONEX=m
1118CONFIG_USB_GSPCA_ETOMS=m
1119CONFIG_USB_GSPCA_FINEPIX=m
1120CONFIG_USB_GSPCA_MARS=m
1121CONFIG_USB_GSPCA_OV519=m
1122CONFIG_USB_GSPCA_PAC207=m
1123CONFIG_USB_GSPCA_PAC7311=m
1124CONFIG_USB_GSPCA_SONIXB=m
1125CONFIG_USB_GSPCA_SONIXJ=m
1126CONFIG_USB_GSPCA_SPCA500=m
1127CONFIG_USB_GSPCA_SPCA501=m
1128CONFIG_USB_GSPCA_SPCA505=m
1129CONFIG_USB_GSPCA_SPCA506=m
1130CONFIG_USB_GSPCA_SPCA508=m
1131CONFIG_USB_GSPCA_SPCA561=m
1132CONFIG_USB_GSPCA_STK014=m
1133CONFIG_USB_GSPCA_SUNPLUS=m
1134CONFIG_USB_GSPCA_T613=m
1135CONFIG_USB_GSPCA_TV8532=m
1136CONFIG_USB_GSPCA_VC032X=m
1137CONFIG_USB_GSPCA_ZC3XX=m
1072# CONFIG_VIDEO_PVRUSB2 is not set 1138# CONFIG_VIDEO_PVRUSB2 is not set
1073# CONFIG_VIDEO_EM28XX is not set 1139# CONFIG_VIDEO_EM28XX is not set
1074# CONFIG_VIDEO_USBVISION is not set 1140# CONFIG_VIDEO_USBVISION is not set
@@ -1079,7 +1145,6 @@ CONFIG_USB_KONICAWC=m
1079CONFIG_USB_QUICKCAM_MESSENGER=m 1145CONFIG_USB_QUICKCAM_MESSENGER=m
1080CONFIG_USB_ET61X251=m 1146CONFIG_USB_ET61X251=m
1081# CONFIG_VIDEO_OVCAMCHIP is not set 1147# CONFIG_VIDEO_OVCAMCHIP is not set
1082# CONFIG_USB_W9968CF is not set
1083CONFIG_USB_OV511=m 1148CONFIG_USB_OV511=m
1084CONFIG_USB_SE401=m 1149CONFIG_USB_SE401=m
1085CONFIG_USB_SN9C102=m 1150CONFIG_USB_SN9C102=m
@@ -1088,6 +1153,8 @@ CONFIG_USB_ZC0301=m
1088CONFIG_USB_PWC=m 1153CONFIG_USB_PWC=m
1089# CONFIG_USB_PWC_DEBUG is not set 1154# CONFIG_USB_PWC_DEBUG is not set
1090# CONFIG_USB_ZR364XX is not set 1155# CONFIG_USB_ZR364XX is not set
1156CONFIG_USB_STKWEBCAM=m
1157CONFIG_USB_S2255=m
1091CONFIG_RADIO_ADAPTERS=y 1158CONFIG_RADIO_ADAPTERS=y
1092# CONFIG_RADIO_CADET is not set 1159# CONFIG_RADIO_CADET is not set
1093# CONFIG_RADIO_RTRACK is not set 1160# CONFIG_RADIO_RTRACK is not set
@@ -1104,33 +1171,30 @@ CONFIG_RADIO_ADAPTERS=y
1104# CONFIG_RADIO_TYPHOON is not set 1171# CONFIG_RADIO_TYPHOON is not set
1105# CONFIG_RADIO_ZOLTRIX is not set 1172# CONFIG_RADIO_ZOLTRIX is not set
1106# CONFIG_USB_DSBR is not set 1173# CONFIG_USB_DSBR is not set
1107# CONFIG_DVB_CORE is not set 1174CONFIG_USB_SI470X=m
1175CONFIG_USB_MR800=m
1108CONFIG_DAB=y 1176CONFIG_DAB=y
1109# CONFIG_USB_DABUSB is not set 1177# CONFIG_USB_DABUSB is not set
1110 1178
1111# 1179#
1112# Graphics support 1180# Graphics support
1113# 1181#
1114CONFIG_BACKLIGHT_LCD_SUPPORT=y 1182# CONFIG_DRM is not set
1115CONFIG_BACKLIGHT_CLASS_DEVICE=y
1116CONFIG_LCD_CLASS_DEVICE=m
1117
1118#
1119# Display device support
1120#
1121# CONFIG_DISPLAY_SUPPORT is not set
1122# CONFIG_VGASTATE is not set 1183# CONFIG_VGASTATE is not set
1184CONFIG_VIDEO_OUTPUT_CONTROL=m
1123CONFIG_FB=y 1185CONFIG_FB=y
1124# CONFIG_FIRMWARE_EDID is not set 1186# CONFIG_FIRMWARE_EDID is not set
1125# CONFIG_FB_DDC is not set 1187# CONFIG_FB_DDC is not set
1188# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1126CONFIG_FB_CFB_FILLRECT=y 1189CONFIG_FB_CFB_FILLRECT=y
1127CONFIG_FB_CFB_COPYAREA=y 1190CONFIG_FB_CFB_COPYAREA=y
1128CONFIG_FB_CFB_IMAGEBLIT=y 1191CONFIG_FB_CFB_IMAGEBLIT=y
1192# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
1129# CONFIG_FB_SYS_FILLRECT is not set 1193# CONFIG_FB_SYS_FILLRECT is not set
1130# CONFIG_FB_SYS_COPYAREA is not set 1194# CONFIG_FB_SYS_COPYAREA is not set
1131# CONFIG_FB_SYS_IMAGEBLIT is not set 1195# CONFIG_FB_SYS_IMAGEBLIT is not set
1196# CONFIG_FB_FOREIGN_ENDIAN is not set
1132# CONFIG_FB_SYS_FOPS is not set 1197# CONFIG_FB_SYS_FOPS is not set
1133CONFIG_FB_DEFERRED_IO=y
1134# CONFIG_FB_SVGALIB is not set 1198# CONFIG_FB_SVGALIB is not set
1135# CONFIG_FB_MACMODES is not set 1199# CONFIG_FB_MACMODES is not set
1136CONFIG_FB_BACKLIGHT=y 1200CONFIG_FB_BACKLIGHT=y
@@ -1158,16 +1222,30 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1158# CONFIG_FB_S3 is not set 1222# CONFIG_FB_S3 is not set
1159# CONFIG_FB_SAVAGE is not set 1223# CONFIG_FB_SAVAGE is not set
1160# CONFIG_FB_SIS is not set 1224# CONFIG_FB_SIS is not set
1225# CONFIG_FB_VIA is not set
1161# CONFIG_FB_NEOMAGIC is not set 1226# CONFIG_FB_NEOMAGIC is not set
1162# CONFIG_FB_KYRO is not set 1227# CONFIG_FB_KYRO is not set
1163# CONFIG_FB_3DFX is not set 1228# CONFIG_FB_3DFX is not set
1164# CONFIG_FB_VOODOO1 is not set 1229# CONFIG_FB_VOODOO1 is not set
1165# CONFIG_FB_SMIVGX is not set
1166# CONFIG_FB_VT8623 is not set 1230# CONFIG_FB_VT8623 is not set
1167# CONFIG_FB_TRIDENT is not set 1231# CONFIG_FB_TRIDENT is not set
1168# CONFIG_FB_ARK is not set 1232# CONFIG_FB_ARK is not set
1169# CONFIG_FB_PM3 is not set 1233# CONFIG_FB_PM3 is not set
1234# CONFIG_FB_CARMINE is not set
1170# CONFIG_FB_VIRTUAL is not set 1235# CONFIG_FB_VIRTUAL is not set
1236# CONFIG_FB_METRONOME is not set
1237# CONFIG_FB_MB862XX is not set
1238CONFIG_BACKLIGHT_LCD_SUPPORT=y
1239CONFIG_LCD_CLASS_DEVICE=m
1240# CONFIG_LCD_ILI9320 is not set
1241# CONFIG_LCD_PLATFORM is not set
1242CONFIG_BACKLIGHT_CLASS_DEVICE=y
1243# CONFIG_BACKLIGHT_CORGI is not set
1244
1245#
1246# Display device support
1247#
1248# CONFIG_DISPLAY_SUPPORT is not set
1171 1249
1172# 1250#
1173# Console display driver support 1251# Console display driver support
@@ -1176,20 +1254,14 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1176# CONFIG_MDA_CONSOLE is not set 1254# CONFIG_MDA_CONSOLE is not set
1177CONFIG_DUMMY_CONSOLE=y 1255CONFIG_DUMMY_CONSOLE=y
1178CONFIG_FRAMEBUFFER_CONSOLE=y 1256CONFIG_FRAMEBUFFER_CONSOLE=y
1257# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1179# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 1258# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1180# CONFIG_FONTS is not set 1259# CONFIG_FONTS is not set
1181CONFIG_FONT_8x8=y 1260CONFIG_FONT_8x8=y
1182CONFIG_FONT_8x16=y 1261CONFIG_FONT_8x16=y
1183# CONFIG_LOGO is not set 1262# CONFIG_LOGO is not set
1184
1185#
1186# Sound
1187#
1188CONFIG_SOUND=y 1263CONFIG_SOUND=y
1189 1264CONFIG_SOUND_OSS_CORE=y
1190#
1191# Advanced Linux Sound Architecture
1192#
1193CONFIG_SND=m 1265CONFIG_SND=m
1194CONFIG_SND_TIMER=m 1266CONFIG_SND_TIMER=m
1195CONFIG_SND_PCM=m 1267CONFIG_SND_PCM=m
@@ -1201,28 +1273,22 @@ CONFIG_SND_MIXER_OSS=m
1201CONFIG_SND_PCM_OSS=m 1273CONFIG_SND_PCM_OSS=m
1202CONFIG_SND_PCM_OSS_PLUGINS=y 1274CONFIG_SND_PCM_OSS_PLUGINS=y
1203CONFIG_SND_SEQUENCER_OSS=y 1275CONFIG_SND_SEQUENCER_OSS=y
1204CONFIG_SND_RTCTIMER=m
1205CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
1206# CONFIG_SND_DYNAMIC_MINORS is not set 1276# CONFIG_SND_DYNAMIC_MINORS is not set
1207CONFIG_SND_SUPPORT_OLD_API=y 1277CONFIG_SND_SUPPORT_OLD_API=y
1208CONFIG_SND_VERBOSE_PROCFS=y 1278CONFIG_SND_VERBOSE_PROCFS=y
1209# CONFIG_SND_VERBOSE_PRINTK is not set 1279# CONFIG_SND_VERBOSE_PRINTK is not set
1210# CONFIG_SND_DEBUG is not set 1280# CONFIG_SND_DEBUG is not set
1211 1281CONFIG_SND_VMASTER=y
1212#
1213# Generic devices
1214#
1215CONFIG_SND_MPU401_UART=m 1282CONFIG_SND_MPU401_UART=m
1216CONFIG_SND_AC97_CODEC=m 1283CONFIG_SND_AC97_CODEC=m
1284CONFIG_SND_DRIVERS=y
1217# CONFIG_SND_DUMMY is not set 1285# CONFIG_SND_DUMMY is not set
1218# CONFIG_SND_VIRMIDI is not set 1286# CONFIG_SND_VIRMIDI is not set
1219# CONFIG_SND_MTPAV is not set 1287# CONFIG_SND_MTPAV is not set
1220# CONFIG_SND_SERIAL_U16550 is not set 1288# CONFIG_SND_SERIAL_U16550 is not set
1221# CONFIG_SND_MPU401 is not set 1289# CONFIG_SND_MPU401 is not set
1222 1290# CONFIG_SND_AC97_POWER_SAVE is not set
1223# 1291CONFIG_SND_PCI=y
1224# PCI devices
1225#
1226# CONFIG_SND_AD1889 is not set 1292# CONFIG_SND_AD1889 is not set
1227# CONFIG_SND_ALS300 is not set 1293# CONFIG_SND_ALS300 is not set
1228# CONFIG_SND_ALI5451 is not set 1294# CONFIG_SND_ALI5451 is not set
@@ -1231,10 +1297,12 @@ CONFIG_SND_AC97_CODEC=m
1231# CONFIG_SND_AU8810 is not set 1297# CONFIG_SND_AU8810 is not set
1232# CONFIG_SND_AU8820 is not set 1298# CONFIG_SND_AU8820 is not set
1233# CONFIG_SND_AU8830 is not set 1299# CONFIG_SND_AU8830 is not set
1300# CONFIG_SND_AW2 is not set
1234# CONFIG_SND_AZT3328 is not set 1301# CONFIG_SND_AZT3328 is not set
1235# CONFIG_SND_BT87X is not set 1302# CONFIG_SND_BT87X is not set
1236# CONFIG_SND_CA0106 is not set 1303# CONFIG_SND_CA0106 is not set
1237# CONFIG_SND_CMIPCI is not set 1304# CONFIG_SND_CMIPCI is not set
1305# CONFIG_SND_OXYGEN is not set
1238# CONFIG_SND_CS4281 is not set 1306# CONFIG_SND_CS4281 is not set
1239# CONFIG_SND_CS46XX is not set 1307# CONFIG_SND_CS46XX is not set
1240# CONFIG_SND_DARLA20 is not set 1308# CONFIG_SND_DARLA20 is not set
@@ -1259,6 +1327,7 @@ CONFIG_SND_AC97_CODEC=m
1259# CONFIG_SND_HDA_INTEL is not set 1327# CONFIG_SND_HDA_INTEL is not set
1260# CONFIG_SND_HDSP is not set 1328# CONFIG_SND_HDSP is not set
1261# CONFIG_SND_HDSPM is not set 1329# CONFIG_SND_HDSPM is not set
1330# CONFIG_SND_HIFIER is not set
1262# CONFIG_SND_ICE1712 is not set 1331# CONFIG_SND_ICE1712 is not set
1263# CONFIG_SND_ICE1724 is not set 1332# CONFIG_SND_ICE1724 is not set
1264# CONFIG_SND_INTEL8X0 is not set 1333# CONFIG_SND_INTEL8X0 is not set
@@ -1276,43 +1345,26 @@ CONFIG_SND_AC97_CODEC=m
1276# CONFIG_SND_TRIDENT is not set 1345# CONFIG_SND_TRIDENT is not set
1277CONFIG_SND_VIA82XX=m 1346CONFIG_SND_VIA82XX=m
1278# CONFIG_SND_VIA82XX_MODEM is not set 1347# CONFIG_SND_VIA82XX_MODEM is not set
1348# CONFIG_SND_VIRTUOSO is not set
1279# CONFIG_SND_VX222 is not set 1349# CONFIG_SND_VX222 is not set
1280# CONFIG_SND_YMFPCI is not set 1350# CONFIG_SND_YMFPCI is not set
1281# CONFIG_SND_AC97_POWER_SAVE is not set 1351CONFIG_SND_MIPS=y
1282 1352CONFIG_SND_USB=y
1283#
1284# ALSA MIPS devices
1285#
1286
1287#
1288# USB devices
1289#
1290# CONFIG_SND_USB_AUDIO is not set 1353# CONFIG_SND_USB_AUDIO is not set
1291# CONFIG_SND_USB_CAIAQ is not set 1354# CONFIG_SND_USB_CAIAQ is not set
1292
1293#
1294# System on Chip audio support
1295#
1296# CONFIG_SND_SOC is not set 1355# CONFIG_SND_SOC is not set
1297
1298#
1299# Open Sound System
1300#
1301# CONFIG_SOUND_PRIME is not set 1356# CONFIG_SOUND_PRIME is not set
1302CONFIG_AC97_BUS=m 1357CONFIG_AC97_BUS=m
1303 1358CONFIG_HID_SUPPORT=y
1304#
1305# HID Devices
1306#
1307CONFIG_HID=y 1359CONFIG_HID=y
1308# CONFIG_HID_DEBUG is not set 1360# CONFIG_HID_DEBUG is not set
1361CONFIG_HIDRAW=y
1309 1362
1310# 1363#
1311# USB Input Devices 1364# USB Input Devices
1312# 1365#
1313CONFIG_USB_HID=m 1366CONFIG_USB_HID=m
1314# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1367CONFIG_HID_PID=y
1315# CONFIG_HID_FF is not set
1316CONFIG_USB_HIDDEV=y 1368CONFIG_USB_HIDDEV=y
1317 1369
1318# 1370#
@@ -1322,13 +1374,39 @@ CONFIG_USB_HIDDEV=y
1322# CONFIG_USB_MOUSE is not set 1374# CONFIG_USB_MOUSE is not set
1323 1375
1324# 1376#
1325# USB support 1377# Special HID drivers
1326# 1378#
1379CONFIG_HID_COMPAT=y
1380CONFIG_HID_A4TECH=m
1381CONFIG_HID_APPLE=m
1382CONFIG_HID_BELKIN=m
1383CONFIG_HID_BRIGHT=m
1384CONFIG_HID_CHERRY=m
1385CONFIG_HID_CHICONY=m
1386CONFIG_HID_CYPRESS=m
1387CONFIG_HID_DELL=m
1388CONFIG_HID_EZKEY=m
1389CONFIG_HID_GYRATION=m
1390CONFIG_HID_LOGITECH=m
1391CONFIG_LOGITECH_FF=y
1392CONFIG_LOGIRUMBLEPAD2_FF=y
1393CONFIG_HID_MICROSOFT=m
1394CONFIG_HID_MONTEREY=m
1395CONFIG_HID_PANTHERLORD=m
1396# CONFIG_PANTHERLORD_FF is not set
1397CONFIG_HID_PETALYNX=m
1398CONFIG_HID_SAMSUNG=m
1399CONFIG_HID_SONY=m
1400CONFIG_HID_SUNPLUS=m
1401# CONFIG_THRUSTMASTER_FF is not set
1402CONFIG_ZEROPLUS_FF=m
1403CONFIG_USB_SUPPORT=y
1327CONFIG_USB_ARCH_HAS_HCD=y 1404CONFIG_USB_ARCH_HAS_HCD=y
1328CONFIG_USB_ARCH_HAS_OHCI=y 1405CONFIG_USB_ARCH_HAS_OHCI=y
1329CONFIG_USB_ARCH_HAS_EHCI=y 1406CONFIG_USB_ARCH_HAS_EHCI=y
1330CONFIG_USB=y 1407CONFIG_USB=y
1331# CONFIG_USB_DEBUG is not set 1408# CONFIG_USB_DEBUG is not set
1409CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
1332 1410
1333# 1411#
1334# Miscellaneous USB options 1412# Miscellaneous USB options
@@ -1338,35 +1416,46 @@ CONFIG_USB_DEVICEFS=y
1338# CONFIG_USB_DYNAMIC_MINORS is not set 1416# CONFIG_USB_DYNAMIC_MINORS is not set
1339# CONFIG_USB_SUSPEND is not set 1417# CONFIG_USB_SUSPEND is not set
1340# CONFIG_USB_OTG is not set 1418# CONFIG_USB_OTG is not set
1419CONFIG_USB_OTG_WHITELIST=y
1420# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1421# CONFIG_USB_MON is not set
1422# CONFIG_USB_WUSB is not set
1423CONFIG_USB_WUSB_CBAF=m
1424# CONFIG_USB_WUSB_CBAF_DEBUG is not set
1341 1425
1342# 1426#
1343# USB Host Controller Drivers 1427# USB Host Controller Drivers
1344# 1428#
1429CONFIG_USB_C67X00_HCD=m
1345CONFIG_USB_EHCI_HCD=y 1430CONFIG_USB_EHCI_HCD=y
1346CONFIG_USB_EHCI_SPLIT_ISO=y
1347CONFIG_USB_EHCI_ROOT_HUB_TT=y 1431CONFIG_USB_EHCI_ROOT_HUB_TT=y
1348CONFIG_USB_EHCI_TT_NEWSCHED=y 1432CONFIG_USB_EHCI_TT_NEWSCHED=y
1349# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1350# CONFIG_USB_ISP116X_HCD is not set 1433# CONFIG_USB_ISP116X_HCD is not set
1434CONFIG_USB_ISP1760_HCD=m
1351CONFIG_USB_OHCI_HCD=y 1435CONFIG_USB_OHCI_HCD=y
1352# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1436# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1353# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1437# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1354CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1438CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1355CONFIG_USB_UHCI_HCD=m 1439CONFIG_USB_UHCI_HCD=m
1356# CONFIG_USB_SL811_HCD is not set 1440# CONFIG_USB_SL811_HCD is not set
1441CONFIG_USB_R8A66597_HCD=m
1442# CONFIG_USB_WHCI_HCD is not set
1443# CONFIG_USB_HWA_HCD is not set
1357 1444
1358# 1445#
1359# USB Device Class drivers 1446# USB Device Class drivers
1360# 1447#
1361CONFIG_USB_ACM=y 1448CONFIG_USB_ACM=y
1362CONFIG_USB_PRINTER=y 1449CONFIG_USB_PRINTER=y
1450CONFIG_USB_WDM=m
1451CONFIG_USB_TMC=m
1363 1452
1364# 1453#
1365# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1454# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1366# 1455#
1367 1456
1368# 1457#
1369# may also be needed; see USB_STORAGE Help for more information 1458# see USB_STORAGE Help for more information
1370# 1459#
1371CONFIG_USB_STORAGE=y 1460CONFIG_USB_STORAGE=y
1372# CONFIG_USB_STORAGE_DEBUG is not set 1461# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1379,7 +1468,9 @@ CONFIG_USB_STORAGE=y
1379# CONFIG_USB_STORAGE_SDDR55 is not set 1468# CONFIG_USB_STORAGE_SDDR55 is not set
1380# CONFIG_USB_STORAGE_JUMPSHOT is not set 1469# CONFIG_USB_STORAGE_JUMPSHOT is not set
1381# CONFIG_USB_STORAGE_ALAUDA is not set 1470# CONFIG_USB_STORAGE_ALAUDA is not set
1471CONFIG_USB_STORAGE_ONETOUCH=y
1382# CONFIG_USB_STORAGE_KARMA is not set 1472# CONFIG_USB_STORAGE_KARMA is not set
1473CONFIG_USB_STORAGE_CYPRESS_ATACB=y
1383CONFIG_USB_LIBUSUAL=y 1474CONFIG_USB_LIBUSUAL=y
1384 1475
1385# 1476#
@@ -1387,15 +1478,10 @@ CONFIG_USB_LIBUSUAL=y
1387# 1478#
1388# CONFIG_USB_MDC800 is not set 1479# CONFIG_USB_MDC800 is not set
1389# CONFIG_USB_MICROTEK is not set 1480# CONFIG_USB_MICROTEK is not set
1390# CONFIG_USB_MON is not set
1391 1481
1392# 1482#
1393# USB port drivers 1483# USB port drivers
1394# 1484#
1395
1396#
1397# USB Serial Converter support
1398#
1399# CONFIG_USB_SERIAL is not set 1485# CONFIG_USB_SERIAL is not set
1400 1486
1401# 1487#
@@ -1404,7 +1490,7 @@ CONFIG_USB_LIBUSUAL=y
1404# CONFIG_USB_EMI62 is not set 1490# CONFIG_USB_EMI62 is not set
1405# CONFIG_USB_EMI26 is not set 1491# CONFIG_USB_EMI26 is not set
1406# CONFIG_USB_ADUTUX is not set 1492# CONFIG_USB_ADUTUX is not set
1407# CONFIG_USB_AUERSWALD is not set 1493CONFIG_USB_SEVSEG=m
1408# CONFIG_USB_RIO500 is not set 1494# CONFIG_USB_RIO500 is not set
1409# CONFIG_USB_LEGOTOWER is not set 1495# CONFIG_USB_LEGOTOWER is not set
1410# CONFIG_USB_LCD is not set 1496# CONFIG_USB_LCD is not set
@@ -1421,56 +1507,75 @@ CONFIG_USB_LIBUSUAL=y
1421# CONFIG_USB_TRANCEVIBRATOR is not set 1507# CONFIG_USB_TRANCEVIBRATOR is not set
1422# CONFIG_USB_IOWARRIOR is not set 1508# CONFIG_USB_IOWARRIOR is not set
1423# CONFIG_USB_TEST is not set 1509# CONFIG_USB_TEST is not set
1424 1510CONFIG_USB_ISIGHTFW=m
1425# 1511CONFIG_USB_VST=m
1426# USB DSL modem support
1427#
1428
1429#
1430# USB Gadget Support
1431#
1432# CONFIG_USB_GADGET is not set 1512# CONFIG_USB_GADGET is not set
1513# CONFIG_UWB is not set
1433# CONFIG_MMC is not set 1514# CONFIG_MMC is not set
1434 1515# CONFIG_MEMSTICK is not set
1435#
1436# LED devices
1437#
1438# CONFIG_NEW_LEDS is not set 1516# CONFIG_NEW_LEDS is not set
1439 1517# CONFIG_ACCESSIBILITY is not set
1440#
1441# LED drivers
1442#
1443
1444#
1445# LED Triggers
1446#
1447
1448#
1449# InfiniBand support
1450#
1451# CONFIG_INFINIBAND is not set 1518# CONFIG_INFINIBAND is not set
1519CONFIG_RTC_LIB=y
1520CONFIG_RTC_CLASS=m
1452 1521
1453# 1522#
1454# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 1523# RTC interfaces
1455# 1524#
1525CONFIG_RTC_INTF_SYSFS=y
1526CONFIG_RTC_INTF_PROC=y
1527CONFIG_RTC_INTF_DEV=y
1528CONFIG_RTC_INTF_DEV_UIE_EMUL=y
1529# CONFIG_RTC_DRV_TEST is not set
1456 1530
1457# 1531#
1458# Real Time Clock 1532# I2C RTC drivers
1459# 1533#
1460# CONFIG_RTC_CLASS is not set 1534# CONFIG_RTC_DRV_DS1307 is not set
1535# CONFIG_RTC_DRV_DS1374 is not set
1536# CONFIG_RTC_DRV_DS1672 is not set
1537# CONFIG_RTC_DRV_MAX6900 is not set
1538# CONFIG_RTC_DRV_RS5C372 is not set
1539# CONFIG_RTC_DRV_ISL1208 is not set
1540# CONFIG_RTC_DRV_X1205 is not set
1541# CONFIG_RTC_DRV_PCF8563 is not set
1542# CONFIG_RTC_DRV_PCF8583 is not set
1543# CONFIG_RTC_DRV_M41T80 is not set
1544# CONFIG_RTC_DRV_S35390A is not set
1545# CONFIG_RTC_DRV_FM3130 is not set
1546# CONFIG_RTC_DRV_RX8581 is not set
1461 1547
1462# 1548#
1463# DMA Engine support 1549# SPI RTC drivers
1464# 1550#
1465# CONFIG_DMA_ENGINE is not set
1466 1551
1467# 1552#
1468# DMA Clients 1553# Platform RTC drivers
1469# 1554#
1555CONFIG_RTC_DRV_CMOS=m
1556# CONFIG_RTC_DRV_DS1286 is not set
1557# CONFIG_RTC_DRV_DS1511 is not set
1558# CONFIG_RTC_DRV_DS1553 is not set
1559# CONFIG_RTC_DRV_DS1742 is not set
1560# CONFIG_RTC_DRV_STK17TA8 is not set
1561# CONFIG_RTC_DRV_M48T86 is not set
1562# CONFIG_RTC_DRV_M48T35 is not set
1563# CONFIG_RTC_DRV_M48T59 is not set
1564# CONFIG_RTC_DRV_BQ4802 is not set
1565# CONFIG_RTC_DRV_V3020 is not set
1470 1566
1471# 1567#
1472# DMA Devices 1568# on-CPU RTC drivers
1473# 1569#
1570# CONFIG_DMADEVICES is not set
1571CONFIG_UIO=m
1572CONFIG_UIO_CIF=m
1573# CONFIG_UIO_PDRV is not set
1574# CONFIG_UIO_PDRV_GENIRQ is not set
1575# CONFIG_UIO_SMX is not set
1576# CONFIG_UIO_SERCOS3 is not set
1577# CONFIG_STAGING is not set
1578CONFIG_STAGING_EXCLUDE_BUILD=y
1474 1579
1475# 1580#
1476# File systems 1581# File systems
@@ -1478,27 +1583,31 @@ CONFIG_USB_LIBUSUAL=y
1478CONFIG_EXT2_FS=y 1583CONFIG_EXT2_FS=y
1479# CONFIG_EXT2_FS_XATTR is not set 1584# CONFIG_EXT2_FS_XATTR is not set
1480CONFIG_EXT2_FS_XIP=y 1585CONFIG_EXT2_FS_XIP=y
1481CONFIG_FS_XIP=y
1482CONFIG_EXT3_FS=y 1586CONFIG_EXT3_FS=y
1483# CONFIG_EXT3_FS_XATTR is not set 1587# CONFIG_EXT3_FS_XATTR is not set
1484# CONFIG_EXT4DEV_FS is not set 1588CONFIG_EXT4_FS=m
1589CONFIG_EXT4DEV_COMPAT=y
1590CONFIG_EXT4_FS_XATTR=y
1591CONFIG_EXT4_FS_POSIX_ACL=y
1592CONFIG_EXT4_FS_SECURITY=y
1593CONFIG_FS_XIP=y
1485CONFIG_JBD=y 1594CONFIG_JBD=y
1486# CONFIG_JBD_DEBUG is not set 1595CONFIG_JBD2=m
1596CONFIG_FS_MBCACHE=m
1487CONFIG_REISERFS_FS=m 1597CONFIG_REISERFS_FS=m
1488# CONFIG_REISERFS_CHECK is not set 1598# CONFIG_REISERFS_CHECK is not set
1489# CONFIG_REISERFS_PROC_INFO is not set 1599# CONFIG_REISERFS_PROC_INFO is not set
1490# CONFIG_REISERFS_FS_XATTR is not set 1600# CONFIG_REISERFS_FS_XATTR is not set
1491# CONFIG_JFS_FS is not set 1601# CONFIG_JFS_FS is not set
1492CONFIG_FS_POSIX_ACL=y 1602CONFIG_FS_POSIX_ACL=y
1603CONFIG_FILE_LOCKING=y
1493# CONFIG_XFS_FS is not set 1604# CONFIG_XFS_FS is not set
1494# CONFIG_GFS2_FS is not set 1605# CONFIG_GFS2_FS is not set
1495# CONFIG_OCFS2_FS is not set 1606# CONFIG_OCFS2_FS is not set
1496# CONFIG_MINIX_FS is not set 1607CONFIG_DNOTIFY=y
1497# CONFIG_ROMFS_FS is not set
1498CONFIG_INOTIFY=y 1608CONFIG_INOTIFY=y
1499CONFIG_INOTIFY_USER=y 1609CONFIG_INOTIFY_USER=y
1500# CONFIG_QUOTA is not set 1610# CONFIG_QUOTA is not set
1501CONFIG_DNOTIFY=y
1502CONFIG_AUTOFS_FS=y 1611CONFIG_AUTOFS_FS=y
1503CONFIG_AUTOFS4_FS=y 1612CONFIG_AUTOFS4_FS=y
1504CONFIG_FUSE_FS=y 1613CONFIG_FUSE_FS=y
@@ -1530,11 +1639,11 @@ CONFIG_NTFS_RW=y
1530CONFIG_PROC_FS=y 1639CONFIG_PROC_FS=y
1531CONFIG_PROC_KCORE=y 1640CONFIG_PROC_KCORE=y
1532CONFIG_PROC_SYSCTL=y 1641CONFIG_PROC_SYSCTL=y
1642CONFIG_PROC_PAGE_MONITOR=y
1533CONFIG_SYSFS=y 1643CONFIG_SYSFS=y
1534CONFIG_TMPFS=y 1644CONFIG_TMPFS=y
1535# CONFIG_TMPFS_POSIX_ACL is not set 1645# CONFIG_TMPFS_POSIX_ACL is not set
1536# CONFIG_HUGETLB_PAGE is not set 1646# CONFIG_HUGETLB_PAGE is not set
1537CONFIG_RAMFS=y
1538# CONFIG_CONFIGFS_FS is not set 1647# CONFIG_CONFIGFS_FS is not set
1539 1648
1540# 1649#
@@ -1550,25 +1659,23 @@ CONFIG_RAMFS=y
1550# CONFIG_JFFS2_FS is not set 1659# CONFIG_JFFS2_FS is not set
1551# CONFIG_CRAMFS is not set 1660# CONFIG_CRAMFS is not set
1552# CONFIG_VXFS_FS is not set 1661# CONFIG_VXFS_FS is not set
1662# CONFIG_MINIX_FS is not set
1663CONFIG_OMFS_FS=m
1553# CONFIG_HPFS_FS is not set 1664# CONFIG_HPFS_FS is not set
1554# CONFIG_QNX4FS_FS is not set 1665# CONFIG_QNX4FS_FS is not set
1666# CONFIG_ROMFS_FS is not set
1555# CONFIG_SYSV_FS is not set 1667# CONFIG_SYSV_FS is not set
1556# CONFIG_UFS_FS is not set 1668# CONFIG_UFS_FS is not set
1557 1669CONFIG_NETWORK_FILESYSTEMS=y
1558#
1559# Network File Systems
1560#
1561CONFIG_NFS_FS=m 1670CONFIG_NFS_FS=m
1562CONFIG_NFS_V3=y 1671CONFIG_NFS_V3=y
1563CONFIG_NFS_V3_ACL=y 1672CONFIG_NFS_V3_ACL=y
1564CONFIG_NFS_V4=y 1673CONFIG_NFS_V4=y
1565CONFIG_NFS_DIRECTIO=y
1566CONFIG_NFSD=m 1674CONFIG_NFSD=m
1567CONFIG_NFSD_V2_ACL=y 1675CONFIG_NFSD_V2_ACL=y
1568CONFIG_NFSD_V3=y 1676CONFIG_NFSD_V3=y
1569CONFIG_NFSD_V3_ACL=y 1677CONFIG_NFSD_V3_ACL=y
1570CONFIG_NFSD_V4=y 1678CONFIG_NFSD_V4=y
1571CONFIG_NFSD_TCP=y
1572CONFIG_LOCKD=m 1679CONFIG_LOCKD=m
1573CONFIG_LOCKD_V4=y 1680CONFIG_LOCKD_V4=y
1574CONFIG_EXPORTFS=m 1681CONFIG_EXPORTFS=m
@@ -1576,7 +1683,7 @@ CONFIG_NFS_ACL_SUPPORT=m
1576CONFIG_NFS_COMMON=y 1683CONFIG_NFS_COMMON=y
1577CONFIG_SUNRPC=m 1684CONFIG_SUNRPC=m
1578CONFIG_SUNRPC_GSS=m 1685CONFIG_SUNRPC_GSS=m
1579# CONFIG_SUNRPC_BIND34 is not set 1686# CONFIG_SUNRPC_REGISTER_V4 is not set
1580CONFIG_RPCSEC_GSS_KRB5=m 1687CONFIG_RPCSEC_GSS_KRB5=m
1581# CONFIG_RPCSEC_GSS_SPKM3 is not set 1688# CONFIG_RPCSEC_GSS_SPKM3 is not set
1582CONFIG_SMB_FS=m 1689CONFIG_SMB_FS=m
@@ -1616,10 +1723,6 @@ CONFIG_MSDOS_PARTITION=y
1616# CONFIG_KARMA_PARTITION is not set 1723# CONFIG_KARMA_PARTITION is not set
1617# CONFIG_EFI_PARTITION is not set 1724# CONFIG_EFI_PARTITION is not set
1618# CONFIG_SYSV68_PARTITION is not set 1725# CONFIG_SYSV68_PARTITION is not set
1619
1620#
1621# Native Language Support
1622#
1623CONFIG_NLS=y 1726CONFIG_NLS=y
1624CONFIG_NLS_DEFAULT="utf8" 1727CONFIG_NLS_DEFAULT="utf8"
1625# CONFIG_NLS_CODEPAGE_437 is not set 1728# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1660,30 +1763,31 @@ CONFIG_NLS_ISO8859_1=y
1660# CONFIG_NLS_KOI8_R is not set 1763# CONFIG_NLS_KOI8_R is not set
1661# CONFIG_NLS_KOI8_U is not set 1764# CONFIG_NLS_KOI8_U is not set
1662CONFIG_NLS_UTF8=y 1765CONFIG_NLS_UTF8=y
1663
1664#
1665# Distributed Lock Manager
1666#
1667# CONFIG_DLM is not set 1766# CONFIG_DLM is not set
1668 1767
1669# 1768#
1670# Profiling support
1671#
1672CONFIG_PROFILING=y
1673CONFIG_OPROFILE=m
1674
1675#
1676# Kernel hacking 1769# Kernel hacking
1677# 1770#
1678CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1771CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1679# CONFIG_PRINTK_TIME is not set 1772# CONFIG_PRINTK_TIME is not set
1773CONFIG_ENABLE_WARN_DEPRECATED=y
1680# CONFIG_ENABLE_MUST_CHECK is not set 1774# CONFIG_ENABLE_MUST_CHECK is not set
1775CONFIG_FRAME_WARN=2048
1681# CONFIG_MAGIC_SYSRQ is not set 1776# CONFIG_MAGIC_SYSRQ is not set
1682# CONFIG_UNUSED_SYMBOLS is not set 1777# CONFIG_UNUSED_SYMBOLS is not set
1683# CONFIG_DEBUG_FS is not set 1778# CONFIG_DEBUG_FS is not set
1684# CONFIG_HEADERS_CHECK is not set 1779# CONFIG_HEADERS_CHECK is not set
1685# CONFIG_DEBUG_KERNEL is not set 1780# CONFIG_DEBUG_KERNEL is not set
1686CONFIG_CROSSCOMPILE=y 1781# CONFIG_DEBUG_MEMORY_INIT is not set
1782# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1783CONFIG_SYSCTL_SYSCALL_CHECK=y
1784
1785#
1786# Tracers
1787#
1788CONFIG_DYNAMIC_PRINTK_DEBUG=y
1789# CONFIG_SAMPLES is not set
1790CONFIG_HAVE_ARCH_KGDB=y
1687CONFIG_CMDLINE="" 1791CONFIG_CMDLINE=""
1688 1792
1689# 1793#
@@ -1691,64 +1795,113 @@ CONFIG_CMDLINE=""
1691# 1795#
1692# CONFIG_KEYS is not set 1796# CONFIG_KEYS is not set
1693# CONFIG_SECURITY is not set 1797# CONFIG_SECURITY is not set
1798# CONFIG_SECURITYFS is not set
1799CONFIG_SECURITY_FILE_CAPABILITIES=y
1800CONFIG_CRYPTO=y
1694 1801
1695# 1802#
1696# Cryptographic options 1803# Crypto core or helper
1697# 1804#
1698CONFIG_CRYPTO=y 1805CONFIG_CRYPTO_FIPS=y
1699CONFIG_CRYPTO_ALGAPI=y 1806CONFIG_CRYPTO_ALGAPI=y
1700CONFIG_CRYPTO_BLKCIPHER=m 1807CONFIG_CRYPTO_AEAD=y
1808CONFIG_CRYPTO_BLKCIPHER=y
1701CONFIG_CRYPTO_HASH=y 1809CONFIG_CRYPTO_HASH=y
1810CONFIG_CRYPTO_RNG=y
1702CONFIG_CRYPTO_MANAGER=y 1811CONFIG_CRYPTO_MANAGER=y
1812CONFIG_CRYPTO_GF128MUL=m
1813# CONFIG_CRYPTO_NULL is not set
1814# CONFIG_CRYPTO_CRYPTD is not set
1815CONFIG_CRYPTO_AUTHENC=m
1816# CONFIG_CRYPTO_TEST is not set
1817
1818#
1819# Authenticated Encryption with Associated Data
1820#
1821CONFIG_CRYPTO_CCM=m
1822CONFIG_CRYPTO_GCM=m
1823CONFIG_CRYPTO_SEQIV=m
1824
1825#
1826# Block modes
1827#
1828CONFIG_CRYPTO_CBC=m
1829CONFIG_CRYPTO_CTR=m
1830CONFIG_CRYPTO_CTS=m
1831CONFIG_CRYPTO_ECB=m
1832# CONFIG_CRYPTO_LRW is not set
1833CONFIG_CRYPTO_PCBC=m
1834CONFIG_CRYPTO_XTS=m
1835
1836#
1837# Hash modes
1838#
1703CONFIG_CRYPTO_HMAC=y 1839CONFIG_CRYPTO_HMAC=y
1704# CONFIG_CRYPTO_XCBC is not set 1840# CONFIG_CRYPTO_XCBC is not set
1705# CONFIG_CRYPTO_NULL is not set 1841
1842#
1843# Digest
1844#
1845# CONFIG_CRYPTO_CRC32C is not set
1706# CONFIG_CRYPTO_MD4 is not set 1846# CONFIG_CRYPTO_MD4 is not set
1707CONFIG_CRYPTO_MD5=m 1847CONFIG_CRYPTO_MD5=m
1848# CONFIG_CRYPTO_MICHAEL_MIC is not set
1849CONFIG_CRYPTO_RMD128=m
1850CONFIG_CRYPTO_RMD160=m
1851CONFIG_CRYPTO_RMD256=m
1852CONFIG_CRYPTO_RMD320=m
1708CONFIG_CRYPTO_SHA1=m 1853CONFIG_CRYPTO_SHA1=m
1709# CONFIG_CRYPTO_SHA256 is not set 1854# CONFIG_CRYPTO_SHA256 is not set
1710# CONFIG_CRYPTO_SHA512 is not set 1855# CONFIG_CRYPTO_SHA512 is not set
1711# CONFIG_CRYPTO_WP512 is not set
1712# CONFIG_CRYPTO_TGR192 is not set 1856# CONFIG_CRYPTO_TGR192 is not set
1713# CONFIG_CRYPTO_GF128MUL is not set 1857# CONFIG_CRYPTO_WP512 is not set
1714CONFIG_CRYPTO_ECB=m 1858
1715CONFIG_CRYPTO_CBC=m 1859#
1716CONFIG_CRYPTO_PCBC=m 1860# Ciphers
1717# CONFIG_CRYPTO_LRW is not set 1861#
1718# CONFIG_CRYPTO_CRYPTD is not set 1862CONFIG_CRYPTO_AES=m
1719CONFIG_CRYPTO_DES=m 1863# CONFIG_CRYPTO_ANUBIS is not set
1720# CONFIG_CRYPTO_FCRYPT is not set 1864CONFIG_CRYPTO_ARC4=m
1721# CONFIG_CRYPTO_BLOWFISH is not set 1865# CONFIG_CRYPTO_BLOWFISH is not set
1722# CONFIG_CRYPTO_TWOFISH is not set 1866# CONFIG_CRYPTO_CAMELLIA is not set
1723# CONFIG_CRYPTO_SERPENT is not set
1724# CONFIG_CRYPTO_AES is not set
1725# CONFIG_CRYPTO_CAST5 is not set 1867# CONFIG_CRYPTO_CAST5 is not set
1726# CONFIG_CRYPTO_CAST6 is not set 1868# CONFIG_CRYPTO_CAST6 is not set
1727# CONFIG_CRYPTO_TEA is not set 1869CONFIG_CRYPTO_DES=m
1728CONFIG_CRYPTO_ARC4=m 1870# CONFIG_CRYPTO_FCRYPT is not set
1729# CONFIG_CRYPTO_KHAZAD is not set 1871# CONFIG_CRYPTO_KHAZAD is not set
1730# CONFIG_CRYPTO_ANUBIS is not set 1872CONFIG_CRYPTO_SALSA20=m
1873CONFIG_CRYPTO_SEED=m
1874# CONFIG_CRYPTO_SERPENT is not set
1875# CONFIG_CRYPTO_TEA is not set
1876# CONFIG_CRYPTO_TWOFISH is not set
1877
1878#
1879# Compression
1880#
1731CONFIG_CRYPTO_DEFLATE=m 1881CONFIG_CRYPTO_DEFLATE=m
1732# CONFIG_CRYPTO_MICHAEL_MIC is not set 1882CONFIG_CRYPTO_LZO=m
1733# CONFIG_CRYPTO_CRC32C is not set
1734# CONFIG_CRYPTO_CAMELLIA is not set
1735# CONFIG_CRYPTO_TEST is not set
1736 1883
1737# 1884#
1738# Hardware crypto devices 1885# Random Number Generation
1739# 1886#
1887CONFIG_CRYPTO_ANSI_CPRNG=m
1888# CONFIG_CRYPTO_HW is not set
1740 1889
1741# 1890#
1742# Library routines 1891# Library routines
1743# 1892#
1744CONFIG_BITREVERSE=y 1893CONFIG_BITREVERSE=y
1745CONFIG_CRC_CCITT=y 1894CONFIG_CRC_CCITT=y
1746# CONFIG_CRC16 is not set 1895CONFIG_CRC16=m
1747# CONFIG_CRC_ITU_T is not set 1896# CONFIG_CRC_T10DIF is not set
1897CONFIG_CRC_ITU_T=m
1748CONFIG_CRC32=y 1898CONFIG_CRC32=y
1899CONFIG_CRC7=m
1749# CONFIG_LIBCRC32C is not set 1900# CONFIG_LIBCRC32C is not set
1750CONFIG_ZLIB_INFLATE=m 1901CONFIG_ZLIB_INFLATE=m
1751CONFIG_ZLIB_DEFLATE=m 1902CONFIG_ZLIB_DEFLATE=m
1903CONFIG_LZO_COMPRESS=m
1904CONFIG_LZO_DECOMPRESS=m
1752CONFIG_TEXTSEARCH=y 1905CONFIG_TEXTSEARCH=y
1753CONFIG_TEXTSEARCH_KMP=m 1906CONFIG_TEXTSEARCH_KMP=m
1754CONFIG_TEXTSEARCH_BM=m 1907CONFIG_TEXTSEARCH_BM=m
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index f719bf5e01aa..115822876417 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,30 +1,34 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.23-rc2 3# Linux kernel version: 2.6.28-rc6
4# Tue Aug 7 12:39:49 2007 4# Fri Nov 28 15:41:33 2008
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
12# CONFIG_MACH_ALCHEMY is not set 11# CONFIG_MACH_ALCHEMY is not set
13# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
13# CONFIG_BCM47XX is not set
14# CONFIG_MIPS_COBALT is not set 14# CONFIG_MIPS_COBALT is not set
15# CONFIG_MACH_DECSTATION is not set 15# CONFIG_MACH_DECSTATION is not set
16# CONFIG_MACH_JAZZ is not set 16# CONFIG_MACH_JAZZ is not set
17# CONFIG_LASAT is not set
17# CONFIG_LEMOTE_FULONG is not set 18# CONFIG_LEMOTE_FULONG is not set
18# CONFIG_MIPS_MALTA is not set 19# CONFIG_MIPS_MALTA is not set
19# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
20# CONFIG_MARKEINS is not set 21# CONFIG_MACH_EMMA is not set
21# CONFIG_MACH_VR41XX is not set 22# CONFIG_MACH_VR41XX is not set
23# CONFIG_NXP_STB220 is not set
24# CONFIG_NXP_STB225 is not set
22# CONFIG_PNX8550_JBS is not set 25# CONFIG_PNX8550_JBS is not set
23# CONFIG_PNX8550_STB810 is not set 26# CONFIG_PNX8550_STB810 is not set
24# CONFIG_PMC_MSP is not set 27# CONFIG_PMC_MSP is not set
25# CONFIG_PMC_YOSEMITE is not set 28# CONFIG_PMC_YOSEMITE is not set
26CONFIG_SGI_IP22=y 29CONFIG_SGI_IP22=y
27# CONFIG_SGI_IP27 is not set 30# CONFIG_SGI_IP27 is not set
31# CONFIG_SGI_IP28 is not set
28# CONFIG_SGI_IP32 is not set 32# CONFIG_SGI_IP32 is not set
29# CONFIG_SIBYTE_CRHINE is not set 33# CONFIG_SIBYTE_CRHINE is not set
30# CONFIG_SIBYTE_CARMEL is not set 34# CONFIG_SIBYTE_CARMEL is not set
@@ -35,34 +39,49 @@ CONFIG_SGI_IP22=y
35# CONFIG_SIBYTE_SENTOSA is not set 39# CONFIG_SIBYTE_SENTOSA is not set
36# CONFIG_SIBYTE_BIGSUR is not set 40# CONFIG_SIBYTE_BIGSUR is not set
37# CONFIG_SNI_RM is not set 41# CONFIG_SNI_RM is not set
38# CONFIG_TOSHIBA_JMR3927 is not set 42# CONFIG_MACH_TX39XX is not set
39# CONFIG_TOSHIBA_RBTX4927 is not set 43# CONFIG_MACH_TX49XX is not set
40# CONFIG_TOSHIBA_RBTX4938 is not set 44# CONFIG_MIKROTIK_RB532 is not set
41# CONFIG_WR_PPMC is not set 45# CONFIG_WR_PPMC is not set
42CONFIG_RWSEM_GENERIC_SPINLOCK=y 46CONFIG_RWSEM_GENERIC_SPINLOCK=y
43# CONFIG_ARCH_HAS_ILOG2_U32 is not set 47# CONFIG_ARCH_HAS_ILOG2_U32 is not set
44# CONFIG_ARCH_HAS_ILOG2_U64 is not set 48# CONFIG_ARCH_HAS_ILOG2_U64 is not set
49CONFIG_ARCH_SUPPORTS_OPROFILE=y
45CONFIG_GENERIC_FIND_NEXT_BIT=y 50CONFIG_GENERIC_FIND_NEXT_BIT=y
46CONFIG_GENERIC_HWEIGHT=y 51CONFIG_GENERIC_HWEIGHT=y
47CONFIG_GENERIC_CALIBRATE_DELAY=y 52CONFIG_GENERIC_CALIBRATE_DELAY=y
53CONFIG_GENERIC_CLOCKEVENTS=y
48CONFIG_GENERIC_TIME=y 54CONFIG_GENERIC_TIME=y
55CONFIG_GENERIC_CMOS_UPDATE=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 56CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
50# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set 57# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
51CONFIG_ARC=y 58CONFIG_ARC=y
59CONFIG_CEVT_R4K=y
60CONFIG_CSRC_R4K=y
52CONFIG_DMA_NONCOHERENT=y 61CONFIG_DMA_NONCOHERENT=y
53CONFIG_DMA_NEED_PCI_MAP_STATE=y 62CONFIG_DMA_NEED_PCI_MAP_STATE=y
54CONFIG_EARLY_PRINTK=y 63CONFIG_EARLY_PRINTK=y
55CONFIG_SYS_HAS_EARLY_PRINTK=y 64CONFIG_SYS_HAS_EARLY_PRINTK=y
65# CONFIG_HOTPLUG_CPU is not set
66CONFIG_I8259=y
56# CONFIG_NO_IOPORT is not set 67# CONFIG_NO_IOPORT is not set
68CONFIG_GENERIC_ISA_DMA=y
57CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y 69CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
58CONFIG_CPU_BIG_ENDIAN=y 70CONFIG_CPU_BIG_ENDIAN=y
59# CONFIG_CPU_LITTLE_ENDIAN is not set 71# CONFIG_CPU_LITTLE_ENDIAN is not set
60CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 72CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
61CONFIG_IRQ_CPU=y 73CONFIG_IRQ_CPU=y
62CONFIG_SWAP_IO_SPACE=y 74CONFIG_SWAP_IO_SPACE=y
75CONFIG_SGI_HAS_INDYDOG=y
76CONFIG_SGI_HAS_HAL2=y
77CONFIG_SGI_HAS_SEEQ=y
78CONFIG_SGI_HAS_WD93=y
79CONFIG_SGI_HAS_ZILOG=y
80CONFIG_SGI_HAS_I8042=y
81CONFIG_DEFAULT_SGI_PARTITION=y
63CONFIG_ARC32=y 82CONFIG_ARC32=y
64CONFIG_BOOT_ELF32=y 83CONFIG_BOOT_ELF32=y
65CONFIG_MIPS_L1_CACHE_SHIFT=5 84CONFIG_MIPS_L1_CACHE_SHIFT=7
66CONFIG_ARC_CONSOLE=y 85CONFIG_ARC_CONSOLE=y
67CONFIG_ARC_PROMLIB=y 86CONFIG_ARC_PROMLIB=y
68 87
@@ -82,6 +101,7 @@ CONFIG_ARC_PROMLIB=y
82# CONFIG_CPU_TX49XX is not set 101# CONFIG_CPU_TX49XX is not set
83CONFIG_CPU_R5000=y 102CONFIG_CPU_R5000=y
84# CONFIG_CPU_R5432 is not set 103# CONFIG_CPU_R5432 is not set
104# CONFIG_CPU_R5500 is not set
85# CONFIG_CPU_R6000 is not set 105# CONFIG_CPU_R6000 is not set
86# CONFIG_CPU_NEVADA is not set 106# CONFIG_CPU_NEVADA is not set
87# CONFIG_CPU_R8000 is not set 107# CONFIG_CPU_R8000 is not set
@@ -115,18 +135,24 @@ CONFIG_CPU_HAS_SYNC=y
115CONFIG_GENERIC_HARDIRQS=y 135CONFIG_GENERIC_HARDIRQS=y
116CONFIG_GENERIC_IRQ_PROBE=y 136CONFIG_GENERIC_IRQ_PROBE=y
117CONFIG_ARCH_FLATMEM_ENABLE=y 137CONFIG_ARCH_FLATMEM_ENABLE=y
138CONFIG_ARCH_POPULATES_NODE_MAP=y
118CONFIG_SELECT_MEMORY_MODEL=y 139CONFIG_SELECT_MEMORY_MODEL=y
119CONFIG_FLATMEM_MANUAL=y 140CONFIG_FLATMEM_MANUAL=y
120# CONFIG_DISCONTIGMEM_MANUAL is not set 141# CONFIG_DISCONTIGMEM_MANUAL is not set
121# CONFIG_SPARSEMEM_MANUAL is not set 142# CONFIG_SPARSEMEM_MANUAL is not set
122CONFIG_FLATMEM=y 143CONFIG_FLATMEM=y
123CONFIG_FLAT_NODE_MEM_MAP=y 144CONFIG_FLAT_NODE_MEM_MAP=y
124# CONFIG_SPARSEMEM_STATIC is not set 145CONFIG_PAGEFLAGS_EXTENDED=y
125CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
126# CONFIG_RESOURCES_64BIT is not set 147# CONFIG_RESOURCES_64BIT is not set
127CONFIG_ZONE_DMA_FLAG=1 148# CONFIG_PHYS_ADDR_T_64BIT is not set
128CONFIG_BOUNCE=y 149CONFIG_ZONE_DMA_FLAG=0
129CONFIG_VIRT_TO_BUS=y 150CONFIG_VIRT_TO_BUS=y
151CONFIG_UNEVICTABLE_LRU=y
152CONFIG_TICK_ONESHOT=y
153CONFIG_NO_HZ=y
154CONFIG_HIGH_RES_TIMERS=y
155CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
130# CONFIG_HZ_48 is not set 156# CONFIG_HZ_48 is not set
131# CONFIG_HZ_100 is not set 157# CONFIG_HZ_100 is not set
132# CONFIG_HZ_128 is not set 158# CONFIG_HZ_128 is not set
@@ -159,13 +185,20 @@ CONFIG_SYSVIPC_SYSCTL=y
159# CONFIG_POSIX_MQUEUE is not set 185# CONFIG_POSIX_MQUEUE is not set
160# CONFIG_BSD_PROCESS_ACCT is not set 186# CONFIG_BSD_PROCESS_ACCT is not set
161# CONFIG_TASKSTATS is not set 187# CONFIG_TASKSTATS is not set
162# CONFIG_USER_NS is not set
163# CONFIG_AUDIT is not set 188# CONFIG_AUDIT is not set
164CONFIG_IKCONFIG=y 189CONFIG_IKCONFIG=y
165CONFIG_IKCONFIG_PROC=y 190CONFIG_IKCONFIG_PROC=y
166CONFIG_LOG_BUF_SHIFT=14 191CONFIG_LOG_BUF_SHIFT=14
192# CONFIG_CGROUPS is not set
193# CONFIG_GROUP_SCHED is not set
167CONFIG_SYSFS_DEPRECATED=y 194CONFIG_SYSFS_DEPRECATED=y
195CONFIG_SYSFS_DEPRECATED_V2=y
168CONFIG_RELAY=y 196CONFIG_RELAY=y
197CONFIG_NAMESPACES=y
198CONFIG_UTS_NS=y
199CONFIG_IPC_NS=y
200CONFIG_USER_NS=y
201CONFIG_PID_NS=y
169# CONFIG_BLK_DEV_INITRD is not set 202# CONFIG_BLK_DEV_INITRD is not set
170# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 203# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
171CONFIG_SYSCTL=y 204CONFIG_SYSCTL=y
@@ -177,6 +210,8 @@ CONFIG_KALLSYMS=y
177CONFIG_PRINTK=y 210CONFIG_PRINTK=y
178CONFIG_BUG=y 211CONFIG_BUG=y
179CONFIG_ELF_CORE=y 212CONFIG_ELF_CORE=y
213# CONFIG_PCSPKR_PLATFORM is not set
214# CONFIG_COMPAT_BRK is not set
180CONFIG_BASE_FULL=y 215CONFIG_BASE_FULL=y
181CONFIG_FUTEX=y 216CONFIG_FUTEX=y
182CONFIG_ANON_INODES=y 217CONFIG_ANON_INODES=y
@@ -185,14 +220,21 @@ CONFIG_SIGNALFD=y
185CONFIG_TIMERFD=y 220CONFIG_TIMERFD=y
186CONFIG_EVENTFD=y 221CONFIG_EVENTFD=y
187CONFIG_SHMEM=y 222CONFIG_SHMEM=y
223CONFIG_AIO=y
188CONFIG_VM_EVENT_COUNTERS=y 224CONFIG_VM_EVENT_COUNTERS=y
189CONFIG_SLAB=y 225CONFIG_SLAB=y
190# CONFIG_SLUB is not set 226# CONFIG_SLUB is not set
191# CONFIG_SLOB is not set 227# CONFIG_SLOB is not set
228# CONFIG_PROFILING is not set
229# CONFIG_MARKERS is not set
230CONFIG_HAVE_OPROFILE=y
231# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
232CONFIG_SLABINFO=y
192CONFIG_RT_MUTEXES=y 233CONFIG_RT_MUTEXES=y
193# CONFIG_TINY_SHMEM is not set 234# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0 235CONFIG_BASE_SMALL=0
195CONFIG_MODULES=y 236CONFIG_MODULES=y
237# CONFIG_MODULE_FORCE_LOAD is not set
196CONFIG_MODULE_UNLOAD=y 238CONFIG_MODULE_UNLOAD=y
197# CONFIG_MODULE_FORCE_UNLOAD is not set 239# CONFIG_MODULE_FORCE_UNLOAD is not set
198CONFIG_MODVERSIONS=y 240CONFIG_MODVERSIONS=y
@@ -203,6 +245,7 @@ CONFIG_BLOCK=y
203# CONFIG_BLK_DEV_IO_TRACE is not set 245# CONFIG_BLK_DEV_IO_TRACE is not set
204# CONFIG_LSF is not set 246# CONFIG_LSF is not set
205# CONFIG_BLK_DEV_BSG is not set 247# CONFIG_BLK_DEV_BSG is not set
248# CONFIG_BLK_DEV_INTEGRITY is not set
206 249
207# 250#
208# IO Schedulers 251# IO Schedulers
@@ -216,6 +259,8 @@ CONFIG_DEFAULT_AS=y
216# CONFIG_DEFAULT_CFQ is not set 259# CONFIG_DEFAULT_CFQ is not set
217# CONFIG_DEFAULT_NOOP is not set 260# CONFIG_DEFAULT_NOOP is not set
218CONFIG_DEFAULT_IOSCHED="anticipatory" 261CONFIG_DEFAULT_IOSCHED="anticipatory"
262CONFIG_CLASSIC_RCU=y
263# CONFIG_FREEZER is not set
219 264
220# 265#
221# Bus options (PCI, PCMCIA, EISA, ISA, TC) 266# Bus options (PCI, PCMCIA, EISA, ISA, TC)
@@ -224,29 +269,24 @@ CONFIG_HW_HAS_EISA=y
224# CONFIG_ARCH_SUPPORTS_MSI is not set 269# CONFIG_ARCH_SUPPORTS_MSI is not set
225# CONFIG_EISA is not set 270# CONFIG_EISA is not set
226CONFIG_MMU=y 271CONFIG_MMU=y
227 272CONFIG_I8253=y
228#
229# PCCARD (PCMCIA/CardBus) support
230#
231 273
232# 274#
233# Executable file formats 275# Executable file formats
234# 276#
235CONFIG_BINFMT_ELF=y 277CONFIG_BINFMT_ELF=y
278# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
279# CONFIG_HAVE_AOUT is not set
236CONFIG_BINFMT_MISC=m 280CONFIG_BINFMT_MISC=m
237CONFIG_TRAD_SIGNALS=y 281CONFIG_TRAD_SIGNALS=y
238 282
239# 283#
240# Power management options 284# Power management options
241# 285#
286CONFIG_ARCH_SUSPEND_POSSIBLE=y
242CONFIG_PM=y 287CONFIG_PM=y
243# CONFIG_PM_LEGACY is not set
244# CONFIG_PM_DEBUG is not set 288# CONFIG_PM_DEBUG is not set
245# CONFIG_SUSPEND is not set 289# CONFIG_SUSPEND is not set
246
247#
248# Networking
249#
250CONFIG_NET=y 290CONFIG_NET=y
251 291
252# 292#
@@ -259,6 +299,8 @@ CONFIG_XFRM=y
259CONFIG_XFRM_USER=m 299CONFIG_XFRM_USER=m
260# CONFIG_XFRM_SUB_POLICY is not set 300# CONFIG_XFRM_SUB_POLICY is not set
261CONFIG_XFRM_MIGRATE=y 301CONFIG_XFRM_MIGRATE=y
302# CONFIG_XFRM_STATISTICS is not set
303CONFIG_XFRM_IPCOMP=m
262CONFIG_NET_KEY=y 304CONFIG_NET_KEY=y
263CONFIG_NET_KEY_MIGRATE=y 305CONFIG_NET_KEY_MIGRATE=y
264CONFIG_INET=y 306CONFIG_INET=y
@@ -282,42 +324,13 @@ CONFIG_INET_TUNNEL=m
282CONFIG_INET_XFRM_MODE_TRANSPORT=m 324CONFIG_INET_XFRM_MODE_TRANSPORT=m
283CONFIG_INET_XFRM_MODE_TUNNEL=m 325CONFIG_INET_XFRM_MODE_TUNNEL=m
284CONFIG_INET_XFRM_MODE_BEET=m 326CONFIG_INET_XFRM_MODE_BEET=m
327# CONFIG_INET_LRO is not set
285CONFIG_INET_DIAG=y 328CONFIG_INET_DIAG=y
286CONFIG_INET_TCP_DIAG=y 329CONFIG_INET_TCP_DIAG=y
287# CONFIG_TCP_CONG_ADVANCED is not set 330# CONFIG_TCP_CONG_ADVANCED is not set
288CONFIG_TCP_CONG_CUBIC=y 331CONFIG_TCP_CONG_CUBIC=y
289CONFIG_DEFAULT_TCP_CONG="cubic" 332CONFIG_DEFAULT_TCP_CONG="cubic"
290CONFIG_TCP_MD5SIG=y 333CONFIG_TCP_MD5SIG=y
291CONFIG_IP_VS=m
292# CONFIG_IP_VS_DEBUG is not set
293CONFIG_IP_VS_TAB_BITS=12
294
295#
296# IPVS transport protocol load balancing support
297#
298CONFIG_IP_VS_PROTO_TCP=y
299CONFIG_IP_VS_PROTO_UDP=y
300CONFIG_IP_VS_PROTO_ESP=y
301CONFIG_IP_VS_PROTO_AH=y
302
303#
304# IPVS scheduler
305#
306CONFIG_IP_VS_RR=m
307CONFIG_IP_VS_WRR=m
308CONFIG_IP_VS_LC=m
309CONFIG_IP_VS_WLC=m
310CONFIG_IP_VS_LBLC=m
311CONFIG_IP_VS_LBLCR=m
312CONFIG_IP_VS_DH=m
313CONFIG_IP_VS_SH=m
314CONFIG_IP_VS_SED=m
315CONFIG_IP_VS_NQ=m
316
317#
318# IPVS application helper
319#
320CONFIG_IP_VS_FTP=m
321CONFIG_IPV6=m 334CONFIG_IPV6=m
322CONFIG_IPV6_PRIVACY=y 335CONFIG_IPV6_PRIVACY=y
323CONFIG_IPV6_ROUTER_PREF=y 336CONFIG_IPV6_ROUTER_PREF=y
@@ -334,12 +347,16 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
334CONFIG_INET6_XFRM_MODE_BEET=m 347CONFIG_INET6_XFRM_MODE_BEET=m
335CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 348CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
336CONFIG_IPV6_SIT=m 349CONFIG_IPV6_SIT=m
350CONFIG_IPV6_NDISC_NODETYPE=y
337CONFIG_IPV6_TUNNEL=m 351CONFIG_IPV6_TUNNEL=m
338CONFIG_IPV6_MULTIPLE_TABLES=y 352CONFIG_IPV6_MULTIPLE_TABLES=y
339CONFIG_IPV6_SUBTREES=y 353CONFIG_IPV6_SUBTREES=y
354CONFIG_IPV6_MROUTE=y
355CONFIG_IPV6_PIMSM_V2=y
340CONFIG_NETWORK_SECMARK=y 356CONFIG_NETWORK_SECMARK=y
341CONFIG_NETFILTER=y 357CONFIG_NETFILTER=y
342# CONFIG_NETFILTER_DEBUG is not set 358# CONFIG_NETFILTER_DEBUG is not set
359CONFIG_NETFILTER_ADVANCED=y
343 360
344# 361#
345# Core Netfilter Configuration 362# Core Netfilter Configuration
@@ -347,12 +364,12 @@ CONFIG_NETFILTER=y
347CONFIG_NETFILTER_NETLINK=m 364CONFIG_NETFILTER_NETLINK=m
348CONFIG_NETFILTER_NETLINK_QUEUE=m 365CONFIG_NETFILTER_NETLINK_QUEUE=m
349CONFIG_NETFILTER_NETLINK_LOG=m 366CONFIG_NETFILTER_NETLINK_LOG=m
350CONFIG_NF_CONNTRACK_ENABLED=m
351CONFIG_NF_CONNTRACK=m 367CONFIG_NF_CONNTRACK=m
352CONFIG_NF_CT_ACCT=y 368CONFIG_NF_CT_ACCT=y
353CONFIG_NF_CONNTRACK_MARK=y 369CONFIG_NF_CONNTRACK_MARK=y
354CONFIG_NF_CONNTRACK_SECMARK=y 370CONFIG_NF_CONNTRACK_SECMARK=y
355CONFIG_NF_CONNTRACK_EVENTS=y 371CONFIG_NF_CONNTRACK_EVENTS=y
372CONFIG_NF_CT_PROTO_DCCP=m
356CONFIG_NF_CT_PROTO_GRE=m 373CONFIG_NF_CT_PROTO_GRE=m
357CONFIG_NF_CT_PROTO_SCTP=m 374CONFIG_NF_CT_PROTO_SCTP=m
358CONFIG_NF_CT_PROTO_UDPLITE=m 375CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -366,18 +383,22 @@ CONFIG_NF_CONNTRACK_SANE=m
366CONFIG_NF_CONNTRACK_SIP=m 383CONFIG_NF_CONNTRACK_SIP=m
367CONFIG_NF_CONNTRACK_TFTP=m 384CONFIG_NF_CONNTRACK_TFTP=m
368CONFIG_NF_CT_NETLINK=m 385CONFIG_NF_CT_NETLINK=m
386CONFIG_NETFILTER_TPROXY=m
369CONFIG_NETFILTER_XTABLES=m 387CONFIG_NETFILTER_XTABLES=m
370CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 388CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
371CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 389CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
390CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
372CONFIG_NETFILTER_XT_TARGET_DSCP=m 391CONFIG_NETFILTER_XT_TARGET_DSCP=m
373CONFIG_NETFILTER_XT_TARGET_MARK=m 392CONFIG_NETFILTER_XT_TARGET_MARK=m
374CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
375CONFIG_NETFILTER_XT_TARGET_NFLOG=m 393CONFIG_NETFILTER_XT_TARGET_NFLOG=m
394CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
376CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 395CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
396CONFIG_NETFILTER_XT_TARGET_RATEEST=m
397CONFIG_NETFILTER_XT_TARGET_TPROXY=m
377CONFIG_NETFILTER_XT_TARGET_TRACE=m 398CONFIG_NETFILTER_XT_TARGET_TRACE=m
378CONFIG_NETFILTER_XT_TARGET_SECMARK=m 399CONFIG_NETFILTER_XT_TARGET_SECMARK=m
379CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
380CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 400CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
401CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
381CONFIG_NETFILTER_XT_MATCH_COMMENT=m 402CONFIG_NETFILTER_XT_MATCH_COMMENT=m
382CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 403CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
383CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 404CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -386,39 +407,75 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
386CONFIG_NETFILTER_XT_MATCH_DCCP=m 407CONFIG_NETFILTER_XT_MATCH_DCCP=m
387CONFIG_NETFILTER_XT_MATCH_DSCP=m 408CONFIG_NETFILTER_XT_MATCH_DSCP=m
388CONFIG_NETFILTER_XT_MATCH_ESP=m 409CONFIG_NETFILTER_XT_MATCH_ESP=m
410CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
389CONFIG_NETFILTER_XT_MATCH_HELPER=m 411CONFIG_NETFILTER_XT_MATCH_HELPER=m
412CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
390CONFIG_NETFILTER_XT_MATCH_LENGTH=m 413CONFIG_NETFILTER_XT_MATCH_LENGTH=m
391CONFIG_NETFILTER_XT_MATCH_LIMIT=m 414CONFIG_NETFILTER_XT_MATCH_LIMIT=m
392CONFIG_NETFILTER_XT_MATCH_MAC=m 415CONFIG_NETFILTER_XT_MATCH_MAC=m
393CONFIG_NETFILTER_XT_MATCH_MARK=m 416CONFIG_NETFILTER_XT_MATCH_MARK=m
394CONFIG_NETFILTER_XT_MATCH_POLICY=m
395CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 417CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
418CONFIG_NETFILTER_XT_MATCH_OWNER=m
419CONFIG_NETFILTER_XT_MATCH_POLICY=m
396CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 420CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
397CONFIG_NETFILTER_XT_MATCH_QUOTA=m 421CONFIG_NETFILTER_XT_MATCH_QUOTA=m
422CONFIG_NETFILTER_XT_MATCH_RATEEST=m
398CONFIG_NETFILTER_XT_MATCH_REALM=m 423CONFIG_NETFILTER_XT_MATCH_REALM=m
424CONFIG_NETFILTER_XT_MATCH_RECENT=m
425CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
399CONFIG_NETFILTER_XT_MATCH_SCTP=m 426CONFIG_NETFILTER_XT_MATCH_SCTP=m
427CONFIG_NETFILTER_XT_MATCH_SOCKET=m
400CONFIG_NETFILTER_XT_MATCH_STATE=m 428CONFIG_NETFILTER_XT_MATCH_STATE=m
401CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 429CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
402CONFIG_NETFILTER_XT_MATCH_STRING=m 430CONFIG_NETFILTER_XT_MATCH_STRING=m
403CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 431CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
432CONFIG_NETFILTER_XT_MATCH_TIME=m
404CONFIG_NETFILTER_XT_MATCH_U32=m 433CONFIG_NETFILTER_XT_MATCH_U32=m
405CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 434CONFIG_IP_VS=m
435CONFIG_IP_VS_IPV6=y
436# CONFIG_IP_VS_DEBUG is not set
437CONFIG_IP_VS_TAB_BITS=12
438
439#
440# IPVS transport protocol load balancing support
441#
442CONFIG_IP_VS_PROTO_TCP=y
443CONFIG_IP_VS_PROTO_UDP=y
444CONFIG_IP_VS_PROTO_AH_ESP=y
445CONFIG_IP_VS_PROTO_ESP=y
446CONFIG_IP_VS_PROTO_AH=y
447
448#
449# IPVS scheduler
450#
451CONFIG_IP_VS_RR=m
452CONFIG_IP_VS_WRR=m
453CONFIG_IP_VS_LC=m
454CONFIG_IP_VS_WLC=m
455CONFIG_IP_VS_LBLC=m
456CONFIG_IP_VS_LBLCR=m
457CONFIG_IP_VS_DH=m
458CONFIG_IP_VS_SH=m
459CONFIG_IP_VS_SED=m
460CONFIG_IP_VS_NQ=m
461
462#
463# IPVS application helper
464#
465CONFIG_IP_VS_FTP=m
406 466
407# 467#
408# IP: Netfilter Configuration 468# IP: Netfilter Configuration
409# 469#
470CONFIG_NF_DEFRAG_IPV4=m
410CONFIG_NF_CONNTRACK_IPV4=m 471CONFIG_NF_CONNTRACK_IPV4=m
411CONFIG_NF_CONNTRACK_PROC_COMPAT=y 472CONFIG_NF_CONNTRACK_PROC_COMPAT=y
412CONFIG_IP_NF_QUEUE=m 473CONFIG_IP_NF_QUEUE=m
413CONFIG_IP_NF_IPTABLES=m 474CONFIG_IP_NF_IPTABLES=m
414CONFIG_IP_NF_MATCH_IPRANGE=m 475CONFIG_IP_NF_MATCH_ADDRTYPE=m
415CONFIG_IP_NF_MATCH_TOS=m
416CONFIG_IP_NF_MATCH_RECENT=m
417CONFIG_IP_NF_MATCH_ECN=m
418CONFIG_IP_NF_MATCH_AH=m 476CONFIG_IP_NF_MATCH_AH=m
477CONFIG_IP_NF_MATCH_ECN=m
419CONFIG_IP_NF_MATCH_TTL=m 478CONFIG_IP_NF_MATCH_TTL=m
420CONFIG_IP_NF_MATCH_OWNER=m
421CONFIG_IP_NF_MATCH_ADDRTYPE=m
422CONFIG_IP_NF_FILTER=m 479CONFIG_IP_NF_FILTER=m
423CONFIG_IP_NF_TARGET_REJECT=m 480CONFIG_IP_NF_TARGET_REJECT=m
424CONFIG_IP_NF_TARGET_LOG=m 481CONFIG_IP_NF_TARGET_LOG=m
@@ -426,11 +483,13 @@ CONFIG_IP_NF_TARGET_ULOG=m
426CONFIG_NF_NAT=m 483CONFIG_NF_NAT=m
427CONFIG_NF_NAT_NEEDED=y 484CONFIG_NF_NAT_NEEDED=y
428CONFIG_IP_NF_TARGET_MASQUERADE=m 485CONFIG_IP_NF_TARGET_MASQUERADE=m
429CONFIG_IP_NF_TARGET_REDIRECT=m
430CONFIG_IP_NF_TARGET_NETMAP=m 486CONFIG_IP_NF_TARGET_NETMAP=m
431CONFIG_IP_NF_TARGET_SAME=m 487CONFIG_IP_NF_TARGET_REDIRECT=m
432CONFIG_NF_NAT_SNMP_BASIC=m 488CONFIG_NF_NAT_SNMP_BASIC=m
489CONFIG_NF_NAT_PROTO_DCCP=m
433CONFIG_NF_NAT_PROTO_GRE=m 490CONFIG_NF_NAT_PROTO_GRE=m
491CONFIG_NF_NAT_PROTO_UDPLITE=m
492CONFIG_NF_NAT_PROTO_SCTP=m
434CONFIG_NF_NAT_FTP=m 493CONFIG_NF_NAT_FTP=m
435CONFIG_NF_NAT_IRC=m 494CONFIG_NF_NAT_IRC=m
436CONFIG_NF_NAT_TFTP=m 495CONFIG_NF_NAT_TFTP=m
@@ -439,32 +498,30 @@ CONFIG_NF_NAT_PPTP=m
439CONFIG_NF_NAT_H323=m 498CONFIG_NF_NAT_H323=m
440CONFIG_NF_NAT_SIP=m 499CONFIG_NF_NAT_SIP=m
441CONFIG_IP_NF_MANGLE=m 500CONFIG_IP_NF_MANGLE=m
442CONFIG_IP_NF_TARGET_TOS=m 501CONFIG_IP_NF_TARGET_CLUSTERIP=m
443CONFIG_IP_NF_TARGET_ECN=m 502CONFIG_IP_NF_TARGET_ECN=m
444CONFIG_IP_NF_TARGET_TTL=m 503CONFIG_IP_NF_TARGET_TTL=m
445CONFIG_IP_NF_TARGET_CLUSTERIP=m
446CONFIG_IP_NF_RAW=m 504CONFIG_IP_NF_RAW=m
447CONFIG_IP_NF_ARPTABLES=m 505CONFIG_IP_NF_ARPTABLES=m
448CONFIG_IP_NF_ARPFILTER=m 506CONFIG_IP_NF_ARPFILTER=m
449CONFIG_IP_NF_ARP_MANGLE=m 507CONFIG_IP_NF_ARP_MANGLE=m
450 508
451# 509#
452# IPv6: Netfilter Configuration (EXPERIMENTAL) 510# IPv6: Netfilter Configuration
453# 511#
454CONFIG_NF_CONNTRACK_IPV6=m 512CONFIG_NF_CONNTRACK_IPV6=m
455CONFIG_IP6_NF_QUEUE=m 513CONFIG_IP6_NF_QUEUE=m
456CONFIG_IP6_NF_IPTABLES=m 514CONFIG_IP6_NF_IPTABLES=m
457CONFIG_IP6_NF_MATCH_RT=m 515CONFIG_IP6_NF_MATCH_AH=m
458CONFIG_IP6_NF_MATCH_OPTS=m 516CONFIG_IP6_NF_MATCH_EUI64=m
459CONFIG_IP6_NF_MATCH_FRAG=m 517CONFIG_IP6_NF_MATCH_FRAG=m
518CONFIG_IP6_NF_MATCH_OPTS=m
460CONFIG_IP6_NF_MATCH_HL=m 519CONFIG_IP6_NF_MATCH_HL=m
461CONFIG_IP6_NF_MATCH_OWNER=m
462CONFIG_IP6_NF_MATCH_IPV6HEADER=m 520CONFIG_IP6_NF_MATCH_IPV6HEADER=m
463CONFIG_IP6_NF_MATCH_AH=m
464CONFIG_IP6_NF_MATCH_MH=m 521CONFIG_IP6_NF_MATCH_MH=m
465CONFIG_IP6_NF_MATCH_EUI64=m 522CONFIG_IP6_NF_MATCH_RT=m
466CONFIG_IP6_NF_FILTER=m
467CONFIG_IP6_NF_TARGET_LOG=m 523CONFIG_IP6_NF_TARGET_LOG=m
524CONFIG_IP6_NF_FILTER=m
468CONFIG_IP6_NF_TARGET_REJECT=m 525CONFIG_IP6_NF_TARGET_REJECT=m
469CONFIG_IP6_NF_MANGLE=m 526CONFIG_IP6_NF_MANGLE=m
470CONFIG_IP6_NF_TARGET_HL=m 527CONFIG_IP6_NF_TARGET_HL=m
@@ -479,6 +536,7 @@ CONFIG_SCTP_HMAC_MD5=y
479# CONFIG_TIPC is not set 536# CONFIG_TIPC is not set
480# CONFIG_ATM is not set 537# CONFIG_ATM is not set
481# CONFIG_BRIDGE is not set 538# CONFIG_BRIDGE is not set
539# CONFIG_NET_DSA is not set
482# CONFIG_VLAN_8021Q is not set 540# CONFIG_VLAN_8021Q is not set
483# CONFIG_DECNET is not set 541# CONFIG_DECNET is not set
484# CONFIG_LLC2 is not set 542# CONFIG_LLC2 is not set
@@ -488,12 +546,7 @@ CONFIG_SCTP_HMAC_MD5=y
488# CONFIG_LAPB is not set 546# CONFIG_LAPB is not set
489# CONFIG_ECONET is not set 547# CONFIG_ECONET is not set
490# CONFIG_WAN_ROUTER is not set 548# CONFIG_WAN_ROUTER is not set
491
492#
493# QoS and/or fair queueing
494#
495CONFIG_NET_SCHED=y 549CONFIG_NET_SCHED=y
496CONFIG_NET_SCH_FIFO=y
497 550
498# 551#
499# Queueing/Scheduling 552# Queueing/Scheduling
@@ -502,7 +555,7 @@ CONFIG_NET_SCH_CBQ=m
502CONFIG_NET_SCH_HTB=m 555CONFIG_NET_SCH_HTB=m
503CONFIG_NET_SCH_HFSC=m 556CONFIG_NET_SCH_HFSC=m
504CONFIG_NET_SCH_PRIO=m 557CONFIG_NET_SCH_PRIO=m
505CONFIG_NET_SCH_RR=m 558# CONFIG_NET_SCH_MULTIQ is not set
506CONFIG_NET_SCH_RED=m 559CONFIG_NET_SCH_RED=m
507CONFIG_NET_SCH_SFQ=m 560CONFIG_NET_SCH_SFQ=m
508CONFIG_NET_SCH_TEQL=m 561CONFIG_NET_SCH_TEQL=m
@@ -526,6 +579,7 @@ CONFIG_NET_CLS_U32=m
526# CONFIG_CLS_U32_MARK is not set 579# CONFIG_CLS_U32_MARK is not set
527CONFIG_NET_CLS_RSVP=m 580CONFIG_NET_CLS_RSVP=m
528CONFIG_NET_CLS_RSVP6=m 581CONFIG_NET_CLS_RSVP6=m
582CONFIG_NET_CLS_FLOW=m
529# CONFIG_NET_EMATCH is not set 583# CONFIG_NET_EMATCH is not set
530CONFIG_NET_CLS_ACT=y 584CONFIG_NET_CLS_ACT=y
531CONFIG_NET_ACT_POLICE=y 585CONFIG_NET_ACT_POLICE=y
@@ -533,35 +587,28 @@ CONFIG_NET_ACT_GACT=m
533CONFIG_GACT_PROB=y 587CONFIG_GACT_PROB=y
534CONFIG_NET_ACT_MIRRED=m 588CONFIG_NET_ACT_MIRRED=m
535CONFIG_NET_ACT_IPT=m 589CONFIG_NET_ACT_IPT=m
590CONFIG_NET_ACT_NAT=m
536CONFIG_NET_ACT_PEDIT=m 591CONFIG_NET_ACT_PEDIT=m
537CONFIG_NET_ACT_SIMP=m 592CONFIG_NET_ACT_SIMP=m
538CONFIG_NET_CLS_POLICE=y 593CONFIG_NET_ACT_SKBEDIT=m
539# CONFIG_NET_CLS_IND is not set 594# CONFIG_NET_CLS_IND is not set
595CONFIG_NET_SCH_FIFO=y
540 596
541# 597#
542# Network testing 598# Network testing
543# 599#
544# CONFIG_NET_PKTGEN is not set 600# CONFIG_NET_PKTGEN is not set
545# CONFIG_HAMRADIO is not set 601# CONFIG_HAMRADIO is not set
602# CONFIG_CAN is not set
546# CONFIG_IRDA is not set 603# CONFIG_IRDA is not set
547# CONFIG_BT is not set 604# CONFIG_BT is not set
548# CONFIG_AF_RXRPC is not set 605# CONFIG_AF_RXRPC is not set
606CONFIG_PHONET=m
549CONFIG_FIB_RULES=y 607CONFIG_FIB_RULES=y
550 608# CONFIG_WIRELESS is not set
551#
552# Wireless
553#
554CONFIG_CFG80211=m
555CONFIG_WIRELESS_EXT=y 609CONFIG_WIRELESS_EXT=y
556CONFIG_MAC80211=m
557# CONFIG_MAC80211_DEBUG is not set
558CONFIG_IEEE80211=m 610CONFIG_IEEE80211=m
559# CONFIG_IEEE80211_DEBUG is not set
560CONFIG_IEEE80211_CRYPT_WEP=m 611CONFIG_IEEE80211_CRYPT_WEP=m
561CONFIG_IEEE80211_CRYPT_CCMP=m
562CONFIG_IEEE80211_CRYPT_TKIP=m
563CONFIG_IEEE80211_SOFTMAC=m
564# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
565CONFIG_RFKILL=m 612CONFIG_RFKILL=m
566CONFIG_RFKILL_INPUT=m 613CONFIG_RFKILL_INPUT=m
567# CONFIG_NET_9P is not set 614# CONFIG_NET_9P is not set
@@ -588,7 +635,9 @@ CONFIG_CDROM_PKTCDVD=m
588CONFIG_CDROM_PKTCDVD_BUFFERS=8 635CONFIG_CDROM_PKTCDVD_BUFFERS=8
589# CONFIG_CDROM_PKTCDVD_WCACHE is not set 636# CONFIG_CDROM_PKTCDVD_WCACHE is not set
590CONFIG_ATA_OVER_ETH=m 637CONFIG_ATA_OVER_ETH=m
638# CONFIG_BLK_DEV_HD is not set
591# CONFIG_MISC_DEVICES is not set 639# CONFIG_MISC_DEVICES is not set
640CONFIG_HAVE_IDE=y
592# CONFIG_IDE is not set 641# CONFIG_IDE is not set
593 642
594# 643#
@@ -628,20 +677,22 @@ CONFIG_SCSI_SPI_ATTRS=m
628# CONFIG_SCSI_FC_ATTRS is not set 677# CONFIG_SCSI_FC_ATTRS is not set
629CONFIG_SCSI_ISCSI_ATTRS=m 678CONFIG_SCSI_ISCSI_ATTRS=m
630# CONFIG_SCSI_SAS_LIBSAS is not set 679# CONFIG_SCSI_SAS_LIBSAS is not set
680# CONFIG_SCSI_SRP_ATTRS is not set
631CONFIG_SCSI_LOWLEVEL=y 681CONFIG_SCSI_LOWLEVEL=y
632CONFIG_ISCSI_TCP=m 682CONFIG_ISCSI_TCP=m
633CONFIG_SGIWD93_SCSI=y 683CONFIG_SGIWD93_SCSI=y
634# CONFIG_SCSI_DEBUG is not set 684# CONFIG_SCSI_DEBUG is not set
685# CONFIG_SCSI_DH is not set
635# CONFIG_ATA is not set 686# CONFIG_ATA is not set
636# CONFIG_MD is not set 687# CONFIG_MD is not set
637CONFIG_NETDEVICES=y 688CONFIG_NETDEVICES=y
638# CONFIG_NETDEVICES_MULTIQUEUE is not set
639# CONFIG_IFB is not set 689# CONFIG_IFB is not set
640CONFIG_DUMMY=m 690CONFIG_DUMMY=m
641CONFIG_BONDING=m 691CONFIG_BONDING=m
642CONFIG_MACVLAN=m 692CONFIG_MACVLAN=m
643CONFIG_EQUALIZER=m 693CONFIG_EQUALIZER=m
644CONFIG_TUN=m 694CONFIG_TUN=m
695CONFIG_VETH=m
645CONFIG_PHYLIB=m 696CONFIG_PHYLIB=m
646 697
647# 698#
@@ -656,11 +707,21 @@ CONFIG_CICADA_PHY=m
656# CONFIG_SMSC_PHY is not set 707# CONFIG_SMSC_PHY is not set
657# CONFIG_BROADCOM_PHY is not set 708# CONFIG_BROADCOM_PHY is not set
658# CONFIG_ICPLUS_PHY is not set 709# CONFIG_ICPLUS_PHY is not set
659# CONFIG_FIXED_PHY is not set 710CONFIG_REALTEK_PHY=m
711CONFIG_MDIO_BITBANG=m
660CONFIG_NET_ETHERNET=y 712CONFIG_NET_ETHERNET=y
661# CONFIG_MII is not set 713CONFIG_MII=m
662# CONFIG_AX88796 is not set 714# CONFIG_AX88796 is not set
715CONFIG_SMC91X=m
663# CONFIG_DM9000 is not set 716# CONFIG_DM9000 is not set
717# CONFIG_IBM_NEW_EMAC_ZMII is not set
718# CONFIG_IBM_NEW_EMAC_RGMII is not set
719# CONFIG_IBM_NEW_EMAC_TAH is not set
720# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
721# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
722# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
723# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
724# CONFIG_B44 is not set
664CONFIG_SGISEEQ=y 725CONFIG_SGISEEQ=y
665# CONFIG_NETDEV_1000 is not set 726# CONFIG_NETDEV_1000 is not set
666# CONFIG_NETDEV_10000 is not set 727# CONFIG_NETDEV_10000 is not set
@@ -672,12 +733,12 @@ CONFIG_WLAN_PRE80211=y
672CONFIG_STRIP=m 733CONFIG_STRIP=m
673CONFIG_WLAN_80211=y 734CONFIG_WLAN_80211=y
674# CONFIG_LIBERTAS is not set 735# CONFIG_LIBERTAS is not set
736# CONFIG_IWLWIFI_LEDS is not set
675CONFIG_HOSTAP=m 737CONFIG_HOSTAP=m
676# CONFIG_HOSTAP_FIRMWARE is not set 738# CONFIG_HOSTAP_FIRMWARE is not set
677# CONFIG_WAN is not set 739# CONFIG_WAN is not set
678# CONFIG_PPP is not set 740# CONFIG_PPP is not set
679# CONFIG_SLIP is not set 741# CONFIG_SLIP is not set
680# CONFIG_SHAPER is not set
681# CONFIG_NETCONSOLE is not set 742# CONFIG_NETCONSOLE is not set
682# CONFIG_NETPOLL is not set 743# CONFIG_NETPOLL is not set
683# CONFIG_NET_POLL_CONTROLLER is not set 744# CONFIG_NET_POLL_CONTROLLER is not set
@@ -699,7 +760,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
699CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 760CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
700CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 761CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
701# CONFIG_INPUT_JOYDEV is not set 762# CONFIG_INPUT_JOYDEV is not set
702# CONFIG_INPUT_TSDEV is not set
703# CONFIG_INPUT_EVDEV is not set 763# CONFIG_INPUT_EVDEV is not set
704# CONFIG_INPUT_EVBUG is not set 764# CONFIG_INPUT_EVBUG is not set
705 765
@@ -720,6 +780,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
720# CONFIG_MOUSE_PS2_SYNAPTICS is not set 780# CONFIG_MOUSE_PS2_SYNAPTICS is not set
721# CONFIG_MOUSE_PS2_LIFEBOOK is not set 781# CONFIG_MOUSE_PS2_LIFEBOOK is not set
722CONFIG_MOUSE_PS2_TRACKPOINT=y 782CONFIG_MOUSE_PS2_TRACKPOINT=y
783# CONFIG_MOUSE_PS2_ELANTECH is not set
723# CONFIG_MOUSE_PS2_TOUCHKIT is not set 784# CONFIG_MOUSE_PS2_TOUCHKIT is not set
724CONFIG_MOUSE_SERIAL=m 785CONFIG_MOUSE_SERIAL=m
725# CONFIG_MOUSE_VSXXXAA is not set 786# CONFIG_MOUSE_VSXXXAA is not set
@@ -742,9 +803,11 @@ CONFIG_SERIO_RAW=m
742# Character devices 803# Character devices
743# 804#
744CONFIG_VT=y 805CONFIG_VT=y
806CONFIG_CONSOLE_TRANSLATIONS=y
745CONFIG_VT_CONSOLE=y 807CONFIG_VT_CONSOLE=y
746CONFIG_HW_CONSOLE=y 808CONFIG_HW_CONSOLE=y
747CONFIG_VT_HW_CONSOLE_BINDING=y 809CONFIG_VT_HW_CONSOLE_BINDING=y
810CONFIG_DEVKMEM=y
748# CONFIG_SERIAL_NONSTANDARD is not set 811# CONFIG_SERIAL_NONSTANDARD is not set
749 812
750# 813#
@@ -761,6 +824,17 @@ CONFIG_UNIX98_PTYS=y
761CONFIG_LEGACY_PTYS=y 824CONFIG_LEGACY_PTYS=y
762CONFIG_LEGACY_PTY_COUNT=256 825CONFIG_LEGACY_PTY_COUNT=256
763# CONFIG_IPMI_HANDLER is not set 826# CONFIG_IPMI_HANDLER is not set
827# CONFIG_HW_RANDOM is not set
828# CONFIG_R3964 is not set
829CONFIG_RAW_DRIVER=m
830CONFIG_MAX_RAW_DEVS=256
831# CONFIG_TCG_TPM is not set
832# CONFIG_I2C is not set
833# CONFIG_SPI is not set
834# CONFIG_W1 is not set
835# CONFIG_POWER_SUPPLY is not set
836# CONFIG_HWMON is not set
837CONFIG_THERMAL=m
764CONFIG_WATCHDOG=y 838CONFIG_WATCHDOG=y
765# CONFIG_WATCHDOG_NOWAYOUT is not set 839# CONFIG_WATCHDOG_NOWAYOUT is not set
766 840
@@ -769,47 +843,50 @@ CONFIG_WATCHDOG=y
769# 843#
770# CONFIG_SOFT_WATCHDOG is not set 844# CONFIG_SOFT_WATCHDOG is not set
771CONFIG_INDYDOG=m 845CONFIG_INDYDOG=m
772# CONFIG_HW_RANDOM is not set 846CONFIG_SSB_POSSIBLE=y
773# CONFIG_RTC is not set
774# CONFIG_R3964 is not set
775CONFIG_RAW_DRIVER=m
776CONFIG_MAX_RAW_DEVS=256
777# CONFIG_TCG_TPM is not set
778# CONFIG_I2C is not set
779 847
780# 848#
781# SPI support 849# Sonics Silicon Backplane
782# 850#
783# CONFIG_SPI is not set 851# CONFIG_SSB is not set
784# CONFIG_SPI_MASTER is not set
785# CONFIG_W1 is not set
786# CONFIG_POWER_SUPPLY is not set
787# CONFIG_HWMON is not set
788 852
789# 853#
790# Multifunction device drivers 854# Multifunction device drivers
791# 855#
856# CONFIG_MFD_CORE is not set
792# CONFIG_MFD_SM501 is not set 857# CONFIG_MFD_SM501 is not set
858# CONFIG_HTC_PASIC3 is not set
859# CONFIG_MFD_TMIO is not set
860# CONFIG_REGULATOR is not set
793 861
794# 862#
795# Multimedia devices 863# Multimedia devices
796# 864#
865
866#
867# Multimedia core support
868#
797# CONFIG_VIDEO_DEV is not set 869# CONFIG_VIDEO_DEV is not set
798# CONFIG_DVB_CORE is not set 870# CONFIG_DVB_CORE is not set
871# CONFIG_VIDEO_MEDIA is not set
872
873#
874# Multimedia drivers
875#
799# CONFIG_DAB is not set 876# CONFIG_DAB is not set
800 877
801# 878#
802# Graphics support 879# Graphics support
803# 880#
881# CONFIG_VGASTATE is not set
882# CONFIG_VIDEO_OUTPUT_CONTROL is not set
883# CONFIG_FB is not set
804# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 884# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
805 885
806# 886#
807# Display device support 887# Display device support
808# 888#
809# CONFIG_DISPLAY_SUPPORT is not set 889# CONFIG_DISPLAY_SUPPORT is not set
810# CONFIG_VGASTATE is not set
811# CONFIG_VIDEO_OUTPUT_CONTROL is not set
812# CONFIG_FB is not set
813 890
814# 891#
815# Console display driver support 892# Console display driver support
@@ -823,48 +900,77 @@ CONFIG_LOGO=y
823# CONFIG_LOGO_LINUX_VGA16 is not set 900# CONFIG_LOGO_LINUX_VGA16 is not set
824# CONFIG_LOGO_LINUX_CLUT224 is not set 901# CONFIG_LOGO_LINUX_CLUT224 is not set
825CONFIG_LOGO_SGI_CLUT224=y 902CONFIG_LOGO_SGI_CLUT224=y
826
827#
828# Sound
829#
830# CONFIG_SOUND is not set 903# CONFIG_SOUND is not set
831CONFIG_HID_SUPPORT=y 904CONFIG_HID_SUPPORT=y
832CONFIG_HID=y 905CONFIG_HID=y
833# CONFIG_HID_DEBUG is not set 906# CONFIG_HID_DEBUG is not set
907CONFIG_HIDRAW=y
908CONFIG_HID_PID=y
909
910#
911# Special HID drivers
912#
913CONFIG_HID_COMPAT=y
834CONFIG_USB_SUPPORT=y 914CONFIG_USB_SUPPORT=y
835# CONFIG_USB_ARCH_HAS_HCD is not set 915# CONFIG_USB_ARCH_HAS_HCD is not set
836# CONFIG_USB_ARCH_HAS_OHCI is not set 916# CONFIG_USB_ARCH_HAS_OHCI is not set
837# CONFIG_USB_ARCH_HAS_EHCI is not set 917# CONFIG_USB_ARCH_HAS_EHCI is not set
918# CONFIG_USB_OTG_WHITELIST is not set
919# CONFIG_USB_OTG_BLACKLIST_HUB is not set
838 920
839# 921#
840# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 922# Enable Host or Gadget support to see Inventra options
841# 923#
842 924
843# 925#
844# USB Gadget Support 926# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
845# 927#
846# CONFIG_USB_GADGET is not set 928# CONFIG_USB_GADGET is not set
847# CONFIG_MMC is not set 929# CONFIG_MMC is not set
930# CONFIG_MEMSTICK is not set
848# CONFIG_NEW_LEDS is not set 931# CONFIG_NEW_LEDS is not set
849# CONFIG_RTC_CLASS is not set 932# CONFIG_ACCESSIBILITY is not set
933CONFIG_RTC_LIB=y
934CONFIG_RTC_CLASS=y
935CONFIG_RTC_HCTOSYS=y
936CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
937# CONFIG_RTC_DEBUG is not set
850 938
851# 939#
852# DMA Engine support 940# RTC interfaces
853# 941#
854# CONFIG_DMA_ENGINE is not set 942CONFIG_RTC_INTF_SYSFS=y
943CONFIG_RTC_INTF_PROC=y
944CONFIG_RTC_INTF_DEV=y
945CONFIG_RTC_INTF_DEV_UIE_EMUL=y
946# CONFIG_RTC_DRV_TEST is not set
855 947
856# 948#
857# DMA Clients 949# SPI RTC drivers
858# 950#
859 951
860# 952#
861# DMA Devices 953# Platform RTC drivers
862# 954#
955# CONFIG_RTC_DRV_CMOS is not set
956CONFIG_RTC_DRV_DS1286=y
957# CONFIG_RTC_DRV_DS1511 is not set
958# CONFIG_RTC_DRV_DS1553 is not set
959# CONFIG_RTC_DRV_DS1742 is not set
960# CONFIG_RTC_DRV_STK17TA8 is not set
961# CONFIG_RTC_DRV_M48T86 is not set
962# CONFIG_RTC_DRV_M48T35 is not set
963# CONFIG_RTC_DRV_M48T59 is not set
964# CONFIG_RTC_DRV_BQ4802 is not set
965# CONFIG_RTC_DRV_V3020 is not set
863 966
864# 967#
865# Userspace I/O 968# on-CPU RTC drivers
866# 969#
970# CONFIG_DMADEVICES is not set
867# CONFIG_UIO is not set 971# CONFIG_UIO is not set
972# CONFIG_STAGING is not set
973CONFIG_STAGING_EXCLUDE_BUILD=y
868 974
869# 975#
870# File systems 976# File systems
@@ -876,29 +982,33 @@ CONFIG_EXT3_FS=y
876CONFIG_EXT3_FS_XATTR=y 982CONFIG_EXT3_FS_XATTR=y
877CONFIG_EXT3_FS_POSIX_ACL=y 983CONFIG_EXT3_FS_POSIX_ACL=y
878CONFIG_EXT3_FS_SECURITY=y 984CONFIG_EXT3_FS_SECURITY=y
879# CONFIG_EXT4DEV_FS is not set 985CONFIG_EXT4_FS=m
986CONFIG_EXT4DEV_COMPAT=y
987CONFIG_EXT4_FS_XATTR=y
988CONFIG_EXT4_FS_POSIX_ACL=y
989CONFIG_EXT4_FS_SECURITY=y
880CONFIG_JBD=y 990CONFIG_JBD=y
881# CONFIG_JBD_DEBUG is not set 991CONFIG_JBD2=m
882CONFIG_FS_MBCACHE=y 992CONFIG_FS_MBCACHE=y
883# CONFIG_REISERFS_FS is not set 993# CONFIG_REISERFS_FS is not set
884# CONFIG_JFS_FS is not set 994# CONFIG_JFS_FS is not set
885CONFIG_FS_POSIX_ACL=y 995CONFIG_FS_POSIX_ACL=y
996CONFIG_FILE_LOCKING=y
886CONFIG_XFS_FS=m 997CONFIG_XFS_FS=m
887CONFIG_XFS_QUOTA=y 998CONFIG_XFS_QUOTA=y
888CONFIG_XFS_SECURITY=y
889# CONFIG_XFS_POSIX_ACL is not set 999# CONFIG_XFS_POSIX_ACL is not set
890# CONFIG_XFS_RT is not set 1000# CONFIG_XFS_RT is not set
891# CONFIG_GFS2_FS is not set 1001# CONFIG_XFS_DEBUG is not set
892# CONFIG_OCFS2_FS is not set 1002# CONFIG_OCFS2_FS is not set
893CONFIG_MINIX_FS=m 1003CONFIG_DNOTIFY=y
894# CONFIG_ROMFS_FS is not set
895CONFIG_INOTIFY=y 1004CONFIG_INOTIFY=y
896CONFIG_INOTIFY_USER=y 1005CONFIG_INOTIFY_USER=y
897CONFIG_QUOTA=y 1006CONFIG_QUOTA=y
1007CONFIG_QUOTA_NETLINK_INTERFACE=y
1008# CONFIG_PRINT_QUOTA_WARNING is not set
898# CONFIG_QFMT_V1 is not set 1009# CONFIG_QFMT_V1 is not set
899CONFIG_QFMT_V2=m 1010CONFIG_QFMT_V2=m
900CONFIG_QUOTACTL=y 1011CONFIG_QUOTACTL=y
901CONFIG_DNOTIFY=y
902CONFIG_AUTOFS_FS=m 1012CONFIG_AUTOFS_FS=m
903CONFIG_AUTOFS4_FS=m 1013CONFIG_AUTOFS4_FS=m
904CONFIG_FUSE_FS=m 1014CONFIG_FUSE_FS=m
@@ -929,11 +1039,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
929CONFIG_PROC_FS=y 1039CONFIG_PROC_FS=y
930CONFIG_PROC_KCORE=y 1040CONFIG_PROC_KCORE=y
931CONFIG_PROC_SYSCTL=y 1041CONFIG_PROC_SYSCTL=y
1042CONFIG_PROC_PAGE_MONITOR=y
932CONFIG_SYSFS=y 1043CONFIG_SYSFS=y
933CONFIG_TMPFS=y 1044CONFIG_TMPFS=y
934CONFIG_TMPFS_POSIX_ACL=y 1045CONFIG_TMPFS_POSIX_ACL=y
935# CONFIG_HUGETLB_PAGE is not set 1046# CONFIG_HUGETLB_PAGE is not set
936CONFIG_RAMFS=y
937CONFIG_CONFIGFS_FS=m 1047CONFIG_CONFIGFS_FS=m
938 1048
939# 1049#
@@ -949,27 +1059,25 @@ CONFIG_CONFIGFS_FS=m
949CONFIG_EFS_FS=m 1059CONFIG_EFS_FS=m
950# CONFIG_CRAMFS is not set 1060# CONFIG_CRAMFS is not set
951# CONFIG_VXFS_FS is not set 1061# CONFIG_VXFS_FS is not set
1062CONFIG_MINIX_FS=m
1063CONFIG_OMFS_FS=m
952# CONFIG_HPFS_FS is not set 1064# CONFIG_HPFS_FS is not set
953# CONFIG_QNX4FS_FS is not set 1065# CONFIG_QNX4FS_FS is not set
1066# CONFIG_ROMFS_FS is not set
954# CONFIG_SYSV_FS is not set 1067# CONFIG_SYSV_FS is not set
955CONFIG_UFS_FS=m 1068CONFIG_UFS_FS=m
956# CONFIG_UFS_FS_WRITE is not set 1069# CONFIG_UFS_FS_WRITE is not set
957# CONFIG_UFS_DEBUG is not set 1070# CONFIG_UFS_DEBUG is not set
958 1071CONFIG_NETWORK_FILESYSTEMS=y
959#
960# Network File Systems
961#
962CONFIG_NFS_FS=m 1072CONFIG_NFS_FS=m
963CONFIG_NFS_V3=y 1073CONFIG_NFS_V3=y
964CONFIG_NFS_V3_ACL=y 1074CONFIG_NFS_V3_ACL=y
965# CONFIG_NFS_V4 is not set 1075# CONFIG_NFS_V4 is not set
966# CONFIG_NFS_DIRECTIO is not set
967CONFIG_NFSD=m 1076CONFIG_NFSD=m
968CONFIG_NFSD_V2_ACL=y 1077CONFIG_NFSD_V2_ACL=y
969CONFIG_NFSD_V3=y 1078CONFIG_NFSD_V3=y
970CONFIG_NFSD_V3_ACL=y 1079CONFIG_NFSD_V3_ACL=y
971# CONFIG_NFSD_V4 is not set 1080# CONFIG_NFSD_V4 is not set
972CONFIG_NFSD_TCP=y
973CONFIG_LOCKD=m 1081CONFIG_LOCKD=m
974CONFIG_LOCKD_V4=y 1082CONFIG_LOCKD_V4=y
975CONFIG_EXPORTFS=m 1083CONFIG_EXPORTFS=m
@@ -977,7 +1085,7 @@ CONFIG_NFS_ACL_SUPPORT=m
977CONFIG_NFS_COMMON=y 1085CONFIG_NFS_COMMON=y
978CONFIG_SUNRPC=m 1086CONFIG_SUNRPC=m
979CONFIG_SUNRPC_GSS=m 1087CONFIG_SUNRPC_GSS=m
980# CONFIG_SUNRPC_BIND34 is not set 1088# CONFIG_SUNRPC_REGISTER_V4 is not set
981CONFIG_RPCSEC_GSS_KRB5=m 1089CONFIG_RPCSEC_GSS_KRB5=m
982# CONFIG_RPCSEC_GSS_SPKM3 is not set 1090# CONFIG_RPCSEC_GSS_SPKM3 is not set
983CONFIG_SMB_FS=m 1091CONFIG_SMB_FS=m
@@ -986,12 +1094,12 @@ CONFIG_SMB_NLS_REMOTE="cp437"
986CONFIG_CIFS=m 1094CONFIG_CIFS=m
987# CONFIG_CIFS_STATS is not set 1095# CONFIG_CIFS_STATS is not set
988# CONFIG_CIFS_WEAK_PW_HASH is not set 1096# CONFIG_CIFS_WEAK_PW_HASH is not set
1097CONFIG_CIFS_UPCALL=y
989# CONFIG_CIFS_XATTR is not set 1098# CONFIG_CIFS_XATTR is not set
990# CONFIG_CIFS_DEBUG2 is not set 1099# CONFIG_CIFS_DEBUG2 is not set
991# CONFIG_CIFS_EXPERIMENTAL is not set 1100# CONFIG_CIFS_EXPERIMENTAL is not set
992# CONFIG_NCP_FS is not set 1101# CONFIG_NCP_FS is not set
993CONFIG_CODA_FS=m 1102CONFIG_CODA_FS=m
994# CONFIG_CODA_FS_OLD_API is not set
995# CONFIG_AFS_FS is not set 1103# CONFIG_AFS_FS is not set
996 1104
997# 1105#
@@ -1015,10 +1123,6 @@ CONFIG_SGI_PARTITION=y
1015# CONFIG_KARMA_PARTITION is not set 1123# CONFIG_KARMA_PARTITION is not set
1016# CONFIG_EFI_PARTITION is not set 1124# CONFIG_EFI_PARTITION is not set
1017# CONFIG_SYSV68_PARTITION is not set 1125# CONFIG_SYSV68_PARTITION is not set
1018
1019#
1020# Native Language Support
1021#
1022CONFIG_NLS=m 1126CONFIG_NLS=m
1023CONFIG_NLS_DEFAULT="iso8859-1" 1127CONFIG_NLS_DEFAULT="iso8859-1"
1024CONFIG_NLS_CODEPAGE_437=m 1128CONFIG_NLS_CODEPAGE_437=m
@@ -1059,30 +1163,32 @@ CONFIG_NLS_ISO8859_15=m
1059CONFIG_NLS_KOI8_R=m 1163CONFIG_NLS_KOI8_R=m
1060CONFIG_NLS_KOI8_U=m 1164CONFIG_NLS_KOI8_U=m
1061CONFIG_NLS_UTF8=m 1165CONFIG_NLS_UTF8=m
1062
1063#
1064# Distributed Lock Manager
1065#
1066CONFIG_DLM=m 1166CONFIG_DLM=m
1067# CONFIG_DLM_DEBUG is not set 1167# CONFIG_DLM_DEBUG is not set
1068 1168
1069# 1169#
1070# Profiling support
1071#
1072# CONFIG_PROFILING is not set
1073
1074#
1075# Kernel hacking 1170# Kernel hacking
1076# 1171#
1077CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1172CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1078# CONFIG_PRINTK_TIME is not set 1173# CONFIG_PRINTK_TIME is not set
1174CONFIG_ENABLE_WARN_DEPRECATED=y
1079CONFIG_ENABLE_MUST_CHECK=y 1175CONFIG_ENABLE_MUST_CHECK=y
1176CONFIG_FRAME_WARN=1024
1080# CONFIG_MAGIC_SYSRQ is not set 1177# CONFIG_MAGIC_SYSRQ is not set
1081# CONFIG_UNUSED_SYMBOLS is not set 1178# CONFIG_UNUSED_SYMBOLS is not set
1082# CONFIG_DEBUG_FS is not set 1179# CONFIG_DEBUG_FS is not set
1083# CONFIG_HEADERS_CHECK is not set 1180# CONFIG_HEADERS_CHECK is not set
1084# CONFIG_DEBUG_KERNEL is not set 1181# CONFIG_DEBUG_KERNEL is not set
1085CONFIG_CROSSCOMPILE=y 1182CONFIG_DEBUG_MEMORY_INIT=y
1183# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1184# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1185
1186#
1187# Tracers
1188#
1189CONFIG_DYNAMIC_PRINTK_DEBUG=y
1190# CONFIG_SAMPLES is not set
1191CONFIG_HAVE_ARCH_KGDB=y
1086CONFIG_CMDLINE="" 1192CONFIG_CMDLINE=""
1087 1193
1088# 1194#
@@ -1091,46 +1197,97 @@ CONFIG_CMDLINE=""
1091CONFIG_KEYS=y 1197CONFIG_KEYS=y
1092CONFIG_KEYS_DEBUG_PROC_KEYS=y 1198CONFIG_KEYS_DEBUG_PROC_KEYS=y
1093# CONFIG_SECURITY is not set 1199# CONFIG_SECURITY is not set
1200# CONFIG_SECURITYFS is not set
1201CONFIG_SECURITY_FILE_CAPABILITIES=y
1094CONFIG_CRYPTO=y 1202CONFIG_CRYPTO=y
1203
1204#
1205# Crypto core or helper
1206#
1207CONFIG_CRYPTO_FIPS=y
1095CONFIG_CRYPTO_ALGAPI=y 1208CONFIG_CRYPTO_ALGAPI=y
1096CONFIG_CRYPTO_ABLKCIPHER=m 1209CONFIG_CRYPTO_AEAD=y
1097CONFIG_CRYPTO_BLKCIPHER=m 1210CONFIG_CRYPTO_BLKCIPHER=y
1098CONFIG_CRYPTO_HASH=y 1211CONFIG_CRYPTO_HASH=y
1212CONFIG_CRYPTO_RNG=y
1099CONFIG_CRYPTO_MANAGER=y 1213CONFIG_CRYPTO_MANAGER=y
1214CONFIG_CRYPTO_GF128MUL=m
1215CONFIG_CRYPTO_NULL=m
1216CONFIG_CRYPTO_CRYPTD=m
1217CONFIG_CRYPTO_AUTHENC=m
1218# CONFIG_CRYPTO_TEST is not set
1219
1220#
1221# Authenticated Encryption with Associated Data
1222#
1223CONFIG_CRYPTO_CCM=m
1224CONFIG_CRYPTO_GCM=m
1225CONFIG_CRYPTO_SEQIV=m
1226
1227#
1228# Block modes
1229#
1230CONFIG_CRYPTO_CBC=m
1231CONFIG_CRYPTO_CTR=m
1232CONFIG_CRYPTO_CTS=m
1233CONFIG_CRYPTO_ECB=m
1234CONFIG_CRYPTO_LRW=m
1235CONFIG_CRYPTO_PCBC=m
1236CONFIG_CRYPTO_XTS=m
1237
1238#
1239# Hash modes
1240#
1100CONFIG_CRYPTO_HMAC=y 1241CONFIG_CRYPTO_HMAC=y
1101CONFIG_CRYPTO_XCBC=m 1242CONFIG_CRYPTO_XCBC=m
1102CONFIG_CRYPTO_NULL=m 1243
1244#
1245# Digest
1246#
1247CONFIG_CRYPTO_CRC32C=m
1103CONFIG_CRYPTO_MD4=m 1248CONFIG_CRYPTO_MD4=m
1104CONFIG_CRYPTO_MD5=y 1249CONFIG_CRYPTO_MD5=y
1250CONFIG_CRYPTO_MICHAEL_MIC=m
1251CONFIG_CRYPTO_RMD128=m
1252CONFIG_CRYPTO_RMD160=m
1253CONFIG_CRYPTO_RMD256=m
1254CONFIG_CRYPTO_RMD320=m
1105CONFIG_CRYPTO_SHA1=m 1255CONFIG_CRYPTO_SHA1=m
1106CONFIG_CRYPTO_SHA256=m 1256CONFIG_CRYPTO_SHA256=m
1107CONFIG_CRYPTO_SHA512=m 1257CONFIG_CRYPTO_SHA512=m
1108CONFIG_CRYPTO_WP512=m
1109CONFIG_CRYPTO_TGR192=m 1258CONFIG_CRYPTO_TGR192=m
1110CONFIG_CRYPTO_GF128MUL=m 1259CONFIG_CRYPTO_WP512=m
1111CONFIG_CRYPTO_ECB=m 1260
1112CONFIG_CRYPTO_CBC=m 1261#
1113CONFIG_CRYPTO_PCBC=m 1262# Ciphers
1114CONFIG_CRYPTO_LRW=m 1263#
1115CONFIG_CRYPTO_CRYPTD=m
1116CONFIG_CRYPTO_DES=m
1117CONFIG_CRYPTO_FCRYPT=m
1118CONFIG_CRYPTO_BLOWFISH=m
1119CONFIG_CRYPTO_TWOFISH=m
1120CONFIG_CRYPTO_TWOFISH_COMMON=m
1121CONFIG_CRYPTO_SERPENT=m
1122CONFIG_CRYPTO_AES=m 1264CONFIG_CRYPTO_AES=m
1265CONFIG_CRYPTO_ANUBIS=m
1266CONFIG_CRYPTO_ARC4=m
1267CONFIG_CRYPTO_BLOWFISH=m
1268CONFIG_CRYPTO_CAMELLIA=m
1123CONFIG_CRYPTO_CAST5=m 1269CONFIG_CRYPTO_CAST5=m
1124CONFIG_CRYPTO_CAST6=m 1270CONFIG_CRYPTO_CAST6=m
1125CONFIG_CRYPTO_TEA=m 1271CONFIG_CRYPTO_DES=m
1126CONFIG_CRYPTO_ARC4=m 1272CONFIG_CRYPTO_FCRYPT=m
1127CONFIG_CRYPTO_KHAZAD=m 1273CONFIG_CRYPTO_KHAZAD=m
1128CONFIG_CRYPTO_ANUBIS=m 1274CONFIG_CRYPTO_SALSA20=m
1275CONFIG_CRYPTO_SEED=m
1276CONFIG_CRYPTO_SERPENT=m
1277CONFIG_CRYPTO_TEA=m
1278CONFIG_CRYPTO_TWOFISH=m
1279CONFIG_CRYPTO_TWOFISH_COMMON=m
1280
1281#
1282# Compression
1283#
1129CONFIG_CRYPTO_DEFLATE=m 1284CONFIG_CRYPTO_DEFLATE=m
1130CONFIG_CRYPTO_MICHAEL_MIC=m 1285CONFIG_CRYPTO_LZO=m
1131CONFIG_CRYPTO_CRC32C=m 1286
1132CONFIG_CRYPTO_CAMELLIA=m 1287#
1133# CONFIG_CRYPTO_TEST is not set 1288# Random Number Generation
1289#
1290CONFIG_CRYPTO_ANSI_CPRNG=m
1134# CONFIG_CRYPTO_HW is not set 1291# CONFIG_CRYPTO_HW is not set
1135 1292
1136# 1293#
@@ -1139,12 +1296,15 @@ CONFIG_CRYPTO_CAMELLIA=m
1139CONFIG_BITREVERSE=m 1296CONFIG_BITREVERSE=m
1140# CONFIG_CRC_CCITT is not set 1297# CONFIG_CRC_CCITT is not set
1141CONFIG_CRC16=m 1298CONFIG_CRC16=m
1142# CONFIG_CRC_ITU_T is not set 1299CONFIG_CRC_T10DIF=m
1300CONFIG_CRC_ITU_T=m
1143CONFIG_CRC32=m 1301CONFIG_CRC32=m
1144# CONFIG_CRC7 is not set 1302# CONFIG_CRC7 is not set
1145CONFIG_LIBCRC32C=m 1303CONFIG_LIBCRC32C=m
1146CONFIG_ZLIB_INFLATE=m 1304CONFIG_ZLIB_INFLATE=m
1147CONFIG_ZLIB_DEFLATE=m 1305CONFIG_ZLIB_DEFLATE=m
1306CONFIG_LZO_COMPRESS=m
1307CONFIG_LZO_DECOMPRESS=m
1148CONFIG_TEXTSEARCH=y 1308CONFIG_TEXTSEARCH=y
1149CONFIG_TEXTSEARCH_KMP=m 1309CONFIG_TEXTSEARCH_KMP=m
1150CONFIG_TEXTSEARCH_BM=m 1310CONFIG_TEXTSEARCH_BM=m
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 74daa0cf87e6..1ecdd3b65dc7 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.23-rc2 3# Linux kernel version: 2.6.28-rc6
4# Tue Aug 7 12:59:29 2007 4# Mon Dec 1 08:08:19 2008
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -11,20 +11,25 @@ CONFIG_MIPS=y
11CONFIG_ZONE_DMA=y 11CONFIG_ZONE_DMA=y
12# CONFIG_MACH_ALCHEMY is not set 12# CONFIG_MACH_ALCHEMY is not set
13# CONFIG_BASLER_EXCITE is not set 13# CONFIG_BASLER_EXCITE is not set
14# CONFIG_BCM47XX is not set
14# CONFIG_MIPS_COBALT is not set 15# CONFIG_MIPS_COBALT is not set
15# CONFIG_MACH_DECSTATION is not set 16# CONFIG_MACH_DECSTATION is not set
16# CONFIG_MACH_JAZZ is not set 17# CONFIG_MACH_JAZZ is not set
18# CONFIG_LASAT is not set
17# CONFIG_LEMOTE_FULONG is not set 19# CONFIG_LEMOTE_FULONG is not set
18CONFIG_MIPS_MALTA=y 20CONFIG_MIPS_MALTA=y
19# CONFIG_MIPS_SIM is not set 21# CONFIG_MIPS_SIM is not set
20# CONFIG_MARKEINS is not set 22# CONFIG_MACH_EMMA is not set
21# CONFIG_MACH_VR41XX is not set 23# CONFIG_MACH_VR41XX is not set
24# CONFIG_NXP_STB220 is not set
25# CONFIG_NXP_STB225 is not set
22# CONFIG_PNX8550_JBS is not set 26# CONFIG_PNX8550_JBS is not set
23# CONFIG_PNX8550_STB810 is not set 27# CONFIG_PNX8550_STB810 is not set
24# CONFIG_PMC_MSP is not set 28# CONFIG_PMC_MSP is not set
25# CONFIG_PMC_YOSEMITE is not set 29# CONFIG_PMC_YOSEMITE is not set
26# CONFIG_SGI_IP22 is not set 30# CONFIG_SGI_IP22 is not set
27# CONFIG_SGI_IP27 is not set 31# CONFIG_SGI_IP27 is not set
32# CONFIG_SGI_IP28 is not set
28# CONFIG_SGI_IP32 is not set 33# CONFIG_SGI_IP32 is not set
29# CONFIG_SIBYTE_CRHINE is not set 34# CONFIG_SIBYTE_CRHINE is not set
30# CONFIG_SIBYTE_CARMEL is not set 35# CONFIG_SIBYTE_CARMEL is not set
@@ -35,13 +40,14 @@ CONFIG_MIPS_MALTA=y
35# CONFIG_SIBYTE_SENTOSA is not set 40# CONFIG_SIBYTE_SENTOSA is not set
36# CONFIG_SIBYTE_BIGSUR is not set 41# CONFIG_SIBYTE_BIGSUR is not set
37# CONFIG_SNI_RM is not set 42# CONFIG_SNI_RM is not set
38# CONFIG_TOSHIBA_JMR3927 is not set 43# CONFIG_MACH_TX39XX is not set
39# CONFIG_TOSHIBA_RBTX4927 is not set 44# CONFIG_MACH_TX49XX is not set
40# CONFIG_TOSHIBA_RBTX4938 is not set 45# CONFIG_MIKROTIK_RB532 is not set
41# CONFIG_WR_PPMC is not set 46# CONFIG_WR_PPMC is not set
42CONFIG_RWSEM_GENERIC_SPINLOCK=y 47CONFIG_RWSEM_GENERIC_SPINLOCK=y
43# CONFIG_ARCH_HAS_ILOG2_U32 is not set 48# CONFIG_ARCH_HAS_ILOG2_U32 is not set
44# CONFIG_ARCH_HAS_ILOG2_U64 is not set 49# CONFIG_ARCH_HAS_ILOG2_U64 is not set
50CONFIG_ARCH_SUPPORTS_OPROFILE=y
45CONFIG_GENERIC_FIND_NEXT_BIT=y 51CONFIG_GENERIC_FIND_NEXT_BIT=y
46CONFIG_GENERIC_HWEIGHT=y 52CONFIG_GENERIC_HWEIGHT=y
47CONFIG_GENERIC_CALIBRATE_DELAY=y 53CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -51,21 +57,26 @@ CONFIG_GENERIC_CMOS_UPDATE=y
51CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 57CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
52# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set 58# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
53CONFIG_ARCH_MAY_HAVE_PC_FDC=y 59CONFIG_ARCH_MAY_HAVE_PC_FDC=y
60CONFIG_BOOT_RAW=y
54CONFIG_CEVT_R4K=y 61CONFIG_CEVT_R4K=y
62CONFIG_CSRC_R4K=y
55CONFIG_DMA_NONCOHERENT=y 63CONFIG_DMA_NONCOHERENT=y
56CONFIG_DMA_NEED_PCI_MAP_STATE=y 64CONFIG_DMA_NEED_PCI_MAP_STATE=y
57CONFIG_EARLY_PRINTK=y 65CONFIG_EARLY_PRINTK=y
58CONFIG_SYS_HAS_EARLY_PRINTK=y 66CONFIG_SYS_HAS_EARLY_PRINTK=y
59CONFIG_GENERIC_ISA_DMA=y 67# CONFIG_HOTPLUG_CPU is not set
60CONFIG_I8259=y 68CONFIG_I8259=y
61CONFIG_MIPS_BONITO64=y 69CONFIG_MIPS_BONITO64=y
62CONFIG_MIPS_MSC=y 70CONFIG_MIPS_MSC=y
63# CONFIG_NO_IOPORT is not set 71# CONFIG_NO_IOPORT is not set
72CONFIG_GENERIC_ISA_DMA=y
64# CONFIG_CPU_BIG_ENDIAN is not set 73# CONFIG_CPU_BIG_ENDIAN is not set
65CONFIG_CPU_LITTLE_ENDIAN=y 74CONFIG_CPU_LITTLE_ENDIAN=y
66CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 75CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
67CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 76CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
68CONFIG_IRQ_CPU=y 77CONFIG_IRQ_CPU=y
78CONFIG_IRQ_GIC=y
79CONFIG_MIPS_BOARDS_GEN=y
69CONFIG_PCI_GT64XXX_PCI0=y 80CONFIG_PCI_GT64XXX_PCI0=y
70CONFIG_SWAP_IO_SPACE=y 81CONFIG_SWAP_IO_SPACE=y
71CONFIG_BOOT_ELF32=y 82CONFIG_BOOT_ELF32=y
@@ -74,10 +85,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
74# 85#
75# CPU selection 86# CPU selection
76# 87#
77CONFIG_TICK_ONESHOT=y
78CONFIG_NO_HZ=y
79CONFIG_HIGH_RES_TIMERS=y
80CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
81# CONFIG_CPU_LOONGSON2 is not set 88# CONFIG_CPU_LOONGSON2 is not set
82# CONFIG_CPU_MIPS32_R1 is not set 89# CONFIG_CPU_MIPS32_R1 is not set
83CONFIG_CPU_MIPS32_R2=y 90CONFIG_CPU_MIPS32_R2=y
@@ -91,6 +98,7 @@ CONFIG_CPU_MIPS32_R2=y
91# CONFIG_CPU_TX49XX is not set 98# CONFIG_CPU_TX49XX is not set
92# CONFIG_CPU_R5000 is not set 99# CONFIG_CPU_R5000 is not set
93# CONFIG_CPU_R5432 is not set 100# CONFIG_CPU_R5432 is not set
101# CONFIG_CPU_R5500 is not set
94# CONFIG_CPU_R6000 is not set 102# CONFIG_CPU_R6000 is not set
95# CONFIG_CPU_NEVADA is not set 103# CONFIG_CPU_NEVADA is not set
96# CONFIG_CPU_R8000 is not set 104# CONFIG_CPU_R8000 is not set
@@ -108,6 +116,7 @@ CONFIG_CPU_MIPSR2=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 116CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
109CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 117CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 118CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
119CONFIG_HARDWARE_WATCHPOINTS=y
111 120
112# 121#
113# Kernel type 122# Kernel type
@@ -125,6 +134,8 @@ CONFIG_CPU_HAS_PREFETCH=y
125CONFIG_MIPS_MT_SMP=y 134CONFIG_MIPS_MT_SMP=y
126# CONFIG_MIPS_MT_SMTC is not set 135# CONFIG_MIPS_MT_SMTC is not set
127CONFIG_MIPS_MT=y 136CONFIG_MIPS_MT=y
137# CONFIG_SCHED_SMT is not set
138CONFIG_SYS_SUPPORTS_SCHED_SMT=y
128CONFIG_SYS_SUPPORTS_MULTITHREADING=y 139CONFIG_SYS_SUPPORTS_MULTITHREADING=y
129CONFIG_MIPS_MT_FPAFF=y 140CONFIG_MIPS_MT_FPAFF=y
130# CONFIG_MIPS_VPE_LOADER is not set 141# CONFIG_MIPS_VPE_LOADER is not set
@@ -132,7 +143,6 @@ CONFIG_CPU_HAS_LLSC=y
132# CONFIG_CPU_HAS_SMARTMIPS is not set 143# CONFIG_CPU_HAS_SMARTMIPS is not set
133CONFIG_CPU_MIPSR2_IRQ_VI=y 144CONFIG_CPU_MIPSR2_IRQ_VI=y
134CONFIG_CPU_MIPSR2_IRQ_EI=y 145CONFIG_CPU_MIPSR2_IRQ_EI=y
135CONFIG_CPU_MIPSR2_SRS=y
136CONFIG_CPU_HAS_SYNC=y 146CONFIG_CPU_HAS_SYNC=y
137CONFIG_GENERIC_HARDIRQS=y 147CONFIG_GENERIC_HARDIRQS=y
138CONFIG_GENERIC_IRQ_PROBE=y 148CONFIG_GENERIC_IRQ_PROBE=y
@@ -140,22 +150,30 @@ CONFIG_IRQ_PER_CPU=y
140CONFIG_CPU_SUPPORTS_HIGHMEM=y 150CONFIG_CPU_SUPPORTS_HIGHMEM=y
141CONFIG_SYS_SUPPORTS_SMARTMIPS=y 151CONFIG_SYS_SUPPORTS_SMARTMIPS=y
142CONFIG_ARCH_FLATMEM_ENABLE=y 152CONFIG_ARCH_FLATMEM_ENABLE=y
153CONFIG_ARCH_POPULATES_NODE_MAP=y
143CONFIG_SELECT_MEMORY_MODEL=y 154CONFIG_SELECT_MEMORY_MODEL=y
144CONFIG_FLATMEM_MANUAL=y 155CONFIG_FLATMEM_MANUAL=y
145# CONFIG_DISCONTIGMEM_MANUAL is not set 156# CONFIG_DISCONTIGMEM_MANUAL is not set
146# CONFIG_SPARSEMEM_MANUAL is not set 157# CONFIG_SPARSEMEM_MANUAL is not set
147CONFIG_FLATMEM=y 158CONFIG_FLATMEM=y
148CONFIG_FLAT_NODE_MEM_MAP=y 159CONFIG_FLAT_NODE_MEM_MAP=y
149# CONFIG_SPARSEMEM_STATIC is not set 160CONFIG_PAGEFLAGS_EXTENDED=y
150CONFIG_SPLIT_PTLOCK_CPUS=4 161CONFIG_SPLIT_PTLOCK_CPUS=4
151# CONFIG_RESOURCES_64BIT is not set 162# CONFIG_RESOURCES_64BIT is not set
163# CONFIG_PHYS_ADDR_T_64BIT is not set
152CONFIG_ZONE_DMA_FLAG=1 164CONFIG_ZONE_DMA_FLAG=1
153CONFIG_BOUNCE=y 165CONFIG_BOUNCE=y
154CONFIG_VIRT_TO_BUS=y 166CONFIG_VIRT_TO_BUS=y
167CONFIG_UNEVICTABLE_LRU=y
155CONFIG_SMP=y 168CONFIG_SMP=y
169CONFIG_SMP_UP=y
156CONFIG_SYS_SUPPORTS_SMP=y 170CONFIG_SYS_SUPPORTS_SMP=y
157CONFIG_NR_CPUS_DEFAULT_2=y 171CONFIG_NR_CPUS_DEFAULT_2=y
158CONFIG_NR_CPUS=2 172CONFIG_NR_CPUS=2
173CONFIG_TICK_ONESHOT=y
174CONFIG_NO_HZ=y
175CONFIG_HIGH_RES_TIMERS=y
176CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
159# CONFIG_HZ_48 is not set 177# CONFIG_HZ_48 is not set
160CONFIG_HZ_100=y 178CONFIG_HZ_100=y
161# CONFIG_HZ_128 is not set 179# CONFIG_HZ_128 is not set
@@ -168,7 +186,6 @@ CONFIG_HZ=100
168CONFIG_PREEMPT_NONE=y 186CONFIG_PREEMPT_NONE=y
169# CONFIG_PREEMPT_VOLUNTARY is not set 187# CONFIG_PREEMPT_VOLUNTARY is not set
170# CONFIG_PREEMPT is not set 188# CONFIG_PREEMPT is not set
171CONFIG_PREEMPT_BKL=y
172# CONFIG_KEXEC is not set 189# CONFIG_KEXEC is not set
173CONFIG_SECCOMP=y 190CONFIG_SECCOMP=y
174CONFIG_LOCKDEP_SUPPORT=y 191CONFIG_LOCKDEP_SUPPORT=y
@@ -189,13 +206,19 @@ CONFIG_SYSVIPC_SYSCTL=y
189# CONFIG_POSIX_MQUEUE is not set 206# CONFIG_POSIX_MQUEUE is not set
190# CONFIG_BSD_PROCESS_ACCT is not set 207# CONFIG_BSD_PROCESS_ACCT is not set
191# CONFIG_TASKSTATS is not set 208# CONFIG_TASKSTATS is not set
192# CONFIG_USER_NS is not set
193# CONFIG_AUDIT is not set 209# CONFIG_AUDIT is not set
194# CONFIG_IKCONFIG is not set 210# CONFIG_IKCONFIG is not set
195CONFIG_LOG_BUF_SHIFT=15 211CONFIG_LOG_BUF_SHIFT=15
196# CONFIG_CPUSETS is not set 212# CONFIG_CGROUPS is not set
213# CONFIG_GROUP_SCHED is not set
197CONFIG_SYSFS_DEPRECATED=y 214CONFIG_SYSFS_DEPRECATED=y
215CONFIG_SYSFS_DEPRECATED_V2=y
198CONFIG_RELAY=y 216CONFIG_RELAY=y
217CONFIG_NAMESPACES=y
218CONFIG_UTS_NS=y
219CONFIG_IPC_NS=y
220# CONFIG_USER_NS is not set
221CONFIG_PID_NS=y
199# CONFIG_BLK_DEV_INITRD is not set 222# CONFIG_BLK_DEV_INITRD is not set
200# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 223# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
201CONFIG_SYSCTL=y 224CONFIG_SYSCTL=y
@@ -207,6 +230,8 @@ CONFIG_HOTPLUG=y
207CONFIG_PRINTK=y 230CONFIG_PRINTK=y
208CONFIG_BUG=y 231CONFIG_BUG=y
209CONFIG_ELF_CORE=y 232CONFIG_ELF_CORE=y
233CONFIG_PCSPKR_PLATFORM=y
234# CONFIG_COMPAT_BRK is not set
210CONFIG_BASE_FULL=y 235CONFIG_BASE_FULL=y
211CONFIG_FUTEX=y 236CONFIG_FUTEX=y
212CONFIG_ANON_INODES=y 237CONFIG_ANON_INODES=y
@@ -215,14 +240,23 @@ CONFIG_SIGNALFD=y
215CONFIG_TIMERFD=y 240CONFIG_TIMERFD=y
216CONFIG_EVENTFD=y 241CONFIG_EVENTFD=y
217CONFIG_SHMEM=y 242CONFIG_SHMEM=y
243CONFIG_AIO=y
218CONFIG_VM_EVENT_COUNTERS=y 244CONFIG_VM_EVENT_COUNTERS=y
245CONFIG_PCI_QUIRKS=y
219CONFIG_SLAB=y 246CONFIG_SLAB=y
220# CONFIG_SLUB is not set 247# CONFIG_SLUB is not set
221# CONFIG_SLOB is not set 248# CONFIG_SLOB is not set
249# CONFIG_PROFILING is not set
250# CONFIG_MARKERS is not set
251CONFIG_HAVE_OPROFILE=y
252CONFIG_USE_GENERIC_SMP_HELPERS=y
253# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
254CONFIG_SLABINFO=y
222CONFIG_RT_MUTEXES=y 255CONFIG_RT_MUTEXES=y
223# CONFIG_TINY_SHMEM is not set 256# CONFIG_TINY_SHMEM is not set
224CONFIG_BASE_SMALL=0 257CONFIG_BASE_SMALL=0
225CONFIG_MODULES=y 258CONFIG_MODULES=y
259# CONFIG_MODULE_FORCE_LOAD is not set
226CONFIG_MODULE_UNLOAD=y 260CONFIG_MODULE_UNLOAD=y
227# CONFIG_MODULE_FORCE_UNLOAD is not set 261# CONFIG_MODULE_FORCE_UNLOAD is not set
228CONFIG_MODVERSIONS=y 262CONFIG_MODVERSIONS=y
@@ -234,6 +268,7 @@ CONFIG_BLOCK=y
234# CONFIG_BLK_DEV_IO_TRACE is not set 268# CONFIG_BLK_DEV_IO_TRACE is not set
235# CONFIG_LSF is not set 269# CONFIG_LSF is not set
236# CONFIG_BLK_DEV_BSG is not set 270# CONFIG_BLK_DEV_BSG is not set
271# CONFIG_BLK_DEV_INTEGRITY is not set
237 272
238# 273#
239# IO Schedulers 274# IO Schedulers
@@ -247,19 +282,19 @@ CONFIG_DEFAULT_AS=y
247# CONFIG_DEFAULT_CFQ is not set 282# CONFIG_DEFAULT_CFQ is not set
248# CONFIG_DEFAULT_NOOP is not set 283# CONFIG_DEFAULT_NOOP is not set
249CONFIG_DEFAULT_IOSCHED="anticipatory" 284CONFIG_DEFAULT_IOSCHED="anticipatory"
285CONFIG_CLASSIC_RCU=y
286# CONFIG_FREEZER is not set
250 287
251# 288#
252# Bus options (PCI, PCMCIA, EISA, ISA, TC) 289# Bus options (PCI, PCMCIA, EISA, ISA, TC)
253# 290#
254CONFIG_HW_HAS_PCI=y 291CONFIG_HW_HAS_PCI=y
255CONFIG_PCI=y 292CONFIG_PCI=y
293CONFIG_PCI_DOMAINS=y
256# CONFIG_ARCH_SUPPORTS_MSI is not set 294# CONFIG_ARCH_SUPPORTS_MSI is not set
295CONFIG_PCI_LEGACY=y
257CONFIG_MMU=y 296CONFIG_MMU=y
258CONFIG_I8253=y 297CONFIG_I8253=y
259
260#
261# PCCARD (PCMCIA/CardBus) support
262#
263# CONFIG_PCCARD is not set 298# CONFIG_PCCARD is not set
264# CONFIG_HOTPLUG_PCI is not set 299# CONFIG_HOTPLUG_PCI is not set
265 300
@@ -267,6 +302,8 @@ CONFIG_I8253=y
267# Executable file formats 302# Executable file formats
268# 303#
269CONFIG_BINFMT_ELF=y 304CONFIG_BINFMT_ELF=y
305# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
306# CONFIG_HAVE_AOUT is not set
270# CONFIG_BINFMT_MISC is not set 307# CONFIG_BINFMT_MISC is not set
271CONFIG_TRAD_SIGNALS=y 308CONFIG_TRAD_SIGNALS=y
272 309
@@ -274,12 +311,7 @@ CONFIG_TRAD_SIGNALS=y
274# Power management options 311# Power management options
275# 312#
276CONFIG_PM=y 313CONFIG_PM=y
277# CONFIG_PM_LEGACY is not set
278# CONFIG_PM_DEBUG is not set 314# CONFIG_PM_DEBUG is not set
279
280#
281# Networking
282#
283CONFIG_NET=y 315CONFIG_NET=y
284 316
285# 317#
@@ -292,6 +324,8 @@ CONFIG_XFRM=y
292CONFIG_XFRM_USER=m 324CONFIG_XFRM_USER=m
293# CONFIG_XFRM_SUB_POLICY is not set 325# CONFIG_XFRM_SUB_POLICY is not set
294CONFIG_XFRM_MIGRATE=y 326CONFIG_XFRM_MIGRATE=y
327# CONFIG_XFRM_STATISTICS is not set
328CONFIG_XFRM_IPCOMP=m
295CONFIG_NET_KEY=y 329CONFIG_NET_KEY=y
296CONFIG_NET_KEY_MIGRATE=y 330CONFIG_NET_KEY_MIGRATE=y
297CONFIG_INET=y 331CONFIG_INET=y
@@ -323,42 +357,13 @@ CONFIG_INET_TUNNEL=m
323CONFIG_INET_XFRM_MODE_TRANSPORT=m 357CONFIG_INET_XFRM_MODE_TRANSPORT=m
324CONFIG_INET_XFRM_MODE_TUNNEL=m 358CONFIG_INET_XFRM_MODE_TUNNEL=m
325CONFIG_INET_XFRM_MODE_BEET=y 359CONFIG_INET_XFRM_MODE_BEET=y
360CONFIG_INET_LRO=m
326CONFIG_INET_DIAG=y 361CONFIG_INET_DIAG=y
327CONFIG_INET_TCP_DIAG=y 362CONFIG_INET_TCP_DIAG=y
328# CONFIG_TCP_CONG_ADVANCED is not set 363# CONFIG_TCP_CONG_ADVANCED is not set
329CONFIG_TCP_CONG_CUBIC=y 364CONFIG_TCP_CONG_CUBIC=y
330CONFIG_DEFAULT_TCP_CONG="cubic" 365CONFIG_DEFAULT_TCP_CONG="cubic"
331CONFIG_TCP_MD5SIG=y 366CONFIG_TCP_MD5SIG=y
332CONFIG_IP_VS=m
333# CONFIG_IP_VS_DEBUG is not set
334CONFIG_IP_VS_TAB_BITS=12
335
336#
337# IPVS transport protocol load balancing support
338#
339CONFIG_IP_VS_PROTO_TCP=y
340CONFIG_IP_VS_PROTO_UDP=y
341CONFIG_IP_VS_PROTO_ESP=y
342CONFIG_IP_VS_PROTO_AH=y
343
344#
345# IPVS scheduler
346#
347CONFIG_IP_VS_RR=m
348CONFIG_IP_VS_WRR=m
349CONFIG_IP_VS_LC=m
350CONFIG_IP_VS_WLC=m
351CONFIG_IP_VS_LBLC=m
352CONFIG_IP_VS_LBLCR=m
353CONFIG_IP_VS_DH=m
354CONFIG_IP_VS_SH=m
355CONFIG_IP_VS_SED=m
356CONFIG_IP_VS_NQ=m
357
358#
359# IPVS application helper
360#
361CONFIG_IP_VS_FTP=m
362CONFIG_IPV6=m 367CONFIG_IPV6=m
363CONFIG_IPV6_PRIVACY=y 368CONFIG_IPV6_PRIVACY=y
364CONFIG_IPV6_ROUTER_PREF=y 369CONFIG_IPV6_ROUTER_PREF=y
@@ -375,11 +380,15 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
375CONFIG_INET6_XFRM_MODE_BEET=m 380CONFIG_INET6_XFRM_MODE_BEET=m
376# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 381# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
377CONFIG_IPV6_SIT=m 382CONFIG_IPV6_SIT=m
383CONFIG_IPV6_NDISC_NODETYPE=y
378CONFIG_IPV6_TUNNEL=m 384CONFIG_IPV6_TUNNEL=m
379# CONFIG_IPV6_MULTIPLE_TABLES is not set 385# CONFIG_IPV6_MULTIPLE_TABLES is not set
386CONFIG_IPV6_MROUTE=y
387CONFIG_IPV6_PIMSM_V2=y
380CONFIG_NETWORK_SECMARK=y 388CONFIG_NETWORK_SECMARK=y
381CONFIG_NETFILTER=y 389CONFIG_NETFILTER=y
382# CONFIG_NETFILTER_DEBUG is not set 390# CONFIG_NETFILTER_DEBUG is not set
391CONFIG_NETFILTER_ADVANCED=y
383CONFIG_BRIDGE_NETFILTER=y 392CONFIG_BRIDGE_NETFILTER=y
384 393
385# 394#
@@ -388,12 +397,12 @@ CONFIG_BRIDGE_NETFILTER=y
388CONFIG_NETFILTER_NETLINK=m 397CONFIG_NETFILTER_NETLINK=m
389CONFIG_NETFILTER_NETLINK_QUEUE=m 398CONFIG_NETFILTER_NETLINK_QUEUE=m
390CONFIG_NETFILTER_NETLINK_LOG=m 399CONFIG_NETFILTER_NETLINK_LOG=m
391CONFIG_NF_CONNTRACK_ENABLED=m
392CONFIG_NF_CONNTRACK=m 400CONFIG_NF_CONNTRACK=m
393CONFIG_NF_CT_ACCT=y 401CONFIG_NF_CT_ACCT=y
394CONFIG_NF_CONNTRACK_MARK=y 402CONFIG_NF_CONNTRACK_MARK=y
395CONFIG_NF_CONNTRACK_SECMARK=y 403CONFIG_NF_CONNTRACK_SECMARK=y
396CONFIG_NF_CONNTRACK_EVENTS=y 404CONFIG_NF_CONNTRACK_EVENTS=y
405CONFIG_NF_CT_PROTO_DCCP=m
397CONFIG_NF_CT_PROTO_GRE=m 406CONFIG_NF_CT_PROTO_GRE=m
398CONFIG_NF_CT_PROTO_SCTP=m 407CONFIG_NF_CT_PROTO_SCTP=m
399CONFIG_NF_CT_PROTO_UDPLITE=m 408CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -407,18 +416,22 @@ CONFIG_NF_CONNTRACK_SANE=m
407CONFIG_NF_CONNTRACK_SIP=m 416CONFIG_NF_CONNTRACK_SIP=m
408CONFIG_NF_CONNTRACK_TFTP=m 417CONFIG_NF_CONNTRACK_TFTP=m
409CONFIG_NF_CT_NETLINK=m 418CONFIG_NF_CT_NETLINK=m
419CONFIG_NETFILTER_TPROXY=m
410CONFIG_NETFILTER_XTABLES=m 420CONFIG_NETFILTER_XTABLES=m
411CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 421CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
412CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 422CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
423# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
413# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 424# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
414CONFIG_NETFILTER_XT_TARGET_MARK=m 425CONFIG_NETFILTER_XT_TARGET_MARK=m
415CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
416CONFIG_NETFILTER_XT_TARGET_NFLOG=m 426CONFIG_NETFILTER_XT_TARGET_NFLOG=m
427CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
417CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 428CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
429CONFIG_NETFILTER_XT_TARGET_RATEEST=m
430CONFIG_NETFILTER_XT_TARGET_TPROXY=m
418CONFIG_NETFILTER_XT_TARGET_TRACE=m 431CONFIG_NETFILTER_XT_TARGET_TRACE=m
419CONFIG_NETFILTER_XT_TARGET_SECMARK=m 432CONFIG_NETFILTER_XT_TARGET_SECMARK=m
420# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
421CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 433CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
434CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
422CONFIG_NETFILTER_XT_MATCH_COMMENT=m 435CONFIG_NETFILTER_XT_MATCH_COMMENT=m
423CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 436CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
424CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 437CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -427,40 +440,76 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
427CONFIG_NETFILTER_XT_MATCH_DCCP=m 440CONFIG_NETFILTER_XT_MATCH_DCCP=m
428# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 441# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
429CONFIG_NETFILTER_XT_MATCH_ESP=m 442CONFIG_NETFILTER_XT_MATCH_ESP=m
443CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
430CONFIG_NETFILTER_XT_MATCH_HELPER=m 444CONFIG_NETFILTER_XT_MATCH_HELPER=m
445CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
431CONFIG_NETFILTER_XT_MATCH_LENGTH=m 446CONFIG_NETFILTER_XT_MATCH_LENGTH=m
432CONFIG_NETFILTER_XT_MATCH_LIMIT=m 447CONFIG_NETFILTER_XT_MATCH_LIMIT=m
433CONFIG_NETFILTER_XT_MATCH_MAC=m 448CONFIG_NETFILTER_XT_MATCH_MAC=m
434CONFIG_NETFILTER_XT_MATCH_MARK=m 449CONFIG_NETFILTER_XT_MATCH_MARK=m
435CONFIG_NETFILTER_XT_MATCH_POLICY=m
436CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 450CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
451CONFIG_NETFILTER_XT_MATCH_OWNER=m
452CONFIG_NETFILTER_XT_MATCH_POLICY=m
437# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set 453# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
438CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 454CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
439CONFIG_NETFILTER_XT_MATCH_QUOTA=m 455CONFIG_NETFILTER_XT_MATCH_QUOTA=m
456CONFIG_NETFILTER_XT_MATCH_RATEEST=m
440CONFIG_NETFILTER_XT_MATCH_REALM=m 457CONFIG_NETFILTER_XT_MATCH_REALM=m
458CONFIG_NETFILTER_XT_MATCH_RECENT=m
459# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
441CONFIG_NETFILTER_XT_MATCH_SCTP=m 460CONFIG_NETFILTER_XT_MATCH_SCTP=m
461CONFIG_NETFILTER_XT_MATCH_SOCKET=m
442CONFIG_NETFILTER_XT_MATCH_STATE=m 462CONFIG_NETFILTER_XT_MATCH_STATE=m
443CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 463CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
444CONFIG_NETFILTER_XT_MATCH_STRING=m 464CONFIG_NETFILTER_XT_MATCH_STRING=m
445CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 465CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
466CONFIG_NETFILTER_XT_MATCH_TIME=m
446CONFIG_NETFILTER_XT_MATCH_U32=m 467CONFIG_NETFILTER_XT_MATCH_U32=m
447CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 468CONFIG_IP_VS=m
469CONFIG_IP_VS_IPV6=y
470# CONFIG_IP_VS_DEBUG is not set
471CONFIG_IP_VS_TAB_BITS=12
472
473#
474# IPVS transport protocol load balancing support
475#
476CONFIG_IP_VS_PROTO_TCP=y
477CONFIG_IP_VS_PROTO_UDP=y
478CONFIG_IP_VS_PROTO_AH_ESP=y
479CONFIG_IP_VS_PROTO_ESP=y
480CONFIG_IP_VS_PROTO_AH=y
481
482#
483# IPVS scheduler
484#
485CONFIG_IP_VS_RR=m
486CONFIG_IP_VS_WRR=m
487CONFIG_IP_VS_LC=m
488CONFIG_IP_VS_WLC=m
489CONFIG_IP_VS_LBLC=m
490CONFIG_IP_VS_LBLCR=m
491CONFIG_IP_VS_DH=m
492CONFIG_IP_VS_SH=m
493CONFIG_IP_VS_SED=m
494CONFIG_IP_VS_NQ=m
495
496#
497# IPVS application helper
498#
499CONFIG_IP_VS_FTP=m
448 500
449# 501#
450# IP: Netfilter Configuration 502# IP: Netfilter Configuration
451# 503#
504CONFIG_NF_DEFRAG_IPV4=m
452CONFIG_NF_CONNTRACK_IPV4=m 505CONFIG_NF_CONNTRACK_IPV4=m
453CONFIG_NF_CONNTRACK_PROC_COMPAT=y 506CONFIG_NF_CONNTRACK_PROC_COMPAT=y
454CONFIG_IP_NF_QUEUE=m 507CONFIG_IP_NF_QUEUE=m
455CONFIG_IP_NF_IPTABLES=m 508CONFIG_IP_NF_IPTABLES=m
456CONFIG_IP_NF_MATCH_IPRANGE=m 509CONFIG_IP_NF_MATCH_ADDRTYPE=m
457CONFIG_IP_NF_MATCH_TOS=m
458CONFIG_IP_NF_MATCH_RECENT=m
459CONFIG_IP_NF_MATCH_ECN=m
460CONFIG_IP_NF_MATCH_AH=m 510CONFIG_IP_NF_MATCH_AH=m
511CONFIG_IP_NF_MATCH_ECN=m
461CONFIG_IP_NF_MATCH_TTL=m 512CONFIG_IP_NF_MATCH_TTL=m
462CONFIG_IP_NF_MATCH_OWNER=m
463CONFIG_IP_NF_MATCH_ADDRTYPE=m
464CONFIG_IP_NF_FILTER=m 513CONFIG_IP_NF_FILTER=m
465CONFIG_IP_NF_TARGET_REJECT=m 514CONFIG_IP_NF_TARGET_REJECT=m
466CONFIG_IP_NF_TARGET_LOG=m 515CONFIG_IP_NF_TARGET_LOG=m
@@ -468,11 +517,13 @@ CONFIG_IP_NF_TARGET_ULOG=m
468CONFIG_NF_NAT=m 517CONFIG_NF_NAT=m
469CONFIG_NF_NAT_NEEDED=y 518CONFIG_NF_NAT_NEEDED=y
470CONFIG_IP_NF_TARGET_MASQUERADE=m 519CONFIG_IP_NF_TARGET_MASQUERADE=m
471CONFIG_IP_NF_TARGET_REDIRECT=m
472CONFIG_IP_NF_TARGET_NETMAP=m 520CONFIG_IP_NF_TARGET_NETMAP=m
473CONFIG_IP_NF_TARGET_SAME=m 521CONFIG_IP_NF_TARGET_REDIRECT=m
474CONFIG_NF_NAT_SNMP_BASIC=m 522CONFIG_NF_NAT_SNMP_BASIC=m
523CONFIG_NF_NAT_PROTO_DCCP=m
475CONFIG_NF_NAT_PROTO_GRE=m 524CONFIG_NF_NAT_PROTO_GRE=m
525CONFIG_NF_NAT_PROTO_UDPLITE=m
526CONFIG_NF_NAT_PROTO_SCTP=m
476CONFIG_NF_NAT_FTP=m 527CONFIG_NF_NAT_FTP=m
477CONFIG_NF_NAT_IRC=m 528CONFIG_NF_NAT_IRC=m
478CONFIG_NF_NAT_TFTP=m 529CONFIG_NF_NAT_TFTP=m
@@ -481,40 +532,34 @@ CONFIG_NF_NAT_PPTP=m
481CONFIG_NF_NAT_H323=m 532CONFIG_NF_NAT_H323=m
482CONFIG_NF_NAT_SIP=m 533CONFIG_NF_NAT_SIP=m
483CONFIG_IP_NF_MANGLE=m 534CONFIG_IP_NF_MANGLE=m
484CONFIG_IP_NF_TARGET_TOS=m 535CONFIG_IP_NF_TARGET_CLUSTERIP=m
485CONFIG_IP_NF_TARGET_ECN=m 536CONFIG_IP_NF_TARGET_ECN=m
486CONFIG_IP_NF_TARGET_TTL=m 537CONFIG_IP_NF_TARGET_TTL=m
487CONFIG_IP_NF_TARGET_CLUSTERIP=m
488CONFIG_IP_NF_RAW=m 538CONFIG_IP_NF_RAW=m
489CONFIG_IP_NF_ARPTABLES=m 539CONFIG_IP_NF_ARPTABLES=m
490CONFIG_IP_NF_ARPFILTER=m 540CONFIG_IP_NF_ARPFILTER=m
491CONFIG_IP_NF_ARP_MANGLE=m 541CONFIG_IP_NF_ARP_MANGLE=m
492 542
493# 543#
494# IPv6: Netfilter Configuration (EXPERIMENTAL) 544# IPv6: Netfilter Configuration
495# 545#
496CONFIG_NF_CONNTRACK_IPV6=m 546CONFIG_NF_CONNTRACK_IPV6=m
497CONFIG_IP6_NF_QUEUE=m 547CONFIG_IP6_NF_QUEUE=m
498CONFIG_IP6_NF_IPTABLES=m 548CONFIG_IP6_NF_IPTABLES=m
499CONFIG_IP6_NF_MATCH_RT=m 549CONFIG_IP6_NF_MATCH_AH=m
500CONFIG_IP6_NF_MATCH_OPTS=m 550CONFIG_IP6_NF_MATCH_EUI64=m
501CONFIG_IP6_NF_MATCH_FRAG=m 551CONFIG_IP6_NF_MATCH_FRAG=m
552CONFIG_IP6_NF_MATCH_OPTS=m
502CONFIG_IP6_NF_MATCH_HL=m 553CONFIG_IP6_NF_MATCH_HL=m
503CONFIG_IP6_NF_MATCH_OWNER=m
504CONFIG_IP6_NF_MATCH_IPV6HEADER=m 554CONFIG_IP6_NF_MATCH_IPV6HEADER=m
505CONFIG_IP6_NF_MATCH_AH=m
506CONFIG_IP6_NF_MATCH_MH=m 555CONFIG_IP6_NF_MATCH_MH=m
507CONFIG_IP6_NF_MATCH_EUI64=m 556CONFIG_IP6_NF_MATCH_RT=m
508CONFIG_IP6_NF_FILTER=m
509CONFIG_IP6_NF_TARGET_LOG=m 557CONFIG_IP6_NF_TARGET_LOG=m
558CONFIG_IP6_NF_FILTER=m
510CONFIG_IP6_NF_TARGET_REJECT=m 559CONFIG_IP6_NF_TARGET_REJECT=m
511CONFIG_IP6_NF_MANGLE=m 560CONFIG_IP6_NF_MANGLE=m
512CONFIG_IP6_NF_TARGET_HL=m 561CONFIG_IP6_NF_TARGET_HL=m
513CONFIG_IP6_NF_RAW=m 562CONFIG_IP6_NF_RAW=m
514
515#
516# Bridge: Netfilter Configuration
517#
518CONFIG_BRIDGE_NF_EBTABLES=m 563CONFIG_BRIDGE_NF_EBTABLES=m
519CONFIG_BRIDGE_EBT_BROUTE=m 564CONFIG_BRIDGE_EBT_BROUTE=m
520CONFIG_BRIDGE_EBT_T_FILTER=m 565CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -523,6 +568,7 @@ CONFIG_BRIDGE_EBT_802_3=m
523CONFIG_BRIDGE_EBT_AMONG=m 568CONFIG_BRIDGE_EBT_AMONG=m
524CONFIG_BRIDGE_EBT_ARP=m 569CONFIG_BRIDGE_EBT_ARP=m
525CONFIG_BRIDGE_EBT_IP=m 570CONFIG_BRIDGE_EBT_IP=m
571CONFIG_BRIDGE_EBT_IP6=m
526CONFIG_BRIDGE_EBT_LIMIT=m 572CONFIG_BRIDGE_EBT_LIMIT=m
527CONFIG_BRIDGE_EBT_MARK=m 573CONFIG_BRIDGE_EBT_MARK=m
528CONFIG_BRIDGE_EBT_PKTTYPE=m 574CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -535,6 +581,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
535CONFIG_BRIDGE_EBT_SNAT=m 581CONFIG_BRIDGE_EBT_SNAT=m
536CONFIG_BRIDGE_EBT_LOG=m 582CONFIG_BRIDGE_EBT_LOG=m
537CONFIG_BRIDGE_EBT_ULOG=m 583CONFIG_BRIDGE_EBT_ULOG=m
584CONFIG_BRIDGE_EBT_NFLOG=m
538# CONFIG_IP_DCCP is not set 585# CONFIG_IP_DCCP is not set
539CONFIG_IP_SCTP=m 586CONFIG_IP_SCTP=m
540# CONFIG_SCTP_DBG_MSG is not set 587# CONFIG_SCTP_DBG_MSG is not set
@@ -544,8 +591,12 @@ CONFIG_IP_SCTP=m
544CONFIG_SCTP_HMAC_MD5=y 591CONFIG_SCTP_HMAC_MD5=y
545# CONFIG_TIPC is not set 592# CONFIG_TIPC is not set
546# CONFIG_ATM is not set 593# CONFIG_ATM is not set
594CONFIG_STP=m
595CONFIG_GARP=m
547CONFIG_BRIDGE=m 596CONFIG_BRIDGE=m
597# CONFIG_NET_DSA is not set
548CONFIG_VLAN_8021Q=m 598CONFIG_VLAN_8021Q=m
599CONFIG_VLAN_8021Q_GVRP=y
549# CONFIG_DECNET is not set 600# CONFIG_DECNET is not set
550CONFIG_LLC=m 601CONFIG_LLC=m
551# CONFIG_LLC2 is not set 602# CONFIG_LLC2 is not set
@@ -559,12 +610,7 @@ CONFIG_IPDDP_DECAP=y
559# CONFIG_LAPB is not set 610# CONFIG_LAPB is not set
560# CONFIG_ECONET is not set 611# CONFIG_ECONET is not set
561# CONFIG_WAN_ROUTER is not set 612# CONFIG_WAN_ROUTER is not set
562
563#
564# QoS and/or fair queueing
565#
566CONFIG_NET_SCHED=y 613CONFIG_NET_SCHED=y
567CONFIG_NET_SCH_FIFO=y
568 614
569# 615#
570# Queueing/Scheduling 616# Queueing/Scheduling
@@ -573,7 +619,7 @@ CONFIG_NET_SCH_CBQ=m
573CONFIG_NET_SCH_HTB=m 619CONFIG_NET_SCH_HTB=m
574CONFIG_NET_SCH_HFSC=m 620CONFIG_NET_SCH_HFSC=m
575CONFIG_NET_SCH_PRIO=m 621CONFIG_NET_SCH_PRIO=m
576CONFIG_NET_SCH_RR=m 622# CONFIG_NET_SCH_MULTIQ is not set
577CONFIG_NET_SCH_RED=m 623CONFIG_NET_SCH_RED=m
578CONFIG_NET_SCH_SFQ=m 624CONFIG_NET_SCH_SFQ=m
579CONFIG_NET_SCH_TEQL=m 625CONFIG_NET_SCH_TEQL=m
@@ -597,6 +643,7 @@ CONFIG_NET_CLS_U32=m
597# CONFIG_CLS_U32_MARK is not set 643# CONFIG_CLS_U32_MARK is not set
598CONFIG_NET_CLS_RSVP=m 644CONFIG_NET_CLS_RSVP=m
599CONFIG_NET_CLS_RSVP6=m 645CONFIG_NET_CLS_RSVP6=m
646CONFIG_NET_CLS_FLOW=m
600# CONFIG_NET_EMATCH is not set 647# CONFIG_NET_EMATCH is not set
601CONFIG_NET_CLS_ACT=y 648CONFIG_NET_CLS_ACT=y
602CONFIG_NET_ACT_POLICE=y 649CONFIG_NET_ACT_POLICE=y
@@ -604,37 +651,51 @@ CONFIG_NET_ACT_GACT=m
604CONFIG_GACT_PROB=y 651CONFIG_GACT_PROB=y
605CONFIG_NET_ACT_MIRRED=m 652CONFIG_NET_ACT_MIRRED=m
606CONFIG_NET_ACT_IPT=m 653CONFIG_NET_ACT_IPT=m
654CONFIG_NET_ACT_NAT=m
607CONFIG_NET_ACT_PEDIT=m 655CONFIG_NET_ACT_PEDIT=m
608CONFIG_NET_ACT_SIMP=m 656CONFIG_NET_ACT_SIMP=m
609CONFIG_NET_CLS_POLICE=y 657CONFIG_NET_ACT_SKBEDIT=m
610CONFIG_NET_CLS_IND=y 658CONFIG_NET_CLS_IND=y
659CONFIG_NET_SCH_FIFO=y
611 660
612# 661#
613# Network testing 662# Network testing
614# 663#
615# CONFIG_NET_PKTGEN is not set 664# CONFIG_NET_PKTGEN is not set
616# CONFIG_HAMRADIO is not set 665# CONFIG_HAMRADIO is not set
666# CONFIG_CAN is not set
617# CONFIG_IRDA is not set 667# CONFIG_IRDA is not set
618# CONFIG_BT is not set 668# CONFIG_BT is not set
619# CONFIG_AF_RXRPC is not set 669# CONFIG_AF_RXRPC is not set
670CONFIG_PHONET=m
620CONFIG_FIB_RULES=y 671CONFIG_FIB_RULES=y
621 672CONFIG_WIRELESS=y
622#
623# Wireless
624#
625CONFIG_CFG80211=m 673CONFIG_CFG80211=m
674CONFIG_NL80211=y
675CONFIG_WIRELESS_OLD_REGULATORY=y
626CONFIG_WIRELESS_EXT=y 676CONFIG_WIRELESS_EXT=y
677CONFIG_WIRELESS_EXT_SYSFS=y
627CONFIG_MAC80211=m 678CONFIG_MAC80211=m
628# CONFIG_MAC80211_DEBUG is not set 679
680#
681# Rate control algorithm selection
682#
683CONFIG_MAC80211_RC_PID=y
684CONFIG_MAC80211_RC_MINSTREL=y
685CONFIG_MAC80211_RC_DEFAULT_PID=y
686# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
687CONFIG_MAC80211_RC_DEFAULT="pid"
688CONFIG_MAC80211_MESH=y
689CONFIG_MAC80211_LEDS=y
690# CONFIG_MAC80211_DEBUG_MENU is not set
629CONFIG_IEEE80211=m 691CONFIG_IEEE80211=m
630# CONFIG_IEEE80211_DEBUG is not set 692# CONFIG_IEEE80211_DEBUG is not set
631CONFIG_IEEE80211_CRYPT_WEP=m 693CONFIG_IEEE80211_CRYPT_WEP=m
632CONFIG_IEEE80211_CRYPT_CCMP=m 694CONFIG_IEEE80211_CRYPT_CCMP=m
633CONFIG_IEEE80211_CRYPT_TKIP=m 695CONFIG_IEEE80211_CRYPT_TKIP=m
634CONFIG_IEEE80211_SOFTMAC=m
635# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
636CONFIG_RFKILL=m 696CONFIG_RFKILL=m
637CONFIG_RFKILL_INPUT=m 697CONFIG_RFKILL_INPUT=m
698CONFIG_RFKILL_LEDS=y
638# CONFIG_NET_9P is not set 699# CONFIG_NET_9P is not set
639 700
640# 701#
@@ -644,9 +705,12 @@ CONFIG_RFKILL_INPUT=m
644# 705#
645# Generic Driver Options 706# Generic Driver Options
646# 707#
708CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
647CONFIG_STANDALONE=y 709CONFIG_STANDALONE=y
648CONFIG_PREVENT_FIRMWARE_BUILD=y 710CONFIG_PREVENT_FIRMWARE_BUILD=y
649CONFIG_FW_LOADER=y 711CONFIG_FW_LOADER=y
712CONFIG_FIRMWARE_IN_KERNEL=y
713CONFIG_EXTRA_FIRMWARE=""
650# CONFIG_SYS_HYPERVISOR is not set 714# CONFIG_SYS_HYPERVISOR is not set
651CONFIG_CONNECTOR=m 715CONFIG_CONNECTOR=m
652CONFIG_MTD=y 716CONFIG_MTD=y
@@ -655,6 +719,7 @@ CONFIG_MTD=y
655CONFIG_MTD_PARTITIONS=y 719CONFIG_MTD_PARTITIONS=y
656# CONFIG_MTD_REDBOOT_PARTS is not set 720# CONFIG_MTD_REDBOOT_PARTS is not set
657# CONFIG_MTD_CMDLINE_PARTS is not set 721# CONFIG_MTD_CMDLINE_PARTS is not set
722# CONFIG_MTD_AR7_PARTS is not set
658 723
659# 724#
660# User Modules And Translation Layers 725# User Modules And Translation Layers
@@ -667,6 +732,7 @@ CONFIG_MTD_BLOCK=y
667# CONFIG_INFTL is not set 732# CONFIG_INFTL is not set
668# CONFIG_RFD_FTL is not set 733# CONFIG_RFD_FTL is not set
669# CONFIG_SSFDC is not set 734# CONFIG_SSFDC is not set
735CONFIG_MTD_OOPS=m
670 736
671# 737#
672# RAM/ROM/Flash chip drivers 738# RAM/ROM/Flash chip drivers
@@ -701,6 +767,7 @@ CONFIG_MTD_PHYSMAP=y
701CONFIG_MTD_PHYSMAP_START=0x0 767CONFIG_MTD_PHYSMAP_START=0x0
702CONFIG_MTD_PHYSMAP_LEN=0x0 768CONFIG_MTD_PHYSMAP_LEN=0x0
703CONFIG_MTD_PHYSMAP_BANKWIDTH=0 769CONFIG_MTD_PHYSMAP_BANKWIDTH=0
770# CONFIG_MTD_INTEL_VR_NOR is not set
704# CONFIG_MTD_PLATRAM is not set 771# CONFIG_MTD_PLATRAM is not set
705 772
706# 773#
@@ -748,25 +815,26 @@ CONFIG_BLK_DEV_NBD=m
748CONFIG_BLK_DEV_RAM=y 815CONFIG_BLK_DEV_RAM=y
749CONFIG_BLK_DEV_RAM_COUNT=16 816CONFIG_BLK_DEV_RAM_COUNT=16
750CONFIG_BLK_DEV_RAM_SIZE=4096 817CONFIG_BLK_DEV_RAM_SIZE=4096
751CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 818# CONFIG_BLK_DEV_XIP is not set
752CONFIG_CDROM_PKTCDVD=m 819CONFIG_CDROM_PKTCDVD=m
753CONFIG_CDROM_PKTCDVD_BUFFERS=8 820CONFIG_CDROM_PKTCDVD_BUFFERS=8
754# CONFIG_CDROM_PKTCDVD_WCACHE is not set 821# CONFIG_CDROM_PKTCDVD_WCACHE is not set
755CONFIG_ATA_OVER_ETH=m 822CONFIG_ATA_OVER_ETH=m
823# CONFIG_BLK_DEV_HD is not set
756# CONFIG_MISC_DEVICES is not set 824# CONFIG_MISC_DEVICES is not set
825CONFIG_HAVE_IDE=y
757CONFIG_IDE=y 826CONFIG_IDE=y
758CONFIG_IDE_MAX_HWIFS=4
759CONFIG_BLK_DEV_IDE=y
760 827
761# 828#
762# Please see Documentation/ide.txt for help/info on IDE drives 829# Please see Documentation/ide/ide.txt for help/info on IDE drives
763# 830#
764# CONFIG_BLK_DEV_IDE_SATA is not set 831# CONFIG_BLK_DEV_IDE_SATA is not set
765CONFIG_BLK_DEV_IDEDISK=y 832CONFIG_IDE_GD=y
766# CONFIG_IDEDISK_MULTI_MODE is not set 833CONFIG_IDE_GD_ATA=y
834# CONFIG_IDE_GD_ATAPI is not set
767CONFIG_BLK_DEV_IDECD=y 835CONFIG_BLK_DEV_IDECD=y
836CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
768# CONFIG_BLK_DEV_IDETAPE is not set 837# CONFIG_BLK_DEV_IDETAPE is not set
769# CONFIG_BLK_DEV_IDEFLOPPY is not set
770# CONFIG_BLK_DEV_IDESCSI is not set 838# CONFIG_BLK_DEV_IDESCSI is not set
771# CONFIG_IDE_TASK_IOCTL is not set 839# CONFIG_IDE_TASK_IOCTL is not set
772CONFIG_IDE_PROC_FS=y 840CONFIG_IDE_PROC_FS=y
@@ -775,24 +843,25 @@ CONFIG_IDE_PROC_FS=y
775# IDE chipset support/bugfixes 843# IDE chipset support/bugfixes
776# 844#
777CONFIG_IDE_GENERIC=y 845CONFIG_IDE_GENERIC=y
846# CONFIG_BLK_DEV_PLATFORM is not set
847CONFIG_BLK_DEV_IDEDMA_SFF=y
848
849#
850# PCI IDE chipsets support
851#
778CONFIG_BLK_DEV_IDEPCI=y 852CONFIG_BLK_DEV_IDEPCI=y
779# CONFIG_IDEPCI_SHARE_IRQ is not set
780CONFIG_IDEPCI_PCIBUS_ORDER=y 853CONFIG_IDEPCI_PCIBUS_ORDER=y
781# CONFIG_BLK_DEV_OFFBOARD is not set 854# CONFIG_BLK_DEV_OFFBOARD is not set
782CONFIG_BLK_DEV_GENERIC=y 855CONFIG_BLK_DEV_GENERIC=y
783# CONFIG_BLK_DEV_OPTI621 is not set 856# CONFIG_BLK_DEV_OPTI621 is not set
784CONFIG_BLK_DEV_IDEDMA_PCI=y 857CONFIG_BLK_DEV_IDEDMA_PCI=y
785# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
786# CONFIG_IDEDMA_ONLYDISK is not set
787# CONFIG_BLK_DEV_AEC62XX is not set 858# CONFIG_BLK_DEV_AEC62XX is not set
788# CONFIG_BLK_DEV_ALI15X3 is not set 859# CONFIG_BLK_DEV_ALI15X3 is not set
789# CONFIG_BLK_DEV_AMD74XX is not set 860# CONFIG_BLK_DEV_AMD74XX is not set
790# CONFIG_BLK_DEV_CMD64X is not set 861# CONFIG_BLK_DEV_CMD64X is not set
791# CONFIG_BLK_DEV_TRIFLEX is not set 862# CONFIG_BLK_DEV_TRIFLEX is not set
792# CONFIG_BLK_DEV_CY82C693 is not set
793# CONFIG_BLK_DEV_CS5520 is not set 863# CONFIG_BLK_DEV_CS5520 is not set
794# CONFIG_BLK_DEV_CS5530 is not set 864# CONFIG_BLK_DEV_CS5530 is not set
795# CONFIG_BLK_DEV_HPT34X is not set
796# CONFIG_BLK_DEV_HPT366 is not set 865# CONFIG_BLK_DEV_HPT366 is not set
797# CONFIG_BLK_DEV_JMICRON is not set 866# CONFIG_BLK_DEV_JMICRON is not set
798# CONFIG_BLK_DEV_SC1200 is not set 867# CONFIG_BLK_DEV_SC1200 is not set
@@ -808,10 +877,7 @@ CONFIG_BLK_DEV_IT8213=m
808# CONFIG_BLK_DEV_TRM290 is not set 877# CONFIG_BLK_DEV_TRM290 is not set
809# CONFIG_BLK_DEV_VIA82CXXX is not set 878# CONFIG_BLK_DEV_VIA82CXXX is not set
810CONFIG_BLK_DEV_TC86C001=m 879CONFIG_BLK_DEV_TC86C001=m
811# CONFIG_IDE_ARM is not set
812CONFIG_BLK_DEV_IDEDMA=y 880CONFIG_BLK_DEV_IDEDMA=y
813# CONFIG_IDEDMA_IVB is not set
814# CONFIG_BLK_DEV_HD is not set
815 881
816# 882#
817# SCSI device support 883# SCSI device support
@@ -848,8 +914,10 @@ CONFIG_SCSI_WAIT_SCAN=m
848# 914#
849CONFIG_SCSI_SPI_ATTRS=m 915CONFIG_SCSI_SPI_ATTRS=m
850CONFIG_SCSI_FC_ATTRS=m 916CONFIG_SCSI_FC_ATTRS=m
917# CONFIG_SCSI_FC_TGT_ATTRS is not set
851CONFIG_SCSI_ISCSI_ATTRS=m 918CONFIG_SCSI_ISCSI_ATTRS=m
852# CONFIG_SCSI_SAS_LIBSAS is not set 919# CONFIG_SCSI_SAS_LIBSAS is not set
920# CONFIG_SCSI_SRP_ATTRS is not set
853CONFIG_SCSI_LOWLEVEL=y 921CONFIG_SCSI_LOWLEVEL=y
854CONFIG_ISCSI_TCP=m 922CONFIG_ISCSI_TCP=m
855CONFIG_BLK_DEV_3W_XXXX_RAID=m 923CONFIG_BLK_DEV_3W_XXXX_RAID=m
@@ -866,6 +934,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
866# CONFIG_SCSI_AIC79XX is not set 934# CONFIG_SCSI_AIC79XX is not set
867# CONFIG_SCSI_AIC94XX is not set 935# CONFIG_SCSI_AIC94XX is not set
868# CONFIG_SCSI_DPT_I2O is not set 936# CONFIG_SCSI_DPT_I2O is not set
937# CONFIG_SCSI_ADVANSYS is not set
869# CONFIG_SCSI_ARCMSR is not set 938# CONFIG_SCSI_ARCMSR is not set
870# CONFIG_MEGARAID_NEWGEN is not set 939# CONFIG_MEGARAID_NEWGEN is not set
871# CONFIG_MEGARAID_LEGACY is not set 940# CONFIG_MEGARAID_LEGACY is not set
@@ -876,6 +945,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
876# CONFIG_SCSI_IPS is not set 945# CONFIG_SCSI_IPS is not set
877# CONFIG_SCSI_INITIO is not set 946# CONFIG_SCSI_INITIO is not set
878# CONFIG_SCSI_INIA100 is not set 947# CONFIG_SCSI_INIA100 is not set
948# CONFIG_SCSI_MVSAS is not set
879# CONFIG_SCSI_STEX is not set 949# CONFIG_SCSI_STEX is not set
880# CONFIG_SCSI_SYM53C8XX_2 is not set 950# CONFIG_SCSI_SYM53C8XX_2 is not set
881# CONFIG_SCSI_QLOGIC_1280 is not set 951# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -887,6 +957,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
887# CONFIG_SCSI_NSP32 is not set 957# CONFIG_SCSI_NSP32 is not set
888# CONFIG_SCSI_DEBUG is not set 958# CONFIG_SCSI_DEBUG is not set
889# CONFIG_SCSI_SRP is not set 959# CONFIG_SCSI_SRP is not set
960# CONFIG_SCSI_DH is not set
890# CONFIG_ATA is not set 961# CONFIG_ATA is not set
891CONFIG_MD=y 962CONFIG_MD=y
892CONFIG_BLK_DEV_MD=m 963CONFIG_BLK_DEV_MD=m
@@ -905,32 +976,28 @@ CONFIG_DM_SNAPSHOT=m
905CONFIG_DM_MIRROR=m 976CONFIG_DM_MIRROR=m
906CONFIG_DM_ZERO=m 977CONFIG_DM_ZERO=m
907CONFIG_DM_MULTIPATH=m 978CONFIG_DM_MULTIPATH=m
908CONFIG_DM_MULTIPATH_EMC=m
909CONFIG_DM_MULTIPATH_RDAC=m
910# CONFIG_DM_DELAY is not set 979# CONFIG_DM_DELAY is not set
980# CONFIG_DM_UEVENT is not set
981# CONFIG_FUSION is not set
911 982
912# 983#
913# Fusion MPT device support 984# IEEE 1394 (FireWire) support
914# 985#
915# CONFIG_FUSION is not set
916# CONFIG_FUSION_SPI is not set
917# CONFIG_FUSION_FC is not set
918# CONFIG_FUSION_SAS is not set
919 986
920# 987#
921# IEEE 1394 (FireWire) support 988# Enable only one of the two stacks, unless you know what you are doing
922# 989#
923# CONFIG_FIREWIRE is not set 990# CONFIG_FIREWIRE is not set
924# CONFIG_IEEE1394 is not set 991# CONFIG_IEEE1394 is not set
925# CONFIG_I2O is not set 992# CONFIG_I2O is not set
926CONFIG_NETDEVICES=y 993CONFIG_NETDEVICES=y
927CONFIG_NETDEVICES_MULTIQUEUE=y
928CONFIG_IFB=m 994CONFIG_IFB=m
929CONFIG_DUMMY=m 995CONFIG_DUMMY=m
930CONFIG_BONDING=m 996CONFIG_BONDING=m
931CONFIG_MACVLAN=m 997CONFIG_MACVLAN=m
932CONFIG_EQUALIZER=m 998CONFIG_EQUALIZER=m
933CONFIG_TUN=m 999CONFIG_TUN=m
1000CONFIG_VETH=m
934# CONFIG_ARCNET is not set 1001# CONFIG_ARCNET is not set
935CONFIG_PHYLIB=m 1002CONFIG_PHYLIB=m
936 1003
@@ -946,26 +1013,34 @@ CONFIG_VITESSE_PHY=m
946CONFIG_SMSC_PHY=m 1013CONFIG_SMSC_PHY=m
947CONFIG_BROADCOM_PHY=m 1014CONFIG_BROADCOM_PHY=m
948CONFIG_ICPLUS_PHY=m 1015CONFIG_ICPLUS_PHY=m
949# CONFIG_FIXED_PHY is not set 1016CONFIG_REALTEK_PHY=m
1017CONFIG_MDIO_BITBANG=m
950CONFIG_NET_ETHERNET=y 1018CONFIG_NET_ETHERNET=y
951CONFIG_MII=y 1019CONFIG_MII=y
952CONFIG_AX88796=m 1020CONFIG_AX88796=m
1021# CONFIG_AX88796_93CX6 is not set
953# CONFIG_HAPPYMEAL is not set 1022# CONFIG_HAPPYMEAL is not set
954# CONFIG_SUNGEM is not set 1023# CONFIG_SUNGEM is not set
955# CONFIG_CASSINI is not set 1024# CONFIG_CASSINI is not set
956# CONFIG_NET_VENDOR_3COM is not set 1025# CONFIG_NET_VENDOR_3COM is not set
1026# CONFIG_SMC91X is not set
957# CONFIG_DM9000 is not set 1027# CONFIG_DM9000 is not set
958# CONFIG_NET_TULIP is not set 1028# CONFIG_NET_TULIP is not set
959# CONFIG_HP100 is not set 1029# CONFIG_HP100 is not set
1030# CONFIG_IBM_NEW_EMAC_ZMII is not set
1031# CONFIG_IBM_NEW_EMAC_RGMII is not set
1032# CONFIG_IBM_NEW_EMAC_TAH is not set
1033# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
1034# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
1035# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
1036# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
960CONFIG_NET_PCI=y 1037CONFIG_NET_PCI=y
961CONFIG_PCNET32=y 1038CONFIG_PCNET32=y
962# CONFIG_PCNET32_NAPI is not set
963# CONFIG_AMD8111_ETH is not set 1039# CONFIG_AMD8111_ETH is not set
964# CONFIG_ADAPTEC_STARFIRE is not set 1040# CONFIG_ADAPTEC_STARFIRE is not set
965# CONFIG_B44 is not set 1041# CONFIG_B44 is not set
966# CONFIG_FORCEDETH is not set 1042# CONFIG_FORCEDETH is not set
967CONFIG_TC35815=m 1043CONFIG_TC35815=m
968# CONFIG_DGRS is not set
969# CONFIG_EEPRO100 is not set 1044# CONFIG_EEPRO100 is not set
970# CONFIG_E100 is not set 1045# CONFIG_E100 is not set
971# CONFIG_FEALNX is not set 1046# CONFIG_FEALNX is not set
@@ -973,16 +1048,21 @@ CONFIG_TC35815=m
973# CONFIG_NE2K_PCI is not set 1048# CONFIG_NE2K_PCI is not set
974# CONFIG_8139CP is not set 1049# CONFIG_8139CP is not set
975# CONFIG_8139TOO is not set 1050# CONFIG_8139TOO is not set
1051# CONFIG_R6040 is not set
976# CONFIG_SIS900 is not set 1052# CONFIG_SIS900 is not set
977# CONFIG_EPIC100 is not set 1053# CONFIG_EPIC100 is not set
978# CONFIG_SUNDANCE is not set 1054# CONFIG_SUNDANCE is not set
979# CONFIG_TLAN is not set 1055# CONFIG_TLAN is not set
980# CONFIG_VIA_RHINE is not set 1056# CONFIG_VIA_RHINE is not set
981# CONFIG_SC92031 is not set 1057# CONFIG_SC92031 is not set
1058# CONFIG_ATL2 is not set
982CONFIG_NETDEV_1000=y 1059CONFIG_NETDEV_1000=y
983# CONFIG_ACENIC is not set 1060# CONFIG_ACENIC is not set
984# CONFIG_DL2K is not set 1061# CONFIG_DL2K is not set
985# CONFIG_E1000 is not set 1062# CONFIG_E1000 is not set
1063# CONFIG_E1000E is not set
1064# CONFIG_IP1000 is not set
1065# CONFIG_IGB is not set
986# CONFIG_NS83820 is not set 1066# CONFIG_NS83820 is not set
987# CONFIG_HAMACHI is not set 1067# CONFIG_HAMACHI is not set
988# CONFIG_YELLOWFIN is not set 1068# CONFIG_YELLOWFIN is not set
@@ -995,14 +1075,24 @@ CONFIG_NETDEV_1000=y
995# CONFIG_BNX2 is not set 1075# CONFIG_BNX2 is not set
996# CONFIG_QLA3XXX is not set 1076# CONFIG_QLA3XXX is not set
997# CONFIG_ATL1 is not set 1077# CONFIG_ATL1 is not set
1078# CONFIG_ATL1E is not set
1079# CONFIG_JME is not set
998CONFIG_NETDEV_10000=y 1080CONFIG_NETDEV_10000=y
999# CONFIG_CHELSIO_T1 is not set 1081# CONFIG_CHELSIO_T1 is not set
1000CONFIG_CHELSIO_T3=m 1082CONFIG_CHELSIO_T3=m
1083# CONFIG_ENIC is not set
1084# CONFIG_IXGBE is not set
1001# CONFIG_IXGB is not set 1085# CONFIG_IXGB is not set
1002# CONFIG_S2IO is not set 1086# CONFIG_S2IO is not set
1003# CONFIG_MYRI10GE is not set 1087# CONFIG_MYRI10GE is not set
1004CONFIG_NETXEN_NIC=m 1088CONFIG_NETXEN_NIC=m
1089# CONFIG_NIU is not set
1090# CONFIG_MLX4_EN is not set
1005# CONFIG_MLX4_CORE is not set 1091# CONFIG_MLX4_CORE is not set
1092# CONFIG_TEHUTI is not set
1093# CONFIG_BNX2X is not set
1094# CONFIG_QLGE is not set
1095# CONFIG_SFC is not set
1006# CONFIG_TR is not set 1096# CONFIG_TR is not set
1007 1097
1008# 1098#
@@ -1022,6 +1112,7 @@ CONFIG_IPW2200_QOS=y
1022# CONFIG_IPW2200_DEBUG is not set 1112# CONFIG_IPW2200_DEBUG is not set
1023CONFIG_LIBERTAS=m 1113CONFIG_LIBERTAS=m
1024# CONFIG_LIBERTAS_DEBUG is not set 1114# CONFIG_LIBERTAS_DEBUG is not set
1115# CONFIG_LIBERTAS_THINFIRM is not set
1025CONFIG_HERMES=m 1116CONFIG_HERMES=m
1026CONFIG_PLX_HERMES=m 1117CONFIG_PLX_HERMES=m
1027CONFIG_TMD_HERMES=m 1118CONFIG_TMD_HERMES=m
@@ -1030,25 +1121,30 @@ CONFIG_PCI_HERMES=m
1030CONFIG_ATMEL=m 1121CONFIG_ATMEL=m
1031CONFIG_PCI_ATMEL=m 1122CONFIG_PCI_ATMEL=m
1032CONFIG_PRISM54=m 1123CONFIG_PRISM54=m
1124# CONFIG_RTL8180 is not set
1125# CONFIG_ADM8211 is not set
1126# CONFIG_MAC80211_HWSIM is not set
1127# CONFIG_P54_COMMON is not set
1128# CONFIG_ATH5K is not set
1129# CONFIG_ATH9K is not set
1130# CONFIG_IWLCORE is not set
1131# CONFIG_IWLWIFI_LEDS is not set
1132# CONFIG_IWLAGN is not set
1133# CONFIG_IWL3945 is not set
1033CONFIG_HOSTAP=m 1134CONFIG_HOSTAP=m
1034CONFIG_HOSTAP_FIRMWARE=y 1135CONFIG_HOSTAP_FIRMWARE=y
1035CONFIG_HOSTAP_FIRMWARE_NVRAM=y 1136CONFIG_HOSTAP_FIRMWARE_NVRAM=y
1036CONFIG_HOSTAP_PLX=m 1137CONFIG_HOSTAP_PLX=m
1037CONFIG_HOSTAP_PCI=m 1138CONFIG_HOSTAP_PCI=m
1038CONFIG_BCM43XX=m 1139# CONFIG_B43 is not set
1039CONFIG_BCM43XX_DEBUG=y 1140# CONFIG_B43LEGACY is not set
1040CONFIG_BCM43XX_DMA=y 1141# CONFIG_RT2X00 is not set
1041CONFIG_BCM43XX_PIO=y
1042CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
1043# CONFIG_BCM43XX_DMA_MODE is not set
1044# CONFIG_BCM43XX_PIO_MODE is not set
1045# CONFIG_WAN is not set 1142# CONFIG_WAN is not set
1046# CONFIG_FDDI is not set 1143# CONFIG_FDDI is not set
1047# CONFIG_HIPPI is not set 1144# CONFIG_HIPPI is not set
1048# CONFIG_PPP is not set 1145# CONFIG_PPP is not set
1049# CONFIG_SLIP is not set 1146# CONFIG_SLIP is not set
1050# CONFIG_NET_FC is not set 1147# CONFIG_NET_FC is not set
1051# CONFIG_SHAPER is not set
1052# CONFIG_NETCONSOLE is not set 1148# CONFIG_NETCONSOLE is not set
1053# CONFIG_NETPOLL is not set 1149# CONFIG_NETPOLL is not set
1054# CONFIG_NET_POLL_CONTROLLER is not set 1150# CONFIG_NET_POLL_CONTROLLER is not set
@@ -1070,7 +1166,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
1070CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 1166CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
1071CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 1167CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
1072# CONFIG_INPUT_JOYDEV is not set 1168# CONFIG_INPUT_JOYDEV is not set
1073# CONFIG_INPUT_TSDEV is not set
1074# CONFIG_INPUT_EVDEV is not set 1169# CONFIG_INPUT_EVDEV is not set
1075# CONFIG_INPUT_EVBUG is not set 1170# CONFIG_INPUT_EVBUG is not set
1076 1171
@@ -1099,10 +1194,13 @@ CONFIG_SERIO_SERPORT=y
1099# Character devices 1194# Character devices
1100# 1195#
1101CONFIG_VT=y 1196CONFIG_VT=y
1197CONFIG_CONSOLE_TRANSLATIONS=y
1102CONFIG_VT_CONSOLE=y 1198CONFIG_VT_CONSOLE=y
1103CONFIG_HW_CONSOLE=y 1199CONFIG_HW_CONSOLE=y
1104CONFIG_VT_HW_CONSOLE_BINDING=y 1200CONFIG_VT_HW_CONSOLE_BINDING=y
1201CONFIG_DEVKMEM=y
1105# CONFIG_SERIAL_NONSTANDARD is not set 1202# CONFIG_SERIAL_NONSTANDARD is not set
1203# CONFIG_NOZOMI is not set
1106 1204
1107# 1205#
1108# Serial drivers 1206# Serial drivers
@@ -1124,101 +1222,165 @@ CONFIG_UNIX98_PTYS=y
1124CONFIG_LEGACY_PTYS=y 1222CONFIG_LEGACY_PTYS=y
1125CONFIG_LEGACY_PTY_COUNT=256 1223CONFIG_LEGACY_PTY_COUNT=256
1126# CONFIG_IPMI_HANDLER is not set 1224# CONFIG_IPMI_HANDLER is not set
1127# CONFIG_WATCHDOG is not set
1128CONFIG_HW_RANDOM=m 1225CONFIG_HW_RANDOM=m
1129CONFIG_RTC=y
1130# CONFIG_R3964 is not set 1226# CONFIG_R3964 is not set
1131# CONFIG_APPLICOM is not set 1227# CONFIG_APPLICOM is not set
1132# CONFIG_DRM is not set
1133# CONFIG_RAW_DRIVER is not set 1228# CONFIG_RAW_DRIVER is not set
1134# CONFIG_TCG_TPM is not set 1229# CONFIG_TCG_TPM is not set
1135CONFIG_DEVPORT=y 1230CONFIG_DEVPORT=y
1136# CONFIG_I2C is not set 1231# CONFIG_I2C is not set
1137
1138#
1139# SPI support
1140#
1141# CONFIG_SPI is not set 1232# CONFIG_SPI is not set
1142# CONFIG_SPI_MASTER is not set
1143# CONFIG_W1 is not set 1233# CONFIG_W1 is not set
1144# CONFIG_POWER_SUPPLY is not set 1234# CONFIG_POWER_SUPPLY is not set
1145# CONFIG_HWMON is not set 1235# CONFIG_HWMON is not set
1236# CONFIG_THERMAL is not set
1237# CONFIG_THERMAL_HWMON is not set
1238# CONFIG_WATCHDOG is not set
1239CONFIG_SSB_POSSIBLE=y
1240
1241#
1242# Sonics Silicon Backplane
1243#
1244# CONFIG_SSB is not set
1146 1245
1147# 1246#
1148# Multifunction device drivers 1247# Multifunction device drivers
1149# 1248#
1249# CONFIG_MFD_CORE is not set
1150# CONFIG_MFD_SM501 is not set 1250# CONFIG_MFD_SM501 is not set
1251# CONFIG_HTC_PASIC3 is not set
1252# CONFIG_MFD_TMIO is not set
1253# CONFIG_REGULATOR is not set
1151 1254
1152# 1255#
1153# Multimedia devices 1256# Multimedia devices
1154# 1257#
1258
1259#
1260# Multimedia core support
1261#
1155# CONFIG_VIDEO_DEV is not set 1262# CONFIG_VIDEO_DEV is not set
1156# CONFIG_DVB_CORE is not set 1263# CONFIG_DVB_CORE is not set
1264# CONFIG_VIDEO_MEDIA is not set
1265
1266#
1267# Multimedia drivers
1268#
1157# CONFIG_DAB is not set 1269# CONFIG_DAB is not set
1158 1270
1159# 1271#
1160# Graphics support 1272# Graphics support
1161# 1273#
1274# CONFIG_DRM is not set
1275# CONFIG_VGASTATE is not set
1276# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1277# CONFIG_FB is not set
1162# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1278# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1163 1279
1164# 1280#
1165# Display device support 1281# Display device support
1166# 1282#
1167# CONFIG_DISPLAY_SUPPORT is not set 1283# CONFIG_DISPLAY_SUPPORT is not set
1168# CONFIG_VGASTATE is not set
1169# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1170# CONFIG_FB is not set
1171 1284
1172# 1285#
1173# Console display driver support 1286# Console display driver support
1174# 1287#
1175# CONFIG_VGA_CONSOLE is not set 1288# CONFIG_VGA_CONSOLE is not set
1176CONFIG_DUMMY_CONSOLE=y 1289CONFIG_DUMMY_CONSOLE=y
1177
1178#
1179# Sound
1180#
1181# CONFIG_SOUND is not set 1290# CONFIG_SOUND is not set
1182CONFIG_HID_SUPPORT=y 1291CONFIG_HID_SUPPORT=y
1183CONFIG_HID=m 1292CONFIG_HID=m
1184# CONFIG_HID_DEBUG is not set 1293# CONFIG_HID_DEBUG is not set
1294# CONFIG_HIDRAW is not set
1295# CONFIG_HID_PID is not set
1296
1297#
1298# Special HID drivers
1299#
1300CONFIG_HID_COMPAT=y
1185CONFIG_USB_SUPPORT=y 1301CONFIG_USB_SUPPORT=y
1186CONFIG_USB_ARCH_HAS_HCD=y 1302CONFIG_USB_ARCH_HAS_HCD=y
1187CONFIG_USB_ARCH_HAS_OHCI=y 1303CONFIG_USB_ARCH_HAS_OHCI=y
1188CONFIG_USB_ARCH_HAS_EHCI=y 1304CONFIG_USB_ARCH_HAS_EHCI=y
1189# CONFIG_USB is not set 1305# CONFIG_USB is not set
1306# CONFIG_USB_OTG_WHITELIST is not set
1307# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1190 1308
1191# 1309#
1192# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1310# Enable Host or Gadget support to see Inventra options
1193# 1311#
1194 1312
1195# 1313#
1196# USB Gadget Support 1314# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1197# 1315#
1198# CONFIG_USB_GADGET is not set 1316# CONFIG_USB_GADGET is not set
1317# CONFIG_UWB is not set
1199# CONFIG_MMC is not set 1318# CONFIG_MMC is not set
1200# CONFIG_NEW_LEDS is not set 1319# CONFIG_MEMSTICK is not set
1320CONFIG_NEW_LEDS=y
1321CONFIG_LEDS_CLASS=m
1322
1323#
1324# LED drivers
1325#
1326
1327#
1328# LED Triggers
1329#
1330CONFIG_LEDS_TRIGGERS=y
1331CONFIG_LEDS_TRIGGER_TIMER=m
1332CONFIG_LEDS_TRIGGER_IDE_DISK=y
1333CONFIG_LEDS_TRIGGER_HEARTBEAT=m
1334CONFIG_LEDS_TRIGGER_BACKLIGHT=m
1335CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
1336# CONFIG_ACCESSIBILITY is not set
1201# CONFIG_INFINIBAND is not set 1337# CONFIG_INFINIBAND is not set
1202# CONFIG_RTC_CLASS is not set 1338CONFIG_RTC_LIB=y
1339CONFIG_RTC_CLASS=y
1340CONFIG_RTC_HCTOSYS=y
1341CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1342# CONFIG_RTC_DEBUG is not set
1203 1343
1204# 1344#
1205# DMA Engine support 1345# RTC interfaces
1206# 1346#
1207# CONFIG_DMA_ENGINE is not set 1347CONFIG_RTC_INTF_SYSFS=y
1348CONFIG_RTC_INTF_PROC=y
1349CONFIG_RTC_INTF_DEV=y
1350# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1351# CONFIG_RTC_DRV_TEST is not set
1208 1352
1209# 1353#
1210# DMA Clients 1354# SPI RTC drivers
1211# 1355#
1212 1356
1213# 1357#
1214# DMA Devices 1358# Platform RTC drivers
1215# 1359#
1360CONFIG_RTC_DRV_CMOS=y
1361# CONFIG_RTC_DRV_DS1286 is not set
1362# CONFIG_RTC_DRV_DS1511 is not set
1363# CONFIG_RTC_DRV_DS1553 is not set
1364# CONFIG_RTC_DRV_DS1742 is not set
1365# CONFIG_RTC_DRV_STK17TA8 is not set
1366# CONFIG_RTC_DRV_M48T86 is not set
1367# CONFIG_RTC_DRV_M48T35 is not set
1368# CONFIG_RTC_DRV_M48T59 is not set
1369# CONFIG_RTC_DRV_BQ4802 is not set
1370# CONFIG_RTC_DRV_V3020 is not set
1216 1371
1217# 1372#
1218# Userspace I/O 1373# on-CPU RTC drivers
1219# 1374#
1375# CONFIG_DMADEVICES is not set
1220CONFIG_UIO=m 1376CONFIG_UIO=m
1221CONFIG_UIO_CIF=m 1377CONFIG_UIO_CIF=m
1378# CONFIG_UIO_PDRV is not set
1379# CONFIG_UIO_PDRV_GENIRQ is not set
1380# CONFIG_UIO_SMX is not set
1381# CONFIG_UIO_SERCOS3 is not set
1382# CONFIG_STAGING is not set
1383CONFIG_STAGING_EXCLUDE_BUILD=y
1222 1384
1223# 1385#
1224# File systems 1386# File systems
@@ -1230,9 +1392,8 @@ CONFIG_EXT3_FS=y
1230CONFIG_EXT3_FS_XATTR=y 1392CONFIG_EXT3_FS_XATTR=y
1231# CONFIG_EXT3_FS_POSIX_ACL is not set 1393# CONFIG_EXT3_FS_POSIX_ACL is not set
1232# CONFIG_EXT3_FS_SECURITY is not set 1394# CONFIG_EXT3_FS_SECURITY is not set
1233# CONFIG_EXT4DEV_FS is not set 1395# CONFIG_EXT4_FS is not set
1234CONFIG_JBD=y 1396CONFIG_JBD=y
1235# CONFIG_JBD_DEBUG is not set
1236CONFIG_FS_MBCACHE=y 1397CONFIG_FS_MBCACHE=y
1237CONFIG_REISERFS_FS=m 1398CONFIG_REISERFS_FS=m
1238# CONFIG_REISERFS_CHECK is not set 1399# CONFIG_REISERFS_CHECK is not set
@@ -1246,22 +1407,22 @@ CONFIG_JFS_SECURITY=y
1246# CONFIG_JFS_DEBUG is not set 1407# CONFIG_JFS_DEBUG is not set
1247# CONFIG_JFS_STATISTICS is not set 1408# CONFIG_JFS_STATISTICS is not set
1248CONFIG_FS_POSIX_ACL=y 1409CONFIG_FS_POSIX_ACL=y
1410CONFIG_FILE_LOCKING=y
1249CONFIG_XFS_FS=m 1411CONFIG_XFS_FS=m
1250CONFIG_XFS_QUOTA=y 1412CONFIG_XFS_QUOTA=y
1251CONFIG_XFS_SECURITY=y
1252CONFIG_XFS_POSIX_ACL=y 1413CONFIG_XFS_POSIX_ACL=y
1253# CONFIG_XFS_RT is not set 1414# CONFIG_XFS_RT is not set
1254# CONFIG_GFS2_FS is not set 1415# CONFIG_XFS_DEBUG is not set
1255# CONFIG_OCFS2_FS is not set 1416# CONFIG_OCFS2_FS is not set
1256CONFIG_MINIX_FS=m 1417CONFIG_DNOTIFY=y
1257CONFIG_ROMFS_FS=m
1258CONFIG_INOTIFY=y 1418CONFIG_INOTIFY=y
1259CONFIG_INOTIFY_USER=y 1419CONFIG_INOTIFY_USER=y
1260CONFIG_QUOTA=y 1420CONFIG_QUOTA=y
1421# CONFIG_QUOTA_NETLINK_INTERFACE is not set
1422CONFIG_PRINT_QUOTA_WARNING=y
1261# CONFIG_QFMT_V1 is not set 1423# CONFIG_QFMT_V1 is not set
1262CONFIG_QFMT_V2=y 1424CONFIG_QFMT_V2=y
1263CONFIG_QUOTACTL=y 1425CONFIG_QUOTACTL=y
1264CONFIG_DNOTIFY=y
1265CONFIG_AUTOFS_FS=y 1426CONFIG_AUTOFS_FS=y
1266# CONFIG_AUTOFS4_FS is not set 1427# CONFIG_AUTOFS4_FS is not set
1267CONFIG_FUSE_FS=m 1428CONFIG_FUSE_FS=m
@@ -1291,11 +1452,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1291CONFIG_PROC_FS=y 1452CONFIG_PROC_FS=y
1292CONFIG_PROC_KCORE=y 1453CONFIG_PROC_KCORE=y
1293CONFIG_PROC_SYSCTL=y 1454CONFIG_PROC_SYSCTL=y
1455CONFIG_PROC_PAGE_MONITOR=y
1294CONFIG_SYSFS=y 1456CONFIG_SYSFS=y
1295CONFIG_TMPFS=y 1457CONFIG_TMPFS=y
1296# CONFIG_TMPFS_POSIX_ACL is not set 1458# CONFIG_TMPFS_POSIX_ACL is not set
1297# CONFIG_HUGETLB_PAGE is not set 1459# CONFIG_HUGETLB_PAGE is not set
1298CONFIG_RAMFS=y
1299# CONFIG_CONFIGFS_FS is not set 1460# CONFIG_CONFIGFS_FS is not set
1300 1461
1301# 1462#
@@ -1312,46 +1473,48 @@ CONFIG_EFS_FS=m
1312CONFIG_JFFS2_FS=m 1473CONFIG_JFFS2_FS=m
1313CONFIG_JFFS2_FS_DEBUG=0 1474CONFIG_JFFS2_FS_DEBUG=0
1314CONFIG_JFFS2_FS_WRITEBUFFER=y 1475CONFIG_JFFS2_FS_WRITEBUFFER=y
1476# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
1315# CONFIG_JFFS2_SUMMARY is not set 1477# CONFIG_JFFS2_SUMMARY is not set
1316CONFIG_JFFS2_FS_XATTR=y 1478CONFIG_JFFS2_FS_XATTR=y
1317CONFIG_JFFS2_FS_POSIX_ACL=y 1479CONFIG_JFFS2_FS_POSIX_ACL=y
1318CONFIG_JFFS2_FS_SECURITY=y 1480CONFIG_JFFS2_FS_SECURITY=y
1319CONFIG_JFFS2_COMPRESSION_OPTIONS=y 1481CONFIG_JFFS2_COMPRESSION_OPTIONS=y
1320CONFIG_JFFS2_ZLIB=y 1482CONFIG_JFFS2_ZLIB=y
1483# CONFIG_JFFS2_LZO is not set
1321CONFIG_JFFS2_RTIME=y 1484CONFIG_JFFS2_RTIME=y
1322CONFIG_JFFS2_RUBIN=y 1485CONFIG_JFFS2_RUBIN=y
1323# CONFIG_JFFS2_CMODE_NONE is not set 1486# CONFIG_JFFS2_CMODE_NONE is not set
1324CONFIG_JFFS2_CMODE_PRIORITY=y 1487CONFIG_JFFS2_CMODE_PRIORITY=y
1325# CONFIG_JFFS2_CMODE_SIZE is not set 1488# CONFIG_JFFS2_CMODE_SIZE is not set
1489# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
1490# CONFIG_UBIFS_FS is not set
1326CONFIG_CRAMFS=m 1491CONFIG_CRAMFS=m
1327CONFIG_VXFS_FS=m 1492CONFIG_VXFS_FS=m
1493CONFIG_MINIX_FS=m
1494# CONFIG_OMFS_FS is not set
1328# CONFIG_HPFS_FS is not set 1495# CONFIG_HPFS_FS is not set
1329# CONFIG_QNX4FS_FS is not set 1496# CONFIG_QNX4FS_FS is not set
1497CONFIG_ROMFS_FS=m
1330CONFIG_SYSV_FS=m 1498CONFIG_SYSV_FS=m
1331CONFIG_UFS_FS=m 1499CONFIG_UFS_FS=m
1332# CONFIG_UFS_FS_WRITE is not set 1500# CONFIG_UFS_FS_WRITE is not set
1333# CONFIG_UFS_DEBUG is not set 1501# CONFIG_UFS_DEBUG is not set
1334 1502CONFIG_NETWORK_FILESYSTEMS=y
1335#
1336# Network File Systems
1337#
1338CONFIG_NFS_FS=y 1503CONFIG_NFS_FS=y
1339CONFIG_NFS_V3=y 1504CONFIG_NFS_V3=y
1340# CONFIG_NFS_V3_ACL is not set 1505# CONFIG_NFS_V3_ACL is not set
1341# CONFIG_NFS_V4 is not set 1506# CONFIG_NFS_V4 is not set
1342# CONFIG_NFS_DIRECTIO is not set 1507CONFIG_ROOT_NFS=y
1343CONFIG_NFSD=y 1508CONFIG_NFSD=y
1344CONFIG_NFSD_V3=y 1509CONFIG_NFSD_V3=y
1345# CONFIG_NFSD_V3_ACL is not set 1510# CONFIG_NFSD_V3_ACL is not set
1346# CONFIG_NFSD_V4 is not set 1511# CONFIG_NFSD_V4 is not set
1347# CONFIG_NFSD_TCP is not set
1348CONFIG_ROOT_NFS=y
1349CONFIG_LOCKD=y 1512CONFIG_LOCKD=y
1350CONFIG_LOCKD_V4=y 1513CONFIG_LOCKD_V4=y
1351CONFIG_EXPORTFS=y 1514CONFIG_EXPORTFS=y
1352CONFIG_NFS_COMMON=y 1515CONFIG_NFS_COMMON=y
1353CONFIG_SUNRPC=y 1516CONFIG_SUNRPC=y
1354# CONFIG_SUNRPC_BIND34 is not set 1517# CONFIG_SUNRPC_REGISTER_V4 is not set
1355# CONFIG_RPCSEC_GSS_KRB5 is not set 1518# CONFIG_RPCSEC_GSS_KRB5 is not set
1356# CONFIG_RPCSEC_GSS_SPKM3 is not set 1519# CONFIG_RPCSEC_GSS_SPKM3 is not set
1357# CONFIG_SMB_FS is not set 1520# CONFIG_SMB_FS is not set
@@ -1365,10 +1528,6 @@ CONFIG_SUNRPC=y
1365# 1528#
1366# CONFIG_PARTITION_ADVANCED is not set 1529# CONFIG_PARTITION_ADVANCED is not set
1367CONFIG_MSDOS_PARTITION=y 1530CONFIG_MSDOS_PARTITION=y
1368
1369#
1370# Native Language Support
1371#
1372CONFIG_NLS=m 1531CONFIG_NLS=m
1373CONFIG_NLS_DEFAULT="iso8859-1" 1532CONFIG_NLS_DEFAULT="iso8859-1"
1374CONFIG_NLS_CODEPAGE_437=m 1533CONFIG_NLS_CODEPAGE_437=m
@@ -1409,29 +1568,30 @@ CONFIG_NLS_ISO8859_15=m
1409CONFIG_NLS_KOI8_R=m 1568CONFIG_NLS_KOI8_R=m
1410CONFIG_NLS_KOI8_U=m 1569CONFIG_NLS_KOI8_U=m
1411CONFIG_NLS_UTF8=m 1570CONFIG_NLS_UTF8=m
1412
1413#
1414# Distributed Lock Manager
1415#
1416# CONFIG_DLM is not set 1571# CONFIG_DLM is not set
1417 1572
1418# 1573#
1419# Profiling support
1420#
1421# CONFIG_PROFILING is not set
1422
1423#
1424# Kernel hacking 1574# Kernel hacking
1425# 1575#
1426CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1576CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1427# CONFIG_PRINTK_TIME is not set 1577# CONFIG_PRINTK_TIME is not set
1578CONFIG_ENABLE_WARN_DEPRECATED=y
1428CONFIG_ENABLE_MUST_CHECK=y 1579CONFIG_ENABLE_MUST_CHECK=y
1580CONFIG_FRAME_WARN=1024
1429# CONFIG_MAGIC_SYSRQ is not set 1581# CONFIG_MAGIC_SYSRQ is not set
1430# CONFIG_UNUSED_SYMBOLS is not set 1582# CONFIG_UNUSED_SYMBOLS is not set
1431# CONFIG_DEBUG_FS is not set 1583# CONFIG_DEBUG_FS is not set
1432# CONFIG_HEADERS_CHECK is not set 1584# CONFIG_HEADERS_CHECK is not set
1433# CONFIG_DEBUG_KERNEL is not set 1585# CONFIG_DEBUG_KERNEL is not set
1434CONFIG_CROSSCOMPILE=y 1586# CONFIG_DEBUG_MEMORY_INIT is not set
1587# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1588
1589#
1590# Tracers
1591#
1592# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1593# CONFIG_SAMPLES is not set
1594CONFIG_HAVE_ARCH_KGDB=y
1435CONFIG_CMDLINE="" 1595CONFIG_CMDLINE=""
1436 1596
1437# 1597#
@@ -1439,51 +1599,103 @@ CONFIG_CMDLINE=""
1439# 1599#
1440# CONFIG_KEYS is not set 1600# CONFIG_KEYS is not set
1441# CONFIG_SECURITY is not set 1601# CONFIG_SECURITY is not set
1602# CONFIG_SECURITYFS is not set
1603# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1442CONFIG_XOR_BLOCKS=m 1604CONFIG_XOR_BLOCKS=m
1443CONFIG_ASYNC_CORE=m 1605CONFIG_ASYNC_CORE=m
1444CONFIG_ASYNC_MEMCPY=m 1606CONFIG_ASYNC_MEMCPY=m
1445CONFIG_ASYNC_XOR=m 1607CONFIG_ASYNC_XOR=m
1446CONFIG_CRYPTO=y 1608CONFIG_CRYPTO=y
1609
1610#
1611# Crypto core or helper
1612#
1613# CONFIG_CRYPTO_FIPS is not set
1447CONFIG_CRYPTO_ALGAPI=y 1614CONFIG_CRYPTO_ALGAPI=y
1448CONFIG_CRYPTO_ABLKCIPHER=m 1615CONFIG_CRYPTO_AEAD=y
1449CONFIG_CRYPTO_BLKCIPHER=m 1616CONFIG_CRYPTO_BLKCIPHER=y
1450CONFIG_CRYPTO_HASH=y 1617CONFIG_CRYPTO_HASH=y
1618CONFIG_CRYPTO_RNG=y
1451CONFIG_CRYPTO_MANAGER=y 1619CONFIG_CRYPTO_MANAGER=y
1620CONFIG_CRYPTO_GF128MUL=m
1621CONFIG_CRYPTO_NULL=m
1622CONFIG_CRYPTO_CRYPTD=m
1623CONFIG_CRYPTO_AUTHENC=m
1624# CONFIG_CRYPTO_TEST is not set
1625
1626#
1627# Authenticated Encryption with Associated Data
1628#
1629# CONFIG_CRYPTO_CCM is not set
1630# CONFIG_CRYPTO_GCM is not set
1631# CONFIG_CRYPTO_SEQIV is not set
1632
1633#
1634# Block modes
1635#
1636CONFIG_CRYPTO_CBC=m
1637# CONFIG_CRYPTO_CTR is not set
1638# CONFIG_CRYPTO_CTS is not set
1639CONFIG_CRYPTO_ECB=m
1640CONFIG_CRYPTO_LRW=m
1641CONFIG_CRYPTO_PCBC=m
1642# CONFIG_CRYPTO_XTS is not set
1643
1644#
1645# Hash modes
1646#
1452CONFIG_CRYPTO_HMAC=y 1647CONFIG_CRYPTO_HMAC=y
1453CONFIG_CRYPTO_XCBC=m 1648CONFIG_CRYPTO_XCBC=m
1454CONFIG_CRYPTO_NULL=m 1649
1650#
1651# Digest
1652#
1653CONFIG_CRYPTO_CRC32C=m
1455CONFIG_CRYPTO_MD4=m 1654CONFIG_CRYPTO_MD4=m
1456CONFIG_CRYPTO_MD5=y 1655CONFIG_CRYPTO_MD5=y
1656CONFIG_CRYPTO_MICHAEL_MIC=m
1657# CONFIG_CRYPTO_RMD128 is not set
1658# CONFIG_CRYPTO_RMD160 is not set
1659# CONFIG_CRYPTO_RMD256 is not set
1660# CONFIG_CRYPTO_RMD320 is not set
1457CONFIG_CRYPTO_SHA1=m 1661CONFIG_CRYPTO_SHA1=m
1458CONFIG_CRYPTO_SHA256=m 1662CONFIG_CRYPTO_SHA256=m
1459CONFIG_CRYPTO_SHA512=m 1663CONFIG_CRYPTO_SHA512=m
1460CONFIG_CRYPTO_WP512=m
1461CONFIG_CRYPTO_TGR192=m 1664CONFIG_CRYPTO_TGR192=m
1462CONFIG_CRYPTO_GF128MUL=m 1665CONFIG_CRYPTO_WP512=m
1463CONFIG_CRYPTO_ECB=m 1666
1464CONFIG_CRYPTO_CBC=m 1667#
1465CONFIG_CRYPTO_PCBC=m 1668# Ciphers
1466CONFIG_CRYPTO_LRW=m 1669#
1467CONFIG_CRYPTO_CRYPTD=m
1468CONFIG_CRYPTO_DES=m
1469CONFIG_CRYPTO_FCRYPT=m
1470CONFIG_CRYPTO_BLOWFISH=m
1471CONFIG_CRYPTO_TWOFISH=m
1472CONFIG_CRYPTO_TWOFISH_COMMON=m
1473CONFIG_CRYPTO_SERPENT=m
1474CONFIG_CRYPTO_AES=m 1670CONFIG_CRYPTO_AES=m
1671CONFIG_CRYPTO_ANUBIS=m
1672CONFIG_CRYPTO_ARC4=m
1673CONFIG_CRYPTO_BLOWFISH=m
1674CONFIG_CRYPTO_CAMELLIA=m
1475CONFIG_CRYPTO_CAST5=m 1675CONFIG_CRYPTO_CAST5=m
1476CONFIG_CRYPTO_CAST6=m 1676CONFIG_CRYPTO_CAST6=m
1477CONFIG_CRYPTO_TEA=m 1677CONFIG_CRYPTO_DES=m
1478CONFIG_CRYPTO_ARC4=m 1678CONFIG_CRYPTO_FCRYPT=m
1479CONFIG_CRYPTO_KHAZAD=m 1679CONFIG_CRYPTO_KHAZAD=m
1480CONFIG_CRYPTO_ANUBIS=m 1680# CONFIG_CRYPTO_SALSA20 is not set
1681# CONFIG_CRYPTO_SEED is not set
1682CONFIG_CRYPTO_SERPENT=m
1683CONFIG_CRYPTO_TEA=m
1684CONFIG_CRYPTO_TWOFISH=m
1685CONFIG_CRYPTO_TWOFISH_COMMON=m
1686
1687#
1688# Compression
1689#
1481CONFIG_CRYPTO_DEFLATE=m 1690CONFIG_CRYPTO_DEFLATE=m
1482CONFIG_CRYPTO_MICHAEL_MIC=m 1691# CONFIG_CRYPTO_LZO is not set
1483CONFIG_CRYPTO_CRC32C=m 1692
1484CONFIG_CRYPTO_CAMELLIA=m 1693#
1485# CONFIG_CRYPTO_TEST is not set 1694# Random Number Generation
1695#
1696# CONFIG_CRYPTO_ANSI_CPRNG is not set
1486CONFIG_CRYPTO_HW=y 1697CONFIG_CRYPTO_HW=y
1698# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1487 1699
1488# 1700#
1489# Library routines 1701# Library routines
@@ -1491,7 +1703,8 @@ CONFIG_CRYPTO_HW=y
1491CONFIG_BITREVERSE=y 1703CONFIG_BITREVERSE=y
1492# CONFIG_CRC_CCITT is not set 1704# CONFIG_CRC_CCITT is not set
1493CONFIG_CRC16=m 1705CONFIG_CRC16=m
1494# CONFIG_CRC_ITU_T is not set 1706# CONFIG_CRC_T10DIF is not set
1707CONFIG_CRC_ITU_T=m
1495CONFIG_CRC32=y 1708CONFIG_CRC32=y
1496# CONFIG_CRC7 is not set 1709# CONFIG_CRC7 is not set
1497CONFIG_LIBCRC32C=m 1710CONFIG_LIBCRC32C=m
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 759f68066b5d..d0916a55cd77 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -262,14 +262,11 @@ bad_alignment:
262 LEAF(sys_syscall) 262 LEAF(sys_syscall)
263 subu t0, a0, __NR_O32_Linux # check syscall number 263 subu t0, a0, __NR_O32_Linux # check syscall number
264 sltiu v0, t0, __NR_O32_Linux_syscalls + 1 264 sltiu v0, t0, __NR_O32_Linux_syscalls + 1
265 beqz t0, einval # do not recurse
265 sll t1, t0, 3 266 sll t1, t0, 3
266 beqz v0, einval 267 beqz v0, einval
267
268 lw t2, sys_call_table(t1) # syscall routine 268 lw t2, sys_call_table(t1) # syscall routine
269 269
270 li v1, 4000 - __NR_O32_Linux # index of sys_syscall
271 beq t0, v1, einval # do not recurse
272
273 /* Some syscalls like execve get their arguments from struct pt_regs 270 /* Some syscalls like execve get their arguments from struct pt_regs
274 and claim zero arguments in the syscall table. Thus we have to 271 and claim zero arguments in the syscall table. Thus we have to
275 assume the worst case and shuffle around all potential arguments. 272 assume the worst case and shuffle around all potential arguments.
@@ -627,7 +624,7 @@ einval: li v0, -ENOSYS
627 sys sys_pselect6 6 624 sys sys_pselect6 6
628 sys sys_ppoll 5 625 sys sys_ppoll 5
629 sys sys_unshare 1 626 sys sys_unshare 1
630 sys sys_splice 4 627 sys sys_splice 6
631 sys sys_sync_file_range 7 /* 4305 */ 628 sys sys_sync_file_range 7 /* 4305 */
632 sys sys_tee 4 629 sys sys_tee 4
633 sys sys_vmsplice 4 630 sys sys_vmsplice 4
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index e266b3aa6560..30f3b6317a83 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -390,7 +390,7 @@ EXPORT(sysn32_call_table)
390 PTR sys_splice 390 PTR sys_splice
391 PTR sys_sync_file_range 391 PTR sys_sync_file_range
392 PTR sys_tee 392 PTR sys_tee
393 PTR sys_vmsplice /* 6270 */ 393 PTR compat_sys_vmsplice /* 6270 */
394 PTR sys_move_pages 394 PTR sys_move_pages
395 PTR compat_sys_set_robust_list 395 PTR compat_sys_set_robust_list
396 PTR compat_sys_get_robust_list 396 PTR compat_sys_get_robust_list
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 6c7ef8313ebd..fefef4af8595 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -174,14 +174,12 @@ not_o32_scall:
174 END(handle_sys) 174 END(handle_sys)
175 175
176LEAF(sys32_syscall) 176LEAF(sys32_syscall)
177 sltu v0, a0, __NR_O32_Linux + __NR_O32_Linux_syscalls + 1 177 subu t0, a0, __NR_O32_Linux # check syscall number
178 sltiu v0, t0, __NR_O32_Linux_syscalls + 1
179 beqz t0, einval # do not recurse
180 dsll t1, t0, 3
178 beqz v0, einval 181 beqz v0, einval
179 182 ld t2, sys_call_table(t1) # syscall routine
180 dsll v0, a0, 3
181 ld t2, (sys_call_table - (__NR_O32_Linux * 8))(v0)
182
183 li v1, 4000 # indirect syscall number
184 beq a0, v1, einval # do not recurse
185 183
186 move a0, a1 # shift argument registers 184 move a0, a1 # shift argument registers
187 move a1, a2 185 move a1, a2
@@ -198,7 +196,7 @@ LEAF(sys32_syscall)
198 jr t2 196 jr t2
199 /* Unreached */ 197 /* Unreached */
200 198
201einval: li v0, -EINVAL 199einval: li v0, -ENOSYS
202 jr ra 200 jr ra
203 END(sys32_syscall) 201 END(sys32_syscall)
204 202
@@ -512,7 +510,7 @@ sys_call_table:
512 PTR sys_splice 510 PTR sys_splice
513 PTR sys32_sync_file_range /* 4305 */ 511 PTR sys32_sync_file_range /* 4305 */
514 PTR sys_tee 512 PTR sys_tee
515 PTR sys_vmsplice 513 PTR compat_sys_vmsplice
516 PTR compat_sys_move_pages 514 PTR compat_sys_move_pages
517 PTR compat_sys_set_robust_list 515 PTR compat_sys_set_robust_list
518 PTR compat_sys_get_robust_list /* 4310 */ 516 PTR compat_sys_get_robust_list /* 4310 */
diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile
index cef2db8d2225..32e847808df1 100644
--- a/arch/mips/mti-malta/Makefile
+++ b/arch/mips/mti-malta/Makefile
@@ -7,9 +7,8 @@
7# 7#
8obj-y := malta-amon.o malta-cmdline.o \ 8obj-y := malta-amon.o malta-cmdline.o \
9 malta-display.o malta-init.o malta-int.o \ 9 malta-display.o malta-init.o malta-int.o \
10 malta-memory.o malta-mtd.o \ 10 malta-memory.o malta-platform.o \
11 malta-platform.o malta-reset.o \ 11 malta-reset.o malta-setup.o malta-time.o
12 malta-setup.o malta-time.o
13 12
14obj-$(CONFIG_EARLY_PRINTK) += malta-console.o 13obj-$(CONFIG_EARLY_PRINTK) += malta-console.o
15obj-$(CONFIG_PCI) += malta-pci.o 14obj-$(CONFIG_PCI) += malta-pci.o
diff --git a/arch/mips/mti-malta/malta-mtd.c b/arch/mips/mti-malta/malta-mtd.c
deleted file mode 100644
index 8ad9bdf25dce..000000000000
--- a/arch/mips/mti-malta/malta-mtd.c
+++ /dev/null
@@ -1,63 +0,0 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Copyright (C) 2006 MIPS Technologies, Inc.
7 * written by Ralf Baechle <ralf@linux-mips.org>
8 */
9
10#include <linux/init.h>
11#include <linux/platform_device.h>
12#include <linux/mtd/partitions.h>
13#include <linux/mtd/physmap.h>
14#include <mtd/mtd-abi.h>
15
16static struct mtd_partition malta_mtd_partitions[] = {
17 {
18 .name = "YAMON",
19 .offset = 0x0,
20 .size = 0x100000,
21 .mask_flags = MTD_WRITEABLE
22 }, {
23 .name = "User FS",
24 .offset = 0x100000,
25 .size = 0x2e0000
26 }, {
27 .name = "Board Config",
28 .offset = 0x3e0000,
29 .size = 0x020000,
30 .mask_flags = MTD_WRITEABLE
31 }
32};
33
34static struct physmap_flash_data malta_flash_data = {
35 .width = 4,
36 .nr_parts = ARRAY_SIZE(malta_mtd_partitions),
37 .parts = malta_mtd_partitions
38};
39
40static struct resource malta_flash_resource = {
41 .start = 0x1e000000,
42 .end = 0x1e3fffff,
43 .flags = IORESOURCE_MEM
44};
45
46static struct platform_device malta_flash = {
47 .name = "physmap-flash",
48 .id = 0,
49 .dev = {
50 .platform_data = &malta_flash_data,
51 },
52 .num_resources = 1,
53 .resource = &malta_flash_resource,
54};
55
56static int __init malta_mtd_init(void)
57{
58 platform_device_register(&malta_flash);
59
60 return 0;
61}
62
63module_init(malta_mtd_init)
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c
index 83b9bab3cd3f..72e32a7715be 100644
--- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c
@@ -3,10 +3,14 @@
3 * License. See the file "COPYING" in the main directory of this archive 3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details. 4 * for more details.
5 * 5 *
6 * Copyright (C) 2007 MIPS Technologies, Inc. 6 * Copyright (C) 2006, 07 MIPS Technologies, Inc.
7 * written by Ralf Baechle (ralf@linux-mips.org) 7 * written by Ralf Baechle (ralf@linux-mips.org)
8 * written by Ralf Baechle <ralf@linux-mips.org>
8 * 9 *
9 * Probe driver for the Malta's UART ports: 10 * Copyright (C) 2008 Wind River Systems, Inc.
11 * updated by Tiejun Chen <tiejun.chen@windriver.com>
12 *
13 * 1. Probe driver for the Malta's UART ports:
10 * 14 *
11 * o 2 ports in the SMC SuperIO 15 * o 2 ports in the SMC SuperIO
12 * o 1 port in the CBUS UART, a discrete 16550 which normally is only used 16 * o 1 port in the CBUS UART, a discrete 16550 which normally is only used
@@ -14,10 +18,17 @@
14 * 18 *
15 * We don't use 8250_platform.c on Malta as it would result in the CBUS 19 * We don't use 8250_platform.c on Malta as it would result in the CBUS
16 * UART becoming ttyS0. 20 * UART becoming ttyS0.
21 *
22 * 2. Register RTC-CMOS platform device on Malta.
17 */ 23 */
18#include <linux/module.h>
19#include <linux/init.h> 24#include <linux/init.h>
20#include <linux/serial_8250.h> 25#include <linux/serial_8250.h>
26#include <linux/mc146818rtc.h>
27#include <linux/module.h>
28#include <linux/mtd/partitions.h>
29#include <linux/mtd/physmap.h>
30#include <linux/platform_device.h>
31#include <mtd/mtd-abi.h>
21 32
22#define SMC_PORT(base, int) \ 33#define SMC_PORT(base, int) \
23{ \ 34{ \
@@ -45,21 +56,93 @@ static struct plat_serial8250_port uart8250_data[] = {
45 { }, 56 { },
46}; 57};
47 58
48static struct platform_device uart8250_device = { 59static struct platform_device malta_uart8250_device = {
49 .name = "serial8250", 60 .name = "serial8250",
50 .id = PLAT8250_DEV_PLATFORM2, 61 .id = PLAT8250_DEV_PLATFORM,
51 .dev = { 62 .dev = {
52 .platform_data = uart8250_data, 63 .platform_data = uart8250_data,
53 }, 64 },
54}; 65};
55 66
56static int __init uart8250_init(void) 67struct resource malta_rtc_resources[] = {
68 {
69 .start = RTC_PORT(0),
70 .end = RTC_PORT(7),
71 .flags = IORESOURCE_IO,
72 }, {
73 .start = RTC_IRQ,
74 .end = RTC_IRQ,
75 .flags = IORESOURCE_IRQ,
76 }
77};
78
79static struct platform_device malta_rtc_device = {
80 .name = "rtc_cmos",
81 .id = -1,
82 .resource = malta_rtc_resources,
83 .num_resources = ARRAY_SIZE(malta_rtc_resources),
84};
85
86static struct mtd_partition malta_mtd_partitions[] = {
87 {
88 .name = "YAMON",
89 .offset = 0x0,
90 .size = 0x100000,
91 .mask_flags = MTD_WRITEABLE
92 }, {
93 .name = "User FS",
94 .offset = 0x100000,
95 .size = 0x2e0000
96 }, {
97 .name = "Board Config",
98 .offset = 0x3e0000,
99 .size = 0x020000,
100 .mask_flags = MTD_WRITEABLE
101 }
102};
103
104static struct physmap_flash_data malta_flash_data = {
105 .width = 4,
106 .nr_parts = ARRAY_SIZE(malta_mtd_partitions),
107 .parts = malta_mtd_partitions
108};
109
110static struct resource malta_flash_resource = {
111 .start = 0x1e000000,
112 .end = 0x1e3fffff,
113 .flags = IORESOURCE_MEM
114};
115
116static struct platform_device malta_flash_device = {
117 .name = "physmap-flash",
118 .id = 0,
119 .dev = {
120 .platform_data = &malta_flash_data,
121 },
122 .num_resources = 1,
123 .resource = &malta_flash_resource,
124};
125
126static struct platform_device *malta_devices[] __initdata = {
127 &malta_uart8250_device,
128 &malta_rtc_device,
129 &malta_flash_device,
130};
131
132static int __init malta_add_devices(void)
57{ 133{
58 return platform_device_register(&uart8250_device); 134 int err;
59}
60 135
61module_init(uart8250_init); 136 err = platform_add_devices(malta_devices, ARRAY_SIZE(malta_devices));
137 if (err)
138 return err;
139
140 /*
141 * Set RTC to BCD mode to support current alarm code.
142 */
143 CMOS_WRITE(CMOS_READ(RTC_CONTROL) & ~RTC_DM_BINARY, RTC_CONTROL);
144
145 return 0;
146}
62 147
63MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>"); 148device_initcall(malta_add_devices);
64MODULE_LICENSE("GPL");
65MODULE_DESCRIPTION("8250 UART probe driver for the Malta CBUS UART");
diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c
index 9a6d4e8ebe73..11584c51acd9 100644
--- a/arch/mn10300/kernel/gdb-io-serial.c
+++ b/arch/mn10300/kernel/gdb-io-serial.c
@@ -99,6 +99,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock)
99 try_again: 99 try_again:
100 /* pull chars out of the buffer */ 100 /* pull chars out of the buffer */
101 ix = gdbstub_rx_outp; 101 ix = gdbstub_rx_outp;
102 barrier();
102 if (ix == gdbstub_rx_inp) { 103 if (ix == gdbstub_rx_inp) {
103 if (nonblock) 104 if (nonblock)
104 return -EAGAIN; 105 return -EAGAIN;
@@ -110,6 +111,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock)
110 111
111 ch = gdbstub_rx_buffer[ix++]; 112 ch = gdbstub_rx_buffer[ix++];
112 st = gdbstub_rx_buffer[ix++]; 113 st = gdbstub_rx_buffer[ix++];
114 barrier();
113 gdbstub_rx_outp = ix & 0x00000fff; 115 gdbstub_rx_outp = ix & 0x00000fff;
114 116
115 if (st & UART_LSR_BI) { 117 if (st & UART_LSR_BI) {
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index e55ff7c47a36..07a674f5344e 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y
723# CONFIG_BROADCOM_PHY is not set 723# CONFIG_BROADCOM_PHY is not set
724# CONFIG_ICPLUS_PHY is not set 724# CONFIG_ICPLUS_PHY is not set
725# CONFIG_REALTEK_PHY is not set 725# CONFIG_REALTEK_PHY is not set
726# CONFIG_FIXED_PHY is not set 726CONFIG_FIXED_PHY=y
727# CONFIG_MDIO_BITBANG is not set 727# CONFIG_MDIO_BITBANG is not set
728# CONFIG_NET_ETHERNET is not set 728# CONFIG_NET_ETHERNET is not set
729CONFIG_NETDEV_1000=y 729CONFIG_NETDEV_1000=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 15eb30c9b3f9..d582014b0a38 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y
682# CONFIG_BROADCOM_PHY is not set 682# CONFIG_BROADCOM_PHY is not set
683CONFIG_ICPLUS_PHY=y 683CONFIG_ICPLUS_PHY=y
684# CONFIG_REALTEK_PHY is not set 684# CONFIG_REALTEK_PHY is not set
685# CONFIG_FIXED_PHY is not set 685CONFIG_FIXED_PHY=y
686# CONFIG_MDIO_BITBANG is not set 686# CONFIG_MDIO_BITBANG is not set
687CONFIG_NET_ETHERNET=y 687CONFIG_NET_ETHERNET=y
688CONFIG_MII=y 688CONFIG_MII=y
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h
index 68b98a7e6454..9cf4ae0cd7ba 100644
--- a/arch/sparc/include/asm/bitops_32.h
+++ b/arch/sparc/include/asm/bitops_32.h
@@ -98,6 +98,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
98#include <asm-generic/bitops/sched.h> 98#include <asm-generic/bitops/sched.h>
99#include <asm-generic/bitops/ffs.h> 99#include <asm-generic/bitops/ffs.h>
100#include <asm-generic/bitops/fls.h> 100#include <asm-generic/bitops/fls.h>
101#include <asm-generic/bitops/__fls.h>
101#include <asm-generic/bitops/fls64.h> 102#include <asm-generic/bitops/fls64.h>
102#include <asm-generic/bitops/hweight.h> 103#include <asm-generic/bitops/hweight.h>
103#include <asm-generic/bitops/lock.h> 104#include <asm-generic/bitops/lock.h>
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index f43adbc773ca..a941c610e7ce 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -1014,7 +1014,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
1014 break; 1014 break;
1015 1015
1016 case PTRACE_SETFPREGS64: 1016 case PTRACE_SETFPREGS64:
1017 ret = copy_regset_to_user(child, view, REGSET_FP, 1017 ret = copy_regset_from_user(child, view, REGSET_FP,
1018 0 * sizeof(u64), 1018 0 * sizeof(u64),
1019 33 * sizeof(u64), 1019 33 * sizeof(u64),
1020 fps); 1020 fps);
diff --git a/arch/sparc64/kernel/visemul.c b/arch/sparc64/kernel/visemul.c
index 9e05cb5cb855..b956fd71c131 100644
--- a/arch/sparc64/kernel/visemul.c
+++ b/arch/sparc64/kernel/visemul.c
@@ -131,7 +131,7 @@
131#define VIS_OPF_SHIFT 5 131#define VIS_OPF_SHIFT 5
132#define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT) 132#define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT)
133 133
134#define RS1(INSN) (((INSN) >> 24) & 0x1f) 134#define RS1(INSN) (((INSN) >> 14) & 0x1f)
135#define RS2(INSN) (((INSN) >> 0) & 0x1f) 135#define RS2(INSN) (((INSN) >> 0) & 0x1f)
136#define RD(INSN) (((INSN) >> 25) & 0x1f) 136#define RD(INSN) (((INSN) >> 25) & 0x1f)
137 137
@@ -445,7 +445,7 @@ static void pdist(struct pt_regs *regs, unsigned int insn)
445 unsigned long i; 445 unsigned long i;
446 446
447 rs1 = fpd_regval(f, RS1(insn)); 447 rs1 = fpd_regval(f, RS1(insn));
448 rs2 = fpd_regval(f, RS1(insn)); 448 rs2 = fpd_regval(f, RS2(insn));
449 rd = fpd_regaddr(f, RD(insn)); 449 rd = fpd_regaddr(f, RD(insn));
450 450
451 rd_val = *rd; 451 rd_val = *rd;
@@ -807,6 +807,8 @@ int vis_emul(struct pt_regs *regs, unsigned int insn)
807 if (get_user(insn, (u32 __user *) pc)) 807 if (get_user(insn, (u32 __user *) pc))
808 return -EFAULT; 808 return -EFAULT;
809 809
810 save_and_clear_fpu();
811
810 opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT; 812 opf = (insn & VIS_OPF_MASK) >> VIS_OPF_SHIFT;
811 switch (opf) { 813 switch (opf) {
812 default: 814 default:
diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h
index 1a30c0440c6b..ac302a2fa339 100644
--- a/arch/x86/include/asm/amd_iommu_types.h
+++ b/arch/x86/include/asm/amd_iommu_types.h
@@ -251,13 +251,6 @@ struct amd_iommu {
251 /* Pointer to PCI device of this IOMMU */ 251 /* Pointer to PCI device of this IOMMU */
252 struct pci_dev *dev; 252 struct pci_dev *dev;
253 253
254 /*
255 * Capability pointer. There could be more than one IOMMU per PCI
256 * device function if there are more than one AMD IOMMU capability
257 * pointers.
258 */
259 u16 cap_ptr;
260
261 /* physical address of MMIO space */ 254 /* physical address of MMIO space */
262 u64 mmio_phys; 255 u64 mmio_phys;
263 /* virtual address of MMIO space */ 256 /* virtual address of MMIO space */
@@ -266,6 +259,13 @@ struct amd_iommu {
266 /* capabilities of that IOMMU read from ACPI */ 259 /* capabilities of that IOMMU read from ACPI */
267 u32 cap; 260 u32 cap;
268 261
262 /*
263 * Capability pointer. There could be more than one IOMMU per PCI
264 * device function if there are more than one AMD IOMMU capability
265 * pointers.
266 */
267 u16 cap_ptr;
268
269 /* pci domain of this IOMMU */ 269 /* pci domain of this IOMMU */
270 u16 pci_seg; 270 u16 pci_seg;
271 271
@@ -284,19 +284,19 @@ struct amd_iommu {
284 /* size of command buffer */ 284 /* size of command buffer */
285 u32 cmd_buf_size; 285 u32 cmd_buf_size;
286 286
287 /* event buffer virtual address */
288 u8 *evt_buf;
289 /* size of event buffer */ 287 /* size of event buffer */
290 u32 evt_buf_size; 288 u32 evt_buf_size;
289 /* event buffer virtual address */
290 u8 *evt_buf;
291 /* MSI number for event interrupt */ 291 /* MSI number for event interrupt */
292 u16 evt_msi_num; 292 u16 evt_msi_num;
293 293
294 /* if one, we need to send a completion wait command */
295 int need_sync;
296
297 /* true if interrupts for this IOMMU are already enabled */ 294 /* true if interrupts for this IOMMU are already enabled */
298 bool int_enabled; 295 bool int_enabled;
299 296
297 /* if one, we need to send a completion wait command */
298 int need_sync;
299
300 /* default dma_ops domain for that IOMMU */ 300 /* default dma_ops domain for that IOMMU */
301 struct dma_ops_domain *default_dom; 301 struct dma_ops_domain *default_dom;
302}; 302};
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 7f225a4b2a26..097794ff6b79 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -71,15 +71,13 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)
71/* Make sure we keep the same behaviour */ 71/* Make sure we keep the same behaviour */
72static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) 72static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
73{ 73{
74#ifdef CONFIG_X86_32 74#ifdef CONFIG_X86_64
75 return 0;
76#else
77 struct dma_mapping_ops *ops = get_dma_ops(dev); 75 struct dma_mapping_ops *ops = get_dma_ops(dev);
78 if (ops->mapping_error) 76 if (ops->mapping_error)
79 return ops->mapping_error(dev, dma_addr); 77 return ops->mapping_error(dev, dma_addr);
80 78
81 return (dma_addr == bad_dma_address);
82#endif 79#endif
80 return (dma_addr == bad_dma_address);
83} 81}
84 82
85#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) 83#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 4850e4b02b61..ff386ff50ed7 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -239,7 +239,7 @@ struct pci_bus;
239void set_pci_bus_resources_arch_default(struct pci_bus *b); 239void set_pci_bus_resources_arch_default(struct pci_bus *b);
240 240
241#ifdef CONFIG_SMP 241#ifdef CONFIG_SMP
242#define mc_capable() (boot_cpu_data.x86_max_cores > 1) 242#define mc_capable() (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids)
243#define smt_capable() (smp_num_siblings > 1) 243#define smt_capable() (smp_num_siblings > 1)
244#endif 244#endif
245 245
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index e4899e0e8787..5662e226b0c9 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -187,6 +187,8 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
187 187
188 spin_lock_irqsave(&iommu->lock, flags); 188 spin_lock_irqsave(&iommu->lock, flags);
189 ret = __iommu_queue_command(iommu, cmd); 189 ret = __iommu_queue_command(iommu, cmd);
190 if (!ret)
191 iommu->need_sync = 1;
190 spin_unlock_irqrestore(&iommu->lock, flags); 192 spin_unlock_irqrestore(&iommu->lock, flags);
191 193
192 return ret; 194 return ret;
@@ -210,10 +212,13 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
210 cmd.data[0] = CMD_COMPL_WAIT_INT_MASK; 212 cmd.data[0] = CMD_COMPL_WAIT_INT_MASK;
211 CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT); 213 CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT);
212 214
213 iommu->need_sync = 0;
214
215 spin_lock_irqsave(&iommu->lock, flags); 215 spin_lock_irqsave(&iommu->lock, flags);
216 216
217 if (!iommu->need_sync)
218 goto out;
219
220 iommu->need_sync = 0;
221
217 ret = __iommu_queue_command(iommu, &cmd); 222 ret = __iommu_queue_command(iommu, &cmd);
218 223
219 if (ret) 224 if (ret)
@@ -254,8 +259,6 @@ static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid)
254 259
255 ret = iommu_queue_command(iommu, &cmd); 260 ret = iommu_queue_command(iommu, &cmd);
256 261
257 iommu->need_sync = 1;
258
259 return ret; 262 return ret;
260} 263}
261 264
@@ -281,8 +284,6 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,
281 284
282 ret = iommu_queue_command(iommu, &cmd); 285 ret = iommu_queue_command(iommu, &cmd);
283 286
284 iommu->need_sync = 1;
285
286 return ret; 287 return ret;
287} 288}
288 289
@@ -762,8 +763,6 @@ static void set_device_domain(struct amd_iommu *iommu,
762 write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); 763 write_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
763 764
764 iommu_queue_inv_dev_entry(iommu, devid); 765 iommu_queue_inv_dev_entry(iommu, devid);
765
766 iommu->need_sync = 1;
767} 766}
768 767
769/***************************************************************************** 768/*****************************************************************************
@@ -858,6 +857,9 @@ static int get_device_resources(struct device *dev,
858 print_devid(_bdf, 1); 857 print_devid(_bdf, 1);
859 } 858 }
860 859
860 if (domain_for_device(_bdf) == NULL)
861 set_device_domain(*iommu, *domain, _bdf);
862
861 return 1; 863 return 1;
862} 864}
863 865
@@ -1031,8 +1033,7 @@ static dma_addr_t map_single(struct device *dev, phys_addr_t paddr,
1031 if (addr == bad_dma_address) 1033 if (addr == bad_dma_address)
1032 goto out; 1034 goto out;
1033 1035
1034 if (unlikely(iommu->need_sync)) 1036 iommu_completion_wait(iommu);
1035 iommu_completion_wait(iommu);
1036 1037
1037out: 1038out:
1038 spin_unlock_irqrestore(&domain->lock, flags); 1039 spin_unlock_irqrestore(&domain->lock, flags);
@@ -1060,8 +1061,7 @@ static void unmap_single(struct device *dev, dma_addr_t dma_addr,
1060 1061
1061 __unmap_single(iommu, domain->priv, dma_addr, size, dir); 1062 __unmap_single(iommu, domain->priv, dma_addr, size, dir);
1062 1063
1063 if (unlikely(iommu->need_sync)) 1064 iommu_completion_wait(iommu);
1064 iommu_completion_wait(iommu);
1065 1065
1066 spin_unlock_irqrestore(&domain->lock, flags); 1066 spin_unlock_irqrestore(&domain->lock, flags);
1067} 1067}
@@ -1127,8 +1127,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
1127 goto unmap; 1127 goto unmap;
1128 } 1128 }
1129 1129
1130 if (unlikely(iommu->need_sync)) 1130 iommu_completion_wait(iommu);
1131 iommu_completion_wait(iommu);
1132 1131
1133out: 1132out:
1134 spin_unlock_irqrestore(&domain->lock, flags); 1133 spin_unlock_irqrestore(&domain->lock, flags);
@@ -1173,8 +1172,7 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,
1173 s->dma_address = s->dma_length = 0; 1172 s->dma_address = s->dma_length = 0;
1174 } 1173 }
1175 1174
1176 if (unlikely(iommu->need_sync)) 1175 iommu_completion_wait(iommu);
1177 iommu_completion_wait(iommu);
1178 1176
1179 spin_unlock_irqrestore(&domain->lock, flags); 1177 spin_unlock_irqrestore(&domain->lock, flags);
1180} 1178}
@@ -1225,8 +1223,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
1225 goto out; 1223 goto out;
1226 } 1224 }
1227 1225
1228 if (unlikely(iommu->need_sync)) 1226 iommu_completion_wait(iommu);
1229 iommu_completion_wait(iommu);
1230 1227
1231out: 1228out:
1232 spin_unlock_irqrestore(&domain->lock, flags); 1229 spin_unlock_irqrestore(&domain->lock, flags);
@@ -1257,8 +1254,7 @@ static void free_coherent(struct device *dev, size_t size,
1257 1254
1258 __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL); 1255 __unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL);
1259 1256
1260 if (unlikely(iommu->need_sync)) 1257 iommu_completion_wait(iommu);
1261 iommu_completion_wait(iommu);
1262 1258
1263 spin_unlock_irqrestore(&domain->lock, flags); 1259 spin_unlock_irqrestore(&domain->lock, flags);
1264 1260
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index f98f4e1dba09..0f4c1fd5a1f4 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -604,6 +604,9 @@ static void __init __get_smp_config(unsigned int early)
604 printk(KERN_INFO "Using ACPI for processor (LAPIC) " 604 printk(KERN_INFO "Using ACPI for processor (LAPIC) "
605 "configuration information\n"); 605 "configuration information\n");
606 606
607 if (!mpf)
608 return;
609
607 printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", 610 printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",
608 mpf->mpf_specification); 611 mpf->mpf_specification);
609#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) 612#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index a42b02b4df68..ba7ad83e20a8 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -123,6 +123,8 @@ static void free_iommu(unsigned long offset, int size)
123 123
124 spin_lock_irqsave(&iommu_bitmap_lock, flags); 124 spin_lock_irqsave(&iommu_bitmap_lock, flags);
125 iommu_area_free(iommu_gart_bitmap, offset, size); 125 iommu_area_free(iommu_gart_bitmap, offset, size);
126 if (offset >= next_bit)
127 next_bit = offset + size;
126 spin_unlock_irqrestore(&iommu_bitmap_lock, flags); 128 spin_unlock_irqrestore(&iommu_bitmap_lock, flags);
127} 129}
128 130
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 022cd41ea9b4..202864ad49a7 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type)
401 *cpu_type = "i386/pii"; 401 *cpu_type = "i386/pii";
402 break; 402 break;
403 case 6 ... 8: 403 case 6 ... 8:
404 case 10 ... 11:
404 *cpu_type = "i386/piii"; 405 *cpu_type = "i386/piii";
405 break; 406 break;
406 case 9: 407 case 9:
408 case 13:
407 *cpu_type = "i386/p6_mobile"; 409 *cpu_type = "i386/p6_mobile";
408 break; 410 break;
409 case 10 ... 13:
410 *cpu_type = "i386/p6";
411 break;
412 case 14: 411 case 14:
413 *cpu_type = "i386/core"; 412 *cpu_type = "i386/core";
414 break; 413 break;
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
index 716d26f0e5d4..e9f80c744cf3 100644
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
@@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs)
156 unsigned int low, high; 156 unsigned int low, high;
157 int i; 157 int i;
158 158
159 if (!reset_value)
160 return;
159 for (i = 0; i < num_counters; ++i) { 161 for (i = 0; i < num_counters; ++i) {
160 if (reset_value[i]) { 162 if (reset_value[i]) {
161 CTRL_READ(low, high, msrs, i); 163 CTRL_READ(low, high, msrs, i);
@@ -171,6 +173,8 @@ static void ppro_stop(struct op_msrs const * const msrs)
171 unsigned int low, high; 173 unsigned int low, high;
172 int i; 174 int i;
173 175
176 if (!reset_value)
177 return;
174 for (i = 0; i < num_counters; ++i) { 178 for (i = 0; i < num_counters; ++i) {
175 if (!reset_value[i]) 179 if (!reset_value[i])
176 continue; 180 continue;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index a0a178dd189c..4fb3c12ac1d8 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -173,14 +173,17 @@ static int acpi_battery_get_property(struct power_supply *psy,
173 val->intval = battery->voltage_now * 1000; 173 val->intval = battery->voltage_now * 1000;
174 break; 174 break;
175 case POWER_SUPPLY_PROP_CURRENT_NOW: 175 case POWER_SUPPLY_PROP_CURRENT_NOW:
176 val->intval = battery->current_now * 1000; 176 val->intval = battery->current_now;
177 /* if power units are mW, convert to mA by 177 if (battery->power_unit) {
178 dividing by current voltage (mV/1000) */ 178 val->intval *= 1000;
179 if (!battery->power_unit) { 179 } else {
180 if (battery->voltage_now) { 180 /*
181 * If power units are mW, convert to mA by dividing by
182 * current voltage.
183 */
184 if (battery->voltage_now)
181 val->intval /= battery->voltage_now; 185 val->intval /= battery->voltage_now;
182 val->intval *= 1000; 186 else
183 } else
184 val->intval = -1; 187 val->intval = -1;
185 } 188 }
186 break; 189 break;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0a4f39b9a0ec..adc972cc6bfc 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -244,6 +244,10 @@ typedef struct drm_i915_private {
244 * List of objects currently involved in rendering from the 244 * List of objects currently involved in rendering from the
245 * ringbuffer. 245 * ringbuffer.
246 * 246 *
247 * Includes buffers having the contents of their GPU caches
248 * flushed, not necessarily primitives. last_rendering_seqno
249 * represents when the rendering involved will be completed.
250 *
247 * A reference is held on the buffer while on this list. 251 * A reference is held on the buffer while on this list.
248 */ 252 */
249 struct list_head active_list; 253 struct list_head active_list;
@@ -253,6 +257,8 @@ typedef struct drm_i915_private {
253 * still have a write_domain which needs to be flushed before 257 * still have a write_domain which needs to be flushed before
254 * unbinding. 258 * unbinding.
255 * 259 *
260 * last_rendering_seqno is 0 while an object is in this list.
261 *
256 * A reference is held on the buffer while on this list. 262 * A reference is held on the buffer while on this list.
257 */ 263 */
258 struct list_head flushing_list; 264 struct list_head flushing_list;
@@ -261,6 +267,8 @@ typedef struct drm_i915_private {
261 * LRU list of objects which are not in the ringbuffer and 267 * LRU list of objects which are not in the ringbuffer and
262 * are ready to unbind, but are still in the GTT. 268 * are ready to unbind, but are still in the GTT.
263 * 269 *
270 * last_rendering_seqno is 0 while an object is in this list.
271 *
264 * A reference is not held on the buffer while on this list, 272 * A reference is not held on the buffer while on this list,
265 * as merely being GTT-bound shouldn't prevent its being 273 * as merely being GTT-bound shouldn't prevent its being
266 * freed, and we'll pull it off the list in the free path. 274 * freed, and we'll pull it off the list in the free path.
@@ -371,8 +379,8 @@ struct drm_i915_gem_object {
371 uint32_t agp_type; 379 uint32_t agp_type;
372 380
373 /** 381 /**
374 * Flagging of which individual pages are valid in GEM_DOMAIN_CPU when 382 * If present, while GEM_DOMAIN_CPU is in the read domain this array
375 * GEM_DOMAIN_CPU is not in the object's read domain. 383 * flags which individual pages are valid.
376 */ 384 */
377 uint8_t *page_cpu_valid; 385 uint8_t *page_cpu_valid;
378}; 386};
@@ -394,9 +402,6 @@ struct drm_i915_gem_request {
394 /** Time at which this request was emitted, in jiffies. */ 402 /** Time at which this request was emitted, in jiffies. */
395 unsigned long emitted_jiffies; 403 unsigned long emitted_jiffies;
396 404
397 /** Cache domains that were flushed at the start of the request. */
398 uint32_t flush_domains;
399
400 struct list_head list; 405 struct list_head list;
401}; 406};
402 407
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d58ddef468f8..3fde82be014f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -33,21 +33,21 @@
33 33
34#define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) 34#define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT))
35 35
36static int 36static void
37i915_gem_object_set_domain(struct drm_gem_object *obj, 37i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
38 uint32_t read_domains, 38 uint32_t read_domains,
39 uint32_t write_domain); 39 uint32_t write_domain);
40static int 40static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj);
41i915_gem_object_set_domain_range(struct drm_gem_object *obj, 41static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj);
42 uint64_t offset, 42static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj);
43 uint64_t size, 43static int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,
44 uint32_t read_domains, 44 int write);
45 uint32_t write_domain); 45static int i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj,
46static int 46 int write);
47i915_gem_set_domain(struct drm_gem_object *obj, 47static int i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj,
48 struct drm_file *file_priv, 48 uint64_t offset,
49 uint32_t read_domains, 49 uint64_t size);
50 uint32_t write_domain); 50static void i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj);
51static int i915_gem_object_get_page_list(struct drm_gem_object *obj); 51static int i915_gem_object_get_page_list(struct drm_gem_object *obj);
52static void i915_gem_object_free_page_list(struct drm_gem_object *obj); 52static void i915_gem_object_free_page_list(struct drm_gem_object *obj);
53static int i915_gem_object_wait_rendering(struct drm_gem_object *obj); 53static int i915_gem_object_wait_rendering(struct drm_gem_object *obj);
@@ -162,8 +162,8 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
162 162
163 mutex_lock(&dev->struct_mutex); 163 mutex_lock(&dev->struct_mutex);
164 164
165 ret = i915_gem_object_set_domain_range(obj, args->offset, args->size, 165 ret = i915_gem_object_set_cpu_read_domain_range(obj, args->offset,
166 I915_GEM_DOMAIN_CPU, 0); 166 args->size);
167 if (ret != 0) { 167 if (ret != 0) {
168 drm_gem_object_unreference(obj); 168 drm_gem_object_unreference(obj);
169 mutex_unlock(&dev->struct_mutex); 169 mutex_unlock(&dev->struct_mutex);
@@ -260,8 +260,7 @@ i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
260 mutex_unlock(&dev->struct_mutex); 260 mutex_unlock(&dev->struct_mutex);
261 return ret; 261 return ret;
262 } 262 }
263 ret = i915_gem_set_domain(obj, file_priv, 263 ret = i915_gem_object_set_to_gtt_domain(obj, 1);
264 I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
265 if (ret) 264 if (ret)
266 goto fail; 265 goto fail;
267 266
@@ -320,8 +319,7 @@ i915_gem_shmem_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
320 319
321 mutex_lock(&dev->struct_mutex); 320 mutex_lock(&dev->struct_mutex);
322 321
323 ret = i915_gem_set_domain(obj, file_priv, 322 ret = i915_gem_object_set_to_cpu_domain(obj, 1);
324 I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
325 if (ret) { 323 if (ret) {
326 mutex_unlock(&dev->struct_mutex); 324 mutex_unlock(&dev->struct_mutex);
327 return ret; 325 return ret;
@@ -397,7 +395,8 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
397} 395}
398 396
399/** 397/**
400 * Called when user space prepares to use an object 398 * Called when user space prepares to use an object with the CPU, either
399 * through the mmap ioctl's mapping or a GTT mapping.
401 */ 400 */
402int 401int
403i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, 402i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
@@ -405,11 +404,26 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
405{ 404{
406 struct drm_i915_gem_set_domain *args = data; 405 struct drm_i915_gem_set_domain *args = data;
407 struct drm_gem_object *obj; 406 struct drm_gem_object *obj;
407 uint32_t read_domains = args->read_domains;
408 uint32_t write_domain = args->write_domain;
408 int ret; 409 int ret;
409 410
410 if (!(dev->driver->driver_features & DRIVER_GEM)) 411 if (!(dev->driver->driver_features & DRIVER_GEM))
411 return -ENODEV; 412 return -ENODEV;
412 413
414 /* Only handle setting domains to types used by the CPU. */
415 if (write_domain & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT))
416 return -EINVAL;
417
418 if (read_domains & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT))
419 return -EINVAL;
420
421 /* Having something in the write domain implies it's in the read
422 * domain, and only that read domain. Enforce that in the request.
423 */
424 if (write_domain != 0 && read_domains != write_domain)
425 return -EINVAL;
426
413 obj = drm_gem_object_lookup(dev, file_priv, args->handle); 427 obj = drm_gem_object_lookup(dev, file_priv, args->handle);
414 if (obj == NULL) 428 if (obj == NULL)
415 return -EBADF; 429 return -EBADF;
@@ -417,10 +431,21 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
417 mutex_lock(&dev->struct_mutex); 431 mutex_lock(&dev->struct_mutex);
418#if WATCH_BUF 432#if WATCH_BUF
419 DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n", 433 DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n",
420 obj, obj->size, args->read_domains, args->write_domain); 434 obj, obj->size, read_domains, write_domain);
421#endif 435#endif
422 ret = i915_gem_set_domain(obj, file_priv, 436 if (read_domains & I915_GEM_DOMAIN_GTT) {
423 args->read_domains, args->write_domain); 437 ret = i915_gem_object_set_to_gtt_domain(obj, write_domain != 0);
438
439 /* Silently promote "you're not bound, there was nothing to do"
440 * to success, since the client was just asking us to
441 * make sure everything was done.
442 */
443 if (ret == -EINVAL)
444 ret = 0;
445 } else {
446 ret = i915_gem_object_set_to_cpu_domain(obj, write_domain != 0);
447 }
448
424 drm_gem_object_unreference(obj); 449 drm_gem_object_unreference(obj);
425 mutex_unlock(&dev->struct_mutex); 450 mutex_unlock(&dev->struct_mutex);
426 return ret; 451 return ret;
@@ -455,10 +480,9 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
455 obj_priv = obj->driver_private; 480 obj_priv = obj->driver_private;
456 481
457 /* Pinned buffers may be scanout, so flush the cache */ 482 /* Pinned buffers may be scanout, so flush the cache */
458 if ((obj->write_domain & I915_GEM_DOMAIN_CPU) && obj_priv->pin_count) { 483 if (obj_priv->pin_count)
459 i915_gem_clflush_object(obj); 484 i915_gem_object_flush_cpu_write_domain(obj);
460 drm_agp_chipset_flush(dev); 485
461 }
462 drm_gem_object_unreference(obj); 486 drm_gem_object_unreference(obj);
463 mutex_unlock(&dev->struct_mutex); 487 mutex_unlock(&dev->struct_mutex);
464 return ret; 488 return ret;
@@ -532,7 +556,7 @@ i915_gem_object_free_page_list(struct drm_gem_object *obj)
532} 556}
533 557
534static void 558static void
535i915_gem_object_move_to_active(struct drm_gem_object *obj) 559i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno)
536{ 560{
537 struct drm_device *dev = obj->dev; 561 struct drm_device *dev = obj->dev;
538 drm_i915_private_t *dev_priv = dev->dev_private; 562 drm_i915_private_t *dev_priv = dev->dev_private;
@@ -546,8 +570,20 @@ i915_gem_object_move_to_active(struct drm_gem_object *obj)
546 /* Move from whatever list we were on to the tail of execution. */ 570 /* Move from whatever list we were on to the tail of execution. */
547 list_move_tail(&obj_priv->list, 571 list_move_tail(&obj_priv->list,
548 &dev_priv->mm.active_list); 572 &dev_priv->mm.active_list);
573 obj_priv->last_rendering_seqno = seqno;
549} 574}
550 575
576static void
577i915_gem_object_move_to_flushing(struct drm_gem_object *obj)
578{
579 struct drm_device *dev = obj->dev;
580 drm_i915_private_t *dev_priv = dev->dev_private;
581 struct drm_i915_gem_object *obj_priv = obj->driver_private;
582
583 BUG_ON(!obj_priv->active);
584 list_move_tail(&obj_priv->list, &dev_priv->mm.flushing_list);
585 obj_priv->last_rendering_seqno = 0;
586}
551 587
552static void 588static void
553i915_gem_object_move_to_inactive(struct drm_gem_object *obj) 589i915_gem_object_move_to_inactive(struct drm_gem_object *obj)
@@ -562,6 +598,7 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj)
562 else 598 else
563 list_move_tail(&obj_priv->list, &dev_priv->mm.inactive_list); 599 list_move_tail(&obj_priv->list, &dev_priv->mm.inactive_list);
564 600
601 obj_priv->last_rendering_seqno = 0;
565 if (obj_priv->active) { 602 if (obj_priv->active) {
566 obj_priv->active = 0; 603 obj_priv->active = 0;
567 drm_gem_object_unreference(obj); 604 drm_gem_object_unreference(obj);
@@ -610,10 +647,28 @@ i915_add_request(struct drm_device *dev, uint32_t flush_domains)
610 647
611 request->seqno = seqno; 648 request->seqno = seqno;
612 request->emitted_jiffies = jiffies; 649 request->emitted_jiffies = jiffies;
613 request->flush_domains = flush_domains;
614 was_empty = list_empty(&dev_priv->mm.request_list); 650 was_empty = list_empty(&dev_priv->mm.request_list);
615 list_add_tail(&request->list, &dev_priv->mm.request_list); 651 list_add_tail(&request->list, &dev_priv->mm.request_list);
616 652
653 /* Associate any objects on the flushing list matching the write
654 * domain we're flushing with our flush.
655 */
656 if (flush_domains != 0) {
657 struct drm_i915_gem_object *obj_priv, *next;
658
659 list_for_each_entry_safe(obj_priv, next,
660 &dev_priv->mm.flushing_list, list) {
661 struct drm_gem_object *obj = obj_priv->obj;
662
663 if ((obj->write_domain & flush_domains) ==
664 obj->write_domain) {
665 obj->write_domain = 0;
666 i915_gem_object_move_to_active(obj, seqno);
667 }
668 }
669
670 }
671
617 if (was_empty && !dev_priv->mm.suspended) 672 if (was_empty && !dev_priv->mm.suspended)
618 schedule_delayed_work(&dev_priv->mm.retire_work, HZ); 673 schedule_delayed_work(&dev_priv->mm.retire_work, HZ);
619 return seqno; 674 return seqno;
@@ -676,30 +731,10 @@ i915_gem_retire_request(struct drm_device *dev,
676 __func__, request->seqno, obj); 731 __func__, request->seqno, obj);
677#endif 732#endif
678 733
679 if (obj->write_domain != 0) { 734 if (obj->write_domain != 0)
680 list_move_tail(&obj_priv->list, 735 i915_gem_object_move_to_flushing(obj);
681 &dev_priv->mm.flushing_list); 736 else
682 } else {
683 i915_gem_object_move_to_inactive(obj); 737 i915_gem_object_move_to_inactive(obj);
684 }
685 }
686
687 if (request->flush_domains != 0) {
688 struct drm_i915_gem_object *obj_priv, *next;
689
690 /* Clear the write domain and activity from any buffers
691 * that are just waiting for a flush matching the one retired.
692 */
693 list_for_each_entry_safe(obj_priv, next,
694 &dev_priv->mm.flushing_list, list) {
695 struct drm_gem_object *obj = obj_priv->obj;
696
697 if (obj->write_domain & request->flush_domains) {
698 obj->write_domain = 0;
699 i915_gem_object_move_to_inactive(obj);
700 }
701 }
702
703 } 738 }
704} 739}
705 740
@@ -892,25 +927,10 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj)
892 struct drm_i915_gem_object *obj_priv = obj->driver_private; 927 struct drm_i915_gem_object *obj_priv = obj->driver_private;
893 int ret; 928 int ret;
894 929
895 /* If there are writes queued to the buffer, flush and 930 /* This function only exists to support waiting for existing rendering,
896 * create a new seqno to wait for. 931 * not for emitting required flushes.
897 */ 932 */
898 if (obj->write_domain & ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT)) { 933 BUG_ON((obj->write_domain & I915_GEM_GPU_DOMAINS) != 0);
899 uint32_t write_domain = obj->write_domain;
900#if WATCH_BUF
901 DRM_INFO("%s: flushing object %p from write domain %08x\n",
902 __func__, obj, write_domain);
903#endif
904 i915_gem_flush(dev, 0, write_domain);
905
906 i915_gem_object_move_to_active(obj);
907 obj_priv->last_rendering_seqno = i915_add_request(dev,
908 write_domain);
909 BUG_ON(obj_priv->last_rendering_seqno == 0);
910#if WATCH_LRU
911 DRM_INFO("%s: flush moves to exec list %p\n", __func__, obj);
912#endif
913 }
914 934
915 /* If there is rendering queued on the buffer being evicted, wait for 935 /* If there is rendering queued on the buffer being evicted, wait for
916 * it. 936 * it.
@@ -950,24 +970,16 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
950 return -EINVAL; 970 return -EINVAL;
951 } 971 }
952 972
953 /* Wait for any rendering to complete
954 */
955 ret = i915_gem_object_wait_rendering(obj);
956 if (ret) {
957 DRM_ERROR("wait_rendering failed: %d\n", ret);
958 return ret;
959 }
960
961 /* Move the object to the CPU domain to ensure that 973 /* Move the object to the CPU domain to ensure that
962 * any possible CPU writes while it's not in the GTT 974 * any possible CPU writes while it's not in the GTT
963 * are flushed when we go to remap it. This will 975 * are flushed when we go to remap it. This will
964 * also ensure that all pending GPU writes are finished 976 * also ensure that all pending GPU writes are finished
965 * before we unbind. 977 * before we unbind.
966 */ 978 */
967 ret = i915_gem_object_set_domain(obj, I915_GEM_DOMAIN_CPU, 979 ret = i915_gem_object_set_to_cpu_domain(obj, 1);
968 I915_GEM_DOMAIN_CPU);
969 if (ret) { 980 if (ret) {
970 DRM_ERROR("set_domain failed: %d\n", ret); 981 if (ret != -ERESTARTSYS)
982 DRM_ERROR("set_domain failed: %d\n", ret);
971 return ret; 983 return ret;
972 } 984 }
973 985
@@ -1083,6 +1095,19 @@ i915_gem_evict_something(struct drm_device *dev)
1083} 1095}
1084 1096
1085static int 1097static int
1098i915_gem_evict_everything(struct drm_device *dev)
1099{
1100 int ret;
1101
1102 for (;;) {
1103 ret = i915_gem_evict_something(dev);
1104 if (ret != 0)
1105 break;
1106 }
1107 return ret;
1108}
1109
1110static int
1086i915_gem_object_get_page_list(struct drm_gem_object *obj) 1111i915_gem_object_get_page_list(struct drm_gem_object *obj)
1087{ 1112{
1088 struct drm_i915_gem_object *obj_priv = obj->driver_private; 1113 struct drm_i915_gem_object *obj_priv = obj->driver_private;
@@ -1168,7 +1193,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
1168 1193
1169 ret = i915_gem_evict_something(dev); 1194 ret = i915_gem_evict_something(dev);
1170 if (ret != 0) { 1195 if (ret != 0) {
1171 DRM_ERROR("Failed to evict a buffer %d\n", ret); 1196 if (ret != -ERESTARTSYS)
1197 DRM_ERROR("Failed to evict a buffer %d\n", ret);
1172 return ret; 1198 return ret;
1173 } 1199 }
1174 goto search_free; 1200 goto search_free;
@@ -1228,6 +1254,143 @@ i915_gem_clflush_object(struct drm_gem_object *obj)
1228 drm_clflush_pages(obj_priv->page_list, obj->size / PAGE_SIZE); 1254 drm_clflush_pages(obj_priv->page_list, obj->size / PAGE_SIZE);
1229} 1255}
1230 1256
1257/** Flushes any GPU write domain for the object if it's dirty. */
1258static void
1259i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj)
1260{
1261 struct drm_device *dev = obj->dev;
1262 uint32_t seqno;
1263
1264 if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0)
1265 return;
1266
1267 /* Queue the GPU write cache flushing we need. */
1268 i915_gem_flush(dev, 0, obj->write_domain);
1269 seqno = i915_add_request(dev, obj->write_domain);
1270 obj->write_domain = 0;
1271 i915_gem_object_move_to_active(obj, seqno);
1272}
1273
1274/** Flushes the GTT write domain for the object if it's dirty. */
1275static void
1276i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj)
1277{
1278 if (obj->write_domain != I915_GEM_DOMAIN_GTT)
1279 return;
1280
1281 /* No actual flushing is required for the GTT write domain. Writes
1282 * to it immediately go to main memory as far as we know, so there's
1283 * no chipset flush. It also doesn't land in render cache.
1284 */
1285 obj->write_domain = 0;
1286}
1287
1288/** Flushes the CPU write domain for the object if it's dirty. */
1289static void
1290i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj)
1291{
1292 struct drm_device *dev = obj->dev;
1293
1294 if (obj->write_domain != I915_GEM_DOMAIN_CPU)
1295 return;
1296
1297 i915_gem_clflush_object(obj);
1298 drm_agp_chipset_flush(dev);
1299 obj->write_domain = 0;
1300}
1301
1302/**
1303 * Moves a single object to the GTT read, and possibly write domain.
1304 *
1305 * This function returns when the move is complete, including waiting on
1306 * flushes to occur.
1307 */
1308static int
1309i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
1310{
1311 struct drm_i915_gem_object *obj_priv = obj->driver_private;
1312 int ret;
1313
1314 /* Not valid to be called on unbound objects. */
1315 if (obj_priv->gtt_space == NULL)
1316 return -EINVAL;
1317
1318 i915_gem_object_flush_gpu_write_domain(obj);
1319 /* Wait on any GPU rendering and flushing to occur. */
1320 ret = i915_gem_object_wait_rendering(obj);
1321 if (ret != 0)
1322 return ret;
1323
1324 /* If we're writing through the GTT domain, then CPU and GPU caches
1325 * will need to be invalidated at next use.
1326 */
1327 if (write)
1328 obj->read_domains &= I915_GEM_DOMAIN_GTT;
1329
1330 i915_gem_object_flush_cpu_write_domain(obj);
1331
1332 /* It should now be out of any other write domains, and we can update
1333 * the domain values for our changes.
1334 */
1335 BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0);
1336 obj->read_domains |= I915_GEM_DOMAIN_GTT;
1337 if (write) {
1338 obj->write_domain = I915_GEM_DOMAIN_GTT;
1339 obj_priv->dirty = 1;
1340 }
1341
1342 return 0;
1343}
1344
1345/**
1346 * Moves a single object to the CPU read, and possibly write domain.
1347 *
1348 * This function returns when the move is complete, including waiting on
1349 * flushes to occur.
1350 */
1351static int
1352i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
1353{
1354 struct drm_device *dev = obj->dev;
1355 int ret;
1356
1357 i915_gem_object_flush_gpu_write_domain(obj);
1358 /* Wait on any GPU rendering and flushing to occur. */
1359 ret = i915_gem_object_wait_rendering(obj);
1360 if (ret != 0)
1361 return ret;
1362
1363 i915_gem_object_flush_gtt_write_domain(obj);
1364
1365 /* If we have a partially-valid cache of the object in the CPU,
1366 * finish invalidating it and free the per-page flags.
1367 */
1368 i915_gem_object_set_to_full_cpu_read_domain(obj);
1369
1370 /* Flush the CPU cache if it's still invalid. */
1371 if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) {
1372 i915_gem_clflush_object(obj);
1373 drm_agp_chipset_flush(dev);
1374
1375 obj->read_domains |= I915_GEM_DOMAIN_CPU;
1376 }
1377
1378 /* It should now be out of any other write domains, and we can update
1379 * the domain values for our changes.
1380 */
1381 BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_CPU) != 0);
1382
1383 /* If we're writing through the CPU, then the GPU read domains will
1384 * need to be invalidated at next use.
1385 */
1386 if (write) {
1387 obj->read_domains &= I915_GEM_DOMAIN_CPU;
1388 obj->write_domain = I915_GEM_DOMAIN_CPU;
1389 }
1390
1391 return 0;
1392}
1393
1231/* 1394/*
1232 * Set the next domain for the specified object. This 1395 * Set the next domain for the specified object. This
1233 * may not actually perform the necessary flushing/invaliding though, 1396 * may not actually perform the necessary flushing/invaliding though,
@@ -1339,16 +1502,18 @@ i915_gem_clflush_object(struct drm_gem_object *obj)
1339 * MI_FLUSH 1502 * MI_FLUSH
1340 * drm_agp_chipset_flush 1503 * drm_agp_chipset_flush
1341 */ 1504 */
1342static int 1505static void
1343i915_gem_object_set_domain(struct drm_gem_object *obj, 1506i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
1344 uint32_t read_domains, 1507 uint32_t read_domains,
1345 uint32_t write_domain) 1508 uint32_t write_domain)
1346{ 1509{
1347 struct drm_device *dev = obj->dev; 1510 struct drm_device *dev = obj->dev;
1348 struct drm_i915_gem_object *obj_priv = obj->driver_private; 1511 struct drm_i915_gem_object *obj_priv = obj->driver_private;
1349 uint32_t invalidate_domains = 0; 1512 uint32_t invalidate_domains = 0;
1350 uint32_t flush_domains = 0; 1513 uint32_t flush_domains = 0;
1351 int ret; 1514
1515 BUG_ON(read_domains & I915_GEM_DOMAIN_CPU);
1516 BUG_ON(write_domain == I915_GEM_DOMAIN_CPU);
1352 1517
1353#if WATCH_BUF 1518#if WATCH_BUF
1354 DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n", 1519 DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n",
@@ -1385,34 +1550,11 @@ i915_gem_object_set_domain(struct drm_gem_object *obj,
1385 DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n", 1550 DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n",
1386 __func__, flush_domains, invalidate_domains); 1551 __func__, flush_domains, invalidate_domains);
1387#endif 1552#endif
1388 /*
1389 * If we're invaliding the CPU cache and flushing a GPU cache,
1390 * then pause for rendering so that the GPU caches will be
1391 * flushed before the cpu cache is invalidated
1392 */
1393 if ((invalidate_domains & I915_GEM_DOMAIN_CPU) &&
1394 (flush_domains & ~(I915_GEM_DOMAIN_CPU |
1395 I915_GEM_DOMAIN_GTT))) {
1396 ret = i915_gem_object_wait_rendering(obj);
1397 if (ret)
1398 return ret;
1399 }
1400 i915_gem_clflush_object(obj); 1553 i915_gem_clflush_object(obj);
1401 } 1554 }
1402 1555
1403 if ((write_domain | flush_domains) != 0) 1556 if ((write_domain | flush_domains) != 0)
1404 obj->write_domain = write_domain; 1557 obj->write_domain = write_domain;
1405
1406 /* If we're invalidating the CPU domain, clear the per-page CPU
1407 * domain list as well.
1408 */
1409 if (obj_priv->page_cpu_valid != NULL &&
1410 (write_domain != 0 ||
1411 read_domains & I915_GEM_DOMAIN_CPU)) {
1412 drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE,
1413 DRM_MEM_DRIVER);
1414 obj_priv->page_cpu_valid = NULL;
1415 }
1416 obj->read_domains = read_domains; 1558 obj->read_domains = read_domains;
1417 1559
1418 dev->invalidate_domains |= invalidate_domains; 1560 dev->invalidate_domains |= invalidate_domains;
@@ -1423,47 +1565,94 @@ i915_gem_object_set_domain(struct drm_gem_object *obj,
1423 obj->read_domains, obj->write_domain, 1565 obj->read_domains, obj->write_domain,
1424 dev->invalidate_domains, dev->flush_domains); 1566 dev->invalidate_domains, dev->flush_domains);
1425#endif 1567#endif
1426 return 0;
1427} 1568}
1428 1569
1429/** 1570/**
1430 * Set the read/write domain on a range of the object. 1571 * Moves the object from a partially CPU read to a full one.
1431 * 1572 *
1432 * Currently only implemented for CPU reads, otherwise drops to normal 1573 * Note that this only resolves i915_gem_object_set_cpu_read_domain_range(),
1433 * i915_gem_object_set_domain(). 1574 * and doesn't handle transitioning from !(read_domains & I915_GEM_DOMAIN_CPU).
1434 */ 1575 */
1435static int 1576static void
1436i915_gem_object_set_domain_range(struct drm_gem_object *obj, 1577i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
1437 uint64_t offset,
1438 uint64_t size,
1439 uint32_t read_domains,
1440 uint32_t write_domain)
1441{ 1578{
1579 struct drm_device *dev = obj->dev;
1442 struct drm_i915_gem_object *obj_priv = obj->driver_private; 1580 struct drm_i915_gem_object *obj_priv = obj->driver_private;
1443 int ret, i;
1444 1581
1445 if (obj->read_domains & I915_GEM_DOMAIN_CPU) 1582 if (!obj_priv->page_cpu_valid)
1446 return 0; 1583 return;
1447 1584
1448 if (read_domains != I915_GEM_DOMAIN_CPU || 1585 /* If we're partially in the CPU read domain, finish moving it in.
1449 write_domain != 0) 1586 */
1450 return i915_gem_object_set_domain(obj, 1587 if (obj->read_domains & I915_GEM_DOMAIN_CPU) {
1451 read_domains, write_domain); 1588 int i;
1452 1589
1453 /* Wait on any GPU rendering to the object to be flushed. */ 1590 for (i = 0; i <= (obj->size - 1) / PAGE_SIZE; i++) {
1591 if (obj_priv->page_cpu_valid[i])
1592 continue;
1593 drm_clflush_pages(obj_priv->page_list + i, 1);
1594 }
1595 drm_agp_chipset_flush(dev);
1596 }
1597
1598 /* Free the page_cpu_valid mappings which are now stale, whether
1599 * or not we've got I915_GEM_DOMAIN_CPU.
1600 */
1601 drm_free(obj_priv->page_cpu_valid, obj->size / PAGE_SIZE,
1602 DRM_MEM_DRIVER);
1603 obj_priv->page_cpu_valid = NULL;
1604}
1605
1606/**
1607 * Set the CPU read domain on a range of the object.
1608 *
1609 * The object ends up with I915_GEM_DOMAIN_CPU in its read flags although it's
1610 * not entirely valid. The page_cpu_valid member of the object flags which
1611 * pages have been flushed, and will be respected by
1612 * i915_gem_object_set_to_cpu_domain() if it's called on to get a valid mapping
1613 * of the whole object.
1614 *
1615 * This function returns when the move is complete, including waiting on
1616 * flushes to occur.
1617 */
1618static int
1619i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj,
1620 uint64_t offset, uint64_t size)
1621{
1622 struct drm_i915_gem_object *obj_priv = obj->driver_private;
1623 int i, ret;
1624
1625 if (offset == 0 && size == obj->size)
1626 return i915_gem_object_set_to_cpu_domain(obj, 0);
1627
1628 i915_gem_object_flush_gpu_write_domain(obj);
1629 /* Wait on any GPU rendering and flushing to occur. */
1454 ret = i915_gem_object_wait_rendering(obj); 1630 ret = i915_gem_object_wait_rendering(obj);
1455 if (ret) 1631 if (ret != 0)
1456 return ret; 1632 return ret;
1633 i915_gem_object_flush_gtt_write_domain(obj);
1457 1634
1635 /* If we're already fully in the CPU read domain, we're done. */
1636 if (obj_priv->page_cpu_valid == NULL &&
1637 (obj->read_domains & I915_GEM_DOMAIN_CPU) != 0)
1638 return 0;
1639
1640 /* Otherwise, create/clear the per-page CPU read domain flag if we're
1641 * newly adding I915_GEM_DOMAIN_CPU
1642 */
1458 if (obj_priv->page_cpu_valid == NULL) { 1643 if (obj_priv->page_cpu_valid == NULL) {
1459 obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE, 1644 obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE,
1460 DRM_MEM_DRIVER); 1645 DRM_MEM_DRIVER);
1461 } 1646 if (obj_priv->page_cpu_valid == NULL)
1647 return -ENOMEM;
1648 } else if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0)
1649 memset(obj_priv->page_cpu_valid, 0, obj->size / PAGE_SIZE);
1462 1650
1463 /* Flush the cache on any pages that are still invalid from the CPU's 1651 /* Flush the cache on any pages that are still invalid from the CPU's
1464 * perspective. 1652 * perspective.
1465 */ 1653 */
1466 for (i = offset / PAGE_SIZE; i <= (offset + size - 1) / PAGE_SIZE; i++) { 1654 for (i = offset / PAGE_SIZE; i <= (offset + size - 1) / PAGE_SIZE;
1655 i++) {
1467 if (obj_priv->page_cpu_valid[i]) 1656 if (obj_priv->page_cpu_valid[i])
1468 continue; 1657 continue;
1469 1658
@@ -1472,39 +1661,14 @@ i915_gem_object_set_domain_range(struct drm_gem_object *obj,
1472 obj_priv->page_cpu_valid[i] = 1; 1661 obj_priv->page_cpu_valid[i] = 1;
1473 } 1662 }
1474 1663
1475 return 0; 1664 /* It should now be out of any other write domains, and we can update
1476} 1665 * the domain values for our changes.
1477
1478/**
1479 * Once all of the objects have been set in the proper domain,
1480 * perform the necessary flush and invalidate operations.
1481 *
1482 * Returns the write domains flushed, for use in flush tracking.
1483 */
1484static uint32_t
1485i915_gem_dev_set_domain(struct drm_device *dev)
1486{
1487 uint32_t flush_domains = dev->flush_domains;
1488
1489 /*
1490 * Now that all the buffers are synced to the proper domains,
1491 * flush and invalidate the collected domains
1492 */ 1666 */
1493 if (dev->invalidate_domains | dev->flush_domains) { 1667 BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_CPU) != 0);
1494#if WATCH_EXEC
1495 DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n",
1496 __func__,
1497 dev->invalidate_domains,
1498 dev->flush_domains);
1499#endif
1500 i915_gem_flush(dev,
1501 dev->invalidate_domains,
1502 dev->flush_domains);
1503 dev->invalidate_domains = 0;
1504 dev->flush_domains = 0;
1505 }
1506 1668
1507 return flush_domains; 1669 obj->read_domains |= I915_GEM_DOMAIN_CPU;
1670
1671 return 0;
1508} 1672}
1509 1673
1510/** 1674/**
@@ -1585,6 +1749,18 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
1585 return -EINVAL; 1749 return -EINVAL;
1586 } 1750 }
1587 1751
1752 if (reloc.write_domain & I915_GEM_DOMAIN_CPU ||
1753 reloc.read_domains & I915_GEM_DOMAIN_CPU) {
1754 DRM_ERROR("reloc with read/write CPU domains: "
1755 "obj %p target %d offset %d "
1756 "read %08x write %08x",
1757 obj, reloc.target_handle,
1758 (int) reloc.offset,
1759 reloc.read_domains,
1760 reloc.write_domain);
1761 return -EINVAL;
1762 }
1763
1588 if (reloc.write_domain && target_obj->pending_write_domain && 1764 if (reloc.write_domain && target_obj->pending_write_domain &&
1589 reloc.write_domain != target_obj->pending_write_domain) { 1765 reloc.write_domain != target_obj->pending_write_domain) {
1590 DRM_ERROR("Write domain conflict: " 1766 DRM_ERROR("Write domain conflict: "
@@ -1625,19 +1801,11 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
1625 continue; 1801 continue;
1626 } 1802 }
1627 1803
1628 /* Now that we're going to actually write some data in, 1804 ret = i915_gem_object_set_to_gtt_domain(obj, 1);
1629 * make sure that any rendering using this buffer's contents 1805 if (ret != 0) {
1630 * is completed. 1806 drm_gem_object_unreference(target_obj);
1631 */ 1807 i915_gem_object_unpin(obj);
1632 i915_gem_object_wait_rendering(obj); 1808 return -EINVAL;
1633
1634 /* As we're writing through the gtt, flush
1635 * any CPU writes before we write the relocations
1636 */
1637 if (obj->write_domain & I915_GEM_DOMAIN_CPU) {
1638 i915_gem_clflush_object(obj);
1639 drm_agp_chipset_flush(dev);
1640 obj->write_domain = 0;
1641 } 1809 }
1642 1810
1643 /* Map the page containing the relocation we're going to 1811 /* Map the page containing the relocation we're going to
@@ -1779,6 +1947,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
1779 int ret, i, pinned = 0; 1947 int ret, i, pinned = 0;
1780 uint64_t exec_offset; 1948 uint64_t exec_offset;
1781 uint32_t seqno, flush_domains; 1949 uint32_t seqno, flush_domains;
1950 int pin_tries;
1782 1951
1783#if WATCH_EXEC 1952#if WATCH_EXEC
1784 DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n", 1953 DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n",
@@ -1827,14 +1996,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
1827 return -EBUSY; 1996 return -EBUSY;
1828 } 1997 }
1829 1998
1830 /* Zero the gloabl flush/invalidate flags. These 1999 /* Look up object handles */
1831 * will be modified as each object is bound to the
1832 * gtt
1833 */
1834 dev->invalidate_domains = 0;
1835 dev->flush_domains = 0;
1836
1837 /* Look up object handles and perform the relocations */
1838 for (i = 0; i < args->buffer_count; i++) { 2000 for (i = 0; i < args->buffer_count; i++) {
1839 object_list[i] = drm_gem_object_lookup(dev, file_priv, 2001 object_list[i] = drm_gem_object_lookup(dev, file_priv,
1840 exec_list[i].handle); 2002 exec_list[i].handle);
@@ -1844,17 +2006,39 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
1844 ret = -EBADF; 2006 ret = -EBADF;
1845 goto err; 2007 goto err;
1846 } 2008 }
2009 }
1847 2010
1848 object_list[i]->pending_read_domains = 0; 2011 /* Pin and relocate */
1849 object_list[i]->pending_write_domain = 0; 2012 for (pin_tries = 0; ; pin_tries++) {
1850 ret = i915_gem_object_pin_and_relocate(object_list[i], 2013 ret = 0;
1851 file_priv, 2014 for (i = 0; i < args->buffer_count; i++) {
1852 &exec_list[i]); 2015 object_list[i]->pending_read_domains = 0;
1853 if (ret) { 2016 object_list[i]->pending_write_domain = 0;
1854 DRM_ERROR("object bind and relocate failed %d\n", ret); 2017 ret = i915_gem_object_pin_and_relocate(object_list[i],
2018 file_priv,
2019 &exec_list[i]);
2020 if (ret)
2021 break;
2022 pinned = i + 1;
2023 }
2024 /* success */
2025 if (ret == 0)
2026 break;
2027
2028 /* error other than GTT full, or we've already tried again */
2029 if (ret != -ENOMEM || pin_tries >= 1) {
2030 DRM_ERROR("Failed to pin buffers %d\n", ret);
1855 goto err; 2031 goto err;
1856 } 2032 }
1857 pinned = i + 1; 2033
2034 /* unpin all of our buffers */
2035 for (i = 0; i < pinned; i++)
2036 i915_gem_object_unpin(object_list[i]);
2037
2038 /* evict everyone we can from the aperture */
2039 ret = i915_gem_evict_everything(dev);
2040 if (ret)
2041 goto err;
1858 } 2042 }
1859 2043
1860 /* Set the pending read domains for the batch buffer to COMMAND */ 2044 /* Set the pending read domains for the batch buffer to COMMAND */
@@ -1864,21 +2048,37 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
1864 2048
1865 i915_verify_inactive(dev, __FILE__, __LINE__); 2049 i915_verify_inactive(dev, __FILE__, __LINE__);
1866 2050
2051 /* Zero the global flush/invalidate flags. These
2052 * will be modified as new domains are computed
2053 * for each object
2054 */
2055 dev->invalidate_domains = 0;
2056 dev->flush_domains = 0;
2057
1867 for (i = 0; i < args->buffer_count; i++) { 2058 for (i = 0; i < args->buffer_count; i++) {
1868 struct drm_gem_object *obj = object_list[i]; 2059 struct drm_gem_object *obj = object_list[i];
1869 2060
1870 /* make sure all previous memory operations have passed */ 2061 /* Compute new gpu domains and update invalidate/flush */
1871 ret = i915_gem_object_set_domain(obj, 2062 i915_gem_object_set_to_gpu_domain(obj,
1872 obj->pending_read_domains, 2063 obj->pending_read_domains,
1873 obj->pending_write_domain); 2064 obj->pending_write_domain);
1874 if (ret)
1875 goto err;
1876 } 2065 }
1877 2066
1878 i915_verify_inactive(dev, __FILE__, __LINE__); 2067 i915_verify_inactive(dev, __FILE__, __LINE__);
1879 2068
1880 /* Flush/invalidate caches and chipset buffer */ 2069 if (dev->invalidate_domains | dev->flush_domains) {
1881 flush_domains = i915_gem_dev_set_domain(dev); 2070#if WATCH_EXEC
2071 DRM_INFO("%s: invalidate_domains %08x flush_domains %08x\n",
2072 __func__,
2073 dev->invalidate_domains,
2074 dev->flush_domains);
2075#endif
2076 i915_gem_flush(dev,
2077 dev->invalidate_domains,
2078 dev->flush_domains);
2079 if (dev->flush_domains)
2080 (void)i915_add_request(dev, dev->flush_domains);
2081 }
1882 2082
1883 i915_verify_inactive(dev, __FILE__, __LINE__); 2083 i915_verify_inactive(dev, __FILE__, __LINE__);
1884 2084
@@ -1898,8 +2098,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
1898 ~0); 2098 ~0);
1899#endif 2099#endif
1900 2100
1901 (void)i915_add_request(dev, flush_domains);
1902
1903 /* Exec the batchbuffer */ 2101 /* Exec the batchbuffer */
1904 ret = i915_dispatch_gem_execbuffer(dev, args, exec_offset); 2102 ret = i915_dispatch_gem_execbuffer(dev, args, exec_offset);
1905 if (ret) { 2103 if (ret) {
@@ -1927,10 +2125,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
1927 i915_file_priv->mm.last_gem_seqno = seqno; 2125 i915_file_priv->mm.last_gem_seqno = seqno;
1928 for (i = 0; i < args->buffer_count; i++) { 2126 for (i = 0; i < args->buffer_count; i++) {
1929 struct drm_gem_object *obj = object_list[i]; 2127 struct drm_gem_object *obj = object_list[i];
1930 struct drm_i915_gem_object *obj_priv = obj->driver_private;
1931 2128
1932 i915_gem_object_move_to_active(obj); 2129 i915_gem_object_move_to_active(obj, seqno);
1933 obj_priv->last_rendering_seqno = seqno;
1934#if WATCH_LRU 2130#if WATCH_LRU
1935 DRM_INFO("%s: move to exec list %p\n", __func__, obj); 2131 DRM_INFO("%s: move to exec list %p\n", __func__, obj);
1936#endif 2132#endif
@@ -2061,11 +2257,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
2061 /* XXX - flush the CPU caches for pinned objects 2257 /* XXX - flush the CPU caches for pinned objects
2062 * as the X server doesn't manage domains yet 2258 * as the X server doesn't manage domains yet
2063 */ 2259 */
2064 if (obj->write_domain & I915_GEM_DOMAIN_CPU) { 2260 i915_gem_object_flush_cpu_write_domain(obj);
2065 i915_gem_clflush_object(obj);
2066 drm_agp_chipset_flush(dev);
2067 obj->write_domain = 0;
2068 }
2069 args->offset = obj_priv->gtt_offset; 2261 args->offset = obj_priv->gtt_offset;
2070 drm_gem_object_unreference(obj); 2262 drm_gem_object_unreference(obj);
2071 mutex_unlock(&dev->struct_mutex); 2263 mutex_unlock(&dev->struct_mutex);
@@ -2167,29 +2359,6 @@ void i915_gem_free_object(struct drm_gem_object *obj)
2167 drm_free(obj->driver_private, 1, DRM_MEM_DRIVER); 2359 drm_free(obj->driver_private, 1, DRM_MEM_DRIVER);
2168} 2360}
2169 2361
2170static int
2171i915_gem_set_domain(struct drm_gem_object *obj,
2172 struct drm_file *file_priv,
2173 uint32_t read_domains,
2174 uint32_t write_domain)
2175{
2176 struct drm_device *dev = obj->dev;
2177 int ret;
2178 uint32_t flush_domains;
2179
2180 BUG_ON(!mutex_is_locked(&dev->struct_mutex));
2181
2182 ret = i915_gem_object_set_domain(obj, read_domains, write_domain);
2183 if (ret)
2184 return ret;
2185 flush_domains = i915_gem_dev_set_domain(obj->dev);
2186
2187 if (flush_domains & ~(I915_GEM_DOMAIN_CPU|I915_GEM_DOMAIN_GTT))
2188 (void) i915_add_request(dev, flush_domains);
2189
2190 return 0;
2191}
2192
2193/** Unbinds all objects that are on the given buffer list. */ 2362/** Unbinds all objects that are on the given buffer list. */
2194static int 2363static int
2195i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head) 2364i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head)
diff --git a/drivers/gpu/drm/i915/i915_gem_proc.c b/drivers/gpu/drm/i915/i915_gem_proc.c
index 93de15b4c9a7..e8d5abe1250e 100644
--- a/drivers/gpu/drm/i915/i915_gem_proc.c
+++ b/drivers/gpu/drm/i915/i915_gem_proc.c
@@ -166,10 +166,9 @@ static int i915_gem_request_info(char *buf, char **start, off_t offset,
166 list_for_each_entry(gem_request, &dev_priv->mm.request_list, 166 list_for_each_entry(gem_request, &dev_priv->mm.request_list,
167 list) 167 list)
168 { 168 {
169 DRM_PROC_PRINT(" %d @ %d %08x\n", 169 DRM_PROC_PRINT(" %d @ %d\n",
170 gem_request->seqno, 170 gem_request->seqno,
171 (int) (jiffies - gem_request->emitted_jiffies), 171 (int) (jiffies - gem_request->emitted_jiffies));
172 gem_request->flush_domains);
173 } 172 }
174 if (len > request + offset) 173 if (len > request + offset)
175 return request; 174 return request;
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index e8b85ac4ca04..a8cb69469c64 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -119,9 +119,10 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
119 dcc & DCC_CHANNEL_XOR_DISABLE) { 119 dcc & DCC_CHANNEL_XOR_DISABLE) {
120 swizzle_x = I915_BIT_6_SWIZZLE_9_10; 120 swizzle_x = I915_BIT_6_SWIZZLE_9_10;
121 swizzle_y = I915_BIT_6_SWIZZLE_9; 121 swizzle_y = I915_BIT_6_SWIZZLE_9;
122 } else if (IS_I965GM(dev) || IS_GM45(dev)) { 122 } else if ((IS_I965GM(dev) || IS_GM45(dev)) &&
123 /* GM965 only does bit 11-based channel 123 (dcc & DCC_CHANNEL_XOR_BIT_17) == 0) {
124 * randomization 124 /* GM965/GM45 does either bit 11 or bit 17
125 * swizzling.
125 */ 126 */
126 swizzle_x = I915_BIT_6_SWIZZLE_9_10_11; 127 swizzle_x = I915_BIT_6_SWIZZLE_9_10_11;
127 swizzle_y = I915_BIT_6_SWIZZLE_9_11; 128 swizzle_y = I915_BIT_6_SWIZZLE_9_11;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0e476eba36e6..9d24aaeb8a45 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -522,6 +522,7 @@
522#define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0) 522#define DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED (2 << 0)
523#define DCC_ADDRESSING_MODE_MASK (3 << 0) 523#define DCC_ADDRESSING_MODE_MASK (3 << 0)
524#define DCC_CHANNEL_XOR_DISABLE (1 << 10) 524#define DCC_CHANNEL_XOR_DISABLE (1 << 10)
525#define DCC_CHANNEL_XOR_BIT_17 (1 << 9)
525 526
526/** 965 MCH register controlling DRAM channel configuration */ 527/** 965 MCH register controlling DRAM channel configuration */
527#define C0DRB3 0x10206 528#define C0DRB3 0x10206
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c
index d700dacdb10e..c903130be7fd 100644
--- a/fs/xfs/xfs_rename.c
+++ b/fs/xfs/xfs_rename.c
@@ -212,7 +212,7 @@ xfs_rename(
212 if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && 212 if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
213 (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) { 213 (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) {
214 error = XFS_ERROR(EXDEV); 214 error = XFS_ERROR(EXDEV);
215 xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED); 215 xfs_rename_unlock4(inodes, XFS_ILOCK_EXCL);
216 xfs_trans_cancel(tp, cancel_flags); 216 xfs_trans_cancel(tp, cancel_flags);
217 goto std_return; 217 goto std_return;
218 } 218 }
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 895337b16a24..4e5288a831de 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -311,7 +311,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
311 struct task_cputime cputime; 311 struct task_cputime cputime;
312 312
313 thread_group_cputime(p, &cputime); 313 thread_group_cputime(p, &cputime);
314 switch (which_clock) { 314 switch (CPUCLOCK_WHICH(which_clock)) {
315 default: 315 default:
316 return -EINVAL; 316 return -EINVAL;
317 case CPUCLOCK_PROF: 317 case CPUCLOCK_PROF:
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 3953e4aed733..dc0b3be6b7d5 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -188,7 +188,7 @@ static void check_hung_task(struct task_struct *t, unsigned long now)
188 if ((long)(now - t->last_switch_timestamp) < 188 if ((long)(now - t->last_switch_timestamp) <
189 sysctl_hung_task_timeout_secs) 189 sysctl_hung_task_timeout_secs)
190 return; 190 return;
191 if (sysctl_hung_task_warnings < 0) 191 if (!sysctl_hung_task_warnings)
192 return; 192 return;
193 sysctl_hung_task_warnings--; 193 sysctl_hung_task_warnings--;
194 194
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index e7acfb482a68..fa05e88aa76f 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -518,6 +518,28 @@ void update_wall_time(void)
518 /* correct the clock when NTP error is too big */ 518 /* correct the clock when NTP error is too big */
519 clocksource_adjust(offset); 519 clocksource_adjust(offset);
520 520
521 /*
522 * Since in the loop above, we accumulate any amount of time
523 * in xtime_nsec over a second into xtime.tv_sec, its possible for
524 * xtime_nsec to be fairly small after the loop. Further, if we're
525 * slightly speeding the clocksource up in clocksource_adjust(),
526 * its possible the required corrective factor to xtime_nsec could
527 * cause it to underflow.
528 *
529 * Now, we cannot simply roll the accumulated second back, since
530 * the NTP subsystem has been notified via second_overflow. So
531 * instead we push xtime_nsec forward by the amount we underflowed,
532 * and add that amount into the error.
533 *
534 * We'll correct this error next time through this function, when
535 * xtime_nsec is not as small.
536 */
537 if (unlikely((s64)clock->xtime_nsec < 0)) {
538 s64 neg = -(s64)clock->xtime_nsec;
539 clock->xtime_nsec = 0;
540 clock->error += neg << (NTP_SCALE_SHIFT - clock->shift);
541 }
542
521 /* store full nanoseconds into xtime after rounding it up and 543 /* store full nanoseconds into xtime after rounding it up and
522 * add the remainder to the error difference. 544 * add the remainder to the error difference.
523 */ 545 */
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-08 02:42:59 -0500