diff options
170 files changed, 4987 insertions, 2092 deletions
diff --git a/Documentation/fault-injection/fault-injection.txt b/Documentation/fault-injection/fault-injection.txt index 079305640790..7be15e44d481 100644 --- a/Documentation/fault-injection/fault-injection.txt +++ b/Documentation/fault-injection/fault-injection.txt | |||
@@ -143,8 +143,8 @@ o provide a way to configure fault attributes | |||
143 | failslab, fail_page_alloc, and fail_make_request use this way. | 143 | failslab, fail_page_alloc, and fail_make_request use this way. |
144 | Helper functions: | 144 | Helper functions: |
145 | 145 | ||
146 | init_fault_attr_entries(entries, attr, name); | 146 | init_fault_attr_dentries(entries, attr, name); |
147 | void cleanup_fault_attr_entries(entries); | 147 | void cleanup_fault_attr_dentries(entries); |
148 | 148 | ||
149 | - module parameters | 149 | - module parameters |
150 | 150 | ||
diff --git a/Documentation/trace/ftrace-design.txt b/Documentation/trace/ftrace-design.txt index 239f14b2b55a..6a5a579126b0 100644 --- a/Documentation/trace/ftrace-design.txt +++ b/Documentation/trace/ftrace-design.txt | |||
@@ -1,5 +1,6 @@ | |||
1 | function tracer guts | 1 | function tracer guts |
2 | ==================== | 2 | ==================== |
3 | By Mike Frysinger | ||
3 | 4 | ||
4 | Introduction | 5 | Introduction |
5 | ------------ | 6 | ------------ |
@@ -173,14 +174,16 @@ void ftrace_graph_caller(void) | |||
173 | 174 | ||
174 | unsigned long *frompc = &...; | 175 | unsigned long *frompc = &...; |
175 | unsigned long selfpc = <return address> - MCOUNT_INSN_SIZE; | 176 | unsigned long selfpc = <return address> - MCOUNT_INSN_SIZE; |
176 | prepare_ftrace_return(frompc, selfpc); | 177 | /* passing frame pointer up is optional -- see below */ |
178 | prepare_ftrace_return(frompc, selfpc, frame_pointer); | ||
177 | 179 | ||
178 | /* restore all state needed by the ABI */ | 180 | /* restore all state needed by the ABI */ |
179 | } | 181 | } |
180 | #endif | 182 | #endif |
181 | 183 | ||
182 | For information on how to implement prepare_ftrace_return(), simply look at | 184 | For information on how to implement prepare_ftrace_return(), simply look at the |
183 | the x86 version. The only architecture-specific piece in it is the setup of | 185 | x86 version (the frame pointer passing is optional; see the next section for |
186 | more information). The only architecture-specific piece in it is the setup of | ||
184 | the fault recovery table (the asm(...) code). The rest should be the same | 187 | the fault recovery table (the asm(...) code). The rest should be the same |
185 | across architectures. | 188 | across architectures. |
186 | 189 | ||
@@ -205,6 +208,23 @@ void return_to_handler(void) | |||
205 | #endif | 208 | #endif |
206 | 209 | ||
207 | 210 | ||
211 | HAVE_FUNCTION_GRAPH_FP_TEST | ||
212 | --------------------------- | ||
213 | |||
214 | An arch may pass in a unique value (frame pointer) to both the entering and | ||
215 | exiting of a function. On exit, the value is compared and if it does not | ||
216 | match, then it will panic the kernel. This is largely a sanity check for bad | ||
217 | code generation with gcc. If gcc for your port sanely updates the frame | ||
218 | pointer under different opitmization levels, then ignore this option. | ||
219 | |||
220 | However, adding support for it isn't terribly difficult. In your assembly code | ||
221 | that calls prepare_ftrace_return(), pass the frame pointer as the 3rd argument. | ||
222 | Then in the C version of that function, do what the x86 port does and pass it | ||
223 | along to ftrace_push_return_trace() instead of a stub value of 0. | ||
224 | |||
225 | Similarly, when you call ftrace_return_to_handler(), pass it the frame pointer. | ||
226 | |||
227 | |||
208 | HAVE_FTRACE_NMI_ENTER | 228 | HAVE_FTRACE_NMI_ENTER |
209 | --------------------- | 229 | --------------------- |
210 | 230 | ||
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt index 8179692fbb90..bab3040da548 100644 --- a/Documentation/trace/ftrace.txt +++ b/Documentation/trace/ftrace.txt | |||
@@ -1625,7 +1625,7 @@ If I am only interested in sys_nanosleep and hrtimer_interrupt: | |||
1625 | 1625 | ||
1626 | # echo sys_nanosleep hrtimer_interrupt \ | 1626 | # echo sys_nanosleep hrtimer_interrupt \ |
1627 | > set_ftrace_filter | 1627 | > set_ftrace_filter |
1628 | # echo ftrace > current_tracer | 1628 | # echo function > current_tracer |
1629 | # echo 1 > tracing_enabled | 1629 | # echo 1 > tracing_enabled |
1630 | # usleep 1 | 1630 | # usleep 1 |
1631 | # echo 0 > tracing_enabled | 1631 | # echo 0 > tracing_enabled |
diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig index bb7c374713ad..6fced1fe3bf0 100644 --- a/arch/microblaze/configs/mmu_defconfig +++ b/arch/microblaze/configs/mmu_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.31 | 3 | # Linux kernel version: 2.6.33-rc6 |
4 | # Thu Sep 24 10:28:50 2009 | 4 | # Wed Feb 3 10:02:59 2010 |
5 | # | 5 | # |
6 | CONFIG_MICROBLAZE=y | 6 | CONFIG_MICROBLAZE=y |
7 | # CONFIG_SWAP is not set | 7 | # CONFIG_SWAP is not set |
@@ -19,8 +19,12 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
19 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 19 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
20 | CONFIG_GENERIC_GPIO=y | 20 | CONFIG_GENERIC_GPIO=y |
21 | CONFIG_GENERIC_CSUM=y | 21 | CONFIG_GENERIC_CSUM=y |
22 | CONFIG_STACKTRACE_SUPPORT=y | ||
23 | CONFIG_LOCKDEP_SUPPORT=y | ||
24 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
22 | # CONFIG_PCI is not set | 25 | # CONFIG_PCI is not set |
23 | CONFIG_NO_DMA=y | 26 | CONFIG_NO_DMA=y |
27 | CONFIG_DTC=y | ||
24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
25 | CONFIG_CONSTRUCTORS=y | 29 | CONFIG_CONSTRUCTORS=y |
26 | 30 | ||
@@ -44,6 +48,7 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
44 | # | 48 | # |
45 | CONFIG_TREE_RCU=y | 49 | CONFIG_TREE_RCU=y |
46 | # CONFIG_TREE_PREEMPT_RCU is not set | 50 | # CONFIG_TREE_PREEMPT_RCU is not set |
51 | # CONFIG_TINY_RCU is not set | ||
47 | # CONFIG_RCU_TRACE is not set | 52 | # CONFIG_RCU_TRACE is not set |
48 | CONFIG_RCU_FANOUT=32 | 53 | CONFIG_RCU_FANOUT=32 |
49 | # CONFIG_RCU_FANOUT_EXACT is not set | 54 | # CONFIG_RCU_FANOUT_EXACT is not set |
@@ -64,10 +69,12 @@ CONFIG_INITRAMFS_ROOT_GID=0 | |||
64 | CONFIG_RD_GZIP=y | 69 | CONFIG_RD_GZIP=y |
65 | # CONFIG_RD_BZIP2 is not set | 70 | # CONFIG_RD_BZIP2 is not set |
66 | # CONFIG_RD_LZMA is not set | 71 | # CONFIG_RD_LZMA is not set |
72 | # CONFIG_RD_LZO is not set | ||
67 | # CONFIG_INITRAMFS_COMPRESSION_NONE is not set | 73 | # CONFIG_INITRAMFS_COMPRESSION_NONE is not set |
68 | CONFIG_INITRAMFS_COMPRESSION_GZIP=y | 74 | CONFIG_INITRAMFS_COMPRESSION_GZIP=y |
69 | # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set | 75 | # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set |
70 | # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set | 76 | # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set |
77 | # CONFIG_INITRAMFS_COMPRESSION_LZO is not set | ||
71 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 78 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
72 | CONFIG_SYSCTL=y | 79 | CONFIG_SYSCTL=y |
73 | CONFIG_ANON_INODES=y | 80 | CONFIG_ANON_INODES=y |
@@ -90,21 +97,20 @@ CONFIG_EVENTFD=y | |||
90 | CONFIG_AIO=y | 97 | CONFIG_AIO=y |
91 | 98 | ||
92 | # | 99 | # |
93 | # Performance Counters | 100 | # Kernel Performance Events And Counters |
94 | # | 101 | # |
95 | CONFIG_VM_EVENT_COUNTERS=y | 102 | CONFIG_VM_EVENT_COUNTERS=y |
96 | # CONFIG_STRIP_ASM_SYMS is not set | ||
97 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_SLAB=y | 104 | CONFIG_SLAB=y |
99 | # CONFIG_SLUB is not set | 105 | # CONFIG_SLUB is not set |
100 | # CONFIG_SLOB is not set | 106 | # CONFIG_SLOB is not set |
101 | # CONFIG_PROFILING is not set | 107 | # CONFIG_PROFILING is not set |
102 | # CONFIG_MARKERS is not set | 108 | CONFIG_HAVE_OPROFILE=y |
103 | 109 | ||
104 | # | 110 | # |
105 | # GCOV-based kernel profiling | 111 | # GCOV-based kernel profiling |
106 | # | 112 | # |
107 | # CONFIG_SLOW_WORK is not set | 113 | CONFIG_SLOW_WORK=y |
108 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 114 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
109 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
110 | CONFIG_BASE_SMALL=1 | 116 | CONFIG_BASE_SMALL=1 |
@@ -123,14 +129,41 @@ CONFIG_LBDAF=y | |||
123 | # IO Schedulers | 129 | # IO Schedulers |
124 | # | 130 | # |
125 | CONFIG_IOSCHED_NOOP=y | 131 | CONFIG_IOSCHED_NOOP=y |
126 | CONFIG_IOSCHED_AS=y | ||
127 | CONFIG_IOSCHED_DEADLINE=y | 132 | CONFIG_IOSCHED_DEADLINE=y |
128 | CONFIG_IOSCHED_CFQ=y | 133 | CONFIG_IOSCHED_CFQ=y |
129 | # CONFIG_DEFAULT_AS is not set | ||
130 | # CONFIG_DEFAULT_DEADLINE is not set | 134 | # CONFIG_DEFAULT_DEADLINE is not set |
131 | CONFIG_DEFAULT_CFQ=y | 135 | CONFIG_DEFAULT_CFQ=y |
132 | # CONFIG_DEFAULT_NOOP is not set | 136 | # CONFIG_DEFAULT_NOOP is not set |
133 | CONFIG_DEFAULT_IOSCHED="cfq" | 137 | CONFIG_DEFAULT_IOSCHED="cfq" |
138 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
139 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
140 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
141 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
142 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
143 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
144 | # CONFIG_INLINE_SPIN_UNLOCK is not set | ||
145 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
146 | # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set | ||
147 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
148 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
149 | # CONFIG_INLINE_READ_LOCK is not set | ||
150 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
151 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
152 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
153 | # CONFIG_INLINE_READ_UNLOCK is not set | ||
154 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
155 | # CONFIG_INLINE_READ_UNLOCK_IRQ is not set | ||
156 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
157 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
158 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
159 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
160 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
161 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
162 | # CONFIG_INLINE_WRITE_UNLOCK is not set | ||
163 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
164 | # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set | ||
165 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
166 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
134 | # CONFIG_FREEZER is not set | 167 | # CONFIG_FREEZER is not set |
135 | 168 | ||
136 | # | 169 | # |
@@ -139,11 +172,6 @@ CONFIG_DEFAULT_IOSCHED="cfq" | |||
139 | CONFIG_PLATFORM_GENERIC=y | 172 | CONFIG_PLATFORM_GENERIC=y |
140 | CONFIG_OPT_LIB_FUNCTION=y | 173 | CONFIG_OPT_LIB_FUNCTION=y |
141 | CONFIG_OPT_LIB_ASM=y | 174 | CONFIG_OPT_LIB_ASM=y |
142 | CONFIG_ALLOW_EDIT_AUTO=y | ||
143 | |||
144 | # | ||
145 | # Automatic platform settings from Kconfig.auto | ||
146 | # | ||
147 | 175 | ||
148 | # | 176 | # |
149 | # Definitions for MICROBLAZE0 | 177 | # Definitions for MICROBLAZE0 |
@@ -203,12 +231,11 @@ CONFIG_FLATMEM_MANUAL=y | |||
203 | CONFIG_FLATMEM=y | 231 | CONFIG_FLATMEM=y |
204 | CONFIG_FLAT_NODE_MEM_MAP=y | 232 | CONFIG_FLAT_NODE_MEM_MAP=y |
205 | CONFIG_PAGEFLAGS_EXTENDED=y | 233 | CONFIG_PAGEFLAGS_EXTENDED=y |
206 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 234 | CONFIG_SPLIT_PTLOCK_CPUS=999999 |
207 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 235 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
208 | CONFIG_ZONE_DMA_FLAG=0 | 236 | CONFIG_ZONE_DMA_FLAG=0 |
209 | CONFIG_VIRT_TO_BUS=y | 237 | CONFIG_VIRT_TO_BUS=y |
210 | CONFIG_HAVE_MLOCK=y | 238 | # CONFIG_KSM is not set |
211 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
212 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 239 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
213 | 240 | ||
214 | # | 241 | # |
@@ -289,7 +316,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
289 | # CONFIG_IRDA is not set | 316 | # CONFIG_IRDA is not set |
290 | # CONFIG_BT is not set | 317 | # CONFIG_BT is not set |
291 | # CONFIG_AF_RXRPC is not set | 318 | # CONFIG_AF_RXRPC is not set |
292 | # CONFIG_WIRELESS is not set | 319 | CONFIG_WIRELESS=y |
320 | # CONFIG_CFG80211 is not set | ||
321 | # CONFIG_LIB80211 is not set | ||
322 | |||
323 | # | ||
324 | # CFG80211 needs to be enabled for MAC80211 | ||
325 | # | ||
293 | # CONFIG_WIMAX is not set | 326 | # CONFIG_WIMAX is not set |
294 | # CONFIG_RFKILL is not set | 327 | # CONFIG_RFKILL is not set |
295 | # CONFIG_NET_9P is not set | 328 | # CONFIG_NET_9P is not set |
@@ -313,6 +346,10 @@ CONFIG_OF_DEVICE=y | |||
313 | CONFIG_BLK_DEV=y | 346 | CONFIG_BLK_DEV=y |
314 | # CONFIG_BLK_DEV_COW_COMMON is not set | 347 | # CONFIG_BLK_DEV_COW_COMMON is not set |
315 | # CONFIG_BLK_DEV_LOOP is not set | 348 | # CONFIG_BLK_DEV_LOOP is not set |
349 | |||
350 | # | ||
351 | # DRBD disabled because PROC_FS, INET or CONNECTOR not selected | ||
352 | # | ||
316 | # CONFIG_BLK_DEV_NBD is not set | 353 | # CONFIG_BLK_DEV_NBD is not set |
317 | CONFIG_BLK_DEV_RAM=y | 354 | CONFIG_BLK_DEV_RAM=y |
318 | CONFIG_BLK_DEV_RAM_COUNT=16 | 355 | CONFIG_BLK_DEV_RAM_COUNT=16 |
@@ -349,7 +386,6 @@ CONFIG_NETDEVICES=y | |||
349 | # CONFIG_PHYLIB is not set | 386 | # CONFIG_PHYLIB is not set |
350 | CONFIG_NET_ETHERNET=y | 387 | CONFIG_NET_ETHERNET=y |
351 | # CONFIG_MII is not set | 388 | # CONFIG_MII is not set |
352 | # CONFIG_ETHOC is not set | ||
353 | # CONFIG_DNET is not set | 389 | # CONFIG_DNET is not set |
354 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 390 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
355 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 391 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
@@ -359,12 +395,12 @@ CONFIG_NET_ETHERNET=y | |||
359 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 395 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
360 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 396 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
361 | # CONFIG_KS8842 is not set | 397 | # CONFIG_KS8842 is not set |
398 | # CONFIG_KS8851_MLL is not set | ||
362 | CONFIG_XILINX_EMACLITE=y | 399 | CONFIG_XILINX_EMACLITE=y |
363 | CONFIG_NETDEV_1000=y | 400 | CONFIG_NETDEV_1000=y |
364 | CONFIG_NETDEV_10000=y | 401 | CONFIG_NETDEV_10000=y |
365 | CONFIG_WLAN=y | 402 | CONFIG_WLAN=y |
366 | # CONFIG_WLAN_PRE80211 is not set | 403 | # CONFIG_HOSTAP is not set |
367 | # CONFIG_WLAN_80211 is not set | ||
368 | 404 | ||
369 | # | 405 | # |
370 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 406 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -408,6 +444,7 @@ CONFIG_SERIAL_UARTLITE=y | |||
408 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | 444 | CONFIG_SERIAL_UARTLITE_CONSOLE=y |
409 | CONFIG_SERIAL_CORE=y | 445 | CONFIG_SERIAL_CORE=y |
410 | CONFIG_SERIAL_CORE_CONSOLE=y | 446 | CONFIG_SERIAL_CORE_CONSOLE=y |
447 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
411 | CONFIG_UNIX98_PTYS=y | 448 | CONFIG_UNIX98_PTYS=y |
412 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 449 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
413 | CONFIG_LEGACY_PTYS=y | 450 | CONFIG_LEGACY_PTYS=y |
@@ -433,7 +470,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
433 | # CONFIG_POWER_SUPPLY is not set | 470 | # CONFIG_POWER_SUPPLY is not set |
434 | # CONFIG_HWMON is not set | 471 | # CONFIG_HWMON is not set |
435 | # CONFIG_THERMAL is not set | 472 | # CONFIG_THERMAL is not set |
436 | # CONFIG_THERMAL_HWMON is not set | ||
437 | # CONFIG_WATCHDOG is not set | 473 | # CONFIG_WATCHDOG is not set |
438 | 474 | ||
439 | # | 475 | # |
@@ -526,8 +562,6 @@ CONFIG_PROC_FS=y | |||
526 | CONFIG_PROC_SYSCTL=y | 562 | CONFIG_PROC_SYSCTL=y |
527 | CONFIG_PROC_PAGE_MONITOR=y | 563 | CONFIG_PROC_PAGE_MONITOR=y |
528 | CONFIG_SYSFS=y | 564 | CONFIG_SYSFS=y |
529 | CONFIG_TMPFS=y | ||
530 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
531 | # CONFIG_HUGETLB_PAGE is not set | 565 | # CONFIG_HUGETLB_PAGE is not set |
532 | # CONFIG_CONFIGFS_FS is not set | 566 | # CONFIG_CONFIGFS_FS is not set |
533 | CONFIG_MISC_FILESYSTEMS=y | 567 | CONFIG_MISC_FILESYSTEMS=y |
@@ -638,11 +672,13 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
638 | # | 672 | # |
639 | # Kernel hacking | 673 | # Kernel hacking |
640 | # | 674 | # |
675 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
641 | # CONFIG_PRINTK_TIME is not set | 676 | # CONFIG_PRINTK_TIME is not set |
642 | CONFIG_ENABLE_WARN_DEPRECATED=y | 677 | CONFIG_ENABLE_WARN_DEPRECATED=y |
643 | CONFIG_ENABLE_MUST_CHECK=y | 678 | CONFIG_ENABLE_MUST_CHECK=y |
644 | CONFIG_FRAME_WARN=1024 | 679 | CONFIG_FRAME_WARN=1024 |
645 | # CONFIG_MAGIC_SYSRQ is not set | 680 | # CONFIG_MAGIC_SYSRQ is not set |
681 | # CONFIG_STRIP_ASM_SYMS is not set | ||
646 | # CONFIG_UNUSED_SYMBOLS is not set | 682 | # CONFIG_UNUSED_SYMBOLS is not set |
647 | # CONFIG_DEBUG_FS is not set | 683 | # CONFIG_DEBUG_FS is not set |
648 | # CONFIG_HEADERS_CHECK is not set | 684 | # CONFIG_HEADERS_CHECK is not set |
@@ -662,6 +698,9 @@ CONFIG_DEBUG_SLAB=y | |||
662 | # CONFIG_DEBUG_SLAB_LEAK is not set | 698 | # CONFIG_DEBUG_SLAB_LEAK is not set |
663 | CONFIG_DEBUG_SPINLOCK=y | 699 | CONFIG_DEBUG_SPINLOCK=y |
664 | # CONFIG_DEBUG_MUTEXES is not set | 700 | # CONFIG_DEBUG_MUTEXES is not set |
701 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
702 | # CONFIG_PROVE_LOCKING is not set | ||
703 | # CONFIG_LOCK_STAT is not set | ||
665 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 704 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
666 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 705 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
667 | # CONFIG_DEBUG_KOBJECT is not set | 706 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -680,10 +719,29 @@ CONFIG_DEBUG_INFO=y | |||
680 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 719 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
681 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 720 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
682 | # CONFIG_FAULT_INJECTION is not set | 721 | # CONFIG_FAULT_INJECTION is not set |
722 | # CONFIG_LATENCYTOP is not set | ||
683 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | 723 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set |
684 | # CONFIG_PAGE_POISONING is not set | 724 | # CONFIG_PAGE_POISONING is not set |
725 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
726 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
727 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y | ||
728 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
729 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
730 | CONFIG_TRACING_SUPPORT=y | ||
731 | CONFIG_FTRACE=y | ||
732 | # CONFIG_FUNCTION_TRACER is not set | ||
733 | # CONFIG_IRQSOFF_TRACER is not set | ||
734 | # CONFIG_SCHED_TRACER is not set | ||
735 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set | ||
736 | # CONFIG_BOOT_TRACER is not set | ||
737 | CONFIG_BRANCH_PROFILE_NONE=y | ||
738 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
739 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
740 | # CONFIG_STACK_TRACER is not set | ||
741 | # CONFIG_KMEMTRACE is not set | ||
742 | # CONFIG_WORKQUEUE_TRACER is not set | ||
743 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
685 | # CONFIG_SAMPLES is not set | 744 | # CONFIG_SAMPLES is not set |
686 | # CONFIG_KMEMCHECK is not set | ||
687 | CONFIG_EARLY_PRINTK=y | 745 | CONFIG_EARLY_PRINTK=y |
688 | # CONFIG_HEART_BEAT is not set | 746 | # CONFIG_HEART_BEAT is not set |
689 | CONFIG_DEBUG_BOOTMEM=y | 747 | CONFIG_DEBUG_BOOTMEM=y |
@@ -694,7 +752,11 @@ CONFIG_DEBUG_BOOTMEM=y | |||
694 | # CONFIG_KEYS is not set | 752 | # CONFIG_KEYS is not set |
695 | # CONFIG_SECURITY is not set | 753 | # CONFIG_SECURITY is not set |
696 | # CONFIG_SECURITYFS is not set | 754 | # CONFIG_SECURITYFS is not set |
697 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 755 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
756 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
757 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
758 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
759 | CONFIG_DEFAULT_SECURITY="" | ||
698 | CONFIG_CRYPTO=y | 760 | CONFIG_CRYPTO=y |
699 | 761 | ||
700 | # | 762 | # |
diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig index adb839bab704..ce2da535246a 100644 --- a/arch/microblaze/configs/nommu_defconfig +++ b/arch/microblaze/configs/nommu_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.31 | 3 | # Linux kernel version: 2.6.33-rc6 |
4 | # Thu Sep 24 10:29:43 2009 | 4 | # Wed Feb 3 10:03:21 2010 |
5 | # | 5 | # |
6 | CONFIG_MICROBLAZE=y | 6 | CONFIG_MICROBLAZE=y |
7 | # CONFIG_SWAP is not set | 7 | # CONFIG_SWAP is not set |
@@ -19,8 +19,12 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
19 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 19 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
20 | CONFIG_GENERIC_GPIO=y | 20 | CONFIG_GENERIC_GPIO=y |
21 | CONFIG_GENERIC_CSUM=y | 21 | CONFIG_GENERIC_CSUM=y |
22 | CONFIG_STACKTRACE_SUPPORT=y | ||
23 | CONFIG_LOCKDEP_SUPPORT=y | ||
24 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
22 | # CONFIG_PCI is not set | 25 | # CONFIG_PCI is not set |
23 | CONFIG_NO_DMA=y | 26 | CONFIG_NO_DMA=y |
27 | CONFIG_DTC=y | ||
24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
25 | CONFIG_CONSTRUCTORS=y | 29 | CONFIG_CONSTRUCTORS=y |
26 | 30 | ||
@@ -46,6 +50,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y | |||
46 | # | 50 | # |
47 | CONFIG_TREE_RCU=y | 51 | CONFIG_TREE_RCU=y |
48 | # CONFIG_TREE_PREEMPT_RCU is not set | 52 | # CONFIG_TREE_PREEMPT_RCU is not set |
53 | # CONFIG_TINY_RCU is not set | ||
49 | # CONFIG_RCU_TRACE is not set | 54 | # CONFIG_RCU_TRACE is not set |
50 | CONFIG_RCU_FANOUT=32 | 55 | CONFIG_RCU_FANOUT=32 |
51 | # CONFIG_RCU_FANOUT_EXACT is not set | 56 | # CONFIG_RCU_FANOUT_EXACT is not set |
@@ -81,16 +86,16 @@ CONFIG_EVENTFD=y | |||
81 | CONFIG_AIO=y | 86 | CONFIG_AIO=y |
82 | 87 | ||
83 | # | 88 | # |
84 | # Performance Counters | 89 | # Kernel Performance Events And Counters |
85 | # | 90 | # |
86 | CONFIG_VM_EVENT_COUNTERS=y | 91 | CONFIG_VM_EVENT_COUNTERS=y |
87 | # CONFIG_STRIP_ASM_SYMS is not set | ||
88 | CONFIG_COMPAT_BRK=y | 92 | CONFIG_COMPAT_BRK=y |
89 | CONFIG_SLAB=y | 93 | CONFIG_SLAB=y |
90 | # CONFIG_SLUB is not set | 94 | # CONFIG_SLUB is not set |
91 | # CONFIG_SLOB is not set | 95 | # CONFIG_SLOB is not set |
96 | # CONFIG_MMAP_ALLOW_UNINITIALIZED is not set | ||
92 | # CONFIG_PROFILING is not set | 97 | # CONFIG_PROFILING is not set |
93 | # CONFIG_MARKERS is not set | 98 | CONFIG_HAVE_OPROFILE=y |
94 | 99 | ||
95 | # | 100 | # |
96 | # GCOV-based kernel profiling | 101 | # GCOV-based kernel profiling |
@@ -116,14 +121,41 @@ CONFIG_LBDAF=y | |||
116 | # IO Schedulers | 121 | # IO Schedulers |
117 | # | 122 | # |
118 | CONFIG_IOSCHED_NOOP=y | 123 | CONFIG_IOSCHED_NOOP=y |
119 | CONFIG_IOSCHED_AS=y | ||
120 | CONFIG_IOSCHED_DEADLINE=y | 124 | CONFIG_IOSCHED_DEADLINE=y |
121 | CONFIG_IOSCHED_CFQ=y | 125 | CONFIG_IOSCHED_CFQ=y |
122 | # CONFIG_DEFAULT_AS is not set | ||
123 | # CONFIG_DEFAULT_DEADLINE is not set | 126 | # CONFIG_DEFAULT_DEADLINE is not set |
124 | CONFIG_DEFAULT_CFQ=y | 127 | CONFIG_DEFAULT_CFQ=y |
125 | # CONFIG_DEFAULT_NOOP is not set | 128 | # CONFIG_DEFAULT_NOOP is not set |
126 | CONFIG_DEFAULT_IOSCHED="cfq" | 129 | CONFIG_DEFAULT_IOSCHED="cfq" |
130 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
131 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
132 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
133 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
134 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
135 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
136 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
137 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
138 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
139 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
140 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
141 | # CONFIG_INLINE_READ_LOCK is not set | ||
142 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
143 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
144 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
145 | CONFIG_INLINE_READ_UNLOCK=y | ||
146 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
147 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
148 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
149 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
150 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
151 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
152 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
153 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
154 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
155 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
156 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
157 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
158 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
127 | # CONFIG_FREEZER is not set | 159 | # CONFIG_FREEZER is not set |
128 | 160 | ||
129 | # | 161 | # |
@@ -132,7 +164,10 @@ CONFIG_DEFAULT_IOSCHED="cfq" | |||
132 | CONFIG_PLATFORM_GENERIC=y | 164 | CONFIG_PLATFORM_GENERIC=y |
133 | # CONFIG_SELFMOD is not set | 165 | # CONFIG_SELFMOD is not set |
134 | # CONFIG_OPT_LIB_FUNCTION is not set | 166 | # CONFIG_OPT_LIB_FUNCTION is not set |
135 | # CONFIG_ALLOW_EDIT_AUTO is not set | 167 | |
168 | # | ||
169 | # Definitions for MICROBLAZE0 | ||
170 | # | ||
136 | CONFIG_KERNEL_BASE_ADDR=0x90000000 | 171 | CONFIG_KERNEL_BASE_ADDR=0x90000000 |
137 | CONFIG_XILINX_MICROBLAZE0_FAMILY="virtex5" | 172 | CONFIG_XILINX_MICROBLAZE0_FAMILY="virtex5" |
138 | CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 | 173 | CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 |
@@ -190,7 +225,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
190 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 225 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
191 | CONFIG_ZONE_DMA_FLAG=0 | 226 | CONFIG_ZONE_DMA_FLAG=0 |
192 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
193 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
194 | CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 | 228 | CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 |
195 | 229 | ||
196 | # | 230 | # |
@@ -274,9 +308,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
274 | # CONFIG_AF_RXRPC is not set | 308 | # CONFIG_AF_RXRPC is not set |
275 | CONFIG_WIRELESS=y | 309 | CONFIG_WIRELESS=y |
276 | # CONFIG_CFG80211 is not set | 310 | # CONFIG_CFG80211 is not set |
277 | CONFIG_CFG80211_DEFAULT_PS_VALUE=0 | ||
278 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
279 | # CONFIG_WIRELESS_EXT is not set | ||
280 | # CONFIG_LIB80211 is not set | 311 | # CONFIG_LIB80211 is not set |
281 | 312 | ||
282 | # | 313 | # |
@@ -301,9 +332,9 @@ CONFIG_STANDALONE=y | |||
301 | # CONFIG_CONNECTOR is not set | 332 | # CONFIG_CONNECTOR is not set |
302 | CONFIG_MTD=y | 333 | CONFIG_MTD=y |
303 | # CONFIG_MTD_DEBUG is not set | 334 | # CONFIG_MTD_DEBUG is not set |
335 | # CONFIG_MTD_TESTS is not set | ||
304 | CONFIG_MTD_CONCAT=y | 336 | CONFIG_MTD_CONCAT=y |
305 | CONFIG_MTD_PARTITIONS=y | 337 | CONFIG_MTD_PARTITIONS=y |
306 | # CONFIG_MTD_TESTS is not set | ||
307 | # CONFIG_MTD_REDBOOT_PARTS is not set | 338 | # CONFIG_MTD_REDBOOT_PARTS is not set |
308 | CONFIG_MTD_CMDLINE_PARTS=y | 339 | CONFIG_MTD_CMDLINE_PARTS=y |
309 | # CONFIG_MTD_OF_PARTS is not set | 340 | # CONFIG_MTD_OF_PARTS is not set |
@@ -387,6 +418,10 @@ CONFIG_OF_DEVICE=y | |||
387 | CONFIG_BLK_DEV=y | 418 | CONFIG_BLK_DEV=y |
388 | # CONFIG_BLK_DEV_COW_COMMON is not set | 419 | # CONFIG_BLK_DEV_COW_COMMON is not set |
389 | # CONFIG_BLK_DEV_LOOP is not set | 420 | # CONFIG_BLK_DEV_LOOP is not set |
421 | |||
422 | # | ||
423 | # DRBD disabled because PROC_FS, INET or CONNECTOR not selected | ||
424 | # | ||
390 | CONFIG_BLK_DEV_NBD=y | 425 | CONFIG_BLK_DEV_NBD=y |
391 | CONFIG_BLK_DEV_RAM=y | 426 | CONFIG_BLK_DEV_RAM=y |
392 | CONFIG_BLK_DEV_RAM_COUNT=16 | 427 | CONFIG_BLK_DEV_RAM_COUNT=16 |
@@ -423,7 +458,6 @@ CONFIG_NETDEVICES=y | |||
423 | # CONFIG_PHYLIB is not set | 458 | # CONFIG_PHYLIB is not set |
424 | CONFIG_NET_ETHERNET=y | 459 | CONFIG_NET_ETHERNET=y |
425 | # CONFIG_MII is not set | 460 | # CONFIG_MII is not set |
426 | # CONFIG_ETHOC is not set | ||
427 | # CONFIG_DNET is not set | 461 | # CONFIG_DNET is not set |
428 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 462 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
429 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 463 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
@@ -433,12 +467,12 @@ CONFIG_NET_ETHERNET=y | |||
433 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 467 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
434 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 468 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
435 | # CONFIG_KS8842 is not set | 469 | # CONFIG_KS8842 is not set |
470 | # CONFIG_KS8851_MLL is not set | ||
436 | # CONFIG_XILINX_EMACLITE is not set | 471 | # CONFIG_XILINX_EMACLITE is not set |
437 | CONFIG_NETDEV_1000=y | 472 | CONFIG_NETDEV_1000=y |
438 | CONFIG_NETDEV_10000=y | 473 | CONFIG_NETDEV_10000=y |
439 | CONFIG_WLAN=y | 474 | CONFIG_WLAN=y |
440 | # CONFIG_WLAN_PRE80211 is not set | 475 | # CONFIG_HOSTAP is not set |
441 | # CONFIG_WLAN_80211 is not set | ||
442 | 476 | ||
443 | # | 477 | # |
444 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 478 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -482,6 +516,7 @@ CONFIG_SERIAL_UARTLITE=y | |||
482 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | 516 | CONFIG_SERIAL_UARTLITE_CONSOLE=y |
483 | CONFIG_SERIAL_CORE=y | 517 | CONFIG_SERIAL_CORE=y |
484 | CONFIG_SERIAL_CORE_CONSOLE=y | 518 | CONFIG_SERIAL_CORE_CONSOLE=y |
519 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
485 | CONFIG_UNIX98_PTYS=y | 520 | CONFIG_UNIX98_PTYS=y |
486 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 521 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
487 | CONFIG_LEGACY_PTYS=y | 522 | CONFIG_LEGACY_PTYS=y |
@@ -508,7 +543,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
508 | # CONFIG_POWER_SUPPLY is not set | 543 | # CONFIG_POWER_SUPPLY is not set |
509 | # CONFIG_HWMON is not set | 544 | # CONFIG_HWMON is not set |
510 | # CONFIG_THERMAL is not set | 545 | # CONFIG_THERMAL is not set |
511 | # CONFIG_THERMAL_HWMON is not set | ||
512 | # CONFIG_WATCHDOG is not set | 546 | # CONFIG_WATCHDOG is not set |
513 | 547 | ||
514 | # | 548 | # |
@@ -616,7 +650,6 @@ CONFIG_INOTIFY_USER=y | |||
616 | CONFIG_PROC_FS=y | 650 | CONFIG_PROC_FS=y |
617 | CONFIG_PROC_SYSCTL=y | 651 | CONFIG_PROC_SYSCTL=y |
618 | CONFIG_SYSFS=y | 652 | CONFIG_SYSFS=y |
619 | # CONFIG_TMPFS is not set | ||
620 | # CONFIG_HUGETLB_PAGE is not set | 653 | # CONFIG_HUGETLB_PAGE is not set |
621 | # CONFIG_CONFIGFS_FS is not set | 654 | # CONFIG_CONFIGFS_FS is not set |
622 | CONFIG_MISC_FILESYSTEMS=y | 655 | CONFIG_MISC_FILESYSTEMS=y |
@@ -672,11 +705,13 @@ CONFIG_MSDOS_PARTITION=y | |||
672 | # | 705 | # |
673 | # Kernel hacking | 706 | # Kernel hacking |
674 | # | 707 | # |
708 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
675 | # CONFIG_PRINTK_TIME is not set | 709 | # CONFIG_PRINTK_TIME is not set |
676 | CONFIG_ENABLE_WARN_DEPRECATED=y | 710 | CONFIG_ENABLE_WARN_DEPRECATED=y |
677 | CONFIG_ENABLE_MUST_CHECK=y | 711 | CONFIG_ENABLE_MUST_CHECK=y |
678 | CONFIG_FRAME_WARN=1024 | 712 | CONFIG_FRAME_WARN=1024 |
679 | # CONFIG_MAGIC_SYSRQ is not set | 713 | # CONFIG_MAGIC_SYSRQ is not set |
714 | # CONFIG_STRIP_ASM_SYMS is not set | ||
680 | CONFIG_UNUSED_SYMBOLS=y | 715 | CONFIG_UNUSED_SYMBOLS=y |
681 | CONFIG_DEBUG_FS=y | 716 | CONFIG_DEBUG_FS=y |
682 | # CONFIG_HEADERS_CHECK is not set | 717 | # CONFIG_HEADERS_CHECK is not set |
@@ -695,12 +730,16 @@ CONFIG_DEBUG_OBJECTS=y | |||
695 | CONFIG_DEBUG_OBJECTS_SELFTEST=y | 730 | CONFIG_DEBUG_OBJECTS_SELFTEST=y |
696 | CONFIG_DEBUG_OBJECTS_FREE=y | 731 | CONFIG_DEBUG_OBJECTS_FREE=y |
697 | CONFIG_DEBUG_OBJECTS_TIMERS=y | 732 | CONFIG_DEBUG_OBJECTS_TIMERS=y |
733 | # CONFIG_DEBUG_OBJECTS_WORK is not set | ||
698 | CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 | 734 | CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 |
699 | # CONFIG_DEBUG_SLAB is not set | 735 | # CONFIG_DEBUG_SLAB is not set |
700 | # CONFIG_DEBUG_RT_MUTEXES is not set | 736 | # CONFIG_DEBUG_RT_MUTEXES is not set |
701 | # CONFIG_RT_MUTEX_TESTER is not set | 737 | # CONFIG_RT_MUTEX_TESTER is not set |
702 | # CONFIG_DEBUG_SPINLOCK is not set | 738 | # CONFIG_DEBUG_SPINLOCK is not set |
703 | # CONFIG_DEBUG_MUTEXES is not set | 739 | # CONFIG_DEBUG_MUTEXES is not set |
740 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
741 | # CONFIG_PROVE_LOCKING is not set | ||
742 | # CONFIG_LOCK_STAT is not set | ||
704 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 743 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
705 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 744 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
706 | # CONFIG_DEBUG_KOBJECT is not set | 745 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -720,8 +759,28 @@ CONFIG_DEBUG_SG=y | |||
720 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 759 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
721 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | 760 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set |
722 | # CONFIG_FAULT_INJECTION is not set | 761 | # CONFIG_FAULT_INJECTION is not set |
762 | # CONFIG_LATENCYTOP is not set | ||
723 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 763 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
724 | # CONFIG_PAGE_POISONING is not set | 764 | # CONFIG_PAGE_POISONING is not set |
765 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
766 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
767 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y | ||
768 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
769 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
770 | CONFIG_TRACING_SUPPORT=y | ||
771 | CONFIG_FTRACE=y | ||
772 | # CONFIG_FUNCTION_TRACER is not set | ||
773 | # CONFIG_IRQSOFF_TRACER is not set | ||
774 | # CONFIG_SCHED_TRACER is not set | ||
775 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set | ||
776 | # CONFIG_BOOT_TRACER is not set | ||
777 | CONFIG_BRANCH_PROFILE_NONE=y | ||
778 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
779 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
780 | # CONFIG_STACK_TRACER is not set | ||
781 | # CONFIG_KMEMTRACE is not set | ||
782 | # CONFIG_WORKQUEUE_TRACER is not set | ||
783 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
725 | # CONFIG_DYNAMIC_DEBUG is not set | 784 | # CONFIG_DYNAMIC_DEBUG is not set |
726 | # CONFIG_SAMPLES is not set | 785 | # CONFIG_SAMPLES is not set |
727 | CONFIG_EARLY_PRINTK=y | 786 | CONFIG_EARLY_PRINTK=y |
@@ -734,7 +793,11 @@ CONFIG_EARLY_PRINTK=y | |||
734 | # CONFIG_KEYS is not set | 793 | # CONFIG_KEYS is not set |
735 | # CONFIG_SECURITY is not set | 794 | # CONFIG_SECURITY is not set |
736 | # CONFIG_SECURITYFS is not set | 795 | # CONFIG_SECURITYFS is not set |
737 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 796 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
797 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
798 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
799 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
800 | CONFIG_DEFAULT_SECURITY="" | ||
738 | CONFIG_CRYPTO=y | 801 | CONFIG_CRYPTO=y |
739 | 802 | ||
740 | # | 803 | # |
diff --git a/arch/microblaze/kernel/entry-nommu.S b/arch/microblaze/kernel/entry-nommu.S index 95b0855802df..391d6197fc3b 100644 --- a/arch/microblaze/kernel/entry-nommu.S +++ b/arch/microblaze/kernel/entry-nommu.S | |||
@@ -122,7 +122,7 @@ ENTRY(_interrupt) | |||
122 | 122 | ||
123 | ret_from_intr: | 123 | ret_from_intr: |
124 | lwi r11, r1, PT_MODE | 124 | lwi r11, r1, PT_MODE |
125 | bneid r11, 3f | 125 | bneid r11, no_intr_resched |
126 | 126 | ||
127 | lwi r6, r31, TS_THREAD_INFO /* get thread info */ | 127 | lwi r6, r31, TS_THREAD_INFO /* get thread info */ |
128 | lwi r19, r6, TI_FLAGS /* get flags in thread info */ | 128 | lwi r19, r6, TI_FLAGS /* get flags in thread info */ |
@@ -133,16 +133,18 @@ ret_from_intr: | |||
133 | bralid r15, schedule | 133 | bralid r15, schedule |
134 | nop | 134 | nop |
135 | 1: andi r11, r19, _TIF_SIGPENDING | 135 | 1: andi r11, r19, _TIF_SIGPENDING |
136 | beqid r11, no_intr_reshed | 136 | beqid r11, no_intr_resched |
137 | addk r5, r1, r0 | 137 | addk r5, r1, r0 |
138 | addk r7, r0, r0 | 138 | addk r7, r0, r0 |
139 | bralid r15, do_signal | 139 | bralid r15, do_signal |
140 | addk r6, r0, r0 | 140 | addk r6, r0, r0 |
141 | 141 | ||
142 | no_intr_reshed: | 142 | no_intr_resched: |
143 | /* Disable interrupts, we are now committed to the state restore */ | ||
144 | disable_irq | ||
145 | |||
143 | /* save mode indicator */ | 146 | /* save mode indicator */ |
144 | lwi r11, r1, PT_MODE | 147 | lwi r11, r1, PT_MODE |
145 | 3: | ||
146 | swi r11, r0, PER_CPU(KM) | 148 | swi r11, r0, PER_CPU(KM) |
147 | 149 | ||
148 | /* save r31 */ | 150 | /* save r31 */ |
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c index 5c68569344c1..f9201ca2295b 100644 --- a/arch/mips/alchemy/common/dbdma.c +++ b/arch/mips/alchemy/common/dbdma.c | |||
@@ -412,8 +412,11 @@ u32 au1xxx_dbdma_ring_alloc(u32 chanid, int entries) | |||
412 | if (desc_base == 0) | 412 | if (desc_base == 0) |
413 | return 0; | 413 | return 0; |
414 | 414 | ||
415 | ctp->cdb_membase = desc_base; | ||
415 | desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); | 416 | desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); |
416 | } | 417 | } else |
418 | ctp->cdb_membase = desc_base; | ||
419 | |||
417 | dp = (au1x_ddma_desc_t *)desc_base; | 420 | dp = (au1x_ddma_desc_t *)desc_base; |
418 | 421 | ||
419 | /* Keep track of the base descriptor. */ | 422 | /* Keep track of the base descriptor. */ |
@@ -831,7 +834,7 @@ void au1xxx_dbdma_chan_free(u32 chanid) | |||
831 | 834 | ||
832 | au1xxx_dbdma_stop(chanid); | 835 | au1xxx_dbdma_stop(chanid); |
833 | 836 | ||
834 | kfree((void *)ctp->chan_desc_base); | 837 | kfree((void *)ctp->cdb_membase); |
835 | 838 | ||
836 | stp->dev_flags &= ~DEV_FLAGS_INUSE; | 839 | stp->dev_flags &= ~DEV_FLAGS_INUSE; |
837 | dtp->dev_flags &= ~DEV_FLAGS_INUSE; | 840 | dtp->dev_flags &= ~DEV_FLAGS_INUSE; |
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c index 85169c08d8dc..f70a10a8cc96 100644 --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c | |||
@@ -202,7 +202,7 @@ static struct resource usb_res[] = { | |||
202 | .name = "mem", | 202 | .name = "mem", |
203 | .flags = IORESOURCE_MEM, | 203 | .flags = IORESOURCE_MEM, |
204 | .start = 0x03400000, | 204 | .start = 0x03400000, |
205 | .end = 0x034001fff, | 205 | .end = 0x03401fff, |
206 | }, | 206 | }, |
207 | }; | 207 | }; |
208 | 208 | ||
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h index 1f4df647c384..272c5ef35bbb 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h | |||
@@ -191,6 +191,9 @@ | |||
191 | # ifndef cpu_has_64bit_addresses | 191 | # ifndef cpu_has_64bit_addresses |
192 | # define cpu_has_64bit_addresses 0 | 192 | # define cpu_has_64bit_addresses 0 |
193 | # endif | 193 | # endif |
194 | # ifndef cpu_vmbits | ||
195 | # define cpu_vmbits 31 | ||
196 | # endif | ||
194 | #endif | 197 | #endif |
195 | 198 | ||
196 | #ifdef CONFIG_64BIT | 199 | #ifdef CONFIG_64BIT |
@@ -209,6 +212,10 @@ | |||
209 | # ifndef cpu_has_64bit_addresses | 212 | # ifndef cpu_has_64bit_addresses |
210 | # define cpu_has_64bit_addresses 1 | 213 | # define cpu_has_64bit_addresses 1 |
211 | # endif | 214 | # endif |
215 | # ifndef cpu_vmbits | ||
216 | # define cpu_vmbits cpu_data[0].vmbits | ||
217 | # define __NEED_VMBITS_PROBE | ||
218 | # endif | ||
212 | #endif | 219 | #endif |
213 | 220 | ||
214 | #if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint) | 221 | #if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint) |
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h index 126044308dec..b39def3f6e03 100644 --- a/arch/mips/include/asm/cpu-info.h +++ b/arch/mips/include/asm/cpu-info.h | |||
@@ -58,6 +58,9 @@ struct cpuinfo_mips { | |||
58 | struct cache_desc tcache; /* Tertiary/split secondary cache */ | 58 | struct cache_desc tcache; /* Tertiary/split secondary cache */ |
59 | int srsets; /* Shadow register sets */ | 59 | int srsets; /* Shadow register sets */ |
60 | int core; /* physical core number */ | 60 | int core; /* physical core number */ |
61 | #ifdef CONFIG_64BIT | ||
62 | int vmbits; /* Virtual memory size in bits */ | ||
63 | #endif | ||
61 | #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC) | 64 | #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC) |
62 | /* | 65 | /* |
63 | * In the MIPS MT "SMTC" model, each TC is considered | 66 | * In the MIPS MT "SMTC" model, each TC is considered |
diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h index 06f68f43800a..d206000fbfe2 100644 --- a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h +++ b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | |||
@@ -305,6 +305,7 @@ typedef struct dbdma_chan_config { | |||
305 | dbdev_tab_t *chan_dest; | 305 | dbdev_tab_t *chan_dest; |
306 | au1x_dma_chan_t *chan_ptr; | 306 | au1x_dma_chan_t *chan_ptr; |
307 | au1x_ddma_desc_t *chan_desc_base; | 307 | au1x_ddma_desc_t *chan_desc_base; |
308 | u32 cdb_membase; /* kmalloc base of above */ | ||
308 | au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; | 309 | au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; |
309 | void *chan_callparam; | 310 | void *chan_callparam; |
310 | void (*chan_callback)(int, void *); | 311 | void (*chan_callback)(int, void *); |
diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h index 9cd508993956..8eda30b467da 100644 --- a/arch/mips/include/asm/pgtable-64.h +++ b/arch/mips/include/asm/pgtable-64.h | |||
@@ -110,7 +110,9 @@ | |||
110 | #define VMALLOC_START MAP_BASE | 110 | #define VMALLOC_START MAP_BASE |
111 | #define VMALLOC_END \ | 111 | #define VMALLOC_END \ |
112 | (VMALLOC_START + \ | 112 | (VMALLOC_START + \ |
113 | PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE - (1UL << 32)) | 113 | min(PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE, \ |
114 | (1UL << cpu_vmbits)) - (1UL << 32)) | ||
115 | |||
114 | #if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \ | 116 | #if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \ |
115 | VMALLOC_START != CKSSEG | 117 | VMALLOC_START != CKSSEG |
116 | /* Load modules into 32bit-compatible segment. */ | 118 | /* Load modules into 32bit-compatible segment. */ |
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 80e202eca056..9c187a64649b 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -284,6 +284,15 @@ static inline int __cpu_has_fpu(void) | |||
284 | return ((cpu_get_fpu_id() & 0xff00) != FPIR_IMP_NONE); | 284 | return ((cpu_get_fpu_id() & 0xff00) != FPIR_IMP_NONE); |
285 | } | 285 | } |
286 | 286 | ||
287 | static inline void cpu_probe_vmbits(struct cpuinfo_mips *c) | ||
288 | { | ||
289 | #ifdef __NEED_VMBITS_PROBE | ||
290 | write_c0_entryhi(0x3ffffffffffff000ULL); | ||
291 | back_to_back_c0_hazard(); | ||
292 | c->vmbits = fls64(read_c0_entryhi() & 0x3ffffffffffff000ULL); | ||
293 | #endif | ||
294 | } | ||
295 | |||
287 | #define R4K_OPTS (MIPS_CPU_TLB | MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE \ | 296 | #define R4K_OPTS (MIPS_CPU_TLB | MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE \ |
288 | | MIPS_CPU_COUNTER) | 297 | | MIPS_CPU_COUNTER) |
289 | 298 | ||
@@ -969,6 +978,8 @@ __cpuinit void cpu_probe(void) | |||
969 | c->srsets = ((read_c0_srsctl() >> 26) & 0x0f) + 1; | 978 | c->srsets = ((read_c0_srsctl() >> 26) & 0x0f) + 1; |
970 | else | 979 | else |
971 | c->srsets = 1; | 980 | c->srsets = 1; |
981 | |||
982 | cpu_probe_vmbits(c); | ||
972 | } | 983 | } |
973 | 984 | ||
974 | __cpuinit void cpu_report(void) | 985 | __cpuinit void cpu_report(void) |
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig index 173a5bb77ca1..8e95f8d227b9 100644 --- a/arch/powerpc/configs/40x/acadia_defconfig +++ b/arch/powerpc/configs/40x/acadia_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:17:46 2009 | 4 | # Mon Jan 4 15:33:07 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | CONFIG_40x=y | 14 | CONFIG_40x=y |
@@ -16,6 +16,7 @@ CONFIG_40x=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_4xx=y | 17 | CONFIG_4xx=y |
18 | CONFIG_PPC_MMU_NOHASH=y | 18 | CONFIG_PPC_MMU_NOHASH=y |
19 | CONFIG_PPC_MMU_NOHASH_32=y | ||
19 | # CONFIG_PPC_MM_SLICES is not set | 20 | # CONFIG_PPC_MM_SLICES is not set |
20 | CONFIG_NOT_COHERENT_CACHE=y | 21 | CONFIG_NOT_COHERENT_CACHE=y |
21 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
@@ -27,15 +28,18 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 28 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 29 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
31 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_NR_IRQS=512 | ||
32 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
38 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 39 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 41 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 42 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
@@ -49,11 +53,15 @@ CONFIG_PPC_UDBG_16550=y | |||
49 | # CONFIG_GENERIC_TBSYNC is not set | 53 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 54 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
56 | CONFIG_DTC=y | ||
52 | # CONFIG_DEFAULT_UIMAGE is not set | 57 | # CONFIG_DEFAULT_UIMAGE is not set |
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
53 | CONFIG_PPC_DCR_NATIVE=y | 59 | CONFIG_PPC_DCR_NATIVE=y |
54 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_PPC_DCR=y | 61 | CONFIG_PPC_DCR=y |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
64 | CONFIG_CONSTRUCTORS=y | ||
57 | 65 | ||
58 | # | 66 | # |
59 | # General setup | 67 | # General setup |
@@ -67,9 +75,21 @@ CONFIG_SWAP=y | |||
67 | CONFIG_SYSVIPC=y | 75 | CONFIG_SYSVIPC=y |
68 | CONFIG_SYSVIPC_SYSCTL=y | 76 | CONFIG_SYSVIPC_SYSCTL=y |
69 | CONFIG_POSIX_MQUEUE=y | 77 | CONFIG_POSIX_MQUEUE=y |
78 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
70 | # CONFIG_BSD_PROCESS_ACCT is not set | 79 | # CONFIG_BSD_PROCESS_ACCT is not set |
71 | # CONFIG_TASKSTATS is not set | 80 | # CONFIG_TASKSTATS is not set |
72 | # CONFIG_AUDIT is not set | 81 | # CONFIG_AUDIT is not set |
82 | |||
83 | # | ||
84 | # RCU Subsystem | ||
85 | # | ||
86 | CONFIG_TREE_RCU=y | ||
87 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
88 | # CONFIG_TINY_RCU is not set | ||
89 | # CONFIG_RCU_TRACE is not set | ||
90 | CONFIG_RCU_FANOUT=32 | ||
91 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
92 | # CONFIG_TREE_RCU_TRACE is not set | ||
73 | # CONFIG_IKCONFIG is not set | 93 | # CONFIG_IKCONFIG is not set |
74 | CONFIG_LOG_BUF_SHIFT=14 | 94 | CONFIG_LOG_BUF_SHIFT=14 |
75 | CONFIG_GROUP_SCHED=y | 95 | CONFIG_GROUP_SCHED=y |
@@ -84,31 +104,40 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
84 | # CONFIG_NAMESPACES is not set | 104 | # CONFIG_NAMESPACES is not set |
85 | CONFIG_BLK_DEV_INITRD=y | 105 | CONFIG_BLK_DEV_INITRD=y |
86 | CONFIG_INITRAMFS_SOURCE="" | 106 | CONFIG_INITRAMFS_SOURCE="" |
107 | CONFIG_RD_GZIP=y | ||
108 | # CONFIG_RD_BZIP2 is not set | ||
109 | # CONFIG_RD_LZMA is not set | ||
87 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 110 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
88 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
112 | CONFIG_ANON_INODES=y | ||
89 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_KALLSYMS=y | 115 | CONFIG_KALLSYMS=y |
92 | CONFIG_KALLSYMS_ALL=y | 116 | CONFIG_KALLSYMS_ALL=y |
93 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 117 | CONFIG_KALLSYMS_EXTRA_PASS=y |
95 | CONFIG_HOTPLUG=y | 118 | CONFIG_HOTPLUG=y |
96 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
97 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
98 | CONFIG_ELF_CORE=y | 121 | CONFIG_ELF_CORE=y |
99 | CONFIG_COMPAT_BRK=y | ||
100 | CONFIG_BASE_FULL=y | 122 | CONFIG_BASE_FULL=y |
101 | CONFIG_FUTEX=y | 123 | CONFIG_FUTEX=y |
102 | CONFIG_ANON_INODES=y | ||
103 | CONFIG_EPOLL=y | 124 | CONFIG_EPOLL=y |
104 | CONFIG_SIGNALFD=y | 125 | CONFIG_SIGNALFD=y |
105 | CONFIG_TIMERFD=y | 126 | CONFIG_TIMERFD=y |
106 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
107 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
108 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_EVENTS=y | ||
131 | |||
132 | # | ||
133 | # Kernel Performance Events And Counters | ||
134 | # | ||
135 | # CONFIG_PERF_EVENTS is not set | ||
136 | # CONFIG_PERF_COUNTERS is not set | ||
109 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
110 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
111 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
140 | CONFIG_COMPAT_BRK=y | ||
112 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
113 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
114 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
@@ -120,6 +149,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
120 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
154 | |||
155 | # | ||
156 | # GCOV-based kernel profiling | ||
157 | # | ||
158 | # CONFIG_GCOV_KERNEL is not set | ||
159 | # CONFIG_SLOW_WORK is not set | ||
123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 160 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
124 | CONFIG_SLABINFO=y | 161 | CONFIG_SLABINFO=y |
125 | CONFIG_RT_MUTEXES=y | 162 | CONFIG_RT_MUTEXES=y |
@@ -131,8 +168,7 @@ CONFIG_MODULE_UNLOAD=y | |||
131 | # CONFIG_MODVERSIONS is not set | 168 | # CONFIG_MODVERSIONS is not set |
132 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 169 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
133 | CONFIG_BLOCK=y | 170 | CONFIG_BLOCK=y |
134 | CONFIG_LBD=y | 171 | CONFIG_LBDAF=y |
135 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
136 | # CONFIG_BLK_DEV_BSG is not set | 172 | # CONFIG_BLK_DEV_BSG is not set |
137 | # CONFIG_BLK_DEV_INTEGRITY is not set | 173 | # CONFIG_BLK_DEV_INTEGRITY is not set |
138 | 174 | ||
@@ -140,19 +176,41 @@ CONFIG_LBD=y | |||
140 | # IO Schedulers | 176 | # IO Schedulers |
141 | # | 177 | # |
142 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
143 | CONFIG_IOSCHED_AS=y | ||
144 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
145 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
146 | CONFIG_DEFAULT_AS=y | ||
147 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
148 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
149 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
150 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
151 | CONFIG_CLASSIC_RCU=y | 185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
152 | # CONFIG_TREE_RCU is not set | 186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
153 | # CONFIG_PREEMPT_RCU is not set | 187 | # CONFIG_INLINE_SPIN_LOCK is not set |
154 | # CONFIG_TREE_RCU_TRACE is not set | 188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
155 | # CONFIG_PREEMPT_RCU_TRACE is not set | 189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
156 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
157 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 215 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
158 | 216 | ||
@@ -166,6 +224,7 @@ CONFIG_CLASSIC_RCU=y | |||
166 | CONFIG_ACADIA=y | 224 | CONFIG_ACADIA=y |
167 | # CONFIG_EP405 is not set | 225 | # CONFIG_EP405 is not set |
168 | # CONFIG_HCU4 is not set | 226 | # CONFIG_HCU4 is not set |
227 | # CONFIG_HOTFOOT is not set | ||
169 | # CONFIG_KILAUEA is not set | 228 | # CONFIG_KILAUEA is not set |
170 | # CONFIG_MAKALU is not set | 229 | # CONFIG_MAKALU is not set |
171 | # CONFIG_WALNUT is not set | 230 | # CONFIG_WALNUT is not set |
@@ -208,10 +267,12 @@ CONFIG_BINFMT_ELF=y | |||
208 | # CONFIG_BINFMT_MISC is not set | 267 | # CONFIG_BINFMT_MISC is not set |
209 | # CONFIG_MATH_EMULATION is not set | 268 | # CONFIG_MATH_EMULATION is not set |
210 | # CONFIG_IOMMU_HELPER is not set | 269 | # CONFIG_IOMMU_HELPER is not set |
211 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 270 | # CONFIG_SWIOTLB is not set |
212 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 271 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
213 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 272 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
214 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 273 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
274 | CONFIG_SPARSE_IRQ=y | ||
275 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
215 | CONFIG_ARCH_FLATMEM_ENABLE=y | 276 | CONFIG_ARCH_FLATMEM_ENABLE=y |
216 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 277 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
217 | CONFIG_SELECT_MEMORY_MODEL=y | 278 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -227,10 +288,12 @@ CONFIG_MIGRATION=y | |||
227 | CONFIG_ZONE_DMA_FLAG=1 | 288 | CONFIG_ZONE_DMA_FLAG=1 |
228 | CONFIG_BOUNCE=y | 289 | CONFIG_BOUNCE=y |
229 | CONFIG_VIRT_TO_BUS=y | 290 | CONFIG_VIRT_TO_BUS=y |
230 | CONFIG_UNEVICTABLE_LRU=y | 291 | # CONFIG_KSM is not set |
292 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
231 | CONFIG_PPC_4K_PAGES=y | 293 | CONFIG_PPC_4K_PAGES=y |
232 | # CONFIG_PPC_16K_PAGES is not set | 294 | # CONFIG_PPC_16K_PAGES is not set |
233 | # CONFIG_PPC_64K_PAGES is not set | 295 | # CONFIG_PPC_64K_PAGES is not set |
296 | # CONFIG_PPC_256K_PAGES is not set | ||
234 | CONFIG_FORCE_MAX_ZONEORDER=11 | 297 | CONFIG_FORCE_MAX_ZONEORDER=11 |
235 | CONFIG_PROC_DEVICETREE=y | 298 | CONFIG_PROC_DEVICETREE=y |
236 | # CONFIG_CMDLINE_BOOL is not set | 299 | # CONFIG_CMDLINE_BOOL is not set |
@@ -255,6 +318,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
255 | # CONFIG_PCI_LEGACY is not set | 318 | # CONFIG_PCI_LEGACY is not set |
256 | # CONFIG_PCI_DEBUG is not set | 319 | # CONFIG_PCI_DEBUG is not set |
257 | # CONFIG_PCI_STUB is not set | 320 | # CONFIG_PCI_STUB is not set |
321 | # CONFIG_PCI_IOV is not set | ||
258 | # CONFIG_PCCARD is not set | 322 | # CONFIG_PCCARD is not set |
259 | # CONFIG_HOTPLUG_PCI is not set | 323 | # CONFIG_HOTPLUG_PCI is not set |
260 | # CONFIG_HAS_RAPIDIO is not set | 324 | # CONFIG_HAS_RAPIDIO is not set |
@@ -272,14 +336,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
272 | CONFIG_KERNEL_START=0xc0000000 | 336 | CONFIG_KERNEL_START=0xc0000000 |
273 | CONFIG_PHYSICAL_START=0x00000000 | 337 | CONFIG_PHYSICAL_START=0x00000000 |
274 | CONFIG_TASK_SIZE=0xc0000000 | 338 | CONFIG_TASK_SIZE=0xc0000000 |
275 | CONFIG_CONSISTENT_START=0xff100000 | ||
276 | CONFIG_CONSISTENT_SIZE=0x00200000 | 339 | CONFIG_CONSISTENT_SIZE=0x00200000 |
277 | CONFIG_NET=y | 340 | CONFIG_NET=y |
278 | 341 | ||
279 | # | 342 | # |
280 | # Networking options | 343 | # Networking options |
281 | # | 344 | # |
282 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
283 | CONFIG_PACKET=y | 345 | CONFIG_PACKET=y |
284 | # CONFIG_PACKET_MMAP is not set | 346 | # CONFIG_PACKET_MMAP is not set |
285 | CONFIG_UNIX=y | 347 | CONFIG_UNIX=y |
@@ -316,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
316 | # CONFIG_NETFILTER is not set | 378 | # CONFIG_NETFILTER is not set |
317 | # CONFIG_IP_DCCP is not set | 379 | # CONFIG_IP_DCCP is not set |
318 | # CONFIG_IP_SCTP is not set | 380 | # CONFIG_IP_SCTP is not set |
381 | # CONFIG_RDS is not set | ||
319 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
320 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
321 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
@@ -329,6 +392,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
329 | # CONFIG_LAPB is not set | 392 | # CONFIG_LAPB is not set |
330 | # CONFIG_ECONET is not set | 393 | # CONFIG_ECONET is not set |
331 | # CONFIG_WAN_ROUTER is not set | 394 | # CONFIG_WAN_ROUTER is not set |
395 | # CONFIG_PHONET is not set | ||
396 | # CONFIG_IEEE802154 is not set | ||
332 | # CONFIG_NET_SCHED is not set | 397 | # CONFIG_NET_SCHED is not set |
333 | # CONFIG_DCB is not set | 398 | # CONFIG_DCB is not set |
334 | 399 | ||
@@ -341,8 +406,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
341 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
342 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
343 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
344 | # CONFIG_PHONET is not set | 409 | CONFIG_WIRELESS=y |
345 | # CONFIG_WIRELESS is not set | 410 | # CONFIG_CFG80211 is not set |
411 | # CONFIG_LIB80211 is not set | ||
412 | |||
413 | # | ||
414 | # CFG80211 needs to be enabled for MAC80211 | ||
415 | # | ||
346 | # CONFIG_WIMAX is not set | 416 | # CONFIG_WIMAX is not set |
347 | # CONFIG_RFKILL is not set | 417 | # CONFIG_RFKILL is not set |
348 | # CONFIG_NET_9P is not set | 418 | # CONFIG_NET_9P is not set |
@@ -355,6 +425,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
355 | # Generic Driver Options | 425 | # Generic Driver Options |
356 | # | 426 | # |
357 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 427 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
428 | # CONFIG_DEVTMPFS is not set | ||
358 | CONFIG_STANDALONE=y | 429 | CONFIG_STANDALONE=y |
359 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 430 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
360 | CONFIG_FW_LOADER=y | 431 | CONFIG_FW_LOADER=y |
@@ -367,9 +438,9 @@ CONFIG_CONNECTOR=y | |||
367 | CONFIG_PROC_EVENTS=y | 438 | CONFIG_PROC_EVENTS=y |
368 | CONFIG_MTD=y | 439 | CONFIG_MTD=y |
369 | # CONFIG_MTD_DEBUG is not set | 440 | # CONFIG_MTD_DEBUG is not set |
441 | # CONFIG_MTD_TESTS is not set | ||
370 | # CONFIG_MTD_CONCAT is not set | 442 | # CONFIG_MTD_CONCAT is not set |
371 | CONFIG_MTD_PARTITIONS=y | 443 | CONFIG_MTD_PARTITIONS=y |
372 | # CONFIG_MTD_TESTS is not set | ||
373 | # CONFIG_MTD_REDBOOT_PARTS is not set | 444 | # CONFIG_MTD_REDBOOT_PARTS is not set |
374 | CONFIG_MTD_CMDLINE_PARTS=y | 445 | CONFIG_MTD_CMDLINE_PARTS=y |
375 | CONFIG_MTD_OF_PARTS=y | 446 | CONFIG_MTD_OF_PARTS=y |
@@ -445,7 +516,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
445 | # LPDDR flash memory drivers | 516 | # LPDDR flash memory drivers |
446 | # | 517 | # |
447 | # CONFIG_MTD_LPDDR is not set | 518 | # CONFIG_MTD_LPDDR is not set |
448 | # CONFIG_MTD_QINFO_PROBE is not set | ||
449 | 519 | ||
450 | # | 520 | # |
451 | # UBI - Unsorted block images | 521 | # UBI - Unsorted block images |
@@ -461,6 +531,7 @@ CONFIG_BLK_DEV=y | |||
461 | # CONFIG_BLK_DEV_UMEM is not set | 531 | # CONFIG_BLK_DEV_UMEM is not set |
462 | # CONFIG_BLK_DEV_COW_COMMON is not set | 532 | # CONFIG_BLK_DEV_COW_COMMON is not set |
463 | # CONFIG_BLK_DEV_LOOP is not set | 533 | # CONFIG_BLK_DEV_LOOP is not set |
534 | # CONFIG_BLK_DEV_DRBD is not set | ||
464 | # CONFIG_BLK_DEV_NBD is not set | 535 | # CONFIG_BLK_DEV_NBD is not set |
465 | # CONFIG_BLK_DEV_SX8 is not set | 536 | # CONFIG_BLK_DEV_SX8 is not set |
466 | CONFIG_BLK_DEV_RAM=y | 537 | CONFIG_BLK_DEV_RAM=y |
@@ -491,7 +562,11 @@ CONFIG_HAVE_IDE=y | |||
491 | # | 562 | # |
492 | 563 | ||
493 | # | 564 | # |
494 | # Enable only one of the two stacks, unless you know what you are doing | 565 | # You can enable one or both FireWire driver stacks. |
566 | # | ||
567 | |||
568 | # | ||
569 | # See the help texts for more information. | ||
495 | # | 570 | # |
496 | # CONFIG_FIREWIRE is not set | 571 | # CONFIG_FIREWIRE is not set |
497 | # CONFIG_IEEE1394 is not set | 572 | # CONFIG_IEEE1394 is not set |
@@ -512,6 +587,8 @@ CONFIG_MII=y | |||
512 | # CONFIG_SUNGEM is not set | 587 | # CONFIG_SUNGEM is not set |
513 | # CONFIG_CASSINI is not set | 588 | # CONFIG_CASSINI is not set |
514 | # CONFIG_NET_VENDOR_3COM is not set | 589 | # CONFIG_NET_VENDOR_3COM is not set |
590 | # CONFIG_ETHOC is not set | ||
591 | # CONFIG_DNET is not set | ||
515 | # CONFIG_NET_TULIP is not set | 592 | # CONFIG_NET_TULIP is not set |
516 | # CONFIG_HP100 is not set | 593 | # CONFIG_HP100 is not set |
517 | CONFIG_IBM_NEW_EMAC=y | 594 | CONFIG_IBM_NEW_EMAC=y |
@@ -530,17 +607,18 @@ CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT=y | |||
530 | CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y | 607 | CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y |
531 | # CONFIG_NET_PCI is not set | 608 | # CONFIG_NET_PCI is not set |
532 | # CONFIG_B44 is not set | 609 | # CONFIG_B44 is not set |
610 | # CONFIG_KS8842 is not set | ||
611 | # CONFIG_KS8851_MLL is not set | ||
533 | # CONFIG_ATL2 is not set | 612 | # CONFIG_ATL2 is not set |
613 | # CONFIG_XILINX_EMACLITE is not set | ||
534 | # CONFIG_NETDEV_1000 is not set | 614 | # CONFIG_NETDEV_1000 is not set |
535 | # CONFIG_NETDEV_10000 is not set | 615 | # CONFIG_NETDEV_10000 is not set |
536 | # CONFIG_TR is not set | 616 | # CONFIG_TR is not set |
537 | 617 | CONFIG_WLAN=y | |
538 | # | 618 | # CONFIG_AIRO is not set |
539 | # Wireless LAN | 619 | # CONFIG_ATMEL is not set |
540 | # | 620 | # CONFIG_PRISM54 is not set |
541 | # CONFIG_WLAN_PRE80211 is not set | 621 | # CONFIG_HOSTAP is not set |
542 | # CONFIG_WLAN_80211 is not set | ||
543 | # CONFIG_IWLWIFI_LEDS is not set | ||
544 | 622 | ||
545 | # | 623 | # |
546 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 624 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -553,6 +631,7 @@ CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y | |||
553 | # CONFIG_NETCONSOLE is not set | 631 | # CONFIG_NETCONSOLE is not set |
554 | # CONFIG_NETPOLL is not set | 632 | # CONFIG_NETPOLL is not set |
555 | # CONFIG_NET_POLL_CONTROLLER is not set | 633 | # CONFIG_NET_POLL_CONTROLLER is not set |
634 | # CONFIG_VMXNET3 is not set | ||
556 | # CONFIG_ISDN is not set | 635 | # CONFIG_ISDN is not set |
557 | # CONFIG_PHONE is not set | 636 | # CONFIG_PHONE is not set |
558 | 637 | ||
@@ -598,6 +677,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
598 | # CONFIG_SERIAL_JSM is not set | 677 | # CONFIG_SERIAL_JSM is not set |
599 | CONFIG_SERIAL_OF_PLATFORM=y | 678 | CONFIG_SERIAL_OF_PLATFORM=y |
600 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 679 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
680 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
601 | CONFIG_UNIX98_PTYS=y | 681 | CONFIG_UNIX98_PTYS=y |
602 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 682 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
603 | CONFIG_LEGACY_PTYS=y | 683 | CONFIG_LEGACY_PTYS=y |
@@ -614,6 +694,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
614 | CONFIG_DEVPORT=y | 694 | CONFIG_DEVPORT=y |
615 | # CONFIG_I2C is not set | 695 | # CONFIG_I2C is not set |
616 | # CONFIG_SPI is not set | 696 | # CONFIG_SPI is not set |
697 | |||
698 | # | ||
699 | # PPS support | ||
700 | # | ||
701 | # CONFIG_PPS is not set | ||
617 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 702 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
618 | # CONFIG_GPIOLIB is not set | 703 | # CONFIG_GPIOLIB is not set |
619 | # CONFIG_W1 is not set | 704 | # CONFIG_W1 is not set |
@@ -636,27 +721,13 @@ CONFIG_SSB_POSSIBLE=y | |||
636 | # CONFIG_HTC_PASIC3 is not set | 721 | # CONFIG_HTC_PASIC3 is not set |
637 | # CONFIG_MFD_TMIO is not set | 722 | # CONFIG_MFD_TMIO is not set |
638 | # CONFIG_REGULATOR is not set | 723 | # CONFIG_REGULATOR is not set |
639 | 724 | # CONFIG_MEDIA_SUPPORT is not set | |
640 | # | ||
641 | # Multimedia devices | ||
642 | # | ||
643 | |||
644 | # | ||
645 | # Multimedia core support | ||
646 | # | ||
647 | # CONFIG_VIDEO_DEV is not set | ||
648 | # CONFIG_DVB_CORE is not set | ||
649 | # CONFIG_VIDEO_MEDIA is not set | ||
650 | |||
651 | # | ||
652 | # Multimedia drivers | ||
653 | # | ||
654 | # CONFIG_DAB is not set | ||
655 | 725 | ||
656 | # | 726 | # |
657 | # Graphics support | 727 | # Graphics support |
658 | # | 728 | # |
659 | # CONFIG_AGP is not set | 729 | # CONFIG_AGP is not set |
730 | CONFIG_VGA_ARB=y | ||
660 | # CONFIG_DRM is not set | 731 | # CONFIG_DRM is not set |
661 | # CONFIG_VGASTATE is not set | 732 | # CONFIG_VGASTATE is not set |
662 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 733 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
@@ -678,7 +749,12 @@ CONFIG_SSB_POSSIBLE=y | |||
678 | # CONFIG_EDAC is not set | 749 | # CONFIG_EDAC is not set |
679 | # CONFIG_RTC_CLASS is not set | 750 | # CONFIG_RTC_CLASS is not set |
680 | # CONFIG_DMADEVICES is not set | 751 | # CONFIG_DMADEVICES is not set |
752 | # CONFIG_AUXDISPLAY is not set | ||
681 | # CONFIG_UIO is not set | 753 | # CONFIG_UIO is not set |
754 | |||
755 | # | ||
756 | # TI VLYNQ | ||
757 | # | ||
682 | # CONFIG_STAGING is not set | 758 | # CONFIG_STAGING is not set |
683 | 759 | ||
684 | # | 760 | # |
@@ -689,14 +765,17 @@ CONFIG_EXT2_FS=y | |||
689 | # CONFIG_EXT2_FS_XIP is not set | 765 | # CONFIG_EXT2_FS_XIP is not set |
690 | # CONFIG_EXT3_FS is not set | 766 | # CONFIG_EXT3_FS is not set |
691 | # CONFIG_EXT4_FS is not set | 767 | # CONFIG_EXT4_FS is not set |
768 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
692 | # CONFIG_REISERFS_FS is not set | 769 | # CONFIG_REISERFS_FS is not set |
693 | # CONFIG_JFS_FS is not set | 770 | # CONFIG_JFS_FS is not set |
694 | # CONFIG_FS_POSIX_ACL is not set | 771 | # CONFIG_FS_POSIX_ACL is not set |
695 | CONFIG_FILE_LOCKING=y | ||
696 | # CONFIG_XFS_FS is not set | 772 | # CONFIG_XFS_FS is not set |
697 | # CONFIG_GFS2_FS is not set | 773 | # CONFIG_GFS2_FS is not set |
698 | # CONFIG_OCFS2_FS is not set | 774 | # CONFIG_OCFS2_FS is not set |
699 | # CONFIG_BTRFS_FS is not set | 775 | # CONFIG_BTRFS_FS is not set |
776 | # CONFIG_NILFS2_FS is not set | ||
777 | CONFIG_FILE_LOCKING=y | ||
778 | CONFIG_FSNOTIFY=y | ||
700 | CONFIG_DNOTIFY=y | 779 | CONFIG_DNOTIFY=y |
701 | CONFIG_INOTIFY=y | 780 | CONFIG_INOTIFY=y |
702 | CONFIG_INOTIFY_USER=y | 781 | CONFIG_INOTIFY_USER=y |
@@ -706,6 +785,11 @@ CONFIG_INOTIFY_USER=y | |||
706 | # CONFIG_FUSE_FS is not set | 785 | # CONFIG_FUSE_FS is not set |
707 | 786 | ||
708 | # | 787 | # |
788 | # Caches | ||
789 | # | ||
790 | # CONFIG_FSCACHE is not set | ||
791 | |||
792 | # | ||
709 | # CD-ROM/DVD Filesystems | 793 | # CD-ROM/DVD Filesystems |
710 | # | 794 | # |
711 | # CONFIG_ISO9660_FS is not set | 795 | # CONFIG_ISO9660_FS is not set |
@@ -760,7 +844,6 @@ CONFIG_LOCKD=y | |||
760 | CONFIG_LOCKD_V4=y | 844 | CONFIG_LOCKD_V4=y |
761 | CONFIG_NFS_COMMON=y | 845 | CONFIG_NFS_COMMON=y |
762 | CONFIG_SUNRPC=y | 846 | CONFIG_SUNRPC=y |
763 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
764 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 847 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
765 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 848 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
766 | # CONFIG_SMB_FS is not set | 849 | # CONFIG_SMB_FS is not set |
@@ -776,6 +859,7 @@ CONFIG_SUNRPC=y | |||
776 | CONFIG_MSDOS_PARTITION=y | 859 | CONFIG_MSDOS_PARTITION=y |
777 | # CONFIG_NLS is not set | 860 | # CONFIG_NLS is not set |
778 | # CONFIG_DLM is not set | 861 | # CONFIG_DLM is not set |
862 | # CONFIG_BINARY_PRINTF is not set | ||
779 | 863 | ||
780 | # | 864 | # |
781 | # Library routines | 865 | # Library routines |
@@ -790,11 +874,13 @@ CONFIG_CRC32=y | |||
790 | # CONFIG_CRC7 is not set | 874 | # CONFIG_CRC7 is not set |
791 | # CONFIG_LIBCRC32C is not set | 875 | # CONFIG_LIBCRC32C is not set |
792 | CONFIG_ZLIB_INFLATE=y | 876 | CONFIG_ZLIB_INFLATE=y |
793 | CONFIG_PLIST=y | 877 | CONFIG_DECOMPRESS_GZIP=y |
794 | CONFIG_HAS_IOMEM=y | 878 | CONFIG_HAS_IOMEM=y |
795 | CONFIG_HAS_IOPORT=y | 879 | CONFIG_HAS_IOPORT=y |
796 | CONFIG_HAS_DMA=y | 880 | CONFIG_HAS_DMA=y |
797 | CONFIG_HAVE_LMB=y | 881 | CONFIG_HAVE_LMB=y |
882 | CONFIG_NLATTR=y | ||
883 | CONFIG_GENERIC_ATOMIC64=y | ||
798 | 884 | ||
799 | # | 885 | # |
800 | # Kernel hacking | 886 | # Kernel hacking |
@@ -804,6 +890,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
804 | CONFIG_ENABLE_MUST_CHECK=y | 890 | CONFIG_ENABLE_MUST_CHECK=y |
805 | CONFIG_FRAME_WARN=1024 | 891 | CONFIG_FRAME_WARN=1024 |
806 | CONFIG_MAGIC_SYSRQ=y | 892 | CONFIG_MAGIC_SYSRQ=y |
893 | # CONFIG_STRIP_ASM_SYMS is not set | ||
807 | # CONFIG_UNUSED_SYMBOLS is not set | 894 | # CONFIG_UNUSED_SYMBOLS is not set |
808 | CONFIG_DEBUG_FS=y | 895 | CONFIG_DEBUG_FS=y |
809 | # CONFIG_HEADERS_CHECK is not set | 896 | # CONFIG_HEADERS_CHECK is not set |
@@ -812,16 +899,23 @@ CONFIG_DEBUG_KERNEL=y | |||
812 | CONFIG_DETECT_SOFTLOCKUP=y | 899 | CONFIG_DETECT_SOFTLOCKUP=y |
813 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 900 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
814 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 901 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
902 | CONFIG_DETECT_HUNG_TASK=y | ||
903 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
904 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
815 | CONFIG_SCHED_DEBUG=y | 905 | CONFIG_SCHED_DEBUG=y |
816 | # CONFIG_SCHEDSTATS is not set | 906 | # CONFIG_SCHEDSTATS is not set |
817 | # CONFIG_TIMER_STATS is not set | 907 | # CONFIG_TIMER_STATS is not set |
818 | # CONFIG_DEBUG_OBJECTS is not set | 908 | # CONFIG_DEBUG_OBJECTS is not set |
819 | # CONFIG_SLUB_DEBUG_ON is not set | 909 | # CONFIG_SLUB_DEBUG_ON is not set |
820 | # CONFIG_SLUB_STATS is not set | 910 | # CONFIG_SLUB_STATS is not set |
911 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
821 | # CONFIG_DEBUG_RT_MUTEXES is not set | 912 | # CONFIG_DEBUG_RT_MUTEXES is not set |
822 | # CONFIG_RT_MUTEX_TESTER is not set | 913 | # CONFIG_RT_MUTEX_TESTER is not set |
823 | # CONFIG_DEBUG_SPINLOCK is not set | 914 | # CONFIG_DEBUG_SPINLOCK is not set |
824 | # CONFIG_DEBUG_MUTEXES is not set | 915 | # CONFIG_DEBUG_MUTEXES is not set |
916 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
917 | # CONFIG_PROVE_LOCKING is not set | ||
918 | # CONFIG_LOCK_STAT is not set | ||
825 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 919 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
826 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 920 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
827 | # CONFIG_DEBUG_KOBJECT is not set | 921 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -833,35 +927,45 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
833 | # CONFIG_DEBUG_LIST is not set | 927 | # CONFIG_DEBUG_LIST is not set |
834 | # CONFIG_DEBUG_SG is not set | 928 | # CONFIG_DEBUG_SG is not set |
835 | # CONFIG_DEBUG_NOTIFIERS is not set | 929 | # CONFIG_DEBUG_NOTIFIERS is not set |
836 | # CONFIG_BOOT_PRINTK_DELAY is not set | 930 | # CONFIG_DEBUG_CREDENTIALS is not set |
837 | # CONFIG_RCU_TORTURE_TEST is not set | 931 | # CONFIG_RCU_TORTURE_TEST is not set |
838 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 932 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
839 | # CONFIG_BACKTRACE_SELF_TEST is not set | 933 | # CONFIG_BACKTRACE_SELF_TEST is not set |
840 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 934 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
935 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
841 | # CONFIG_FAULT_INJECTION is not set | 936 | # CONFIG_FAULT_INJECTION is not set |
842 | # CONFIG_LATENCYTOP is not set | 937 | # CONFIG_LATENCYTOP is not set |
843 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 938 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
939 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
844 | CONFIG_HAVE_FUNCTION_TRACER=y | 940 | CONFIG_HAVE_FUNCTION_TRACER=y |
941 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
845 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 942 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
846 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 943 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
847 | 944 | CONFIG_TRACING_SUPPORT=y | |
848 | # | 945 | CONFIG_FTRACE=y |
849 | # Tracers | ||
850 | # | ||
851 | # CONFIG_FUNCTION_TRACER is not set | 946 | # CONFIG_FUNCTION_TRACER is not set |
947 | # CONFIG_IRQSOFF_TRACER is not set | ||
852 | # CONFIG_SCHED_TRACER is not set | 948 | # CONFIG_SCHED_TRACER is not set |
853 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 949 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
854 | # CONFIG_BOOT_TRACER is not set | 950 | # CONFIG_BOOT_TRACER is not set |
855 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 951 | CONFIG_BRANCH_PROFILE_NONE=y |
952 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
953 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
856 | # CONFIG_STACK_TRACER is not set | 954 | # CONFIG_STACK_TRACER is not set |
857 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 955 | # CONFIG_KMEMTRACE is not set |
956 | # CONFIG_WORKQUEUE_TRACER is not set | ||
957 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
958 | # CONFIG_DYNAMIC_DEBUG is not set | ||
959 | # CONFIG_DMA_API_DEBUG is not set | ||
858 | # CONFIG_SAMPLES is not set | 960 | # CONFIG_SAMPLES is not set |
859 | CONFIG_HAVE_ARCH_KGDB=y | 961 | CONFIG_HAVE_ARCH_KGDB=y |
860 | # CONFIG_KGDB is not set | 962 | # CONFIG_KGDB is not set |
963 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
964 | CONFIG_PPC_WERROR=y | ||
861 | CONFIG_PRINT_STACK_DEPTH=64 | 965 | CONFIG_PRINT_STACK_DEPTH=64 |
862 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 966 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
863 | # CONFIG_DEBUG_STACK_USAGE is not set | 967 | # CONFIG_DEBUG_STACK_USAGE is not set |
864 | # CONFIG_DEBUG_PAGEALLOC is not set | 968 | # CONFIG_PPC_EMULATED_STATS is not set |
865 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 969 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
866 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 970 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
867 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 971 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -877,13 +981,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
877 | # CONFIG_KEYS is not set | 981 | # CONFIG_KEYS is not set |
878 | # CONFIG_SECURITY is not set | 982 | # CONFIG_SECURITY is not set |
879 | # CONFIG_SECURITYFS is not set | 983 | # CONFIG_SECURITYFS is not set |
880 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 984 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
985 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
986 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
987 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
988 | CONFIG_DEFAULT_SECURITY="" | ||
881 | CONFIG_CRYPTO=y | 989 | CONFIG_CRYPTO=y |
882 | 990 | ||
883 | # | 991 | # |
884 | # Crypto core or helper | 992 | # Crypto core or helper |
885 | # | 993 | # |
886 | # CONFIG_CRYPTO_FIPS is not set | ||
887 | CONFIG_CRYPTO_ALGAPI=y | 994 | CONFIG_CRYPTO_ALGAPI=y |
888 | CONFIG_CRYPTO_ALGAPI2=y | 995 | CONFIG_CRYPTO_ALGAPI2=y |
889 | CONFIG_CRYPTO_AEAD2=y | 996 | CONFIG_CRYPTO_AEAD2=y |
@@ -892,10 +999,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
892 | CONFIG_CRYPTO_HASH=y | 999 | CONFIG_CRYPTO_HASH=y |
893 | CONFIG_CRYPTO_HASH2=y | 1000 | CONFIG_CRYPTO_HASH2=y |
894 | CONFIG_CRYPTO_RNG2=y | 1001 | CONFIG_CRYPTO_RNG2=y |
1002 | CONFIG_CRYPTO_PCOMP=y | ||
895 | CONFIG_CRYPTO_MANAGER=y | 1003 | CONFIG_CRYPTO_MANAGER=y |
896 | CONFIG_CRYPTO_MANAGER2=y | 1004 | CONFIG_CRYPTO_MANAGER2=y |
897 | # CONFIG_CRYPTO_GF128MUL is not set | 1005 | # CONFIG_CRYPTO_GF128MUL is not set |
898 | # CONFIG_CRYPTO_NULL is not set | 1006 | # CONFIG_CRYPTO_NULL is not set |
1007 | CONFIG_CRYPTO_WORKQUEUE=y | ||
899 | # CONFIG_CRYPTO_CRYPTD is not set | 1008 | # CONFIG_CRYPTO_CRYPTD is not set |
900 | # CONFIG_CRYPTO_AUTHENC is not set | 1009 | # CONFIG_CRYPTO_AUTHENC is not set |
901 | # CONFIG_CRYPTO_TEST is not set | 1010 | # CONFIG_CRYPTO_TEST is not set |
@@ -923,11 +1032,13 @@ CONFIG_CRYPTO_PCBC=y | |||
923 | # | 1032 | # |
924 | # CONFIG_CRYPTO_HMAC is not set | 1033 | # CONFIG_CRYPTO_HMAC is not set |
925 | # CONFIG_CRYPTO_XCBC is not set | 1034 | # CONFIG_CRYPTO_XCBC is not set |
1035 | # CONFIG_CRYPTO_VMAC is not set | ||
926 | 1036 | ||
927 | # | 1037 | # |
928 | # Digest | 1038 | # Digest |
929 | # | 1039 | # |
930 | # CONFIG_CRYPTO_CRC32C is not set | 1040 | # CONFIG_CRYPTO_CRC32C is not set |
1041 | # CONFIG_CRYPTO_GHASH is not set | ||
931 | # CONFIG_CRYPTO_MD4 is not set | 1042 | # CONFIG_CRYPTO_MD4 is not set |
932 | CONFIG_CRYPTO_MD5=y | 1043 | CONFIG_CRYPTO_MD5=y |
933 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1044 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -964,6 +1075,7 @@ CONFIG_CRYPTO_DES=y | |||
964 | # Compression | 1075 | # Compression |
965 | # | 1076 | # |
966 | # CONFIG_CRYPTO_DEFLATE is not set | 1077 | # CONFIG_CRYPTO_DEFLATE is not set |
1078 | # CONFIG_CRYPTO_ZLIB is not set | ||
967 | # CONFIG_CRYPTO_LZO is not set | 1079 | # CONFIG_CRYPTO_LZO is not set |
968 | 1080 | ||
969 | # | 1081 | # |
@@ -972,5 +1084,6 @@ CONFIG_CRYPTO_DES=y | |||
972 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1084 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
973 | CONFIG_CRYPTO_HW=y | 1085 | CONFIG_CRYPTO_HW=y |
974 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1086 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1087 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
975 | # CONFIG_PPC_CLOCK is not set | 1088 | # CONFIG_PPC_CLOCK is not set |
976 | # CONFIG_VIRTUALIZATION is not set | 1089 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig index e9b8495cde0c..918f23fd2b18 100644 --- a/arch/powerpc/configs/40x/ep405_defconfig +++ b/arch/powerpc/configs/40x/ep405_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:17:48 2009 | 4 | # Mon Jan 4 15:37:34 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | CONFIG_40x=y | 14 | CONFIG_40x=y |
@@ -16,6 +16,7 @@ CONFIG_40x=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_4xx=y | 17 | CONFIG_4xx=y |
18 | CONFIG_PPC_MMU_NOHASH=y | 18 | CONFIG_PPC_MMU_NOHASH=y |
19 | CONFIG_PPC_MMU_NOHASH_32=y | ||
19 | # CONFIG_PPC_MM_SLICES is not set | 20 | # CONFIG_PPC_MM_SLICES is not set |
20 | CONFIG_NOT_COHERENT_CACHE=y | 21 | CONFIG_NOT_COHERENT_CACHE=y |
21 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
@@ -27,15 +28,18 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 28 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 29 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
31 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_NR_IRQS=512 | ||
32 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
38 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 39 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 41 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 42 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
@@ -49,11 +53,15 @@ CONFIG_PPC_UDBG_16550=y | |||
49 | # CONFIG_GENERIC_TBSYNC is not set | 53 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 54 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
56 | CONFIG_DTC=y | ||
52 | # CONFIG_DEFAULT_UIMAGE is not set | 57 | # CONFIG_DEFAULT_UIMAGE is not set |
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
53 | CONFIG_PPC_DCR_NATIVE=y | 59 | CONFIG_PPC_DCR_NATIVE=y |
54 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_PPC_DCR=y | 61 | CONFIG_PPC_DCR=y |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
64 | CONFIG_CONSTRUCTORS=y | ||
57 | 65 | ||
58 | # | 66 | # |
59 | # General setup | 67 | # General setup |
@@ -67,9 +75,21 @@ CONFIG_SWAP=y | |||
67 | CONFIG_SYSVIPC=y | 75 | CONFIG_SYSVIPC=y |
68 | CONFIG_SYSVIPC_SYSCTL=y | 76 | CONFIG_SYSVIPC_SYSCTL=y |
69 | CONFIG_POSIX_MQUEUE=y | 77 | CONFIG_POSIX_MQUEUE=y |
78 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
70 | # CONFIG_BSD_PROCESS_ACCT is not set | 79 | # CONFIG_BSD_PROCESS_ACCT is not set |
71 | # CONFIG_TASKSTATS is not set | 80 | # CONFIG_TASKSTATS is not set |
72 | # CONFIG_AUDIT is not set | 81 | # CONFIG_AUDIT is not set |
82 | |||
83 | # | ||
84 | # RCU Subsystem | ||
85 | # | ||
86 | CONFIG_TREE_RCU=y | ||
87 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
88 | # CONFIG_TINY_RCU is not set | ||
89 | # CONFIG_RCU_TRACE is not set | ||
90 | CONFIG_RCU_FANOUT=32 | ||
91 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
92 | # CONFIG_TREE_RCU_TRACE is not set | ||
73 | # CONFIG_IKCONFIG is not set | 93 | # CONFIG_IKCONFIG is not set |
74 | CONFIG_LOG_BUF_SHIFT=14 | 94 | CONFIG_LOG_BUF_SHIFT=14 |
75 | CONFIG_GROUP_SCHED=y | 95 | CONFIG_GROUP_SCHED=y |
@@ -84,31 +104,40 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
84 | # CONFIG_NAMESPACES is not set | 104 | # CONFIG_NAMESPACES is not set |
85 | CONFIG_BLK_DEV_INITRD=y | 105 | CONFIG_BLK_DEV_INITRD=y |
86 | CONFIG_INITRAMFS_SOURCE="" | 106 | CONFIG_INITRAMFS_SOURCE="" |
107 | CONFIG_RD_GZIP=y | ||
108 | # CONFIG_RD_BZIP2 is not set | ||
109 | # CONFIG_RD_LZMA is not set | ||
87 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 110 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
88 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
112 | CONFIG_ANON_INODES=y | ||
89 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_KALLSYMS=y | 115 | CONFIG_KALLSYMS=y |
92 | CONFIG_KALLSYMS_ALL=y | 116 | CONFIG_KALLSYMS_ALL=y |
93 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 117 | CONFIG_KALLSYMS_EXTRA_PASS=y |
95 | CONFIG_HOTPLUG=y | 118 | CONFIG_HOTPLUG=y |
96 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
97 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
98 | CONFIG_ELF_CORE=y | 121 | CONFIG_ELF_CORE=y |
99 | CONFIG_COMPAT_BRK=y | ||
100 | CONFIG_BASE_FULL=y | 122 | CONFIG_BASE_FULL=y |
101 | CONFIG_FUTEX=y | 123 | CONFIG_FUTEX=y |
102 | CONFIG_ANON_INODES=y | ||
103 | CONFIG_EPOLL=y | 124 | CONFIG_EPOLL=y |
104 | CONFIG_SIGNALFD=y | 125 | CONFIG_SIGNALFD=y |
105 | CONFIG_TIMERFD=y | 126 | CONFIG_TIMERFD=y |
106 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
107 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
108 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_EVENTS=y | ||
131 | |||
132 | # | ||
133 | # Kernel Performance Events And Counters | ||
134 | # | ||
135 | # CONFIG_PERF_EVENTS is not set | ||
136 | # CONFIG_PERF_COUNTERS is not set | ||
109 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
110 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
111 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
140 | CONFIG_COMPAT_BRK=y | ||
112 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
113 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
114 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
@@ -120,6 +149,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
120 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
154 | |||
155 | # | ||
156 | # GCOV-based kernel profiling | ||
157 | # | ||
158 | # CONFIG_GCOV_KERNEL is not set | ||
159 | # CONFIG_SLOW_WORK is not set | ||
123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 160 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
124 | CONFIG_SLABINFO=y | 161 | CONFIG_SLABINFO=y |
125 | CONFIG_RT_MUTEXES=y | 162 | CONFIG_RT_MUTEXES=y |
@@ -131,8 +168,7 @@ CONFIG_MODULE_UNLOAD=y | |||
131 | # CONFIG_MODVERSIONS is not set | 168 | # CONFIG_MODVERSIONS is not set |
132 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 169 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
133 | CONFIG_BLOCK=y | 170 | CONFIG_BLOCK=y |
134 | CONFIG_LBD=y | 171 | CONFIG_LBDAF=y |
135 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
136 | # CONFIG_BLK_DEV_BSG is not set | 172 | # CONFIG_BLK_DEV_BSG is not set |
137 | # CONFIG_BLK_DEV_INTEGRITY is not set | 173 | # CONFIG_BLK_DEV_INTEGRITY is not set |
138 | 174 | ||
@@ -140,19 +176,41 @@ CONFIG_LBD=y | |||
140 | # IO Schedulers | 176 | # IO Schedulers |
141 | # | 177 | # |
142 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
143 | CONFIG_IOSCHED_AS=y | ||
144 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
145 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
146 | CONFIG_DEFAULT_AS=y | ||
147 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
148 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
149 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
150 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
151 | CONFIG_CLASSIC_RCU=y | 185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
152 | # CONFIG_TREE_RCU is not set | 186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
153 | # CONFIG_PREEMPT_RCU is not set | 187 | # CONFIG_INLINE_SPIN_LOCK is not set |
154 | # CONFIG_TREE_RCU_TRACE is not set | 188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
155 | # CONFIG_PREEMPT_RCU_TRACE is not set | 189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
156 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
157 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 215 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
158 | 216 | ||
@@ -166,6 +224,7 @@ CONFIG_CLASSIC_RCU=y | |||
166 | # CONFIG_ACADIA is not set | 224 | # CONFIG_ACADIA is not set |
167 | CONFIG_EP405=y | 225 | CONFIG_EP405=y |
168 | # CONFIG_HCU4 is not set | 226 | # CONFIG_HCU4 is not set |
227 | # CONFIG_HOTFOOT is not set | ||
169 | # CONFIG_KILAUEA is not set | 228 | # CONFIG_KILAUEA is not set |
170 | # CONFIG_MAKALU is not set | 229 | # CONFIG_MAKALU is not set |
171 | # CONFIG_WALNUT is not set | 230 | # CONFIG_WALNUT is not set |
@@ -210,10 +269,12 @@ CONFIG_BINFMT_ELF=y | |||
210 | # CONFIG_BINFMT_MISC is not set | 269 | # CONFIG_BINFMT_MISC is not set |
211 | # CONFIG_MATH_EMULATION is not set | 270 | # CONFIG_MATH_EMULATION is not set |
212 | # CONFIG_IOMMU_HELPER is not set | 271 | # CONFIG_IOMMU_HELPER is not set |
213 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 272 | # CONFIG_SWIOTLB is not set |
214 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 273 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
215 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 274 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
216 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 275 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
276 | CONFIG_SPARSE_IRQ=y | ||
277 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
217 | CONFIG_ARCH_FLATMEM_ENABLE=y | 278 | CONFIG_ARCH_FLATMEM_ENABLE=y |
218 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 279 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
219 | CONFIG_SELECT_MEMORY_MODEL=y | 280 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -229,10 +290,12 @@ CONFIG_MIGRATION=y | |||
229 | CONFIG_ZONE_DMA_FLAG=1 | 290 | CONFIG_ZONE_DMA_FLAG=1 |
230 | CONFIG_BOUNCE=y | 291 | CONFIG_BOUNCE=y |
231 | CONFIG_VIRT_TO_BUS=y | 292 | CONFIG_VIRT_TO_BUS=y |
232 | CONFIG_UNEVICTABLE_LRU=y | 293 | # CONFIG_KSM is not set |
294 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
233 | CONFIG_PPC_4K_PAGES=y | 295 | CONFIG_PPC_4K_PAGES=y |
234 | # CONFIG_PPC_16K_PAGES is not set | 296 | # CONFIG_PPC_16K_PAGES is not set |
235 | # CONFIG_PPC_64K_PAGES is not set | 297 | # CONFIG_PPC_64K_PAGES is not set |
298 | # CONFIG_PPC_256K_PAGES is not set | ||
236 | CONFIG_FORCE_MAX_ZONEORDER=11 | 299 | CONFIG_FORCE_MAX_ZONEORDER=11 |
237 | CONFIG_PROC_DEVICETREE=y | 300 | CONFIG_PROC_DEVICETREE=y |
238 | # CONFIG_CMDLINE_BOOL is not set | 301 | # CONFIG_CMDLINE_BOOL is not set |
@@ -257,6 +320,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
257 | # CONFIG_PCI_LEGACY is not set | 320 | # CONFIG_PCI_LEGACY is not set |
258 | # CONFIG_PCI_DEBUG is not set | 321 | # CONFIG_PCI_DEBUG is not set |
259 | # CONFIG_PCI_STUB is not set | 322 | # CONFIG_PCI_STUB is not set |
323 | # CONFIG_PCI_IOV is not set | ||
260 | # CONFIG_PCCARD is not set | 324 | # CONFIG_PCCARD is not set |
261 | # CONFIG_HOTPLUG_PCI is not set | 325 | # CONFIG_HOTPLUG_PCI is not set |
262 | # CONFIG_HAS_RAPIDIO is not set | 326 | # CONFIG_HAS_RAPIDIO is not set |
@@ -274,14 +338,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
274 | CONFIG_KERNEL_START=0xc0000000 | 338 | CONFIG_KERNEL_START=0xc0000000 |
275 | CONFIG_PHYSICAL_START=0x00000000 | 339 | CONFIG_PHYSICAL_START=0x00000000 |
276 | CONFIG_TASK_SIZE=0xc0000000 | 340 | CONFIG_TASK_SIZE=0xc0000000 |
277 | CONFIG_CONSISTENT_START=0xff100000 | ||
278 | CONFIG_CONSISTENT_SIZE=0x00200000 | 341 | CONFIG_CONSISTENT_SIZE=0x00200000 |
279 | CONFIG_NET=y | 342 | CONFIG_NET=y |
280 | 343 | ||
281 | # | 344 | # |
282 | # Networking options | 345 | # Networking options |
283 | # | 346 | # |
284 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
285 | CONFIG_PACKET=y | 347 | CONFIG_PACKET=y |
286 | # CONFIG_PACKET_MMAP is not set | 348 | # CONFIG_PACKET_MMAP is not set |
287 | CONFIG_UNIX=y | 349 | CONFIG_UNIX=y |
@@ -318,6 +380,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
318 | # CONFIG_NETFILTER is not set | 380 | # CONFIG_NETFILTER is not set |
319 | # CONFIG_IP_DCCP is not set | 381 | # CONFIG_IP_DCCP is not set |
320 | # CONFIG_IP_SCTP is not set | 382 | # CONFIG_IP_SCTP is not set |
383 | # CONFIG_RDS is not set | ||
321 | # CONFIG_TIPC is not set | 384 | # CONFIG_TIPC is not set |
322 | # CONFIG_ATM is not set | 385 | # CONFIG_ATM is not set |
323 | # CONFIG_BRIDGE is not set | 386 | # CONFIG_BRIDGE is not set |
@@ -331,6 +394,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
331 | # CONFIG_LAPB is not set | 394 | # CONFIG_LAPB is not set |
332 | # CONFIG_ECONET is not set | 395 | # CONFIG_ECONET is not set |
333 | # CONFIG_WAN_ROUTER is not set | 396 | # CONFIG_WAN_ROUTER is not set |
397 | # CONFIG_PHONET is not set | ||
398 | # CONFIG_IEEE802154 is not set | ||
334 | # CONFIG_NET_SCHED is not set | 399 | # CONFIG_NET_SCHED is not set |
335 | # CONFIG_DCB is not set | 400 | # CONFIG_DCB is not set |
336 | 401 | ||
@@ -343,8 +408,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
343 | # CONFIG_IRDA is not set | 408 | # CONFIG_IRDA is not set |
344 | # CONFIG_BT is not set | 409 | # CONFIG_BT is not set |
345 | # CONFIG_AF_RXRPC is not set | 410 | # CONFIG_AF_RXRPC is not set |
346 | # CONFIG_PHONET is not set | 411 | CONFIG_WIRELESS=y |
347 | # CONFIG_WIRELESS is not set | 412 | # CONFIG_CFG80211 is not set |
413 | # CONFIG_LIB80211 is not set | ||
414 | |||
415 | # | ||
416 | # CFG80211 needs to be enabled for MAC80211 | ||
417 | # | ||
348 | # CONFIG_WIMAX is not set | 418 | # CONFIG_WIMAX is not set |
349 | # CONFIG_RFKILL is not set | 419 | # CONFIG_RFKILL is not set |
350 | # CONFIG_NET_9P is not set | 420 | # CONFIG_NET_9P is not set |
@@ -357,6 +427,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
357 | # Generic Driver Options | 427 | # Generic Driver Options |
358 | # | 428 | # |
359 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 429 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
430 | # CONFIG_DEVTMPFS is not set | ||
360 | CONFIG_STANDALONE=y | 431 | CONFIG_STANDALONE=y |
361 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 432 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
362 | CONFIG_FW_LOADER=y | 433 | CONFIG_FW_LOADER=y |
@@ -369,9 +440,9 @@ CONFIG_CONNECTOR=y | |||
369 | CONFIG_PROC_EVENTS=y | 440 | CONFIG_PROC_EVENTS=y |
370 | CONFIG_MTD=y | 441 | CONFIG_MTD=y |
371 | # CONFIG_MTD_DEBUG is not set | 442 | # CONFIG_MTD_DEBUG is not set |
443 | # CONFIG_MTD_TESTS is not set | ||
372 | # CONFIG_MTD_CONCAT is not set | 444 | # CONFIG_MTD_CONCAT is not set |
373 | CONFIG_MTD_PARTITIONS=y | 445 | CONFIG_MTD_PARTITIONS=y |
374 | # CONFIG_MTD_TESTS is not set | ||
375 | # CONFIG_MTD_REDBOOT_PARTS is not set | 446 | # CONFIG_MTD_REDBOOT_PARTS is not set |
376 | CONFIG_MTD_CMDLINE_PARTS=y | 447 | CONFIG_MTD_CMDLINE_PARTS=y |
377 | CONFIG_MTD_OF_PARTS=y | 448 | CONFIG_MTD_OF_PARTS=y |
@@ -447,7 +518,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
447 | # LPDDR flash memory drivers | 518 | # LPDDR flash memory drivers |
448 | # | 519 | # |
449 | # CONFIG_MTD_LPDDR is not set | 520 | # CONFIG_MTD_LPDDR is not set |
450 | # CONFIG_MTD_QINFO_PROBE is not set | ||
451 | 521 | ||
452 | # | 522 | # |
453 | # UBI - Unsorted block images | 523 | # UBI - Unsorted block images |
@@ -463,6 +533,7 @@ CONFIG_BLK_DEV=y | |||
463 | # CONFIG_BLK_DEV_UMEM is not set | 533 | # CONFIG_BLK_DEV_UMEM is not set |
464 | # CONFIG_BLK_DEV_COW_COMMON is not set | 534 | # CONFIG_BLK_DEV_COW_COMMON is not set |
465 | # CONFIG_BLK_DEV_LOOP is not set | 535 | # CONFIG_BLK_DEV_LOOP is not set |
536 | # CONFIG_BLK_DEV_DRBD is not set | ||
466 | # CONFIG_BLK_DEV_NBD is not set | 537 | # CONFIG_BLK_DEV_NBD is not set |
467 | # CONFIG_BLK_DEV_SX8 is not set | 538 | # CONFIG_BLK_DEV_SX8 is not set |
468 | # CONFIG_BLK_DEV_UB is not set | 539 | # CONFIG_BLK_DEV_UB is not set |
@@ -476,12 +547,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
476 | # CONFIG_BLK_DEV_HD is not set | 547 | # CONFIG_BLK_DEV_HD is not set |
477 | CONFIG_MISC_DEVICES=y | 548 | CONFIG_MISC_DEVICES=y |
478 | # CONFIG_PHANTOM is not set | 549 | # CONFIG_PHANTOM is not set |
479 | # CONFIG_EEPROM_93CX6 is not set | ||
480 | # CONFIG_SGI_IOC4 is not set | 550 | # CONFIG_SGI_IOC4 is not set |
481 | # CONFIG_TIFM_CORE is not set | 551 | # CONFIG_TIFM_CORE is not set |
482 | # CONFIG_ENCLOSURE_SERVICES is not set | 552 | # CONFIG_ENCLOSURE_SERVICES is not set |
483 | # CONFIG_HP_ILO is not set | 553 | # CONFIG_HP_ILO is not set |
484 | # CONFIG_C2PORT is not set | 554 | # CONFIG_C2PORT is not set |
555 | |||
556 | # | ||
557 | # EEPROM support | ||
558 | # | ||
559 | # CONFIG_EEPROM_93CX6 is not set | ||
560 | # CONFIG_CB710_CORE is not set | ||
485 | CONFIG_HAVE_IDE=y | 561 | CONFIG_HAVE_IDE=y |
486 | # CONFIG_IDE is not set | 562 | # CONFIG_IDE is not set |
487 | 563 | ||
@@ -501,7 +577,11 @@ CONFIG_HAVE_IDE=y | |||
501 | # | 577 | # |
502 | 578 | ||
503 | # | 579 | # |
504 | # Enable only one of the two stacks, unless you know what you are doing | 580 | # You can enable one or both FireWire driver stacks. |
581 | # | ||
582 | |||
583 | # | ||
584 | # See the help texts for more information. | ||
505 | # | 585 | # |
506 | # CONFIG_FIREWIRE is not set | 586 | # CONFIG_FIREWIRE is not set |
507 | # CONFIG_IEEE1394 is not set | 587 | # CONFIG_IEEE1394 is not set |
@@ -522,6 +602,8 @@ CONFIG_NET_ETHERNET=y | |||
522 | # CONFIG_SUNGEM is not set | 602 | # CONFIG_SUNGEM is not set |
523 | # CONFIG_CASSINI is not set | 603 | # CONFIG_CASSINI is not set |
524 | # CONFIG_NET_VENDOR_3COM is not set | 604 | # CONFIG_NET_VENDOR_3COM is not set |
605 | # CONFIG_ETHOC is not set | ||
606 | # CONFIG_DNET is not set | ||
525 | # CONFIG_NET_TULIP is not set | 607 | # CONFIG_NET_TULIP is not set |
526 | # CONFIG_HP100 is not set | 608 | # CONFIG_HP100 is not set |
527 | CONFIG_IBM_NEW_EMAC=y | 609 | CONFIG_IBM_NEW_EMAC=y |
@@ -540,7 +622,10 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
540 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 622 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
541 | # CONFIG_NET_PCI is not set | 623 | # CONFIG_NET_PCI is not set |
542 | # CONFIG_B44 is not set | 624 | # CONFIG_B44 is not set |
625 | # CONFIG_KS8842 is not set | ||
626 | # CONFIG_KS8851_MLL is not set | ||
543 | # CONFIG_ATL2 is not set | 627 | # CONFIG_ATL2 is not set |
628 | # CONFIG_XILINX_EMACLITE is not set | ||
544 | CONFIG_NETDEV_1000=y | 629 | CONFIG_NETDEV_1000=y |
545 | # CONFIG_ACENIC is not set | 630 | # CONFIG_ACENIC is not set |
546 | # CONFIG_DL2K is not set | 631 | # CONFIG_DL2K is not set |
@@ -548,6 +633,7 @@ CONFIG_NETDEV_1000=y | |||
548 | # CONFIG_E1000E is not set | 633 | # CONFIG_E1000E is not set |
549 | # CONFIG_IP1000 is not set | 634 | # CONFIG_IP1000 is not set |
550 | # CONFIG_IGB is not set | 635 | # CONFIG_IGB is not set |
636 | # CONFIG_IGBVF is not set | ||
551 | # CONFIG_NS83820 is not set | 637 | # CONFIG_NS83820 is not set |
552 | # CONFIG_HAMACHI is not set | 638 | # CONFIG_HAMACHI is not set |
553 | # CONFIG_YELLOWFIN is not set | 639 | # CONFIG_YELLOWFIN is not set |
@@ -558,9 +644,13 @@ CONFIG_NETDEV_1000=y | |||
558 | # CONFIG_VIA_VELOCITY is not set | 644 | # CONFIG_VIA_VELOCITY is not set |
559 | # CONFIG_TIGON3 is not set | 645 | # CONFIG_TIGON3 is not set |
560 | # CONFIG_BNX2 is not set | 646 | # CONFIG_BNX2 is not set |
647 | # CONFIG_CNIC is not set | ||
648 | # CONFIG_MV643XX_ETH is not set | ||
649 | # CONFIG_XILINX_LL_TEMAC is not set | ||
561 | # CONFIG_QLA3XXX is not set | 650 | # CONFIG_QLA3XXX is not set |
562 | # CONFIG_ATL1 is not set | 651 | # CONFIG_ATL1 is not set |
563 | # CONFIG_ATL1E is not set | 652 | # CONFIG_ATL1E is not set |
653 | # CONFIG_ATL1C is not set | ||
564 | # CONFIG_JME is not set | 654 | # CONFIG_JME is not set |
565 | CONFIG_NETDEV_10000=y | 655 | CONFIG_NETDEV_10000=y |
566 | # CONFIG_CHELSIO_T1 is not set | 656 | # CONFIG_CHELSIO_T1 is not set |
@@ -570,6 +660,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
570 | # CONFIG_IXGBE is not set | 660 | # CONFIG_IXGBE is not set |
571 | # CONFIG_IXGB is not set | 661 | # CONFIG_IXGB is not set |
572 | # CONFIG_S2IO is not set | 662 | # CONFIG_S2IO is not set |
663 | # CONFIG_VXGE is not set | ||
573 | # CONFIG_MYRI10GE is not set | 664 | # CONFIG_MYRI10GE is not set |
574 | # CONFIG_NETXEN_NIC is not set | 665 | # CONFIG_NETXEN_NIC is not set |
575 | # CONFIG_NIU is not set | 666 | # CONFIG_NIU is not set |
@@ -579,14 +670,14 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
579 | # CONFIG_BNX2X is not set | 670 | # CONFIG_BNX2X is not set |
580 | # CONFIG_QLGE is not set | 671 | # CONFIG_QLGE is not set |
581 | # CONFIG_SFC is not set | 672 | # CONFIG_SFC is not set |
673 | # CONFIG_BE2NET is not set | ||
582 | # CONFIG_TR is not set | 674 | # CONFIG_TR is not set |
583 | 675 | CONFIG_WLAN=y | |
584 | # | 676 | # CONFIG_AIRO is not set |
585 | # Wireless LAN | 677 | # CONFIG_ATMEL is not set |
586 | # | 678 | # CONFIG_PRISM54 is not set |
587 | # CONFIG_WLAN_PRE80211 is not set | 679 | # CONFIG_USB_ZD1201 is not set |
588 | # CONFIG_WLAN_80211 is not set | 680 | # CONFIG_HOSTAP is not set |
589 | # CONFIG_IWLWIFI_LEDS is not set | ||
590 | 681 | ||
591 | # | 682 | # |
592 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 683 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -608,6 +699,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
608 | # CONFIG_NETCONSOLE is not set | 699 | # CONFIG_NETCONSOLE is not set |
609 | # CONFIG_NETPOLL is not set | 700 | # CONFIG_NETPOLL is not set |
610 | # CONFIG_NET_POLL_CONTROLLER is not set | 701 | # CONFIG_NET_POLL_CONTROLLER is not set |
702 | # CONFIG_VMXNET3 is not set | ||
611 | # CONFIG_ISDN is not set | 703 | # CONFIG_ISDN is not set |
612 | # CONFIG_PHONE is not set | 704 | # CONFIG_PHONE is not set |
613 | 705 | ||
@@ -653,6 +745,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
653 | # CONFIG_SERIAL_JSM is not set | 745 | # CONFIG_SERIAL_JSM is not set |
654 | CONFIG_SERIAL_OF_PLATFORM=y | 746 | CONFIG_SERIAL_OF_PLATFORM=y |
655 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 747 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
748 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
656 | CONFIG_UNIX98_PTYS=y | 749 | CONFIG_UNIX98_PTYS=y |
657 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 750 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
658 | CONFIG_LEGACY_PTYS=y | 751 | CONFIG_LEGACY_PTYS=y |
@@ -669,6 +762,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
669 | CONFIG_DEVPORT=y | 762 | CONFIG_DEVPORT=y |
670 | # CONFIG_I2C is not set | 763 | # CONFIG_I2C is not set |
671 | # CONFIG_SPI is not set | 764 | # CONFIG_SPI is not set |
765 | |||
766 | # | ||
767 | # PPS support | ||
768 | # | ||
769 | # CONFIG_PPS is not set | ||
672 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 770 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
673 | # CONFIG_GPIOLIB is not set | 771 | # CONFIG_GPIOLIB is not set |
674 | # CONFIG_W1 is not set | 772 | # CONFIG_W1 is not set |
@@ -691,27 +789,13 @@ CONFIG_SSB_POSSIBLE=y | |||
691 | # CONFIG_HTC_PASIC3 is not set | 789 | # CONFIG_HTC_PASIC3 is not set |
692 | # CONFIG_MFD_TMIO is not set | 790 | # CONFIG_MFD_TMIO is not set |
693 | # CONFIG_REGULATOR is not set | 791 | # CONFIG_REGULATOR is not set |
694 | 792 | # CONFIG_MEDIA_SUPPORT is not set | |
695 | # | ||
696 | # Multimedia devices | ||
697 | # | ||
698 | |||
699 | # | ||
700 | # Multimedia core support | ||
701 | # | ||
702 | # CONFIG_VIDEO_DEV is not set | ||
703 | # CONFIG_DVB_CORE is not set | ||
704 | # CONFIG_VIDEO_MEDIA is not set | ||
705 | |||
706 | # | ||
707 | # Multimedia drivers | ||
708 | # | ||
709 | # CONFIG_DAB is not set | ||
710 | 793 | ||
711 | # | 794 | # |
712 | # Graphics support | 795 | # Graphics support |
713 | # | 796 | # |
714 | # CONFIG_AGP is not set | 797 | # CONFIG_AGP is not set |
798 | CONFIG_VGA_ARB=y | ||
715 | # CONFIG_DRM is not set | 799 | # CONFIG_DRM is not set |
716 | # CONFIG_VGASTATE is not set | 800 | # CONFIG_VGASTATE is not set |
717 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 801 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -748,14 +832,16 @@ CONFIG_USB_MON=y | |||
748 | # USB Host Controller Drivers | 832 | # USB Host Controller Drivers |
749 | # | 833 | # |
750 | # CONFIG_USB_C67X00_HCD is not set | 834 | # CONFIG_USB_C67X00_HCD is not set |
835 | # CONFIG_USB_XHCI_HCD is not set | ||
751 | # CONFIG_USB_EHCI_HCD is not set | 836 | # CONFIG_USB_EHCI_HCD is not set |
752 | # CONFIG_USB_OXU210HP_HCD is not set | 837 | # CONFIG_USB_OXU210HP_HCD is not set |
753 | # CONFIG_USB_ISP116X_HCD is not set | 838 | # CONFIG_USB_ISP116X_HCD is not set |
754 | # CONFIG_USB_ISP1760_HCD is not set | 839 | # CONFIG_USB_ISP1760_HCD is not set |
840 | # CONFIG_USB_ISP1362_HCD is not set | ||
755 | CONFIG_USB_OHCI_HCD=y | 841 | CONFIG_USB_OHCI_HCD=y |
756 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
757 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 842 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
758 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 843 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
844 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
759 | CONFIG_USB_OHCI_HCD_PCI=y | 845 | CONFIG_USB_OHCI_HCD_PCI=y |
760 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 846 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
761 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 847 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -775,11 +861,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
775 | # CONFIG_USB_TMC is not set | 861 | # CONFIG_USB_TMC is not set |
776 | 862 | ||
777 | # | 863 | # |
778 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 864 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
779 | # | 865 | # |
780 | 866 | ||
781 | # | 867 | # |
782 | # see USB_STORAGE Help for more information | 868 | # also be needed; see USB_STORAGE Help for more info |
783 | # | 869 | # |
784 | # CONFIG_USB_LIBUSUAL is not set | 870 | # CONFIG_USB_LIBUSUAL is not set |
785 | 871 | ||
@@ -807,7 +893,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
807 | # CONFIG_USB_LED is not set | 893 | # CONFIG_USB_LED is not set |
808 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 894 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
809 | # CONFIG_USB_CYTHERM is not set | 895 | # CONFIG_USB_CYTHERM is not set |
810 | # CONFIG_USB_PHIDGET is not set | ||
811 | # CONFIG_USB_IDMOUSE is not set | 896 | # CONFIG_USB_IDMOUSE is not set |
812 | # CONFIG_USB_FTDI_ELAN is not set | 897 | # CONFIG_USB_FTDI_ELAN is not set |
813 | # CONFIG_USB_APPLEDISPLAY is not set | 898 | # CONFIG_USB_APPLEDISPLAY is not set |
@@ -822,6 +907,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
822 | # | 907 | # |
823 | # OTG and related infrastructure | 908 | # OTG and related infrastructure |
824 | # | 909 | # |
910 | # CONFIG_NOP_USB_XCEIV is not set | ||
825 | # CONFIG_UWB is not set | 911 | # CONFIG_UWB is not set |
826 | # CONFIG_MMC is not set | 912 | # CONFIG_MMC is not set |
827 | # CONFIG_MEMSTICK is not set | 913 | # CONFIG_MEMSTICK is not set |
@@ -831,7 +917,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
831 | # CONFIG_EDAC is not set | 917 | # CONFIG_EDAC is not set |
832 | # CONFIG_RTC_CLASS is not set | 918 | # CONFIG_RTC_CLASS is not set |
833 | # CONFIG_DMADEVICES is not set | 919 | # CONFIG_DMADEVICES is not set |
920 | # CONFIG_AUXDISPLAY is not set | ||
834 | # CONFIG_UIO is not set | 921 | # CONFIG_UIO is not set |
922 | |||
923 | # | ||
924 | # TI VLYNQ | ||
925 | # | ||
835 | # CONFIG_STAGING is not set | 926 | # CONFIG_STAGING is not set |
836 | 927 | ||
837 | # | 928 | # |
@@ -842,14 +933,17 @@ CONFIG_EXT2_FS=y | |||
842 | # CONFIG_EXT2_FS_XIP is not set | 933 | # CONFIG_EXT2_FS_XIP is not set |
843 | # CONFIG_EXT3_FS is not set | 934 | # CONFIG_EXT3_FS is not set |
844 | # CONFIG_EXT4_FS is not set | 935 | # CONFIG_EXT4_FS is not set |
936 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
845 | # CONFIG_REISERFS_FS is not set | 937 | # CONFIG_REISERFS_FS is not set |
846 | # CONFIG_JFS_FS is not set | 938 | # CONFIG_JFS_FS is not set |
847 | # CONFIG_FS_POSIX_ACL is not set | 939 | # CONFIG_FS_POSIX_ACL is not set |
848 | CONFIG_FILE_LOCKING=y | ||
849 | # CONFIG_XFS_FS is not set | 940 | # CONFIG_XFS_FS is not set |
850 | # CONFIG_GFS2_FS is not set | 941 | # CONFIG_GFS2_FS is not set |
851 | # CONFIG_OCFS2_FS is not set | 942 | # CONFIG_OCFS2_FS is not set |
852 | # CONFIG_BTRFS_FS is not set | 943 | # CONFIG_BTRFS_FS is not set |
944 | # CONFIG_NILFS2_FS is not set | ||
945 | CONFIG_FILE_LOCKING=y | ||
946 | CONFIG_FSNOTIFY=y | ||
853 | CONFIG_DNOTIFY=y | 947 | CONFIG_DNOTIFY=y |
854 | CONFIG_INOTIFY=y | 948 | CONFIG_INOTIFY=y |
855 | CONFIG_INOTIFY_USER=y | 949 | CONFIG_INOTIFY_USER=y |
@@ -859,6 +953,11 @@ CONFIG_INOTIFY_USER=y | |||
859 | # CONFIG_FUSE_FS is not set | 953 | # CONFIG_FUSE_FS is not set |
860 | 954 | ||
861 | # | 955 | # |
956 | # Caches | ||
957 | # | ||
958 | # CONFIG_FSCACHE is not set | ||
959 | |||
960 | # | ||
862 | # CD-ROM/DVD Filesystems | 961 | # CD-ROM/DVD Filesystems |
863 | # | 962 | # |
864 | # CONFIG_ISO9660_FS is not set | 963 | # CONFIG_ISO9660_FS is not set |
@@ -913,7 +1012,6 @@ CONFIG_LOCKD=y | |||
913 | CONFIG_LOCKD_V4=y | 1012 | CONFIG_LOCKD_V4=y |
914 | CONFIG_NFS_COMMON=y | 1013 | CONFIG_NFS_COMMON=y |
915 | CONFIG_SUNRPC=y | 1014 | CONFIG_SUNRPC=y |
916 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
917 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1015 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
918 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1016 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
919 | # CONFIG_SMB_FS is not set | 1017 | # CONFIG_SMB_FS is not set |
@@ -927,8 +1025,48 @@ CONFIG_SUNRPC=y | |||
927 | # | 1025 | # |
928 | # CONFIG_PARTITION_ADVANCED is not set | 1026 | # CONFIG_PARTITION_ADVANCED is not set |
929 | CONFIG_MSDOS_PARTITION=y | 1027 | CONFIG_MSDOS_PARTITION=y |
930 | # CONFIG_NLS is not set | 1028 | CONFIG_NLS=y |
1029 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1030 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1031 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1032 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1033 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1034 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1035 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1036 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1037 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1038 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1039 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1040 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1041 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1042 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1043 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1044 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1045 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1046 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1047 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1048 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1049 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1050 | # CONFIG_NLS_ISO8859_8 is not set | ||
1051 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1052 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1053 | # CONFIG_NLS_ASCII is not set | ||
1054 | # CONFIG_NLS_ISO8859_1 is not set | ||
1055 | # CONFIG_NLS_ISO8859_2 is not set | ||
1056 | # CONFIG_NLS_ISO8859_3 is not set | ||
1057 | # CONFIG_NLS_ISO8859_4 is not set | ||
1058 | # CONFIG_NLS_ISO8859_5 is not set | ||
1059 | # CONFIG_NLS_ISO8859_6 is not set | ||
1060 | # CONFIG_NLS_ISO8859_7 is not set | ||
1061 | # CONFIG_NLS_ISO8859_9 is not set | ||
1062 | # CONFIG_NLS_ISO8859_13 is not set | ||
1063 | # CONFIG_NLS_ISO8859_14 is not set | ||
1064 | # CONFIG_NLS_ISO8859_15 is not set | ||
1065 | # CONFIG_NLS_KOI8_R is not set | ||
1066 | # CONFIG_NLS_KOI8_U is not set | ||
1067 | # CONFIG_NLS_UTF8 is not set | ||
931 | # CONFIG_DLM is not set | 1068 | # CONFIG_DLM is not set |
1069 | # CONFIG_BINARY_PRINTF is not set | ||
932 | 1070 | ||
933 | # | 1071 | # |
934 | # Library routines | 1072 | # Library routines |
@@ -943,11 +1081,13 @@ CONFIG_CRC32=y | |||
943 | # CONFIG_CRC7 is not set | 1081 | # CONFIG_CRC7 is not set |
944 | # CONFIG_LIBCRC32C is not set | 1082 | # CONFIG_LIBCRC32C is not set |
945 | CONFIG_ZLIB_INFLATE=y | 1083 | CONFIG_ZLIB_INFLATE=y |
946 | CONFIG_PLIST=y | 1084 | CONFIG_DECOMPRESS_GZIP=y |
947 | CONFIG_HAS_IOMEM=y | 1085 | CONFIG_HAS_IOMEM=y |
948 | CONFIG_HAS_IOPORT=y | 1086 | CONFIG_HAS_IOPORT=y |
949 | CONFIG_HAS_DMA=y | 1087 | CONFIG_HAS_DMA=y |
950 | CONFIG_HAVE_LMB=y | 1088 | CONFIG_HAVE_LMB=y |
1089 | CONFIG_NLATTR=y | ||
1090 | CONFIG_GENERIC_ATOMIC64=y | ||
951 | 1091 | ||
952 | # | 1092 | # |
953 | # Kernel hacking | 1093 | # Kernel hacking |
@@ -957,6 +1097,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
957 | CONFIG_ENABLE_MUST_CHECK=y | 1097 | CONFIG_ENABLE_MUST_CHECK=y |
958 | CONFIG_FRAME_WARN=1024 | 1098 | CONFIG_FRAME_WARN=1024 |
959 | CONFIG_MAGIC_SYSRQ=y | 1099 | CONFIG_MAGIC_SYSRQ=y |
1100 | # CONFIG_STRIP_ASM_SYMS is not set | ||
960 | # CONFIG_UNUSED_SYMBOLS is not set | 1101 | # CONFIG_UNUSED_SYMBOLS is not set |
961 | CONFIG_DEBUG_FS=y | 1102 | CONFIG_DEBUG_FS=y |
962 | # CONFIG_HEADERS_CHECK is not set | 1103 | # CONFIG_HEADERS_CHECK is not set |
@@ -965,16 +1106,23 @@ CONFIG_DEBUG_KERNEL=y | |||
965 | CONFIG_DETECT_SOFTLOCKUP=y | 1106 | CONFIG_DETECT_SOFTLOCKUP=y |
966 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1107 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
967 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1108 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
1109 | CONFIG_DETECT_HUNG_TASK=y | ||
1110 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
1111 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
968 | CONFIG_SCHED_DEBUG=y | 1112 | CONFIG_SCHED_DEBUG=y |
969 | # CONFIG_SCHEDSTATS is not set | 1113 | # CONFIG_SCHEDSTATS is not set |
970 | # CONFIG_TIMER_STATS is not set | 1114 | # CONFIG_TIMER_STATS is not set |
971 | # CONFIG_DEBUG_OBJECTS is not set | 1115 | # CONFIG_DEBUG_OBJECTS is not set |
972 | # CONFIG_SLUB_DEBUG_ON is not set | 1116 | # CONFIG_SLUB_DEBUG_ON is not set |
973 | # CONFIG_SLUB_STATS is not set | 1117 | # CONFIG_SLUB_STATS is not set |
1118 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
974 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1119 | # CONFIG_DEBUG_RT_MUTEXES is not set |
975 | # CONFIG_RT_MUTEX_TESTER is not set | 1120 | # CONFIG_RT_MUTEX_TESTER is not set |
976 | # CONFIG_DEBUG_SPINLOCK is not set | 1121 | # CONFIG_DEBUG_SPINLOCK is not set |
977 | # CONFIG_DEBUG_MUTEXES is not set | 1122 | # CONFIG_DEBUG_MUTEXES is not set |
1123 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1124 | # CONFIG_PROVE_LOCKING is not set | ||
1125 | # CONFIG_LOCK_STAT is not set | ||
978 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1126 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
979 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1127 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
980 | # CONFIG_DEBUG_KOBJECT is not set | 1128 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -986,35 +1134,45 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
986 | # CONFIG_DEBUG_LIST is not set | 1134 | # CONFIG_DEBUG_LIST is not set |
987 | # CONFIG_DEBUG_SG is not set | 1135 | # CONFIG_DEBUG_SG is not set |
988 | # CONFIG_DEBUG_NOTIFIERS is not set | 1136 | # CONFIG_DEBUG_NOTIFIERS is not set |
989 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1137 | # CONFIG_DEBUG_CREDENTIALS is not set |
990 | # CONFIG_RCU_TORTURE_TEST is not set | 1138 | # CONFIG_RCU_TORTURE_TEST is not set |
991 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1139 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
992 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1140 | # CONFIG_BACKTRACE_SELF_TEST is not set |
993 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1141 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1142 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
994 | # CONFIG_FAULT_INJECTION is not set | 1143 | # CONFIG_FAULT_INJECTION is not set |
995 | # CONFIG_LATENCYTOP is not set | 1144 | # CONFIG_LATENCYTOP is not set |
996 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1145 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1146 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
997 | CONFIG_HAVE_FUNCTION_TRACER=y | 1147 | CONFIG_HAVE_FUNCTION_TRACER=y |
1148 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
998 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1149 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
999 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1150 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1000 | 1151 | CONFIG_TRACING_SUPPORT=y | |
1001 | # | 1152 | CONFIG_FTRACE=y |
1002 | # Tracers | ||
1003 | # | ||
1004 | # CONFIG_FUNCTION_TRACER is not set | 1153 | # CONFIG_FUNCTION_TRACER is not set |
1154 | # CONFIG_IRQSOFF_TRACER is not set | ||
1005 | # CONFIG_SCHED_TRACER is not set | 1155 | # CONFIG_SCHED_TRACER is not set |
1006 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1156 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1007 | # CONFIG_BOOT_TRACER is not set | 1157 | # CONFIG_BOOT_TRACER is not set |
1008 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1158 | CONFIG_BRANCH_PROFILE_NONE=y |
1159 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1160 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1009 | # CONFIG_STACK_TRACER is not set | 1161 | # CONFIG_STACK_TRACER is not set |
1010 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1162 | # CONFIG_KMEMTRACE is not set |
1163 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1164 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1165 | # CONFIG_DYNAMIC_DEBUG is not set | ||
1166 | # CONFIG_DMA_API_DEBUG is not set | ||
1011 | # CONFIG_SAMPLES is not set | 1167 | # CONFIG_SAMPLES is not set |
1012 | CONFIG_HAVE_ARCH_KGDB=y | 1168 | CONFIG_HAVE_ARCH_KGDB=y |
1013 | # CONFIG_KGDB is not set | 1169 | # CONFIG_KGDB is not set |
1170 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1171 | CONFIG_PPC_WERROR=y | ||
1014 | CONFIG_PRINT_STACK_DEPTH=64 | 1172 | CONFIG_PRINT_STACK_DEPTH=64 |
1015 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1173 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1016 | # CONFIG_DEBUG_STACK_USAGE is not set | 1174 | # CONFIG_DEBUG_STACK_USAGE is not set |
1017 | # CONFIG_DEBUG_PAGEALLOC is not set | 1175 | # CONFIG_PPC_EMULATED_STATS is not set |
1018 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1176 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1019 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1177 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1020 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1178 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -1030,13 +1188,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1030 | # CONFIG_KEYS is not set | 1188 | # CONFIG_KEYS is not set |
1031 | # CONFIG_SECURITY is not set | 1189 | # CONFIG_SECURITY is not set |
1032 | # CONFIG_SECURITYFS is not set | 1190 | # CONFIG_SECURITYFS is not set |
1033 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1191 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1192 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1193 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1194 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1195 | CONFIG_DEFAULT_SECURITY="" | ||
1034 | CONFIG_CRYPTO=y | 1196 | CONFIG_CRYPTO=y |
1035 | 1197 | ||
1036 | # | 1198 | # |
1037 | # Crypto core or helper | 1199 | # Crypto core or helper |
1038 | # | 1200 | # |
1039 | # CONFIG_CRYPTO_FIPS is not set | ||
1040 | CONFIG_CRYPTO_ALGAPI=y | 1201 | CONFIG_CRYPTO_ALGAPI=y |
1041 | CONFIG_CRYPTO_ALGAPI2=y | 1202 | CONFIG_CRYPTO_ALGAPI2=y |
1042 | CONFIG_CRYPTO_AEAD2=y | 1203 | CONFIG_CRYPTO_AEAD2=y |
@@ -1045,10 +1206,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
1045 | CONFIG_CRYPTO_HASH=y | 1206 | CONFIG_CRYPTO_HASH=y |
1046 | CONFIG_CRYPTO_HASH2=y | 1207 | CONFIG_CRYPTO_HASH2=y |
1047 | CONFIG_CRYPTO_RNG2=y | 1208 | CONFIG_CRYPTO_RNG2=y |
1209 | CONFIG_CRYPTO_PCOMP=y | ||
1048 | CONFIG_CRYPTO_MANAGER=y | 1210 | CONFIG_CRYPTO_MANAGER=y |
1049 | CONFIG_CRYPTO_MANAGER2=y | 1211 | CONFIG_CRYPTO_MANAGER2=y |
1050 | # CONFIG_CRYPTO_GF128MUL is not set | 1212 | # CONFIG_CRYPTO_GF128MUL is not set |
1051 | # CONFIG_CRYPTO_NULL is not set | 1213 | # CONFIG_CRYPTO_NULL is not set |
1214 | CONFIG_CRYPTO_WORKQUEUE=y | ||
1052 | # CONFIG_CRYPTO_CRYPTD is not set | 1215 | # CONFIG_CRYPTO_CRYPTD is not set |
1053 | # CONFIG_CRYPTO_AUTHENC is not set | 1216 | # CONFIG_CRYPTO_AUTHENC is not set |
1054 | # CONFIG_CRYPTO_TEST is not set | 1217 | # CONFIG_CRYPTO_TEST is not set |
@@ -1076,11 +1239,13 @@ CONFIG_CRYPTO_PCBC=y | |||
1076 | # | 1239 | # |
1077 | # CONFIG_CRYPTO_HMAC is not set | 1240 | # CONFIG_CRYPTO_HMAC is not set |
1078 | # CONFIG_CRYPTO_XCBC is not set | 1241 | # CONFIG_CRYPTO_XCBC is not set |
1242 | # CONFIG_CRYPTO_VMAC is not set | ||
1079 | 1243 | ||
1080 | # | 1244 | # |
1081 | # Digest | 1245 | # Digest |
1082 | # | 1246 | # |
1083 | # CONFIG_CRYPTO_CRC32C is not set | 1247 | # CONFIG_CRYPTO_CRC32C is not set |
1248 | # CONFIG_CRYPTO_GHASH is not set | ||
1084 | # CONFIG_CRYPTO_MD4 is not set | 1249 | # CONFIG_CRYPTO_MD4 is not set |
1085 | CONFIG_CRYPTO_MD5=y | 1250 | CONFIG_CRYPTO_MD5=y |
1086 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1251 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1117,6 +1282,7 @@ CONFIG_CRYPTO_DES=y | |||
1117 | # Compression | 1282 | # Compression |
1118 | # | 1283 | # |
1119 | # CONFIG_CRYPTO_DEFLATE is not set | 1284 | # CONFIG_CRYPTO_DEFLATE is not set |
1285 | # CONFIG_CRYPTO_ZLIB is not set | ||
1120 | # CONFIG_CRYPTO_LZO is not set | 1286 | # CONFIG_CRYPTO_LZO is not set |
1121 | 1287 | ||
1122 | # | 1288 | # |
@@ -1125,5 +1291,6 @@ CONFIG_CRYPTO_DES=y | |||
1125 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1291 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
1126 | CONFIG_CRYPTO_HW=y | 1292 | CONFIG_CRYPTO_HW=y |
1127 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1293 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1294 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
1128 | # CONFIG_PPC_CLOCK is not set | 1295 | # CONFIG_PPC_CLOCK is not set |
1129 | # CONFIG_VIRTUALIZATION is not set | 1296 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/40x/hcu4_defconfig b/arch/powerpc/configs/40x/hcu4_defconfig index 8c019d79bf2a..f87ef0382280 100644 --- a/arch/powerpc/configs/40x/hcu4_defconfig +++ b/arch/powerpc/configs/40x/hcu4_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:17:50 2009 | 4 | # Mon Jan 4 15:45:11 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | CONFIG_40x=y | 14 | CONFIG_40x=y |
@@ -16,6 +16,7 @@ CONFIG_40x=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_4xx=y | 17 | CONFIG_4xx=y |
18 | CONFIG_PPC_MMU_NOHASH=y | 18 | CONFIG_PPC_MMU_NOHASH=y |
19 | CONFIG_PPC_MMU_NOHASH_32=y | ||
19 | # CONFIG_PPC_MM_SLICES is not set | 20 | # CONFIG_PPC_MM_SLICES is not set |
20 | CONFIG_NOT_COHERENT_CACHE=y | 21 | CONFIG_NOT_COHERENT_CACHE=y |
21 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
@@ -27,15 +28,18 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 28 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 29 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
31 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_NR_IRQS=512 | ||
32 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
38 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 39 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 41 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 42 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
@@ -49,11 +53,15 @@ CONFIG_PPC_UDBG_16550=y | |||
49 | # CONFIG_GENERIC_TBSYNC is not set | 53 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 54 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
56 | CONFIG_DTC=y | ||
52 | # CONFIG_DEFAULT_UIMAGE is not set | 57 | # CONFIG_DEFAULT_UIMAGE is not set |
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
53 | CONFIG_PPC_DCR_NATIVE=y | 59 | CONFIG_PPC_DCR_NATIVE=y |
54 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_PPC_DCR=y | 61 | CONFIG_PPC_DCR=y |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
64 | CONFIG_CONSTRUCTORS=y | ||
57 | 65 | ||
58 | # | 66 | # |
59 | # General setup | 67 | # General setup |
@@ -67,9 +75,21 @@ CONFIG_SWAP=y | |||
67 | CONFIG_SYSVIPC=y | 75 | CONFIG_SYSVIPC=y |
68 | CONFIG_SYSVIPC_SYSCTL=y | 76 | CONFIG_SYSVIPC_SYSCTL=y |
69 | CONFIG_POSIX_MQUEUE=y | 77 | CONFIG_POSIX_MQUEUE=y |
78 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
70 | # CONFIG_BSD_PROCESS_ACCT is not set | 79 | # CONFIG_BSD_PROCESS_ACCT is not set |
71 | # CONFIG_TASKSTATS is not set | 80 | # CONFIG_TASKSTATS is not set |
72 | # CONFIG_AUDIT is not set | 81 | # CONFIG_AUDIT is not set |
82 | |||
83 | # | ||
84 | # RCU Subsystem | ||
85 | # | ||
86 | CONFIG_TREE_RCU=y | ||
87 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
88 | # CONFIG_TINY_RCU is not set | ||
89 | # CONFIG_RCU_TRACE is not set | ||
90 | CONFIG_RCU_FANOUT=32 | ||
91 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
92 | # CONFIG_TREE_RCU_TRACE is not set | ||
73 | # CONFIG_IKCONFIG is not set | 93 | # CONFIG_IKCONFIG is not set |
74 | CONFIG_LOG_BUF_SHIFT=14 | 94 | CONFIG_LOG_BUF_SHIFT=14 |
75 | CONFIG_GROUP_SCHED=y | 95 | CONFIG_GROUP_SCHED=y |
@@ -84,31 +104,40 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
84 | # CONFIG_NAMESPACES is not set | 104 | # CONFIG_NAMESPACES is not set |
85 | CONFIG_BLK_DEV_INITRD=y | 105 | CONFIG_BLK_DEV_INITRD=y |
86 | CONFIG_INITRAMFS_SOURCE="" | 106 | CONFIG_INITRAMFS_SOURCE="" |
107 | CONFIG_RD_GZIP=y | ||
108 | # CONFIG_RD_BZIP2 is not set | ||
109 | # CONFIG_RD_LZMA is not set | ||
87 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 110 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
88 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
112 | CONFIG_ANON_INODES=y | ||
89 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_KALLSYMS=y | 115 | CONFIG_KALLSYMS=y |
92 | CONFIG_KALLSYMS_ALL=y | 116 | CONFIG_KALLSYMS_ALL=y |
93 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 117 | CONFIG_KALLSYMS_EXTRA_PASS=y |
95 | CONFIG_HOTPLUG=y | 118 | CONFIG_HOTPLUG=y |
96 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
97 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
98 | CONFIG_ELF_CORE=y | 121 | CONFIG_ELF_CORE=y |
99 | CONFIG_COMPAT_BRK=y | ||
100 | CONFIG_BASE_FULL=y | 122 | CONFIG_BASE_FULL=y |
101 | CONFIG_FUTEX=y | 123 | CONFIG_FUTEX=y |
102 | CONFIG_ANON_INODES=y | ||
103 | CONFIG_EPOLL=y | 124 | CONFIG_EPOLL=y |
104 | CONFIG_SIGNALFD=y | 125 | CONFIG_SIGNALFD=y |
105 | CONFIG_TIMERFD=y | 126 | CONFIG_TIMERFD=y |
106 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
107 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
108 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_EVENTS=y | ||
131 | |||
132 | # | ||
133 | # Kernel Performance Events And Counters | ||
134 | # | ||
135 | # CONFIG_PERF_EVENTS is not set | ||
136 | # CONFIG_PERF_COUNTERS is not set | ||
109 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
110 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
111 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
140 | CONFIG_COMPAT_BRK=y | ||
112 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
113 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
114 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
@@ -120,6 +149,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
120 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
154 | |||
155 | # | ||
156 | # GCOV-based kernel profiling | ||
157 | # | ||
158 | # CONFIG_GCOV_KERNEL is not set | ||
159 | # CONFIG_SLOW_WORK is not set | ||
123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 160 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
124 | CONFIG_SLABINFO=y | 161 | CONFIG_SLABINFO=y |
125 | CONFIG_RT_MUTEXES=y | 162 | CONFIG_RT_MUTEXES=y |
@@ -131,8 +168,7 @@ CONFIG_MODULE_UNLOAD=y | |||
131 | # CONFIG_MODVERSIONS is not set | 168 | # CONFIG_MODVERSIONS is not set |
132 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 169 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
133 | CONFIG_BLOCK=y | 170 | CONFIG_BLOCK=y |
134 | CONFIG_LBD=y | 171 | CONFIG_LBDAF=y |
135 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
136 | # CONFIG_BLK_DEV_BSG is not set | 172 | # CONFIG_BLK_DEV_BSG is not set |
137 | # CONFIG_BLK_DEV_INTEGRITY is not set | 173 | # CONFIG_BLK_DEV_INTEGRITY is not set |
138 | 174 | ||
@@ -140,19 +176,41 @@ CONFIG_LBD=y | |||
140 | # IO Schedulers | 176 | # IO Schedulers |
141 | # | 177 | # |
142 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
143 | CONFIG_IOSCHED_AS=y | ||
144 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
145 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
146 | CONFIG_DEFAULT_AS=y | ||
147 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
148 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
149 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
150 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
151 | CONFIG_CLASSIC_RCU=y | 185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
152 | # CONFIG_TREE_RCU is not set | 186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
153 | # CONFIG_PREEMPT_RCU is not set | 187 | # CONFIG_INLINE_SPIN_LOCK is not set |
154 | # CONFIG_TREE_RCU_TRACE is not set | 188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
155 | # CONFIG_PREEMPT_RCU_TRACE is not set | 189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
156 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
157 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 215 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
158 | 216 | ||
@@ -166,6 +224,7 @@ CONFIG_CLASSIC_RCU=y | |||
166 | # CONFIG_ACADIA is not set | 224 | # CONFIG_ACADIA is not set |
167 | # CONFIG_EP405 is not set | 225 | # CONFIG_EP405 is not set |
168 | CONFIG_HCU4=y | 226 | CONFIG_HCU4=y |
227 | # CONFIG_HOTFOOT is not set | ||
169 | # CONFIG_KILAUEA is not set | 228 | # CONFIG_KILAUEA is not set |
170 | # CONFIG_MAKALU is not set | 229 | # CONFIG_MAKALU is not set |
171 | # CONFIG_WALNUT is not set | 230 | # CONFIG_WALNUT is not set |
@@ -208,10 +267,12 @@ CONFIG_BINFMT_ELF=y | |||
208 | # CONFIG_BINFMT_MISC is not set | 267 | # CONFIG_BINFMT_MISC is not set |
209 | # CONFIG_MATH_EMULATION is not set | 268 | # CONFIG_MATH_EMULATION is not set |
210 | # CONFIG_IOMMU_HELPER is not set | 269 | # CONFIG_IOMMU_HELPER is not set |
211 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 270 | # CONFIG_SWIOTLB is not set |
212 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 271 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
213 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 272 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
214 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 273 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
274 | CONFIG_SPARSE_IRQ=y | ||
275 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
215 | CONFIG_ARCH_FLATMEM_ENABLE=y | 276 | CONFIG_ARCH_FLATMEM_ENABLE=y |
216 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 277 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
217 | CONFIG_SELECT_MEMORY_MODEL=y | 278 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -227,10 +288,12 @@ CONFIG_MIGRATION=y | |||
227 | CONFIG_ZONE_DMA_FLAG=1 | 288 | CONFIG_ZONE_DMA_FLAG=1 |
228 | CONFIG_BOUNCE=y | 289 | CONFIG_BOUNCE=y |
229 | CONFIG_VIRT_TO_BUS=y | 290 | CONFIG_VIRT_TO_BUS=y |
230 | CONFIG_UNEVICTABLE_LRU=y | 291 | # CONFIG_KSM is not set |
292 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
231 | CONFIG_PPC_4K_PAGES=y | 293 | CONFIG_PPC_4K_PAGES=y |
232 | # CONFIG_PPC_16K_PAGES is not set | 294 | # CONFIG_PPC_16K_PAGES is not set |
233 | # CONFIG_PPC_64K_PAGES is not set | 295 | # CONFIG_PPC_64K_PAGES is not set |
296 | # CONFIG_PPC_256K_PAGES is not set | ||
234 | CONFIG_FORCE_MAX_ZONEORDER=11 | 297 | CONFIG_FORCE_MAX_ZONEORDER=11 |
235 | CONFIG_PROC_DEVICETREE=y | 298 | CONFIG_PROC_DEVICETREE=y |
236 | # CONFIG_CMDLINE_BOOL is not set | 299 | # CONFIG_CMDLINE_BOOL is not set |
@@ -255,6 +318,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
255 | # CONFIG_PCI_LEGACY is not set | 318 | # CONFIG_PCI_LEGACY is not set |
256 | # CONFIG_PCI_DEBUG is not set | 319 | # CONFIG_PCI_DEBUG is not set |
257 | # CONFIG_PCI_STUB is not set | 320 | # CONFIG_PCI_STUB is not set |
321 | # CONFIG_PCI_IOV is not set | ||
258 | # CONFIG_PCCARD is not set | 322 | # CONFIG_PCCARD is not set |
259 | # CONFIG_HOTPLUG_PCI is not set | 323 | # CONFIG_HOTPLUG_PCI is not set |
260 | # CONFIG_HAS_RAPIDIO is not set | 324 | # CONFIG_HAS_RAPIDIO is not set |
@@ -272,14 +336,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
272 | CONFIG_KERNEL_START=0xc0000000 | 336 | CONFIG_KERNEL_START=0xc0000000 |
273 | CONFIG_PHYSICAL_START=0x00000000 | 337 | CONFIG_PHYSICAL_START=0x00000000 |
274 | CONFIG_TASK_SIZE=0xc0000000 | 338 | CONFIG_TASK_SIZE=0xc0000000 |
275 | CONFIG_CONSISTENT_START=0xff100000 | ||
276 | CONFIG_CONSISTENT_SIZE=0x00200000 | 339 | CONFIG_CONSISTENT_SIZE=0x00200000 |
277 | CONFIG_NET=y | 340 | CONFIG_NET=y |
278 | 341 | ||
279 | # | 342 | # |
280 | # Networking options | 343 | # Networking options |
281 | # | 344 | # |
282 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
283 | CONFIG_PACKET=y | 345 | CONFIG_PACKET=y |
284 | # CONFIG_PACKET_MMAP is not set | 346 | # CONFIG_PACKET_MMAP is not set |
285 | CONFIG_UNIX=y | 347 | CONFIG_UNIX=y |
@@ -316,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
316 | # CONFIG_NETFILTER is not set | 378 | # CONFIG_NETFILTER is not set |
317 | # CONFIG_IP_DCCP is not set | 379 | # CONFIG_IP_DCCP is not set |
318 | # CONFIG_IP_SCTP is not set | 380 | # CONFIG_IP_SCTP is not set |
381 | # CONFIG_RDS is not set | ||
319 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
320 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
321 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
@@ -329,6 +392,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
329 | # CONFIG_LAPB is not set | 392 | # CONFIG_LAPB is not set |
330 | # CONFIG_ECONET is not set | 393 | # CONFIG_ECONET is not set |
331 | # CONFIG_WAN_ROUTER is not set | 394 | # CONFIG_WAN_ROUTER is not set |
395 | # CONFIG_PHONET is not set | ||
396 | # CONFIG_IEEE802154 is not set | ||
332 | # CONFIG_NET_SCHED is not set | 397 | # CONFIG_NET_SCHED is not set |
333 | # CONFIG_DCB is not set | 398 | # CONFIG_DCB is not set |
334 | 399 | ||
@@ -341,8 +406,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
341 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
342 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
343 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
344 | # CONFIG_PHONET is not set | 409 | CONFIG_WIRELESS=y |
345 | # CONFIG_WIRELESS is not set | 410 | # CONFIG_CFG80211 is not set |
411 | # CONFIG_LIB80211 is not set | ||
412 | |||
413 | # | ||
414 | # CFG80211 needs to be enabled for MAC80211 | ||
415 | # | ||
346 | # CONFIG_WIMAX is not set | 416 | # CONFIG_WIMAX is not set |
347 | # CONFIG_RFKILL is not set | 417 | # CONFIG_RFKILL is not set |
348 | # CONFIG_NET_9P is not set | 418 | # CONFIG_NET_9P is not set |
@@ -355,6 +425,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
355 | # Generic Driver Options | 425 | # Generic Driver Options |
356 | # | 426 | # |
357 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 427 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
428 | # CONFIG_DEVTMPFS is not set | ||
358 | CONFIG_STANDALONE=y | 429 | CONFIG_STANDALONE=y |
359 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 430 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
360 | CONFIG_FW_LOADER=y | 431 | CONFIG_FW_LOADER=y |
@@ -367,9 +438,9 @@ CONFIG_CONNECTOR=y | |||
367 | CONFIG_PROC_EVENTS=y | 438 | CONFIG_PROC_EVENTS=y |
368 | CONFIG_MTD=y | 439 | CONFIG_MTD=y |
369 | # CONFIG_MTD_DEBUG is not set | 440 | # CONFIG_MTD_DEBUG is not set |
441 | # CONFIG_MTD_TESTS is not set | ||
370 | # CONFIG_MTD_CONCAT is not set | 442 | # CONFIG_MTD_CONCAT is not set |
371 | CONFIG_MTD_PARTITIONS=y | 443 | CONFIG_MTD_PARTITIONS=y |
372 | # CONFIG_MTD_TESTS is not set | ||
373 | # CONFIG_MTD_REDBOOT_PARTS is not set | 444 | # CONFIG_MTD_REDBOOT_PARTS is not set |
374 | CONFIG_MTD_CMDLINE_PARTS=y | 445 | CONFIG_MTD_CMDLINE_PARTS=y |
375 | CONFIG_MTD_OF_PARTS=y | 446 | CONFIG_MTD_OF_PARTS=y |
@@ -445,7 +516,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
445 | # LPDDR flash memory drivers | 516 | # LPDDR flash memory drivers |
446 | # | 517 | # |
447 | # CONFIG_MTD_LPDDR is not set | 518 | # CONFIG_MTD_LPDDR is not set |
448 | # CONFIG_MTD_QINFO_PROBE is not set | ||
449 | 519 | ||
450 | # | 520 | # |
451 | # UBI - Unsorted block images | 521 | # UBI - Unsorted block images |
@@ -461,6 +531,7 @@ CONFIG_BLK_DEV=y | |||
461 | # CONFIG_BLK_DEV_UMEM is not set | 531 | # CONFIG_BLK_DEV_UMEM is not set |
462 | # CONFIG_BLK_DEV_COW_COMMON is not set | 532 | # CONFIG_BLK_DEV_COW_COMMON is not set |
463 | # CONFIG_BLK_DEV_LOOP is not set | 533 | # CONFIG_BLK_DEV_LOOP is not set |
534 | # CONFIG_BLK_DEV_DRBD is not set | ||
464 | # CONFIG_BLK_DEV_NBD is not set | 535 | # CONFIG_BLK_DEV_NBD is not set |
465 | # CONFIG_BLK_DEV_SX8 is not set | 536 | # CONFIG_BLK_DEV_SX8 is not set |
466 | CONFIG_BLK_DEV_RAM=y | 537 | CONFIG_BLK_DEV_RAM=y |
@@ -473,12 +544,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
473 | # CONFIG_BLK_DEV_HD is not set | 544 | # CONFIG_BLK_DEV_HD is not set |
474 | CONFIG_MISC_DEVICES=y | 545 | CONFIG_MISC_DEVICES=y |
475 | # CONFIG_PHANTOM is not set | 546 | # CONFIG_PHANTOM is not set |
476 | # CONFIG_EEPROM_93CX6 is not set | ||
477 | # CONFIG_SGI_IOC4 is not set | 547 | # CONFIG_SGI_IOC4 is not set |
478 | # CONFIG_TIFM_CORE is not set | 548 | # CONFIG_TIFM_CORE is not set |
479 | # CONFIG_ENCLOSURE_SERVICES is not set | 549 | # CONFIG_ENCLOSURE_SERVICES is not set |
480 | # CONFIG_HP_ILO is not set | 550 | # CONFIG_HP_ILO is not set |
481 | # CONFIG_C2PORT is not set | 551 | # CONFIG_C2PORT is not set |
552 | |||
553 | # | ||
554 | # EEPROM support | ||
555 | # | ||
556 | # CONFIG_EEPROM_93CX6 is not set | ||
557 | # CONFIG_CB710_CORE is not set | ||
482 | CONFIG_HAVE_IDE=y | 558 | CONFIG_HAVE_IDE=y |
483 | # CONFIG_IDE is not set | 559 | # CONFIG_IDE is not set |
484 | 560 | ||
@@ -498,7 +574,11 @@ CONFIG_HAVE_IDE=y | |||
498 | # | 574 | # |
499 | 575 | ||
500 | # | 576 | # |
501 | # Enable only one of the two stacks, unless you know what you are doing | 577 | # You can enable one or both FireWire driver stacks. |
578 | # | ||
579 | |||
580 | # | ||
581 | # See the help texts for more information. | ||
502 | # | 582 | # |
503 | # CONFIG_FIREWIRE is not set | 583 | # CONFIG_FIREWIRE is not set |
504 | # CONFIG_IEEE1394 is not set | 584 | # CONFIG_IEEE1394 is not set |
@@ -519,6 +599,8 @@ CONFIG_NET_ETHERNET=y | |||
519 | # CONFIG_SUNGEM is not set | 599 | # CONFIG_SUNGEM is not set |
520 | # CONFIG_CASSINI is not set | 600 | # CONFIG_CASSINI is not set |
521 | # CONFIG_NET_VENDOR_3COM is not set | 601 | # CONFIG_NET_VENDOR_3COM is not set |
602 | # CONFIG_ETHOC is not set | ||
603 | # CONFIG_DNET is not set | ||
522 | # CONFIG_NET_TULIP is not set | 604 | # CONFIG_NET_TULIP is not set |
523 | # CONFIG_HP100 is not set | 605 | # CONFIG_HP100 is not set |
524 | CONFIG_IBM_NEW_EMAC=y | 606 | CONFIG_IBM_NEW_EMAC=y |
@@ -537,7 +619,10 @@ CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 | |||
537 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 619 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
538 | # CONFIG_NET_PCI is not set | 620 | # CONFIG_NET_PCI is not set |
539 | # CONFIG_B44 is not set | 621 | # CONFIG_B44 is not set |
622 | # CONFIG_KS8842 is not set | ||
623 | # CONFIG_KS8851_MLL is not set | ||
540 | # CONFIG_ATL2 is not set | 624 | # CONFIG_ATL2 is not set |
625 | # CONFIG_XILINX_EMACLITE is not set | ||
541 | CONFIG_NETDEV_1000=y | 626 | CONFIG_NETDEV_1000=y |
542 | # CONFIG_ACENIC is not set | 627 | # CONFIG_ACENIC is not set |
543 | # CONFIG_DL2K is not set | 628 | # CONFIG_DL2K is not set |
@@ -545,6 +630,7 @@ CONFIG_NETDEV_1000=y | |||
545 | # CONFIG_E1000E is not set | 630 | # CONFIG_E1000E is not set |
546 | # CONFIG_IP1000 is not set | 631 | # CONFIG_IP1000 is not set |
547 | # CONFIG_IGB is not set | 632 | # CONFIG_IGB is not set |
633 | # CONFIG_IGBVF is not set | ||
548 | # CONFIG_NS83820 is not set | 634 | # CONFIG_NS83820 is not set |
549 | # CONFIG_HAMACHI is not set | 635 | # CONFIG_HAMACHI is not set |
550 | # CONFIG_YELLOWFIN is not set | 636 | # CONFIG_YELLOWFIN is not set |
@@ -555,9 +641,13 @@ CONFIG_NETDEV_1000=y | |||
555 | # CONFIG_VIA_VELOCITY is not set | 641 | # CONFIG_VIA_VELOCITY is not set |
556 | # CONFIG_TIGON3 is not set | 642 | # CONFIG_TIGON3 is not set |
557 | # CONFIG_BNX2 is not set | 643 | # CONFIG_BNX2 is not set |
644 | # CONFIG_CNIC is not set | ||
645 | # CONFIG_MV643XX_ETH is not set | ||
646 | # CONFIG_XILINX_LL_TEMAC is not set | ||
558 | # CONFIG_QLA3XXX is not set | 647 | # CONFIG_QLA3XXX is not set |
559 | # CONFIG_ATL1 is not set | 648 | # CONFIG_ATL1 is not set |
560 | # CONFIG_ATL1E is not set | 649 | # CONFIG_ATL1E is not set |
650 | # CONFIG_ATL1C is not set | ||
561 | # CONFIG_JME is not set | 651 | # CONFIG_JME is not set |
562 | CONFIG_NETDEV_10000=y | 652 | CONFIG_NETDEV_10000=y |
563 | # CONFIG_CHELSIO_T1 is not set | 653 | # CONFIG_CHELSIO_T1 is not set |
@@ -567,6 +657,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
567 | # CONFIG_IXGBE is not set | 657 | # CONFIG_IXGBE is not set |
568 | # CONFIG_IXGB is not set | 658 | # CONFIG_IXGB is not set |
569 | # CONFIG_S2IO is not set | 659 | # CONFIG_S2IO is not set |
660 | # CONFIG_VXGE is not set | ||
570 | # CONFIG_MYRI10GE is not set | 661 | # CONFIG_MYRI10GE is not set |
571 | # CONFIG_NETXEN_NIC is not set | 662 | # CONFIG_NETXEN_NIC is not set |
572 | # CONFIG_NIU is not set | 663 | # CONFIG_NIU is not set |
@@ -576,14 +667,13 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
576 | # CONFIG_BNX2X is not set | 667 | # CONFIG_BNX2X is not set |
577 | # CONFIG_QLGE is not set | 668 | # CONFIG_QLGE is not set |
578 | # CONFIG_SFC is not set | 669 | # CONFIG_SFC is not set |
670 | # CONFIG_BE2NET is not set | ||
579 | # CONFIG_TR is not set | 671 | # CONFIG_TR is not set |
580 | 672 | CONFIG_WLAN=y | |
581 | # | 673 | # CONFIG_AIRO is not set |
582 | # Wireless LAN | 674 | # CONFIG_ATMEL is not set |
583 | # | 675 | # CONFIG_PRISM54 is not set |
584 | # CONFIG_WLAN_PRE80211 is not set | 676 | # CONFIG_HOSTAP is not set |
585 | # CONFIG_WLAN_80211 is not set | ||
586 | # CONFIG_IWLWIFI_LEDS is not set | ||
587 | 677 | ||
588 | # | 678 | # |
589 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 679 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -596,6 +686,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
596 | # CONFIG_NETCONSOLE is not set | 686 | # CONFIG_NETCONSOLE is not set |
597 | # CONFIG_NETPOLL is not set | 687 | # CONFIG_NETPOLL is not set |
598 | # CONFIG_NET_POLL_CONTROLLER is not set | 688 | # CONFIG_NET_POLL_CONTROLLER is not set |
689 | # CONFIG_VMXNET3 is not set | ||
599 | # CONFIG_ISDN is not set | 690 | # CONFIG_ISDN is not set |
600 | # CONFIG_PHONE is not set | 691 | # CONFIG_PHONE is not set |
601 | 692 | ||
@@ -641,6 +732,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
641 | # CONFIG_SERIAL_JSM is not set | 732 | # CONFIG_SERIAL_JSM is not set |
642 | CONFIG_SERIAL_OF_PLATFORM=y | 733 | CONFIG_SERIAL_OF_PLATFORM=y |
643 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 734 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
735 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
644 | CONFIG_UNIX98_PTYS=y | 736 | CONFIG_UNIX98_PTYS=y |
645 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 737 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
646 | CONFIG_LEGACY_PTYS=y | 738 | CONFIG_LEGACY_PTYS=y |
@@ -657,13 +749,17 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
657 | CONFIG_DEVPORT=y | 749 | CONFIG_DEVPORT=y |
658 | # CONFIG_I2C is not set | 750 | # CONFIG_I2C is not set |
659 | # CONFIG_SPI is not set | 751 | # CONFIG_SPI is not set |
752 | |||
753 | # | ||
754 | # PPS support | ||
755 | # | ||
756 | # CONFIG_PPS is not set | ||
660 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 757 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
661 | # CONFIG_GPIOLIB is not set | 758 | # CONFIG_GPIOLIB is not set |
662 | # CONFIG_W1 is not set | 759 | # CONFIG_W1 is not set |
663 | # CONFIG_POWER_SUPPLY is not set | 760 | # CONFIG_POWER_SUPPLY is not set |
664 | # CONFIG_HWMON is not set | 761 | # CONFIG_HWMON is not set |
665 | # CONFIG_THERMAL is not set | 762 | # CONFIG_THERMAL is not set |
666 | # CONFIG_THERMAL_HWMON is not set | ||
667 | # CONFIG_WATCHDOG is not set | 763 | # CONFIG_WATCHDOG is not set |
668 | CONFIG_SSB_POSSIBLE=y | 764 | CONFIG_SSB_POSSIBLE=y |
669 | 765 | ||
@@ -680,27 +776,13 @@ CONFIG_SSB_POSSIBLE=y | |||
680 | # CONFIG_HTC_PASIC3 is not set | 776 | # CONFIG_HTC_PASIC3 is not set |
681 | # CONFIG_MFD_TMIO is not set | 777 | # CONFIG_MFD_TMIO is not set |
682 | # CONFIG_REGULATOR is not set | 778 | # CONFIG_REGULATOR is not set |
683 | 779 | # CONFIG_MEDIA_SUPPORT is not set | |
684 | # | ||
685 | # Multimedia devices | ||
686 | # | ||
687 | |||
688 | # | ||
689 | # Multimedia core support | ||
690 | # | ||
691 | # CONFIG_VIDEO_DEV is not set | ||
692 | # CONFIG_DVB_CORE is not set | ||
693 | # CONFIG_VIDEO_MEDIA is not set | ||
694 | |||
695 | # | ||
696 | # Multimedia drivers | ||
697 | # | ||
698 | # CONFIG_DAB is not set | ||
699 | 780 | ||
700 | # | 781 | # |
701 | # Graphics support | 782 | # Graphics support |
702 | # | 783 | # |
703 | # CONFIG_AGP is not set | 784 | # CONFIG_AGP is not set |
785 | CONFIG_VGA_ARB=y | ||
704 | # CONFIG_DRM is not set | 786 | # CONFIG_DRM is not set |
705 | # CONFIG_VGASTATE is not set | 787 | # CONFIG_VGASTATE is not set |
706 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 788 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -722,7 +804,12 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
722 | # CONFIG_EDAC is not set | 804 | # CONFIG_EDAC is not set |
723 | # CONFIG_RTC_CLASS is not set | 805 | # CONFIG_RTC_CLASS is not set |
724 | # CONFIG_DMADEVICES is not set | 806 | # CONFIG_DMADEVICES is not set |
807 | # CONFIG_AUXDISPLAY is not set | ||
725 | # CONFIG_UIO is not set | 808 | # CONFIG_UIO is not set |
809 | |||
810 | # | ||
811 | # TI VLYNQ | ||
812 | # | ||
726 | # CONFIG_STAGING is not set | 813 | # CONFIG_STAGING is not set |
727 | 814 | ||
728 | # | 815 | # |
@@ -733,14 +820,17 @@ CONFIG_EXT2_FS=y | |||
733 | # CONFIG_EXT2_FS_XIP is not set | 820 | # CONFIG_EXT2_FS_XIP is not set |
734 | # CONFIG_EXT3_FS is not set | 821 | # CONFIG_EXT3_FS is not set |
735 | # CONFIG_EXT4_FS is not set | 822 | # CONFIG_EXT4_FS is not set |
823 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
736 | # CONFIG_REISERFS_FS is not set | 824 | # CONFIG_REISERFS_FS is not set |
737 | # CONFIG_JFS_FS is not set | 825 | # CONFIG_JFS_FS is not set |
738 | # CONFIG_FS_POSIX_ACL is not set | 826 | # CONFIG_FS_POSIX_ACL is not set |
739 | CONFIG_FILE_LOCKING=y | ||
740 | # CONFIG_XFS_FS is not set | 827 | # CONFIG_XFS_FS is not set |
741 | # CONFIG_GFS2_FS is not set | 828 | # CONFIG_GFS2_FS is not set |
742 | # CONFIG_OCFS2_FS is not set | 829 | # CONFIG_OCFS2_FS is not set |
743 | # CONFIG_BTRFS_FS is not set | 830 | # CONFIG_BTRFS_FS is not set |
831 | # CONFIG_NILFS2_FS is not set | ||
832 | CONFIG_FILE_LOCKING=y | ||
833 | CONFIG_FSNOTIFY=y | ||
744 | CONFIG_DNOTIFY=y | 834 | CONFIG_DNOTIFY=y |
745 | CONFIG_INOTIFY=y | 835 | CONFIG_INOTIFY=y |
746 | CONFIG_INOTIFY_USER=y | 836 | CONFIG_INOTIFY_USER=y |
@@ -750,6 +840,11 @@ CONFIG_INOTIFY_USER=y | |||
750 | # CONFIG_FUSE_FS is not set | 840 | # CONFIG_FUSE_FS is not set |
751 | 841 | ||
752 | # | 842 | # |
843 | # Caches | ||
844 | # | ||
845 | # CONFIG_FSCACHE is not set | ||
846 | |||
847 | # | ||
753 | # CD-ROM/DVD Filesystems | 848 | # CD-ROM/DVD Filesystems |
754 | # | 849 | # |
755 | # CONFIG_ISO9660_FS is not set | 850 | # CONFIG_ISO9660_FS is not set |
@@ -804,7 +899,6 @@ CONFIG_LOCKD=y | |||
804 | CONFIG_LOCKD_V4=y | 899 | CONFIG_LOCKD_V4=y |
805 | CONFIG_NFS_COMMON=y | 900 | CONFIG_NFS_COMMON=y |
806 | CONFIG_SUNRPC=y | 901 | CONFIG_SUNRPC=y |
807 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
808 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 902 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
809 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 903 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
810 | # CONFIG_SMB_FS is not set | 904 | # CONFIG_SMB_FS is not set |
@@ -820,6 +914,7 @@ CONFIG_SUNRPC=y | |||
820 | CONFIG_MSDOS_PARTITION=y | 914 | CONFIG_MSDOS_PARTITION=y |
821 | # CONFIG_NLS is not set | 915 | # CONFIG_NLS is not set |
822 | # CONFIG_DLM is not set | 916 | # CONFIG_DLM is not set |
917 | # CONFIG_BINARY_PRINTF is not set | ||
823 | 918 | ||
824 | # | 919 | # |
825 | # Library routines | 920 | # Library routines |
@@ -834,11 +929,13 @@ CONFIG_CRC32=y | |||
834 | # CONFIG_CRC7 is not set | 929 | # CONFIG_CRC7 is not set |
835 | # CONFIG_LIBCRC32C is not set | 930 | # CONFIG_LIBCRC32C is not set |
836 | CONFIG_ZLIB_INFLATE=y | 931 | CONFIG_ZLIB_INFLATE=y |
837 | CONFIG_PLIST=y | 932 | CONFIG_DECOMPRESS_GZIP=y |
838 | CONFIG_HAS_IOMEM=y | 933 | CONFIG_HAS_IOMEM=y |
839 | CONFIG_HAS_IOPORT=y | 934 | CONFIG_HAS_IOPORT=y |
840 | CONFIG_HAS_DMA=y | 935 | CONFIG_HAS_DMA=y |
841 | CONFIG_HAVE_LMB=y | 936 | CONFIG_HAVE_LMB=y |
937 | CONFIG_NLATTR=y | ||
938 | CONFIG_GENERIC_ATOMIC64=y | ||
842 | 939 | ||
843 | # | 940 | # |
844 | # Kernel hacking | 941 | # Kernel hacking |
@@ -848,6 +945,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
848 | CONFIG_ENABLE_MUST_CHECK=y | 945 | CONFIG_ENABLE_MUST_CHECK=y |
849 | CONFIG_FRAME_WARN=1024 | 946 | CONFIG_FRAME_WARN=1024 |
850 | CONFIG_MAGIC_SYSRQ=y | 947 | CONFIG_MAGIC_SYSRQ=y |
948 | # CONFIG_STRIP_ASM_SYMS is not set | ||
851 | # CONFIG_UNUSED_SYMBOLS is not set | 949 | # CONFIG_UNUSED_SYMBOLS is not set |
852 | CONFIG_DEBUG_FS=y | 950 | CONFIG_DEBUG_FS=y |
853 | # CONFIG_HEADERS_CHECK is not set | 951 | # CONFIG_HEADERS_CHECK is not set |
@@ -856,16 +954,23 @@ CONFIG_DEBUG_KERNEL=y | |||
856 | CONFIG_DETECT_SOFTLOCKUP=y | 954 | CONFIG_DETECT_SOFTLOCKUP=y |
857 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 955 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
858 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 956 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
957 | CONFIG_DETECT_HUNG_TASK=y | ||
958 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
959 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
859 | CONFIG_SCHED_DEBUG=y | 960 | CONFIG_SCHED_DEBUG=y |
860 | # CONFIG_SCHEDSTATS is not set | 961 | # CONFIG_SCHEDSTATS is not set |
861 | # CONFIG_TIMER_STATS is not set | 962 | # CONFIG_TIMER_STATS is not set |
862 | # CONFIG_DEBUG_OBJECTS is not set | 963 | # CONFIG_DEBUG_OBJECTS is not set |
863 | # CONFIG_SLUB_DEBUG_ON is not set | 964 | # CONFIG_SLUB_DEBUG_ON is not set |
864 | # CONFIG_SLUB_STATS is not set | 965 | # CONFIG_SLUB_STATS is not set |
966 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
865 | # CONFIG_DEBUG_RT_MUTEXES is not set | 967 | # CONFIG_DEBUG_RT_MUTEXES is not set |
866 | # CONFIG_RT_MUTEX_TESTER is not set | 968 | # CONFIG_RT_MUTEX_TESTER is not set |
867 | # CONFIG_DEBUG_SPINLOCK is not set | 969 | # CONFIG_DEBUG_SPINLOCK is not set |
868 | # CONFIG_DEBUG_MUTEXES is not set | 970 | # CONFIG_DEBUG_MUTEXES is not set |
971 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
972 | # CONFIG_PROVE_LOCKING is not set | ||
973 | # CONFIG_LOCK_STAT is not set | ||
869 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 974 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
870 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 975 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
871 | # CONFIG_DEBUG_KOBJECT is not set | 976 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -877,35 +982,45 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
877 | # CONFIG_DEBUG_LIST is not set | 982 | # CONFIG_DEBUG_LIST is not set |
878 | # CONFIG_DEBUG_SG is not set | 983 | # CONFIG_DEBUG_SG is not set |
879 | # CONFIG_DEBUG_NOTIFIERS is not set | 984 | # CONFIG_DEBUG_NOTIFIERS is not set |
880 | # CONFIG_BOOT_PRINTK_DELAY is not set | 985 | # CONFIG_DEBUG_CREDENTIALS is not set |
881 | # CONFIG_RCU_TORTURE_TEST is not set | 986 | # CONFIG_RCU_TORTURE_TEST is not set |
882 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 987 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
883 | # CONFIG_BACKTRACE_SELF_TEST is not set | 988 | # CONFIG_BACKTRACE_SELF_TEST is not set |
884 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 989 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
990 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
885 | # CONFIG_FAULT_INJECTION is not set | 991 | # CONFIG_FAULT_INJECTION is not set |
886 | # CONFIG_LATENCYTOP is not set | 992 | # CONFIG_LATENCYTOP is not set |
887 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 993 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
994 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
888 | CONFIG_HAVE_FUNCTION_TRACER=y | 995 | CONFIG_HAVE_FUNCTION_TRACER=y |
996 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
889 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 997 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
890 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 998 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
891 | 999 | CONFIG_TRACING_SUPPORT=y | |
892 | # | 1000 | CONFIG_FTRACE=y |
893 | # Tracers | ||
894 | # | ||
895 | # CONFIG_FUNCTION_TRACER is not set | 1001 | # CONFIG_FUNCTION_TRACER is not set |
1002 | # CONFIG_IRQSOFF_TRACER is not set | ||
896 | # CONFIG_SCHED_TRACER is not set | 1003 | # CONFIG_SCHED_TRACER is not set |
897 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1004 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
898 | # CONFIG_BOOT_TRACER is not set | 1005 | # CONFIG_BOOT_TRACER is not set |
899 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1006 | CONFIG_BRANCH_PROFILE_NONE=y |
1007 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1008 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
900 | # CONFIG_STACK_TRACER is not set | 1009 | # CONFIG_STACK_TRACER is not set |
901 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1010 | # CONFIG_KMEMTRACE is not set |
1011 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1012 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1013 | # CONFIG_DYNAMIC_DEBUG is not set | ||
1014 | # CONFIG_DMA_API_DEBUG is not set | ||
902 | # CONFIG_SAMPLES is not set | 1015 | # CONFIG_SAMPLES is not set |
903 | CONFIG_HAVE_ARCH_KGDB=y | 1016 | CONFIG_HAVE_ARCH_KGDB=y |
904 | # CONFIG_KGDB is not set | 1017 | # CONFIG_KGDB is not set |
1018 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1019 | CONFIG_PPC_WERROR=y | ||
905 | CONFIG_PRINT_STACK_DEPTH=64 | 1020 | CONFIG_PRINT_STACK_DEPTH=64 |
906 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1021 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
907 | # CONFIG_DEBUG_STACK_USAGE is not set | 1022 | # CONFIG_DEBUG_STACK_USAGE is not set |
908 | # CONFIG_DEBUG_PAGEALLOC is not set | 1023 | # CONFIG_PPC_EMULATED_STATS is not set |
909 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1024 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
910 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1025 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
911 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1026 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -921,13 +1036,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
921 | # CONFIG_KEYS is not set | 1036 | # CONFIG_KEYS is not set |
922 | # CONFIG_SECURITY is not set | 1037 | # CONFIG_SECURITY is not set |
923 | # CONFIG_SECURITYFS is not set | 1038 | # CONFIG_SECURITYFS is not set |
924 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1039 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1040 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1041 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1042 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1043 | CONFIG_DEFAULT_SECURITY="" | ||
925 | CONFIG_CRYPTO=y | 1044 | CONFIG_CRYPTO=y |
926 | 1045 | ||
927 | # | 1046 | # |
928 | # Crypto core or helper | 1047 | # Crypto core or helper |
929 | # | 1048 | # |
930 | # CONFIG_CRYPTO_FIPS is not set | ||
931 | CONFIG_CRYPTO_ALGAPI=y | 1049 | CONFIG_CRYPTO_ALGAPI=y |
932 | CONFIG_CRYPTO_ALGAPI2=y | 1050 | CONFIG_CRYPTO_ALGAPI2=y |
933 | CONFIG_CRYPTO_AEAD2=y | 1051 | CONFIG_CRYPTO_AEAD2=y |
@@ -936,10 +1054,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
936 | CONFIG_CRYPTO_HASH=y | 1054 | CONFIG_CRYPTO_HASH=y |
937 | CONFIG_CRYPTO_HASH2=y | 1055 | CONFIG_CRYPTO_HASH2=y |
938 | CONFIG_CRYPTO_RNG2=y | 1056 | CONFIG_CRYPTO_RNG2=y |
1057 | CONFIG_CRYPTO_PCOMP=y | ||
939 | CONFIG_CRYPTO_MANAGER=y | 1058 | CONFIG_CRYPTO_MANAGER=y |
940 | CONFIG_CRYPTO_MANAGER2=y | 1059 | CONFIG_CRYPTO_MANAGER2=y |
941 | # CONFIG_CRYPTO_GF128MUL is not set | 1060 | # CONFIG_CRYPTO_GF128MUL is not set |
942 | # CONFIG_CRYPTO_NULL is not set | 1061 | # CONFIG_CRYPTO_NULL is not set |
1062 | CONFIG_CRYPTO_WORKQUEUE=y | ||
943 | # CONFIG_CRYPTO_CRYPTD is not set | 1063 | # CONFIG_CRYPTO_CRYPTD is not set |
944 | # CONFIG_CRYPTO_AUTHENC is not set | 1064 | # CONFIG_CRYPTO_AUTHENC is not set |
945 | # CONFIG_CRYPTO_TEST is not set | 1065 | # CONFIG_CRYPTO_TEST is not set |
@@ -967,11 +1087,13 @@ CONFIG_CRYPTO_PCBC=y | |||
967 | # | 1087 | # |
968 | # CONFIG_CRYPTO_HMAC is not set | 1088 | # CONFIG_CRYPTO_HMAC is not set |
969 | # CONFIG_CRYPTO_XCBC is not set | 1089 | # CONFIG_CRYPTO_XCBC is not set |
1090 | # CONFIG_CRYPTO_VMAC is not set | ||
970 | 1091 | ||
971 | # | 1092 | # |
972 | # Digest | 1093 | # Digest |
973 | # | 1094 | # |
974 | # CONFIG_CRYPTO_CRC32C is not set | 1095 | # CONFIG_CRYPTO_CRC32C is not set |
1096 | # CONFIG_CRYPTO_GHASH is not set | ||
975 | # CONFIG_CRYPTO_MD4 is not set | 1097 | # CONFIG_CRYPTO_MD4 is not set |
976 | CONFIG_CRYPTO_MD5=y | 1098 | CONFIG_CRYPTO_MD5=y |
977 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1099 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1008,6 +1130,7 @@ CONFIG_CRYPTO_DES=y | |||
1008 | # Compression | 1130 | # Compression |
1009 | # | 1131 | # |
1010 | # CONFIG_CRYPTO_DEFLATE is not set | 1132 | # CONFIG_CRYPTO_DEFLATE is not set |
1133 | # CONFIG_CRYPTO_ZLIB is not set | ||
1011 | # CONFIG_CRYPTO_LZO is not set | 1134 | # CONFIG_CRYPTO_LZO is not set |
1012 | 1135 | ||
1013 | # | 1136 | # |
@@ -1016,5 +1139,6 @@ CONFIG_CRYPTO_DES=y | |||
1016 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1139 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
1017 | CONFIG_CRYPTO_HW=y | 1140 | CONFIG_CRYPTO_HW=y |
1018 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1141 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1142 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
1019 | # CONFIG_PPC_CLOCK is not set | 1143 | # CONFIG_PPC_CLOCK is not set |
1020 | # CONFIG_VIRTUALIZATION is not set | 1144 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig index 9a05ec0ec312..19fbcb075376 100644 --- a/arch/powerpc/configs/40x/kilauea_defconfig +++ b/arch/powerpc/configs/40x/kilauea_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.31-rc4 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Wed Jul 29 13:28:37 2009 | 4 | # Mon Jan 4 15:51:23 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_40x=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_4xx=y | 17 | CONFIG_4xx=y |
18 | CONFIG_PPC_MMU_NOHASH=y | 18 | CONFIG_PPC_MMU_NOHASH=y |
19 | CONFIG_PPC_MMU_NOHASH_32=y | ||
19 | # CONFIG_PPC_MM_SLICES is not set | 20 | # CONFIG_PPC_MM_SLICES is not set |
20 | CONFIG_NOT_COHERENT_CACHE=y | 21 | CONFIG_NOT_COHERENT_CACHE=y |
21 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
@@ -29,7 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
29 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 31 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
32 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_NR_IRQS=512 | ||
33 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 38 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
@@ -52,6 +55,7 @@ CONFIG_AUDIT_ARCH=y | |||
52 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DTC=y | 56 | CONFIG_DTC=y |
54 | # CONFIG_DEFAULT_UIMAGE is not set | 57 | # CONFIG_DEFAULT_UIMAGE is not set |
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
55 | CONFIG_PPC_DCR_NATIVE=y | 59 | CONFIG_PPC_DCR_NATIVE=y |
56 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
57 | CONFIG_PPC_DCR=y | 61 | CONFIG_PPC_DCR=y |
@@ -79,11 +83,13 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y | |||
79 | # | 83 | # |
80 | # RCU Subsystem | 84 | # RCU Subsystem |
81 | # | 85 | # |
82 | CONFIG_CLASSIC_RCU=y | 86 | CONFIG_TREE_RCU=y |
83 | # CONFIG_TREE_RCU is not set | 87 | # CONFIG_TREE_PREEMPT_RCU is not set |
84 | # CONFIG_PREEMPT_RCU is not set | 88 | # CONFIG_TINY_RCU is not set |
89 | # CONFIG_RCU_TRACE is not set | ||
90 | CONFIG_RCU_FANOUT=32 | ||
91 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
85 | # CONFIG_TREE_RCU_TRACE is not set | 92 | # CONFIG_TREE_RCU_TRACE is not set |
86 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
87 | # CONFIG_IKCONFIG is not set | 93 | # CONFIG_IKCONFIG is not set |
88 | CONFIG_LOG_BUF_SHIFT=14 | 94 | CONFIG_LOG_BUF_SHIFT=14 |
89 | CONFIG_GROUP_SCHED=y | 95 | CONFIG_GROUP_SCHED=y |
@@ -121,22 +127,21 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
124 | CONFIG_HAVE_PERF_COUNTERS=y | 130 | CONFIG_HAVE_PERF_EVENTS=y |
125 | 131 | ||
126 | # | 132 | # |
127 | # Performance Counters | 133 | # Kernel Performance Events And Counters |
128 | # | 134 | # |
135 | # CONFIG_PERF_EVENTS is not set | ||
129 | # CONFIG_PERF_COUNTERS is not set | 136 | # CONFIG_PERF_COUNTERS is not set |
130 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
131 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
132 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
133 | # CONFIG_STRIP_ASM_SYMS is not set | ||
134 | CONFIG_COMPAT_BRK=y | 140 | CONFIG_COMPAT_BRK=y |
135 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
136 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
137 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
138 | # CONFIG_PROFILING is not set | 144 | # CONFIG_PROFILING is not set |
139 | # CONFIG_MARKERS is not set | ||
140 | CONFIG_HAVE_OPROFILE=y | 145 | CONFIG_HAVE_OPROFILE=y |
141 | # CONFIG_KPROBES is not set | 146 | # CONFIG_KPROBES is not set |
142 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 147 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
@@ -144,6 +149,8 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
144 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
145 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
146 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
147 | 154 | ||
148 | # | 155 | # |
149 | # GCOV-based kernel profiling | 156 | # GCOV-based kernel profiling |
@@ -169,14 +176,41 @@ CONFIG_LBDAF=y | |||
169 | # IO Schedulers | 176 | # IO Schedulers |
170 | # | 177 | # |
171 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
172 | CONFIG_IOSCHED_AS=y | ||
173 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
174 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
175 | CONFIG_DEFAULT_AS=y | ||
176 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
177 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
178 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
179 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
187 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
180 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
181 | CONFIG_PPC4xx_PCI_EXPRESS=y | 215 | CONFIG_PPC4xx_PCI_EXPRESS=y |
182 | 216 | ||
@@ -190,6 +224,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y | |||
190 | # CONFIG_ACADIA is not set | 224 | # CONFIG_ACADIA is not set |
191 | # CONFIG_EP405 is not set | 225 | # CONFIG_EP405 is not set |
192 | # CONFIG_HCU4 is not set | 226 | # CONFIG_HCU4 is not set |
227 | # CONFIG_HOTFOOT is not set | ||
193 | CONFIG_KILAUEA=y | 228 | CONFIG_KILAUEA=y |
194 | # CONFIG_MAKALU is not set | 229 | # CONFIG_MAKALU is not set |
195 | # CONFIG_WALNUT is not set | 230 | # CONFIG_WALNUT is not set |
@@ -233,10 +268,11 @@ CONFIG_BINFMT_ELF=y | |||
233 | # CONFIG_MATH_EMULATION is not set | 268 | # CONFIG_MATH_EMULATION is not set |
234 | # CONFIG_IOMMU_HELPER is not set | 269 | # CONFIG_IOMMU_HELPER is not set |
235 | # CONFIG_SWIOTLB is not set | 270 | # CONFIG_SWIOTLB is not set |
236 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 271 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 272 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 273 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
274 | CONFIG_SPARSE_IRQ=y | ||
275 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
240 | CONFIG_ARCH_FLATMEM_ENABLE=y | 276 | CONFIG_ARCH_FLATMEM_ENABLE=y |
241 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 277 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
242 | CONFIG_SELECT_MEMORY_MODEL=y | 278 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -252,8 +288,7 @@ CONFIG_MIGRATION=y | |||
252 | CONFIG_ZONE_DMA_FLAG=1 | 288 | CONFIG_ZONE_DMA_FLAG=1 |
253 | CONFIG_BOUNCE=y | 289 | CONFIG_BOUNCE=y |
254 | CONFIG_VIRT_TO_BUS=y | 290 | CONFIG_VIRT_TO_BUS=y |
255 | CONFIG_HAVE_MLOCK=y | 291 | # CONFIG_KSM is not set |
256 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
257 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 292 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
258 | CONFIG_PPC_4K_PAGES=y | 293 | CONFIG_PPC_4K_PAGES=y |
259 | # CONFIG_PPC_16K_PAGES is not set | 294 | # CONFIG_PPC_16K_PAGES is not set |
@@ -343,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
343 | # CONFIG_NETFILTER is not set | 378 | # CONFIG_NETFILTER is not set |
344 | # CONFIG_IP_DCCP is not set | 379 | # CONFIG_IP_DCCP is not set |
345 | # CONFIG_IP_SCTP is not set | 380 | # CONFIG_IP_SCTP is not set |
381 | # CONFIG_RDS is not set | ||
346 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
347 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
348 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
@@ -370,7 +406,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
370 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
371 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
372 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
373 | # CONFIG_WIRELESS is not set | 409 | CONFIG_WIRELESS=y |
410 | # CONFIG_CFG80211 is not set | ||
411 | # CONFIG_LIB80211 is not set | ||
412 | |||
413 | # | ||
414 | # CFG80211 needs to be enabled for MAC80211 | ||
415 | # | ||
374 | # CONFIG_WIMAX is not set | 416 | # CONFIG_WIMAX is not set |
375 | # CONFIG_RFKILL is not set | 417 | # CONFIG_RFKILL is not set |
376 | # CONFIG_NET_9P is not set | 418 | # CONFIG_NET_9P is not set |
@@ -383,6 +425,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
383 | # Generic Driver Options | 425 | # Generic Driver Options |
384 | # | 426 | # |
385 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 427 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
428 | # CONFIG_DEVTMPFS is not set | ||
386 | CONFIG_STANDALONE=y | 429 | CONFIG_STANDALONE=y |
387 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 430 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
388 | CONFIG_FW_LOADER=y | 431 | CONFIG_FW_LOADER=y |
@@ -395,9 +438,9 @@ CONFIG_CONNECTOR=y | |||
395 | CONFIG_PROC_EVENTS=y | 438 | CONFIG_PROC_EVENTS=y |
396 | CONFIG_MTD=y | 439 | CONFIG_MTD=y |
397 | # CONFIG_MTD_DEBUG is not set | 440 | # CONFIG_MTD_DEBUG is not set |
441 | # CONFIG_MTD_TESTS is not set | ||
398 | # CONFIG_MTD_CONCAT is not set | 442 | # CONFIG_MTD_CONCAT is not set |
399 | CONFIG_MTD_PARTITIONS=y | 443 | CONFIG_MTD_PARTITIONS=y |
400 | # CONFIG_MTD_TESTS is not set | ||
401 | # CONFIG_MTD_REDBOOT_PARTS is not set | 444 | # CONFIG_MTD_REDBOOT_PARTS is not set |
402 | CONFIG_MTD_CMDLINE_PARTS=y | 445 | CONFIG_MTD_CMDLINE_PARTS=y |
403 | CONFIG_MTD_OF_PARTS=y | 446 | CONFIG_MTD_OF_PARTS=y |
@@ -498,6 +541,7 @@ CONFIG_BLK_DEV=y | |||
498 | # CONFIG_BLK_DEV_UMEM is not set | 541 | # CONFIG_BLK_DEV_UMEM is not set |
499 | # CONFIG_BLK_DEV_COW_COMMON is not set | 542 | # CONFIG_BLK_DEV_COW_COMMON is not set |
500 | # CONFIG_BLK_DEV_LOOP is not set | 543 | # CONFIG_BLK_DEV_LOOP is not set |
544 | # CONFIG_BLK_DEV_DRBD is not set | ||
501 | # CONFIG_BLK_DEV_NBD is not set | 545 | # CONFIG_BLK_DEV_NBD is not set |
502 | # CONFIG_BLK_DEV_SX8 is not set | 546 | # CONFIG_BLK_DEV_SX8 is not set |
503 | CONFIG_BLK_DEV_RAM=y | 547 | CONFIG_BLK_DEV_RAM=y |
@@ -574,16 +618,17 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
574 | # CONFIG_NET_PCI is not set | 618 | # CONFIG_NET_PCI is not set |
575 | # CONFIG_B44 is not set | 619 | # CONFIG_B44 is not set |
576 | # CONFIG_KS8842 is not set | 620 | # CONFIG_KS8842 is not set |
621 | # CONFIG_KS8851_MLL is not set | ||
577 | # CONFIG_ATL2 is not set | 622 | # CONFIG_ATL2 is not set |
623 | # CONFIG_XILINX_EMACLITE is not set | ||
578 | # CONFIG_NETDEV_1000 is not set | 624 | # CONFIG_NETDEV_1000 is not set |
579 | # CONFIG_NETDEV_10000 is not set | 625 | # CONFIG_NETDEV_10000 is not set |
580 | # CONFIG_TR is not set | 626 | # CONFIG_TR is not set |
581 | 627 | CONFIG_WLAN=y | |
582 | # | 628 | # CONFIG_AIRO is not set |
583 | # Wireless LAN | 629 | # CONFIG_ATMEL is not set |
584 | # | 630 | # CONFIG_PRISM54 is not set |
585 | # CONFIG_WLAN_PRE80211 is not set | 631 | # CONFIG_HOSTAP is not set |
586 | # CONFIG_WLAN_80211 is not set | ||
587 | 632 | ||
588 | # | 633 | # |
589 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 634 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -596,6 +641,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
596 | # CONFIG_NETCONSOLE is not set | 641 | # CONFIG_NETCONSOLE is not set |
597 | # CONFIG_NETPOLL is not set | 642 | # CONFIG_NETPOLL is not set |
598 | # CONFIG_NET_POLL_CONTROLLER is not set | 643 | # CONFIG_NET_POLL_CONTROLLER is not set |
644 | # CONFIG_VMXNET3 is not set | ||
599 | # CONFIG_ISDN is not set | 645 | # CONFIG_ISDN is not set |
600 | # CONFIG_PHONE is not set | 646 | # CONFIG_PHONE is not set |
601 | 647 | ||
@@ -641,6 +687,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
641 | # CONFIG_SERIAL_JSM is not set | 687 | # CONFIG_SERIAL_JSM is not set |
642 | CONFIG_SERIAL_OF_PLATFORM=y | 688 | CONFIG_SERIAL_OF_PLATFORM=y |
643 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 689 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
690 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
644 | CONFIG_UNIX98_PTYS=y | 691 | CONFIG_UNIX98_PTYS=y |
645 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 692 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
646 | CONFIG_LEGACY_PTYS=y | 693 | CONFIG_LEGACY_PTYS=y |
@@ -656,6 +703,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
656 | CONFIG_DEVPORT=y | 703 | CONFIG_DEVPORT=y |
657 | CONFIG_I2C=y | 704 | CONFIG_I2C=y |
658 | CONFIG_I2C_BOARDINFO=y | 705 | CONFIG_I2C_BOARDINFO=y |
706 | CONFIG_I2C_COMPAT=y | ||
659 | CONFIG_I2C_CHARDEV=y | 707 | CONFIG_I2C_CHARDEV=y |
660 | CONFIG_I2C_HELPER_AUTO=y | 708 | CONFIG_I2C_HELPER_AUTO=y |
661 | 709 | ||
@@ -696,11 +744,6 @@ CONFIG_I2C_IBM_IIC=y | |||
696 | # CONFIG_I2C_TAOS_EVM is not set | 744 | # CONFIG_I2C_TAOS_EVM is not set |
697 | 745 | ||
698 | # | 746 | # |
699 | # Graphics adapter I2C/DDC channel drivers | ||
700 | # | ||
701 | # CONFIG_I2C_VOODOO3 is not set | ||
702 | |||
703 | # | ||
704 | # Other I2C/SMBus bus drivers | 747 | # Other I2C/SMBus bus drivers |
705 | # | 748 | # |
706 | # CONFIG_I2C_PCA_PLATFORM is not set | 749 | # CONFIG_I2C_PCA_PLATFORM is not set |
@@ -709,10 +752,6 @@ CONFIG_I2C_IBM_IIC=y | |||
709 | # | 752 | # |
710 | # Miscellaneous I2C Chip support | 753 | # Miscellaneous I2C Chip support |
711 | # | 754 | # |
712 | # CONFIG_DS1682 is not set | ||
713 | # CONFIG_SENSORS_PCF8574 is not set | ||
714 | # CONFIG_PCF8575 is not set | ||
715 | # CONFIG_SENSORS_PCA9539 is not set | ||
716 | # CONFIG_SENSORS_TSL2550 is not set | 755 | # CONFIG_SENSORS_TSL2550 is not set |
717 | # CONFIG_I2C_DEBUG_CORE is not set | 756 | # CONFIG_I2C_DEBUG_CORE is not set |
718 | # CONFIG_I2C_DEBUG_ALGO is not set | 757 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -730,6 +769,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
730 | # CONFIG_POWER_SUPPLY is not set | 769 | # CONFIG_POWER_SUPPLY is not set |
731 | CONFIG_HWMON=y | 770 | CONFIG_HWMON=y |
732 | # CONFIG_HWMON_VID is not set | 771 | # CONFIG_HWMON_VID is not set |
772 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
773 | |||
774 | # | ||
775 | # Native drivers | ||
776 | # | ||
733 | # CONFIG_SENSORS_AD7414 is not set | 777 | # CONFIG_SENSORS_AD7414 is not set |
734 | # CONFIG_SENSORS_AD7418 is not set | 778 | # CONFIG_SENSORS_AD7418 is not set |
735 | # CONFIG_SENSORS_ADM1021 is not set | 779 | # CONFIG_SENSORS_ADM1021 is not set |
@@ -753,6 +797,7 @@ CONFIG_HWMON=y | |||
753 | # CONFIG_SENSORS_GL520SM is not set | 797 | # CONFIG_SENSORS_GL520SM is not set |
754 | # CONFIG_SENSORS_IT87 is not set | 798 | # CONFIG_SENSORS_IT87 is not set |
755 | # CONFIG_SENSORS_LM63 is not set | 799 | # CONFIG_SENSORS_LM63 is not set |
800 | # CONFIG_SENSORS_LM73 is not set | ||
756 | CONFIG_SENSORS_LM75=y | 801 | CONFIG_SENSORS_LM75=y |
757 | # CONFIG_SENSORS_LM77 is not set | 802 | # CONFIG_SENSORS_LM77 is not set |
758 | # CONFIG_SENSORS_LM78 is not set | 803 | # CONFIG_SENSORS_LM78 is not set |
@@ -779,6 +824,7 @@ CONFIG_SENSORS_LM75=y | |||
779 | # CONFIG_SENSORS_ADS7828 is not set | 824 | # CONFIG_SENSORS_ADS7828 is not set |
780 | # CONFIG_SENSORS_THMC50 is not set | 825 | # CONFIG_SENSORS_THMC50 is not set |
781 | # CONFIG_SENSORS_TMP401 is not set | 826 | # CONFIG_SENSORS_TMP401 is not set |
827 | # CONFIG_SENSORS_TMP421 is not set | ||
782 | # CONFIG_SENSORS_VIA686A is not set | 828 | # CONFIG_SENSORS_VIA686A is not set |
783 | # CONFIG_SENSORS_VT1211 is not set | 829 | # CONFIG_SENSORS_VT1211 is not set |
784 | # CONFIG_SENSORS_VT8231 is not set | 830 | # CONFIG_SENSORS_VT8231 is not set |
@@ -790,7 +836,6 @@ CONFIG_SENSORS_LM75=y | |||
790 | # CONFIG_SENSORS_W83L786NG is not set | 836 | # CONFIG_SENSORS_W83L786NG is not set |
791 | # CONFIG_SENSORS_W83627HF is not set | 837 | # CONFIG_SENSORS_W83627HF is not set |
792 | # CONFIG_SENSORS_W83627EHF is not set | 838 | # CONFIG_SENSORS_W83627EHF is not set |
793 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
794 | CONFIG_THERMAL=y | 839 | CONFIG_THERMAL=y |
795 | # CONFIG_THERMAL_HWMON is not set | 840 | # CONFIG_THERMAL_HWMON is not set |
796 | # CONFIG_WATCHDOG is not set | 841 | # CONFIG_WATCHDOG is not set |
@@ -810,10 +855,13 @@ CONFIG_SSB_POSSIBLE=y | |||
810 | # CONFIG_TWL4030_CORE is not set | 855 | # CONFIG_TWL4030_CORE is not set |
811 | # CONFIG_MFD_TMIO is not set | 856 | # CONFIG_MFD_TMIO is not set |
812 | # CONFIG_PMIC_DA903X is not set | 857 | # CONFIG_PMIC_DA903X is not set |
858 | # CONFIG_PMIC_ADP5520 is not set | ||
813 | # CONFIG_MFD_WM8400 is not set | 859 | # CONFIG_MFD_WM8400 is not set |
860 | # CONFIG_MFD_WM831X is not set | ||
814 | # CONFIG_MFD_WM8350_I2C is not set | 861 | # CONFIG_MFD_WM8350_I2C is not set |
815 | # CONFIG_MFD_PCF50633 is not set | 862 | # CONFIG_MFD_PCF50633 is not set |
816 | # CONFIG_AB3100_CORE is not set | 863 | # CONFIG_AB3100_CORE is not set |
864 | # CONFIG_MFD_88PM8607 is not set | ||
817 | # CONFIG_REGULATOR is not set | 865 | # CONFIG_REGULATOR is not set |
818 | # CONFIG_MEDIA_SUPPORT is not set | 866 | # CONFIG_MEDIA_SUPPORT is not set |
819 | 867 | ||
@@ -821,6 +869,7 @@ CONFIG_SSB_POSSIBLE=y | |||
821 | # Graphics support | 869 | # Graphics support |
822 | # | 870 | # |
823 | # CONFIG_AGP is not set | 871 | # CONFIG_AGP is not set |
872 | CONFIG_VGA_ARB=y | ||
824 | # CONFIG_DRM is not set | 873 | # CONFIG_DRM is not set |
825 | # CONFIG_VGASTATE is not set | 874 | # CONFIG_VGASTATE is not set |
826 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 875 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
@@ -868,6 +917,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
868 | # CONFIG_RTC_DRV_PCF8563 is not set | 917 | # CONFIG_RTC_DRV_PCF8563 is not set |
869 | # CONFIG_RTC_DRV_PCF8583 is not set | 918 | # CONFIG_RTC_DRV_PCF8583 is not set |
870 | # CONFIG_RTC_DRV_M41T80 is not set | 919 | # CONFIG_RTC_DRV_M41T80 is not set |
920 | # CONFIG_RTC_DRV_BQ32K is not set | ||
871 | # CONFIG_RTC_DRV_S35390A is not set | 921 | # CONFIG_RTC_DRV_S35390A is not set |
872 | # CONFIG_RTC_DRV_FM3130 is not set | 922 | # CONFIG_RTC_DRV_FM3130 is not set |
873 | # CONFIG_RTC_DRV_RX8581 is not set | 923 | # CONFIG_RTC_DRV_RX8581 is not set |
@@ -889,7 +939,9 @@ CONFIG_RTC_DRV_DS1307=y | |||
889 | # CONFIG_RTC_DRV_M48T86 is not set | 939 | # CONFIG_RTC_DRV_M48T86 is not set |
890 | # CONFIG_RTC_DRV_M48T35 is not set | 940 | # CONFIG_RTC_DRV_M48T35 is not set |
891 | # CONFIG_RTC_DRV_M48T59 is not set | 941 | # CONFIG_RTC_DRV_M48T59 is not set |
942 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
892 | # CONFIG_RTC_DRV_BQ4802 is not set | 943 | # CONFIG_RTC_DRV_BQ4802 is not set |
944 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
893 | # CONFIG_RTC_DRV_V3020 is not set | 945 | # CONFIG_RTC_DRV_V3020 is not set |
894 | 946 | ||
895 | # | 947 | # |
@@ -913,6 +965,7 @@ CONFIG_EXT2_FS=y | |||
913 | # CONFIG_EXT2_FS_XIP is not set | 965 | # CONFIG_EXT2_FS_XIP is not set |
914 | # CONFIG_EXT3_FS is not set | 966 | # CONFIG_EXT3_FS is not set |
915 | # CONFIG_EXT4_FS is not set | 967 | # CONFIG_EXT4_FS is not set |
968 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
916 | # CONFIG_REISERFS_FS is not set | 969 | # CONFIG_REISERFS_FS is not set |
917 | # CONFIG_JFS_FS is not set | 970 | # CONFIG_JFS_FS is not set |
918 | # CONFIG_FS_POSIX_ACL is not set | 971 | # CONFIG_FS_POSIX_ACL is not set |
@@ -920,6 +973,7 @@ CONFIG_EXT2_FS=y | |||
920 | # CONFIG_GFS2_FS is not set | 973 | # CONFIG_GFS2_FS is not set |
921 | # CONFIG_OCFS2_FS is not set | 974 | # CONFIG_OCFS2_FS is not set |
922 | # CONFIG_BTRFS_FS is not set | 975 | # CONFIG_BTRFS_FS is not set |
976 | # CONFIG_NILFS2_FS is not set | ||
923 | CONFIG_FILE_LOCKING=y | 977 | CONFIG_FILE_LOCKING=y |
924 | CONFIG_FSNOTIFY=y | 978 | CONFIG_FSNOTIFY=y |
925 | CONFIG_DNOTIFY=y | 979 | CONFIG_DNOTIFY=y |
@@ -979,7 +1033,6 @@ CONFIG_CRAMFS=y | |||
979 | # CONFIG_ROMFS_FS is not set | 1033 | # CONFIG_ROMFS_FS is not set |
980 | # CONFIG_SYSV_FS is not set | 1034 | # CONFIG_SYSV_FS is not set |
981 | # CONFIG_UFS_FS is not set | 1035 | # CONFIG_UFS_FS is not set |
982 | # CONFIG_NILFS2_FS is not set | ||
983 | CONFIG_NETWORK_FILESYSTEMS=y | 1036 | CONFIG_NETWORK_FILESYSTEMS=y |
984 | CONFIG_NFS_FS=y | 1037 | CONFIG_NFS_FS=y |
985 | CONFIG_NFS_V3=y | 1038 | CONFIG_NFS_V3=y |
@@ -1037,6 +1090,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
1037 | CONFIG_ENABLE_MUST_CHECK=y | 1090 | CONFIG_ENABLE_MUST_CHECK=y |
1038 | CONFIG_FRAME_WARN=1024 | 1091 | CONFIG_FRAME_WARN=1024 |
1039 | CONFIG_MAGIC_SYSRQ=y | 1092 | CONFIG_MAGIC_SYSRQ=y |
1093 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1040 | # CONFIG_UNUSED_SYMBOLS is not set | 1094 | # CONFIG_UNUSED_SYMBOLS is not set |
1041 | CONFIG_DEBUG_FS=y | 1095 | CONFIG_DEBUG_FS=y |
1042 | # CONFIG_HEADERS_CHECK is not set | 1096 | # CONFIG_HEADERS_CHECK is not set |
@@ -1054,6 +1108,7 @@ CONFIG_SCHED_DEBUG=y | |||
1054 | # CONFIG_DEBUG_OBJECTS is not set | 1108 | # CONFIG_DEBUG_OBJECTS is not set |
1055 | # CONFIG_SLUB_DEBUG_ON is not set | 1109 | # CONFIG_SLUB_DEBUG_ON is not set |
1056 | # CONFIG_SLUB_STATS is not set | 1110 | # CONFIG_SLUB_STATS is not set |
1111 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
1057 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1112 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1058 | # CONFIG_RT_MUTEX_TESTER is not set | 1113 | # CONFIG_RT_MUTEX_TESTER is not set |
1059 | # CONFIG_DEBUG_SPINLOCK is not set | 1114 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1072,10 +1127,12 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1072 | # CONFIG_DEBUG_LIST is not set | 1127 | # CONFIG_DEBUG_LIST is not set |
1073 | # CONFIG_DEBUG_SG is not set | 1128 | # CONFIG_DEBUG_SG is not set |
1074 | # CONFIG_DEBUG_NOTIFIERS is not set | 1129 | # CONFIG_DEBUG_NOTIFIERS is not set |
1130 | # CONFIG_DEBUG_CREDENTIALS is not set | ||
1075 | # CONFIG_RCU_TORTURE_TEST is not set | 1131 | # CONFIG_RCU_TORTURE_TEST is not set |
1076 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1132 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1077 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1133 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1078 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1134 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1135 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1079 | # CONFIG_FAULT_INJECTION is not set | 1136 | # CONFIG_FAULT_INJECTION is not set |
1080 | # CONFIG_LATENCYTOP is not set | 1137 | # CONFIG_LATENCYTOP is not set |
1081 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1138 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
@@ -1099,10 +1156,10 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
1099 | # CONFIG_WORKQUEUE_TRACER is not set | 1156 | # CONFIG_WORKQUEUE_TRACER is not set |
1100 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1157 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1101 | # CONFIG_DYNAMIC_DEBUG is not set | 1158 | # CONFIG_DYNAMIC_DEBUG is not set |
1159 | # CONFIG_DMA_API_DEBUG is not set | ||
1102 | # CONFIG_SAMPLES is not set | 1160 | # CONFIG_SAMPLES is not set |
1103 | CONFIG_HAVE_ARCH_KGDB=y | 1161 | CONFIG_HAVE_ARCH_KGDB=y |
1104 | # CONFIG_KGDB is not set | 1162 | # CONFIG_KGDB is not set |
1105 | # CONFIG_KMEMCHECK is not set | ||
1106 | # CONFIG_PPC_DISABLE_WERROR is not set | 1163 | # CONFIG_PPC_DISABLE_WERROR is not set |
1107 | CONFIG_PPC_WERROR=y | 1164 | CONFIG_PPC_WERROR=y |
1108 | CONFIG_PRINT_STACK_DEPTH=64 | 1165 | CONFIG_PRINT_STACK_DEPTH=64 |
@@ -1124,13 +1181,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1124 | # CONFIG_KEYS is not set | 1181 | # CONFIG_KEYS is not set |
1125 | # CONFIG_SECURITY is not set | 1182 | # CONFIG_SECURITY is not set |
1126 | # CONFIG_SECURITYFS is not set | 1183 | # CONFIG_SECURITYFS is not set |
1127 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1184 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1185 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1186 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1187 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1188 | CONFIG_DEFAULT_SECURITY="" | ||
1128 | CONFIG_CRYPTO=y | 1189 | CONFIG_CRYPTO=y |
1129 | 1190 | ||
1130 | # | 1191 | # |
1131 | # Crypto core or helper | 1192 | # Crypto core or helper |
1132 | # | 1193 | # |
1133 | # CONFIG_CRYPTO_FIPS is not set | ||
1134 | CONFIG_CRYPTO_ALGAPI=y | 1194 | CONFIG_CRYPTO_ALGAPI=y |
1135 | CONFIG_CRYPTO_ALGAPI2=y | 1195 | CONFIG_CRYPTO_ALGAPI2=y |
1136 | CONFIG_CRYPTO_AEAD2=y | 1196 | CONFIG_CRYPTO_AEAD2=y |
@@ -1172,11 +1232,13 @@ CONFIG_CRYPTO_PCBC=y | |||
1172 | # | 1232 | # |
1173 | # CONFIG_CRYPTO_HMAC is not set | 1233 | # CONFIG_CRYPTO_HMAC is not set |
1174 | # CONFIG_CRYPTO_XCBC is not set | 1234 | # CONFIG_CRYPTO_XCBC is not set |
1235 | # CONFIG_CRYPTO_VMAC is not set | ||
1175 | 1236 | ||
1176 | # | 1237 | # |
1177 | # Digest | 1238 | # Digest |
1178 | # | 1239 | # |
1179 | # CONFIG_CRYPTO_CRC32C is not set | 1240 | # CONFIG_CRYPTO_CRC32C is not set |
1241 | # CONFIG_CRYPTO_GHASH is not set | ||
1180 | # CONFIG_CRYPTO_MD4 is not set | 1242 | # CONFIG_CRYPTO_MD4 is not set |
1181 | CONFIG_CRYPTO_MD5=y | 1243 | CONFIG_CRYPTO_MD5=y |
1182 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig index 146747547873..eb41cd695979 100644 --- a/arch/powerpc/configs/40x/makalu_defconfig +++ b/arch/powerpc/configs/40x/makalu_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.30-rc7 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Wed Jun 3 09:11:02 2009 | 4 | # Mon Jan 4 15:55:12 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | CONFIG_40x=y | 14 | CONFIG_40x=y |
@@ -16,6 +16,7 @@ CONFIG_40x=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_4xx=y | 17 | CONFIG_4xx=y |
18 | CONFIG_PPC_MMU_NOHASH=y | 18 | CONFIG_PPC_MMU_NOHASH=y |
19 | CONFIG_PPC_MMU_NOHASH_32=y | ||
19 | # CONFIG_PPC_MM_SLICES is not set | 20 | # CONFIG_PPC_MM_SLICES is not set |
20 | CONFIG_NOT_COHERENT_CACHE=y | 21 | CONFIG_NOT_COHERENT_CACHE=y |
21 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
@@ -29,14 +30,16 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
29 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 31 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
32 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_NR_IRQS=512 | ||
33 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
38 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 39 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 41 | CONFIG_ARCH_HAS_ILOG2_U32=y |
38 | CONFIG_GENERIC_HWEIGHT=y | 42 | CONFIG_GENERIC_HWEIGHT=y |
39 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
40 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
42 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
@@ -52,11 +55,13 @@ CONFIG_AUDIT_ARCH=y | |||
52 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DTC=y | 56 | CONFIG_DTC=y |
54 | # CONFIG_DEFAULT_UIMAGE is not set | 57 | # CONFIG_DEFAULT_UIMAGE is not set |
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
55 | CONFIG_PPC_DCR_NATIVE=y | 59 | CONFIG_PPC_DCR_NATIVE=y |
56 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
57 | CONFIG_PPC_DCR=y | 61 | CONFIG_PPC_DCR=y |
58 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
64 | CONFIG_CONSTRUCTORS=y | ||
60 | 65 | ||
61 | # | 66 | # |
62 | # General setup | 67 | # General setup |
@@ -78,11 +83,13 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y | |||
78 | # | 83 | # |
79 | # RCU Subsystem | 84 | # RCU Subsystem |
80 | # | 85 | # |
81 | CONFIG_CLASSIC_RCU=y | 86 | CONFIG_TREE_RCU=y |
82 | # CONFIG_TREE_RCU is not set | 87 | # CONFIG_TREE_PREEMPT_RCU is not set |
83 | # CONFIG_PREEMPT_RCU is not set | 88 | # CONFIG_TINY_RCU is not set |
89 | # CONFIG_RCU_TRACE is not set | ||
90 | CONFIG_RCU_FANOUT=32 | ||
91 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
84 | # CONFIG_TREE_RCU_TRACE is not set | 92 | # CONFIG_TREE_RCU_TRACE is not set |
85 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
86 | # CONFIG_IKCONFIG is not set | 93 | # CONFIG_IKCONFIG is not set |
87 | CONFIG_LOG_BUF_SHIFT=14 | 94 | CONFIG_LOG_BUF_SHIFT=14 |
88 | CONFIG_GROUP_SCHED=y | 95 | CONFIG_GROUP_SCHED=y |
@@ -108,7 +115,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
108 | CONFIG_KALLSYMS=y | 115 | CONFIG_KALLSYMS=y |
109 | CONFIG_KALLSYMS_ALL=y | 116 | CONFIG_KALLSYMS_ALL=y |
110 | CONFIG_KALLSYMS_EXTRA_PASS=y | 117 | CONFIG_KALLSYMS_EXTRA_PASS=y |
111 | # CONFIG_STRIP_ASM_SYMS is not set | ||
112 | CONFIG_HOTPLUG=y | 118 | CONFIG_HOTPLUG=y |
113 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
114 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
@@ -121,6 +127,13 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_EVENTS=y | ||
131 | |||
132 | # | ||
133 | # Kernel Performance Events And Counters | ||
134 | # | ||
135 | # CONFIG_PERF_EVENTS is not set | ||
136 | # CONFIG_PERF_COUNTERS is not set | ||
124 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
125 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
126 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
@@ -129,7 +142,6 @@ CONFIG_COMPAT_BRK=y | |||
129 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
130 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
131 | # CONFIG_PROFILING is not set | 144 | # CONFIG_PROFILING is not set |
132 | # CONFIG_MARKERS is not set | ||
133 | CONFIG_HAVE_OPROFILE=y | 145 | CONFIG_HAVE_OPROFILE=y |
134 | # CONFIG_KPROBES is not set | 146 | # CONFIG_KPROBES is not set |
135 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 147 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
@@ -137,6 +149,13 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
137 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
138 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
139 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
154 | |||
155 | # | ||
156 | # GCOV-based kernel profiling | ||
157 | # | ||
158 | # CONFIG_GCOV_KERNEL is not set | ||
140 | # CONFIG_SLOW_WORK is not set | 159 | # CONFIG_SLOW_WORK is not set |
141 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 160 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
142 | CONFIG_SLABINFO=y | 161 | CONFIG_SLABINFO=y |
@@ -149,7 +168,7 @@ CONFIG_MODULE_UNLOAD=y | |||
149 | # CONFIG_MODVERSIONS is not set | 168 | # CONFIG_MODVERSIONS is not set |
150 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 169 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
151 | CONFIG_BLOCK=y | 170 | CONFIG_BLOCK=y |
152 | CONFIG_LBD=y | 171 | CONFIG_LBDAF=y |
153 | # CONFIG_BLK_DEV_BSG is not set | 172 | # CONFIG_BLK_DEV_BSG is not set |
154 | # CONFIG_BLK_DEV_INTEGRITY is not set | 173 | # CONFIG_BLK_DEV_INTEGRITY is not set |
155 | 174 | ||
@@ -157,14 +176,41 @@ CONFIG_LBD=y | |||
157 | # IO Schedulers | 176 | # IO Schedulers |
158 | # | 177 | # |
159 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
160 | CONFIG_IOSCHED_AS=y | ||
161 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
162 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
163 | CONFIG_DEFAULT_AS=y | ||
164 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
165 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
166 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
167 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
187 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
168 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
169 | CONFIG_PPC4xx_PCI_EXPRESS=y | 215 | CONFIG_PPC4xx_PCI_EXPRESS=y |
170 | 216 | ||
@@ -178,6 +224,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y | |||
178 | # CONFIG_ACADIA is not set | 224 | # CONFIG_ACADIA is not set |
179 | # CONFIG_EP405 is not set | 225 | # CONFIG_EP405 is not set |
180 | # CONFIG_HCU4 is not set | 226 | # CONFIG_HCU4 is not set |
227 | # CONFIG_HOTFOOT is not set | ||
181 | # CONFIG_KILAUEA is not set | 228 | # CONFIG_KILAUEA is not set |
182 | CONFIG_MAKALU=y | 229 | CONFIG_MAKALU=y |
183 | # CONFIG_WALNUT is not set | 230 | # CONFIG_WALNUT is not set |
@@ -220,10 +267,12 @@ CONFIG_BINFMT_ELF=y | |||
220 | # CONFIG_BINFMT_MISC is not set | 267 | # CONFIG_BINFMT_MISC is not set |
221 | # CONFIG_MATH_EMULATION is not set | 268 | # CONFIG_MATH_EMULATION is not set |
222 | # CONFIG_IOMMU_HELPER is not set | 269 | # CONFIG_IOMMU_HELPER is not set |
223 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 270 | # CONFIG_SWIOTLB is not set |
224 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 271 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
225 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 272 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
226 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 273 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
274 | CONFIG_SPARSE_IRQ=y | ||
275 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
227 | CONFIG_ARCH_FLATMEM_ENABLE=y | 276 | CONFIG_ARCH_FLATMEM_ENABLE=y |
228 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 277 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
229 | CONFIG_SELECT_MEMORY_MODEL=y | 278 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -239,9 +288,8 @@ CONFIG_MIGRATION=y | |||
239 | CONFIG_ZONE_DMA_FLAG=1 | 288 | CONFIG_ZONE_DMA_FLAG=1 |
240 | CONFIG_BOUNCE=y | 289 | CONFIG_BOUNCE=y |
241 | CONFIG_VIRT_TO_BUS=y | 290 | CONFIG_VIRT_TO_BUS=y |
242 | CONFIG_UNEVICTABLE_LRU=y | 291 | # CONFIG_KSM is not set |
243 | CONFIG_HAVE_MLOCK=y | 292 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
244 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
245 | CONFIG_PPC_4K_PAGES=y | 293 | CONFIG_PPC_4K_PAGES=y |
246 | # CONFIG_PPC_16K_PAGES is not set | 294 | # CONFIG_PPC_16K_PAGES is not set |
247 | # CONFIG_PPC_64K_PAGES is not set | 295 | # CONFIG_PPC_64K_PAGES is not set |
@@ -330,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
330 | # CONFIG_NETFILTER is not set | 378 | # CONFIG_NETFILTER is not set |
331 | # CONFIG_IP_DCCP is not set | 379 | # CONFIG_IP_DCCP is not set |
332 | # CONFIG_IP_SCTP is not set | 380 | # CONFIG_IP_SCTP is not set |
381 | # CONFIG_RDS is not set | ||
333 | # CONFIG_TIPC is not set | 382 | # CONFIG_TIPC is not set |
334 | # CONFIG_ATM is not set | 383 | # CONFIG_ATM is not set |
335 | # CONFIG_BRIDGE is not set | 384 | # CONFIG_BRIDGE is not set |
@@ -344,6 +393,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
344 | # CONFIG_ECONET is not set | 393 | # CONFIG_ECONET is not set |
345 | # CONFIG_WAN_ROUTER is not set | 394 | # CONFIG_WAN_ROUTER is not set |
346 | # CONFIG_PHONET is not set | 395 | # CONFIG_PHONET is not set |
396 | # CONFIG_IEEE802154 is not set | ||
347 | # CONFIG_NET_SCHED is not set | 397 | # CONFIG_NET_SCHED is not set |
348 | # CONFIG_DCB is not set | 398 | # CONFIG_DCB is not set |
349 | 399 | ||
@@ -356,7 +406,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
356 | # CONFIG_IRDA is not set | 406 | # CONFIG_IRDA is not set |
357 | # CONFIG_BT is not set | 407 | # CONFIG_BT is not set |
358 | # CONFIG_AF_RXRPC is not set | 408 | # CONFIG_AF_RXRPC is not set |
359 | # CONFIG_WIRELESS is not set | 409 | CONFIG_WIRELESS=y |
410 | # CONFIG_CFG80211 is not set | ||
411 | # CONFIG_LIB80211 is not set | ||
412 | |||
413 | # | ||
414 | # CFG80211 needs to be enabled for MAC80211 | ||
415 | # | ||
360 | # CONFIG_WIMAX is not set | 416 | # CONFIG_WIMAX is not set |
361 | # CONFIG_RFKILL is not set | 417 | # CONFIG_RFKILL is not set |
362 | # CONFIG_NET_9P is not set | 418 | # CONFIG_NET_9P is not set |
@@ -369,6 +425,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
369 | # Generic Driver Options | 425 | # Generic Driver Options |
370 | # | 426 | # |
371 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 427 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
428 | # CONFIG_DEVTMPFS is not set | ||
372 | CONFIG_STANDALONE=y | 429 | CONFIG_STANDALONE=y |
373 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 430 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
374 | CONFIG_FW_LOADER=y | 431 | CONFIG_FW_LOADER=y |
@@ -381,9 +438,9 @@ CONFIG_CONNECTOR=y | |||
381 | CONFIG_PROC_EVENTS=y | 438 | CONFIG_PROC_EVENTS=y |
382 | CONFIG_MTD=y | 439 | CONFIG_MTD=y |
383 | # CONFIG_MTD_DEBUG is not set | 440 | # CONFIG_MTD_DEBUG is not set |
441 | # CONFIG_MTD_TESTS is not set | ||
384 | # CONFIG_MTD_CONCAT is not set | 442 | # CONFIG_MTD_CONCAT is not set |
385 | CONFIG_MTD_PARTITIONS=y | 443 | CONFIG_MTD_PARTITIONS=y |
386 | # CONFIG_MTD_TESTS is not set | ||
387 | # CONFIG_MTD_REDBOOT_PARTS is not set | 444 | # CONFIG_MTD_REDBOOT_PARTS is not set |
388 | CONFIG_MTD_CMDLINE_PARTS=y | 445 | CONFIG_MTD_CMDLINE_PARTS=y |
389 | CONFIG_MTD_OF_PARTS=y | 446 | CONFIG_MTD_OF_PARTS=y |
@@ -474,6 +531,7 @@ CONFIG_BLK_DEV=y | |||
474 | # CONFIG_BLK_DEV_UMEM is not set | 531 | # CONFIG_BLK_DEV_UMEM is not set |
475 | # CONFIG_BLK_DEV_COW_COMMON is not set | 532 | # CONFIG_BLK_DEV_COW_COMMON is not set |
476 | # CONFIG_BLK_DEV_LOOP is not set | 533 | # CONFIG_BLK_DEV_LOOP is not set |
534 | # CONFIG_BLK_DEV_DRBD is not set | ||
477 | # CONFIG_BLK_DEV_NBD is not set | 535 | # CONFIG_BLK_DEV_NBD is not set |
478 | # CONFIG_BLK_DEV_SX8 is not set | 536 | # CONFIG_BLK_DEV_SX8 is not set |
479 | CONFIG_BLK_DEV_RAM=y | 537 | CONFIG_BLK_DEV_RAM=y |
@@ -504,14 +562,17 @@ CONFIG_HAVE_IDE=y | |||
504 | # | 562 | # |
505 | 563 | ||
506 | # | 564 | # |
507 | # Enable only one of the two stacks, unless you know what you are doing | 565 | # You can enable one or both FireWire driver stacks. |
566 | # | ||
567 | |||
568 | # | ||
569 | # See the help texts for more information. | ||
508 | # | 570 | # |
509 | # CONFIG_FIREWIRE is not set | 571 | # CONFIG_FIREWIRE is not set |
510 | # CONFIG_IEEE1394 is not set | 572 | # CONFIG_IEEE1394 is not set |
511 | # CONFIG_I2O is not set | 573 | # CONFIG_I2O is not set |
512 | # CONFIG_MACINTOSH_DRIVERS is not set | 574 | # CONFIG_MACINTOSH_DRIVERS is not set |
513 | CONFIG_NETDEVICES=y | 575 | CONFIG_NETDEVICES=y |
514 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
515 | # CONFIG_DUMMY is not set | 576 | # CONFIG_DUMMY is not set |
516 | # CONFIG_BONDING is not set | 577 | # CONFIG_BONDING is not set |
517 | # CONFIG_MACVLAN is not set | 578 | # CONFIG_MACVLAN is not set |
@@ -546,16 +607,18 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
546 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 607 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
547 | # CONFIG_NET_PCI is not set | 608 | # CONFIG_NET_PCI is not set |
548 | # CONFIG_B44 is not set | 609 | # CONFIG_B44 is not set |
610 | # CONFIG_KS8842 is not set | ||
611 | # CONFIG_KS8851_MLL is not set | ||
549 | # CONFIG_ATL2 is not set | 612 | # CONFIG_ATL2 is not set |
613 | # CONFIG_XILINX_EMACLITE is not set | ||
550 | # CONFIG_NETDEV_1000 is not set | 614 | # CONFIG_NETDEV_1000 is not set |
551 | # CONFIG_NETDEV_10000 is not set | 615 | # CONFIG_NETDEV_10000 is not set |
552 | # CONFIG_TR is not set | 616 | # CONFIG_TR is not set |
553 | 617 | CONFIG_WLAN=y | |
554 | # | 618 | # CONFIG_AIRO is not set |
555 | # Wireless LAN | 619 | # CONFIG_ATMEL is not set |
556 | # | 620 | # CONFIG_PRISM54 is not set |
557 | # CONFIG_WLAN_PRE80211 is not set | 621 | # CONFIG_HOSTAP is not set |
558 | # CONFIG_WLAN_80211 is not set | ||
559 | 622 | ||
560 | # | 623 | # |
561 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 624 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -568,6 +631,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
568 | # CONFIG_NETCONSOLE is not set | 631 | # CONFIG_NETCONSOLE is not set |
569 | # CONFIG_NETPOLL is not set | 632 | # CONFIG_NETPOLL is not set |
570 | # CONFIG_NET_POLL_CONTROLLER is not set | 633 | # CONFIG_NET_POLL_CONTROLLER is not set |
634 | # CONFIG_VMXNET3 is not set | ||
571 | # CONFIG_ISDN is not set | 635 | # CONFIG_ISDN is not set |
572 | # CONFIG_PHONE is not set | 636 | # CONFIG_PHONE is not set |
573 | 637 | ||
@@ -613,6 +677,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
613 | # CONFIG_SERIAL_JSM is not set | 677 | # CONFIG_SERIAL_JSM is not set |
614 | CONFIG_SERIAL_OF_PLATFORM=y | 678 | CONFIG_SERIAL_OF_PLATFORM=y |
615 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 679 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
680 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
616 | CONFIG_UNIX98_PTYS=y | 681 | CONFIG_UNIX98_PTYS=y |
617 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 682 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
618 | CONFIG_LEGACY_PTYS=y | 683 | CONFIG_LEGACY_PTYS=y |
@@ -629,6 +694,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
629 | CONFIG_DEVPORT=y | 694 | CONFIG_DEVPORT=y |
630 | # CONFIG_I2C is not set | 695 | # CONFIG_I2C is not set |
631 | # CONFIG_SPI is not set | 696 | # CONFIG_SPI is not set |
697 | |||
698 | # | ||
699 | # PPS support | ||
700 | # | ||
701 | # CONFIG_PPS is not set | ||
632 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 702 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
633 | # CONFIG_GPIOLIB is not set | 703 | # CONFIG_GPIOLIB is not set |
634 | # CONFIG_W1 is not set | 704 | # CONFIG_W1 is not set |
@@ -651,27 +721,13 @@ CONFIG_SSB_POSSIBLE=y | |||
651 | # CONFIG_HTC_PASIC3 is not set | 721 | # CONFIG_HTC_PASIC3 is not set |
652 | # CONFIG_MFD_TMIO is not set | 722 | # CONFIG_MFD_TMIO is not set |
653 | # CONFIG_REGULATOR is not set | 723 | # CONFIG_REGULATOR is not set |
654 | 724 | # CONFIG_MEDIA_SUPPORT is not set | |
655 | # | ||
656 | # Multimedia devices | ||
657 | # | ||
658 | |||
659 | # | ||
660 | # Multimedia core support | ||
661 | # | ||
662 | # CONFIG_VIDEO_DEV is not set | ||
663 | # CONFIG_DVB_CORE is not set | ||
664 | # CONFIG_VIDEO_MEDIA is not set | ||
665 | |||
666 | # | ||
667 | # Multimedia drivers | ||
668 | # | ||
669 | # CONFIG_DAB is not set | ||
670 | 725 | ||
671 | # | 726 | # |
672 | # Graphics support | 727 | # Graphics support |
673 | # | 728 | # |
674 | # CONFIG_AGP is not set | 729 | # CONFIG_AGP is not set |
730 | CONFIG_VGA_ARB=y | ||
675 | # CONFIG_DRM is not set | 731 | # CONFIG_DRM is not set |
676 | # CONFIG_VGASTATE is not set | 732 | # CONFIG_VGASTATE is not set |
677 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 733 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
@@ -695,6 +751,10 @@ CONFIG_SSB_POSSIBLE=y | |||
695 | # CONFIG_DMADEVICES is not set | 751 | # CONFIG_DMADEVICES is not set |
696 | # CONFIG_AUXDISPLAY is not set | 752 | # CONFIG_AUXDISPLAY is not set |
697 | # CONFIG_UIO is not set | 753 | # CONFIG_UIO is not set |
754 | |||
755 | # | ||
756 | # TI VLYNQ | ||
757 | # | ||
698 | # CONFIG_STAGING is not set | 758 | # CONFIG_STAGING is not set |
699 | 759 | ||
700 | # | 760 | # |
@@ -705,14 +765,17 @@ CONFIG_EXT2_FS=y | |||
705 | # CONFIG_EXT2_FS_XIP is not set | 765 | # CONFIG_EXT2_FS_XIP is not set |
706 | # CONFIG_EXT3_FS is not set | 766 | # CONFIG_EXT3_FS is not set |
707 | # CONFIG_EXT4_FS is not set | 767 | # CONFIG_EXT4_FS is not set |
768 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
708 | # CONFIG_REISERFS_FS is not set | 769 | # CONFIG_REISERFS_FS is not set |
709 | # CONFIG_JFS_FS is not set | 770 | # CONFIG_JFS_FS is not set |
710 | # CONFIG_FS_POSIX_ACL is not set | 771 | # CONFIG_FS_POSIX_ACL is not set |
711 | CONFIG_FILE_LOCKING=y | ||
712 | # CONFIG_XFS_FS is not set | 772 | # CONFIG_XFS_FS is not set |
713 | # CONFIG_GFS2_FS is not set | 773 | # CONFIG_GFS2_FS is not set |
714 | # CONFIG_OCFS2_FS is not set | 774 | # CONFIG_OCFS2_FS is not set |
715 | # CONFIG_BTRFS_FS is not set | 775 | # CONFIG_BTRFS_FS is not set |
776 | # CONFIG_NILFS2_FS is not set | ||
777 | CONFIG_FILE_LOCKING=y | ||
778 | CONFIG_FSNOTIFY=y | ||
716 | CONFIG_DNOTIFY=y | 779 | CONFIG_DNOTIFY=y |
717 | CONFIG_INOTIFY=y | 780 | CONFIG_INOTIFY=y |
718 | CONFIG_INOTIFY_USER=y | 781 | CONFIG_INOTIFY_USER=y |
@@ -770,7 +833,6 @@ CONFIG_CRAMFS=y | |||
770 | # CONFIG_ROMFS_FS is not set | 833 | # CONFIG_ROMFS_FS is not set |
771 | # CONFIG_SYSV_FS is not set | 834 | # CONFIG_SYSV_FS is not set |
772 | # CONFIG_UFS_FS is not set | 835 | # CONFIG_UFS_FS is not set |
773 | # CONFIG_NILFS2_FS is not set | ||
774 | CONFIG_NETWORK_FILESYSTEMS=y | 836 | CONFIG_NETWORK_FILESYSTEMS=y |
775 | CONFIG_NFS_FS=y | 837 | CONFIG_NFS_FS=y |
776 | CONFIG_NFS_V3=y | 838 | CONFIG_NFS_V3=y |
@@ -818,6 +880,7 @@ CONFIG_HAS_IOPORT=y | |||
818 | CONFIG_HAS_DMA=y | 880 | CONFIG_HAS_DMA=y |
819 | CONFIG_HAVE_LMB=y | 881 | CONFIG_HAVE_LMB=y |
820 | CONFIG_NLATTR=y | 882 | CONFIG_NLATTR=y |
883 | CONFIG_GENERIC_ATOMIC64=y | ||
821 | 884 | ||
822 | # | 885 | # |
823 | # Kernel hacking | 886 | # Kernel hacking |
@@ -827,6 +890,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
827 | CONFIG_ENABLE_MUST_CHECK=y | 890 | CONFIG_ENABLE_MUST_CHECK=y |
828 | CONFIG_FRAME_WARN=1024 | 891 | CONFIG_FRAME_WARN=1024 |
829 | CONFIG_MAGIC_SYSRQ=y | 892 | CONFIG_MAGIC_SYSRQ=y |
893 | # CONFIG_STRIP_ASM_SYMS is not set | ||
830 | # CONFIG_UNUSED_SYMBOLS is not set | 894 | # CONFIG_UNUSED_SYMBOLS is not set |
831 | CONFIG_DEBUG_FS=y | 895 | CONFIG_DEBUG_FS=y |
832 | # CONFIG_HEADERS_CHECK is not set | 896 | # CONFIG_HEADERS_CHECK is not set |
@@ -844,10 +908,14 @@ CONFIG_SCHED_DEBUG=y | |||
844 | # CONFIG_DEBUG_OBJECTS is not set | 908 | # CONFIG_DEBUG_OBJECTS is not set |
845 | # CONFIG_SLUB_DEBUG_ON is not set | 909 | # CONFIG_SLUB_DEBUG_ON is not set |
846 | # CONFIG_SLUB_STATS is not set | 910 | # CONFIG_SLUB_STATS is not set |
911 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
847 | # CONFIG_DEBUG_RT_MUTEXES is not set | 912 | # CONFIG_DEBUG_RT_MUTEXES is not set |
848 | # CONFIG_RT_MUTEX_TESTER is not set | 913 | # CONFIG_RT_MUTEX_TESTER is not set |
849 | # CONFIG_DEBUG_SPINLOCK is not set | 914 | # CONFIG_DEBUG_SPINLOCK is not set |
850 | # CONFIG_DEBUG_MUTEXES is not set | 915 | # CONFIG_DEBUG_MUTEXES is not set |
916 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
917 | # CONFIG_PROVE_LOCKING is not set | ||
918 | # CONFIG_LOCK_STAT is not set | ||
851 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 919 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
852 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 920 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
853 | # CONFIG_DEBUG_KOBJECT is not set | 921 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -859,11 +927,12 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
859 | # CONFIG_DEBUG_LIST is not set | 927 | # CONFIG_DEBUG_LIST is not set |
860 | # CONFIG_DEBUG_SG is not set | 928 | # CONFIG_DEBUG_SG is not set |
861 | # CONFIG_DEBUG_NOTIFIERS is not set | 929 | # CONFIG_DEBUG_NOTIFIERS is not set |
862 | # CONFIG_BOOT_PRINTK_DELAY is not set | 930 | # CONFIG_DEBUG_CREDENTIALS is not set |
863 | # CONFIG_RCU_TORTURE_TEST is not set | 931 | # CONFIG_RCU_TORTURE_TEST is not set |
864 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 932 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
865 | # CONFIG_BACKTRACE_SELF_TEST is not set | 933 | # CONFIG_BACKTRACE_SELF_TEST is not set |
866 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 934 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
935 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
867 | # CONFIG_FAULT_INJECTION is not set | 936 | # CONFIG_FAULT_INJECTION is not set |
868 | # CONFIG_LATENCYTOP is not set | 937 | # CONFIG_LATENCYTOP is not set |
869 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 938 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
@@ -873,24 +942,26 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
873 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 942 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
874 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 943 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
875 | CONFIG_TRACING_SUPPORT=y | 944 | CONFIG_TRACING_SUPPORT=y |
876 | 945 | CONFIG_FTRACE=y | |
877 | # | ||
878 | # Tracers | ||
879 | # | ||
880 | # CONFIG_FUNCTION_TRACER is not set | 946 | # CONFIG_FUNCTION_TRACER is not set |
947 | # CONFIG_IRQSOFF_TRACER is not set | ||
881 | # CONFIG_SCHED_TRACER is not set | 948 | # CONFIG_SCHED_TRACER is not set |
882 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 949 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
883 | # CONFIG_EVENT_TRACER is not set | ||
884 | # CONFIG_BOOT_TRACER is not set | 950 | # CONFIG_BOOT_TRACER is not set |
885 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 951 | CONFIG_BRANCH_PROFILE_NONE=y |
952 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
953 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
886 | # CONFIG_STACK_TRACER is not set | 954 | # CONFIG_STACK_TRACER is not set |
887 | # CONFIG_KMEMTRACE is not set | 955 | # CONFIG_KMEMTRACE is not set |
888 | # CONFIG_WORKQUEUE_TRACER is not set | 956 | # CONFIG_WORKQUEUE_TRACER is not set |
889 | # CONFIG_BLK_DEV_IO_TRACE is not set | 957 | # CONFIG_BLK_DEV_IO_TRACE is not set |
890 | # CONFIG_DYNAMIC_DEBUG is not set | 958 | # CONFIG_DYNAMIC_DEBUG is not set |
959 | # CONFIG_DMA_API_DEBUG is not set | ||
891 | # CONFIG_SAMPLES is not set | 960 | # CONFIG_SAMPLES is not set |
892 | CONFIG_HAVE_ARCH_KGDB=y | 961 | CONFIG_HAVE_ARCH_KGDB=y |
893 | # CONFIG_KGDB is not set | 962 | # CONFIG_KGDB is not set |
963 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
964 | CONFIG_PPC_WERROR=y | ||
894 | CONFIG_PRINT_STACK_DEPTH=64 | 965 | CONFIG_PRINT_STACK_DEPTH=64 |
895 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 966 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
896 | # CONFIG_DEBUG_STACK_USAGE is not set | 967 | # CONFIG_DEBUG_STACK_USAGE is not set |
@@ -910,13 +981,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
910 | # CONFIG_KEYS is not set | 981 | # CONFIG_KEYS is not set |
911 | # CONFIG_SECURITY is not set | 982 | # CONFIG_SECURITY is not set |
912 | # CONFIG_SECURITYFS is not set | 983 | # CONFIG_SECURITYFS is not set |
913 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 984 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
985 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
986 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
987 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
988 | CONFIG_DEFAULT_SECURITY="" | ||
914 | CONFIG_CRYPTO=y | 989 | CONFIG_CRYPTO=y |
915 | 990 | ||
916 | # | 991 | # |
917 | # Crypto core or helper | 992 | # Crypto core or helper |
918 | # | 993 | # |
919 | # CONFIG_CRYPTO_FIPS is not set | ||
920 | CONFIG_CRYPTO_ALGAPI=y | 994 | CONFIG_CRYPTO_ALGAPI=y |
921 | CONFIG_CRYPTO_ALGAPI2=y | 995 | CONFIG_CRYPTO_ALGAPI2=y |
922 | CONFIG_CRYPTO_AEAD2=y | 996 | CONFIG_CRYPTO_AEAD2=y |
@@ -958,11 +1032,13 @@ CONFIG_CRYPTO_PCBC=y | |||
958 | # | 1032 | # |
959 | # CONFIG_CRYPTO_HMAC is not set | 1033 | # CONFIG_CRYPTO_HMAC is not set |
960 | # CONFIG_CRYPTO_XCBC is not set | 1034 | # CONFIG_CRYPTO_XCBC is not set |
1035 | # CONFIG_CRYPTO_VMAC is not set | ||
961 | 1036 | ||
962 | # | 1037 | # |
963 | # Digest | 1038 | # Digest |
964 | # | 1039 | # |
965 | # CONFIG_CRYPTO_CRC32C is not set | 1040 | # CONFIG_CRYPTO_CRC32C is not set |
1041 | # CONFIG_CRYPTO_GHASH is not set | ||
966 | # CONFIG_CRYPTO_MD4 is not set | 1042 | # CONFIG_CRYPTO_MD4 is not set |
967 | CONFIG_CRYPTO_MD5=y | 1043 | CONFIG_CRYPTO_MD5=y |
968 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1044 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig index 5ab29dddd21c..bfff0eae39d2 100644 --- a/arch/powerpc/configs/40x/walnut_defconfig +++ b/arch/powerpc/configs/40x/walnut_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:17:57 2009 | 4 | # Mon Jan 4 15:56:30 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | CONFIG_40x=y | 14 | CONFIG_40x=y |
@@ -16,6 +16,7 @@ CONFIG_40x=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_4xx=y | 17 | CONFIG_4xx=y |
18 | CONFIG_PPC_MMU_NOHASH=y | 18 | CONFIG_PPC_MMU_NOHASH=y |
19 | CONFIG_PPC_MMU_NOHASH_32=y | ||
19 | # CONFIG_PPC_MM_SLICES is not set | 20 | # CONFIG_PPC_MM_SLICES is not set |
20 | CONFIG_NOT_COHERENT_CACHE=y | 21 | CONFIG_NOT_COHERENT_CACHE=y |
21 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
@@ -27,15 +28,18 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 28 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 29 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
31 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_NR_IRQS=512 | ||
32 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
38 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 39 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 41 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 42 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
@@ -49,11 +53,15 @@ CONFIG_PPC_UDBG_16550=y | |||
49 | # CONFIG_GENERIC_TBSYNC is not set | 53 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 54 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
56 | CONFIG_DTC=y | ||
52 | # CONFIG_DEFAULT_UIMAGE is not set | 57 | # CONFIG_DEFAULT_UIMAGE is not set |
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
53 | CONFIG_PPC_DCR_NATIVE=y | 59 | CONFIG_PPC_DCR_NATIVE=y |
54 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_PPC_DCR=y | 61 | CONFIG_PPC_DCR=y |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
64 | CONFIG_CONSTRUCTORS=y | ||
57 | 65 | ||
58 | # | 66 | # |
59 | # General setup | 67 | # General setup |
@@ -67,9 +75,21 @@ CONFIG_SWAP=y | |||
67 | CONFIG_SYSVIPC=y | 75 | CONFIG_SYSVIPC=y |
68 | CONFIG_SYSVIPC_SYSCTL=y | 76 | CONFIG_SYSVIPC_SYSCTL=y |
69 | CONFIG_POSIX_MQUEUE=y | 77 | CONFIG_POSIX_MQUEUE=y |
78 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
70 | # CONFIG_BSD_PROCESS_ACCT is not set | 79 | # CONFIG_BSD_PROCESS_ACCT is not set |
71 | # CONFIG_TASKSTATS is not set | 80 | # CONFIG_TASKSTATS is not set |
72 | # CONFIG_AUDIT is not set | 81 | # CONFIG_AUDIT is not set |
82 | |||
83 | # | ||
84 | # RCU Subsystem | ||
85 | # | ||
86 | CONFIG_TREE_RCU=y | ||
87 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
88 | # CONFIG_TINY_RCU is not set | ||
89 | # CONFIG_RCU_TRACE is not set | ||
90 | CONFIG_RCU_FANOUT=32 | ||
91 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
92 | # CONFIG_TREE_RCU_TRACE is not set | ||
73 | # CONFIG_IKCONFIG is not set | 93 | # CONFIG_IKCONFIG is not set |
74 | CONFIG_LOG_BUF_SHIFT=14 | 94 | CONFIG_LOG_BUF_SHIFT=14 |
75 | CONFIG_GROUP_SCHED=y | 95 | CONFIG_GROUP_SCHED=y |
@@ -84,31 +104,40 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
84 | # CONFIG_NAMESPACES is not set | 104 | # CONFIG_NAMESPACES is not set |
85 | CONFIG_BLK_DEV_INITRD=y | 105 | CONFIG_BLK_DEV_INITRD=y |
86 | CONFIG_INITRAMFS_SOURCE="" | 106 | CONFIG_INITRAMFS_SOURCE="" |
107 | CONFIG_RD_GZIP=y | ||
108 | # CONFIG_RD_BZIP2 is not set | ||
109 | # CONFIG_RD_LZMA is not set | ||
87 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 110 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
88 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
112 | CONFIG_ANON_INODES=y | ||
89 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_KALLSYMS=y | 115 | CONFIG_KALLSYMS=y |
92 | CONFIG_KALLSYMS_ALL=y | 116 | CONFIG_KALLSYMS_ALL=y |
93 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
94 | CONFIG_KALLSYMS_EXTRA_PASS=y | 117 | CONFIG_KALLSYMS_EXTRA_PASS=y |
95 | CONFIG_HOTPLUG=y | 118 | CONFIG_HOTPLUG=y |
96 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
97 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
98 | CONFIG_ELF_CORE=y | 121 | CONFIG_ELF_CORE=y |
99 | CONFIG_COMPAT_BRK=y | ||
100 | CONFIG_BASE_FULL=y | 122 | CONFIG_BASE_FULL=y |
101 | CONFIG_FUTEX=y | 123 | CONFIG_FUTEX=y |
102 | CONFIG_ANON_INODES=y | ||
103 | CONFIG_EPOLL=y | 124 | CONFIG_EPOLL=y |
104 | CONFIG_SIGNALFD=y | 125 | CONFIG_SIGNALFD=y |
105 | CONFIG_TIMERFD=y | 126 | CONFIG_TIMERFD=y |
106 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
107 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
108 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_EVENTS=y | ||
131 | |||
132 | # | ||
133 | # Kernel Performance Events And Counters | ||
134 | # | ||
135 | # CONFIG_PERF_EVENTS is not set | ||
136 | # CONFIG_PERF_COUNTERS is not set | ||
109 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
110 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
111 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
140 | CONFIG_COMPAT_BRK=y | ||
112 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
113 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
114 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
@@ -120,6 +149,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
120 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
154 | |||
155 | # | ||
156 | # GCOV-based kernel profiling | ||
157 | # | ||
158 | # CONFIG_GCOV_KERNEL is not set | ||
159 | # CONFIG_SLOW_WORK is not set | ||
123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 160 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
124 | CONFIG_SLABINFO=y | 161 | CONFIG_SLABINFO=y |
125 | CONFIG_RT_MUTEXES=y | 162 | CONFIG_RT_MUTEXES=y |
@@ -131,8 +168,7 @@ CONFIG_MODULE_UNLOAD=y | |||
131 | # CONFIG_MODVERSIONS is not set | 168 | # CONFIG_MODVERSIONS is not set |
132 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 169 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
133 | CONFIG_BLOCK=y | 170 | CONFIG_BLOCK=y |
134 | CONFIG_LBD=y | 171 | CONFIG_LBDAF=y |
135 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
136 | # CONFIG_BLK_DEV_BSG is not set | 172 | # CONFIG_BLK_DEV_BSG is not set |
137 | # CONFIG_BLK_DEV_INTEGRITY is not set | 173 | # CONFIG_BLK_DEV_INTEGRITY is not set |
138 | 174 | ||
@@ -140,19 +176,41 @@ CONFIG_LBD=y | |||
140 | # IO Schedulers | 176 | # IO Schedulers |
141 | # | 177 | # |
142 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
143 | CONFIG_IOSCHED_AS=y | ||
144 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
145 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
146 | CONFIG_DEFAULT_AS=y | ||
147 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
148 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
149 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
150 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
151 | CONFIG_CLASSIC_RCU=y | 185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
152 | # CONFIG_TREE_RCU is not set | 186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
153 | # CONFIG_PREEMPT_RCU is not set | 187 | # CONFIG_INLINE_SPIN_LOCK is not set |
154 | # CONFIG_TREE_RCU_TRACE is not set | 188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
155 | # CONFIG_PREEMPT_RCU_TRACE is not set | 189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
156 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
157 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 215 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
158 | 216 | ||
@@ -166,6 +224,7 @@ CONFIG_CLASSIC_RCU=y | |||
166 | # CONFIG_ACADIA is not set | 224 | # CONFIG_ACADIA is not set |
167 | # CONFIG_EP405 is not set | 225 | # CONFIG_EP405 is not set |
168 | # CONFIG_HCU4 is not set | 226 | # CONFIG_HCU4 is not set |
227 | # CONFIG_HOTFOOT is not set | ||
169 | # CONFIG_KILAUEA is not set | 228 | # CONFIG_KILAUEA is not set |
170 | # CONFIG_MAKALU is not set | 229 | # CONFIG_MAKALU is not set |
171 | CONFIG_WALNUT=y | 230 | CONFIG_WALNUT=y |
@@ -211,10 +270,12 @@ CONFIG_BINFMT_ELF=y | |||
211 | # CONFIG_BINFMT_MISC is not set | 270 | # CONFIG_BINFMT_MISC is not set |
212 | # CONFIG_MATH_EMULATION is not set | 271 | # CONFIG_MATH_EMULATION is not set |
213 | # CONFIG_IOMMU_HELPER is not set | 272 | # CONFIG_IOMMU_HELPER is not set |
214 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 273 | # CONFIG_SWIOTLB is not set |
215 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 274 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
216 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 275 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
217 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 276 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
277 | CONFIG_SPARSE_IRQ=y | ||
278 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
218 | CONFIG_ARCH_FLATMEM_ENABLE=y | 279 | CONFIG_ARCH_FLATMEM_ENABLE=y |
219 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 280 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
220 | CONFIG_SELECT_MEMORY_MODEL=y | 281 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -230,10 +291,12 @@ CONFIG_MIGRATION=y | |||
230 | CONFIG_ZONE_DMA_FLAG=1 | 291 | CONFIG_ZONE_DMA_FLAG=1 |
231 | CONFIG_BOUNCE=y | 292 | CONFIG_BOUNCE=y |
232 | CONFIG_VIRT_TO_BUS=y | 293 | CONFIG_VIRT_TO_BUS=y |
233 | CONFIG_UNEVICTABLE_LRU=y | 294 | # CONFIG_KSM is not set |
295 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
234 | CONFIG_PPC_4K_PAGES=y | 296 | CONFIG_PPC_4K_PAGES=y |
235 | # CONFIG_PPC_16K_PAGES is not set | 297 | # CONFIG_PPC_16K_PAGES is not set |
236 | # CONFIG_PPC_64K_PAGES is not set | 298 | # CONFIG_PPC_64K_PAGES is not set |
299 | # CONFIG_PPC_256K_PAGES is not set | ||
237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 300 | CONFIG_FORCE_MAX_ZONEORDER=11 |
238 | CONFIG_PROC_DEVICETREE=y | 301 | CONFIG_PROC_DEVICETREE=y |
239 | # CONFIG_CMDLINE_BOOL is not set | 302 | # CONFIG_CMDLINE_BOOL is not set |
@@ -258,6 +321,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
258 | # CONFIG_PCI_LEGACY is not set | 321 | # CONFIG_PCI_LEGACY is not set |
259 | # CONFIG_PCI_DEBUG is not set | 322 | # CONFIG_PCI_DEBUG is not set |
260 | # CONFIG_PCI_STUB is not set | 323 | # CONFIG_PCI_STUB is not set |
324 | # CONFIG_PCI_IOV is not set | ||
261 | # CONFIG_PCCARD is not set | 325 | # CONFIG_PCCARD is not set |
262 | # CONFIG_HOTPLUG_PCI is not set | 326 | # CONFIG_HOTPLUG_PCI is not set |
263 | # CONFIG_HAS_RAPIDIO is not set | 327 | # CONFIG_HAS_RAPIDIO is not set |
@@ -275,14 +339,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
275 | CONFIG_KERNEL_START=0xc0000000 | 339 | CONFIG_KERNEL_START=0xc0000000 |
276 | CONFIG_PHYSICAL_START=0x00000000 | 340 | CONFIG_PHYSICAL_START=0x00000000 |
277 | CONFIG_TASK_SIZE=0xc0000000 | 341 | CONFIG_TASK_SIZE=0xc0000000 |
278 | CONFIG_CONSISTENT_START=0xff100000 | ||
279 | CONFIG_CONSISTENT_SIZE=0x00200000 | 342 | CONFIG_CONSISTENT_SIZE=0x00200000 |
280 | CONFIG_NET=y | 343 | CONFIG_NET=y |
281 | 344 | ||
282 | # | 345 | # |
283 | # Networking options | 346 | # Networking options |
284 | # | 347 | # |
285 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
286 | CONFIG_PACKET=y | 348 | CONFIG_PACKET=y |
287 | # CONFIG_PACKET_MMAP is not set | 349 | # CONFIG_PACKET_MMAP is not set |
288 | CONFIG_UNIX=y | 350 | CONFIG_UNIX=y |
@@ -319,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
319 | # CONFIG_NETFILTER is not set | 381 | # CONFIG_NETFILTER is not set |
320 | # CONFIG_IP_DCCP is not set | 382 | # CONFIG_IP_DCCP is not set |
321 | # CONFIG_IP_SCTP is not set | 383 | # CONFIG_IP_SCTP is not set |
384 | # CONFIG_RDS is not set | ||
322 | # CONFIG_TIPC is not set | 385 | # CONFIG_TIPC is not set |
323 | # CONFIG_ATM is not set | 386 | # CONFIG_ATM is not set |
324 | # CONFIG_BRIDGE is not set | 387 | # CONFIG_BRIDGE is not set |
@@ -332,6 +395,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
332 | # CONFIG_LAPB is not set | 395 | # CONFIG_LAPB is not set |
333 | # CONFIG_ECONET is not set | 396 | # CONFIG_ECONET is not set |
334 | # CONFIG_WAN_ROUTER is not set | 397 | # CONFIG_WAN_ROUTER is not set |
398 | # CONFIG_PHONET is not set | ||
399 | # CONFIG_IEEE802154 is not set | ||
335 | # CONFIG_NET_SCHED is not set | 400 | # CONFIG_NET_SCHED is not set |
336 | # CONFIG_DCB is not set | 401 | # CONFIG_DCB is not set |
337 | 402 | ||
@@ -344,8 +409,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
344 | # CONFIG_IRDA is not set | 409 | # CONFIG_IRDA is not set |
345 | # CONFIG_BT is not set | 410 | # CONFIG_BT is not set |
346 | # CONFIG_AF_RXRPC is not set | 411 | # CONFIG_AF_RXRPC is not set |
347 | # CONFIG_PHONET is not set | 412 | CONFIG_WIRELESS=y |
348 | # CONFIG_WIRELESS is not set | 413 | # CONFIG_CFG80211 is not set |
414 | # CONFIG_LIB80211 is not set | ||
415 | |||
416 | # | ||
417 | # CFG80211 needs to be enabled for MAC80211 | ||
418 | # | ||
349 | # CONFIG_WIMAX is not set | 419 | # CONFIG_WIMAX is not set |
350 | # CONFIG_RFKILL is not set | 420 | # CONFIG_RFKILL is not set |
351 | # CONFIG_NET_9P is not set | 421 | # CONFIG_NET_9P is not set |
@@ -358,6 +428,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
358 | # Generic Driver Options | 428 | # Generic Driver Options |
359 | # | 429 | # |
360 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 430 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
431 | # CONFIG_DEVTMPFS is not set | ||
361 | CONFIG_STANDALONE=y | 432 | CONFIG_STANDALONE=y |
362 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 433 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
363 | CONFIG_FW_LOADER=y | 434 | CONFIG_FW_LOADER=y |
@@ -370,9 +441,9 @@ CONFIG_CONNECTOR=y | |||
370 | CONFIG_PROC_EVENTS=y | 441 | CONFIG_PROC_EVENTS=y |
371 | CONFIG_MTD=y | 442 | CONFIG_MTD=y |
372 | # CONFIG_MTD_DEBUG is not set | 443 | # CONFIG_MTD_DEBUG is not set |
444 | # CONFIG_MTD_TESTS is not set | ||
373 | # CONFIG_MTD_CONCAT is not set | 445 | # CONFIG_MTD_CONCAT is not set |
374 | CONFIG_MTD_PARTITIONS=y | 446 | CONFIG_MTD_PARTITIONS=y |
375 | # CONFIG_MTD_TESTS is not set | ||
376 | # CONFIG_MTD_REDBOOT_PARTS is not set | 447 | # CONFIG_MTD_REDBOOT_PARTS is not set |
377 | CONFIG_MTD_CMDLINE_PARTS=y | 448 | CONFIG_MTD_CMDLINE_PARTS=y |
378 | CONFIG_MTD_OF_PARTS=y | 449 | CONFIG_MTD_OF_PARTS=y |
@@ -448,7 +519,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
448 | # LPDDR flash memory drivers | 519 | # LPDDR flash memory drivers |
449 | # | 520 | # |
450 | # CONFIG_MTD_LPDDR is not set | 521 | # CONFIG_MTD_LPDDR is not set |
451 | # CONFIG_MTD_QINFO_PROBE is not set | ||
452 | 522 | ||
453 | # | 523 | # |
454 | # UBI - Unsorted block images | 524 | # UBI - Unsorted block images |
@@ -464,6 +534,7 @@ CONFIG_BLK_DEV=y | |||
464 | # CONFIG_BLK_DEV_UMEM is not set | 534 | # CONFIG_BLK_DEV_UMEM is not set |
465 | # CONFIG_BLK_DEV_COW_COMMON is not set | 535 | # CONFIG_BLK_DEV_COW_COMMON is not set |
466 | # CONFIG_BLK_DEV_LOOP is not set | 536 | # CONFIG_BLK_DEV_LOOP is not set |
537 | # CONFIG_BLK_DEV_DRBD is not set | ||
467 | # CONFIG_BLK_DEV_NBD is not set | 538 | # CONFIG_BLK_DEV_NBD is not set |
468 | # CONFIG_BLK_DEV_SX8 is not set | 539 | # CONFIG_BLK_DEV_SX8 is not set |
469 | CONFIG_BLK_DEV_RAM=y | 540 | CONFIG_BLK_DEV_RAM=y |
@@ -476,12 +547,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
476 | # CONFIG_BLK_DEV_HD is not set | 547 | # CONFIG_BLK_DEV_HD is not set |
477 | CONFIG_MISC_DEVICES=y | 548 | CONFIG_MISC_DEVICES=y |
478 | # CONFIG_PHANTOM is not set | 549 | # CONFIG_PHANTOM is not set |
479 | # CONFIG_EEPROM_93CX6 is not set | ||
480 | # CONFIG_SGI_IOC4 is not set | 550 | # CONFIG_SGI_IOC4 is not set |
481 | # CONFIG_TIFM_CORE is not set | 551 | # CONFIG_TIFM_CORE is not set |
482 | # CONFIG_ENCLOSURE_SERVICES is not set | 552 | # CONFIG_ENCLOSURE_SERVICES is not set |
483 | # CONFIG_HP_ILO is not set | 553 | # CONFIG_HP_ILO is not set |
484 | # CONFIG_C2PORT is not set | 554 | # CONFIG_C2PORT is not set |
555 | |||
556 | # | ||
557 | # EEPROM support | ||
558 | # | ||
559 | # CONFIG_EEPROM_93CX6 is not set | ||
560 | # CONFIG_CB710_CORE is not set | ||
485 | CONFIG_HAVE_IDE=y | 561 | CONFIG_HAVE_IDE=y |
486 | # CONFIG_IDE is not set | 562 | # CONFIG_IDE is not set |
487 | 563 | ||
@@ -501,7 +577,11 @@ CONFIG_HAVE_IDE=y | |||
501 | # | 577 | # |
502 | 578 | ||
503 | # | 579 | # |
504 | # Enable only one of the two stacks, unless you know what you are doing | 580 | # You can enable one or both FireWire driver stacks. |
581 | # | ||
582 | |||
583 | # | ||
584 | # See the help texts for more information. | ||
505 | # | 585 | # |
506 | # CONFIG_FIREWIRE is not set | 586 | # CONFIG_FIREWIRE is not set |
507 | # CONFIG_IEEE1394 is not set | 587 | # CONFIG_IEEE1394 is not set |
@@ -522,6 +602,8 @@ CONFIG_NET_ETHERNET=y | |||
522 | # CONFIG_SUNGEM is not set | 602 | # CONFIG_SUNGEM is not set |
523 | # CONFIG_CASSINI is not set | 603 | # CONFIG_CASSINI is not set |
524 | # CONFIG_NET_VENDOR_3COM is not set | 604 | # CONFIG_NET_VENDOR_3COM is not set |
605 | # CONFIG_ETHOC is not set | ||
606 | # CONFIG_DNET is not set | ||
525 | # CONFIG_NET_TULIP is not set | 607 | # CONFIG_NET_TULIP is not set |
526 | # CONFIG_HP100 is not set | 608 | # CONFIG_HP100 is not set |
527 | CONFIG_IBM_NEW_EMAC=y | 609 | CONFIG_IBM_NEW_EMAC=y |
@@ -540,7 +622,10 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
540 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 622 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
541 | # CONFIG_NET_PCI is not set | 623 | # CONFIG_NET_PCI is not set |
542 | # CONFIG_B44 is not set | 624 | # CONFIG_B44 is not set |
625 | # CONFIG_KS8842 is not set | ||
626 | # CONFIG_KS8851_MLL is not set | ||
543 | # CONFIG_ATL2 is not set | 627 | # CONFIG_ATL2 is not set |
628 | # CONFIG_XILINX_EMACLITE is not set | ||
544 | CONFIG_NETDEV_1000=y | 629 | CONFIG_NETDEV_1000=y |
545 | # CONFIG_ACENIC is not set | 630 | # CONFIG_ACENIC is not set |
546 | # CONFIG_DL2K is not set | 631 | # CONFIG_DL2K is not set |
@@ -548,6 +633,7 @@ CONFIG_NETDEV_1000=y | |||
548 | # CONFIG_E1000E is not set | 633 | # CONFIG_E1000E is not set |
549 | # CONFIG_IP1000 is not set | 634 | # CONFIG_IP1000 is not set |
550 | # CONFIG_IGB is not set | 635 | # CONFIG_IGB is not set |
636 | # CONFIG_IGBVF is not set | ||
551 | # CONFIG_NS83820 is not set | 637 | # CONFIG_NS83820 is not set |
552 | # CONFIG_HAMACHI is not set | 638 | # CONFIG_HAMACHI is not set |
553 | # CONFIG_YELLOWFIN is not set | 639 | # CONFIG_YELLOWFIN is not set |
@@ -558,9 +644,13 @@ CONFIG_NETDEV_1000=y | |||
558 | # CONFIG_VIA_VELOCITY is not set | 644 | # CONFIG_VIA_VELOCITY is not set |
559 | # CONFIG_TIGON3 is not set | 645 | # CONFIG_TIGON3 is not set |
560 | # CONFIG_BNX2 is not set | 646 | # CONFIG_BNX2 is not set |
647 | # CONFIG_CNIC is not set | ||
648 | # CONFIG_MV643XX_ETH is not set | ||
649 | # CONFIG_XILINX_LL_TEMAC is not set | ||
561 | # CONFIG_QLA3XXX is not set | 650 | # CONFIG_QLA3XXX is not set |
562 | # CONFIG_ATL1 is not set | 651 | # CONFIG_ATL1 is not set |
563 | # CONFIG_ATL1E is not set | 652 | # CONFIG_ATL1E is not set |
653 | # CONFIG_ATL1C is not set | ||
564 | # CONFIG_JME is not set | 654 | # CONFIG_JME is not set |
565 | CONFIG_NETDEV_10000=y | 655 | CONFIG_NETDEV_10000=y |
566 | # CONFIG_CHELSIO_T1 is not set | 656 | # CONFIG_CHELSIO_T1 is not set |
@@ -570,6 +660,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
570 | # CONFIG_IXGBE is not set | 660 | # CONFIG_IXGBE is not set |
571 | # CONFIG_IXGB is not set | 661 | # CONFIG_IXGB is not set |
572 | # CONFIG_S2IO is not set | 662 | # CONFIG_S2IO is not set |
663 | # CONFIG_VXGE is not set | ||
573 | # CONFIG_MYRI10GE is not set | 664 | # CONFIG_MYRI10GE is not set |
574 | # CONFIG_NETXEN_NIC is not set | 665 | # CONFIG_NETXEN_NIC is not set |
575 | # CONFIG_NIU is not set | 666 | # CONFIG_NIU is not set |
@@ -579,14 +670,13 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
579 | # CONFIG_BNX2X is not set | 670 | # CONFIG_BNX2X is not set |
580 | # CONFIG_QLGE is not set | 671 | # CONFIG_QLGE is not set |
581 | # CONFIG_SFC is not set | 672 | # CONFIG_SFC is not set |
673 | # CONFIG_BE2NET is not set | ||
582 | # CONFIG_TR is not set | 674 | # CONFIG_TR is not set |
583 | 675 | CONFIG_WLAN=y | |
584 | # | 676 | # CONFIG_AIRO is not set |
585 | # Wireless LAN | 677 | # CONFIG_ATMEL is not set |
586 | # | 678 | # CONFIG_PRISM54 is not set |
587 | # CONFIG_WLAN_PRE80211 is not set | 679 | # CONFIG_HOSTAP is not set |
588 | # CONFIG_WLAN_80211 is not set | ||
589 | # CONFIG_IWLWIFI_LEDS is not set | ||
590 | 680 | ||
591 | # | 681 | # |
592 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 682 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -599,6 +689,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
599 | # CONFIG_NETCONSOLE is not set | 689 | # CONFIG_NETCONSOLE is not set |
600 | # CONFIG_NETPOLL is not set | 690 | # CONFIG_NETPOLL is not set |
601 | # CONFIG_NET_POLL_CONTROLLER is not set | 691 | # CONFIG_NET_POLL_CONTROLLER is not set |
692 | # CONFIG_VMXNET3 is not set | ||
602 | # CONFIG_ISDN is not set | 693 | # CONFIG_ISDN is not set |
603 | # CONFIG_PHONE is not set | 694 | # CONFIG_PHONE is not set |
604 | 695 | ||
@@ -644,6 +735,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
644 | # CONFIG_SERIAL_JSM is not set | 735 | # CONFIG_SERIAL_JSM is not set |
645 | CONFIG_SERIAL_OF_PLATFORM=y | 736 | CONFIG_SERIAL_OF_PLATFORM=y |
646 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 737 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
738 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
647 | CONFIG_UNIX98_PTYS=y | 739 | CONFIG_UNIX98_PTYS=y |
648 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 740 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
649 | CONFIG_LEGACY_PTYS=y | 741 | CONFIG_LEGACY_PTYS=y |
@@ -660,6 +752,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
660 | CONFIG_DEVPORT=y | 752 | CONFIG_DEVPORT=y |
661 | # CONFIG_I2C is not set | 753 | # CONFIG_I2C is not set |
662 | # CONFIG_SPI is not set | 754 | # CONFIG_SPI is not set |
755 | |||
756 | # | ||
757 | # PPS support | ||
758 | # | ||
759 | # CONFIG_PPS is not set | ||
663 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 760 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
664 | # CONFIG_GPIOLIB is not set | 761 | # CONFIG_GPIOLIB is not set |
665 | # CONFIG_W1 is not set | 762 | # CONFIG_W1 is not set |
@@ -682,27 +779,13 @@ CONFIG_SSB_POSSIBLE=y | |||
682 | # CONFIG_HTC_PASIC3 is not set | 779 | # CONFIG_HTC_PASIC3 is not set |
683 | # CONFIG_MFD_TMIO is not set | 780 | # CONFIG_MFD_TMIO is not set |
684 | # CONFIG_REGULATOR is not set | 781 | # CONFIG_REGULATOR is not set |
685 | 782 | # CONFIG_MEDIA_SUPPORT is not set | |
686 | # | ||
687 | # Multimedia devices | ||
688 | # | ||
689 | |||
690 | # | ||
691 | # Multimedia core support | ||
692 | # | ||
693 | # CONFIG_VIDEO_DEV is not set | ||
694 | # CONFIG_DVB_CORE is not set | ||
695 | # CONFIG_VIDEO_MEDIA is not set | ||
696 | |||
697 | # | ||
698 | # Multimedia drivers | ||
699 | # | ||
700 | # CONFIG_DAB is not set | ||
701 | 783 | ||
702 | # | 784 | # |
703 | # Graphics support | 785 | # Graphics support |
704 | # | 786 | # |
705 | # CONFIG_AGP is not set | 787 | # CONFIG_AGP is not set |
788 | CONFIG_VGA_ARB=y | ||
706 | # CONFIG_DRM is not set | 789 | # CONFIG_DRM is not set |
707 | # CONFIG_VGASTATE is not set | 790 | # CONFIG_VGASTATE is not set |
708 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 791 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -727,7 +810,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
727 | # | 810 | # |
728 | 811 | ||
729 | # | 812 | # |
730 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 813 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
731 | # | 814 | # |
732 | # CONFIG_USB_GADGET is not set | 815 | # CONFIG_USB_GADGET is not set |
733 | 816 | ||
@@ -743,7 +826,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
743 | # CONFIG_EDAC is not set | 826 | # CONFIG_EDAC is not set |
744 | # CONFIG_RTC_CLASS is not set | 827 | # CONFIG_RTC_CLASS is not set |
745 | # CONFIG_DMADEVICES is not set | 828 | # CONFIG_DMADEVICES is not set |
829 | # CONFIG_AUXDISPLAY is not set | ||
746 | # CONFIG_UIO is not set | 830 | # CONFIG_UIO is not set |
831 | |||
832 | # | ||
833 | # TI VLYNQ | ||
834 | # | ||
747 | # CONFIG_STAGING is not set | 835 | # CONFIG_STAGING is not set |
748 | 836 | ||
749 | # | 837 | # |
@@ -754,14 +842,17 @@ CONFIG_EXT2_FS=y | |||
754 | # CONFIG_EXT2_FS_XIP is not set | 842 | # CONFIG_EXT2_FS_XIP is not set |
755 | # CONFIG_EXT3_FS is not set | 843 | # CONFIG_EXT3_FS is not set |
756 | # CONFIG_EXT4_FS is not set | 844 | # CONFIG_EXT4_FS is not set |
845 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
757 | # CONFIG_REISERFS_FS is not set | 846 | # CONFIG_REISERFS_FS is not set |
758 | # CONFIG_JFS_FS is not set | 847 | # CONFIG_JFS_FS is not set |
759 | # CONFIG_FS_POSIX_ACL is not set | 848 | # CONFIG_FS_POSIX_ACL is not set |
760 | CONFIG_FILE_LOCKING=y | ||
761 | # CONFIG_XFS_FS is not set | 849 | # CONFIG_XFS_FS is not set |
762 | # CONFIG_GFS2_FS is not set | 850 | # CONFIG_GFS2_FS is not set |
763 | # CONFIG_OCFS2_FS is not set | 851 | # CONFIG_OCFS2_FS is not set |
764 | # CONFIG_BTRFS_FS is not set | 852 | # CONFIG_BTRFS_FS is not set |
853 | # CONFIG_NILFS2_FS is not set | ||
854 | CONFIG_FILE_LOCKING=y | ||
855 | CONFIG_FSNOTIFY=y | ||
765 | CONFIG_DNOTIFY=y | 856 | CONFIG_DNOTIFY=y |
766 | CONFIG_INOTIFY=y | 857 | CONFIG_INOTIFY=y |
767 | CONFIG_INOTIFY_USER=y | 858 | CONFIG_INOTIFY_USER=y |
@@ -771,6 +862,11 @@ CONFIG_INOTIFY_USER=y | |||
771 | # CONFIG_FUSE_FS is not set | 862 | # CONFIG_FUSE_FS is not set |
772 | 863 | ||
773 | # | 864 | # |
865 | # Caches | ||
866 | # | ||
867 | # CONFIG_FSCACHE is not set | ||
868 | |||
869 | # | ||
774 | # CD-ROM/DVD Filesystems | 870 | # CD-ROM/DVD Filesystems |
775 | # | 871 | # |
776 | # CONFIG_ISO9660_FS is not set | 872 | # CONFIG_ISO9660_FS is not set |
@@ -825,7 +921,6 @@ CONFIG_LOCKD=y | |||
825 | CONFIG_LOCKD_V4=y | 921 | CONFIG_LOCKD_V4=y |
826 | CONFIG_NFS_COMMON=y | 922 | CONFIG_NFS_COMMON=y |
827 | CONFIG_SUNRPC=y | 923 | CONFIG_SUNRPC=y |
828 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
829 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 924 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
830 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 925 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
831 | # CONFIG_SMB_FS is not set | 926 | # CONFIG_SMB_FS is not set |
@@ -841,6 +936,7 @@ CONFIG_SUNRPC=y | |||
841 | CONFIG_MSDOS_PARTITION=y | 936 | CONFIG_MSDOS_PARTITION=y |
842 | # CONFIG_NLS is not set | 937 | # CONFIG_NLS is not set |
843 | # CONFIG_DLM is not set | 938 | # CONFIG_DLM is not set |
939 | # CONFIG_BINARY_PRINTF is not set | ||
844 | 940 | ||
845 | # | 941 | # |
846 | # Library routines | 942 | # Library routines |
@@ -855,11 +951,13 @@ CONFIG_CRC32=y | |||
855 | # CONFIG_CRC7 is not set | 951 | # CONFIG_CRC7 is not set |
856 | # CONFIG_LIBCRC32C is not set | 952 | # CONFIG_LIBCRC32C is not set |
857 | CONFIG_ZLIB_INFLATE=y | 953 | CONFIG_ZLIB_INFLATE=y |
858 | CONFIG_PLIST=y | 954 | CONFIG_DECOMPRESS_GZIP=y |
859 | CONFIG_HAS_IOMEM=y | 955 | CONFIG_HAS_IOMEM=y |
860 | CONFIG_HAS_IOPORT=y | 956 | CONFIG_HAS_IOPORT=y |
861 | CONFIG_HAS_DMA=y | 957 | CONFIG_HAS_DMA=y |
862 | CONFIG_HAVE_LMB=y | 958 | CONFIG_HAVE_LMB=y |
959 | CONFIG_NLATTR=y | ||
960 | CONFIG_GENERIC_ATOMIC64=y | ||
863 | 961 | ||
864 | # | 962 | # |
865 | # Kernel hacking | 963 | # Kernel hacking |
@@ -869,6 +967,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
869 | CONFIG_ENABLE_MUST_CHECK=y | 967 | CONFIG_ENABLE_MUST_CHECK=y |
870 | CONFIG_FRAME_WARN=1024 | 968 | CONFIG_FRAME_WARN=1024 |
871 | CONFIG_MAGIC_SYSRQ=y | 969 | CONFIG_MAGIC_SYSRQ=y |
970 | # CONFIG_STRIP_ASM_SYMS is not set | ||
872 | # CONFIG_UNUSED_SYMBOLS is not set | 971 | # CONFIG_UNUSED_SYMBOLS is not set |
873 | CONFIG_DEBUG_FS=y | 972 | CONFIG_DEBUG_FS=y |
874 | # CONFIG_HEADERS_CHECK is not set | 973 | # CONFIG_HEADERS_CHECK is not set |
@@ -877,16 +976,23 @@ CONFIG_DEBUG_KERNEL=y | |||
877 | CONFIG_DETECT_SOFTLOCKUP=y | 976 | CONFIG_DETECT_SOFTLOCKUP=y |
878 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 977 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
879 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 978 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
979 | CONFIG_DETECT_HUNG_TASK=y | ||
980 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
981 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
880 | CONFIG_SCHED_DEBUG=y | 982 | CONFIG_SCHED_DEBUG=y |
881 | # CONFIG_SCHEDSTATS is not set | 983 | # CONFIG_SCHEDSTATS is not set |
882 | # CONFIG_TIMER_STATS is not set | 984 | # CONFIG_TIMER_STATS is not set |
883 | # CONFIG_DEBUG_OBJECTS is not set | 985 | # CONFIG_DEBUG_OBJECTS is not set |
884 | # CONFIG_SLUB_DEBUG_ON is not set | 986 | # CONFIG_SLUB_DEBUG_ON is not set |
885 | # CONFIG_SLUB_STATS is not set | 987 | # CONFIG_SLUB_STATS is not set |
988 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
886 | # CONFIG_DEBUG_RT_MUTEXES is not set | 989 | # CONFIG_DEBUG_RT_MUTEXES is not set |
887 | # CONFIG_RT_MUTEX_TESTER is not set | 990 | # CONFIG_RT_MUTEX_TESTER is not set |
888 | # CONFIG_DEBUG_SPINLOCK is not set | 991 | # CONFIG_DEBUG_SPINLOCK is not set |
889 | # CONFIG_DEBUG_MUTEXES is not set | 992 | # CONFIG_DEBUG_MUTEXES is not set |
993 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
994 | # CONFIG_PROVE_LOCKING is not set | ||
995 | # CONFIG_LOCK_STAT is not set | ||
890 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 996 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
891 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 997 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
892 | # CONFIG_DEBUG_KOBJECT is not set | 998 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -898,35 +1004,45 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
898 | # CONFIG_DEBUG_LIST is not set | 1004 | # CONFIG_DEBUG_LIST is not set |
899 | # CONFIG_DEBUG_SG is not set | 1005 | # CONFIG_DEBUG_SG is not set |
900 | # CONFIG_DEBUG_NOTIFIERS is not set | 1006 | # CONFIG_DEBUG_NOTIFIERS is not set |
901 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1007 | # CONFIG_DEBUG_CREDENTIALS is not set |
902 | # CONFIG_RCU_TORTURE_TEST is not set | 1008 | # CONFIG_RCU_TORTURE_TEST is not set |
903 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1009 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
904 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1010 | # CONFIG_BACKTRACE_SELF_TEST is not set |
905 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1011 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1012 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
906 | # CONFIG_FAULT_INJECTION is not set | 1013 | # CONFIG_FAULT_INJECTION is not set |
907 | # CONFIG_LATENCYTOP is not set | 1014 | # CONFIG_LATENCYTOP is not set |
908 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1015 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1016 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
909 | CONFIG_HAVE_FUNCTION_TRACER=y | 1017 | CONFIG_HAVE_FUNCTION_TRACER=y |
1018 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
910 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1019 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
911 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1020 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
912 | 1021 | CONFIG_TRACING_SUPPORT=y | |
913 | # | 1022 | CONFIG_FTRACE=y |
914 | # Tracers | ||
915 | # | ||
916 | # CONFIG_FUNCTION_TRACER is not set | 1023 | # CONFIG_FUNCTION_TRACER is not set |
1024 | # CONFIG_IRQSOFF_TRACER is not set | ||
917 | # CONFIG_SCHED_TRACER is not set | 1025 | # CONFIG_SCHED_TRACER is not set |
918 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1026 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
919 | # CONFIG_BOOT_TRACER is not set | 1027 | # CONFIG_BOOT_TRACER is not set |
920 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1028 | CONFIG_BRANCH_PROFILE_NONE=y |
1029 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1030 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
921 | # CONFIG_STACK_TRACER is not set | 1031 | # CONFIG_STACK_TRACER is not set |
922 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1032 | # CONFIG_KMEMTRACE is not set |
1033 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1034 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1035 | # CONFIG_DYNAMIC_DEBUG is not set | ||
1036 | # CONFIG_DMA_API_DEBUG is not set | ||
923 | # CONFIG_SAMPLES is not set | 1037 | # CONFIG_SAMPLES is not set |
924 | CONFIG_HAVE_ARCH_KGDB=y | 1038 | CONFIG_HAVE_ARCH_KGDB=y |
925 | # CONFIG_KGDB is not set | 1039 | # CONFIG_KGDB is not set |
1040 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1041 | CONFIG_PPC_WERROR=y | ||
926 | CONFIG_PRINT_STACK_DEPTH=64 | 1042 | CONFIG_PRINT_STACK_DEPTH=64 |
927 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1043 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
928 | # CONFIG_DEBUG_STACK_USAGE is not set | 1044 | # CONFIG_DEBUG_STACK_USAGE is not set |
929 | # CONFIG_DEBUG_PAGEALLOC is not set | 1045 | # CONFIG_PPC_EMULATED_STATS is not set |
930 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1046 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
931 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1047 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
932 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1048 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -942,13 +1058,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
942 | # CONFIG_KEYS is not set | 1058 | # CONFIG_KEYS is not set |
943 | # CONFIG_SECURITY is not set | 1059 | # CONFIG_SECURITY is not set |
944 | # CONFIG_SECURITYFS is not set | 1060 | # CONFIG_SECURITYFS is not set |
945 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1061 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1062 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1063 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1064 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1065 | CONFIG_DEFAULT_SECURITY="" | ||
946 | CONFIG_CRYPTO=y | 1066 | CONFIG_CRYPTO=y |
947 | 1067 | ||
948 | # | 1068 | # |
949 | # Crypto core or helper | 1069 | # Crypto core or helper |
950 | # | 1070 | # |
951 | # CONFIG_CRYPTO_FIPS is not set | ||
952 | CONFIG_CRYPTO_ALGAPI=y | 1071 | CONFIG_CRYPTO_ALGAPI=y |
953 | CONFIG_CRYPTO_ALGAPI2=y | 1072 | CONFIG_CRYPTO_ALGAPI2=y |
954 | CONFIG_CRYPTO_AEAD2=y | 1073 | CONFIG_CRYPTO_AEAD2=y |
@@ -957,10 +1076,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
957 | CONFIG_CRYPTO_HASH=y | 1076 | CONFIG_CRYPTO_HASH=y |
958 | CONFIG_CRYPTO_HASH2=y | 1077 | CONFIG_CRYPTO_HASH2=y |
959 | CONFIG_CRYPTO_RNG2=y | 1078 | CONFIG_CRYPTO_RNG2=y |
1079 | CONFIG_CRYPTO_PCOMP=y | ||
960 | CONFIG_CRYPTO_MANAGER=y | 1080 | CONFIG_CRYPTO_MANAGER=y |
961 | CONFIG_CRYPTO_MANAGER2=y | 1081 | CONFIG_CRYPTO_MANAGER2=y |
962 | # CONFIG_CRYPTO_GF128MUL is not set | 1082 | # CONFIG_CRYPTO_GF128MUL is not set |
963 | # CONFIG_CRYPTO_NULL is not set | 1083 | # CONFIG_CRYPTO_NULL is not set |
1084 | CONFIG_CRYPTO_WORKQUEUE=y | ||
964 | # CONFIG_CRYPTO_CRYPTD is not set | 1085 | # CONFIG_CRYPTO_CRYPTD is not set |
965 | # CONFIG_CRYPTO_AUTHENC is not set | 1086 | # CONFIG_CRYPTO_AUTHENC is not set |
966 | # CONFIG_CRYPTO_TEST is not set | 1087 | # CONFIG_CRYPTO_TEST is not set |
@@ -988,11 +1109,13 @@ CONFIG_CRYPTO_PCBC=y | |||
988 | # | 1109 | # |
989 | # CONFIG_CRYPTO_HMAC is not set | 1110 | # CONFIG_CRYPTO_HMAC is not set |
990 | # CONFIG_CRYPTO_XCBC is not set | 1111 | # CONFIG_CRYPTO_XCBC is not set |
1112 | # CONFIG_CRYPTO_VMAC is not set | ||
991 | 1113 | ||
992 | # | 1114 | # |
993 | # Digest | 1115 | # Digest |
994 | # | 1116 | # |
995 | # CONFIG_CRYPTO_CRC32C is not set | 1117 | # CONFIG_CRYPTO_CRC32C is not set |
1118 | # CONFIG_CRYPTO_GHASH is not set | ||
996 | # CONFIG_CRYPTO_MD4 is not set | 1119 | # CONFIG_CRYPTO_MD4 is not set |
997 | CONFIG_CRYPTO_MD5=y | 1120 | CONFIG_CRYPTO_MD5=y |
998 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1121 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1029,6 +1152,7 @@ CONFIG_CRYPTO_DES=y | |||
1029 | # Compression | 1152 | # Compression |
1030 | # | 1153 | # |
1031 | # CONFIG_CRYPTO_DEFLATE is not set | 1154 | # CONFIG_CRYPTO_DEFLATE is not set |
1155 | # CONFIG_CRYPTO_ZLIB is not set | ||
1032 | # CONFIG_CRYPTO_LZO is not set | 1156 | # CONFIG_CRYPTO_LZO is not set |
1033 | 1157 | ||
1034 | # | 1158 | # |
@@ -1037,5 +1161,6 @@ CONFIG_CRYPTO_DES=y | |||
1037 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1161 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
1038 | CONFIG_CRYPTO_HW=y | 1162 | CONFIG_CRYPTO_HW=y |
1039 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1163 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1164 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
1040 | # CONFIG_PPC_CLOCK is not set | 1165 | # CONFIG_PPC_CLOCK is not set |
1041 | # CONFIG_VIRTUALIZATION is not set | 1166 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig index 6f976b51cdd0..1f6d0490e28d 100644 --- a/arch/powerpc/configs/44x/arches_defconfig +++ b/arch/powerpc/configs/44x/arches_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.31-rc5 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Thu Aug 13 14:14:07 2009 | 4 | # Mon Jan 4 14:02:35 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -20,6 +20,7 @@ CONFIG_BOOKE=y | |||
20 | CONFIG_PTE_64BIT=y | 20 | CONFIG_PTE_64BIT=y |
21 | CONFIG_PHYS_64BIT=y | 21 | CONFIG_PHYS_64BIT=y |
22 | CONFIG_PPC_MMU_NOHASH=y | 22 | CONFIG_PPC_MMU_NOHASH=y |
23 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 25 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
@@ -33,7 +34,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
33 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
34 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
36 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
39 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
@@ -56,6 +59,7 @@ CONFIG_AUDIT_ARCH=y | |||
56 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
57 | CONFIG_DTC=y | 60 | CONFIG_DTC=y |
58 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
62 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
59 | CONFIG_PPC_DCR_NATIVE=y | 63 | CONFIG_PPC_DCR_NATIVE=y |
60 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
61 | CONFIG_PPC_DCR=y | 65 | CONFIG_PPC_DCR=y |
@@ -83,11 +87,13 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y | |||
83 | # | 87 | # |
84 | # RCU Subsystem | 88 | # RCU Subsystem |
85 | # | 89 | # |
86 | CONFIG_CLASSIC_RCU=y | 90 | CONFIG_TREE_RCU=y |
87 | # CONFIG_TREE_RCU is not set | 91 | # CONFIG_TREE_PREEMPT_RCU is not set |
88 | # CONFIG_PREEMPT_RCU is not set | 92 | # CONFIG_TINY_RCU is not set |
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
89 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
90 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
91 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
92 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
93 | # CONFIG_GROUP_SCHED is not set | 99 | # CONFIG_GROUP_SCHED is not set |
@@ -121,22 +127,21 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
124 | CONFIG_HAVE_PERF_COUNTERS=y | 130 | CONFIG_HAVE_PERF_EVENTS=y |
125 | 131 | ||
126 | # | 132 | # |
127 | # Performance Counters | 133 | # Kernel Performance Events And Counters |
128 | # | 134 | # |
135 | # CONFIG_PERF_EVENTS is not set | ||
129 | # CONFIG_PERF_COUNTERS is not set | 136 | # CONFIG_PERF_COUNTERS is not set |
130 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
131 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
132 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
133 | # CONFIG_STRIP_ASM_SYMS is not set | ||
134 | CONFIG_COMPAT_BRK=y | 140 | CONFIG_COMPAT_BRK=y |
135 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
136 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
137 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
138 | # CONFIG_PROFILING is not set | 144 | # CONFIG_PROFILING is not set |
139 | # CONFIG_MARKERS is not set | ||
140 | CONFIG_HAVE_OPROFILE=y | 145 | CONFIG_HAVE_OPROFILE=y |
141 | # CONFIG_KPROBES is not set | 146 | # CONFIG_KPROBES is not set |
142 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 147 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
@@ -144,6 +149,8 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
144 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
145 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
146 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
147 | 154 | ||
148 | # | 155 | # |
149 | # GCOV-based kernel profiling | 156 | # GCOV-based kernel profiling |
@@ -169,14 +176,41 @@ CONFIG_LBDAF=y | |||
169 | # IO Schedulers | 176 | # IO Schedulers |
170 | # | 177 | # |
171 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
172 | CONFIG_IOSCHED_AS=y | ||
173 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
174 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
175 | CONFIG_DEFAULT_AS=y | ||
176 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
177 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
178 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
179 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
187 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
180 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
181 | CONFIG_PPC4xx_PCI_EXPRESS=y | 215 | CONFIG_PPC4xx_PCI_EXPRESS=y |
182 | 216 | ||
@@ -198,6 +232,7 @@ CONFIG_ARCHES=y | |||
198 | # CONFIG_CANYONLANDS is not set | 232 | # CONFIG_CANYONLANDS is not set |
199 | # CONFIG_GLACIER is not set | 233 | # CONFIG_GLACIER is not set |
200 | # CONFIG_REDWOOD is not set | 234 | # CONFIG_REDWOOD is not set |
235 | # CONFIG_EIGER is not set | ||
201 | # CONFIG_YOSEMITE is not set | 236 | # CONFIG_YOSEMITE is not set |
202 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 237 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
203 | CONFIG_PPC44x_SIMPLE=y | 238 | CONFIG_PPC44x_SIMPLE=y |
@@ -241,10 +276,11 @@ CONFIG_BINFMT_ELF=y | |||
241 | # CONFIG_MATH_EMULATION is not set | 276 | # CONFIG_MATH_EMULATION is not set |
242 | # CONFIG_IOMMU_HELPER is not set | 277 | # CONFIG_IOMMU_HELPER is not set |
243 | # CONFIG_SWIOTLB is not set | 278 | # CONFIG_SWIOTLB is not set |
244 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | ||
245 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 279 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
246 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 280 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
247 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 281 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
282 | CONFIG_SPARSE_IRQ=y | ||
283 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
248 | CONFIG_ARCH_FLATMEM_ENABLE=y | 284 | CONFIG_ARCH_FLATMEM_ENABLE=y |
249 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 285 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
250 | CONFIG_SELECT_MEMORY_MODEL=y | 286 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -260,8 +296,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
260 | CONFIG_ZONE_DMA_FLAG=1 | 296 | CONFIG_ZONE_DMA_FLAG=1 |
261 | CONFIG_BOUNCE=y | 297 | CONFIG_BOUNCE=y |
262 | CONFIG_VIRT_TO_BUS=y | 298 | CONFIG_VIRT_TO_BUS=y |
263 | CONFIG_HAVE_MLOCK=y | 299 | # CONFIG_KSM is not set |
264 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
265 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 300 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
266 | CONFIG_STDBINUTILS=y | 301 | CONFIG_STDBINUTILS=y |
267 | CONFIG_PPC_4K_PAGES=y | 302 | CONFIG_PPC_4K_PAGES=y |
@@ -352,6 +387,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
352 | # CONFIG_NETFILTER is not set | 387 | # CONFIG_NETFILTER is not set |
353 | # CONFIG_IP_DCCP is not set | 388 | # CONFIG_IP_DCCP is not set |
354 | # CONFIG_IP_SCTP is not set | 389 | # CONFIG_IP_SCTP is not set |
390 | # CONFIG_RDS is not set | ||
355 | # CONFIG_TIPC is not set | 391 | # CONFIG_TIPC is not set |
356 | # CONFIG_ATM is not set | 392 | # CONFIG_ATM is not set |
357 | # CONFIG_BRIDGE is not set | 393 | # CONFIG_BRIDGE is not set |
@@ -379,7 +415,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
379 | # CONFIG_IRDA is not set | 415 | # CONFIG_IRDA is not set |
380 | # CONFIG_BT is not set | 416 | # CONFIG_BT is not set |
381 | # CONFIG_AF_RXRPC is not set | 417 | # CONFIG_AF_RXRPC is not set |
382 | # CONFIG_WIRELESS is not set | 418 | CONFIG_WIRELESS=y |
419 | # CONFIG_CFG80211 is not set | ||
420 | # CONFIG_LIB80211 is not set | ||
421 | |||
422 | # | ||
423 | # CFG80211 needs to be enabled for MAC80211 | ||
424 | # | ||
383 | # CONFIG_WIMAX is not set | 425 | # CONFIG_WIMAX is not set |
384 | # CONFIG_RFKILL is not set | 426 | # CONFIG_RFKILL is not set |
385 | # CONFIG_NET_9P is not set | 427 | # CONFIG_NET_9P is not set |
@@ -392,6 +434,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
392 | # Generic Driver Options | 434 | # Generic Driver Options |
393 | # | 435 | # |
394 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 436 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
437 | # CONFIG_DEVTMPFS is not set | ||
395 | CONFIG_STANDALONE=y | 438 | CONFIG_STANDALONE=y |
396 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 439 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
397 | CONFIG_FW_LOADER=y | 440 | CONFIG_FW_LOADER=y |
@@ -404,9 +447,9 @@ CONFIG_CONNECTOR=y | |||
404 | CONFIG_PROC_EVENTS=y | 447 | CONFIG_PROC_EVENTS=y |
405 | CONFIG_MTD=y | 448 | CONFIG_MTD=y |
406 | # CONFIG_MTD_DEBUG is not set | 449 | # CONFIG_MTD_DEBUG is not set |
450 | # CONFIG_MTD_TESTS is not set | ||
407 | # CONFIG_MTD_CONCAT is not set | 451 | # CONFIG_MTD_CONCAT is not set |
408 | CONFIG_MTD_PARTITIONS=y | 452 | CONFIG_MTD_PARTITIONS=y |
409 | # CONFIG_MTD_TESTS is not set | ||
410 | # CONFIG_MTD_REDBOOT_PARTS is not set | 453 | # CONFIG_MTD_REDBOOT_PARTS is not set |
411 | CONFIG_MTD_CMDLINE_PARTS=y | 454 | CONFIG_MTD_CMDLINE_PARTS=y |
412 | CONFIG_MTD_OF_PARTS=y | 455 | CONFIG_MTD_OF_PARTS=y |
@@ -497,6 +540,7 @@ CONFIG_BLK_DEV=y | |||
497 | # CONFIG_BLK_DEV_UMEM is not set | 540 | # CONFIG_BLK_DEV_UMEM is not set |
498 | # CONFIG_BLK_DEV_COW_COMMON is not set | 541 | # CONFIG_BLK_DEV_COW_COMMON is not set |
499 | # CONFIG_BLK_DEV_LOOP is not set | 542 | # CONFIG_BLK_DEV_LOOP is not set |
543 | # CONFIG_BLK_DEV_DRBD is not set | ||
500 | # CONFIG_BLK_DEV_NBD is not set | 544 | # CONFIG_BLK_DEV_NBD is not set |
501 | # CONFIG_BLK_DEV_SX8 is not set | 545 | # CONFIG_BLK_DEV_SX8 is not set |
502 | CONFIG_BLK_DEV_RAM=y | 546 | CONFIG_BLK_DEV_RAM=y |
@@ -573,16 +617,17 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
573 | # CONFIG_NET_PCI is not set | 617 | # CONFIG_NET_PCI is not set |
574 | # CONFIG_B44 is not set | 618 | # CONFIG_B44 is not set |
575 | # CONFIG_KS8842 is not set | 619 | # CONFIG_KS8842 is not set |
620 | # CONFIG_KS8851_MLL is not set | ||
576 | # CONFIG_ATL2 is not set | 621 | # CONFIG_ATL2 is not set |
622 | # CONFIG_XILINX_EMACLITE is not set | ||
577 | # CONFIG_NETDEV_1000 is not set | 623 | # CONFIG_NETDEV_1000 is not set |
578 | # CONFIG_NETDEV_10000 is not set | 624 | # CONFIG_NETDEV_10000 is not set |
579 | # CONFIG_TR is not set | 625 | # CONFIG_TR is not set |
580 | 626 | CONFIG_WLAN=y | |
581 | # | 627 | # CONFIG_AIRO is not set |
582 | # Wireless LAN | 628 | # CONFIG_ATMEL is not set |
583 | # | 629 | # CONFIG_PRISM54 is not set |
584 | # CONFIG_WLAN_PRE80211 is not set | 630 | # CONFIG_HOSTAP is not set |
585 | # CONFIG_WLAN_80211 is not set | ||
586 | 631 | ||
587 | # | 632 | # |
588 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 633 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -595,6 +640,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
595 | # CONFIG_NETCONSOLE is not set | 640 | # CONFIG_NETCONSOLE is not set |
596 | # CONFIG_NETPOLL is not set | 641 | # CONFIG_NETPOLL is not set |
597 | # CONFIG_NET_POLL_CONTROLLER is not set | 642 | # CONFIG_NET_POLL_CONTROLLER is not set |
643 | # CONFIG_VMXNET3 is not set | ||
598 | # CONFIG_ISDN is not set | 644 | # CONFIG_ISDN is not set |
599 | # CONFIG_PHONE is not set | 645 | # CONFIG_PHONE is not set |
600 | 646 | ||
@@ -640,6 +686,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
640 | # CONFIG_SERIAL_JSM is not set | 686 | # CONFIG_SERIAL_JSM is not set |
641 | CONFIG_SERIAL_OF_PLATFORM=y | 687 | CONFIG_SERIAL_OF_PLATFORM=y |
642 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 688 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
689 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
643 | CONFIG_UNIX98_PTYS=y | 690 | CONFIG_UNIX98_PTYS=y |
644 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 691 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
645 | CONFIG_LEGACY_PTYS=y | 692 | CONFIG_LEGACY_PTYS=y |
@@ -656,6 +703,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
656 | CONFIG_DEVPORT=y | 703 | CONFIG_DEVPORT=y |
657 | CONFIG_I2C=y | 704 | CONFIG_I2C=y |
658 | CONFIG_I2C_BOARDINFO=y | 705 | CONFIG_I2C_BOARDINFO=y |
706 | CONFIG_I2C_COMPAT=y | ||
659 | CONFIG_I2C_CHARDEV=y | 707 | CONFIG_I2C_CHARDEV=y |
660 | CONFIG_I2C_HELPER_AUTO=y | 708 | CONFIG_I2C_HELPER_AUTO=y |
661 | 709 | ||
@@ -696,11 +744,6 @@ CONFIG_I2C_IBM_IIC=y | |||
696 | # CONFIG_I2C_TAOS_EVM is not set | 744 | # CONFIG_I2C_TAOS_EVM is not set |
697 | 745 | ||
698 | # | 746 | # |
699 | # Graphics adapter I2C/DDC channel drivers | ||
700 | # | ||
701 | # CONFIG_I2C_VOODOO3 is not set | ||
702 | |||
703 | # | ||
704 | # Other I2C/SMBus bus drivers | 747 | # Other I2C/SMBus bus drivers |
705 | # | 748 | # |
706 | # CONFIG_I2C_PCA_PLATFORM is not set | 749 | # CONFIG_I2C_PCA_PLATFORM is not set |
@@ -709,10 +752,6 @@ CONFIG_I2C_IBM_IIC=y | |||
709 | # | 752 | # |
710 | # Miscellaneous I2C Chip support | 753 | # Miscellaneous I2C Chip support |
711 | # | 754 | # |
712 | # CONFIG_DS1682 is not set | ||
713 | # CONFIG_SENSORS_PCF8574 is not set | ||
714 | # CONFIG_PCF8575 is not set | ||
715 | # CONFIG_SENSORS_PCA9539 is not set | ||
716 | # CONFIG_SENSORS_TSL2550 is not set | 755 | # CONFIG_SENSORS_TSL2550 is not set |
717 | # CONFIG_I2C_DEBUG_CORE is not set | 756 | # CONFIG_I2C_DEBUG_CORE is not set |
718 | # CONFIG_I2C_DEBUG_ALGO is not set | 757 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -730,6 +769,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
730 | # CONFIG_POWER_SUPPLY is not set | 769 | # CONFIG_POWER_SUPPLY is not set |
731 | CONFIG_HWMON=y | 770 | CONFIG_HWMON=y |
732 | # CONFIG_HWMON_VID is not set | 771 | # CONFIG_HWMON_VID is not set |
772 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
773 | |||
774 | # | ||
775 | # Native drivers | ||
776 | # | ||
733 | CONFIG_SENSORS_AD7414=y | 777 | CONFIG_SENSORS_AD7414=y |
734 | # CONFIG_SENSORS_AD7418 is not set | 778 | # CONFIG_SENSORS_AD7418 is not set |
735 | # CONFIG_SENSORS_ADM1021 is not set | 779 | # CONFIG_SENSORS_ADM1021 is not set |
@@ -753,6 +797,7 @@ CONFIG_SENSORS_AD7414=y | |||
753 | # CONFIG_SENSORS_GL520SM is not set | 797 | # CONFIG_SENSORS_GL520SM is not set |
754 | # CONFIG_SENSORS_IT87 is not set | 798 | # CONFIG_SENSORS_IT87 is not set |
755 | # CONFIG_SENSORS_LM63 is not set | 799 | # CONFIG_SENSORS_LM63 is not set |
800 | # CONFIG_SENSORS_LM73 is not set | ||
756 | # CONFIG_SENSORS_LM75 is not set | 801 | # CONFIG_SENSORS_LM75 is not set |
757 | # CONFIG_SENSORS_LM77 is not set | 802 | # CONFIG_SENSORS_LM77 is not set |
758 | # CONFIG_SENSORS_LM78 is not set | 803 | # CONFIG_SENSORS_LM78 is not set |
@@ -779,6 +824,7 @@ CONFIG_SENSORS_AD7414=y | |||
779 | # CONFIG_SENSORS_ADS7828 is not set | 824 | # CONFIG_SENSORS_ADS7828 is not set |
780 | # CONFIG_SENSORS_THMC50 is not set | 825 | # CONFIG_SENSORS_THMC50 is not set |
781 | # CONFIG_SENSORS_TMP401 is not set | 826 | # CONFIG_SENSORS_TMP401 is not set |
827 | # CONFIG_SENSORS_TMP421 is not set | ||
782 | # CONFIG_SENSORS_VIA686A is not set | 828 | # CONFIG_SENSORS_VIA686A is not set |
783 | # CONFIG_SENSORS_VT1211 is not set | 829 | # CONFIG_SENSORS_VT1211 is not set |
784 | # CONFIG_SENSORS_VT8231 is not set | 830 | # CONFIG_SENSORS_VT8231 is not set |
@@ -790,9 +836,7 @@ CONFIG_SENSORS_AD7414=y | |||
790 | # CONFIG_SENSORS_W83L786NG is not set | 836 | # CONFIG_SENSORS_W83L786NG is not set |
791 | # CONFIG_SENSORS_W83627HF is not set | 837 | # CONFIG_SENSORS_W83627HF is not set |
792 | # CONFIG_SENSORS_W83627EHF is not set | 838 | # CONFIG_SENSORS_W83627EHF is not set |
793 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
794 | # CONFIG_THERMAL is not set | 839 | # CONFIG_THERMAL is not set |
795 | # CONFIG_THERMAL_HWMON is not set | ||
796 | # CONFIG_WATCHDOG is not set | 840 | # CONFIG_WATCHDOG is not set |
797 | CONFIG_SSB_POSSIBLE=y | 841 | CONFIG_SSB_POSSIBLE=y |
798 | 842 | ||
@@ -810,10 +854,13 @@ CONFIG_SSB_POSSIBLE=y | |||
810 | # CONFIG_TWL4030_CORE is not set | 854 | # CONFIG_TWL4030_CORE is not set |
811 | # CONFIG_MFD_TMIO is not set | 855 | # CONFIG_MFD_TMIO is not set |
812 | # CONFIG_PMIC_DA903X is not set | 856 | # CONFIG_PMIC_DA903X is not set |
857 | # CONFIG_PMIC_ADP5520 is not set | ||
813 | # CONFIG_MFD_WM8400 is not set | 858 | # CONFIG_MFD_WM8400 is not set |
859 | # CONFIG_MFD_WM831X is not set | ||
814 | # CONFIG_MFD_WM8350_I2C is not set | 860 | # CONFIG_MFD_WM8350_I2C is not set |
815 | # CONFIG_MFD_PCF50633 is not set | 861 | # CONFIG_MFD_PCF50633 is not set |
816 | # CONFIG_AB3100_CORE is not set | 862 | # CONFIG_AB3100_CORE is not set |
863 | # CONFIG_MFD_88PM8607 is not set | ||
817 | # CONFIG_REGULATOR is not set | 864 | # CONFIG_REGULATOR is not set |
818 | # CONFIG_MEDIA_SUPPORT is not set | 865 | # CONFIG_MEDIA_SUPPORT is not set |
819 | 866 | ||
@@ -821,6 +868,7 @@ CONFIG_SSB_POSSIBLE=y | |||
821 | # Graphics support | 868 | # Graphics support |
822 | # | 869 | # |
823 | # CONFIG_AGP is not set | 870 | # CONFIG_AGP is not set |
871 | CONFIG_VGA_ARB=y | ||
824 | # CONFIG_DRM is not set | 872 | # CONFIG_DRM is not set |
825 | # CONFIG_VGASTATE is not set | 873 | # CONFIG_VGASTATE is not set |
826 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 874 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -858,6 +906,7 @@ CONFIG_EXT2_FS=y | |||
858 | # CONFIG_EXT2_FS_XIP is not set | 906 | # CONFIG_EXT2_FS_XIP is not set |
859 | # CONFIG_EXT3_FS is not set | 907 | # CONFIG_EXT3_FS is not set |
860 | # CONFIG_EXT4_FS is not set | 908 | # CONFIG_EXT4_FS is not set |
909 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
861 | # CONFIG_REISERFS_FS is not set | 910 | # CONFIG_REISERFS_FS is not set |
862 | # CONFIG_JFS_FS is not set | 911 | # CONFIG_JFS_FS is not set |
863 | # CONFIG_FS_POSIX_ACL is not set | 912 | # CONFIG_FS_POSIX_ACL is not set |
@@ -865,6 +914,7 @@ CONFIG_EXT2_FS=y | |||
865 | # CONFIG_GFS2_FS is not set | 914 | # CONFIG_GFS2_FS is not set |
866 | # CONFIG_OCFS2_FS is not set | 915 | # CONFIG_OCFS2_FS is not set |
867 | # CONFIG_BTRFS_FS is not set | 916 | # CONFIG_BTRFS_FS is not set |
917 | # CONFIG_NILFS2_FS is not set | ||
868 | CONFIG_FILE_LOCKING=y | 918 | CONFIG_FILE_LOCKING=y |
869 | CONFIG_FSNOTIFY=y | 919 | CONFIG_FSNOTIFY=y |
870 | CONFIG_DNOTIFY=y | 920 | CONFIG_DNOTIFY=y |
@@ -934,7 +984,6 @@ CONFIG_CRAMFS=y | |||
934 | # CONFIG_ROMFS_FS is not set | 984 | # CONFIG_ROMFS_FS is not set |
935 | # CONFIG_SYSV_FS is not set | 985 | # CONFIG_SYSV_FS is not set |
936 | # CONFIG_UFS_FS is not set | 986 | # CONFIG_UFS_FS is not set |
937 | # CONFIG_NILFS2_FS is not set | ||
938 | CONFIG_NETWORK_FILESYSTEMS=y | 987 | CONFIG_NETWORK_FILESYSTEMS=y |
939 | CONFIG_NFS_FS=y | 988 | CONFIG_NFS_FS=y |
940 | CONFIG_NFS_V3=y | 989 | CONFIG_NFS_V3=y |
@@ -993,6 +1042,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
993 | CONFIG_ENABLE_MUST_CHECK=y | 1042 | CONFIG_ENABLE_MUST_CHECK=y |
994 | CONFIG_FRAME_WARN=1024 | 1043 | CONFIG_FRAME_WARN=1024 |
995 | CONFIG_MAGIC_SYSRQ=y | 1044 | CONFIG_MAGIC_SYSRQ=y |
1045 | # CONFIG_STRIP_ASM_SYMS is not set | ||
996 | # CONFIG_UNUSED_SYMBOLS is not set | 1046 | # CONFIG_UNUSED_SYMBOLS is not set |
997 | CONFIG_DEBUG_FS=y | 1047 | CONFIG_DEBUG_FS=y |
998 | # CONFIG_HEADERS_CHECK is not set | 1048 | # CONFIG_HEADERS_CHECK is not set |
@@ -1010,6 +1060,7 @@ CONFIG_SCHED_DEBUG=y | |||
1010 | # CONFIG_DEBUG_OBJECTS is not set | 1060 | # CONFIG_DEBUG_OBJECTS is not set |
1011 | # CONFIG_SLUB_DEBUG_ON is not set | 1061 | # CONFIG_SLUB_DEBUG_ON is not set |
1012 | # CONFIG_SLUB_STATS is not set | 1062 | # CONFIG_SLUB_STATS is not set |
1063 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
1013 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1064 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1014 | # CONFIG_RT_MUTEX_TESTER is not set | 1065 | # CONFIG_RT_MUTEX_TESTER is not set |
1015 | # CONFIG_DEBUG_SPINLOCK is not set | 1066 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1028,10 +1079,12 @@ CONFIG_SCHED_DEBUG=y | |||
1028 | # CONFIG_DEBUG_LIST is not set | 1079 | # CONFIG_DEBUG_LIST is not set |
1029 | # CONFIG_DEBUG_SG is not set | 1080 | # CONFIG_DEBUG_SG is not set |
1030 | # CONFIG_DEBUG_NOTIFIERS is not set | 1081 | # CONFIG_DEBUG_NOTIFIERS is not set |
1082 | # CONFIG_DEBUG_CREDENTIALS is not set | ||
1031 | # CONFIG_RCU_TORTURE_TEST is not set | 1083 | # CONFIG_RCU_TORTURE_TEST is not set |
1032 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1084 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1033 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1085 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1034 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1086 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1087 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1035 | # CONFIG_FAULT_INJECTION is not set | 1088 | # CONFIG_FAULT_INJECTION is not set |
1036 | # CONFIG_LATENCYTOP is not set | 1089 | # CONFIG_LATENCYTOP is not set |
1037 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1090 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
@@ -1055,10 +1108,10 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
1055 | # CONFIG_WORKQUEUE_TRACER is not set | 1108 | # CONFIG_WORKQUEUE_TRACER is not set |
1056 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1109 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1057 | # CONFIG_DYNAMIC_DEBUG is not set | 1110 | # CONFIG_DYNAMIC_DEBUG is not set |
1111 | # CONFIG_DMA_API_DEBUG is not set | ||
1058 | # CONFIG_SAMPLES is not set | 1112 | # CONFIG_SAMPLES is not set |
1059 | CONFIG_HAVE_ARCH_KGDB=y | 1113 | CONFIG_HAVE_ARCH_KGDB=y |
1060 | # CONFIG_KGDB is not set | 1114 | # CONFIG_KGDB is not set |
1061 | # CONFIG_KMEMCHECK is not set | ||
1062 | # CONFIG_PPC_DISABLE_WERROR is not set | 1115 | # CONFIG_PPC_DISABLE_WERROR is not set |
1063 | CONFIG_PPC_WERROR=y | 1116 | CONFIG_PPC_WERROR=y |
1064 | CONFIG_PRINT_STACK_DEPTH=64 | 1117 | CONFIG_PRINT_STACK_DEPTH=64 |
@@ -1080,7 +1133,11 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1080 | # CONFIG_KEYS is not set | 1133 | # CONFIG_KEYS is not set |
1081 | # CONFIG_SECURITY is not set | 1134 | # CONFIG_SECURITY is not set |
1082 | # CONFIG_SECURITYFS is not set | 1135 | # CONFIG_SECURITYFS is not set |
1083 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1136 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1137 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1138 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1139 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1140 | CONFIG_DEFAULT_SECURITY="" | ||
1084 | # CONFIG_CRYPTO is not set | 1141 | # CONFIG_CRYPTO is not set |
1085 | # CONFIG_PPC_CLOCK is not set | 1142 | # CONFIG_PPC_CLOCK is not set |
1086 | # CONFIG_VIRTUALIZATION is not set | 1143 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig index e57f1e4c1795..788faac6c27a 100644 --- a/arch/powerpc/configs/44x/bamboo_defconfig +++ b/arch/powerpc/configs/44x/bamboo_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:22:33 2009 | 4 | # Mon Jan 4 14:09:03 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -20,6 +20,7 @@ CONFIG_BOOKE=y | |||
20 | CONFIG_PTE_64BIT=y | 20 | CONFIG_PTE_64BIT=y |
21 | CONFIG_PHYS_64BIT=y | 21 | CONFIG_PHYS_64BIT=y |
22 | CONFIG_PPC_MMU_NOHASH=y | 22 | CONFIG_PPC_MMU_NOHASH=y |
23 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 25 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
@@ -31,15 +32,18 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
36 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -53,11 +57,15 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
56 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
62 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
57 | CONFIG_PPC_DCR_NATIVE=y | 63 | CONFIG_PPC_DCR_NATIVE=y |
58 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
59 | CONFIG_PPC_DCR=y | 65 | CONFIG_PPC_DCR=y |
66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
61 | 69 | ||
62 | # | 70 | # |
63 | # General setup | 71 | # General setup |
@@ -71,9 +79,21 @@ CONFIG_SWAP=y | |||
71 | CONFIG_SYSVIPC=y | 79 | CONFIG_SYSVIPC=y |
72 | CONFIG_SYSVIPC_SYSCTL=y | 80 | CONFIG_SYSVIPC_SYSCTL=y |
73 | CONFIG_POSIX_MQUEUE=y | 81 | CONFIG_POSIX_MQUEUE=y |
82 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
74 | # CONFIG_BSD_PROCESS_ACCT is not set | 83 | # CONFIG_BSD_PROCESS_ACCT is not set |
75 | # CONFIG_TASKSTATS is not set | 84 | # CONFIG_TASKSTATS is not set |
76 | # CONFIG_AUDIT is not set | 85 | # CONFIG_AUDIT is not set |
86 | |||
87 | # | ||
88 | # RCU Subsystem | ||
89 | # | ||
90 | CONFIG_TREE_RCU=y | ||
91 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
92 | # CONFIG_TINY_RCU is not set | ||
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
96 | # CONFIG_TREE_RCU_TRACE is not set | ||
77 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
78 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
79 | CONFIG_GROUP_SCHED=y | 99 | CONFIG_GROUP_SCHED=y |
@@ -88,8 +108,12 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
88 | # CONFIG_NAMESPACES is not set | 108 | # CONFIG_NAMESPACES is not set |
89 | CONFIG_BLK_DEV_INITRD=y | 109 | CONFIG_BLK_DEV_INITRD=y |
90 | CONFIG_INITRAMFS_SOURCE="" | 110 | CONFIG_INITRAMFS_SOURCE="" |
111 | CONFIG_RD_GZIP=y | ||
112 | # CONFIG_RD_BZIP2 is not set | ||
113 | # CONFIG_RD_LZMA is not set | ||
91 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
92 | CONFIG_SYSCTL=y | 115 | CONFIG_SYSCTL=y |
116 | CONFIG_ANON_INODES=y | ||
93 | CONFIG_EMBEDDED=y | 117 | CONFIG_EMBEDDED=y |
94 | CONFIG_SYSCTL_SYSCALL=y | 118 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_KALLSYMS=y | 119 | CONFIG_KALLSYMS=y |
@@ -99,19 +123,25 @@ CONFIG_HOTPLUG=y | |||
99 | CONFIG_PRINTK=y | 123 | CONFIG_PRINTK=y |
100 | CONFIG_BUG=y | 124 | CONFIG_BUG=y |
101 | CONFIG_ELF_CORE=y | 125 | CONFIG_ELF_CORE=y |
102 | CONFIG_COMPAT_BRK=y | ||
103 | CONFIG_BASE_FULL=y | 126 | CONFIG_BASE_FULL=y |
104 | CONFIG_FUTEX=y | 127 | CONFIG_FUTEX=y |
105 | CONFIG_ANON_INODES=y | ||
106 | CONFIG_EPOLL=y | 128 | CONFIG_EPOLL=y |
107 | CONFIG_SIGNALFD=y | 129 | CONFIG_SIGNALFD=y |
108 | CONFIG_TIMERFD=y | 130 | CONFIG_TIMERFD=y |
109 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
110 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
111 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_EVENTS=y | ||
135 | |||
136 | # | ||
137 | # Kernel Performance Events And Counters | ||
138 | # | ||
139 | # CONFIG_PERF_EVENTS is not set | ||
140 | # CONFIG_PERF_COUNTERS is not set | ||
112 | CONFIG_VM_EVENT_COUNTERS=y | 141 | CONFIG_VM_EVENT_COUNTERS=y |
113 | CONFIG_PCI_QUIRKS=y | 142 | CONFIG_PCI_QUIRKS=y |
114 | CONFIG_SLUB_DEBUG=y | 143 | CONFIG_SLUB_DEBUG=y |
144 | CONFIG_COMPAT_BRK=y | ||
115 | # CONFIG_SLAB is not set | 145 | # CONFIG_SLAB is not set |
116 | CONFIG_SLUB=y | 146 | CONFIG_SLUB=y |
117 | # CONFIG_SLOB is not set | 147 | # CONFIG_SLOB is not set |
@@ -123,6 +153,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
123 | CONFIG_HAVE_KPROBES=y | 153 | CONFIG_HAVE_KPROBES=y |
124 | CONFIG_HAVE_KRETPROBES=y | 154 | CONFIG_HAVE_KRETPROBES=y |
125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 155 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
156 | CONFIG_HAVE_DMA_ATTRS=y | ||
157 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
158 | |||
159 | # | ||
160 | # GCOV-based kernel profiling | ||
161 | # | ||
162 | # CONFIG_GCOV_KERNEL is not set | ||
163 | # CONFIG_SLOW_WORK is not set | ||
126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 164 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
127 | CONFIG_SLABINFO=y | 165 | CONFIG_SLABINFO=y |
128 | CONFIG_RT_MUTEXES=y | 166 | CONFIG_RT_MUTEXES=y |
@@ -134,8 +172,7 @@ CONFIG_MODULE_UNLOAD=y | |||
134 | # CONFIG_MODVERSIONS is not set | 172 | # CONFIG_MODVERSIONS is not set |
135 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 173 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
136 | CONFIG_BLOCK=y | 174 | CONFIG_BLOCK=y |
137 | CONFIG_LBD=y | 175 | CONFIG_LBDAF=y |
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
139 | # CONFIG_BLK_DEV_BSG is not set | 176 | # CONFIG_BLK_DEV_BSG is not set |
140 | # CONFIG_BLK_DEV_INTEGRITY is not set | 177 | # CONFIG_BLK_DEV_INTEGRITY is not set |
141 | 178 | ||
@@ -143,19 +180,41 @@ CONFIG_LBD=y | |||
143 | # IO Schedulers | 180 | # IO Schedulers |
144 | # | 181 | # |
145 | CONFIG_IOSCHED_NOOP=y | 182 | CONFIG_IOSCHED_NOOP=y |
146 | CONFIG_IOSCHED_AS=y | ||
147 | CONFIG_IOSCHED_DEADLINE=y | 183 | CONFIG_IOSCHED_DEADLINE=y |
148 | CONFIG_IOSCHED_CFQ=y | 184 | CONFIG_IOSCHED_CFQ=y |
149 | CONFIG_DEFAULT_AS=y | ||
150 | # CONFIG_DEFAULT_DEADLINE is not set | 185 | # CONFIG_DEFAULT_DEADLINE is not set |
151 | # CONFIG_DEFAULT_CFQ is not set | 186 | CONFIG_DEFAULT_CFQ=y |
152 | # CONFIG_DEFAULT_NOOP is not set | 187 | # CONFIG_DEFAULT_NOOP is not set |
153 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 188 | CONFIG_DEFAULT_IOSCHED="cfq" |
154 | CONFIG_CLASSIC_RCU=y | 189 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
155 | # CONFIG_TREE_RCU is not set | 190 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
156 | # CONFIG_PREEMPT_RCU is not set | 191 | # CONFIG_INLINE_SPIN_LOCK is not set |
157 | # CONFIG_TREE_RCU_TRACE is not set | 192 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
158 | # CONFIG_PREEMPT_RCU_TRACE is not set | 193 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
194 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
195 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
196 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
197 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
198 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
199 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
200 | # CONFIG_INLINE_READ_LOCK is not set | ||
201 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
203 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
204 | CONFIG_INLINE_READ_UNLOCK=y | ||
205 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
206 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
207 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
208 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
212 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
213 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
214 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
215 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
216 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
217 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
159 | # CONFIG_FREEZER is not set | 218 | # CONFIG_FREEZER is not set |
160 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 219 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
161 | 220 | ||
@@ -176,6 +235,8 @@ CONFIG_BAMBOO=y | |||
176 | # CONFIG_ARCHES is not set | 235 | # CONFIG_ARCHES is not set |
177 | # CONFIG_CANYONLANDS is not set | 236 | # CONFIG_CANYONLANDS is not set |
178 | # CONFIG_GLACIER is not set | 237 | # CONFIG_GLACIER is not set |
238 | # CONFIG_REDWOOD is not set | ||
239 | # CONFIG_EIGER is not set | ||
179 | # CONFIG_YOSEMITE is not set | 240 | # CONFIG_YOSEMITE is not set |
180 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 241 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
181 | CONFIG_PPC44x_SIMPLE=y | 242 | CONFIG_PPC44x_SIMPLE=y |
@@ -218,10 +279,12 @@ CONFIG_BINFMT_ELF=y | |||
218 | # CONFIG_BINFMT_MISC is not set | 279 | # CONFIG_BINFMT_MISC is not set |
219 | # CONFIG_MATH_EMULATION is not set | 280 | # CONFIG_MATH_EMULATION is not set |
220 | # CONFIG_IOMMU_HELPER is not set | 281 | # CONFIG_IOMMU_HELPER is not set |
221 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 282 | # CONFIG_SWIOTLB is not set |
222 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 283 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
223 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 284 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
224 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 285 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
286 | CONFIG_SPARSE_IRQ=y | ||
287 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
225 | CONFIG_ARCH_FLATMEM_ENABLE=y | 288 | CONFIG_ARCH_FLATMEM_ENABLE=y |
226 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 289 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
227 | CONFIG_SELECT_MEMORY_MODEL=y | 290 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -237,10 +300,13 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
237 | CONFIG_ZONE_DMA_FLAG=1 | 300 | CONFIG_ZONE_DMA_FLAG=1 |
238 | CONFIG_BOUNCE=y | 301 | CONFIG_BOUNCE=y |
239 | CONFIG_VIRT_TO_BUS=y | 302 | CONFIG_VIRT_TO_BUS=y |
240 | CONFIG_UNEVICTABLE_LRU=y | 303 | # CONFIG_KSM is not set |
304 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
305 | CONFIG_STDBINUTILS=y | ||
241 | CONFIG_PPC_4K_PAGES=y | 306 | CONFIG_PPC_4K_PAGES=y |
242 | # CONFIG_PPC_16K_PAGES is not set | 307 | # CONFIG_PPC_16K_PAGES is not set |
243 | # CONFIG_PPC_64K_PAGES is not set | 308 | # CONFIG_PPC_64K_PAGES is not set |
309 | # CONFIG_PPC_256K_PAGES is not set | ||
244 | CONFIG_FORCE_MAX_ZONEORDER=11 | 310 | CONFIG_FORCE_MAX_ZONEORDER=11 |
245 | CONFIG_PROC_DEVICETREE=y | 311 | CONFIG_PROC_DEVICETREE=y |
246 | CONFIG_CMDLINE_BOOL=y | 312 | CONFIG_CMDLINE_BOOL=y |
@@ -265,6 +331,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
265 | # CONFIG_PCI_LEGACY is not set | 331 | # CONFIG_PCI_LEGACY is not set |
266 | # CONFIG_PCI_DEBUG is not set | 332 | # CONFIG_PCI_DEBUG is not set |
267 | # CONFIG_PCI_STUB is not set | 333 | # CONFIG_PCI_STUB is not set |
334 | # CONFIG_PCI_IOV is not set | ||
268 | # CONFIG_PCCARD is not set | 335 | # CONFIG_PCCARD is not set |
269 | # CONFIG_HOTPLUG_PCI is not set | 336 | # CONFIG_HOTPLUG_PCI is not set |
270 | # CONFIG_HAS_RAPIDIO is not set | 337 | # CONFIG_HAS_RAPIDIO is not set |
@@ -282,14 +349,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
282 | CONFIG_KERNEL_START=0xc0000000 | 349 | CONFIG_KERNEL_START=0xc0000000 |
283 | CONFIG_PHYSICAL_START=0x00000000 | 350 | CONFIG_PHYSICAL_START=0x00000000 |
284 | CONFIG_TASK_SIZE=0xc0000000 | 351 | CONFIG_TASK_SIZE=0xc0000000 |
285 | CONFIG_CONSISTENT_START=0xff100000 | ||
286 | CONFIG_CONSISTENT_SIZE=0x00200000 | 352 | CONFIG_CONSISTENT_SIZE=0x00200000 |
287 | CONFIG_NET=y | 353 | CONFIG_NET=y |
288 | 354 | ||
289 | # | 355 | # |
290 | # Networking options | 356 | # Networking options |
291 | # | 357 | # |
292 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
293 | CONFIG_PACKET=y | 358 | CONFIG_PACKET=y |
294 | # CONFIG_PACKET_MMAP is not set | 359 | # CONFIG_PACKET_MMAP is not set |
295 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
@@ -326,6 +391,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
326 | # CONFIG_NETFILTER is not set | 391 | # CONFIG_NETFILTER is not set |
327 | # CONFIG_IP_DCCP is not set | 392 | # CONFIG_IP_DCCP is not set |
328 | # CONFIG_IP_SCTP is not set | 393 | # CONFIG_IP_SCTP is not set |
394 | # CONFIG_RDS is not set | ||
329 | # CONFIG_TIPC is not set | 395 | # CONFIG_TIPC is not set |
330 | # CONFIG_ATM is not set | 396 | # CONFIG_ATM is not set |
331 | # CONFIG_BRIDGE is not set | 397 | # CONFIG_BRIDGE is not set |
@@ -339,6 +405,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
339 | # CONFIG_LAPB is not set | 405 | # CONFIG_LAPB is not set |
340 | # CONFIG_ECONET is not set | 406 | # CONFIG_ECONET is not set |
341 | # CONFIG_WAN_ROUTER is not set | 407 | # CONFIG_WAN_ROUTER is not set |
408 | # CONFIG_PHONET is not set | ||
409 | # CONFIG_IEEE802154 is not set | ||
342 | # CONFIG_NET_SCHED is not set | 410 | # CONFIG_NET_SCHED is not set |
343 | # CONFIG_DCB is not set | 411 | # CONFIG_DCB is not set |
344 | 412 | ||
@@ -351,8 +419,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
351 | # CONFIG_IRDA is not set | 419 | # CONFIG_IRDA is not set |
352 | # CONFIG_BT is not set | 420 | # CONFIG_BT is not set |
353 | # CONFIG_AF_RXRPC is not set | 421 | # CONFIG_AF_RXRPC is not set |
354 | # CONFIG_PHONET is not set | 422 | CONFIG_WIRELESS=y |
355 | # CONFIG_WIRELESS is not set | 423 | # CONFIG_CFG80211 is not set |
424 | # CONFIG_LIB80211 is not set | ||
425 | |||
426 | # | ||
427 | # CFG80211 needs to be enabled for MAC80211 | ||
428 | # | ||
356 | # CONFIG_WIMAX is not set | 429 | # CONFIG_WIMAX is not set |
357 | # CONFIG_RFKILL is not set | 430 | # CONFIG_RFKILL is not set |
358 | # CONFIG_NET_9P is not set | 431 | # CONFIG_NET_9P is not set |
@@ -365,6 +438,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
365 | # Generic Driver Options | 438 | # Generic Driver Options |
366 | # | 439 | # |
367 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 440 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
441 | # CONFIG_DEVTMPFS is not set | ||
368 | CONFIG_STANDALONE=y | 442 | CONFIG_STANDALONE=y |
369 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 443 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
370 | CONFIG_FW_LOADER=y | 444 | CONFIG_FW_LOADER=y |
@@ -386,6 +460,7 @@ CONFIG_BLK_DEV=y | |||
386 | # CONFIG_BLK_DEV_UMEM is not set | 460 | # CONFIG_BLK_DEV_UMEM is not set |
387 | # CONFIG_BLK_DEV_COW_COMMON is not set | 461 | # CONFIG_BLK_DEV_COW_COMMON is not set |
388 | # CONFIG_BLK_DEV_LOOP is not set | 462 | # CONFIG_BLK_DEV_LOOP is not set |
463 | # CONFIG_BLK_DEV_DRBD is not set | ||
389 | # CONFIG_BLK_DEV_NBD is not set | 464 | # CONFIG_BLK_DEV_NBD is not set |
390 | # CONFIG_BLK_DEV_SX8 is not set | 465 | # CONFIG_BLK_DEV_SX8 is not set |
391 | CONFIG_BLK_DEV_RAM=y | 466 | CONFIG_BLK_DEV_RAM=y |
@@ -398,12 +473,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
398 | # CONFIG_BLK_DEV_HD is not set | 473 | # CONFIG_BLK_DEV_HD is not set |
399 | CONFIG_MISC_DEVICES=y | 474 | CONFIG_MISC_DEVICES=y |
400 | # CONFIG_PHANTOM is not set | 475 | # CONFIG_PHANTOM is not set |
401 | # CONFIG_EEPROM_93CX6 is not set | ||
402 | # CONFIG_SGI_IOC4 is not set | 476 | # CONFIG_SGI_IOC4 is not set |
403 | # CONFIG_TIFM_CORE is not set | 477 | # CONFIG_TIFM_CORE is not set |
404 | # CONFIG_ENCLOSURE_SERVICES is not set | 478 | # CONFIG_ENCLOSURE_SERVICES is not set |
405 | # CONFIG_HP_ILO is not set | 479 | # CONFIG_HP_ILO is not set |
406 | # CONFIG_C2PORT is not set | 480 | # CONFIG_C2PORT is not set |
481 | |||
482 | # | ||
483 | # EEPROM support | ||
484 | # | ||
485 | # CONFIG_EEPROM_93CX6 is not set | ||
486 | # CONFIG_CB710_CORE is not set | ||
407 | CONFIG_HAVE_IDE=y | 487 | CONFIG_HAVE_IDE=y |
408 | # CONFIG_IDE is not set | 488 | # CONFIG_IDE is not set |
409 | 489 | ||
@@ -423,7 +503,11 @@ CONFIG_HAVE_IDE=y | |||
423 | # | 503 | # |
424 | 504 | ||
425 | # | 505 | # |
426 | # Enable only one of the two stacks, unless you know what you are doing | 506 | # You can enable one or both FireWire driver stacks. |
507 | # | ||
508 | |||
509 | # | ||
510 | # See the help texts for more information. | ||
427 | # | 511 | # |
428 | # CONFIG_FIREWIRE is not set | 512 | # CONFIG_FIREWIRE is not set |
429 | # CONFIG_IEEE1394 is not set | 513 | # CONFIG_IEEE1394 is not set |
@@ -444,6 +528,8 @@ CONFIG_NET_ETHERNET=y | |||
444 | # CONFIG_SUNGEM is not set | 528 | # CONFIG_SUNGEM is not set |
445 | # CONFIG_CASSINI is not set | 529 | # CONFIG_CASSINI is not set |
446 | # CONFIG_NET_VENDOR_3COM is not set | 530 | # CONFIG_NET_VENDOR_3COM is not set |
531 | # CONFIG_ETHOC is not set | ||
532 | # CONFIG_DNET is not set | ||
447 | # CONFIG_NET_TULIP is not set | 533 | # CONFIG_NET_TULIP is not set |
448 | # CONFIG_HP100 is not set | 534 | # CONFIG_HP100 is not set |
449 | CONFIG_IBM_NEW_EMAC=y | 535 | CONFIG_IBM_NEW_EMAC=y |
@@ -462,7 +548,10 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
462 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 548 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
463 | # CONFIG_NET_PCI is not set | 549 | # CONFIG_NET_PCI is not set |
464 | # CONFIG_B44 is not set | 550 | # CONFIG_B44 is not set |
551 | # CONFIG_KS8842 is not set | ||
552 | # CONFIG_KS8851_MLL is not set | ||
465 | # CONFIG_ATL2 is not set | 553 | # CONFIG_ATL2 is not set |
554 | # CONFIG_XILINX_EMACLITE is not set | ||
466 | CONFIG_NETDEV_1000=y | 555 | CONFIG_NETDEV_1000=y |
467 | # CONFIG_ACENIC is not set | 556 | # CONFIG_ACENIC is not set |
468 | # CONFIG_DL2K is not set | 557 | # CONFIG_DL2K is not set |
@@ -470,6 +559,7 @@ CONFIG_NETDEV_1000=y | |||
470 | # CONFIG_E1000E is not set | 559 | # CONFIG_E1000E is not set |
471 | # CONFIG_IP1000 is not set | 560 | # CONFIG_IP1000 is not set |
472 | # CONFIG_IGB is not set | 561 | # CONFIG_IGB is not set |
562 | # CONFIG_IGBVF is not set | ||
473 | # CONFIG_NS83820 is not set | 563 | # CONFIG_NS83820 is not set |
474 | # CONFIG_HAMACHI is not set | 564 | # CONFIG_HAMACHI is not set |
475 | # CONFIG_YELLOWFIN is not set | 565 | # CONFIG_YELLOWFIN is not set |
@@ -480,9 +570,13 @@ CONFIG_NETDEV_1000=y | |||
480 | # CONFIG_VIA_VELOCITY is not set | 570 | # CONFIG_VIA_VELOCITY is not set |
481 | # CONFIG_TIGON3 is not set | 571 | # CONFIG_TIGON3 is not set |
482 | # CONFIG_BNX2 is not set | 572 | # CONFIG_BNX2 is not set |
573 | # CONFIG_CNIC is not set | ||
574 | # CONFIG_MV643XX_ETH is not set | ||
575 | # CONFIG_XILINX_LL_TEMAC is not set | ||
483 | # CONFIG_QLA3XXX is not set | 576 | # CONFIG_QLA3XXX is not set |
484 | # CONFIG_ATL1 is not set | 577 | # CONFIG_ATL1 is not set |
485 | # CONFIG_ATL1E is not set | 578 | # CONFIG_ATL1E is not set |
579 | # CONFIG_ATL1C is not set | ||
486 | # CONFIG_JME is not set | 580 | # CONFIG_JME is not set |
487 | CONFIG_NETDEV_10000=y | 581 | CONFIG_NETDEV_10000=y |
488 | # CONFIG_CHELSIO_T1 is not set | 582 | # CONFIG_CHELSIO_T1 is not set |
@@ -492,6 +586,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
492 | # CONFIG_IXGBE is not set | 586 | # CONFIG_IXGBE is not set |
493 | # CONFIG_IXGB is not set | 587 | # CONFIG_IXGB is not set |
494 | # CONFIG_S2IO is not set | 588 | # CONFIG_S2IO is not set |
589 | # CONFIG_VXGE is not set | ||
495 | # CONFIG_MYRI10GE is not set | 590 | # CONFIG_MYRI10GE is not set |
496 | # CONFIG_NETXEN_NIC is not set | 591 | # CONFIG_NETXEN_NIC is not set |
497 | # CONFIG_NIU is not set | 592 | # CONFIG_NIU is not set |
@@ -501,14 +596,13 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
501 | # CONFIG_BNX2X is not set | 596 | # CONFIG_BNX2X is not set |
502 | # CONFIG_QLGE is not set | 597 | # CONFIG_QLGE is not set |
503 | # CONFIG_SFC is not set | 598 | # CONFIG_SFC is not set |
599 | # CONFIG_BE2NET is not set | ||
504 | # CONFIG_TR is not set | 600 | # CONFIG_TR is not set |
505 | 601 | CONFIG_WLAN=y | |
506 | # | 602 | # CONFIG_AIRO is not set |
507 | # Wireless LAN | 603 | # CONFIG_ATMEL is not set |
508 | # | 604 | # CONFIG_PRISM54 is not set |
509 | # CONFIG_WLAN_PRE80211 is not set | 605 | # CONFIG_HOSTAP is not set |
510 | # CONFIG_WLAN_80211 is not set | ||
511 | # CONFIG_IWLWIFI_LEDS is not set | ||
512 | 606 | ||
513 | # | 607 | # |
514 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 608 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -521,6 +615,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
521 | # CONFIG_NETCONSOLE is not set | 615 | # CONFIG_NETCONSOLE is not set |
522 | # CONFIG_NETPOLL is not set | 616 | # CONFIG_NETPOLL is not set |
523 | # CONFIG_NET_POLL_CONTROLLER is not set | 617 | # CONFIG_NET_POLL_CONTROLLER is not set |
618 | # CONFIG_VMXNET3 is not set | ||
524 | # CONFIG_ISDN is not set | 619 | # CONFIG_ISDN is not set |
525 | # CONFIG_PHONE is not set | 620 | # CONFIG_PHONE is not set |
526 | 621 | ||
@@ -566,6 +661,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
566 | # CONFIG_SERIAL_JSM is not set | 661 | # CONFIG_SERIAL_JSM is not set |
567 | CONFIG_SERIAL_OF_PLATFORM=y | 662 | CONFIG_SERIAL_OF_PLATFORM=y |
568 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 663 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
664 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
569 | CONFIG_UNIX98_PTYS=y | 665 | CONFIG_UNIX98_PTYS=y |
570 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 666 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
571 | CONFIG_LEGACY_PTYS=y | 667 | CONFIG_LEGACY_PTYS=y |
@@ -582,6 +678,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
582 | CONFIG_DEVPORT=y | 678 | CONFIG_DEVPORT=y |
583 | # CONFIG_I2C is not set | 679 | # CONFIG_I2C is not set |
584 | # CONFIG_SPI is not set | 680 | # CONFIG_SPI is not set |
681 | |||
682 | # | ||
683 | # PPS support | ||
684 | # | ||
685 | # CONFIG_PPS is not set | ||
585 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 686 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
586 | # CONFIG_GPIOLIB is not set | 687 | # CONFIG_GPIOLIB is not set |
587 | # CONFIG_W1 is not set | 688 | # CONFIG_W1 is not set |
@@ -604,27 +705,13 @@ CONFIG_SSB_POSSIBLE=y | |||
604 | # CONFIG_HTC_PASIC3 is not set | 705 | # CONFIG_HTC_PASIC3 is not set |
605 | # CONFIG_MFD_TMIO is not set | 706 | # CONFIG_MFD_TMIO is not set |
606 | # CONFIG_REGULATOR is not set | 707 | # CONFIG_REGULATOR is not set |
607 | 708 | # CONFIG_MEDIA_SUPPORT is not set | |
608 | # | ||
609 | # Multimedia devices | ||
610 | # | ||
611 | |||
612 | # | ||
613 | # Multimedia core support | ||
614 | # | ||
615 | # CONFIG_VIDEO_DEV is not set | ||
616 | # CONFIG_DVB_CORE is not set | ||
617 | # CONFIG_VIDEO_MEDIA is not set | ||
618 | |||
619 | # | ||
620 | # Multimedia drivers | ||
621 | # | ||
622 | CONFIG_DAB=y | ||
623 | 709 | ||
624 | # | 710 | # |
625 | # Graphics support | 711 | # Graphics support |
626 | # | 712 | # |
627 | # CONFIG_AGP is not set | 713 | # CONFIG_AGP is not set |
714 | CONFIG_VGA_ARB=y | ||
628 | # CONFIG_DRM is not set | 715 | # CONFIG_DRM is not set |
629 | # CONFIG_VGASTATE is not set | 716 | # CONFIG_VGASTATE is not set |
630 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 717 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -649,7 +736,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
649 | # | 736 | # |
650 | 737 | ||
651 | # | 738 | # |
652 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 739 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
653 | # | 740 | # |
654 | # CONFIG_USB_GADGET is not set | 741 | # CONFIG_USB_GADGET is not set |
655 | 742 | ||
@@ -665,7 +752,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
665 | # CONFIG_EDAC is not set | 752 | # CONFIG_EDAC is not set |
666 | # CONFIG_RTC_CLASS is not set | 753 | # CONFIG_RTC_CLASS is not set |
667 | # CONFIG_DMADEVICES is not set | 754 | # CONFIG_DMADEVICES is not set |
755 | # CONFIG_AUXDISPLAY is not set | ||
668 | # CONFIG_UIO is not set | 756 | # CONFIG_UIO is not set |
757 | |||
758 | # | ||
759 | # TI VLYNQ | ||
760 | # | ||
669 | # CONFIG_STAGING is not set | 761 | # CONFIG_STAGING is not set |
670 | 762 | ||
671 | # | 763 | # |
@@ -676,14 +768,17 @@ CONFIG_EXT2_FS=y | |||
676 | # CONFIG_EXT2_FS_XIP is not set | 768 | # CONFIG_EXT2_FS_XIP is not set |
677 | # CONFIG_EXT3_FS is not set | 769 | # CONFIG_EXT3_FS is not set |
678 | # CONFIG_EXT4_FS is not set | 770 | # CONFIG_EXT4_FS is not set |
771 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
679 | # CONFIG_REISERFS_FS is not set | 772 | # CONFIG_REISERFS_FS is not set |
680 | # CONFIG_JFS_FS is not set | 773 | # CONFIG_JFS_FS is not set |
681 | # CONFIG_FS_POSIX_ACL is not set | 774 | # CONFIG_FS_POSIX_ACL is not set |
682 | CONFIG_FILE_LOCKING=y | ||
683 | # CONFIG_XFS_FS is not set | 775 | # CONFIG_XFS_FS is not set |
684 | # CONFIG_GFS2_FS is not set | 776 | # CONFIG_GFS2_FS is not set |
685 | # CONFIG_OCFS2_FS is not set | 777 | # CONFIG_OCFS2_FS is not set |
686 | # CONFIG_BTRFS_FS is not set | 778 | # CONFIG_BTRFS_FS is not set |
779 | # CONFIG_NILFS2_FS is not set | ||
780 | CONFIG_FILE_LOCKING=y | ||
781 | CONFIG_FSNOTIFY=y | ||
687 | CONFIG_DNOTIFY=y | 782 | CONFIG_DNOTIFY=y |
688 | CONFIG_INOTIFY=y | 783 | CONFIG_INOTIFY=y |
689 | CONFIG_INOTIFY_USER=y | 784 | CONFIG_INOTIFY_USER=y |
@@ -693,6 +788,11 @@ CONFIG_INOTIFY_USER=y | |||
693 | # CONFIG_FUSE_FS is not set | 788 | # CONFIG_FUSE_FS is not set |
694 | 789 | ||
695 | # | 790 | # |
791 | # Caches | ||
792 | # | ||
793 | # CONFIG_FSCACHE is not set | ||
794 | |||
795 | # | ||
696 | # CD-ROM/DVD Filesystems | 796 | # CD-ROM/DVD Filesystems |
697 | # | 797 | # |
698 | # CONFIG_ISO9660_FS is not set | 798 | # CONFIG_ISO9660_FS is not set |
@@ -746,7 +846,6 @@ CONFIG_LOCKD=y | |||
746 | CONFIG_LOCKD_V4=y | 846 | CONFIG_LOCKD_V4=y |
747 | CONFIG_NFS_COMMON=y | 847 | CONFIG_NFS_COMMON=y |
748 | CONFIG_SUNRPC=y | 848 | CONFIG_SUNRPC=y |
749 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
750 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 849 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
751 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 850 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
752 | # CONFIG_SMB_FS is not set | 851 | # CONFIG_SMB_FS is not set |
@@ -762,6 +861,7 @@ CONFIG_SUNRPC=y | |||
762 | CONFIG_MSDOS_PARTITION=y | 861 | CONFIG_MSDOS_PARTITION=y |
763 | # CONFIG_NLS is not set | 862 | # CONFIG_NLS is not set |
764 | # CONFIG_DLM is not set | 863 | # CONFIG_DLM is not set |
864 | # CONFIG_BINARY_PRINTF is not set | ||
765 | 865 | ||
766 | # | 866 | # |
767 | # Library routines | 867 | # Library routines |
@@ -776,11 +876,13 @@ CONFIG_CRC32=y | |||
776 | # CONFIG_CRC7 is not set | 876 | # CONFIG_CRC7 is not set |
777 | # CONFIG_LIBCRC32C is not set | 877 | # CONFIG_LIBCRC32C is not set |
778 | CONFIG_ZLIB_INFLATE=y | 878 | CONFIG_ZLIB_INFLATE=y |
779 | CONFIG_PLIST=y | 879 | CONFIG_DECOMPRESS_GZIP=y |
780 | CONFIG_HAS_IOMEM=y | 880 | CONFIG_HAS_IOMEM=y |
781 | CONFIG_HAS_IOPORT=y | 881 | CONFIG_HAS_IOPORT=y |
782 | CONFIG_HAS_DMA=y | 882 | CONFIG_HAS_DMA=y |
783 | CONFIG_HAVE_LMB=y | 883 | CONFIG_HAVE_LMB=y |
884 | CONFIG_NLATTR=y | ||
885 | CONFIG_GENERIC_ATOMIC64=y | ||
784 | 886 | ||
785 | # | 887 | # |
786 | # Kernel hacking | 888 | # Kernel hacking |
@@ -790,6 +892,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
790 | CONFIG_ENABLE_MUST_CHECK=y | 892 | CONFIG_ENABLE_MUST_CHECK=y |
791 | CONFIG_FRAME_WARN=1024 | 893 | CONFIG_FRAME_WARN=1024 |
792 | CONFIG_MAGIC_SYSRQ=y | 894 | CONFIG_MAGIC_SYSRQ=y |
895 | # CONFIG_STRIP_ASM_SYMS is not set | ||
793 | # CONFIG_UNUSED_SYMBOLS is not set | 896 | # CONFIG_UNUSED_SYMBOLS is not set |
794 | CONFIG_DEBUG_FS=y | 897 | CONFIG_DEBUG_FS=y |
795 | # CONFIG_HEADERS_CHECK is not set | 898 | # CONFIG_HEADERS_CHECK is not set |
@@ -798,16 +901,23 @@ CONFIG_DEBUG_KERNEL=y | |||
798 | CONFIG_DETECT_SOFTLOCKUP=y | 901 | CONFIG_DETECT_SOFTLOCKUP=y |
799 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 902 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
800 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 903 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
904 | CONFIG_DETECT_HUNG_TASK=y | ||
905 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
906 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
801 | CONFIG_SCHED_DEBUG=y | 907 | CONFIG_SCHED_DEBUG=y |
802 | # CONFIG_SCHEDSTATS is not set | 908 | # CONFIG_SCHEDSTATS is not set |
803 | # CONFIG_TIMER_STATS is not set | 909 | # CONFIG_TIMER_STATS is not set |
804 | # CONFIG_DEBUG_OBJECTS is not set | 910 | # CONFIG_DEBUG_OBJECTS is not set |
805 | # CONFIG_SLUB_DEBUG_ON is not set | 911 | # CONFIG_SLUB_DEBUG_ON is not set |
806 | # CONFIG_SLUB_STATS is not set | 912 | # CONFIG_SLUB_STATS is not set |
913 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
807 | # CONFIG_DEBUG_RT_MUTEXES is not set | 914 | # CONFIG_DEBUG_RT_MUTEXES is not set |
808 | # CONFIG_RT_MUTEX_TESTER is not set | 915 | # CONFIG_RT_MUTEX_TESTER is not set |
809 | # CONFIG_DEBUG_SPINLOCK is not set | 916 | # CONFIG_DEBUG_SPINLOCK is not set |
810 | # CONFIG_DEBUG_MUTEXES is not set | 917 | # CONFIG_DEBUG_MUTEXES is not set |
918 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
919 | # CONFIG_PROVE_LOCKING is not set | ||
920 | # CONFIG_LOCK_STAT is not set | ||
811 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 921 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
812 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 922 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
813 | # CONFIG_DEBUG_KOBJECT is not set | 923 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -819,35 +929,45 @@ CONFIG_SCHED_DEBUG=y | |||
819 | # CONFIG_DEBUG_LIST is not set | 929 | # CONFIG_DEBUG_LIST is not set |
820 | # CONFIG_DEBUG_SG is not set | 930 | # CONFIG_DEBUG_SG is not set |
821 | # CONFIG_DEBUG_NOTIFIERS is not set | 931 | # CONFIG_DEBUG_NOTIFIERS is not set |
822 | # CONFIG_BOOT_PRINTK_DELAY is not set | 932 | # CONFIG_DEBUG_CREDENTIALS is not set |
823 | # CONFIG_RCU_TORTURE_TEST is not set | 933 | # CONFIG_RCU_TORTURE_TEST is not set |
824 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 934 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
825 | # CONFIG_BACKTRACE_SELF_TEST is not set | 935 | # CONFIG_BACKTRACE_SELF_TEST is not set |
826 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 936 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
937 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
827 | # CONFIG_FAULT_INJECTION is not set | 938 | # CONFIG_FAULT_INJECTION is not set |
828 | # CONFIG_LATENCYTOP is not set | 939 | # CONFIG_LATENCYTOP is not set |
829 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 940 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
941 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
830 | CONFIG_HAVE_FUNCTION_TRACER=y | 942 | CONFIG_HAVE_FUNCTION_TRACER=y |
943 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
831 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 944 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
832 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 945 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
833 | 946 | CONFIG_TRACING_SUPPORT=y | |
834 | # | 947 | CONFIG_FTRACE=y |
835 | # Tracers | ||
836 | # | ||
837 | # CONFIG_FUNCTION_TRACER is not set | 948 | # CONFIG_FUNCTION_TRACER is not set |
949 | # CONFIG_IRQSOFF_TRACER is not set | ||
838 | # CONFIG_SCHED_TRACER is not set | 950 | # CONFIG_SCHED_TRACER is not set |
839 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 951 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
840 | # CONFIG_BOOT_TRACER is not set | 952 | # CONFIG_BOOT_TRACER is not set |
841 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 953 | CONFIG_BRANCH_PROFILE_NONE=y |
954 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
955 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
842 | # CONFIG_STACK_TRACER is not set | 956 | # CONFIG_STACK_TRACER is not set |
843 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 957 | # CONFIG_KMEMTRACE is not set |
958 | # CONFIG_WORKQUEUE_TRACER is not set | ||
959 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
960 | # CONFIG_DYNAMIC_DEBUG is not set | ||
961 | # CONFIG_DMA_API_DEBUG is not set | ||
844 | # CONFIG_SAMPLES is not set | 962 | # CONFIG_SAMPLES is not set |
845 | CONFIG_HAVE_ARCH_KGDB=y | 963 | CONFIG_HAVE_ARCH_KGDB=y |
846 | # CONFIG_KGDB is not set | 964 | # CONFIG_KGDB is not set |
965 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
966 | CONFIG_PPC_WERROR=y | ||
847 | CONFIG_PRINT_STACK_DEPTH=64 | 967 | CONFIG_PRINT_STACK_DEPTH=64 |
848 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 968 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
849 | # CONFIG_DEBUG_STACK_USAGE is not set | 969 | # CONFIG_DEBUG_STACK_USAGE is not set |
850 | # CONFIG_DEBUG_PAGEALLOC is not set | 970 | # CONFIG_PPC_EMULATED_STATS is not set |
851 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 971 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
852 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 972 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
853 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 973 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -863,13 +983,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
863 | # CONFIG_KEYS is not set | 983 | # CONFIG_KEYS is not set |
864 | # CONFIG_SECURITY is not set | 984 | # CONFIG_SECURITY is not set |
865 | # CONFIG_SECURITYFS is not set | 985 | # CONFIG_SECURITYFS is not set |
866 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 986 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
987 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
988 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
989 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
990 | CONFIG_DEFAULT_SECURITY="" | ||
867 | CONFIG_CRYPTO=y | 991 | CONFIG_CRYPTO=y |
868 | 992 | ||
869 | # | 993 | # |
870 | # Crypto core or helper | 994 | # Crypto core or helper |
871 | # | 995 | # |
872 | # CONFIG_CRYPTO_FIPS is not set | ||
873 | CONFIG_CRYPTO_ALGAPI=y | 996 | CONFIG_CRYPTO_ALGAPI=y |
874 | CONFIG_CRYPTO_ALGAPI2=y | 997 | CONFIG_CRYPTO_ALGAPI2=y |
875 | CONFIG_CRYPTO_AEAD2=y | 998 | CONFIG_CRYPTO_AEAD2=y |
@@ -878,10 +1001,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
878 | CONFIG_CRYPTO_HASH=y | 1001 | CONFIG_CRYPTO_HASH=y |
879 | CONFIG_CRYPTO_HASH2=y | 1002 | CONFIG_CRYPTO_HASH2=y |
880 | CONFIG_CRYPTO_RNG2=y | 1003 | CONFIG_CRYPTO_RNG2=y |
1004 | CONFIG_CRYPTO_PCOMP=y | ||
881 | CONFIG_CRYPTO_MANAGER=y | 1005 | CONFIG_CRYPTO_MANAGER=y |
882 | CONFIG_CRYPTO_MANAGER2=y | 1006 | CONFIG_CRYPTO_MANAGER2=y |
883 | # CONFIG_CRYPTO_GF128MUL is not set | 1007 | # CONFIG_CRYPTO_GF128MUL is not set |
884 | # CONFIG_CRYPTO_NULL is not set | 1008 | # CONFIG_CRYPTO_NULL is not set |
1009 | CONFIG_CRYPTO_WORKQUEUE=y | ||
885 | # CONFIG_CRYPTO_CRYPTD is not set | 1010 | # CONFIG_CRYPTO_CRYPTD is not set |
886 | # CONFIG_CRYPTO_AUTHENC is not set | 1011 | # CONFIG_CRYPTO_AUTHENC is not set |
887 | # CONFIG_CRYPTO_TEST is not set | 1012 | # CONFIG_CRYPTO_TEST is not set |
@@ -909,11 +1034,13 @@ CONFIG_CRYPTO_PCBC=y | |||
909 | # | 1034 | # |
910 | # CONFIG_CRYPTO_HMAC is not set | 1035 | # CONFIG_CRYPTO_HMAC is not set |
911 | # CONFIG_CRYPTO_XCBC is not set | 1036 | # CONFIG_CRYPTO_XCBC is not set |
1037 | # CONFIG_CRYPTO_VMAC is not set | ||
912 | 1038 | ||
913 | # | 1039 | # |
914 | # Digest | 1040 | # Digest |
915 | # | 1041 | # |
916 | # CONFIG_CRYPTO_CRC32C is not set | 1042 | # CONFIG_CRYPTO_CRC32C is not set |
1043 | # CONFIG_CRYPTO_GHASH is not set | ||
917 | # CONFIG_CRYPTO_MD4 is not set | 1044 | # CONFIG_CRYPTO_MD4 is not set |
918 | CONFIG_CRYPTO_MD5=y | 1045 | CONFIG_CRYPTO_MD5=y |
919 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1046 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -950,6 +1077,7 @@ CONFIG_CRYPTO_DES=y | |||
950 | # Compression | 1077 | # Compression |
951 | # | 1078 | # |
952 | # CONFIG_CRYPTO_DEFLATE is not set | 1079 | # CONFIG_CRYPTO_DEFLATE is not set |
1080 | # CONFIG_CRYPTO_ZLIB is not set | ||
953 | # CONFIG_CRYPTO_LZO is not set | 1081 | # CONFIG_CRYPTO_LZO is not set |
954 | 1082 | ||
955 | # | 1083 | # |
@@ -958,5 +1086,6 @@ CONFIG_CRYPTO_DES=y | |||
958 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1086 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
959 | CONFIG_CRYPTO_HW=y | 1087 | CONFIG_CRYPTO_HW=y |
960 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1088 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1089 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
961 | # CONFIG_PPC_CLOCK is not set | 1090 | # CONFIG_PPC_CLOCK is not set |
962 | # CONFIG_VIRTUALIZATION is not set | 1091 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig index b312b166be66..4ef8bcab61f8 100644 --- a/arch/powerpc/configs/44x/canyonlands_defconfig +++ b/arch/powerpc/configs/44x/canyonlands_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.31-rc4 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Wed Jul 29 17:27:20 2009 | 4 | # Mon Jan 4 14:12:20 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -20,6 +20,7 @@ CONFIG_BOOKE=y | |||
20 | CONFIG_PTE_64BIT=y | 20 | CONFIG_PTE_64BIT=y |
21 | CONFIG_PHYS_64BIT=y | 21 | CONFIG_PHYS_64BIT=y |
22 | CONFIG_PPC_MMU_NOHASH=y | 22 | CONFIG_PPC_MMU_NOHASH=y |
23 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 25 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
@@ -33,7 +34,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
33 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
34 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
36 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
39 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
@@ -56,6 +59,7 @@ CONFIG_AUDIT_ARCH=y | |||
56 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
57 | CONFIG_DTC=y | 60 | CONFIG_DTC=y |
58 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
62 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
59 | CONFIG_PPC_DCR_NATIVE=y | 63 | CONFIG_PPC_DCR_NATIVE=y |
60 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
61 | CONFIG_PPC_DCR=y | 65 | CONFIG_PPC_DCR=y |
@@ -83,11 +87,13 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y | |||
83 | # | 87 | # |
84 | # RCU Subsystem | 88 | # RCU Subsystem |
85 | # | 89 | # |
86 | CONFIG_CLASSIC_RCU=y | 90 | CONFIG_TREE_RCU=y |
87 | # CONFIG_TREE_RCU is not set | 91 | # CONFIG_TREE_PREEMPT_RCU is not set |
88 | # CONFIG_PREEMPT_RCU is not set | 92 | # CONFIG_TINY_RCU is not set |
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
89 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
90 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
91 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
92 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
93 | # CONFIG_GROUP_SCHED is not set | 99 | # CONFIG_GROUP_SCHED is not set |
@@ -121,22 +127,21 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
124 | CONFIG_HAVE_PERF_COUNTERS=y | 130 | CONFIG_HAVE_PERF_EVENTS=y |
125 | 131 | ||
126 | # | 132 | # |
127 | # Performance Counters | 133 | # Kernel Performance Events And Counters |
128 | # | 134 | # |
135 | # CONFIG_PERF_EVENTS is not set | ||
129 | # CONFIG_PERF_COUNTERS is not set | 136 | # CONFIG_PERF_COUNTERS is not set |
130 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
131 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
132 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
133 | # CONFIG_STRIP_ASM_SYMS is not set | ||
134 | CONFIG_COMPAT_BRK=y | 140 | CONFIG_COMPAT_BRK=y |
135 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
136 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
137 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
138 | # CONFIG_PROFILING is not set | 144 | # CONFIG_PROFILING is not set |
139 | # CONFIG_MARKERS is not set | ||
140 | CONFIG_HAVE_OPROFILE=y | 145 | CONFIG_HAVE_OPROFILE=y |
141 | # CONFIG_KPROBES is not set | 146 | # CONFIG_KPROBES is not set |
142 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 147 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
@@ -144,6 +149,8 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
144 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
145 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
146 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
147 | 154 | ||
148 | # | 155 | # |
149 | # GCOV-based kernel profiling | 156 | # GCOV-based kernel profiling |
@@ -169,14 +176,41 @@ CONFIG_LBDAF=y | |||
169 | # IO Schedulers | 176 | # IO Schedulers |
170 | # | 177 | # |
171 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
172 | CONFIG_IOSCHED_AS=y | ||
173 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
174 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
175 | CONFIG_DEFAULT_AS=y | ||
176 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
177 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
178 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
179 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
187 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
180 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
181 | CONFIG_PPC4xx_PCI_EXPRESS=y | 215 | CONFIG_PPC4xx_PCI_EXPRESS=y |
182 | 216 | ||
@@ -198,6 +232,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y | |||
198 | CONFIG_CANYONLANDS=y | 232 | CONFIG_CANYONLANDS=y |
199 | # CONFIG_GLACIER is not set | 233 | # CONFIG_GLACIER is not set |
200 | # CONFIG_REDWOOD is not set | 234 | # CONFIG_REDWOOD is not set |
235 | # CONFIG_EIGER is not set | ||
201 | # CONFIG_YOSEMITE is not set | 236 | # CONFIG_YOSEMITE is not set |
202 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 237 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
203 | CONFIG_PPC44x_SIMPLE=y | 238 | CONFIG_PPC44x_SIMPLE=y |
@@ -241,10 +276,11 @@ CONFIG_BINFMT_ELF=y | |||
241 | # CONFIG_MATH_EMULATION is not set | 276 | # CONFIG_MATH_EMULATION is not set |
242 | # CONFIG_IOMMU_HELPER is not set | 277 | # CONFIG_IOMMU_HELPER is not set |
243 | # CONFIG_SWIOTLB is not set | 278 | # CONFIG_SWIOTLB is not set |
244 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | ||
245 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 279 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
246 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 280 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
247 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 281 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
282 | CONFIG_SPARSE_IRQ=y | ||
283 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
248 | CONFIG_ARCH_FLATMEM_ENABLE=y | 284 | CONFIG_ARCH_FLATMEM_ENABLE=y |
249 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 285 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
250 | CONFIG_SELECT_MEMORY_MODEL=y | 286 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -260,8 +296,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
260 | CONFIG_ZONE_DMA_FLAG=1 | 296 | CONFIG_ZONE_DMA_FLAG=1 |
261 | CONFIG_BOUNCE=y | 297 | CONFIG_BOUNCE=y |
262 | CONFIG_VIRT_TO_BUS=y | 298 | CONFIG_VIRT_TO_BUS=y |
263 | CONFIG_HAVE_MLOCK=y | 299 | # CONFIG_KSM is not set |
264 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
265 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 300 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
266 | CONFIG_STDBINUTILS=y | 301 | CONFIG_STDBINUTILS=y |
267 | CONFIG_PPC_4K_PAGES=y | 302 | CONFIG_PPC_4K_PAGES=y |
@@ -352,6 +387,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
352 | # CONFIG_NETFILTER is not set | 387 | # CONFIG_NETFILTER is not set |
353 | # CONFIG_IP_DCCP is not set | 388 | # CONFIG_IP_DCCP is not set |
354 | # CONFIG_IP_SCTP is not set | 389 | # CONFIG_IP_SCTP is not set |
390 | # CONFIG_RDS is not set | ||
355 | # CONFIG_TIPC is not set | 391 | # CONFIG_TIPC is not set |
356 | # CONFIG_ATM is not set | 392 | # CONFIG_ATM is not set |
357 | # CONFIG_BRIDGE is not set | 393 | # CONFIG_BRIDGE is not set |
@@ -379,7 +415,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
379 | # CONFIG_IRDA is not set | 415 | # CONFIG_IRDA is not set |
380 | # CONFIG_BT is not set | 416 | # CONFIG_BT is not set |
381 | # CONFIG_AF_RXRPC is not set | 417 | # CONFIG_AF_RXRPC is not set |
382 | # CONFIG_WIRELESS is not set | 418 | CONFIG_WIRELESS=y |
419 | # CONFIG_CFG80211 is not set | ||
420 | # CONFIG_LIB80211 is not set | ||
421 | |||
422 | # | ||
423 | # CFG80211 needs to be enabled for MAC80211 | ||
424 | # | ||
383 | # CONFIG_WIMAX is not set | 425 | # CONFIG_WIMAX is not set |
384 | # CONFIG_RFKILL is not set | 426 | # CONFIG_RFKILL is not set |
385 | # CONFIG_NET_9P is not set | 427 | # CONFIG_NET_9P is not set |
@@ -392,6 +434,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
392 | # Generic Driver Options | 434 | # Generic Driver Options |
393 | # | 435 | # |
394 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 436 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
437 | # CONFIG_DEVTMPFS is not set | ||
395 | CONFIG_STANDALONE=y | 438 | CONFIG_STANDALONE=y |
396 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 439 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
397 | CONFIG_FW_LOADER=y | 440 | CONFIG_FW_LOADER=y |
@@ -404,9 +447,9 @@ CONFIG_CONNECTOR=y | |||
404 | CONFIG_PROC_EVENTS=y | 447 | CONFIG_PROC_EVENTS=y |
405 | CONFIG_MTD=y | 448 | CONFIG_MTD=y |
406 | # CONFIG_MTD_DEBUG is not set | 449 | # CONFIG_MTD_DEBUG is not set |
450 | # CONFIG_MTD_TESTS is not set | ||
407 | # CONFIG_MTD_CONCAT is not set | 451 | # CONFIG_MTD_CONCAT is not set |
408 | CONFIG_MTD_PARTITIONS=y | 452 | CONFIG_MTD_PARTITIONS=y |
409 | # CONFIG_MTD_TESTS is not set | ||
410 | # CONFIG_MTD_REDBOOT_PARTS is not set | 453 | # CONFIG_MTD_REDBOOT_PARTS is not set |
411 | CONFIG_MTD_CMDLINE_PARTS=y | 454 | CONFIG_MTD_CMDLINE_PARTS=y |
412 | CONFIG_MTD_OF_PARTS=y | 455 | CONFIG_MTD_OF_PARTS=y |
@@ -508,6 +551,7 @@ CONFIG_BLK_DEV=y | |||
508 | # CONFIG_BLK_DEV_UMEM is not set | 551 | # CONFIG_BLK_DEV_UMEM is not set |
509 | # CONFIG_BLK_DEV_COW_COMMON is not set | 552 | # CONFIG_BLK_DEV_COW_COMMON is not set |
510 | # CONFIG_BLK_DEV_LOOP is not set | 553 | # CONFIG_BLK_DEV_LOOP is not set |
554 | # CONFIG_BLK_DEV_DRBD is not set | ||
511 | # CONFIG_BLK_DEV_NBD is not set | 555 | # CONFIG_BLK_DEV_NBD is not set |
512 | # CONFIG_BLK_DEV_SX8 is not set | 556 | # CONFIG_BLK_DEV_SX8 is not set |
513 | # CONFIG_BLK_DEV_UB is not set | 557 | # CONFIG_BLK_DEV_UB is not set |
@@ -585,16 +629,18 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
585 | # CONFIG_NET_PCI is not set | 629 | # CONFIG_NET_PCI is not set |
586 | # CONFIG_B44 is not set | 630 | # CONFIG_B44 is not set |
587 | # CONFIG_KS8842 is not set | 631 | # CONFIG_KS8842 is not set |
632 | # CONFIG_KS8851_MLL is not set | ||
588 | # CONFIG_ATL2 is not set | 633 | # CONFIG_ATL2 is not set |
634 | # CONFIG_XILINX_EMACLITE is not set | ||
589 | # CONFIG_NETDEV_1000 is not set | 635 | # CONFIG_NETDEV_1000 is not set |
590 | # CONFIG_NETDEV_10000 is not set | 636 | # CONFIG_NETDEV_10000 is not set |
591 | # CONFIG_TR is not set | 637 | # CONFIG_TR is not set |
592 | 638 | CONFIG_WLAN=y | |
593 | # | 639 | # CONFIG_AIRO is not set |
594 | # Wireless LAN | 640 | # CONFIG_ATMEL is not set |
595 | # | 641 | # CONFIG_PRISM54 is not set |
596 | # CONFIG_WLAN_PRE80211 is not set | 642 | # CONFIG_USB_ZD1201 is not set |
597 | # CONFIG_WLAN_80211 is not set | 643 | # CONFIG_HOSTAP is not set |
598 | 644 | ||
599 | # | 645 | # |
600 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 646 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -616,6 +662,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
616 | # CONFIG_NETCONSOLE is not set | 662 | # CONFIG_NETCONSOLE is not set |
617 | # CONFIG_NETPOLL is not set | 663 | # CONFIG_NETPOLL is not set |
618 | # CONFIG_NET_POLL_CONTROLLER is not set | 664 | # CONFIG_NET_POLL_CONTROLLER is not set |
665 | # CONFIG_VMXNET3 is not set | ||
619 | # CONFIG_ISDN is not set | 666 | # CONFIG_ISDN is not set |
620 | # CONFIG_PHONE is not set | 667 | # CONFIG_PHONE is not set |
621 | 668 | ||
@@ -661,6 +708,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
661 | # CONFIG_SERIAL_JSM is not set | 708 | # CONFIG_SERIAL_JSM is not set |
662 | CONFIG_SERIAL_OF_PLATFORM=y | 709 | CONFIG_SERIAL_OF_PLATFORM=y |
663 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 710 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
711 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
664 | CONFIG_UNIX98_PTYS=y | 712 | CONFIG_UNIX98_PTYS=y |
665 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 713 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
666 | CONFIG_LEGACY_PTYS=y | 714 | CONFIG_LEGACY_PTYS=y |
@@ -676,6 +724,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
676 | CONFIG_DEVPORT=y | 724 | CONFIG_DEVPORT=y |
677 | CONFIG_I2C=y | 725 | CONFIG_I2C=y |
678 | CONFIG_I2C_BOARDINFO=y | 726 | CONFIG_I2C_BOARDINFO=y |
727 | CONFIG_I2C_COMPAT=y | ||
679 | CONFIG_I2C_CHARDEV=y | 728 | CONFIG_I2C_CHARDEV=y |
680 | CONFIG_I2C_HELPER_AUTO=y | 729 | CONFIG_I2C_HELPER_AUTO=y |
681 | 730 | ||
@@ -717,11 +766,6 @@ CONFIG_I2C_IBM_IIC=y | |||
717 | # CONFIG_I2C_TINY_USB is not set | 766 | # CONFIG_I2C_TINY_USB is not set |
718 | 767 | ||
719 | # | 768 | # |
720 | # Graphics adapter I2C/DDC channel drivers | ||
721 | # | ||
722 | # CONFIG_I2C_VOODOO3 is not set | ||
723 | |||
724 | # | ||
725 | # Other I2C/SMBus bus drivers | 769 | # Other I2C/SMBus bus drivers |
726 | # | 770 | # |
727 | # CONFIG_I2C_PCA_PLATFORM is not set | 771 | # CONFIG_I2C_PCA_PLATFORM is not set |
@@ -730,10 +774,6 @@ CONFIG_I2C_IBM_IIC=y | |||
730 | # | 774 | # |
731 | # Miscellaneous I2C Chip support | 775 | # Miscellaneous I2C Chip support |
732 | # | 776 | # |
733 | # CONFIG_DS1682 is not set | ||
734 | # CONFIG_SENSORS_PCF8574 is not set | ||
735 | # CONFIG_PCF8575 is not set | ||
736 | # CONFIG_SENSORS_PCA9539 is not set | ||
737 | # CONFIG_SENSORS_TSL2550 is not set | 777 | # CONFIG_SENSORS_TSL2550 is not set |
738 | # CONFIG_I2C_DEBUG_CORE is not set | 778 | # CONFIG_I2C_DEBUG_CORE is not set |
739 | # CONFIG_I2C_DEBUG_ALGO is not set | 779 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -751,6 +791,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
751 | # CONFIG_POWER_SUPPLY is not set | 791 | # CONFIG_POWER_SUPPLY is not set |
752 | CONFIG_HWMON=y | 792 | CONFIG_HWMON=y |
753 | # CONFIG_HWMON_VID is not set | 793 | # CONFIG_HWMON_VID is not set |
794 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
795 | |||
796 | # | ||
797 | # Native drivers | ||
798 | # | ||
754 | CONFIG_SENSORS_AD7414=y | 799 | CONFIG_SENSORS_AD7414=y |
755 | # CONFIG_SENSORS_AD7418 is not set | 800 | # CONFIG_SENSORS_AD7418 is not set |
756 | # CONFIG_SENSORS_ADM1021 is not set | 801 | # CONFIG_SENSORS_ADM1021 is not set |
@@ -774,6 +819,7 @@ CONFIG_SENSORS_AD7414=y | |||
774 | # CONFIG_SENSORS_GL520SM is not set | 819 | # CONFIG_SENSORS_GL520SM is not set |
775 | # CONFIG_SENSORS_IT87 is not set | 820 | # CONFIG_SENSORS_IT87 is not set |
776 | # CONFIG_SENSORS_LM63 is not set | 821 | # CONFIG_SENSORS_LM63 is not set |
822 | # CONFIG_SENSORS_LM73 is not set | ||
777 | # CONFIG_SENSORS_LM75 is not set | 823 | # CONFIG_SENSORS_LM75 is not set |
778 | # CONFIG_SENSORS_LM77 is not set | 824 | # CONFIG_SENSORS_LM77 is not set |
779 | # CONFIG_SENSORS_LM78 is not set | 825 | # CONFIG_SENSORS_LM78 is not set |
@@ -800,6 +846,7 @@ CONFIG_SENSORS_AD7414=y | |||
800 | # CONFIG_SENSORS_ADS7828 is not set | 846 | # CONFIG_SENSORS_ADS7828 is not set |
801 | # CONFIG_SENSORS_THMC50 is not set | 847 | # CONFIG_SENSORS_THMC50 is not set |
802 | # CONFIG_SENSORS_TMP401 is not set | 848 | # CONFIG_SENSORS_TMP401 is not set |
849 | # CONFIG_SENSORS_TMP421 is not set | ||
803 | # CONFIG_SENSORS_VIA686A is not set | 850 | # CONFIG_SENSORS_VIA686A is not set |
804 | # CONFIG_SENSORS_VT1211 is not set | 851 | # CONFIG_SENSORS_VT1211 is not set |
805 | # CONFIG_SENSORS_VT8231 is not set | 852 | # CONFIG_SENSORS_VT8231 is not set |
@@ -811,9 +858,7 @@ CONFIG_SENSORS_AD7414=y | |||
811 | # CONFIG_SENSORS_W83L786NG is not set | 858 | # CONFIG_SENSORS_W83L786NG is not set |
812 | # CONFIG_SENSORS_W83627HF is not set | 859 | # CONFIG_SENSORS_W83627HF is not set |
813 | # CONFIG_SENSORS_W83627EHF is not set | 860 | # CONFIG_SENSORS_W83627EHF is not set |
814 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
815 | # CONFIG_THERMAL is not set | 861 | # CONFIG_THERMAL is not set |
816 | # CONFIG_THERMAL_HWMON is not set | ||
817 | # CONFIG_WATCHDOG is not set | 862 | # CONFIG_WATCHDOG is not set |
818 | CONFIG_SSB_POSSIBLE=y | 863 | CONFIG_SSB_POSSIBLE=y |
819 | 864 | ||
@@ -831,10 +876,13 @@ CONFIG_SSB_POSSIBLE=y | |||
831 | # CONFIG_TWL4030_CORE is not set | 876 | # CONFIG_TWL4030_CORE is not set |
832 | # CONFIG_MFD_TMIO is not set | 877 | # CONFIG_MFD_TMIO is not set |
833 | # CONFIG_PMIC_DA903X is not set | 878 | # CONFIG_PMIC_DA903X is not set |
879 | # CONFIG_PMIC_ADP5520 is not set | ||
834 | # CONFIG_MFD_WM8400 is not set | 880 | # CONFIG_MFD_WM8400 is not set |
881 | # CONFIG_MFD_WM831X is not set | ||
835 | # CONFIG_MFD_WM8350_I2C is not set | 882 | # CONFIG_MFD_WM8350_I2C is not set |
836 | # CONFIG_MFD_PCF50633 is not set | 883 | # CONFIG_MFD_PCF50633 is not set |
837 | # CONFIG_AB3100_CORE is not set | 884 | # CONFIG_AB3100_CORE is not set |
885 | # CONFIG_MFD_88PM8607 is not set | ||
838 | # CONFIG_REGULATOR is not set | 886 | # CONFIG_REGULATOR is not set |
839 | # CONFIG_MEDIA_SUPPORT is not set | 887 | # CONFIG_MEDIA_SUPPORT is not set |
840 | 888 | ||
@@ -842,6 +890,7 @@ CONFIG_SSB_POSSIBLE=y | |||
842 | # Graphics support | 890 | # Graphics support |
843 | # | 891 | # |
844 | # CONFIG_AGP is not set | 892 | # CONFIG_AGP is not set |
893 | CONFIG_VGA_ARB=y | ||
845 | # CONFIG_DRM is not set | 894 | # CONFIG_DRM is not set |
846 | # CONFIG_VGASTATE is not set | 895 | # CONFIG_VGASTATE is not set |
847 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 896 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
@@ -882,10 +931,12 @@ CONFIG_USB_MON=y | |||
882 | CONFIG_USB_EHCI_HCD=m | 931 | CONFIG_USB_EHCI_HCD=m |
883 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 932 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
884 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 933 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
934 | # CONFIG_XPS_USB_HCD_XILINX is not set | ||
885 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 935 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
886 | # CONFIG_USB_OXU210HP_HCD is not set | 936 | # CONFIG_USB_OXU210HP_HCD is not set |
887 | # CONFIG_USB_ISP116X_HCD is not set | 937 | # CONFIG_USB_ISP116X_HCD is not set |
888 | # CONFIG_USB_ISP1760_HCD is not set | 938 | # CONFIG_USB_ISP1760_HCD is not set |
939 | # CONFIG_USB_ISP1362_HCD is not set | ||
889 | CONFIG_USB_OHCI_HCD=y | 940 | CONFIG_USB_OHCI_HCD=y |
890 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 941 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
891 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 942 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
@@ -993,6 +1044,7 @@ CONFIG_RTC_INTF_DEV=y | |||
993 | # CONFIG_RTC_DRV_PCF8583 is not set | 1044 | # CONFIG_RTC_DRV_PCF8583 is not set |
994 | CONFIG_RTC_DRV_M41T80=y | 1045 | CONFIG_RTC_DRV_M41T80=y |
995 | # CONFIG_RTC_DRV_M41T80_WDT is not set | 1046 | # CONFIG_RTC_DRV_M41T80_WDT is not set |
1047 | # CONFIG_RTC_DRV_BQ32K is not set | ||
996 | # CONFIG_RTC_DRV_S35390A is not set | 1048 | # CONFIG_RTC_DRV_S35390A is not set |
997 | # CONFIG_RTC_DRV_FM3130 is not set | 1049 | # CONFIG_RTC_DRV_FM3130 is not set |
998 | # CONFIG_RTC_DRV_RX8581 is not set | 1050 | # CONFIG_RTC_DRV_RX8581 is not set |
@@ -1014,7 +1066,9 @@ CONFIG_RTC_DRV_M41T80=y | |||
1014 | # CONFIG_RTC_DRV_M48T86 is not set | 1066 | # CONFIG_RTC_DRV_M48T86 is not set |
1015 | # CONFIG_RTC_DRV_M48T35 is not set | 1067 | # CONFIG_RTC_DRV_M48T35 is not set |
1016 | # CONFIG_RTC_DRV_M48T59 is not set | 1068 | # CONFIG_RTC_DRV_M48T59 is not set |
1069 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
1017 | # CONFIG_RTC_DRV_BQ4802 is not set | 1070 | # CONFIG_RTC_DRV_BQ4802 is not set |
1071 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
1018 | # CONFIG_RTC_DRV_V3020 is not set | 1072 | # CONFIG_RTC_DRV_V3020 is not set |
1019 | 1073 | ||
1020 | # | 1074 | # |
@@ -1038,6 +1092,7 @@ CONFIG_EXT2_FS=y | |||
1038 | # CONFIG_EXT2_FS_XIP is not set | 1092 | # CONFIG_EXT2_FS_XIP is not set |
1039 | # CONFIG_EXT3_FS is not set | 1093 | # CONFIG_EXT3_FS is not set |
1040 | # CONFIG_EXT4_FS is not set | 1094 | # CONFIG_EXT4_FS is not set |
1095 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
1041 | # CONFIG_REISERFS_FS is not set | 1096 | # CONFIG_REISERFS_FS is not set |
1042 | # CONFIG_JFS_FS is not set | 1097 | # CONFIG_JFS_FS is not set |
1043 | # CONFIG_FS_POSIX_ACL is not set | 1098 | # CONFIG_FS_POSIX_ACL is not set |
@@ -1045,6 +1100,7 @@ CONFIG_EXT2_FS=y | |||
1045 | # CONFIG_GFS2_FS is not set | 1100 | # CONFIG_GFS2_FS is not set |
1046 | # CONFIG_OCFS2_FS is not set | 1101 | # CONFIG_OCFS2_FS is not set |
1047 | # CONFIG_BTRFS_FS is not set | 1102 | # CONFIG_BTRFS_FS is not set |
1103 | # CONFIG_NILFS2_FS is not set | ||
1048 | CONFIG_FILE_LOCKING=y | 1104 | CONFIG_FILE_LOCKING=y |
1049 | CONFIG_FSNOTIFY=y | 1105 | CONFIG_FSNOTIFY=y |
1050 | CONFIG_DNOTIFY=y | 1106 | CONFIG_DNOTIFY=y |
@@ -1104,7 +1160,6 @@ CONFIG_CRAMFS=y | |||
1104 | # CONFIG_ROMFS_FS is not set | 1160 | # CONFIG_ROMFS_FS is not set |
1105 | # CONFIG_SYSV_FS is not set | 1161 | # CONFIG_SYSV_FS is not set |
1106 | # CONFIG_UFS_FS is not set | 1162 | # CONFIG_UFS_FS is not set |
1107 | # CONFIG_NILFS2_FS is not set | ||
1108 | CONFIG_NETWORK_FILESYSTEMS=y | 1163 | CONFIG_NETWORK_FILESYSTEMS=y |
1109 | CONFIG_NFS_FS=y | 1164 | CONFIG_NFS_FS=y |
1110 | CONFIG_NFS_V3=y | 1165 | CONFIG_NFS_V3=y |
@@ -1201,6 +1256,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
1201 | CONFIG_ENABLE_MUST_CHECK=y | 1256 | CONFIG_ENABLE_MUST_CHECK=y |
1202 | CONFIG_FRAME_WARN=1024 | 1257 | CONFIG_FRAME_WARN=1024 |
1203 | CONFIG_MAGIC_SYSRQ=y | 1258 | CONFIG_MAGIC_SYSRQ=y |
1259 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1204 | # CONFIG_UNUSED_SYMBOLS is not set | 1260 | # CONFIG_UNUSED_SYMBOLS is not set |
1205 | CONFIG_DEBUG_FS=y | 1261 | CONFIG_DEBUG_FS=y |
1206 | # CONFIG_HEADERS_CHECK is not set | 1262 | # CONFIG_HEADERS_CHECK is not set |
@@ -1218,6 +1274,7 @@ CONFIG_SCHED_DEBUG=y | |||
1218 | # CONFIG_DEBUG_OBJECTS is not set | 1274 | # CONFIG_DEBUG_OBJECTS is not set |
1219 | # CONFIG_SLUB_DEBUG_ON is not set | 1275 | # CONFIG_SLUB_DEBUG_ON is not set |
1220 | # CONFIG_SLUB_STATS is not set | 1276 | # CONFIG_SLUB_STATS is not set |
1277 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
1221 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1278 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1222 | # CONFIG_RT_MUTEX_TESTER is not set | 1279 | # CONFIG_RT_MUTEX_TESTER is not set |
1223 | # CONFIG_DEBUG_SPINLOCK is not set | 1280 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1236,10 +1293,12 @@ CONFIG_SCHED_DEBUG=y | |||
1236 | # CONFIG_DEBUG_LIST is not set | 1293 | # CONFIG_DEBUG_LIST is not set |
1237 | # CONFIG_DEBUG_SG is not set | 1294 | # CONFIG_DEBUG_SG is not set |
1238 | # CONFIG_DEBUG_NOTIFIERS is not set | 1295 | # CONFIG_DEBUG_NOTIFIERS is not set |
1296 | # CONFIG_DEBUG_CREDENTIALS is not set | ||
1239 | # CONFIG_RCU_TORTURE_TEST is not set | 1297 | # CONFIG_RCU_TORTURE_TEST is not set |
1240 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1298 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1241 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1299 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1242 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1300 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1301 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1243 | # CONFIG_FAULT_INJECTION is not set | 1302 | # CONFIG_FAULT_INJECTION is not set |
1244 | # CONFIG_LATENCYTOP is not set | 1303 | # CONFIG_LATENCYTOP is not set |
1245 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1304 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
@@ -1263,10 +1322,10 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
1263 | # CONFIG_WORKQUEUE_TRACER is not set | 1322 | # CONFIG_WORKQUEUE_TRACER is not set |
1264 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1323 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1265 | # CONFIG_DYNAMIC_DEBUG is not set | 1324 | # CONFIG_DYNAMIC_DEBUG is not set |
1325 | # CONFIG_DMA_API_DEBUG is not set | ||
1266 | # CONFIG_SAMPLES is not set | 1326 | # CONFIG_SAMPLES is not set |
1267 | CONFIG_HAVE_ARCH_KGDB=y | 1327 | CONFIG_HAVE_ARCH_KGDB=y |
1268 | # CONFIG_KGDB is not set | 1328 | # CONFIG_KGDB is not set |
1269 | # CONFIG_KMEMCHECK is not set | ||
1270 | # CONFIG_PPC_DISABLE_WERROR is not set | 1329 | # CONFIG_PPC_DISABLE_WERROR is not set |
1271 | CONFIG_PPC_WERROR=y | 1330 | CONFIG_PPC_WERROR=y |
1272 | CONFIG_PRINT_STACK_DEPTH=64 | 1331 | CONFIG_PRINT_STACK_DEPTH=64 |
@@ -1288,7 +1347,11 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1288 | # CONFIG_KEYS is not set | 1347 | # CONFIG_KEYS is not set |
1289 | # CONFIG_SECURITY is not set | 1348 | # CONFIG_SECURITY is not set |
1290 | # CONFIG_SECURITYFS is not set | 1349 | # CONFIG_SECURITYFS is not set |
1291 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1350 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1351 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1352 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1353 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1354 | CONFIG_DEFAULT_SECURITY="" | ||
1292 | # CONFIG_CRYPTO is not set | 1355 | # CONFIG_CRYPTO is not set |
1293 | # CONFIG_PPC_CLOCK is not set | 1356 | # CONFIG_PPC_CLOCK is not set |
1294 | # CONFIG_VIRTUALIZATION is not set | 1357 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig index b652f7dcab5a..ca17b1496e32 100644 --- a/arch/powerpc/configs/44x/ebony_defconfig +++ b/arch/powerpc/configs/44x/ebony_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:22:36 2009 | 4 | # Mon Jan 4 14:20:46 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -19,6 +19,7 @@ CONFIG_BOOKE=y | |||
19 | CONFIG_PTE_64BIT=y | 19 | CONFIG_PTE_64BIT=y |
20 | CONFIG_PHYS_64BIT=y | 20 | CONFIG_PHYS_64BIT=y |
21 | CONFIG_PPC_MMU_NOHASH=y | 21 | CONFIG_PPC_MMU_NOHASH=y |
22 | CONFIG_PPC_MMU_NOHASH_32=y | ||
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
23 | CONFIG_NOT_COHERENT_CACHE=y | 24 | CONFIG_NOT_COHERENT_CACHE=y |
24 | CONFIG_PPC32=y | 25 | CONFIG_PPC32=y |
@@ -30,15 +31,18 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 31 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 32 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 33 | CONFIG_GENERIC_HARDIRQS=y |
34 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
38 | CONFIG_NR_IRQS=512 | ||
35 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
44 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -52,11 +56,15 @@ CONFIG_PPC_UDBG_16550=y | |||
52 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
53 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
54 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
55 | # CONFIG_DEFAULT_UIMAGE is not set | 60 | # CONFIG_DEFAULT_UIMAGE is not set |
61 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
56 | CONFIG_PPC_DCR_NATIVE=y | 62 | CONFIG_PPC_DCR_NATIVE=y |
57 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
58 | CONFIG_PPC_DCR=y | 64 | CONFIG_PPC_DCR=y |
65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
60 | 68 | ||
61 | # | 69 | # |
62 | # General setup | 70 | # General setup |
@@ -70,9 +78,21 @@ CONFIG_SWAP=y | |||
70 | CONFIG_SYSVIPC=y | 78 | CONFIG_SYSVIPC=y |
71 | CONFIG_SYSVIPC_SYSCTL=y | 79 | CONFIG_SYSVIPC_SYSCTL=y |
72 | CONFIG_POSIX_MQUEUE=y | 80 | CONFIG_POSIX_MQUEUE=y |
81 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
73 | # CONFIG_BSD_PROCESS_ACCT is not set | 82 | # CONFIG_BSD_PROCESS_ACCT is not set |
74 | # CONFIG_TASKSTATS is not set | 83 | # CONFIG_TASKSTATS is not set |
75 | # CONFIG_AUDIT is not set | 84 | # CONFIG_AUDIT is not set |
85 | |||
86 | # | ||
87 | # RCU Subsystem | ||
88 | # | ||
89 | CONFIG_TREE_RCU=y | ||
90 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
91 | # CONFIG_TINY_RCU is not set | ||
92 | # CONFIG_RCU_TRACE is not set | ||
93 | CONFIG_RCU_FANOUT=32 | ||
94 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
95 | # CONFIG_TREE_RCU_TRACE is not set | ||
76 | # CONFIG_IKCONFIG is not set | 96 | # CONFIG_IKCONFIG is not set |
77 | CONFIG_LOG_BUF_SHIFT=14 | 97 | CONFIG_LOG_BUF_SHIFT=14 |
78 | CONFIG_GROUP_SCHED=y | 98 | CONFIG_GROUP_SCHED=y |
@@ -87,31 +107,40 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
87 | # CONFIG_NAMESPACES is not set | 107 | # CONFIG_NAMESPACES is not set |
88 | CONFIG_BLK_DEV_INITRD=y | 108 | CONFIG_BLK_DEV_INITRD=y |
89 | CONFIG_INITRAMFS_SOURCE="" | 109 | CONFIG_INITRAMFS_SOURCE="" |
110 | CONFIG_RD_GZIP=y | ||
111 | # CONFIG_RD_BZIP2 is not set | ||
112 | # CONFIG_RD_LZMA is not set | ||
90 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 113 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
91 | CONFIG_SYSCTL=y | 114 | CONFIG_SYSCTL=y |
115 | CONFIG_ANON_INODES=y | ||
92 | CONFIG_EMBEDDED=y | 116 | CONFIG_EMBEDDED=y |
93 | CONFIG_SYSCTL_SYSCALL=y | 117 | CONFIG_SYSCTL_SYSCALL=y |
94 | CONFIG_KALLSYMS=y | 118 | CONFIG_KALLSYMS=y |
95 | CONFIG_KALLSYMS_ALL=y | 119 | CONFIG_KALLSYMS_ALL=y |
96 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
97 | CONFIG_KALLSYMS_EXTRA_PASS=y | 120 | CONFIG_KALLSYMS_EXTRA_PASS=y |
98 | CONFIG_HOTPLUG=y | 121 | CONFIG_HOTPLUG=y |
99 | CONFIG_PRINTK=y | 122 | CONFIG_PRINTK=y |
100 | CONFIG_BUG=y | 123 | CONFIG_BUG=y |
101 | CONFIG_ELF_CORE=y | 124 | CONFIG_ELF_CORE=y |
102 | CONFIG_COMPAT_BRK=y | ||
103 | CONFIG_BASE_FULL=y | 125 | CONFIG_BASE_FULL=y |
104 | CONFIG_FUTEX=y | 126 | CONFIG_FUTEX=y |
105 | CONFIG_ANON_INODES=y | ||
106 | CONFIG_EPOLL=y | 127 | CONFIG_EPOLL=y |
107 | CONFIG_SIGNALFD=y | 128 | CONFIG_SIGNALFD=y |
108 | CONFIG_TIMERFD=y | 129 | CONFIG_TIMERFD=y |
109 | CONFIG_EVENTFD=y | 130 | CONFIG_EVENTFD=y |
110 | CONFIG_SHMEM=y | 131 | CONFIG_SHMEM=y |
111 | CONFIG_AIO=y | 132 | CONFIG_AIO=y |
133 | CONFIG_HAVE_PERF_EVENTS=y | ||
134 | |||
135 | # | ||
136 | # Kernel Performance Events And Counters | ||
137 | # | ||
138 | # CONFIG_PERF_EVENTS is not set | ||
139 | # CONFIG_PERF_COUNTERS is not set | ||
112 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
113 | CONFIG_PCI_QUIRKS=y | 141 | CONFIG_PCI_QUIRKS=y |
114 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
143 | CONFIG_COMPAT_BRK=y | ||
115 | # CONFIG_SLAB is not set | 144 | # CONFIG_SLAB is not set |
116 | CONFIG_SLUB=y | 145 | CONFIG_SLUB=y |
117 | # CONFIG_SLOB is not set | 146 | # CONFIG_SLOB is not set |
@@ -123,6 +152,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
123 | CONFIG_HAVE_KPROBES=y | 152 | CONFIG_HAVE_KPROBES=y |
124 | CONFIG_HAVE_KRETPROBES=y | 153 | CONFIG_HAVE_KRETPROBES=y |
125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
155 | CONFIG_HAVE_DMA_ATTRS=y | ||
156 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
157 | |||
158 | # | ||
159 | # GCOV-based kernel profiling | ||
160 | # | ||
161 | # CONFIG_GCOV_KERNEL is not set | ||
162 | # CONFIG_SLOW_WORK is not set | ||
126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 163 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
127 | CONFIG_SLABINFO=y | 164 | CONFIG_SLABINFO=y |
128 | CONFIG_RT_MUTEXES=y | 165 | CONFIG_RT_MUTEXES=y |
@@ -134,8 +171,7 @@ CONFIG_MODULE_UNLOAD=y | |||
134 | # CONFIG_MODVERSIONS is not set | 171 | # CONFIG_MODVERSIONS is not set |
135 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 172 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
136 | CONFIG_BLOCK=y | 173 | CONFIG_BLOCK=y |
137 | CONFIG_LBD=y | 174 | CONFIG_LBDAF=y |
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
139 | # CONFIG_BLK_DEV_BSG is not set | 175 | # CONFIG_BLK_DEV_BSG is not set |
140 | # CONFIG_BLK_DEV_INTEGRITY is not set | 176 | # CONFIG_BLK_DEV_INTEGRITY is not set |
141 | 177 | ||
@@ -143,19 +179,41 @@ CONFIG_LBD=y | |||
143 | # IO Schedulers | 179 | # IO Schedulers |
144 | # | 180 | # |
145 | CONFIG_IOSCHED_NOOP=y | 181 | CONFIG_IOSCHED_NOOP=y |
146 | CONFIG_IOSCHED_AS=y | ||
147 | CONFIG_IOSCHED_DEADLINE=y | 182 | CONFIG_IOSCHED_DEADLINE=y |
148 | CONFIG_IOSCHED_CFQ=y | 183 | CONFIG_IOSCHED_CFQ=y |
149 | CONFIG_DEFAULT_AS=y | ||
150 | # CONFIG_DEFAULT_DEADLINE is not set | 184 | # CONFIG_DEFAULT_DEADLINE is not set |
151 | # CONFIG_DEFAULT_CFQ is not set | 185 | CONFIG_DEFAULT_CFQ=y |
152 | # CONFIG_DEFAULT_NOOP is not set | 186 | # CONFIG_DEFAULT_NOOP is not set |
153 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 187 | CONFIG_DEFAULT_IOSCHED="cfq" |
154 | CONFIG_CLASSIC_RCU=y | 188 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
155 | # CONFIG_TREE_RCU is not set | 189 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
156 | # CONFIG_PREEMPT_RCU is not set | 190 | # CONFIG_INLINE_SPIN_LOCK is not set |
157 | # CONFIG_TREE_RCU_TRACE is not set | 191 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
158 | # CONFIG_PREEMPT_RCU_TRACE is not set | 192 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
193 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
194 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
195 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
196 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
197 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
198 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
199 | # CONFIG_INLINE_READ_LOCK is not set | ||
200 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
201 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
203 | CONFIG_INLINE_READ_UNLOCK=y | ||
204 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
205 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
206 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
207 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
212 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
213 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
214 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
215 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
216 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
159 | # CONFIG_FREEZER is not set | 217 | # CONFIG_FREEZER is not set |
160 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 218 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
161 | 219 | ||
@@ -176,6 +234,8 @@ CONFIG_EBONY=y | |||
176 | # CONFIG_ARCHES is not set | 234 | # CONFIG_ARCHES is not set |
177 | # CONFIG_CANYONLANDS is not set | 235 | # CONFIG_CANYONLANDS is not set |
178 | # CONFIG_GLACIER is not set | 236 | # CONFIG_GLACIER is not set |
237 | # CONFIG_REDWOOD is not set | ||
238 | # CONFIG_EIGER is not set | ||
179 | # CONFIG_YOSEMITE is not set | 239 | # CONFIG_YOSEMITE is not set |
180 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 240 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
181 | # CONFIG_PPC44x_SIMPLE is not set | 241 | # CONFIG_PPC44x_SIMPLE is not set |
@@ -218,10 +278,12 @@ CONFIG_BINFMT_ELF=y | |||
218 | # CONFIG_BINFMT_MISC is not set | 278 | # CONFIG_BINFMT_MISC is not set |
219 | CONFIG_MATH_EMULATION=y | 279 | CONFIG_MATH_EMULATION=y |
220 | # CONFIG_IOMMU_HELPER is not set | 280 | # CONFIG_IOMMU_HELPER is not set |
221 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 281 | # CONFIG_SWIOTLB is not set |
222 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 282 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
223 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 283 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
224 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 284 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
285 | CONFIG_SPARSE_IRQ=y | ||
286 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
225 | CONFIG_ARCH_FLATMEM_ENABLE=y | 287 | CONFIG_ARCH_FLATMEM_ENABLE=y |
226 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 288 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
227 | CONFIG_SELECT_MEMORY_MODEL=y | 289 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -237,10 +299,13 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
237 | CONFIG_ZONE_DMA_FLAG=1 | 299 | CONFIG_ZONE_DMA_FLAG=1 |
238 | CONFIG_BOUNCE=y | 300 | CONFIG_BOUNCE=y |
239 | CONFIG_VIRT_TO_BUS=y | 301 | CONFIG_VIRT_TO_BUS=y |
240 | CONFIG_UNEVICTABLE_LRU=y | 302 | # CONFIG_KSM is not set |
303 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
304 | CONFIG_STDBINUTILS=y | ||
241 | CONFIG_PPC_4K_PAGES=y | 305 | CONFIG_PPC_4K_PAGES=y |
242 | # CONFIG_PPC_16K_PAGES is not set | 306 | # CONFIG_PPC_16K_PAGES is not set |
243 | # CONFIG_PPC_64K_PAGES is not set | 307 | # CONFIG_PPC_64K_PAGES is not set |
308 | # CONFIG_PPC_256K_PAGES is not set | ||
244 | CONFIG_FORCE_MAX_ZONEORDER=11 | 309 | CONFIG_FORCE_MAX_ZONEORDER=11 |
245 | CONFIG_PROC_DEVICETREE=y | 310 | CONFIG_PROC_DEVICETREE=y |
246 | # CONFIG_CMDLINE_BOOL is not set | 311 | # CONFIG_CMDLINE_BOOL is not set |
@@ -264,6 +329,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
264 | # CONFIG_PCI_LEGACY is not set | 329 | # CONFIG_PCI_LEGACY is not set |
265 | # CONFIG_PCI_DEBUG is not set | 330 | # CONFIG_PCI_DEBUG is not set |
266 | # CONFIG_PCI_STUB is not set | 331 | # CONFIG_PCI_STUB is not set |
332 | # CONFIG_PCI_IOV is not set | ||
267 | # CONFIG_PCCARD is not set | 333 | # CONFIG_PCCARD is not set |
268 | # CONFIG_HOTPLUG_PCI is not set | 334 | # CONFIG_HOTPLUG_PCI is not set |
269 | # CONFIG_HAS_RAPIDIO is not set | 335 | # CONFIG_HAS_RAPIDIO is not set |
@@ -281,14 +347,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
281 | CONFIG_KERNEL_START=0xc0000000 | 347 | CONFIG_KERNEL_START=0xc0000000 |
282 | CONFIG_PHYSICAL_START=0x00000000 | 348 | CONFIG_PHYSICAL_START=0x00000000 |
283 | CONFIG_TASK_SIZE=0xc0000000 | 349 | CONFIG_TASK_SIZE=0xc0000000 |
284 | CONFIG_CONSISTENT_START=0xff100000 | ||
285 | CONFIG_CONSISTENT_SIZE=0x00200000 | 350 | CONFIG_CONSISTENT_SIZE=0x00200000 |
286 | CONFIG_NET=y | 351 | CONFIG_NET=y |
287 | 352 | ||
288 | # | 353 | # |
289 | # Networking options | 354 | # Networking options |
290 | # | 355 | # |
291 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
292 | CONFIG_PACKET=y | 356 | CONFIG_PACKET=y |
293 | # CONFIG_PACKET_MMAP is not set | 357 | # CONFIG_PACKET_MMAP is not set |
294 | CONFIG_UNIX=y | 358 | CONFIG_UNIX=y |
@@ -325,6 +389,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
325 | # CONFIG_NETFILTER is not set | 389 | # CONFIG_NETFILTER is not set |
326 | # CONFIG_IP_DCCP is not set | 390 | # CONFIG_IP_DCCP is not set |
327 | # CONFIG_IP_SCTP is not set | 391 | # CONFIG_IP_SCTP is not set |
392 | # CONFIG_RDS is not set | ||
328 | # CONFIG_TIPC is not set | 393 | # CONFIG_TIPC is not set |
329 | # CONFIG_ATM is not set | 394 | # CONFIG_ATM is not set |
330 | # CONFIG_BRIDGE is not set | 395 | # CONFIG_BRIDGE is not set |
@@ -338,6 +403,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
338 | # CONFIG_LAPB is not set | 403 | # CONFIG_LAPB is not set |
339 | # CONFIG_ECONET is not set | 404 | # CONFIG_ECONET is not set |
340 | # CONFIG_WAN_ROUTER is not set | 405 | # CONFIG_WAN_ROUTER is not set |
406 | # CONFIG_PHONET is not set | ||
407 | # CONFIG_IEEE802154 is not set | ||
341 | # CONFIG_NET_SCHED is not set | 408 | # CONFIG_NET_SCHED is not set |
342 | # CONFIG_DCB is not set | 409 | # CONFIG_DCB is not set |
343 | 410 | ||
@@ -350,8 +417,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
350 | # CONFIG_IRDA is not set | 417 | # CONFIG_IRDA is not set |
351 | # CONFIG_BT is not set | 418 | # CONFIG_BT is not set |
352 | # CONFIG_AF_RXRPC is not set | 419 | # CONFIG_AF_RXRPC is not set |
353 | # CONFIG_PHONET is not set | 420 | CONFIG_WIRELESS=y |
354 | # CONFIG_WIRELESS is not set | 421 | # CONFIG_CFG80211 is not set |
422 | # CONFIG_LIB80211 is not set | ||
423 | |||
424 | # | ||
425 | # CFG80211 needs to be enabled for MAC80211 | ||
426 | # | ||
355 | # CONFIG_WIMAX is not set | 427 | # CONFIG_WIMAX is not set |
356 | # CONFIG_RFKILL is not set | 428 | # CONFIG_RFKILL is not set |
357 | # CONFIG_NET_9P is not set | 429 | # CONFIG_NET_9P is not set |
@@ -364,6 +436,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
364 | # Generic Driver Options | 436 | # Generic Driver Options |
365 | # | 437 | # |
366 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 438 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
439 | # CONFIG_DEVTMPFS is not set | ||
367 | CONFIG_STANDALONE=y | 440 | CONFIG_STANDALONE=y |
368 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 441 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
369 | CONFIG_FW_LOADER=y | 442 | CONFIG_FW_LOADER=y |
@@ -376,9 +449,9 @@ CONFIG_CONNECTOR=y | |||
376 | CONFIG_PROC_EVENTS=y | 449 | CONFIG_PROC_EVENTS=y |
377 | CONFIG_MTD=y | 450 | CONFIG_MTD=y |
378 | # CONFIG_MTD_DEBUG is not set | 451 | # CONFIG_MTD_DEBUG is not set |
452 | # CONFIG_MTD_TESTS is not set | ||
379 | # CONFIG_MTD_CONCAT is not set | 453 | # CONFIG_MTD_CONCAT is not set |
380 | CONFIG_MTD_PARTITIONS=y | 454 | CONFIG_MTD_PARTITIONS=y |
381 | # CONFIG_MTD_TESTS is not set | ||
382 | # CONFIG_MTD_REDBOOT_PARTS is not set | 455 | # CONFIG_MTD_REDBOOT_PARTS is not set |
383 | # CONFIG_MTD_CMDLINE_PARTS is not set | 456 | # CONFIG_MTD_CMDLINE_PARTS is not set |
384 | CONFIG_MTD_OF_PARTS=y | 457 | CONFIG_MTD_OF_PARTS=y |
@@ -453,7 +526,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
453 | # LPDDR flash memory drivers | 526 | # LPDDR flash memory drivers |
454 | # | 527 | # |
455 | # CONFIG_MTD_LPDDR is not set | 528 | # CONFIG_MTD_LPDDR is not set |
456 | # CONFIG_MTD_QINFO_PROBE is not set | ||
457 | 529 | ||
458 | # | 530 | # |
459 | # UBI - Unsorted block images | 531 | # UBI - Unsorted block images |
@@ -469,6 +541,7 @@ CONFIG_BLK_DEV=y | |||
469 | # CONFIG_BLK_DEV_UMEM is not set | 541 | # CONFIG_BLK_DEV_UMEM is not set |
470 | # CONFIG_BLK_DEV_COW_COMMON is not set | 542 | # CONFIG_BLK_DEV_COW_COMMON is not set |
471 | # CONFIG_BLK_DEV_LOOP is not set | 543 | # CONFIG_BLK_DEV_LOOP is not set |
544 | # CONFIG_BLK_DEV_DRBD is not set | ||
472 | # CONFIG_BLK_DEV_NBD is not set | 545 | # CONFIG_BLK_DEV_NBD is not set |
473 | # CONFIG_BLK_DEV_SX8 is not set | 546 | # CONFIG_BLK_DEV_SX8 is not set |
474 | CONFIG_BLK_DEV_RAM=y | 547 | CONFIG_BLK_DEV_RAM=y |
@@ -481,12 +554,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
481 | # CONFIG_BLK_DEV_HD is not set | 554 | # CONFIG_BLK_DEV_HD is not set |
482 | CONFIG_MISC_DEVICES=y | 555 | CONFIG_MISC_DEVICES=y |
483 | # CONFIG_PHANTOM is not set | 556 | # CONFIG_PHANTOM is not set |
484 | # CONFIG_EEPROM_93CX6 is not set | ||
485 | # CONFIG_SGI_IOC4 is not set | 557 | # CONFIG_SGI_IOC4 is not set |
486 | # CONFIG_TIFM_CORE is not set | 558 | # CONFIG_TIFM_CORE is not set |
487 | # CONFIG_ENCLOSURE_SERVICES is not set | 559 | # CONFIG_ENCLOSURE_SERVICES is not set |
488 | # CONFIG_HP_ILO is not set | 560 | # CONFIG_HP_ILO is not set |
489 | # CONFIG_C2PORT is not set | 561 | # CONFIG_C2PORT is not set |
562 | |||
563 | # | ||
564 | # EEPROM support | ||
565 | # | ||
566 | # CONFIG_EEPROM_93CX6 is not set | ||
567 | # CONFIG_CB710_CORE is not set | ||
490 | CONFIG_HAVE_IDE=y | 568 | CONFIG_HAVE_IDE=y |
491 | # CONFIG_IDE is not set | 569 | # CONFIG_IDE is not set |
492 | 570 | ||
@@ -506,7 +584,11 @@ CONFIG_HAVE_IDE=y | |||
506 | # | 584 | # |
507 | 585 | ||
508 | # | 586 | # |
509 | # Enable only one of the two stacks, unless you know what you are doing | 587 | # You can enable one or both FireWire driver stacks. |
588 | # | ||
589 | |||
590 | # | ||
591 | # See the help texts for more information. | ||
510 | # | 592 | # |
511 | # CONFIG_FIREWIRE is not set | 593 | # CONFIG_FIREWIRE is not set |
512 | # CONFIG_IEEE1394 is not set | 594 | # CONFIG_IEEE1394 is not set |
@@ -527,6 +609,8 @@ CONFIG_NET_ETHERNET=y | |||
527 | # CONFIG_SUNGEM is not set | 609 | # CONFIG_SUNGEM is not set |
528 | # CONFIG_CASSINI is not set | 610 | # CONFIG_CASSINI is not set |
529 | # CONFIG_NET_VENDOR_3COM is not set | 611 | # CONFIG_NET_VENDOR_3COM is not set |
612 | # CONFIG_ETHOC is not set | ||
613 | # CONFIG_DNET is not set | ||
530 | # CONFIG_NET_TULIP is not set | 614 | # CONFIG_NET_TULIP is not set |
531 | # CONFIG_HP100 is not set | 615 | # CONFIG_HP100 is not set |
532 | CONFIG_IBM_NEW_EMAC=y | 616 | CONFIG_IBM_NEW_EMAC=y |
@@ -545,7 +629,10 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
545 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 629 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
546 | # CONFIG_NET_PCI is not set | 630 | # CONFIG_NET_PCI is not set |
547 | # CONFIG_B44 is not set | 631 | # CONFIG_B44 is not set |
632 | # CONFIG_KS8842 is not set | ||
633 | # CONFIG_KS8851_MLL is not set | ||
548 | # CONFIG_ATL2 is not set | 634 | # CONFIG_ATL2 is not set |
635 | # CONFIG_XILINX_EMACLITE is not set | ||
549 | CONFIG_NETDEV_1000=y | 636 | CONFIG_NETDEV_1000=y |
550 | # CONFIG_ACENIC is not set | 637 | # CONFIG_ACENIC is not set |
551 | # CONFIG_DL2K is not set | 638 | # CONFIG_DL2K is not set |
@@ -553,6 +640,7 @@ CONFIG_NETDEV_1000=y | |||
553 | # CONFIG_E1000E is not set | 640 | # CONFIG_E1000E is not set |
554 | # CONFIG_IP1000 is not set | 641 | # CONFIG_IP1000 is not set |
555 | # CONFIG_IGB is not set | 642 | # CONFIG_IGB is not set |
643 | # CONFIG_IGBVF is not set | ||
556 | # CONFIG_NS83820 is not set | 644 | # CONFIG_NS83820 is not set |
557 | # CONFIG_HAMACHI is not set | 645 | # CONFIG_HAMACHI is not set |
558 | # CONFIG_YELLOWFIN is not set | 646 | # CONFIG_YELLOWFIN is not set |
@@ -563,9 +651,13 @@ CONFIG_NETDEV_1000=y | |||
563 | # CONFIG_VIA_VELOCITY is not set | 651 | # CONFIG_VIA_VELOCITY is not set |
564 | # CONFIG_TIGON3 is not set | 652 | # CONFIG_TIGON3 is not set |
565 | # CONFIG_BNX2 is not set | 653 | # CONFIG_BNX2 is not set |
654 | # CONFIG_CNIC is not set | ||
655 | # CONFIG_MV643XX_ETH is not set | ||
656 | # CONFIG_XILINX_LL_TEMAC is not set | ||
566 | # CONFIG_QLA3XXX is not set | 657 | # CONFIG_QLA3XXX is not set |
567 | # CONFIG_ATL1 is not set | 658 | # CONFIG_ATL1 is not set |
568 | # CONFIG_ATL1E is not set | 659 | # CONFIG_ATL1E is not set |
660 | # CONFIG_ATL1C is not set | ||
569 | # CONFIG_JME is not set | 661 | # CONFIG_JME is not set |
570 | CONFIG_NETDEV_10000=y | 662 | CONFIG_NETDEV_10000=y |
571 | # CONFIG_CHELSIO_T1 is not set | 663 | # CONFIG_CHELSIO_T1 is not set |
@@ -575,6 +667,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
575 | # CONFIG_IXGBE is not set | 667 | # CONFIG_IXGBE is not set |
576 | # CONFIG_IXGB is not set | 668 | # CONFIG_IXGB is not set |
577 | # CONFIG_S2IO is not set | 669 | # CONFIG_S2IO is not set |
670 | # CONFIG_VXGE is not set | ||
578 | # CONFIG_MYRI10GE is not set | 671 | # CONFIG_MYRI10GE is not set |
579 | # CONFIG_NETXEN_NIC is not set | 672 | # CONFIG_NETXEN_NIC is not set |
580 | # CONFIG_NIU is not set | 673 | # CONFIG_NIU is not set |
@@ -584,14 +677,13 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
584 | # CONFIG_BNX2X is not set | 677 | # CONFIG_BNX2X is not set |
585 | # CONFIG_QLGE is not set | 678 | # CONFIG_QLGE is not set |
586 | # CONFIG_SFC is not set | 679 | # CONFIG_SFC is not set |
680 | # CONFIG_BE2NET is not set | ||
587 | # CONFIG_TR is not set | 681 | # CONFIG_TR is not set |
588 | 682 | CONFIG_WLAN=y | |
589 | # | 683 | # CONFIG_AIRO is not set |
590 | # Wireless LAN | 684 | # CONFIG_ATMEL is not set |
591 | # | 685 | # CONFIG_PRISM54 is not set |
592 | # CONFIG_WLAN_PRE80211 is not set | 686 | # CONFIG_HOSTAP is not set |
593 | # CONFIG_WLAN_80211 is not set | ||
594 | # CONFIG_IWLWIFI_LEDS is not set | ||
595 | 687 | ||
596 | # | 688 | # |
597 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 689 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -604,6 +696,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
604 | # CONFIG_NETCONSOLE is not set | 696 | # CONFIG_NETCONSOLE is not set |
605 | # CONFIG_NETPOLL is not set | 697 | # CONFIG_NETPOLL is not set |
606 | # CONFIG_NET_POLL_CONTROLLER is not set | 698 | # CONFIG_NET_POLL_CONTROLLER is not set |
699 | # CONFIG_VMXNET3 is not set | ||
607 | # CONFIG_ISDN is not set | 700 | # CONFIG_ISDN is not set |
608 | # CONFIG_PHONE is not set | 701 | # CONFIG_PHONE is not set |
609 | 702 | ||
@@ -649,6 +742,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
649 | # CONFIG_SERIAL_JSM is not set | 742 | # CONFIG_SERIAL_JSM is not set |
650 | CONFIG_SERIAL_OF_PLATFORM=y | 743 | CONFIG_SERIAL_OF_PLATFORM=y |
651 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 744 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
745 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
652 | CONFIG_UNIX98_PTYS=y | 746 | CONFIG_UNIX98_PTYS=y |
653 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 747 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
654 | CONFIG_LEGACY_PTYS=y | 748 | CONFIG_LEGACY_PTYS=y |
@@ -665,6 +759,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
665 | CONFIG_DEVPORT=y | 759 | CONFIG_DEVPORT=y |
666 | # CONFIG_I2C is not set | 760 | # CONFIG_I2C is not set |
667 | # CONFIG_SPI is not set | 761 | # CONFIG_SPI is not set |
762 | |||
763 | # | ||
764 | # PPS support | ||
765 | # | ||
766 | # CONFIG_PPS is not set | ||
668 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 767 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
669 | # CONFIG_GPIOLIB is not set | 768 | # CONFIG_GPIOLIB is not set |
670 | # CONFIG_W1 is not set | 769 | # CONFIG_W1 is not set |
@@ -687,27 +786,13 @@ CONFIG_SSB_POSSIBLE=y | |||
687 | # CONFIG_HTC_PASIC3 is not set | 786 | # CONFIG_HTC_PASIC3 is not set |
688 | # CONFIG_MFD_TMIO is not set | 787 | # CONFIG_MFD_TMIO is not set |
689 | # CONFIG_REGULATOR is not set | 788 | # CONFIG_REGULATOR is not set |
690 | 789 | # CONFIG_MEDIA_SUPPORT is not set | |
691 | # | ||
692 | # Multimedia devices | ||
693 | # | ||
694 | |||
695 | # | ||
696 | # Multimedia core support | ||
697 | # | ||
698 | # CONFIG_VIDEO_DEV is not set | ||
699 | # CONFIG_DVB_CORE is not set | ||
700 | # CONFIG_VIDEO_MEDIA is not set | ||
701 | |||
702 | # | ||
703 | # Multimedia drivers | ||
704 | # | ||
705 | # CONFIG_DAB is not set | ||
706 | 790 | ||
707 | # | 791 | # |
708 | # Graphics support | 792 | # Graphics support |
709 | # | 793 | # |
710 | # CONFIG_AGP is not set | 794 | # CONFIG_AGP is not set |
795 | CONFIG_VGA_ARB=y | ||
711 | # CONFIG_DRM is not set | 796 | # CONFIG_DRM is not set |
712 | # CONFIG_VGASTATE is not set | 797 | # CONFIG_VGASTATE is not set |
713 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 798 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
@@ -732,7 +817,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
732 | # | 817 | # |
733 | 818 | ||
734 | # | 819 | # |
735 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 820 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
736 | # | 821 | # |
737 | # CONFIG_USB_GADGET is not set | 822 | # CONFIG_USB_GADGET is not set |
738 | 823 | ||
@@ -748,7 +833,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
748 | # CONFIG_EDAC is not set | 833 | # CONFIG_EDAC is not set |
749 | # CONFIG_RTC_CLASS is not set | 834 | # CONFIG_RTC_CLASS is not set |
750 | # CONFIG_DMADEVICES is not set | 835 | # CONFIG_DMADEVICES is not set |
836 | # CONFIG_AUXDISPLAY is not set | ||
751 | # CONFIG_UIO is not set | 837 | # CONFIG_UIO is not set |
838 | |||
839 | # | ||
840 | # TI VLYNQ | ||
841 | # | ||
752 | # CONFIG_STAGING is not set | 842 | # CONFIG_STAGING is not set |
753 | 843 | ||
754 | # | 844 | # |
@@ -759,14 +849,17 @@ CONFIG_EXT2_FS=y | |||
759 | # CONFIG_EXT2_FS_XIP is not set | 849 | # CONFIG_EXT2_FS_XIP is not set |
760 | # CONFIG_EXT3_FS is not set | 850 | # CONFIG_EXT3_FS is not set |
761 | # CONFIG_EXT4_FS is not set | 851 | # CONFIG_EXT4_FS is not set |
852 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
762 | # CONFIG_REISERFS_FS is not set | 853 | # CONFIG_REISERFS_FS is not set |
763 | # CONFIG_JFS_FS is not set | 854 | # CONFIG_JFS_FS is not set |
764 | # CONFIG_FS_POSIX_ACL is not set | 855 | # CONFIG_FS_POSIX_ACL is not set |
765 | CONFIG_FILE_LOCKING=y | ||
766 | # CONFIG_XFS_FS is not set | 856 | # CONFIG_XFS_FS is not set |
767 | # CONFIG_GFS2_FS is not set | 857 | # CONFIG_GFS2_FS is not set |
768 | # CONFIG_OCFS2_FS is not set | 858 | # CONFIG_OCFS2_FS is not set |
769 | # CONFIG_BTRFS_FS is not set | 859 | # CONFIG_BTRFS_FS is not set |
860 | # CONFIG_NILFS2_FS is not set | ||
861 | CONFIG_FILE_LOCKING=y | ||
862 | CONFIG_FSNOTIFY=y | ||
770 | CONFIG_DNOTIFY=y | 863 | CONFIG_DNOTIFY=y |
771 | CONFIG_INOTIFY=y | 864 | CONFIG_INOTIFY=y |
772 | CONFIG_INOTIFY_USER=y | 865 | CONFIG_INOTIFY_USER=y |
@@ -776,6 +869,11 @@ CONFIG_INOTIFY_USER=y | |||
776 | # CONFIG_FUSE_FS is not set | 869 | # CONFIG_FUSE_FS is not set |
777 | 870 | ||
778 | # | 871 | # |
872 | # Caches | ||
873 | # | ||
874 | # CONFIG_FSCACHE is not set | ||
875 | |||
876 | # | ||
779 | # CD-ROM/DVD Filesystems | 877 | # CD-ROM/DVD Filesystems |
780 | # | 878 | # |
781 | # CONFIG_ISO9660_FS is not set | 879 | # CONFIG_ISO9660_FS is not set |
@@ -840,7 +938,6 @@ CONFIG_LOCKD=y | |||
840 | CONFIG_LOCKD_V4=y | 938 | CONFIG_LOCKD_V4=y |
841 | CONFIG_NFS_COMMON=y | 939 | CONFIG_NFS_COMMON=y |
842 | CONFIG_SUNRPC=y | 940 | CONFIG_SUNRPC=y |
843 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
844 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 941 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
845 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 942 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
846 | # CONFIG_SMB_FS is not set | 943 | # CONFIG_SMB_FS is not set |
@@ -856,6 +953,7 @@ CONFIG_SUNRPC=y | |||
856 | CONFIG_MSDOS_PARTITION=y | 953 | CONFIG_MSDOS_PARTITION=y |
857 | # CONFIG_NLS is not set | 954 | # CONFIG_NLS is not set |
858 | # CONFIG_DLM is not set | 955 | # CONFIG_DLM is not set |
956 | # CONFIG_BINARY_PRINTF is not set | ||
859 | 957 | ||
860 | # | 958 | # |
861 | # Library routines | 959 | # Library routines |
@@ -871,11 +969,13 @@ CONFIG_CRC32=y | |||
871 | # CONFIG_LIBCRC32C is not set | 969 | # CONFIG_LIBCRC32C is not set |
872 | CONFIG_ZLIB_INFLATE=y | 970 | CONFIG_ZLIB_INFLATE=y |
873 | CONFIG_ZLIB_DEFLATE=y | 971 | CONFIG_ZLIB_DEFLATE=y |
874 | CONFIG_PLIST=y | 972 | CONFIG_DECOMPRESS_GZIP=y |
875 | CONFIG_HAS_IOMEM=y | 973 | CONFIG_HAS_IOMEM=y |
876 | CONFIG_HAS_IOPORT=y | 974 | CONFIG_HAS_IOPORT=y |
877 | CONFIG_HAS_DMA=y | 975 | CONFIG_HAS_DMA=y |
878 | CONFIG_HAVE_LMB=y | 976 | CONFIG_HAVE_LMB=y |
977 | CONFIG_NLATTR=y | ||
978 | CONFIG_GENERIC_ATOMIC64=y | ||
879 | 979 | ||
880 | # | 980 | # |
881 | # Kernel hacking | 981 | # Kernel hacking |
@@ -885,6 +985,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
885 | CONFIG_ENABLE_MUST_CHECK=y | 985 | CONFIG_ENABLE_MUST_CHECK=y |
886 | CONFIG_FRAME_WARN=1024 | 986 | CONFIG_FRAME_WARN=1024 |
887 | CONFIG_MAGIC_SYSRQ=y | 987 | CONFIG_MAGIC_SYSRQ=y |
988 | # CONFIG_STRIP_ASM_SYMS is not set | ||
888 | # CONFIG_UNUSED_SYMBOLS is not set | 989 | # CONFIG_UNUSED_SYMBOLS is not set |
889 | CONFIG_DEBUG_FS=y | 990 | CONFIG_DEBUG_FS=y |
890 | # CONFIG_HEADERS_CHECK is not set | 991 | # CONFIG_HEADERS_CHECK is not set |
@@ -893,16 +994,23 @@ CONFIG_DEBUG_KERNEL=y | |||
893 | CONFIG_DETECT_SOFTLOCKUP=y | 994 | CONFIG_DETECT_SOFTLOCKUP=y |
894 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 995 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
895 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 996 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
997 | CONFIG_DETECT_HUNG_TASK=y | ||
998 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
999 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
896 | CONFIG_SCHED_DEBUG=y | 1000 | CONFIG_SCHED_DEBUG=y |
897 | # CONFIG_SCHEDSTATS is not set | 1001 | # CONFIG_SCHEDSTATS is not set |
898 | # CONFIG_TIMER_STATS is not set | 1002 | # CONFIG_TIMER_STATS is not set |
899 | # CONFIG_DEBUG_OBJECTS is not set | 1003 | # CONFIG_DEBUG_OBJECTS is not set |
900 | # CONFIG_SLUB_DEBUG_ON is not set | 1004 | # CONFIG_SLUB_DEBUG_ON is not set |
901 | # CONFIG_SLUB_STATS is not set | 1005 | # CONFIG_SLUB_STATS is not set |
1006 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
902 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1007 | # CONFIG_DEBUG_RT_MUTEXES is not set |
903 | # CONFIG_RT_MUTEX_TESTER is not set | 1008 | # CONFIG_RT_MUTEX_TESTER is not set |
904 | # CONFIG_DEBUG_SPINLOCK is not set | 1009 | # CONFIG_DEBUG_SPINLOCK is not set |
905 | # CONFIG_DEBUG_MUTEXES is not set | 1010 | # CONFIG_DEBUG_MUTEXES is not set |
1011 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1012 | # CONFIG_PROVE_LOCKING is not set | ||
1013 | # CONFIG_LOCK_STAT is not set | ||
906 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1014 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
907 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1015 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
908 | # CONFIG_DEBUG_KOBJECT is not set | 1016 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -914,35 +1022,45 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
914 | # CONFIG_DEBUG_LIST is not set | 1022 | # CONFIG_DEBUG_LIST is not set |
915 | # CONFIG_DEBUG_SG is not set | 1023 | # CONFIG_DEBUG_SG is not set |
916 | # CONFIG_DEBUG_NOTIFIERS is not set | 1024 | # CONFIG_DEBUG_NOTIFIERS is not set |
917 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1025 | # CONFIG_DEBUG_CREDENTIALS is not set |
918 | # CONFIG_RCU_TORTURE_TEST is not set | 1026 | # CONFIG_RCU_TORTURE_TEST is not set |
919 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1027 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
920 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1028 | # CONFIG_BACKTRACE_SELF_TEST is not set |
921 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1029 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1030 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
922 | # CONFIG_FAULT_INJECTION is not set | 1031 | # CONFIG_FAULT_INJECTION is not set |
923 | # CONFIG_LATENCYTOP is not set | 1032 | # CONFIG_LATENCYTOP is not set |
924 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1033 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1034 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
925 | CONFIG_HAVE_FUNCTION_TRACER=y | 1035 | CONFIG_HAVE_FUNCTION_TRACER=y |
1036 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
926 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1037 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
927 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1038 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
928 | 1039 | CONFIG_TRACING_SUPPORT=y | |
929 | # | 1040 | CONFIG_FTRACE=y |
930 | # Tracers | ||
931 | # | ||
932 | # CONFIG_FUNCTION_TRACER is not set | 1041 | # CONFIG_FUNCTION_TRACER is not set |
1042 | # CONFIG_IRQSOFF_TRACER is not set | ||
933 | # CONFIG_SCHED_TRACER is not set | 1043 | # CONFIG_SCHED_TRACER is not set |
934 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1044 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
935 | # CONFIG_BOOT_TRACER is not set | 1045 | # CONFIG_BOOT_TRACER is not set |
936 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1046 | CONFIG_BRANCH_PROFILE_NONE=y |
1047 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1048 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
937 | # CONFIG_STACK_TRACER is not set | 1049 | # CONFIG_STACK_TRACER is not set |
938 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1050 | # CONFIG_KMEMTRACE is not set |
1051 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1052 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1053 | # CONFIG_DYNAMIC_DEBUG is not set | ||
1054 | # CONFIG_DMA_API_DEBUG is not set | ||
939 | # CONFIG_SAMPLES is not set | 1055 | # CONFIG_SAMPLES is not set |
940 | CONFIG_HAVE_ARCH_KGDB=y | 1056 | CONFIG_HAVE_ARCH_KGDB=y |
941 | # CONFIG_KGDB is not set | 1057 | # CONFIG_KGDB is not set |
1058 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1059 | CONFIG_PPC_WERROR=y | ||
942 | CONFIG_PRINT_STACK_DEPTH=64 | 1060 | CONFIG_PRINT_STACK_DEPTH=64 |
943 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1061 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
944 | # CONFIG_DEBUG_STACK_USAGE is not set | 1062 | # CONFIG_DEBUG_STACK_USAGE is not set |
945 | # CONFIG_DEBUG_PAGEALLOC is not set | 1063 | # CONFIG_PPC_EMULATED_STATS is not set |
946 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1064 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
947 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1065 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
948 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1066 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -958,13 +1076,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
958 | # CONFIG_KEYS is not set | 1076 | # CONFIG_KEYS is not set |
959 | # CONFIG_SECURITY is not set | 1077 | # CONFIG_SECURITY is not set |
960 | # CONFIG_SECURITYFS is not set | 1078 | # CONFIG_SECURITYFS is not set |
961 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1079 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1080 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1081 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1082 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1083 | CONFIG_DEFAULT_SECURITY="" | ||
962 | CONFIG_CRYPTO=y | 1084 | CONFIG_CRYPTO=y |
963 | 1085 | ||
964 | # | 1086 | # |
965 | # Crypto core or helper | 1087 | # Crypto core or helper |
966 | # | 1088 | # |
967 | # CONFIG_CRYPTO_FIPS is not set | ||
968 | CONFIG_CRYPTO_ALGAPI=y | 1089 | CONFIG_CRYPTO_ALGAPI=y |
969 | CONFIG_CRYPTO_ALGAPI2=y | 1090 | CONFIG_CRYPTO_ALGAPI2=y |
970 | CONFIG_CRYPTO_AEAD2=y | 1091 | CONFIG_CRYPTO_AEAD2=y |
@@ -973,10 +1094,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
973 | CONFIG_CRYPTO_HASH=y | 1094 | CONFIG_CRYPTO_HASH=y |
974 | CONFIG_CRYPTO_HASH2=y | 1095 | CONFIG_CRYPTO_HASH2=y |
975 | CONFIG_CRYPTO_RNG2=y | 1096 | CONFIG_CRYPTO_RNG2=y |
1097 | CONFIG_CRYPTO_PCOMP=y | ||
976 | CONFIG_CRYPTO_MANAGER=y | 1098 | CONFIG_CRYPTO_MANAGER=y |
977 | CONFIG_CRYPTO_MANAGER2=y | 1099 | CONFIG_CRYPTO_MANAGER2=y |
978 | # CONFIG_CRYPTO_GF128MUL is not set | 1100 | # CONFIG_CRYPTO_GF128MUL is not set |
979 | # CONFIG_CRYPTO_NULL is not set | 1101 | # CONFIG_CRYPTO_NULL is not set |
1102 | CONFIG_CRYPTO_WORKQUEUE=y | ||
980 | # CONFIG_CRYPTO_CRYPTD is not set | 1103 | # CONFIG_CRYPTO_CRYPTD is not set |
981 | # CONFIG_CRYPTO_AUTHENC is not set | 1104 | # CONFIG_CRYPTO_AUTHENC is not set |
982 | # CONFIG_CRYPTO_TEST is not set | 1105 | # CONFIG_CRYPTO_TEST is not set |
@@ -1004,11 +1127,13 @@ CONFIG_CRYPTO_PCBC=y | |||
1004 | # | 1127 | # |
1005 | # CONFIG_CRYPTO_HMAC is not set | 1128 | # CONFIG_CRYPTO_HMAC is not set |
1006 | # CONFIG_CRYPTO_XCBC is not set | 1129 | # CONFIG_CRYPTO_XCBC is not set |
1130 | # CONFIG_CRYPTO_VMAC is not set | ||
1007 | 1131 | ||
1008 | # | 1132 | # |
1009 | # Digest | 1133 | # Digest |
1010 | # | 1134 | # |
1011 | # CONFIG_CRYPTO_CRC32C is not set | 1135 | # CONFIG_CRYPTO_CRC32C is not set |
1136 | # CONFIG_CRYPTO_GHASH is not set | ||
1012 | # CONFIG_CRYPTO_MD4 is not set | 1137 | # CONFIG_CRYPTO_MD4 is not set |
1013 | CONFIG_CRYPTO_MD5=y | 1138 | CONFIG_CRYPTO_MD5=y |
1014 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1139 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1045,6 +1170,7 @@ CONFIG_CRYPTO_DES=y | |||
1045 | # Compression | 1170 | # Compression |
1046 | # | 1171 | # |
1047 | # CONFIG_CRYPTO_DEFLATE is not set | 1172 | # CONFIG_CRYPTO_DEFLATE is not set |
1173 | # CONFIG_CRYPTO_ZLIB is not set | ||
1048 | # CONFIG_CRYPTO_LZO is not set | 1174 | # CONFIG_CRYPTO_LZO is not set |
1049 | 1175 | ||
1050 | # | 1176 | # |
diff --git a/arch/powerpc/configs/44x/eiger_defconfig b/arch/powerpc/configs/44x/eiger_defconfig index 007f3bd939e7..e3149bade0b2 100644 --- a/arch/powerpc/configs/44x/eiger_defconfig +++ b/arch/powerpc/configs/44x/eiger_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.31-rc6 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Wed Aug 19 13:06:50 2009 | 4 | # Mon Jan 4 14:33:04 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -34,7 +34,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
34 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
37 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
38 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
40 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
@@ -57,6 +59,7 @@ CONFIG_AUDIT_ARCH=y | |||
57 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
58 | CONFIG_DTC=y | 60 | CONFIG_DTC=y |
59 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
62 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
60 | CONFIG_PPC_DCR_NATIVE=y | 63 | CONFIG_PPC_DCR_NATIVE=y |
61 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_PPC_DCR=y | 65 | CONFIG_PPC_DCR=y |
@@ -84,11 +87,13 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y | |||
84 | # | 87 | # |
85 | # RCU Subsystem | 88 | # RCU Subsystem |
86 | # | 89 | # |
87 | CONFIG_CLASSIC_RCU=y | 90 | CONFIG_TREE_RCU=y |
88 | # CONFIG_TREE_RCU is not set | 91 | # CONFIG_TREE_PREEMPT_RCU is not set |
89 | # CONFIG_PREEMPT_RCU is not set | 92 | # CONFIG_TINY_RCU is not set |
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
90 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
91 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
92 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
93 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
94 | # CONFIG_GROUP_SCHED is not set | 99 | # CONFIG_GROUP_SCHED is not set |
@@ -122,22 +127,21 @@ CONFIG_TIMERFD=y | |||
122 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
123 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
124 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
125 | CONFIG_HAVE_PERF_COUNTERS=y | 130 | CONFIG_HAVE_PERF_EVENTS=y |
126 | 131 | ||
127 | # | 132 | # |
128 | # Performance Counters | 133 | # Kernel Performance Events And Counters |
129 | # | 134 | # |
135 | # CONFIG_PERF_EVENTS is not set | ||
130 | # CONFIG_PERF_COUNTERS is not set | 136 | # CONFIG_PERF_COUNTERS is not set |
131 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
132 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
133 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
134 | # CONFIG_STRIP_ASM_SYMS is not set | ||
135 | CONFIG_COMPAT_BRK=y | 140 | CONFIG_COMPAT_BRK=y |
136 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
137 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
138 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
139 | # CONFIG_PROFILING is not set | 144 | # CONFIG_PROFILING is not set |
140 | # CONFIG_MARKERS is not set | ||
141 | CONFIG_HAVE_OPROFILE=y | 145 | CONFIG_HAVE_OPROFILE=y |
142 | # CONFIG_KPROBES is not set | 146 | # CONFIG_KPROBES is not set |
143 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 147 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
@@ -145,6 +149,8 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
145 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
146 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
147 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
148 | 154 | ||
149 | # | 155 | # |
150 | # GCOV-based kernel profiling | 156 | # GCOV-based kernel profiling |
@@ -170,14 +176,41 @@ CONFIG_LBDAF=y | |||
170 | # IO Schedulers | 176 | # IO Schedulers |
171 | # | 177 | # |
172 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
173 | CONFIG_IOSCHED_AS=y | ||
174 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
175 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
176 | CONFIG_DEFAULT_AS=y | ||
177 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
178 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
179 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
180 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
187 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
181 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
182 | CONFIG_PPC4xx_PCI_EXPRESS=y | 215 | CONFIG_PPC4xx_PCI_EXPRESS=y |
183 | 216 | ||
@@ -243,10 +276,11 @@ CONFIG_BINFMT_ELF=y | |||
243 | # CONFIG_MATH_EMULATION is not set | 276 | # CONFIG_MATH_EMULATION is not set |
244 | # CONFIG_IOMMU_HELPER is not set | 277 | # CONFIG_IOMMU_HELPER is not set |
245 | # CONFIG_SWIOTLB is not set | 278 | # CONFIG_SWIOTLB is not set |
246 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | ||
247 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 279 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
248 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 280 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
249 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 281 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
282 | CONFIG_SPARSE_IRQ=y | ||
283 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
250 | CONFIG_ARCH_FLATMEM_ENABLE=y | 284 | CONFIG_ARCH_FLATMEM_ENABLE=y |
251 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 285 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
252 | CONFIG_SELECT_MEMORY_MODEL=y | 286 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -262,8 +296,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
262 | CONFIG_ZONE_DMA_FLAG=1 | 296 | CONFIG_ZONE_DMA_FLAG=1 |
263 | CONFIG_BOUNCE=y | 297 | CONFIG_BOUNCE=y |
264 | CONFIG_VIRT_TO_BUS=y | 298 | CONFIG_VIRT_TO_BUS=y |
265 | CONFIG_HAVE_MLOCK=y | 299 | # CONFIG_KSM is not set |
266 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
267 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 300 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
268 | CONFIG_STDBINUTILS=y | 301 | CONFIG_STDBINUTILS=y |
269 | CONFIG_PPC_4K_PAGES=y | 302 | CONFIG_PPC_4K_PAGES=y |
@@ -358,6 +391,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
358 | # CONFIG_NETFILTER is not set | 391 | # CONFIG_NETFILTER is not set |
359 | # CONFIG_IP_DCCP is not set | 392 | # CONFIG_IP_DCCP is not set |
360 | # CONFIG_IP_SCTP is not set | 393 | # CONFIG_IP_SCTP is not set |
394 | # CONFIG_RDS is not set | ||
361 | # CONFIG_TIPC is not set | 395 | # CONFIG_TIPC is not set |
362 | # CONFIG_ATM is not set | 396 | # CONFIG_ATM is not set |
363 | # CONFIG_BRIDGE is not set | 397 | # CONFIG_BRIDGE is not set |
@@ -387,14 +421,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
387 | # CONFIG_AF_RXRPC is not set | 421 | # CONFIG_AF_RXRPC is not set |
388 | CONFIG_WIRELESS=y | 422 | CONFIG_WIRELESS=y |
389 | # CONFIG_CFG80211 is not set | 423 | # CONFIG_CFG80211 is not set |
390 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
391 | # CONFIG_WIRELESS_EXT is not set | ||
392 | # CONFIG_LIB80211 is not set | 424 | # CONFIG_LIB80211 is not set |
393 | 425 | ||
394 | # | 426 | # |
395 | # CFG80211 needs to be enabled for MAC80211 | 427 | # CFG80211 needs to be enabled for MAC80211 |
396 | # | 428 | # |
397 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
398 | # CONFIG_WIMAX is not set | 429 | # CONFIG_WIMAX is not set |
399 | # CONFIG_RFKILL is not set | 430 | # CONFIG_RFKILL is not set |
400 | # CONFIG_NET_9P is not set | 431 | # CONFIG_NET_9P is not set |
@@ -407,6 +438,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | |||
407 | # Generic Driver Options | 438 | # Generic Driver Options |
408 | # | 439 | # |
409 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 440 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
441 | # CONFIG_DEVTMPFS is not set | ||
410 | CONFIG_STANDALONE=y | 442 | CONFIG_STANDALONE=y |
411 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 443 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
412 | CONFIG_FW_LOADER=y | 444 | CONFIG_FW_LOADER=y |
@@ -419,9 +451,9 @@ CONFIG_CONNECTOR=y | |||
419 | CONFIG_PROC_EVENTS=y | 451 | CONFIG_PROC_EVENTS=y |
420 | CONFIG_MTD=y | 452 | CONFIG_MTD=y |
421 | # CONFIG_MTD_DEBUG is not set | 453 | # CONFIG_MTD_DEBUG is not set |
454 | # CONFIG_MTD_TESTS is not set | ||
422 | CONFIG_MTD_CONCAT=y | 455 | CONFIG_MTD_CONCAT=y |
423 | CONFIG_MTD_PARTITIONS=y | 456 | CONFIG_MTD_PARTITIONS=y |
424 | # CONFIG_MTD_TESTS is not set | ||
425 | # CONFIG_MTD_REDBOOT_PARTS is not set | 457 | # CONFIG_MTD_REDBOOT_PARTS is not set |
426 | CONFIG_MTD_CMDLINE_PARTS=y | 458 | CONFIG_MTD_CMDLINE_PARTS=y |
427 | CONFIG_MTD_OF_PARTS=y | 459 | CONFIG_MTD_OF_PARTS=y |
@@ -522,6 +554,7 @@ CONFIG_BLK_DEV=y | |||
522 | # CONFIG_BLK_DEV_UMEM is not set | 554 | # CONFIG_BLK_DEV_UMEM is not set |
523 | # CONFIG_BLK_DEV_COW_COMMON is not set | 555 | # CONFIG_BLK_DEV_COW_COMMON is not set |
524 | # CONFIG_BLK_DEV_LOOP is not set | 556 | # CONFIG_BLK_DEV_LOOP is not set |
557 | # CONFIG_BLK_DEV_DRBD is not set | ||
525 | # CONFIG_BLK_DEV_NBD is not set | 558 | # CONFIG_BLK_DEV_NBD is not set |
526 | # CONFIG_BLK_DEV_SX8 is not set | 559 | # CONFIG_BLK_DEV_SX8 is not set |
527 | CONFIG_BLK_DEV_RAM=y | 560 | CONFIG_BLK_DEV_RAM=y |
@@ -573,8 +606,11 @@ CONFIG_SCSI_SAS_ATTRS=y | |||
573 | CONFIG_SCSI_LOWLEVEL=y | 606 | CONFIG_SCSI_LOWLEVEL=y |
574 | # CONFIG_ISCSI_TCP is not set | 607 | # CONFIG_ISCSI_TCP is not set |
575 | # CONFIG_SCSI_BNX2_ISCSI is not set | 608 | # CONFIG_SCSI_BNX2_ISCSI is not set |
609 | # CONFIG_BE2ISCSI is not set | ||
576 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 610 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
611 | # CONFIG_SCSI_HPSA is not set | ||
577 | # CONFIG_SCSI_3W_9XXX is not set | 612 | # CONFIG_SCSI_3W_9XXX is not set |
613 | # CONFIG_SCSI_3W_SAS is not set | ||
578 | # CONFIG_SCSI_ACARD is not set | 614 | # CONFIG_SCSI_ACARD is not set |
579 | # CONFIG_SCSI_AACRAID is not set | 615 | # CONFIG_SCSI_AACRAID is not set |
580 | # CONFIG_SCSI_AIC7XXX is not set | 616 | # CONFIG_SCSI_AIC7XXX is not set |
@@ -611,7 +647,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
611 | # CONFIG_SCSI_DC390T is not set | 647 | # CONFIG_SCSI_DC390T is not set |
612 | # CONFIG_SCSI_NSP32 is not set | 648 | # CONFIG_SCSI_NSP32 is not set |
613 | # CONFIG_SCSI_DEBUG is not set | 649 | # CONFIG_SCSI_DEBUG is not set |
650 | # CONFIG_SCSI_PMCRAID is not set | ||
651 | # CONFIG_SCSI_PM8001 is not set | ||
614 | # CONFIG_SCSI_SRP is not set | 652 | # CONFIG_SCSI_SRP is not set |
653 | # CONFIG_SCSI_BFA_FC is not set | ||
615 | # CONFIG_SCSI_DH is not set | 654 | # CONFIG_SCSI_DH is not set |
616 | # CONFIG_SCSI_OSD_INITIATOR is not set | 655 | # CONFIG_SCSI_OSD_INITIATOR is not set |
617 | # CONFIG_ATA is not set | 656 | # CONFIG_ATA is not set |
@@ -682,7 +721,9 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
682 | # CONFIG_NET_PCI is not set | 721 | # CONFIG_NET_PCI is not set |
683 | # CONFIG_B44 is not set | 722 | # CONFIG_B44 is not set |
684 | # CONFIG_KS8842 is not set | 723 | # CONFIG_KS8842 is not set |
724 | # CONFIG_KS8851_MLL is not set | ||
685 | # CONFIG_ATL2 is not set | 725 | # CONFIG_ATL2 is not set |
726 | # CONFIG_XILINX_EMACLITE is not set | ||
686 | CONFIG_NETDEV_1000=y | 727 | CONFIG_NETDEV_1000=y |
687 | # CONFIG_ACENIC is not set | 728 | # CONFIG_ACENIC is not set |
688 | # CONFIG_DL2K is not set | 729 | # CONFIG_DL2K is not set |
@@ -711,12 +752,11 @@ CONFIG_E1000E=y | |||
711 | # CONFIG_JME is not set | 752 | # CONFIG_JME is not set |
712 | # CONFIG_NETDEV_10000 is not set | 753 | # CONFIG_NETDEV_10000 is not set |
713 | # CONFIG_TR is not set | 754 | # CONFIG_TR is not set |
714 | 755 | CONFIG_WLAN=y | |
715 | # | 756 | # CONFIG_AIRO is not set |
716 | # Wireless LAN | 757 | # CONFIG_ATMEL is not set |
717 | # | 758 | # CONFIG_PRISM54 is not set |
718 | # CONFIG_WLAN_PRE80211 is not set | 759 | # CONFIG_HOSTAP is not set |
719 | # CONFIG_WLAN_80211 is not set | ||
720 | 760 | ||
721 | # | 761 | # |
722 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 762 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -730,6 +770,7 @@ CONFIG_E1000E=y | |||
730 | # CONFIG_NETCONSOLE is not set | 770 | # CONFIG_NETCONSOLE is not set |
731 | # CONFIG_NETPOLL is not set | 771 | # CONFIG_NETPOLL is not set |
732 | # CONFIG_NET_POLL_CONTROLLER is not set | 772 | # CONFIG_NET_POLL_CONTROLLER is not set |
773 | # CONFIG_VMXNET3 is not set | ||
733 | # CONFIG_ISDN is not set | 774 | # CONFIG_ISDN is not set |
734 | # CONFIG_PHONE is not set | 775 | # CONFIG_PHONE is not set |
735 | 776 | ||
@@ -775,6 +816,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
775 | # CONFIG_SERIAL_JSM is not set | 816 | # CONFIG_SERIAL_JSM is not set |
776 | CONFIG_SERIAL_OF_PLATFORM=y | 817 | CONFIG_SERIAL_OF_PLATFORM=y |
777 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 818 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
819 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
778 | CONFIG_UNIX98_PTYS=y | 820 | CONFIG_UNIX98_PTYS=y |
779 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 821 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
780 | CONFIG_LEGACY_PTYS=y | 822 | CONFIG_LEGACY_PTYS=y |
@@ -791,6 +833,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
791 | CONFIG_DEVPORT=y | 833 | CONFIG_DEVPORT=y |
792 | CONFIG_I2C=y | 834 | CONFIG_I2C=y |
793 | CONFIG_I2C_BOARDINFO=y | 835 | CONFIG_I2C_BOARDINFO=y |
836 | CONFIG_I2C_COMPAT=y | ||
794 | CONFIG_I2C_CHARDEV=y | 837 | CONFIG_I2C_CHARDEV=y |
795 | CONFIG_I2C_HELPER_AUTO=y | 838 | CONFIG_I2C_HELPER_AUTO=y |
796 | 839 | ||
@@ -831,11 +874,6 @@ CONFIG_I2C_IBM_IIC=y | |||
831 | # CONFIG_I2C_TAOS_EVM is not set | 874 | # CONFIG_I2C_TAOS_EVM is not set |
832 | 875 | ||
833 | # | 876 | # |
834 | # Graphics adapter I2C/DDC channel drivers | ||
835 | # | ||
836 | # CONFIG_I2C_VOODOO3 is not set | ||
837 | |||
838 | # | ||
839 | # Other I2C/SMBus bus drivers | 877 | # Other I2C/SMBus bus drivers |
840 | # | 878 | # |
841 | # CONFIG_I2C_PCA_PLATFORM is not set | 879 | # CONFIG_I2C_PCA_PLATFORM is not set |
@@ -844,10 +882,6 @@ CONFIG_I2C_IBM_IIC=y | |||
844 | # | 882 | # |
845 | # Miscellaneous I2C Chip support | 883 | # Miscellaneous I2C Chip support |
846 | # | 884 | # |
847 | # CONFIG_DS1682 is not set | ||
848 | # CONFIG_SENSORS_PCF8574 is not set | ||
849 | # CONFIG_PCF8575 is not set | ||
850 | # CONFIG_SENSORS_PCA9539 is not set | ||
851 | # CONFIG_SENSORS_TSL2550 is not set | 885 | # CONFIG_SENSORS_TSL2550 is not set |
852 | CONFIG_I2C_DEBUG_CORE=y | 886 | CONFIG_I2C_DEBUG_CORE=y |
853 | CONFIG_I2C_DEBUG_ALGO=y | 887 | CONFIG_I2C_DEBUG_ALGO=y |
@@ -865,7 +899,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
865 | # CONFIG_POWER_SUPPLY is not set | 899 | # CONFIG_POWER_SUPPLY is not set |
866 | # CONFIG_HWMON is not set | 900 | # CONFIG_HWMON is not set |
867 | # CONFIG_THERMAL is not set | 901 | # CONFIG_THERMAL is not set |
868 | # CONFIG_THERMAL_HWMON is not set | ||
869 | # CONFIG_WATCHDOG is not set | 902 | # CONFIG_WATCHDOG is not set |
870 | CONFIG_SSB_POSSIBLE=y | 903 | CONFIG_SSB_POSSIBLE=y |
871 | 904 | ||
@@ -883,10 +916,13 @@ CONFIG_SSB_POSSIBLE=y | |||
883 | # CONFIG_TWL4030_CORE is not set | 916 | # CONFIG_TWL4030_CORE is not set |
884 | # CONFIG_MFD_TMIO is not set | 917 | # CONFIG_MFD_TMIO is not set |
885 | # CONFIG_PMIC_DA903X is not set | 918 | # CONFIG_PMIC_DA903X is not set |
919 | # CONFIG_PMIC_ADP5520 is not set | ||
886 | # CONFIG_MFD_WM8400 is not set | 920 | # CONFIG_MFD_WM8400 is not set |
921 | # CONFIG_MFD_WM831X is not set | ||
887 | # CONFIG_MFD_WM8350_I2C is not set | 922 | # CONFIG_MFD_WM8350_I2C is not set |
888 | # CONFIG_MFD_PCF50633 is not set | 923 | # CONFIG_MFD_PCF50633 is not set |
889 | # CONFIG_AB3100_CORE is not set | 924 | # CONFIG_AB3100_CORE is not set |
925 | # CONFIG_MFD_88PM8607 is not set | ||
890 | # CONFIG_REGULATOR is not set | 926 | # CONFIG_REGULATOR is not set |
891 | # CONFIG_MEDIA_SUPPORT is not set | 927 | # CONFIG_MEDIA_SUPPORT is not set |
892 | 928 | ||
@@ -894,6 +930,7 @@ CONFIG_SSB_POSSIBLE=y | |||
894 | # Graphics support | 930 | # Graphics support |
895 | # | 931 | # |
896 | # CONFIG_AGP is not set | 932 | # CONFIG_AGP is not set |
933 | CONFIG_VGA_ARB=y | ||
897 | # CONFIG_DRM is not set | 934 | # CONFIG_DRM is not set |
898 | # CONFIG_VGASTATE is not set | 935 | # CONFIG_VGASTATE is not set |
899 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 936 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -935,6 +972,7 @@ CONFIG_EXT2_FS=y | |||
935 | # CONFIG_EXT2_FS_XIP is not set | 972 | # CONFIG_EXT2_FS_XIP is not set |
936 | # CONFIG_EXT3_FS is not set | 973 | # CONFIG_EXT3_FS is not set |
937 | # CONFIG_EXT4_FS is not set | 974 | # CONFIG_EXT4_FS is not set |
975 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
938 | # CONFIG_REISERFS_FS is not set | 976 | # CONFIG_REISERFS_FS is not set |
939 | # CONFIG_JFS_FS is not set | 977 | # CONFIG_JFS_FS is not set |
940 | # CONFIG_FS_POSIX_ACL is not set | 978 | # CONFIG_FS_POSIX_ACL is not set |
@@ -942,6 +980,7 @@ CONFIG_EXT2_FS=y | |||
942 | # CONFIG_GFS2_FS is not set | 980 | # CONFIG_GFS2_FS is not set |
943 | # CONFIG_OCFS2_FS is not set | 981 | # CONFIG_OCFS2_FS is not set |
944 | # CONFIG_BTRFS_FS is not set | 982 | # CONFIG_BTRFS_FS is not set |
983 | # CONFIG_NILFS2_FS is not set | ||
945 | CONFIG_FILE_LOCKING=y | 984 | CONFIG_FILE_LOCKING=y |
946 | CONFIG_FSNOTIFY=y | 985 | CONFIG_FSNOTIFY=y |
947 | CONFIG_DNOTIFY=y | 986 | CONFIG_DNOTIFY=y |
@@ -1001,7 +1040,6 @@ CONFIG_CRAMFS=y | |||
1001 | # CONFIG_ROMFS_FS is not set | 1040 | # CONFIG_ROMFS_FS is not set |
1002 | # CONFIG_SYSV_FS is not set | 1041 | # CONFIG_SYSV_FS is not set |
1003 | # CONFIG_UFS_FS is not set | 1042 | # CONFIG_UFS_FS is not set |
1004 | # CONFIG_NILFS2_FS is not set | ||
1005 | CONFIG_NETWORK_FILESYSTEMS=y | 1043 | CONFIG_NETWORK_FILESYSTEMS=y |
1006 | CONFIG_NFS_FS=y | 1044 | CONFIG_NFS_FS=y |
1007 | CONFIG_NFS_V3=y | 1045 | CONFIG_NFS_V3=y |
@@ -1059,6 +1097,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
1059 | CONFIG_ENABLE_MUST_CHECK=y | 1097 | CONFIG_ENABLE_MUST_CHECK=y |
1060 | CONFIG_FRAME_WARN=1024 | 1098 | CONFIG_FRAME_WARN=1024 |
1061 | CONFIG_MAGIC_SYSRQ=y | 1099 | CONFIG_MAGIC_SYSRQ=y |
1100 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1062 | # CONFIG_UNUSED_SYMBOLS is not set | 1101 | # CONFIG_UNUSED_SYMBOLS is not set |
1063 | CONFIG_DEBUG_FS=y | 1102 | CONFIG_DEBUG_FS=y |
1064 | # CONFIG_HEADERS_CHECK is not set | 1103 | # CONFIG_HEADERS_CHECK is not set |
@@ -1095,10 +1134,12 @@ CONFIG_SCHED_DEBUG=y | |||
1095 | # CONFIG_DEBUG_LIST is not set | 1134 | # CONFIG_DEBUG_LIST is not set |
1096 | # CONFIG_DEBUG_SG is not set | 1135 | # CONFIG_DEBUG_SG is not set |
1097 | # CONFIG_DEBUG_NOTIFIERS is not set | 1136 | # CONFIG_DEBUG_NOTIFIERS is not set |
1137 | # CONFIG_DEBUG_CREDENTIALS is not set | ||
1098 | # CONFIG_RCU_TORTURE_TEST is not set | 1138 | # CONFIG_RCU_TORTURE_TEST is not set |
1099 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1139 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1100 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1140 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1101 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1141 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1142 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1102 | # CONFIG_FAULT_INJECTION is not set | 1143 | # CONFIG_FAULT_INJECTION is not set |
1103 | # CONFIG_LATENCYTOP is not set | 1144 | # CONFIG_LATENCYTOP is not set |
1104 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1145 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
@@ -1122,10 +1163,10 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
1122 | # CONFIG_WORKQUEUE_TRACER is not set | 1163 | # CONFIG_WORKQUEUE_TRACER is not set |
1123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1164 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1124 | # CONFIG_DYNAMIC_DEBUG is not set | 1165 | # CONFIG_DYNAMIC_DEBUG is not set |
1166 | # CONFIG_DMA_API_DEBUG is not set | ||
1125 | # CONFIG_SAMPLES is not set | 1167 | # CONFIG_SAMPLES is not set |
1126 | CONFIG_HAVE_ARCH_KGDB=y | 1168 | CONFIG_HAVE_ARCH_KGDB=y |
1127 | # CONFIG_KGDB is not set | 1169 | # CONFIG_KGDB is not set |
1128 | # CONFIG_KMEMCHECK is not set | ||
1129 | # CONFIG_PPC_DISABLE_WERROR is not set | 1170 | # CONFIG_PPC_DISABLE_WERROR is not set |
1130 | CONFIG_PPC_WERROR=y | 1171 | CONFIG_PPC_WERROR=y |
1131 | CONFIG_PRINT_STACK_DEPTH=64 | 1172 | CONFIG_PRINT_STACK_DEPTH=64 |
@@ -1147,13 +1188,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1147 | # CONFIG_KEYS is not set | 1188 | # CONFIG_KEYS is not set |
1148 | # CONFIG_SECURITY is not set | 1189 | # CONFIG_SECURITY is not set |
1149 | # CONFIG_SECURITYFS is not set | 1190 | # CONFIG_SECURITYFS is not set |
1150 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1191 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1192 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1193 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1194 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1195 | CONFIG_DEFAULT_SECURITY="" | ||
1151 | CONFIG_CRYPTO=y | 1196 | CONFIG_CRYPTO=y |
1152 | 1197 | ||
1153 | # | 1198 | # |
1154 | # Crypto core or helper | 1199 | # Crypto core or helper |
1155 | # | 1200 | # |
1156 | # CONFIG_CRYPTO_FIPS is not set | ||
1157 | CONFIG_CRYPTO_ALGAPI=y | 1201 | CONFIG_CRYPTO_ALGAPI=y |
1158 | CONFIG_CRYPTO_ALGAPI2=y | 1202 | CONFIG_CRYPTO_ALGAPI2=y |
1159 | CONFIG_CRYPTO_AEAD=y | 1203 | CONFIG_CRYPTO_AEAD=y |
@@ -1197,11 +1241,13 @@ CONFIG_CRYPTO_XTS=y | |||
1197 | # | 1241 | # |
1198 | CONFIG_CRYPTO_HMAC=y | 1242 | CONFIG_CRYPTO_HMAC=y |
1199 | CONFIG_CRYPTO_XCBC=y | 1243 | CONFIG_CRYPTO_XCBC=y |
1244 | # CONFIG_CRYPTO_VMAC is not set | ||
1200 | 1245 | ||
1201 | # | 1246 | # |
1202 | # Digest | 1247 | # Digest |
1203 | # | 1248 | # |
1204 | # CONFIG_CRYPTO_CRC32C is not set | 1249 | # CONFIG_CRYPTO_CRC32C is not set |
1250 | CONFIG_CRYPTO_GHASH=y | ||
1205 | CONFIG_CRYPTO_MD4=y | 1251 | CONFIG_CRYPTO_MD4=y |
1206 | CONFIG_CRYPTO_MD5=y | 1252 | CONFIG_CRYPTO_MD5=y |
1207 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1253 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig index c23a4ef13e45..dec901f9cc84 100644 --- a/arch/powerpc/configs/44x/katmai_defconfig +++ b/arch/powerpc/configs/44x/katmai_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:22:38 2009 | 4 | # Mon Jan 4 14:55:34 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -19,6 +19,7 @@ CONFIG_BOOKE=y | |||
19 | CONFIG_PTE_64BIT=y | 19 | CONFIG_PTE_64BIT=y |
20 | CONFIG_PHYS_64BIT=y | 20 | CONFIG_PHYS_64BIT=y |
21 | CONFIG_PPC_MMU_NOHASH=y | 21 | CONFIG_PPC_MMU_NOHASH=y |
22 | CONFIG_PPC_MMU_NOHASH_32=y | ||
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
23 | CONFIG_NOT_COHERENT_CACHE=y | 24 | CONFIG_NOT_COHERENT_CACHE=y |
24 | CONFIG_PPC32=y | 25 | CONFIG_PPC32=y |
@@ -30,15 +31,18 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 31 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 32 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 33 | CONFIG_GENERIC_HARDIRQS=y |
34 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
38 | CONFIG_NR_IRQS=512 | ||
35 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
44 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -52,11 +56,15 @@ CONFIG_PPC_UDBG_16550=y | |||
52 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
53 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
54 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
55 | # CONFIG_DEFAULT_UIMAGE is not set | 60 | # CONFIG_DEFAULT_UIMAGE is not set |
61 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
56 | CONFIG_PPC_DCR_NATIVE=y | 62 | CONFIG_PPC_DCR_NATIVE=y |
57 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
58 | CONFIG_PPC_DCR=y | 64 | CONFIG_PPC_DCR=y |
65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
60 | 68 | ||
61 | # | 69 | # |
62 | # General setup | 70 | # General setup |
@@ -70,9 +78,21 @@ CONFIG_SWAP=y | |||
70 | CONFIG_SYSVIPC=y | 78 | CONFIG_SYSVIPC=y |
71 | CONFIG_SYSVIPC_SYSCTL=y | 79 | CONFIG_SYSVIPC_SYSCTL=y |
72 | CONFIG_POSIX_MQUEUE=y | 80 | CONFIG_POSIX_MQUEUE=y |
81 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
73 | # CONFIG_BSD_PROCESS_ACCT is not set | 82 | # CONFIG_BSD_PROCESS_ACCT is not set |
74 | # CONFIG_TASKSTATS is not set | 83 | # CONFIG_TASKSTATS is not set |
75 | # CONFIG_AUDIT is not set | 84 | # CONFIG_AUDIT is not set |
85 | |||
86 | # | ||
87 | # RCU Subsystem | ||
88 | # | ||
89 | CONFIG_TREE_RCU=y | ||
90 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
91 | # CONFIG_TINY_RCU is not set | ||
92 | # CONFIG_RCU_TRACE is not set | ||
93 | CONFIG_RCU_FANOUT=32 | ||
94 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
95 | # CONFIG_TREE_RCU_TRACE is not set | ||
76 | # CONFIG_IKCONFIG is not set | 96 | # CONFIG_IKCONFIG is not set |
77 | CONFIG_LOG_BUF_SHIFT=14 | 97 | CONFIG_LOG_BUF_SHIFT=14 |
78 | # CONFIG_GROUP_SCHED is not set | 98 | # CONFIG_GROUP_SCHED is not set |
@@ -83,8 +103,12 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
83 | # CONFIG_NAMESPACES is not set | 103 | # CONFIG_NAMESPACES is not set |
84 | CONFIG_BLK_DEV_INITRD=y | 104 | CONFIG_BLK_DEV_INITRD=y |
85 | CONFIG_INITRAMFS_SOURCE="" | 105 | CONFIG_INITRAMFS_SOURCE="" |
106 | CONFIG_RD_GZIP=y | ||
107 | # CONFIG_RD_BZIP2 is not set | ||
108 | # CONFIG_RD_LZMA is not set | ||
86 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 109 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
87 | CONFIG_SYSCTL=y | 110 | CONFIG_SYSCTL=y |
111 | CONFIG_ANON_INODES=y | ||
88 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
90 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
@@ -94,19 +118,25 @@ CONFIG_HOTPLUG=y | |||
94 | CONFIG_PRINTK=y | 118 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 119 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 120 | CONFIG_ELF_CORE=y |
97 | CONFIG_COMPAT_BRK=y | ||
98 | CONFIG_BASE_FULL=y | 121 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 122 | CONFIG_FUTEX=y |
100 | CONFIG_ANON_INODES=y | ||
101 | CONFIG_EPOLL=y | 123 | CONFIG_EPOLL=y |
102 | CONFIG_SIGNALFD=y | 124 | CONFIG_SIGNALFD=y |
103 | CONFIG_TIMERFD=y | 125 | CONFIG_TIMERFD=y |
104 | CONFIG_EVENTFD=y | 126 | CONFIG_EVENTFD=y |
105 | CONFIG_SHMEM=y | 127 | CONFIG_SHMEM=y |
106 | CONFIG_AIO=y | 128 | CONFIG_AIO=y |
129 | CONFIG_HAVE_PERF_EVENTS=y | ||
130 | |||
131 | # | ||
132 | # Kernel Performance Events And Counters | ||
133 | # | ||
134 | # CONFIG_PERF_EVENTS is not set | ||
135 | # CONFIG_PERF_COUNTERS is not set | ||
107 | CONFIG_VM_EVENT_COUNTERS=y | 136 | CONFIG_VM_EVENT_COUNTERS=y |
108 | CONFIG_PCI_QUIRKS=y | 137 | CONFIG_PCI_QUIRKS=y |
109 | CONFIG_SLUB_DEBUG=y | 138 | CONFIG_SLUB_DEBUG=y |
139 | CONFIG_COMPAT_BRK=y | ||
110 | # CONFIG_SLAB is not set | 140 | # CONFIG_SLAB is not set |
111 | CONFIG_SLUB=y | 141 | CONFIG_SLUB=y |
112 | # CONFIG_SLOB is not set | 142 | # CONFIG_SLOB is not set |
@@ -118,6 +148,13 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
118 | CONFIG_HAVE_KPROBES=y | 148 | CONFIG_HAVE_KPROBES=y |
119 | CONFIG_HAVE_KRETPROBES=y | 149 | CONFIG_HAVE_KRETPROBES=y |
120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 150 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
151 | CONFIG_HAVE_DMA_ATTRS=y | ||
152 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
153 | |||
154 | # | ||
155 | # GCOV-based kernel profiling | ||
156 | # | ||
157 | # CONFIG_SLOW_WORK is not set | ||
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 158 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
122 | CONFIG_SLABINFO=y | 159 | CONFIG_SLABINFO=y |
123 | CONFIG_RT_MUTEXES=y | 160 | CONFIG_RT_MUTEXES=y |
@@ -129,8 +166,7 @@ CONFIG_MODULE_UNLOAD=y | |||
129 | # CONFIG_MODVERSIONS is not set | 166 | # CONFIG_MODVERSIONS is not set |
130 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 167 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
131 | CONFIG_BLOCK=y | 168 | CONFIG_BLOCK=y |
132 | CONFIG_LBD=y | 169 | CONFIG_LBDAF=y |
133 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
134 | # CONFIG_BLK_DEV_BSG is not set | 170 | # CONFIG_BLK_DEV_BSG is not set |
135 | # CONFIG_BLK_DEV_INTEGRITY is not set | 171 | # CONFIG_BLK_DEV_INTEGRITY is not set |
136 | 172 | ||
@@ -138,19 +174,41 @@ CONFIG_LBD=y | |||
138 | # IO Schedulers | 174 | # IO Schedulers |
139 | # | 175 | # |
140 | CONFIG_IOSCHED_NOOP=y | 176 | CONFIG_IOSCHED_NOOP=y |
141 | CONFIG_IOSCHED_AS=y | ||
142 | CONFIG_IOSCHED_DEADLINE=y | 177 | CONFIG_IOSCHED_DEADLINE=y |
143 | CONFIG_IOSCHED_CFQ=y | 178 | CONFIG_IOSCHED_CFQ=y |
144 | CONFIG_DEFAULT_AS=y | ||
145 | # CONFIG_DEFAULT_DEADLINE is not set | 179 | # CONFIG_DEFAULT_DEADLINE is not set |
146 | # CONFIG_DEFAULT_CFQ is not set | 180 | CONFIG_DEFAULT_CFQ=y |
147 | # CONFIG_DEFAULT_NOOP is not set | 181 | # CONFIG_DEFAULT_NOOP is not set |
148 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 182 | CONFIG_DEFAULT_IOSCHED="cfq" |
149 | CONFIG_CLASSIC_RCU=y | 183 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
150 | # CONFIG_TREE_RCU is not set | 184 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
151 | # CONFIG_PREEMPT_RCU is not set | 185 | # CONFIG_INLINE_SPIN_LOCK is not set |
152 | # CONFIG_TREE_RCU_TRACE is not set | 186 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
153 | # CONFIG_PREEMPT_RCU_TRACE is not set | 187 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
188 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
189 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
190 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
193 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
194 | # CONFIG_INLINE_READ_LOCK is not set | ||
195 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
196 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
198 | CONFIG_INLINE_READ_UNLOCK=y | ||
199 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
202 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
203 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
204 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
207 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
208 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
211 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
154 | # CONFIG_FREEZER is not set | 212 | # CONFIG_FREEZER is not set |
155 | CONFIG_PPC4xx_PCI_EXPRESS=y | 213 | CONFIG_PPC4xx_PCI_EXPRESS=y |
156 | 214 | ||
@@ -171,6 +229,8 @@ CONFIG_KATMAI=y | |||
171 | # CONFIG_ARCHES is not set | 229 | # CONFIG_ARCHES is not set |
172 | # CONFIG_CANYONLANDS is not set | 230 | # CONFIG_CANYONLANDS is not set |
173 | # CONFIG_GLACIER is not set | 231 | # CONFIG_GLACIER is not set |
232 | # CONFIG_REDWOOD is not set | ||
233 | # CONFIG_EIGER is not set | ||
174 | # CONFIG_YOSEMITE is not set | 234 | # CONFIG_YOSEMITE is not set |
175 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 235 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
176 | CONFIG_PPC44x_SIMPLE=y | 236 | CONFIG_PPC44x_SIMPLE=y |
@@ -212,10 +272,12 @@ CONFIG_BINFMT_ELF=y | |||
212 | # CONFIG_BINFMT_MISC is not set | 272 | # CONFIG_BINFMT_MISC is not set |
213 | # CONFIG_MATH_EMULATION is not set | 273 | # CONFIG_MATH_EMULATION is not set |
214 | # CONFIG_IOMMU_HELPER is not set | 274 | # CONFIG_IOMMU_HELPER is not set |
215 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 275 | # CONFIG_SWIOTLB is not set |
216 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 276 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
217 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 277 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
218 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 278 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
279 | CONFIG_SPARSE_IRQ=y | ||
280 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
219 | CONFIG_ARCH_FLATMEM_ENABLE=y | 281 | CONFIG_ARCH_FLATMEM_ENABLE=y |
220 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 282 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
221 | CONFIG_SELECT_MEMORY_MODEL=y | 283 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -231,10 +293,13 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
231 | CONFIG_ZONE_DMA_FLAG=1 | 293 | CONFIG_ZONE_DMA_FLAG=1 |
232 | CONFIG_BOUNCE=y | 294 | CONFIG_BOUNCE=y |
233 | CONFIG_VIRT_TO_BUS=y | 295 | CONFIG_VIRT_TO_BUS=y |
234 | CONFIG_UNEVICTABLE_LRU=y | 296 | # CONFIG_KSM is not set |
297 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
298 | CONFIG_STDBINUTILS=y | ||
235 | CONFIG_PPC_4K_PAGES=y | 299 | CONFIG_PPC_4K_PAGES=y |
236 | # CONFIG_PPC_16K_PAGES is not set | 300 | # CONFIG_PPC_16K_PAGES is not set |
237 | # CONFIG_PPC_64K_PAGES is not set | 301 | # CONFIG_PPC_64K_PAGES is not set |
302 | # CONFIG_PPC_256K_PAGES is not set | ||
238 | CONFIG_FORCE_MAX_ZONEORDER=11 | 303 | CONFIG_FORCE_MAX_ZONEORDER=11 |
239 | CONFIG_PROC_DEVICETREE=y | 304 | CONFIG_PROC_DEVICETREE=y |
240 | CONFIG_CMDLINE_BOOL=y | 305 | CONFIG_CMDLINE_BOOL=y |
@@ -259,6 +324,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
259 | # CONFIG_PCI_LEGACY is not set | 324 | # CONFIG_PCI_LEGACY is not set |
260 | # CONFIG_PCI_DEBUG is not set | 325 | # CONFIG_PCI_DEBUG is not set |
261 | # CONFIG_PCI_STUB is not set | 326 | # CONFIG_PCI_STUB is not set |
327 | # CONFIG_PCI_IOV is not set | ||
262 | # CONFIG_PCCARD is not set | 328 | # CONFIG_PCCARD is not set |
263 | # CONFIG_HOTPLUG_PCI is not set | 329 | # CONFIG_HOTPLUG_PCI is not set |
264 | # CONFIG_HAS_RAPIDIO is not set | 330 | # CONFIG_HAS_RAPIDIO is not set |
@@ -276,14 +342,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
276 | CONFIG_KERNEL_START=0xc0000000 | 342 | CONFIG_KERNEL_START=0xc0000000 |
277 | CONFIG_PHYSICAL_START=0x00000000 | 343 | CONFIG_PHYSICAL_START=0x00000000 |
278 | CONFIG_TASK_SIZE=0xc0000000 | 344 | CONFIG_TASK_SIZE=0xc0000000 |
279 | CONFIG_CONSISTENT_START=0xff100000 | ||
280 | CONFIG_CONSISTENT_SIZE=0x00200000 | 345 | CONFIG_CONSISTENT_SIZE=0x00200000 |
281 | CONFIG_NET=y | 346 | CONFIG_NET=y |
282 | 347 | ||
283 | # | 348 | # |
284 | # Networking options | 349 | # Networking options |
285 | # | 350 | # |
286 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
287 | CONFIG_PACKET=y | 351 | CONFIG_PACKET=y |
288 | # CONFIG_PACKET_MMAP is not set | 352 | # CONFIG_PACKET_MMAP is not set |
289 | CONFIG_UNIX=y | 353 | CONFIG_UNIX=y |
@@ -320,6 +384,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
320 | # CONFIG_NETFILTER is not set | 384 | # CONFIG_NETFILTER is not set |
321 | # CONFIG_IP_DCCP is not set | 385 | # CONFIG_IP_DCCP is not set |
322 | # CONFIG_IP_SCTP is not set | 386 | # CONFIG_IP_SCTP is not set |
387 | # CONFIG_RDS is not set | ||
323 | # CONFIG_TIPC is not set | 388 | # CONFIG_TIPC is not set |
324 | # CONFIG_ATM is not set | 389 | # CONFIG_ATM is not set |
325 | # CONFIG_BRIDGE is not set | 390 | # CONFIG_BRIDGE is not set |
@@ -333,6 +398,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
333 | # CONFIG_LAPB is not set | 398 | # CONFIG_LAPB is not set |
334 | # CONFIG_ECONET is not set | 399 | # CONFIG_ECONET is not set |
335 | # CONFIG_WAN_ROUTER is not set | 400 | # CONFIG_WAN_ROUTER is not set |
401 | # CONFIG_PHONET is not set | ||
402 | # CONFIG_IEEE802154 is not set | ||
336 | # CONFIG_NET_SCHED is not set | 403 | # CONFIG_NET_SCHED is not set |
337 | # CONFIG_DCB is not set | 404 | # CONFIG_DCB is not set |
338 | 405 | ||
@@ -345,8 +412,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
345 | # CONFIG_IRDA is not set | 412 | # CONFIG_IRDA is not set |
346 | # CONFIG_BT is not set | 413 | # CONFIG_BT is not set |
347 | # CONFIG_AF_RXRPC is not set | 414 | # CONFIG_AF_RXRPC is not set |
348 | # CONFIG_PHONET is not set | 415 | CONFIG_WIRELESS=y |
349 | # CONFIG_WIRELESS is not set | 416 | # CONFIG_CFG80211 is not set |
417 | # CONFIG_LIB80211 is not set | ||
418 | |||
419 | # | ||
420 | # CFG80211 needs to be enabled for MAC80211 | ||
421 | # | ||
350 | # CONFIG_WIMAX is not set | 422 | # CONFIG_WIMAX is not set |
351 | # CONFIG_RFKILL is not set | 423 | # CONFIG_RFKILL is not set |
352 | # CONFIG_NET_9P is not set | 424 | # CONFIG_NET_9P is not set |
@@ -359,6 +431,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
359 | # Generic Driver Options | 431 | # Generic Driver Options |
360 | # | 432 | # |
361 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 433 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
434 | # CONFIG_DEVTMPFS is not set | ||
362 | CONFIG_STANDALONE=y | 435 | CONFIG_STANDALONE=y |
363 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 436 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
364 | CONFIG_FW_LOADER=y | 437 | CONFIG_FW_LOADER=y |
@@ -380,6 +453,7 @@ CONFIG_BLK_DEV=y | |||
380 | # CONFIG_BLK_DEV_UMEM is not set | 453 | # CONFIG_BLK_DEV_UMEM is not set |
381 | # CONFIG_BLK_DEV_COW_COMMON is not set | 454 | # CONFIG_BLK_DEV_COW_COMMON is not set |
382 | # CONFIG_BLK_DEV_LOOP is not set | 455 | # CONFIG_BLK_DEV_LOOP is not set |
456 | # CONFIG_BLK_DEV_DRBD is not set | ||
383 | # CONFIG_BLK_DEV_NBD is not set | 457 | # CONFIG_BLK_DEV_NBD is not set |
384 | # CONFIG_BLK_DEV_SX8 is not set | 458 | # CONFIG_BLK_DEV_SX8 is not set |
385 | CONFIG_BLK_DEV_RAM=y | 459 | CONFIG_BLK_DEV_RAM=y |
@@ -392,12 +466,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
392 | # CONFIG_BLK_DEV_HD is not set | 466 | # CONFIG_BLK_DEV_HD is not set |
393 | CONFIG_MISC_DEVICES=y | 467 | CONFIG_MISC_DEVICES=y |
394 | # CONFIG_PHANTOM is not set | 468 | # CONFIG_PHANTOM is not set |
395 | # CONFIG_EEPROM_93CX6 is not set | ||
396 | # CONFIG_SGI_IOC4 is not set | 469 | # CONFIG_SGI_IOC4 is not set |
397 | # CONFIG_TIFM_CORE is not set | 470 | # CONFIG_TIFM_CORE is not set |
398 | # CONFIG_ENCLOSURE_SERVICES is not set | 471 | # CONFIG_ENCLOSURE_SERVICES is not set |
399 | # CONFIG_HP_ILO is not set | 472 | # CONFIG_HP_ILO is not set |
400 | # CONFIG_C2PORT is not set | 473 | # CONFIG_C2PORT is not set |
474 | |||
475 | # | ||
476 | # EEPROM support | ||
477 | # | ||
478 | # CONFIG_EEPROM_93CX6 is not set | ||
479 | # CONFIG_CB710_CORE is not set | ||
401 | CONFIG_HAVE_IDE=y | 480 | CONFIG_HAVE_IDE=y |
402 | # CONFIG_IDE is not set | 481 | # CONFIG_IDE is not set |
403 | 482 | ||
@@ -417,7 +496,11 @@ CONFIG_HAVE_IDE=y | |||
417 | # | 496 | # |
418 | 497 | ||
419 | # | 498 | # |
420 | # Enable only one of the two stacks, unless you know what you are doing | 499 | # You can enable one or both FireWire driver stacks. |
500 | # | ||
501 | |||
502 | # | ||
503 | # See the help texts for more information. | ||
421 | # | 504 | # |
422 | # CONFIG_FIREWIRE is not set | 505 | # CONFIG_FIREWIRE is not set |
423 | # CONFIG_IEEE1394 is not set | 506 | # CONFIG_IEEE1394 is not set |
@@ -440,6 +523,8 @@ CONFIG_NET_ETHERNET=y | |||
440 | # CONFIG_SUNGEM is not set | 523 | # CONFIG_SUNGEM is not set |
441 | # CONFIG_CASSINI is not set | 524 | # CONFIG_CASSINI is not set |
442 | # CONFIG_NET_VENDOR_3COM is not set | 525 | # CONFIG_NET_VENDOR_3COM is not set |
526 | # CONFIG_ETHOC is not set | ||
527 | # CONFIG_DNET is not set | ||
443 | # CONFIG_NET_TULIP is not set | 528 | # CONFIG_NET_TULIP is not set |
444 | # CONFIG_HP100 is not set | 529 | # CONFIG_HP100 is not set |
445 | CONFIG_IBM_NEW_EMAC=y | 530 | CONFIG_IBM_NEW_EMAC=y |
@@ -458,7 +543,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
458 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 543 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
459 | # CONFIG_NET_PCI is not set | 544 | # CONFIG_NET_PCI is not set |
460 | # CONFIG_B44 is not set | 545 | # CONFIG_B44 is not set |
546 | # CONFIG_KS8842 is not set | ||
547 | # CONFIG_KS8851_MLL is not set | ||
461 | # CONFIG_ATL2 is not set | 548 | # CONFIG_ATL2 is not set |
549 | # CONFIG_XILINX_EMACLITE is not set | ||
462 | CONFIG_NETDEV_1000=y | 550 | CONFIG_NETDEV_1000=y |
463 | # CONFIG_ACENIC is not set | 551 | # CONFIG_ACENIC is not set |
464 | # CONFIG_DL2K is not set | 552 | # CONFIG_DL2K is not set |
@@ -466,6 +554,7 @@ CONFIG_NETDEV_1000=y | |||
466 | # CONFIG_E1000E is not set | 554 | # CONFIG_E1000E is not set |
467 | # CONFIG_IP1000 is not set | 555 | # CONFIG_IP1000 is not set |
468 | # CONFIG_IGB is not set | 556 | # CONFIG_IGB is not set |
557 | # CONFIG_IGBVF is not set | ||
469 | # CONFIG_NS83820 is not set | 558 | # CONFIG_NS83820 is not set |
470 | # CONFIG_HAMACHI is not set | 559 | # CONFIG_HAMACHI is not set |
471 | # CONFIG_YELLOWFIN is not set | 560 | # CONFIG_YELLOWFIN is not set |
@@ -476,9 +565,13 @@ CONFIG_NETDEV_1000=y | |||
476 | # CONFIG_VIA_VELOCITY is not set | 565 | # CONFIG_VIA_VELOCITY is not set |
477 | # CONFIG_TIGON3 is not set | 566 | # CONFIG_TIGON3 is not set |
478 | # CONFIG_BNX2 is not set | 567 | # CONFIG_BNX2 is not set |
568 | # CONFIG_CNIC is not set | ||
569 | # CONFIG_MV643XX_ETH is not set | ||
570 | # CONFIG_XILINX_LL_TEMAC is not set | ||
479 | # CONFIG_QLA3XXX is not set | 571 | # CONFIG_QLA3XXX is not set |
480 | # CONFIG_ATL1 is not set | 572 | # CONFIG_ATL1 is not set |
481 | # CONFIG_ATL1E is not set | 573 | # CONFIG_ATL1E is not set |
574 | # CONFIG_ATL1C is not set | ||
482 | # CONFIG_JME is not set | 575 | # CONFIG_JME is not set |
483 | CONFIG_NETDEV_10000=y | 576 | CONFIG_NETDEV_10000=y |
484 | # CONFIG_CHELSIO_T1 is not set | 577 | # CONFIG_CHELSIO_T1 is not set |
@@ -488,6 +581,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
488 | # CONFIG_IXGBE is not set | 581 | # CONFIG_IXGBE is not set |
489 | # CONFIG_IXGB is not set | 582 | # CONFIG_IXGB is not set |
490 | # CONFIG_S2IO is not set | 583 | # CONFIG_S2IO is not set |
584 | # CONFIG_VXGE is not set | ||
491 | # CONFIG_MYRI10GE is not set | 585 | # CONFIG_MYRI10GE is not set |
492 | # CONFIG_NETXEN_NIC is not set | 586 | # CONFIG_NETXEN_NIC is not set |
493 | # CONFIG_NIU is not set | 587 | # CONFIG_NIU is not set |
@@ -497,14 +591,13 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
497 | # CONFIG_BNX2X is not set | 591 | # CONFIG_BNX2X is not set |
498 | # CONFIG_QLGE is not set | 592 | # CONFIG_QLGE is not set |
499 | # CONFIG_SFC is not set | 593 | # CONFIG_SFC is not set |
594 | # CONFIG_BE2NET is not set | ||
500 | # CONFIG_TR is not set | 595 | # CONFIG_TR is not set |
501 | 596 | CONFIG_WLAN=y | |
502 | # | 597 | # CONFIG_AIRO is not set |
503 | # Wireless LAN | 598 | # CONFIG_ATMEL is not set |
504 | # | 599 | # CONFIG_PRISM54 is not set |
505 | # CONFIG_WLAN_PRE80211 is not set | 600 | # CONFIG_HOSTAP is not set |
506 | # CONFIG_WLAN_80211 is not set | ||
507 | # CONFIG_IWLWIFI_LEDS is not set | ||
508 | 601 | ||
509 | # | 602 | # |
510 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 603 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -517,6 +610,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
517 | # CONFIG_NETCONSOLE is not set | 610 | # CONFIG_NETCONSOLE is not set |
518 | # CONFIG_NETPOLL is not set | 611 | # CONFIG_NETPOLL is not set |
519 | # CONFIG_NET_POLL_CONTROLLER is not set | 612 | # CONFIG_NET_POLL_CONTROLLER is not set |
613 | # CONFIG_VMXNET3 is not set | ||
520 | # CONFIG_ISDN is not set | 614 | # CONFIG_ISDN is not set |
521 | # CONFIG_PHONE is not set | 615 | # CONFIG_PHONE is not set |
522 | 616 | ||
@@ -562,6 +656,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
562 | # CONFIG_SERIAL_JSM is not set | 656 | # CONFIG_SERIAL_JSM is not set |
563 | CONFIG_SERIAL_OF_PLATFORM=y | 657 | CONFIG_SERIAL_OF_PLATFORM=y |
564 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 658 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
659 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
565 | CONFIG_UNIX98_PTYS=y | 660 | CONFIG_UNIX98_PTYS=y |
566 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 661 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
567 | CONFIG_LEGACY_PTYS=y | 662 | CONFIG_LEGACY_PTYS=y |
@@ -578,13 +673,17 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
578 | CONFIG_DEVPORT=y | 673 | CONFIG_DEVPORT=y |
579 | # CONFIG_I2C is not set | 674 | # CONFIG_I2C is not set |
580 | # CONFIG_SPI is not set | 675 | # CONFIG_SPI is not set |
676 | |||
677 | # | ||
678 | # PPS support | ||
679 | # | ||
680 | # CONFIG_PPS is not set | ||
581 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 681 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
582 | # CONFIG_GPIOLIB is not set | 682 | # CONFIG_GPIOLIB is not set |
583 | # CONFIG_W1 is not set | 683 | # CONFIG_W1 is not set |
584 | # CONFIG_POWER_SUPPLY is not set | 684 | # CONFIG_POWER_SUPPLY is not set |
585 | # CONFIG_HWMON is not set | 685 | # CONFIG_HWMON is not set |
586 | # CONFIG_THERMAL is not set | 686 | # CONFIG_THERMAL is not set |
587 | # CONFIG_THERMAL_HWMON is not set | ||
588 | # CONFIG_WATCHDOG is not set | 687 | # CONFIG_WATCHDOG is not set |
589 | CONFIG_SSB_POSSIBLE=y | 688 | CONFIG_SSB_POSSIBLE=y |
590 | 689 | ||
@@ -601,27 +700,13 @@ CONFIG_SSB_POSSIBLE=y | |||
601 | # CONFIG_HTC_PASIC3 is not set | 700 | # CONFIG_HTC_PASIC3 is not set |
602 | # CONFIG_MFD_TMIO is not set | 701 | # CONFIG_MFD_TMIO is not set |
603 | # CONFIG_REGULATOR is not set | 702 | # CONFIG_REGULATOR is not set |
604 | 703 | # CONFIG_MEDIA_SUPPORT is not set | |
605 | # | ||
606 | # Multimedia devices | ||
607 | # | ||
608 | |||
609 | # | ||
610 | # Multimedia core support | ||
611 | # | ||
612 | # CONFIG_VIDEO_DEV is not set | ||
613 | # CONFIG_DVB_CORE is not set | ||
614 | # CONFIG_VIDEO_MEDIA is not set | ||
615 | |||
616 | # | ||
617 | # Multimedia drivers | ||
618 | # | ||
619 | CONFIG_DAB=y | ||
620 | 704 | ||
621 | # | 705 | # |
622 | # Graphics support | 706 | # Graphics support |
623 | # | 707 | # |
624 | # CONFIG_AGP is not set | 708 | # CONFIG_AGP is not set |
709 | CONFIG_VGA_ARB=y | ||
625 | # CONFIG_DRM is not set | 710 | # CONFIG_DRM is not set |
626 | # CONFIG_VGASTATE is not set | 711 | # CONFIG_VGASTATE is not set |
627 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 712 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -646,7 +731,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
646 | # | 731 | # |
647 | 732 | ||
648 | # | 733 | # |
649 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 734 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
650 | # | 735 | # |
651 | # CONFIG_USB_GADGET is not set | 736 | # CONFIG_USB_GADGET is not set |
652 | 737 | ||
@@ -662,7 +747,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
662 | # CONFIG_EDAC is not set | 747 | # CONFIG_EDAC is not set |
663 | # CONFIG_RTC_CLASS is not set | 748 | # CONFIG_RTC_CLASS is not set |
664 | # CONFIG_DMADEVICES is not set | 749 | # CONFIG_DMADEVICES is not set |
750 | # CONFIG_AUXDISPLAY is not set | ||
665 | # CONFIG_UIO is not set | 751 | # CONFIG_UIO is not set |
752 | |||
753 | # | ||
754 | # TI VLYNQ | ||
755 | # | ||
666 | # CONFIG_STAGING is not set | 756 | # CONFIG_STAGING is not set |
667 | 757 | ||
668 | # | 758 | # |
@@ -673,14 +763,17 @@ CONFIG_EXT2_FS=y | |||
673 | # CONFIG_EXT2_FS_XIP is not set | 763 | # CONFIG_EXT2_FS_XIP is not set |
674 | # CONFIG_EXT3_FS is not set | 764 | # CONFIG_EXT3_FS is not set |
675 | # CONFIG_EXT4_FS is not set | 765 | # CONFIG_EXT4_FS is not set |
766 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
676 | # CONFIG_REISERFS_FS is not set | 767 | # CONFIG_REISERFS_FS is not set |
677 | # CONFIG_JFS_FS is not set | 768 | # CONFIG_JFS_FS is not set |
678 | # CONFIG_FS_POSIX_ACL is not set | 769 | # CONFIG_FS_POSIX_ACL is not set |
679 | CONFIG_FILE_LOCKING=y | ||
680 | # CONFIG_XFS_FS is not set | 770 | # CONFIG_XFS_FS is not set |
681 | # CONFIG_GFS2_FS is not set | 771 | # CONFIG_GFS2_FS is not set |
682 | # CONFIG_OCFS2_FS is not set | 772 | # CONFIG_OCFS2_FS is not set |
683 | # CONFIG_BTRFS_FS is not set | 773 | # CONFIG_BTRFS_FS is not set |
774 | # CONFIG_NILFS2_FS is not set | ||
775 | CONFIG_FILE_LOCKING=y | ||
776 | CONFIG_FSNOTIFY=y | ||
684 | CONFIG_DNOTIFY=y | 777 | CONFIG_DNOTIFY=y |
685 | CONFIG_INOTIFY=y | 778 | CONFIG_INOTIFY=y |
686 | CONFIG_INOTIFY_USER=y | 779 | CONFIG_INOTIFY_USER=y |
@@ -690,6 +783,11 @@ CONFIG_INOTIFY_USER=y | |||
690 | # CONFIG_FUSE_FS is not set | 783 | # CONFIG_FUSE_FS is not set |
691 | 784 | ||
692 | # | 785 | # |
786 | # Caches | ||
787 | # | ||
788 | # CONFIG_FSCACHE is not set | ||
789 | |||
790 | # | ||
693 | # CD-ROM/DVD Filesystems | 791 | # CD-ROM/DVD Filesystems |
694 | # | 792 | # |
695 | # CONFIG_ISO9660_FS is not set | 793 | # CONFIG_ISO9660_FS is not set |
@@ -743,7 +841,6 @@ CONFIG_LOCKD=y | |||
743 | CONFIG_LOCKD_V4=y | 841 | CONFIG_LOCKD_V4=y |
744 | CONFIG_NFS_COMMON=y | 842 | CONFIG_NFS_COMMON=y |
745 | CONFIG_SUNRPC=y | 843 | CONFIG_SUNRPC=y |
746 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
747 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 844 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
748 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 845 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
749 | # CONFIG_SMB_FS is not set | 846 | # CONFIG_SMB_FS is not set |
@@ -759,6 +856,7 @@ CONFIG_SUNRPC=y | |||
759 | CONFIG_MSDOS_PARTITION=y | 856 | CONFIG_MSDOS_PARTITION=y |
760 | # CONFIG_NLS is not set | 857 | # CONFIG_NLS is not set |
761 | # CONFIG_DLM is not set | 858 | # CONFIG_DLM is not set |
859 | # CONFIG_BINARY_PRINTF is not set | ||
762 | 860 | ||
763 | # | 861 | # |
764 | # Library routines | 862 | # Library routines |
@@ -773,11 +871,13 @@ CONFIG_CRC32=y | |||
773 | # CONFIG_CRC7 is not set | 871 | # CONFIG_CRC7 is not set |
774 | # CONFIG_LIBCRC32C is not set | 872 | # CONFIG_LIBCRC32C is not set |
775 | CONFIG_ZLIB_INFLATE=y | 873 | CONFIG_ZLIB_INFLATE=y |
776 | CONFIG_PLIST=y | 874 | CONFIG_DECOMPRESS_GZIP=y |
777 | CONFIG_HAS_IOMEM=y | 875 | CONFIG_HAS_IOMEM=y |
778 | CONFIG_HAS_IOPORT=y | 876 | CONFIG_HAS_IOPORT=y |
779 | CONFIG_HAS_DMA=y | 877 | CONFIG_HAS_DMA=y |
780 | CONFIG_HAVE_LMB=y | 878 | CONFIG_HAVE_LMB=y |
879 | CONFIG_NLATTR=y | ||
880 | CONFIG_GENERIC_ATOMIC64=y | ||
781 | 881 | ||
782 | # | 882 | # |
783 | # Kernel hacking | 883 | # Kernel hacking |
@@ -787,6 +887,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
787 | CONFIG_ENABLE_MUST_CHECK=y | 887 | CONFIG_ENABLE_MUST_CHECK=y |
788 | CONFIG_FRAME_WARN=1024 | 888 | CONFIG_FRAME_WARN=1024 |
789 | CONFIG_MAGIC_SYSRQ=y | 889 | CONFIG_MAGIC_SYSRQ=y |
890 | # CONFIG_STRIP_ASM_SYMS is not set | ||
790 | # CONFIG_UNUSED_SYMBOLS is not set | 891 | # CONFIG_UNUSED_SYMBOLS is not set |
791 | # CONFIG_DEBUG_FS is not set | 892 | # CONFIG_DEBUG_FS is not set |
792 | # CONFIG_HEADERS_CHECK is not set | 893 | # CONFIG_HEADERS_CHECK is not set |
@@ -795,16 +896,23 @@ CONFIG_DEBUG_KERNEL=y | |||
795 | CONFIG_DETECT_SOFTLOCKUP=y | 896 | CONFIG_DETECT_SOFTLOCKUP=y |
796 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 897 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
797 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 898 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
899 | CONFIG_DETECT_HUNG_TASK=y | ||
900 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
901 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
798 | CONFIG_SCHED_DEBUG=y | 902 | CONFIG_SCHED_DEBUG=y |
799 | # CONFIG_SCHEDSTATS is not set | 903 | # CONFIG_SCHEDSTATS is not set |
800 | # CONFIG_TIMER_STATS is not set | 904 | # CONFIG_TIMER_STATS is not set |
801 | # CONFIG_DEBUG_OBJECTS is not set | 905 | # CONFIG_DEBUG_OBJECTS is not set |
802 | # CONFIG_SLUB_DEBUG_ON is not set | 906 | # CONFIG_SLUB_DEBUG_ON is not set |
803 | # CONFIG_SLUB_STATS is not set | 907 | # CONFIG_SLUB_STATS is not set |
908 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
804 | # CONFIG_DEBUG_RT_MUTEXES is not set | 909 | # CONFIG_DEBUG_RT_MUTEXES is not set |
805 | # CONFIG_RT_MUTEX_TESTER is not set | 910 | # CONFIG_RT_MUTEX_TESTER is not set |
806 | # CONFIG_DEBUG_SPINLOCK is not set | 911 | # CONFIG_DEBUG_SPINLOCK is not set |
807 | # CONFIG_DEBUG_MUTEXES is not set | 912 | # CONFIG_DEBUG_MUTEXES is not set |
913 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
914 | # CONFIG_PROVE_LOCKING is not set | ||
915 | # CONFIG_LOCK_STAT is not set | ||
808 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 916 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
809 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 917 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
810 | # CONFIG_DEBUG_KOBJECT is not set | 918 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -816,35 +924,43 @@ CONFIG_SCHED_DEBUG=y | |||
816 | # CONFIG_DEBUG_LIST is not set | 924 | # CONFIG_DEBUG_LIST is not set |
817 | # CONFIG_DEBUG_SG is not set | 925 | # CONFIG_DEBUG_SG is not set |
818 | # CONFIG_DEBUG_NOTIFIERS is not set | 926 | # CONFIG_DEBUG_NOTIFIERS is not set |
819 | # CONFIG_BOOT_PRINTK_DELAY is not set | 927 | # CONFIG_DEBUG_CREDENTIALS is not set |
820 | # CONFIG_RCU_TORTURE_TEST is not set | 928 | # CONFIG_RCU_TORTURE_TEST is not set |
821 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 929 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
822 | # CONFIG_BACKTRACE_SELF_TEST is not set | 930 | # CONFIG_BACKTRACE_SELF_TEST is not set |
823 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 931 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
932 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
824 | # CONFIG_FAULT_INJECTION is not set | 933 | # CONFIG_FAULT_INJECTION is not set |
825 | # CONFIG_LATENCYTOP is not set | 934 | # CONFIG_LATENCYTOP is not set |
826 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 935 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
936 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
827 | CONFIG_HAVE_FUNCTION_TRACER=y | 937 | CONFIG_HAVE_FUNCTION_TRACER=y |
938 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
828 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 939 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
829 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 940 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
830 | 941 | CONFIG_TRACING_SUPPORT=y | |
831 | # | 942 | CONFIG_FTRACE=y |
832 | # Tracers | ||
833 | # | ||
834 | # CONFIG_FUNCTION_TRACER is not set | 943 | # CONFIG_FUNCTION_TRACER is not set |
944 | # CONFIG_IRQSOFF_TRACER is not set | ||
835 | # CONFIG_SCHED_TRACER is not set | 945 | # CONFIG_SCHED_TRACER is not set |
836 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 946 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
837 | # CONFIG_BOOT_TRACER is not set | 947 | # CONFIG_BOOT_TRACER is not set |
838 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 948 | CONFIG_BRANCH_PROFILE_NONE=y |
949 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
950 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
839 | # CONFIG_STACK_TRACER is not set | 951 | # CONFIG_STACK_TRACER is not set |
840 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 952 | # CONFIG_KMEMTRACE is not set |
953 | # CONFIG_WORKQUEUE_TRACER is not set | ||
954 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
955 | # CONFIG_DMA_API_DEBUG is not set | ||
841 | # CONFIG_SAMPLES is not set | 956 | # CONFIG_SAMPLES is not set |
842 | CONFIG_HAVE_ARCH_KGDB=y | 957 | CONFIG_HAVE_ARCH_KGDB=y |
843 | # CONFIG_KGDB is not set | 958 | # CONFIG_KGDB is not set |
959 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
960 | CONFIG_PPC_WERROR=y | ||
844 | CONFIG_PRINT_STACK_DEPTH=64 | 961 | CONFIG_PRINT_STACK_DEPTH=64 |
845 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 962 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
846 | # CONFIG_DEBUG_STACK_USAGE is not set | 963 | # CONFIG_DEBUG_STACK_USAGE is not set |
847 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
848 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 964 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
849 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 965 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
850 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 966 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -859,13 +975,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
859 | # CONFIG_KEYS is not set | 975 | # CONFIG_KEYS is not set |
860 | # CONFIG_SECURITY is not set | 976 | # CONFIG_SECURITY is not set |
861 | # CONFIG_SECURITYFS is not set | 977 | # CONFIG_SECURITYFS is not set |
862 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 978 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
979 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
980 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
981 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
982 | CONFIG_DEFAULT_SECURITY="" | ||
863 | CONFIG_CRYPTO=y | 983 | CONFIG_CRYPTO=y |
864 | 984 | ||
865 | # | 985 | # |
866 | # Crypto core or helper | 986 | # Crypto core or helper |
867 | # | 987 | # |
868 | # CONFIG_CRYPTO_FIPS is not set | ||
869 | CONFIG_CRYPTO_ALGAPI=y | 988 | CONFIG_CRYPTO_ALGAPI=y |
870 | CONFIG_CRYPTO_ALGAPI2=y | 989 | CONFIG_CRYPTO_ALGAPI2=y |
871 | CONFIG_CRYPTO_AEAD2=y | 990 | CONFIG_CRYPTO_AEAD2=y |
@@ -874,10 +993,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
874 | CONFIG_CRYPTO_HASH=y | 993 | CONFIG_CRYPTO_HASH=y |
875 | CONFIG_CRYPTO_HASH2=y | 994 | CONFIG_CRYPTO_HASH2=y |
876 | CONFIG_CRYPTO_RNG2=y | 995 | CONFIG_CRYPTO_RNG2=y |
996 | CONFIG_CRYPTO_PCOMP=y | ||
877 | CONFIG_CRYPTO_MANAGER=y | 997 | CONFIG_CRYPTO_MANAGER=y |
878 | CONFIG_CRYPTO_MANAGER2=y | 998 | CONFIG_CRYPTO_MANAGER2=y |
879 | # CONFIG_CRYPTO_GF128MUL is not set | 999 | # CONFIG_CRYPTO_GF128MUL is not set |
880 | # CONFIG_CRYPTO_NULL is not set | 1000 | # CONFIG_CRYPTO_NULL is not set |
1001 | CONFIG_CRYPTO_WORKQUEUE=y | ||
881 | # CONFIG_CRYPTO_CRYPTD is not set | 1002 | # CONFIG_CRYPTO_CRYPTD is not set |
882 | # CONFIG_CRYPTO_AUTHENC is not set | 1003 | # CONFIG_CRYPTO_AUTHENC is not set |
883 | # CONFIG_CRYPTO_TEST is not set | 1004 | # CONFIG_CRYPTO_TEST is not set |
@@ -905,11 +1026,13 @@ CONFIG_CRYPTO_PCBC=y | |||
905 | # | 1026 | # |
906 | # CONFIG_CRYPTO_HMAC is not set | 1027 | # CONFIG_CRYPTO_HMAC is not set |
907 | # CONFIG_CRYPTO_XCBC is not set | 1028 | # CONFIG_CRYPTO_XCBC is not set |
1029 | # CONFIG_CRYPTO_VMAC is not set | ||
908 | 1030 | ||
909 | # | 1031 | # |
910 | # Digest | 1032 | # Digest |
911 | # | 1033 | # |
912 | # CONFIG_CRYPTO_CRC32C is not set | 1034 | # CONFIG_CRYPTO_CRC32C is not set |
1035 | # CONFIG_CRYPTO_GHASH is not set | ||
913 | # CONFIG_CRYPTO_MD4 is not set | 1036 | # CONFIG_CRYPTO_MD4 is not set |
914 | CONFIG_CRYPTO_MD5=y | 1037 | CONFIG_CRYPTO_MD5=y |
915 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1038 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -946,6 +1069,7 @@ CONFIG_CRYPTO_DES=y | |||
946 | # Compression | 1069 | # Compression |
947 | # | 1070 | # |
948 | # CONFIG_CRYPTO_DEFLATE is not set | 1071 | # CONFIG_CRYPTO_DEFLATE is not set |
1072 | # CONFIG_CRYPTO_ZLIB is not set | ||
949 | # CONFIG_CRYPTO_LZO is not set | 1073 | # CONFIG_CRYPTO_LZO is not set |
950 | 1074 | ||
951 | # | 1075 | # |
@@ -954,5 +1078,6 @@ CONFIG_CRYPTO_DES=y | |||
954 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1078 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
955 | CONFIG_CRYPTO_HW=y | 1079 | CONFIG_CRYPTO_HW=y |
956 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1080 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1081 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
957 | # CONFIG_PPC_CLOCK is not set | 1082 | # CONFIG_PPC_CLOCK is not set |
958 | # CONFIG_VIRTUALIZATION is not set | 1083 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig index b25fad1343dc..8fed3b26af2e 100644 --- a/arch/powerpc/configs/44x/rainier_defconfig +++ b/arch/powerpc/configs/44x/rainier_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:22:41 2009 | 4 | # Mon Jan 4 14:59:12 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -19,6 +19,7 @@ CONFIG_BOOKE=y | |||
19 | CONFIG_PTE_64BIT=y | 19 | CONFIG_PTE_64BIT=y |
20 | CONFIG_PHYS_64BIT=y | 20 | CONFIG_PHYS_64BIT=y |
21 | CONFIG_PPC_MMU_NOHASH=y | 21 | CONFIG_PPC_MMU_NOHASH=y |
22 | CONFIG_PPC_MMU_NOHASH_32=y | ||
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
23 | CONFIG_NOT_COHERENT_CACHE=y | 24 | CONFIG_NOT_COHERENT_CACHE=y |
24 | CONFIG_PPC32=y | 25 | CONFIG_PPC32=y |
@@ -30,15 +31,18 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 31 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 32 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 33 | CONFIG_GENERIC_HARDIRQS=y |
34 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
38 | CONFIG_NR_IRQS=512 | ||
35 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
44 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -52,11 +56,15 @@ CONFIG_PPC_UDBG_16550=y | |||
52 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
53 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
54 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
55 | # CONFIG_DEFAULT_UIMAGE is not set | 60 | # CONFIG_DEFAULT_UIMAGE is not set |
61 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
56 | CONFIG_PPC_DCR_NATIVE=y | 62 | CONFIG_PPC_DCR_NATIVE=y |
57 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
58 | CONFIG_PPC_DCR=y | 64 | CONFIG_PPC_DCR=y |
65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
60 | 68 | ||
61 | # | 69 | # |
62 | # General setup | 70 | # General setup |
@@ -70,9 +78,21 @@ CONFIG_SWAP=y | |||
70 | CONFIG_SYSVIPC=y | 78 | CONFIG_SYSVIPC=y |
71 | CONFIG_SYSVIPC_SYSCTL=y | 79 | CONFIG_SYSVIPC_SYSCTL=y |
72 | CONFIG_POSIX_MQUEUE=y | 80 | CONFIG_POSIX_MQUEUE=y |
81 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
73 | # CONFIG_BSD_PROCESS_ACCT is not set | 82 | # CONFIG_BSD_PROCESS_ACCT is not set |
74 | # CONFIG_TASKSTATS is not set | 83 | # CONFIG_TASKSTATS is not set |
75 | # CONFIG_AUDIT is not set | 84 | # CONFIG_AUDIT is not set |
85 | |||
86 | # | ||
87 | # RCU Subsystem | ||
88 | # | ||
89 | CONFIG_TREE_RCU=y | ||
90 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
91 | # CONFIG_TINY_RCU is not set | ||
92 | # CONFIG_RCU_TRACE is not set | ||
93 | CONFIG_RCU_FANOUT=32 | ||
94 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
95 | # CONFIG_TREE_RCU_TRACE is not set | ||
76 | # CONFIG_IKCONFIG is not set | 96 | # CONFIG_IKCONFIG is not set |
77 | CONFIG_LOG_BUF_SHIFT=14 | 97 | CONFIG_LOG_BUF_SHIFT=14 |
78 | CONFIG_GROUP_SCHED=y | 98 | CONFIG_GROUP_SCHED=y |
@@ -87,8 +107,12 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
87 | # CONFIG_NAMESPACES is not set | 107 | # CONFIG_NAMESPACES is not set |
88 | CONFIG_BLK_DEV_INITRD=y | 108 | CONFIG_BLK_DEV_INITRD=y |
89 | CONFIG_INITRAMFS_SOURCE="" | 109 | CONFIG_INITRAMFS_SOURCE="" |
110 | CONFIG_RD_GZIP=y | ||
111 | # CONFIG_RD_BZIP2 is not set | ||
112 | # CONFIG_RD_LZMA is not set | ||
90 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 113 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
91 | CONFIG_SYSCTL=y | 114 | CONFIG_SYSCTL=y |
115 | CONFIG_ANON_INODES=y | ||
92 | CONFIG_EMBEDDED=y | 116 | CONFIG_EMBEDDED=y |
93 | CONFIG_SYSCTL_SYSCALL=y | 117 | CONFIG_SYSCTL_SYSCALL=y |
94 | CONFIG_KALLSYMS=y | 118 | CONFIG_KALLSYMS=y |
@@ -98,19 +122,25 @@ CONFIG_HOTPLUG=y | |||
98 | CONFIG_PRINTK=y | 122 | CONFIG_PRINTK=y |
99 | CONFIG_BUG=y | 123 | CONFIG_BUG=y |
100 | CONFIG_ELF_CORE=y | 124 | CONFIG_ELF_CORE=y |
101 | CONFIG_COMPAT_BRK=y | ||
102 | CONFIG_BASE_FULL=y | 125 | CONFIG_BASE_FULL=y |
103 | CONFIG_FUTEX=y | 126 | CONFIG_FUTEX=y |
104 | CONFIG_ANON_INODES=y | ||
105 | CONFIG_EPOLL=y | 127 | CONFIG_EPOLL=y |
106 | CONFIG_SIGNALFD=y | 128 | CONFIG_SIGNALFD=y |
107 | CONFIG_TIMERFD=y | 129 | CONFIG_TIMERFD=y |
108 | CONFIG_EVENTFD=y | 130 | CONFIG_EVENTFD=y |
109 | CONFIG_SHMEM=y | 131 | CONFIG_SHMEM=y |
110 | CONFIG_AIO=y | 132 | CONFIG_AIO=y |
133 | CONFIG_HAVE_PERF_EVENTS=y | ||
134 | |||
135 | # | ||
136 | # Kernel Performance Events And Counters | ||
137 | # | ||
138 | # CONFIG_PERF_EVENTS is not set | ||
139 | # CONFIG_PERF_COUNTERS is not set | ||
111 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
112 | CONFIG_PCI_QUIRKS=y | 141 | CONFIG_PCI_QUIRKS=y |
113 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
143 | CONFIG_COMPAT_BRK=y | ||
114 | # CONFIG_SLAB is not set | 144 | # CONFIG_SLAB is not set |
115 | CONFIG_SLUB=y | 145 | CONFIG_SLUB=y |
116 | # CONFIG_SLOB is not set | 146 | # CONFIG_SLOB is not set |
@@ -122,6 +152,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
122 | CONFIG_HAVE_KPROBES=y | 152 | CONFIG_HAVE_KPROBES=y |
123 | CONFIG_HAVE_KRETPROBES=y | 153 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
155 | CONFIG_HAVE_DMA_ATTRS=y | ||
156 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
157 | |||
158 | # | ||
159 | # GCOV-based kernel profiling | ||
160 | # | ||
161 | # CONFIG_GCOV_KERNEL is not set | ||
162 | # CONFIG_SLOW_WORK is not set | ||
125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 163 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
126 | CONFIG_SLABINFO=y | 164 | CONFIG_SLABINFO=y |
127 | CONFIG_RT_MUTEXES=y | 165 | CONFIG_RT_MUTEXES=y |
@@ -133,8 +171,7 @@ CONFIG_MODULE_UNLOAD=y | |||
133 | # CONFIG_MODVERSIONS is not set | 171 | # CONFIG_MODVERSIONS is not set |
134 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 172 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
135 | CONFIG_BLOCK=y | 173 | CONFIG_BLOCK=y |
136 | CONFIG_LBD=y | 174 | CONFIG_LBDAF=y |
137 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
138 | # CONFIG_BLK_DEV_BSG is not set | 175 | # CONFIG_BLK_DEV_BSG is not set |
139 | # CONFIG_BLK_DEV_INTEGRITY is not set | 176 | # CONFIG_BLK_DEV_INTEGRITY is not set |
140 | 177 | ||
@@ -142,19 +179,41 @@ CONFIG_LBD=y | |||
142 | # IO Schedulers | 179 | # IO Schedulers |
143 | # | 180 | # |
144 | CONFIG_IOSCHED_NOOP=y | 181 | CONFIG_IOSCHED_NOOP=y |
145 | CONFIG_IOSCHED_AS=y | ||
146 | CONFIG_IOSCHED_DEADLINE=y | 182 | CONFIG_IOSCHED_DEADLINE=y |
147 | CONFIG_IOSCHED_CFQ=y | 183 | CONFIG_IOSCHED_CFQ=y |
148 | CONFIG_DEFAULT_AS=y | ||
149 | # CONFIG_DEFAULT_DEADLINE is not set | 184 | # CONFIG_DEFAULT_DEADLINE is not set |
150 | # CONFIG_DEFAULT_CFQ is not set | 185 | CONFIG_DEFAULT_CFQ=y |
151 | # CONFIG_DEFAULT_NOOP is not set | 186 | # CONFIG_DEFAULT_NOOP is not set |
152 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 187 | CONFIG_DEFAULT_IOSCHED="cfq" |
153 | CONFIG_CLASSIC_RCU=y | 188 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
154 | # CONFIG_TREE_RCU is not set | 189 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
155 | # CONFIG_PREEMPT_RCU is not set | 190 | # CONFIG_INLINE_SPIN_LOCK is not set |
156 | # CONFIG_TREE_RCU_TRACE is not set | 191 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
157 | # CONFIG_PREEMPT_RCU_TRACE is not set | 192 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
193 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
194 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
195 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
196 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
197 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
198 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
199 | # CONFIG_INLINE_READ_LOCK is not set | ||
200 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
201 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
203 | CONFIG_INLINE_READ_UNLOCK=y | ||
204 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
205 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
206 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
207 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
212 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
213 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
214 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
215 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
216 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
158 | # CONFIG_FREEZER is not set | 217 | # CONFIG_FREEZER is not set |
159 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 218 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
160 | 219 | ||
@@ -175,6 +234,8 @@ CONFIG_RAINIER=y | |||
175 | # CONFIG_ARCHES is not set | 234 | # CONFIG_ARCHES is not set |
176 | # CONFIG_CANYONLANDS is not set | 235 | # CONFIG_CANYONLANDS is not set |
177 | # CONFIG_GLACIER is not set | 236 | # CONFIG_GLACIER is not set |
237 | # CONFIG_REDWOOD is not set | ||
238 | # CONFIG_EIGER is not set | ||
178 | # CONFIG_YOSEMITE is not set | 239 | # CONFIG_YOSEMITE is not set |
179 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 240 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
180 | CONFIG_PPC44x_SIMPLE=y | 241 | CONFIG_PPC44x_SIMPLE=y |
@@ -216,10 +277,12 @@ CONFIG_BINFMT_ELF=y | |||
216 | # CONFIG_BINFMT_MISC is not set | 277 | # CONFIG_BINFMT_MISC is not set |
217 | CONFIG_MATH_EMULATION=y | 278 | CONFIG_MATH_EMULATION=y |
218 | # CONFIG_IOMMU_HELPER is not set | 279 | # CONFIG_IOMMU_HELPER is not set |
219 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 280 | # CONFIG_SWIOTLB is not set |
220 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 281 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
221 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 282 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
222 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 283 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
284 | CONFIG_SPARSE_IRQ=y | ||
285 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
223 | CONFIG_ARCH_FLATMEM_ENABLE=y | 286 | CONFIG_ARCH_FLATMEM_ENABLE=y |
224 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 287 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
225 | CONFIG_SELECT_MEMORY_MODEL=y | 288 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -235,10 +298,13 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
235 | CONFIG_ZONE_DMA_FLAG=1 | 298 | CONFIG_ZONE_DMA_FLAG=1 |
236 | CONFIG_BOUNCE=y | 299 | CONFIG_BOUNCE=y |
237 | CONFIG_VIRT_TO_BUS=y | 300 | CONFIG_VIRT_TO_BUS=y |
238 | CONFIG_UNEVICTABLE_LRU=y | 301 | # CONFIG_KSM is not set |
302 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
303 | CONFIG_STDBINUTILS=y | ||
239 | CONFIG_PPC_4K_PAGES=y | 304 | CONFIG_PPC_4K_PAGES=y |
240 | # CONFIG_PPC_16K_PAGES is not set | 305 | # CONFIG_PPC_16K_PAGES is not set |
241 | # CONFIG_PPC_64K_PAGES is not set | 306 | # CONFIG_PPC_64K_PAGES is not set |
307 | # CONFIG_PPC_256K_PAGES is not set | ||
242 | CONFIG_FORCE_MAX_ZONEORDER=11 | 308 | CONFIG_FORCE_MAX_ZONEORDER=11 |
243 | CONFIG_PROC_DEVICETREE=y | 309 | CONFIG_PROC_DEVICETREE=y |
244 | CONFIG_CMDLINE_BOOL=y | 310 | CONFIG_CMDLINE_BOOL=y |
@@ -263,6 +329,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
263 | # CONFIG_PCI_LEGACY is not set | 329 | # CONFIG_PCI_LEGACY is not set |
264 | # CONFIG_PCI_DEBUG is not set | 330 | # CONFIG_PCI_DEBUG is not set |
265 | # CONFIG_PCI_STUB is not set | 331 | # CONFIG_PCI_STUB is not set |
332 | # CONFIG_PCI_IOV is not set | ||
266 | # CONFIG_PCCARD is not set | 333 | # CONFIG_PCCARD is not set |
267 | # CONFIG_HOTPLUG_PCI is not set | 334 | # CONFIG_HOTPLUG_PCI is not set |
268 | # CONFIG_HAS_RAPIDIO is not set | 335 | # CONFIG_HAS_RAPIDIO is not set |
@@ -280,14 +347,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
280 | CONFIG_KERNEL_START=0xc0000000 | 347 | CONFIG_KERNEL_START=0xc0000000 |
281 | CONFIG_PHYSICAL_START=0x00000000 | 348 | CONFIG_PHYSICAL_START=0x00000000 |
282 | CONFIG_TASK_SIZE=0xc0000000 | 349 | CONFIG_TASK_SIZE=0xc0000000 |
283 | CONFIG_CONSISTENT_START=0xff100000 | ||
284 | CONFIG_CONSISTENT_SIZE=0x00200000 | 350 | CONFIG_CONSISTENT_SIZE=0x00200000 |
285 | CONFIG_NET=y | 351 | CONFIG_NET=y |
286 | 352 | ||
287 | # | 353 | # |
288 | # Networking options | 354 | # Networking options |
289 | # | 355 | # |
290 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
291 | CONFIG_PACKET=y | 356 | CONFIG_PACKET=y |
292 | # CONFIG_PACKET_MMAP is not set | 357 | # CONFIG_PACKET_MMAP is not set |
293 | CONFIG_UNIX=y | 358 | CONFIG_UNIX=y |
@@ -324,6 +389,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
324 | # CONFIG_NETFILTER is not set | 389 | # CONFIG_NETFILTER is not set |
325 | # CONFIG_IP_DCCP is not set | 390 | # CONFIG_IP_DCCP is not set |
326 | # CONFIG_IP_SCTP is not set | 391 | # CONFIG_IP_SCTP is not set |
392 | # CONFIG_RDS is not set | ||
327 | # CONFIG_TIPC is not set | 393 | # CONFIG_TIPC is not set |
328 | # CONFIG_ATM is not set | 394 | # CONFIG_ATM is not set |
329 | # CONFIG_BRIDGE is not set | 395 | # CONFIG_BRIDGE is not set |
@@ -337,6 +403,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
337 | # CONFIG_LAPB is not set | 403 | # CONFIG_LAPB is not set |
338 | # CONFIG_ECONET is not set | 404 | # CONFIG_ECONET is not set |
339 | # CONFIG_WAN_ROUTER is not set | 405 | # CONFIG_WAN_ROUTER is not set |
406 | # CONFIG_PHONET is not set | ||
407 | # CONFIG_IEEE802154 is not set | ||
340 | # CONFIG_NET_SCHED is not set | 408 | # CONFIG_NET_SCHED is not set |
341 | # CONFIG_DCB is not set | 409 | # CONFIG_DCB is not set |
342 | 410 | ||
@@ -349,8 +417,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
349 | # CONFIG_IRDA is not set | 417 | # CONFIG_IRDA is not set |
350 | # CONFIG_BT is not set | 418 | # CONFIG_BT is not set |
351 | # CONFIG_AF_RXRPC is not set | 419 | # CONFIG_AF_RXRPC is not set |
352 | # CONFIG_PHONET is not set | 420 | CONFIG_WIRELESS=y |
353 | # CONFIG_WIRELESS is not set | 421 | # CONFIG_CFG80211 is not set |
422 | # CONFIG_LIB80211 is not set | ||
423 | |||
424 | # | ||
425 | # CFG80211 needs to be enabled for MAC80211 | ||
426 | # | ||
354 | # CONFIG_WIMAX is not set | 427 | # CONFIG_WIMAX is not set |
355 | # CONFIG_RFKILL is not set | 428 | # CONFIG_RFKILL is not set |
356 | # CONFIG_NET_9P is not set | 429 | # CONFIG_NET_9P is not set |
@@ -363,6 +436,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
363 | # Generic Driver Options | 436 | # Generic Driver Options |
364 | # | 437 | # |
365 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 438 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
439 | # CONFIG_DEVTMPFS is not set | ||
366 | CONFIG_STANDALONE=y | 440 | CONFIG_STANDALONE=y |
367 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 441 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
368 | CONFIG_FW_LOADER=y | 442 | CONFIG_FW_LOADER=y |
@@ -375,9 +449,9 @@ CONFIG_CONNECTOR=y | |||
375 | CONFIG_PROC_EVENTS=y | 449 | CONFIG_PROC_EVENTS=y |
376 | CONFIG_MTD=y | 450 | CONFIG_MTD=y |
377 | # CONFIG_MTD_DEBUG is not set | 451 | # CONFIG_MTD_DEBUG is not set |
452 | # CONFIG_MTD_TESTS is not set | ||
378 | # CONFIG_MTD_CONCAT is not set | 453 | # CONFIG_MTD_CONCAT is not set |
379 | CONFIG_MTD_PARTITIONS=y | 454 | CONFIG_MTD_PARTITIONS=y |
380 | # CONFIG_MTD_TESTS is not set | ||
381 | # CONFIG_MTD_REDBOOT_PARTS is not set | 455 | # CONFIG_MTD_REDBOOT_PARTS is not set |
382 | CONFIG_MTD_CMDLINE_PARTS=y | 456 | CONFIG_MTD_CMDLINE_PARTS=y |
383 | CONFIG_MTD_OF_PARTS=y | 457 | CONFIG_MTD_OF_PARTS=y |
@@ -453,7 +527,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
453 | # LPDDR flash memory drivers | 527 | # LPDDR flash memory drivers |
454 | # | 528 | # |
455 | # CONFIG_MTD_LPDDR is not set | 529 | # CONFIG_MTD_LPDDR is not set |
456 | # CONFIG_MTD_QINFO_PROBE is not set | ||
457 | 530 | ||
458 | # | 531 | # |
459 | # UBI - Unsorted block images | 532 | # UBI - Unsorted block images |
@@ -469,6 +542,7 @@ CONFIG_BLK_DEV=y | |||
469 | # CONFIG_BLK_DEV_UMEM is not set | 542 | # CONFIG_BLK_DEV_UMEM is not set |
470 | # CONFIG_BLK_DEV_COW_COMMON is not set | 543 | # CONFIG_BLK_DEV_COW_COMMON is not set |
471 | # CONFIG_BLK_DEV_LOOP is not set | 544 | # CONFIG_BLK_DEV_LOOP is not set |
545 | # CONFIG_BLK_DEV_DRBD is not set | ||
472 | # CONFIG_BLK_DEV_NBD is not set | 546 | # CONFIG_BLK_DEV_NBD is not set |
473 | # CONFIG_BLK_DEV_SX8 is not set | 547 | # CONFIG_BLK_DEV_SX8 is not set |
474 | CONFIG_BLK_DEV_RAM=y | 548 | CONFIG_BLK_DEV_RAM=y |
@@ -481,12 +555,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
481 | # CONFIG_BLK_DEV_HD is not set | 555 | # CONFIG_BLK_DEV_HD is not set |
482 | CONFIG_MISC_DEVICES=y | 556 | CONFIG_MISC_DEVICES=y |
483 | # CONFIG_PHANTOM is not set | 557 | # CONFIG_PHANTOM is not set |
484 | # CONFIG_EEPROM_93CX6 is not set | ||
485 | # CONFIG_SGI_IOC4 is not set | 558 | # CONFIG_SGI_IOC4 is not set |
486 | # CONFIG_TIFM_CORE is not set | 559 | # CONFIG_TIFM_CORE is not set |
487 | # CONFIG_ENCLOSURE_SERVICES is not set | 560 | # CONFIG_ENCLOSURE_SERVICES is not set |
488 | # CONFIG_HP_ILO is not set | 561 | # CONFIG_HP_ILO is not set |
489 | # CONFIG_C2PORT is not set | 562 | # CONFIG_C2PORT is not set |
563 | |||
564 | # | ||
565 | # EEPROM support | ||
566 | # | ||
567 | # CONFIG_EEPROM_93CX6 is not set | ||
568 | # CONFIG_CB710_CORE is not set | ||
490 | CONFIG_HAVE_IDE=y | 569 | CONFIG_HAVE_IDE=y |
491 | # CONFIG_IDE is not set | 570 | # CONFIG_IDE is not set |
492 | 571 | ||
@@ -506,7 +585,11 @@ CONFIG_HAVE_IDE=y | |||
506 | # | 585 | # |
507 | 586 | ||
508 | # | 587 | # |
509 | # Enable only one of the two stacks, unless you know what you are doing | 588 | # You can enable one or both FireWire driver stacks. |
589 | # | ||
590 | |||
591 | # | ||
592 | # See the help texts for more information. | ||
510 | # | 593 | # |
511 | # CONFIG_FIREWIRE is not set | 594 | # CONFIG_FIREWIRE is not set |
512 | # CONFIG_IEEE1394 is not set | 595 | # CONFIG_IEEE1394 is not set |
@@ -533,6 +616,7 @@ CONFIG_NETDEV_1000=y | |||
533 | # CONFIG_E1000E is not set | 616 | # CONFIG_E1000E is not set |
534 | # CONFIG_IP1000 is not set | 617 | # CONFIG_IP1000 is not set |
535 | # CONFIG_IGB is not set | 618 | # CONFIG_IGB is not set |
619 | # CONFIG_IGBVF is not set | ||
536 | # CONFIG_NS83820 is not set | 620 | # CONFIG_NS83820 is not set |
537 | # CONFIG_HAMACHI is not set | 621 | # CONFIG_HAMACHI is not set |
538 | # CONFIG_YELLOWFIN is not set | 622 | # CONFIG_YELLOWFIN is not set |
@@ -543,9 +627,13 @@ CONFIG_NETDEV_1000=y | |||
543 | # CONFIG_VIA_VELOCITY is not set | 627 | # CONFIG_VIA_VELOCITY is not set |
544 | # CONFIG_TIGON3 is not set | 628 | # CONFIG_TIGON3 is not set |
545 | # CONFIG_BNX2 is not set | 629 | # CONFIG_BNX2 is not set |
630 | # CONFIG_CNIC is not set | ||
631 | # CONFIG_MV643XX_ETH is not set | ||
632 | # CONFIG_XILINX_LL_TEMAC is not set | ||
546 | # CONFIG_QLA3XXX is not set | 633 | # CONFIG_QLA3XXX is not set |
547 | # CONFIG_ATL1 is not set | 634 | # CONFIG_ATL1 is not set |
548 | # CONFIG_ATL1E is not set | 635 | # CONFIG_ATL1E is not set |
636 | # CONFIG_ATL1C is not set | ||
549 | # CONFIG_JME is not set | 637 | # CONFIG_JME is not set |
550 | CONFIG_NETDEV_10000=y | 638 | CONFIG_NETDEV_10000=y |
551 | # CONFIG_CHELSIO_T1 is not set | 639 | # CONFIG_CHELSIO_T1 is not set |
@@ -555,6 +643,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
555 | # CONFIG_IXGBE is not set | 643 | # CONFIG_IXGBE is not set |
556 | # CONFIG_IXGB is not set | 644 | # CONFIG_IXGB is not set |
557 | # CONFIG_S2IO is not set | 645 | # CONFIG_S2IO is not set |
646 | # CONFIG_VXGE is not set | ||
558 | # CONFIG_MYRI10GE is not set | 647 | # CONFIG_MYRI10GE is not set |
559 | # CONFIG_NETXEN_NIC is not set | 648 | # CONFIG_NETXEN_NIC is not set |
560 | # CONFIG_NIU is not set | 649 | # CONFIG_NIU is not set |
@@ -564,14 +653,13 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
564 | # CONFIG_BNX2X is not set | 653 | # CONFIG_BNX2X is not set |
565 | # CONFIG_QLGE is not set | 654 | # CONFIG_QLGE is not set |
566 | # CONFIG_SFC is not set | 655 | # CONFIG_SFC is not set |
656 | # CONFIG_BE2NET is not set | ||
567 | # CONFIG_TR is not set | 657 | # CONFIG_TR is not set |
568 | 658 | CONFIG_WLAN=y | |
569 | # | 659 | # CONFIG_AIRO is not set |
570 | # Wireless LAN | 660 | # CONFIG_ATMEL is not set |
571 | # | 661 | # CONFIG_PRISM54 is not set |
572 | # CONFIG_WLAN_PRE80211 is not set | 662 | # CONFIG_HOSTAP is not set |
573 | # CONFIG_WLAN_80211 is not set | ||
574 | # CONFIG_IWLWIFI_LEDS is not set | ||
575 | 663 | ||
576 | # | 664 | # |
577 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 665 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -584,6 +672,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
584 | # CONFIG_NETCONSOLE is not set | 672 | # CONFIG_NETCONSOLE is not set |
585 | # CONFIG_NETPOLL is not set | 673 | # CONFIG_NETPOLL is not set |
586 | # CONFIG_NET_POLL_CONTROLLER is not set | 674 | # CONFIG_NET_POLL_CONTROLLER is not set |
675 | # CONFIG_VMXNET3 is not set | ||
587 | # CONFIG_ISDN is not set | 676 | # CONFIG_ISDN is not set |
588 | # CONFIG_PHONE is not set | 677 | # CONFIG_PHONE is not set |
589 | 678 | ||
@@ -629,6 +718,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
629 | # CONFIG_SERIAL_JSM is not set | 718 | # CONFIG_SERIAL_JSM is not set |
630 | CONFIG_SERIAL_OF_PLATFORM=y | 719 | CONFIG_SERIAL_OF_PLATFORM=y |
631 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 720 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
721 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
632 | CONFIG_UNIX98_PTYS=y | 722 | CONFIG_UNIX98_PTYS=y |
633 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 723 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
634 | CONFIG_LEGACY_PTYS=y | 724 | CONFIG_LEGACY_PTYS=y |
@@ -645,6 +735,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
645 | CONFIG_DEVPORT=y | 735 | CONFIG_DEVPORT=y |
646 | # CONFIG_I2C is not set | 736 | # CONFIG_I2C is not set |
647 | # CONFIG_SPI is not set | 737 | # CONFIG_SPI is not set |
738 | |||
739 | # | ||
740 | # PPS support | ||
741 | # | ||
742 | # CONFIG_PPS is not set | ||
648 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 743 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
649 | # CONFIG_GPIOLIB is not set | 744 | # CONFIG_GPIOLIB is not set |
650 | # CONFIG_W1 is not set | 745 | # CONFIG_W1 is not set |
@@ -667,27 +762,13 @@ CONFIG_SSB_POSSIBLE=y | |||
667 | # CONFIG_HTC_PASIC3 is not set | 762 | # CONFIG_HTC_PASIC3 is not set |
668 | # CONFIG_MFD_TMIO is not set | 763 | # CONFIG_MFD_TMIO is not set |
669 | # CONFIG_REGULATOR is not set | 764 | # CONFIG_REGULATOR is not set |
670 | 765 | # CONFIG_MEDIA_SUPPORT is not set | |
671 | # | ||
672 | # Multimedia devices | ||
673 | # | ||
674 | |||
675 | # | ||
676 | # Multimedia core support | ||
677 | # | ||
678 | # CONFIG_VIDEO_DEV is not set | ||
679 | # CONFIG_DVB_CORE is not set | ||
680 | # CONFIG_VIDEO_MEDIA is not set | ||
681 | |||
682 | # | ||
683 | # Multimedia drivers | ||
684 | # | ||
685 | CONFIG_DAB=y | ||
686 | 766 | ||
687 | # | 767 | # |
688 | # Graphics support | 768 | # Graphics support |
689 | # | 769 | # |
690 | # CONFIG_AGP is not set | 770 | # CONFIG_AGP is not set |
771 | CONFIG_VGA_ARB=y | ||
691 | # CONFIG_DRM is not set | 772 | # CONFIG_DRM is not set |
692 | # CONFIG_VGASTATE is not set | 773 | # CONFIG_VGASTATE is not set |
693 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 774 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -712,7 +793,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
712 | # | 793 | # |
713 | 794 | ||
714 | # | 795 | # |
715 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 796 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
716 | # | 797 | # |
717 | # CONFIG_USB_GADGET is not set | 798 | # CONFIG_USB_GADGET is not set |
718 | 799 | ||
@@ -728,7 +809,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
728 | # CONFIG_EDAC is not set | 809 | # CONFIG_EDAC is not set |
729 | # CONFIG_RTC_CLASS is not set | 810 | # CONFIG_RTC_CLASS is not set |
730 | # CONFIG_DMADEVICES is not set | 811 | # CONFIG_DMADEVICES is not set |
812 | # CONFIG_AUXDISPLAY is not set | ||
731 | # CONFIG_UIO is not set | 813 | # CONFIG_UIO is not set |
814 | |||
815 | # | ||
816 | # TI VLYNQ | ||
817 | # | ||
732 | # CONFIG_STAGING is not set | 818 | # CONFIG_STAGING is not set |
733 | 819 | ||
734 | # | 820 | # |
@@ -739,14 +825,17 @@ CONFIG_EXT2_FS=y | |||
739 | # CONFIG_EXT2_FS_XIP is not set | 825 | # CONFIG_EXT2_FS_XIP is not set |
740 | # CONFIG_EXT3_FS is not set | 826 | # CONFIG_EXT3_FS is not set |
741 | # CONFIG_EXT4_FS is not set | 827 | # CONFIG_EXT4_FS is not set |
828 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
742 | # CONFIG_REISERFS_FS is not set | 829 | # CONFIG_REISERFS_FS is not set |
743 | # CONFIG_JFS_FS is not set | 830 | # CONFIG_JFS_FS is not set |
744 | # CONFIG_FS_POSIX_ACL is not set | 831 | # CONFIG_FS_POSIX_ACL is not set |
745 | CONFIG_FILE_LOCKING=y | ||
746 | # CONFIG_XFS_FS is not set | 832 | # CONFIG_XFS_FS is not set |
747 | # CONFIG_GFS2_FS is not set | 833 | # CONFIG_GFS2_FS is not set |
748 | # CONFIG_OCFS2_FS is not set | 834 | # CONFIG_OCFS2_FS is not set |
749 | # CONFIG_BTRFS_FS is not set | 835 | # CONFIG_BTRFS_FS is not set |
836 | # CONFIG_NILFS2_FS is not set | ||
837 | CONFIG_FILE_LOCKING=y | ||
838 | CONFIG_FSNOTIFY=y | ||
750 | CONFIG_DNOTIFY=y | 839 | CONFIG_DNOTIFY=y |
751 | CONFIG_INOTIFY=y | 840 | CONFIG_INOTIFY=y |
752 | CONFIG_INOTIFY_USER=y | 841 | CONFIG_INOTIFY_USER=y |
@@ -756,6 +845,11 @@ CONFIG_INOTIFY_USER=y | |||
756 | # CONFIG_FUSE_FS is not set | 845 | # CONFIG_FUSE_FS is not set |
757 | 846 | ||
758 | # | 847 | # |
848 | # Caches | ||
849 | # | ||
850 | # CONFIG_FSCACHE is not set | ||
851 | |||
852 | # | ||
759 | # CD-ROM/DVD Filesystems | 853 | # CD-ROM/DVD Filesystems |
760 | # | 854 | # |
761 | # CONFIG_ISO9660_FS is not set | 855 | # CONFIG_ISO9660_FS is not set |
@@ -820,7 +914,6 @@ CONFIG_LOCKD=y | |||
820 | CONFIG_LOCKD_V4=y | 914 | CONFIG_LOCKD_V4=y |
821 | CONFIG_NFS_COMMON=y | 915 | CONFIG_NFS_COMMON=y |
822 | CONFIG_SUNRPC=y | 916 | CONFIG_SUNRPC=y |
823 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
824 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 917 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
825 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 918 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
826 | # CONFIG_SMB_FS is not set | 919 | # CONFIG_SMB_FS is not set |
@@ -836,6 +929,7 @@ CONFIG_SUNRPC=y | |||
836 | CONFIG_MSDOS_PARTITION=y | 929 | CONFIG_MSDOS_PARTITION=y |
837 | # CONFIG_NLS is not set | 930 | # CONFIG_NLS is not set |
838 | # CONFIG_DLM is not set | 931 | # CONFIG_DLM is not set |
932 | # CONFIG_BINARY_PRINTF is not set | ||
839 | 933 | ||
840 | # | 934 | # |
841 | # Library routines | 935 | # Library routines |
@@ -851,11 +945,13 @@ CONFIG_CRC32=y | |||
851 | # CONFIG_LIBCRC32C is not set | 945 | # CONFIG_LIBCRC32C is not set |
852 | CONFIG_ZLIB_INFLATE=y | 946 | CONFIG_ZLIB_INFLATE=y |
853 | CONFIG_ZLIB_DEFLATE=y | 947 | CONFIG_ZLIB_DEFLATE=y |
854 | CONFIG_PLIST=y | 948 | CONFIG_DECOMPRESS_GZIP=y |
855 | CONFIG_HAS_IOMEM=y | 949 | CONFIG_HAS_IOMEM=y |
856 | CONFIG_HAS_IOPORT=y | 950 | CONFIG_HAS_IOPORT=y |
857 | CONFIG_HAS_DMA=y | 951 | CONFIG_HAS_DMA=y |
858 | CONFIG_HAVE_LMB=y | 952 | CONFIG_HAVE_LMB=y |
953 | CONFIG_NLATTR=y | ||
954 | CONFIG_GENERIC_ATOMIC64=y | ||
859 | 955 | ||
860 | # | 956 | # |
861 | # Kernel hacking | 957 | # Kernel hacking |
@@ -865,6 +961,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
865 | CONFIG_ENABLE_MUST_CHECK=y | 961 | CONFIG_ENABLE_MUST_CHECK=y |
866 | CONFIG_FRAME_WARN=1024 | 962 | CONFIG_FRAME_WARN=1024 |
867 | CONFIG_MAGIC_SYSRQ=y | 963 | CONFIG_MAGIC_SYSRQ=y |
964 | # CONFIG_STRIP_ASM_SYMS is not set | ||
868 | # CONFIG_UNUSED_SYMBOLS is not set | 965 | # CONFIG_UNUSED_SYMBOLS is not set |
869 | CONFIG_DEBUG_FS=y | 966 | CONFIG_DEBUG_FS=y |
870 | # CONFIG_HEADERS_CHECK is not set | 967 | # CONFIG_HEADERS_CHECK is not set |
@@ -873,16 +970,23 @@ CONFIG_DEBUG_KERNEL=y | |||
873 | CONFIG_DETECT_SOFTLOCKUP=y | 970 | CONFIG_DETECT_SOFTLOCKUP=y |
874 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 971 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
875 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 972 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
973 | CONFIG_DETECT_HUNG_TASK=y | ||
974 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
975 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
876 | CONFIG_SCHED_DEBUG=y | 976 | CONFIG_SCHED_DEBUG=y |
877 | # CONFIG_SCHEDSTATS is not set | 977 | # CONFIG_SCHEDSTATS is not set |
878 | # CONFIG_TIMER_STATS is not set | 978 | # CONFIG_TIMER_STATS is not set |
879 | # CONFIG_DEBUG_OBJECTS is not set | 979 | # CONFIG_DEBUG_OBJECTS is not set |
880 | # CONFIG_SLUB_DEBUG_ON is not set | 980 | # CONFIG_SLUB_DEBUG_ON is not set |
881 | # CONFIG_SLUB_STATS is not set | 981 | # CONFIG_SLUB_STATS is not set |
982 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
882 | # CONFIG_DEBUG_RT_MUTEXES is not set | 983 | # CONFIG_DEBUG_RT_MUTEXES is not set |
883 | # CONFIG_RT_MUTEX_TESTER is not set | 984 | # CONFIG_RT_MUTEX_TESTER is not set |
884 | # CONFIG_DEBUG_SPINLOCK is not set | 985 | # CONFIG_DEBUG_SPINLOCK is not set |
885 | # CONFIG_DEBUG_MUTEXES is not set | 986 | # CONFIG_DEBUG_MUTEXES is not set |
987 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
988 | # CONFIG_PROVE_LOCKING is not set | ||
989 | # CONFIG_LOCK_STAT is not set | ||
886 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 990 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
887 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 991 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
888 | # CONFIG_DEBUG_KOBJECT is not set | 992 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -894,35 +998,45 @@ CONFIG_SCHED_DEBUG=y | |||
894 | # CONFIG_DEBUG_LIST is not set | 998 | # CONFIG_DEBUG_LIST is not set |
895 | # CONFIG_DEBUG_SG is not set | 999 | # CONFIG_DEBUG_SG is not set |
896 | # CONFIG_DEBUG_NOTIFIERS is not set | 1000 | # CONFIG_DEBUG_NOTIFIERS is not set |
897 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1001 | # CONFIG_DEBUG_CREDENTIALS is not set |
898 | # CONFIG_RCU_TORTURE_TEST is not set | 1002 | # CONFIG_RCU_TORTURE_TEST is not set |
899 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1003 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
900 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1004 | # CONFIG_BACKTRACE_SELF_TEST is not set |
901 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1005 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1006 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
902 | # CONFIG_FAULT_INJECTION is not set | 1007 | # CONFIG_FAULT_INJECTION is not set |
903 | # CONFIG_LATENCYTOP is not set | 1008 | # CONFIG_LATENCYTOP is not set |
904 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1009 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1010 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
905 | CONFIG_HAVE_FUNCTION_TRACER=y | 1011 | CONFIG_HAVE_FUNCTION_TRACER=y |
1012 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
906 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1013 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
907 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1014 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
908 | 1015 | CONFIG_TRACING_SUPPORT=y | |
909 | # | 1016 | CONFIG_FTRACE=y |
910 | # Tracers | ||
911 | # | ||
912 | # CONFIG_FUNCTION_TRACER is not set | 1017 | # CONFIG_FUNCTION_TRACER is not set |
1018 | # CONFIG_IRQSOFF_TRACER is not set | ||
913 | # CONFIG_SCHED_TRACER is not set | 1019 | # CONFIG_SCHED_TRACER is not set |
914 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1020 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
915 | # CONFIG_BOOT_TRACER is not set | 1021 | # CONFIG_BOOT_TRACER is not set |
916 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1022 | CONFIG_BRANCH_PROFILE_NONE=y |
1023 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1024 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
917 | # CONFIG_STACK_TRACER is not set | 1025 | # CONFIG_STACK_TRACER is not set |
918 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1026 | # CONFIG_KMEMTRACE is not set |
1027 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1028 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1029 | # CONFIG_DYNAMIC_DEBUG is not set | ||
1030 | # CONFIG_DMA_API_DEBUG is not set | ||
919 | # CONFIG_SAMPLES is not set | 1031 | # CONFIG_SAMPLES is not set |
920 | CONFIG_HAVE_ARCH_KGDB=y | 1032 | CONFIG_HAVE_ARCH_KGDB=y |
921 | # CONFIG_KGDB is not set | 1033 | # CONFIG_KGDB is not set |
1034 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1035 | CONFIG_PPC_WERROR=y | ||
922 | CONFIG_PRINT_STACK_DEPTH=64 | 1036 | CONFIG_PRINT_STACK_DEPTH=64 |
923 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1037 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
924 | # CONFIG_DEBUG_STACK_USAGE is not set | 1038 | # CONFIG_DEBUG_STACK_USAGE is not set |
925 | # CONFIG_DEBUG_PAGEALLOC is not set | 1039 | # CONFIG_PPC_EMULATED_STATS is not set |
926 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1040 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
927 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1041 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
928 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1042 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -942,6 +1056,7 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
942 | CONFIG_PPC_EARLY_DEBUG_44x=y | 1056 | CONFIG_PPC_EARLY_DEBUG_44x=y |
943 | # CONFIG_PPC_EARLY_DEBUG_40x is not set | 1057 | # CONFIG_PPC_EARLY_DEBUG_40x is not set |
944 | # CONFIG_PPC_EARLY_DEBUG_CPM is not set | 1058 | # CONFIG_PPC_EARLY_DEBUG_CPM is not set |
1059 | # CONFIG_PPC_EARLY_DEBUG_USBGECKO is not set | ||
945 | CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 | 1060 | CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 |
946 | CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1 | 1061 | CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1 |
947 | 1062 | ||
@@ -951,13 +1066,16 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1 | |||
951 | # CONFIG_KEYS is not set | 1066 | # CONFIG_KEYS is not set |
952 | # CONFIG_SECURITY is not set | 1067 | # CONFIG_SECURITY is not set |
953 | # CONFIG_SECURITYFS is not set | 1068 | # CONFIG_SECURITYFS is not set |
954 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1069 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1070 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1071 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1072 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1073 | CONFIG_DEFAULT_SECURITY="" | ||
955 | CONFIG_CRYPTO=y | 1074 | CONFIG_CRYPTO=y |
956 | 1075 | ||
957 | # | 1076 | # |
958 | # Crypto core or helper | 1077 | # Crypto core or helper |
959 | # | 1078 | # |
960 | # CONFIG_CRYPTO_FIPS is not set | ||
961 | CONFIG_CRYPTO_ALGAPI=y | 1079 | CONFIG_CRYPTO_ALGAPI=y |
962 | CONFIG_CRYPTO_ALGAPI2=y | 1080 | CONFIG_CRYPTO_ALGAPI2=y |
963 | CONFIG_CRYPTO_AEAD2=y | 1081 | CONFIG_CRYPTO_AEAD2=y |
@@ -966,10 +1084,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
966 | CONFIG_CRYPTO_HASH=y | 1084 | CONFIG_CRYPTO_HASH=y |
967 | CONFIG_CRYPTO_HASH2=y | 1085 | CONFIG_CRYPTO_HASH2=y |
968 | CONFIG_CRYPTO_RNG2=y | 1086 | CONFIG_CRYPTO_RNG2=y |
1087 | CONFIG_CRYPTO_PCOMP=y | ||
969 | CONFIG_CRYPTO_MANAGER=y | 1088 | CONFIG_CRYPTO_MANAGER=y |
970 | CONFIG_CRYPTO_MANAGER2=y | 1089 | CONFIG_CRYPTO_MANAGER2=y |
971 | # CONFIG_CRYPTO_GF128MUL is not set | 1090 | # CONFIG_CRYPTO_GF128MUL is not set |
972 | # CONFIG_CRYPTO_NULL is not set | 1091 | # CONFIG_CRYPTO_NULL is not set |
1092 | CONFIG_CRYPTO_WORKQUEUE=y | ||
973 | # CONFIG_CRYPTO_CRYPTD is not set | 1093 | # CONFIG_CRYPTO_CRYPTD is not set |
974 | # CONFIG_CRYPTO_AUTHENC is not set | 1094 | # CONFIG_CRYPTO_AUTHENC is not set |
975 | # CONFIG_CRYPTO_TEST is not set | 1095 | # CONFIG_CRYPTO_TEST is not set |
@@ -997,11 +1117,13 @@ CONFIG_CRYPTO_PCBC=y | |||
997 | # | 1117 | # |
998 | # CONFIG_CRYPTO_HMAC is not set | 1118 | # CONFIG_CRYPTO_HMAC is not set |
999 | # CONFIG_CRYPTO_XCBC is not set | 1119 | # CONFIG_CRYPTO_XCBC is not set |
1120 | # CONFIG_CRYPTO_VMAC is not set | ||
1000 | 1121 | ||
1001 | # | 1122 | # |
1002 | # Digest | 1123 | # Digest |
1003 | # | 1124 | # |
1004 | # CONFIG_CRYPTO_CRC32C is not set | 1125 | # CONFIG_CRYPTO_CRC32C is not set |
1126 | # CONFIG_CRYPTO_GHASH is not set | ||
1005 | # CONFIG_CRYPTO_MD4 is not set | 1127 | # CONFIG_CRYPTO_MD4 is not set |
1006 | CONFIG_CRYPTO_MD5=y | 1128 | CONFIG_CRYPTO_MD5=y |
1007 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1129 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1038,6 +1160,7 @@ CONFIG_CRYPTO_DES=y | |||
1038 | # Compression | 1160 | # Compression |
1039 | # | 1161 | # |
1040 | # CONFIG_CRYPTO_DEFLATE is not set | 1162 | # CONFIG_CRYPTO_DEFLATE is not set |
1163 | # CONFIG_CRYPTO_ZLIB is not set | ||
1041 | # CONFIG_CRYPTO_LZO is not set | 1164 | # CONFIG_CRYPTO_LZO is not set |
1042 | 1165 | ||
1043 | # | 1166 | # |
@@ -1046,5 +1169,6 @@ CONFIG_CRYPTO_DES=y | |||
1046 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1169 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
1047 | CONFIG_CRYPTO_HW=y | 1170 | CONFIG_CRYPTO_HW=y |
1048 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1171 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1172 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
1049 | # CONFIG_PPC_CLOCK is not set | 1173 | # CONFIG_PPC_CLOCK is not set |
1050 | # CONFIG_VIRTUALIZATION is not set | 1174 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/redwood_defconfig b/arch/powerpc/configs/44x/redwood_defconfig index ed31d4f17b5a..a67ec91a28c3 100644 --- a/arch/powerpc/configs/44x/redwood_defconfig +++ b/arch/powerpc/configs/44x/redwood_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc3 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Wed Feb 4 14:31:09 2009 | 4 | # Mon Jan 4 15:05:05 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -20,6 +20,7 @@ CONFIG_BOOKE=y | |||
20 | CONFIG_PTE_64BIT=y | 20 | CONFIG_PTE_64BIT=y |
21 | CONFIG_PHYS_64BIT=y | 21 | CONFIG_PHYS_64BIT=y |
22 | CONFIG_PPC_MMU_NOHASH=y | 22 | CONFIG_PPC_MMU_NOHASH=y |
23 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 25 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
@@ -31,15 +32,18 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
36 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -53,11 +57,15 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
56 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
62 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
57 | CONFIG_PPC_DCR_NATIVE=y | 63 | CONFIG_PPC_DCR_NATIVE=y |
58 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
59 | CONFIG_PPC_DCR=y | 65 | CONFIG_PPC_DCR=y |
66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
61 | 69 | ||
62 | # | 70 | # |
63 | # General setup | 71 | # General setup |
@@ -71,6 +79,7 @@ CONFIG_SWAP=y | |||
71 | CONFIG_SYSVIPC=y | 79 | CONFIG_SYSVIPC=y |
72 | CONFIG_SYSVIPC_SYSCTL=y | 80 | CONFIG_SYSVIPC_SYSCTL=y |
73 | CONFIG_POSIX_MQUEUE=y | 81 | CONFIG_POSIX_MQUEUE=y |
82 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
74 | # CONFIG_BSD_PROCESS_ACCT is not set | 83 | # CONFIG_BSD_PROCESS_ACCT is not set |
75 | # CONFIG_TASKSTATS is not set | 84 | # CONFIG_TASKSTATS is not set |
76 | # CONFIG_AUDIT is not set | 85 | # CONFIG_AUDIT is not set |
@@ -78,11 +87,13 @@ CONFIG_POSIX_MQUEUE=y | |||
78 | # | 87 | # |
79 | # RCU Subsystem | 88 | # RCU Subsystem |
80 | # | 89 | # |
81 | CONFIG_CLASSIC_RCU=y | 90 | CONFIG_TREE_RCU=y |
82 | # CONFIG_TREE_RCU is not set | 91 | # CONFIG_TREE_PREEMPT_RCU is not set |
83 | # CONFIG_PREEMPT_RCU is not set | 92 | # CONFIG_TINY_RCU is not set |
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
84 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
85 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
86 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
87 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
88 | # CONFIG_GROUP_SCHED is not set | 99 | # CONFIG_GROUP_SCHED is not set |
@@ -93,8 +104,12 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
93 | # CONFIG_NAMESPACES is not set | 104 | # CONFIG_NAMESPACES is not set |
94 | CONFIG_BLK_DEV_INITRD=y | 105 | CONFIG_BLK_DEV_INITRD=y |
95 | CONFIG_INITRAMFS_SOURCE="" | 106 | CONFIG_INITRAMFS_SOURCE="" |
107 | CONFIG_RD_GZIP=y | ||
108 | # CONFIG_RD_BZIP2 is not set | ||
109 | # CONFIG_RD_LZMA is not set | ||
96 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 110 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
97 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
112 | CONFIG_ANON_INODES=y | ||
98 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
99 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
100 | CONFIG_KALLSYMS=y | 115 | CONFIG_KALLSYMS=y |
@@ -104,19 +119,25 @@ CONFIG_HOTPLUG=y | |||
104 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
105 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
106 | CONFIG_ELF_CORE=y | 121 | CONFIG_ELF_CORE=y |
107 | CONFIG_COMPAT_BRK=y | ||
108 | CONFIG_BASE_FULL=y | 122 | CONFIG_BASE_FULL=y |
109 | CONFIG_FUTEX=y | 123 | CONFIG_FUTEX=y |
110 | CONFIG_ANON_INODES=y | ||
111 | CONFIG_EPOLL=y | 124 | CONFIG_EPOLL=y |
112 | CONFIG_SIGNALFD=y | 125 | CONFIG_SIGNALFD=y |
113 | CONFIG_TIMERFD=y | 126 | CONFIG_TIMERFD=y |
114 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
115 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
116 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_EVENTS=y | ||
131 | |||
132 | # | ||
133 | # Kernel Performance Events And Counters | ||
134 | # | ||
135 | # CONFIG_PERF_EVENTS is not set | ||
136 | # CONFIG_PERF_COUNTERS is not set | ||
117 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
118 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
119 | CONFIG_SLUB_DEBUG=y | 139 | CONFIG_SLUB_DEBUG=y |
140 | CONFIG_COMPAT_BRK=y | ||
120 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
121 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
122 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
@@ -128,6 +149,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
128 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
129 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
130 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | CONFIG_HAVE_DMA_ATTRS=y | ||
153 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
154 | |||
155 | # | ||
156 | # GCOV-based kernel profiling | ||
157 | # | ||
158 | # CONFIG_GCOV_KERNEL is not set | ||
159 | # CONFIG_SLOW_WORK is not set | ||
131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 160 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
132 | CONFIG_SLABINFO=y | 161 | CONFIG_SLABINFO=y |
133 | CONFIG_RT_MUTEXES=y | 162 | CONFIG_RT_MUTEXES=y |
@@ -139,8 +168,7 @@ CONFIG_MODULE_UNLOAD=y | |||
139 | # CONFIG_MODVERSIONS is not set | 168 | # CONFIG_MODVERSIONS is not set |
140 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 169 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
141 | CONFIG_BLOCK=y | 170 | CONFIG_BLOCK=y |
142 | CONFIG_LBD=y | 171 | CONFIG_LBDAF=y |
143 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
144 | # CONFIG_BLK_DEV_BSG is not set | 172 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | 173 | # CONFIG_BLK_DEV_INTEGRITY is not set |
146 | 174 | ||
@@ -148,14 +176,41 @@ CONFIG_LBD=y | |||
148 | # IO Schedulers | 176 | # IO Schedulers |
149 | # | 177 | # |
150 | CONFIG_IOSCHED_NOOP=y | 178 | CONFIG_IOSCHED_NOOP=y |
151 | CONFIG_IOSCHED_AS=y | ||
152 | CONFIG_IOSCHED_DEADLINE=y | 179 | CONFIG_IOSCHED_DEADLINE=y |
153 | CONFIG_IOSCHED_CFQ=y | 180 | CONFIG_IOSCHED_CFQ=y |
154 | CONFIG_DEFAULT_AS=y | ||
155 | # CONFIG_DEFAULT_DEADLINE is not set | 181 | # CONFIG_DEFAULT_DEADLINE is not set |
156 | # CONFIG_DEFAULT_CFQ is not set | 182 | CONFIG_DEFAULT_CFQ=y |
157 | # CONFIG_DEFAULT_NOOP is not set | 183 | # CONFIG_DEFAULT_NOOP is not set |
158 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 184 | CONFIG_DEFAULT_IOSCHED="cfq" |
185 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
186 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
187 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
188 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
189 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
190 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
191 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
192 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
193 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
194 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
195 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
196 | # CONFIG_INLINE_READ_LOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
200 | CONFIG_INLINE_READ_UNLOCK=y | ||
201 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
202 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
203 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
204 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
205 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
209 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
210 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
211 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
212 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
213 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
159 | # CONFIG_FREEZER is not set | 214 | # CONFIG_FREEZER is not set |
160 | CONFIG_PPC4xx_PCI_EXPRESS=y | 215 | CONFIG_PPC4xx_PCI_EXPRESS=y |
161 | 216 | ||
@@ -177,6 +232,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y | |||
177 | # CONFIG_CANYONLANDS is not set | 232 | # CONFIG_CANYONLANDS is not set |
178 | # CONFIG_GLACIER is not set | 233 | # CONFIG_GLACIER is not set |
179 | CONFIG_REDWOOD=y | 234 | CONFIG_REDWOOD=y |
235 | # CONFIG_EIGER is not set | ||
180 | # CONFIG_YOSEMITE is not set | 236 | # CONFIG_YOSEMITE is not set |
181 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 237 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
182 | CONFIG_PPC44x_SIMPLE=y | 238 | CONFIG_PPC44x_SIMPLE=y |
@@ -219,10 +275,12 @@ CONFIG_BINFMT_ELF=y | |||
219 | # CONFIG_BINFMT_MISC is not set | 275 | # CONFIG_BINFMT_MISC is not set |
220 | # CONFIG_MATH_EMULATION is not set | 276 | # CONFIG_MATH_EMULATION is not set |
221 | # CONFIG_IOMMU_HELPER is not set | 277 | # CONFIG_IOMMU_HELPER is not set |
222 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 278 | # CONFIG_SWIOTLB is not set |
223 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 279 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
224 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 280 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
225 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 281 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
282 | CONFIG_SPARSE_IRQ=y | ||
283 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
226 | CONFIG_ARCH_FLATMEM_ENABLE=y | 284 | CONFIG_ARCH_FLATMEM_ENABLE=y |
227 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 285 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
228 | CONFIG_SELECT_MEMORY_MODEL=y | 286 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -238,10 +296,13 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
238 | CONFIG_ZONE_DMA_FLAG=1 | 296 | CONFIG_ZONE_DMA_FLAG=1 |
239 | CONFIG_BOUNCE=y | 297 | CONFIG_BOUNCE=y |
240 | CONFIG_VIRT_TO_BUS=y | 298 | CONFIG_VIRT_TO_BUS=y |
241 | CONFIG_UNEVICTABLE_LRU=y | 299 | # CONFIG_KSM is not set |
300 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
301 | CONFIG_STDBINUTILS=y | ||
242 | CONFIG_PPC_4K_PAGES=y | 302 | CONFIG_PPC_4K_PAGES=y |
243 | # CONFIG_PPC_16K_PAGES is not set | 303 | # CONFIG_PPC_16K_PAGES is not set |
244 | # CONFIG_PPC_64K_PAGES is not set | 304 | # CONFIG_PPC_64K_PAGES is not set |
305 | # CONFIG_PPC_256K_PAGES is not set | ||
245 | CONFIG_FORCE_MAX_ZONEORDER=11 | 306 | CONFIG_FORCE_MAX_ZONEORDER=11 |
246 | CONFIG_PROC_DEVICETREE=y | 307 | CONFIG_PROC_DEVICETREE=y |
247 | CONFIG_CMDLINE_BOOL=y | 308 | CONFIG_CMDLINE_BOOL=y |
@@ -262,12 +323,15 @@ CONFIG_PCI_DOMAINS=y | |||
262 | CONFIG_PCI_SYSCALL=y | 323 | CONFIG_PCI_SYSCALL=y |
263 | CONFIG_PCIEPORTBUS=y | 324 | CONFIG_PCIEPORTBUS=y |
264 | CONFIG_PCIEAER=y | 325 | CONFIG_PCIEAER=y |
326 | # CONFIG_PCIE_ECRC is not set | ||
327 | # CONFIG_PCIEAER_INJECT is not set | ||
265 | # CONFIG_PCIEASPM is not set | 328 | # CONFIG_PCIEASPM is not set |
266 | CONFIG_ARCH_SUPPORTS_MSI=y | 329 | CONFIG_ARCH_SUPPORTS_MSI=y |
267 | # CONFIG_PCI_MSI is not set | 330 | # CONFIG_PCI_MSI is not set |
268 | # CONFIG_PCI_LEGACY is not set | 331 | # CONFIG_PCI_LEGACY is not set |
269 | # CONFIG_PCI_DEBUG is not set | 332 | # CONFIG_PCI_DEBUG is not set |
270 | # CONFIG_PCI_STUB is not set | 333 | # CONFIG_PCI_STUB is not set |
334 | # CONFIG_PCI_IOV is not set | ||
271 | # CONFIG_PCCARD is not set | 335 | # CONFIG_PCCARD is not set |
272 | # CONFIG_HOTPLUG_PCI is not set | 336 | # CONFIG_HOTPLUG_PCI is not set |
273 | # CONFIG_HAS_RAPIDIO is not set | 337 | # CONFIG_HAS_RAPIDIO is not set |
@@ -285,14 +349,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
285 | CONFIG_KERNEL_START=0xc0000000 | 349 | CONFIG_KERNEL_START=0xc0000000 |
286 | CONFIG_PHYSICAL_START=0x00000000 | 350 | CONFIG_PHYSICAL_START=0x00000000 |
287 | CONFIG_TASK_SIZE=0xc0000000 | 351 | CONFIG_TASK_SIZE=0xc0000000 |
288 | CONFIG_CONSISTENT_START=0xff100000 | ||
289 | CONFIG_CONSISTENT_SIZE=0x00200000 | 352 | CONFIG_CONSISTENT_SIZE=0x00200000 |
290 | CONFIG_NET=y | 353 | CONFIG_NET=y |
291 | 354 | ||
292 | # | 355 | # |
293 | # Networking options | 356 | # Networking options |
294 | # | 357 | # |
295 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
296 | CONFIG_PACKET=y | 358 | CONFIG_PACKET=y |
297 | # CONFIG_PACKET_MMAP is not set | 359 | # CONFIG_PACKET_MMAP is not set |
298 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
@@ -329,6 +391,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
329 | # CONFIG_NETFILTER is not set | 391 | # CONFIG_NETFILTER is not set |
330 | # CONFIG_IP_DCCP is not set | 392 | # CONFIG_IP_DCCP is not set |
331 | # CONFIG_IP_SCTP is not set | 393 | # CONFIG_IP_SCTP is not set |
394 | # CONFIG_RDS is not set | ||
332 | # CONFIG_TIPC is not set | 395 | # CONFIG_TIPC is not set |
333 | # CONFIG_ATM is not set | 396 | # CONFIG_ATM is not set |
334 | # CONFIG_BRIDGE is not set | 397 | # CONFIG_BRIDGE is not set |
@@ -342,6 +405,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
342 | # CONFIG_LAPB is not set | 405 | # CONFIG_LAPB is not set |
343 | # CONFIG_ECONET is not set | 406 | # CONFIG_ECONET is not set |
344 | # CONFIG_WAN_ROUTER is not set | 407 | # CONFIG_WAN_ROUTER is not set |
408 | # CONFIG_PHONET is not set | ||
409 | # CONFIG_IEEE802154 is not set | ||
345 | # CONFIG_NET_SCHED is not set | 410 | # CONFIG_NET_SCHED is not set |
346 | # CONFIG_DCB is not set | 411 | # CONFIG_DCB is not set |
347 | 412 | ||
@@ -354,13 +419,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
354 | # CONFIG_IRDA is not set | 419 | # CONFIG_IRDA is not set |
355 | # CONFIG_BT is not set | 420 | # CONFIG_BT is not set |
356 | # CONFIG_AF_RXRPC is not set | 421 | # CONFIG_AF_RXRPC is not set |
357 | # CONFIG_PHONET is not set | ||
358 | CONFIG_WIRELESS=y | 422 | CONFIG_WIRELESS=y |
359 | # CONFIG_CFG80211 is not set | 423 | # CONFIG_CFG80211 is not set |
360 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
361 | # CONFIG_WIRELESS_EXT is not set | ||
362 | # CONFIG_LIB80211 is not set | 424 | # CONFIG_LIB80211 is not set |
363 | # CONFIG_MAC80211 is not set | 425 | |
426 | # | ||
427 | # CFG80211 needs to be enabled for MAC80211 | ||
428 | # | ||
364 | # CONFIG_WIMAX is not set | 429 | # CONFIG_WIMAX is not set |
365 | # CONFIG_RFKILL is not set | 430 | # CONFIG_RFKILL is not set |
366 | # CONFIG_NET_9P is not set | 431 | # CONFIG_NET_9P is not set |
@@ -373,6 +438,7 @@ CONFIG_WIRELESS_OLD_REGULATORY=y | |||
373 | # Generic Driver Options | 438 | # Generic Driver Options |
374 | # | 439 | # |
375 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 440 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
441 | # CONFIG_DEVTMPFS is not set | ||
376 | CONFIG_STANDALONE=y | 442 | CONFIG_STANDALONE=y |
377 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 443 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
378 | CONFIG_FW_LOADER=y | 444 | CONFIG_FW_LOADER=y |
@@ -385,9 +451,9 @@ CONFIG_CONNECTOR=y | |||
385 | CONFIG_PROC_EVENTS=y | 451 | CONFIG_PROC_EVENTS=y |
386 | CONFIG_MTD=y | 452 | CONFIG_MTD=y |
387 | # CONFIG_MTD_DEBUG is not set | 453 | # CONFIG_MTD_DEBUG is not set |
454 | # CONFIG_MTD_TESTS is not set | ||
388 | CONFIG_MTD_CONCAT=y | 455 | CONFIG_MTD_CONCAT=y |
389 | CONFIG_MTD_PARTITIONS=y | 456 | CONFIG_MTD_PARTITIONS=y |
390 | # CONFIG_MTD_TESTS is not set | ||
391 | # CONFIG_MTD_REDBOOT_PARTS is not set | 457 | # CONFIG_MTD_REDBOOT_PARTS is not set |
392 | CONFIG_MTD_CMDLINE_PARTS=y | 458 | CONFIG_MTD_CMDLINE_PARTS=y |
393 | CONFIG_MTD_OF_PARTS=y | 459 | CONFIG_MTD_OF_PARTS=y |
@@ -462,7 +528,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
462 | # LPDDR flash memory drivers | 528 | # LPDDR flash memory drivers |
463 | # | 529 | # |
464 | # CONFIG_MTD_LPDDR is not set | 530 | # CONFIG_MTD_LPDDR is not set |
465 | # CONFIG_MTD_QINFO_PROBE is not set | ||
466 | 531 | ||
467 | # | 532 | # |
468 | # UBI - Unsorted block images | 533 | # UBI - Unsorted block images |
@@ -479,6 +544,7 @@ CONFIG_BLK_DEV=y | |||
479 | # CONFIG_BLK_DEV_UMEM is not set | 544 | # CONFIG_BLK_DEV_UMEM is not set |
480 | # CONFIG_BLK_DEV_COW_COMMON is not set | 545 | # CONFIG_BLK_DEV_COW_COMMON is not set |
481 | # CONFIG_BLK_DEV_LOOP is not set | 546 | # CONFIG_BLK_DEV_LOOP is not set |
547 | # CONFIG_BLK_DEV_DRBD is not set | ||
482 | # CONFIG_BLK_DEV_NBD is not set | 548 | # CONFIG_BLK_DEV_NBD is not set |
483 | # CONFIG_BLK_DEV_SX8 is not set | 549 | # CONFIG_BLK_DEV_SX8 is not set |
484 | CONFIG_BLK_DEV_RAM=y | 550 | CONFIG_BLK_DEV_RAM=y |
@@ -512,10 +578,6 @@ CONFIG_BLK_DEV_SD=y | |||
512 | # CONFIG_BLK_DEV_SR is not set | 578 | # CONFIG_BLK_DEV_SR is not set |
513 | CONFIG_CHR_DEV_SG=y | 579 | CONFIG_CHR_DEV_SG=y |
514 | # CONFIG_CHR_DEV_SCH is not set | 580 | # CONFIG_CHR_DEV_SCH is not set |
515 | |||
516 | # | ||
517 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
518 | # | ||
519 | # CONFIG_SCSI_MULTI_LUN is not set | 581 | # CONFIG_SCSI_MULTI_LUN is not set |
520 | # CONFIG_SCSI_CONSTANTS is not set | 582 | # CONFIG_SCSI_CONSTANTS is not set |
521 | # CONFIG_SCSI_LOGGING is not set | 583 | # CONFIG_SCSI_LOGGING is not set |
@@ -533,23 +595,30 @@ CONFIG_SCSI_SAS_ATTRS=y | |||
533 | # CONFIG_SCSI_SRP_ATTRS is not set | 595 | # CONFIG_SCSI_SRP_ATTRS is not set |
534 | CONFIG_SCSI_LOWLEVEL=y | 596 | CONFIG_SCSI_LOWLEVEL=y |
535 | # CONFIG_ISCSI_TCP is not set | 597 | # CONFIG_ISCSI_TCP is not set |
598 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
599 | # CONFIG_BE2ISCSI is not set | ||
536 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 600 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
601 | # CONFIG_SCSI_HPSA is not set | ||
537 | # CONFIG_SCSI_3W_9XXX is not set | 602 | # CONFIG_SCSI_3W_9XXX is not set |
603 | # CONFIG_SCSI_3W_SAS is not set | ||
538 | # CONFIG_SCSI_ACARD is not set | 604 | # CONFIG_SCSI_ACARD is not set |
539 | # CONFIG_SCSI_AACRAID is not set | 605 | # CONFIG_SCSI_AACRAID is not set |
540 | # CONFIG_SCSI_AIC7XXX is not set | 606 | # CONFIG_SCSI_AIC7XXX is not set |
541 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 607 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
542 | # CONFIG_SCSI_AIC79XX is not set | 608 | # CONFIG_SCSI_AIC79XX is not set |
543 | # CONFIG_SCSI_AIC94XX is not set | 609 | # CONFIG_SCSI_AIC94XX is not set |
610 | # CONFIG_SCSI_MVSAS is not set | ||
544 | # CONFIG_SCSI_DPT_I2O is not set | 611 | # CONFIG_SCSI_DPT_I2O is not set |
545 | # CONFIG_SCSI_ADVANSYS is not set | 612 | # CONFIG_SCSI_ADVANSYS is not set |
546 | # CONFIG_SCSI_ARCMSR is not set | 613 | # CONFIG_SCSI_ARCMSR is not set |
547 | # CONFIG_MEGARAID_NEWGEN is not set | 614 | # CONFIG_MEGARAID_NEWGEN is not set |
548 | # CONFIG_MEGARAID_LEGACY is not set | 615 | # CONFIG_MEGARAID_LEGACY is not set |
549 | # CONFIG_MEGARAID_SAS is not set | 616 | # CONFIG_MEGARAID_SAS is not set |
617 | # CONFIG_SCSI_MPT2SAS is not set | ||
550 | # CONFIG_SCSI_HPTIOP is not set | 618 | # CONFIG_SCSI_HPTIOP is not set |
551 | # CONFIG_SCSI_BUSLOGIC is not set | 619 | # CONFIG_SCSI_BUSLOGIC is not set |
552 | # CONFIG_LIBFC is not set | 620 | # CONFIG_LIBFC is not set |
621 | # CONFIG_LIBFCOE is not set | ||
553 | # CONFIG_FCOE is not set | 622 | # CONFIG_FCOE is not set |
554 | # CONFIG_SCSI_DMX3191D is not set | 623 | # CONFIG_SCSI_DMX3191D is not set |
555 | # CONFIG_SCSI_EATA is not set | 624 | # CONFIG_SCSI_EATA is not set |
@@ -558,7 +627,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
558 | # CONFIG_SCSI_IPS is not set | 627 | # CONFIG_SCSI_IPS is not set |
559 | # CONFIG_SCSI_INITIO is not set | 628 | # CONFIG_SCSI_INITIO is not set |
560 | # CONFIG_SCSI_INIA100 is not set | 629 | # CONFIG_SCSI_INIA100 is not set |
561 | # CONFIG_SCSI_MVSAS is not set | ||
562 | # CONFIG_SCSI_STEX is not set | 630 | # CONFIG_SCSI_STEX is not set |
563 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 631 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
564 | # CONFIG_SCSI_QLOGIC_1280 is not set | 632 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -569,8 +637,12 @@ CONFIG_SCSI_LOWLEVEL=y | |||
569 | # CONFIG_SCSI_DC390T is not set | 637 | # CONFIG_SCSI_DC390T is not set |
570 | # CONFIG_SCSI_NSP32 is not set | 638 | # CONFIG_SCSI_NSP32 is not set |
571 | # CONFIG_SCSI_DEBUG is not set | 639 | # CONFIG_SCSI_DEBUG is not set |
640 | # CONFIG_SCSI_PMCRAID is not set | ||
641 | # CONFIG_SCSI_PM8001 is not set | ||
572 | # CONFIG_SCSI_SRP is not set | 642 | # CONFIG_SCSI_SRP is not set |
643 | # CONFIG_SCSI_BFA_FC is not set | ||
573 | # CONFIG_SCSI_DH is not set | 644 | # CONFIG_SCSI_DH is not set |
645 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
574 | # CONFIG_ATA is not set | 646 | # CONFIG_ATA is not set |
575 | # CONFIG_MD is not set | 647 | # CONFIG_MD is not set |
576 | CONFIG_FUSION=y | 648 | CONFIG_FUSION=y |
@@ -586,7 +658,11 @@ CONFIG_FUSION_MAX_SGE=128 | |||
586 | # | 658 | # |
587 | 659 | ||
588 | # | 660 | # |
589 | # Enable only one of the two stacks, unless you know what you are doing | 661 | # You can enable one or both FireWire driver stacks. |
662 | # | ||
663 | |||
664 | # | ||
665 | # See the help texts for more information. | ||
590 | # | 666 | # |
591 | # CONFIG_FIREWIRE is not set | 667 | # CONFIG_FIREWIRE is not set |
592 | # CONFIG_IEEE1394 is not set | 668 | # CONFIG_IEEE1394 is not set |
@@ -614,6 +690,8 @@ CONFIG_NET_ETHERNET=y | |||
614 | # CONFIG_SUNGEM is not set | 690 | # CONFIG_SUNGEM is not set |
615 | # CONFIG_CASSINI is not set | 691 | # CONFIG_CASSINI is not set |
616 | # CONFIG_NET_VENDOR_3COM is not set | 692 | # CONFIG_NET_VENDOR_3COM is not set |
693 | # CONFIG_ETHOC is not set | ||
694 | # CONFIG_DNET is not set | ||
617 | # CONFIG_NET_TULIP is not set | 695 | # CONFIG_NET_TULIP is not set |
618 | # CONFIG_HP100 is not set | 696 | # CONFIG_HP100 is not set |
619 | CONFIG_IBM_NEW_EMAC=y | 697 | CONFIG_IBM_NEW_EMAC=y |
@@ -632,7 +710,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
632 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 710 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
633 | # CONFIG_NET_PCI is not set | 711 | # CONFIG_NET_PCI is not set |
634 | # CONFIG_B44 is not set | 712 | # CONFIG_B44 is not set |
713 | # CONFIG_KS8842 is not set | ||
714 | # CONFIG_KS8851_MLL is not set | ||
635 | # CONFIG_ATL2 is not set | 715 | # CONFIG_ATL2 is not set |
716 | # CONFIG_XILINX_EMACLITE is not set | ||
636 | CONFIG_NETDEV_1000=y | 717 | CONFIG_NETDEV_1000=y |
637 | # CONFIG_ACENIC is not set | 718 | # CONFIG_ACENIC is not set |
638 | # CONFIG_DL2K is not set | 719 | # CONFIG_DL2K is not set |
@@ -640,6 +721,7 @@ CONFIG_NETDEV_1000=y | |||
640 | CONFIG_E1000E=y | 721 | CONFIG_E1000E=y |
641 | # CONFIG_IP1000 is not set | 722 | # CONFIG_IP1000 is not set |
642 | # CONFIG_IGB is not set | 723 | # CONFIG_IGB is not set |
724 | # CONFIG_IGBVF is not set | ||
643 | # CONFIG_NS83820 is not set | 725 | # CONFIG_NS83820 is not set |
644 | # CONFIG_HAMACHI is not set | 726 | # CONFIG_HAMACHI is not set |
645 | # CONFIG_YELLOWFIN is not set | 727 | # CONFIG_YELLOWFIN is not set |
@@ -650,19 +732,21 @@ CONFIG_E1000E=y | |||
650 | # CONFIG_VIA_VELOCITY is not set | 732 | # CONFIG_VIA_VELOCITY is not set |
651 | # CONFIG_TIGON3 is not set | 733 | # CONFIG_TIGON3 is not set |
652 | # CONFIG_BNX2 is not set | 734 | # CONFIG_BNX2 is not set |
735 | # CONFIG_CNIC is not set | ||
736 | # CONFIG_MV643XX_ETH is not set | ||
737 | # CONFIG_XILINX_LL_TEMAC is not set | ||
653 | # CONFIG_QLA3XXX is not set | 738 | # CONFIG_QLA3XXX is not set |
654 | # CONFIG_ATL1 is not set | 739 | # CONFIG_ATL1 is not set |
655 | # CONFIG_ATL1E is not set | 740 | # CONFIG_ATL1E is not set |
741 | # CONFIG_ATL1C is not set | ||
656 | # CONFIG_JME is not set | 742 | # CONFIG_JME is not set |
657 | # CONFIG_NETDEV_10000 is not set | 743 | # CONFIG_NETDEV_10000 is not set |
658 | # CONFIG_TR is not set | 744 | # CONFIG_TR is not set |
659 | 745 | CONFIG_WLAN=y | |
660 | # | 746 | # CONFIG_AIRO is not set |
661 | # Wireless LAN | 747 | # CONFIG_ATMEL is not set |
662 | # | 748 | # CONFIG_PRISM54 is not set |
663 | # CONFIG_WLAN_PRE80211 is not set | 749 | # CONFIG_HOSTAP is not set |
664 | # CONFIG_WLAN_80211 is not set | ||
665 | # CONFIG_IWLWIFI_LEDS is not set | ||
666 | 750 | ||
667 | # | 751 | # |
668 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 752 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -676,6 +760,7 @@ CONFIG_E1000E=y | |||
676 | # CONFIG_NETCONSOLE is not set | 760 | # CONFIG_NETCONSOLE is not set |
677 | # CONFIG_NETPOLL is not set | 761 | # CONFIG_NETPOLL is not set |
678 | # CONFIG_NET_POLL_CONTROLLER is not set | 762 | # CONFIG_NET_POLL_CONTROLLER is not set |
763 | # CONFIG_VMXNET3 is not set | ||
679 | # CONFIG_ISDN is not set | 764 | # CONFIG_ISDN is not set |
680 | # CONFIG_PHONE is not set | 765 | # CONFIG_PHONE is not set |
681 | 766 | ||
@@ -721,6 +806,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
721 | # CONFIG_SERIAL_JSM is not set | 806 | # CONFIG_SERIAL_JSM is not set |
722 | CONFIG_SERIAL_OF_PLATFORM=y | 807 | CONFIG_SERIAL_OF_PLATFORM=y |
723 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 808 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
809 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
724 | CONFIG_UNIX98_PTYS=y | 810 | CONFIG_UNIX98_PTYS=y |
725 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 811 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
726 | CONFIG_LEGACY_PTYS=y | 812 | CONFIG_LEGACY_PTYS=y |
@@ -737,6 +823,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
737 | CONFIG_DEVPORT=y | 823 | CONFIG_DEVPORT=y |
738 | CONFIG_I2C=y | 824 | CONFIG_I2C=y |
739 | CONFIG_I2C_BOARDINFO=y | 825 | CONFIG_I2C_BOARDINFO=y |
826 | CONFIG_I2C_COMPAT=y | ||
740 | CONFIG_I2C_CHARDEV=y | 827 | CONFIG_I2C_CHARDEV=y |
741 | CONFIG_I2C_HELPER_AUTO=y | 828 | CONFIG_I2C_HELPER_AUTO=y |
742 | 829 | ||
@@ -777,11 +864,6 @@ CONFIG_I2C_IBM_IIC=y | |||
777 | # CONFIG_I2C_TAOS_EVM is not set | 864 | # CONFIG_I2C_TAOS_EVM is not set |
778 | 865 | ||
779 | # | 866 | # |
780 | # Graphics adapter I2C/DDC channel drivers | ||
781 | # | ||
782 | # CONFIG_I2C_VOODOO3 is not set | ||
783 | |||
784 | # | ||
785 | # Other I2C/SMBus bus drivers | 867 | # Other I2C/SMBus bus drivers |
786 | # | 868 | # |
787 | # CONFIG_I2C_PCA_PLATFORM is not set | 869 | # CONFIG_I2C_PCA_PLATFORM is not set |
@@ -790,25 +872,23 @@ CONFIG_I2C_IBM_IIC=y | |||
790 | # | 872 | # |
791 | # Miscellaneous I2C Chip support | 873 | # Miscellaneous I2C Chip support |
792 | # | 874 | # |
793 | # CONFIG_DS1682 is not set | ||
794 | # CONFIG_SENSORS_PCF8574 is not set | ||
795 | # CONFIG_PCF8575 is not set | ||
796 | # CONFIG_SENSORS_PCA9539 is not set | ||
797 | # CONFIG_SENSORS_PCF8591 is not set | ||
798 | # CONFIG_SENSORS_MAX6875 is not set | ||
799 | # CONFIG_SENSORS_TSL2550 is not set | 875 | # CONFIG_SENSORS_TSL2550 is not set |
800 | CONFIG_I2C_DEBUG_CORE=y | 876 | CONFIG_I2C_DEBUG_CORE=y |
801 | CONFIG_I2C_DEBUG_ALGO=y | 877 | CONFIG_I2C_DEBUG_ALGO=y |
802 | CONFIG_I2C_DEBUG_BUS=y | 878 | CONFIG_I2C_DEBUG_BUS=y |
803 | CONFIG_I2C_DEBUG_CHIP=y | 879 | CONFIG_I2C_DEBUG_CHIP=y |
804 | # CONFIG_SPI is not set | 880 | # CONFIG_SPI is not set |
881 | |||
882 | # | ||
883 | # PPS support | ||
884 | # | ||
885 | # CONFIG_PPS is not set | ||
805 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 886 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
806 | # CONFIG_GPIOLIB is not set | 887 | # CONFIG_GPIOLIB is not set |
807 | # CONFIG_W1 is not set | 888 | # CONFIG_W1 is not set |
808 | # CONFIG_POWER_SUPPLY is not set | 889 | # CONFIG_POWER_SUPPLY is not set |
809 | # CONFIG_HWMON is not set | 890 | # CONFIG_HWMON is not set |
810 | # CONFIG_THERMAL is not set | 891 | # CONFIG_THERMAL is not set |
811 | # CONFIG_THERMAL_HWMON is not set | ||
812 | # CONFIG_WATCHDOG is not set | 892 | # CONFIG_WATCHDOG is not set |
813 | CONFIG_SSB_POSSIBLE=y | 893 | CONFIG_SSB_POSSIBLE=y |
814 | 894 | ||
@@ -826,31 +906,21 @@ CONFIG_SSB_POSSIBLE=y | |||
826 | # CONFIG_TWL4030_CORE is not set | 906 | # CONFIG_TWL4030_CORE is not set |
827 | # CONFIG_MFD_TMIO is not set | 907 | # CONFIG_MFD_TMIO is not set |
828 | # CONFIG_PMIC_DA903X is not set | 908 | # CONFIG_PMIC_DA903X is not set |
909 | # CONFIG_PMIC_ADP5520 is not set | ||
829 | # CONFIG_MFD_WM8400 is not set | 910 | # CONFIG_MFD_WM8400 is not set |
911 | # CONFIG_MFD_WM831X is not set | ||
830 | # CONFIG_MFD_WM8350_I2C is not set | 912 | # CONFIG_MFD_WM8350_I2C is not set |
831 | # CONFIG_MFD_PCF50633 is not set | 913 | # CONFIG_MFD_PCF50633 is not set |
914 | # CONFIG_AB3100_CORE is not set | ||
915 | # CONFIG_MFD_88PM8607 is not set | ||
832 | # CONFIG_REGULATOR is not set | 916 | # CONFIG_REGULATOR is not set |
833 | 917 | # CONFIG_MEDIA_SUPPORT is not set | |
834 | # | ||
835 | # Multimedia devices | ||
836 | # | ||
837 | |||
838 | # | ||
839 | # Multimedia core support | ||
840 | # | ||
841 | # CONFIG_VIDEO_DEV is not set | ||
842 | # CONFIG_DVB_CORE is not set | ||
843 | # CONFIG_VIDEO_MEDIA is not set | ||
844 | |||
845 | # | ||
846 | # Multimedia drivers | ||
847 | # | ||
848 | CONFIG_DAB=y | ||
849 | 918 | ||
850 | # | 919 | # |
851 | # Graphics support | 920 | # Graphics support |
852 | # | 921 | # |
853 | # CONFIG_AGP is not set | 922 | # CONFIG_AGP is not set |
923 | CONFIG_VGA_ARB=y | ||
854 | # CONFIG_DRM is not set | 924 | # CONFIG_DRM is not set |
855 | # CONFIG_VGASTATE is not set | 925 | # CONFIG_VGASTATE is not set |
856 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 926 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -876,7 +946,12 @@ CONFIG_DMADEVICES=y | |||
876 | # | 946 | # |
877 | # DMA Devices | 947 | # DMA Devices |
878 | # | 948 | # |
949 | # CONFIG_AUXDISPLAY is not set | ||
879 | # CONFIG_UIO is not set | 950 | # CONFIG_UIO is not set |
951 | |||
952 | # | ||
953 | # TI VLYNQ | ||
954 | # | ||
880 | # CONFIG_STAGING is not set | 955 | # CONFIG_STAGING is not set |
881 | 956 | ||
882 | # | 957 | # |
@@ -887,14 +962,17 @@ CONFIG_EXT2_FS=y | |||
887 | # CONFIG_EXT2_FS_XIP is not set | 962 | # CONFIG_EXT2_FS_XIP is not set |
888 | # CONFIG_EXT3_FS is not set | 963 | # CONFIG_EXT3_FS is not set |
889 | # CONFIG_EXT4_FS is not set | 964 | # CONFIG_EXT4_FS is not set |
965 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
890 | # CONFIG_REISERFS_FS is not set | 966 | # CONFIG_REISERFS_FS is not set |
891 | # CONFIG_JFS_FS is not set | 967 | # CONFIG_JFS_FS is not set |
892 | # CONFIG_FS_POSIX_ACL is not set | 968 | # CONFIG_FS_POSIX_ACL is not set |
893 | CONFIG_FILE_LOCKING=y | ||
894 | # CONFIG_XFS_FS is not set | 969 | # CONFIG_XFS_FS is not set |
895 | # CONFIG_GFS2_FS is not set | 970 | # CONFIG_GFS2_FS is not set |
896 | # CONFIG_OCFS2_FS is not set | 971 | # CONFIG_OCFS2_FS is not set |
897 | # CONFIG_BTRFS_FS is not set | 972 | # CONFIG_BTRFS_FS is not set |
973 | # CONFIG_NILFS2_FS is not set | ||
974 | CONFIG_FILE_LOCKING=y | ||
975 | CONFIG_FSNOTIFY=y | ||
898 | CONFIG_DNOTIFY=y | 976 | CONFIG_DNOTIFY=y |
899 | CONFIG_INOTIFY=y | 977 | CONFIG_INOTIFY=y |
900 | CONFIG_INOTIFY_USER=y | 978 | CONFIG_INOTIFY_USER=y |
@@ -904,6 +982,11 @@ CONFIG_INOTIFY_USER=y | |||
904 | # CONFIG_FUSE_FS is not set | 982 | # CONFIG_FUSE_FS is not set |
905 | 983 | ||
906 | # | 984 | # |
985 | # Caches | ||
986 | # | ||
987 | # CONFIG_FSCACHE is not set | ||
988 | |||
989 | # | ||
907 | # CD-ROM/DVD Filesystems | 990 | # CD-ROM/DVD Filesystems |
908 | # | 991 | # |
909 | # CONFIG_ISO9660_FS is not set | 992 | # CONFIG_ISO9660_FS is not set |
@@ -958,7 +1041,6 @@ CONFIG_LOCKD=y | |||
958 | CONFIG_LOCKD_V4=y | 1041 | CONFIG_LOCKD_V4=y |
959 | CONFIG_NFS_COMMON=y | 1042 | CONFIG_NFS_COMMON=y |
960 | CONFIG_SUNRPC=y | 1043 | CONFIG_SUNRPC=y |
961 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
962 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1044 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
963 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1045 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
964 | # CONFIG_SMB_FS is not set | 1046 | # CONFIG_SMB_FS is not set |
@@ -974,6 +1056,7 @@ CONFIG_SUNRPC=y | |||
974 | CONFIG_MSDOS_PARTITION=y | 1056 | CONFIG_MSDOS_PARTITION=y |
975 | # CONFIG_NLS is not set | 1057 | # CONFIG_NLS is not set |
976 | # CONFIG_DLM is not set | 1058 | # CONFIG_DLM is not set |
1059 | # CONFIG_BINARY_PRINTF is not set | ||
977 | 1060 | ||
978 | # | 1061 | # |
979 | # Library routines | 1062 | # Library routines |
@@ -988,11 +1071,13 @@ CONFIG_CRC32=y | |||
988 | # CONFIG_CRC7 is not set | 1071 | # CONFIG_CRC7 is not set |
989 | # CONFIG_LIBCRC32C is not set | 1072 | # CONFIG_LIBCRC32C is not set |
990 | CONFIG_ZLIB_INFLATE=y | 1073 | CONFIG_ZLIB_INFLATE=y |
991 | CONFIG_PLIST=y | 1074 | CONFIG_DECOMPRESS_GZIP=y |
992 | CONFIG_HAS_IOMEM=y | 1075 | CONFIG_HAS_IOMEM=y |
993 | CONFIG_HAS_IOPORT=y | 1076 | CONFIG_HAS_IOPORT=y |
994 | CONFIG_HAS_DMA=y | 1077 | CONFIG_HAS_DMA=y |
995 | CONFIG_HAVE_LMB=y | 1078 | CONFIG_HAVE_LMB=y |
1079 | CONFIG_NLATTR=y | ||
1080 | CONFIG_GENERIC_ATOMIC64=y | ||
996 | 1081 | ||
997 | # | 1082 | # |
998 | # Kernel hacking | 1083 | # Kernel hacking |
@@ -1002,6 +1087,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
1002 | CONFIG_ENABLE_MUST_CHECK=y | 1087 | CONFIG_ENABLE_MUST_CHECK=y |
1003 | CONFIG_FRAME_WARN=1024 | 1088 | CONFIG_FRAME_WARN=1024 |
1004 | CONFIG_MAGIC_SYSRQ=y | 1089 | CONFIG_MAGIC_SYSRQ=y |
1090 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1005 | # CONFIG_UNUSED_SYMBOLS is not set | 1091 | # CONFIG_UNUSED_SYMBOLS is not set |
1006 | CONFIG_DEBUG_FS=y | 1092 | CONFIG_DEBUG_FS=y |
1007 | # CONFIG_HEADERS_CHECK is not set | 1093 | # CONFIG_HEADERS_CHECK is not set |
@@ -1010,16 +1096,23 @@ CONFIG_DEBUG_KERNEL=y | |||
1010 | CONFIG_DETECT_SOFTLOCKUP=y | 1096 | CONFIG_DETECT_SOFTLOCKUP=y |
1011 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1097 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
1012 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1098 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
1099 | CONFIG_DETECT_HUNG_TASK=y | ||
1100 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
1101 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
1013 | CONFIG_SCHED_DEBUG=y | 1102 | CONFIG_SCHED_DEBUG=y |
1014 | # CONFIG_SCHEDSTATS is not set | 1103 | # CONFIG_SCHEDSTATS is not set |
1015 | # CONFIG_TIMER_STATS is not set | 1104 | # CONFIG_TIMER_STATS is not set |
1016 | # CONFIG_DEBUG_OBJECTS is not set | 1105 | # CONFIG_DEBUG_OBJECTS is not set |
1017 | # CONFIG_SLUB_DEBUG_ON is not set | 1106 | # CONFIG_SLUB_DEBUG_ON is not set |
1018 | # CONFIG_SLUB_STATS is not set | 1107 | # CONFIG_SLUB_STATS is not set |
1108 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
1019 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1109 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1020 | # CONFIG_RT_MUTEX_TESTER is not set | 1110 | # CONFIG_RT_MUTEX_TESTER is not set |
1021 | # CONFIG_DEBUG_SPINLOCK is not set | 1111 | # CONFIG_DEBUG_SPINLOCK is not set |
1022 | # CONFIG_DEBUG_MUTEXES is not set | 1112 | # CONFIG_DEBUG_MUTEXES is not set |
1113 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1114 | # CONFIG_PROVE_LOCKING is not set | ||
1115 | # CONFIG_LOCK_STAT is not set | ||
1023 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1116 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1024 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1117 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1025 | # CONFIG_DEBUG_KOBJECT is not set | 1118 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1031,35 +1124,45 @@ CONFIG_SCHED_DEBUG=y | |||
1031 | # CONFIG_DEBUG_LIST is not set | 1124 | # CONFIG_DEBUG_LIST is not set |
1032 | # CONFIG_DEBUG_SG is not set | 1125 | # CONFIG_DEBUG_SG is not set |
1033 | # CONFIG_DEBUG_NOTIFIERS is not set | 1126 | # CONFIG_DEBUG_NOTIFIERS is not set |
1034 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1127 | # CONFIG_DEBUG_CREDENTIALS is not set |
1035 | # CONFIG_RCU_TORTURE_TEST is not set | 1128 | # CONFIG_RCU_TORTURE_TEST is not set |
1036 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1129 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1037 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1130 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1038 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1131 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1132 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1039 | # CONFIG_FAULT_INJECTION is not set | 1133 | # CONFIG_FAULT_INJECTION is not set |
1040 | # CONFIG_LATENCYTOP is not set | 1134 | # CONFIG_LATENCYTOP is not set |
1041 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1135 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1136 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
1042 | CONFIG_HAVE_FUNCTION_TRACER=y | 1137 | CONFIG_HAVE_FUNCTION_TRACER=y |
1138 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
1043 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1139 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1044 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1140 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1045 | 1141 | CONFIG_TRACING_SUPPORT=y | |
1046 | # | 1142 | CONFIG_FTRACE=y |
1047 | # Tracers | ||
1048 | # | ||
1049 | # CONFIG_FUNCTION_TRACER is not set | 1143 | # CONFIG_FUNCTION_TRACER is not set |
1144 | # CONFIG_IRQSOFF_TRACER is not set | ||
1050 | # CONFIG_SCHED_TRACER is not set | 1145 | # CONFIG_SCHED_TRACER is not set |
1051 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1146 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1052 | # CONFIG_BOOT_TRACER is not set | 1147 | # CONFIG_BOOT_TRACER is not set |
1053 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1148 | CONFIG_BRANCH_PROFILE_NONE=y |
1149 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1150 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1054 | # CONFIG_STACK_TRACER is not set | 1151 | # CONFIG_STACK_TRACER is not set |
1055 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1152 | # CONFIG_KMEMTRACE is not set |
1153 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1154 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1155 | # CONFIG_DYNAMIC_DEBUG is not set | ||
1156 | # CONFIG_DMA_API_DEBUG is not set | ||
1056 | # CONFIG_SAMPLES is not set | 1157 | # CONFIG_SAMPLES is not set |
1057 | CONFIG_HAVE_ARCH_KGDB=y | 1158 | CONFIG_HAVE_ARCH_KGDB=y |
1058 | # CONFIG_KGDB is not set | 1159 | # CONFIG_KGDB is not set |
1160 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1161 | CONFIG_PPC_WERROR=y | ||
1059 | CONFIG_PRINT_STACK_DEPTH=64 | 1162 | CONFIG_PRINT_STACK_DEPTH=64 |
1060 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1163 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1061 | # CONFIG_DEBUG_STACK_USAGE is not set | 1164 | # CONFIG_DEBUG_STACK_USAGE is not set |
1062 | # CONFIG_DEBUG_PAGEALLOC is not set | 1165 | # CONFIG_PPC_EMULATED_STATS is not set |
1063 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1166 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1064 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1167 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1065 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1168 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -1075,13 +1178,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1075 | # CONFIG_KEYS is not set | 1178 | # CONFIG_KEYS is not set |
1076 | # CONFIG_SECURITY is not set | 1179 | # CONFIG_SECURITY is not set |
1077 | # CONFIG_SECURITYFS is not set | 1180 | # CONFIG_SECURITYFS is not set |
1078 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1181 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1182 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1183 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1184 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1185 | CONFIG_DEFAULT_SECURITY="" | ||
1079 | CONFIG_CRYPTO=y | 1186 | CONFIG_CRYPTO=y |
1080 | 1187 | ||
1081 | # | 1188 | # |
1082 | # Crypto core or helper | 1189 | # Crypto core or helper |
1083 | # | 1190 | # |
1084 | # CONFIG_CRYPTO_FIPS is not set | ||
1085 | CONFIG_CRYPTO_ALGAPI=y | 1191 | CONFIG_CRYPTO_ALGAPI=y |
1086 | CONFIG_CRYPTO_ALGAPI2=y | 1192 | CONFIG_CRYPTO_ALGAPI2=y |
1087 | CONFIG_CRYPTO_AEAD=y | 1193 | CONFIG_CRYPTO_AEAD=y |
@@ -1092,10 +1198,12 @@ CONFIG_CRYPTO_HASH=y | |||
1092 | CONFIG_CRYPTO_HASH2=y | 1198 | CONFIG_CRYPTO_HASH2=y |
1093 | CONFIG_CRYPTO_RNG=y | 1199 | CONFIG_CRYPTO_RNG=y |
1094 | CONFIG_CRYPTO_RNG2=y | 1200 | CONFIG_CRYPTO_RNG2=y |
1201 | CONFIG_CRYPTO_PCOMP=y | ||
1095 | CONFIG_CRYPTO_MANAGER=y | 1202 | CONFIG_CRYPTO_MANAGER=y |
1096 | CONFIG_CRYPTO_MANAGER2=y | 1203 | CONFIG_CRYPTO_MANAGER2=y |
1097 | CONFIG_CRYPTO_GF128MUL=y | 1204 | CONFIG_CRYPTO_GF128MUL=y |
1098 | # CONFIG_CRYPTO_NULL is not set | 1205 | # CONFIG_CRYPTO_NULL is not set |
1206 | CONFIG_CRYPTO_WORKQUEUE=y | ||
1099 | CONFIG_CRYPTO_CRYPTD=y | 1207 | CONFIG_CRYPTO_CRYPTD=y |
1100 | CONFIG_CRYPTO_AUTHENC=y | 1208 | CONFIG_CRYPTO_AUTHENC=y |
1101 | # CONFIG_CRYPTO_TEST is not set | 1209 | # CONFIG_CRYPTO_TEST is not set |
@@ -1123,11 +1231,13 @@ CONFIG_CRYPTO_XTS=y | |||
1123 | # | 1231 | # |
1124 | CONFIG_CRYPTO_HMAC=y | 1232 | CONFIG_CRYPTO_HMAC=y |
1125 | CONFIG_CRYPTO_XCBC=y | 1233 | CONFIG_CRYPTO_XCBC=y |
1234 | # CONFIG_CRYPTO_VMAC is not set | ||
1126 | 1235 | ||
1127 | # | 1236 | # |
1128 | # Digest | 1237 | # Digest |
1129 | # | 1238 | # |
1130 | # CONFIG_CRYPTO_CRC32C is not set | 1239 | # CONFIG_CRYPTO_CRC32C is not set |
1240 | CONFIG_CRYPTO_GHASH=y | ||
1131 | CONFIG_CRYPTO_MD4=y | 1241 | CONFIG_CRYPTO_MD4=y |
1132 | CONFIG_CRYPTO_MD5=y | 1242 | CONFIG_CRYPTO_MD5=y |
1133 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1243 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1164,6 +1274,7 @@ CONFIG_CRYPTO_DES=y | |||
1164 | # Compression | 1274 | # Compression |
1165 | # | 1275 | # |
1166 | # CONFIG_CRYPTO_DEFLATE is not set | 1276 | # CONFIG_CRYPTO_DEFLATE is not set |
1277 | # CONFIG_CRYPTO_ZLIB is not set | ||
1167 | # CONFIG_CRYPTO_LZO is not set | 1278 | # CONFIG_CRYPTO_LZO is not set |
1168 | 1279 | ||
1169 | # | 1280 | # |
@@ -1172,5 +1283,6 @@ CONFIG_CRYPTO_DES=y | |||
1172 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1283 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
1173 | CONFIG_CRYPTO_HW=y | 1284 | CONFIG_CRYPTO_HW=y |
1174 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1285 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1286 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
1175 | # CONFIG_PPC_CLOCK is not set | 1287 | # CONFIG_PPC_CLOCK is not set |
1176 | # CONFIG_VIRTUALIZATION is not set | 1288 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig index e14e89a5e06b..886cb6aa6432 100644 --- a/arch/powerpc/configs/44x/sam440ep_defconfig +++ b/arch/powerpc/configs/44x/sam440ep_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:22:42 2009 | 4 | # Mon Jan 4 15:11:24 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -20,6 +20,7 @@ CONFIG_BOOKE=y | |||
20 | CONFIG_PTE_64BIT=y | 20 | CONFIG_PTE_64BIT=y |
21 | CONFIG_PHYS_64BIT=y | 21 | CONFIG_PHYS_64BIT=y |
22 | CONFIG_PPC_MMU_NOHASH=y | 22 | CONFIG_PPC_MMU_NOHASH=y |
23 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 25 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
@@ -31,15 +32,18 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
36 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -53,11 +57,15 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
56 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
62 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
57 | CONFIG_PPC_DCR_NATIVE=y | 63 | CONFIG_PPC_DCR_NATIVE=y |
58 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
59 | CONFIG_PPC_DCR=y | 65 | CONFIG_PPC_DCR=y |
66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
61 | 69 | ||
62 | # | 70 | # |
63 | # General setup | 71 | # General setup |
@@ -71,9 +79,21 @@ CONFIG_SWAP=y | |||
71 | CONFIG_SYSVIPC=y | 79 | CONFIG_SYSVIPC=y |
72 | CONFIG_SYSVIPC_SYSCTL=y | 80 | CONFIG_SYSVIPC_SYSCTL=y |
73 | CONFIG_POSIX_MQUEUE=y | 81 | CONFIG_POSIX_MQUEUE=y |
82 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
74 | # CONFIG_BSD_PROCESS_ACCT is not set | 83 | # CONFIG_BSD_PROCESS_ACCT is not set |
75 | # CONFIG_TASKSTATS is not set | 84 | # CONFIG_TASKSTATS is not set |
76 | # CONFIG_AUDIT is not set | 85 | # CONFIG_AUDIT is not set |
86 | |||
87 | # | ||
88 | # RCU Subsystem | ||
89 | # | ||
90 | CONFIG_TREE_RCU=y | ||
91 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
92 | # CONFIG_TINY_RCU is not set | ||
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
96 | # CONFIG_TREE_RCU_TRACE is not set | ||
77 | CONFIG_IKCONFIG=y | 97 | CONFIG_IKCONFIG=y |
78 | # CONFIG_IKCONFIG_PROC is not set | 98 | # CONFIG_IKCONFIG_PROC is not set |
79 | CONFIG_LOG_BUF_SHIFT=14 | 99 | CONFIG_LOG_BUF_SHIFT=14 |
@@ -89,8 +109,12 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
89 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
90 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
91 | CONFIG_INITRAMFS_SOURCE="" | 111 | CONFIG_INITRAMFS_SOURCE="" |
112 | CONFIG_RD_GZIP=y | ||
113 | # CONFIG_RD_BZIP2 is not set | ||
114 | # CONFIG_RD_LZMA is not set | ||
92 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
93 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
117 | CONFIG_ANON_INODES=y | ||
94 | CONFIG_EMBEDDED=y | 118 | CONFIG_EMBEDDED=y |
95 | CONFIG_SYSCTL_SYSCALL=y | 119 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_KALLSYMS=y | 120 | CONFIG_KALLSYMS=y |
@@ -99,19 +123,25 @@ CONFIG_HOTPLUG=y | |||
99 | CONFIG_PRINTK=y | 123 | CONFIG_PRINTK=y |
100 | CONFIG_BUG=y | 124 | CONFIG_BUG=y |
101 | CONFIG_ELF_CORE=y | 125 | CONFIG_ELF_CORE=y |
102 | CONFIG_COMPAT_BRK=y | ||
103 | CONFIG_BASE_FULL=y | 126 | CONFIG_BASE_FULL=y |
104 | CONFIG_FUTEX=y | 127 | CONFIG_FUTEX=y |
105 | CONFIG_ANON_INODES=y | ||
106 | CONFIG_EPOLL=y | 128 | CONFIG_EPOLL=y |
107 | CONFIG_SIGNALFD=y | 129 | CONFIG_SIGNALFD=y |
108 | CONFIG_TIMERFD=y | 130 | CONFIG_TIMERFD=y |
109 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
110 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
111 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_EVENTS=y | ||
135 | |||
136 | # | ||
137 | # Kernel Performance Events And Counters | ||
138 | # | ||
139 | # CONFIG_PERF_EVENTS is not set | ||
140 | # CONFIG_PERF_COUNTERS is not set | ||
112 | CONFIG_VM_EVENT_COUNTERS=y | 141 | CONFIG_VM_EVENT_COUNTERS=y |
113 | CONFIG_PCI_QUIRKS=y | 142 | CONFIG_PCI_QUIRKS=y |
114 | CONFIG_SLUB_DEBUG=y | 143 | CONFIG_SLUB_DEBUG=y |
144 | CONFIG_COMPAT_BRK=y | ||
115 | # CONFIG_SLAB is not set | 145 | # CONFIG_SLAB is not set |
116 | CONFIG_SLUB=y | 146 | CONFIG_SLUB=y |
117 | # CONFIG_SLOB is not set | 147 | # CONFIG_SLOB is not set |
@@ -123,6 +153,13 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
123 | CONFIG_HAVE_KPROBES=y | 153 | CONFIG_HAVE_KPROBES=y |
124 | CONFIG_HAVE_KRETPROBES=y | 154 | CONFIG_HAVE_KRETPROBES=y |
125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 155 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
156 | CONFIG_HAVE_DMA_ATTRS=y | ||
157 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
158 | |||
159 | # | ||
160 | # GCOV-based kernel profiling | ||
161 | # | ||
162 | # CONFIG_SLOW_WORK is not set | ||
126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 163 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
127 | CONFIG_SLABINFO=y | 164 | CONFIG_SLABINFO=y |
128 | CONFIG_RT_MUTEXES=y | 165 | CONFIG_RT_MUTEXES=y |
@@ -134,8 +171,7 @@ CONFIG_MODULE_UNLOAD=y | |||
134 | # CONFIG_MODVERSIONS is not set | 171 | # CONFIG_MODVERSIONS is not set |
135 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 172 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
136 | CONFIG_BLOCK=y | 173 | CONFIG_BLOCK=y |
137 | # CONFIG_LBD is not set | 174 | CONFIG_LBDAF=y |
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
139 | # CONFIG_BLK_DEV_BSG is not set | 175 | # CONFIG_BLK_DEV_BSG is not set |
140 | # CONFIG_BLK_DEV_INTEGRITY is not set | 176 | # CONFIG_BLK_DEV_INTEGRITY is not set |
141 | 177 | ||
@@ -143,19 +179,41 @@ CONFIG_BLOCK=y | |||
143 | # IO Schedulers | 179 | # IO Schedulers |
144 | # | 180 | # |
145 | CONFIG_IOSCHED_NOOP=y | 181 | CONFIG_IOSCHED_NOOP=y |
146 | CONFIG_IOSCHED_AS=y | ||
147 | # CONFIG_IOSCHED_DEADLINE is not set | 182 | # CONFIG_IOSCHED_DEADLINE is not set |
148 | # CONFIG_IOSCHED_CFQ is not set | 183 | # CONFIG_IOSCHED_CFQ is not set |
149 | CONFIG_DEFAULT_AS=y | ||
150 | # CONFIG_DEFAULT_DEADLINE is not set | 184 | # CONFIG_DEFAULT_DEADLINE is not set |
151 | # CONFIG_DEFAULT_CFQ is not set | 185 | # CONFIG_DEFAULT_CFQ is not set |
152 | # CONFIG_DEFAULT_NOOP is not set | 186 | CONFIG_DEFAULT_NOOP=y |
153 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 187 | CONFIG_DEFAULT_IOSCHED="noop" |
154 | CONFIG_CLASSIC_RCU=y | 188 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
155 | # CONFIG_TREE_RCU is not set | 189 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
156 | # CONFIG_PREEMPT_RCU is not set | 190 | # CONFIG_INLINE_SPIN_LOCK is not set |
157 | # CONFIG_TREE_RCU_TRACE is not set | 191 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
158 | # CONFIG_PREEMPT_RCU_TRACE is not set | 192 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
193 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
194 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
195 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
196 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
197 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
198 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
199 | # CONFIG_INLINE_READ_LOCK is not set | ||
200 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
201 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
203 | CONFIG_INLINE_READ_UNLOCK=y | ||
204 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
205 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
206 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
207 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
212 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
213 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
214 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
215 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
216 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
159 | # CONFIG_FREEZER is not set | 217 | # CONFIG_FREEZER is not set |
160 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 218 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
161 | 219 | ||
@@ -176,6 +234,8 @@ CONFIG_SAM440EP=y | |||
176 | # CONFIG_ARCHES is not set | 234 | # CONFIG_ARCHES is not set |
177 | # CONFIG_CANYONLANDS is not set | 235 | # CONFIG_CANYONLANDS is not set |
178 | # CONFIG_GLACIER is not set | 236 | # CONFIG_GLACIER is not set |
237 | # CONFIG_REDWOOD is not set | ||
238 | # CONFIG_EIGER is not set | ||
179 | # CONFIG_YOSEMITE is not set | 239 | # CONFIG_YOSEMITE is not set |
180 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 240 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
181 | # CONFIG_PPC44x_SIMPLE is not set | 241 | # CONFIG_PPC44x_SIMPLE is not set |
@@ -218,10 +278,12 @@ CONFIG_BINFMT_ELF=y | |||
218 | # CONFIG_BINFMT_MISC is not set | 278 | # CONFIG_BINFMT_MISC is not set |
219 | # CONFIG_MATH_EMULATION is not set | 279 | # CONFIG_MATH_EMULATION is not set |
220 | # CONFIG_IOMMU_HELPER is not set | 280 | # CONFIG_IOMMU_HELPER is not set |
221 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 281 | # CONFIG_SWIOTLB is not set |
222 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 282 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
223 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 283 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
224 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 284 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
285 | CONFIG_SPARSE_IRQ=y | ||
286 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
225 | CONFIG_ARCH_FLATMEM_ENABLE=y | 287 | CONFIG_ARCH_FLATMEM_ENABLE=y |
226 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 288 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
227 | CONFIG_SELECT_MEMORY_MODEL=y | 289 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -237,10 +299,13 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
237 | CONFIG_ZONE_DMA_FLAG=1 | 299 | CONFIG_ZONE_DMA_FLAG=1 |
238 | CONFIG_BOUNCE=y | 300 | CONFIG_BOUNCE=y |
239 | CONFIG_VIRT_TO_BUS=y | 301 | CONFIG_VIRT_TO_BUS=y |
240 | CONFIG_UNEVICTABLE_LRU=y | 302 | # CONFIG_KSM is not set |
303 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
304 | CONFIG_STDBINUTILS=y | ||
241 | CONFIG_PPC_4K_PAGES=y | 305 | CONFIG_PPC_4K_PAGES=y |
242 | # CONFIG_PPC_16K_PAGES is not set | 306 | # CONFIG_PPC_16K_PAGES is not set |
243 | # CONFIG_PPC_64K_PAGES is not set | 307 | # CONFIG_PPC_64K_PAGES is not set |
308 | # CONFIG_PPC_256K_PAGES is not set | ||
244 | CONFIG_FORCE_MAX_ZONEORDER=11 | 309 | CONFIG_FORCE_MAX_ZONEORDER=11 |
245 | CONFIG_PROC_DEVICETREE=y | 310 | CONFIG_PROC_DEVICETREE=y |
246 | CONFIG_CMDLINE_BOOL=y | 311 | CONFIG_CMDLINE_BOOL=y |
@@ -264,6 +329,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
264 | # CONFIG_PCI_MSI is not set | 329 | # CONFIG_PCI_MSI is not set |
265 | # CONFIG_PCI_LEGACY is not set | 330 | # CONFIG_PCI_LEGACY is not set |
266 | # CONFIG_PCI_STUB is not set | 331 | # CONFIG_PCI_STUB is not set |
332 | # CONFIG_PCI_IOV is not set | ||
267 | # CONFIG_PCCARD is not set | 333 | # CONFIG_PCCARD is not set |
268 | # CONFIG_HOTPLUG_PCI is not set | 334 | # CONFIG_HOTPLUG_PCI is not set |
269 | # CONFIG_HAS_RAPIDIO is not set | 335 | # CONFIG_HAS_RAPIDIO is not set |
@@ -281,14 +347,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
281 | CONFIG_KERNEL_START=0xc0000000 | 347 | CONFIG_KERNEL_START=0xc0000000 |
282 | CONFIG_PHYSICAL_START=0x00000000 | 348 | CONFIG_PHYSICAL_START=0x00000000 |
283 | CONFIG_TASK_SIZE=0xc0000000 | 349 | CONFIG_TASK_SIZE=0xc0000000 |
284 | CONFIG_CONSISTENT_START=0xff100000 | ||
285 | CONFIG_CONSISTENT_SIZE=0x00200000 | 350 | CONFIG_CONSISTENT_SIZE=0x00200000 |
286 | CONFIG_NET=y | 351 | CONFIG_NET=y |
287 | 352 | ||
288 | # | 353 | # |
289 | # Networking options | 354 | # Networking options |
290 | # | 355 | # |
291 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
292 | CONFIG_PACKET=y | 356 | CONFIG_PACKET=y |
293 | # CONFIG_PACKET_MMAP is not set | 357 | # CONFIG_PACKET_MMAP is not set |
294 | CONFIG_UNIX=y | 358 | CONFIG_UNIX=y |
@@ -325,6 +389,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
325 | # CONFIG_NETFILTER is not set | 389 | # CONFIG_NETFILTER is not set |
326 | # CONFIG_IP_DCCP is not set | 390 | # CONFIG_IP_DCCP is not set |
327 | # CONFIG_IP_SCTP is not set | 391 | # CONFIG_IP_SCTP is not set |
392 | # CONFIG_RDS is not set | ||
328 | # CONFIG_TIPC is not set | 393 | # CONFIG_TIPC is not set |
329 | # CONFIG_ATM is not set | 394 | # CONFIG_ATM is not set |
330 | # CONFIG_BRIDGE is not set | 395 | # CONFIG_BRIDGE is not set |
@@ -338,6 +403,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
338 | # CONFIG_LAPB is not set | 403 | # CONFIG_LAPB is not set |
339 | # CONFIG_ECONET is not set | 404 | # CONFIG_ECONET is not set |
340 | # CONFIG_WAN_ROUTER is not set | 405 | # CONFIG_WAN_ROUTER is not set |
406 | # CONFIG_PHONET is not set | ||
407 | # CONFIG_IEEE802154 is not set | ||
341 | # CONFIG_NET_SCHED is not set | 408 | # CONFIG_NET_SCHED is not set |
342 | # CONFIG_DCB is not set | 409 | # CONFIG_DCB is not set |
343 | 410 | ||
@@ -350,8 +417,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
350 | # CONFIG_IRDA is not set | 417 | # CONFIG_IRDA is not set |
351 | # CONFIG_BT is not set | 418 | # CONFIG_BT is not set |
352 | # CONFIG_AF_RXRPC is not set | 419 | # CONFIG_AF_RXRPC is not set |
353 | # CONFIG_PHONET is not set | 420 | CONFIG_WIRELESS=y |
354 | # CONFIG_WIRELESS is not set | 421 | # CONFIG_CFG80211 is not set |
422 | # CONFIG_LIB80211 is not set | ||
423 | |||
424 | # | ||
425 | # CFG80211 needs to be enabled for MAC80211 | ||
426 | # | ||
355 | # CONFIG_WIMAX is not set | 427 | # CONFIG_WIMAX is not set |
356 | # CONFIG_RFKILL is not set | 428 | # CONFIG_RFKILL is not set |
357 | # CONFIG_NET_9P is not set | 429 | # CONFIG_NET_9P is not set |
@@ -364,6 +436,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
364 | # Generic Driver Options | 436 | # Generic Driver Options |
365 | # | 437 | # |
366 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 438 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
439 | # CONFIG_DEVTMPFS is not set | ||
367 | CONFIG_STANDALONE=y | 440 | CONFIG_STANDALONE=y |
368 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 441 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
369 | CONFIG_FW_LOADER=y | 442 | CONFIG_FW_LOADER=y |
@@ -385,6 +458,7 @@ CONFIG_BLK_DEV=y | |||
385 | # CONFIG_BLK_DEV_COW_COMMON is not set | 458 | # CONFIG_BLK_DEV_COW_COMMON is not set |
386 | CONFIG_BLK_DEV_LOOP=y | 459 | CONFIG_BLK_DEV_LOOP=y |
387 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 460 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
461 | # CONFIG_BLK_DEV_DRBD is not set | ||
388 | # CONFIG_BLK_DEV_NBD is not set | 462 | # CONFIG_BLK_DEV_NBD is not set |
389 | # CONFIG_BLK_DEV_SX8 is not set | 463 | # CONFIG_BLK_DEV_SX8 is not set |
390 | # CONFIG_BLK_DEV_UB is not set | 464 | # CONFIG_BLK_DEV_UB is not set |
@@ -420,10 +494,6 @@ CONFIG_BLK_DEV_SR=y | |||
420 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 494 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
421 | CONFIG_CHR_DEV_SG=y | 495 | CONFIG_CHR_DEV_SG=y |
422 | # CONFIG_CHR_DEV_SCH is not set | 496 | # CONFIG_CHR_DEV_SCH is not set |
423 | |||
424 | # | ||
425 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
426 | # | ||
427 | # CONFIG_SCSI_MULTI_LUN is not set | 497 | # CONFIG_SCSI_MULTI_LUN is not set |
428 | # CONFIG_SCSI_CONSTANTS is not set | 498 | # CONFIG_SCSI_CONSTANTS is not set |
429 | # CONFIG_SCSI_LOGGING is not set | 499 | # CONFIG_SCSI_LOGGING is not set |
@@ -440,8 +510,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
440 | # CONFIG_SCSI_SRP_ATTRS is not set | 510 | # CONFIG_SCSI_SRP_ATTRS is not set |
441 | # CONFIG_SCSI_LOWLEVEL is not set | 511 | # CONFIG_SCSI_LOWLEVEL is not set |
442 | # CONFIG_SCSI_DH is not set | 512 | # CONFIG_SCSI_DH is not set |
513 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
443 | CONFIG_ATA=y | 514 | CONFIG_ATA=y |
444 | # CONFIG_ATA_NONSTANDARD is not set | 515 | # CONFIG_ATA_NONSTANDARD is not set |
516 | CONFIG_ATA_VERBOSE_ERROR=y | ||
445 | # CONFIG_SATA_PMP is not set | 517 | # CONFIG_SATA_PMP is not set |
446 | # CONFIG_SATA_AHCI is not set | 518 | # CONFIG_SATA_AHCI is not set |
447 | # CONFIG_SATA_SIL24 is not set | 519 | # CONFIG_SATA_SIL24 is not set |
@@ -463,6 +535,7 @@ CONFIG_SATA_SIL=y | |||
463 | # CONFIG_PATA_ALI is not set | 535 | # CONFIG_PATA_ALI is not set |
464 | # CONFIG_PATA_AMD is not set | 536 | # CONFIG_PATA_AMD is not set |
465 | # CONFIG_PATA_ARTOP is not set | 537 | # CONFIG_PATA_ARTOP is not set |
538 | # CONFIG_PATA_ATP867X is not set | ||
466 | # CONFIG_PATA_ATIIXP is not set | 539 | # CONFIG_PATA_ATIIXP is not set |
467 | # CONFIG_PATA_CMD640_PCI is not set | 540 | # CONFIG_PATA_CMD640_PCI is not set |
468 | # CONFIG_PATA_CMD64X is not set | 541 | # CONFIG_PATA_CMD64X is not set |
@@ -488,14 +561,16 @@ CONFIG_SATA_SIL=y | |||
488 | # CONFIG_PATA_NS87415 is not set | 561 | # CONFIG_PATA_NS87415 is not set |
489 | # CONFIG_PATA_OPTI is not set | 562 | # CONFIG_PATA_OPTI is not set |
490 | # CONFIG_PATA_OPTIDMA is not set | 563 | # CONFIG_PATA_OPTIDMA is not set |
564 | # CONFIG_PATA_PDC2027X is not set | ||
491 | # CONFIG_PATA_PDC_OLD is not set | 565 | # CONFIG_PATA_PDC_OLD is not set |
492 | # CONFIG_PATA_RADISYS is not set | 566 | # CONFIG_PATA_RADISYS is not set |
567 | # CONFIG_PATA_RDC is not set | ||
493 | # CONFIG_PATA_RZ1000 is not set | 568 | # CONFIG_PATA_RZ1000 is not set |
494 | # CONFIG_PATA_SC1200 is not set | 569 | # CONFIG_PATA_SC1200 is not set |
495 | # CONFIG_PATA_SERVERWORKS is not set | 570 | # CONFIG_PATA_SERVERWORKS is not set |
496 | # CONFIG_PATA_PDC2027X is not set | ||
497 | # CONFIG_PATA_SIL680 is not set | 571 | # CONFIG_PATA_SIL680 is not set |
498 | # CONFIG_PATA_SIS is not set | 572 | # CONFIG_PATA_SIS is not set |
573 | # CONFIG_PATA_TOSHIBA is not set | ||
499 | # CONFIG_PATA_VIA is not set | 574 | # CONFIG_PATA_VIA is not set |
500 | # CONFIG_PATA_WINBOND is not set | 575 | # CONFIG_PATA_WINBOND is not set |
501 | # CONFIG_PATA_PLATFORM is not set | 576 | # CONFIG_PATA_PLATFORM is not set |
@@ -508,7 +583,11 @@ CONFIG_SATA_SIL=y | |||
508 | # | 583 | # |
509 | 584 | ||
510 | # | 585 | # |
511 | # Enable only one of the two stacks, unless you know what you are doing | 586 | # You can enable one or both FireWire driver stacks. |
587 | # | ||
588 | |||
589 | # | ||
590 | # See the help texts for more information. | ||
512 | # | 591 | # |
513 | # CONFIG_FIREWIRE is not set | 592 | # CONFIG_FIREWIRE is not set |
514 | # CONFIG_IEEE1394 is not set | 593 | # CONFIG_IEEE1394 is not set |
@@ -529,6 +608,8 @@ CONFIG_NET_ETHERNET=y | |||
529 | # CONFIG_SUNGEM is not set | 608 | # CONFIG_SUNGEM is not set |
530 | # CONFIG_CASSINI is not set | 609 | # CONFIG_CASSINI is not set |
531 | # CONFIG_NET_VENDOR_3COM is not set | 610 | # CONFIG_NET_VENDOR_3COM is not set |
611 | # CONFIG_ETHOC is not set | ||
612 | # CONFIG_DNET is not set | ||
532 | # CONFIG_NET_TULIP is not set | 613 | # CONFIG_NET_TULIP is not set |
533 | # CONFIG_HP100 is not set | 614 | # CONFIG_HP100 is not set |
534 | CONFIG_IBM_NEW_EMAC=y | 615 | CONFIG_IBM_NEW_EMAC=y |
@@ -547,17 +628,19 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
547 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 628 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
548 | # CONFIG_NET_PCI is not set | 629 | # CONFIG_NET_PCI is not set |
549 | # CONFIG_B44 is not set | 630 | # CONFIG_B44 is not set |
631 | # CONFIG_KS8842 is not set | ||
632 | # CONFIG_KS8851_MLL is not set | ||
550 | # CONFIG_ATL2 is not set | 633 | # CONFIG_ATL2 is not set |
634 | # CONFIG_XILINX_EMACLITE is not set | ||
551 | # CONFIG_NETDEV_1000 is not set | 635 | # CONFIG_NETDEV_1000 is not set |
552 | # CONFIG_NETDEV_10000 is not set | 636 | # CONFIG_NETDEV_10000 is not set |
553 | # CONFIG_TR is not set | 637 | # CONFIG_TR is not set |
554 | 638 | CONFIG_WLAN=y | |
555 | # | 639 | # CONFIG_AIRO is not set |
556 | # Wireless LAN | 640 | # CONFIG_ATMEL is not set |
557 | # | 641 | # CONFIG_PRISM54 is not set |
558 | # CONFIG_WLAN_PRE80211 is not set | 642 | # CONFIG_USB_ZD1201 is not set |
559 | # CONFIG_WLAN_80211 is not set | 643 | # CONFIG_HOSTAP is not set |
560 | # CONFIG_IWLWIFI_LEDS is not set | ||
561 | 644 | ||
562 | # | 645 | # |
563 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 646 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -580,6 +663,7 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
580 | # CONFIG_NETCONSOLE is not set | 663 | # CONFIG_NETCONSOLE is not set |
581 | # CONFIG_NETPOLL is not set | 664 | # CONFIG_NETPOLL is not set |
582 | # CONFIG_NET_POLL_CONTROLLER is not set | 665 | # CONFIG_NET_POLL_CONTROLLER is not set |
666 | # CONFIG_VMXNET3 is not set | ||
583 | # CONFIG_ISDN is not set | 667 | # CONFIG_ISDN is not set |
584 | # CONFIG_PHONE is not set | 668 | # CONFIG_PHONE is not set |
585 | 669 | ||
@@ -589,6 +673,7 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
589 | CONFIG_INPUT=y | 673 | CONFIG_INPUT=y |
590 | CONFIG_INPUT_FF_MEMLESS=m | 674 | CONFIG_INPUT_FF_MEMLESS=m |
591 | # CONFIG_INPUT_POLLDEV is not set | 675 | # CONFIG_INPUT_POLLDEV is not set |
676 | # CONFIG_INPUT_SPARSEKMAP is not set | ||
592 | 677 | ||
593 | # | 678 | # |
594 | # Userland interfaces | 679 | # Userland interfaces |
@@ -605,25 +690,30 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
605 | # Input Device Drivers | 690 | # Input Device Drivers |
606 | # | 691 | # |
607 | CONFIG_INPUT_KEYBOARD=y | 692 | CONFIG_INPUT_KEYBOARD=y |
693 | # CONFIG_KEYBOARD_ADP5588 is not set | ||
608 | CONFIG_KEYBOARD_ATKBD=y | 694 | CONFIG_KEYBOARD_ATKBD=y |
609 | # CONFIG_KEYBOARD_SUNKBD is not set | 695 | # CONFIG_QT2160 is not set |
610 | # CONFIG_KEYBOARD_LKKBD is not set | 696 | # CONFIG_KEYBOARD_LKKBD is not set |
611 | # CONFIG_KEYBOARD_XTKBD is not set | 697 | # CONFIG_KEYBOARD_MAX7359 is not set |
612 | # CONFIG_KEYBOARD_NEWTON is not set | 698 | # CONFIG_KEYBOARD_NEWTON is not set |
699 | # CONFIG_KEYBOARD_OPENCORES is not set | ||
613 | # CONFIG_KEYBOARD_STOWAWAY is not set | 700 | # CONFIG_KEYBOARD_STOWAWAY is not set |
701 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
702 | # CONFIG_KEYBOARD_XTKBD is not set | ||
614 | CONFIG_INPUT_MOUSE=y | 703 | CONFIG_INPUT_MOUSE=y |
615 | CONFIG_MOUSE_PS2=y | 704 | CONFIG_MOUSE_PS2=y |
616 | CONFIG_MOUSE_PS2_ALPS=y | 705 | CONFIG_MOUSE_PS2_ALPS=y |
617 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | 706 | CONFIG_MOUSE_PS2_LOGIPS2PP=y |
618 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 707 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
619 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
620 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 708 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
621 | # CONFIG_MOUSE_PS2_ELANTECH is not set | 709 | # CONFIG_MOUSE_PS2_ELANTECH is not set |
710 | # CONFIG_MOUSE_PS2_SENTELIC is not set | ||
622 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 711 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
623 | # CONFIG_MOUSE_SERIAL is not set | 712 | # CONFIG_MOUSE_SERIAL is not set |
624 | # CONFIG_MOUSE_APPLETOUCH is not set | 713 | # CONFIG_MOUSE_APPLETOUCH is not set |
625 | # CONFIG_MOUSE_BCM5974 is not set | 714 | # CONFIG_MOUSE_BCM5974 is not set |
626 | # CONFIG_MOUSE_VSXXXAA is not set | 715 | # CONFIG_MOUSE_VSXXXAA is not set |
716 | # CONFIG_MOUSE_SYNAPTICS_I2C is not set | ||
627 | # CONFIG_INPUT_JOYSTICK is not set | 717 | # CONFIG_INPUT_JOYSTICK is not set |
628 | # CONFIG_INPUT_TABLET is not set | 718 | # CONFIG_INPUT_TABLET is not set |
629 | # CONFIG_INPUT_TOUCHSCREEN is not set | 719 | # CONFIG_INPUT_TOUCHSCREEN is not set |
@@ -639,6 +729,7 @@ CONFIG_SERIO_SERPORT=y | |||
639 | CONFIG_SERIO_LIBPS2=y | 729 | CONFIG_SERIO_LIBPS2=y |
640 | # CONFIG_SERIO_RAW is not set | 730 | # CONFIG_SERIO_RAW is not set |
641 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | 731 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set |
732 | # CONFIG_SERIO_ALTERA_PS2 is not set | ||
642 | # CONFIG_GAMEPORT is not set | 733 | # CONFIG_GAMEPORT is not set |
643 | 734 | ||
644 | # | 735 | # |
@@ -676,6 +767,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
676 | # CONFIG_SERIAL_JSM is not set | 767 | # CONFIG_SERIAL_JSM is not set |
677 | CONFIG_SERIAL_OF_PLATFORM=y | 768 | CONFIG_SERIAL_OF_PLATFORM=y |
678 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 769 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
770 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
679 | CONFIG_UNIX98_PTYS=y | 771 | CONFIG_UNIX98_PTYS=y |
680 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 772 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
681 | CONFIG_LEGACY_PTYS=y | 773 | CONFIG_LEGACY_PTYS=y |
@@ -691,6 +783,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
691 | CONFIG_DEVPORT=y | 783 | CONFIG_DEVPORT=y |
692 | CONFIG_I2C=y | 784 | CONFIG_I2C=y |
693 | CONFIG_I2C_BOARDINFO=y | 785 | CONFIG_I2C_BOARDINFO=y |
786 | CONFIG_I2C_COMPAT=y | ||
694 | # CONFIG_I2C_CHARDEV is not set | 787 | # CONFIG_I2C_CHARDEV is not set |
695 | CONFIG_I2C_HELPER_AUTO=y | 788 | CONFIG_I2C_HELPER_AUTO=y |
696 | CONFIG_I2C_ALGOBIT=y | 789 | CONFIG_I2C_ALGOBIT=y |
@@ -733,11 +826,6 @@ CONFIG_I2C_IBM_IIC=y | |||
733 | # CONFIG_I2C_TINY_USB is not set | 826 | # CONFIG_I2C_TINY_USB is not set |
734 | 827 | ||
735 | # | 828 | # |
736 | # Graphics adapter I2C/DDC channel drivers | ||
737 | # | ||
738 | # CONFIG_I2C_VOODOO3 is not set | ||
739 | |||
740 | # | ||
741 | # Other I2C/SMBus bus drivers | 829 | # Other I2C/SMBus bus drivers |
742 | # | 830 | # |
743 | # CONFIG_I2C_PCA_PLATFORM is not set | 831 | # CONFIG_I2C_PCA_PLATFORM is not set |
@@ -746,27 +834,23 @@ CONFIG_I2C_IBM_IIC=y | |||
746 | # | 834 | # |
747 | # Miscellaneous I2C Chip support | 835 | # Miscellaneous I2C Chip support |
748 | # | 836 | # |
749 | # CONFIG_DS1682 is not set | ||
750 | # CONFIG_EEPROM_AT24 is not set | ||
751 | # CONFIG_EEPROM_LEGACY is not set | ||
752 | # CONFIG_SENSORS_PCF8574 is not set | ||
753 | # CONFIG_PCF8575 is not set | ||
754 | # CONFIG_SENSORS_PCA9539 is not set | ||
755 | # CONFIG_SENSORS_PCF8591 is not set | ||
756 | # CONFIG_SENSORS_MAX6875 is not set | ||
757 | # CONFIG_SENSORS_TSL2550 is not set | 837 | # CONFIG_SENSORS_TSL2550 is not set |
758 | # CONFIG_I2C_DEBUG_CORE is not set | 838 | # CONFIG_I2C_DEBUG_CORE is not set |
759 | # CONFIG_I2C_DEBUG_ALGO is not set | 839 | # CONFIG_I2C_DEBUG_ALGO is not set |
760 | # CONFIG_I2C_DEBUG_BUS is not set | 840 | # CONFIG_I2C_DEBUG_BUS is not set |
761 | # CONFIG_I2C_DEBUG_CHIP is not set | 841 | # CONFIG_I2C_DEBUG_CHIP is not set |
762 | # CONFIG_SPI is not set | 842 | # CONFIG_SPI is not set |
843 | |||
844 | # | ||
845 | # PPS support | ||
846 | # | ||
847 | # CONFIG_PPS is not set | ||
763 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 848 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
764 | # CONFIG_GPIOLIB is not set | 849 | # CONFIG_GPIOLIB is not set |
765 | # CONFIG_W1 is not set | 850 | # CONFIG_W1 is not set |
766 | # CONFIG_POWER_SUPPLY is not set | 851 | # CONFIG_POWER_SUPPLY is not set |
767 | # CONFIG_HWMON is not set | 852 | # CONFIG_HWMON is not set |
768 | # CONFIG_THERMAL is not set | 853 | # CONFIG_THERMAL is not set |
769 | # CONFIG_THERMAL_HWMON is not set | ||
770 | # CONFIG_WATCHDOG is not set | 854 | # CONFIG_WATCHDOG is not set |
771 | CONFIG_SSB_POSSIBLE=y | 855 | CONFIG_SSB_POSSIBLE=y |
772 | 856 | ||
@@ -784,31 +868,21 @@ CONFIG_SSB_POSSIBLE=y | |||
784 | # CONFIG_TWL4030_CORE is not set | 868 | # CONFIG_TWL4030_CORE is not set |
785 | # CONFIG_MFD_TMIO is not set | 869 | # CONFIG_MFD_TMIO is not set |
786 | # CONFIG_PMIC_DA903X is not set | 870 | # CONFIG_PMIC_DA903X is not set |
871 | # CONFIG_PMIC_ADP5520 is not set | ||
787 | # CONFIG_MFD_WM8400 is not set | 872 | # CONFIG_MFD_WM8400 is not set |
873 | # CONFIG_MFD_WM831X is not set | ||
788 | # CONFIG_MFD_WM8350_I2C is not set | 874 | # CONFIG_MFD_WM8350_I2C is not set |
789 | # CONFIG_MFD_PCF50633 is not set | 875 | # CONFIG_MFD_PCF50633 is not set |
876 | # CONFIG_AB3100_CORE is not set | ||
877 | # CONFIG_MFD_88PM8607 is not set | ||
790 | # CONFIG_REGULATOR is not set | 878 | # CONFIG_REGULATOR is not set |
791 | 879 | # CONFIG_MEDIA_SUPPORT is not set | |
792 | # | ||
793 | # Multimedia devices | ||
794 | # | ||
795 | |||
796 | # | ||
797 | # Multimedia core support | ||
798 | # | ||
799 | # CONFIG_VIDEO_DEV is not set | ||
800 | # CONFIG_DVB_CORE is not set | ||
801 | # CONFIG_VIDEO_MEDIA is not set | ||
802 | |||
803 | # | ||
804 | # Multimedia drivers | ||
805 | # | ||
806 | # CONFIG_DAB is not set | ||
807 | 880 | ||
808 | # | 881 | # |
809 | # Graphics support | 882 | # Graphics support |
810 | # | 883 | # |
811 | # CONFIG_AGP is not set | 884 | # CONFIG_AGP is not set |
885 | CONFIG_VGA_ARB=y | ||
812 | # CONFIG_DRM is not set | 886 | # CONFIG_DRM is not set |
813 | # CONFIG_VGASTATE is not set | 887 | # CONFIG_VGASTATE is not set |
814 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 888 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
@@ -870,6 +944,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
870 | # CONFIG_FB_VIRTUAL is not set | 944 | # CONFIG_FB_VIRTUAL is not set |
871 | # CONFIG_FB_METRONOME is not set | 945 | # CONFIG_FB_METRONOME is not set |
872 | # CONFIG_FB_MB862XX is not set | 946 | # CONFIG_FB_MB862XX is not set |
947 | # CONFIG_FB_BROADSHEET is not set | ||
873 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 948 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
874 | CONFIG_LCD_CLASS_DEVICE=y | 949 | CONFIG_LCD_CLASS_DEVICE=y |
875 | # CONFIG_LCD_ILI9320 is not set | 950 | # CONFIG_LCD_ILI9320 is not set |
@@ -899,7 +974,6 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
899 | # CONFIG_SOUND is not set | 974 | # CONFIG_SOUND is not set |
900 | CONFIG_HID_SUPPORT=y | 975 | CONFIG_HID_SUPPORT=y |
901 | CONFIG_HID=y | 976 | CONFIG_HID=y |
902 | # CONFIG_HID_DEBUG is not set | ||
903 | # CONFIG_HIDRAW is not set | 977 | # CONFIG_HIDRAW is not set |
904 | 978 | ||
905 | # | 979 | # |
@@ -912,15 +986,18 @@ CONFIG_USB_HID=y | |||
912 | # | 986 | # |
913 | # Special HID drivers | 987 | # Special HID drivers |
914 | # | 988 | # |
915 | CONFIG_HID_COMPAT=y | ||
916 | CONFIG_HID_A4TECH=y | 989 | CONFIG_HID_A4TECH=y |
917 | CONFIG_HID_APPLE=y | 990 | CONFIG_HID_APPLE=y |
918 | CONFIG_HID_BELKIN=y | 991 | CONFIG_HID_BELKIN=y |
919 | CONFIG_HID_CHERRY=y | 992 | CONFIG_HID_CHERRY=y |
920 | CONFIG_HID_CHICONY=y | 993 | CONFIG_HID_CHICONY=y |
921 | CONFIG_HID_CYPRESS=y | 994 | CONFIG_HID_CYPRESS=y |
995 | # CONFIG_HID_DRAGONRISE is not set | ||
922 | CONFIG_HID_EZKEY=y | 996 | CONFIG_HID_EZKEY=y |
997 | # CONFIG_HID_KYE is not set | ||
923 | CONFIG_HID_GYRATION=y | 998 | CONFIG_HID_GYRATION=y |
999 | # CONFIG_HID_TWINHAN is not set | ||
1000 | # CONFIG_HID_KENSINGTON is not set | ||
924 | CONFIG_HID_LOGITECH=y | 1001 | CONFIG_HID_LOGITECH=y |
925 | # CONFIG_LOGITECH_FF is not set | 1002 | # CONFIG_LOGITECH_FF is not set |
926 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1003 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
@@ -933,10 +1010,11 @@ CONFIG_HID_PETALYNX=y | |||
933 | CONFIG_HID_SAMSUNG=y | 1010 | CONFIG_HID_SAMSUNG=y |
934 | CONFIG_HID_SONY=y | 1011 | CONFIG_HID_SONY=y |
935 | CONFIG_HID_SUNPLUS=y | 1012 | CONFIG_HID_SUNPLUS=y |
936 | # CONFIG_GREENASIA_FF is not set | 1013 | # CONFIG_HID_GREENASIA is not set |
1014 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
937 | # CONFIG_HID_TOPSEED is not set | 1015 | # CONFIG_HID_TOPSEED is not set |
938 | CONFIG_THRUSTMASTER_FF=m | 1016 | # CONFIG_HID_THRUSTMASTER is not set |
939 | CONFIG_ZEROPLUS_FF=m | 1017 | # CONFIG_HID_ZEROPLUS is not set |
940 | CONFIG_USB_SUPPORT=y | 1018 | CONFIG_USB_SUPPORT=y |
941 | CONFIG_USB_ARCH_HAS_HCD=y | 1019 | CONFIG_USB_ARCH_HAS_HCD=y |
942 | CONFIG_USB_ARCH_HAS_OHCI=y | 1020 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -962,17 +1040,20 @@ CONFIG_USB_DEVICEFS=y | |||
962 | # USB Host Controller Drivers | 1040 | # USB Host Controller Drivers |
963 | # | 1041 | # |
964 | # CONFIG_USB_C67X00_HCD is not set | 1042 | # CONFIG_USB_C67X00_HCD is not set |
1043 | # CONFIG_USB_XHCI_HCD is not set | ||
965 | CONFIG_USB_EHCI_HCD=m | 1044 | CONFIG_USB_EHCI_HCD=m |
966 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1045 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
967 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1046 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1047 | # CONFIG_XPS_USB_HCD_XILINX is not set | ||
968 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1048 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
969 | # CONFIG_USB_OXU210HP_HCD is not set | 1049 | # CONFIG_USB_OXU210HP_HCD is not set |
970 | # CONFIG_USB_ISP116X_HCD is not set | 1050 | # CONFIG_USB_ISP116X_HCD is not set |
971 | # CONFIG_USB_ISP1760_HCD is not set | 1051 | # CONFIG_USB_ISP1760_HCD is not set |
1052 | # CONFIG_USB_ISP1362_HCD is not set | ||
972 | CONFIG_USB_OHCI_HCD=y | 1053 | CONFIG_USB_OHCI_HCD=y |
973 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
974 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1054 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
975 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 1055 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
1056 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
976 | CONFIG_USB_OHCI_HCD_PCI=y | 1057 | CONFIG_USB_OHCI_HCD_PCI=y |
977 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1058 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
978 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1059 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -992,11 +1073,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
992 | # CONFIG_USB_TMC is not set | 1073 | # CONFIG_USB_TMC is not set |
993 | 1074 | ||
994 | # | 1075 | # |
995 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 1076 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
996 | # | 1077 | # |
997 | 1078 | ||
998 | # | 1079 | # |
999 | # see USB_STORAGE Help for more information | 1080 | # also be needed; see USB_STORAGE Help for more info |
1000 | # | 1081 | # |
1001 | CONFIG_USB_STORAGE=m | 1082 | CONFIG_USB_STORAGE=m |
1002 | # CONFIG_USB_STORAGE_DEBUG is not set | 1083 | # CONFIG_USB_STORAGE_DEBUG is not set |
@@ -1038,7 +1119,6 @@ CONFIG_USB_STORAGE=m | |||
1038 | # CONFIG_USB_LED is not set | 1119 | # CONFIG_USB_LED is not set |
1039 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1120 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
1040 | # CONFIG_USB_CYTHERM is not set | 1121 | # CONFIG_USB_CYTHERM is not set |
1041 | # CONFIG_USB_PHIDGET is not set | ||
1042 | # CONFIG_USB_IDMOUSE is not set | 1122 | # CONFIG_USB_IDMOUSE is not set |
1043 | # CONFIG_USB_FTDI_ELAN is not set | 1123 | # CONFIG_USB_FTDI_ELAN is not set |
1044 | # CONFIG_USB_APPLEDISPLAY is not set | 1124 | # CONFIG_USB_APPLEDISPLAY is not set |
@@ -1054,6 +1134,7 @@ CONFIG_USB_STORAGE=m | |||
1054 | # | 1134 | # |
1055 | # OTG and related infrastructure | 1135 | # OTG and related infrastructure |
1056 | # | 1136 | # |
1137 | # CONFIG_NOP_USB_XCEIV is not set | ||
1057 | # CONFIG_UWB is not set | 1138 | # CONFIG_UWB is not set |
1058 | # CONFIG_MMC is not set | 1139 | # CONFIG_MMC is not set |
1059 | # CONFIG_MEMSTICK is not set | 1140 | # CONFIG_MEMSTICK is not set |
@@ -1090,9 +1171,11 @@ CONFIG_RTC_INTF_DEV=y | |||
1090 | # CONFIG_RTC_DRV_PCF8583 is not set | 1171 | # CONFIG_RTC_DRV_PCF8583 is not set |
1091 | CONFIG_RTC_DRV_M41T80=y | 1172 | CONFIG_RTC_DRV_M41T80=y |
1092 | CONFIG_RTC_DRV_M41T80_WDT=y | 1173 | CONFIG_RTC_DRV_M41T80_WDT=y |
1174 | # CONFIG_RTC_DRV_BQ32K is not set | ||
1093 | # CONFIG_RTC_DRV_S35390A is not set | 1175 | # CONFIG_RTC_DRV_S35390A is not set |
1094 | # CONFIG_RTC_DRV_FM3130 is not set | 1176 | # CONFIG_RTC_DRV_FM3130 is not set |
1095 | # CONFIG_RTC_DRV_RX8581 is not set | 1177 | # CONFIG_RTC_DRV_RX8581 is not set |
1178 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1096 | 1179 | ||
1097 | # | 1180 | # |
1098 | # SPI RTC drivers | 1181 | # SPI RTC drivers |
@@ -1110,15 +1193,22 @@ CONFIG_RTC_DRV_M41T80_WDT=y | |||
1110 | # CONFIG_RTC_DRV_M48T86 is not set | 1193 | # CONFIG_RTC_DRV_M48T86 is not set |
1111 | # CONFIG_RTC_DRV_M48T35 is not set | 1194 | # CONFIG_RTC_DRV_M48T35 is not set |
1112 | # CONFIG_RTC_DRV_M48T59 is not set | 1195 | # CONFIG_RTC_DRV_M48T59 is not set |
1196 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
1113 | # CONFIG_RTC_DRV_BQ4802 is not set | 1197 | # CONFIG_RTC_DRV_BQ4802 is not set |
1198 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
1114 | # CONFIG_RTC_DRV_V3020 is not set | 1199 | # CONFIG_RTC_DRV_V3020 is not set |
1115 | 1200 | ||
1116 | # | 1201 | # |
1117 | # on-CPU RTC drivers | 1202 | # on-CPU RTC drivers |
1118 | # | 1203 | # |
1119 | # CONFIG_RTC_DRV_PPC is not set | 1204 | # CONFIG_RTC_DRV_GENERIC is not set |
1120 | # CONFIG_DMADEVICES is not set | 1205 | # CONFIG_DMADEVICES is not set |
1206 | # CONFIG_AUXDISPLAY is not set | ||
1121 | # CONFIG_UIO is not set | 1207 | # CONFIG_UIO is not set |
1208 | |||
1209 | # | ||
1210 | # TI VLYNQ | ||
1211 | # | ||
1122 | # CONFIG_STAGING is not set | 1212 | # CONFIG_STAGING is not set |
1123 | 1213 | ||
1124 | # | 1214 | # |
@@ -1130,6 +1220,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y | |||
1130 | # CONFIG_EXT2_FS_SECURITY is not set | 1220 | # CONFIG_EXT2_FS_SECURITY is not set |
1131 | # CONFIG_EXT2_FS_XIP is not set | 1221 | # CONFIG_EXT2_FS_XIP is not set |
1132 | CONFIG_EXT3_FS=y | 1222 | CONFIG_EXT3_FS=y |
1223 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
1133 | CONFIG_EXT3_FS_XATTR=y | 1224 | CONFIG_EXT3_FS_XATTR=y |
1134 | CONFIG_EXT3_FS_POSIX_ACL=y | 1225 | CONFIG_EXT3_FS_POSIX_ACL=y |
1135 | # CONFIG_EXT3_FS_SECURITY is not set | 1226 | # CONFIG_EXT3_FS_SECURITY is not set |
@@ -1142,10 +1233,13 @@ CONFIG_REISERFS_FS=y | |||
1142 | # CONFIG_REISERFS_FS_XATTR is not set | 1233 | # CONFIG_REISERFS_FS_XATTR is not set |
1143 | # CONFIG_JFS_FS is not set | 1234 | # CONFIG_JFS_FS is not set |
1144 | CONFIG_FS_POSIX_ACL=y | 1235 | CONFIG_FS_POSIX_ACL=y |
1145 | CONFIG_FILE_LOCKING=y | ||
1146 | # CONFIG_XFS_FS is not set | 1236 | # CONFIG_XFS_FS is not set |
1237 | # CONFIG_GFS2_FS is not set | ||
1147 | # CONFIG_OCFS2_FS is not set | 1238 | # CONFIG_OCFS2_FS is not set |
1148 | # CONFIG_BTRFS_FS is not set | 1239 | # CONFIG_BTRFS_FS is not set |
1240 | # CONFIG_NILFS2_FS is not set | ||
1241 | CONFIG_FILE_LOCKING=y | ||
1242 | CONFIG_FSNOTIFY=y | ||
1149 | CONFIG_DNOTIFY=y | 1243 | CONFIG_DNOTIFY=y |
1150 | CONFIG_INOTIFY=y | 1244 | CONFIG_INOTIFY=y |
1151 | CONFIG_INOTIFY_USER=y | 1245 | CONFIG_INOTIFY_USER=y |
@@ -1155,6 +1249,11 @@ CONFIG_AUTOFS4_FS=y | |||
1155 | # CONFIG_FUSE_FS is not set | 1249 | # CONFIG_FUSE_FS is not set |
1156 | 1250 | ||
1157 | # | 1251 | # |
1252 | # Caches | ||
1253 | # | ||
1254 | # CONFIG_FSCACHE is not set | ||
1255 | |||
1256 | # | ||
1158 | # CD-ROM/DVD Filesystems | 1257 | # CD-ROM/DVD Filesystems |
1159 | # | 1258 | # |
1160 | CONFIG_ISO9660_FS=y | 1259 | CONFIG_ISO9660_FS=y |
@@ -1267,6 +1366,7 @@ CONFIG_NLS_ISO8859_1=y | |||
1267 | # CONFIG_NLS_KOI8_U is not set | 1366 | # CONFIG_NLS_KOI8_U is not set |
1268 | # CONFIG_NLS_UTF8 is not set | 1367 | # CONFIG_NLS_UTF8 is not set |
1269 | # CONFIG_DLM is not set | 1368 | # CONFIG_DLM is not set |
1369 | # CONFIG_BINARY_PRINTF is not set | ||
1270 | 1370 | ||
1271 | # | 1371 | # |
1272 | # Library routines | 1372 | # Library routines |
@@ -1281,11 +1381,13 @@ CONFIG_CRC32=y | |||
1281 | # CONFIG_CRC7 is not set | 1381 | # CONFIG_CRC7 is not set |
1282 | # CONFIG_LIBCRC32C is not set | 1382 | # CONFIG_LIBCRC32C is not set |
1283 | CONFIG_ZLIB_INFLATE=y | 1383 | CONFIG_ZLIB_INFLATE=y |
1284 | CONFIG_PLIST=y | 1384 | CONFIG_DECOMPRESS_GZIP=y |
1285 | CONFIG_HAS_IOMEM=y | 1385 | CONFIG_HAS_IOMEM=y |
1286 | CONFIG_HAS_IOPORT=y | 1386 | CONFIG_HAS_IOPORT=y |
1287 | CONFIG_HAS_DMA=y | 1387 | CONFIG_HAS_DMA=y |
1288 | CONFIG_HAVE_LMB=y | 1388 | CONFIG_HAVE_LMB=y |
1389 | CONFIG_NLATTR=y | ||
1390 | CONFIG_GENERIC_ATOMIC64=y | ||
1289 | 1391 | ||
1290 | # | 1392 | # |
1291 | # Kernel hacking | 1393 | # Kernel hacking |
@@ -1295,27 +1397,29 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
1295 | CONFIG_ENABLE_MUST_CHECK=y | 1397 | CONFIG_ENABLE_MUST_CHECK=y |
1296 | CONFIG_FRAME_WARN=1024 | 1398 | CONFIG_FRAME_WARN=1024 |
1297 | CONFIG_MAGIC_SYSRQ=y | 1399 | CONFIG_MAGIC_SYSRQ=y |
1400 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1298 | # CONFIG_UNUSED_SYMBOLS is not set | 1401 | # CONFIG_UNUSED_SYMBOLS is not set |
1299 | # CONFIG_DEBUG_FS is not set | 1402 | # CONFIG_DEBUG_FS is not set |
1300 | # CONFIG_HEADERS_CHECK is not set | 1403 | # CONFIG_HEADERS_CHECK is not set |
1301 | # CONFIG_DEBUG_KERNEL is not set | 1404 | # CONFIG_DEBUG_KERNEL is not set |
1302 | # CONFIG_SLUB_DEBUG_ON is not set | 1405 | # CONFIG_SLUB_DEBUG_ON is not set |
1303 | # CONFIG_SLUB_STATS is not set | 1406 | # CONFIG_SLUB_STATS is not set |
1304 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1407 | CONFIG_DEBUG_BUGVERBOSE=y |
1305 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1408 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1306 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1409 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1307 | # CONFIG_LATENCYTOP is not set | 1410 | # CONFIG_LATENCYTOP is not set |
1308 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1411 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1309 | CONFIG_HAVE_FUNCTION_TRACER=y | 1412 | CONFIG_HAVE_FUNCTION_TRACER=y |
1413 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
1310 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1414 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1311 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1415 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1312 | 1416 | CONFIG_TRACING_SUPPORT=y | |
1313 | # | 1417 | # CONFIG_FTRACE is not set |
1314 | # Tracers | 1418 | # CONFIG_DMA_API_DEBUG is not set |
1315 | # | ||
1316 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1317 | # CONFIG_SAMPLES is not set | 1419 | # CONFIG_SAMPLES is not set |
1318 | CONFIG_HAVE_ARCH_KGDB=y | 1420 | CONFIG_HAVE_ARCH_KGDB=y |
1421 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1422 | CONFIG_PPC_WERROR=y | ||
1319 | CONFIG_PRINT_STACK_DEPTH=64 | 1423 | CONFIG_PRINT_STACK_DEPTH=64 |
1320 | # CONFIG_IRQSTACKS is not set | 1424 | # CONFIG_IRQSTACKS is not set |
1321 | # CONFIG_PPC_EARLY_DEBUG is not set | 1425 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1326,7 +1430,11 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1326 | # CONFIG_KEYS is not set | 1430 | # CONFIG_KEYS is not set |
1327 | # CONFIG_SECURITY is not set | 1431 | # CONFIG_SECURITY is not set |
1328 | # CONFIG_SECURITYFS is not set | 1432 | # CONFIG_SECURITYFS is not set |
1329 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1433 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1434 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1435 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1436 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1437 | CONFIG_DEFAULT_SECURITY="" | ||
1330 | # CONFIG_CRYPTO is not set | 1438 | # CONFIG_CRYPTO is not set |
1331 | # CONFIG_PPC_CLOCK is not set | 1439 | # CONFIG_PPC_CLOCK is not set |
1332 | # CONFIG_VIRTUALIZATION is not set | 1440 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig index 6400aae04dda..1b2f41dbcafb 100644 --- a/arch/powerpc/configs/44x/sequoia_defconfig +++ b/arch/powerpc/configs/44x/sequoia_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Apr 7 17:04:52 2009 | 4 | # Mon Jan 4 15:15:51 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -20,6 +20,7 @@ CONFIG_BOOKE=y | |||
20 | CONFIG_PTE_64BIT=y | 20 | CONFIG_PTE_64BIT=y |
21 | CONFIG_PHYS_64BIT=y | 21 | CONFIG_PHYS_64BIT=y |
22 | CONFIG_PPC_MMU_NOHASH=y | 22 | CONFIG_PPC_MMU_NOHASH=y |
23 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 25 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
@@ -31,15 +32,18 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
36 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -53,12 +57,15 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
56 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
62 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
57 | CONFIG_PPC_DCR_NATIVE=y | 63 | CONFIG_PPC_DCR_NATIVE=y |
58 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
59 | CONFIG_PPC_DCR=y | 65 | CONFIG_PPC_DCR=y |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
62 | 69 | ||
63 | # | 70 | # |
64 | # General setup | 71 | # General setup |
@@ -72,6 +79,7 @@ CONFIG_SWAP=y | |||
72 | CONFIG_SYSVIPC=y | 79 | CONFIG_SYSVIPC=y |
73 | CONFIG_SYSVIPC_SYSCTL=y | 80 | CONFIG_SYSVIPC_SYSCTL=y |
74 | CONFIG_POSIX_MQUEUE=y | 81 | CONFIG_POSIX_MQUEUE=y |
82 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
75 | # CONFIG_BSD_PROCESS_ACCT is not set | 83 | # CONFIG_BSD_PROCESS_ACCT is not set |
76 | # CONFIG_TASKSTATS is not set | 84 | # CONFIG_TASKSTATS is not set |
77 | # CONFIG_AUDIT is not set | 85 | # CONFIG_AUDIT is not set |
@@ -79,11 +87,13 @@ CONFIG_POSIX_MQUEUE=y | |||
79 | # | 87 | # |
80 | # RCU Subsystem | 88 | # RCU Subsystem |
81 | # | 89 | # |
82 | CONFIG_CLASSIC_RCU=y | 90 | CONFIG_TREE_RCU=y |
83 | # CONFIG_TREE_RCU is not set | 91 | # CONFIG_TREE_PREEMPT_RCU is not set |
84 | # CONFIG_PREEMPT_RCU is not set | 92 | # CONFIG_TINY_RCU is not set |
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
85 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
86 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
87 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
88 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
89 | CONFIG_GROUP_SCHED=y | 99 | CONFIG_GROUP_SCHED=y |
@@ -121,6 +131,13 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_EVENTS=y | ||
135 | |||
136 | # | ||
137 | # Kernel Performance Events And Counters | ||
138 | # | ||
139 | # CONFIG_PERF_EVENTS is not set | ||
140 | # CONFIG_PERF_COUNTERS is not set | ||
124 | CONFIG_VM_EVENT_COUNTERS=y | 141 | CONFIG_VM_EVENT_COUNTERS=y |
125 | CONFIG_PCI_QUIRKS=y | 142 | CONFIG_PCI_QUIRKS=y |
126 | CONFIG_SLUB_DEBUG=y | 143 | CONFIG_SLUB_DEBUG=y |
@@ -129,7 +146,6 @@ CONFIG_COMPAT_BRK=y | |||
129 | CONFIG_SLUB=y | 146 | CONFIG_SLUB=y |
130 | # CONFIG_SLOB is not set | 147 | # CONFIG_SLOB is not set |
131 | # CONFIG_PROFILING is not set | 148 | # CONFIG_PROFILING is not set |
132 | # CONFIG_MARKERS is not set | ||
133 | CONFIG_HAVE_OPROFILE=y | 149 | CONFIG_HAVE_OPROFILE=y |
134 | # CONFIG_KPROBES is not set | 150 | # CONFIG_KPROBES is not set |
135 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 151 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
@@ -137,6 +153,13 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
137 | CONFIG_HAVE_KPROBES=y | 153 | CONFIG_HAVE_KPROBES=y |
138 | CONFIG_HAVE_KRETPROBES=y | 154 | CONFIG_HAVE_KRETPROBES=y |
139 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 155 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
156 | CONFIG_HAVE_DMA_ATTRS=y | ||
157 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
158 | |||
159 | # | ||
160 | # GCOV-based kernel profiling | ||
161 | # | ||
162 | # CONFIG_GCOV_KERNEL is not set | ||
140 | # CONFIG_SLOW_WORK is not set | 163 | # CONFIG_SLOW_WORK is not set |
141 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 164 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
142 | CONFIG_SLABINFO=y | 165 | CONFIG_SLABINFO=y |
@@ -149,7 +172,7 @@ CONFIG_MODULE_UNLOAD=y | |||
149 | # CONFIG_MODVERSIONS is not set | 172 | # CONFIG_MODVERSIONS is not set |
150 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 173 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
151 | CONFIG_BLOCK=y | 174 | CONFIG_BLOCK=y |
152 | CONFIG_LBD=y | 175 | CONFIG_LBDAF=y |
153 | # CONFIG_BLK_DEV_BSG is not set | 176 | # CONFIG_BLK_DEV_BSG is not set |
154 | # CONFIG_BLK_DEV_INTEGRITY is not set | 177 | # CONFIG_BLK_DEV_INTEGRITY is not set |
155 | 178 | ||
@@ -157,14 +180,41 @@ CONFIG_LBD=y | |||
157 | # IO Schedulers | 180 | # IO Schedulers |
158 | # | 181 | # |
159 | CONFIG_IOSCHED_NOOP=y | 182 | CONFIG_IOSCHED_NOOP=y |
160 | CONFIG_IOSCHED_AS=y | ||
161 | CONFIG_IOSCHED_DEADLINE=y | 183 | CONFIG_IOSCHED_DEADLINE=y |
162 | CONFIG_IOSCHED_CFQ=y | 184 | CONFIG_IOSCHED_CFQ=y |
163 | CONFIG_DEFAULT_AS=y | ||
164 | # CONFIG_DEFAULT_DEADLINE is not set | 185 | # CONFIG_DEFAULT_DEADLINE is not set |
165 | # CONFIG_DEFAULT_CFQ is not set | 186 | CONFIG_DEFAULT_CFQ=y |
166 | # CONFIG_DEFAULT_NOOP is not set | 187 | # CONFIG_DEFAULT_NOOP is not set |
167 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 188 | CONFIG_DEFAULT_IOSCHED="cfq" |
189 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
190 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
191 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
192 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
193 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
194 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
195 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
196 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
197 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
198 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
199 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
200 | # CONFIG_INLINE_READ_LOCK is not set | ||
201 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
203 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
204 | CONFIG_INLINE_READ_UNLOCK=y | ||
205 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
206 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
207 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
208 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
212 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
213 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
214 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
215 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
216 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
217 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
168 | # CONFIG_FREEZER is not set | 218 | # CONFIG_FREEZER is not set |
169 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 219 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
170 | 220 | ||
@@ -186,6 +236,7 @@ CONFIG_SEQUOIA=y | |||
186 | # CONFIG_CANYONLANDS is not set | 236 | # CONFIG_CANYONLANDS is not set |
187 | # CONFIG_GLACIER is not set | 237 | # CONFIG_GLACIER is not set |
188 | # CONFIG_REDWOOD is not set | 238 | # CONFIG_REDWOOD is not set |
239 | # CONFIG_EIGER is not set | ||
189 | # CONFIG_YOSEMITE is not set | 240 | # CONFIG_YOSEMITE is not set |
190 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 241 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
191 | CONFIG_PPC44x_SIMPLE=y | 242 | CONFIG_PPC44x_SIMPLE=y |
@@ -228,10 +279,12 @@ CONFIG_BINFMT_ELF=y | |||
228 | # CONFIG_BINFMT_MISC is not set | 279 | # CONFIG_BINFMT_MISC is not set |
229 | # CONFIG_MATH_EMULATION is not set | 280 | # CONFIG_MATH_EMULATION is not set |
230 | # CONFIG_IOMMU_HELPER is not set | 281 | # CONFIG_IOMMU_HELPER is not set |
231 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 282 | # CONFIG_SWIOTLB is not set |
232 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 283 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
233 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 284 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
234 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 285 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
286 | CONFIG_SPARSE_IRQ=y | ||
287 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
235 | CONFIG_ARCH_FLATMEM_ENABLE=y | 288 | CONFIG_ARCH_FLATMEM_ENABLE=y |
236 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 289 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
237 | CONFIG_SELECT_MEMORY_MODEL=y | 290 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -247,9 +300,8 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
247 | CONFIG_ZONE_DMA_FLAG=1 | 300 | CONFIG_ZONE_DMA_FLAG=1 |
248 | CONFIG_BOUNCE=y | 301 | CONFIG_BOUNCE=y |
249 | CONFIG_VIRT_TO_BUS=y | 302 | CONFIG_VIRT_TO_BUS=y |
250 | CONFIG_UNEVICTABLE_LRU=y | 303 | # CONFIG_KSM is not set |
251 | CONFIG_HAVE_MLOCK=y | 304 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
252 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
253 | CONFIG_STDBINUTILS=y | 305 | CONFIG_STDBINUTILS=y |
254 | CONFIG_PPC_4K_PAGES=y | 306 | CONFIG_PPC_4K_PAGES=y |
255 | # CONFIG_PPC_16K_PAGES is not set | 307 | # CONFIG_PPC_16K_PAGES is not set |
@@ -293,11 +345,11 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
293 | # Default settings for advanced configuration options are used | 345 | # Default settings for advanced configuration options are used |
294 | # | 346 | # |
295 | CONFIG_LOWMEM_SIZE=0x30000000 | 347 | CONFIG_LOWMEM_SIZE=0x30000000 |
296 | CONFIG_LOWMEM_CAM_NUM=3 | ||
297 | CONFIG_PAGE_OFFSET=0xc0000000 | 348 | CONFIG_PAGE_OFFSET=0xc0000000 |
298 | CONFIG_KERNEL_START=0xc0000000 | 349 | CONFIG_KERNEL_START=0xc0000000 |
299 | CONFIG_PHYSICAL_START=0x00000000 | 350 | CONFIG_PHYSICAL_START=0x00000000 |
300 | CONFIG_TASK_SIZE=0xc0000000 | 351 | CONFIG_TASK_SIZE=0xc0000000 |
352 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
301 | CONFIG_NET=y | 353 | CONFIG_NET=y |
302 | 354 | ||
303 | # | 355 | # |
@@ -339,6 +391,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
339 | # CONFIG_NETFILTER is not set | 391 | # CONFIG_NETFILTER is not set |
340 | # CONFIG_IP_DCCP is not set | 392 | # CONFIG_IP_DCCP is not set |
341 | # CONFIG_IP_SCTP is not set | 393 | # CONFIG_IP_SCTP is not set |
394 | # CONFIG_RDS is not set | ||
342 | # CONFIG_TIPC is not set | 395 | # CONFIG_TIPC is not set |
343 | # CONFIG_ATM is not set | 396 | # CONFIG_ATM is not set |
344 | # CONFIG_BRIDGE is not set | 397 | # CONFIG_BRIDGE is not set |
@@ -353,6 +406,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
353 | # CONFIG_ECONET is not set | 406 | # CONFIG_ECONET is not set |
354 | # CONFIG_WAN_ROUTER is not set | 407 | # CONFIG_WAN_ROUTER is not set |
355 | # CONFIG_PHONET is not set | 408 | # CONFIG_PHONET is not set |
409 | # CONFIG_IEEE802154 is not set | ||
356 | # CONFIG_NET_SCHED is not set | 410 | # CONFIG_NET_SCHED is not set |
357 | # CONFIG_DCB is not set | 411 | # CONFIG_DCB is not set |
358 | 412 | ||
@@ -365,7 +419,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
365 | # CONFIG_IRDA is not set | 419 | # CONFIG_IRDA is not set |
366 | # CONFIG_BT is not set | 420 | # CONFIG_BT is not set |
367 | # CONFIG_AF_RXRPC is not set | 421 | # CONFIG_AF_RXRPC is not set |
368 | # CONFIG_WIRELESS is not set | 422 | CONFIG_WIRELESS=y |
423 | # CONFIG_CFG80211 is not set | ||
424 | # CONFIG_LIB80211 is not set | ||
425 | |||
426 | # | ||
427 | # CFG80211 needs to be enabled for MAC80211 | ||
428 | # | ||
369 | # CONFIG_WIMAX is not set | 429 | # CONFIG_WIMAX is not set |
370 | # CONFIG_RFKILL is not set | 430 | # CONFIG_RFKILL is not set |
371 | # CONFIG_NET_9P is not set | 431 | # CONFIG_NET_9P is not set |
@@ -378,6 +438,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
378 | # Generic Driver Options | 438 | # Generic Driver Options |
379 | # | 439 | # |
380 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 440 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
441 | # CONFIG_DEVTMPFS is not set | ||
381 | CONFIG_STANDALONE=y | 442 | CONFIG_STANDALONE=y |
382 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 443 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
383 | CONFIG_FW_LOADER=y | 444 | CONFIG_FW_LOADER=y |
@@ -390,9 +451,9 @@ CONFIG_CONNECTOR=y | |||
390 | CONFIG_PROC_EVENTS=y | 451 | CONFIG_PROC_EVENTS=y |
391 | CONFIG_MTD=y | 452 | CONFIG_MTD=y |
392 | # CONFIG_MTD_DEBUG is not set | 453 | # CONFIG_MTD_DEBUG is not set |
454 | # CONFIG_MTD_TESTS is not set | ||
393 | # CONFIG_MTD_CONCAT is not set | 455 | # CONFIG_MTD_CONCAT is not set |
394 | CONFIG_MTD_PARTITIONS=y | 456 | CONFIG_MTD_PARTITIONS=y |
395 | # CONFIG_MTD_TESTS is not set | ||
396 | # CONFIG_MTD_REDBOOT_PARTS is not set | 457 | # CONFIG_MTD_REDBOOT_PARTS is not set |
397 | CONFIG_MTD_CMDLINE_PARTS=y | 458 | CONFIG_MTD_CMDLINE_PARTS=y |
398 | CONFIG_MTD_OF_PARTS=y | 459 | CONFIG_MTD_OF_PARTS=y |
@@ -493,6 +554,7 @@ CONFIG_BLK_DEV=y | |||
493 | # CONFIG_BLK_DEV_UMEM is not set | 554 | # CONFIG_BLK_DEV_UMEM is not set |
494 | # CONFIG_BLK_DEV_COW_COMMON is not set | 555 | # CONFIG_BLK_DEV_COW_COMMON is not set |
495 | # CONFIG_BLK_DEV_LOOP is not set | 556 | # CONFIG_BLK_DEV_LOOP is not set |
557 | # CONFIG_BLK_DEV_DRBD is not set | ||
496 | # CONFIG_BLK_DEV_NBD is not set | 558 | # CONFIG_BLK_DEV_NBD is not set |
497 | # CONFIG_BLK_DEV_SX8 is not set | 559 | # CONFIG_BLK_DEV_SX8 is not set |
498 | CONFIG_BLK_DEV_RAM=y | 560 | CONFIG_BLK_DEV_RAM=y |
@@ -515,6 +577,7 @@ CONFIG_MISC_DEVICES=y | |||
515 | # EEPROM support | 577 | # EEPROM support |
516 | # | 578 | # |
517 | # CONFIG_EEPROM_93CX6 is not set | 579 | # CONFIG_EEPROM_93CX6 is not set |
580 | # CONFIG_CB710_CORE is not set | ||
518 | CONFIG_HAVE_IDE=y | 581 | CONFIG_HAVE_IDE=y |
519 | # CONFIG_IDE is not set | 582 | # CONFIG_IDE is not set |
520 | 583 | ||
@@ -534,14 +597,17 @@ CONFIG_HAVE_IDE=y | |||
534 | # | 597 | # |
535 | 598 | ||
536 | # | 599 | # |
537 | # Enable only one of the two stacks, unless you know what you are doing | 600 | # You can enable one or both FireWire driver stacks. |
601 | # | ||
602 | |||
603 | # | ||
604 | # See the help texts for more information. | ||
538 | # | 605 | # |
539 | # CONFIG_FIREWIRE is not set | 606 | # CONFIG_FIREWIRE is not set |
540 | # CONFIG_IEEE1394 is not set | 607 | # CONFIG_IEEE1394 is not set |
541 | # CONFIG_I2O is not set | 608 | # CONFIG_I2O is not set |
542 | # CONFIG_MACINTOSH_DRIVERS is not set | 609 | # CONFIG_MACINTOSH_DRIVERS is not set |
543 | CONFIG_NETDEVICES=y | 610 | CONFIG_NETDEVICES=y |
544 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
545 | # CONFIG_DUMMY is not set | 611 | # CONFIG_DUMMY is not set |
546 | # CONFIG_BONDING is not set | 612 | # CONFIG_BONDING is not set |
547 | # CONFIG_MACVLAN is not set | 613 | # CONFIG_MACVLAN is not set |
@@ -576,7 +642,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
576 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 642 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
577 | # CONFIG_NET_PCI is not set | 643 | # CONFIG_NET_PCI is not set |
578 | # CONFIG_B44 is not set | 644 | # CONFIG_B44 is not set |
645 | # CONFIG_KS8842 is not set | ||
646 | # CONFIG_KS8851_MLL is not set | ||
579 | # CONFIG_ATL2 is not set | 647 | # CONFIG_ATL2 is not set |
648 | # CONFIG_XILINX_EMACLITE is not set | ||
580 | CONFIG_NETDEV_1000=y | 649 | CONFIG_NETDEV_1000=y |
581 | # CONFIG_ACENIC is not set | 650 | # CONFIG_ACENIC is not set |
582 | # CONFIG_DL2K is not set | 651 | # CONFIG_DL2K is not set |
@@ -584,6 +653,7 @@ CONFIG_NETDEV_1000=y | |||
584 | # CONFIG_E1000E is not set | 653 | # CONFIG_E1000E is not set |
585 | # CONFIG_IP1000 is not set | 654 | # CONFIG_IP1000 is not set |
586 | # CONFIG_IGB is not set | 655 | # CONFIG_IGB is not set |
656 | # CONFIG_IGBVF is not set | ||
587 | # CONFIG_NS83820 is not set | 657 | # CONFIG_NS83820 is not set |
588 | # CONFIG_HAMACHI is not set | 658 | # CONFIG_HAMACHI is not set |
589 | # CONFIG_YELLOWFIN is not set | 659 | # CONFIG_YELLOWFIN is not set |
@@ -594,6 +664,9 @@ CONFIG_NETDEV_1000=y | |||
594 | # CONFIG_VIA_VELOCITY is not set | 664 | # CONFIG_VIA_VELOCITY is not set |
595 | # CONFIG_TIGON3 is not set | 665 | # CONFIG_TIGON3 is not set |
596 | # CONFIG_BNX2 is not set | 666 | # CONFIG_BNX2 is not set |
667 | # CONFIG_CNIC is not set | ||
668 | # CONFIG_MV643XX_ETH is not set | ||
669 | # CONFIG_XILINX_LL_TEMAC is not set | ||
597 | # CONFIG_QLA3XXX is not set | 670 | # CONFIG_QLA3XXX is not set |
598 | # CONFIG_ATL1 is not set | 671 | # CONFIG_ATL1 is not set |
599 | # CONFIG_ATL1E is not set | 672 | # CONFIG_ATL1E is not set |
@@ -619,12 +692,11 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
619 | # CONFIG_SFC is not set | 692 | # CONFIG_SFC is not set |
620 | # CONFIG_BE2NET is not set | 693 | # CONFIG_BE2NET is not set |
621 | # CONFIG_TR is not set | 694 | # CONFIG_TR is not set |
622 | 695 | CONFIG_WLAN=y | |
623 | # | 696 | # CONFIG_AIRO is not set |
624 | # Wireless LAN | 697 | # CONFIG_ATMEL is not set |
625 | # | 698 | # CONFIG_PRISM54 is not set |
626 | # CONFIG_WLAN_PRE80211 is not set | 699 | # CONFIG_HOSTAP is not set |
627 | # CONFIG_WLAN_80211 is not set | ||
628 | 700 | ||
629 | # | 701 | # |
630 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 702 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -637,6 +709,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
637 | # CONFIG_NETCONSOLE is not set | 709 | # CONFIG_NETCONSOLE is not set |
638 | # CONFIG_NETPOLL is not set | 710 | # CONFIG_NETPOLL is not set |
639 | # CONFIG_NET_POLL_CONTROLLER is not set | 711 | # CONFIG_NET_POLL_CONTROLLER is not set |
712 | # CONFIG_VMXNET3 is not set | ||
640 | # CONFIG_ISDN is not set | 713 | # CONFIG_ISDN is not set |
641 | # CONFIG_PHONE is not set | 714 | # CONFIG_PHONE is not set |
642 | 715 | ||
@@ -682,6 +755,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
682 | # CONFIG_SERIAL_JSM is not set | 755 | # CONFIG_SERIAL_JSM is not set |
683 | CONFIG_SERIAL_OF_PLATFORM=y | 756 | CONFIG_SERIAL_OF_PLATFORM=y |
684 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 757 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
758 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
685 | CONFIG_UNIX98_PTYS=y | 759 | CONFIG_UNIX98_PTYS=y |
686 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 760 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
687 | CONFIG_LEGACY_PTYS=y | 761 | CONFIG_LEGACY_PTYS=y |
@@ -698,6 +772,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
698 | CONFIG_DEVPORT=y | 772 | CONFIG_DEVPORT=y |
699 | # CONFIG_I2C is not set | 773 | # CONFIG_I2C is not set |
700 | # CONFIG_SPI is not set | 774 | # CONFIG_SPI is not set |
775 | |||
776 | # | ||
777 | # PPS support | ||
778 | # | ||
779 | # CONFIG_PPS is not set | ||
701 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 780 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
702 | # CONFIG_GPIOLIB is not set | 781 | # CONFIG_GPIOLIB is not set |
703 | # CONFIG_W1 is not set | 782 | # CONFIG_W1 is not set |
@@ -720,27 +799,13 @@ CONFIG_SSB_POSSIBLE=y | |||
720 | # CONFIG_HTC_PASIC3 is not set | 799 | # CONFIG_HTC_PASIC3 is not set |
721 | # CONFIG_MFD_TMIO is not set | 800 | # CONFIG_MFD_TMIO is not set |
722 | # CONFIG_REGULATOR is not set | 801 | # CONFIG_REGULATOR is not set |
723 | 802 | # CONFIG_MEDIA_SUPPORT is not set | |
724 | # | ||
725 | # Multimedia devices | ||
726 | # | ||
727 | |||
728 | # | ||
729 | # Multimedia core support | ||
730 | # | ||
731 | # CONFIG_VIDEO_DEV is not set | ||
732 | # CONFIG_DVB_CORE is not set | ||
733 | # CONFIG_VIDEO_MEDIA is not set | ||
734 | |||
735 | # | ||
736 | # Multimedia drivers | ||
737 | # | ||
738 | CONFIG_DAB=y | ||
739 | 803 | ||
740 | # | 804 | # |
741 | # Graphics support | 805 | # Graphics support |
742 | # | 806 | # |
743 | # CONFIG_AGP is not set | 807 | # CONFIG_AGP is not set |
808 | CONFIG_VGA_ARB=y | ||
744 | # CONFIG_DRM is not set | 809 | # CONFIG_DRM is not set |
745 | # CONFIG_VGASTATE is not set | 810 | # CONFIG_VGASTATE is not set |
746 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 811 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -783,6 +848,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
783 | # CONFIG_DMADEVICES is not set | 848 | # CONFIG_DMADEVICES is not set |
784 | # CONFIG_AUXDISPLAY is not set | 849 | # CONFIG_AUXDISPLAY is not set |
785 | # CONFIG_UIO is not set | 850 | # CONFIG_UIO is not set |
851 | |||
852 | # | ||
853 | # TI VLYNQ | ||
854 | # | ||
786 | # CONFIG_STAGING is not set | 855 | # CONFIG_STAGING is not set |
787 | 856 | ||
788 | # | 857 | # |
@@ -793,14 +862,17 @@ CONFIG_EXT2_FS=y | |||
793 | # CONFIG_EXT2_FS_XIP is not set | 862 | # CONFIG_EXT2_FS_XIP is not set |
794 | # CONFIG_EXT3_FS is not set | 863 | # CONFIG_EXT3_FS is not set |
795 | # CONFIG_EXT4_FS is not set | 864 | # CONFIG_EXT4_FS is not set |
865 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
796 | # CONFIG_REISERFS_FS is not set | 866 | # CONFIG_REISERFS_FS is not set |
797 | # CONFIG_JFS_FS is not set | 867 | # CONFIG_JFS_FS is not set |
798 | # CONFIG_FS_POSIX_ACL is not set | 868 | # CONFIG_FS_POSIX_ACL is not set |
799 | CONFIG_FILE_LOCKING=y | ||
800 | # CONFIG_XFS_FS is not set | 869 | # CONFIG_XFS_FS is not set |
801 | # CONFIG_GFS2_FS is not set | 870 | # CONFIG_GFS2_FS is not set |
802 | # CONFIG_OCFS2_FS is not set | 871 | # CONFIG_OCFS2_FS is not set |
803 | # CONFIG_BTRFS_FS is not set | 872 | # CONFIG_BTRFS_FS is not set |
873 | # CONFIG_NILFS2_FS is not set | ||
874 | CONFIG_FILE_LOCKING=y | ||
875 | CONFIG_FSNOTIFY=y | ||
804 | CONFIG_DNOTIFY=y | 876 | CONFIG_DNOTIFY=y |
805 | CONFIG_INOTIFY=y | 877 | CONFIG_INOTIFY=y |
806 | CONFIG_INOTIFY_USER=y | 878 | CONFIG_INOTIFY_USER=y |
@@ -916,6 +988,7 @@ CONFIG_HAS_IOPORT=y | |||
916 | CONFIG_HAS_DMA=y | 988 | CONFIG_HAS_DMA=y |
917 | CONFIG_HAVE_LMB=y | 989 | CONFIG_HAVE_LMB=y |
918 | CONFIG_NLATTR=y | 990 | CONFIG_NLATTR=y |
991 | CONFIG_GENERIC_ATOMIC64=y | ||
919 | 992 | ||
920 | # | 993 | # |
921 | # Kernel hacking | 994 | # Kernel hacking |
@@ -925,6 +998,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
925 | CONFIG_ENABLE_MUST_CHECK=y | 998 | CONFIG_ENABLE_MUST_CHECK=y |
926 | CONFIG_FRAME_WARN=1024 | 999 | CONFIG_FRAME_WARN=1024 |
927 | CONFIG_MAGIC_SYSRQ=y | 1000 | CONFIG_MAGIC_SYSRQ=y |
1001 | # CONFIG_STRIP_ASM_SYMS is not set | ||
928 | # CONFIG_UNUSED_SYMBOLS is not set | 1002 | # CONFIG_UNUSED_SYMBOLS is not set |
929 | CONFIG_DEBUG_FS=y | 1003 | CONFIG_DEBUG_FS=y |
930 | # CONFIG_HEADERS_CHECK is not set | 1004 | # CONFIG_HEADERS_CHECK is not set |
@@ -933,16 +1007,23 @@ CONFIG_DEBUG_KERNEL=y | |||
933 | CONFIG_DETECT_SOFTLOCKUP=y | 1007 | CONFIG_DETECT_SOFTLOCKUP=y |
934 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1008 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
935 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1009 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
1010 | CONFIG_DETECT_HUNG_TASK=y | ||
1011 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
1012 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
936 | CONFIG_SCHED_DEBUG=y | 1013 | CONFIG_SCHED_DEBUG=y |
937 | # CONFIG_SCHEDSTATS is not set | 1014 | # CONFIG_SCHEDSTATS is not set |
938 | # CONFIG_TIMER_STATS is not set | 1015 | # CONFIG_TIMER_STATS is not set |
939 | # CONFIG_DEBUG_OBJECTS is not set | 1016 | # CONFIG_DEBUG_OBJECTS is not set |
940 | # CONFIG_SLUB_DEBUG_ON is not set | 1017 | # CONFIG_SLUB_DEBUG_ON is not set |
941 | # CONFIG_SLUB_STATS is not set | 1018 | # CONFIG_SLUB_STATS is not set |
1019 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
942 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1020 | # CONFIG_DEBUG_RT_MUTEXES is not set |
943 | # CONFIG_RT_MUTEX_TESTER is not set | 1021 | # CONFIG_RT_MUTEX_TESTER is not set |
944 | # CONFIG_DEBUG_SPINLOCK is not set | 1022 | # CONFIG_DEBUG_SPINLOCK is not set |
945 | # CONFIG_DEBUG_MUTEXES is not set | 1023 | # CONFIG_DEBUG_MUTEXES is not set |
1024 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1025 | # CONFIG_PROVE_LOCKING is not set | ||
1026 | # CONFIG_LOCK_STAT is not set | ||
946 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1027 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
947 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1028 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
948 | # CONFIG_DEBUG_KOBJECT is not set | 1029 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -954,11 +1035,12 @@ CONFIG_SCHED_DEBUG=y | |||
954 | # CONFIG_DEBUG_LIST is not set | 1035 | # CONFIG_DEBUG_LIST is not set |
955 | # CONFIG_DEBUG_SG is not set | 1036 | # CONFIG_DEBUG_SG is not set |
956 | # CONFIG_DEBUG_NOTIFIERS is not set | 1037 | # CONFIG_DEBUG_NOTIFIERS is not set |
957 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1038 | # CONFIG_DEBUG_CREDENTIALS is not set |
958 | # CONFIG_RCU_TORTURE_TEST is not set | 1039 | # CONFIG_RCU_TORTURE_TEST is not set |
959 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1040 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
960 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1041 | # CONFIG_BACKTRACE_SELF_TEST is not set |
961 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1042 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1043 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
962 | # CONFIG_FAULT_INJECTION is not set | 1044 | # CONFIG_FAULT_INJECTION is not set |
963 | # CONFIG_LATENCYTOP is not set | 1045 | # CONFIG_LATENCYTOP is not set |
964 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1046 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
@@ -968,27 +1050,30 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
968 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1050 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
969 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1051 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
970 | CONFIG_TRACING_SUPPORT=y | 1052 | CONFIG_TRACING_SUPPORT=y |
971 | 1053 | CONFIG_FTRACE=y | |
972 | # | ||
973 | # Tracers | ||
974 | # | ||
975 | # CONFIG_FUNCTION_TRACER is not set | 1054 | # CONFIG_FUNCTION_TRACER is not set |
1055 | # CONFIG_IRQSOFF_TRACER is not set | ||
976 | # CONFIG_SCHED_TRACER is not set | 1056 | # CONFIG_SCHED_TRACER is not set |
977 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1057 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
978 | # CONFIG_EVENT_TRACER is not set | ||
979 | # CONFIG_BOOT_TRACER is not set | 1058 | # CONFIG_BOOT_TRACER is not set |
980 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1059 | CONFIG_BRANCH_PROFILE_NONE=y |
1060 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1061 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
981 | # CONFIG_STACK_TRACER is not set | 1062 | # CONFIG_STACK_TRACER is not set |
982 | # CONFIG_KMEMTRACE is not set | 1063 | # CONFIG_KMEMTRACE is not set |
983 | # CONFIG_WORKQUEUE_TRACER is not set | 1064 | # CONFIG_WORKQUEUE_TRACER is not set |
984 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1065 | # CONFIG_BLK_DEV_IO_TRACE is not set |
985 | # CONFIG_DYNAMIC_DEBUG is not set | 1066 | # CONFIG_DYNAMIC_DEBUG is not set |
1067 | # CONFIG_DMA_API_DEBUG is not set | ||
986 | # CONFIG_SAMPLES is not set | 1068 | # CONFIG_SAMPLES is not set |
987 | CONFIG_HAVE_ARCH_KGDB=y | 1069 | CONFIG_HAVE_ARCH_KGDB=y |
988 | # CONFIG_KGDB is not set | 1070 | # CONFIG_KGDB is not set |
1071 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1072 | CONFIG_PPC_WERROR=y | ||
989 | CONFIG_PRINT_STACK_DEPTH=64 | 1073 | CONFIG_PRINT_STACK_DEPTH=64 |
990 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1074 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
991 | # CONFIG_DEBUG_STACK_USAGE is not set | 1075 | # CONFIG_DEBUG_STACK_USAGE is not set |
1076 | # CONFIG_PPC_EMULATED_STATS is not set | ||
992 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1077 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
993 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1078 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
994 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1079 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -1004,13 +1089,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1004 | # CONFIG_KEYS is not set | 1089 | # CONFIG_KEYS is not set |
1005 | # CONFIG_SECURITY is not set | 1090 | # CONFIG_SECURITY is not set |
1006 | # CONFIG_SECURITYFS is not set | 1091 | # CONFIG_SECURITYFS is not set |
1007 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1092 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1093 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1094 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1095 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1096 | CONFIG_DEFAULT_SECURITY="" | ||
1008 | CONFIG_CRYPTO=y | 1097 | CONFIG_CRYPTO=y |
1009 | 1098 | ||
1010 | # | 1099 | # |
1011 | # Crypto core or helper | 1100 | # Crypto core or helper |
1012 | # | 1101 | # |
1013 | # CONFIG_CRYPTO_FIPS is not set | ||
1014 | CONFIG_CRYPTO_ALGAPI=y | 1102 | CONFIG_CRYPTO_ALGAPI=y |
1015 | CONFIG_CRYPTO_ALGAPI2=y | 1103 | CONFIG_CRYPTO_ALGAPI2=y |
1016 | CONFIG_CRYPTO_AEAD2=y | 1104 | CONFIG_CRYPTO_AEAD2=y |
@@ -1052,11 +1140,13 @@ CONFIG_CRYPTO_PCBC=y | |||
1052 | # | 1140 | # |
1053 | # CONFIG_CRYPTO_HMAC is not set | 1141 | # CONFIG_CRYPTO_HMAC is not set |
1054 | # CONFIG_CRYPTO_XCBC is not set | 1142 | # CONFIG_CRYPTO_XCBC is not set |
1143 | # CONFIG_CRYPTO_VMAC is not set | ||
1055 | 1144 | ||
1056 | # | 1145 | # |
1057 | # Digest | 1146 | # Digest |
1058 | # | 1147 | # |
1059 | # CONFIG_CRYPTO_CRC32C is not set | 1148 | # CONFIG_CRYPTO_CRC32C is not set |
1149 | # CONFIG_CRYPTO_GHASH is not set | ||
1060 | # CONFIG_CRYPTO_MD4 is not set | 1150 | # CONFIG_CRYPTO_MD4 is not set |
1061 | CONFIG_CRYPTO_MD5=y | 1151 | CONFIG_CRYPTO_MD5=y |
1062 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1152 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig index ef32cc4f82eb..12041d355b8c 100644 --- a/arch/powerpc/configs/44x/taishan_defconfig +++ b/arch/powerpc/configs/44x/taishan_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jan 20 08:22:47 2009 | 4 | # Mon Jan 4 15:21:04 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -19,6 +19,7 @@ CONFIG_BOOKE=y | |||
19 | CONFIG_PTE_64BIT=y | 19 | CONFIG_PTE_64BIT=y |
20 | CONFIG_PHYS_64BIT=y | 20 | CONFIG_PHYS_64BIT=y |
21 | CONFIG_PPC_MMU_NOHASH=y | 21 | CONFIG_PPC_MMU_NOHASH=y |
22 | CONFIG_PPC_MMU_NOHASH_32=y | ||
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
23 | CONFIG_NOT_COHERENT_CACHE=y | 24 | CONFIG_NOT_COHERENT_CACHE=y |
24 | CONFIG_PPC32=y | 25 | CONFIG_PPC32=y |
@@ -30,15 +31,18 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 31 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 32 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 33 | CONFIG_GENERIC_HARDIRQS=y |
34 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
38 | CONFIG_NR_IRQS=512 | ||
35 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
44 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -52,11 +56,15 @@ CONFIG_PPC_UDBG_16550=y | |||
52 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
53 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
54 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
55 | # CONFIG_DEFAULT_UIMAGE is not set | 60 | # CONFIG_DEFAULT_UIMAGE is not set |
61 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
56 | CONFIG_PPC_DCR_NATIVE=y | 62 | CONFIG_PPC_DCR_NATIVE=y |
57 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
58 | CONFIG_PPC_DCR=y | 64 | CONFIG_PPC_DCR=y |
65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
60 | 68 | ||
61 | # | 69 | # |
62 | # General setup | 70 | # General setup |
@@ -70,9 +78,21 @@ CONFIG_SWAP=y | |||
70 | CONFIG_SYSVIPC=y | 78 | CONFIG_SYSVIPC=y |
71 | CONFIG_SYSVIPC_SYSCTL=y | 79 | CONFIG_SYSVIPC_SYSCTL=y |
72 | CONFIG_POSIX_MQUEUE=y | 80 | CONFIG_POSIX_MQUEUE=y |
81 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
73 | # CONFIG_BSD_PROCESS_ACCT is not set | 82 | # CONFIG_BSD_PROCESS_ACCT is not set |
74 | # CONFIG_TASKSTATS is not set | 83 | # CONFIG_TASKSTATS is not set |
75 | # CONFIG_AUDIT is not set | 84 | # CONFIG_AUDIT is not set |
85 | |||
86 | # | ||
87 | # RCU Subsystem | ||
88 | # | ||
89 | CONFIG_TREE_RCU=y | ||
90 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
91 | # CONFIG_TINY_RCU is not set | ||
92 | # CONFIG_RCU_TRACE is not set | ||
93 | CONFIG_RCU_FANOUT=32 | ||
94 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
95 | # CONFIG_TREE_RCU_TRACE is not set | ||
76 | # CONFIG_IKCONFIG is not set | 96 | # CONFIG_IKCONFIG is not set |
77 | CONFIG_LOG_BUF_SHIFT=14 | 97 | CONFIG_LOG_BUF_SHIFT=14 |
78 | CONFIG_GROUP_SCHED=y | 98 | CONFIG_GROUP_SCHED=y |
@@ -87,8 +107,12 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
87 | # CONFIG_NAMESPACES is not set | 107 | # CONFIG_NAMESPACES is not set |
88 | CONFIG_BLK_DEV_INITRD=y | 108 | CONFIG_BLK_DEV_INITRD=y |
89 | CONFIG_INITRAMFS_SOURCE="" | 109 | CONFIG_INITRAMFS_SOURCE="" |
110 | CONFIG_RD_GZIP=y | ||
111 | # CONFIG_RD_BZIP2 is not set | ||
112 | # CONFIG_RD_LZMA is not set | ||
90 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 113 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
91 | CONFIG_SYSCTL=y | 114 | CONFIG_SYSCTL=y |
115 | CONFIG_ANON_INODES=y | ||
92 | CONFIG_EMBEDDED=y | 116 | CONFIG_EMBEDDED=y |
93 | CONFIG_SYSCTL_SYSCALL=y | 117 | CONFIG_SYSCTL_SYSCALL=y |
94 | CONFIG_KALLSYMS=y | 118 | CONFIG_KALLSYMS=y |
@@ -98,19 +122,25 @@ CONFIG_HOTPLUG=y | |||
98 | CONFIG_PRINTK=y | 122 | CONFIG_PRINTK=y |
99 | CONFIG_BUG=y | 123 | CONFIG_BUG=y |
100 | CONFIG_ELF_CORE=y | 124 | CONFIG_ELF_CORE=y |
101 | CONFIG_COMPAT_BRK=y | ||
102 | CONFIG_BASE_FULL=y | 125 | CONFIG_BASE_FULL=y |
103 | CONFIG_FUTEX=y | 126 | CONFIG_FUTEX=y |
104 | CONFIG_ANON_INODES=y | ||
105 | CONFIG_EPOLL=y | 127 | CONFIG_EPOLL=y |
106 | CONFIG_SIGNALFD=y | 128 | CONFIG_SIGNALFD=y |
107 | CONFIG_TIMERFD=y | 129 | CONFIG_TIMERFD=y |
108 | CONFIG_EVENTFD=y | 130 | CONFIG_EVENTFD=y |
109 | CONFIG_SHMEM=y | 131 | CONFIG_SHMEM=y |
110 | CONFIG_AIO=y | 132 | CONFIG_AIO=y |
133 | CONFIG_HAVE_PERF_EVENTS=y | ||
134 | |||
135 | # | ||
136 | # Kernel Performance Events And Counters | ||
137 | # | ||
138 | # CONFIG_PERF_EVENTS is not set | ||
139 | # CONFIG_PERF_COUNTERS is not set | ||
111 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
112 | CONFIG_PCI_QUIRKS=y | 141 | CONFIG_PCI_QUIRKS=y |
113 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
143 | CONFIG_COMPAT_BRK=y | ||
114 | # CONFIG_SLAB is not set | 144 | # CONFIG_SLAB is not set |
115 | CONFIG_SLUB=y | 145 | CONFIG_SLUB=y |
116 | # CONFIG_SLOB is not set | 146 | # CONFIG_SLOB is not set |
@@ -122,6 +152,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
122 | CONFIG_HAVE_KPROBES=y | 152 | CONFIG_HAVE_KPROBES=y |
123 | CONFIG_HAVE_KRETPROBES=y | 153 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
155 | CONFIG_HAVE_DMA_ATTRS=y | ||
156 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
157 | |||
158 | # | ||
159 | # GCOV-based kernel profiling | ||
160 | # | ||
161 | # CONFIG_GCOV_KERNEL is not set | ||
162 | # CONFIG_SLOW_WORK is not set | ||
125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 163 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
126 | CONFIG_SLABINFO=y | 164 | CONFIG_SLABINFO=y |
127 | CONFIG_RT_MUTEXES=y | 165 | CONFIG_RT_MUTEXES=y |
@@ -133,8 +171,7 @@ CONFIG_MODULE_UNLOAD=y | |||
133 | # CONFIG_MODVERSIONS is not set | 171 | # CONFIG_MODVERSIONS is not set |
134 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 172 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
135 | CONFIG_BLOCK=y | 173 | CONFIG_BLOCK=y |
136 | CONFIG_LBD=y | 174 | CONFIG_LBDAF=y |
137 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
138 | # CONFIG_BLK_DEV_BSG is not set | 175 | # CONFIG_BLK_DEV_BSG is not set |
139 | # CONFIG_BLK_DEV_INTEGRITY is not set | 176 | # CONFIG_BLK_DEV_INTEGRITY is not set |
140 | 177 | ||
@@ -142,19 +179,41 @@ CONFIG_LBD=y | |||
142 | # IO Schedulers | 179 | # IO Schedulers |
143 | # | 180 | # |
144 | CONFIG_IOSCHED_NOOP=y | 181 | CONFIG_IOSCHED_NOOP=y |
145 | CONFIG_IOSCHED_AS=y | ||
146 | CONFIG_IOSCHED_DEADLINE=y | 182 | CONFIG_IOSCHED_DEADLINE=y |
147 | CONFIG_IOSCHED_CFQ=y | 183 | CONFIG_IOSCHED_CFQ=y |
148 | CONFIG_DEFAULT_AS=y | ||
149 | # CONFIG_DEFAULT_DEADLINE is not set | 184 | # CONFIG_DEFAULT_DEADLINE is not set |
150 | # CONFIG_DEFAULT_CFQ is not set | 185 | CONFIG_DEFAULT_CFQ=y |
151 | # CONFIG_DEFAULT_NOOP is not set | 186 | # CONFIG_DEFAULT_NOOP is not set |
152 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 187 | CONFIG_DEFAULT_IOSCHED="cfq" |
153 | CONFIG_CLASSIC_RCU=y | 188 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
154 | # CONFIG_TREE_RCU is not set | 189 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
155 | # CONFIG_PREEMPT_RCU is not set | 190 | # CONFIG_INLINE_SPIN_LOCK is not set |
156 | # CONFIG_TREE_RCU_TRACE is not set | 191 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
157 | # CONFIG_PREEMPT_RCU_TRACE is not set | 192 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
193 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
194 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
195 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
196 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
197 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
198 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
199 | # CONFIG_INLINE_READ_LOCK is not set | ||
200 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
201 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
203 | CONFIG_INLINE_READ_UNLOCK=y | ||
204 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
205 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
206 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
207 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
212 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
213 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
214 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
215 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
216 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
158 | # CONFIG_FREEZER is not set | 217 | # CONFIG_FREEZER is not set |
159 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 218 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
160 | 219 | ||
@@ -175,6 +234,8 @@ CONFIG_TAISHAN=y | |||
175 | # CONFIG_ARCHES is not set | 234 | # CONFIG_ARCHES is not set |
176 | # CONFIG_CANYONLANDS is not set | 235 | # CONFIG_CANYONLANDS is not set |
177 | # CONFIG_GLACIER is not set | 236 | # CONFIG_GLACIER is not set |
237 | # CONFIG_REDWOOD is not set | ||
238 | # CONFIG_EIGER is not set | ||
178 | # CONFIG_YOSEMITE is not set | 239 | # CONFIG_YOSEMITE is not set |
179 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 240 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
180 | CONFIG_PPC44x_SIMPLE=y | 241 | CONFIG_PPC44x_SIMPLE=y |
@@ -216,10 +277,12 @@ CONFIG_BINFMT_ELF=y | |||
216 | # CONFIG_BINFMT_MISC is not set | 277 | # CONFIG_BINFMT_MISC is not set |
217 | # CONFIG_MATH_EMULATION is not set | 278 | # CONFIG_MATH_EMULATION is not set |
218 | # CONFIG_IOMMU_HELPER is not set | 279 | # CONFIG_IOMMU_HELPER is not set |
219 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 280 | # CONFIG_SWIOTLB is not set |
220 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 281 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
221 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 282 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
222 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 283 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
284 | CONFIG_SPARSE_IRQ=y | ||
285 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
223 | CONFIG_ARCH_FLATMEM_ENABLE=y | 286 | CONFIG_ARCH_FLATMEM_ENABLE=y |
224 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 287 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
225 | CONFIG_SELECT_MEMORY_MODEL=y | 288 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -235,10 +298,13 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
235 | CONFIG_ZONE_DMA_FLAG=1 | 298 | CONFIG_ZONE_DMA_FLAG=1 |
236 | CONFIG_BOUNCE=y | 299 | CONFIG_BOUNCE=y |
237 | CONFIG_VIRT_TO_BUS=y | 300 | CONFIG_VIRT_TO_BUS=y |
238 | CONFIG_UNEVICTABLE_LRU=y | 301 | # CONFIG_KSM is not set |
302 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
303 | CONFIG_STDBINUTILS=y | ||
239 | CONFIG_PPC_4K_PAGES=y | 304 | CONFIG_PPC_4K_PAGES=y |
240 | # CONFIG_PPC_16K_PAGES is not set | 305 | # CONFIG_PPC_16K_PAGES is not set |
241 | # CONFIG_PPC_64K_PAGES is not set | 306 | # CONFIG_PPC_64K_PAGES is not set |
307 | # CONFIG_PPC_256K_PAGES is not set | ||
242 | CONFIG_FORCE_MAX_ZONEORDER=11 | 308 | CONFIG_FORCE_MAX_ZONEORDER=11 |
243 | CONFIG_PROC_DEVICETREE=y | 309 | CONFIG_PROC_DEVICETREE=y |
244 | CONFIG_CMDLINE_BOOL=y | 310 | CONFIG_CMDLINE_BOOL=y |
@@ -263,6 +329,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
263 | # CONFIG_PCI_LEGACY is not set | 329 | # CONFIG_PCI_LEGACY is not set |
264 | # CONFIG_PCI_DEBUG is not set | 330 | # CONFIG_PCI_DEBUG is not set |
265 | # CONFIG_PCI_STUB is not set | 331 | # CONFIG_PCI_STUB is not set |
332 | # CONFIG_PCI_IOV is not set | ||
266 | # CONFIG_PCCARD is not set | 333 | # CONFIG_PCCARD is not set |
267 | # CONFIG_HOTPLUG_PCI is not set | 334 | # CONFIG_HOTPLUG_PCI is not set |
268 | # CONFIG_HAS_RAPIDIO is not set | 335 | # CONFIG_HAS_RAPIDIO is not set |
@@ -280,14 +347,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
280 | CONFIG_KERNEL_START=0xc0000000 | 347 | CONFIG_KERNEL_START=0xc0000000 |
281 | CONFIG_PHYSICAL_START=0x00000000 | 348 | CONFIG_PHYSICAL_START=0x00000000 |
282 | CONFIG_TASK_SIZE=0xc0000000 | 349 | CONFIG_TASK_SIZE=0xc0000000 |
283 | CONFIG_CONSISTENT_START=0xff100000 | ||
284 | CONFIG_CONSISTENT_SIZE=0x00200000 | 350 | CONFIG_CONSISTENT_SIZE=0x00200000 |
285 | CONFIG_NET=y | 351 | CONFIG_NET=y |
286 | 352 | ||
287 | # | 353 | # |
288 | # Networking options | 354 | # Networking options |
289 | # | 355 | # |
290 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
291 | CONFIG_PACKET=y | 356 | CONFIG_PACKET=y |
292 | # CONFIG_PACKET_MMAP is not set | 357 | # CONFIG_PACKET_MMAP is not set |
293 | CONFIG_UNIX=y | 358 | CONFIG_UNIX=y |
@@ -324,6 +389,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
324 | # CONFIG_NETFILTER is not set | 389 | # CONFIG_NETFILTER is not set |
325 | # CONFIG_IP_DCCP is not set | 390 | # CONFIG_IP_DCCP is not set |
326 | # CONFIG_IP_SCTP is not set | 391 | # CONFIG_IP_SCTP is not set |
392 | # CONFIG_RDS is not set | ||
327 | # CONFIG_TIPC is not set | 393 | # CONFIG_TIPC is not set |
328 | # CONFIG_ATM is not set | 394 | # CONFIG_ATM is not set |
329 | # CONFIG_BRIDGE is not set | 395 | # CONFIG_BRIDGE is not set |
@@ -337,6 +403,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
337 | # CONFIG_LAPB is not set | 403 | # CONFIG_LAPB is not set |
338 | # CONFIG_ECONET is not set | 404 | # CONFIG_ECONET is not set |
339 | # CONFIG_WAN_ROUTER is not set | 405 | # CONFIG_WAN_ROUTER is not set |
406 | # CONFIG_PHONET is not set | ||
407 | # CONFIG_IEEE802154 is not set | ||
340 | # CONFIG_NET_SCHED is not set | 408 | # CONFIG_NET_SCHED is not set |
341 | # CONFIG_DCB is not set | 409 | # CONFIG_DCB is not set |
342 | 410 | ||
@@ -349,8 +417,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
349 | # CONFIG_IRDA is not set | 417 | # CONFIG_IRDA is not set |
350 | # CONFIG_BT is not set | 418 | # CONFIG_BT is not set |
351 | # CONFIG_AF_RXRPC is not set | 419 | # CONFIG_AF_RXRPC is not set |
352 | # CONFIG_PHONET is not set | 420 | CONFIG_WIRELESS=y |
353 | # CONFIG_WIRELESS is not set | 421 | # CONFIG_CFG80211 is not set |
422 | # CONFIG_LIB80211 is not set | ||
423 | |||
424 | # | ||
425 | # CFG80211 needs to be enabled for MAC80211 | ||
426 | # | ||
354 | # CONFIG_WIMAX is not set | 427 | # CONFIG_WIMAX is not set |
355 | # CONFIG_RFKILL is not set | 428 | # CONFIG_RFKILL is not set |
356 | # CONFIG_NET_9P is not set | 429 | # CONFIG_NET_9P is not set |
@@ -363,6 +436,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
363 | # Generic Driver Options | 436 | # Generic Driver Options |
364 | # | 437 | # |
365 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 438 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
439 | # CONFIG_DEVTMPFS is not set | ||
366 | CONFIG_STANDALONE=y | 440 | CONFIG_STANDALONE=y |
367 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 441 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
368 | CONFIG_FW_LOADER=y | 442 | CONFIG_FW_LOADER=y |
@@ -375,9 +449,9 @@ CONFIG_CONNECTOR=y | |||
375 | CONFIG_PROC_EVENTS=y | 449 | CONFIG_PROC_EVENTS=y |
376 | CONFIG_MTD=y | 450 | CONFIG_MTD=y |
377 | # CONFIG_MTD_DEBUG is not set | 451 | # CONFIG_MTD_DEBUG is not set |
452 | # CONFIG_MTD_TESTS is not set | ||
378 | # CONFIG_MTD_CONCAT is not set | 453 | # CONFIG_MTD_CONCAT is not set |
379 | CONFIG_MTD_PARTITIONS=y | 454 | CONFIG_MTD_PARTITIONS=y |
380 | # CONFIG_MTD_TESTS is not set | ||
381 | # CONFIG_MTD_REDBOOT_PARTS is not set | 455 | # CONFIG_MTD_REDBOOT_PARTS is not set |
382 | CONFIG_MTD_CMDLINE_PARTS=y | 456 | CONFIG_MTD_CMDLINE_PARTS=y |
383 | # CONFIG_MTD_OF_PARTS is not set | 457 | # CONFIG_MTD_OF_PARTS is not set |
@@ -453,7 +527,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
453 | # LPDDR flash memory drivers | 527 | # LPDDR flash memory drivers |
454 | # | 528 | # |
455 | # CONFIG_MTD_LPDDR is not set | 529 | # CONFIG_MTD_LPDDR is not set |
456 | # CONFIG_MTD_QINFO_PROBE is not set | ||
457 | 530 | ||
458 | # | 531 | # |
459 | # UBI - Unsorted block images | 532 | # UBI - Unsorted block images |
@@ -469,6 +542,7 @@ CONFIG_BLK_DEV=y | |||
469 | # CONFIG_BLK_DEV_UMEM is not set | 542 | # CONFIG_BLK_DEV_UMEM is not set |
470 | # CONFIG_BLK_DEV_COW_COMMON is not set | 543 | # CONFIG_BLK_DEV_COW_COMMON is not set |
471 | # CONFIG_BLK_DEV_LOOP is not set | 544 | # CONFIG_BLK_DEV_LOOP is not set |
545 | # CONFIG_BLK_DEV_DRBD is not set | ||
472 | # CONFIG_BLK_DEV_NBD is not set | 546 | # CONFIG_BLK_DEV_NBD is not set |
473 | # CONFIG_BLK_DEV_SX8 is not set | 547 | # CONFIG_BLK_DEV_SX8 is not set |
474 | CONFIG_BLK_DEV_RAM=y | 548 | CONFIG_BLK_DEV_RAM=y |
@@ -481,12 +555,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
481 | # CONFIG_BLK_DEV_HD is not set | 555 | # CONFIG_BLK_DEV_HD is not set |
482 | CONFIG_MISC_DEVICES=y | 556 | CONFIG_MISC_DEVICES=y |
483 | # CONFIG_PHANTOM is not set | 557 | # CONFIG_PHANTOM is not set |
484 | # CONFIG_EEPROM_93CX6 is not set | ||
485 | # CONFIG_SGI_IOC4 is not set | 558 | # CONFIG_SGI_IOC4 is not set |
486 | # CONFIG_TIFM_CORE is not set | 559 | # CONFIG_TIFM_CORE is not set |
487 | # CONFIG_ENCLOSURE_SERVICES is not set | 560 | # CONFIG_ENCLOSURE_SERVICES is not set |
488 | # CONFIG_HP_ILO is not set | 561 | # CONFIG_HP_ILO is not set |
489 | # CONFIG_C2PORT is not set | 562 | # CONFIG_C2PORT is not set |
563 | |||
564 | # | ||
565 | # EEPROM support | ||
566 | # | ||
567 | # CONFIG_EEPROM_93CX6 is not set | ||
568 | # CONFIG_CB710_CORE is not set | ||
490 | CONFIG_HAVE_IDE=y | 569 | CONFIG_HAVE_IDE=y |
491 | # CONFIG_IDE is not set | 570 | # CONFIG_IDE is not set |
492 | 571 | ||
@@ -506,7 +585,11 @@ CONFIG_HAVE_IDE=y | |||
506 | # | 585 | # |
507 | 586 | ||
508 | # | 587 | # |
509 | # Enable only one of the two stacks, unless you know what you are doing | 588 | # You can enable one or both FireWire driver stacks. |
589 | # | ||
590 | |||
591 | # | ||
592 | # See the help texts for more information. | ||
510 | # | 593 | # |
511 | # CONFIG_FIREWIRE is not set | 594 | # CONFIG_FIREWIRE is not set |
512 | # CONFIG_IEEE1394 is not set | 595 | # CONFIG_IEEE1394 is not set |
@@ -529,6 +612,8 @@ CONFIG_NET_ETHERNET=y | |||
529 | # CONFIG_SUNGEM is not set | 612 | # CONFIG_SUNGEM is not set |
530 | # CONFIG_CASSINI is not set | 613 | # CONFIG_CASSINI is not set |
531 | # CONFIG_NET_VENDOR_3COM is not set | 614 | # CONFIG_NET_VENDOR_3COM is not set |
615 | # CONFIG_ETHOC is not set | ||
616 | # CONFIG_DNET is not set | ||
532 | # CONFIG_NET_TULIP is not set | 617 | # CONFIG_NET_TULIP is not set |
533 | # CONFIG_HP100 is not set | 618 | # CONFIG_HP100 is not set |
534 | CONFIG_IBM_NEW_EMAC=y | 619 | CONFIG_IBM_NEW_EMAC=y |
@@ -547,7 +632,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
547 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 632 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
548 | # CONFIG_NET_PCI is not set | 633 | # CONFIG_NET_PCI is not set |
549 | # CONFIG_B44 is not set | 634 | # CONFIG_B44 is not set |
635 | # CONFIG_KS8842 is not set | ||
636 | # CONFIG_KS8851_MLL is not set | ||
550 | # CONFIG_ATL2 is not set | 637 | # CONFIG_ATL2 is not set |
638 | # CONFIG_XILINX_EMACLITE is not set | ||
551 | CONFIG_NETDEV_1000=y | 639 | CONFIG_NETDEV_1000=y |
552 | # CONFIG_ACENIC is not set | 640 | # CONFIG_ACENIC is not set |
553 | # CONFIG_DL2K is not set | 641 | # CONFIG_DL2K is not set |
@@ -555,6 +643,7 @@ CONFIG_NETDEV_1000=y | |||
555 | # CONFIG_E1000E is not set | 643 | # CONFIG_E1000E is not set |
556 | # CONFIG_IP1000 is not set | 644 | # CONFIG_IP1000 is not set |
557 | # CONFIG_IGB is not set | 645 | # CONFIG_IGB is not set |
646 | # CONFIG_IGBVF is not set | ||
558 | # CONFIG_NS83820 is not set | 647 | # CONFIG_NS83820 is not set |
559 | # CONFIG_HAMACHI is not set | 648 | # CONFIG_HAMACHI is not set |
560 | # CONFIG_YELLOWFIN is not set | 649 | # CONFIG_YELLOWFIN is not set |
@@ -565,9 +654,13 @@ CONFIG_NETDEV_1000=y | |||
565 | # CONFIG_VIA_VELOCITY is not set | 654 | # CONFIG_VIA_VELOCITY is not set |
566 | # CONFIG_TIGON3 is not set | 655 | # CONFIG_TIGON3 is not set |
567 | # CONFIG_BNX2 is not set | 656 | # CONFIG_BNX2 is not set |
657 | # CONFIG_CNIC is not set | ||
658 | # CONFIG_MV643XX_ETH is not set | ||
659 | # CONFIG_XILINX_LL_TEMAC is not set | ||
568 | # CONFIG_QLA3XXX is not set | 660 | # CONFIG_QLA3XXX is not set |
569 | # CONFIG_ATL1 is not set | 661 | # CONFIG_ATL1 is not set |
570 | # CONFIG_ATL1E is not set | 662 | # CONFIG_ATL1E is not set |
663 | # CONFIG_ATL1C is not set | ||
571 | # CONFIG_JME is not set | 664 | # CONFIG_JME is not set |
572 | CONFIG_NETDEV_10000=y | 665 | CONFIG_NETDEV_10000=y |
573 | # CONFIG_CHELSIO_T1 is not set | 666 | # CONFIG_CHELSIO_T1 is not set |
@@ -577,6 +670,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
577 | # CONFIG_IXGBE is not set | 670 | # CONFIG_IXGBE is not set |
578 | # CONFIG_IXGB is not set | 671 | # CONFIG_IXGB is not set |
579 | # CONFIG_S2IO is not set | 672 | # CONFIG_S2IO is not set |
673 | # CONFIG_VXGE is not set | ||
580 | # CONFIG_MYRI10GE is not set | 674 | # CONFIG_MYRI10GE is not set |
581 | # CONFIG_NETXEN_NIC is not set | 675 | # CONFIG_NETXEN_NIC is not set |
582 | # CONFIG_NIU is not set | 676 | # CONFIG_NIU is not set |
@@ -586,14 +680,13 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
586 | # CONFIG_BNX2X is not set | 680 | # CONFIG_BNX2X is not set |
587 | # CONFIG_QLGE is not set | 681 | # CONFIG_QLGE is not set |
588 | # CONFIG_SFC is not set | 682 | # CONFIG_SFC is not set |
683 | # CONFIG_BE2NET is not set | ||
589 | # CONFIG_TR is not set | 684 | # CONFIG_TR is not set |
590 | 685 | CONFIG_WLAN=y | |
591 | # | 686 | # CONFIG_AIRO is not set |
592 | # Wireless LAN | 687 | # CONFIG_ATMEL is not set |
593 | # | 688 | # CONFIG_PRISM54 is not set |
594 | # CONFIG_WLAN_PRE80211 is not set | 689 | # CONFIG_HOSTAP is not set |
595 | # CONFIG_WLAN_80211 is not set | ||
596 | # CONFIG_IWLWIFI_LEDS is not set | ||
597 | 690 | ||
598 | # | 691 | # |
599 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 692 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -606,6 +699,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
606 | # CONFIG_NETCONSOLE is not set | 699 | # CONFIG_NETCONSOLE is not set |
607 | # CONFIG_NETPOLL is not set | 700 | # CONFIG_NETPOLL is not set |
608 | # CONFIG_NET_POLL_CONTROLLER is not set | 701 | # CONFIG_NET_POLL_CONTROLLER is not set |
702 | # CONFIG_VMXNET3 is not set | ||
609 | # CONFIG_ISDN is not set | 703 | # CONFIG_ISDN is not set |
610 | # CONFIG_PHONE is not set | 704 | # CONFIG_PHONE is not set |
611 | 705 | ||
@@ -651,6 +745,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
651 | # CONFIG_SERIAL_JSM is not set | 745 | # CONFIG_SERIAL_JSM is not set |
652 | CONFIG_SERIAL_OF_PLATFORM=y | 746 | CONFIG_SERIAL_OF_PLATFORM=y |
653 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 747 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
748 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
654 | CONFIG_UNIX98_PTYS=y | 749 | CONFIG_UNIX98_PTYS=y |
655 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 750 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
656 | CONFIG_LEGACY_PTYS=y | 751 | CONFIG_LEGACY_PTYS=y |
@@ -667,6 +762,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
667 | CONFIG_DEVPORT=y | 762 | CONFIG_DEVPORT=y |
668 | # CONFIG_I2C is not set | 763 | # CONFIG_I2C is not set |
669 | # CONFIG_SPI is not set | 764 | # CONFIG_SPI is not set |
765 | |||
766 | # | ||
767 | # PPS support | ||
768 | # | ||
769 | # CONFIG_PPS is not set | ||
670 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 770 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
671 | # CONFIG_GPIOLIB is not set | 771 | # CONFIG_GPIOLIB is not set |
672 | # CONFIG_W1 is not set | 772 | # CONFIG_W1 is not set |
@@ -689,27 +789,13 @@ CONFIG_SSB_POSSIBLE=y | |||
689 | # CONFIG_HTC_PASIC3 is not set | 789 | # CONFIG_HTC_PASIC3 is not set |
690 | # CONFIG_MFD_TMIO is not set | 790 | # CONFIG_MFD_TMIO is not set |
691 | # CONFIG_REGULATOR is not set | 791 | # CONFIG_REGULATOR is not set |
692 | 792 | # CONFIG_MEDIA_SUPPORT is not set | |
693 | # | ||
694 | # Multimedia devices | ||
695 | # | ||
696 | |||
697 | # | ||
698 | # Multimedia core support | ||
699 | # | ||
700 | # CONFIG_VIDEO_DEV is not set | ||
701 | # CONFIG_DVB_CORE is not set | ||
702 | # CONFIG_VIDEO_MEDIA is not set | ||
703 | |||
704 | # | ||
705 | # Multimedia drivers | ||
706 | # | ||
707 | CONFIG_DAB=y | ||
708 | 793 | ||
709 | # | 794 | # |
710 | # Graphics support | 795 | # Graphics support |
711 | # | 796 | # |
712 | # CONFIG_AGP is not set | 797 | # CONFIG_AGP is not set |
798 | CONFIG_VGA_ARB=y | ||
713 | # CONFIG_DRM is not set | 799 | # CONFIG_DRM is not set |
714 | # CONFIG_VGASTATE is not set | 800 | # CONFIG_VGASTATE is not set |
715 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 801 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -734,7 +820,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
734 | # | 820 | # |
735 | 821 | ||
736 | # | 822 | # |
737 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 823 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
738 | # | 824 | # |
739 | # CONFIG_USB_GADGET is not set | 825 | # CONFIG_USB_GADGET is not set |
740 | 826 | ||
@@ -750,7 +836,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
750 | # CONFIG_EDAC is not set | 836 | # CONFIG_EDAC is not set |
751 | # CONFIG_RTC_CLASS is not set | 837 | # CONFIG_RTC_CLASS is not set |
752 | # CONFIG_DMADEVICES is not set | 838 | # CONFIG_DMADEVICES is not set |
839 | # CONFIG_AUXDISPLAY is not set | ||
753 | # CONFIG_UIO is not set | 840 | # CONFIG_UIO is not set |
841 | |||
842 | # | ||
843 | # TI VLYNQ | ||
844 | # | ||
754 | # CONFIG_STAGING is not set | 845 | # CONFIG_STAGING is not set |
755 | 846 | ||
756 | # | 847 | # |
@@ -761,14 +852,17 @@ CONFIG_EXT2_FS=y | |||
761 | # CONFIG_EXT2_FS_XIP is not set | 852 | # CONFIG_EXT2_FS_XIP is not set |
762 | # CONFIG_EXT3_FS is not set | 853 | # CONFIG_EXT3_FS is not set |
763 | # CONFIG_EXT4_FS is not set | 854 | # CONFIG_EXT4_FS is not set |
855 | CONFIG_EXT4_USE_FOR_EXT23=y | ||
764 | # CONFIG_REISERFS_FS is not set | 856 | # CONFIG_REISERFS_FS is not set |
765 | # CONFIG_JFS_FS is not set | 857 | # CONFIG_JFS_FS is not set |
766 | # CONFIG_FS_POSIX_ACL is not set | 858 | # CONFIG_FS_POSIX_ACL is not set |
767 | CONFIG_FILE_LOCKING=y | ||
768 | # CONFIG_XFS_FS is not set | 859 | # CONFIG_XFS_FS is not set |
769 | # CONFIG_GFS2_FS is not set | 860 | # CONFIG_GFS2_FS is not set |
770 | # CONFIG_OCFS2_FS is not set | 861 | # CONFIG_OCFS2_FS is not set |
771 | # CONFIG_BTRFS_FS is not set | 862 | # CONFIG_BTRFS_FS is not set |
863 | # CONFIG_NILFS2_FS is not set | ||
864 | CONFIG_FILE_LOCKING=y | ||
865 | CONFIG_FSNOTIFY=y | ||
772 | CONFIG_DNOTIFY=y | 866 | CONFIG_DNOTIFY=y |
773 | CONFIG_INOTIFY=y | 867 | CONFIG_INOTIFY=y |
774 | CONFIG_INOTIFY_USER=y | 868 | CONFIG_INOTIFY_USER=y |
@@ -778,6 +872,11 @@ CONFIG_INOTIFY_USER=y | |||
778 | # CONFIG_FUSE_FS is not set | 872 | # CONFIG_FUSE_FS is not set |
779 | 873 | ||
780 | # | 874 | # |
875 | # Caches | ||
876 | # | ||
877 | # CONFIG_FSCACHE is not set | ||
878 | |||
879 | # | ||
781 | # CD-ROM/DVD Filesystems | 880 | # CD-ROM/DVD Filesystems |
782 | # | 881 | # |
783 | # CONFIG_ISO9660_FS is not set | 882 | # CONFIG_ISO9660_FS is not set |
@@ -832,7 +931,6 @@ CONFIG_LOCKD=y | |||
832 | CONFIG_LOCKD_V4=y | 931 | CONFIG_LOCKD_V4=y |
833 | CONFIG_NFS_COMMON=y | 932 | CONFIG_NFS_COMMON=y |
834 | CONFIG_SUNRPC=y | 933 | CONFIG_SUNRPC=y |
835 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
836 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 934 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
837 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 935 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
838 | # CONFIG_SMB_FS is not set | 936 | # CONFIG_SMB_FS is not set |
@@ -848,6 +946,7 @@ CONFIG_SUNRPC=y | |||
848 | CONFIG_MSDOS_PARTITION=y | 946 | CONFIG_MSDOS_PARTITION=y |
849 | # CONFIG_NLS is not set | 947 | # CONFIG_NLS is not set |
850 | # CONFIG_DLM is not set | 948 | # CONFIG_DLM is not set |
949 | # CONFIG_BINARY_PRINTF is not set | ||
851 | 950 | ||
852 | # | 951 | # |
853 | # Library routines | 952 | # Library routines |
@@ -862,11 +961,13 @@ CONFIG_CRC32=y | |||
862 | # CONFIG_CRC7 is not set | 961 | # CONFIG_CRC7 is not set |
863 | # CONFIG_LIBCRC32C is not set | 962 | # CONFIG_LIBCRC32C is not set |
864 | CONFIG_ZLIB_INFLATE=y | 963 | CONFIG_ZLIB_INFLATE=y |
865 | CONFIG_PLIST=y | 964 | CONFIG_DECOMPRESS_GZIP=y |
866 | CONFIG_HAS_IOMEM=y | 965 | CONFIG_HAS_IOMEM=y |
867 | CONFIG_HAS_IOPORT=y | 966 | CONFIG_HAS_IOPORT=y |
868 | CONFIG_HAS_DMA=y | 967 | CONFIG_HAS_DMA=y |
869 | CONFIG_HAVE_LMB=y | 968 | CONFIG_HAVE_LMB=y |
969 | CONFIG_NLATTR=y | ||
970 | CONFIG_GENERIC_ATOMIC64=y | ||
870 | 971 | ||
871 | # | 972 | # |
872 | # Kernel hacking | 973 | # Kernel hacking |
@@ -876,6 +977,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
876 | CONFIG_ENABLE_MUST_CHECK=y | 977 | CONFIG_ENABLE_MUST_CHECK=y |
877 | CONFIG_FRAME_WARN=1024 | 978 | CONFIG_FRAME_WARN=1024 |
878 | CONFIG_MAGIC_SYSRQ=y | 979 | CONFIG_MAGIC_SYSRQ=y |
980 | # CONFIG_STRIP_ASM_SYMS is not set | ||
879 | # CONFIG_UNUSED_SYMBOLS is not set | 981 | # CONFIG_UNUSED_SYMBOLS is not set |
880 | CONFIG_DEBUG_FS=y | 982 | CONFIG_DEBUG_FS=y |
881 | # CONFIG_HEADERS_CHECK is not set | 983 | # CONFIG_HEADERS_CHECK is not set |
@@ -884,16 +986,23 @@ CONFIG_DEBUG_KERNEL=y | |||
884 | CONFIG_DETECT_SOFTLOCKUP=y | 986 | CONFIG_DETECT_SOFTLOCKUP=y |
885 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 987 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
886 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 988 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
989 | CONFIG_DETECT_HUNG_TASK=y | ||
990 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
991 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
887 | CONFIG_SCHED_DEBUG=y | 992 | CONFIG_SCHED_DEBUG=y |
888 | # CONFIG_SCHEDSTATS is not set | 993 | # CONFIG_SCHEDSTATS is not set |
889 | # CONFIG_TIMER_STATS is not set | 994 | # CONFIG_TIMER_STATS is not set |
890 | # CONFIG_DEBUG_OBJECTS is not set | 995 | # CONFIG_DEBUG_OBJECTS is not set |
891 | # CONFIG_SLUB_DEBUG_ON is not set | 996 | # CONFIG_SLUB_DEBUG_ON is not set |
892 | # CONFIG_SLUB_STATS is not set | 997 | # CONFIG_SLUB_STATS is not set |
998 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
893 | # CONFIG_DEBUG_RT_MUTEXES is not set | 999 | # CONFIG_DEBUG_RT_MUTEXES is not set |
894 | # CONFIG_RT_MUTEX_TESTER is not set | 1000 | # CONFIG_RT_MUTEX_TESTER is not set |
895 | # CONFIG_DEBUG_SPINLOCK is not set | 1001 | # CONFIG_DEBUG_SPINLOCK is not set |
896 | # CONFIG_DEBUG_MUTEXES is not set | 1002 | # CONFIG_DEBUG_MUTEXES is not set |
1003 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1004 | # CONFIG_PROVE_LOCKING is not set | ||
1005 | # CONFIG_LOCK_STAT is not set | ||
897 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1006 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
898 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1007 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
899 | # CONFIG_DEBUG_KOBJECT is not set | 1008 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -905,35 +1014,45 @@ CONFIG_SCHED_DEBUG=y | |||
905 | # CONFIG_DEBUG_LIST is not set | 1014 | # CONFIG_DEBUG_LIST is not set |
906 | # CONFIG_DEBUG_SG is not set | 1015 | # CONFIG_DEBUG_SG is not set |
907 | # CONFIG_DEBUG_NOTIFIERS is not set | 1016 | # CONFIG_DEBUG_NOTIFIERS is not set |
908 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1017 | # CONFIG_DEBUG_CREDENTIALS is not set |
909 | # CONFIG_RCU_TORTURE_TEST is not set | 1018 | # CONFIG_RCU_TORTURE_TEST is not set |
910 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1019 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
911 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1020 | # CONFIG_BACKTRACE_SELF_TEST is not set |
912 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1021 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1022 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
913 | # CONFIG_FAULT_INJECTION is not set | 1023 | # CONFIG_FAULT_INJECTION is not set |
914 | # CONFIG_LATENCYTOP is not set | 1024 | # CONFIG_LATENCYTOP is not set |
915 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1025 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1026 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
916 | CONFIG_HAVE_FUNCTION_TRACER=y | 1027 | CONFIG_HAVE_FUNCTION_TRACER=y |
1028 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
917 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1029 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
918 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1030 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
919 | 1031 | CONFIG_TRACING_SUPPORT=y | |
920 | # | 1032 | CONFIG_FTRACE=y |
921 | # Tracers | ||
922 | # | ||
923 | # CONFIG_FUNCTION_TRACER is not set | 1033 | # CONFIG_FUNCTION_TRACER is not set |
1034 | # CONFIG_IRQSOFF_TRACER is not set | ||
924 | # CONFIG_SCHED_TRACER is not set | 1035 | # CONFIG_SCHED_TRACER is not set |
925 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1036 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
926 | # CONFIG_BOOT_TRACER is not set | 1037 | # CONFIG_BOOT_TRACER is not set |
927 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1038 | CONFIG_BRANCH_PROFILE_NONE=y |
1039 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1040 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
928 | # CONFIG_STACK_TRACER is not set | 1041 | # CONFIG_STACK_TRACER is not set |
929 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1042 | # CONFIG_KMEMTRACE is not set |
1043 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1044 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1045 | # CONFIG_DYNAMIC_DEBUG is not set | ||
1046 | # CONFIG_DMA_API_DEBUG is not set | ||
930 | # CONFIG_SAMPLES is not set | 1047 | # CONFIG_SAMPLES is not set |
931 | CONFIG_HAVE_ARCH_KGDB=y | 1048 | CONFIG_HAVE_ARCH_KGDB=y |
932 | # CONFIG_KGDB is not set | 1049 | # CONFIG_KGDB is not set |
1050 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1051 | CONFIG_PPC_WERROR=y | ||
933 | CONFIG_PRINT_STACK_DEPTH=64 | 1052 | CONFIG_PRINT_STACK_DEPTH=64 |
934 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1053 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
935 | # CONFIG_DEBUG_STACK_USAGE is not set | 1054 | # CONFIG_DEBUG_STACK_USAGE is not set |
936 | # CONFIG_DEBUG_PAGEALLOC is not set | 1055 | # CONFIG_PPC_EMULATED_STATS is not set |
937 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1056 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
938 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1057 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
939 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1058 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -949,13 +1068,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
949 | # CONFIG_KEYS is not set | 1068 | # CONFIG_KEYS is not set |
950 | # CONFIG_SECURITY is not set | 1069 | # CONFIG_SECURITY is not set |
951 | # CONFIG_SECURITYFS is not set | 1070 | # CONFIG_SECURITYFS is not set |
952 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1071 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1072 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1073 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1074 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1075 | CONFIG_DEFAULT_SECURITY="" | ||
953 | CONFIG_CRYPTO=y | 1076 | CONFIG_CRYPTO=y |
954 | 1077 | ||
955 | # | 1078 | # |
956 | # Crypto core or helper | 1079 | # Crypto core or helper |
957 | # | 1080 | # |
958 | # CONFIG_CRYPTO_FIPS is not set | ||
959 | CONFIG_CRYPTO_ALGAPI=y | 1081 | CONFIG_CRYPTO_ALGAPI=y |
960 | CONFIG_CRYPTO_ALGAPI2=y | 1082 | CONFIG_CRYPTO_ALGAPI2=y |
961 | CONFIG_CRYPTO_AEAD2=y | 1083 | CONFIG_CRYPTO_AEAD2=y |
@@ -964,10 +1086,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
964 | CONFIG_CRYPTO_HASH=y | 1086 | CONFIG_CRYPTO_HASH=y |
965 | CONFIG_CRYPTO_HASH2=y | 1087 | CONFIG_CRYPTO_HASH2=y |
966 | CONFIG_CRYPTO_RNG2=y | 1088 | CONFIG_CRYPTO_RNG2=y |
1089 | CONFIG_CRYPTO_PCOMP=y | ||
967 | CONFIG_CRYPTO_MANAGER=y | 1090 | CONFIG_CRYPTO_MANAGER=y |
968 | CONFIG_CRYPTO_MANAGER2=y | 1091 | CONFIG_CRYPTO_MANAGER2=y |
969 | # CONFIG_CRYPTO_GF128MUL is not set | 1092 | # CONFIG_CRYPTO_GF128MUL is not set |
970 | # CONFIG_CRYPTO_NULL is not set | 1093 | # CONFIG_CRYPTO_NULL is not set |
1094 | CONFIG_CRYPTO_WORKQUEUE=y | ||
971 | # CONFIG_CRYPTO_CRYPTD is not set | 1095 | # CONFIG_CRYPTO_CRYPTD is not set |
972 | # CONFIG_CRYPTO_AUTHENC is not set | 1096 | # CONFIG_CRYPTO_AUTHENC is not set |
973 | # CONFIG_CRYPTO_TEST is not set | 1097 | # CONFIG_CRYPTO_TEST is not set |
@@ -995,11 +1119,13 @@ CONFIG_CRYPTO_PCBC=y | |||
995 | # | 1119 | # |
996 | # CONFIG_CRYPTO_HMAC is not set | 1120 | # CONFIG_CRYPTO_HMAC is not set |
997 | # CONFIG_CRYPTO_XCBC is not set | 1121 | # CONFIG_CRYPTO_XCBC is not set |
1122 | # CONFIG_CRYPTO_VMAC is not set | ||
998 | 1123 | ||
999 | # | 1124 | # |
1000 | # Digest | 1125 | # Digest |
1001 | # | 1126 | # |
1002 | # CONFIG_CRYPTO_CRC32C is not set | 1127 | # CONFIG_CRYPTO_CRC32C is not set |
1128 | # CONFIG_CRYPTO_GHASH is not set | ||
1003 | # CONFIG_CRYPTO_MD4 is not set | 1129 | # CONFIG_CRYPTO_MD4 is not set |
1004 | CONFIG_CRYPTO_MD5=y | 1130 | CONFIG_CRYPTO_MD5=y |
1005 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1131 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1036,6 +1162,7 @@ CONFIG_CRYPTO_DES=y | |||
1036 | # Compression | 1162 | # Compression |
1037 | # | 1163 | # |
1038 | # CONFIG_CRYPTO_DEFLATE is not set | 1164 | # CONFIG_CRYPTO_DEFLATE is not set |
1165 | # CONFIG_CRYPTO_ZLIB is not set | ||
1039 | # CONFIG_CRYPTO_LZO is not set | 1166 | # CONFIG_CRYPTO_LZO is not set |
1040 | 1167 | ||
1041 | # | 1168 | # |
@@ -1044,5 +1171,6 @@ CONFIG_CRYPTO_DES=y | |||
1044 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1171 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
1045 | CONFIG_CRYPTO_HW=y | 1172 | CONFIG_CRYPTO_HW=y |
1046 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1173 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1174 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
1047 | # CONFIG_PPC_CLOCK is not set | 1175 | # CONFIG_PPC_CLOCK is not set |
1048 | # CONFIG_VIRTUALIZATION is not set | 1176 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig index 787635f23d8f..99eff4dd9364 100644 --- a/arch/powerpc/configs/44x/warp_defconfig +++ b/arch/powerpc/configs/44x/warp_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.30 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Tue Jun 9 23:35:36 2009 | 4 | # Mon Jan 4 15:27:46 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -20,6 +20,7 @@ CONFIG_BOOKE=y | |||
20 | CONFIG_PTE_64BIT=y | 20 | CONFIG_PTE_64BIT=y |
21 | CONFIG_PHYS_64BIT=y | 21 | CONFIG_PHYS_64BIT=y |
22 | CONFIG_PPC_MMU_NOHASH=y | 22 | CONFIG_PPC_MMU_NOHASH=y |
23 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 25 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
@@ -31,15 +32,18 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
36 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -56,11 +60,13 @@ CONFIG_AUDIT_ARCH=y | |||
56 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
57 | CONFIG_DTC=y | 61 | CONFIG_DTC=y |
58 | # CONFIG_DEFAULT_UIMAGE is not set | 62 | # CONFIG_DEFAULT_UIMAGE is not set |
63 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
59 | CONFIG_PPC_DCR_NATIVE=y | 64 | CONFIG_PPC_DCR_NATIVE=y |
60 | # CONFIG_PPC_DCR_MMIO is not set | 65 | # CONFIG_PPC_DCR_MMIO is not set |
61 | CONFIG_PPC_DCR=y | 66 | CONFIG_PPC_DCR=y |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 67 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 68 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
69 | CONFIG_CONSTRUCTORS=y | ||
64 | 70 | ||
65 | # | 71 | # |
66 | # General setup | 72 | # General setup |
@@ -81,11 +87,13 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
81 | # | 87 | # |
82 | # RCU Subsystem | 88 | # RCU Subsystem |
83 | # | 89 | # |
84 | CONFIG_CLASSIC_RCU=y | 90 | CONFIG_TREE_RCU=y |
85 | # CONFIG_TREE_RCU is not set | 91 | # CONFIG_TREE_PREEMPT_RCU is not set |
86 | # CONFIG_PREEMPT_RCU is not set | 92 | # CONFIG_TINY_RCU is not set |
93 | # CONFIG_RCU_TRACE is not set | ||
94 | CONFIG_RCU_FANOUT=32 | ||
95 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
87 | # CONFIG_TREE_RCU_TRACE is not set | 96 | # CONFIG_TREE_RCU_TRACE is not set |
88 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
89 | CONFIG_IKCONFIG=y | 97 | CONFIG_IKCONFIG=y |
90 | CONFIG_IKCONFIG_PROC=y | 98 | CONFIG_IKCONFIG_PROC=y |
91 | CONFIG_LOG_BUF_SHIFT=14 | 99 | CONFIG_LOG_BUF_SHIFT=14 |
@@ -111,7 +119,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
111 | CONFIG_KALLSYMS=y | 119 | CONFIG_KALLSYMS=y |
112 | # CONFIG_KALLSYMS_ALL is not set | 120 | # CONFIG_KALLSYMS_ALL is not set |
113 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 121 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
114 | # CONFIG_STRIP_ASM_SYMS is not set | ||
115 | CONFIG_HOTPLUG=y | 122 | CONFIG_HOTPLUG=y |
116 | CONFIG_PRINTK=y | 123 | CONFIG_PRINTK=y |
117 | CONFIG_BUG=y | 124 | CONFIG_BUG=y |
@@ -124,6 +131,13 @@ CONFIG_TIMERFD=y | |||
124 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
125 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
126 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_EVENTS=y | ||
135 | |||
136 | # | ||
137 | # Kernel Performance Events And Counters | ||
138 | # | ||
139 | # CONFIG_PERF_EVENTS is not set | ||
140 | # CONFIG_PERF_COUNTERS is not set | ||
127 | CONFIG_VM_EVENT_COUNTERS=y | 141 | CONFIG_VM_EVENT_COUNTERS=y |
128 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
129 | CONFIG_COMPAT_BRK=y | 143 | CONFIG_COMPAT_BRK=y |
@@ -131,7 +145,6 @@ CONFIG_COMPAT_BRK=y | |||
131 | CONFIG_SLUB=y | 145 | CONFIG_SLUB=y |
132 | # CONFIG_SLOB is not set | 146 | # CONFIG_SLOB is not set |
133 | # CONFIG_PROFILING is not set | 147 | # CONFIG_PROFILING is not set |
134 | # CONFIG_MARKERS is not set | ||
135 | CONFIG_HAVE_OPROFILE=y | 148 | CONFIG_HAVE_OPROFILE=y |
136 | # CONFIG_KPROBES is not set | 149 | # CONFIG_KPROBES is not set |
137 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 150 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
@@ -139,6 +152,13 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
139 | CONFIG_HAVE_KPROBES=y | 152 | CONFIG_HAVE_KPROBES=y |
140 | CONFIG_HAVE_KRETPROBES=y | 153 | CONFIG_HAVE_KRETPROBES=y |
141 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
155 | CONFIG_HAVE_DMA_ATTRS=y | ||
156 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
157 | |||
158 | # | ||
159 | # GCOV-based kernel profiling | ||
160 | # | ||
161 | # CONFIG_GCOV_KERNEL is not set | ||
142 | # CONFIG_SLOW_WORK is not set | 162 | # CONFIG_SLOW_WORK is not set |
143 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 163 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
144 | CONFIG_SLABINFO=y | 164 | CONFIG_SLABINFO=y |
@@ -151,7 +171,7 @@ CONFIG_MODULE_UNLOAD=y | |||
151 | # CONFIG_MODVERSIONS is not set | 171 | # CONFIG_MODVERSIONS is not set |
152 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 172 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
153 | CONFIG_BLOCK=y | 173 | CONFIG_BLOCK=y |
154 | # CONFIG_LBD is not set | 174 | CONFIG_LBDAF=y |
155 | # CONFIG_BLK_DEV_BSG is not set | 175 | # CONFIG_BLK_DEV_BSG is not set |
156 | # CONFIG_BLK_DEV_INTEGRITY is not set | 176 | # CONFIG_BLK_DEV_INTEGRITY is not set |
157 | 177 | ||
@@ -159,14 +179,41 @@ CONFIG_BLOCK=y | |||
159 | # IO Schedulers | 179 | # IO Schedulers |
160 | # | 180 | # |
161 | CONFIG_IOSCHED_NOOP=y | 181 | CONFIG_IOSCHED_NOOP=y |
162 | CONFIG_IOSCHED_AS=y | ||
163 | CONFIG_IOSCHED_DEADLINE=y | 182 | CONFIG_IOSCHED_DEADLINE=y |
164 | CONFIG_IOSCHED_CFQ=y | 183 | CONFIG_IOSCHED_CFQ=y |
165 | CONFIG_DEFAULT_AS=y | ||
166 | # CONFIG_DEFAULT_DEADLINE is not set | 184 | # CONFIG_DEFAULT_DEADLINE is not set |
167 | # CONFIG_DEFAULT_CFQ is not set | 185 | CONFIG_DEFAULT_CFQ=y |
168 | # CONFIG_DEFAULT_NOOP is not set | 186 | # CONFIG_DEFAULT_NOOP is not set |
169 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 187 | CONFIG_DEFAULT_IOSCHED="cfq" |
188 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
189 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
190 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
191 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
192 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
193 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
194 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
195 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
196 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
197 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
198 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
199 | # CONFIG_INLINE_READ_LOCK is not set | ||
200 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
201 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
203 | CONFIG_INLINE_READ_UNLOCK=y | ||
204 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
205 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
206 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
207 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
212 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
213 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
214 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
215 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
216 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
170 | # CONFIG_FREEZER is not set | 217 | # CONFIG_FREEZER is not set |
171 | 218 | ||
172 | # | 219 | # |
@@ -187,6 +234,7 @@ CONFIG_WARP=y | |||
187 | # CONFIG_CANYONLANDS is not set | 234 | # CONFIG_CANYONLANDS is not set |
188 | # CONFIG_GLACIER is not set | 235 | # CONFIG_GLACIER is not set |
189 | # CONFIG_REDWOOD is not set | 236 | # CONFIG_REDWOOD is not set |
237 | # CONFIG_EIGER is not set | ||
190 | # CONFIG_YOSEMITE is not set | 238 | # CONFIG_YOSEMITE is not set |
191 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | 239 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set |
192 | # CONFIG_PPC44x_SIMPLE is not set | 240 | # CONFIG_PPC44x_SIMPLE is not set |
@@ -229,10 +277,12 @@ CONFIG_BINFMT_ELF=y | |||
229 | # CONFIG_BINFMT_MISC is not set | 277 | # CONFIG_BINFMT_MISC is not set |
230 | # CONFIG_MATH_EMULATION is not set | 278 | # CONFIG_MATH_EMULATION is not set |
231 | # CONFIG_IOMMU_HELPER is not set | 279 | # CONFIG_IOMMU_HELPER is not set |
232 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 280 | # CONFIG_SWIOTLB is not set |
233 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 281 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
234 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 282 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
235 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 283 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
284 | CONFIG_SPARSE_IRQ=y | ||
285 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
236 | CONFIG_ARCH_FLATMEM_ENABLE=y | 286 | CONFIG_ARCH_FLATMEM_ENABLE=y |
237 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 287 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
238 | CONFIG_SELECT_MEMORY_MODEL=y | 288 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -248,9 +298,8 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
248 | CONFIG_ZONE_DMA_FLAG=1 | 298 | CONFIG_ZONE_DMA_FLAG=1 |
249 | CONFIG_BOUNCE=y | 299 | CONFIG_BOUNCE=y |
250 | CONFIG_VIRT_TO_BUS=y | 300 | CONFIG_VIRT_TO_BUS=y |
251 | CONFIG_UNEVICTABLE_LRU=y | 301 | # CONFIG_KSM is not set |
252 | CONFIG_HAVE_MLOCK=y | 302 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
253 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
254 | CONFIG_STDBINUTILS=y | 303 | CONFIG_STDBINUTILS=y |
255 | CONFIG_PPC_4K_PAGES=y | 304 | CONFIG_PPC_4K_PAGES=y |
256 | # CONFIG_PPC_16K_PAGES is not set | 305 | # CONFIG_PPC_16K_PAGES is not set |
@@ -356,6 +405,7 @@ CONFIG_NETFILTER_ADVANCED=y | |||
356 | # CONFIG_IP_NF_ARPTABLES is not set | 405 | # CONFIG_IP_NF_ARPTABLES is not set |
357 | # CONFIG_IP_DCCP is not set | 406 | # CONFIG_IP_DCCP is not set |
358 | # CONFIG_IP_SCTP is not set | 407 | # CONFIG_IP_SCTP is not set |
408 | # CONFIG_RDS is not set | ||
359 | # CONFIG_TIPC is not set | 409 | # CONFIG_TIPC is not set |
360 | # CONFIG_ATM is not set | 410 | # CONFIG_ATM is not set |
361 | # CONFIG_BRIDGE is not set | 411 | # CONFIG_BRIDGE is not set |
@@ -371,6 +421,7 @@ CONFIG_VLAN_8021Q=y | |||
371 | # CONFIG_ECONET is not set | 421 | # CONFIG_ECONET is not set |
372 | # CONFIG_WAN_ROUTER is not set | 422 | # CONFIG_WAN_ROUTER is not set |
373 | # CONFIG_PHONET is not set | 423 | # CONFIG_PHONET is not set |
424 | # CONFIG_IEEE802154 is not set | ||
374 | # CONFIG_NET_SCHED is not set | 425 | # CONFIG_NET_SCHED is not set |
375 | # CONFIG_DCB is not set | 426 | # CONFIG_DCB is not set |
376 | 427 | ||
@@ -383,7 +434,13 @@ CONFIG_VLAN_8021Q=y | |||
383 | # CONFIG_IRDA is not set | 434 | # CONFIG_IRDA is not set |
384 | # CONFIG_BT is not set | 435 | # CONFIG_BT is not set |
385 | # CONFIG_AF_RXRPC is not set | 436 | # CONFIG_AF_RXRPC is not set |
386 | # CONFIG_WIRELESS is not set | 437 | CONFIG_WIRELESS=y |
438 | # CONFIG_CFG80211 is not set | ||
439 | # CONFIG_LIB80211 is not set | ||
440 | |||
441 | # | ||
442 | # CFG80211 needs to be enabled for MAC80211 | ||
443 | # | ||
387 | # CONFIG_WIMAX is not set | 444 | # CONFIG_WIMAX is not set |
388 | # CONFIG_RFKILL is not set | 445 | # CONFIG_RFKILL is not set |
389 | # CONFIG_NET_9P is not set | 446 | # CONFIG_NET_9P is not set |
@@ -396,6 +453,7 @@ CONFIG_VLAN_8021Q=y | |||
396 | # Generic Driver Options | 453 | # Generic Driver Options |
397 | # | 454 | # |
398 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 455 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
456 | # CONFIG_DEVTMPFS is not set | ||
399 | # CONFIG_STANDALONE is not set | 457 | # CONFIG_STANDALONE is not set |
400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 458 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
401 | CONFIG_FW_LOADER=y | 459 | CONFIG_FW_LOADER=y |
@@ -407,9 +465,9 @@ CONFIG_EXTRA_FIRMWARE="" | |||
407 | # CONFIG_CONNECTOR is not set | 465 | # CONFIG_CONNECTOR is not set |
408 | CONFIG_MTD=y | 466 | CONFIG_MTD=y |
409 | # CONFIG_MTD_DEBUG is not set | 467 | # CONFIG_MTD_DEBUG is not set |
468 | # CONFIG_MTD_TESTS is not set | ||
410 | # CONFIG_MTD_CONCAT is not set | 469 | # CONFIG_MTD_CONCAT is not set |
411 | CONFIG_MTD_PARTITIONS=y | 470 | CONFIG_MTD_PARTITIONS=y |
412 | # CONFIG_MTD_TESTS is not set | ||
413 | # CONFIG_MTD_REDBOOT_PARTS is not set | 471 | # CONFIG_MTD_REDBOOT_PARTS is not set |
414 | CONFIG_MTD_CMDLINE_PARTS=y | 472 | CONFIG_MTD_CMDLINE_PARTS=y |
415 | CONFIG_MTD_OF_PARTS=y | 473 | CONFIG_MTD_OF_PARTS=y |
@@ -513,6 +571,10 @@ CONFIG_BLK_DEV=y | |||
513 | # CONFIG_BLK_DEV_FD is not set | 571 | # CONFIG_BLK_DEV_FD is not set |
514 | # CONFIG_BLK_DEV_COW_COMMON is not set | 572 | # CONFIG_BLK_DEV_COW_COMMON is not set |
515 | # CONFIG_BLK_DEV_LOOP is not set | 573 | # CONFIG_BLK_DEV_LOOP is not set |
574 | |||
575 | # | ||
576 | # DRBD disabled because PROC_FS, INET or CONNECTOR not selected | ||
577 | # | ||
516 | # CONFIG_BLK_DEV_NBD is not set | 578 | # CONFIG_BLK_DEV_NBD is not set |
517 | # CONFIG_BLK_DEV_UB is not set | 579 | # CONFIG_BLK_DEV_UB is not set |
518 | CONFIG_BLK_DEV_RAM=y | 580 | CONFIG_BLK_DEV_RAM=y |
@@ -524,9 +586,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
524 | # CONFIG_XILINX_SYSACE is not set | 586 | # CONFIG_XILINX_SYSACE is not set |
525 | # CONFIG_BLK_DEV_HD is not set | 587 | # CONFIG_BLK_DEV_HD is not set |
526 | CONFIG_MISC_DEVICES=y | 588 | CONFIG_MISC_DEVICES=y |
589 | # CONFIG_AD525X_DPOT is not set | ||
527 | # CONFIG_ICS932S401 is not set | 590 | # CONFIG_ICS932S401 is not set |
528 | # CONFIG_ENCLOSURE_SERVICES is not set | 591 | # CONFIG_ENCLOSURE_SERVICES is not set |
529 | # CONFIG_ISL29003 is not set | 592 | # CONFIG_ISL29003 is not set |
593 | # CONFIG_DS1682 is not set | ||
530 | # CONFIG_C2PORT is not set | 594 | # CONFIG_C2PORT is not set |
531 | 595 | ||
532 | # | 596 | # |
@@ -534,7 +598,9 @@ CONFIG_MISC_DEVICES=y | |||
534 | # | 598 | # |
535 | CONFIG_EEPROM_AT24=y | 599 | CONFIG_EEPROM_AT24=y |
536 | # CONFIG_EEPROM_LEGACY is not set | 600 | # CONFIG_EEPROM_LEGACY is not set |
601 | # CONFIG_EEPROM_MAX6875 is not set | ||
537 | # CONFIG_EEPROM_93CX6 is not set | 602 | # CONFIG_EEPROM_93CX6 is not set |
603 | # CONFIG_IWMC3200TOP is not set | ||
538 | CONFIG_HAVE_IDE=y | 604 | CONFIG_HAVE_IDE=y |
539 | # CONFIG_IDE is not set | 605 | # CONFIG_IDE is not set |
540 | 606 | ||
@@ -557,15 +623,11 @@ CONFIG_BLK_DEV_SD=y | |||
557 | # CONFIG_BLK_DEV_SR is not set | 623 | # CONFIG_BLK_DEV_SR is not set |
558 | # CONFIG_CHR_DEV_SG is not set | 624 | # CONFIG_CHR_DEV_SG is not set |
559 | # CONFIG_CHR_DEV_SCH is not set | 625 | # CONFIG_CHR_DEV_SCH is not set |
560 | |||
561 | # | ||
562 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
563 | # | ||
564 | # CONFIG_SCSI_MULTI_LUN is not set | 626 | # CONFIG_SCSI_MULTI_LUN is not set |
565 | # CONFIG_SCSI_CONSTANTS is not set | 627 | # CONFIG_SCSI_CONSTANTS is not set |
566 | # CONFIG_SCSI_LOGGING is not set | 628 | # CONFIG_SCSI_LOGGING is not set |
567 | # CONFIG_SCSI_SCAN_ASYNC is not set | 629 | # CONFIG_SCSI_SCAN_ASYNC is not set |
568 | # CONFIG_SCSI_WAIT_SCAN is not set | 630 | CONFIG_SCSI_WAIT_SCAN=m |
569 | 631 | ||
570 | # | 632 | # |
571 | # SCSI Transports | 633 | # SCSI Transports |
@@ -582,7 +644,6 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
582 | # CONFIG_MD is not set | 644 | # CONFIG_MD is not set |
583 | # CONFIG_MACINTOSH_DRIVERS is not set | 645 | # CONFIG_MACINTOSH_DRIVERS is not set |
584 | CONFIG_NETDEVICES=y | 646 | CONFIG_NETDEVICES=y |
585 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
586 | # CONFIG_DUMMY is not set | 647 | # CONFIG_DUMMY is not set |
587 | # CONFIG_BONDING is not set | 648 | # CONFIG_BONDING is not set |
588 | # CONFIG_MACVLAN is not set | 649 | # CONFIG_MACVLAN is not set |
@@ -609,14 +670,14 @@ CONFIG_IBM_NEW_EMAC_ZMII=y | |||
609 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 670 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
610 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 671 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
611 | # CONFIG_B44 is not set | 672 | # CONFIG_B44 is not set |
673 | # CONFIG_KS8842 is not set | ||
674 | # CONFIG_KS8851_MLL is not set | ||
675 | # CONFIG_XILINX_EMACLITE is not set | ||
612 | # CONFIG_NETDEV_1000 is not set | 676 | # CONFIG_NETDEV_1000 is not set |
613 | # CONFIG_NETDEV_10000 is not set | 677 | # CONFIG_NETDEV_10000 is not set |
614 | 678 | CONFIG_WLAN=y | |
615 | # | 679 | # CONFIG_USB_ZD1201 is not set |
616 | # Wireless LAN | 680 | # CONFIG_HOSTAP is not set |
617 | # | ||
618 | # CONFIG_WLAN_PRE80211 is not set | ||
619 | # CONFIG_WLAN_80211 is not set | ||
620 | 681 | ||
621 | # | 682 | # |
622 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 683 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -678,6 +739,7 @@ CONFIG_SERIAL_CORE=y | |||
678 | CONFIG_SERIAL_CORE_CONSOLE=y | 739 | CONFIG_SERIAL_CORE_CONSOLE=y |
679 | # CONFIG_SERIAL_OF_PLATFORM is not set | 740 | # CONFIG_SERIAL_OF_PLATFORM is not set |
680 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 741 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
742 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
681 | CONFIG_UNIX98_PTYS=y | 743 | CONFIG_UNIX98_PTYS=y |
682 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 744 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
683 | CONFIG_LEGACY_PTYS=y | 745 | CONFIG_LEGACY_PTYS=y |
@@ -693,6 +755,7 @@ CONFIG_HW_RANDOM=y | |||
693 | # CONFIG_TCG_TPM is not set | 755 | # CONFIG_TCG_TPM is not set |
694 | CONFIG_I2C=y | 756 | CONFIG_I2C=y |
695 | CONFIG_I2C_BOARDINFO=y | 757 | CONFIG_I2C_BOARDINFO=y |
758 | CONFIG_I2C_COMPAT=y | ||
696 | # CONFIG_I2C_CHARDEV is not set | 759 | # CONFIG_I2C_CHARDEV is not set |
697 | CONFIG_I2C_HELPER_AUTO=y | 760 | CONFIG_I2C_HELPER_AUTO=y |
698 | 761 | ||
@@ -725,17 +788,17 @@ CONFIG_I2C_IBM_IIC=y | |||
725 | # | 788 | # |
726 | # Miscellaneous I2C Chip support | 789 | # Miscellaneous I2C Chip support |
727 | # | 790 | # |
728 | # CONFIG_DS1682 is not set | ||
729 | # CONFIG_SENSORS_PCF8574 is not set | ||
730 | # CONFIG_PCF8575 is not set | ||
731 | # CONFIG_SENSORS_PCA9539 is not set | ||
732 | # CONFIG_SENSORS_MAX6875 is not set | ||
733 | # CONFIG_SENSORS_TSL2550 is not set | 791 | # CONFIG_SENSORS_TSL2550 is not set |
734 | # CONFIG_I2C_DEBUG_CORE is not set | 792 | # CONFIG_I2C_DEBUG_CORE is not set |
735 | # CONFIG_I2C_DEBUG_ALGO is not set | 793 | # CONFIG_I2C_DEBUG_ALGO is not set |
736 | # CONFIG_I2C_DEBUG_BUS is not set | 794 | # CONFIG_I2C_DEBUG_BUS is not set |
737 | # CONFIG_I2C_DEBUG_CHIP is not set | 795 | # CONFIG_I2C_DEBUG_CHIP is not set |
738 | # CONFIG_SPI is not set | 796 | # CONFIG_SPI is not set |
797 | |||
798 | # | ||
799 | # PPS support | ||
800 | # | ||
801 | # CONFIG_PPS is not set | ||
739 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 802 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
740 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 803 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
741 | CONFIG_GPIOLIB=y | 804 | CONFIG_GPIOLIB=y |
@@ -761,10 +824,19 @@ CONFIG_GPIO_SYSFS=y | |||
761 | # | 824 | # |
762 | # SPI GPIO expanders: | 825 | # SPI GPIO expanders: |
763 | # | 826 | # |
827 | |||
828 | # | ||
829 | # AC97 GPIO expanders: | ||
830 | # | ||
764 | # CONFIG_W1 is not set | 831 | # CONFIG_W1 is not set |
765 | # CONFIG_POWER_SUPPLY is not set | 832 | # CONFIG_POWER_SUPPLY is not set |
766 | CONFIG_HWMON=y | 833 | CONFIG_HWMON=y |
767 | # CONFIG_HWMON_VID is not set | 834 | # CONFIG_HWMON_VID is not set |
835 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
836 | |||
837 | # | ||
838 | # Native drivers | ||
839 | # | ||
768 | CONFIG_SENSORS_AD7414=y | 840 | CONFIG_SENSORS_AD7414=y |
769 | # CONFIG_SENSORS_AD7418 is not set | 841 | # CONFIG_SENSORS_AD7418 is not set |
770 | # CONFIG_SENSORS_ADM1021 is not set | 842 | # CONFIG_SENSORS_ADM1021 is not set |
@@ -787,6 +859,7 @@ CONFIG_SENSORS_AD7414=y | |||
787 | # CONFIG_SENSORS_GL520SM is not set | 859 | # CONFIG_SENSORS_GL520SM is not set |
788 | # CONFIG_SENSORS_IT87 is not set | 860 | # CONFIG_SENSORS_IT87 is not set |
789 | # CONFIG_SENSORS_LM63 is not set | 861 | # CONFIG_SENSORS_LM63 is not set |
862 | # CONFIG_SENSORS_LM73 is not set | ||
790 | # CONFIG_SENSORS_LM75 is not set | 863 | # CONFIG_SENSORS_LM75 is not set |
791 | # CONFIG_SENSORS_LM77 is not set | 864 | # CONFIG_SENSORS_LM77 is not set |
792 | # CONFIG_SENSORS_LM78 is not set | 865 | # CONFIG_SENSORS_LM78 is not set |
@@ -812,6 +885,8 @@ CONFIG_SENSORS_AD7414=y | |||
812 | # CONFIG_SENSORS_SMSC47B397 is not set | 885 | # CONFIG_SENSORS_SMSC47B397 is not set |
813 | # CONFIG_SENSORS_ADS7828 is not set | 886 | # CONFIG_SENSORS_ADS7828 is not set |
814 | # CONFIG_SENSORS_THMC50 is not set | 887 | # CONFIG_SENSORS_THMC50 is not set |
888 | # CONFIG_SENSORS_TMP401 is not set | ||
889 | # CONFIG_SENSORS_TMP421 is not set | ||
815 | # CONFIG_SENSORS_VT1211 is not set | 890 | # CONFIG_SENSORS_VT1211 is not set |
816 | # CONFIG_SENSORS_W83781D is not set | 891 | # CONFIG_SENSORS_W83781D is not set |
817 | # CONFIG_SENSORS_W83791D is not set | 892 | # CONFIG_SENSORS_W83791D is not set |
@@ -821,7 +896,6 @@ CONFIG_SENSORS_AD7414=y | |||
821 | # CONFIG_SENSORS_W83L786NG is not set | 896 | # CONFIG_SENSORS_W83L786NG is not set |
822 | # CONFIG_SENSORS_W83627HF is not set | 897 | # CONFIG_SENSORS_W83627HF is not set |
823 | # CONFIG_SENSORS_W83627EHF is not set | 898 | # CONFIG_SENSORS_W83627EHF is not set |
824 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
825 | CONFIG_THERMAL=y | 899 | CONFIG_THERMAL=y |
826 | CONFIG_THERMAL_HWMON=y | 900 | CONFIG_THERMAL_HWMON=y |
827 | CONFIG_WATCHDOG=y | 901 | CONFIG_WATCHDOG=y |
@@ -855,26 +929,15 @@ CONFIG_SSB_POSSIBLE=y | |||
855 | # CONFIG_TWL4030_CORE is not set | 929 | # CONFIG_TWL4030_CORE is not set |
856 | # CONFIG_MFD_TMIO is not set | 930 | # CONFIG_MFD_TMIO is not set |
857 | # CONFIG_PMIC_DA903X is not set | 931 | # CONFIG_PMIC_DA903X is not set |
932 | # CONFIG_PMIC_ADP5520 is not set | ||
858 | # CONFIG_MFD_WM8400 is not set | 933 | # CONFIG_MFD_WM8400 is not set |
934 | # CONFIG_MFD_WM831X is not set | ||
859 | # CONFIG_MFD_WM8350_I2C is not set | 935 | # CONFIG_MFD_WM8350_I2C is not set |
860 | # CONFIG_MFD_PCF50633 is not set | 936 | # CONFIG_MFD_PCF50633 is not set |
937 | # CONFIG_AB3100_CORE is not set | ||
938 | # CONFIG_MFD_88PM8607 is not set | ||
861 | # CONFIG_REGULATOR is not set | 939 | # CONFIG_REGULATOR is not set |
862 | 940 | # CONFIG_MEDIA_SUPPORT is not set | |
863 | # | ||
864 | # Multimedia devices | ||
865 | # | ||
866 | |||
867 | # | ||
868 | # Multimedia core support | ||
869 | # | ||
870 | # CONFIG_VIDEO_DEV is not set | ||
871 | # CONFIG_DVB_CORE is not set | ||
872 | # CONFIG_VIDEO_MEDIA is not set | ||
873 | |||
874 | # | ||
875 | # Multimedia drivers | ||
876 | # | ||
877 | # CONFIG_DAB is not set | ||
878 | 941 | ||
879 | # | 942 | # |
880 | # Graphics support | 943 | # Graphics support |
@@ -917,10 +980,11 @@ CONFIG_USB_MON=y | |||
917 | # CONFIG_USB_OXU210HP_HCD is not set | 980 | # CONFIG_USB_OXU210HP_HCD is not set |
918 | # CONFIG_USB_ISP116X_HCD is not set | 981 | # CONFIG_USB_ISP116X_HCD is not set |
919 | # CONFIG_USB_ISP1760_HCD is not set | 982 | # CONFIG_USB_ISP1760_HCD is not set |
983 | # CONFIG_USB_ISP1362_HCD is not set | ||
920 | CONFIG_USB_OHCI_HCD=y | 984 | CONFIG_USB_OHCI_HCD=y |
921 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
922 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 985 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
923 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 986 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
987 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
924 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 988 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
925 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 989 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
926 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 990 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
@@ -988,6 +1052,7 @@ CONFIG_USB_STORAGE=y | |||
988 | # CONFIG_USB_LD is not set | 1052 | # CONFIG_USB_LD is not set |
989 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1053 | # CONFIG_USB_TRANCEVIBRATOR is not set |
990 | # CONFIG_USB_IOWARRIOR is not set | 1054 | # CONFIG_USB_IOWARRIOR is not set |
1055 | # CONFIG_USB_TEST is not set | ||
991 | # CONFIG_USB_ISIGHTFW is not set | 1056 | # CONFIG_USB_ISIGHTFW is not set |
992 | # CONFIG_USB_VST is not set | 1057 | # CONFIG_USB_VST is not set |
993 | # CONFIG_USB_GADGET is not set | 1058 | # CONFIG_USB_GADGET is not set |
@@ -1014,7 +1079,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
1014 | # | 1079 | # |
1015 | # CONFIG_MMC_SDHCI is not set | 1080 | # CONFIG_MMC_SDHCI is not set |
1016 | # CONFIG_MMC_WBSD is not set | 1081 | # CONFIG_MMC_WBSD is not set |
1017 | CONFIG_MMC_PIKASD=y | 1082 | # CONFIG_MMC_AT91 is not set |
1083 | # CONFIG_MMC_ATMELMCI is not set | ||
1018 | # CONFIG_MEMSTICK is not set | 1084 | # CONFIG_MEMSTICK is not set |
1019 | CONFIG_NEW_LEDS=y | 1085 | CONFIG_NEW_LEDS=y |
1020 | CONFIG_LEDS_CLASS=y | 1086 | CONFIG_LEDS_CLASS=y |
@@ -1025,9 +1091,10 @@ CONFIG_LEDS_CLASS=y | |||
1025 | CONFIG_LEDS_GPIO=y | 1091 | CONFIG_LEDS_GPIO=y |
1026 | # CONFIG_LEDS_GPIO_PLATFORM is not set | 1092 | # CONFIG_LEDS_GPIO_PLATFORM is not set |
1027 | CONFIG_LEDS_GPIO_OF=y | 1093 | CONFIG_LEDS_GPIO_OF=y |
1028 | # CONFIG_LEDS_LP5521 is not set | 1094 | # CONFIG_LEDS_LP3944 is not set |
1029 | # CONFIG_LEDS_PCA955X is not set | 1095 | # CONFIG_LEDS_PCA955X is not set |
1030 | # CONFIG_LEDS_BD2802 is not set | 1096 | # CONFIG_LEDS_BD2802 is not set |
1097 | # CONFIG_LEDS_LT3593 is not set | ||
1031 | 1098 | ||
1032 | # | 1099 | # |
1033 | # LED Triggers | 1100 | # LED Triggers |
@@ -1048,6 +1115,10 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | |||
1048 | # CONFIG_DMADEVICES is not set | 1115 | # CONFIG_DMADEVICES is not set |
1049 | # CONFIG_AUXDISPLAY is not set | 1116 | # CONFIG_AUXDISPLAY is not set |
1050 | # CONFIG_UIO is not set | 1117 | # CONFIG_UIO is not set |
1118 | |||
1119 | # | ||
1120 | # TI VLYNQ | ||
1121 | # | ||
1051 | # CONFIG_STAGING is not set | 1122 | # CONFIG_STAGING is not set |
1052 | 1123 | ||
1053 | # | 1124 | # |
@@ -1065,10 +1136,13 @@ CONFIG_JBD=y | |||
1065 | # CONFIG_REISERFS_FS is not set | 1136 | # CONFIG_REISERFS_FS is not set |
1066 | # CONFIG_JFS_FS is not set | 1137 | # CONFIG_JFS_FS is not set |
1067 | # CONFIG_FS_POSIX_ACL is not set | 1138 | # CONFIG_FS_POSIX_ACL is not set |
1068 | CONFIG_FILE_LOCKING=y | ||
1069 | # CONFIG_XFS_FS is not set | 1139 | # CONFIG_XFS_FS is not set |
1140 | # CONFIG_GFS2_FS is not set | ||
1070 | # CONFIG_OCFS2_FS is not set | 1141 | # CONFIG_OCFS2_FS is not set |
1071 | # CONFIG_BTRFS_FS is not set | 1142 | # CONFIG_BTRFS_FS is not set |
1143 | # CONFIG_NILFS2_FS is not set | ||
1144 | CONFIG_FILE_LOCKING=y | ||
1145 | CONFIG_FSNOTIFY=y | ||
1072 | CONFIG_DNOTIFY=y | 1146 | CONFIG_DNOTIFY=y |
1073 | CONFIG_INOTIFY=y | 1147 | CONFIG_INOTIFY=y |
1074 | CONFIG_INOTIFY_USER=y | 1148 | CONFIG_INOTIFY_USER=y |
@@ -1145,7 +1219,6 @@ CONFIG_CRAMFS=y | |||
1145 | # CONFIG_ROMFS_FS is not set | 1219 | # CONFIG_ROMFS_FS is not set |
1146 | # CONFIG_SYSV_FS is not set | 1220 | # CONFIG_SYSV_FS is not set |
1147 | # CONFIG_UFS_FS is not set | 1221 | # CONFIG_UFS_FS is not set |
1148 | # CONFIG_NILFS2_FS is not set | ||
1149 | CONFIG_NETWORK_FILESYSTEMS=y | 1222 | CONFIG_NETWORK_FILESYSTEMS=y |
1150 | CONFIG_NFS_FS=y | 1223 | CONFIG_NFS_FS=y |
1151 | CONFIG_NFS_V3=y | 1224 | CONFIG_NFS_V3=y |
@@ -1235,6 +1308,7 @@ CONFIG_HAS_IOPORT=y | |||
1235 | CONFIG_HAS_DMA=y | 1308 | CONFIG_HAS_DMA=y |
1236 | CONFIG_HAVE_LMB=y | 1309 | CONFIG_HAVE_LMB=y |
1237 | CONFIG_NLATTR=y | 1310 | CONFIG_NLATTR=y |
1311 | CONFIG_GENERIC_ATOMIC64=y | ||
1238 | 1312 | ||
1239 | # | 1313 | # |
1240 | # Kernel hacking | 1314 | # Kernel hacking |
@@ -1244,6 +1318,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
1244 | CONFIG_ENABLE_MUST_CHECK=y | 1318 | CONFIG_ENABLE_MUST_CHECK=y |
1245 | CONFIG_FRAME_WARN=1024 | 1319 | CONFIG_FRAME_WARN=1024 |
1246 | CONFIG_MAGIC_SYSRQ=y | 1320 | CONFIG_MAGIC_SYSRQ=y |
1321 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1247 | # CONFIG_UNUSED_SYMBOLS is not set | 1322 | # CONFIG_UNUSED_SYMBOLS is not set |
1248 | CONFIG_DEBUG_FS=y | 1323 | CONFIG_DEBUG_FS=y |
1249 | # CONFIG_HEADERS_CHECK is not set | 1324 | # CONFIG_HEADERS_CHECK is not set |
@@ -1261,10 +1336,14 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | |||
1261 | # CONFIG_DEBUG_OBJECTS is not set | 1336 | # CONFIG_DEBUG_OBJECTS is not set |
1262 | # CONFIG_SLUB_DEBUG_ON is not set | 1337 | # CONFIG_SLUB_DEBUG_ON is not set |
1263 | # CONFIG_SLUB_STATS is not set | 1338 | # CONFIG_SLUB_STATS is not set |
1339 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
1264 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1340 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1265 | # CONFIG_RT_MUTEX_TESTER is not set | 1341 | # CONFIG_RT_MUTEX_TESTER is not set |
1266 | # CONFIG_DEBUG_SPINLOCK is not set | 1342 | # CONFIG_DEBUG_SPINLOCK is not set |
1267 | # CONFIG_DEBUG_MUTEXES is not set | 1343 | # CONFIG_DEBUG_MUTEXES is not set |
1344 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1345 | # CONFIG_PROVE_LOCKING is not set | ||
1346 | # CONFIG_LOCK_STAT is not set | ||
1268 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1347 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1269 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1348 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1270 | # CONFIG_DEBUG_KOBJECT is not set | 1349 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1276,11 +1355,12 @@ CONFIG_DEBUG_INFO=y | |||
1276 | # CONFIG_DEBUG_LIST is not set | 1355 | # CONFIG_DEBUG_LIST is not set |
1277 | # CONFIG_DEBUG_SG is not set | 1356 | # CONFIG_DEBUG_SG is not set |
1278 | # CONFIG_DEBUG_NOTIFIERS is not set | 1357 | # CONFIG_DEBUG_NOTIFIERS is not set |
1279 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1358 | # CONFIG_DEBUG_CREDENTIALS is not set |
1280 | # CONFIG_RCU_TORTURE_TEST is not set | 1359 | # CONFIG_RCU_TORTURE_TEST is not set |
1281 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1360 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1282 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1361 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1283 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1362 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1363 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1284 | # CONFIG_FAULT_INJECTION is not set | 1364 | # CONFIG_FAULT_INJECTION is not set |
1285 | # CONFIG_LATENCYTOP is not set | 1365 | # CONFIG_LATENCYTOP is not set |
1286 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1366 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
@@ -1290,27 +1370,30 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1290 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1370 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1291 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1371 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1292 | CONFIG_TRACING_SUPPORT=y | 1372 | CONFIG_TRACING_SUPPORT=y |
1293 | 1373 | CONFIG_FTRACE=y | |
1294 | # | ||
1295 | # Tracers | ||
1296 | # | ||
1297 | # CONFIG_FUNCTION_TRACER is not set | 1374 | # CONFIG_FUNCTION_TRACER is not set |
1375 | # CONFIG_IRQSOFF_TRACER is not set | ||
1298 | # CONFIG_SCHED_TRACER is not set | 1376 | # CONFIG_SCHED_TRACER is not set |
1299 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1377 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1300 | # CONFIG_EVENT_TRACER is not set | ||
1301 | # CONFIG_BOOT_TRACER is not set | 1378 | # CONFIG_BOOT_TRACER is not set |
1302 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1379 | CONFIG_BRANCH_PROFILE_NONE=y |
1380 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1381 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1303 | # CONFIG_STACK_TRACER is not set | 1382 | # CONFIG_STACK_TRACER is not set |
1304 | # CONFIG_KMEMTRACE is not set | 1383 | # CONFIG_KMEMTRACE is not set |
1305 | # CONFIG_WORKQUEUE_TRACER is not set | 1384 | # CONFIG_WORKQUEUE_TRACER is not set |
1306 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1385 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1307 | # CONFIG_DYNAMIC_DEBUG is not set | 1386 | # CONFIG_DYNAMIC_DEBUG is not set |
1387 | # CONFIG_DMA_API_DEBUG is not set | ||
1308 | # CONFIG_SAMPLES is not set | 1388 | # CONFIG_SAMPLES is not set |
1309 | CONFIG_HAVE_ARCH_KGDB=y | 1389 | CONFIG_HAVE_ARCH_KGDB=y |
1310 | # CONFIG_KGDB is not set | 1390 | # CONFIG_KGDB is not set |
1391 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1392 | CONFIG_PPC_WERROR=y | ||
1311 | CONFIG_PRINT_STACK_DEPTH=64 | 1393 | CONFIG_PRINT_STACK_DEPTH=64 |
1312 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1394 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1313 | # CONFIG_DEBUG_STACK_USAGE is not set | 1395 | # CONFIG_DEBUG_STACK_USAGE is not set |
1396 | # CONFIG_PPC_EMULATED_STATS is not set | ||
1314 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1397 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1315 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1398 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1316 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1399 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -1326,13 +1409,16 @@ CONFIG_IRQSTACKS=y | |||
1326 | # CONFIG_KEYS is not set | 1409 | # CONFIG_KEYS is not set |
1327 | # CONFIG_SECURITY is not set | 1410 | # CONFIG_SECURITY is not set |
1328 | # CONFIG_SECURITYFS is not set | 1411 | # CONFIG_SECURITYFS is not set |
1329 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1412 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1413 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1414 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1415 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1416 | CONFIG_DEFAULT_SECURITY="" | ||
1330 | CONFIG_CRYPTO=y | 1417 | CONFIG_CRYPTO=y |
1331 | 1418 | ||
1332 | # | 1419 | # |
1333 | # Crypto core or helper | 1420 | # Crypto core or helper |
1334 | # | 1421 | # |
1335 | # CONFIG_CRYPTO_FIPS is not set | ||
1336 | CONFIG_CRYPTO_ALGAPI=y | 1422 | CONFIG_CRYPTO_ALGAPI=y |
1337 | CONFIG_CRYPTO_ALGAPI2=y | 1423 | CONFIG_CRYPTO_ALGAPI2=y |
1338 | # CONFIG_CRYPTO_MANAGER is not set | 1424 | # CONFIG_CRYPTO_MANAGER is not set |
@@ -1366,11 +1452,13 @@ CONFIG_CRYPTO_ALGAPI2=y | |||
1366 | # | 1452 | # |
1367 | # CONFIG_CRYPTO_HMAC is not set | 1453 | # CONFIG_CRYPTO_HMAC is not set |
1368 | # CONFIG_CRYPTO_XCBC is not set | 1454 | # CONFIG_CRYPTO_XCBC is not set |
1455 | # CONFIG_CRYPTO_VMAC is not set | ||
1369 | 1456 | ||
1370 | # | 1457 | # |
1371 | # Digest | 1458 | # Digest |
1372 | # | 1459 | # |
1373 | # CONFIG_CRYPTO_CRC32C is not set | 1460 | # CONFIG_CRYPTO_CRC32C is not set |
1461 | # CONFIG_CRYPTO_GHASH is not set | ||
1374 | # CONFIG_CRYPTO_MD4 is not set | 1462 | # CONFIG_CRYPTO_MD4 is not set |
1375 | # CONFIG_CRYPTO_MD5 is not set | 1463 | # CONFIG_CRYPTO_MD5 is not set |
1376 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1464 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig index 326205cabf77..35b60683cde5 100644 --- a/arch/powerpc/configs/ppc40x_defconfig +++ b/arch/powerpc/configs/ppc40x_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Fri Jan 23 08:44:03 2009 | 4 | # Mon Jan 4 13:54:06 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | CONFIG_40x=y | 14 | CONFIG_40x=y |
@@ -16,6 +16,7 @@ CONFIG_40x=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_4xx=y | 17 | CONFIG_4xx=y |
18 | CONFIG_PPC_MMU_NOHASH=y | 18 | CONFIG_PPC_MMU_NOHASH=y |
19 | CONFIG_PPC_MMU_NOHASH_32=y | ||
19 | # CONFIG_PPC_MM_SLICES is not set | 20 | # CONFIG_PPC_MM_SLICES is not set |
20 | CONFIG_NOT_COHERENT_CACHE=y | 21 | CONFIG_NOT_COHERENT_CACHE=y |
21 | CONFIG_PPC32=y | 22 | CONFIG_PPC32=y |
@@ -27,15 +28,18 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 28 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 29 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
31 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_NR_IRQS=512 | ||
32 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
38 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 39 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 41 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 42 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | CONFIG_GENERIC_GPIO=y | 44 | CONFIG_GENERIC_GPIO=y |
41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -50,11 +54,15 @@ CONFIG_PPC_UDBG_16550=y | |||
50 | # CONFIG_GENERIC_TBSYNC is not set | 54 | # CONFIG_GENERIC_TBSYNC is not set |
51 | CONFIG_AUDIT_ARCH=y | 55 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 56 | CONFIG_GENERIC_BUG=y |
53 | # CONFIG_DEFAULT_UIMAGE is not set | 57 | CONFIG_DTC=y |
58 | CONFIG_DEFAULT_UIMAGE=y | ||
59 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
54 | CONFIG_PPC_DCR_NATIVE=y | 60 | CONFIG_PPC_DCR_NATIVE=y |
55 | # CONFIG_PPC_DCR_MMIO is not set | 61 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_PPC_DCR=y | 62 | CONFIG_PPC_DCR=y |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
65 | CONFIG_CONSTRUCTORS=y | ||
58 | 66 | ||
59 | # | 67 | # |
60 | # General setup | 68 | # General setup |
@@ -68,9 +76,21 @@ CONFIG_SWAP=y | |||
68 | CONFIG_SYSVIPC=y | 76 | CONFIG_SYSVIPC=y |
69 | CONFIG_SYSVIPC_SYSCTL=y | 77 | CONFIG_SYSVIPC_SYSCTL=y |
70 | CONFIG_POSIX_MQUEUE=y | 78 | CONFIG_POSIX_MQUEUE=y |
79 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
71 | # CONFIG_BSD_PROCESS_ACCT is not set | 80 | # CONFIG_BSD_PROCESS_ACCT is not set |
72 | # CONFIG_TASKSTATS is not set | 81 | # CONFIG_TASKSTATS is not set |
73 | # CONFIG_AUDIT is not set | 82 | # CONFIG_AUDIT is not set |
83 | |||
84 | # | ||
85 | # RCU Subsystem | ||
86 | # | ||
87 | CONFIG_TREE_RCU=y | ||
88 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
89 | # CONFIG_TINY_RCU is not set | ||
90 | # CONFIG_RCU_TRACE is not set | ||
91 | CONFIG_RCU_FANOUT=32 | ||
92 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
93 | # CONFIG_TREE_RCU_TRACE is not set | ||
74 | # CONFIG_IKCONFIG is not set | 94 | # CONFIG_IKCONFIG is not set |
75 | CONFIG_LOG_BUF_SHIFT=14 | 95 | CONFIG_LOG_BUF_SHIFT=14 |
76 | CONFIG_GROUP_SCHED=y | 96 | CONFIG_GROUP_SCHED=y |
@@ -85,31 +105,40 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
85 | # CONFIG_NAMESPACES is not set | 105 | # CONFIG_NAMESPACES is not set |
86 | CONFIG_BLK_DEV_INITRD=y | 106 | CONFIG_BLK_DEV_INITRD=y |
87 | CONFIG_INITRAMFS_SOURCE="" | 107 | CONFIG_INITRAMFS_SOURCE="" |
108 | CONFIG_RD_GZIP=y | ||
109 | # CONFIG_RD_BZIP2 is not set | ||
110 | # CONFIG_RD_LZMA is not set | ||
88 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 111 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
89 | CONFIG_SYSCTL=y | 112 | CONFIG_SYSCTL=y |
113 | CONFIG_ANON_INODES=y | ||
90 | CONFIG_EMBEDDED=y | 114 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 115 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_KALLSYMS=y | 116 | CONFIG_KALLSYMS=y |
93 | CONFIG_KALLSYMS_ALL=y | 117 | CONFIG_KALLSYMS_ALL=y |
94 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 118 | CONFIG_KALLSYMS_EXTRA_PASS=y |
96 | CONFIG_HOTPLUG=y | 119 | CONFIG_HOTPLUG=y |
97 | CONFIG_PRINTK=y | 120 | CONFIG_PRINTK=y |
98 | CONFIG_BUG=y | 121 | CONFIG_BUG=y |
99 | CONFIG_ELF_CORE=y | 122 | CONFIG_ELF_CORE=y |
100 | CONFIG_COMPAT_BRK=y | ||
101 | CONFIG_BASE_FULL=y | 123 | CONFIG_BASE_FULL=y |
102 | CONFIG_FUTEX=y | 124 | CONFIG_FUTEX=y |
103 | CONFIG_ANON_INODES=y | ||
104 | CONFIG_EPOLL=y | 125 | CONFIG_EPOLL=y |
105 | CONFIG_SIGNALFD=y | 126 | CONFIG_SIGNALFD=y |
106 | CONFIG_TIMERFD=y | 127 | CONFIG_TIMERFD=y |
107 | CONFIG_EVENTFD=y | 128 | CONFIG_EVENTFD=y |
108 | CONFIG_SHMEM=y | 129 | CONFIG_SHMEM=y |
109 | CONFIG_AIO=y | 130 | CONFIG_AIO=y |
131 | CONFIG_HAVE_PERF_EVENTS=y | ||
132 | |||
133 | # | ||
134 | # Kernel Performance Events And Counters | ||
135 | # | ||
136 | # CONFIG_PERF_EVENTS is not set | ||
137 | # CONFIG_PERF_COUNTERS is not set | ||
110 | CONFIG_VM_EVENT_COUNTERS=y | 138 | CONFIG_VM_EVENT_COUNTERS=y |
111 | CONFIG_PCI_QUIRKS=y | 139 | CONFIG_PCI_QUIRKS=y |
112 | CONFIG_SLUB_DEBUG=y | 140 | CONFIG_SLUB_DEBUG=y |
141 | CONFIG_COMPAT_BRK=y | ||
113 | # CONFIG_SLAB is not set | 142 | # CONFIG_SLAB is not set |
114 | CONFIG_SLUB=y | 143 | CONFIG_SLUB=y |
115 | # CONFIG_SLOB is not set | 144 | # CONFIG_SLOB is not set |
@@ -121,6 +150,14 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
121 | CONFIG_HAVE_KPROBES=y | 150 | CONFIG_HAVE_KPROBES=y |
122 | CONFIG_HAVE_KRETPROBES=y | 151 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 152 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
153 | CONFIG_HAVE_DMA_ATTRS=y | ||
154 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
155 | |||
156 | # | ||
157 | # GCOV-based kernel profiling | ||
158 | # | ||
159 | # CONFIG_GCOV_KERNEL is not set | ||
160 | # CONFIG_SLOW_WORK is not set | ||
124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 161 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
125 | CONFIG_SLABINFO=y | 162 | CONFIG_SLABINFO=y |
126 | CONFIG_RT_MUTEXES=y | 163 | CONFIG_RT_MUTEXES=y |
@@ -132,8 +169,7 @@ CONFIG_MODULE_UNLOAD=y | |||
132 | # CONFIG_MODVERSIONS is not set | 169 | # CONFIG_MODVERSIONS is not set |
133 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 170 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
134 | CONFIG_BLOCK=y | 171 | CONFIG_BLOCK=y |
135 | CONFIG_LBD=y | 172 | CONFIG_LBDAF=y |
136 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
137 | # CONFIG_BLK_DEV_BSG is not set | 173 | # CONFIG_BLK_DEV_BSG is not set |
138 | # CONFIG_BLK_DEV_INTEGRITY is not set | 174 | # CONFIG_BLK_DEV_INTEGRITY is not set |
139 | 175 | ||
@@ -141,19 +177,41 @@ CONFIG_LBD=y | |||
141 | # IO Schedulers | 177 | # IO Schedulers |
142 | # | 178 | # |
143 | CONFIG_IOSCHED_NOOP=y | 179 | CONFIG_IOSCHED_NOOP=y |
144 | CONFIG_IOSCHED_AS=y | ||
145 | CONFIG_IOSCHED_DEADLINE=y | 180 | CONFIG_IOSCHED_DEADLINE=y |
146 | CONFIG_IOSCHED_CFQ=y | 181 | CONFIG_IOSCHED_CFQ=y |
147 | CONFIG_DEFAULT_AS=y | ||
148 | # CONFIG_DEFAULT_DEADLINE is not set | 182 | # CONFIG_DEFAULT_DEADLINE is not set |
149 | # CONFIG_DEFAULT_CFQ is not set | 183 | CONFIG_DEFAULT_CFQ=y |
150 | # CONFIG_DEFAULT_NOOP is not set | 184 | # CONFIG_DEFAULT_NOOP is not set |
151 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 185 | CONFIG_DEFAULT_IOSCHED="cfq" |
152 | CONFIG_CLASSIC_RCU=y | 186 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
153 | # CONFIG_TREE_RCU is not set | 187 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
154 | # CONFIG_PREEMPT_RCU is not set | 188 | # CONFIG_INLINE_SPIN_LOCK is not set |
155 | # CONFIG_TREE_RCU_TRACE is not set | 189 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
156 | # CONFIG_PREEMPT_RCU_TRACE is not set | 190 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
191 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
192 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
193 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
194 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
195 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
196 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
197 | # CONFIG_INLINE_READ_LOCK is not set | ||
198 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
199 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
200 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
201 | CONFIG_INLINE_READ_UNLOCK=y | ||
202 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
203 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
204 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
205 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
206 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
207 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
208 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
210 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
211 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
212 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
213 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
214 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
157 | # CONFIG_FREEZER is not set | 215 | # CONFIG_FREEZER is not set |
158 | CONFIG_PPC4xx_PCI_EXPRESS=y | 216 | CONFIG_PPC4xx_PCI_EXPRESS=y |
159 | 217 | ||
@@ -168,12 +226,14 @@ CONFIG_XILINX_VIRTEX=y | |||
168 | CONFIG_ACADIA=y | 226 | CONFIG_ACADIA=y |
169 | CONFIG_EP405=y | 227 | CONFIG_EP405=y |
170 | CONFIG_HCU4=y | 228 | CONFIG_HCU4=y |
229 | CONFIG_HOTFOOT=y | ||
171 | CONFIG_KILAUEA=y | 230 | CONFIG_KILAUEA=y |
172 | CONFIG_MAKALU=y | 231 | CONFIG_MAKALU=y |
173 | CONFIG_WALNUT=y | 232 | CONFIG_WALNUT=y |
174 | CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y | 233 | CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y |
175 | CONFIG_PPC40x_SIMPLE=y | 234 | CONFIG_PPC40x_SIMPLE=y |
176 | CONFIG_405GP=y | 235 | CONFIG_405GP=y |
236 | CONFIG_405EP=y | ||
177 | CONFIG_405EX=y | 237 | CONFIG_405EX=y |
178 | CONFIG_405EZ=y | 238 | CONFIG_405EZ=y |
179 | CONFIG_405GPR=y | 239 | CONFIG_405GPR=y |
@@ -195,6 +255,7 @@ CONFIG_IBM405_ERR51=y | |||
195 | # CONFIG_FSL_ULI1575 is not set | 255 | # CONFIG_FSL_ULI1575 is not set |
196 | CONFIG_OF_RTC=y | 256 | CONFIG_OF_RTC=y |
197 | # CONFIG_SIMPLE_GPIO is not set | 257 | # CONFIG_SIMPLE_GPIO is not set |
258 | # CONFIG_XILINX_PCI is not set | ||
198 | 259 | ||
199 | # | 260 | # |
200 | # Kernel options | 261 | # Kernel options |
@@ -218,10 +279,12 @@ CONFIG_BINFMT_ELF=y | |||
218 | # CONFIG_BINFMT_MISC is not set | 279 | # CONFIG_BINFMT_MISC is not set |
219 | # CONFIG_MATH_EMULATION is not set | 280 | # CONFIG_MATH_EMULATION is not set |
220 | # CONFIG_IOMMU_HELPER is not set | 281 | # CONFIG_IOMMU_HELPER is not set |
221 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 282 | # CONFIG_SWIOTLB is not set |
222 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 283 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
223 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 284 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
224 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 285 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
286 | CONFIG_SPARSE_IRQ=y | ||
287 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
225 | CONFIG_ARCH_FLATMEM_ENABLE=y | 288 | CONFIG_ARCH_FLATMEM_ENABLE=y |
226 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 289 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
227 | CONFIG_SELECT_MEMORY_MODEL=y | 290 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -237,10 +300,12 @@ CONFIG_MIGRATION=y | |||
237 | CONFIG_ZONE_DMA_FLAG=1 | 300 | CONFIG_ZONE_DMA_FLAG=1 |
238 | CONFIG_BOUNCE=y | 301 | CONFIG_BOUNCE=y |
239 | CONFIG_VIRT_TO_BUS=y | 302 | CONFIG_VIRT_TO_BUS=y |
240 | CONFIG_UNEVICTABLE_LRU=y | 303 | # CONFIG_KSM is not set |
304 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
241 | CONFIG_PPC_4K_PAGES=y | 305 | CONFIG_PPC_4K_PAGES=y |
242 | # CONFIG_PPC_16K_PAGES is not set | 306 | # CONFIG_PPC_16K_PAGES is not set |
243 | # CONFIG_PPC_64K_PAGES is not set | 307 | # CONFIG_PPC_64K_PAGES is not set |
308 | # CONFIG_PPC_256K_PAGES is not set | ||
244 | CONFIG_FORCE_MAX_ZONEORDER=11 | 309 | CONFIG_FORCE_MAX_ZONEORDER=11 |
245 | CONFIG_PROC_DEVICETREE=y | 310 | CONFIG_PROC_DEVICETREE=y |
246 | # CONFIG_CMDLINE_BOOL is not set | 311 | # CONFIG_CMDLINE_BOOL is not set |
@@ -265,6 +330,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
265 | # CONFIG_PCI_LEGACY is not set | 330 | # CONFIG_PCI_LEGACY is not set |
266 | # CONFIG_PCI_DEBUG is not set | 331 | # CONFIG_PCI_DEBUG is not set |
267 | # CONFIG_PCI_STUB is not set | 332 | # CONFIG_PCI_STUB is not set |
333 | # CONFIG_PCI_IOV is not set | ||
268 | # CONFIG_PCCARD is not set | 334 | # CONFIG_PCCARD is not set |
269 | # CONFIG_HOTPLUG_PCI is not set | 335 | # CONFIG_HOTPLUG_PCI is not set |
270 | # CONFIG_HAS_RAPIDIO is not set | 336 | # CONFIG_HAS_RAPIDIO is not set |
@@ -282,14 +348,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
282 | CONFIG_KERNEL_START=0xc0000000 | 348 | CONFIG_KERNEL_START=0xc0000000 |
283 | CONFIG_PHYSICAL_START=0x00000000 | 349 | CONFIG_PHYSICAL_START=0x00000000 |
284 | CONFIG_TASK_SIZE=0xc0000000 | 350 | CONFIG_TASK_SIZE=0xc0000000 |
285 | CONFIG_CONSISTENT_START=0xff100000 | ||
286 | CONFIG_CONSISTENT_SIZE=0x00200000 | 351 | CONFIG_CONSISTENT_SIZE=0x00200000 |
287 | CONFIG_NET=y | 352 | CONFIG_NET=y |
288 | 353 | ||
289 | # | 354 | # |
290 | # Networking options | 355 | # Networking options |
291 | # | 356 | # |
292 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
293 | CONFIG_PACKET=y | 357 | CONFIG_PACKET=y |
294 | # CONFIG_PACKET_MMAP is not set | 358 | # CONFIG_PACKET_MMAP is not set |
295 | CONFIG_UNIX=y | 359 | CONFIG_UNIX=y |
@@ -341,6 +405,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
341 | CONFIG_INET6_XFRM_MODE_BEET=m | 405 | CONFIG_INET6_XFRM_MODE_BEET=m |
342 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 406 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
343 | CONFIG_IPV6_SIT=m | 407 | CONFIG_IPV6_SIT=m |
408 | # CONFIG_IPV6_SIT_6RD is not set | ||
344 | CONFIG_IPV6_NDISC_NODETYPE=y | 409 | CONFIG_IPV6_NDISC_NODETYPE=y |
345 | # CONFIG_IPV6_TUNNEL is not set | 410 | # CONFIG_IPV6_TUNNEL is not set |
346 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 411 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
@@ -349,6 +414,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
349 | # CONFIG_NETFILTER is not set | 414 | # CONFIG_NETFILTER is not set |
350 | # CONFIG_IP_DCCP is not set | 415 | # CONFIG_IP_DCCP is not set |
351 | # CONFIG_IP_SCTP is not set | 416 | # CONFIG_IP_SCTP is not set |
417 | # CONFIG_RDS is not set | ||
352 | # CONFIG_TIPC is not set | 418 | # CONFIG_TIPC is not set |
353 | # CONFIG_ATM is not set | 419 | # CONFIG_ATM is not set |
354 | # CONFIG_BRIDGE is not set | 420 | # CONFIG_BRIDGE is not set |
@@ -362,6 +428,8 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
362 | # CONFIG_LAPB is not set | 428 | # CONFIG_LAPB is not set |
363 | # CONFIG_ECONET is not set | 429 | # CONFIG_ECONET is not set |
364 | # CONFIG_WAN_ROUTER is not set | 430 | # CONFIG_WAN_ROUTER is not set |
431 | # CONFIG_PHONET is not set | ||
432 | # CONFIG_IEEE802154 is not set | ||
365 | # CONFIG_NET_SCHED is not set | 433 | # CONFIG_NET_SCHED is not set |
366 | # CONFIG_DCB is not set | 434 | # CONFIG_DCB is not set |
367 | 435 | ||
@@ -374,13 +442,13 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
374 | # CONFIG_IRDA is not set | 442 | # CONFIG_IRDA is not set |
375 | # CONFIG_BT is not set | 443 | # CONFIG_BT is not set |
376 | # CONFIG_AF_RXRPC is not set | 444 | # CONFIG_AF_RXRPC is not set |
377 | # CONFIG_PHONET is not set | ||
378 | CONFIG_WIRELESS=y | 445 | CONFIG_WIRELESS=y |
379 | # CONFIG_CFG80211 is not set | 446 | # CONFIG_CFG80211 is not set |
380 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
381 | # CONFIG_WIRELESS_EXT is not set | ||
382 | # CONFIG_LIB80211 is not set | 447 | # CONFIG_LIB80211 is not set |
383 | # CONFIG_MAC80211 is not set | 448 | |
449 | # | ||
450 | # CFG80211 needs to be enabled for MAC80211 | ||
451 | # | ||
384 | # CONFIG_WIMAX is not set | 452 | # CONFIG_WIMAX is not set |
385 | # CONFIG_RFKILL is not set | 453 | # CONFIG_RFKILL is not set |
386 | # CONFIG_NET_9P is not set | 454 | # CONFIG_NET_9P is not set |
@@ -393,6 +461,7 @@ CONFIG_WIRELESS_OLD_REGULATORY=y | |||
393 | # Generic Driver Options | 461 | # Generic Driver Options |
394 | # | 462 | # |
395 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 463 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
464 | # CONFIG_DEVTMPFS is not set | ||
396 | CONFIG_STANDALONE=y | 465 | CONFIG_STANDALONE=y |
397 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 466 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
398 | CONFIG_FW_LOADER=y | 467 | CONFIG_FW_LOADER=y |
@@ -405,9 +474,9 @@ CONFIG_CONNECTOR=y | |||
405 | CONFIG_PROC_EVENTS=y | 474 | CONFIG_PROC_EVENTS=y |
406 | CONFIG_MTD=y | 475 | CONFIG_MTD=y |
407 | # CONFIG_MTD_DEBUG is not set | 476 | # CONFIG_MTD_DEBUG is not set |
477 | # CONFIG_MTD_TESTS is not set | ||
408 | # CONFIG_MTD_CONCAT is not set | 478 | # CONFIG_MTD_CONCAT is not set |
409 | CONFIG_MTD_PARTITIONS=y | 479 | CONFIG_MTD_PARTITIONS=y |
410 | # CONFIG_MTD_TESTS is not set | ||
411 | # CONFIG_MTD_REDBOOT_PARTS is not set | 480 | # CONFIG_MTD_REDBOOT_PARTS is not set |
412 | CONFIG_MTD_CMDLINE_PARTS=y | 481 | CONFIG_MTD_CMDLINE_PARTS=y |
413 | CONFIG_MTD_OF_PARTS=y | 482 | CONFIG_MTD_OF_PARTS=y |
@@ -483,7 +552,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
483 | # LPDDR flash memory drivers | 552 | # LPDDR flash memory drivers |
484 | # | 553 | # |
485 | # CONFIG_MTD_LPDDR is not set | 554 | # CONFIG_MTD_LPDDR is not set |
486 | # CONFIG_MTD_QINFO_PROBE is not set | ||
487 | 555 | ||
488 | # | 556 | # |
489 | # UBI - Unsorted block images | 557 | # UBI - Unsorted block images |
@@ -491,7 +559,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
491 | CONFIG_MTD_UBI=m | 559 | CONFIG_MTD_UBI=m |
492 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 | 560 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 |
493 | CONFIG_MTD_UBI_BEB_RESERVE=1 | 561 | CONFIG_MTD_UBI_BEB_RESERVE=1 |
494 | CONFIG_MTD_UBI_GLUEBI=y | 562 | CONFIG_MTD_UBI_GLUEBI=m |
495 | 563 | ||
496 | # | 564 | # |
497 | # UBI debugging options | 565 | # UBI debugging options |
@@ -509,6 +577,7 @@ CONFIG_BLK_DEV=y | |||
509 | # CONFIG_BLK_DEV_UMEM is not set | 577 | # CONFIG_BLK_DEV_UMEM is not set |
510 | # CONFIG_BLK_DEV_COW_COMMON is not set | 578 | # CONFIG_BLK_DEV_COW_COMMON is not set |
511 | # CONFIG_BLK_DEV_LOOP is not set | 579 | # CONFIG_BLK_DEV_LOOP is not set |
580 | # CONFIG_BLK_DEV_DRBD is not set | ||
512 | # CONFIG_BLK_DEV_NBD is not set | 581 | # CONFIG_BLK_DEV_NBD is not set |
513 | # CONFIG_BLK_DEV_SX8 is not set | 582 | # CONFIG_BLK_DEV_SX8 is not set |
514 | CONFIG_BLK_DEV_RAM=y | 583 | CONFIG_BLK_DEV_RAM=y |
@@ -520,14 +589,25 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
520 | CONFIG_XILINX_SYSACE=m | 589 | CONFIG_XILINX_SYSACE=m |
521 | # CONFIG_BLK_DEV_HD is not set | 590 | # CONFIG_BLK_DEV_HD is not set |
522 | CONFIG_MISC_DEVICES=y | 591 | CONFIG_MISC_DEVICES=y |
592 | # CONFIG_AD525X_DPOT is not set | ||
523 | # CONFIG_PHANTOM is not set | 593 | # CONFIG_PHANTOM is not set |
524 | # CONFIG_EEPROM_93CX6 is not set | ||
525 | # CONFIG_SGI_IOC4 is not set | 594 | # CONFIG_SGI_IOC4 is not set |
526 | # CONFIG_TIFM_CORE is not set | 595 | # CONFIG_TIFM_CORE is not set |
527 | # CONFIG_ICS932S401 is not set | 596 | # CONFIG_ICS932S401 is not set |
528 | # CONFIG_ENCLOSURE_SERVICES is not set | 597 | # CONFIG_ENCLOSURE_SERVICES is not set |
529 | # CONFIG_HP_ILO is not set | 598 | # CONFIG_HP_ILO is not set |
599 | # CONFIG_ISL29003 is not set | ||
600 | # CONFIG_DS1682 is not set | ||
530 | # CONFIG_C2PORT is not set | 601 | # CONFIG_C2PORT is not set |
602 | |||
603 | # | ||
604 | # EEPROM support | ||
605 | # | ||
606 | # CONFIG_EEPROM_AT24 is not set | ||
607 | # CONFIG_EEPROM_LEGACY is not set | ||
608 | # CONFIG_EEPROM_MAX6875 is not set | ||
609 | # CONFIG_EEPROM_93CX6 is not set | ||
610 | # CONFIG_CB710_CORE is not set | ||
531 | CONFIG_HAVE_IDE=y | 611 | CONFIG_HAVE_IDE=y |
532 | # CONFIG_IDE is not set | 612 | # CONFIG_IDE is not set |
533 | 613 | ||
@@ -547,7 +627,11 @@ CONFIG_HAVE_IDE=y | |||
547 | # | 627 | # |
548 | 628 | ||
549 | # | 629 | # |
550 | # Enable only one of the two stacks, unless you know what you are doing | 630 | # You can enable one or both FireWire driver stacks. |
631 | # | ||
632 | |||
633 | # | ||
634 | # See the help texts for more information. | ||
551 | # | 635 | # |
552 | # CONFIG_FIREWIRE is not set | 636 | # CONFIG_FIREWIRE is not set |
553 | # CONFIG_IEEE1394 is not set | 637 | # CONFIG_IEEE1394 is not set |
@@ -568,6 +652,8 @@ CONFIG_NET_ETHERNET=y | |||
568 | # CONFIG_SUNGEM is not set | 652 | # CONFIG_SUNGEM is not set |
569 | # CONFIG_CASSINI is not set | 653 | # CONFIG_CASSINI is not set |
570 | # CONFIG_NET_VENDOR_3COM is not set | 654 | # CONFIG_NET_VENDOR_3COM is not set |
655 | # CONFIG_ETHOC is not set | ||
656 | # CONFIG_DNET is not set | ||
571 | # CONFIG_NET_TULIP is not set | 657 | # CONFIG_NET_TULIP is not set |
572 | # CONFIG_HP100 is not set | 658 | # CONFIG_HP100 is not set |
573 | CONFIG_IBM_NEW_EMAC=y | 659 | CONFIG_IBM_NEW_EMAC=y |
@@ -586,7 +672,10 @@ CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT=y | |||
586 | CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y | 672 | CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y |
587 | # CONFIG_NET_PCI is not set | 673 | # CONFIG_NET_PCI is not set |
588 | # CONFIG_B44 is not set | 674 | # CONFIG_B44 is not set |
675 | # CONFIG_KS8842 is not set | ||
676 | # CONFIG_KS8851_MLL is not set | ||
589 | # CONFIG_ATL2 is not set | 677 | # CONFIG_ATL2 is not set |
678 | # CONFIG_XILINX_EMACLITE is not set | ||
590 | CONFIG_NETDEV_1000=y | 679 | CONFIG_NETDEV_1000=y |
591 | # CONFIG_ACENIC is not set | 680 | # CONFIG_ACENIC is not set |
592 | # CONFIG_DL2K is not set | 681 | # CONFIG_DL2K is not set |
@@ -594,6 +683,7 @@ CONFIG_NETDEV_1000=y | |||
594 | # CONFIG_E1000E is not set | 683 | # CONFIG_E1000E is not set |
595 | # CONFIG_IP1000 is not set | 684 | # CONFIG_IP1000 is not set |
596 | # CONFIG_IGB is not set | 685 | # CONFIG_IGB is not set |
686 | # CONFIG_IGBVF is not set | ||
597 | # CONFIG_NS83820 is not set | 687 | # CONFIG_NS83820 is not set |
598 | # CONFIG_HAMACHI is not set | 688 | # CONFIG_HAMACHI is not set |
599 | # CONFIG_YELLOWFIN is not set | 689 | # CONFIG_YELLOWFIN is not set |
@@ -604,9 +694,13 @@ CONFIG_NETDEV_1000=y | |||
604 | # CONFIG_VIA_VELOCITY is not set | 694 | # CONFIG_VIA_VELOCITY is not set |
605 | # CONFIG_TIGON3 is not set | 695 | # CONFIG_TIGON3 is not set |
606 | # CONFIG_BNX2 is not set | 696 | # CONFIG_BNX2 is not set |
697 | # CONFIG_CNIC is not set | ||
698 | # CONFIG_MV643XX_ETH is not set | ||
699 | # CONFIG_XILINX_LL_TEMAC is not set | ||
607 | # CONFIG_QLA3XXX is not set | 700 | # CONFIG_QLA3XXX is not set |
608 | # CONFIG_ATL1 is not set | 701 | # CONFIG_ATL1 is not set |
609 | # CONFIG_ATL1E is not set | 702 | # CONFIG_ATL1E is not set |
703 | # CONFIG_ATL1C is not set | ||
610 | # CONFIG_JME is not set | 704 | # CONFIG_JME is not set |
611 | CONFIG_NETDEV_10000=y | 705 | CONFIG_NETDEV_10000=y |
612 | # CONFIG_CHELSIO_T1 is not set | 706 | # CONFIG_CHELSIO_T1 is not set |
@@ -616,6 +710,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
616 | # CONFIG_IXGBE is not set | 710 | # CONFIG_IXGBE is not set |
617 | # CONFIG_IXGB is not set | 711 | # CONFIG_IXGB is not set |
618 | # CONFIG_S2IO is not set | 712 | # CONFIG_S2IO is not set |
713 | # CONFIG_VXGE is not set | ||
619 | # CONFIG_MYRI10GE is not set | 714 | # CONFIG_MYRI10GE is not set |
620 | # CONFIG_NETXEN_NIC is not set | 715 | # CONFIG_NETXEN_NIC is not set |
621 | # CONFIG_NIU is not set | 716 | # CONFIG_NIU is not set |
@@ -625,14 +720,13 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
625 | # CONFIG_BNX2X is not set | 720 | # CONFIG_BNX2X is not set |
626 | # CONFIG_QLGE is not set | 721 | # CONFIG_QLGE is not set |
627 | # CONFIG_SFC is not set | 722 | # CONFIG_SFC is not set |
723 | # CONFIG_BE2NET is not set | ||
628 | # CONFIG_TR is not set | 724 | # CONFIG_TR is not set |
629 | 725 | CONFIG_WLAN=y | |
630 | # | 726 | # CONFIG_AIRO is not set |
631 | # Wireless LAN | 727 | # CONFIG_ATMEL is not set |
632 | # | 728 | # CONFIG_PRISM54 is not set |
633 | # CONFIG_WLAN_PRE80211 is not set | 729 | # CONFIG_HOSTAP is not set |
634 | # CONFIG_WLAN_80211 is not set | ||
635 | # CONFIG_IWLWIFI_LEDS is not set | ||
636 | 730 | ||
637 | # | 731 | # |
638 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 732 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -645,6 +739,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
645 | # CONFIG_NETCONSOLE is not set | 739 | # CONFIG_NETCONSOLE is not set |
646 | # CONFIG_NETPOLL is not set | 740 | # CONFIG_NETPOLL is not set |
647 | # CONFIG_NET_POLL_CONTROLLER is not set | 741 | # CONFIG_NET_POLL_CONTROLLER is not set |
742 | # CONFIG_VMXNET3 is not set | ||
648 | # CONFIG_ISDN is not set | 743 | # CONFIG_ISDN is not set |
649 | # CONFIG_PHONE is not set | 744 | # CONFIG_PHONE is not set |
650 | 745 | ||
@@ -663,6 +758,7 @@ CONFIG_SERIO=m | |||
663 | # CONFIG_SERIO_LIBPS2 is not set | 758 | # CONFIG_SERIO_LIBPS2 is not set |
664 | # CONFIG_SERIO_RAW is not set | 759 | # CONFIG_SERIO_RAW is not set |
665 | CONFIG_SERIO_XILINX_XPS_PS2=m | 760 | CONFIG_SERIO_XILINX_XPS_PS2=m |
761 | # CONFIG_SERIO_ALTERA_PS2 is not set | ||
666 | # CONFIG_GAMEPORT is not set | 762 | # CONFIG_GAMEPORT is not set |
667 | 763 | ||
668 | # | 764 | # |
@@ -697,6 +793,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
697 | # CONFIG_SERIAL_JSM is not set | 793 | # CONFIG_SERIAL_JSM is not set |
698 | CONFIG_SERIAL_OF_PLATFORM=y | 794 | CONFIG_SERIAL_OF_PLATFORM=y |
699 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 795 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
796 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
700 | CONFIG_UNIX98_PTYS=y | 797 | CONFIG_UNIX98_PTYS=y |
701 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 798 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
702 | CONFIG_LEGACY_PTYS=y | 799 | CONFIG_LEGACY_PTYS=y |
@@ -714,6 +811,7 @@ CONFIG_XILINX_HWICAP=m | |||
714 | CONFIG_DEVPORT=y | 811 | CONFIG_DEVPORT=y |
715 | CONFIG_I2C=m | 812 | CONFIG_I2C=m |
716 | CONFIG_I2C_BOARDINFO=y | 813 | CONFIG_I2C_BOARDINFO=y |
814 | CONFIG_I2C_COMPAT=y | ||
717 | CONFIG_I2C_CHARDEV=m | 815 | CONFIG_I2C_CHARDEV=m |
718 | CONFIG_I2C_HELPER_AUTO=y | 816 | CONFIG_I2C_HELPER_AUTO=y |
719 | CONFIG_I2C_ALGOBIT=m | 817 | CONFIG_I2C_ALGOBIT=m |
@@ -756,11 +854,6 @@ CONFIG_I2C_IBM_IIC=m | |||
756 | # CONFIG_I2C_TAOS_EVM is not set | 854 | # CONFIG_I2C_TAOS_EVM is not set |
757 | 855 | ||
758 | # | 856 | # |
759 | # Graphics adapter I2C/DDC channel drivers | ||
760 | # | ||
761 | # CONFIG_I2C_VOODOO3 is not set | ||
762 | |||
763 | # | ||
764 | # Other I2C/SMBus bus drivers | 857 | # Other I2C/SMBus bus drivers |
765 | # | 858 | # |
766 | # CONFIG_I2C_PCA_PLATFORM is not set | 859 | # CONFIG_I2C_PCA_PLATFORM is not set |
@@ -769,20 +862,17 @@ CONFIG_I2C_IBM_IIC=m | |||
769 | # | 862 | # |
770 | # Miscellaneous I2C Chip support | 863 | # Miscellaneous I2C Chip support |
771 | # | 864 | # |
772 | # CONFIG_DS1682 is not set | ||
773 | # CONFIG_EEPROM_AT24 is not set | ||
774 | # CONFIG_EEPROM_LEGACY is not set | ||
775 | # CONFIG_SENSORS_PCF8574 is not set | ||
776 | # CONFIG_PCF8575 is not set | ||
777 | # CONFIG_SENSORS_PCA9539 is not set | ||
778 | # CONFIG_SENSORS_PCF8591 is not set | ||
779 | # CONFIG_SENSORS_MAX6875 is not set | ||
780 | # CONFIG_SENSORS_TSL2550 is not set | 865 | # CONFIG_SENSORS_TSL2550 is not set |
781 | # CONFIG_I2C_DEBUG_CORE is not set | 866 | # CONFIG_I2C_DEBUG_CORE is not set |
782 | # CONFIG_I2C_DEBUG_ALGO is not set | 867 | # CONFIG_I2C_DEBUG_ALGO is not set |
783 | # CONFIG_I2C_DEBUG_BUS is not set | 868 | # CONFIG_I2C_DEBUG_BUS is not set |
784 | # CONFIG_I2C_DEBUG_CHIP is not set | 869 | # CONFIG_I2C_DEBUG_CHIP is not set |
785 | # CONFIG_SPI is not set | 870 | # CONFIG_SPI is not set |
871 | |||
872 | # | ||
873 | # PPS support | ||
874 | # | ||
875 | # CONFIG_PPS is not set | ||
786 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 876 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
787 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 877 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
788 | CONFIG_GPIOLIB=y | 878 | CONFIG_GPIOLIB=y |
@@ -804,11 +894,17 @@ CONFIG_GPIO_XILINX=y | |||
804 | # | 894 | # |
805 | # PCI GPIO expanders: | 895 | # PCI GPIO expanders: |
806 | # | 896 | # |
897 | # CONFIG_GPIO_CS5535 is not set | ||
807 | # CONFIG_GPIO_BT8XX is not set | 898 | # CONFIG_GPIO_BT8XX is not set |
899 | # CONFIG_GPIO_LANGWELL is not set | ||
808 | 900 | ||
809 | # | 901 | # |
810 | # SPI GPIO expanders: | 902 | # SPI GPIO expanders: |
811 | # | 903 | # |
904 | |||
905 | # | ||
906 | # AC97 GPIO expanders: | ||
907 | # | ||
812 | # CONFIG_W1 is not set | 908 | # CONFIG_W1 is not set |
813 | # CONFIG_POWER_SUPPLY is not set | 909 | # CONFIG_POWER_SUPPLY is not set |
814 | # CONFIG_HWMON is not set | 910 | # CONFIG_HWMON is not set |
@@ -832,28 +928,15 @@ CONFIG_SSB_POSSIBLE=y | |||
832 | # CONFIG_MFD_WM8400 is not set | 928 | # CONFIG_MFD_WM8400 is not set |
833 | # CONFIG_MFD_WM8350_I2C is not set | 929 | # CONFIG_MFD_WM8350_I2C is not set |
834 | # CONFIG_MFD_PCF50633 is not set | 930 | # CONFIG_MFD_PCF50633 is not set |
931 | # CONFIG_AB3100_CORE is not set | ||
835 | # CONFIG_REGULATOR is not set | 932 | # CONFIG_REGULATOR is not set |
836 | 933 | # CONFIG_MEDIA_SUPPORT is not set | |
837 | # | ||
838 | # Multimedia devices | ||
839 | # | ||
840 | |||
841 | # | ||
842 | # Multimedia core support | ||
843 | # | ||
844 | # CONFIG_VIDEO_DEV is not set | ||
845 | # CONFIG_DVB_CORE is not set | ||
846 | # CONFIG_VIDEO_MEDIA is not set | ||
847 | |||
848 | # | ||
849 | # Multimedia drivers | ||
850 | # | ||
851 | # CONFIG_DAB is not set | ||
852 | 934 | ||
853 | # | 935 | # |
854 | # Graphics support | 936 | # Graphics support |
855 | # | 937 | # |
856 | # CONFIG_AGP is not set | 938 | # CONFIG_AGP is not set |
939 | CONFIG_VGA_ARB=y | ||
857 | # CONFIG_DRM is not set | 940 | # CONFIG_DRM is not set |
858 | # CONFIG_VGASTATE is not set | 941 | # CONFIG_VGASTATE is not set |
859 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 942 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
@@ -909,6 +992,7 @@ CONFIG_FB_XILINX=m | |||
909 | # CONFIG_FB_VIRTUAL is not set | 992 | # CONFIG_FB_VIRTUAL is not set |
910 | # CONFIG_FB_METRONOME is not set | 993 | # CONFIG_FB_METRONOME is not set |
911 | # CONFIG_FB_MB862XX is not set | 994 | # CONFIG_FB_MB862XX is not set |
995 | # CONFIG_FB_BROADSHEET is not set | ||
912 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 996 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
913 | 997 | ||
914 | # | 998 | # |
@@ -930,7 +1014,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
930 | # | 1014 | # |
931 | 1015 | ||
932 | # | 1016 | # |
933 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 1017 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
934 | # | 1018 | # |
935 | # CONFIG_USB_GADGET is not set | 1019 | # CONFIG_USB_GADGET is not set |
936 | 1020 | ||
@@ -946,7 +1030,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
946 | # CONFIG_EDAC is not set | 1030 | # CONFIG_EDAC is not set |
947 | # CONFIG_RTC_CLASS is not set | 1031 | # CONFIG_RTC_CLASS is not set |
948 | # CONFIG_DMADEVICES is not set | 1032 | # CONFIG_DMADEVICES is not set |
1033 | # CONFIG_AUXDISPLAY is not set | ||
949 | # CONFIG_UIO is not set | 1034 | # CONFIG_UIO is not set |
1035 | |||
1036 | # | ||
1037 | # TI VLYNQ | ||
1038 | # | ||
950 | # CONFIG_STAGING is not set | 1039 | # CONFIG_STAGING is not set |
951 | 1040 | ||
952 | # | 1041 | # |
@@ -956,6 +1045,7 @@ CONFIG_EXT2_FS=y | |||
956 | # CONFIG_EXT2_FS_XATTR is not set | 1045 | # CONFIG_EXT2_FS_XATTR is not set |
957 | # CONFIG_EXT2_FS_XIP is not set | 1046 | # CONFIG_EXT2_FS_XIP is not set |
958 | CONFIG_EXT3_FS=m | 1047 | CONFIG_EXT3_FS=m |
1048 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
959 | CONFIG_EXT3_FS_XATTR=y | 1049 | CONFIG_EXT3_FS_XATTR=y |
960 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1050 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
961 | # CONFIG_EXT3_FS_SECURITY is not set | 1051 | # CONFIG_EXT3_FS_SECURITY is not set |
@@ -966,11 +1056,13 @@ CONFIG_FS_MBCACHE=m | |||
966 | # CONFIG_REISERFS_FS is not set | 1056 | # CONFIG_REISERFS_FS is not set |
967 | # CONFIG_JFS_FS is not set | 1057 | # CONFIG_JFS_FS is not set |
968 | # CONFIG_FS_POSIX_ACL is not set | 1058 | # CONFIG_FS_POSIX_ACL is not set |
969 | CONFIG_FILE_LOCKING=y | ||
970 | # CONFIG_XFS_FS is not set | 1059 | # CONFIG_XFS_FS is not set |
971 | # CONFIG_GFS2_FS is not set | 1060 | # CONFIG_GFS2_FS is not set |
972 | # CONFIG_OCFS2_FS is not set | 1061 | # CONFIG_OCFS2_FS is not set |
973 | # CONFIG_BTRFS_FS is not set | 1062 | # CONFIG_BTRFS_FS is not set |
1063 | # CONFIG_NILFS2_FS is not set | ||
1064 | CONFIG_FILE_LOCKING=y | ||
1065 | CONFIG_FSNOTIFY=y | ||
974 | CONFIG_DNOTIFY=y | 1066 | CONFIG_DNOTIFY=y |
975 | CONFIG_INOTIFY=y | 1067 | CONFIG_INOTIFY=y |
976 | CONFIG_INOTIFY_USER=y | 1068 | CONFIG_INOTIFY_USER=y |
@@ -980,6 +1072,11 @@ CONFIG_INOTIFY_USER=y | |||
980 | # CONFIG_FUSE_FS is not set | 1072 | # CONFIG_FUSE_FS is not set |
981 | 1073 | ||
982 | # | 1074 | # |
1075 | # Caches | ||
1076 | # | ||
1077 | # CONFIG_FSCACHE is not set | ||
1078 | |||
1079 | # | ||
983 | # CD-ROM/DVD Filesystems | 1080 | # CD-ROM/DVD Filesystems |
984 | # | 1081 | # |
985 | # CONFIG_ISO9660_FS is not set | 1082 | # CONFIG_ISO9660_FS is not set |
@@ -1053,7 +1150,6 @@ CONFIG_LOCKD=y | |||
1053 | CONFIG_LOCKD_V4=y | 1150 | CONFIG_LOCKD_V4=y |
1054 | CONFIG_NFS_COMMON=y | 1151 | CONFIG_NFS_COMMON=y |
1055 | CONFIG_SUNRPC=y | 1152 | CONFIG_SUNRPC=y |
1056 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1057 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1153 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1058 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1154 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1059 | # CONFIG_SMB_FS is not set | 1155 | # CONFIG_SMB_FS is not set |
@@ -1108,6 +1204,7 @@ CONFIG_NLS_ISO8859_1=m | |||
1108 | # CONFIG_NLS_KOI8_U is not set | 1204 | # CONFIG_NLS_KOI8_U is not set |
1109 | # CONFIG_NLS_UTF8 is not set | 1205 | # CONFIG_NLS_UTF8 is not set |
1110 | # CONFIG_DLM is not set | 1206 | # CONFIG_DLM is not set |
1207 | # CONFIG_BINARY_PRINTF is not set | ||
1111 | 1208 | ||
1112 | # | 1209 | # |
1113 | # Library routines | 1210 | # Library routines |
@@ -1125,11 +1222,13 @@ CONFIG_ZLIB_INFLATE=y | |||
1125 | CONFIG_ZLIB_DEFLATE=m | 1222 | CONFIG_ZLIB_DEFLATE=m |
1126 | CONFIG_LZO_COMPRESS=m | 1223 | CONFIG_LZO_COMPRESS=m |
1127 | CONFIG_LZO_DECOMPRESS=m | 1224 | CONFIG_LZO_DECOMPRESS=m |
1128 | CONFIG_PLIST=y | 1225 | CONFIG_DECOMPRESS_GZIP=y |
1129 | CONFIG_HAS_IOMEM=y | 1226 | CONFIG_HAS_IOMEM=y |
1130 | CONFIG_HAS_IOPORT=y | 1227 | CONFIG_HAS_IOPORT=y |
1131 | CONFIG_HAS_DMA=y | 1228 | CONFIG_HAS_DMA=y |
1132 | CONFIG_HAVE_LMB=y | 1229 | CONFIG_HAVE_LMB=y |
1230 | CONFIG_NLATTR=y | ||
1231 | CONFIG_GENERIC_ATOMIC64=y | ||
1133 | 1232 | ||
1134 | # | 1233 | # |
1135 | # Kernel hacking | 1234 | # Kernel hacking |
@@ -1139,6 +1238,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
1139 | CONFIG_ENABLE_MUST_CHECK=y | 1238 | CONFIG_ENABLE_MUST_CHECK=y |
1140 | CONFIG_FRAME_WARN=1024 | 1239 | CONFIG_FRAME_WARN=1024 |
1141 | CONFIG_MAGIC_SYSRQ=y | 1240 | CONFIG_MAGIC_SYSRQ=y |
1241 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1142 | # CONFIG_UNUSED_SYMBOLS is not set | 1242 | # CONFIG_UNUSED_SYMBOLS is not set |
1143 | CONFIG_DEBUG_FS=y | 1243 | CONFIG_DEBUG_FS=y |
1144 | # CONFIG_HEADERS_CHECK is not set | 1244 | # CONFIG_HEADERS_CHECK is not set |
@@ -1147,16 +1247,23 @@ CONFIG_DEBUG_KERNEL=y | |||
1147 | CONFIG_DETECT_SOFTLOCKUP=y | 1247 | CONFIG_DETECT_SOFTLOCKUP=y |
1148 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1248 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
1149 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1249 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
1250 | CONFIG_DETECT_HUNG_TASK=y | ||
1251 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
1252 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
1150 | CONFIG_SCHED_DEBUG=y | 1253 | CONFIG_SCHED_DEBUG=y |
1151 | # CONFIG_SCHEDSTATS is not set | 1254 | # CONFIG_SCHEDSTATS is not set |
1152 | # CONFIG_TIMER_STATS is not set | 1255 | # CONFIG_TIMER_STATS is not set |
1153 | # CONFIG_DEBUG_OBJECTS is not set | 1256 | # CONFIG_DEBUG_OBJECTS is not set |
1154 | # CONFIG_SLUB_DEBUG_ON is not set | 1257 | # CONFIG_SLUB_DEBUG_ON is not set |
1155 | # CONFIG_SLUB_STATS is not set | 1258 | # CONFIG_SLUB_STATS is not set |
1259 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
1156 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1260 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1157 | # CONFIG_RT_MUTEX_TESTER is not set | 1261 | # CONFIG_RT_MUTEX_TESTER is not set |
1158 | # CONFIG_DEBUG_SPINLOCK is not set | 1262 | # CONFIG_DEBUG_SPINLOCK is not set |
1159 | # CONFIG_DEBUG_MUTEXES is not set | 1263 | # CONFIG_DEBUG_MUTEXES is not set |
1264 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1265 | # CONFIG_PROVE_LOCKING is not set | ||
1266 | # CONFIG_LOCK_STAT is not set | ||
1160 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1267 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1161 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1268 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1162 | # CONFIG_DEBUG_KOBJECT is not set | 1269 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1168,35 +1275,45 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1168 | # CONFIG_DEBUG_LIST is not set | 1275 | # CONFIG_DEBUG_LIST is not set |
1169 | # CONFIG_DEBUG_SG is not set | 1276 | # CONFIG_DEBUG_SG is not set |
1170 | # CONFIG_DEBUG_NOTIFIERS is not set | 1277 | # CONFIG_DEBUG_NOTIFIERS is not set |
1171 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1278 | # CONFIG_DEBUG_CREDENTIALS is not set |
1172 | # CONFIG_RCU_TORTURE_TEST is not set | 1279 | # CONFIG_RCU_TORTURE_TEST is not set |
1173 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1280 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1174 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1281 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1175 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1282 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1283 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1176 | # CONFIG_FAULT_INJECTION is not set | 1284 | # CONFIG_FAULT_INJECTION is not set |
1177 | # CONFIG_LATENCYTOP is not set | 1285 | # CONFIG_LATENCYTOP is not set |
1178 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1286 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1287 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
1179 | CONFIG_HAVE_FUNCTION_TRACER=y | 1288 | CONFIG_HAVE_FUNCTION_TRACER=y |
1289 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
1180 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1290 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1181 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1291 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1182 | 1292 | CONFIG_TRACING_SUPPORT=y | |
1183 | # | 1293 | CONFIG_FTRACE=y |
1184 | # Tracers | ||
1185 | # | ||
1186 | # CONFIG_FUNCTION_TRACER is not set | 1294 | # CONFIG_FUNCTION_TRACER is not set |
1295 | # CONFIG_IRQSOFF_TRACER is not set | ||
1187 | # CONFIG_SCHED_TRACER is not set | 1296 | # CONFIG_SCHED_TRACER is not set |
1188 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1297 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1189 | # CONFIG_BOOT_TRACER is not set | 1298 | # CONFIG_BOOT_TRACER is not set |
1190 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1299 | CONFIG_BRANCH_PROFILE_NONE=y |
1300 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1301 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1191 | # CONFIG_STACK_TRACER is not set | 1302 | # CONFIG_STACK_TRACER is not set |
1192 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1303 | # CONFIG_KMEMTRACE is not set |
1304 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1305 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1306 | # CONFIG_DYNAMIC_DEBUG is not set | ||
1307 | # CONFIG_DMA_API_DEBUG is not set | ||
1193 | # CONFIG_SAMPLES is not set | 1308 | # CONFIG_SAMPLES is not set |
1194 | CONFIG_HAVE_ARCH_KGDB=y | 1309 | CONFIG_HAVE_ARCH_KGDB=y |
1195 | # CONFIG_KGDB is not set | 1310 | # CONFIG_KGDB is not set |
1311 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1312 | CONFIG_PPC_WERROR=y | ||
1196 | CONFIG_PRINT_STACK_DEPTH=64 | 1313 | CONFIG_PRINT_STACK_DEPTH=64 |
1197 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1314 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1198 | # CONFIG_DEBUG_STACK_USAGE is not set | 1315 | # CONFIG_DEBUG_STACK_USAGE is not set |
1199 | # CONFIG_DEBUG_PAGEALLOC is not set | 1316 | # CONFIG_PPC_EMULATED_STATS is not set |
1200 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1317 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1201 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1318 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1202 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1319 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -1212,13 +1329,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1212 | # CONFIG_KEYS is not set | 1329 | # CONFIG_KEYS is not set |
1213 | # CONFIG_SECURITY is not set | 1330 | # CONFIG_SECURITY is not set |
1214 | # CONFIG_SECURITYFS is not set | 1331 | # CONFIG_SECURITYFS is not set |
1215 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1332 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1333 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1334 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1335 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1336 | CONFIG_DEFAULT_SECURITY="" | ||
1216 | CONFIG_CRYPTO=y | 1337 | CONFIG_CRYPTO=y |
1217 | 1338 | ||
1218 | # | 1339 | # |
1219 | # Crypto core or helper | 1340 | # Crypto core or helper |
1220 | # | 1341 | # |
1221 | # CONFIG_CRYPTO_FIPS is not set | ||
1222 | CONFIG_CRYPTO_ALGAPI=y | 1342 | CONFIG_CRYPTO_ALGAPI=y |
1223 | CONFIG_CRYPTO_ALGAPI2=y | 1343 | CONFIG_CRYPTO_ALGAPI2=y |
1224 | CONFIG_CRYPTO_AEAD2=y | 1344 | CONFIG_CRYPTO_AEAD2=y |
@@ -1227,10 +1347,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
1227 | CONFIG_CRYPTO_HASH=y | 1347 | CONFIG_CRYPTO_HASH=y |
1228 | CONFIG_CRYPTO_HASH2=y | 1348 | CONFIG_CRYPTO_HASH2=y |
1229 | CONFIG_CRYPTO_RNG2=y | 1349 | CONFIG_CRYPTO_RNG2=y |
1350 | CONFIG_CRYPTO_PCOMP=y | ||
1230 | CONFIG_CRYPTO_MANAGER=y | 1351 | CONFIG_CRYPTO_MANAGER=y |
1231 | CONFIG_CRYPTO_MANAGER2=y | 1352 | CONFIG_CRYPTO_MANAGER2=y |
1232 | # CONFIG_CRYPTO_GF128MUL is not set | 1353 | # CONFIG_CRYPTO_GF128MUL is not set |
1233 | # CONFIG_CRYPTO_NULL is not set | 1354 | # CONFIG_CRYPTO_NULL is not set |
1355 | CONFIG_CRYPTO_WORKQUEUE=y | ||
1234 | # CONFIG_CRYPTO_CRYPTD is not set | 1356 | # CONFIG_CRYPTO_CRYPTD is not set |
1235 | # CONFIG_CRYPTO_AUTHENC is not set | 1357 | # CONFIG_CRYPTO_AUTHENC is not set |
1236 | # CONFIG_CRYPTO_TEST is not set | 1358 | # CONFIG_CRYPTO_TEST is not set |
@@ -1258,11 +1380,13 @@ CONFIG_CRYPTO_PCBC=y | |||
1258 | # | 1380 | # |
1259 | # CONFIG_CRYPTO_HMAC is not set | 1381 | # CONFIG_CRYPTO_HMAC is not set |
1260 | # CONFIG_CRYPTO_XCBC is not set | 1382 | # CONFIG_CRYPTO_XCBC is not set |
1383 | # CONFIG_CRYPTO_VMAC is not set | ||
1261 | 1384 | ||
1262 | # | 1385 | # |
1263 | # Digest | 1386 | # Digest |
1264 | # | 1387 | # |
1265 | # CONFIG_CRYPTO_CRC32C is not set | 1388 | # CONFIG_CRYPTO_CRC32C is not set |
1389 | # CONFIG_CRYPTO_GHASH is not set | ||
1266 | # CONFIG_CRYPTO_MD4 is not set | 1390 | # CONFIG_CRYPTO_MD4 is not set |
1267 | CONFIG_CRYPTO_MD5=y | 1391 | CONFIG_CRYPTO_MD5=y |
1268 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1392 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1299,6 +1423,7 @@ CONFIG_CRYPTO_DES=y | |||
1299 | # Compression | 1423 | # Compression |
1300 | # | 1424 | # |
1301 | CONFIG_CRYPTO_DEFLATE=m | 1425 | CONFIG_CRYPTO_DEFLATE=m |
1426 | # CONFIG_CRYPTO_ZLIB is not set | ||
1302 | CONFIG_CRYPTO_LZO=m | 1427 | CONFIG_CRYPTO_LZO=m |
1303 | 1428 | ||
1304 | # | 1429 | # |
@@ -1307,5 +1432,6 @@ CONFIG_CRYPTO_LZO=m | |||
1307 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 1432 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
1308 | CONFIG_CRYPTO_HW=y | 1433 | CONFIG_CRYPTO_HW=y |
1309 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1434 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1435 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
1310 | # CONFIG_PPC_CLOCK is not set | 1436 | # CONFIG_PPC_CLOCK is not set |
1311 | # CONFIG_VIRTUALIZATION is not set | 1437 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig index 5e6d55f006bb..46f5c47e9f85 100644 --- a/arch/powerpc/configs/ppc44x_defconfig +++ b/arch/powerpc/configs/ppc44x_defconfig | |||
@@ -1,14 +1,14 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc2 | 3 | # Linux kernel version: 2.6.33-rc1 |
4 | # Fri Jan 23 08:43:46 2009 | 4 | # Mon Jan 4 13:42:17 2010 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | # CONFIG_6xx is not set | 11 | # CONFIG_PPC_BOOK3S_32 is not set |
12 | # CONFIG_PPC_85xx is not set | 12 | # CONFIG_PPC_85xx is not set |
13 | # CONFIG_PPC_8xx is not set | 13 | # CONFIG_PPC_8xx is not set |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -20,6 +20,7 @@ CONFIG_BOOKE=y | |||
20 | CONFIG_PTE_64BIT=y | 20 | CONFIG_PTE_64BIT=y |
21 | CONFIG_PHYS_64BIT=y | 21 | CONFIG_PHYS_64BIT=y |
22 | CONFIG_PPC_MMU_NOHASH=y | 22 | CONFIG_PPC_MMU_NOHASH=y |
23 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 25 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
@@ -31,15 +32,18 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
37 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_NR_IRQS=512 | ||
36 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -54,11 +58,15 @@ CONFIG_PPC_UDBG_16550=y | |||
54 | # CONFIG_GENERIC_TBSYNC is not set | 58 | # CONFIG_GENERIC_TBSYNC is not set |
55 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
56 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
57 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | CONFIG_DTC=y |
62 | CONFIG_DEFAULT_UIMAGE=y | ||
63 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_PPC_DCR_NATIVE=y | 64 | CONFIG_PPC_DCR_NATIVE=y |
59 | # CONFIG_PPC_DCR_MMIO is not set | 65 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_PPC_DCR=y | 66 | CONFIG_PPC_DCR=y |
67 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 68 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
69 | CONFIG_CONSTRUCTORS=y | ||
62 | 70 | ||
63 | # | 71 | # |
64 | # General setup | 72 | # General setup |
@@ -72,9 +80,21 @@ CONFIG_SWAP=y | |||
72 | CONFIG_SYSVIPC=y | 80 | CONFIG_SYSVIPC=y |
73 | CONFIG_SYSVIPC_SYSCTL=y | 81 | CONFIG_SYSVIPC_SYSCTL=y |
74 | CONFIG_POSIX_MQUEUE=y | 82 | CONFIG_POSIX_MQUEUE=y |
83 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
75 | # CONFIG_BSD_PROCESS_ACCT is not set | 84 | # CONFIG_BSD_PROCESS_ACCT is not set |
76 | # CONFIG_TASKSTATS is not set | 85 | # CONFIG_TASKSTATS is not set |
77 | # CONFIG_AUDIT is not set | 86 | # CONFIG_AUDIT is not set |
87 | |||
88 | # | ||
89 | # RCU Subsystem | ||
90 | # | ||
91 | CONFIG_TREE_RCU=y | ||
92 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
93 | # CONFIG_TINY_RCU is not set | ||
94 | # CONFIG_RCU_TRACE is not set | ||
95 | CONFIG_RCU_FANOUT=32 | ||
96 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
97 | # CONFIG_TREE_RCU_TRACE is not set | ||
78 | # CONFIG_IKCONFIG is not set | 98 | # CONFIG_IKCONFIG is not set |
79 | CONFIG_LOG_BUF_SHIFT=14 | 99 | CONFIG_LOG_BUF_SHIFT=14 |
80 | CONFIG_GROUP_SCHED=y | 100 | CONFIG_GROUP_SCHED=y |
@@ -89,31 +109,40 @@ CONFIG_SYSFS_DEPRECATED_V2=y | |||
89 | # CONFIG_NAMESPACES is not set | 109 | # CONFIG_NAMESPACES is not set |
90 | CONFIG_BLK_DEV_INITRD=y | 110 | CONFIG_BLK_DEV_INITRD=y |
91 | CONFIG_INITRAMFS_SOURCE="" | 111 | CONFIG_INITRAMFS_SOURCE="" |
112 | CONFIG_RD_GZIP=y | ||
113 | # CONFIG_RD_BZIP2 is not set | ||
114 | # CONFIG_RD_LZMA is not set | ||
92 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 115 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
93 | CONFIG_SYSCTL=y | 116 | CONFIG_SYSCTL=y |
117 | CONFIG_ANON_INODES=y | ||
94 | CONFIG_EMBEDDED=y | 118 | CONFIG_EMBEDDED=y |
95 | CONFIG_SYSCTL_SYSCALL=y | 119 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_KALLSYMS=y | 120 | CONFIG_KALLSYMS=y |
97 | CONFIG_KALLSYMS_ALL=y | 121 | CONFIG_KALLSYMS_ALL=y |
98 | CONFIG_KALLSYMS_STRIP_GENERATED=y | ||
99 | CONFIG_KALLSYMS_EXTRA_PASS=y | 122 | CONFIG_KALLSYMS_EXTRA_PASS=y |
100 | CONFIG_HOTPLUG=y | 123 | CONFIG_HOTPLUG=y |
101 | CONFIG_PRINTK=y | 124 | CONFIG_PRINTK=y |
102 | CONFIG_BUG=y | 125 | CONFIG_BUG=y |
103 | CONFIG_ELF_CORE=y | 126 | CONFIG_ELF_CORE=y |
104 | CONFIG_COMPAT_BRK=y | ||
105 | CONFIG_BASE_FULL=y | 127 | CONFIG_BASE_FULL=y |
106 | CONFIG_FUTEX=y | 128 | CONFIG_FUTEX=y |
107 | CONFIG_ANON_INODES=y | ||
108 | CONFIG_EPOLL=y | 129 | CONFIG_EPOLL=y |
109 | CONFIG_SIGNALFD=y | 130 | CONFIG_SIGNALFD=y |
110 | CONFIG_TIMERFD=y | 131 | CONFIG_TIMERFD=y |
111 | CONFIG_EVENTFD=y | 132 | CONFIG_EVENTFD=y |
112 | CONFIG_SHMEM=y | 133 | CONFIG_SHMEM=y |
113 | CONFIG_AIO=y | 134 | CONFIG_AIO=y |
135 | CONFIG_HAVE_PERF_EVENTS=y | ||
136 | |||
137 | # | ||
138 | # Kernel Performance Events And Counters | ||
139 | # | ||
140 | # CONFIG_PERF_EVENTS is not set | ||
141 | # CONFIG_PERF_COUNTERS is not set | ||
114 | CONFIG_VM_EVENT_COUNTERS=y | 142 | CONFIG_VM_EVENT_COUNTERS=y |
115 | CONFIG_PCI_QUIRKS=y | 143 | CONFIG_PCI_QUIRKS=y |
116 | CONFIG_SLUB_DEBUG=y | 144 | CONFIG_SLUB_DEBUG=y |
145 | CONFIG_COMPAT_BRK=y | ||
117 | # CONFIG_SLAB is not set | 146 | # CONFIG_SLAB is not set |
118 | CONFIG_SLUB=y | 147 | CONFIG_SLUB=y |
119 | # CONFIG_SLOB is not set | 148 | # CONFIG_SLOB is not set |
@@ -125,6 +154,13 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
125 | CONFIG_HAVE_KPROBES=y | 154 | CONFIG_HAVE_KPROBES=y |
126 | CONFIG_HAVE_KRETPROBES=y | 155 | CONFIG_HAVE_KRETPROBES=y |
127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 156 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
157 | CONFIG_HAVE_DMA_ATTRS=y | ||
158 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
159 | |||
160 | # | ||
161 | # GCOV-based kernel profiling | ||
162 | # | ||
163 | # CONFIG_SLOW_WORK is not set | ||
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 164 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
129 | CONFIG_SLABINFO=y | 165 | CONFIG_SLABINFO=y |
130 | CONFIG_RT_MUTEXES=y | 166 | CONFIG_RT_MUTEXES=y |
@@ -136,8 +172,7 @@ CONFIG_MODULE_UNLOAD=y | |||
136 | # CONFIG_MODVERSIONS is not set | 172 | # CONFIG_MODVERSIONS is not set |
137 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 173 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
138 | CONFIG_BLOCK=y | 174 | CONFIG_BLOCK=y |
139 | CONFIG_LBD=y | 175 | CONFIG_LBDAF=y |
140 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
141 | # CONFIG_BLK_DEV_BSG is not set | 176 | # CONFIG_BLK_DEV_BSG is not set |
142 | # CONFIG_BLK_DEV_INTEGRITY is not set | 177 | # CONFIG_BLK_DEV_INTEGRITY is not set |
143 | 178 | ||
@@ -145,20 +180,42 @@ CONFIG_LBD=y | |||
145 | # IO Schedulers | 180 | # IO Schedulers |
146 | # | 181 | # |
147 | CONFIG_IOSCHED_NOOP=y | 182 | CONFIG_IOSCHED_NOOP=y |
148 | CONFIG_IOSCHED_AS=y | ||
149 | CONFIG_IOSCHED_DEADLINE=y | 183 | CONFIG_IOSCHED_DEADLINE=y |
150 | CONFIG_IOSCHED_CFQ=y | 184 | CONFIG_IOSCHED_CFQ=y |
151 | CONFIG_DEFAULT_AS=y | ||
152 | # CONFIG_DEFAULT_DEADLINE is not set | 185 | # CONFIG_DEFAULT_DEADLINE is not set |
153 | # CONFIG_DEFAULT_CFQ is not set | 186 | CONFIG_DEFAULT_CFQ=y |
154 | # CONFIG_DEFAULT_NOOP is not set | 187 | # CONFIG_DEFAULT_NOOP is not set |
155 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 188 | CONFIG_DEFAULT_IOSCHED="cfq" |
156 | CONFIG_PREEMPT_NOTIFIERS=y | 189 | CONFIG_PREEMPT_NOTIFIERS=y |
157 | CONFIG_CLASSIC_RCU=y | 190 | # CONFIG_INLINE_SPIN_TRYLOCK is not set |
158 | # CONFIG_TREE_RCU is not set | 191 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set |
159 | # CONFIG_PREEMPT_RCU is not set | 192 | # CONFIG_INLINE_SPIN_LOCK is not set |
160 | # CONFIG_TREE_RCU_TRACE is not set | 193 | # CONFIG_INLINE_SPIN_LOCK_BH is not set |
161 | # CONFIG_PREEMPT_RCU_TRACE is not set | 194 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set |
195 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
196 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
197 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
198 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
199 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
200 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
201 | # CONFIG_INLINE_READ_LOCK is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
203 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
204 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
205 | CONFIG_INLINE_READ_UNLOCK=y | ||
206 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
207 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
208 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
209 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
212 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
213 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
214 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
215 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
216 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
217 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
218 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
162 | # CONFIG_FREEZER is not set | 219 | # CONFIG_FREEZER is not set |
163 | CONFIG_PPC4xx_PCI_EXPRESS=y | 220 | CONFIG_PPC4xx_PCI_EXPRESS=y |
164 | 221 | ||
@@ -179,8 +236,11 @@ CONFIG_WARP=y | |||
179 | CONFIG_ARCHES=y | 236 | CONFIG_ARCHES=y |
180 | CONFIG_CANYONLANDS=y | 237 | CONFIG_CANYONLANDS=y |
181 | CONFIG_GLACIER=y | 238 | CONFIG_GLACIER=y |
239 | CONFIG_REDWOOD=y | ||
240 | CONFIG_EIGER=y | ||
182 | CONFIG_YOSEMITE=y | 241 | CONFIG_YOSEMITE=y |
183 | CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y | 242 | CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y |
243 | # CONFIG_XILINX_ML510 is not set | ||
184 | CONFIG_PPC44x_SIMPLE=y | 244 | CONFIG_PPC44x_SIMPLE=y |
185 | CONFIG_PPC4xx_GPIO=y | 245 | CONFIG_PPC4xx_GPIO=y |
186 | CONFIG_440EP=y | 246 | CONFIG_440EP=y |
@@ -190,6 +250,7 @@ CONFIG_440GP=y | |||
190 | CONFIG_440GX=y | 250 | CONFIG_440GX=y |
191 | CONFIG_440SPe=y | 251 | CONFIG_440SPe=y |
192 | CONFIG_460EX=y | 252 | CONFIG_460EX=y |
253 | CONFIG_460SX=y | ||
193 | CONFIG_IBM440EP_ERR42=y | 254 | CONFIG_IBM440EP_ERR42=y |
194 | CONFIG_XILINX_VIRTEX=y | 255 | CONFIG_XILINX_VIRTEX=y |
195 | CONFIG_XILINX_VIRTEX_5_FXT=y | 256 | CONFIG_XILINX_VIRTEX_5_FXT=y |
@@ -207,6 +268,7 @@ CONFIG_XILINX_VIRTEX_5_FXT=y | |||
207 | # CONFIG_FSL_ULI1575 is not set | 268 | # CONFIG_FSL_ULI1575 is not set |
208 | CONFIG_OF_RTC=y | 269 | CONFIG_OF_RTC=y |
209 | # CONFIG_SIMPLE_GPIO is not set | 270 | # CONFIG_SIMPLE_GPIO is not set |
271 | # CONFIG_XILINX_PCI is not set | ||
210 | 272 | ||
211 | # | 273 | # |
212 | # Kernel options | 274 | # Kernel options |
@@ -230,10 +292,12 @@ CONFIG_BINFMT_ELF=y | |||
230 | # CONFIG_BINFMT_MISC is not set | 292 | # CONFIG_BINFMT_MISC is not set |
231 | CONFIG_MATH_EMULATION=y | 293 | CONFIG_MATH_EMULATION=y |
232 | # CONFIG_IOMMU_HELPER is not set | 294 | # CONFIG_IOMMU_HELPER is not set |
233 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 295 | # CONFIG_SWIOTLB is not set |
234 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 296 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
235 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 297 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
236 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 298 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
299 | CONFIG_SPARSE_IRQ=y | ||
300 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
237 | CONFIG_ARCH_FLATMEM_ENABLE=y | 301 | CONFIG_ARCH_FLATMEM_ENABLE=y |
238 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 302 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
239 | CONFIG_SELECT_MEMORY_MODEL=y | 303 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -249,10 +313,13 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
249 | CONFIG_ZONE_DMA_FLAG=1 | 313 | CONFIG_ZONE_DMA_FLAG=1 |
250 | CONFIG_BOUNCE=y | 314 | CONFIG_BOUNCE=y |
251 | CONFIG_VIRT_TO_BUS=y | 315 | CONFIG_VIRT_TO_BUS=y |
252 | CONFIG_UNEVICTABLE_LRU=y | 316 | # CONFIG_KSM is not set |
317 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
318 | CONFIG_STDBINUTILS=y | ||
253 | CONFIG_PPC_4K_PAGES=y | 319 | CONFIG_PPC_4K_PAGES=y |
254 | # CONFIG_PPC_16K_PAGES is not set | 320 | # CONFIG_PPC_16K_PAGES is not set |
255 | # CONFIG_PPC_64K_PAGES is not set | 321 | # CONFIG_PPC_64K_PAGES is not set |
322 | # CONFIG_PPC_256K_PAGES is not set | ||
256 | CONFIG_FORCE_MAX_ZONEORDER=11 | 323 | CONFIG_FORCE_MAX_ZONEORDER=11 |
257 | CONFIG_PROC_DEVICETREE=y | 324 | CONFIG_PROC_DEVICETREE=y |
258 | # CONFIG_CMDLINE_BOOL is not set | 325 | # CONFIG_CMDLINE_BOOL is not set |
@@ -276,6 +343,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
276 | # CONFIG_PCI_LEGACY is not set | 343 | # CONFIG_PCI_LEGACY is not set |
277 | # CONFIG_PCI_DEBUG is not set | 344 | # CONFIG_PCI_DEBUG is not set |
278 | # CONFIG_PCI_STUB is not set | 345 | # CONFIG_PCI_STUB is not set |
346 | # CONFIG_PCI_IOV is not set | ||
279 | # CONFIG_PCCARD is not set | 347 | # CONFIG_PCCARD is not set |
280 | # CONFIG_HOTPLUG_PCI is not set | 348 | # CONFIG_HOTPLUG_PCI is not set |
281 | # CONFIG_HAS_RAPIDIO is not set | 349 | # CONFIG_HAS_RAPIDIO is not set |
@@ -293,14 +361,12 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
293 | CONFIG_KERNEL_START=0xc0000000 | 361 | CONFIG_KERNEL_START=0xc0000000 |
294 | CONFIG_PHYSICAL_START=0x00000000 | 362 | CONFIG_PHYSICAL_START=0x00000000 |
295 | CONFIG_TASK_SIZE=0xc0000000 | 363 | CONFIG_TASK_SIZE=0xc0000000 |
296 | CONFIG_CONSISTENT_START=0xff100000 | ||
297 | CONFIG_CONSISTENT_SIZE=0x00200000 | 364 | CONFIG_CONSISTENT_SIZE=0x00200000 |
298 | CONFIG_NET=y | 365 | CONFIG_NET=y |
299 | 366 | ||
300 | # | 367 | # |
301 | # Networking options | 368 | # Networking options |
302 | # | 369 | # |
303 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
304 | CONFIG_PACKET=y | 370 | CONFIG_PACKET=y |
305 | # CONFIG_PACKET_MMAP is not set | 371 | # CONFIG_PACKET_MMAP is not set |
306 | CONFIG_UNIX=y | 372 | CONFIG_UNIX=y |
@@ -352,6 +418,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
352 | CONFIG_INET6_XFRM_MODE_BEET=m | 418 | CONFIG_INET6_XFRM_MODE_BEET=m |
353 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 419 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
354 | CONFIG_IPV6_SIT=m | 420 | CONFIG_IPV6_SIT=m |
421 | # CONFIG_IPV6_SIT_6RD is not set | ||
355 | CONFIG_IPV6_NDISC_NODETYPE=y | 422 | CONFIG_IPV6_NDISC_NODETYPE=y |
356 | # CONFIG_IPV6_TUNNEL is not set | 423 | # CONFIG_IPV6_TUNNEL is not set |
357 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 424 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
@@ -360,6 +427,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
360 | # CONFIG_NETFILTER is not set | 427 | # CONFIG_NETFILTER is not set |
361 | # CONFIG_IP_DCCP is not set | 428 | # CONFIG_IP_DCCP is not set |
362 | # CONFIG_IP_SCTP is not set | 429 | # CONFIG_IP_SCTP is not set |
430 | # CONFIG_RDS is not set | ||
363 | # CONFIG_TIPC is not set | 431 | # CONFIG_TIPC is not set |
364 | # CONFIG_ATM is not set | 432 | # CONFIG_ATM is not set |
365 | CONFIG_STP=m | 433 | CONFIG_STP=m |
@@ -375,6 +443,8 @@ CONFIG_LLC=m | |||
375 | # CONFIG_LAPB is not set | 443 | # CONFIG_LAPB is not set |
376 | # CONFIG_ECONET is not set | 444 | # CONFIG_ECONET is not set |
377 | # CONFIG_WAN_ROUTER is not set | 445 | # CONFIG_WAN_ROUTER is not set |
446 | # CONFIG_PHONET is not set | ||
447 | # CONFIG_IEEE802154 is not set | ||
378 | # CONFIG_NET_SCHED is not set | 448 | # CONFIG_NET_SCHED is not set |
379 | # CONFIG_DCB is not set | 449 | # CONFIG_DCB is not set |
380 | 450 | ||
@@ -387,8 +457,13 @@ CONFIG_LLC=m | |||
387 | # CONFIG_IRDA is not set | 457 | # CONFIG_IRDA is not set |
388 | # CONFIG_BT is not set | 458 | # CONFIG_BT is not set |
389 | # CONFIG_AF_RXRPC is not set | 459 | # CONFIG_AF_RXRPC is not set |
390 | # CONFIG_PHONET is not set | 460 | CONFIG_WIRELESS=y |
391 | # CONFIG_WIRELESS is not set | 461 | # CONFIG_CFG80211 is not set |
462 | # CONFIG_LIB80211 is not set | ||
463 | |||
464 | # | ||
465 | # CFG80211 needs to be enabled for MAC80211 | ||
466 | # | ||
392 | # CONFIG_WIMAX is not set | 467 | # CONFIG_WIMAX is not set |
393 | # CONFIG_RFKILL is not set | 468 | # CONFIG_RFKILL is not set |
394 | # CONFIG_NET_9P is not set | 469 | # CONFIG_NET_9P is not set |
@@ -401,6 +476,7 @@ CONFIG_LLC=m | |||
401 | # Generic Driver Options | 476 | # Generic Driver Options |
402 | # | 477 | # |
403 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 478 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
479 | # CONFIG_DEVTMPFS is not set | ||
404 | CONFIG_STANDALONE=y | 480 | CONFIG_STANDALONE=y |
405 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 481 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
406 | CONFIG_FW_LOADER=y | 482 | CONFIG_FW_LOADER=y |
@@ -413,9 +489,9 @@ CONFIG_CONNECTOR=y | |||
413 | CONFIG_PROC_EVENTS=y | 489 | CONFIG_PROC_EVENTS=y |
414 | CONFIG_MTD=y | 490 | CONFIG_MTD=y |
415 | # CONFIG_MTD_DEBUG is not set | 491 | # CONFIG_MTD_DEBUG is not set |
492 | # CONFIG_MTD_TESTS is not set | ||
416 | # CONFIG_MTD_CONCAT is not set | 493 | # CONFIG_MTD_CONCAT is not set |
417 | CONFIG_MTD_PARTITIONS=y | 494 | CONFIG_MTD_PARTITIONS=y |
418 | # CONFIG_MTD_TESTS is not set | ||
419 | # CONFIG_MTD_REDBOOT_PARTS is not set | 495 | # CONFIG_MTD_REDBOOT_PARTS is not set |
420 | # CONFIG_MTD_CMDLINE_PARTS is not set | 496 | # CONFIG_MTD_CMDLINE_PARTS is not set |
421 | CONFIG_MTD_OF_PARTS=y | 497 | CONFIG_MTD_OF_PARTS=y |
@@ -490,7 +566,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
490 | # LPDDR flash memory drivers | 566 | # LPDDR flash memory drivers |
491 | # | 567 | # |
492 | # CONFIG_MTD_LPDDR is not set | 568 | # CONFIG_MTD_LPDDR is not set |
493 | # CONFIG_MTD_QINFO_PROBE is not set | ||
494 | 569 | ||
495 | # | 570 | # |
496 | # UBI - Unsorted block images | 571 | # UBI - Unsorted block images |
@@ -498,7 +573,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
498 | CONFIG_MTD_UBI=m | 573 | CONFIG_MTD_UBI=m |
499 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 | 574 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 |
500 | CONFIG_MTD_UBI_BEB_RESERVE=1 | 575 | CONFIG_MTD_UBI_BEB_RESERVE=1 |
501 | CONFIG_MTD_UBI_GLUEBI=y | 576 | CONFIG_MTD_UBI_GLUEBI=m |
502 | 577 | ||
503 | # | 578 | # |
504 | # UBI debugging options | 579 | # UBI debugging options |
@@ -516,6 +591,7 @@ CONFIG_BLK_DEV=y | |||
516 | # CONFIG_BLK_DEV_UMEM is not set | 591 | # CONFIG_BLK_DEV_UMEM is not set |
517 | # CONFIG_BLK_DEV_COW_COMMON is not set | 592 | # CONFIG_BLK_DEV_COW_COMMON is not set |
518 | # CONFIG_BLK_DEV_LOOP is not set | 593 | # CONFIG_BLK_DEV_LOOP is not set |
594 | # CONFIG_BLK_DEV_DRBD is not set | ||
519 | # CONFIG_BLK_DEV_NBD is not set | 595 | # CONFIG_BLK_DEV_NBD is not set |
520 | # CONFIG_BLK_DEV_SX8 is not set | 596 | # CONFIG_BLK_DEV_SX8 is not set |
521 | # CONFIG_BLK_DEV_UB is not set | 597 | # CONFIG_BLK_DEV_UB is not set |
@@ -528,14 +604,25 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
528 | CONFIG_XILINX_SYSACE=m | 604 | CONFIG_XILINX_SYSACE=m |
529 | # CONFIG_BLK_DEV_HD is not set | 605 | # CONFIG_BLK_DEV_HD is not set |
530 | CONFIG_MISC_DEVICES=y | 606 | CONFIG_MISC_DEVICES=y |
607 | # CONFIG_AD525X_DPOT is not set | ||
531 | # CONFIG_PHANTOM is not set | 608 | # CONFIG_PHANTOM is not set |
532 | # CONFIG_EEPROM_93CX6 is not set | ||
533 | # CONFIG_SGI_IOC4 is not set | 609 | # CONFIG_SGI_IOC4 is not set |
534 | # CONFIG_TIFM_CORE is not set | 610 | # CONFIG_TIFM_CORE is not set |
535 | # CONFIG_ICS932S401 is not set | 611 | # CONFIG_ICS932S401 is not set |
536 | # CONFIG_ENCLOSURE_SERVICES is not set | 612 | # CONFIG_ENCLOSURE_SERVICES is not set |
537 | # CONFIG_HP_ILO is not set | 613 | # CONFIG_HP_ILO is not set |
614 | # CONFIG_ISL29003 is not set | ||
615 | # CONFIG_DS1682 is not set | ||
538 | # CONFIG_C2PORT is not set | 616 | # CONFIG_C2PORT is not set |
617 | |||
618 | # | ||
619 | # EEPROM support | ||
620 | # | ||
621 | # CONFIG_EEPROM_AT24 is not set | ||
622 | # CONFIG_EEPROM_LEGACY is not set | ||
623 | # CONFIG_EEPROM_MAX6875 is not set | ||
624 | # CONFIG_EEPROM_93CX6 is not set | ||
625 | # CONFIG_CB710_CORE is not set | ||
539 | CONFIG_HAVE_IDE=y | 626 | CONFIG_HAVE_IDE=y |
540 | # CONFIG_IDE is not set | 627 | # CONFIG_IDE is not set |
541 | 628 | ||
@@ -558,10 +645,6 @@ CONFIG_BLK_DEV_SD=m | |||
558 | # CONFIG_BLK_DEV_SR is not set | 645 | # CONFIG_BLK_DEV_SR is not set |
559 | # CONFIG_CHR_DEV_SG is not set | 646 | # CONFIG_CHR_DEV_SG is not set |
560 | # CONFIG_CHR_DEV_SCH is not set | 647 | # CONFIG_CHR_DEV_SCH is not set |
561 | |||
562 | # | ||
563 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
564 | # | ||
565 | # CONFIG_SCSI_MULTI_LUN is not set | 648 | # CONFIG_SCSI_MULTI_LUN is not set |
566 | # CONFIG_SCSI_CONSTANTS is not set | 649 | # CONFIG_SCSI_CONSTANTS is not set |
567 | # CONFIG_SCSI_LOGGING is not set | 650 | # CONFIG_SCSI_LOGGING is not set |
@@ -578,6 +661,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
578 | # CONFIG_SCSI_SRP_ATTRS is not set | 661 | # CONFIG_SCSI_SRP_ATTRS is not set |
579 | # CONFIG_SCSI_LOWLEVEL is not set | 662 | # CONFIG_SCSI_LOWLEVEL is not set |
580 | # CONFIG_SCSI_DH is not set | 663 | # CONFIG_SCSI_DH is not set |
664 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
581 | # CONFIG_ATA is not set | 665 | # CONFIG_ATA is not set |
582 | # CONFIG_MD is not set | 666 | # CONFIG_MD is not set |
583 | # CONFIG_FUSION is not set | 667 | # CONFIG_FUSION is not set |
@@ -587,7 +671,11 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
587 | # | 671 | # |
588 | 672 | ||
589 | # | 673 | # |
590 | # Enable only one of the two stacks, unless you know what you are doing | 674 | # You can enable one or both FireWire driver stacks. |
675 | # | ||
676 | |||
677 | # | ||
678 | # See the help texts for more information. | ||
591 | # | 679 | # |
592 | # CONFIG_FIREWIRE is not set | 680 | # CONFIG_FIREWIRE is not set |
593 | # CONFIG_IEEE1394 is not set | 681 | # CONFIG_IEEE1394 is not set |
@@ -608,6 +696,8 @@ CONFIG_NET_ETHERNET=y | |||
608 | # CONFIG_SUNGEM is not set | 696 | # CONFIG_SUNGEM is not set |
609 | # CONFIG_CASSINI is not set | 697 | # CONFIG_CASSINI is not set |
610 | # CONFIG_NET_VENDOR_3COM is not set | 698 | # CONFIG_NET_VENDOR_3COM is not set |
699 | # CONFIG_ETHOC is not set | ||
700 | # CONFIG_DNET is not set | ||
611 | # CONFIG_NET_TULIP is not set | 701 | # CONFIG_NET_TULIP is not set |
612 | # CONFIG_HP100 is not set | 702 | # CONFIG_HP100 is not set |
613 | CONFIG_IBM_NEW_EMAC=y | 703 | CONFIG_IBM_NEW_EMAC=y |
@@ -626,7 +716,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y | |||
626 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 716 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
627 | # CONFIG_NET_PCI is not set | 717 | # CONFIG_NET_PCI is not set |
628 | # CONFIG_B44 is not set | 718 | # CONFIG_B44 is not set |
719 | # CONFIG_KS8842 is not set | ||
720 | # CONFIG_KS8851_MLL is not set | ||
629 | # CONFIG_ATL2 is not set | 721 | # CONFIG_ATL2 is not set |
722 | # CONFIG_XILINX_EMACLITE is not set | ||
630 | CONFIG_NETDEV_1000=y | 723 | CONFIG_NETDEV_1000=y |
631 | # CONFIG_ACENIC is not set | 724 | # CONFIG_ACENIC is not set |
632 | # CONFIG_DL2K is not set | 725 | # CONFIG_DL2K is not set |
@@ -634,6 +727,7 @@ CONFIG_NETDEV_1000=y | |||
634 | # CONFIG_E1000E is not set | 727 | # CONFIG_E1000E is not set |
635 | # CONFIG_IP1000 is not set | 728 | # CONFIG_IP1000 is not set |
636 | # CONFIG_IGB is not set | 729 | # CONFIG_IGB is not set |
730 | # CONFIG_IGBVF is not set | ||
637 | # CONFIG_NS83820 is not set | 731 | # CONFIG_NS83820 is not set |
638 | # CONFIG_HAMACHI is not set | 732 | # CONFIG_HAMACHI is not set |
639 | # CONFIG_YELLOWFIN is not set | 733 | # CONFIG_YELLOWFIN is not set |
@@ -644,9 +738,13 @@ CONFIG_NETDEV_1000=y | |||
644 | # CONFIG_VIA_VELOCITY is not set | 738 | # CONFIG_VIA_VELOCITY is not set |
645 | # CONFIG_TIGON3 is not set | 739 | # CONFIG_TIGON3 is not set |
646 | # CONFIG_BNX2 is not set | 740 | # CONFIG_BNX2 is not set |
741 | # CONFIG_CNIC is not set | ||
742 | # CONFIG_MV643XX_ETH is not set | ||
743 | # CONFIG_XILINX_LL_TEMAC is not set | ||
647 | # CONFIG_QLA3XXX is not set | 744 | # CONFIG_QLA3XXX is not set |
648 | # CONFIG_ATL1 is not set | 745 | # CONFIG_ATL1 is not set |
649 | # CONFIG_ATL1E is not set | 746 | # CONFIG_ATL1E is not set |
747 | # CONFIG_ATL1C is not set | ||
650 | # CONFIG_JME is not set | 748 | # CONFIG_JME is not set |
651 | CONFIG_NETDEV_10000=y | 749 | CONFIG_NETDEV_10000=y |
652 | # CONFIG_CHELSIO_T1 is not set | 750 | # CONFIG_CHELSIO_T1 is not set |
@@ -656,6 +754,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
656 | # CONFIG_IXGBE is not set | 754 | # CONFIG_IXGBE is not set |
657 | # CONFIG_IXGB is not set | 755 | # CONFIG_IXGB is not set |
658 | # CONFIG_S2IO is not set | 756 | # CONFIG_S2IO is not set |
757 | # CONFIG_VXGE is not set | ||
659 | # CONFIG_MYRI10GE is not set | 758 | # CONFIG_MYRI10GE is not set |
660 | # CONFIG_NETXEN_NIC is not set | 759 | # CONFIG_NETXEN_NIC is not set |
661 | # CONFIG_NIU is not set | 760 | # CONFIG_NIU is not set |
@@ -665,14 +764,14 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
665 | # CONFIG_BNX2X is not set | 764 | # CONFIG_BNX2X is not set |
666 | # CONFIG_QLGE is not set | 765 | # CONFIG_QLGE is not set |
667 | # CONFIG_SFC is not set | 766 | # CONFIG_SFC is not set |
767 | # CONFIG_BE2NET is not set | ||
668 | # CONFIG_TR is not set | 768 | # CONFIG_TR is not set |
669 | 769 | CONFIG_WLAN=y | |
670 | # | 770 | # CONFIG_AIRO is not set |
671 | # Wireless LAN | 771 | # CONFIG_ATMEL is not set |
672 | # | 772 | # CONFIG_PRISM54 is not set |
673 | # CONFIG_WLAN_PRE80211 is not set | 773 | # CONFIG_USB_ZD1201 is not set |
674 | # CONFIG_WLAN_80211 is not set | 774 | # CONFIG_HOSTAP is not set |
675 | # CONFIG_IWLWIFI_LEDS is not set | ||
676 | 775 | ||
677 | # | 776 | # |
678 | # Enable WiMAX (Networking options) to see the WiMAX drivers | 777 | # Enable WiMAX (Networking options) to see the WiMAX drivers |
@@ -695,6 +794,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y | |||
695 | # CONFIG_NETCONSOLE is not set | 794 | # CONFIG_NETCONSOLE is not set |
696 | # CONFIG_NETPOLL is not set | 795 | # CONFIG_NETPOLL is not set |
697 | # CONFIG_NET_POLL_CONTROLLER is not set | 796 | # CONFIG_NET_POLL_CONTROLLER is not set |
797 | # CONFIG_VMXNET3 is not set | ||
698 | # CONFIG_ISDN is not set | 798 | # CONFIG_ISDN is not set |
699 | # CONFIG_PHONE is not set | 799 | # CONFIG_PHONE is not set |
700 | 800 | ||
@@ -713,6 +813,7 @@ CONFIG_SERIO=m | |||
713 | # CONFIG_SERIO_LIBPS2 is not set | 813 | # CONFIG_SERIO_LIBPS2 is not set |
714 | # CONFIG_SERIO_RAW is not set | 814 | # CONFIG_SERIO_RAW is not set |
715 | CONFIG_SERIO_XILINX_XPS_PS2=m | 815 | CONFIG_SERIO_XILINX_XPS_PS2=m |
816 | # CONFIG_SERIO_ALTERA_PS2 is not set | ||
716 | # CONFIG_GAMEPORT is not set | 817 | # CONFIG_GAMEPORT is not set |
717 | 818 | ||
718 | # | 819 | # |
@@ -747,6 +848,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
747 | # CONFIG_SERIAL_JSM is not set | 848 | # CONFIG_SERIAL_JSM is not set |
748 | CONFIG_SERIAL_OF_PLATFORM=y | 849 | CONFIG_SERIAL_OF_PLATFORM=y |
749 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | 850 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set |
851 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
750 | CONFIG_UNIX98_PTYS=y | 852 | CONFIG_UNIX98_PTYS=y |
751 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 853 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
752 | CONFIG_LEGACY_PTYS=y | 854 | CONFIG_LEGACY_PTYS=y |
@@ -764,6 +866,7 @@ CONFIG_XILINX_HWICAP=m | |||
764 | CONFIG_DEVPORT=y | 866 | CONFIG_DEVPORT=y |
765 | CONFIG_I2C=m | 867 | CONFIG_I2C=m |
766 | CONFIG_I2C_BOARDINFO=y | 868 | CONFIG_I2C_BOARDINFO=y |
869 | CONFIG_I2C_COMPAT=y | ||
767 | CONFIG_I2C_CHARDEV=m | 870 | CONFIG_I2C_CHARDEV=m |
768 | CONFIG_I2C_HELPER_AUTO=y | 871 | CONFIG_I2C_HELPER_AUTO=y |
769 | CONFIG_I2C_ALGOBIT=m | 872 | CONFIG_I2C_ALGOBIT=m |
@@ -807,11 +910,6 @@ CONFIG_I2C_IBM_IIC=m | |||
807 | # CONFIG_I2C_TINY_USB is not set | 910 | # CONFIG_I2C_TINY_USB is not set |
808 | 911 | ||
809 | # | 912 | # |
810 | # Graphics adapter I2C/DDC channel drivers | ||
811 | # | ||
812 | # CONFIG_I2C_VOODOO3 is not set | ||
813 | |||
814 | # | ||
815 | # Other I2C/SMBus bus drivers | 913 | # Other I2C/SMBus bus drivers |
816 | # | 914 | # |
817 | # CONFIG_I2C_PCA_PLATFORM is not set | 915 | # CONFIG_I2C_PCA_PLATFORM is not set |
@@ -820,20 +918,17 @@ CONFIG_I2C_IBM_IIC=m | |||
820 | # | 918 | # |
821 | # Miscellaneous I2C Chip support | 919 | # Miscellaneous I2C Chip support |
822 | # | 920 | # |
823 | # CONFIG_DS1682 is not set | ||
824 | # CONFIG_EEPROM_AT24 is not set | ||
825 | # CONFIG_EEPROM_LEGACY is not set | ||
826 | # CONFIG_SENSORS_PCF8574 is not set | ||
827 | # CONFIG_PCF8575 is not set | ||
828 | # CONFIG_SENSORS_PCA9539 is not set | ||
829 | # CONFIG_SENSORS_PCF8591 is not set | ||
830 | # CONFIG_SENSORS_MAX6875 is not set | ||
831 | # CONFIG_SENSORS_TSL2550 is not set | 921 | # CONFIG_SENSORS_TSL2550 is not set |
832 | # CONFIG_I2C_DEBUG_CORE is not set | 922 | # CONFIG_I2C_DEBUG_CORE is not set |
833 | # CONFIG_I2C_DEBUG_ALGO is not set | 923 | # CONFIG_I2C_DEBUG_ALGO is not set |
834 | # CONFIG_I2C_DEBUG_BUS is not set | 924 | # CONFIG_I2C_DEBUG_BUS is not set |
835 | # CONFIG_I2C_DEBUG_CHIP is not set | 925 | # CONFIG_I2C_DEBUG_CHIP is not set |
836 | # CONFIG_SPI is not set | 926 | # CONFIG_SPI is not set |
927 | |||
928 | # | ||
929 | # PPS support | ||
930 | # | ||
931 | # CONFIG_PPS is not set | ||
837 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 932 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
838 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 933 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
839 | CONFIG_GPIOLIB=y | 934 | CONFIG_GPIOLIB=y |
@@ -855,16 +950,21 @@ CONFIG_GPIO_XILINX=y | |||
855 | # | 950 | # |
856 | # PCI GPIO expanders: | 951 | # PCI GPIO expanders: |
857 | # | 952 | # |
953 | # CONFIG_GPIO_CS5535 is not set | ||
858 | # CONFIG_GPIO_BT8XX is not set | 954 | # CONFIG_GPIO_BT8XX is not set |
955 | # CONFIG_GPIO_LANGWELL is not set | ||
859 | 956 | ||
860 | # | 957 | # |
861 | # SPI GPIO expanders: | 958 | # SPI GPIO expanders: |
862 | # | 959 | # |
960 | |||
961 | # | ||
962 | # AC97 GPIO expanders: | ||
963 | # | ||
863 | # CONFIG_W1 is not set | 964 | # CONFIG_W1 is not set |
864 | # CONFIG_POWER_SUPPLY is not set | 965 | # CONFIG_POWER_SUPPLY is not set |
865 | # CONFIG_HWMON is not set | 966 | # CONFIG_HWMON is not set |
866 | # CONFIG_THERMAL is not set | 967 | # CONFIG_THERMAL is not set |
867 | # CONFIG_THERMAL_HWMON is not set | ||
868 | # CONFIG_WATCHDOG is not set | 968 | # CONFIG_WATCHDOG is not set |
869 | CONFIG_SSB_POSSIBLE=y | 969 | CONFIG_SSB_POSSIBLE=y |
870 | 970 | ||
@@ -884,28 +984,15 @@ CONFIG_SSB_POSSIBLE=y | |||
884 | # CONFIG_MFD_WM8400 is not set | 984 | # CONFIG_MFD_WM8400 is not set |
885 | # CONFIG_MFD_WM8350_I2C is not set | 985 | # CONFIG_MFD_WM8350_I2C is not set |
886 | # CONFIG_MFD_PCF50633 is not set | 986 | # CONFIG_MFD_PCF50633 is not set |
987 | # CONFIG_AB3100_CORE is not set | ||
887 | # CONFIG_REGULATOR is not set | 988 | # CONFIG_REGULATOR is not set |
888 | 989 | # CONFIG_MEDIA_SUPPORT is not set | |
889 | # | ||
890 | # Multimedia devices | ||
891 | # | ||
892 | |||
893 | # | ||
894 | # Multimedia core support | ||
895 | # | ||
896 | # CONFIG_VIDEO_DEV is not set | ||
897 | # CONFIG_DVB_CORE is not set | ||
898 | # CONFIG_VIDEO_MEDIA is not set | ||
899 | |||
900 | # | ||
901 | # Multimedia drivers | ||
902 | # | ||
903 | # CONFIG_DAB is not set | ||
904 | 990 | ||
905 | # | 991 | # |
906 | # Graphics support | 992 | # Graphics support |
907 | # | 993 | # |
908 | # CONFIG_AGP is not set | 994 | # CONFIG_AGP is not set |
995 | CONFIG_VGA_ARB=y | ||
909 | # CONFIG_DRM is not set | 996 | # CONFIG_DRM is not set |
910 | # CONFIG_VGASTATE is not set | 997 | # CONFIG_VGASTATE is not set |
911 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 998 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
@@ -961,6 +1048,7 @@ CONFIG_FB_XILINX=m | |||
961 | # CONFIG_FB_VIRTUAL is not set | 1048 | # CONFIG_FB_VIRTUAL is not set |
962 | # CONFIG_FB_METRONOME is not set | 1049 | # CONFIG_FB_METRONOME is not set |
963 | # CONFIG_FB_MB862XX is not set | 1050 | # CONFIG_FB_MB862XX is not set |
1051 | # CONFIG_FB_BROADSHEET is not set | ||
964 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1052 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
965 | 1053 | ||
966 | # | 1054 | # |
@@ -994,19 +1082,22 @@ CONFIG_USB_DEVICE_CLASS=y | |||
994 | # USB Host Controller Drivers | 1082 | # USB Host Controller Drivers |
995 | # | 1083 | # |
996 | # CONFIG_USB_C67X00_HCD is not set | 1084 | # CONFIG_USB_C67X00_HCD is not set |
1085 | # CONFIG_USB_XHCI_HCD is not set | ||
997 | CONFIG_USB_EHCI_HCD=m | 1086 | CONFIG_USB_EHCI_HCD=m |
998 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1087 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
999 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1088 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1000 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | 1089 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y |
1001 | CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y | 1090 | CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y |
1091 | # CONFIG_XPS_USB_HCD_XILINX is not set | ||
1002 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1092 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1003 | # CONFIG_USB_OXU210HP_HCD is not set | 1093 | # CONFIG_USB_OXU210HP_HCD is not set |
1004 | # CONFIG_USB_ISP116X_HCD is not set | 1094 | # CONFIG_USB_ISP116X_HCD is not set |
1005 | # CONFIG_USB_ISP1760_HCD is not set | 1095 | # CONFIG_USB_ISP1760_HCD is not set |
1096 | # CONFIG_USB_ISP1362_HCD is not set | ||
1006 | CONFIG_USB_OHCI_HCD=m | 1097 | CONFIG_USB_OHCI_HCD=m |
1007 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1008 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1098 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1009 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 1099 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
1100 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1010 | # CONFIG_USB_OHCI_HCD_PCI is not set | 1101 | # CONFIG_USB_OHCI_HCD_PCI is not set |
1011 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1102 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1012 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1103 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1030,11 +1121,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1030 | # CONFIG_USB_TMC is not set | 1121 | # CONFIG_USB_TMC is not set |
1031 | 1122 | ||
1032 | # | 1123 | # |
1033 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | 1124 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
1034 | # | 1125 | # |
1035 | 1126 | ||
1036 | # | 1127 | # |
1037 | # see USB_STORAGE Help for more information | 1128 | # also be needed; see USB_STORAGE Help for more info |
1038 | # | 1129 | # |
1039 | CONFIG_USB_STORAGE=m | 1130 | CONFIG_USB_STORAGE=m |
1040 | # CONFIG_USB_STORAGE_DEBUG is not set | 1131 | # CONFIG_USB_STORAGE_DEBUG is not set |
@@ -1075,7 +1166,6 @@ CONFIG_USB_STORAGE=m | |||
1075 | # CONFIG_USB_LED is not set | 1166 | # CONFIG_USB_LED is not set |
1076 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1167 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
1077 | # CONFIG_USB_CYTHERM is not set | 1168 | # CONFIG_USB_CYTHERM is not set |
1078 | # CONFIG_USB_PHIDGET is not set | ||
1079 | # CONFIG_USB_IDMOUSE is not set | 1169 | # CONFIG_USB_IDMOUSE is not set |
1080 | # CONFIG_USB_FTDI_ELAN is not set | 1170 | # CONFIG_USB_FTDI_ELAN is not set |
1081 | # CONFIG_USB_APPLEDISPLAY is not set | 1171 | # CONFIG_USB_APPLEDISPLAY is not set |
@@ -1083,6 +1173,7 @@ CONFIG_USB_STORAGE=m | |||
1083 | # CONFIG_USB_LD is not set | 1173 | # CONFIG_USB_LD is not set |
1084 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1174 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1085 | # CONFIG_USB_IOWARRIOR is not set | 1175 | # CONFIG_USB_IOWARRIOR is not set |
1176 | # CONFIG_USB_TEST is not set | ||
1086 | # CONFIG_USB_ISIGHTFW is not set | 1177 | # CONFIG_USB_ISIGHTFW is not set |
1087 | # CONFIG_USB_VST is not set | 1178 | # CONFIG_USB_VST is not set |
1088 | # CONFIG_USB_GADGET is not set | 1179 | # CONFIG_USB_GADGET is not set |
@@ -1091,6 +1182,7 @@ CONFIG_USB_STORAGE=m | |||
1091 | # OTG and related infrastructure | 1182 | # OTG and related infrastructure |
1092 | # | 1183 | # |
1093 | # CONFIG_USB_GPIO_VBUS is not set | 1184 | # CONFIG_USB_GPIO_VBUS is not set |
1185 | # CONFIG_NOP_USB_XCEIV is not set | ||
1094 | # CONFIG_UWB is not set | 1186 | # CONFIG_UWB is not set |
1095 | # CONFIG_MMC is not set | 1187 | # CONFIG_MMC is not set |
1096 | # CONFIG_MEMSTICK is not set | 1188 | # CONFIG_MEMSTICK is not set |
@@ -1100,7 +1192,12 @@ CONFIG_USB_STORAGE=m | |||
1100 | # CONFIG_EDAC is not set | 1192 | # CONFIG_EDAC is not set |
1101 | # CONFIG_RTC_CLASS is not set | 1193 | # CONFIG_RTC_CLASS is not set |
1102 | # CONFIG_DMADEVICES is not set | 1194 | # CONFIG_DMADEVICES is not set |
1195 | # CONFIG_AUXDISPLAY is not set | ||
1103 | # CONFIG_UIO is not set | 1196 | # CONFIG_UIO is not set |
1197 | |||
1198 | # | ||
1199 | # TI VLYNQ | ||
1200 | # | ||
1104 | # CONFIG_STAGING is not set | 1201 | # CONFIG_STAGING is not set |
1105 | 1202 | ||
1106 | # | 1203 | # |
@@ -1110,6 +1207,7 @@ CONFIG_EXT2_FS=y | |||
1110 | # CONFIG_EXT2_FS_XATTR is not set | 1207 | # CONFIG_EXT2_FS_XATTR is not set |
1111 | # CONFIG_EXT2_FS_XIP is not set | 1208 | # CONFIG_EXT2_FS_XIP is not set |
1112 | CONFIG_EXT3_FS=m | 1209 | CONFIG_EXT3_FS=m |
1210 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
1113 | CONFIG_EXT3_FS_XATTR=y | 1211 | CONFIG_EXT3_FS_XATTR=y |
1114 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1212 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
1115 | # CONFIG_EXT3_FS_SECURITY is not set | 1213 | # CONFIG_EXT3_FS_SECURITY is not set |
@@ -1119,11 +1217,13 @@ CONFIG_FS_MBCACHE=m | |||
1119 | # CONFIG_REISERFS_FS is not set | 1217 | # CONFIG_REISERFS_FS is not set |
1120 | # CONFIG_JFS_FS is not set | 1218 | # CONFIG_JFS_FS is not set |
1121 | # CONFIG_FS_POSIX_ACL is not set | 1219 | # CONFIG_FS_POSIX_ACL is not set |
1122 | CONFIG_FILE_LOCKING=y | ||
1123 | # CONFIG_XFS_FS is not set | 1220 | # CONFIG_XFS_FS is not set |
1124 | # CONFIG_GFS2_FS is not set | 1221 | # CONFIG_GFS2_FS is not set |
1125 | # CONFIG_OCFS2_FS is not set | 1222 | # CONFIG_OCFS2_FS is not set |
1126 | # CONFIG_BTRFS_FS is not set | 1223 | # CONFIG_BTRFS_FS is not set |
1224 | # CONFIG_NILFS2_FS is not set | ||
1225 | CONFIG_FILE_LOCKING=y | ||
1226 | CONFIG_FSNOTIFY=y | ||
1127 | CONFIG_DNOTIFY=y | 1227 | CONFIG_DNOTIFY=y |
1128 | CONFIG_INOTIFY=y | 1228 | CONFIG_INOTIFY=y |
1129 | CONFIG_INOTIFY_USER=y | 1229 | CONFIG_INOTIFY_USER=y |
@@ -1133,6 +1233,11 @@ CONFIG_INOTIFY_USER=y | |||
1133 | # CONFIG_FUSE_FS is not set | 1233 | # CONFIG_FUSE_FS is not set |
1134 | 1234 | ||
1135 | # | 1235 | # |
1236 | # Caches | ||
1237 | # | ||
1238 | # CONFIG_FSCACHE is not set | ||
1239 | |||
1240 | # | ||
1136 | # CD-ROM/DVD Filesystems | 1241 | # CD-ROM/DVD Filesystems |
1137 | # | 1242 | # |
1138 | # CONFIG_ISO9660_FS is not set | 1243 | # CONFIG_ISO9660_FS is not set |
@@ -1206,7 +1311,6 @@ CONFIG_LOCKD=y | |||
1206 | CONFIG_LOCKD_V4=y | 1311 | CONFIG_LOCKD_V4=y |
1207 | CONFIG_NFS_COMMON=y | 1312 | CONFIG_NFS_COMMON=y |
1208 | CONFIG_SUNRPC=y | 1313 | CONFIG_SUNRPC=y |
1209 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1210 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1314 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1211 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1315 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1212 | # CONFIG_SMB_FS is not set | 1316 | # CONFIG_SMB_FS is not set |
@@ -1261,6 +1365,7 @@ CONFIG_NLS_ISO8859_1=m | |||
1261 | # CONFIG_NLS_KOI8_U is not set | 1365 | # CONFIG_NLS_KOI8_U is not set |
1262 | # CONFIG_NLS_UTF8 is not set | 1366 | # CONFIG_NLS_UTF8 is not set |
1263 | # CONFIG_DLM is not set | 1367 | # CONFIG_DLM is not set |
1368 | # CONFIG_BINARY_PRINTF is not set | ||
1264 | 1369 | ||
1265 | # | 1370 | # |
1266 | # Library routines | 1371 | # Library routines |
@@ -1278,11 +1383,13 @@ CONFIG_ZLIB_INFLATE=y | |||
1278 | CONFIG_ZLIB_DEFLATE=y | 1383 | CONFIG_ZLIB_DEFLATE=y |
1279 | CONFIG_LZO_COMPRESS=m | 1384 | CONFIG_LZO_COMPRESS=m |
1280 | CONFIG_LZO_DECOMPRESS=m | 1385 | CONFIG_LZO_DECOMPRESS=m |
1281 | CONFIG_PLIST=y | 1386 | CONFIG_DECOMPRESS_GZIP=y |
1282 | CONFIG_HAS_IOMEM=y | 1387 | CONFIG_HAS_IOMEM=y |
1283 | CONFIG_HAS_IOPORT=y | 1388 | CONFIG_HAS_IOPORT=y |
1284 | CONFIG_HAS_DMA=y | 1389 | CONFIG_HAS_DMA=y |
1285 | CONFIG_HAVE_LMB=y | 1390 | CONFIG_HAVE_LMB=y |
1391 | CONFIG_NLATTR=y | ||
1392 | CONFIG_GENERIC_ATOMIC64=y | ||
1286 | 1393 | ||
1287 | # | 1394 | # |
1288 | # Kernel hacking | 1395 | # Kernel hacking |
@@ -1292,6 +1399,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
1292 | CONFIG_ENABLE_MUST_CHECK=y | 1399 | CONFIG_ENABLE_MUST_CHECK=y |
1293 | CONFIG_FRAME_WARN=1024 | 1400 | CONFIG_FRAME_WARN=1024 |
1294 | CONFIG_MAGIC_SYSRQ=y | 1401 | CONFIG_MAGIC_SYSRQ=y |
1402 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1295 | # CONFIG_UNUSED_SYMBOLS is not set | 1403 | # CONFIG_UNUSED_SYMBOLS is not set |
1296 | # CONFIG_DEBUG_FS is not set | 1404 | # CONFIG_DEBUG_FS is not set |
1297 | # CONFIG_HEADERS_CHECK is not set | 1405 | # CONFIG_HEADERS_CHECK is not set |
@@ -1300,16 +1408,23 @@ CONFIG_DEBUG_KERNEL=y | |||
1300 | CONFIG_DETECT_SOFTLOCKUP=y | 1408 | CONFIG_DETECT_SOFTLOCKUP=y |
1301 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | 1409 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set |
1302 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | 1410 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 |
1411 | CONFIG_DETECT_HUNG_TASK=y | ||
1412 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
1413 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
1303 | CONFIG_SCHED_DEBUG=y | 1414 | CONFIG_SCHED_DEBUG=y |
1304 | # CONFIG_SCHEDSTATS is not set | 1415 | # CONFIG_SCHEDSTATS is not set |
1305 | # CONFIG_TIMER_STATS is not set | 1416 | # CONFIG_TIMER_STATS is not set |
1306 | # CONFIG_DEBUG_OBJECTS is not set | 1417 | # CONFIG_DEBUG_OBJECTS is not set |
1307 | # CONFIG_SLUB_DEBUG_ON is not set | 1418 | # CONFIG_SLUB_DEBUG_ON is not set |
1308 | # CONFIG_SLUB_STATS is not set | 1419 | # CONFIG_SLUB_STATS is not set |
1420 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
1309 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1421 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1310 | # CONFIG_RT_MUTEX_TESTER is not set | 1422 | # CONFIG_RT_MUTEX_TESTER is not set |
1311 | # CONFIG_DEBUG_SPINLOCK is not set | 1423 | # CONFIG_DEBUG_SPINLOCK is not set |
1312 | # CONFIG_DEBUG_MUTEXES is not set | 1424 | # CONFIG_DEBUG_MUTEXES is not set |
1425 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1426 | # CONFIG_PROVE_LOCKING is not set | ||
1427 | # CONFIG_LOCK_STAT is not set | ||
1313 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1428 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1314 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1429 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1315 | # CONFIG_DEBUG_KOBJECT is not set | 1430 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1321,35 +1436,43 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1321 | # CONFIG_DEBUG_LIST is not set | 1436 | # CONFIG_DEBUG_LIST is not set |
1322 | # CONFIG_DEBUG_SG is not set | 1437 | # CONFIG_DEBUG_SG is not set |
1323 | # CONFIG_DEBUG_NOTIFIERS is not set | 1438 | # CONFIG_DEBUG_NOTIFIERS is not set |
1324 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1439 | # CONFIG_DEBUG_CREDENTIALS is not set |
1325 | # CONFIG_RCU_TORTURE_TEST is not set | 1440 | # CONFIG_RCU_TORTURE_TEST is not set |
1326 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1441 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1327 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1442 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1328 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | 1443 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
1444 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1329 | # CONFIG_FAULT_INJECTION is not set | 1445 | # CONFIG_FAULT_INJECTION is not set |
1330 | # CONFIG_LATENCYTOP is not set | 1446 | # CONFIG_LATENCYTOP is not set |
1331 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1447 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1448 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
1332 | CONFIG_HAVE_FUNCTION_TRACER=y | 1449 | CONFIG_HAVE_FUNCTION_TRACER=y |
1450 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
1333 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1451 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1334 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1452 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1335 | 1453 | CONFIG_TRACING_SUPPORT=y | |
1336 | # | 1454 | CONFIG_FTRACE=y |
1337 | # Tracers | ||
1338 | # | ||
1339 | # CONFIG_FUNCTION_TRACER is not set | 1455 | # CONFIG_FUNCTION_TRACER is not set |
1456 | # CONFIG_IRQSOFF_TRACER is not set | ||
1340 | # CONFIG_SCHED_TRACER is not set | 1457 | # CONFIG_SCHED_TRACER is not set |
1341 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1458 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1342 | # CONFIG_BOOT_TRACER is not set | 1459 | # CONFIG_BOOT_TRACER is not set |
1343 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1460 | CONFIG_BRANCH_PROFILE_NONE=y |
1461 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1462 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1344 | # CONFIG_STACK_TRACER is not set | 1463 | # CONFIG_STACK_TRACER is not set |
1345 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1464 | # CONFIG_KMEMTRACE is not set |
1465 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1466 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1467 | # CONFIG_DMA_API_DEBUG is not set | ||
1346 | # CONFIG_SAMPLES is not set | 1468 | # CONFIG_SAMPLES is not set |
1347 | CONFIG_HAVE_ARCH_KGDB=y | 1469 | CONFIG_HAVE_ARCH_KGDB=y |
1348 | # CONFIG_KGDB is not set | 1470 | # CONFIG_KGDB is not set |
1471 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1472 | CONFIG_PPC_WERROR=y | ||
1349 | CONFIG_PRINT_STACK_DEPTH=64 | 1473 | CONFIG_PRINT_STACK_DEPTH=64 |
1350 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1474 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1351 | # CONFIG_DEBUG_STACK_USAGE is not set | 1475 | # CONFIG_DEBUG_STACK_USAGE is not set |
1352 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
1353 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1476 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1354 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1477 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1355 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1478 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -1363,13 +1486,16 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1363 | # CONFIG_KEYS is not set | 1486 | # CONFIG_KEYS is not set |
1364 | # CONFIG_SECURITY is not set | 1487 | # CONFIG_SECURITY is not set |
1365 | # CONFIG_SECURITYFS is not set | 1488 | # CONFIG_SECURITYFS is not set |
1366 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1489 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set |
1490 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1491 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1492 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1493 | CONFIG_DEFAULT_SECURITY="" | ||
1367 | CONFIG_CRYPTO=y | 1494 | CONFIG_CRYPTO=y |
1368 | 1495 | ||
1369 | # | 1496 | # |
1370 | # Crypto core or helper | 1497 | # Crypto core or helper |
1371 | # | 1498 | # |
1372 | # CONFIG_CRYPTO_FIPS is not set | ||
1373 | CONFIG_CRYPTO_ALGAPI=y | 1499 | CONFIG_CRYPTO_ALGAPI=y |
1374 | CONFIG_CRYPTO_ALGAPI2=y | 1500 | CONFIG_CRYPTO_ALGAPI2=y |
1375 | CONFIG_CRYPTO_AEAD2=y | 1501 | CONFIG_CRYPTO_AEAD2=y |
@@ -1378,10 +1504,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y | |||
1378 | CONFIG_CRYPTO_HASH=y | 1504 | CONFIG_CRYPTO_HASH=y |
1379 | CONFIG_CRYPTO_HASH2=y | 1505 | CONFIG_CRYPTO_HASH2=y |
1380 | CONFIG_CRYPTO_RNG2=y | 1506 | CONFIG_CRYPTO_RNG2=y |
1507 | CONFIG_CRYPTO_PCOMP=y | ||
1381 | CONFIG_CRYPTO_MANAGER=y | 1508 | CONFIG_CRYPTO_MANAGER=y |
1382 | CONFIG_CRYPTO_MANAGER2=y | 1509 | CONFIG_CRYPTO_MANAGER2=y |
1383 | # CONFIG_CRYPTO_GF128MUL is not set | 1510 | # CONFIG_CRYPTO_GF128MUL is not set |
1384 | # CONFIG_CRYPTO_NULL is not set | 1511 | # CONFIG_CRYPTO_NULL is not set |
1512 | CONFIG_CRYPTO_WORKQUEUE=y | ||
1385 | # CONFIG_CRYPTO_CRYPTD is not set | 1513 | # CONFIG_CRYPTO_CRYPTD is not set |
1386 | # CONFIG_CRYPTO_AUTHENC is not set | 1514 | # CONFIG_CRYPTO_AUTHENC is not set |
1387 | # CONFIG_CRYPTO_TEST is not set | 1515 | # CONFIG_CRYPTO_TEST is not set |
@@ -1409,11 +1537,13 @@ CONFIG_CRYPTO_PCBC=y | |||
1409 | # | 1537 | # |
1410 | # CONFIG_CRYPTO_HMAC is not set | 1538 | # CONFIG_CRYPTO_HMAC is not set |
1411 | # CONFIG_CRYPTO_XCBC is not set | 1539 | # CONFIG_CRYPTO_XCBC is not set |
1540 | # CONFIG_CRYPTO_VMAC is not set | ||
1412 | 1541 | ||
1413 | # | 1542 | # |
1414 | # Digest | 1543 | # Digest |
1415 | # | 1544 | # |
1416 | # CONFIG_CRYPTO_CRC32C is not set | 1545 | # CONFIG_CRYPTO_CRC32C is not set |
1546 | # CONFIG_CRYPTO_GHASH is not set | ||
1417 | # CONFIG_CRYPTO_MD4 is not set | 1547 | # CONFIG_CRYPTO_MD4 is not set |
1418 | CONFIG_CRYPTO_MD5=y | 1548 | CONFIG_CRYPTO_MD5=y |
1419 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1549 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -1450,6 +1580,7 @@ CONFIG_CRYPTO_DES=y | |||
1450 | # Compression | 1580 | # Compression |
1451 | # | 1581 | # |
1452 | CONFIG_CRYPTO_DEFLATE=m | 1582 | CONFIG_CRYPTO_DEFLATE=m |
1583 | # CONFIG_CRYPTO_ZLIB is not set | ||
1453 | CONFIG_CRYPTO_LZO=m | 1584 | CONFIG_CRYPTO_LZO=m |
1454 | 1585 | ||
1455 | # | 1586 | # |
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index 17828ad411eb..c376eda15313 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h | |||
@@ -235,14 +235,10 @@ typedef elf_vrregset_t elf_fpxregset_t; | |||
235 | #ifdef __powerpc64__ | 235 | #ifdef __powerpc64__ |
236 | # define SET_PERSONALITY(ex) \ | 236 | # define SET_PERSONALITY(ex) \ |
237 | do { \ | 237 | do { \ |
238 | unsigned long new_flags = 0; \ | ||
239 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ | 238 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ |
240 | new_flags = _TIF_32BIT; \ | 239 | set_thread_flag(TIF_32BIT); \ |
241 | if ((current_thread_info()->flags & _TIF_32BIT) \ | ||
242 | != new_flags) \ | ||
243 | set_thread_flag(TIF_ABI_PENDING); \ | ||
244 | else \ | 240 | else \ |
245 | clear_thread_flag(TIF_ABI_PENDING); \ | 241 | clear_thread_flag(TIF_32BIT); \ |
246 | if (personality(current->personality) != PER_LINUX32) \ | 242 | if (personality(current->personality) != PER_LINUX32) \ |
247 | set_personality(PER_LINUX | \ | 243 | set_personality(PER_LINUX | \ |
248 | (current->personality & (~PER_MASK))); \ | 244 | (current->personality & (~PER_MASK))); \ |
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h index c8b329255678..aa9d383a1c09 100644 --- a/arch/powerpc/include/asm/thread_info.h +++ b/arch/powerpc/include/asm/thread_info.h | |||
@@ -111,7 +111,6 @@ static inline struct thread_info *current_thread_info(void) | |||
111 | #define TIF_NOTIFY_RESUME 13 /* callback before returning to user */ | 111 | #define TIF_NOTIFY_RESUME 13 /* callback before returning to user */ |
112 | #define TIF_FREEZE 14 /* Freezing for suspend */ | 112 | #define TIF_FREEZE 14 /* Freezing for suspend */ |
113 | #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ | 113 | #define TIF_RUNLATCH 15 /* Is the runlatch enabled? */ |
114 | #define TIF_ABI_PENDING 16 /* 32/64 bit switch needed */ | ||
115 | 114 | ||
116 | /* as above, but as bit values */ | 115 | /* as above, but as bit values */ |
117 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 116 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
@@ -129,7 +128,6 @@ static inline struct thread_info *current_thread_info(void) | |||
129 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) | 128 | #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) |
130 | #define _TIF_FREEZE (1<<TIF_FREEZE) | 129 | #define _TIF_FREEZE (1<<TIF_FREEZE) |
131 | #define _TIF_RUNLATCH (1<<TIF_RUNLATCH) | 130 | #define _TIF_RUNLATCH (1<<TIF_RUNLATCH) |
132 | #define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING) | ||
133 | #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP) | 131 | #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP) |
134 | 132 | ||
135 | #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \ | 133 | #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \ |
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index 7311fdfb9bf8..4aa17401657b 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c | |||
@@ -123,6 +123,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, | |||
123 | { | 123 | { |
124 | struct pci_dev *dev; | 124 | struct pci_dev *dev; |
125 | const char *type; | 125 | const char *type; |
126 | struct pci_slot *slot; | ||
126 | 127 | ||
127 | dev = alloc_pci_dev(); | 128 | dev = alloc_pci_dev(); |
128 | if (!dev) | 129 | if (!dev) |
@@ -140,6 +141,11 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, | |||
140 | dev->devfn = devfn; | 141 | dev->devfn = devfn; |
141 | dev->multifunction = 0; /* maybe a lie? */ | 142 | dev->multifunction = 0; /* maybe a lie? */ |
142 | dev->needs_freset = 0; /* pcie fundamental reset required */ | 143 | dev->needs_freset = 0; /* pcie fundamental reset required */ |
144 | set_pcie_port_type(dev); | ||
145 | |||
146 | list_for_each_entry(slot, &dev->bus->slots, list) | ||
147 | if (PCI_SLOT(dev->devfn) == slot->number) | ||
148 | dev->slot = slot; | ||
143 | 149 | ||
144 | dev->vendor = get_int_prop(node, "vendor-id", 0xffff); | 150 | dev->vendor = get_int_prop(node, "vendor-id", 0xffff); |
145 | dev->device = get_int_prop(node, "device-id", 0xffff); | 151 | dev->device = get_int_prop(node, "device-id", 0xffff); |
@@ -160,10 +166,14 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, | |||
160 | dev->error_state = pci_channel_io_normal; | 166 | dev->error_state = pci_channel_io_normal; |
161 | dev->dma_mask = 0xffffffff; | 167 | dev->dma_mask = 0xffffffff; |
162 | 168 | ||
169 | /* Early fixups, before probing the BARs */ | ||
170 | pci_fixup_device(pci_fixup_early, dev); | ||
171 | |||
163 | if (!strcmp(type, "pci") || !strcmp(type, "pciex")) { | 172 | if (!strcmp(type, "pci") || !strcmp(type, "pciex")) { |
164 | /* a PCI-PCI bridge */ | 173 | /* a PCI-PCI bridge */ |
165 | dev->hdr_type = PCI_HEADER_TYPE_BRIDGE; | 174 | dev->hdr_type = PCI_HEADER_TYPE_BRIDGE; |
166 | dev->rom_base_reg = PCI_ROM_ADDRESS1; | 175 | dev->rom_base_reg = PCI_ROM_ADDRESS1; |
176 | set_pcie_hotplug_bridge(dev); | ||
167 | } else if (!strcmp(type, "cardbus")) { | 177 | } else if (!strcmp(type, "cardbus")) { |
168 | dev->hdr_type = PCI_HEADER_TYPE_CARDBUS; | 178 | dev->hdr_type = PCI_HEADER_TYPE_CARDBUS; |
169 | } else { | 179 | } else { |
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index c930ac38e59f..7b816daf3eba 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
@@ -554,18 +554,6 @@ void exit_thread(void) | |||
554 | 554 | ||
555 | void flush_thread(void) | 555 | void flush_thread(void) |
556 | { | 556 | { |
557 | #ifdef CONFIG_PPC64 | ||
558 | struct thread_info *t = current_thread_info(); | ||
559 | |||
560 | if (test_ti_thread_flag(t, TIF_ABI_PENDING)) { | ||
561 | clear_ti_thread_flag(t, TIF_ABI_PENDING); | ||
562 | if (test_ti_thread_flag(t, TIF_32BIT)) | ||
563 | clear_ti_thread_flag(t, TIF_32BIT); | ||
564 | else | ||
565 | set_ti_thread_flag(t, TIF_32BIT); | ||
566 | } | ||
567 | #endif | ||
568 | |||
569 | discard_lazy_cpu_state(); | 557 | discard_lazy_cpu_state(); |
570 | 558 | ||
571 | if (current->thread.dabr) { | 559 | if (current->thread.dabr) { |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index d80f193cd871..1ee66db003be 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -191,11 +191,7 @@ static int get_irq_server(unsigned int virq, cpumask_t cpumask, | |||
191 | return default_server; | 191 | return default_server; |
192 | } | 192 | } |
193 | #else | 193 | #else |
194 | static int get_irq_server(unsigned int virq, cpumask_t cpumask, | 194 | #define get_irq_server(virq, cpumask, strict_check) (default_server) |
195 | unsigned int strict_check) | ||
196 | { | ||
197 | return default_server; | ||
198 | } | ||
199 | #endif | 195 | #endif |
200 | 196 | ||
201 | static void xics_unmask_irq(unsigned int virq) | 197 | static void xics_unmask_irq(unsigned int virq) |
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c index 6ff9d71b4c0d..8aa33021e50b 100644 --- a/arch/powerpc/sysdev/ppc4xx_pci.c +++ b/arch/powerpc/sysdev/ppc4xx_pci.c | |||
@@ -569,7 +569,8 @@ static void __init ppc4xx_probe_pcix_bridge(struct device_node *np) | |||
569 | hose->last_busno = bus_range ? bus_range[1] : 0xff; | 569 | hose->last_busno = bus_range ? bus_range[1] : 0xff; |
570 | 570 | ||
571 | /* Setup config space */ | 571 | /* Setup config space */ |
572 | setup_indirect_pci(hose, rsrc_cfg.start, rsrc_cfg.start + 0x4, 0); | 572 | setup_indirect_pci(hose, rsrc_cfg.start, rsrc_cfg.start + 0x4, |
573 | PPC_INDIRECT_TYPE_SET_CFG_TYPE); | ||
573 | 574 | ||
574 | /* Disable all windows */ | 575 | /* Disable all windows */ |
575 | writel(0, reg + PCIX0_POM0SA); | 576 | writel(0, reg + PCIX0_POM0SA); |
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index f3a46be2ae81..83da5debeedf 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c | |||
@@ -598,7 +598,7 @@ static struct dentry *clk_debugfs_root; | |||
598 | static int clk_debugfs_register_one(struct clk *c) | 598 | static int clk_debugfs_register_one(struct clk *c) |
599 | { | 599 | { |
600 | int err; | 600 | int err; |
601 | struct dentry *d, *child; | 601 | struct dentry *d, *child, *child_tmp; |
602 | struct clk *pa = c->parent; | 602 | struct clk *pa = c->parent; |
603 | char s[255]; | 603 | char s[255]; |
604 | char *p = s; | 604 | char *p = s; |
@@ -630,7 +630,7 @@ static int clk_debugfs_register_one(struct clk *c) | |||
630 | 630 | ||
631 | err_out: | 631 | err_out: |
632 | d = c->dentry; | 632 | d = c->dentry; |
633 | list_for_each_entry(child, &d->d_subdirs, d_u.d_child) | 633 | list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child) |
634 | debugfs_remove(child); | 634 | debugfs_remove(child); |
635 | debugfs_remove(c->dentry); | 635 | debugfs_remove(c->dentry); |
636 | return err; | 636 | return err; |
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c index 3576b709f052..88d28ec3780a 100644 --- a/arch/sh/kernel/dwarf.c +++ b/arch/sh/kernel/dwarf.c | |||
@@ -892,18 +892,18 @@ static struct unwinder dwarf_unwinder = { | |||
892 | 892 | ||
893 | static void dwarf_unwinder_cleanup(void) | 893 | static void dwarf_unwinder_cleanup(void) |
894 | { | 894 | { |
895 | struct dwarf_cie *cie; | 895 | struct dwarf_cie *cie, *cie_tmp; |
896 | struct dwarf_fde *fde; | 896 | struct dwarf_fde *fde, *fde_tmp; |
897 | 897 | ||
898 | /* | 898 | /* |
899 | * Deallocate all the memory allocated for the DWARF unwinder. | 899 | * Deallocate all the memory allocated for the DWARF unwinder. |
900 | * Traverse all the FDE/CIE lists and remove and free all the | 900 | * Traverse all the FDE/CIE lists and remove and free all the |
901 | * memory associated with those data structures. | 901 | * memory associated with those data structures. |
902 | */ | 902 | */ |
903 | list_for_each_entry(cie, &dwarf_cie_list, link) | 903 | list_for_each_entry_safe(cie, cie_tmp, &dwarf_cie_list, link) |
904 | kfree(cie); | 904 | kfree(cie); |
905 | 905 | ||
906 | list_for_each_entry(fde, &dwarf_fde_list, link) | 906 | list_for_each_entry_safe(fde, fde_tmp, &dwarf_fde_list, link) |
907 | kfree(fde); | 907 | kfree(fde); |
908 | 908 | ||
909 | kmem_cache_destroy(dwarf_reg_cachep); | 909 | kmem_cache_destroy(dwarf_reg_cachep); |
diff --git a/arch/x86/include/asm/amd_iommu_proto.h b/arch/x86/include/asm/amd_iommu_proto.h index 4d817f9e6e77..d2544f1d705d 100644 --- a/arch/x86/include/asm/amd_iommu_proto.h +++ b/arch/x86/include/asm/amd_iommu_proto.h | |||
@@ -31,6 +31,7 @@ extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu); | |||
31 | extern int amd_iommu_init_devices(void); | 31 | extern int amd_iommu_init_devices(void); |
32 | extern void amd_iommu_uninit_devices(void); | 32 | extern void amd_iommu_uninit_devices(void); |
33 | extern void amd_iommu_init_notifier(void); | 33 | extern void amd_iommu_init_notifier(void); |
34 | extern void amd_iommu_init_api(void); | ||
34 | #ifndef CONFIG_AMD_IOMMU_STATS | 35 | #ifndef CONFIG_AMD_IOMMU_STATS |
35 | 36 | ||
36 | static inline void amd_iommu_stats_init(void) { } | 37 | static inline void amd_iommu_stats_init(void) { } |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 23824fef789c..adb0ba025702 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -980,7 +980,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, | |||
980 | { | 980 | { |
981 | int index = dma_dom->aperture_size >> APERTURE_RANGE_SHIFT; | 981 | int index = dma_dom->aperture_size >> APERTURE_RANGE_SHIFT; |
982 | struct amd_iommu *iommu; | 982 | struct amd_iommu *iommu; |
983 | int i; | 983 | unsigned long i; |
984 | 984 | ||
985 | #ifdef CONFIG_IOMMU_STRESS | 985 | #ifdef CONFIG_IOMMU_STRESS |
986 | populate = false; | 986 | populate = false; |
@@ -1489,11 +1489,14 @@ static void __detach_device(struct device *dev) | |||
1489 | { | 1489 | { |
1490 | struct iommu_dev_data *dev_data = get_dev_data(dev); | 1490 | struct iommu_dev_data *dev_data = get_dev_data(dev); |
1491 | struct iommu_dev_data *alias_data; | 1491 | struct iommu_dev_data *alias_data; |
1492 | struct protection_domain *domain; | ||
1492 | unsigned long flags; | 1493 | unsigned long flags; |
1493 | 1494 | ||
1494 | BUG_ON(!dev_data->domain); | 1495 | BUG_ON(!dev_data->domain); |
1495 | 1496 | ||
1496 | spin_lock_irqsave(&dev_data->domain->lock, flags); | 1497 | domain = dev_data->domain; |
1498 | |||
1499 | spin_lock_irqsave(&domain->lock, flags); | ||
1497 | 1500 | ||
1498 | if (dev_data->alias != dev) { | 1501 | if (dev_data->alias != dev) { |
1499 | alias_data = get_dev_data(dev_data->alias); | 1502 | alias_data = get_dev_data(dev_data->alias); |
@@ -1504,13 +1507,15 @@ static void __detach_device(struct device *dev) | |||
1504 | if (atomic_dec_and_test(&dev_data->bind)) | 1507 | if (atomic_dec_and_test(&dev_data->bind)) |
1505 | do_detach(dev); | 1508 | do_detach(dev); |
1506 | 1509 | ||
1507 | spin_unlock_irqrestore(&dev_data->domain->lock, flags); | 1510 | spin_unlock_irqrestore(&domain->lock, flags); |
1508 | 1511 | ||
1509 | /* | 1512 | /* |
1510 | * If we run in passthrough mode the device must be assigned to the | 1513 | * If we run in passthrough mode the device must be assigned to the |
1511 | * passthrough domain if it is detached from any other domain | 1514 | * passthrough domain if it is detached from any other domain. |
1515 | * Make sure we can deassign from the pt_domain itself. | ||
1512 | */ | 1516 | */ |
1513 | if (iommu_pass_through && dev_data->domain == NULL) | 1517 | if (iommu_pass_through && |
1518 | (dev_data->domain == NULL && domain != pt_domain)) | ||
1514 | __attach_device(dev, pt_domain); | 1519 | __attach_device(dev, pt_domain); |
1515 | } | 1520 | } |
1516 | 1521 | ||
@@ -2218,6 +2223,12 @@ static struct dma_map_ops amd_iommu_dma_ops = { | |||
2218 | /* | 2223 | /* |
2219 | * The function which clues the AMD IOMMU driver into dma_ops. | 2224 | * The function which clues the AMD IOMMU driver into dma_ops. |
2220 | */ | 2225 | */ |
2226 | |||
2227 | void __init amd_iommu_init_api(void) | ||
2228 | { | ||
2229 | register_iommu(&amd_iommu_ops); | ||
2230 | } | ||
2231 | |||
2221 | int __init amd_iommu_init_dma_ops(void) | 2232 | int __init amd_iommu_init_dma_ops(void) |
2222 | { | 2233 | { |
2223 | struct amd_iommu *iommu; | 2234 | struct amd_iommu *iommu; |
@@ -2253,8 +2264,6 @@ int __init amd_iommu_init_dma_ops(void) | |||
2253 | /* Make the driver finally visible to the drivers */ | 2264 | /* Make the driver finally visible to the drivers */ |
2254 | dma_ops = &amd_iommu_dma_ops; | 2265 | dma_ops = &amd_iommu_dma_ops; |
2255 | 2266 | ||
2256 | register_iommu(&amd_iommu_ops); | ||
2257 | |||
2258 | amd_iommu_stats_init(); | 2267 | amd_iommu_stats_init(); |
2259 | 2268 | ||
2260 | return 0; | 2269 | return 0; |
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index fb490ce7dd55..9dc91b431470 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
@@ -1292,9 +1292,12 @@ static int __init amd_iommu_init(void) | |||
1292 | ret = amd_iommu_init_passthrough(); | 1292 | ret = amd_iommu_init_passthrough(); |
1293 | else | 1293 | else |
1294 | ret = amd_iommu_init_dma_ops(); | 1294 | ret = amd_iommu_init_dma_ops(); |
1295 | |||
1295 | if (ret) | 1296 | if (ret) |
1296 | goto free; | 1297 | goto free; |
1297 | 1298 | ||
1299 | amd_iommu_init_api(); | ||
1300 | |||
1298 | amd_iommu_init_notifier(); | 1301 | amd_iommu_init_notifier(); |
1299 | 1302 | ||
1300 | enable_iommus(); | 1303 | enable_iommus(); |
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index dd74fe7273b1..bfba6019d762 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <linux/init.h> | 42 | #include <linux/init.h> |
43 | #include <linux/smp.h> | 43 | #include <linux/smp.h> |
44 | #include <linux/nmi.h> | 44 | #include <linux/nmi.h> |
45 | #include <linux/hw_breakpoint.h> | ||
45 | 46 | ||
46 | #include <asm/debugreg.h> | 47 | #include <asm/debugreg.h> |
47 | #include <asm/apicdef.h> | 48 | #include <asm/apicdef.h> |
@@ -204,40 +205,81 @@ void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs) | |||
204 | 205 | ||
205 | static struct hw_breakpoint { | 206 | static struct hw_breakpoint { |
206 | unsigned enabled; | 207 | unsigned enabled; |
207 | unsigned type; | ||
208 | unsigned len; | ||
209 | unsigned long addr; | 208 | unsigned long addr; |
209 | int len; | ||
210 | int type; | ||
211 | struct perf_event **pev; | ||
210 | } breakinfo[4]; | 212 | } breakinfo[4]; |
211 | 213 | ||
212 | static void kgdb_correct_hw_break(void) | 214 | static void kgdb_correct_hw_break(void) |
213 | { | 215 | { |
214 | unsigned long dr7; | ||
215 | int correctit = 0; | ||
216 | int breakbit; | ||
217 | int breakno; | 216 | int breakno; |
218 | 217 | ||
219 | get_debugreg(dr7, 7); | ||
220 | for (breakno = 0; breakno < 4; breakno++) { | 218 | for (breakno = 0; breakno < 4; breakno++) { |
221 | breakbit = 2 << (breakno << 1); | 219 | struct perf_event *bp; |
222 | if (!(dr7 & breakbit) && breakinfo[breakno].enabled) { | 220 | struct arch_hw_breakpoint *info; |
223 | correctit = 1; | 221 | int val; |
224 | dr7 |= breakbit; | 222 | int cpu = raw_smp_processor_id(); |
225 | dr7 &= ~(0xf0000 << (breakno << 2)); | 223 | if (!breakinfo[breakno].enabled) |
226 | dr7 |= ((breakinfo[breakno].len << 2) | | 224 | continue; |
227 | breakinfo[breakno].type) << | 225 | bp = *per_cpu_ptr(breakinfo[breakno].pev, cpu); |
228 | ((breakno << 2) + 16); | 226 | info = counter_arch_bp(bp); |
229 | set_debugreg(breakinfo[breakno].addr, breakno); | 227 | if (bp->attr.disabled != 1) |
230 | 228 | continue; | |
231 | } else { | 229 | bp->attr.bp_addr = breakinfo[breakno].addr; |
232 | if ((dr7 & breakbit) && !breakinfo[breakno].enabled) { | 230 | bp->attr.bp_len = breakinfo[breakno].len; |
233 | correctit = 1; | 231 | bp->attr.bp_type = breakinfo[breakno].type; |
234 | dr7 &= ~breakbit; | 232 | info->address = breakinfo[breakno].addr; |
235 | dr7 &= ~(0xf0000 << (breakno << 2)); | 233 | info->len = breakinfo[breakno].len; |
236 | } | 234 | info->type = breakinfo[breakno].type; |
237 | } | 235 | val = arch_install_hw_breakpoint(bp); |
236 | if (!val) | ||
237 | bp->attr.disabled = 0; | ||
238 | } | ||
239 | hw_breakpoint_restore(); | ||
240 | } | ||
241 | |||
242 | static int hw_break_reserve_slot(int breakno) | ||
243 | { | ||
244 | int cpu; | ||
245 | int cnt = 0; | ||
246 | struct perf_event **pevent; | ||
247 | |||
248 | for_each_online_cpu(cpu) { | ||
249 | cnt++; | ||
250 | pevent = per_cpu_ptr(breakinfo[breakno].pev, cpu); | ||
251 | if (dbg_reserve_bp_slot(*pevent)) | ||
252 | goto fail; | ||
253 | } | ||
254 | |||
255 | return 0; | ||
256 | |||
257 | fail: | ||
258 | for_each_online_cpu(cpu) { | ||
259 | cnt--; | ||
260 | if (!cnt) | ||
261 | break; | ||
262 | pevent = per_cpu_ptr(breakinfo[breakno].pev, cpu); | ||
263 | dbg_release_bp_slot(*pevent); | ||
238 | } | 264 | } |
239 | if (correctit) | 265 | return -1; |
240 | set_debugreg(dr7, 7); | 266 | } |
267 | |||
268 | static int hw_break_release_slot(int breakno) | ||
269 | { | ||
270 | struct perf_event **pevent; | ||
271 | int cpu; | ||
272 | |||
273 | for_each_online_cpu(cpu) { | ||
274 | pevent = per_cpu_ptr(breakinfo[breakno].pev, cpu); | ||
275 | if (dbg_release_bp_slot(*pevent)) | ||
276 | /* | ||
277 | * The debugger is responisble for handing the retry on | ||
278 | * remove failure. | ||
279 | */ | ||
280 | return -1; | ||
281 | } | ||
282 | return 0; | ||
241 | } | 283 | } |
242 | 284 | ||
243 | static int | 285 | static int |
@@ -251,6 +293,10 @@ kgdb_remove_hw_break(unsigned long addr, int len, enum kgdb_bptype bptype) | |||
251 | if (i == 4) | 293 | if (i == 4) |
252 | return -1; | 294 | return -1; |
253 | 295 | ||
296 | if (hw_break_release_slot(i)) { | ||
297 | printk(KERN_ERR "Cannot remove hw breakpoint at %lx\n", addr); | ||
298 | return -1; | ||
299 | } | ||
254 | breakinfo[i].enabled = 0; | 300 | breakinfo[i].enabled = 0; |
255 | 301 | ||
256 | return 0; | 302 | return 0; |
@@ -259,15 +305,23 @@ kgdb_remove_hw_break(unsigned long addr, int len, enum kgdb_bptype bptype) | |||
259 | static void kgdb_remove_all_hw_break(void) | 305 | static void kgdb_remove_all_hw_break(void) |
260 | { | 306 | { |
261 | int i; | 307 | int i; |
308 | int cpu = raw_smp_processor_id(); | ||
309 | struct perf_event *bp; | ||
262 | 310 | ||
263 | for (i = 0; i < 4; i++) | 311 | for (i = 0; i < 4; i++) { |
264 | memset(&breakinfo[i], 0, sizeof(struct hw_breakpoint)); | 312 | if (!breakinfo[i].enabled) |
313 | continue; | ||
314 | bp = *per_cpu_ptr(breakinfo[i].pev, cpu); | ||
315 | if (bp->attr.disabled == 1) | ||
316 | continue; | ||
317 | arch_uninstall_hw_breakpoint(bp); | ||
318 | bp->attr.disabled = 1; | ||
319 | } | ||
265 | } | 320 | } |
266 | 321 | ||
267 | static int | 322 | static int |
268 | kgdb_set_hw_break(unsigned long addr, int len, enum kgdb_bptype bptype) | 323 | kgdb_set_hw_break(unsigned long addr, int len, enum kgdb_bptype bptype) |
269 | { | 324 | { |
270 | unsigned type; | ||
271 | int i; | 325 | int i; |
272 | 326 | ||
273 | for (i = 0; i < 4; i++) | 327 | for (i = 0; i < 4; i++) |
@@ -278,27 +332,42 @@ kgdb_set_hw_break(unsigned long addr, int len, enum kgdb_bptype bptype) | |||
278 | 332 | ||
279 | switch (bptype) { | 333 | switch (bptype) { |
280 | case BP_HARDWARE_BREAKPOINT: | 334 | case BP_HARDWARE_BREAKPOINT: |
281 | type = 0; | 335 | len = 1; |
282 | len = 1; | 336 | breakinfo[i].type = X86_BREAKPOINT_EXECUTE; |
283 | break; | 337 | break; |
284 | case BP_WRITE_WATCHPOINT: | 338 | case BP_WRITE_WATCHPOINT: |
285 | type = 1; | 339 | breakinfo[i].type = X86_BREAKPOINT_WRITE; |
286 | break; | 340 | break; |
287 | case BP_ACCESS_WATCHPOINT: | 341 | case BP_ACCESS_WATCHPOINT: |
288 | type = 3; | 342 | breakinfo[i].type = X86_BREAKPOINT_RW; |
289 | break; | 343 | break; |
290 | default: | 344 | default: |
291 | return -1; | 345 | return -1; |
292 | } | 346 | } |
293 | 347 | switch (len) { | |
294 | if (len == 1 || len == 2 || len == 4) | 348 | case 1: |
295 | breakinfo[i].len = len - 1; | 349 | breakinfo[i].len = X86_BREAKPOINT_LEN_1; |
296 | else | 350 | break; |
351 | case 2: | ||
352 | breakinfo[i].len = X86_BREAKPOINT_LEN_2; | ||
353 | break; | ||
354 | case 4: | ||
355 | breakinfo[i].len = X86_BREAKPOINT_LEN_4; | ||
356 | break; | ||
357 | #ifdef CONFIG_X86_64 | ||
358 | case 8: | ||
359 | breakinfo[i].len = X86_BREAKPOINT_LEN_8; | ||
360 | break; | ||
361 | #endif | ||
362 | default: | ||
297 | return -1; | 363 | return -1; |
298 | 364 | } | |
299 | breakinfo[i].enabled = 1; | ||
300 | breakinfo[i].addr = addr; | 365 | breakinfo[i].addr = addr; |
301 | breakinfo[i].type = type; | 366 | if (hw_break_reserve_slot(i)) { |
367 | breakinfo[i].addr = 0; | ||
368 | return -1; | ||
369 | } | ||
370 | breakinfo[i].enabled = 1; | ||
302 | 371 | ||
303 | return 0; | 372 | return 0; |
304 | } | 373 | } |
@@ -313,8 +382,21 @@ kgdb_set_hw_break(unsigned long addr, int len, enum kgdb_bptype bptype) | |||
313 | */ | 382 | */ |
314 | void kgdb_disable_hw_debug(struct pt_regs *regs) | 383 | void kgdb_disable_hw_debug(struct pt_regs *regs) |
315 | { | 384 | { |
385 | int i; | ||
386 | int cpu = raw_smp_processor_id(); | ||
387 | struct perf_event *bp; | ||
388 | |||
316 | /* Disable hardware debugging while we are in kgdb: */ | 389 | /* Disable hardware debugging while we are in kgdb: */ |
317 | set_debugreg(0UL, 7); | 390 | set_debugreg(0UL, 7); |
391 | for (i = 0; i < 4; i++) { | ||
392 | if (!breakinfo[i].enabled) | ||
393 | continue; | ||
394 | bp = *per_cpu_ptr(breakinfo[i].pev, cpu); | ||
395 | if (bp->attr.disabled == 1) | ||
396 | continue; | ||
397 | arch_uninstall_hw_breakpoint(bp); | ||
398 | bp->attr.disabled = 1; | ||
399 | } | ||
318 | } | 400 | } |
319 | 401 | ||
320 | /** | 402 | /** |
@@ -378,7 +460,6 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code, | |||
378 | struct pt_regs *linux_regs) | 460 | struct pt_regs *linux_regs) |
379 | { | 461 | { |
380 | unsigned long addr; | 462 | unsigned long addr; |
381 | unsigned long dr6; | ||
382 | char *ptr; | 463 | char *ptr; |
383 | int newPC; | 464 | int newPC; |
384 | 465 | ||
@@ -404,20 +485,6 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code, | |||
404 | raw_smp_processor_id()); | 485 | raw_smp_processor_id()); |
405 | } | 486 | } |
406 | 487 | ||
407 | get_debugreg(dr6, 6); | ||
408 | if (!(dr6 & 0x4000)) { | ||
409 | int breakno; | ||
410 | |||
411 | for (breakno = 0; breakno < 4; breakno++) { | ||
412 | if (dr6 & (1 << breakno) && | ||
413 | breakinfo[breakno].type == 0) { | ||
414 | /* Set restore flag: */ | ||
415 | linux_regs->flags |= X86_EFLAGS_RF; | ||
416 | break; | ||
417 | } | ||
418 | } | ||
419 | } | ||
420 | set_debugreg(0UL, 6); | ||
421 | kgdb_correct_hw_break(); | 488 | kgdb_correct_hw_break(); |
422 | 489 | ||
423 | return 0; | 490 | return 0; |
@@ -485,8 +552,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd) | |||
485 | break; | 552 | break; |
486 | 553 | ||
487 | case DIE_DEBUG: | 554 | case DIE_DEBUG: |
488 | if (atomic_read(&kgdb_cpu_doing_single_step) == | 555 | if (atomic_read(&kgdb_cpu_doing_single_step) != -1) { |
489 | raw_smp_processor_id()) { | ||
490 | if (user_mode(regs)) | 556 | if (user_mode(regs)) |
491 | return single_step_cont(regs, args); | 557 | return single_step_cont(regs, args); |
492 | break; | 558 | break; |
@@ -539,7 +605,42 @@ static struct notifier_block kgdb_notifier = { | |||
539 | */ | 605 | */ |
540 | int kgdb_arch_init(void) | 606 | int kgdb_arch_init(void) |
541 | { | 607 | { |
542 | return register_die_notifier(&kgdb_notifier); | 608 | int i, cpu; |
609 | int ret; | ||
610 | struct perf_event_attr attr; | ||
611 | struct perf_event **pevent; | ||
612 | |||
613 | ret = register_die_notifier(&kgdb_notifier); | ||
614 | if (ret != 0) | ||
615 | return ret; | ||
616 | /* | ||
617 | * Pre-allocate the hw breakpoint structions in the non-atomic | ||
618 | * portion of kgdb because this operation requires mutexs to | ||
619 | * complete. | ||
620 | */ | ||
621 | attr.bp_addr = (unsigned long)kgdb_arch_init; | ||
622 | attr.type = PERF_TYPE_BREAKPOINT; | ||
623 | attr.bp_len = HW_BREAKPOINT_LEN_1; | ||
624 | attr.bp_type = HW_BREAKPOINT_W; | ||
625 | attr.disabled = 1; | ||
626 | for (i = 0; i < 4; i++) { | ||
627 | breakinfo[i].pev = register_wide_hw_breakpoint(&attr, NULL); | ||
628 | if (IS_ERR(breakinfo[i].pev)) { | ||
629 | printk(KERN_ERR "kgdb: Could not allocate hw breakpoints\n"); | ||
630 | breakinfo[i].pev = NULL; | ||
631 | kgdb_arch_exit(); | ||
632 | return -1; | ||
633 | } | ||
634 | for_each_online_cpu(cpu) { | ||
635 | pevent = per_cpu_ptr(breakinfo[i].pev, cpu); | ||
636 | pevent[0]->hw.sample_period = 1; | ||
637 | if (pevent[0]->destroy != NULL) { | ||
638 | pevent[0]->destroy = NULL; | ||
639 | release_bp_slot(*pevent); | ||
640 | } | ||
641 | } | ||
642 | } | ||
643 | return ret; | ||
543 | } | 644 | } |
544 | 645 | ||
545 | /** | 646 | /** |
@@ -550,6 +651,13 @@ int kgdb_arch_init(void) | |||
550 | */ | 651 | */ |
551 | void kgdb_arch_exit(void) | 652 | void kgdb_arch_exit(void) |
552 | { | 653 | { |
654 | int i; | ||
655 | for (i = 0; i < 4; i++) { | ||
656 | if (breakinfo[i].pev) { | ||
657 | unregister_wide_hw_breakpoint(breakinfo[i].pev); | ||
658 | breakinfo[i].pev = NULL; | ||
659 | } | ||
660 | } | ||
553 | unregister_die_notifier(&kgdb_notifier); | 661 | unregister_die_notifier(&kgdb_notifier); |
554 | } | 662 | } |
555 | 663 | ||
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 1545bc0c9845..704bddcdf64d 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -203,6 +203,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
203 | DMI_MATCH(DMI_BOARD_NAME, "0T656F"), | 203 | DMI_MATCH(DMI_BOARD_NAME, "0T656F"), |
204 | }, | 204 | }, |
205 | }, | 205 | }, |
206 | { /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G*/ | ||
207 | .callback = set_bios_reboot, | ||
208 | .ident = "Dell OptiPlex 760", | ||
209 | .matches = { | ||
210 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
211 | DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"), | ||
212 | DMI_MATCH(DMI_BOARD_NAME, "0G919G"), | ||
213 | }, | ||
214 | }, | ||
206 | { /* Handle problems with rebooting on Dell 2400's */ | 215 | { /* Handle problems with rebooting on Dell 2400's */ |
207 | .callback = set_bios_reboot, | 216 | .callback = set_bios_reboot, |
208 | .ident = "Dell PowerEdge 2400", | 217 | .ident = "Dell PowerEdge 2400", |
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index f7b8b9894b22..5d9e40c58628 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -642,19 +642,27 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { | |||
642 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix/MSC"), | 642 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix/MSC"), |
643 | }, | 643 | }, |
644 | }, | 644 | }, |
645 | { | ||
646 | /* | 645 | /* |
647 | * AMI BIOS with low memory corruption was found on Intel DG45ID board. | 646 | * AMI BIOS with low memory corruption was found on Intel DG45ID and |
648 | * It hase different DMI_BIOS_VENDOR = "Intel Corp.", for now we will | 647 | * DG45FC boards. |
648 | * It has a different DMI_BIOS_VENDOR = "Intel Corp.", for now we will | ||
649 | * match only DMI_BOARD_NAME and see if there is more bad products | 649 | * match only DMI_BOARD_NAME and see if there is more bad products |
650 | * with this vendor. | 650 | * with this vendor. |
651 | */ | 651 | */ |
652 | { | ||
652 | .callback = dmi_low_memory_corruption, | 653 | .callback = dmi_low_memory_corruption, |
653 | .ident = "AMI BIOS", | 654 | .ident = "AMI BIOS", |
654 | .matches = { | 655 | .matches = { |
655 | DMI_MATCH(DMI_BOARD_NAME, "DG45ID"), | 656 | DMI_MATCH(DMI_BOARD_NAME, "DG45ID"), |
656 | }, | 657 | }, |
657 | }, | 658 | }, |
659 | { | ||
660 | .callback = dmi_low_memory_corruption, | ||
661 | .ident = "AMI BIOS", | ||
662 | .matches = { | ||
663 | DMI_MATCH(DMI_BOARD_NAME, "DG45FC"), | ||
664 | }, | ||
665 | }, | ||
658 | #endif | 666 | #endif |
659 | {} | 667 | {} |
660 | }; | 668 | }; |
diff --git a/arch/x86/kernel/uv_time.c b/arch/x86/kernel/uv_time.c index 3c84aa001c11..2b75ef638dbc 100644 --- a/arch/x86/kernel/uv_time.c +++ b/arch/x86/kernel/uv_time.c | |||
@@ -282,10 +282,21 @@ static int uv_rtc_unset_timer(int cpu, int force) | |||
282 | 282 | ||
283 | /* | 283 | /* |
284 | * Read the RTC. | 284 | * Read the RTC. |
285 | * | ||
286 | * Starting with HUB rev 2.0, the UV RTC register is replicated across all | ||
287 | * cachelines of it's own page. This allows faster simultaneous reads | ||
288 | * from a given socket. | ||
285 | */ | 289 | */ |
286 | static cycle_t uv_read_rtc(struct clocksource *cs) | 290 | static cycle_t uv_read_rtc(struct clocksource *cs) |
287 | { | 291 | { |
288 | return (cycle_t)uv_read_local_mmr(UVH_RTC); | 292 | unsigned long offset; |
293 | |||
294 | if (uv_get_min_hub_revision_id() == 1) | ||
295 | offset = 0; | ||
296 | else | ||
297 | offset = (uv_blade_processor_id() * L1_CACHE_BYTES) % PAGE_SIZE; | ||
298 | |||
299 | return (cycle_t)uv_read_local_mmr(UVH_RTC | offset); | ||
289 | } | 300 | } |
290 | 301 | ||
291 | /* | 302 | /* |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 5198b9bb34ef..69ddfbd91135 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <asm/numa.h> | 49 | #include <asm/numa.h> |
50 | #include <asm/cacheflush.h> | 50 | #include <asm/cacheflush.h> |
51 | #include <asm/init.h> | 51 | #include <asm/init.h> |
52 | #include <linux/bootmem.h> | ||
52 | 53 | ||
53 | static unsigned long dma_reserve __initdata; | 54 | static unsigned long dma_reserve __initdata; |
54 | 55 | ||
@@ -616,6 +617,21 @@ void __init paging_init(void) | |||
616 | */ | 617 | */ |
617 | #ifdef CONFIG_MEMORY_HOTPLUG | 618 | #ifdef CONFIG_MEMORY_HOTPLUG |
618 | /* | 619 | /* |
620 | * After memory hotplug the variables max_pfn, max_low_pfn and high_memory need | ||
621 | * updating. | ||
622 | */ | ||
623 | static void update_end_of_memory_vars(u64 start, u64 size) | ||
624 | { | ||
625 | unsigned long end_pfn = PFN_UP(start + size); | ||
626 | |||
627 | if (end_pfn > max_pfn) { | ||
628 | max_pfn = end_pfn; | ||
629 | max_low_pfn = end_pfn; | ||
630 | high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1; | ||
631 | } | ||
632 | } | ||
633 | |||
634 | /* | ||
619 | * Memory is added always to NORMAL zone. This means you will never get | 635 | * Memory is added always to NORMAL zone. This means you will never get |
620 | * additional DMA/DMA32 memory. | 636 | * additional DMA/DMA32 memory. |
621 | */ | 637 | */ |
@@ -634,6 +650,9 @@ int arch_add_memory(int nid, u64 start, u64 size) | |||
634 | ret = __add_pages(nid, zone, start_pfn, nr_pages); | 650 | ret = __add_pages(nid, zone, start_pfn, nr_pages); |
635 | WARN_ON_ONCE(ret); | 651 | WARN_ON_ONCE(ret); |
636 | 652 | ||
653 | /* update max_pfn, max_low_pfn and high_memory */ | ||
654 | update_end_of_memory_vars(start, size); | ||
655 | |||
637 | return ret; | 656 | return ret; |
638 | } | 657 | } |
639 | EXPORT_SYMBOL_GPL(arch_add_memory); | 658 | EXPORT_SYMBOL_GPL(arch_add_memory); |
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index cb88b1a0bd5f..3347f696edc7 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
@@ -222,7 +222,7 @@ static void nmi_cpu_switch(void *dummy) | |||
222 | 222 | ||
223 | /* move to next set */ | 223 | /* move to next set */ |
224 | si += model->num_counters; | 224 | si += model->num_counters; |
225 | if ((si > model->num_virt_counters) || (counter_config[si].count == 0)) | 225 | if ((si >= model->num_virt_counters) || (counter_config[si].count == 0)) |
226 | per_cpu(switch_index, cpu) = 0; | 226 | per_cpu(switch_index, cpu) = 0; |
227 | else | 227 | else |
228 | per_cpu(switch_index, cpu) = si; | 228 | per_cpu(switch_index, cpu) = si; |
@@ -598,6 +598,7 @@ static int __init ppro_init(char **cpu_type) | |||
598 | case 15: case 23: | 598 | case 15: case 23: |
599 | *cpu_type = "i386/core_2"; | 599 | *cpu_type = "i386/core_2"; |
600 | break; | 600 | break; |
601 | case 0x2e: | ||
601 | case 26: | 602 | case 26: |
602 | spec = &op_arch_perfmon_spec; | 603 | spec = &op_arch_perfmon_spec; |
603 | *cpu_type = "i386/core_i7"; | 604 | *cpu_type = "i386/core_i7"; |
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 1fa2654db0a6..e7dbbaf5fb3e 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c | |||
@@ -147,16 +147,16 @@ blkiocg_weight_write(struct cgroup *cgroup, struct cftype *cftype, u64 val) | |||
147 | return -EINVAL; | 147 | return -EINVAL; |
148 | 148 | ||
149 | blkcg = cgroup_to_blkio_cgroup(cgroup); | 149 | blkcg = cgroup_to_blkio_cgroup(cgroup); |
150 | spin_lock(&blkio_list_lock); | ||
150 | spin_lock_irq(&blkcg->lock); | 151 | spin_lock_irq(&blkcg->lock); |
151 | blkcg->weight = (unsigned int)val; | 152 | blkcg->weight = (unsigned int)val; |
152 | hlist_for_each_entry(blkg, n, &blkcg->blkg_list, blkcg_node) { | 153 | hlist_for_each_entry(blkg, n, &blkcg->blkg_list, blkcg_node) { |
153 | spin_lock(&blkio_list_lock); | ||
154 | list_for_each_entry(blkiop, &blkio_list, list) | 154 | list_for_each_entry(blkiop, &blkio_list, list) |
155 | blkiop->ops.blkio_update_group_weight_fn(blkg, | 155 | blkiop->ops.blkio_update_group_weight_fn(blkg, |
156 | blkcg->weight); | 156 | blkcg->weight); |
157 | spin_unlock(&blkio_list_lock); | ||
158 | } | 157 | } |
159 | spin_unlock_irq(&blkcg->lock); | 158 | spin_unlock_irq(&blkcg->lock); |
159 | spin_unlock(&blkio_list_lock); | ||
160 | return 0; | 160 | return 0; |
161 | } | 161 | } |
162 | 162 | ||
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index ee130f14d1fc..17b768d0d42f 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -1803,7 +1803,7 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq) | |||
1803 | * Otherwise, we do only if they are the last ones | 1803 | * Otherwise, we do only if they are the last ones |
1804 | * in their service tree. | 1804 | * in their service tree. |
1805 | */ | 1805 | */ |
1806 | return service_tree->count == 1; | 1806 | return service_tree->count == 1 && cfq_cfqq_sync(cfqq); |
1807 | } | 1807 | } |
1808 | 1808 | ||
1809 | static void cfq_arm_slice_timer(struct cfq_data *cfqd) | 1809 | static void cfq_arm_slice_timer(struct cfq_data *cfqd) |
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index e898ad9eb1c3..ab871e00ffc5 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -2973,7 +2973,6 @@ struct drbd_conf *drbd_new_device(unsigned int minor) | |||
2973 | goto out_no_q; | 2973 | goto out_no_q; |
2974 | mdev->rq_queue = q; | 2974 | mdev->rq_queue = q; |
2975 | q->queuedata = mdev; | 2975 | q->queuedata = mdev; |
2976 | blk_queue_max_segment_size(q, DRBD_MAX_SEGMENT_SIZE); | ||
2977 | 2976 | ||
2978 | disk = alloc_disk(1); | 2977 | disk = alloc_disk(1); |
2979 | if (!disk) | 2978 | if (!disk) |
@@ -2997,6 +2996,7 @@ struct drbd_conf *drbd_new_device(unsigned int minor) | |||
2997 | q->backing_dev_info.congested_data = mdev; | 2996 | q->backing_dev_info.congested_data = mdev; |
2998 | 2997 | ||
2999 | blk_queue_make_request(q, drbd_make_request_26); | 2998 | blk_queue_make_request(q, drbd_make_request_26); |
2999 | blk_queue_max_segment_size(q, DRBD_MAX_SEGMENT_SIZE); | ||
3000 | blk_queue_bounce_limit(q, BLK_BOUNCE_ANY); | 3000 | blk_queue_bounce_limit(q, BLK_BOUNCE_ANY); |
3001 | blk_queue_merge_bvec(q, drbd_merge_bvec); | 3001 | blk_queue_merge_bvec(q, drbd_merge_bvec); |
3002 | q->queue_lock = &mdev->req_lock; /* needed since we use */ | 3002 | q->queue_lock = &mdev->req_lock; /* needed since we use */ |
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index f22a5283128a..d065c646b35a 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -1224,7 +1224,7 @@ static int receive_Barrier(struct drbd_conf *mdev, struct p_header *h) | |||
1224 | epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO); | 1224 | epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO); |
1225 | if (!epoch) { | 1225 | if (!epoch) { |
1226 | dev_warn(DEV, "Allocation of an epoch failed, slowing down\n"); | 1226 | dev_warn(DEV, "Allocation of an epoch failed, slowing down\n"); |
1227 | issue_flush = !test_and_set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &epoch->flags); | 1227 | issue_flush = !test_and_set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &mdev->current_epoch->flags); |
1228 | drbd_wait_ee_list_empty(mdev, &mdev->active_ee); | 1228 | drbd_wait_ee_list_empty(mdev, &mdev->active_ee); |
1229 | if (issue_flush) { | 1229 | if (issue_flush) { |
1230 | rv = drbd_flush_after_epoch(mdev, mdev->current_epoch); | 1230 | rv = drbd_flush_after_epoch(mdev, mdev->current_epoch); |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 2ddf03ae034e..68b5957f107c 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -322,7 +322,7 @@ static void pkt_sysfs_dev_remove(struct pktcdvd_device *pd) | |||
322 | pkt_kobj_remove(pd->kobj_stat); | 322 | pkt_kobj_remove(pd->kobj_stat); |
323 | pkt_kobj_remove(pd->kobj_wqueue); | 323 | pkt_kobj_remove(pd->kobj_wqueue); |
324 | if (class_pktcdvd) | 324 | if (class_pktcdvd) |
325 | device_destroy(class_pktcdvd, pd->pkt_dev); | 325 | device_unregister(pd->dev); |
326 | } | 326 | } |
327 | 327 | ||
328 | 328 | ||
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 652367aa6546..058fbccf2f52 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig | |||
@@ -195,5 +195,16 @@ config BT_MRVL_SDIO | |||
195 | Say Y here to compile support for Marvell BT-over-SDIO driver | 195 | Say Y here to compile support for Marvell BT-over-SDIO driver |
196 | into the kernel or say M to compile it as module. | 196 | into the kernel or say M to compile it as module. |
197 | 197 | ||
198 | endmenu | 198 | config BT_ATH3K |
199 | tristate "Atheros firmware download driver" | ||
200 | depends on BT_HCIBTUSB | ||
201 | select FW_LOADER | ||
202 | help | ||
203 | Bluetooth firmware download driver. | ||
204 | This driver loads the firmware into the Atheros Bluetooth | ||
205 | chipset. | ||
199 | 206 | ||
207 | Say Y here to compile support for "Atheros firmware download driver" | ||
208 | into the kernel or say M to compile it as module (ath3k). | ||
209 | |||
210 | endmenu | ||
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index b3f57d2d4eb0..7e5aed598121 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile | |||
@@ -15,6 +15,7 @@ obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o | |||
15 | obj-$(CONFIG_BT_HCIBTUSB) += btusb.o | 15 | obj-$(CONFIG_BT_HCIBTUSB) += btusb.o |
16 | obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o | 16 | obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o |
17 | 17 | ||
18 | obj-$(CONFIG_BT_ATH3K) += ath3k.o | ||
18 | obj-$(CONFIG_BT_MRVL) += btmrvl.o | 19 | obj-$(CONFIG_BT_MRVL) += btmrvl.o |
19 | obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o | 20 | obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o |
20 | 21 | ||
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c new file mode 100644 index 000000000000..add9485ca5b6 --- /dev/null +++ b/drivers/bluetooth/ath3k.c | |||
@@ -0,0 +1,187 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2008-2009 Atheros Communications Inc. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | * | ||
18 | */ | ||
19 | |||
20 | |||
21 | #include <linux/module.h> | ||
22 | #include <linux/kernel.h> | ||
23 | #include <linux/init.h> | ||
24 | #include <linux/slab.h> | ||
25 | #include <linux/types.h> | ||
26 | #include <linux/errno.h> | ||
27 | #include <linux/device.h> | ||
28 | #include <linux/firmware.h> | ||
29 | #include <linux/usb.h> | ||
30 | #include <net/bluetooth/bluetooth.h> | ||
31 | |||
32 | #define VERSION "1.0" | ||
33 | |||
34 | |||
35 | static struct usb_device_id ath3k_table[] = { | ||
36 | /* Atheros AR3011 */ | ||
37 | { USB_DEVICE(0x0CF3, 0x3000) }, | ||
38 | { } /* Terminating entry */ | ||
39 | }; | ||
40 | |||
41 | MODULE_DEVICE_TABLE(usb, ath3k_table); | ||
42 | |||
43 | #define USB_REQ_DFU_DNLOAD 1 | ||
44 | #define BULK_SIZE 4096 | ||
45 | |||
46 | struct ath3k_data { | ||
47 | struct usb_device *udev; | ||
48 | u8 *fw_data; | ||
49 | u32 fw_size; | ||
50 | u32 fw_sent; | ||
51 | }; | ||
52 | |||
53 | static int ath3k_load_firmware(struct ath3k_data *data, | ||
54 | unsigned char *firmware, | ||
55 | int count) | ||
56 | { | ||
57 | u8 *send_buf; | ||
58 | int err, pipe, len, size, sent = 0; | ||
59 | |||
60 | BT_DBG("ath3k %p udev %p", data, data->udev); | ||
61 | |||
62 | pipe = usb_sndctrlpipe(data->udev, 0); | ||
63 | |||
64 | if ((usb_control_msg(data->udev, pipe, | ||
65 | USB_REQ_DFU_DNLOAD, | ||
66 | USB_TYPE_VENDOR, 0, 0, | ||
67 | firmware, 20, USB_CTRL_SET_TIMEOUT)) < 0) { | ||
68 | BT_ERR("Can't change to loading configuration err"); | ||
69 | return -EBUSY; | ||
70 | } | ||
71 | sent += 20; | ||
72 | count -= 20; | ||
73 | |||
74 | send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC); | ||
75 | if (!send_buf) { | ||
76 | BT_ERR("Can't allocate memory chunk for firmware"); | ||
77 | return -ENOMEM; | ||
78 | } | ||
79 | |||
80 | while (count) { | ||
81 | size = min_t(uint, count, BULK_SIZE); | ||
82 | pipe = usb_sndbulkpipe(data->udev, 0x02); | ||
83 | memcpy(send_buf, firmware + sent, size); | ||
84 | |||
85 | err = usb_bulk_msg(data->udev, pipe, send_buf, size, | ||
86 | &len, 3000); | ||
87 | |||
88 | if (err || (len != size)) { | ||
89 | BT_ERR("Error in firmware loading err = %d," | ||
90 | "len = %d, size = %d", err, len, size); | ||
91 | goto error; | ||
92 | } | ||
93 | |||
94 | sent += size; | ||
95 | count -= size; | ||
96 | } | ||
97 | |||
98 | kfree(send_buf); | ||
99 | return 0; | ||
100 | |||
101 | error: | ||
102 | kfree(send_buf); | ||
103 | return err; | ||
104 | } | ||
105 | |||
106 | static int ath3k_probe(struct usb_interface *intf, | ||
107 | const struct usb_device_id *id) | ||
108 | { | ||
109 | const struct firmware *firmware; | ||
110 | struct usb_device *udev = interface_to_usbdev(intf); | ||
111 | struct ath3k_data *data; | ||
112 | int size; | ||
113 | |||
114 | BT_DBG("intf %p id %p", intf, id); | ||
115 | |||
116 | if (intf->cur_altsetting->desc.bInterfaceNumber != 0) | ||
117 | return -ENODEV; | ||
118 | |||
119 | data = kzalloc(sizeof(*data), GFP_KERNEL); | ||
120 | if (!data) | ||
121 | return -ENOMEM; | ||
122 | |||
123 | data->udev = udev; | ||
124 | |||
125 | if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) { | ||
126 | kfree(data); | ||
127 | return -EIO; | ||
128 | } | ||
129 | |||
130 | size = max_t(uint, firmware->size, 4096); | ||
131 | data->fw_data = kmalloc(size, GFP_KERNEL); | ||
132 | if (!data->fw_data) { | ||
133 | release_firmware(firmware); | ||
134 | kfree(data); | ||
135 | return -ENOMEM; | ||
136 | } | ||
137 | |||
138 | memcpy(data->fw_data, firmware->data, firmware->size); | ||
139 | data->fw_size = firmware->size; | ||
140 | data->fw_sent = 0; | ||
141 | release_firmware(firmware); | ||
142 | |||
143 | usb_set_intfdata(intf, data); | ||
144 | if (ath3k_load_firmware(data, data->fw_data, data->fw_size)) { | ||
145 | usb_set_intfdata(intf, NULL); | ||
146 | return -EIO; | ||
147 | } | ||
148 | |||
149 | return 0; | ||
150 | } | ||
151 | |||
152 | static void ath3k_disconnect(struct usb_interface *intf) | ||
153 | { | ||
154 | struct ath3k_data *data = usb_get_intfdata(intf); | ||
155 | |||
156 | BT_DBG("ath3k_disconnect intf %p", intf); | ||
157 | |||
158 | kfree(data->fw_data); | ||
159 | kfree(data); | ||
160 | } | ||
161 | |||
162 | static struct usb_driver ath3k_driver = { | ||
163 | .name = "ath3k", | ||
164 | .probe = ath3k_probe, | ||
165 | .disconnect = ath3k_disconnect, | ||
166 | .id_table = ath3k_table, | ||
167 | }; | ||
168 | |||
169 | static int __init ath3k_init(void) | ||
170 | { | ||
171 | BT_INFO("Atheros AR30xx firmware driver ver %s", VERSION); | ||
172 | return usb_register(&ath3k_driver); | ||
173 | } | ||
174 | |||
175 | static void __exit ath3k_exit(void) | ||
176 | { | ||
177 | usb_deregister(&ath3k_driver); | ||
178 | } | ||
179 | |||
180 | module_init(ath3k_init); | ||
181 | module_exit(ath3k_exit); | ||
182 | |||
183 | MODULE_AUTHOR("Atheros Communications"); | ||
184 | MODULE_DESCRIPTION("Atheros AR30xx firmware driver"); | ||
185 | MODULE_VERSION(VERSION); | ||
186 | MODULE_LICENSE("GPL"); | ||
187 | MODULE_FIRMWARE("ath3k-1.fw"); | ||
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 2acdc605cb4b..c2cf81144715 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
@@ -503,7 +503,9 @@ static irqreturn_t bluecard_interrupt(int irq, void *dev_inst) | |||
503 | unsigned int iobase; | 503 | unsigned int iobase; |
504 | unsigned char reg; | 504 | unsigned char reg; |
505 | 505 | ||
506 | BUG_ON(!info->hdev); | 506 | if (!info || !info->hdev) |
507 | /* our irq handler is shared */ | ||
508 | return IRQ_NONE; | ||
507 | 509 | ||
508 | if (!test_bit(CARD_READY, &(info->hw_state))) | 510 | if (!test_bit(CARD_READY, &(info->hw_state))) |
509 | return IRQ_HANDLED; | 511 | return IRQ_HANDLED; |
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index d814a2755ccb..9f5926aaf57f 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -345,7 +345,9 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) | |||
345 | int iir; | 345 | int iir; |
346 | irqreturn_t r = IRQ_NONE; | 346 | irqreturn_t r = IRQ_NONE; |
347 | 347 | ||
348 | BUG_ON(!info->hdev); | 348 | if (!info || !info->hdev) |
349 | /* our irq handler is shared */ | ||
350 | return IRQ_NONE; | ||
349 | 351 | ||
350 | iobase = info->p_dev->io.BasePort1; | 352 | iobase = info->p_dev->io.BasePort1; |
351 | 353 | ||
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index d339464dc15e..91c523099804 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -295,7 +295,9 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst) | |||
295 | int iir, lsr; | 295 | int iir, lsr; |
296 | irqreturn_t r = IRQ_NONE; | 296 | irqreturn_t r = IRQ_NONE; |
297 | 297 | ||
298 | BUG_ON(!info->hdev); | 298 | if (!info || !info->hdev) |
299 | /* our irq handler is shared */ | ||
300 | return IRQ_NONE; | ||
299 | 301 | ||
300 | iobase = info->p_dev->io.BasePort1; | 302 | iobase = info->p_dev->io.BasePort1; |
301 | 303 | ||
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 4f02a6f3c980..697591941e17 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -299,7 +299,9 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst) | |||
299 | int iir, lsr; | 299 | int iir, lsr; |
300 | irqreturn_t r = IRQ_NONE; | 300 | irqreturn_t r = IRQ_NONE; |
301 | 301 | ||
302 | BUG_ON(!info->hdev); | 302 | if (!info || !info->hdev) |
303 | /* our irq handler is shared */ | ||
304 | return IRQ_NONE; | ||
303 | 305 | ||
304 | iobase = info->p_dev->io.BasePort1; | 306 | iobase = info->p_dev->io.BasePort1; |
305 | 307 | ||
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 1afb8968a342..34cf04e21795 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -729,9 +729,6 @@ int __init agp_amd64_init(void) | |||
729 | if (agp_off) | 729 | if (agp_off) |
730 | return -EINVAL; | 730 | return -EINVAL; |
731 | 731 | ||
732 | if (gart_iommu_aperture) | ||
733 | return agp_bridges_found ? 0 : -ENODEV; | ||
734 | |||
735 | err = pci_register_driver(&agp_amd64_pci_driver); | 732 | err = pci_register_driver(&agp_amd64_pci_driver); |
736 | if (err < 0) | 733 | if (err < 0) |
737 | return err; | 734 | return err; |
@@ -768,6 +765,14 @@ int __init agp_amd64_init(void) | |||
768 | return err; | 765 | return err; |
769 | } | 766 | } |
770 | 767 | ||
768 | static int __init agp_amd64_mod_init(void) | ||
769 | { | ||
770 | if (gart_iommu_aperture) | ||
771 | return agp_bridges_found ? 0 : -ENODEV; | ||
772 | |||
773 | return agp_amd64_init(); | ||
774 | } | ||
775 | |||
771 | static void __exit agp_amd64_cleanup(void) | 776 | static void __exit agp_amd64_cleanup(void) |
772 | { | 777 | { |
773 | if (gart_iommu_aperture) | 778 | if (gart_iommu_aperture) |
@@ -777,7 +782,7 @@ static void __exit agp_amd64_cleanup(void) | |||
777 | pci_unregister_driver(&agp_amd64_pci_driver); | 782 | pci_unregister_driver(&agp_amd64_pci_driver); |
778 | } | 783 | } |
779 | 784 | ||
780 | module_init(agp_amd64_init); | 785 | module_init(agp_amd64_mod_init); |
781 | module_exit(agp_amd64_cleanup); | 786 | module_exit(agp_amd64_cleanup); |
782 | 787 | ||
783 | MODULE_AUTHOR("Dave Jones <davej@redhat.com>, Andi Kleen"); | 788 | MODULE_AUTHOR("Dave Jones <davej@redhat.com>, Andi Kleen"); |
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index be832b6f8279..48788db4e280 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
@@ -395,6 +395,7 @@ static ssize_t read_kmem(struct file *file, char __user *buf, | |||
395 | unsigned long p = *ppos; | 395 | unsigned long p = *ppos; |
396 | ssize_t low_count, read, sz; | 396 | ssize_t low_count, read, sz; |
397 | char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ | 397 | char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ |
398 | int err = 0; | ||
398 | 399 | ||
399 | read = 0; | 400 | read = 0; |
400 | if (p < (unsigned long) high_memory) { | 401 | if (p < (unsigned long) high_memory) { |
@@ -441,12 +442,16 @@ static ssize_t read_kmem(struct file *file, char __user *buf, | |||
441 | return -ENOMEM; | 442 | return -ENOMEM; |
442 | while (count > 0) { | 443 | while (count > 0) { |
443 | sz = size_inside_page(p, count); | 444 | sz = size_inside_page(p, count); |
445 | if (!is_vmalloc_or_module_addr((void *)p)) { | ||
446 | err = -ENXIO; | ||
447 | break; | ||
448 | } | ||
444 | sz = vread(kbuf, (char *)p, sz); | 449 | sz = vread(kbuf, (char *)p, sz); |
445 | if (!sz) | 450 | if (!sz) |
446 | break; | 451 | break; |
447 | if (copy_to_user(buf, kbuf, sz)) { | 452 | if (copy_to_user(buf, kbuf, sz)) { |
448 | free_page((unsigned long)kbuf); | 453 | err = -EFAULT; |
449 | return -EFAULT; | 454 | break; |
450 | } | 455 | } |
451 | count -= sz; | 456 | count -= sz; |
452 | buf += sz; | 457 | buf += sz; |
@@ -455,8 +460,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf, | |||
455 | } | 460 | } |
456 | free_page((unsigned long)kbuf); | 461 | free_page((unsigned long)kbuf); |
457 | } | 462 | } |
458 | *ppos = p; | 463 | *ppos = p; |
459 | return read; | 464 | return read ? read : err; |
460 | } | 465 | } |
461 | 466 | ||
462 | 467 | ||
@@ -520,6 +525,7 @@ static ssize_t write_kmem(struct file * file, const char __user * buf, | |||
520 | ssize_t wrote = 0; | 525 | ssize_t wrote = 0; |
521 | ssize_t virtr = 0; | 526 | ssize_t virtr = 0; |
522 | char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ | 527 | char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ |
528 | int err = 0; | ||
523 | 529 | ||
524 | if (p < (unsigned long) high_memory) { | 530 | if (p < (unsigned long) high_memory) { |
525 | unsigned long to_write = min_t(unsigned long, count, | 531 | unsigned long to_write = min_t(unsigned long, count, |
@@ -540,14 +546,16 @@ static ssize_t write_kmem(struct file * file, const char __user * buf, | |||
540 | unsigned long sz = size_inside_page(p, count); | 546 | unsigned long sz = size_inside_page(p, count); |
541 | unsigned long n; | 547 | unsigned long n; |
542 | 548 | ||
549 | if (!is_vmalloc_or_module_addr((void *)p)) { | ||
550 | err = -ENXIO; | ||
551 | break; | ||
552 | } | ||
543 | n = copy_from_user(kbuf, buf, sz); | 553 | n = copy_from_user(kbuf, buf, sz); |
544 | if (n) { | 554 | if (n) { |
545 | if (wrote + virtr) | 555 | err = -EFAULT; |
546 | break; | 556 | break; |
547 | free_page((unsigned long)kbuf); | ||
548 | return -EFAULT; | ||
549 | } | 557 | } |
550 | sz = vwrite(kbuf, (char *)p, sz); | 558 | vwrite(kbuf, (char *)p, sz); |
551 | count -= sz; | 559 | count -= sz; |
552 | buf += sz; | 560 | buf += sz; |
553 | virtr += sz; | 561 | virtr += sz; |
@@ -556,8 +564,8 @@ static ssize_t write_kmem(struct file * file, const char __user * buf, | |||
556 | free_page((unsigned long)kbuf); | 564 | free_page((unsigned long)kbuf); |
557 | } | 565 | } |
558 | 566 | ||
559 | *ppos = p; | 567 | *ppos = p; |
560 | return virtr + wrote; | 568 | return virtr + wrote ? : err; |
561 | } | 569 | } |
562 | #endif | 570 | #endif |
563 | 571 | ||
diff --git a/drivers/char/random.c b/drivers/char/random.c index 8258982b49ec..2849713d2231 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -1051,12 +1051,6 @@ random_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) | |||
1051 | /* like a named pipe */ | 1051 | /* like a named pipe */ |
1052 | } | 1052 | } |
1053 | 1053 | ||
1054 | /* | ||
1055 | * If we gave the user some bytes, update the access time. | ||
1056 | */ | ||
1057 | if (count) | ||
1058 | file_accessed(file); | ||
1059 | |||
1060 | return (count ? count : retval); | 1054 | return (count ? count : retval); |
1061 | } | 1055 | } |
1062 | 1056 | ||
@@ -1107,7 +1101,6 @@ static ssize_t random_write(struct file *file, const char __user *buffer, | |||
1107 | size_t count, loff_t *ppos) | 1101 | size_t count, loff_t *ppos) |
1108 | { | 1102 | { |
1109 | size_t ret; | 1103 | size_t ret; |
1110 | struct inode *inode = file->f_path.dentry->d_inode; | ||
1111 | 1104 | ||
1112 | ret = write_pool(&blocking_pool, buffer, count); | 1105 | ret = write_pool(&blocking_pool, buffer, count); |
1113 | if (ret) | 1106 | if (ret) |
@@ -1116,8 +1109,6 @@ static ssize_t random_write(struct file *file, const char __user *buffer, | |||
1116 | if (ret) | 1109 | if (ret) |
1117 | return ret; | 1110 | return ret; |
1118 | 1111 | ||
1119 | inode->i_mtime = current_fs_time(inode->i_sb); | ||
1120 | mark_inode_dirty(inode); | ||
1121 | return (ssize_t)count; | 1112 | return (ssize_t)count; |
1122 | } | 1113 | } |
1123 | 1114 | ||
diff --git a/drivers/char/uv_mmtimer.c b/drivers/char/uv_mmtimer.c index 867b67be9f0a..c7072ba14f48 100644 --- a/drivers/char/uv_mmtimer.c +++ b/drivers/char/uv_mmtimer.c | |||
@@ -89,13 +89,17 @@ static long uv_mmtimer_ioctl(struct file *file, unsigned int cmd, | |||
89 | switch (cmd) { | 89 | switch (cmd) { |
90 | case MMTIMER_GETOFFSET: /* offset of the counter */ | 90 | case MMTIMER_GETOFFSET: /* offset of the counter */ |
91 | /* | 91 | /* |
92 | * UV RTC register is on its own page | 92 | * Starting with HUB rev 2.0, the UV RTC register is |
93 | * replicated across all cachelines of it's own page. | ||
94 | * This allows faster simultaneous reads from a given socket. | ||
95 | * | ||
96 | * The offset returned is in 64 bit units. | ||
93 | */ | 97 | */ |
94 | if (PAGE_SIZE <= (1 << 16)) | 98 | if (uv_get_min_hub_revision_id() == 1) |
95 | ret = ((UV_LOCAL_MMR_BASE | UVH_RTC) & (PAGE_SIZE-1)) | 99 | ret = 0; |
96 | / 8; | ||
97 | else | 100 | else |
98 | ret = -ENOSYS; | 101 | ret = ((uv_blade_processor_id() * L1_CACHE_BYTES) % |
102 | PAGE_SIZE) / 8; | ||
99 | break; | 103 | break; |
100 | 104 | ||
101 | case MMTIMER_GETRES: /* resolution of the clock in 10^-15 s */ | 105 | case MMTIMER_GETRES: /* resolution of the clock in 10^-15 s */ |
@@ -115,8 +119,8 @@ static long uv_mmtimer_ioctl(struct file *file, unsigned int cmd, | |||
115 | ret = hweight64(UVH_RTC_REAL_TIME_CLOCK_MASK); | 119 | ret = hweight64(UVH_RTC_REAL_TIME_CLOCK_MASK); |
116 | break; | 120 | break; |
117 | 121 | ||
118 | case MMTIMER_MMAPAVAIL: /* can we mmap the clock into userspace? */ | 122 | case MMTIMER_MMAPAVAIL: |
119 | ret = (PAGE_SIZE <= (1 << 16)) ? 1 : 0; | 123 | ret = 1; |
120 | break; | 124 | break; |
121 | 125 | ||
122 | case MMTIMER_GETCOUNTER: | 126 | case MMTIMER_GETCOUNTER: |
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index f06024668f99..537c29ac4487 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
@@ -36,17 +36,6 @@ MODULE_LICENSE("GPL"); | |||
36 | MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>"); | 36 | MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>"); |
37 | MODULE_DESCRIPTION("Generic userspace <-> kernelspace connector."); | 37 | MODULE_DESCRIPTION("Generic userspace <-> kernelspace connector."); |
38 | 38 | ||
39 | static u32 cn_idx = CN_IDX_CONNECTOR; | ||
40 | static u32 cn_val = CN_VAL_CONNECTOR; | ||
41 | |||
42 | module_param(cn_idx, uint, 0); | ||
43 | module_param(cn_val, uint, 0); | ||
44 | MODULE_PARM_DESC(cn_idx, "Connector's main device idx."); | ||
45 | MODULE_PARM_DESC(cn_val, "Connector's main device val."); | ||
46 | |||
47 | static DEFINE_MUTEX(notify_lock); | ||
48 | static LIST_HEAD(notify_list); | ||
49 | |||
50 | static struct cn_dev cdev; | 39 | static struct cn_dev cdev; |
51 | 40 | ||
52 | static int cn_already_initialized; | 41 | static int cn_already_initialized; |
@@ -210,54 +199,6 @@ static void cn_rx_skb(struct sk_buff *__skb) | |||
210 | } | 199 | } |
211 | 200 | ||
212 | /* | 201 | /* |
213 | * Notification routing. | ||
214 | * | ||
215 | * Gets id and checks if there are notification request for it's idx | ||
216 | * and val. If there are such requests notify the listeners with the | ||
217 | * given notify event. | ||
218 | * | ||
219 | */ | ||
220 | static void cn_notify(struct cb_id *id, u32 notify_event) | ||
221 | { | ||
222 | struct cn_ctl_entry *ent; | ||
223 | |||
224 | mutex_lock(¬ify_lock); | ||
225 | list_for_each_entry(ent, ¬ify_list, notify_entry) { | ||
226 | int i; | ||
227 | struct cn_notify_req *req; | ||
228 | struct cn_ctl_msg *ctl = ent->msg; | ||
229 | int idx_found, val_found; | ||
230 | |||
231 | idx_found = val_found = 0; | ||
232 | |||
233 | req = (struct cn_notify_req *)ctl->data; | ||
234 | for (i = 0; i < ctl->idx_notify_num; ++i, ++req) { | ||
235 | if (id->idx >= req->first && | ||
236 | id->idx < req->first + req->range) { | ||
237 | idx_found = 1; | ||
238 | break; | ||
239 | } | ||
240 | } | ||
241 | |||
242 | for (i = 0; i < ctl->val_notify_num; ++i, ++req) { | ||
243 | if (id->val >= req->first && | ||
244 | id->val < req->first + req->range) { | ||
245 | val_found = 1; | ||
246 | break; | ||
247 | } | ||
248 | } | ||
249 | |||
250 | if (idx_found && val_found) { | ||
251 | struct cn_msg m = { .ack = notify_event, }; | ||
252 | |||
253 | memcpy(&m.id, id, sizeof(m.id)); | ||
254 | cn_netlink_send(&m, ctl->group, GFP_KERNEL); | ||
255 | } | ||
256 | } | ||
257 | mutex_unlock(¬ify_lock); | ||
258 | } | ||
259 | |||
260 | /* | ||
261 | * Callback add routing - adds callback with given ID and name. | 202 | * Callback add routing - adds callback with given ID and name. |
262 | * If there is registered callback with the same ID it will not be added. | 203 | * If there is registered callback with the same ID it will not be added. |
263 | * | 204 | * |
@@ -276,8 +217,6 @@ int cn_add_callback(struct cb_id *id, char *name, | |||
276 | if (err) | 217 | if (err) |
277 | return err; | 218 | return err; |
278 | 219 | ||
279 | cn_notify(id, 0); | ||
280 | |||
281 | return 0; | 220 | return 0; |
282 | } | 221 | } |
283 | EXPORT_SYMBOL_GPL(cn_add_callback); | 222 | EXPORT_SYMBOL_GPL(cn_add_callback); |
@@ -295,111 +234,9 @@ void cn_del_callback(struct cb_id *id) | |||
295 | struct cn_dev *dev = &cdev; | 234 | struct cn_dev *dev = &cdev; |
296 | 235 | ||
297 | cn_queue_del_callback(dev->cbdev, id); | 236 | cn_queue_del_callback(dev->cbdev, id); |
298 | cn_notify(id, 1); | ||
299 | } | 237 | } |
300 | EXPORT_SYMBOL_GPL(cn_del_callback); | 238 | EXPORT_SYMBOL_GPL(cn_del_callback); |
301 | 239 | ||
302 | /* | ||
303 | * Checks two connector's control messages to be the same. | ||
304 | * Returns 1 if they are the same or if the first one is corrupted. | ||
305 | */ | ||
306 | static int cn_ctl_msg_equals(struct cn_ctl_msg *m1, struct cn_ctl_msg *m2) | ||
307 | { | ||
308 | int i; | ||
309 | struct cn_notify_req *req1, *req2; | ||
310 | |||
311 | if (m1->idx_notify_num != m2->idx_notify_num) | ||
312 | return 0; | ||
313 | |||
314 | if (m1->val_notify_num != m2->val_notify_num) | ||
315 | return 0; | ||
316 | |||
317 | if (m1->len != m2->len) | ||
318 | return 0; | ||
319 | |||
320 | if ((m1->idx_notify_num + m1->val_notify_num) * sizeof(*req1) != | ||
321 | m1->len) | ||
322 | return 1; | ||
323 | |||
324 | req1 = (struct cn_notify_req *)m1->data; | ||
325 | req2 = (struct cn_notify_req *)m2->data; | ||
326 | |||
327 | for (i = 0; i < m1->idx_notify_num; ++i) { | ||
328 | if (req1->first != req2->first || req1->range != req2->range) | ||
329 | return 0; | ||
330 | req1++; | ||
331 | req2++; | ||
332 | } | ||
333 | |||
334 | for (i = 0; i < m1->val_notify_num; ++i) { | ||
335 | if (req1->first != req2->first || req1->range != req2->range) | ||
336 | return 0; | ||
337 | req1++; | ||
338 | req2++; | ||
339 | } | ||
340 | |||
341 | return 1; | ||
342 | } | ||
343 | |||
344 | /* | ||
345 | * Main connector device's callback. | ||
346 | * | ||
347 | * Used for notification of a request's processing. | ||
348 | */ | ||
349 | static void cn_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp) | ||
350 | { | ||
351 | struct cn_ctl_msg *ctl; | ||
352 | struct cn_ctl_entry *ent; | ||
353 | u32 size; | ||
354 | |||
355 | if (msg->len < sizeof(*ctl)) | ||
356 | return; | ||
357 | |||
358 | ctl = (struct cn_ctl_msg *)msg->data; | ||
359 | |||
360 | size = (sizeof(*ctl) + ((ctl->idx_notify_num + | ||
361 | ctl->val_notify_num) * | ||
362 | sizeof(struct cn_notify_req))); | ||
363 | |||
364 | if (msg->len != size) | ||
365 | return; | ||
366 | |||
367 | if (ctl->len + sizeof(*ctl) != msg->len) | ||
368 | return; | ||
369 | |||
370 | /* | ||
371 | * Remove notification. | ||
372 | */ | ||
373 | if (ctl->group == 0) { | ||
374 | struct cn_ctl_entry *n; | ||
375 | |||
376 | mutex_lock(¬ify_lock); | ||
377 | list_for_each_entry_safe(ent, n, ¬ify_list, notify_entry) { | ||
378 | if (cn_ctl_msg_equals(ent->msg, ctl)) { | ||
379 | list_del(&ent->notify_entry); | ||
380 | kfree(ent); | ||
381 | } | ||
382 | } | ||
383 | mutex_unlock(¬ify_lock); | ||
384 | |||
385 | return; | ||
386 | } | ||
387 | |||
388 | size += sizeof(*ent); | ||
389 | |||
390 | ent = kzalloc(size, GFP_KERNEL); | ||
391 | if (!ent) | ||
392 | return; | ||
393 | |||
394 | ent->msg = (struct cn_ctl_msg *)(ent + 1); | ||
395 | |||
396 | memcpy(ent->msg, ctl, size - sizeof(*ent)); | ||
397 | |||
398 | mutex_lock(¬ify_lock); | ||
399 | list_add(&ent->notify_entry, ¬ify_list); | ||
400 | mutex_unlock(¬ify_lock); | ||
401 | } | ||
402 | |||
403 | static int cn_proc_show(struct seq_file *m, void *v) | 240 | static int cn_proc_show(struct seq_file *m, void *v) |
404 | { | 241 | { |
405 | struct cn_queue_dev *dev = cdev.cbdev; | 242 | struct cn_queue_dev *dev = cdev.cbdev; |
@@ -437,11 +274,8 @@ static const struct file_operations cn_file_ops = { | |||
437 | static int __devinit cn_init(void) | 274 | static int __devinit cn_init(void) |
438 | { | 275 | { |
439 | struct cn_dev *dev = &cdev; | 276 | struct cn_dev *dev = &cdev; |
440 | int err; | ||
441 | 277 | ||
442 | dev->input = cn_rx_skb; | 278 | dev->input = cn_rx_skb; |
443 | dev->id.idx = cn_idx; | ||
444 | dev->id.val = cn_val; | ||
445 | 279 | ||
446 | dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR, | 280 | dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR, |
447 | CN_NETLINK_USERS + 0xf, | 281 | CN_NETLINK_USERS + 0xf, |
@@ -457,14 +291,6 @@ static int __devinit cn_init(void) | |||
457 | 291 | ||
458 | cn_already_initialized = 1; | 292 | cn_already_initialized = 1; |
459 | 293 | ||
460 | err = cn_add_callback(&dev->id, "connector", &cn_callback); | ||
461 | if (err) { | ||
462 | cn_already_initialized = 0; | ||
463 | cn_queue_free_dev(dev->cbdev); | ||
464 | netlink_kernel_release(dev->nls); | ||
465 | return -EINVAL; | ||
466 | } | ||
467 | |||
468 | proc_net_fops_create(&init_net, "connector", S_IRUGO, &cn_file_ops); | 294 | proc_net_fops_create(&init_net, "connector", S_IRUGO, &cn_file_ops); |
469 | 295 | ||
470 | return 0; | 296 | return 0; |
@@ -478,7 +304,6 @@ static void __devexit cn_fini(void) | |||
478 | 304 | ||
479 | proc_net_remove(&init_net, "connector"); | 305 | proc_net_remove(&init_net, "connector"); |
480 | 306 | ||
481 | cn_del_callback(&dev->id); | ||
482 | cn_queue_free_dev(dev->cbdev); | 307 | cn_queue_free_dev(dev->cbdev); |
483 | netlink_kernel_release(dev->nls); | 308 | netlink_kernel_release(dev->nls); |
484 | } | 309 | } |
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c index 0af80577dc7b..d3a27e0119bc 100644 --- a/drivers/crypto/padlock-sha.c +++ b/drivers/crypto/padlock-sha.c | |||
@@ -57,6 +57,23 @@ static int padlock_sha_update(struct shash_desc *desc, | |||
57 | return crypto_shash_update(&dctx->fallback, data, length); | 57 | return crypto_shash_update(&dctx->fallback, data, length); |
58 | } | 58 | } |
59 | 59 | ||
60 | static int padlock_sha_export(struct shash_desc *desc, void *out) | ||
61 | { | ||
62 | struct padlock_sha_desc *dctx = shash_desc_ctx(desc); | ||
63 | |||
64 | return crypto_shash_export(&dctx->fallback, out); | ||
65 | } | ||
66 | |||
67 | static int padlock_sha_import(struct shash_desc *desc, const void *in) | ||
68 | { | ||
69 | struct padlock_sha_desc *dctx = shash_desc_ctx(desc); | ||
70 | struct padlock_sha_ctx *ctx = crypto_shash_ctx(desc->tfm); | ||
71 | |||
72 | dctx->fallback.tfm = ctx->fallback; | ||
73 | dctx->fallback.flags = desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP; | ||
74 | return crypto_shash_import(&dctx->fallback, in); | ||
75 | } | ||
76 | |||
60 | static inline void padlock_output_block(uint32_t *src, | 77 | static inline void padlock_output_block(uint32_t *src, |
61 | uint32_t *dst, size_t count) | 78 | uint32_t *dst, size_t count) |
62 | { | 79 | { |
@@ -235,7 +252,10 @@ static struct shash_alg sha1_alg = { | |||
235 | .update = padlock_sha_update, | 252 | .update = padlock_sha_update, |
236 | .finup = padlock_sha1_finup, | 253 | .finup = padlock_sha1_finup, |
237 | .final = padlock_sha1_final, | 254 | .final = padlock_sha1_final, |
255 | .export = padlock_sha_export, | ||
256 | .import = padlock_sha_import, | ||
238 | .descsize = sizeof(struct padlock_sha_desc), | 257 | .descsize = sizeof(struct padlock_sha_desc), |
258 | .statesize = sizeof(struct sha1_state), | ||
239 | .base = { | 259 | .base = { |
240 | .cra_name = "sha1", | 260 | .cra_name = "sha1", |
241 | .cra_driver_name = "sha1-padlock", | 261 | .cra_driver_name = "sha1-padlock", |
@@ -256,7 +276,10 @@ static struct shash_alg sha256_alg = { | |||
256 | .update = padlock_sha_update, | 276 | .update = padlock_sha_update, |
257 | .finup = padlock_sha256_finup, | 277 | .finup = padlock_sha256_finup, |
258 | .final = padlock_sha256_final, | 278 | .final = padlock_sha256_final, |
279 | .export = padlock_sha_export, | ||
280 | .import = padlock_sha_import, | ||
259 | .descsize = sizeof(struct padlock_sha_desc), | 281 | .descsize = sizeof(struct padlock_sha_desc), |
282 | .statesize = sizeof(struct sha256_state), | ||
260 | .base = { | 283 | .base = { |
261 | .cra_name = "sha256", | 284 | .cra_name = "sha256", |
262 | .cra_driver_name = "sha256-padlock", | 285 | .cra_driver_name = "sha256-padlock", |
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 96eddd17e050..305c59003963 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
@@ -66,6 +66,8 @@ config DRM_RADEON | |||
66 | 66 | ||
67 | If M is selected, the module will be called radeon. | 67 | If M is selected, the module will be called radeon. |
68 | 68 | ||
69 | source "drivers/gpu/drm/radeon/Kconfig" | ||
70 | |||
69 | config DRM_I810 | 71 | config DRM_I810 |
70 | tristate "Intel I810" | 72 | tristate "Intel I810" |
71 | depends on DRM && AGP && AGP_INTEL | 73 | depends on DRM && AGP && AGP_INTEL |
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 3eb0ca5b3d73..71060114d5de 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c | |||
@@ -468,7 +468,7 @@ void radeon_dp_set_link_config(struct drm_connector *connector, | |||
468 | struct radeon_connector *radeon_connector; | 468 | struct radeon_connector *radeon_connector; |
469 | struct radeon_connector_atom_dig *dig_connector; | 469 | struct radeon_connector_atom_dig *dig_connector; |
470 | 470 | ||
471 | if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) || | 471 | if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) && |
472 | (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) | 472 | (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) |
473 | return; | 473 | return; |
474 | 474 | ||
@@ -583,7 +583,7 @@ void dp_link_train(struct drm_encoder *encoder, | |||
583 | u8 train_set[4]; | 583 | u8 train_set[4]; |
584 | int i; | 584 | int i; |
585 | 585 | ||
586 | if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) || | 586 | if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) && |
587 | (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) | 587 | (connector->connector_type != DRM_MODE_CONNECTOR_eDP)) |
588 | return; | 588 | return; |
589 | 589 | ||
@@ -596,21 +596,14 @@ void dp_link_train(struct drm_encoder *encoder, | |||
596 | return; | 596 | return; |
597 | dig_connector = radeon_connector->con_priv; | 597 | dig_connector = radeon_connector->con_priv; |
598 | 598 | ||
599 | if (ASIC_IS_DCE32(rdev)) { | 599 | if (dig->dig_encoder) |
600 | if (dig->dig_block) | 600 | enc_id |= ATOM_DP_CONFIG_DIG2_ENCODER; |
601 | enc_id |= ATOM_DP_CONFIG_DIG2_ENCODER; | 601 | else |
602 | else | 602 | enc_id |= ATOM_DP_CONFIG_DIG1_ENCODER; |
603 | enc_id |= ATOM_DP_CONFIG_DIG1_ENCODER; | 603 | if (dig_connector->linkb) |
604 | if (dig_connector->linkb) | 604 | enc_id |= ATOM_DP_CONFIG_LINK_B; |
605 | enc_id |= ATOM_DP_CONFIG_LINK_B; | 605 | else |
606 | else | 606 | enc_id |= ATOM_DP_CONFIG_LINK_A; |
607 | enc_id |= ATOM_DP_CONFIG_LINK_A; | ||
608 | } else { | ||
609 | if (dig_connector->linkb) | ||
610 | enc_id |= ATOM_DP_CONFIG_DIG2_ENCODER | ATOM_DP_CONFIG_LINK_B; | ||
611 | else | ||
612 | enc_id |= ATOM_DP_CONFIG_DIG1_ENCODER | ATOM_DP_CONFIG_LINK_A; | ||
613 | } | ||
614 | 607 | ||
615 | memset(link_configuration, 0, DP_LINK_CONFIGURATION_SIZE); | 608 | memset(link_configuration, 0, DP_LINK_CONFIGURATION_SIZE); |
616 | if (dig_connector->dp_clock == 270000) | 609 | if (dig_connector->dp_clock == 270000) |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index da9aa3c31bcf..1b6d0001b20e 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -1788,23 +1788,24 @@ void r600_fence_ring_emit(struct radeon_device *rdev, | |||
1788 | radeon_ring_write(rdev, RB_INT_STAT); | 1788 | radeon_ring_write(rdev, RB_INT_STAT); |
1789 | } | 1789 | } |
1790 | 1790 | ||
1791 | int r600_copy_dma(struct radeon_device *rdev, | ||
1792 | uint64_t src_offset, | ||
1793 | uint64_t dst_offset, | ||
1794 | unsigned num_pages, | ||
1795 | struct radeon_fence *fence) | ||
1796 | { | ||
1797 | /* FIXME: implement */ | ||
1798 | return 0; | ||
1799 | } | ||
1800 | |||
1801 | int r600_copy_blit(struct radeon_device *rdev, | 1791 | int r600_copy_blit(struct radeon_device *rdev, |
1802 | uint64_t src_offset, uint64_t dst_offset, | 1792 | uint64_t src_offset, uint64_t dst_offset, |
1803 | unsigned num_pages, struct radeon_fence *fence) | 1793 | unsigned num_pages, struct radeon_fence *fence) |
1804 | { | 1794 | { |
1805 | r600_blit_prepare_copy(rdev, num_pages * RADEON_GPU_PAGE_SIZE); | 1795 | int r; |
1796 | |||
1797 | mutex_lock(&rdev->r600_blit.mutex); | ||
1798 | rdev->r600_blit.vb_ib = NULL; | ||
1799 | r = r600_blit_prepare_copy(rdev, num_pages * RADEON_GPU_PAGE_SIZE); | ||
1800 | if (r) { | ||
1801 | if (rdev->r600_blit.vb_ib) | ||
1802 | radeon_ib_free(rdev, &rdev->r600_blit.vb_ib); | ||
1803 | mutex_unlock(&rdev->r600_blit.mutex); | ||
1804 | return r; | ||
1805 | } | ||
1806 | r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages * RADEON_GPU_PAGE_SIZE); | 1806 | r600_kms_blit_copy(rdev, src_offset, dst_offset, num_pages * RADEON_GPU_PAGE_SIZE); |
1807 | r600_blit_done_copy(rdev, fence); | 1807 | r600_blit_done_copy(rdev, fence); |
1808 | mutex_unlock(&rdev->r600_blit.mutex); | ||
1808 | return 0; | 1809 | return 0; |
1809 | } | 1810 | } |
1810 | 1811 | ||
@@ -1860,26 +1861,19 @@ int r600_startup(struct radeon_device *rdev) | |||
1860 | return r; | 1861 | return r; |
1861 | } | 1862 | } |
1862 | r600_gpu_init(rdev); | 1863 | r600_gpu_init(rdev); |
1863 | 1864 | /* pin copy shader into vram */ | |
1864 | if (!rdev->r600_blit.shader_obj) { | 1865 | if (rdev->r600_blit.shader_obj) { |
1865 | r = r600_blit_init(rdev); | 1866 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); |
1867 | if (unlikely(r != 0)) | ||
1868 | return r; | ||
1869 | r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM, | ||
1870 | &rdev->r600_blit.shader_gpu_addr); | ||
1871 | radeon_bo_unreserve(rdev->r600_blit.shader_obj); | ||
1866 | if (r) { | 1872 | if (r) { |
1867 | DRM_ERROR("radeon: failed blitter (%d).\n", r); | 1873 | dev_err(rdev->dev, "(%d) pin blit object failed\n", r); |
1868 | return r; | 1874 | return r; |
1869 | } | 1875 | } |
1870 | } | 1876 | } |
1871 | |||
1872 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); | ||
1873 | if (unlikely(r != 0)) | ||
1874 | return r; | ||
1875 | r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM, | ||
1876 | &rdev->r600_blit.shader_gpu_addr); | ||
1877 | radeon_bo_unreserve(rdev->r600_blit.shader_obj); | ||
1878 | if (r) { | ||
1879 | dev_err(rdev->dev, "(%d) pin blit object failed\n", r); | ||
1880 | return r; | ||
1881 | } | ||
1882 | |||
1883 | /* Enable IRQ */ | 1877 | /* Enable IRQ */ |
1884 | r = r600_irq_init(rdev); | 1878 | r = r600_irq_init(rdev); |
1885 | if (r) { | 1879 | if (r) { |
@@ -2051,6 +2045,12 @@ int r600_init(struct radeon_device *rdev) | |||
2051 | r = r600_pcie_gart_init(rdev); | 2045 | r = r600_pcie_gart_init(rdev); |
2052 | if (r) | 2046 | if (r) |
2053 | return r; | 2047 | return r; |
2048 | r = r600_blit_init(rdev); | ||
2049 | if (r) { | ||
2050 | r600_blit_fini(rdev); | ||
2051 | rdev->asic->copy = NULL; | ||
2052 | dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); | ||
2053 | } | ||
2054 | 2054 | ||
2055 | rdev->accel_working = true; | 2055 | rdev->accel_working = true; |
2056 | r = r600_startup(rdev); | 2056 | r = r600_startup(rdev); |
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index 2bedce477a97..af1c3ca8a4cb 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c | |||
@@ -449,6 +449,7 @@ int r600_blit_init(struct radeon_device *rdev) | |||
449 | u32 packet2s[16]; | 449 | u32 packet2s[16]; |
450 | int num_packet2s = 0; | 450 | int num_packet2s = 0; |
451 | 451 | ||
452 | mutex_init(&rdev->r600_blit.mutex); | ||
452 | rdev->r600_blit.state_offset = 0; | 453 | rdev->r600_blit.state_offset = 0; |
453 | 454 | ||
454 | if (rdev->family >= CHIP_RV770) | 455 | if (rdev->family >= CHIP_RV770) |
@@ -557,7 +558,8 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes) | |||
557 | int dwords_per_loop = 76, num_loops; | 558 | int dwords_per_loop = 76, num_loops; |
558 | 559 | ||
559 | r = r600_vb_ib_get(rdev); | 560 | r = r600_vb_ib_get(rdev); |
560 | WARN_ON(r); | 561 | if (r) |
562 | return r; | ||
561 | 563 | ||
562 | /* set_render_target emits 2 extra dwords on rv6xx */ | 564 | /* set_render_target emits 2 extra dwords on rv6xx */ |
563 | if (rdev->family > CHIP_R600 && rdev->family < CHIP_RV770) | 565 | if (rdev->family > CHIP_R600 && rdev->family < CHIP_RV770) |
@@ -583,7 +585,8 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes) | |||
583 | ring_size += 5; /* done copy */ | 585 | ring_size += 5; /* done copy */ |
584 | ring_size += 7; /* fence emit for done copy */ | 586 | ring_size += 7; /* fence emit for done copy */ |
585 | r = radeon_ring_lock(rdev, ring_size); | 587 | r = radeon_ring_lock(rdev, ring_size); |
586 | WARN_ON(r); | 588 | if (r) |
589 | return r; | ||
587 | 590 | ||
588 | set_default_state(rdev); /* 14 */ | 591 | set_default_state(rdev); /* 14 */ |
589 | set_shaders(rdev); /* 26 */ | 592 | set_shaders(rdev); /* 26 */ |
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index f7df1a7e4413..2d5f2bfa7201 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -416,6 +416,7 @@ struct r600_ih { | |||
416 | }; | 416 | }; |
417 | 417 | ||
418 | struct r600_blit { | 418 | struct r600_blit { |
419 | struct mutex mutex; | ||
419 | struct radeon_bo *shader_obj; | 420 | struct radeon_bo *shader_obj; |
420 | u64 shader_gpu_addr; | 421 | u64 shader_gpu_addr; |
421 | u32 vs_offset, ps_offset; | 422 | u32 vs_offset, ps_offset; |
diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c index c9ad7f5cc1ac..c0681a5556dc 100644 --- a/drivers/gpu/drm/radeon/radeon_agp.c +++ b/drivers/gpu/drm/radeon/radeon_agp.c | |||
@@ -133,13 +133,6 @@ int radeon_agp_init(struct radeon_device *rdev) | |||
133 | bool is_v3; | 133 | bool is_v3; |
134 | int ret; | 134 | int ret; |
135 | 135 | ||
136 | if (rdev->ddev->agp->agp_info.aper_size < 32) { | ||
137 | dev_warn(rdev->dev, "AGP aperture to small (%dM) " | ||
138 | "need at least 32M, disabling AGP\n", | ||
139 | rdev->ddev->agp->agp_info.aper_size); | ||
140 | return -EINVAL; | ||
141 | } | ||
142 | |||
143 | /* Acquire AGP. */ | 136 | /* Acquire AGP. */ |
144 | if (!rdev->ddev->agp->acquired) { | 137 | if (!rdev->ddev->agp->acquired) { |
145 | ret = drm_agp_acquire(rdev->ddev); | 138 | ret = drm_agp_acquire(rdev->ddev); |
@@ -151,9 +144,19 @@ int radeon_agp_init(struct radeon_device *rdev) | |||
151 | 144 | ||
152 | ret = drm_agp_info(rdev->ddev, &info); | 145 | ret = drm_agp_info(rdev->ddev, &info); |
153 | if (ret) { | 146 | if (ret) { |
147 | drm_agp_release(rdev->ddev); | ||
154 | DRM_ERROR("Unable to get AGP info: %d\n", ret); | 148 | DRM_ERROR("Unable to get AGP info: %d\n", ret); |
155 | return ret; | 149 | return ret; |
156 | } | 150 | } |
151 | |||
152 | if (rdev->ddev->agp->agp_info.aper_size < 32) { | ||
153 | drm_agp_release(rdev->ddev); | ||
154 | dev_warn(rdev->dev, "AGP aperture too small (%zuM) " | ||
155 | "need at least 32M, disabling AGP\n", | ||
156 | rdev->ddev->agp->agp_info.aper_size); | ||
157 | return -EINVAL; | ||
158 | } | ||
159 | |||
157 | mode.mode = info.mode; | 160 | mode.mode = info.mode; |
158 | agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode; | 161 | agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode; |
159 | is_v3 = !!(agp_status & RADEON_AGPv3_MODE); | 162 | is_v3 = !!(agp_status & RADEON_AGPv3_MODE); |
@@ -228,6 +231,7 @@ int radeon_agp_init(struct radeon_device *rdev) | |||
228 | ret = drm_agp_enable(rdev->ddev, mode); | 231 | ret = drm_agp_enable(rdev->ddev, mode); |
229 | if (ret) { | 232 | if (ret) { |
230 | DRM_ERROR("Unable to enable AGP (mode = 0x%lx)\n", mode.mode); | 233 | DRM_ERROR("Unable to enable AGP (mode = 0x%lx)\n", mode.mode); |
234 | drm_agp_release(rdev->ddev); | ||
231 | return ret; | 235 | return ret; |
232 | } | 236 | } |
233 | 237 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 1496cb8658ef..1190148cf5e6 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
@@ -189,7 +189,7 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error) | |||
189 | { | 189 | { |
190 | unsigned i; | 190 | unsigned i; |
191 | 191 | ||
192 | if (error) { | 192 | if (error && parser->ib) { |
193 | radeon_bo_list_unvalidate(&parser->validated, | 193 | radeon_bo_list_unvalidate(&parser->validated, |
194 | parser->ib->fence); | 194 | parser->ib->fence); |
195 | } else { | 195 | } else { |
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 82eb551970b9..3c91724457ca 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c | |||
@@ -156,6 +156,26 @@ radeon_get_encoder_id(struct drm_device *dev, uint32_t supported_device, uint8_t | |||
156 | return ret; | 156 | return ret; |
157 | } | 157 | } |
158 | 158 | ||
159 | static inline bool radeon_encoder_is_digital(struct drm_encoder *encoder) | ||
160 | { | ||
161 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | ||
162 | switch (radeon_encoder->encoder_id) { | ||
163 | case ENCODER_OBJECT_ID_INTERNAL_LVDS: | ||
164 | case ENCODER_OBJECT_ID_INTERNAL_TMDS1: | ||
165 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: | ||
166 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: | ||
167 | case ENCODER_OBJECT_ID_INTERNAL_DVO1: | ||
168 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: | ||
169 | case ENCODER_OBJECT_ID_INTERNAL_DDI: | ||
170 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | ||
171 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: | ||
172 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: | ||
173 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: | ||
174 | return true; | ||
175 | default: | ||
176 | return false; | ||
177 | } | ||
178 | } | ||
159 | void | 179 | void |
160 | radeon_link_encoder_connector(struct drm_device *dev) | 180 | radeon_link_encoder_connector(struct drm_device *dev) |
161 | { | 181 | { |
@@ -202,7 +222,7 @@ radeon_get_connector_for_encoder(struct drm_encoder *encoder) | |||
202 | 222 | ||
203 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 223 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
204 | radeon_connector = to_radeon_connector(connector); | 224 | radeon_connector = to_radeon_connector(connector); |
205 | if (radeon_encoder->devices & radeon_connector->devices) | 225 | if (radeon_encoder->active_device & radeon_connector->devices) |
206 | return connector; | 226 | return connector; |
207 | } | 227 | } |
208 | return NULL; | 228 | return NULL; |
@@ -676,31 +696,11 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action) | |||
676 | 696 | ||
677 | memset(&args, 0, sizeof(args)); | 697 | memset(&args, 0, sizeof(args)); |
678 | 698 | ||
679 | if (ASIC_IS_DCE32(rdev)) { | 699 | if (dig->dig_encoder) |
680 | if (dig->dig_block) | 700 | index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl); |
681 | index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl); | 701 | else |
682 | else | 702 | index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl); |
683 | index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl); | 703 | num = dig->dig_encoder + 1; |
684 | num = dig->dig_block + 1; | ||
685 | } else { | ||
686 | switch (radeon_encoder->encoder_id) { | ||
687 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | ||
688 | /* XXX doesn't really matter which dig encoder we pick as long as it's | ||
689 | * not already in use | ||
690 | */ | ||
691 | if (dig_connector->linkb) | ||
692 | index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl); | ||
693 | else | ||
694 | index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl); | ||
695 | num = 1; | ||
696 | break; | ||
697 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: | ||
698 | /* Only dig2 encoder can drive LVTMA */ | ||
699 | index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl); | ||
700 | num = 2; | ||
701 | break; | ||
702 | } | ||
703 | } | ||
704 | 704 | ||
705 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 705 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); |
706 | 706 | ||
@@ -822,7 +822,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
822 | args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); | 822 | args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); |
823 | } | 823 | } |
824 | if (ASIC_IS_DCE32(rdev)) { | 824 | if (ASIC_IS_DCE32(rdev)) { |
825 | if (dig->dig_block) | 825 | if (dig->dig_encoder == 1) |
826 | args.v2.acConfig.ucEncoderSel = 1; | 826 | args.v2.acConfig.ucEncoderSel = 1; |
827 | if (dig_connector->linkb) | 827 | if (dig_connector->linkb) |
828 | args.v2.acConfig.ucLinkSel = 1; | 828 | args.v2.acConfig.ucLinkSel = 1; |
@@ -849,17 +849,16 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
849 | args.v2.acConfig.fCoherentMode = 1; | 849 | args.v2.acConfig.fCoherentMode = 1; |
850 | } | 850 | } |
851 | } else { | 851 | } else { |
852 | |||
852 | args.v1.ucConfig = ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL; | 853 | args.v1.ucConfig = ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL; |
853 | 854 | ||
855 | if (dig->dig_encoder) | ||
856 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER; | ||
857 | else | ||
858 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER; | ||
859 | |||
854 | switch (radeon_encoder->encoder_id) { | 860 | switch (radeon_encoder->encoder_id) { |
855 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | 861 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: |
856 | /* XXX doesn't really matter which dig encoder we pick as long as it's | ||
857 | * not already in use | ||
858 | */ | ||
859 | if (dig_connector->linkb) | ||
860 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER; | ||
861 | else | ||
862 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER; | ||
863 | if (rdev->flags & RADEON_IS_IGP) { | 862 | if (rdev->flags & RADEON_IS_IGP) { |
864 | if (radeon_encoder->pixel_clock > 165000) { | 863 | if (radeon_encoder->pixel_clock > 165000) { |
865 | if (dig_connector->igp_lane_info & 0x3) | 864 | if (dig_connector->igp_lane_info & 0x3) |
@@ -878,10 +877,6 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
878 | } | 877 | } |
879 | } | 878 | } |
880 | break; | 879 | break; |
881 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: | ||
882 | /* Only dig2 encoder can drive LVTMA */ | ||
883 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER; | ||
884 | break; | ||
885 | } | 880 | } |
886 | 881 | ||
887 | if (radeon_encoder->pixel_clock > 165000) | 882 | if (radeon_encoder->pixel_clock > 165000) |
@@ -1046,6 +1041,7 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder) | |||
1046 | union crtc_sourc_param args; | 1041 | union crtc_sourc_param args; |
1047 | int index = GetIndexIntoMasterTable(COMMAND, SelectCRTC_Source); | 1042 | int index = GetIndexIntoMasterTable(COMMAND, SelectCRTC_Source); |
1048 | uint8_t frev, crev; | 1043 | uint8_t frev, crev; |
1044 | struct radeon_encoder_atom_dig *dig; | ||
1049 | 1045 | ||
1050 | memset(&args, 0, sizeof(args)); | 1046 | memset(&args, 0, sizeof(args)); |
1051 | 1047 | ||
@@ -1109,40 +1105,16 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder) | |||
1109 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | 1105 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: |
1110 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: | 1106 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: |
1111 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: | 1107 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: |
1112 | if (ASIC_IS_DCE32(rdev)) { | 1108 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: |
1113 | if (radeon_crtc->crtc_id) | 1109 | dig = radeon_encoder->enc_priv; |
1114 | args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID; | 1110 | if (dig->dig_encoder) |
1115 | else | 1111 | args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID; |
1116 | args.v2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID; | 1112 | else |
1117 | } else { | 1113 | args.v2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID; |
1118 | struct drm_connector *connector; | ||
1119 | struct radeon_connector *radeon_connector; | ||
1120 | struct radeon_connector_atom_dig *dig_connector; | ||
1121 | |||
1122 | connector = radeon_get_connector_for_encoder(encoder); | ||
1123 | if (!connector) | ||
1124 | return; | ||
1125 | radeon_connector = to_radeon_connector(connector); | ||
1126 | if (!radeon_connector->con_priv) | ||
1127 | return; | ||
1128 | dig_connector = radeon_connector->con_priv; | ||
1129 | |||
1130 | /* XXX doesn't really matter which dig encoder we pick as long as it's | ||
1131 | * not already in use | ||
1132 | */ | ||
1133 | if (dig_connector->linkb) | ||
1134 | args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID; | ||
1135 | else | ||
1136 | args.v2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID; | ||
1137 | } | ||
1138 | break; | 1114 | break; |
1139 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: | 1115 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: |
1140 | args.v2.ucEncoderID = ASIC_INT_DVO_ENCODER_ID; | 1116 | args.v2.ucEncoderID = ASIC_INT_DVO_ENCODER_ID; |
1141 | break; | 1117 | break; |
1142 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: | ||
1143 | /* Only dig2 encoder can drive LVTMA */ | ||
1144 | args.v2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID; | ||
1145 | break; | ||
1146 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: | 1118 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: |
1147 | if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT)) | 1119 | if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT)) |
1148 | args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID; | 1120 | args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID; |
@@ -1202,6 +1174,47 @@ atombios_apply_encoder_quirks(struct drm_encoder *encoder, | |||
1202 | } | 1174 | } |
1203 | } | 1175 | } |
1204 | 1176 | ||
1177 | static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder) | ||
1178 | { | ||
1179 | struct drm_device *dev = encoder->dev; | ||
1180 | struct radeon_device *rdev = dev->dev_private; | ||
1181 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); | ||
1182 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | ||
1183 | struct drm_encoder *test_encoder; | ||
1184 | struct radeon_encoder_atom_dig *dig; | ||
1185 | uint32_t dig_enc_in_use = 0; | ||
1186 | /* on DCE32 and encoder can driver any block so just crtc id */ | ||
1187 | if (ASIC_IS_DCE32(rdev)) { | ||
1188 | return radeon_crtc->crtc_id; | ||
1189 | } | ||
1190 | |||
1191 | /* on DCE3 - LVTMA can only be driven by DIGB */ | ||
1192 | list_for_each_entry(test_encoder, &dev->mode_config.encoder_list, head) { | ||
1193 | struct radeon_encoder *radeon_test_encoder; | ||
1194 | |||
1195 | if (encoder == test_encoder) | ||
1196 | continue; | ||
1197 | |||
1198 | if (!radeon_encoder_is_digital(test_encoder)) | ||
1199 | continue; | ||
1200 | |||
1201 | radeon_test_encoder = to_radeon_encoder(test_encoder); | ||
1202 | dig = radeon_test_encoder->enc_priv; | ||
1203 | |||
1204 | if (dig->dig_encoder >= 0) | ||
1205 | dig_enc_in_use |= (1 << dig->dig_encoder); | ||
1206 | } | ||
1207 | |||
1208 | if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA) { | ||
1209 | if (dig_enc_in_use & 0x2) | ||
1210 | DRM_ERROR("LVDS required digital encoder 2 but it was in use - stealing\n"); | ||
1211 | return 1; | ||
1212 | } | ||
1213 | if (!(dig_enc_in_use & 1)) | ||
1214 | return 0; | ||
1215 | return 1; | ||
1216 | } | ||
1217 | |||
1205 | static void | 1218 | static void |
1206 | radeon_atom_encoder_mode_set(struct drm_encoder *encoder, | 1219 | radeon_atom_encoder_mode_set(struct drm_encoder *encoder, |
1207 | struct drm_display_mode *mode, | 1220 | struct drm_display_mode *mode, |
@@ -1214,12 +1227,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, | |||
1214 | 1227 | ||
1215 | if (radeon_encoder->active_device & | 1228 | if (radeon_encoder->active_device & |
1216 | (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) { | 1229 | (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) { |
1217 | if (radeon_encoder->enc_priv) { | 1230 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; |
1218 | struct radeon_encoder_atom_dig *dig; | 1231 | if (dig) |
1219 | 1232 | dig->dig_encoder = radeon_atom_pick_dig_encoder(encoder); | |
1220 | dig = radeon_encoder->enc_priv; | ||
1221 | dig->dig_block = radeon_crtc->crtc_id; | ||
1222 | } | ||
1223 | } | 1233 | } |
1224 | radeon_encoder->pixel_clock = adjusted_mode->clock; | 1234 | radeon_encoder->pixel_clock = adjusted_mode->clock; |
1225 | 1235 | ||
@@ -1379,7 +1389,13 @@ static void radeon_atom_encoder_commit(struct drm_encoder *encoder) | |||
1379 | static void radeon_atom_encoder_disable(struct drm_encoder *encoder) | 1389 | static void radeon_atom_encoder_disable(struct drm_encoder *encoder) |
1380 | { | 1390 | { |
1381 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 1391 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
1392 | struct radeon_encoder_atom_dig *dig; | ||
1382 | radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); | 1393 | radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); |
1394 | |||
1395 | if (radeon_encoder_is_digital(encoder)) { | ||
1396 | dig = radeon_encoder->enc_priv; | ||
1397 | dig->dig_encoder = -1; | ||
1398 | } | ||
1383 | radeon_encoder->active_device = 0; | 1399 | radeon_encoder->active_device = 0; |
1384 | } | 1400 | } |
1385 | 1401 | ||
@@ -1436,6 +1452,7 @@ radeon_atombios_set_dig_info(struct radeon_encoder *radeon_encoder) | |||
1436 | 1452 | ||
1437 | /* coherent mode by default */ | 1453 | /* coherent mode by default */ |
1438 | dig->coherent_mode = true; | 1454 | dig->coherent_mode = true; |
1455 | dig->dig_encoder = -1; | ||
1439 | 1456 | ||
1440 | return dig; | 1457 | return dig; |
1441 | } | 1458 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 96b851f92f4c..e81b2aeb6a8f 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h | |||
@@ -299,7 +299,7 @@ struct radeon_atom_ss { | |||
299 | struct radeon_encoder_atom_dig { | 299 | struct radeon_encoder_atom_dig { |
300 | /* atom dig */ | 300 | /* atom dig */ |
301 | bool coherent_mode; | 301 | bool coherent_mode; |
302 | int dig_block; | 302 | int dig_encoder; /* -1 disabled, 0 DIGA, 1 DIGB */ |
303 | /* atom lvds */ | 303 | /* atom lvds */ |
304 | uint32_t lvds_misc; | 304 | uint32_t lvds_misc; |
305 | uint16_t panel_pwr_delay; | 305 | uint16_t panel_pwr_delay; |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 55f6ffc4e58b..afd9e8213c29 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -887,26 +887,19 @@ static int rv770_startup(struct radeon_device *rdev) | |||
887 | return r; | 887 | return r; |
888 | } | 888 | } |
889 | rv770_gpu_init(rdev); | 889 | rv770_gpu_init(rdev); |
890 | 890 | /* pin copy shader into vram */ | |
891 | if (!rdev->r600_blit.shader_obj) { | 891 | if (rdev->r600_blit.shader_obj) { |
892 | r = r600_blit_init(rdev); | 892 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); |
893 | if (unlikely(r != 0)) | ||
894 | return r; | ||
895 | r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM, | ||
896 | &rdev->r600_blit.shader_gpu_addr); | ||
897 | radeon_bo_unreserve(rdev->r600_blit.shader_obj); | ||
893 | if (r) { | 898 | if (r) { |
894 | DRM_ERROR("radeon: failed blitter (%d).\n", r); | 899 | DRM_ERROR("failed to pin blit object %d\n", r); |
895 | return r; | 900 | return r; |
896 | } | 901 | } |
897 | } | 902 | } |
898 | |||
899 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); | ||
900 | if (unlikely(r != 0)) | ||
901 | return r; | ||
902 | r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM, | ||
903 | &rdev->r600_blit.shader_gpu_addr); | ||
904 | radeon_bo_unreserve(rdev->r600_blit.shader_obj); | ||
905 | if (r) { | ||
906 | DRM_ERROR("failed to pin blit object %d\n", r); | ||
907 | return r; | ||
908 | } | ||
909 | |||
910 | /* Enable IRQ */ | 903 | /* Enable IRQ */ |
911 | r = r600_irq_init(rdev); | 904 | r = r600_irq_init(rdev); |
912 | if (r) { | 905 | if (r) { |
@@ -1062,6 +1055,12 @@ int rv770_init(struct radeon_device *rdev) | |||
1062 | r = r600_pcie_gart_init(rdev); | 1055 | r = r600_pcie_gart_init(rdev); |
1063 | if (r) | 1056 | if (r) |
1064 | return r; | 1057 | return r; |
1058 | r = r600_blit_init(rdev); | ||
1059 | if (r) { | ||
1060 | r600_blit_fini(rdev); | ||
1061 | rdev->asic->copy = NULL; | ||
1062 | dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); | ||
1063 | } | ||
1065 | 1064 | ||
1066 | rdev->accel_working = true; | 1065 | rdev->accel_working = true; |
1067 | r = rv770_startup(rdev); | 1066 | r = rv770_startup(rdev); |
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 2ecf7d0c64f6..5ca37a58a98c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c | |||
@@ -53,7 +53,6 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, | |||
53 | { | 53 | { |
54 | struct ttm_tt *ttm = bo->ttm; | 54 | struct ttm_tt *ttm = bo->ttm; |
55 | struct ttm_mem_reg *old_mem = &bo->mem; | 55 | struct ttm_mem_reg *old_mem = &bo->mem; |
56 | uint32_t save_flags = old_mem->placement; | ||
57 | int ret; | 56 | int ret; |
58 | 57 | ||
59 | if (old_mem->mem_type != TTM_PL_SYSTEM) { | 58 | if (old_mem->mem_type != TTM_PL_SYSTEM) { |
@@ -62,7 +61,6 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, | |||
62 | ttm_flag_masked(&old_mem->placement, TTM_PL_FLAG_SYSTEM, | 61 | ttm_flag_masked(&old_mem->placement, TTM_PL_FLAG_SYSTEM, |
63 | TTM_PL_MASK_MEM); | 62 | TTM_PL_MASK_MEM); |
64 | old_mem->mem_type = TTM_PL_SYSTEM; | 63 | old_mem->mem_type = TTM_PL_SYSTEM; |
65 | save_flags = old_mem->placement; | ||
66 | } | 64 | } |
67 | 65 | ||
68 | ret = ttm_tt_set_placement_caching(ttm, new_mem->placement); | 66 | ret = ttm_tt_set_placement_caching(ttm, new_mem->placement); |
@@ -77,7 +75,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, | |||
77 | 75 | ||
78 | *old_mem = *new_mem; | 76 | *old_mem = *new_mem; |
79 | new_mem->mm_node = NULL; | 77 | new_mem->mm_node = NULL; |
80 | ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE); | 78 | |
81 | return 0; | 79 | return 0; |
82 | } | 80 | } |
83 | EXPORT_SYMBOL(ttm_bo_move_ttm); | 81 | EXPORT_SYMBOL(ttm_bo_move_ttm); |
@@ -219,7 +217,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, | |||
219 | void *old_iomap; | 217 | void *old_iomap; |
220 | void *new_iomap; | 218 | void *new_iomap; |
221 | int ret; | 219 | int ret; |
222 | uint32_t save_flags = old_mem->placement; | ||
223 | unsigned long i; | 220 | unsigned long i; |
224 | unsigned long page; | 221 | unsigned long page; |
225 | unsigned long add = 0; | 222 | unsigned long add = 0; |
@@ -270,7 +267,6 @@ out2: | |||
270 | 267 | ||
271 | *old_mem = *new_mem; | 268 | *old_mem = *new_mem; |
272 | new_mem->mm_node = NULL; | 269 | new_mem->mm_node = NULL; |
273 | ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE); | ||
274 | 270 | ||
275 | if ((man->flags & TTM_MEMTYPE_FLAG_FIXED) && (ttm != NULL)) { | 271 | if ((man->flags & TTM_MEMTYPE_FLAG_FIXED) && (ttm != NULL)) { |
276 | ttm_tt_unbind(ttm); | 272 | ttm_tt_unbind(ttm); |
@@ -537,7 +533,6 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, | |||
537 | struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type]; | 533 | struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type]; |
538 | struct ttm_mem_reg *old_mem = &bo->mem; | 534 | struct ttm_mem_reg *old_mem = &bo->mem; |
539 | int ret; | 535 | int ret; |
540 | uint32_t save_flags = old_mem->placement; | ||
541 | struct ttm_buffer_object *ghost_obj; | 536 | struct ttm_buffer_object *ghost_obj; |
542 | void *tmp_obj = NULL; | 537 | void *tmp_obj = NULL; |
543 | 538 | ||
@@ -598,7 +593,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, | |||
598 | 593 | ||
599 | *old_mem = *new_mem; | 594 | *old_mem = *new_mem; |
600 | new_mem->mm_node = NULL; | 595 | new_mem->mm_node = NULL; |
601 | ttm_flag_masked(&save_flags, new_mem->placement, TTM_PL_MASK_MEMTYPE); | 596 | |
602 | return 0; | 597 | return 0; |
603 | } | 598 | } |
604 | EXPORT_SYMBOL(ttm_bo_move_accel_cleanup); | 599 | EXPORT_SYMBOL(ttm_bo_move_accel_cleanup); |
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index 1099abac824b..75e9d6f86ba4 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c | |||
@@ -109,8 +109,8 @@ struct ttm_ref_object { | |||
109 | struct drm_hash_item hash; | 109 | struct drm_hash_item hash; |
110 | struct list_head head; | 110 | struct list_head head; |
111 | struct kref kref; | 111 | struct kref kref; |
112 | struct ttm_base_object *obj; | ||
113 | enum ttm_ref_type ref_type; | 112 | enum ttm_ref_type ref_type; |
113 | struct ttm_base_object *obj; | ||
114 | struct ttm_object_file *tfile; | 114 | struct ttm_object_file *tfile; |
115 | }; | 115 | }; |
116 | 116 | ||
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 9c2b1cc5dba5..e2123af7775a 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
@@ -198,17 +198,26 @@ EXPORT_SYMBOL(ttm_tt_populate); | |||
198 | static inline int ttm_tt_set_page_caching(struct page *p, | 198 | static inline int ttm_tt_set_page_caching(struct page *p, |
199 | enum ttm_caching_state c_state) | 199 | enum ttm_caching_state c_state) |
200 | { | 200 | { |
201 | int ret = 0; | ||
202 | |||
201 | if (PageHighMem(p)) | 203 | if (PageHighMem(p)) |
202 | return 0; | 204 | return 0; |
203 | 205 | ||
204 | switch (c_state) { | 206 | if (get_page_memtype(p) != -1) { |
205 | case tt_cached: | 207 | /* p isn't in the default caching state, set it to |
206 | return set_pages_wb(p, 1); | 208 | * writeback first to free its current memtype. */ |
207 | case tt_wc: | 209 | |
208 | return set_memory_wc((unsigned long) page_address(p), 1); | 210 | ret = set_pages_wb(p, 1); |
209 | default: | 211 | if (ret) |
210 | return set_pages_uc(p, 1); | 212 | return ret; |
211 | } | 213 | } |
214 | |||
215 | if (c_state == tt_wc) | ||
216 | ret = set_memory_wc((unsigned long) page_address(p), 1); | ||
217 | else if (c_state == tt_uncached) | ||
218 | ret = set_pages_uc(p, 1); | ||
219 | |||
220 | return ret; | ||
212 | } | 221 | } |
213 | #else /* CONFIG_X86 */ | 222 | #else /* CONFIG_X86 */ |
214 | static inline int ttm_tt_set_page_caching(struct page *p, | 223 | static inline int ttm_tt_set_page_caching(struct page *p, |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index dedd121d8fe7..a6e8f687fa64 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -209,6 +209,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) | |||
209 | { | 209 | { |
210 | struct vmw_private *dev_priv; | 210 | struct vmw_private *dev_priv; |
211 | int ret; | 211 | int ret; |
212 | uint32_t svga_id; | ||
212 | 213 | ||
213 | dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL); | 214 | dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL); |
214 | if (unlikely(dev_priv == NULL)) { | 215 | if (unlikely(dev_priv == NULL)) { |
@@ -239,6 +240,16 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) | |||
239 | dev_priv->mmio_start = pci_resource_start(dev->pdev, 2); | 240 | dev_priv->mmio_start = pci_resource_start(dev->pdev, 2); |
240 | 241 | ||
241 | mutex_lock(&dev_priv->hw_mutex); | 242 | mutex_lock(&dev_priv->hw_mutex); |
243 | |||
244 | vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2); | ||
245 | svga_id = vmw_read(dev_priv, SVGA_REG_ID); | ||
246 | if (svga_id != SVGA_ID_2) { | ||
247 | ret = -ENOSYS; | ||
248 | DRM_ERROR("Unsuported SVGA ID 0x%x\n", svga_id); | ||
249 | mutex_unlock(&dev_priv->hw_mutex); | ||
250 | goto out_err0; | ||
251 | } | ||
252 | |||
242 | dev_priv->capabilities = vmw_read(dev_priv, SVGA_REG_CAPABILITIES); | 253 | dev_priv->capabilities = vmw_read(dev_priv, SVGA_REG_CAPABILITIES); |
243 | 254 | ||
244 | if (dev_priv->capabilities & SVGA_CAP_GMR) { | 255 | if (dev_priv->capabilities & SVGA_CAP_GMR) { |
@@ -357,6 +368,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) | |||
357 | dev_priv->pm_nb.notifier_call = vmwgfx_pm_notifier; | 368 | dev_priv->pm_nb.notifier_call = vmwgfx_pm_notifier; |
358 | register_pm_notifier(&dev_priv->pm_nb); | 369 | register_pm_notifier(&dev_priv->pm_nb); |
359 | 370 | ||
371 | DRM_INFO("%s", vmw_fifo_have_3d(dev_priv) ? "Have 3D\n" : "No 3D\n"); | ||
372 | |||
360 | return 0; | 373 | return 0; |
361 | 374 | ||
362 | out_no_device: | 375 | out_no_device: |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 50529a7f06fb..135be9688c90 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |||
@@ -96,6 +96,8 @@ struct vmw_surface { | |||
96 | struct drm_vmw_size *sizes; | 96 | struct drm_vmw_size *sizes; |
97 | uint32_t num_sizes; | 97 | uint32_t num_sizes; |
98 | 98 | ||
99 | bool scanout; | ||
100 | |||
99 | /* TODO so far just a extra pointer */ | 101 | /* TODO so far just a extra pointer */ |
100 | struct vmw_cursor_snooper snooper; | 102 | struct vmw_cursor_snooper snooper; |
101 | }; | 103 | }; |
@@ -389,6 +391,7 @@ extern int vmw_fifo_send_fence(struct vmw_private *dev_priv, | |||
389 | uint32_t *sequence); | 391 | uint32_t *sequence); |
390 | extern void vmw_fifo_ping_host(struct vmw_private *dev_priv, uint32_t reason); | 392 | extern void vmw_fifo_ping_host(struct vmw_private *dev_priv, uint32_t reason); |
391 | extern int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma); | 393 | extern int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma); |
394 | extern bool vmw_fifo_have_3d(struct vmw_private *dev_priv); | ||
392 | 395 | ||
393 | /** | 396 | /** |
394 | * TTM glue - vmwgfx_ttm_glue.c | 397 | * TTM glue - vmwgfx_ttm_glue.c |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c index f7d5f70b52dd..4157547cc6e4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | |||
@@ -29,6 +29,25 @@ | |||
29 | #include "drmP.h" | 29 | #include "drmP.h" |
30 | #include "ttm/ttm_placement.h" | 30 | #include "ttm/ttm_placement.h" |
31 | 31 | ||
32 | bool vmw_fifo_have_3d(struct vmw_private *dev_priv) | ||
33 | { | ||
34 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; | ||
35 | uint32_t fifo_min, hwversion; | ||
36 | |||
37 | fifo_min = ioread32(fifo_mem + SVGA_FIFO_MIN); | ||
38 | if (fifo_min <= SVGA_FIFO_3D_HWVERSION * sizeof(unsigned int)) | ||
39 | return false; | ||
40 | |||
41 | hwversion = ioread32(fifo_mem + SVGA_FIFO_3D_HWVERSION); | ||
42 | if (hwversion == 0) | ||
43 | return false; | ||
44 | |||
45 | if (hwversion < SVGA3D_HWVERSION_WS65_B1) | ||
46 | return false; | ||
47 | |||
48 | return true; | ||
49 | } | ||
50 | |||
32 | int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) | 51 | int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) |
33 | { | 52 | { |
34 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; | 53 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c index 5fa6a4ed238a..778851f9f1d6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | |||
@@ -43,7 +43,7 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, | |||
43 | param->value = vmw_overlay_num_free_overlays(dev_priv); | 43 | param->value = vmw_overlay_num_free_overlays(dev_priv); |
44 | break; | 44 | break; |
45 | case DRM_VMW_PARAM_3D: | 45 | case DRM_VMW_PARAM_3D: |
46 | param->value = dev_priv->capabilities & SVGA_CAP_3D ? 1 : 0; | 46 | param->value = vmw_fifo_have_3d(dev_priv) ? 1 : 0; |
47 | break; | 47 | break; |
48 | case DRM_VMW_PARAM_FIFO_OFFSET: | 48 | case DRM_VMW_PARAM_FIFO_OFFSET: |
49 | param->value = dev_priv->mmio_start; | 49 | param->value = dev_priv->mmio_start; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 686692de209a..eeba6d1d06e4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |||
@@ -707,6 +707,9 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev, | |||
707 | if (ret) | 707 | if (ret) |
708 | goto try_dmabuf; | 708 | goto try_dmabuf; |
709 | 709 | ||
710 | if (!surface->scanout) | ||
711 | goto err_not_scanout; | ||
712 | |||
710 | ret = vmw_kms_new_framebuffer_surface(dev_priv, surface, &vfb, | 713 | ret = vmw_kms_new_framebuffer_surface(dev_priv, surface, &vfb, |
711 | mode_cmd->width, mode_cmd->height); | 714 | mode_cmd->width, mode_cmd->height); |
712 | 715 | ||
@@ -740,6 +743,13 @@ try_dmabuf: | |||
740 | } | 743 | } |
741 | 744 | ||
742 | return &vfb->base; | 745 | return &vfb->base; |
746 | |||
747 | err_not_scanout: | ||
748 | DRM_ERROR("surface not marked as scanout\n"); | ||
749 | /* vmw_user_surface_lookup takes one ref */ | ||
750 | vmw_surface_unreference(&surface); | ||
751 | |||
752 | return NULL; | ||
743 | } | 753 | } |
744 | 754 | ||
745 | static int vmw_kms_fb_changed(struct drm_device *dev) | 755 | static int vmw_kms_fb_changed(struct drm_device *dev) |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index e01db120efff..c7efbd47ab84 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |||
@@ -35,6 +35,11 @@ | |||
35 | #define VMW_RES_SURFACE ttm_driver_type1 | 35 | #define VMW_RES_SURFACE ttm_driver_type1 |
36 | #define VMW_RES_STREAM ttm_driver_type2 | 36 | #define VMW_RES_STREAM ttm_driver_type2 |
37 | 37 | ||
38 | /* XXX: This isn't a real hardware flag, but just a hack for kernel to | ||
39 | * know about primary surfaces. Find a better way to accomplish this. | ||
40 | */ | ||
41 | #define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9) | ||
42 | |||
38 | struct vmw_user_context { | 43 | struct vmw_user_context { |
39 | struct ttm_base_object base; | 44 | struct ttm_base_object base; |
40 | struct vmw_resource res; | 45 | struct vmw_resource res; |
@@ -599,8 +604,17 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, | |||
599 | if (unlikely(ret != 0)) | 604 | if (unlikely(ret != 0)) |
600 | goto out_err1; | 605 | goto out_err1; |
601 | 606 | ||
607 | if (srf->flags & SVGA3D_SURFACE_HINT_SCANOUT) { | ||
608 | /* we should not send this flag down to hardware since | ||
609 | * its not a official one | ||
610 | */ | ||
611 | srf->flags &= ~SVGA3D_SURFACE_HINT_SCANOUT; | ||
612 | srf->scanout = true; | ||
613 | } else { | ||
614 | srf->scanout = false; | ||
615 | } | ||
602 | 616 | ||
603 | if (srf->flags & (1 << 9) && | 617 | if (srf->scanout && |
604 | srf->num_sizes == 1 && | 618 | srf->num_sizes == 1 && |
605 | srf->sizes[0].width == 64 && | 619 | srf->sizes[0].width == 64 && |
606 | srf->sizes[0].height == 64 && | 620 | srf->sizes[0].height == 64 && |
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index becbaadb3b77..5ed75263340a 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -1333,9 +1333,9 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) | |||
1333 | 1333 | ||
1334 | DEB_CAP(("vbuf:%p\n",vb)); | 1334 | DEB_CAP(("vbuf:%p\n",vb)); |
1335 | 1335 | ||
1336 | release_all_pagetables(dev, buf); | ||
1337 | |||
1338 | saa7146_dma_free(dev,q,buf); | 1336 | saa7146_dma_free(dev,q,buf); |
1337 | |||
1338 | release_all_pagetables(dev, buf); | ||
1339 | } | 1339 | } |
1340 | 1340 | ||
1341 | static struct videobuf_queue_ops video_qops = { | 1341 | static struct videobuf_queue_ops video_qops = { |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 7dfecfc6017c..ee5bff02a92c 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -93,9 +93,9 @@ static int ts_open(struct file *file) | |||
93 | dprintk("open dev=%s\n", video_device_node_name(vdev)); | 93 | dprintk("open dev=%s\n", video_device_node_name(vdev)); |
94 | err = -EBUSY; | 94 | err = -EBUSY; |
95 | if (!mutex_trylock(&dev->empress_tsq.vb_lock)) | 95 | if (!mutex_trylock(&dev->empress_tsq.vb_lock)) |
96 | goto done; | 96 | return err; |
97 | if (atomic_read(&dev->empress_users)) | 97 | if (atomic_read(&dev->empress_users)) |
98 | goto done_up; | 98 | goto done; |
99 | 99 | ||
100 | /* Unmute audio */ | 100 | /* Unmute audio */ |
101 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, | 101 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, |
@@ -105,10 +105,8 @@ static int ts_open(struct file *file) | |||
105 | file->private_data = dev; | 105 | file->private_data = dev; |
106 | err = 0; | 106 | err = 0; |
107 | 107 | ||
108 | done_up: | ||
109 | mutex_unlock(&dev->empress_tsq.vb_lock); | ||
110 | done: | 108 | done: |
111 | unlock_kernel(); | 109 | mutex_unlock(&dev->empress_tsq.vb_lock); |
112 | return err; | 110 | return err; |
113 | } | 111 | } |
114 | 112 | ||
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 9fd8e5ecd5d7..5bc74590c73e 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h | |||
@@ -276,8 +276,13 @@ struct be_adapter { | |||
276 | int link_speed; | 276 | int link_speed; |
277 | u8 port_type; | 277 | u8 port_type; |
278 | u8 transceiver; | 278 | u8 transceiver; |
279 | u8 generation; /* BladeEngine ASIC generation */ | ||
279 | }; | 280 | }; |
280 | 281 | ||
282 | /* BladeEngine Generation numbers */ | ||
283 | #define BE_GEN2 2 | ||
284 | #define BE_GEN3 3 | ||
285 | |||
281 | extern const struct ethtool_ops be_ethtool_ops; | 286 | extern const struct ethtool_ops be_ethtool_ops; |
282 | 287 | ||
283 | #define drvr_stats(adapter) (&adapter->stats.drvr_stats) | 288 | #define drvr_stats(adapter) (&adapter->stats.drvr_stats) |
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h index c002b8391b4d..13b33c841083 100644 --- a/drivers/net/benet/be_cmds.h +++ b/drivers/net/benet/be_cmds.h | |||
@@ -164,7 +164,8 @@ struct be_cmd_req_hdr { | |||
164 | u8 domain; /* dword 0 */ | 164 | u8 domain; /* dword 0 */ |
165 | u32 timeout; /* dword 1 */ | 165 | u32 timeout; /* dword 1 */ |
166 | u32 request_length; /* dword 2 */ | 166 | u32 request_length; /* dword 2 */ |
167 | u32 rsvd; /* dword 3 */ | 167 | u8 version; /* dword 3 */ |
168 | u8 rsvd[3]; /* dword 3 */ | ||
168 | }; | 169 | }; |
169 | 170 | ||
170 | #define RESP_HDR_INFO_OPCODE_SHIFT 0 /* bits 0 - 7 */ | 171 | #define RESP_HDR_INFO_OPCODE_SHIFT 0 /* bits 0 - 7 */ |
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 33ab8c7f14fe..626b76c0ebc7 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -1350,7 +1350,7 @@ static irqreturn_t be_intx(int irq, void *dev) | |||
1350 | int isr; | 1350 | int isr; |
1351 | 1351 | ||
1352 | isr = ioread32(adapter->csr + CEV_ISR0_OFFSET + | 1352 | isr = ioread32(adapter->csr + CEV_ISR0_OFFSET + |
1353 | be_pci_func(adapter) * CEV_ISR_SIZE); | 1353 | (adapter->tx_eq.q.id/ 8) * CEV_ISR_SIZE); |
1354 | if (!isr) | 1354 | if (!isr) |
1355 | return IRQ_NONE; | 1355 | return IRQ_NONE; |
1356 | 1356 | ||
@@ -2051,6 +2051,7 @@ static void be_unmap_pci_bars(struct be_adapter *adapter) | |||
2051 | static int be_map_pci_bars(struct be_adapter *adapter) | 2051 | static int be_map_pci_bars(struct be_adapter *adapter) |
2052 | { | 2052 | { |
2053 | u8 __iomem *addr; | 2053 | u8 __iomem *addr; |
2054 | int pcicfg_reg; | ||
2054 | 2055 | ||
2055 | addr = ioremap_nocache(pci_resource_start(adapter->pdev, 2), | 2056 | addr = ioremap_nocache(pci_resource_start(adapter->pdev, 2), |
2056 | pci_resource_len(adapter->pdev, 2)); | 2057 | pci_resource_len(adapter->pdev, 2)); |
@@ -2064,8 +2065,13 @@ static int be_map_pci_bars(struct be_adapter *adapter) | |||
2064 | goto pci_map_err; | 2065 | goto pci_map_err; |
2065 | adapter->db = addr; | 2066 | adapter->db = addr; |
2066 | 2067 | ||
2067 | addr = ioremap_nocache(pci_resource_start(adapter->pdev, 1), | 2068 | if (adapter->generation == BE_GEN2) |
2068 | pci_resource_len(adapter->pdev, 1)); | 2069 | pcicfg_reg = 1; |
2070 | else | ||
2071 | pcicfg_reg = 0; | ||
2072 | |||
2073 | addr = ioremap_nocache(pci_resource_start(adapter->pdev, pcicfg_reg), | ||
2074 | pci_resource_len(adapter->pdev, pcicfg_reg)); | ||
2069 | if (addr == NULL) | 2075 | if (addr == NULL) |
2070 | goto pci_map_err; | 2076 | goto pci_map_err; |
2071 | adapter->pcicfg = addr; | 2077 | adapter->pcicfg = addr; |
@@ -2162,6 +2168,7 @@ static int be_stats_init(struct be_adapter *adapter) | |||
2162 | cmd->va = pci_alloc_consistent(adapter->pdev, cmd->size, &cmd->dma); | 2168 | cmd->va = pci_alloc_consistent(adapter->pdev, cmd->size, &cmd->dma); |
2163 | if (cmd->va == NULL) | 2169 | if (cmd->va == NULL) |
2164 | return -1; | 2170 | return -1; |
2171 | memset(cmd->va, 0, cmd->size); | ||
2165 | return 0; | 2172 | return 0; |
2166 | } | 2173 | } |
2167 | 2174 | ||
@@ -2240,6 +2247,20 @@ static int __devinit be_probe(struct pci_dev *pdev, | |||
2240 | goto rel_reg; | 2247 | goto rel_reg; |
2241 | } | 2248 | } |
2242 | adapter = netdev_priv(netdev); | 2249 | adapter = netdev_priv(netdev); |
2250 | |||
2251 | switch (pdev->device) { | ||
2252 | case BE_DEVICE_ID1: | ||
2253 | case OC_DEVICE_ID1: | ||
2254 | adapter->generation = BE_GEN2; | ||
2255 | break; | ||
2256 | case BE_DEVICE_ID2: | ||
2257 | case OC_DEVICE_ID2: | ||
2258 | adapter->generation = BE_GEN3; | ||
2259 | break; | ||
2260 | default: | ||
2261 | adapter->generation = 0; | ||
2262 | } | ||
2263 | |||
2243 | adapter->pdev = pdev; | 2264 | adapter->pdev = pdev; |
2244 | pci_set_drvdata(pdev, adapter); | 2265 | pci_set_drvdata(pdev, adapter); |
2245 | adapter->netdev = netdev; | 2266 | adapter->netdev = netdev; |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 3f0071cfe56b..efa0e41bf3ec 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -3639,7 +3639,7 @@ static int bond_open(struct net_device *bond_dev) | |||
3639 | */ | 3639 | */ |
3640 | if (bond_alb_initialize(bond, (bond->params.mode == BOND_MODE_ALB))) { | 3640 | if (bond_alb_initialize(bond, (bond->params.mode == BOND_MODE_ALB))) { |
3641 | /* something went wrong - fail the open operation */ | 3641 | /* something went wrong - fail the open operation */ |
3642 | return -1; | 3642 | return -ENOMEM; |
3643 | } | 3643 | } |
3644 | 3644 | ||
3645 | INIT_DELAYED_WORK(&bond->alb_work, bond_alb_monitor); | 3645 | INIT_DELAYED_WORK(&bond->alb_work, bond_alb_monitor); |
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index 297a5ddd77f0..2aa71a766c35 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c | |||
@@ -2117,6 +2117,7 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter, | |||
2117 | /* set time_stamp *before* dma to help avoid a possible race */ | 2117 | /* set time_stamp *before* dma to help avoid a possible race */ |
2118 | buffer_info->time_stamp = jiffies; | 2118 | buffer_info->time_stamp = jiffies; |
2119 | buffer_info->next_to_watch = i; | 2119 | buffer_info->next_to_watch = i; |
2120 | buffer_info->mapped_as_page = false; | ||
2120 | buffer_info->dma = pci_map_single(pdev, skb->data, len, | 2121 | buffer_info->dma = pci_map_single(pdev, skb->data, len, |
2121 | PCI_DMA_TODEVICE); | 2122 | PCI_DMA_TODEVICE); |
2122 | if (pci_dma_mapping_error(pdev, buffer_info->dma)) | 2123 | if (pci_dma_mapping_error(pdev, buffer_info->dma)) |
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c index 56f37f66b696..dd4883f642be 100644 --- a/drivers/net/ixgbe/ixgbe_dcb_nl.c +++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c | |||
@@ -223,7 +223,7 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id, | |||
223 | 223 | ||
224 | if (adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] != | 224 | if (adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] != |
225 | adapter->dcb_cfg.bw_percentage[0][bwg_id]) { | 225 | adapter->dcb_cfg.bw_percentage[0][bwg_id]) { |
226 | adapter->dcb_set_bitmap |= BIT_PG_RX; | 226 | adapter->dcb_set_bitmap |= BIT_PG_TX; |
227 | adapter->dcb_set_bitmap |= BIT_RESETLINK; | 227 | adapter->dcb_set_bitmap |= BIT_RESETLINK; |
228 | } | 228 | } |
229 | } | 229 | } |
@@ -341,6 +341,12 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) | |||
341 | if (!adapter->dcb_set_bitmap) | 341 | if (!adapter->dcb_set_bitmap) |
342 | return DCB_NO_HW_CHG; | 342 | return DCB_NO_HW_CHG; |
343 | 343 | ||
344 | ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg, | ||
345 | adapter->ring_feature[RING_F_DCB].indices); | ||
346 | |||
347 | if (ret) | ||
348 | return DCB_NO_HW_CHG; | ||
349 | |||
344 | /* | 350 | /* |
345 | * Only take down the adapter if the configuration change | 351 | * Only take down the adapter if the configuration change |
346 | * requires a reset. | 352 | * requires a reset. |
@@ -359,14 +365,6 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) | |||
359 | } | 365 | } |
360 | } | 366 | } |
361 | 367 | ||
362 | ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg, | ||
363 | adapter->ring_feature[RING_F_DCB].indices); | ||
364 | if (ret) { | ||
365 | if (adapter->dcb_set_bitmap & BIT_RESETLINK) | ||
366 | clear_bit(__IXGBE_RESETTING, &adapter->state); | ||
367 | return DCB_NO_HW_CHG; | ||
368 | } | ||
369 | |||
370 | if (adapter->dcb_cfg.pfc_mode_enable) { | 368 | if (adapter->dcb_cfg.pfc_mode_enable) { |
371 | if ((adapter->hw.mac.type != ixgbe_mac_82598EB) && | 369 | if ((adapter->hw.mac.type != ixgbe_mac_82598EB) && |
372 | (adapter->hw.fc.current_mode != ixgbe_fc_pfc)) | 370 | (adapter->hw.fc.current_mode != ixgbe_fc_pfc)) |
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index c146304d8d6c..c0ceebccaa49 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c | |||
@@ -854,8 +854,8 @@ static void ks_update_link_status(struct net_device *netdev, struct ks_net *ks) | |||
854 | 854 | ||
855 | static irqreturn_t ks_irq(int irq, void *pw) | 855 | static irqreturn_t ks_irq(int irq, void *pw) |
856 | { | 856 | { |
857 | struct ks_net *ks = pw; | 857 | struct net_device *netdev = pw; |
858 | struct net_device *netdev = ks->netdev; | 858 | struct ks_net *ks = netdev_priv(netdev); |
859 | u16 status; | 859 | u16 status; |
860 | 860 | ||
861 | /*this should be the first in IRQ handler */ | 861 | /*this should be the first in IRQ handler */ |
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 95db60adde41..f9521136a869 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -1063,7 +1063,7 @@ static int netdev_open(struct net_device *dev) | |||
1063 | if (retval) { | 1063 | if (retval) { |
1064 | printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n", | 1064 | printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n", |
1065 | FIRMWARE_RX); | 1065 | FIRMWARE_RX); |
1066 | return retval; | 1066 | goto out_init; |
1067 | } | 1067 | } |
1068 | if (fw_rx->size % 4) { | 1068 | if (fw_rx->size % 4) { |
1069 | printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n", | 1069 | printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n", |
@@ -1108,6 +1108,9 @@ out_tx: | |||
1108 | release_firmware(fw_tx); | 1108 | release_firmware(fw_tx); |
1109 | out_rx: | 1109 | out_rx: |
1110 | release_firmware(fw_rx); | 1110 | release_firmware(fw_rx); |
1111 | out_init: | ||
1112 | if (retval) | ||
1113 | netdev_close(dev); | ||
1111 | return retval; | 1114 | return retval; |
1112 | } | 1115 | } |
1113 | 1116 | ||
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 21e183a83b99..4f27f022fbf7 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
@@ -419,7 +419,7 @@ static int cdc_manage_power(struct usbnet *dev, int on) | |||
419 | 419 | ||
420 | static const struct driver_info cdc_info = { | 420 | static const struct driver_info cdc_info = { |
421 | .description = "CDC Ethernet Device", | 421 | .description = "CDC Ethernet Device", |
422 | .flags = FLAG_ETHER | FLAG_LINK_INTR, | 422 | .flags = FLAG_ETHER, |
423 | // .check_connect = cdc_check_connect, | 423 | // .check_connect = cdc_check_connect, |
424 | .bind = cdc_bind, | 424 | .bind = cdc_bind, |
425 | .unbind = usbnet_cdc_unbind, | 425 | .unbind = usbnet_cdc_unbind, |
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 2ec61f08cfdb..ae371448b5a0 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -855,12 +855,11 @@ static void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah) | |||
855 | } | 855 | } |
856 | } | 856 | } |
857 | 857 | ||
858 | static void ath9k_hw_init_11a_eeprom_fix(struct ath_hw *ah) | 858 | static void ath9k_hw_init_eeprom_fix(struct ath_hw *ah) |
859 | { | 859 | { |
860 | u32 i, j; | 860 | u32 i, j; |
861 | 861 | ||
862 | if ((ah->hw_version.devid == AR9280_DEVID_PCI) && | 862 | if (ah->hw_version.devid == AR9280_DEVID_PCI) { |
863 | test_bit(ATH9K_MODE_11A, ah->caps.wireless_modes)) { | ||
864 | 863 | ||
865 | /* EEPROM Fixup */ | 864 | /* EEPROM Fixup */ |
866 | for (i = 0; i < ah->iniModes.ia_rows; i++) { | 865 | for (i = 0; i < ah->iniModes.ia_rows; i++) { |
@@ -980,7 +979,7 @@ int ath9k_hw_init(struct ath_hw *ah) | |||
980 | if (r) | 979 | if (r) |
981 | return r; | 980 | return r; |
982 | 981 | ||
983 | ath9k_hw_init_11a_eeprom_fix(ah); | 982 | ath9k_hw_init_eeprom_fix(ah); |
984 | 983 | ||
985 | r = ath9k_hw_init_macaddr(ah); | 984 | r = ath9k_hw_init_macaddr(ah); |
986 | if (r) { | 985 | if (r) { |
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 996eb90263cc..643bea35686f 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -2655,10 +2655,10 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, | |||
2655 | (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) { | 2655 | (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) { |
2656 | ath9k_ps_wakeup(sc); | 2656 | ath9k_ps_wakeup(sc); |
2657 | ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq); | 2657 | ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq); |
2658 | ath_beacon_return(sc, avp); | ||
2659 | ath9k_ps_restore(sc); | 2658 | ath9k_ps_restore(sc); |
2660 | } | 2659 | } |
2661 | 2660 | ||
2661 | ath_beacon_return(sc, avp); | ||
2662 | sc->sc_flags &= ~SC_OP_BEACONS; | 2662 | sc->sc_flags &= ~SC_OP_BEACONS; |
2663 | 2663 | ||
2664 | for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) { | 2664 | for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index cde09a890b73..90fbdb25399e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -297,7 +297,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap, u8 flags, | |||
297 | } | 297 | } |
298 | EXPORT_SYMBOL(iwl_add_station); | 298 | EXPORT_SYMBOL(iwl_add_station); |
299 | 299 | ||
300 | static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const char *addr) | 300 | static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const u8 *addr) |
301 | { | 301 | { |
302 | unsigned long flags; | 302 | unsigned long flags; |
303 | u8 sta_id = iwl_find_station(priv, addr); | 303 | u8 sta_id = iwl_find_station(priv, addr); |
@@ -324,7 +324,7 @@ static void iwl_remove_sta_callback(struct iwl_priv *priv, | |||
324 | { | 324 | { |
325 | struct iwl_rem_sta_cmd *rm_sta = | 325 | struct iwl_rem_sta_cmd *rm_sta = |
326 | (struct iwl_rem_sta_cmd *)cmd->cmd.payload; | 326 | (struct iwl_rem_sta_cmd *)cmd->cmd.payload; |
327 | const char *addr = rm_sta->addr; | 327 | const u8 *addr = rm_sta->addr; |
328 | 328 | ||
329 | if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) { | 329 | if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) { |
330 | IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n", | 330 | IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n", |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 98ffb2de22e9..446e4a94d7d3 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -681,7 +681,7 @@ static void pci_read_irq(struct pci_dev *dev) | |||
681 | dev->irq = irq; | 681 | dev->irq = irq; |
682 | } | 682 | } |
683 | 683 | ||
684 | static void set_pcie_port_type(struct pci_dev *pdev) | 684 | void set_pcie_port_type(struct pci_dev *pdev) |
685 | { | 685 | { |
686 | int pos; | 686 | int pos; |
687 | u16 reg16; | 687 | u16 reg16; |
@@ -695,7 +695,7 @@ static void set_pcie_port_type(struct pci_dev *pdev) | |||
695 | pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4; | 695 | pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4; |
696 | } | 696 | } |
697 | 697 | ||
698 | static void set_pcie_hotplug_bridge(struct pci_dev *pdev) | 698 | void set_pcie_hotplug_bridge(struct pci_dev *pdev) |
699 | { | 699 | { |
700 | int pos; | 700 | int pos; |
701 | u16 reg16; | 701 | u16 reg16; |
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index 1bbff099a546..e7b89e704af6 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c | |||
@@ -1504,7 +1504,8 @@ int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink, | |||
1504 | led->isink_init.consumer_supplies = &led->isink_consumer; | 1504 | led->isink_init.consumer_supplies = &led->isink_consumer; |
1505 | led->isink_init.constraints.min_uA = 0; | 1505 | led->isink_init.constraints.min_uA = 0; |
1506 | led->isink_init.constraints.max_uA = pdata->max_uA; | 1506 | led->isink_init.constraints.max_uA = pdata->max_uA; |
1507 | led->isink_init.constraints.valid_ops_mask = REGULATOR_CHANGE_CURRENT; | 1507 | led->isink_init.constraints.valid_ops_mask |
1508 | = REGULATOR_CHANGE_CURRENT | REGULATOR_CHANGE_STATUS; | ||
1508 | led->isink_init.constraints.valid_modes_mask = REGULATOR_MODE_NORMAL; | 1509 | led->isink_init.constraints.valid_modes_mask = REGULATOR_MODE_NORMAL; |
1509 | ret = wm8350_register_regulator(wm8350, isink, &led->isink_init); | 1510 | ret = wm8350_register_regulator(wm8350, isink, &led->isink_init); |
1510 | if (ret != 0) { | 1511 | if (ret != 0) { |
@@ -1517,6 +1518,7 @@ int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink, | |||
1517 | led->dcdc_init.num_consumer_supplies = 1; | 1518 | led->dcdc_init.num_consumer_supplies = 1; |
1518 | led->dcdc_init.consumer_supplies = &led->dcdc_consumer; | 1519 | led->dcdc_init.consumer_supplies = &led->dcdc_consumer; |
1519 | led->dcdc_init.constraints.valid_modes_mask = REGULATOR_MODE_NORMAL; | 1520 | led->dcdc_init.constraints.valid_modes_mask = REGULATOR_MODE_NORMAL; |
1521 | led->dcdc_init.constraints.valid_ops_mask = REGULATOR_CHANGE_STATUS; | ||
1520 | ret = wm8350_register_regulator(wm8350, dcdc, &led->dcdc_init); | 1522 | ret = wm8350_register_regulator(wm8350, dcdc, &led->dcdc_init); |
1521 | if (ret != 0) { | 1523 | if (ret != 0) { |
1522 | platform_device_put(pdev); | 1524 | platform_device_put(pdev); |
diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c index 3a7be11cc6b9..812c66755083 100644 --- a/drivers/rtc/rtc-fm3130.c +++ b/drivers/rtc/rtc-fm3130.c | |||
@@ -376,20 +376,22 @@ static int __devinit fm3130_probe(struct i2c_client *client, | |||
376 | } | 376 | } |
377 | 377 | ||
378 | /* Disabling calibration mode */ | 378 | /* Disabling calibration mode */ |
379 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL) | 379 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL) { |
380 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, | 380 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, |
381 | fm3130->regs[FM3130_RTC_CONTROL] & | 381 | fm3130->regs[FM3130_RTC_CONTROL] & |
382 | ~(FM3130_RTC_CONTROL_BIT_CAL)); | 382 | ~(FM3130_RTC_CONTROL_BIT_CAL)); |
383 | dev_warn(&client->dev, "Disabling calibration mode!\n"); | 383 | dev_warn(&client->dev, "Disabling calibration mode!\n"); |
384 | } | ||
384 | 385 | ||
385 | /* Disabling read and write modes */ | 386 | /* Disabling read and write modes */ |
386 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_WRITE || | 387 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_WRITE || |
387 | fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ) | 388 | fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ) { |
388 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, | 389 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, |
389 | fm3130->regs[FM3130_RTC_CONTROL] & | 390 | fm3130->regs[FM3130_RTC_CONTROL] & |
390 | ~(FM3130_RTC_CONTROL_BIT_READ | | 391 | ~(FM3130_RTC_CONTROL_BIT_READ | |
391 | FM3130_RTC_CONTROL_BIT_WRITE)); | 392 | FM3130_RTC_CONTROL_BIT_WRITE)); |
392 | dev_warn(&client->dev, "Disabling READ or WRITE mode!\n"); | 393 | dev_warn(&client->dev, "Disabling READ or WRITE mode!\n"); |
394 | } | ||
393 | 395 | ||
394 | /* oscillator off? turn it on, so clock can tick. */ | 396 | /* oscillator off? turn it on, so clock can tick. */ |
395 | if (fm3130->regs[FM3130_CAL_CONTROL] & FM3130_CAL_CONTROL_BIT_nOSCEN) | 397 | if (fm3130->regs[FM3130_CAL_CONTROL] & FM3130_CAL_CONTROL_BIT_nOSCEN) |
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c index 377f2712289e..ab2ab3c81834 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/serial/uartlite.c | |||
@@ -394,7 +394,7 @@ static void ulite_console_write(struct console *co, const char *s, | |||
394 | spin_unlock_irqrestore(&port->lock, flags); | 394 | spin_unlock_irqrestore(&port->lock, flags); |
395 | } | 395 | } |
396 | 396 | ||
397 | static int __init ulite_console_setup(struct console *co, char *options) | 397 | static int __devinit ulite_console_setup(struct console *co, char *options) |
398 | { | 398 | { |
399 | struct uart_port *port; | 399 | struct uart_port *port; |
400 | int baud = 9600; | 400 | int baud = 9600; |
diff --git a/drivers/spi/spi_sh_msiof.c b/drivers/spi/spi_sh_msiof.c index 51e5e1dfa6e5..30973ec16a93 100644 --- a/drivers/spi/spi_sh_msiof.c +++ b/drivers/spi/spi_sh_msiof.c | |||
@@ -173,15 +173,12 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p, | |||
173 | int edge; | 173 | int edge; |
174 | 174 | ||
175 | /* | 175 | /* |
176 | * CPOL CPHA TSCKIZ RSCKIZ TEDG REDG(!) | 176 | * CPOL CPHA TSCKIZ RSCKIZ TEDG REDG |
177 | * 0 0 10 10 1 0 | 177 | * 0 0 10 10 1 1 |
178 | * 0 1 10 10 0 1 | 178 | * 0 1 10 10 0 0 |
179 | * 1 0 11 11 0 1 | 179 | * 1 0 11 11 0 0 |
180 | * 1 1 11 11 1 0 | 180 | * 1 1 11 11 1 1 |
181 | * | ||
182 | * (!) Note: REDG is inverted recommended data sheet setting | ||
183 | */ | 181 | */ |
184 | |||
185 | sh_msiof_write(p, FCTR, 0); | 182 | sh_msiof_write(p, FCTR, 0); |
186 | sh_msiof_write(p, TMDR1, 0xe2000005 | (lsb_first << 24)); | 183 | sh_msiof_write(p, TMDR1, 0xe2000005 | (lsb_first << 24)); |
187 | sh_msiof_write(p, RMDR1, 0x22000005 | (lsb_first << 24)); | 184 | sh_msiof_write(p, RMDR1, 0x22000005 | (lsb_first << 24)); |
@@ -193,7 +190,7 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p, | |||
193 | edge = cpol ? cpha : !cpha; | 190 | edge = cpol ? cpha : !cpha; |
194 | 191 | ||
195 | tmp |= edge << 27; /* TEDG */ | 192 | tmp |= edge << 27; /* TEDG */ |
196 | tmp |= !edge << 26; /* REDG */ | 193 | tmp |= edge << 26; /* REDG */ |
197 | tmp |= (tx_hi_z ? 2 : 0) << 22; /* TXDIZ */ | 194 | tmp |= (tx_hi_z ? 2 : 0) << 22; /* TXDIZ */ |
198 | sh_msiof_write(p, CTR, tmp); | 195 | sh_msiof_write(p, CTR, tmp); |
199 | } | 196 | } |
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 94eb86319ff3..fc2e963e65e9 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -99,8 +99,6 @@ source "drivers/staging/line6/Kconfig" | |||
99 | 99 | ||
100 | source "drivers/gpu/drm/vmwgfx/Kconfig" | 100 | source "drivers/gpu/drm/vmwgfx/Kconfig" |
101 | 101 | ||
102 | source "drivers/gpu/drm/radeon/Kconfig" | ||
103 | |||
104 | source "drivers/gpu/drm/nouveau/Kconfig" | 102 | source "drivers/gpu/drm/nouveau/Kconfig" |
105 | 103 | ||
106 | source "drivers/staging/octeon/Kconfig" | 104 | source "drivers/staging/octeon/Kconfig" |
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index b7a661c02bcd..0ceec123ddfd 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
@@ -216,8 +216,17 @@ static void disable_controller(struct r8a66597 *r8a66597) | |||
216 | { | 216 | { |
217 | int port; | 217 | int port; |
218 | 218 | ||
219 | /* disable interrupts */ | ||
219 | r8a66597_write(r8a66597, 0, INTENB0); | 220 | r8a66597_write(r8a66597, 0, INTENB0); |
220 | r8a66597_write(r8a66597, 0, INTSTS0); | 221 | r8a66597_write(r8a66597, 0, INTENB1); |
222 | r8a66597_write(r8a66597, 0, BRDYENB); | ||
223 | r8a66597_write(r8a66597, 0, BEMPENB); | ||
224 | r8a66597_write(r8a66597, 0, NRDYENB); | ||
225 | |||
226 | /* clear status */ | ||
227 | r8a66597_write(r8a66597, 0, BRDYSTS); | ||
228 | r8a66597_write(r8a66597, 0, NRDYSTS); | ||
229 | r8a66597_write(r8a66597, 0, BEMPSTS); | ||
221 | 230 | ||
222 | for (port = 0; port < r8a66597->max_root_hub; port++) | 231 | for (port = 0; port < r8a66597->max_root_hub; port++) |
223 | r8a66597_disable_port(r8a66597, port); | 232 | r8a66597_disable_port(r8a66597, port); |
@@ -2466,6 +2475,12 @@ static int __devinit r8a66597_probe(struct platform_device *pdev) | |||
2466 | r8a66597->rh_timer.data = (unsigned long)r8a66597; | 2475 | r8a66597->rh_timer.data = (unsigned long)r8a66597; |
2467 | r8a66597->reg = (unsigned long)reg; | 2476 | r8a66597->reg = (unsigned long)reg; |
2468 | 2477 | ||
2478 | /* make sure no interrupts are pending */ | ||
2479 | ret = r8a66597_clock_enable(r8a66597); | ||
2480 | if (ret < 0) | ||
2481 | goto clean_up3; | ||
2482 | disable_controller(r8a66597); | ||
2483 | |||
2469 | for (i = 0; i < R8A66597_MAX_NUM_PIPE; i++) { | 2484 | for (i = 0; i < R8A66597_MAX_NUM_PIPE; i++) { |
2470 | INIT_LIST_HEAD(&r8a66597->pipe_queue[i]); | 2485 | INIT_LIST_HEAD(&r8a66597->pipe_queue[i]); |
2471 | init_timer(&r8a66597->td_timer[i]); | 2486 | init_timer(&r8a66597->td_timer[i]); |
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 66358fa825f3..b4b6deceed15 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
@@ -593,7 +593,8 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf | |||
593 | */ | 593 | */ |
594 | static int imxfb_suspend(struct platform_device *dev, pm_message_t state) | 594 | static int imxfb_suspend(struct platform_device *dev, pm_message_t state) |
595 | { | 595 | { |
596 | struct imxfb_info *fbi = platform_get_drvdata(dev); | 596 | struct fb_info *info = platform_get_drvdata(dev); |
597 | struct imxfb_info *fbi = info->par; | ||
597 | 598 | ||
598 | pr_debug("%s\n", __func__); | 599 | pr_debug("%s\n", __func__); |
599 | 600 | ||
@@ -603,7 +604,8 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state) | |||
603 | 604 | ||
604 | static int imxfb_resume(struct platform_device *dev) | 605 | static int imxfb_resume(struct platform_device *dev) |
605 | { | 606 | { |
606 | struct imxfb_info *fbi = platform_get_drvdata(dev); | 607 | struct fb_info *info = platform_get_drvdata(dev); |
608 | struct imxfb_info *fbi = info->par; | ||
607 | 609 | ||
608 | pr_debug("%s\n", __func__); | 610 | pr_debug("%s\n", __func__); |
609 | 611 | ||
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 054ef29be479..772ba3f45e6f 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c | |||
@@ -324,8 +324,11 @@ static void sdc_enable_channel(struct mx3fb_info *mx3_fbi) | |||
324 | unsigned long flags; | 324 | unsigned long flags; |
325 | dma_cookie_t cookie; | 325 | dma_cookie_t cookie; |
326 | 326 | ||
327 | dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi, | 327 | if (mx3_fbi->txd) |
328 | to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg); | 328 | dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi, |
329 | to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg); | ||
330 | else | ||
331 | dev_dbg(mx3fb->dev, "mx3fbi %p, txd = NULL\n", mx3_fbi); | ||
329 | 332 | ||
330 | /* This enables the channel */ | 333 | /* This enables the channel */ |
331 | if (mx3_fbi->cookie < 0) { | 334 | if (mx3_fbi->cookie < 0) { |
@@ -646,6 +649,7 @@ static int sdc_set_global_alpha(struct mx3fb_data *mx3fb, bool enable, uint8_t a | |||
646 | 649 | ||
647 | static void sdc_set_brightness(struct mx3fb_data *mx3fb, uint8_t value) | 650 | static void sdc_set_brightness(struct mx3fb_data *mx3fb, uint8_t value) |
648 | { | 651 | { |
652 | dev_dbg(mx3fb->dev, "%s: value = %d\n", __func__, value); | ||
649 | /* This might be board-specific */ | 653 | /* This might be board-specific */ |
650 | mx3fb_write_reg(mx3fb, 0x03000000UL | value << 16, SDC_PWM_CTRL); | 654 | mx3fb_write_reg(mx3fb, 0x03000000UL | value << 16, SDC_PWM_CTRL); |
651 | return; | 655 | return; |
@@ -1486,12 +1490,12 @@ static int mx3fb_probe(struct platform_device *pdev) | |||
1486 | goto ersdc0; | 1490 | goto ersdc0; |
1487 | } | 1491 | } |
1488 | 1492 | ||
1493 | mx3fb->backlight_level = 255; | ||
1494 | |||
1489 | ret = init_fb_chan(mx3fb, to_idmac_chan(chan)); | 1495 | ret = init_fb_chan(mx3fb, to_idmac_chan(chan)); |
1490 | if (ret < 0) | 1496 | if (ret < 0) |
1491 | goto eisdc0; | 1497 | goto eisdc0; |
1492 | 1498 | ||
1493 | mx3fb->backlight_level = 255; | ||
1494 | |||
1495 | return 0; | 1499 | return 0; |
1496 | 1500 | ||
1497 | eisdc0: | 1501 | eisdc0: |
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c index 49a34e7f7306..a16f29e888cd 100644 --- a/fs/bio-integrity.c +++ b/fs/bio-integrity.c | |||
@@ -61,7 +61,7 @@ static inline unsigned int vecs_to_idx(unsigned int nr) | |||
61 | 61 | ||
62 | static inline int use_bip_pool(unsigned int idx) | 62 | static inline int use_bip_pool(unsigned int idx) |
63 | { | 63 | { |
64 | if (idx == BIOVEC_NR_POOLS) | 64 | if (idx == BIOVEC_MAX_IDX) |
65 | return 1; | 65 | return 1; |
66 | 66 | ||
67 | return 0; | 67 | return 0; |
@@ -95,6 +95,7 @@ struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *bio, | |||
95 | 95 | ||
96 | /* Use mempool if lower order alloc failed or max vecs were requested */ | 96 | /* Use mempool if lower order alloc failed or max vecs were requested */ |
97 | if (bip == NULL) { | 97 | if (bip == NULL) { |
98 | idx = BIOVEC_MAX_IDX; /* so we free the payload properly later */ | ||
98 | bip = mempool_alloc(bs->bio_integrity_pool, gfp_mask); | 99 | bip = mempool_alloc(bs->bio_integrity_pool, gfp_mask); |
99 | 100 | ||
100 | if (unlikely(bip == NULL)) { | 101 | if (unlikely(bip == NULL)) { |
@@ -542,13 +542,18 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page | |||
542 | 542 | ||
543 | if (page == prev->bv_page && | 543 | if (page == prev->bv_page && |
544 | offset == prev->bv_offset + prev->bv_len) { | 544 | offset == prev->bv_offset + prev->bv_len) { |
545 | unsigned int prev_bv_len = prev->bv_len; | ||
545 | prev->bv_len += len; | 546 | prev->bv_len += len; |
546 | 547 | ||
547 | if (q->merge_bvec_fn) { | 548 | if (q->merge_bvec_fn) { |
548 | struct bvec_merge_data bvm = { | 549 | struct bvec_merge_data bvm = { |
550 | /* prev_bvec is already charged in | ||
551 | bi_size, discharge it in order to | ||
552 | simulate merging updated prev_bvec | ||
553 | as new bvec. */ | ||
549 | .bi_bdev = bio->bi_bdev, | 554 | .bi_bdev = bio->bi_bdev, |
550 | .bi_sector = bio->bi_sector, | 555 | .bi_sector = bio->bi_sector, |
551 | .bi_size = bio->bi_size, | 556 | .bi_size = bio->bi_size - prev_bv_len, |
552 | .bi_rw = bio->bi_rw, | 557 | .bi_rw = bio->bi_rw, |
553 | }; | 558 | }; |
554 | 559 | ||
@@ -961,6 +961,11 @@ int flush_old_exec(struct linux_binprm * bprm) | |||
961 | goto out; | 961 | goto out; |
962 | 962 | ||
963 | bprm->mm = NULL; /* We're using it now */ | 963 | bprm->mm = NULL; /* We're using it now */ |
964 | |||
965 | current->flags &= ~PF_RANDOMIZE; | ||
966 | flush_thread(); | ||
967 | current->personality &= ~bprm->per_clear; | ||
968 | |||
964 | return 0; | 969 | return 0; |
965 | 970 | ||
966 | out: | 971 | out: |
@@ -997,9 +1002,6 @@ void setup_new_exec(struct linux_binprm * bprm) | |||
997 | tcomm[i] = '\0'; | 1002 | tcomm[i] = '\0'; |
998 | set_task_comm(current, tcomm); | 1003 | set_task_comm(current, tcomm); |
999 | 1004 | ||
1000 | current->flags &= ~PF_RANDOMIZE; | ||
1001 | flush_thread(); | ||
1002 | |||
1003 | /* Set the new mm task size. We have to do that late because it may | 1005 | /* Set the new mm task size. We have to do that late because it may |
1004 | * depend on TIF_32BIT which is only updated in flush_thread() on | 1006 | * depend on TIF_32BIT which is only updated in flush_thread() on |
1005 | * some architectures like powerpc | 1007 | * some architectures like powerpc |
@@ -1015,8 +1017,6 @@ void setup_new_exec(struct linux_binprm * bprm) | |||
1015 | set_dumpable(current->mm, suid_dumpable); | 1017 | set_dumpable(current->mm, suid_dumpable); |
1016 | } | 1018 | } |
1017 | 1019 | ||
1018 | current->personality &= ~bprm->per_clear; | ||
1019 | |||
1020 | /* | 1020 | /* |
1021 | * Flush performance counters when crossing a | 1021 | * Flush performance counters when crossing a |
1022 | * security domain: | 1022 | * security domain: |
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index c18913a777ae..a9f5e137f1d3 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -828,6 +828,9 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, | |||
828 | if (!page) | 828 | if (!page) |
829 | break; | 829 | break; |
830 | 830 | ||
831 | if (mapping_writably_mapped(mapping)) | ||
832 | flush_dcache_page(page); | ||
833 | |||
831 | pagefault_disable(); | 834 | pagefault_disable(); |
832 | tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes); | 835 | tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes); |
833 | pagefault_enable(); | 836 | pagefault_enable(); |
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index f455a03a09e2..f42663325931 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -769,6 +769,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, | |||
769 | if (!gl) | 769 | if (!gl) |
770 | return -ENOMEM; | 770 | return -ENOMEM; |
771 | 771 | ||
772 | atomic_inc(&sdp->sd_glock_disposal); | ||
772 | gl->gl_flags = 0; | 773 | gl->gl_flags = 0; |
773 | gl->gl_name = name; | 774 | gl->gl_name = name; |
774 | atomic_set(&gl->gl_ref, 1); | 775 | atomic_set(&gl->gl_ref, 1); |
@@ -1538,6 +1539,9 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp) | |||
1538 | up_write(&gfs2_umount_flush_sem); | 1539 | up_write(&gfs2_umount_flush_sem); |
1539 | msleep(10); | 1540 | msleep(10); |
1540 | } | 1541 | } |
1542 | flush_workqueue(glock_workqueue); | ||
1543 | wait_event(sdp->sd_glock_wait, atomic_read(&sdp->sd_glock_disposal) == 0); | ||
1544 | gfs2_dump_lockstate(sdp); | ||
1541 | } | 1545 | } |
1542 | 1546 | ||
1543 | void gfs2_glock_finish_truncate(struct gfs2_inode *ip) | 1547 | void gfs2_glock_finish_truncate(struct gfs2_inode *ip) |
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h index 13f0bd228132..c0262faf4725 100644 --- a/fs/gfs2/glock.h +++ b/fs/gfs2/glock.h | |||
@@ -123,7 +123,7 @@ struct lm_lockops { | |||
123 | int (*lm_mount) (struct gfs2_sbd *sdp, const char *fsname); | 123 | int (*lm_mount) (struct gfs2_sbd *sdp, const char *fsname); |
124 | void (*lm_unmount) (struct gfs2_sbd *sdp); | 124 | void (*lm_unmount) (struct gfs2_sbd *sdp); |
125 | void (*lm_withdraw) (struct gfs2_sbd *sdp); | 125 | void (*lm_withdraw) (struct gfs2_sbd *sdp); |
126 | void (*lm_put_lock) (struct kmem_cache *cachep, void *gl); | 126 | void (*lm_put_lock) (struct kmem_cache *cachep, struct gfs2_glock *gl); |
127 | unsigned int (*lm_lock) (struct gfs2_glock *gl, | 127 | unsigned int (*lm_lock) (struct gfs2_glock *gl, |
128 | unsigned int req_state, unsigned int flags); | 128 | unsigned int req_state, unsigned int flags); |
129 | void (*lm_cancel) (struct gfs2_glock *gl); | 129 | void (*lm_cancel) (struct gfs2_glock *gl); |
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 4792200978c8..bc0ad158e6b4 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -544,6 +544,8 @@ struct gfs2_sbd { | |||
544 | struct gfs2_holder sd_live_gh; | 544 | struct gfs2_holder sd_live_gh; |
545 | struct gfs2_glock *sd_rename_gl; | 545 | struct gfs2_glock *sd_rename_gl; |
546 | struct gfs2_glock *sd_trans_gl; | 546 | struct gfs2_glock *sd_trans_gl; |
547 | wait_queue_head_t sd_glock_wait; | ||
548 | atomic_t sd_glock_disposal; | ||
547 | 549 | ||
548 | /* Inode Stuff */ | 550 | /* Inode Stuff */ |
549 | 551 | ||
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index 46df988323bc..0e5e0e7022e5 100644 --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c | |||
@@ -21,6 +21,7 @@ static void gdlm_ast(void *arg) | |||
21 | { | 21 | { |
22 | struct gfs2_glock *gl = arg; | 22 | struct gfs2_glock *gl = arg; |
23 | unsigned ret = gl->gl_state; | 23 | unsigned ret = gl->gl_state; |
24 | struct gfs2_sbd *sdp = gl->gl_sbd; | ||
24 | 25 | ||
25 | BUG_ON(gl->gl_lksb.sb_flags & DLM_SBF_DEMOTED); | 26 | BUG_ON(gl->gl_lksb.sb_flags & DLM_SBF_DEMOTED); |
26 | 27 | ||
@@ -30,6 +31,8 @@ static void gdlm_ast(void *arg) | |||
30 | switch (gl->gl_lksb.sb_status) { | 31 | switch (gl->gl_lksb.sb_status) { |
31 | case -DLM_EUNLOCK: /* Unlocked, so glock can be freed */ | 32 | case -DLM_EUNLOCK: /* Unlocked, so glock can be freed */ |
32 | kmem_cache_free(gfs2_glock_cachep, gl); | 33 | kmem_cache_free(gfs2_glock_cachep, gl); |
34 | if (atomic_dec_and_test(&sdp->sd_glock_disposal)) | ||
35 | wake_up(&sdp->sd_glock_wait); | ||
33 | return; | 36 | return; |
34 | case -DLM_ECANCEL: /* Cancel while getting lock */ | 37 | case -DLM_ECANCEL: /* Cancel while getting lock */ |
35 | ret |= LM_OUT_CANCELED; | 38 | ret |= LM_OUT_CANCELED; |
@@ -164,14 +167,16 @@ static unsigned int gdlm_lock(struct gfs2_glock *gl, | |||
164 | return LM_OUT_ASYNC; | 167 | return LM_OUT_ASYNC; |
165 | } | 168 | } |
166 | 169 | ||
167 | static void gdlm_put_lock(struct kmem_cache *cachep, void *ptr) | 170 | static void gdlm_put_lock(struct kmem_cache *cachep, struct gfs2_glock *gl) |
168 | { | 171 | { |
169 | struct gfs2_glock *gl = ptr; | 172 | struct gfs2_sbd *sdp = gl->gl_sbd; |
170 | struct lm_lockstruct *ls = &gl->gl_sbd->sd_lockstruct; | 173 | struct lm_lockstruct *ls = &sdp->sd_lockstruct; |
171 | int error; | 174 | int error; |
172 | 175 | ||
173 | if (gl->gl_lksb.sb_lkid == 0) { | 176 | if (gl->gl_lksb.sb_lkid == 0) { |
174 | kmem_cache_free(cachep, gl); | 177 | kmem_cache_free(cachep, gl); |
178 | if (atomic_dec_and_test(&sdp->sd_glock_disposal)) | ||
179 | wake_up(&sdp->sd_glock_wait); | ||
175 | return; | 180 | return; |
176 | } | 181 | } |
177 | 182 | ||
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index edfee24f3636..8a102f731003 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
@@ -82,6 +82,8 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) | |||
82 | 82 | ||
83 | gfs2_tune_init(&sdp->sd_tune); | 83 | gfs2_tune_init(&sdp->sd_tune); |
84 | 84 | ||
85 | init_waitqueue_head(&sdp->sd_glock_wait); | ||
86 | atomic_set(&sdp->sd_glock_disposal, 0); | ||
85 | spin_lock_init(&sdp->sd_statfs_spin); | 87 | spin_lock_init(&sdp->sd_statfs_spin); |
86 | 88 | ||
87 | spin_lock_init(&sdp->sd_rindex_spin); | 89 | spin_lock_init(&sdp->sd_rindex_spin); |
@@ -983,9 +985,17 @@ static const match_table_t nolock_tokens = { | |||
983 | { Opt_err, NULL }, | 985 | { Opt_err, NULL }, |
984 | }; | 986 | }; |
985 | 987 | ||
988 | static void nolock_put_lock(struct kmem_cache *cachep, struct gfs2_glock *gl) | ||
989 | { | ||
990 | struct gfs2_sbd *sdp = gl->gl_sbd; | ||
991 | kmem_cache_free(cachep, gl); | ||
992 | if (atomic_dec_and_test(&sdp->sd_glock_disposal)) | ||
993 | wake_up(&sdp->sd_glock_wait); | ||
994 | } | ||
995 | |||
986 | static const struct lm_lockops nolock_ops = { | 996 | static const struct lm_lockops nolock_ops = { |
987 | .lm_proto_name = "lock_nolock", | 997 | .lm_proto_name = "lock_nolock", |
988 | .lm_put_lock = kmem_cache_free, | 998 | .lm_put_lock = nolock_put_lock, |
989 | .lm_tokens = &nolock_tokens, | 999 | .lm_tokens = &nolock_tokens, |
990 | }; | 1000 | }; |
991 | 1001 | ||
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 78f73ca1ef3e..84350e1be66d 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c | |||
@@ -1088,7 +1088,8 @@ static void *gfs2_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
1088 | error = vfs_follow_link(nd, buf); | 1088 | error = vfs_follow_link(nd, buf); |
1089 | if (buf != array) | 1089 | if (buf != array) |
1090 | kfree(buf); | 1090 | kfree(buf); |
1091 | } | 1091 | } else |
1092 | path_put(&nd->path); | ||
1092 | 1093 | ||
1093 | return ERR_PTR(error); | 1094 | return ERR_PTR(error); |
1094 | } | 1095 | } |
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 0608f490c295..503b842f3ba2 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
@@ -591,11 +591,7 @@ static int gfs2_ri_update(struct gfs2_inode *ip) | |||
591 | u64 rgrp_count = ip->i_disksize; | 591 | u64 rgrp_count = ip->i_disksize; |
592 | int error; | 592 | int error; |
593 | 593 | ||
594 | if (do_div(rgrp_count, sizeof(struct gfs2_rindex))) { | 594 | do_div(rgrp_count, sizeof(struct gfs2_rindex)); |
595 | gfs2_consist_inode(ip); | ||
596 | return -EIO; | ||
597 | } | ||
598 | |||
599 | clear_rgrpdi(sdp); | 595 | clear_rgrpdi(sdp); |
600 | 596 | ||
601 | file_ra_state_init(&ra_state, inode->i_mapping); | 597 | file_ra_state_init(&ra_state, inode->i_mapping); |
@@ -915,7 +911,7 @@ void gfs2_rgrp_repolish_clones(struct gfs2_rgrpd *rgd) | |||
915 | struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip) | 911 | struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip) |
916 | { | 912 | { |
917 | BUG_ON(ip->i_alloc != NULL); | 913 | BUG_ON(ip->i_alloc != NULL); |
918 | ip->i_alloc = kzalloc(sizeof(struct gfs2_alloc), GFP_KERNEL); | 914 | ip->i_alloc = kzalloc(sizeof(struct gfs2_alloc), GFP_NOFS); |
919 | return ip->i_alloc; | 915 | return ip->i_alloc; |
920 | } | 916 | } |
921 | 917 | ||
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index c282ad41f3d1..b9dd3da22c0a 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/gfs2_ondisk.h> | 21 | #include <linux/gfs2_ondisk.h> |
22 | #include <linux/crc32.h> | 22 | #include <linux/crc32.h> |
23 | #include <linux/time.h> | 23 | #include <linux/time.h> |
24 | #include <linux/wait.h> | ||
24 | 25 | ||
25 | #include "gfs2.h" | 26 | #include "gfs2.h" |
26 | #include "incore.h" | 27 | #include "incore.h" |
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 6b891328f332..63f2071d6445 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -486,6 +486,8 @@ static int nfs_release_page(struct page *page, gfp_t gfp) | |||
486 | { | 486 | { |
487 | dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page); | 487 | dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page); |
488 | 488 | ||
489 | if (gfp & __GFP_WAIT) | ||
490 | nfs_wb_page(page->mapping->host, page); | ||
489 | /* If PagePrivate() is set, then the page is not freeable */ | 491 | /* If PagePrivate() is set, then the page is not freeable */ |
490 | if (PagePrivate(page)) | 492 | if (PagePrivate(page)) |
491 | return 0; | 493 | return 0; |
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index faa091865ad0..f141bde7756a 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -1261,8 +1261,10 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) | |||
1261 | 1261 | ||
1262 | if (fattr->valid & NFS_ATTR_FATTR_MODE) { | 1262 | if (fattr->valid & NFS_ATTR_FATTR_MODE) { |
1263 | if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)) { | 1263 | if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)) { |
1264 | umode_t newmode = inode->i_mode & S_IFMT; | ||
1265 | newmode |= fattr->mode & S_IALLUGO; | ||
1266 | inode->i_mode = newmode; | ||
1264 | invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; | 1267 | invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; |
1265 | inode->i_mode = fattr->mode; | ||
1266 | } | 1268 | } |
1267 | } else if (server->caps & NFS_CAP_MODE) | 1269 | } else if (server->caps & NFS_CAP_MODE) |
1268 | invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR | 1270 | invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR |
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 865265bdca03..0c6fda33d66e 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h | |||
@@ -146,6 +146,7 @@ enum { | |||
146 | NFS_O_RDWR_STATE, /* OPEN stateid has read/write state */ | 146 | NFS_O_RDWR_STATE, /* OPEN stateid has read/write state */ |
147 | NFS_STATE_RECLAIM_REBOOT, /* OPEN stateid server rebooted */ | 147 | NFS_STATE_RECLAIM_REBOOT, /* OPEN stateid server rebooted */ |
148 | NFS_STATE_RECLAIM_NOGRACE, /* OPEN stateid needs to recover state */ | 148 | NFS_STATE_RECLAIM_NOGRACE, /* OPEN stateid needs to recover state */ |
149 | NFS_STATE_POSIX_LOCKS, /* Posix locks are supported */ | ||
149 | }; | 150 | }; |
150 | 151 | ||
151 | struct nfs4_state { | 152 | struct nfs4_state { |
@@ -277,6 +278,7 @@ extern void nfs4_state_set_mode_locked(struct nfs4_state *, fmode_t); | |||
277 | extern void nfs4_schedule_state_recovery(struct nfs_client *); | 278 | extern void nfs4_schedule_state_recovery(struct nfs_client *); |
278 | extern void nfs4_schedule_state_manager(struct nfs_client *); | 279 | extern void nfs4_schedule_state_manager(struct nfs_client *); |
279 | extern int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state); | 280 | extern int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state); |
281 | extern int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_state *state); | ||
280 | extern void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags); | 282 | extern void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags); |
281 | extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp); | 283 | extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp); |
282 | extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl); | 284 | extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl); |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 198d51d17c13..375f0fae2c6a 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -249,19 +249,15 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, | |||
249 | if (state == NULL) | 249 | if (state == NULL) |
250 | break; | 250 | break; |
251 | nfs4_state_mark_reclaim_nograce(clp, state); | 251 | nfs4_state_mark_reclaim_nograce(clp, state); |
252 | case -NFS4ERR_STALE_CLIENTID: | 252 | goto do_state_recovery; |
253 | case -NFS4ERR_STALE_STATEID: | 253 | case -NFS4ERR_STALE_STATEID: |
254 | case -NFS4ERR_EXPIRED: | 254 | if (state == NULL) |
255 | nfs4_schedule_state_recovery(clp); | ||
256 | ret = nfs4_wait_clnt_recover(clp); | ||
257 | if (ret == 0) | ||
258 | exception->retry = 1; | ||
259 | #if !defined(CONFIG_NFS_V4_1) | ||
260 | break; | ||
261 | #else /* !defined(CONFIG_NFS_V4_1) */ | ||
262 | if (!nfs4_has_session(server->nfs_client)) | ||
263 | break; | 255 | break; |
264 | /* FALLTHROUGH */ | 256 | nfs4_state_mark_reclaim_reboot(clp, state); |
257 | case -NFS4ERR_STALE_CLIENTID: | ||
258 | case -NFS4ERR_EXPIRED: | ||
259 | goto do_state_recovery; | ||
260 | #if defined(CONFIG_NFS_V4_1) | ||
265 | case -NFS4ERR_BADSESSION: | 261 | case -NFS4ERR_BADSESSION: |
266 | case -NFS4ERR_BADSLOT: | 262 | case -NFS4ERR_BADSLOT: |
267 | case -NFS4ERR_BAD_HIGH_SLOT: | 263 | case -NFS4ERR_BAD_HIGH_SLOT: |
@@ -274,7 +270,7 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, | |||
274 | nfs4_schedule_state_recovery(clp); | 270 | nfs4_schedule_state_recovery(clp); |
275 | exception->retry = 1; | 271 | exception->retry = 1; |
276 | break; | 272 | break; |
277 | #endif /* !defined(CONFIG_NFS_V4_1) */ | 273 | #endif /* defined(CONFIG_NFS_V4_1) */ |
278 | case -NFS4ERR_FILE_OPEN: | 274 | case -NFS4ERR_FILE_OPEN: |
279 | if (exception->timeout > HZ) { | 275 | if (exception->timeout > HZ) { |
280 | /* We have retried a decent amount, time to | 276 | /* We have retried a decent amount, time to |
@@ -293,6 +289,12 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, | |||
293 | } | 289 | } |
294 | /* We failed to handle the error */ | 290 | /* We failed to handle the error */ |
295 | return nfs4_map_errors(ret); | 291 | return nfs4_map_errors(ret); |
292 | do_state_recovery: | ||
293 | nfs4_schedule_state_recovery(clp); | ||
294 | ret = nfs4_wait_clnt_recover(clp); | ||
295 | if (ret == 0) | ||
296 | exception->retry = 1; | ||
297 | return ret; | ||
296 | } | 298 | } |
297 | 299 | ||
298 | 300 | ||
@@ -1658,6 +1660,8 @@ static int _nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, in | |||
1658 | status = PTR_ERR(state); | 1660 | status = PTR_ERR(state); |
1659 | if (IS_ERR(state)) | 1661 | if (IS_ERR(state)) |
1660 | goto err_opendata_put; | 1662 | goto err_opendata_put; |
1663 | if ((opendata->o_res.rflags & NFS4_OPEN_RESULT_LOCKTYPE_POSIX) != 0) | ||
1664 | set_bit(NFS_STATE_POSIX_LOCKS, &state->flags); | ||
1661 | nfs4_opendata_put(opendata); | 1665 | nfs4_opendata_put(opendata); |
1662 | nfs4_put_state_owner(sp); | 1666 | nfs4_put_state_owner(sp); |
1663 | *res = state; | 1667 | *res = state; |
@@ -3422,15 +3426,14 @@ _nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, | |||
3422 | if (state == NULL) | 3426 | if (state == NULL) |
3423 | break; | 3427 | break; |
3424 | nfs4_state_mark_reclaim_nograce(clp, state); | 3428 | nfs4_state_mark_reclaim_nograce(clp, state); |
3425 | case -NFS4ERR_STALE_CLIENTID: | 3429 | goto do_state_recovery; |
3426 | case -NFS4ERR_STALE_STATEID: | 3430 | case -NFS4ERR_STALE_STATEID: |
3431 | if (state == NULL) | ||
3432 | break; | ||
3433 | nfs4_state_mark_reclaim_reboot(clp, state); | ||
3434 | case -NFS4ERR_STALE_CLIENTID: | ||
3427 | case -NFS4ERR_EXPIRED: | 3435 | case -NFS4ERR_EXPIRED: |
3428 | rpc_sleep_on(&clp->cl_rpcwaitq, task, NULL); | 3436 | goto do_state_recovery; |
3429 | nfs4_schedule_state_recovery(clp); | ||
3430 | if (test_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) == 0) | ||
3431 | rpc_wake_up_queued_task(&clp->cl_rpcwaitq, task); | ||
3432 | task->tk_status = 0; | ||
3433 | return -EAGAIN; | ||
3434 | #if defined(CONFIG_NFS_V4_1) | 3437 | #if defined(CONFIG_NFS_V4_1) |
3435 | case -NFS4ERR_BADSESSION: | 3438 | case -NFS4ERR_BADSESSION: |
3436 | case -NFS4ERR_BADSLOT: | 3439 | case -NFS4ERR_BADSLOT: |
@@ -3458,6 +3461,13 @@ _nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, | |||
3458 | } | 3461 | } |
3459 | task->tk_status = nfs4_map_errors(task->tk_status); | 3462 | task->tk_status = nfs4_map_errors(task->tk_status); |
3460 | return 0; | 3463 | return 0; |
3464 | do_state_recovery: | ||
3465 | rpc_sleep_on(&clp->cl_rpcwaitq, task, NULL); | ||
3466 | nfs4_schedule_state_recovery(clp); | ||
3467 | if (test_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) == 0) | ||
3468 | rpc_wake_up_queued_task(&clp->cl_rpcwaitq, task); | ||
3469 | task->tk_status = 0; | ||
3470 | return -EAGAIN; | ||
3461 | } | 3471 | } |
3462 | 3472 | ||
3463 | static int | 3473 | static int |
@@ -4088,6 +4098,28 @@ static const struct rpc_call_ops nfs4_recover_lock_ops = { | |||
4088 | .rpc_release = nfs4_lock_release, | 4098 | .rpc_release = nfs4_lock_release, |
4089 | }; | 4099 | }; |
4090 | 4100 | ||
4101 | static void nfs4_handle_setlk_error(struct nfs_server *server, struct nfs4_lock_state *lsp, int new_lock_owner, int error) | ||
4102 | { | ||
4103 | struct nfs_client *clp = server->nfs_client; | ||
4104 | struct nfs4_state *state = lsp->ls_state; | ||
4105 | |||
4106 | switch (error) { | ||
4107 | case -NFS4ERR_ADMIN_REVOKED: | ||
4108 | case -NFS4ERR_BAD_STATEID: | ||
4109 | case -NFS4ERR_EXPIRED: | ||
4110 | if (new_lock_owner != 0 || | ||
4111 | (lsp->ls_flags & NFS_LOCK_INITIALIZED) != 0) | ||
4112 | nfs4_state_mark_reclaim_nograce(clp, state); | ||
4113 | lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED; | ||
4114 | break; | ||
4115 | case -NFS4ERR_STALE_STATEID: | ||
4116 | if (new_lock_owner != 0 || | ||
4117 | (lsp->ls_flags & NFS_LOCK_INITIALIZED) != 0) | ||
4118 | nfs4_state_mark_reclaim_reboot(clp, state); | ||
4119 | lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED; | ||
4120 | }; | ||
4121 | } | ||
4122 | |||
4091 | static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *fl, int recovery_type) | 4123 | static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *fl, int recovery_type) |
4092 | { | 4124 | { |
4093 | struct nfs4_lockdata *data; | 4125 | struct nfs4_lockdata *data; |
@@ -4126,6 +4158,9 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f | |||
4126 | ret = nfs4_wait_for_completion_rpc_task(task); | 4158 | ret = nfs4_wait_for_completion_rpc_task(task); |
4127 | if (ret == 0) { | 4159 | if (ret == 0) { |
4128 | ret = data->rpc_status; | 4160 | ret = data->rpc_status; |
4161 | if (ret) | ||
4162 | nfs4_handle_setlk_error(data->server, data->lsp, | ||
4163 | data->arg.new_lock_owner, ret); | ||
4129 | } else | 4164 | } else |
4130 | data->cancelled = 1; | 4165 | data->cancelled = 1; |
4131 | rpc_put_task(task); | 4166 | rpc_put_task(task); |
@@ -4181,8 +4216,11 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock | |||
4181 | { | 4216 | { |
4182 | struct nfs_inode *nfsi = NFS_I(state->inode); | 4217 | struct nfs_inode *nfsi = NFS_I(state->inode); |
4183 | unsigned char fl_flags = request->fl_flags; | 4218 | unsigned char fl_flags = request->fl_flags; |
4184 | int status; | 4219 | int status = -ENOLCK; |
4185 | 4220 | ||
4221 | if ((fl_flags & FL_POSIX) && | ||
4222 | !test_bit(NFS_STATE_POSIX_LOCKS, &state->flags)) | ||
4223 | goto out; | ||
4186 | /* Is this a delegated open? */ | 4224 | /* Is this a delegated open? */ |
4187 | status = nfs4_set_lock_state(state, request); | 4225 | status = nfs4_set_lock_state(state, request); |
4188 | if (status != 0) | 4226 | if (status != 0) |
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 6d263ed79e92..c1e2733f4fa4 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -901,7 +901,7 @@ void nfs4_schedule_state_recovery(struct nfs_client *clp) | |||
901 | nfs4_schedule_state_manager(clp); | 901 | nfs4_schedule_state_manager(clp); |
902 | } | 902 | } |
903 | 903 | ||
904 | static int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_state *state) | 904 | int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_state *state) |
905 | { | 905 | { |
906 | 906 | ||
907 | set_bit(NFS_STATE_RECLAIM_REBOOT, &state->flags); | 907 | set_bit(NFS_STATE_RECLAIM_REBOOT, &state->flags); |
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index e2975939126a..a12c45b65dd4 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -176,6 +176,12 @@ void nfs_release_request(struct nfs_page *req) | |||
176 | kref_put(&req->wb_kref, nfs_free_request); | 176 | kref_put(&req->wb_kref, nfs_free_request); |
177 | } | 177 | } |
178 | 178 | ||
179 | static int nfs_wait_bit_uninterruptible(void *word) | ||
180 | { | ||
181 | io_schedule(); | ||
182 | return 0; | ||
183 | } | ||
184 | |||
179 | /** | 185 | /** |
180 | * nfs_wait_on_request - Wait for a request to complete. | 186 | * nfs_wait_on_request - Wait for a request to complete. |
181 | * @req: request to wait upon. | 187 | * @req: request to wait upon. |
@@ -186,14 +192,9 @@ void nfs_release_request(struct nfs_page *req) | |||
186 | int | 192 | int |
187 | nfs_wait_on_request(struct nfs_page *req) | 193 | nfs_wait_on_request(struct nfs_page *req) |
188 | { | 194 | { |
189 | int ret = 0; | 195 | return wait_on_bit(&req->wb_flags, PG_BUSY, |
190 | 196 | nfs_wait_bit_uninterruptible, | |
191 | if (!test_bit(PG_BUSY, &req->wb_flags)) | 197 | TASK_UNINTERRUPTIBLE); |
192 | goto out; | ||
193 | ret = out_of_line_wait_on_bit(&req->wb_flags, PG_BUSY, | ||
194 | nfs_wait_bit_killable, TASK_KILLABLE); | ||
195 | out: | ||
196 | return ret; | ||
197 | } | 198 | } |
198 | 199 | ||
199 | /** | 200 | /** |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index ce907efc5508..f1afee4eea77 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -243,6 +243,7 @@ static int nfs_show_stats(struct seq_file *, struct vfsmount *); | |||
243 | static int nfs_get_sb(struct file_system_type *, int, const char *, void *, struct vfsmount *); | 243 | static int nfs_get_sb(struct file_system_type *, int, const char *, void *, struct vfsmount *); |
244 | static int nfs_xdev_get_sb(struct file_system_type *fs_type, | 244 | static int nfs_xdev_get_sb(struct file_system_type *fs_type, |
245 | int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt); | 245 | int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt); |
246 | static void nfs_put_super(struct super_block *); | ||
246 | static void nfs_kill_super(struct super_block *); | 247 | static void nfs_kill_super(struct super_block *); |
247 | static int nfs_remount(struct super_block *sb, int *flags, char *raw_data); | 248 | static int nfs_remount(struct super_block *sb, int *flags, char *raw_data); |
248 | 249 | ||
@@ -266,6 +267,7 @@ static const struct super_operations nfs_sops = { | |||
266 | .alloc_inode = nfs_alloc_inode, | 267 | .alloc_inode = nfs_alloc_inode, |
267 | .destroy_inode = nfs_destroy_inode, | 268 | .destroy_inode = nfs_destroy_inode, |
268 | .write_inode = nfs_write_inode, | 269 | .write_inode = nfs_write_inode, |
270 | .put_super = nfs_put_super, | ||
269 | .statfs = nfs_statfs, | 271 | .statfs = nfs_statfs, |
270 | .clear_inode = nfs_clear_inode, | 272 | .clear_inode = nfs_clear_inode, |
271 | .umount_begin = nfs_umount_begin, | 273 | .umount_begin = nfs_umount_begin, |
@@ -335,6 +337,7 @@ static const struct super_operations nfs4_sops = { | |||
335 | .alloc_inode = nfs_alloc_inode, | 337 | .alloc_inode = nfs_alloc_inode, |
336 | .destroy_inode = nfs_destroy_inode, | 338 | .destroy_inode = nfs_destroy_inode, |
337 | .write_inode = nfs_write_inode, | 339 | .write_inode = nfs_write_inode, |
340 | .put_super = nfs_put_super, | ||
338 | .statfs = nfs_statfs, | 341 | .statfs = nfs_statfs, |
339 | .clear_inode = nfs4_clear_inode, | 342 | .clear_inode = nfs4_clear_inode, |
340 | .umount_begin = nfs_umount_begin, | 343 | .umount_begin = nfs_umount_begin, |
@@ -2258,6 +2261,17 @@ error_splat_super: | |||
2258 | } | 2261 | } |
2259 | 2262 | ||
2260 | /* | 2263 | /* |
2264 | * Ensure that we unregister the bdi before kill_anon_super | ||
2265 | * releases the device name | ||
2266 | */ | ||
2267 | static void nfs_put_super(struct super_block *s) | ||
2268 | { | ||
2269 | struct nfs_server *server = NFS_SB(s); | ||
2270 | |||
2271 | bdi_unregister(&server->backing_dev_info); | ||
2272 | } | ||
2273 | |||
2274 | /* | ||
2261 | * Destroy an NFS2/3 superblock | 2275 | * Destroy an NFS2/3 superblock |
2262 | */ | 2276 | */ |
2263 | static void nfs_kill_super(struct super_block *s) | 2277 | static void nfs_kill_super(struct super_block *s) |
@@ -2265,7 +2279,6 @@ static void nfs_kill_super(struct super_block *s) | |||
2265 | struct nfs_server *server = NFS_SB(s); | 2279 | struct nfs_server *server = NFS_SB(s); |
2266 | 2280 | ||
2267 | kill_anon_super(s); | 2281 | kill_anon_super(s); |
2268 | bdi_unregister(&server->backing_dev_info); | ||
2269 | nfs_fscache_release_super_cookie(s); | 2282 | nfs_fscache_release_super_cookie(s); |
2270 | nfs_free_server(server); | 2283 | nfs_free_server(server); |
2271 | } | 2284 | } |
diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index 70e1fbbaaeab..ad4d2e787b20 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c | |||
@@ -15,8 +15,10 @@ | |||
15 | 15 | ||
16 | #include "callback.h" | 16 | #include "callback.h" |
17 | 17 | ||
18 | #ifdef CONFIG_NFS_V4 | ||
18 | static const int nfs_set_port_min = 0; | 19 | static const int nfs_set_port_min = 0; |
19 | static const int nfs_set_port_max = 65535; | 20 | static const int nfs_set_port_max = 65535; |
21 | #endif | ||
20 | static struct ctl_table_header *nfs_callback_sysctl_table; | 22 | static struct ctl_table_header *nfs_callback_sysctl_table; |
21 | 23 | ||
22 | static ctl_table nfs_cb_sysctls[] = { | 24 | static ctl_table nfs_cb_sysctls[] = { |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index d171696017f4..7b54b8bb101f 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -1233,7 +1233,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data) | |||
1233 | 1233 | ||
1234 | 1234 | ||
1235 | #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) | 1235 | #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) |
1236 | void nfs_commitdata_release(void *data) | 1236 | static void nfs_commitdata_release(void *data) |
1237 | { | 1237 | { |
1238 | struct nfs_write_data *wdata = data; | 1238 | struct nfs_write_data *wdata = data; |
1239 | 1239 | ||
@@ -1541,6 +1541,7 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page) | |||
1541 | break; | 1541 | break; |
1542 | } | 1542 | } |
1543 | ret = nfs_wait_on_request(req); | 1543 | ret = nfs_wait_on_request(req); |
1544 | nfs_release_request(req); | ||
1544 | if (ret < 0) | 1545 | if (ret < 0) |
1545 | goto out; | 1546 | goto out; |
1546 | } | 1547 | } |
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 17584c524486..105b508b47a8 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c | |||
@@ -2829,7 +2829,7 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci) | |||
2829 | || sci->sc_seq_request != sci->sc_seq_done); | 2829 | || sci->sc_seq_request != sci->sc_seq_done); |
2830 | spin_unlock(&sci->sc_state_lock); | 2830 | spin_unlock(&sci->sc_state_lock); |
2831 | 2831 | ||
2832 | if (flag || nilfs_segctor_confirm(sci)) | 2832 | if (flag || !nilfs_segctor_confirm(sci)) |
2833 | nilfs_segctor_write_out(sci); | 2833 | nilfs_segctor_write_out(sci); |
2834 | 2834 | ||
2835 | WARN_ON(!list_empty(&sci->sc_copied_buffers)); | 2835 | WARN_ON(!list_empty(&sci->sc_copied_buffers)); |
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 83ac4d3b3cb0..ba98546fabbd 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -2913,7 +2913,9 @@ int journal_init(struct super_block *sb, const char *j_dev_name, | |||
2913 | journal->j_mount_id = 10; | 2913 | journal->j_mount_id = 10; |
2914 | journal->j_state = 0; | 2914 | journal->j_state = 0; |
2915 | atomic_set(&(journal->j_jlock), 0); | 2915 | atomic_set(&(journal->j_jlock), 0); |
2916 | reiserfs_write_unlock(sb); | ||
2916 | journal->j_cnode_free_list = allocate_cnodes(num_cnodes); | 2917 | journal->j_cnode_free_list = allocate_cnodes(num_cnodes); |
2918 | reiserfs_write_lock(sb); | ||
2917 | journal->j_cnode_free_orig = journal->j_cnode_free_list; | 2919 | journal->j_cnode_free_orig = journal->j_cnode_free_list; |
2918 | journal->j_cnode_free = journal->j_cnode_free_list ? num_cnodes : 0; | 2920 | journal->j_cnode_free = journal->j_cnode_free_list ? num_cnodes : 0; |
2919 | journal->j_cnode_used = 0; | 2921 | journal->j_cnode_used = 0; |
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index bc4fdf27bd2e..c5ba1636613c 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h | |||
@@ -85,7 +85,7 @@ struct drm_mode_modeinfo { | |||
85 | __u16 hdisplay, hsync_start, hsync_end, htotal, hskew; | 85 | __u16 hdisplay, hsync_start, hsync_end, htotal, hskew; |
86 | __u16 vdisplay, vsync_start, vsync_end, vtotal, vscan; | 86 | __u16 vdisplay, vsync_start, vsync_end, vtotal, vscan; |
87 | 87 | ||
88 | __u32 vrefresh; /* vertical refresh * 1000 */ | 88 | __u32 vrefresh; |
89 | 89 | ||
90 | __u32 flags; | 90 | __u32 flags; |
91 | __u32 type; | 91 | __u32 type; |
diff --git a/include/linux/connector.h b/include/linux/connector.h index 72ba63eb83c5..3a779ffba60b 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
@@ -24,9 +24,6 @@ | |||
24 | 24 | ||
25 | #include <linux/types.h> | 25 | #include <linux/types.h> |
26 | 26 | ||
27 | #define CN_IDX_CONNECTOR 0xffffffff | ||
28 | #define CN_VAL_CONNECTOR 0xffffffff | ||
29 | |||
30 | /* | 27 | /* |
31 | * Process Events connector unique ids -- used for message routing | 28 | * Process Events connector unique ids -- used for message routing |
32 | */ | 29 | */ |
@@ -75,30 +72,6 @@ struct cn_msg { | |||
75 | __u8 data[0]; | 72 | __u8 data[0]; |
76 | }; | 73 | }; |
77 | 74 | ||
78 | /* | ||
79 | * Notify structure - requests notification about | ||
80 | * registering/unregistering idx/val in range [first, first+range]. | ||
81 | */ | ||
82 | struct cn_notify_req { | ||
83 | __u32 first; | ||
84 | __u32 range; | ||
85 | }; | ||
86 | |||
87 | /* | ||
88 | * Main notification control message | ||
89 | * *_notify_num - number of appropriate cn_notify_req structures after | ||
90 | * this struct. | ||
91 | * group - notification receiver's idx. | ||
92 | * len - total length of the attached data. | ||
93 | */ | ||
94 | struct cn_ctl_msg { | ||
95 | __u32 idx_notify_num; | ||
96 | __u32 val_notify_num; | ||
97 | __u32 group; | ||
98 | __u32 len; | ||
99 | __u8 data[0]; | ||
100 | }; | ||
101 | |||
102 | #ifdef __KERNEL__ | 75 | #ifdef __KERNEL__ |
103 | 76 | ||
104 | #include <asm/atomic.h> | 77 | #include <asm/atomic.h> |
@@ -151,11 +124,6 @@ struct cn_callback_entry { | |||
151 | u32 seq, group; | 124 | u32 seq, group; |
152 | }; | 125 | }; |
153 | 126 | ||
154 | struct cn_ctl_entry { | ||
155 | struct list_head notify_entry; | ||
156 | struct cn_ctl_msg *msg; | ||
157 | }; | ||
158 | |||
159 | struct cn_dev { | 127 | struct cn_dev { |
160 | struct cb_id id; | 128 | struct cb_id id; |
161 | 129 | ||
diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h index 41235c93e4e9..070ba0621738 100644 --- a/include/linux/hw_breakpoint.h +++ b/include/linux/hw_breakpoint.h | |||
@@ -75,6 +75,8 @@ extern int __register_perf_hw_breakpoint(struct perf_event *bp); | |||
75 | extern void unregister_hw_breakpoint(struct perf_event *bp); | 75 | extern void unregister_hw_breakpoint(struct perf_event *bp); |
76 | extern void unregister_wide_hw_breakpoint(struct perf_event **cpu_events); | 76 | extern void unregister_wide_hw_breakpoint(struct perf_event **cpu_events); |
77 | 77 | ||
78 | extern int dbg_reserve_bp_slot(struct perf_event *bp); | ||
79 | extern int dbg_release_bp_slot(struct perf_event *bp); | ||
78 | extern int reserve_bp_slot(struct perf_event *bp); | 80 | extern int reserve_bp_slot(struct perf_event *bp); |
79 | extern void release_bp_slot(struct perf_event *bp); | 81 | extern void release_bp_slot(struct perf_event *bp); |
80 | 82 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index 174e5392e51e..c1968f464c38 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -756,6 +756,10 @@ pci_power_t pci_target_state(struct pci_dev *dev); | |||
756 | int pci_prepare_to_sleep(struct pci_dev *dev); | 756 | int pci_prepare_to_sleep(struct pci_dev *dev); |
757 | int pci_back_from_sleep(struct pci_dev *dev); | 757 | int pci_back_from_sleep(struct pci_dev *dev); |
758 | 758 | ||
759 | /* For use by arch with custom probe code */ | ||
760 | void set_pcie_port_type(struct pci_dev *pdev); | ||
761 | void set_pcie_hotplug_bridge(struct pci_dev *pdev); | ||
762 | |||
759 | /* Functions for PCI Hotplug drivers to use */ | 763 | /* Functions for PCI Hotplug drivers to use */ |
760 | int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); | 764 | int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); |
761 | #ifdef CONFIG_HOTPLUG | 765 | #ifdef CONFIG_HOTPLUG |
diff --git a/include/linux/sched.h b/include/linux/sched.h index abdfacc58653..78efe7c485ac 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -310,6 +310,7 @@ extern void sched_show_task(struct task_struct *p); | |||
310 | #ifdef CONFIG_DETECT_SOFTLOCKUP | 310 | #ifdef CONFIG_DETECT_SOFTLOCKUP |
311 | extern void softlockup_tick(void); | 311 | extern void softlockup_tick(void); |
312 | extern void touch_softlockup_watchdog(void); | 312 | extern void touch_softlockup_watchdog(void); |
313 | extern void touch_softlockup_watchdog_sync(void); | ||
313 | extern void touch_all_softlockup_watchdogs(void); | 314 | extern void touch_all_softlockup_watchdogs(void); |
314 | extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write, | 315 | extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write, |
315 | void __user *buffer, | 316 | void __user *buffer, |
@@ -323,6 +324,9 @@ static inline void softlockup_tick(void) | |||
323 | static inline void touch_softlockup_watchdog(void) | 324 | static inline void touch_softlockup_watchdog(void) |
324 | { | 325 | { |
325 | } | 326 | } |
327 | static inline void touch_softlockup_watchdog_sync(void) | ||
328 | { | ||
329 | } | ||
326 | static inline void touch_all_softlockup_watchdogs(void) | 330 | static inline void touch_all_softlockup_watchdogs(void) |
327 | { | 331 | { |
328 | } | 332 | } |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 1fbcc748044a..aa3bee566446 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -2936,14 +2936,17 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry, | |||
2936 | 2936 | ||
2937 | for_each_subsys(root, ss) { | 2937 | for_each_subsys(root, ss) { |
2938 | struct cgroup_subsys_state *css = ss->create(ss, cgrp); | 2938 | struct cgroup_subsys_state *css = ss->create(ss, cgrp); |
2939 | |||
2939 | if (IS_ERR(css)) { | 2940 | if (IS_ERR(css)) { |
2940 | err = PTR_ERR(css); | 2941 | err = PTR_ERR(css); |
2941 | goto err_destroy; | 2942 | goto err_destroy; |
2942 | } | 2943 | } |
2943 | init_cgroup_css(css, ss, cgrp); | 2944 | init_cgroup_css(css, ss, cgrp); |
2944 | if (ss->use_id) | 2945 | if (ss->use_id) { |
2945 | if (alloc_css_id(ss, parent, cgrp)) | 2946 | err = alloc_css_id(ss, parent, cgrp); |
2947 | if (err) | ||
2946 | goto err_destroy; | 2948 | goto err_destroy; |
2949 | } | ||
2947 | /* At error, ->destroy() callback has to free assigned ID. */ | 2950 | /* At error, ->destroy() callback has to free assigned ID. */ |
2948 | } | 2951 | } |
2949 | 2952 | ||
diff --git a/kernel/cpu.c b/kernel/cpu.c index 1c8ddd6ee940..677f25376a38 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
@@ -151,13 +151,13 @@ static inline void check_for_tasks(int cpu) | |||
151 | 151 | ||
152 | write_lock_irq(&tasklist_lock); | 152 | write_lock_irq(&tasklist_lock); |
153 | for_each_process(p) { | 153 | for_each_process(p) { |
154 | if (task_cpu(p) == cpu && | 154 | if (task_cpu(p) == cpu && p->state == TASK_RUNNING && |
155 | (!cputime_eq(p->utime, cputime_zero) || | 155 | (!cputime_eq(p->utime, cputime_zero) || |
156 | !cputime_eq(p->stime, cputime_zero))) | 156 | !cputime_eq(p->stime, cputime_zero))) |
157 | printk(KERN_WARNING "Task %s (pid = %d) is on cpu %d\ | 157 | printk(KERN_WARNING "Task %s (pid = %d) is on cpu %d " |
158 | (state = %ld, flags = %x) \n", | 158 | "(state = %ld, flags = %x)\n", |
159 | p->comm, task_pid_nr(p), cpu, | 159 | p->comm, task_pid_nr(p), cpu, |
160 | p->state, p->flags); | 160 | p->state, p->flags); |
161 | } | 161 | } |
162 | write_unlock_irq(&tasklist_lock); | 162 | write_unlock_irq(&tasklist_lock); |
163 | } | 163 | } |
diff --git a/kernel/cred.c b/kernel/cred.c index dd76cfe5f5b0..1ed8ca18790c 100644 --- a/kernel/cred.c +++ b/kernel/cred.c | |||
@@ -224,7 +224,7 @@ struct cred *cred_alloc_blank(void) | |||
224 | #ifdef CONFIG_KEYS | 224 | #ifdef CONFIG_KEYS |
225 | new->tgcred = kzalloc(sizeof(*new->tgcred), GFP_KERNEL); | 225 | new->tgcred = kzalloc(sizeof(*new->tgcred), GFP_KERNEL); |
226 | if (!new->tgcred) { | 226 | if (!new->tgcred) { |
227 | kfree(new); | 227 | kmem_cache_free(cred_jar, new); |
228 | return NULL; | 228 | return NULL; |
229 | } | 229 | } |
230 | atomic_set(&new->tgcred->usage, 1); | 230 | atomic_set(&new->tgcred->usage, 1); |
diff --git a/kernel/fork.c b/kernel/fork.c index 5b2959b3ffc2..f88bd984df35 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -1241,21 +1241,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1241 | /* Need tasklist lock for parent etc handling! */ | 1241 | /* Need tasklist lock for parent etc handling! */ |
1242 | write_lock_irq(&tasklist_lock); | 1242 | write_lock_irq(&tasklist_lock); |
1243 | 1243 | ||
1244 | /* | ||
1245 | * The task hasn't been attached yet, so its cpus_allowed mask will | ||
1246 | * not be changed, nor will its assigned CPU. | ||
1247 | * | ||
1248 | * The cpus_allowed mask of the parent may have changed after it was | ||
1249 | * copied first time - so re-copy it here, then check the child's CPU | ||
1250 | * to ensure it is on a valid CPU (and if not, just force it back to | ||
1251 | * parent's CPU). This avoids alot of nasty races. | ||
1252 | */ | ||
1253 | p->cpus_allowed = current->cpus_allowed; | ||
1254 | p->rt.nr_cpus_allowed = current->rt.nr_cpus_allowed; | ||
1255 | if (unlikely(!cpu_isset(task_cpu(p), p->cpus_allowed) || | ||
1256 | !cpu_online(task_cpu(p)))) | ||
1257 | set_task_cpu(p, smp_processor_id()); | ||
1258 | |||
1259 | /* CLONE_PARENT re-uses the old parent */ | 1244 | /* CLONE_PARENT re-uses the old parent */ |
1260 | if (clone_flags & (CLONE_PARENT|CLONE_THREAD)) { | 1245 | if (clone_flags & (CLONE_PARENT|CLONE_THREAD)) { |
1261 | p->real_parent = current->real_parent; | 1246 | p->real_parent = current->real_parent; |
diff --git a/kernel/futex.c b/kernel/futex.c index d9b3a2228f9d..e7a35f1039e7 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -530,8 +530,25 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb, | |||
530 | return -EINVAL; | 530 | return -EINVAL; |
531 | 531 | ||
532 | WARN_ON(!atomic_read(&pi_state->refcount)); | 532 | WARN_ON(!atomic_read(&pi_state->refcount)); |
533 | WARN_ON(pid && pi_state->owner && | 533 | |
534 | pi_state->owner->pid != pid); | 534 | /* |
535 | * When pi_state->owner is NULL then the owner died | ||
536 | * and another waiter is on the fly. pi_state->owner | ||
537 | * is fixed up by the task which acquires | ||
538 | * pi_state->rt_mutex. | ||
539 | * | ||
540 | * We do not check for pid == 0 which can happen when | ||
541 | * the owner died and robust_list_exit() cleared the | ||
542 | * TID. | ||
543 | */ | ||
544 | if (pid && pi_state->owner) { | ||
545 | /* | ||
546 | * Bail out if user space manipulated the | ||
547 | * futex value. | ||
548 | */ | ||
549 | if (pid != task_pid_vnr(pi_state->owner)) | ||
550 | return -EINVAL; | ||
551 | } | ||
535 | 552 | ||
536 | atomic_inc(&pi_state->refcount); | 553 | atomic_inc(&pi_state->refcount); |
537 | *ps = pi_state; | 554 | *ps = pi_state; |
@@ -758,6 +775,13 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) | |||
758 | if (!pi_state) | 775 | if (!pi_state) |
759 | return -EINVAL; | 776 | return -EINVAL; |
760 | 777 | ||
778 | /* | ||
779 | * If current does not own the pi_state then the futex is | ||
780 | * inconsistent and user space fiddled with the futex value. | ||
781 | */ | ||
782 | if (pi_state->owner != current) | ||
783 | return -EINVAL; | ||
784 | |||
761 | raw_spin_lock(&pi_state->pi_mutex.wait_lock); | 785 | raw_spin_lock(&pi_state->pi_mutex.wait_lock); |
762 | new_owner = rt_mutex_next_owner(&pi_state->pi_mutex); | 786 | new_owner = rt_mutex_next_owner(&pi_state->pi_mutex); |
763 | 787 | ||
@@ -1971,7 +1995,7 @@ retry_private: | |||
1971 | /* Unqueue and drop the lock */ | 1995 | /* Unqueue and drop the lock */ |
1972 | unqueue_me_pi(&q); | 1996 | unqueue_me_pi(&q); |
1973 | 1997 | ||
1974 | goto out; | 1998 | goto out_put_key; |
1975 | 1999 | ||
1976 | out_unlock_put_key: | 2000 | out_unlock_put_key: |
1977 | queue_unlock(&q, hb); | 2001 | queue_unlock(&q, hb); |
diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c index 50dbd5999588..8a5c7d55ac9f 100644 --- a/kernel/hw_breakpoint.c +++ b/kernel/hw_breakpoint.c | |||
@@ -243,38 +243,70 @@ static void toggle_bp_slot(struct perf_event *bp, bool enable) | |||
243 | * ((per_cpu(nr_bp_flexible, *) > 1) + max(per_cpu(nr_cpu_bp_pinned, *)) | 243 | * ((per_cpu(nr_bp_flexible, *) > 1) + max(per_cpu(nr_cpu_bp_pinned, *)) |
244 | * + max(per_cpu(nr_task_bp_pinned, *))) < HBP_NUM | 244 | * + max(per_cpu(nr_task_bp_pinned, *))) < HBP_NUM |
245 | */ | 245 | */ |
246 | int reserve_bp_slot(struct perf_event *bp) | 246 | static int __reserve_bp_slot(struct perf_event *bp) |
247 | { | 247 | { |
248 | struct bp_busy_slots slots = {0}; | 248 | struct bp_busy_slots slots = {0}; |
249 | int ret = 0; | ||
250 | |||
251 | mutex_lock(&nr_bp_mutex); | ||
252 | 249 | ||
253 | fetch_bp_busy_slots(&slots, bp); | 250 | fetch_bp_busy_slots(&slots, bp); |
254 | 251 | ||
255 | /* Flexible counters need to keep at least one slot */ | 252 | /* Flexible counters need to keep at least one slot */ |
256 | if (slots.pinned + (!!slots.flexible) == HBP_NUM) { | 253 | if (slots.pinned + (!!slots.flexible) == HBP_NUM) |
257 | ret = -ENOSPC; | 254 | return -ENOSPC; |
258 | goto end; | ||
259 | } | ||
260 | 255 | ||
261 | toggle_bp_slot(bp, true); | 256 | toggle_bp_slot(bp, true); |
262 | 257 | ||
263 | end: | 258 | return 0; |
259 | } | ||
260 | |||
261 | int reserve_bp_slot(struct perf_event *bp) | ||
262 | { | ||
263 | int ret; | ||
264 | |||
265 | mutex_lock(&nr_bp_mutex); | ||
266 | |||
267 | ret = __reserve_bp_slot(bp); | ||
268 | |||
264 | mutex_unlock(&nr_bp_mutex); | 269 | mutex_unlock(&nr_bp_mutex); |
265 | 270 | ||
266 | return ret; | 271 | return ret; |
267 | } | 272 | } |
268 | 273 | ||
274 | static void __release_bp_slot(struct perf_event *bp) | ||
275 | { | ||
276 | toggle_bp_slot(bp, false); | ||
277 | } | ||
278 | |||
269 | void release_bp_slot(struct perf_event *bp) | 279 | void release_bp_slot(struct perf_event *bp) |
270 | { | 280 | { |
271 | mutex_lock(&nr_bp_mutex); | 281 | mutex_lock(&nr_bp_mutex); |
272 | 282 | ||
273 | toggle_bp_slot(bp, false); | 283 | __release_bp_slot(bp); |
274 | 284 | ||
275 | mutex_unlock(&nr_bp_mutex); | 285 | mutex_unlock(&nr_bp_mutex); |
276 | } | 286 | } |
277 | 287 | ||
288 | /* | ||
289 | * Allow the kernel debugger to reserve breakpoint slots without | ||
290 | * taking a lock using the dbg_* variant of for the reserve and | ||
291 | * release breakpoint slots. | ||
292 | */ | ||
293 | int dbg_reserve_bp_slot(struct perf_event *bp) | ||
294 | { | ||
295 | if (mutex_is_locked(&nr_bp_mutex)) | ||
296 | return -1; | ||
297 | |||
298 | return __reserve_bp_slot(bp); | ||
299 | } | ||
300 | |||
301 | int dbg_release_bp_slot(struct perf_event *bp) | ||
302 | { | ||
303 | if (mutex_is_locked(&nr_bp_mutex)) | ||
304 | return -1; | ||
305 | |||
306 | __release_bp_slot(bp); | ||
307 | |||
308 | return 0; | ||
309 | } | ||
278 | 310 | ||
279 | int register_perf_hw_breakpoint(struct perf_event *bp) | 311 | int register_perf_hw_breakpoint(struct perf_event *bp) |
280 | { | 312 | { |
@@ -296,6 +328,10 @@ int register_perf_hw_breakpoint(struct perf_event *bp) | |||
296 | if (!bp->attr.disabled || !bp->overflow_handler) | 328 | if (!bp->attr.disabled || !bp->overflow_handler) |
297 | ret = arch_validate_hwbkpt_settings(bp, bp->ctx->task); | 329 | ret = arch_validate_hwbkpt_settings(bp, bp->ctx->task); |
298 | 330 | ||
331 | /* if arch_validate_hwbkpt_settings() fails then release bp slot */ | ||
332 | if (ret) | ||
333 | release_bp_slot(bp); | ||
334 | |||
299 | return ret; | 335 | return ret; |
300 | } | 336 | } |
301 | 337 | ||
diff --git a/kernel/kfifo.c b/kernel/kfifo.c index 32c5c15d750d..498cabba225e 100644 --- a/kernel/kfifo.c +++ b/kernel/kfifo.c | |||
@@ -349,6 +349,7 @@ EXPORT_SYMBOL(__kfifo_from_user_n); | |||
349 | * @fifo: the fifo to be used. | 349 | * @fifo: the fifo to be used. |
350 | * @from: pointer to the data to be added. | 350 | * @from: pointer to the data to be added. |
351 | * @len: the length of the data to be added. | 351 | * @len: the length of the data to be added. |
352 | * @total: the actual returned data length. | ||
352 | * | 353 | * |
353 | * This function copies at most @len bytes from the @from into the | 354 | * This function copies at most @len bytes from the @from into the |
354 | * FIFO depending and returns -EFAULT/0. | 355 | * FIFO depending and returns -EFAULT/0. |
@@ -399,7 +400,7 @@ EXPORT_SYMBOL(__kfifo_to_user_n); | |||
399 | * @fifo: the fifo to be used. | 400 | * @fifo: the fifo to be used. |
400 | * @to: where the data must be copied. | 401 | * @to: where the data must be copied. |
401 | * @len: the size of the destination buffer. | 402 | * @len: the size of the destination buffer. |
402 | @ @lenout: pointer to output variable with copied data | 403 | * @lenout: pointer to output variable with copied data |
403 | * | 404 | * |
404 | * This function copies at most @len bytes from the FIFO into the | 405 | * This function copies at most @len bytes from the FIFO into the |
405 | * @to buffer and 0 or -EFAULT. | 406 | * @to buffer and 0 or -EFAULT. |
diff --git a/kernel/kgdb.c b/kernel/kgdb.c index 2eb517e23514..761fdd2b3034 100644 --- a/kernel/kgdb.c +++ b/kernel/kgdb.c | |||
@@ -583,6 +583,9 @@ static void kgdb_wait(struct pt_regs *regs) | |||
583 | smp_wmb(); | 583 | smp_wmb(); |
584 | atomic_set(&cpu_in_kgdb[cpu], 1); | 584 | atomic_set(&cpu_in_kgdb[cpu], 1); |
585 | 585 | ||
586 | /* Disable any cpu specific hw breakpoints */ | ||
587 | kgdb_disable_hw_debug(regs); | ||
588 | |||
586 | /* Wait till primary CPU is done with debugging */ | 589 | /* Wait till primary CPU is done with debugging */ |
587 | while (atomic_read(&passive_cpu_wait[cpu])) | 590 | while (atomic_read(&passive_cpu_wait[cpu])) |
588 | cpu_relax(); | 591 | cpu_relax(); |
@@ -596,7 +599,7 @@ static void kgdb_wait(struct pt_regs *regs) | |||
596 | 599 | ||
597 | /* Signal the primary CPU that we are done: */ | 600 | /* Signal the primary CPU that we are done: */ |
598 | atomic_set(&cpu_in_kgdb[cpu], 0); | 601 | atomic_set(&cpu_in_kgdb[cpu], 0); |
599 | touch_softlockup_watchdog(); | 602 | touch_softlockup_watchdog_sync(); |
600 | clocksource_touch_watchdog(); | 603 | clocksource_touch_watchdog(); |
601 | local_irq_restore(flags); | 604 | local_irq_restore(flags); |
602 | } | 605 | } |
@@ -1450,7 +1453,7 @@ acquirelock: | |||
1450 | (kgdb_info[cpu].task && | 1453 | (kgdb_info[cpu].task && |
1451 | kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) { | 1454 | kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) { |
1452 | atomic_set(&kgdb_active, -1); | 1455 | atomic_set(&kgdb_active, -1); |
1453 | touch_softlockup_watchdog(); | 1456 | touch_softlockup_watchdog_sync(); |
1454 | clocksource_touch_watchdog(); | 1457 | clocksource_touch_watchdog(); |
1455 | local_irq_restore(flags); | 1458 | local_irq_restore(flags); |
1456 | 1459 | ||
@@ -1550,7 +1553,7 @@ kgdb_restore: | |||
1550 | } | 1553 | } |
1551 | /* Free kgdb_active */ | 1554 | /* Free kgdb_active */ |
1552 | atomic_set(&kgdb_active, -1); | 1555 | atomic_set(&kgdb_active, -1); |
1553 | touch_softlockup_watchdog(); | 1556 | touch_softlockup_watchdog_sync(); |
1554 | clocksource_touch_watchdog(); | 1557 | clocksource_touch_watchdog(); |
1555 | local_irq_restore(flags); | 1558 | local_irq_restore(flags); |
1556 | 1559 | ||
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 5feaddcdbe49..c62ec14609b9 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
@@ -2147,7 +2147,7 @@ check_usage_backwards(struct task_struct *curr, struct held_lock *this, | |||
2147 | return ret; | 2147 | return ret; |
2148 | 2148 | ||
2149 | return print_irq_inversion_bug(curr, &root, target_entry, | 2149 | return print_irq_inversion_bug(curr, &root, target_entry, |
2150 | this, 1, irqclass); | 2150 | this, 0, irqclass); |
2151 | } | 2151 | } |
2152 | 2152 | ||
2153 | void print_irqtrace_events(struct task_struct *curr) | 2153 | void print_irqtrace_events(struct task_struct *curr) |
diff --git a/kernel/sched.c b/kernel/sched.c index 4508fe7048be..3a8fb30a91b1 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -2320,14 +2320,12 @@ static int select_fallback_rq(int cpu, struct task_struct *p) | |||
2320 | } | 2320 | } |
2321 | 2321 | ||
2322 | /* | 2322 | /* |
2323 | * Called from: | 2323 | * Gets called from 3 sites (exec, fork, wakeup), since it is called without |
2324 | * holding rq->lock we need to ensure ->cpus_allowed is stable, this is done | ||
2325 | * by: | ||
2324 | * | 2326 | * |
2325 | * - fork, @p is stable because it isn't on the tasklist yet | 2327 | * exec: is unstable, retry loop |
2326 | * | 2328 | * fork & wake-up: serialize ->cpus_allowed against TASK_WAKING |
2327 | * - exec, @p is unstable, retry loop | ||
2328 | * | ||
2329 | * - wake-up, we serialize ->cpus_allowed against TASK_WAKING so | ||
2330 | * we should be good. | ||
2331 | */ | 2329 | */ |
2332 | static inline | 2330 | static inline |
2333 | int select_task_rq(struct task_struct *p, int sd_flags, int wake_flags) | 2331 | int select_task_rq(struct task_struct *p, int sd_flags, int wake_flags) |
@@ -2620,9 +2618,6 @@ void sched_fork(struct task_struct *p, int clone_flags) | |||
2620 | if (p->sched_class->task_fork) | 2618 | if (p->sched_class->task_fork) |
2621 | p->sched_class->task_fork(p); | 2619 | p->sched_class->task_fork(p); |
2622 | 2620 | ||
2623 | #ifdef CONFIG_SMP | ||
2624 | cpu = select_task_rq(p, SD_BALANCE_FORK, 0); | ||
2625 | #endif | ||
2626 | set_task_cpu(p, cpu); | 2621 | set_task_cpu(p, cpu); |
2627 | 2622 | ||
2628 | #if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) | 2623 | #if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) |
@@ -2652,6 +2647,21 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags) | |||
2652 | { | 2647 | { |
2653 | unsigned long flags; | 2648 | unsigned long flags; |
2654 | struct rq *rq; | 2649 | struct rq *rq; |
2650 | int cpu = get_cpu(); | ||
2651 | |||
2652 | #ifdef CONFIG_SMP | ||
2653 | /* | ||
2654 | * Fork balancing, do it here and not earlier because: | ||
2655 | * - cpus_allowed can change in the fork path | ||
2656 | * - any previously selected cpu might disappear through hotplug | ||
2657 | * | ||
2658 | * We still have TASK_WAKING but PF_STARTING is gone now, meaning | ||
2659 | * ->cpus_allowed is stable, we have preemption disabled, meaning | ||
2660 | * cpu_online_mask is stable. | ||
2661 | */ | ||
2662 | cpu = select_task_rq(p, SD_BALANCE_FORK, 0); | ||
2663 | set_task_cpu(p, cpu); | ||
2664 | #endif | ||
2655 | 2665 | ||
2656 | rq = task_rq_lock(p, &flags); | 2666 | rq = task_rq_lock(p, &flags); |
2657 | BUG_ON(p->state != TASK_WAKING); | 2667 | BUG_ON(p->state != TASK_WAKING); |
@@ -2665,6 +2675,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags) | |||
2665 | p->sched_class->task_woken(rq, p); | 2675 | p->sched_class->task_woken(rq, p); |
2666 | #endif | 2676 | #endif |
2667 | task_rq_unlock(rq, &flags); | 2677 | task_rq_unlock(rq, &flags); |
2678 | put_cpu(); | ||
2668 | } | 2679 | } |
2669 | 2680 | ||
2670 | #ifdef CONFIG_PREEMPT_NOTIFIERS | 2681 | #ifdef CONFIG_PREEMPT_NOTIFIERS |
@@ -7139,14 +7150,18 @@ int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask) | |||
7139 | * the ->cpus_allowed mask from under waking tasks, which would be | 7150 | * the ->cpus_allowed mask from under waking tasks, which would be |
7140 | * possible when we change rq->lock in ttwu(), so synchronize against | 7151 | * possible when we change rq->lock in ttwu(), so synchronize against |
7141 | * TASK_WAKING to avoid that. | 7152 | * TASK_WAKING to avoid that. |
7153 | * | ||
7154 | * Make an exception for freshly cloned tasks, since cpuset namespaces | ||
7155 | * might move the task about, we have to validate the target in | ||
7156 | * wake_up_new_task() anyway since the cpu might have gone away. | ||
7142 | */ | 7157 | */ |
7143 | again: | 7158 | again: |
7144 | while (p->state == TASK_WAKING) | 7159 | while (p->state == TASK_WAKING && !(p->flags & PF_STARTING)) |
7145 | cpu_relax(); | 7160 | cpu_relax(); |
7146 | 7161 | ||
7147 | rq = task_rq_lock(p, &flags); | 7162 | rq = task_rq_lock(p, &flags); |
7148 | 7163 | ||
7149 | if (p->state == TASK_WAKING) { | 7164 | if (p->state == TASK_WAKING && !(p->flags & PF_STARTING)) { |
7150 | task_rq_unlock(rq, &flags); | 7165 | task_rq_unlock(rq, &flags); |
7151 | goto again; | 7166 | goto again; |
7152 | } | 7167 | } |
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index d22579087e27..0d4c7898ab80 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
@@ -25,6 +25,7 @@ static DEFINE_SPINLOCK(print_lock); | |||
25 | static DEFINE_PER_CPU(unsigned long, softlockup_touch_ts); /* touch timestamp */ | 25 | static DEFINE_PER_CPU(unsigned long, softlockup_touch_ts); /* touch timestamp */ |
26 | static DEFINE_PER_CPU(unsigned long, softlockup_print_ts); /* print timestamp */ | 26 | static DEFINE_PER_CPU(unsigned long, softlockup_print_ts); /* print timestamp */ |
27 | static DEFINE_PER_CPU(struct task_struct *, softlockup_watchdog); | 27 | static DEFINE_PER_CPU(struct task_struct *, softlockup_watchdog); |
28 | static DEFINE_PER_CPU(bool, softlock_touch_sync); | ||
28 | 29 | ||
29 | static int __read_mostly did_panic; | 30 | static int __read_mostly did_panic; |
30 | int __read_mostly softlockup_thresh = 60; | 31 | int __read_mostly softlockup_thresh = 60; |
@@ -79,6 +80,12 @@ void touch_softlockup_watchdog(void) | |||
79 | } | 80 | } |
80 | EXPORT_SYMBOL(touch_softlockup_watchdog); | 81 | EXPORT_SYMBOL(touch_softlockup_watchdog); |
81 | 82 | ||
83 | void touch_softlockup_watchdog_sync(void) | ||
84 | { | ||
85 | __raw_get_cpu_var(softlock_touch_sync) = true; | ||
86 | __raw_get_cpu_var(softlockup_touch_ts) = 0; | ||
87 | } | ||
88 | |||
82 | void touch_all_softlockup_watchdogs(void) | 89 | void touch_all_softlockup_watchdogs(void) |
83 | { | 90 | { |
84 | int cpu; | 91 | int cpu; |
@@ -118,6 +125,14 @@ void softlockup_tick(void) | |||
118 | } | 125 | } |
119 | 126 | ||
120 | if (touch_ts == 0) { | 127 | if (touch_ts == 0) { |
128 | if (unlikely(per_cpu(softlock_touch_sync, this_cpu))) { | ||
129 | /* | ||
130 | * If the time stamp was touched atomically | ||
131 | * make sure the scheduler tick is up to date. | ||
132 | */ | ||
133 | per_cpu(softlock_touch_sync, this_cpu) = false; | ||
134 | sched_clock_tick(); | ||
135 | } | ||
121 | __touch_softlockup_watchdog(); | 136 | __touch_softlockup_watchdog(); |
122 | return; | 137 | return; |
123 | } | 138 | } |
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index e85c23404d34..13700833c181 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -343,7 +343,19 @@ static void clocksource_resume_watchdog(void) | |||
343 | { | 343 | { |
344 | unsigned long flags; | 344 | unsigned long flags; |
345 | 345 | ||
346 | spin_lock_irqsave(&watchdog_lock, flags); | 346 | /* |
347 | * We use trylock here to avoid a potential dead lock when | ||
348 | * kgdb calls this code after the kernel has been stopped with | ||
349 | * watchdog_lock held. When watchdog_lock is held we just | ||
350 | * return and accept, that the watchdog might trigger and mark | ||
351 | * the monitored clock source (usually TSC) unstable. | ||
352 | * | ||
353 | * This does not affect the other caller clocksource_resume() | ||
354 | * because at this point the kernel is UP, interrupts are | ||
355 | * disabled and nothing can hold watchdog_lock. | ||
356 | */ | ||
357 | if (!spin_trylock_irqsave(&watchdog_lock, flags)) | ||
358 | return; | ||
347 | clocksource_reset_watchdog(); | 359 | clocksource_reset_watchdog(); |
348 | spin_unlock_irqrestore(&watchdog_lock, flags); | 360 | spin_unlock_irqrestore(&watchdog_lock, flags); |
349 | } | 361 | } |
@@ -458,8 +470,8 @@ void clocksource_resume(void) | |||
458 | * clocksource_touch_watchdog - Update watchdog | 470 | * clocksource_touch_watchdog - Update watchdog |
459 | * | 471 | * |
460 | * Update the watchdog after exception contexts such as kgdb so as not | 472 | * Update the watchdog after exception contexts such as kgdb so as not |
461 | * to incorrectly trip the watchdog. | 473 | * to incorrectly trip the watchdog. This might fail when the kernel |
462 | * | 474 | * was stopped in code which holds watchdog_lock. |
463 | */ | 475 | */ |
464 | void clocksource_touch_watchdog(void) | 476 | void clocksource_touch_watchdog(void) |
465 | { | 477 | { |
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 6c22d8a2f289..60e2ce0181ee 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
@@ -27,9 +27,7 @@ config HAVE_FUNCTION_GRAPH_TRACER | |||
27 | config HAVE_FUNCTION_GRAPH_FP_TEST | 27 | config HAVE_FUNCTION_GRAPH_FP_TEST |
28 | bool | 28 | bool |
29 | help | 29 | help |
30 | An arch may pass in a unique value (frame pointer) to both the | 30 | See Documentation/trace/ftrace-design.txt |
31 | entering and exiting of a function. On exit, the value is compared | ||
32 | and if it does not match, then it will panic the kernel. | ||
33 | 31 | ||
34 | config HAVE_FUNCTION_TRACE_MCOUNT_TEST | 32 | config HAVE_FUNCTION_TRACE_MCOUNT_TEST |
35 | bool | 33 | bool |
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index edefe3b2801b..8c1b2d290718 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -464,6 +464,8 @@ struct ring_buffer_iter { | |||
464 | struct ring_buffer_per_cpu *cpu_buffer; | 464 | struct ring_buffer_per_cpu *cpu_buffer; |
465 | unsigned long head; | 465 | unsigned long head; |
466 | struct buffer_page *head_page; | 466 | struct buffer_page *head_page; |
467 | struct buffer_page *cache_reader_page; | ||
468 | unsigned long cache_read; | ||
467 | u64 read_stamp; | 469 | u64 read_stamp; |
468 | }; | 470 | }; |
469 | 471 | ||
@@ -2716,6 +2718,8 @@ static void rb_iter_reset(struct ring_buffer_iter *iter) | |||
2716 | iter->read_stamp = cpu_buffer->read_stamp; | 2718 | iter->read_stamp = cpu_buffer->read_stamp; |
2717 | else | 2719 | else |
2718 | iter->read_stamp = iter->head_page->page->time_stamp; | 2720 | iter->read_stamp = iter->head_page->page->time_stamp; |
2721 | iter->cache_reader_page = cpu_buffer->reader_page; | ||
2722 | iter->cache_read = cpu_buffer->read; | ||
2719 | } | 2723 | } |
2720 | 2724 | ||
2721 | /** | 2725 | /** |
@@ -3060,13 +3064,22 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts) | |||
3060 | struct ring_buffer_event *event; | 3064 | struct ring_buffer_event *event; |
3061 | int nr_loops = 0; | 3065 | int nr_loops = 0; |
3062 | 3066 | ||
3063 | if (ring_buffer_iter_empty(iter)) | ||
3064 | return NULL; | ||
3065 | |||
3066 | cpu_buffer = iter->cpu_buffer; | 3067 | cpu_buffer = iter->cpu_buffer; |
3067 | buffer = cpu_buffer->buffer; | 3068 | buffer = cpu_buffer->buffer; |
3068 | 3069 | ||
3070 | /* | ||
3071 | * Check if someone performed a consuming read to | ||
3072 | * the buffer. A consuming read invalidates the iterator | ||
3073 | * and we need to reset the iterator in this case. | ||
3074 | */ | ||
3075 | if (unlikely(iter->cache_read != cpu_buffer->read || | ||
3076 | iter->cache_reader_page != cpu_buffer->reader_page)) | ||
3077 | rb_iter_reset(iter); | ||
3078 | |||
3069 | again: | 3079 | again: |
3080 | if (ring_buffer_iter_empty(iter)) | ||
3081 | return NULL; | ||
3082 | |||
3070 | /* | 3083 | /* |
3071 | * We repeat when a timestamp is encountered. | 3084 | * We repeat when a timestamp is encountered. |
3072 | * We can get multiple timestamps by nested interrupts or also | 3085 | * We can get multiple timestamps by nested interrupts or also |
@@ -3081,6 +3094,11 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts) | |||
3081 | if (rb_per_cpu_empty(cpu_buffer)) | 3094 | if (rb_per_cpu_empty(cpu_buffer)) |
3082 | return NULL; | 3095 | return NULL; |
3083 | 3096 | ||
3097 | if (iter->head >= local_read(&iter->head_page->page->commit)) { | ||
3098 | rb_inc_iter(iter); | ||
3099 | goto again; | ||
3100 | } | ||
3101 | |||
3084 | event = rb_iter_head_event(iter); | 3102 | event = rb_iter_head_event(iter); |
3085 | 3103 | ||
3086 | switch (event->type_len) { | 3104 | switch (event->type_len) { |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 0df1b0f2cb9e..eac6875cb990 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -951,6 +951,11 @@ void trace_find_cmdline(int pid, char comm[]) | |||
951 | return; | 951 | return; |
952 | } | 952 | } |
953 | 953 | ||
954 | if (WARN_ON_ONCE(pid < 0)) { | ||
955 | strcpy(comm, "<XXX>"); | ||
956 | return; | ||
957 | } | ||
958 | |||
954 | if (pid > PID_MAX_DEFAULT) { | 959 | if (pid > PID_MAX_DEFAULT) { |
955 | strcpy(comm, "<...>"); | 960 | strcpy(comm, "<...>"); |
956 | return; | 961 | return; |
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 7d2f0b33e5a8..ba8b67039d13 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
@@ -587,7 +587,7 @@ out_unlock: | |||
587 | return count; | 587 | return count; |
588 | } | 588 | } |
589 | 589 | ||
590 | const struct file_operations filter_fops = { | 590 | static const struct file_operations filter_fops = { |
591 | .read = filter_read, | 591 | .read = filter_read, |
592 | .write = filter_write, | 592 | .write = filter_write, |
593 | }; | 593 | }; |
diff --git a/mm/filemap.c b/mm/filemap.c index e3736923220e..698ea80f2102 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -2232,6 +2232,9 @@ again: | |||
2232 | if (unlikely(status)) | 2232 | if (unlikely(status)) |
2233 | break; | 2233 | break; |
2234 | 2234 | ||
2235 | if (mapping_writably_mapped(mapping)) | ||
2236 | flush_dcache_page(page); | ||
2237 | |||
2235 | pagefault_disable(); | 2238 | pagefault_disable(); |
2236 | copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes); | 2239 | copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes); |
2237 | pagefault_enable(); | 2240 | pagefault_enable(); |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e91b81b63670..2d16fa6b8c2d 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1515,10 +1515,9 @@ static struct attribute_group hstate_attr_group = { | |||
1515 | .attrs = hstate_attrs, | 1515 | .attrs = hstate_attrs, |
1516 | }; | 1516 | }; |
1517 | 1517 | ||
1518 | static int __init hugetlb_sysfs_add_hstate(struct hstate *h, | 1518 | static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent, |
1519 | struct kobject *parent, | 1519 | struct kobject **hstate_kobjs, |
1520 | struct kobject **hstate_kobjs, | 1520 | struct attribute_group *hstate_attr_group) |
1521 | struct attribute_group *hstate_attr_group) | ||
1522 | { | 1521 | { |
1523 | int retval; | 1522 | int retval; |
1524 | int hi = h - hstates; | 1523 | int hi = h - hstates; |
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d55d905463eb..ae007462b7f6 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
@@ -509,6 +509,9 @@ static unsigned long lazy_max_pages(void) | |||
509 | 509 | ||
510 | static atomic_t vmap_lazy_nr = ATOMIC_INIT(0); | 510 | static atomic_t vmap_lazy_nr = ATOMIC_INIT(0); |
511 | 511 | ||
512 | /* for per-CPU blocks */ | ||
513 | static void purge_fragmented_blocks_allcpus(void); | ||
514 | |||
512 | /* | 515 | /* |
513 | * Purges all lazily-freed vmap areas. | 516 | * Purges all lazily-freed vmap areas. |
514 | * | 517 | * |
@@ -539,6 +542,9 @@ static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end, | |||
539 | } else | 542 | } else |
540 | spin_lock(&purge_lock); | 543 | spin_lock(&purge_lock); |
541 | 544 | ||
545 | if (sync) | ||
546 | purge_fragmented_blocks_allcpus(); | ||
547 | |||
542 | rcu_read_lock(); | 548 | rcu_read_lock(); |
543 | list_for_each_entry_rcu(va, &vmap_area_list, list) { | 549 | list_for_each_entry_rcu(va, &vmap_area_list, list) { |
544 | if (va->flags & VM_LAZY_FREE) { | 550 | if (va->flags & VM_LAZY_FREE) { |
@@ -667,8 +673,6 @@ static bool vmap_initialized __read_mostly = false; | |||
667 | struct vmap_block_queue { | 673 | struct vmap_block_queue { |
668 | spinlock_t lock; | 674 | spinlock_t lock; |
669 | struct list_head free; | 675 | struct list_head free; |
670 | struct list_head dirty; | ||
671 | unsigned int nr_dirty; | ||
672 | }; | 676 | }; |
673 | 677 | ||
674 | struct vmap_block { | 678 | struct vmap_block { |
@@ -678,10 +682,9 @@ struct vmap_block { | |||
678 | unsigned long free, dirty; | 682 | unsigned long free, dirty; |
679 | DECLARE_BITMAP(alloc_map, VMAP_BBMAP_BITS); | 683 | DECLARE_BITMAP(alloc_map, VMAP_BBMAP_BITS); |
680 | DECLARE_BITMAP(dirty_map, VMAP_BBMAP_BITS); | 684 | DECLARE_BITMAP(dirty_map, VMAP_BBMAP_BITS); |
681 | union { | 685 | struct list_head free_list; |
682 | struct list_head free_list; | 686 | struct rcu_head rcu_head; |
683 | struct rcu_head rcu_head; | 687 | struct list_head purge; |
684 | }; | ||
685 | }; | 688 | }; |
686 | 689 | ||
687 | /* Queue of free and dirty vmap blocks, for allocation and flushing purposes */ | 690 | /* Queue of free and dirty vmap blocks, for allocation and flushing purposes */ |
@@ -757,7 +760,7 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask) | |||
757 | vbq = &get_cpu_var(vmap_block_queue); | 760 | vbq = &get_cpu_var(vmap_block_queue); |
758 | vb->vbq = vbq; | 761 | vb->vbq = vbq; |
759 | spin_lock(&vbq->lock); | 762 | spin_lock(&vbq->lock); |
760 | list_add(&vb->free_list, &vbq->free); | 763 | list_add_rcu(&vb->free_list, &vbq->free); |
761 | spin_unlock(&vbq->lock); | 764 | spin_unlock(&vbq->lock); |
762 | put_cpu_var(vmap_block_queue); | 765 | put_cpu_var(vmap_block_queue); |
763 | 766 | ||
@@ -776,8 +779,6 @@ static void free_vmap_block(struct vmap_block *vb) | |||
776 | struct vmap_block *tmp; | 779 | struct vmap_block *tmp; |
777 | unsigned long vb_idx; | 780 | unsigned long vb_idx; |
778 | 781 | ||
779 | BUG_ON(!list_empty(&vb->free_list)); | ||
780 | |||
781 | vb_idx = addr_to_vb_idx(vb->va->va_start); | 782 | vb_idx = addr_to_vb_idx(vb->va->va_start); |
782 | spin_lock(&vmap_block_tree_lock); | 783 | spin_lock(&vmap_block_tree_lock); |
783 | tmp = radix_tree_delete(&vmap_block_tree, vb_idx); | 784 | tmp = radix_tree_delete(&vmap_block_tree, vb_idx); |
@@ -788,12 +789,61 @@ static void free_vmap_block(struct vmap_block *vb) | |||
788 | call_rcu(&vb->rcu_head, rcu_free_vb); | 789 | call_rcu(&vb->rcu_head, rcu_free_vb); |
789 | } | 790 | } |
790 | 791 | ||
792 | static void purge_fragmented_blocks(int cpu) | ||
793 | { | ||
794 | LIST_HEAD(purge); | ||
795 | struct vmap_block *vb; | ||
796 | struct vmap_block *n_vb; | ||
797 | struct vmap_block_queue *vbq = &per_cpu(vmap_block_queue, cpu); | ||
798 | |||
799 | rcu_read_lock(); | ||
800 | list_for_each_entry_rcu(vb, &vbq->free, free_list) { | ||
801 | |||
802 | if (!(vb->free + vb->dirty == VMAP_BBMAP_BITS && vb->dirty != VMAP_BBMAP_BITS)) | ||
803 | continue; | ||
804 | |||
805 | spin_lock(&vb->lock); | ||
806 | if (vb->free + vb->dirty == VMAP_BBMAP_BITS && vb->dirty != VMAP_BBMAP_BITS) { | ||
807 | vb->free = 0; /* prevent further allocs after releasing lock */ | ||
808 | vb->dirty = VMAP_BBMAP_BITS; /* prevent purging it again */ | ||
809 | bitmap_fill(vb->alloc_map, VMAP_BBMAP_BITS); | ||
810 | bitmap_fill(vb->dirty_map, VMAP_BBMAP_BITS); | ||
811 | spin_lock(&vbq->lock); | ||
812 | list_del_rcu(&vb->free_list); | ||
813 | spin_unlock(&vbq->lock); | ||
814 | spin_unlock(&vb->lock); | ||
815 | list_add_tail(&vb->purge, &purge); | ||
816 | } else | ||
817 | spin_unlock(&vb->lock); | ||
818 | } | ||
819 | rcu_read_unlock(); | ||
820 | |||
821 | list_for_each_entry_safe(vb, n_vb, &purge, purge) { | ||
822 | list_del(&vb->purge); | ||
823 | free_vmap_block(vb); | ||
824 | } | ||
825 | } | ||
826 | |||
827 | static void purge_fragmented_blocks_thiscpu(void) | ||
828 | { | ||
829 | purge_fragmented_blocks(smp_processor_id()); | ||
830 | } | ||
831 | |||
832 | static void purge_fragmented_blocks_allcpus(void) | ||
833 | { | ||
834 | int cpu; | ||
835 | |||
836 | for_each_possible_cpu(cpu) | ||
837 | purge_fragmented_blocks(cpu); | ||
838 | } | ||
839 | |||
791 | static void *vb_alloc(unsigned long size, gfp_t gfp_mask) | 840 | static void *vb_alloc(unsigned long size, gfp_t gfp_mask) |
792 | { | 841 | { |
793 | struct vmap_block_queue *vbq; | 842 | struct vmap_block_queue *vbq; |
794 | struct vmap_block *vb; | 843 | struct vmap_block *vb; |
795 | unsigned long addr = 0; | 844 | unsigned long addr = 0; |
796 | unsigned int order; | 845 | unsigned int order; |
846 | int purge = 0; | ||
797 | 847 | ||
798 | BUG_ON(size & ~PAGE_MASK); | 848 | BUG_ON(size & ~PAGE_MASK); |
799 | BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC); | 849 | BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC); |
@@ -806,24 +856,38 @@ again: | |||
806 | int i; | 856 | int i; |
807 | 857 | ||
808 | spin_lock(&vb->lock); | 858 | spin_lock(&vb->lock); |
859 | if (vb->free < 1UL << order) | ||
860 | goto next; | ||
861 | |||
809 | i = bitmap_find_free_region(vb->alloc_map, | 862 | i = bitmap_find_free_region(vb->alloc_map, |
810 | VMAP_BBMAP_BITS, order); | 863 | VMAP_BBMAP_BITS, order); |
811 | 864 | ||
812 | if (i >= 0) { | 865 | if (i < 0) { |
813 | addr = vb->va->va_start + (i << PAGE_SHIFT); | 866 | if (vb->free + vb->dirty == VMAP_BBMAP_BITS) { |
814 | BUG_ON(addr_to_vb_idx(addr) != | 867 | /* fragmented and no outstanding allocations */ |
815 | addr_to_vb_idx(vb->va->va_start)); | 868 | BUG_ON(vb->dirty != VMAP_BBMAP_BITS); |
816 | vb->free -= 1UL << order; | 869 | purge = 1; |
817 | if (vb->free == 0) { | ||
818 | spin_lock(&vbq->lock); | ||
819 | list_del_init(&vb->free_list); | ||
820 | spin_unlock(&vbq->lock); | ||
821 | } | 870 | } |
822 | spin_unlock(&vb->lock); | 871 | goto next; |
823 | break; | ||
824 | } | 872 | } |
873 | addr = vb->va->va_start + (i << PAGE_SHIFT); | ||
874 | BUG_ON(addr_to_vb_idx(addr) != | ||
875 | addr_to_vb_idx(vb->va->va_start)); | ||
876 | vb->free -= 1UL << order; | ||
877 | if (vb->free == 0) { | ||
878 | spin_lock(&vbq->lock); | ||
879 | list_del_rcu(&vb->free_list); | ||
880 | spin_unlock(&vbq->lock); | ||
881 | } | ||
882 | spin_unlock(&vb->lock); | ||
883 | break; | ||
884 | next: | ||
825 | spin_unlock(&vb->lock); | 885 | spin_unlock(&vb->lock); |
826 | } | 886 | } |
887 | |||
888 | if (purge) | ||
889 | purge_fragmented_blocks_thiscpu(); | ||
890 | |||
827 | put_cpu_var(vmap_block_queue); | 891 | put_cpu_var(vmap_block_queue); |
828 | rcu_read_unlock(); | 892 | rcu_read_unlock(); |
829 | 893 | ||
@@ -860,11 +924,11 @@ static void vb_free(const void *addr, unsigned long size) | |||
860 | BUG_ON(!vb); | 924 | BUG_ON(!vb); |
861 | 925 | ||
862 | spin_lock(&vb->lock); | 926 | spin_lock(&vb->lock); |
863 | bitmap_allocate_region(vb->dirty_map, offset >> PAGE_SHIFT, order); | 927 | BUG_ON(bitmap_allocate_region(vb->dirty_map, offset >> PAGE_SHIFT, order)); |
864 | 928 | ||
865 | vb->dirty += 1UL << order; | 929 | vb->dirty += 1UL << order; |
866 | if (vb->dirty == VMAP_BBMAP_BITS) { | 930 | if (vb->dirty == VMAP_BBMAP_BITS) { |
867 | BUG_ON(vb->free || !list_empty(&vb->free_list)); | 931 | BUG_ON(vb->free); |
868 | spin_unlock(&vb->lock); | 932 | spin_unlock(&vb->lock); |
869 | free_vmap_block(vb); | 933 | free_vmap_block(vb); |
870 | } else | 934 | } else |
@@ -1033,8 +1097,6 @@ void __init vmalloc_init(void) | |||
1033 | vbq = &per_cpu(vmap_block_queue, i); | 1097 | vbq = &per_cpu(vmap_block_queue, i); |
1034 | spin_lock_init(&vbq->lock); | 1098 | spin_lock_init(&vbq->lock); |
1035 | INIT_LIST_HEAD(&vbq->free); | 1099 | INIT_LIST_HEAD(&vbq->free); |
1036 | INIT_LIST_HEAD(&vbq->dirty); | ||
1037 | vbq->nr_dirty = 0; | ||
1038 | } | 1100 | } |
1039 | 1101 | ||
1040 | /* Import existing vmlist entries. */ | 1102 | /* Import existing vmlist entries. */ |
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 18e7f5a43dc4..6cf526d06e21 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c | |||
@@ -243,6 +243,39 @@ static void hidp_input_report(struct hidp_session *session, struct sk_buff *skb) | |||
243 | input_sync(dev); | 243 | input_sync(dev); |
244 | } | 244 | } |
245 | 245 | ||
246 | static int __hidp_send_ctrl_message(struct hidp_session *session, | ||
247 | unsigned char hdr, unsigned char *data, int size) | ||
248 | { | ||
249 | struct sk_buff *skb; | ||
250 | |||
251 | BT_DBG("session %p data %p size %d", session, data, size); | ||
252 | |||
253 | if (!(skb = alloc_skb(size + 1, GFP_ATOMIC))) { | ||
254 | BT_ERR("Can't allocate memory for new frame"); | ||
255 | return -ENOMEM; | ||
256 | } | ||
257 | |||
258 | *skb_put(skb, 1) = hdr; | ||
259 | if (data && size > 0) | ||
260 | memcpy(skb_put(skb, size), data, size); | ||
261 | |||
262 | skb_queue_tail(&session->ctrl_transmit, skb); | ||
263 | |||
264 | return 0; | ||
265 | } | ||
266 | |||
267 | static inline int hidp_send_ctrl_message(struct hidp_session *session, | ||
268 | unsigned char hdr, unsigned char *data, int size) | ||
269 | { | ||
270 | int err; | ||
271 | |||
272 | err = __hidp_send_ctrl_message(session, hdr, data, size); | ||
273 | |||
274 | hidp_schedule(session); | ||
275 | |||
276 | return err; | ||
277 | } | ||
278 | |||
246 | static int hidp_queue_report(struct hidp_session *session, | 279 | static int hidp_queue_report(struct hidp_session *session, |
247 | unsigned char *data, int size) | 280 | unsigned char *data, int size) |
248 | { | 281 | { |
@@ -282,7 +315,9 @@ static int hidp_send_report(struct hidp_session *session, struct hid_report *rep | |||
282 | 315 | ||
283 | static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count) | 316 | static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count) |
284 | { | 317 | { |
285 | if (hidp_queue_report(hid->driver_data, data, count)) | 318 | if (hidp_send_ctrl_message(hid->driver_data, |
319 | HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE, | ||
320 | data, count)) | ||
286 | return -ENOMEM; | 321 | return -ENOMEM; |
287 | return count; | 322 | return count; |
288 | } | 323 | } |
@@ -307,39 +342,6 @@ static inline void hidp_del_timer(struct hidp_session *session) | |||
307 | del_timer(&session->timer); | 342 | del_timer(&session->timer); |
308 | } | 343 | } |
309 | 344 | ||
310 | static int __hidp_send_ctrl_message(struct hidp_session *session, | ||
311 | unsigned char hdr, unsigned char *data, int size) | ||
312 | { | ||
313 | struct sk_buff *skb; | ||
314 | |||
315 | BT_DBG("session %p data %p size %d", session, data, size); | ||
316 | |||
317 | if (!(skb = alloc_skb(size + 1, GFP_ATOMIC))) { | ||
318 | BT_ERR("Can't allocate memory for new frame"); | ||
319 | return -ENOMEM; | ||
320 | } | ||
321 | |||
322 | *skb_put(skb, 1) = hdr; | ||
323 | if (data && size > 0) | ||
324 | memcpy(skb_put(skb, size), data, size); | ||
325 | |||
326 | skb_queue_tail(&session->ctrl_transmit, skb); | ||
327 | |||
328 | return 0; | ||
329 | } | ||
330 | |||
331 | static inline int hidp_send_ctrl_message(struct hidp_session *session, | ||
332 | unsigned char hdr, unsigned char *data, int size) | ||
333 | { | ||
334 | int err; | ||
335 | |||
336 | err = __hidp_send_ctrl_message(session, hdr, data, size); | ||
337 | |||
338 | hidp_schedule(session); | ||
339 | |||
340 | return err; | ||
341 | } | ||
342 | |||
343 | static void hidp_process_handshake(struct hidp_session *session, | 345 | static void hidp_process_handshake(struct hidp_session *session, |
344 | unsigned char param) | 346 | unsigned char param) |
345 | { | 347 | { |
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 1120cf14a548..400efa26ddba 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -1368,7 +1368,6 @@ static int l2cap_ertm_send(struct sock *sk) | |||
1368 | 1368 | ||
1369 | while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) && | 1369 | while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) && |
1370 | !(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) { | 1370 | !(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) { |
1371 | tx_skb = skb_clone(skb, GFP_ATOMIC); | ||
1372 | 1371 | ||
1373 | if (pi->remote_max_tx && | 1372 | if (pi->remote_max_tx && |
1374 | bt_cb(skb)->retries == pi->remote_max_tx) { | 1373 | bt_cb(skb)->retries == pi->remote_max_tx) { |
@@ -1376,6 +1375,8 @@ static int l2cap_ertm_send(struct sock *sk) | |||
1376 | break; | 1375 | break; |
1377 | } | 1376 | } |
1378 | 1377 | ||
1378 | tx_skb = skb_clone(skb, GFP_ATOMIC); | ||
1379 | |||
1379 | bt_cb(skb)->retries++; | 1380 | bt_cb(skb)->retries++; |
1380 | 1381 | ||
1381 | control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE); | 1382 | control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE); |
@@ -3518,7 +3519,6 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk | |||
3518 | struct l2cap_pinfo *pi; | 3519 | struct l2cap_pinfo *pi; |
3519 | u16 control, len; | 3520 | u16 control, len; |
3520 | u8 tx_seq; | 3521 | u8 tx_seq; |
3521 | int err; | ||
3522 | 3522 | ||
3523 | sk = l2cap_get_chan_by_scid(&conn->chan_list, cid); | 3523 | sk = l2cap_get_chan_by_scid(&conn->chan_list, cid); |
3524 | if (!sk) { | 3524 | if (!sk) { |
@@ -3570,13 +3570,11 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk | |||
3570 | goto drop; | 3570 | goto drop; |
3571 | 3571 | ||
3572 | if (__is_iframe(control)) | 3572 | if (__is_iframe(control)) |
3573 | err = l2cap_data_channel_iframe(sk, control, skb); | 3573 | l2cap_data_channel_iframe(sk, control, skb); |
3574 | else | 3574 | else |
3575 | err = l2cap_data_channel_sframe(sk, control, skb); | 3575 | l2cap_data_channel_sframe(sk, control, skb); |
3576 | 3576 | ||
3577 | if (!err) | 3577 | goto done; |
3578 | goto done; | ||
3579 | break; | ||
3580 | 3578 | ||
3581 | case L2CAP_MODE_STREAMING: | 3579 | case L2CAP_MODE_STREAMING: |
3582 | control = get_unaligned_le16(skb->data); | 3580 | control = get_unaligned_le16(skb->data); |
@@ -3602,7 +3600,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk | |||
3602 | else | 3600 | else |
3603 | pi->expected_tx_seq = tx_seq + 1; | 3601 | pi->expected_tx_seq = tx_seq + 1; |
3604 | 3602 | ||
3605 | err = l2cap_sar_reassembly_sdu(sk, skb, control); | 3603 | l2cap_sar_reassembly_sdu(sk, skb, control); |
3606 | 3604 | ||
3607 | goto done; | 3605 | goto done; |
3608 | 3606 | ||
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 312c20adc83f..624a54832a7c 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
@@ -63,6 +63,7 @@ struct nf_ct_frag6_queue | |||
63 | struct inet_frag_queue q; | 63 | struct inet_frag_queue q; |
64 | 64 | ||
65 | __be32 id; /* fragment id */ | 65 | __be32 id; /* fragment id */ |
66 | u32 user; | ||
66 | struct in6_addr saddr; | 67 | struct in6_addr saddr; |
67 | struct in6_addr daddr; | 68 | struct in6_addr daddr; |
68 | 69 | ||
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index ee94ea0c67e9..da8497ef7063 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h | |||
@@ -680,7 +680,7 @@ TRACE_EVENT(drv_ampdu_action, | |||
680 | __entry->ret = ret; | 680 | __entry->ret = ret; |
681 | __entry->action = action; | 681 | __entry->action = action; |
682 | __entry->tid = tid; | 682 | __entry->tid = tid; |
683 | __entry->ssn = *ssn; | 683 | __entry->ssn = ssn ? *ssn : 0; |
684 | ), | 684 | ), |
685 | 685 | ||
686 | TP_printk( | 686 | TP_printk( |
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 59d8064eb522..42f21c01a93e 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -1437,8 +1437,9 @@ ctnetlink_exp_dump_mask(struct sk_buff *skb, | |||
1437 | struct nlattr *nest_parms; | 1437 | struct nlattr *nest_parms; |
1438 | 1438 | ||
1439 | memset(&m, 0xFF, sizeof(m)); | 1439 | memset(&m, 0xFF, sizeof(m)); |
1440 | m.src.u.all = mask->src.u.all; | ||
1441 | memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3)); | 1440 | memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3)); |
1441 | m.src.u.all = mask->src.u.all; | ||
1442 | m.dst.protonum = tuple->dst.protonum; | ||
1442 | 1443 | ||
1443 | nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED); | 1444 | nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED); |
1444 | if (!nest_parms) | 1445 | if (!nest_parms) |
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 4b572163784b..023966b569bf 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c | |||
@@ -376,7 +376,7 @@ int ct_sip_get_header(const struct nf_conn *ct, const char *dptr, | |||
376 | dptr += hdr->len; | 376 | dptr += hdr->len; |
377 | else if (hdr->cname && limit - dptr >= hdr->clen + 1 && | 377 | else if (hdr->cname && limit - dptr >= hdr->clen + 1 && |
378 | strnicmp(dptr, hdr->cname, hdr->clen) == 0 && | 378 | strnicmp(dptr, hdr->cname, hdr->clen) == 0 && |
379 | !isalpha(*(dptr + hdr->clen + 1))) | 379 | !isalpha(*(dptr + hdr->clen))) |
380 | dptr += hdr->clen; | 380 | dptr += hdr->clen; |
381 | else | 381 | else |
382 | continue; | 382 | continue; |
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 090f24839700..2f3230db7ffb 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl | |||
@@ -74,8 +74,8 @@ my %VCS_cmds; | |||
74 | my %VCS_cmds_git = ( | 74 | my %VCS_cmds_git = ( |
75 | "execute_cmd" => \&git_execute_cmd, | 75 | "execute_cmd" => \&git_execute_cmd, |
76 | "available" => '(which("git") ne "") && (-d ".git")', | 76 | "available" => '(which("git") ne "") && (-d ".git")', |
77 | "find_signers_cmd" => "git log --since=\$email_git_since -- \$file", | 77 | "find_signers_cmd" => "git log --no-color --since=\$email_git_since -- \$file", |
78 | "find_commit_signers_cmd" => "git log -1 \$commit", | 78 | "find_commit_signers_cmd" => "git log --no-color -1 \$commit", |
79 | "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", | 79 | "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", |
80 | "blame_file_cmd" => "git blame -l \$file", | 80 | "blame_file_cmd" => "git blame -l \$file", |
81 | "commit_pattern" => "^commit [0-9a-f]{40,40}", | 81 | "commit_pattern" => "^commit [0-9a-f]{40,40}", |
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl index ce3e40b01e48..e950f9cde019 100644 --- a/scripts/markup_oops.pl +++ b/scripts/markup_oops.pl | |||
@@ -158,7 +158,7 @@ while (<STDIN>) { | |||
158 | $function = $1; | 158 | $function = $1; |
159 | $func_offset = $2; | 159 | $func_offset = $2; |
160 | } | 160 | } |
161 | if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\] \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]/) { | 161 | if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\] \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+0x([0-9a-f]+)\/0x[a-f0-9]/) { |
162 | $function = $1; | 162 | $function = $1; |
163 | $func_offset = $2; | 163 | $func_offset = $2; |
164 | } | 164 | } |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ec9c348336cc..565de38a3fc7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -2332,6 +2332,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev) | |||
2332 | */ | 2332 | */ |
2333 | static struct snd_pci_quirk msi_black_list[] __devinitdata = { | 2333 | static struct snd_pci_quirk msi_black_list[] __devinitdata = { |
2334 | SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ | 2334 | SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ |
2335 | SND_PCI_QUIRK(0x1043, 0x829c, "ASUS", 0), /* nvidia */ | ||
2335 | {} | 2336 | {} |
2336 | }; | 2337 | }; |
2337 | 2338 | ||
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index a9dc5fb54774..da589d8664d0 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
@@ -627,7 +627,7 @@ static int tlv320aic23_resume(struct platform_device *pdev) | |||
627 | u16 reg; | 627 | u16 reg; |
628 | 628 | ||
629 | /* Sync reg_cache with the hardware */ | 629 | /* Sync reg_cache with the hardware */ |
630 | for (reg = 0; reg < TLV320AIC23_RESET; reg++) { | 630 | for (reg = 0; reg <= TLV320AIC23_ACTIVE; reg++) { |
631 | u16 val = tlv320aic23_read_reg_cache(codec, reg); | 631 | u16 val = tlv320aic23_read_reg_cache(codec, reg); |
632 | tlv320aic23_write(codec, reg, val); | 632 | tlv320aic23_write(codec, reg, val); |
633 | } | 633 | } |
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 3db8a6c523f4..19283e5edfbf 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile | |||
@@ -25,7 +25,7 @@ obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o | |||
25 | obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o | 25 | obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o |
26 | obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o | 26 | obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o |
27 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o | 27 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o |
28 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3517EVM) += snd-soc-am3517evm.o | 28 | obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o |
29 | obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o | 29 | obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o |
30 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o | 30 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o |
31 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o | 31 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o |
diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore index fe08660ce0bd..124760bb37b5 100644 --- a/tools/perf/.gitignore +++ b/tools/perf/.gitignore | |||
@@ -13,6 +13,7 @@ perf*.xml | |||
13 | perf*.html | 13 | perf*.html |
14 | common-cmds.h | 14 | common-cmds.h |
15 | perf.data | 15 | perf.data |
16 | perf.data.old | ||
16 | tags | 17 | tags |
17 | TAGS | 18 | TAGS |
18 | cscope* | 19 | cscope* |
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index db10c0e8ecae..860f1eeeea7d 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -269,7 +269,7 @@ parse_callchain_opt(const struct option *opt __used, const char *arg, | |||
269 | 269 | ||
270 | else if (!strncmp(tok, "none", strlen(arg))) { | 270 | else if (!strncmp(tok, "none", strlen(arg))) { |
271 | callchain_param.mode = CHAIN_NONE; | 271 | callchain_param.mode = CHAIN_NONE; |
272 | symbol_conf.use_callchain = true; | 272 | symbol_conf.use_callchain = false; |
273 | 273 | ||
274 | return 0; | 274 | return 0; |
275 | } | 275 | } |