diff options
Diffstat (limited to 'arch')
402 files changed, 7386 insertions, 4859 deletions
diff --git a/arch/alpha/include/asm/tlb.h b/arch/alpha/include/asm/tlb.h index c13636575fba..42866759f3fa 100644 --- a/arch/alpha/include/asm/tlb.h +++ b/arch/alpha/include/asm/tlb.h | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | #include <asm-generic/tlb.h> | 10 | #include <asm-generic/tlb.h> |
11 | 11 | ||
12 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) | 12 | #define __pte_free_tlb(tlb, pte, address) pte_free((tlb)->mm, pte) |
13 | #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd) | 13 | #define __pmd_free_tlb(tlb, pmd, address) pmd_free((tlb)->mm, pmd) |
14 | 14 | ||
15 | #endif | 15 | #endif |
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 9e6e512f0117..17153b54613b 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
@@ -29,7 +29,6 @@ unsigned int __machine_arch_type; | |||
29 | 29 | ||
30 | static void putstr(const char *ptr); | 30 | static void putstr(const char *ptr); |
31 | 31 | ||
32 | #include <linux/compiler.h> | ||
33 | #include <mach/uncompress.h> | 32 | #include <mach/uncompress.h> |
34 | 33 | ||
35 | #ifdef CONFIG_DEBUG_ICEDCC | 34 | #ifdef CONFIG_DEBUG_ICEDCC |
diff --git a/arch/arm/common/clkdev.c b/arch/arm/common/clkdev.c index f37afd9422f3..aae5bc01acc8 100644 --- a/arch/arm/common/clkdev.c +++ b/arch/arm/common/clkdev.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
19 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
20 | #include <linux/clk.h> | ||
20 | 21 | ||
21 | #include <asm/clkdev.h> | 22 | #include <asm/clkdev.h> |
22 | #include <mach/clkdev.h> | 23 | #include <mach/clkdev.h> |
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index 0a1abb978d7e..af74cc2de8b6 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig | |||
@@ -629,7 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
629 | CONFIG_ATA=y | 629 | CONFIG_ATA=y |
630 | # CONFIG_ATA_NONSTANDARD is not set | 630 | # CONFIG_ATA_NONSTANDARD is not set |
631 | CONFIG_SATA_PMP=y | 631 | CONFIG_SATA_PMP=y |
632 | # CONFIG_SATA_AHCI is not set | 632 | CONFIG_SATA_AHCI=y |
633 | # CONFIG_SATA_SIL24 is not set | 633 | # CONFIG_SATA_SIL24 is not set |
634 | CONFIG_ATA_SFF=y | 634 | CONFIG_ATA_SFF=y |
635 | # CONFIG_SATA_SVW is not set | 635 | # CONFIG_SATA_SVW is not set |
diff --git a/arch/arm/configs/mx27_defconfig b/arch/arm/configs/mx27_defconfig index 083516cd0d7f..75263a83741c 100644 --- a/arch/arm/configs/mx27_defconfig +++ b/arch/arm/configs/mx27_defconfig | |||
@@ -1,15 +1,15 @@ | |||
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-rc1 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed Apr 8 10:18:06 2009 | 4 | # Fri Jul 24 16:08:06 2009 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_HAVE_PWM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 8 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | CONFIG_GENERIC_GPIO=y | 9 | CONFIG_GENERIC_GPIO=y |
9 | CONFIG_GENERIC_TIME=y | 10 | CONFIG_GENERIC_TIME=y |
10 | CONFIG_GENERIC_CLOCKEVENTS=y | 11 | CONFIG_GENERIC_CLOCKEVENTS=y |
11 | CONFIG_MMU=y | 12 | CONFIG_MMU=y |
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
14 | CONFIG_STACKTRACE_SUPPORT=y | 14 | CONFIG_STACKTRACE_SUPPORT=y |
15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
@@ -18,14 +18,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y | |||
18 | CONFIG_HARDIRQS_SW_RESEND=y | 18 | CONFIG_HARDIRQS_SW_RESEND=y |
19 | CONFIG_GENERIC_IRQ_PROBE=y | 19 | CONFIG_GENERIC_IRQ_PROBE=y |
20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
23 | CONFIG_GENERIC_HWEIGHT=y | 21 | CONFIG_GENERIC_HWEIGHT=y |
24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 22 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
25 | CONFIG_ARCH_MTD_XIP=y | 23 | CONFIG_ARCH_MTD_XIP=y |
26 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 24 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
27 | CONFIG_VECTORS_BASE=0xffff0000 | 25 | CONFIG_VECTORS_BASE=0xffff0000 |
28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
27 | CONFIG_CONSTRUCTORS=y | ||
29 | 28 | ||
30 | # | 29 | # |
31 | # General setup | 30 | # General setup |
@@ -85,7 +84,12 @@ CONFIG_TIMERFD=y | |||
85 | CONFIG_EVENTFD=y | 84 | CONFIG_EVENTFD=y |
86 | CONFIG_SHMEM=y | 85 | CONFIG_SHMEM=y |
87 | CONFIG_AIO=y | 86 | CONFIG_AIO=y |
87 | |||
88 | # | ||
89 | # Performance Counters | ||
90 | # | ||
88 | CONFIG_VM_EVENT_COUNTERS=y | 91 | CONFIG_VM_EVENT_COUNTERS=y |
92 | # CONFIG_STRIP_ASM_SYMS is not set | ||
89 | # CONFIG_COMPAT_BRK is not set | 93 | # CONFIG_COMPAT_BRK is not set |
90 | CONFIG_SLAB=y | 94 | CONFIG_SLAB=y |
91 | # CONFIG_SLUB is not set | 95 | # CONFIG_SLUB is not set |
@@ -99,6 +103,12 @@ CONFIG_KPROBES=y | |||
99 | CONFIG_KRETPROBES=y | 103 | CONFIG_KRETPROBES=y |
100 | CONFIG_HAVE_KPROBES=y | 104 | CONFIG_HAVE_KPROBES=y |
101 | CONFIG_HAVE_KRETPROBES=y | 105 | CONFIG_HAVE_KRETPROBES=y |
106 | CONFIG_HAVE_CLK=y | ||
107 | |||
108 | # | ||
109 | # GCOV-based kernel profiling | ||
110 | # | ||
111 | # CONFIG_GCOV_KERNEL is not set | ||
102 | # CONFIG_SLOW_WORK is not set | 112 | # CONFIG_SLOW_WORK is not set |
103 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | 113 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
104 | CONFIG_SLABINFO=y | 114 | CONFIG_SLABINFO=y |
@@ -111,7 +121,7 @@ CONFIG_MODULE_UNLOAD=y | |||
111 | # CONFIG_MODVERSIONS is not set | 121 | # CONFIG_MODVERSIONS is not set |
112 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 122 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
113 | CONFIG_BLOCK=y | 123 | CONFIG_BLOCK=y |
114 | # CONFIG_LBD is not set | 124 | CONFIG_LBDAF=y |
115 | # CONFIG_BLK_DEV_BSG is not set | 125 | # CONFIG_BLK_DEV_BSG is not set |
116 | # CONFIG_BLK_DEV_INTEGRITY is not set | 126 | # CONFIG_BLK_DEV_INTEGRITY is not set |
117 | 127 | ||
@@ -138,13 +148,14 @@ CONFIG_FREEZER=y | |||
138 | # CONFIG_ARCH_VERSATILE is not set | 148 | # CONFIG_ARCH_VERSATILE is not set |
139 | # CONFIG_ARCH_AT91 is not set | 149 | # CONFIG_ARCH_AT91 is not set |
140 | # CONFIG_ARCH_CLPS711X is not set | 150 | # CONFIG_ARCH_CLPS711X is not set |
151 | # CONFIG_ARCH_GEMINI is not set | ||
141 | # CONFIG_ARCH_EBSA110 is not set | 152 | # CONFIG_ARCH_EBSA110 is not set |
142 | # CONFIG_ARCH_EP93XX is not set | 153 | # CONFIG_ARCH_EP93XX is not set |
143 | # CONFIG_ARCH_GEMINI is not set | ||
144 | # CONFIG_ARCH_FOOTBRIDGE is not set | 154 | # CONFIG_ARCH_FOOTBRIDGE is not set |
155 | CONFIG_ARCH_MXC=y | ||
156 | # CONFIG_ARCH_STMP3XXX is not set | ||
145 | # CONFIG_ARCH_NETX is not set | 157 | # CONFIG_ARCH_NETX is not set |
146 | # CONFIG_ARCH_H720X is not set | 158 | # CONFIG_ARCH_H720X is not set |
147 | # CONFIG_ARCH_IMX is not set | ||
148 | # CONFIG_ARCH_IOP13XX is not set | 159 | # CONFIG_ARCH_IOP13XX is not set |
149 | # CONFIG_ARCH_IOP32X is not set | 160 | # CONFIG_ARCH_IOP32X is not set |
150 | # CONFIG_ARCH_IOP33X is not set | 161 | # CONFIG_ARCH_IOP33X is not set |
@@ -153,25 +164,25 @@ CONFIG_FREEZER=y | |||
153 | # CONFIG_ARCH_IXP4XX is not set | 164 | # CONFIG_ARCH_IXP4XX is not set |
154 | # CONFIG_ARCH_L7200 is not set | 165 | # CONFIG_ARCH_L7200 is not set |
155 | # CONFIG_ARCH_KIRKWOOD is not set | 166 | # CONFIG_ARCH_KIRKWOOD is not set |
156 | # CONFIG_ARCH_KS8695 is not set | ||
157 | # CONFIG_ARCH_NS9XXX is not set | ||
158 | # CONFIG_ARCH_LOKI is not set | 167 | # CONFIG_ARCH_LOKI is not set |
159 | # CONFIG_ARCH_MV78XX0 is not set | 168 | # CONFIG_ARCH_MV78XX0 is not set |
160 | CONFIG_ARCH_MXC=y | ||
161 | # CONFIG_ARCH_ORION5X is not set | 169 | # CONFIG_ARCH_ORION5X is not set |
170 | # CONFIG_ARCH_MMP is not set | ||
171 | # CONFIG_ARCH_KS8695 is not set | ||
172 | # CONFIG_ARCH_NS9XXX is not set | ||
173 | # CONFIG_ARCH_W90X900 is not set | ||
162 | # CONFIG_ARCH_PNX4008 is not set | 174 | # CONFIG_ARCH_PNX4008 is not set |
163 | # CONFIG_ARCH_PXA is not set | 175 | # CONFIG_ARCH_PXA is not set |
164 | # CONFIG_ARCH_MMP is not set | 176 | # CONFIG_ARCH_MSM is not set |
165 | # CONFIG_ARCH_RPC is not set | 177 | # CONFIG_ARCH_RPC is not set |
166 | # CONFIG_ARCH_SA1100 is not set | 178 | # CONFIG_ARCH_SA1100 is not set |
167 | # CONFIG_ARCH_S3C2410 is not set | 179 | # CONFIG_ARCH_S3C2410 is not set |
168 | # CONFIG_ARCH_S3C64XX is not set | 180 | # CONFIG_ARCH_S3C64XX is not set |
169 | # CONFIG_ARCH_SHARK is not set | 181 | # CONFIG_ARCH_SHARK is not set |
170 | # CONFIG_ARCH_LH7A40X is not set | 182 | # CONFIG_ARCH_LH7A40X is not set |
183 | # CONFIG_ARCH_U300 is not set | ||
171 | # CONFIG_ARCH_DAVINCI is not set | 184 | # CONFIG_ARCH_DAVINCI is not set |
172 | # CONFIG_ARCH_OMAP is not set | 185 | # CONFIG_ARCH_OMAP is not set |
173 | # CONFIG_ARCH_MSM is not set | ||
174 | # CONFIG_ARCH_W90X900 is not set | ||
175 | 186 | ||
176 | # | 187 | # |
177 | # Freescale MXC Implementations | 188 | # Freescale MXC Implementations |
@@ -188,6 +199,8 @@ CONFIG_MACH_MX27=y | |||
188 | CONFIG_MACH_MX27ADS=y | 199 | CONFIG_MACH_MX27ADS=y |
189 | CONFIG_MACH_PCM038=y | 200 | CONFIG_MACH_PCM038=y |
190 | CONFIG_MACH_PCM970_BASEBOARD=y | 201 | CONFIG_MACH_PCM970_BASEBOARD=y |
202 | CONFIG_MACH_MX27_3DS=y | ||
203 | CONFIG_MACH_MX27LITE=y | ||
191 | CONFIG_MXC_IRQ_PRIOR=y | 204 | CONFIG_MXC_IRQ_PRIOR=y |
192 | CONFIG_MXC_PWM=y | 205 | CONFIG_MXC_PWM=y |
193 | 206 | ||
@@ -213,7 +226,6 @@ CONFIG_ARM_THUMB=y | |||
213 | # CONFIG_CPU_DCACHE_DISABLE is not set | 226 | # CONFIG_CPU_DCACHE_DISABLE is not set |
214 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | 227 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set |
215 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | 228 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set |
216 | # CONFIG_OUTER_CACHE is not set | ||
217 | CONFIG_COMMON_CLKDEV=y | 229 | CONFIG_COMMON_CLKDEV=y |
218 | 230 | ||
219 | # | 231 | # |
@@ -238,7 +250,6 @@ CONFIG_PREEMPT=y | |||
238 | CONFIG_HZ=100 | 250 | CONFIG_HZ=100 |
239 | CONFIG_AEABI=y | 251 | CONFIG_AEABI=y |
240 | CONFIG_OABI_COMPAT=y | 252 | CONFIG_OABI_COMPAT=y |
241 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
242 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | 253 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set |
243 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | 254 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set |
244 | # CONFIG_HIGHMEM is not set | 255 | # CONFIG_HIGHMEM is not set |
@@ -253,10 +264,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 | |||
253 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 264 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
254 | CONFIG_ZONE_DMA_FLAG=0 | 265 | CONFIG_ZONE_DMA_FLAG=0 |
255 | CONFIG_VIRT_TO_BUS=y | 266 | CONFIG_VIRT_TO_BUS=y |
256 | CONFIG_UNEVICTABLE_LRU=y | ||
257 | CONFIG_HAVE_MLOCK=y | 267 | CONFIG_HAVE_MLOCK=y |
258 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 268 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
269 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
259 | CONFIG_ALIGNMENT_TRAP=y | 270 | CONFIG_ALIGNMENT_TRAP=y |
271 | # CONFIG_UACCESS_WITH_MEMCPY is not set | ||
260 | 272 | ||
261 | # | 273 | # |
262 | # Boot options | 274 | # Boot options |
@@ -361,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
361 | # CONFIG_ECONET is not set | 373 | # CONFIG_ECONET is not set |
362 | # CONFIG_WAN_ROUTER is not set | 374 | # CONFIG_WAN_ROUTER is not set |
363 | # CONFIG_PHONET is not set | 375 | # CONFIG_PHONET is not set |
376 | # CONFIG_IEEE802154 is not set | ||
364 | # CONFIG_NET_SCHED is not set | 377 | # CONFIG_NET_SCHED is not set |
365 | # CONFIG_DCB is not set | 378 | # CONFIG_DCB is not set |
366 | 379 | ||
@@ -474,7 +487,16 @@ CONFIG_MTD_PHYSMAP=y | |||
474 | # CONFIG_MTD_DOC2000 is not set | 487 | # CONFIG_MTD_DOC2000 is not set |
475 | # CONFIG_MTD_DOC2001 is not set | 488 | # CONFIG_MTD_DOC2001 is not set |
476 | # CONFIG_MTD_DOC2001PLUS is not set | 489 | # CONFIG_MTD_DOC2001PLUS is not set |
477 | # CONFIG_MTD_NAND is not set | 490 | CONFIG_MTD_NAND=y |
491 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
492 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
493 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
494 | # CONFIG_MTD_NAND_GPIO is not set | ||
495 | CONFIG_MTD_NAND_IDS=y | ||
496 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
497 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
498 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
499 | CONFIG_MTD_NAND_MXC=y | ||
478 | # CONFIG_MTD_ONENAND is not set | 500 | # CONFIG_MTD_ONENAND is not set |
479 | 501 | ||
480 | # | 502 | # |
@@ -485,7 +507,15 @@ CONFIG_MTD_PHYSMAP=y | |||
485 | # | 507 | # |
486 | # UBI - Unsorted block images | 508 | # UBI - Unsorted block images |
487 | # | 509 | # |
488 | # CONFIG_MTD_UBI is not set | 510 | CONFIG_MTD_UBI=y |
511 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 | ||
512 | CONFIG_MTD_UBI_BEB_RESERVE=1 | ||
513 | # CONFIG_MTD_UBI_GLUEBI is not set | ||
514 | |||
515 | # | ||
516 | # UBI debugging options | ||
517 | # | ||
518 | # CONFIG_MTD_UBI_DEBUG is not set | ||
489 | # CONFIG_PARPORT is not set | 519 | # CONFIG_PARPORT is not set |
490 | CONFIG_BLK_DEV=y | 520 | CONFIG_BLK_DEV=y |
491 | # CONFIG_BLK_DEV_COW_COMMON is not set | 521 | # CONFIG_BLK_DEV_COW_COMMON is not set |
@@ -494,7 +524,21 @@ CONFIG_BLK_DEV=y | |||
494 | # CONFIG_BLK_DEV_RAM is not set | 524 | # CONFIG_BLK_DEV_RAM is not set |
495 | # CONFIG_CDROM_PKTCDVD is not set | 525 | # CONFIG_CDROM_PKTCDVD is not set |
496 | # CONFIG_ATA_OVER_ETH is not set | 526 | # CONFIG_ATA_OVER_ETH is not set |
497 | # CONFIG_MISC_DEVICES is not set | 527 | # CONFIG_MG_DISK is not set |
528 | CONFIG_MISC_DEVICES=y | ||
529 | # CONFIG_ICS932S401 is not set | ||
530 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
531 | # CONFIG_ISL29003 is not set | ||
532 | # CONFIG_C2PORT is not set | ||
533 | |||
534 | # | ||
535 | # EEPROM support | ||
536 | # | ||
537 | CONFIG_EEPROM_AT24=y | ||
538 | # CONFIG_EEPROM_AT25 is not set | ||
539 | # CONFIG_EEPROM_LEGACY is not set | ||
540 | # CONFIG_EEPROM_MAX6875 is not set | ||
541 | # CONFIG_EEPROM_93CX6 is not set | ||
498 | CONFIG_HAVE_IDE=y | 542 | CONFIG_HAVE_IDE=y |
499 | # CONFIG_IDE is not set | 543 | # CONFIG_IDE is not set |
500 | 544 | ||
@@ -508,7 +552,6 @@ CONFIG_HAVE_IDE=y | |||
508 | # CONFIG_ATA is not set | 552 | # CONFIG_ATA is not set |
509 | # CONFIG_MD is not set | 553 | # CONFIG_MD is not set |
510 | CONFIG_NETDEVICES=y | 554 | CONFIG_NETDEVICES=y |
511 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
512 | # CONFIG_DUMMY is not set | 555 | # CONFIG_DUMMY is not set |
513 | # CONFIG_BONDING is not set | 556 | # CONFIG_BONDING is not set |
514 | # CONFIG_MACVLAN is not set | 557 | # CONFIG_MACVLAN is not set |
@@ -534,6 +577,8 @@ CONFIG_NET_ETHERNET=y | |||
534 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 577 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
535 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 578 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
536 | # CONFIG_B44 is not set | 579 | # CONFIG_B44 is not set |
580 | # CONFIG_KS8842 is not set | ||
581 | # CONFIG_KS8851 is not set | ||
537 | CONFIG_FEC=y | 582 | CONFIG_FEC=y |
538 | # CONFIG_FEC2 is not set | 583 | # CONFIG_FEC2 is not set |
539 | # CONFIG_NETDEV_1000 is not set | 584 | # CONFIG_NETDEV_1000 is not set |
@@ -580,6 +625,11 @@ CONFIG_INPUT_EVDEV=y | |||
580 | # CONFIG_INPUT_TABLET is not set | 625 | # CONFIG_INPUT_TABLET is not set |
581 | CONFIG_INPUT_TOUCHSCREEN=y | 626 | CONFIG_INPUT_TOUCHSCREEN=y |
582 | # CONFIG_TOUCHSCREEN_ADS7846 is not set | 627 | # CONFIG_TOUCHSCREEN_ADS7846 is not set |
628 | # CONFIG_TOUCHSCREEN_AD7877 is not set | ||
629 | # CONFIG_TOUCHSCREEN_AD7879_I2C is not set | ||
630 | # CONFIG_TOUCHSCREEN_AD7879_SPI is not set | ||
631 | # CONFIG_TOUCHSCREEN_AD7879 is not set | ||
632 | # CONFIG_TOUCHSCREEN_EETI is not set | ||
583 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | 633 | # CONFIG_TOUCHSCREEN_FUJITSU is not set |
584 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 634 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
585 | # CONFIG_TOUCHSCREEN_ELO is not set | 635 | # CONFIG_TOUCHSCREEN_ELO is not set |
@@ -592,6 +642,7 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
592 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 642 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
593 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | 643 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set |
594 | # CONFIG_TOUCHSCREEN_TSC2007 is not set | 644 | # CONFIG_TOUCHSCREEN_TSC2007 is not set |
645 | # CONFIG_TOUCHSCREEN_W90X900 is not set | ||
595 | # CONFIG_INPUT_MISC is not set | 646 | # CONFIG_INPUT_MISC is not set |
596 | 647 | ||
597 | # | 648 | # |
@@ -644,6 +695,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
644 | # | 695 | # |
645 | # I2C system bus drivers (mostly embedded / system-on-chip) | 696 | # I2C system bus drivers (mostly embedded / system-on-chip) |
646 | # | 697 | # |
698 | # CONFIG_I2C_DESIGNWARE is not set | ||
647 | # CONFIG_I2C_GPIO is not set | 699 | # CONFIG_I2C_GPIO is not set |
648 | CONFIG_I2C_IMX=y | 700 | CONFIG_I2C_IMX=y |
649 | # CONFIG_I2C_OCORES is not set | 701 | # CONFIG_I2C_OCORES is not set |
@@ -668,7 +720,6 @@ CONFIG_I2C_IMX=y | |||
668 | # CONFIG_SENSORS_PCF8574 is not set | 720 | # CONFIG_SENSORS_PCF8574 is not set |
669 | # CONFIG_PCF8575 is not set | 721 | # CONFIG_PCF8575 is not set |
670 | # CONFIG_SENSORS_PCA9539 is not set | 722 | # CONFIG_SENSORS_PCA9539 is not set |
671 | # CONFIG_SENSORS_MAX6875 is not set | ||
672 | # CONFIG_SENSORS_TSL2550 is not set | 723 | # CONFIG_SENSORS_TSL2550 is not set |
673 | # CONFIG_I2C_DEBUG_CORE is not set | 724 | # CONFIG_I2C_DEBUG_CORE is not set |
674 | # CONFIG_I2C_DEBUG_ALGO is not set | 725 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -719,6 +770,7 @@ CONFIG_W1=y | |||
719 | # | 770 | # |
720 | # CONFIG_W1_MASTER_DS2482 is not set | 771 | # CONFIG_W1_MASTER_DS2482 is not set |
721 | CONFIG_W1_MASTER_MXC=y | 772 | CONFIG_W1_MASTER_MXC=y |
773 | # CONFIG_W1_MASTER_DS1WM is not set | ||
722 | # CONFIG_W1_MASTER_GPIO is not set | 774 | # CONFIG_W1_MASTER_GPIO is not set |
723 | 775 | ||
724 | # | 776 | # |
@@ -753,54 +805,16 @@ CONFIG_SSB_POSSIBLE=y | |||
753 | # CONFIG_TPS65010 is not set | 805 | # CONFIG_TPS65010 is not set |
754 | # CONFIG_TWL4030_CORE is not set | 806 | # CONFIG_TWL4030_CORE is not set |
755 | # CONFIG_MFD_TMIO is not set | 807 | # CONFIG_MFD_TMIO is not set |
808 | # CONFIG_MFD_T7L66XB is not set | ||
809 | # CONFIG_MFD_TC6387XB is not set | ||
756 | # CONFIG_MFD_TC6393XB is not set | 810 | # CONFIG_MFD_TC6393XB is not set |
757 | # CONFIG_PMIC_DA903X is not set | 811 | # CONFIG_PMIC_DA903X is not set |
758 | # CONFIG_MFD_WM8400 is not set | 812 | # CONFIG_MFD_WM8400 is not set |
759 | # CONFIG_MFD_WM8350_I2C is not set | 813 | # CONFIG_MFD_WM8350_I2C is not set |
760 | # CONFIG_MFD_PCF50633 is not set | 814 | # CONFIG_MFD_PCF50633 is not set |
761 | 815 | # CONFIG_AB3100_CORE is not set | |
762 | # | 816 | # CONFIG_EZX_PCAP is not set |
763 | # Multimedia devices | 817 | # CONFIG_MEDIA_SUPPORT is not set |
764 | # | ||
765 | |||
766 | # | ||
767 | # Multimedia core support | ||
768 | # | ||
769 | CONFIG_VIDEO_DEV=y | ||
770 | CONFIG_VIDEO_V4L2_COMMON=y | ||
771 | CONFIG_VIDEO_ALLOW_V4L1=y | ||
772 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
773 | # CONFIG_DVB_CORE is not set | ||
774 | CONFIG_VIDEO_MEDIA=y | ||
775 | |||
776 | # | ||
777 | # Multimedia drivers | ||
778 | # | ||
779 | # CONFIG_MEDIA_ATTACH is not set | ||
780 | CONFIG_MEDIA_TUNER=y | ||
781 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
782 | CONFIG_MEDIA_TUNER_SIMPLE=y | ||
783 | CONFIG_MEDIA_TUNER_TDA8290=y | ||
784 | CONFIG_MEDIA_TUNER_TDA9887=y | ||
785 | CONFIG_MEDIA_TUNER_TEA5761=y | ||
786 | CONFIG_MEDIA_TUNER_TEA5767=y | ||
787 | CONFIG_MEDIA_TUNER_MT20XX=y | ||
788 | CONFIG_MEDIA_TUNER_XC2028=y | ||
789 | CONFIG_MEDIA_TUNER_XC5000=y | ||
790 | CONFIG_MEDIA_TUNER_MC44S803=y | ||
791 | CONFIG_VIDEO_V4L2=y | ||
792 | CONFIG_VIDEO_V4L1=y | ||
793 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
794 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
795 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
796 | CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | ||
797 | # CONFIG_VIDEO_VIVI is not set | ||
798 | # CONFIG_VIDEO_CPIA is not set | ||
799 | # CONFIG_VIDEO_SAA5246A is not set | ||
800 | # CONFIG_VIDEO_SAA5249 is not set | ||
801 | # CONFIG_SOC_CAMERA is not set | ||
802 | # CONFIG_RADIO_ADAPTERS is not set | ||
803 | # CONFIG_DAB is not set | ||
804 | 818 | ||
805 | # | 819 | # |
806 | # Graphics support | 820 | # Graphics support |
@@ -917,6 +931,7 @@ CONFIG_RTC_DRV_PCF8563=y | |||
917 | # CONFIG_RTC_DRV_S35390A is not set | 931 | # CONFIG_RTC_DRV_S35390A is not set |
918 | # CONFIG_RTC_DRV_FM3130 is not set | 932 | # CONFIG_RTC_DRV_FM3130 is not set |
919 | # CONFIG_RTC_DRV_RX8581 is not set | 933 | # CONFIG_RTC_DRV_RX8581 is not set |
934 | # CONFIG_RTC_DRV_RX8025 is not set | ||
920 | 935 | ||
921 | # | 936 | # |
922 | # SPI RTC drivers | 937 | # SPI RTC drivers |
@@ -962,12 +977,15 @@ CONFIG_RTC_DRV_PCF8563=y | |||
962 | # CONFIG_REISERFS_FS is not set | 977 | # CONFIG_REISERFS_FS is not set |
963 | # CONFIG_JFS_FS is not set | 978 | # CONFIG_JFS_FS is not set |
964 | # CONFIG_FS_POSIX_ACL is not set | 979 | # CONFIG_FS_POSIX_ACL is not set |
965 | CONFIG_FILE_LOCKING=y | ||
966 | # CONFIG_XFS_FS is not set | 980 | # CONFIG_XFS_FS is not set |
981 | # CONFIG_GFS2_FS is not set | ||
967 | # CONFIG_OCFS2_FS is not set | 982 | # CONFIG_OCFS2_FS is not set |
968 | # CONFIG_BTRFS_FS is not set | 983 | # CONFIG_BTRFS_FS is not set |
984 | CONFIG_FILE_LOCKING=y | ||
985 | CONFIG_FSNOTIFY=y | ||
969 | # CONFIG_DNOTIFY is not set | 986 | # CONFIG_DNOTIFY is not set |
970 | # CONFIG_INOTIFY is not set | 987 | # CONFIG_INOTIFY is not set |
988 | CONFIG_INOTIFY_USER=y | ||
971 | # CONFIG_QUOTA is not set | 989 | # CONFIG_QUOTA is not set |
972 | # CONFIG_AUTOFS_FS is not set | 990 | # CONFIG_AUTOFS_FS is not set |
973 | # CONFIG_AUTOFS4_FS is not set | 991 | # CONFIG_AUTOFS4_FS is not set |
@@ -1021,6 +1039,12 @@ CONFIG_JFFS2_ZLIB=y | |||
1021 | # CONFIG_JFFS2_LZO is not set | 1039 | # CONFIG_JFFS2_LZO is not set |
1022 | CONFIG_JFFS2_RTIME=y | 1040 | CONFIG_JFFS2_RTIME=y |
1023 | # CONFIG_JFFS2_RUBIN is not set | 1041 | # CONFIG_JFFS2_RUBIN is not set |
1042 | CONFIG_UBIFS_FS=y | ||
1043 | # CONFIG_UBIFS_FS_XATTR is not set | ||
1044 | # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set | ||
1045 | CONFIG_UBIFS_FS_LZO=y | ||
1046 | CONFIG_UBIFS_FS_ZLIB=y | ||
1047 | # CONFIG_UBIFS_FS_DEBUG is not set | ||
1024 | # CONFIG_CRAMFS is not set | 1048 | # CONFIG_CRAMFS is not set |
1025 | # CONFIG_SQUASHFS is not set | 1049 | # CONFIG_SQUASHFS is not set |
1026 | # CONFIG_VXFS_FS is not set | 1050 | # CONFIG_VXFS_FS is not set |
@@ -1119,25 +1143,11 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
1119 | CONFIG_NOP_TRACER=y | 1143 | CONFIG_NOP_TRACER=y |
1120 | CONFIG_HAVE_FUNCTION_TRACER=y | 1144 | CONFIG_HAVE_FUNCTION_TRACER=y |
1121 | CONFIG_RING_BUFFER=y | 1145 | CONFIG_RING_BUFFER=y |
1146 | CONFIG_EVENT_TRACING=y | ||
1147 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
1122 | CONFIG_TRACING=y | 1148 | CONFIG_TRACING=y |
1123 | CONFIG_TRACING_SUPPORT=y | 1149 | CONFIG_TRACING_SUPPORT=y |
1124 | 1150 | # CONFIG_FTRACE is not set | |
1125 | # | ||
1126 | # Tracers | ||
1127 | # | ||
1128 | # CONFIG_FUNCTION_TRACER is not set | ||
1129 | # CONFIG_IRQSOFF_TRACER is not set | ||
1130 | # CONFIG_PREEMPT_TRACER is not set | ||
1131 | # CONFIG_SCHED_TRACER is not set | ||
1132 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1133 | # CONFIG_EVENT_TRACER is not set | ||
1134 | # CONFIG_BOOT_TRACER is not set | ||
1135 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1136 | # CONFIG_STACK_TRACER is not set | ||
1137 | # CONFIG_KMEMTRACE is not set | ||
1138 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1139 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1140 | # CONFIG_FTRACE_STARTUP_TEST is not set | ||
1141 | # CONFIG_DYNAMIC_DEBUG is not set | 1151 | # CONFIG_DYNAMIC_DEBUG is not set |
1142 | # CONFIG_SAMPLES is not set | 1152 | # CONFIG_SAMPLES is not set |
1143 | CONFIG_HAVE_ARCH_KGDB=y | 1153 | CONFIG_HAVE_ARCH_KGDB=y |
@@ -1151,16 +1161,104 @@ CONFIG_ARM_UNWIND=y | |||
1151 | # CONFIG_SECURITY is not set | 1161 | # CONFIG_SECURITY is not set |
1152 | # CONFIG_SECURITYFS is not set | 1162 | # CONFIG_SECURITYFS is not set |
1153 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1163 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1154 | # CONFIG_CRYPTO is not set | 1164 | CONFIG_CRYPTO=y |
1165 | |||
1166 | # | ||
1167 | # Crypto core or helper | ||
1168 | # | ||
1169 | # CONFIG_CRYPTO_FIPS is not set | ||
1170 | CONFIG_CRYPTO_ALGAPI=y | ||
1171 | CONFIG_CRYPTO_ALGAPI2=y | ||
1172 | # CONFIG_CRYPTO_MANAGER is not set | ||
1173 | # CONFIG_CRYPTO_MANAGER2 is not set | ||
1174 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1175 | # CONFIG_CRYPTO_NULL is not set | ||
1176 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1177 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1178 | # CONFIG_CRYPTO_TEST is not set | ||
1179 | |||
1180 | # | ||
1181 | # Authenticated Encryption with Associated Data | ||
1182 | # | ||
1183 | # CONFIG_CRYPTO_CCM is not set | ||
1184 | # CONFIG_CRYPTO_GCM is not set | ||
1185 | # CONFIG_CRYPTO_SEQIV is not set | ||
1186 | |||
1187 | # | ||
1188 | # Block modes | ||
1189 | # | ||
1190 | # CONFIG_CRYPTO_CBC is not set | ||
1191 | # CONFIG_CRYPTO_CTR is not set | ||
1192 | # CONFIG_CRYPTO_CTS is not set | ||
1193 | # CONFIG_CRYPTO_ECB is not set | ||
1194 | # CONFIG_CRYPTO_LRW is not set | ||
1195 | # CONFIG_CRYPTO_PCBC is not set | ||
1196 | # CONFIG_CRYPTO_XTS is not set | ||
1197 | |||
1198 | # | ||
1199 | # Hash modes | ||
1200 | # | ||
1201 | # CONFIG_CRYPTO_HMAC is not set | ||
1202 | # CONFIG_CRYPTO_XCBC is not set | ||
1203 | |||
1204 | # | ||
1205 | # Digest | ||
1206 | # | ||
1207 | # CONFIG_CRYPTO_CRC32C is not set | ||
1208 | # CONFIG_CRYPTO_MD4 is not set | ||
1209 | # CONFIG_CRYPTO_MD5 is not set | ||
1210 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1211 | # CONFIG_CRYPTO_RMD128 is not set | ||
1212 | # CONFIG_CRYPTO_RMD160 is not set | ||
1213 | # CONFIG_CRYPTO_RMD256 is not set | ||
1214 | # CONFIG_CRYPTO_RMD320 is not set | ||
1215 | # CONFIG_CRYPTO_SHA1 is not set | ||
1216 | # CONFIG_CRYPTO_SHA256 is not set | ||
1217 | # CONFIG_CRYPTO_SHA512 is not set | ||
1218 | # CONFIG_CRYPTO_TGR192 is not set | ||
1219 | # CONFIG_CRYPTO_WP512 is not set | ||
1220 | |||
1221 | # | ||
1222 | # Ciphers | ||
1223 | # | ||
1224 | # CONFIG_CRYPTO_AES is not set | ||
1225 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1226 | # CONFIG_CRYPTO_ARC4 is not set | ||
1227 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1228 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1229 | # CONFIG_CRYPTO_CAST5 is not set | ||
1230 | # CONFIG_CRYPTO_CAST6 is not set | ||
1231 | # CONFIG_CRYPTO_DES is not set | ||
1232 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1233 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1234 | # CONFIG_CRYPTO_SALSA20 is not set | ||
1235 | # CONFIG_CRYPTO_SEED is not set | ||
1236 | # CONFIG_CRYPTO_SERPENT is not set | ||
1237 | # CONFIG_CRYPTO_TEA is not set | ||
1238 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1239 | |||
1240 | # | ||
1241 | # Compression | ||
1242 | # | ||
1243 | CONFIG_CRYPTO_DEFLATE=y | ||
1244 | # CONFIG_CRYPTO_ZLIB is not set | ||
1245 | CONFIG_CRYPTO_LZO=y | ||
1246 | |||
1247 | # | ||
1248 | # Random Number Generation | ||
1249 | # | ||
1250 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1251 | CONFIG_CRYPTO_HW=y | ||
1155 | CONFIG_BINARY_PRINTF=y | 1252 | CONFIG_BINARY_PRINTF=y |
1156 | 1253 | ||
1157 | # | 1254 | # |
1158 | # Library routines | 1255 | # Library routines |
1159 | # | 1256 | # |
1160 | CONFIG_BITREVERSE=y | 1257 | CONFIG_BITREVERSE=y |
1258 | CONFIG_RATIONAL=y | ||
1161 | CONFIG_GENERIC_FIND_LAST_BIT=y | 1259 | CONFIG_GENERIC_FIND_LAST_BIT=y |
1162 | # CONFIG_CRC_CCITT is not set | 1260 | # CONFIG_CRC_CCITT is not set |
1163 | # CONFIG_CRC16 is not set | 1261 | CONFIG_CRC16=y |
1164 | # CONFIG_CRC_T10DIF is not set | 1262 | # CONFIG_CRC_T10DIF is not set |
1165 | # CONFIG_CRC_ITU_T is not set | 1263 | # CONFIG_CRC_ITU_T is not set |
1166 | CONFIG_CRC32=y | 1264 | CONFIG_CRC32=y |
@@ -1168,6 +1266,8 @@ CONFIG_CRC32=y | |||
1168 | # CONFIG_LIBCRC32C is not set | 1266 | # CONFIG_LIBCRC32C is not set |
1169 | CONFIG_ZLIB_INFLATE=y | 1267 | CONFIG_ZLIB_INFLATE=y |
1170 | CONFIG_ZLIB_DEFLATE=y | 1268 | CONFIG_ZLIB_DEFLATE=y |
1269 | CONFIG_LZO_COMPRESS=y | ||
1270 | CONFIG_LZO_DECOMPRESS=y | ||
1171 | CONFIG_HAS_IOMEM=y | 1271 | CONFIG_HAS_IOMEM=y |
1172 | CONFIG_HAS_IOPORT=y | 1272 | CONFIG_HAS_IOPORT=y |
1173 | CONFIG_HAS_DMA=y | 1273 | CONFIG_HAS_DMA=y |
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig index 20ada526f6de..a4f9a2a8149c 100644 --- a/arch/arm/configs/mx3_defconfig +++ b/arch/arm/configs/mx3_defconfig | |||
@@ -1,15 +1,15 @@ | |||
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-rc1 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed Apr 8 11:06:37 2009 | 4 | # Tue Jul 28 14:11:34 2009 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_HAVE_PWM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 8 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | CONFIG_GENERIC_GPIO=y | 9 | CONFIG_GENERIC_GPIO=y |
9 | CONFIG_GENERIC_TIME=y | 10 | CONFIG_GENERIC_TIME=y |
10 | CONFIG_GENERIC_CLOCKEVENTS=y | 11 | CONFIG_GENERIC_CLOCKEVENTS=y |
11 | CONFIG_MMU=y | 12 | CONFIG_MMU=y |
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
14 | CONFIG_STACKTRACE_SUPPORT=y | 14 | CONFIG_STACKTRACE_SUPPORT=y |
15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
@@ -18,14 +18,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y | |||
18 | CONFIG_HARDIRQS_SW_RESEND=y | 18 | CONFIG_HARDIRQS_SW_RESEND=y |
19 | CONFIG_GENERIC_IRQ_PROBE=y | 19 | CONFIG_GENERIC_IRQ_PROBE=y |
20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
23 | CONFIG_GENERIC_HWEIGHT=y | 21 | CONFIG_GENERIC_HWEIGHT=y |
24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 22 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
25 | CONFIG_ARCH_MTD_XIP=y | 23 | CONFIG_ARCH_MTD_XIP=y |
26 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 24 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
27 | CONFIG_VECTORS_BASE=0xffff0000 | 25 | CONFIG_VECTORS_BASE=0xffff0000 |
28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
27 | CONFIG_CONSTRUCTORS=y | ||
29 | 28 | ||
30 | # | 29 | # |
31 | # General setup | 30 | # General setup |
@@ -86,7 +85,12 @@ CONFIG_TIMERFD=y | |||
86 | CONFIG_EVENTFD=y | 85 | CONFIG_EVENTFD=y |
87 | CONFIG_SHMEM=y | 86 | CONFIG_SHMEM=y |
88 | CONFIG_AIO=y | 87 | CONFIG_AIO=y |
88 | |||
89 | # | ||
90 | # Performance Counters | ||
91 | # | ||
89 | CONFIG_VM_EVENT_COUNTERS=y | 92 | CONFIG_VM_EVENT_COUNTERS=y |
93 | # CONFIG_STRIP_ASM_SYMS is not set | ||
90 | CONFIG_COMPAT_BRK=y | 94 | CONFIG_COMPAT_BRK=y |
91 | CONFIG_SLAB=y | 95 | CONFIG_SLAB=y |
92 | # CONFIG_SLUB is not set | 96 | # CONFIG_SLUB is not set |
@@ -97,6 +101,11 @@ CONFIG_HAVE_OPROFILE=y | |||
97 | # CONFIG_KPROBES is not set | 101 | # CONFIG_KPROBES is not set |
98 | CONFIG_HAVE_KPROBES=y | 102 | CONFIG_HAVE_KPROBES=y |
99 | CONFIG_HAVE_KRETPROBES=y | 103 | CONFIG_HAVE_KRETPROBES=y |
104 | CONFIG_HAVE_CLK=y | ||
105 | |||
106 | # | ||
107 | # GCOV-based kernel profiling | ||
108 | # | ||
100 | # CONFIG_SLOW_WORK is not set | 109 | # CONFIG_SLOW_WORK is not set |
101 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | 110 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
102 | CONFIG_SLABINFO=y | 111 | CONFIG_SLABINFO=y |
@@ -109,7 +118,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
109 | CONFIG_MODVERSIONS=y | 118 | CONFIG_MODVERSIONS=y |
110 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 119 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
111 | CONFIG_BLOCK=y | 120 | CONFIG_BLOCK=y |
112 | # CONFIG_LBD is not set | 121 | CONFIG_LBDAF=y |
113 | # CONFIG_BLK_DEV_BSG is not set | 122 | # CONFIG_BLK_DEV_BSG is not set |
114 | # CONFIG_BLK_DEV_INTEGRITY is not set | 123 | # CONFIG_BLK_DEV_INTEGRITY is not set |
115 | 124 | ||
@@ -136,13 +145,14 @@ CONFIG_FREEZER=y | |||
136 | # CONFIG_ARCH_VERSATILE is not set | 145 | # CONFIG_ARCH_VERSATILE is not set |
137 | # CONFIG_ARCH_AT91 is not set | 146 | # CONFIG_ARCH_AT91 is not set |
138 | # CONFIG_ARCH_CLPS711X is not set | 147 | # CONFIG_ARCH_CLPS711X is not set |
148 | # CONFIG_ARCH_GEMINI is not set | ||
139 | # CONFIG_ARCH_EBSA110 is not set | 149 | # CONFIG_ARCH_EBSA110 is not set |
140 | # CONFIG_ARCH_EP93XX is not set | 150 | # CONFIG_ARCH_EP93XX is not set |
141 | # CONFIG_ARCH_GEMINI is not set | ||
142 | # CONFIG_ARCH_FOOTBRIDGE is not set | 151 | # CONFIG_ARCH_FOOTBRIDGE is not set |
152 | CONFIG_ARCH_MXC=y | ||
153 | # CONFIG_ARCH_STMP3XXX is not set | ||
143 | # CONFIG_ARCH_NETX is not set | 154 | # CONFIG_ARCH_NETX is not set |
144 | # CONFIG_ARCH_H720X is not set | 155 | # CONFIG_ARCH_H720X is not set |
145 | # CONFIG_ARCH_IMX is not set | ||
146 | # CONFIG_ARCH_IOP13XX is not set | 156 | # CONFIG_ARCH_IOP13XX is not set |
147 | # CONFIG_ARCH_IOP32X is not set | 157 | # CONFIG_ARCH_IOP32X is not set |
148 | # CONFIG_ARCH_IOP33X is not set | 158 | # CONFIG_ARCH_IOP33X is not set |
@@ -151,25 +161,25 @@ CONFIG_FREEZER=y | |||
151 | # CONFIG_ARCH_IXP4XX is not set | 161 | # CONFIG_ARCH_IXP4XX is not set |
152 | # CONFIG_ARCH_L7200 is not set | 162 | # CONFIG_ARCH_L7200 is not set |
153 | # CONFIG_ARCH_KIRKWOOD is not set | 163 | # CONFIG_ARCH_KIRKWOOD is not set |
154 | # CONFIG_ARCH_KS8695 is not set | ||
155 | # CONFIG_ARCH_NS9XXX is not set | ||
156 | # CONFIG_ARCH_LOKI is not set | 164 | # CONFIG_ARCH_LOKI is not set |
157 | # CONFIG_ARCH_MV78XX0 is not set | 165 | # CONFIG_ARCH_MV78XX0 is not set |
158 | CONFIG_ARCH_MXC=y | ||
159 | # CONFIG_ARCH_ORION5X is not set | 166 | # CONFIG_ARCH_ORION5X is not set |
167 | # CONFIG_ARCH_MMP is not set | ||
168 | # CONFIG_ARCH_KS8695 is not set | ||
169 | # CONFIG_ARCH_NS9XXX is not set | ||
170 | # CONFIG_ARCH_W90X900 is not set | ||
160 | # CONFIG_ARCH_PNX4008 is not set | 171 | # CONFIG_ARCH_PNX4008 is not set |
161 | # CONFIG_ARCH_PXA is not set | 172 | # CONFIG_ARCH_PXA is not set |
162 | # CONFIG_ARCH_MMP is not set | 173 | # CONFIG_ARCH_MSM is not set |
163 | # CONFIG_ARCH_RPC is not set | 174 | # CONFIG_ARCH_RPC is not set |
164 | # CONFIG_ARCH_SA1100 is not set | 175 | # CONFIG_ARCH_SA1100 is not set |
165 | # CONFIG_ARCH_S3C2410 is not set | 176 | # CONFIG_ARCH_S3C2410 is not set |
166 | # CONFIG_ARCH_S3C64XX is not set | 177 | # CONFIG_ARCH_S3C64XX is not set |
167 | # CONFIG_ARCH_SHARK is not set | 178 | # CONFIG_ARCH_SHARK is not set |
168 | # CONFIG_ARCH_LH7A40X is not set | 179 | # CONFIG_ARCH_LH7A40X is not set |
180 | # CONFIG_ARCH_U300 is not set | ||
169 | # CONFIG_ARCH_DAVINCI is not set | 181 | # CONFIG_ARCH_DAVINCI is not set |
170 | # CONFIG_ARCH_OMAP is not set | 182 | # CONFIG_ARCH_OMAP is not set |
171 | # CONFIG_ARCH_MSM is not set | ||
172 | # CONFIG_ARCH_W90X900 is not set | ||
173 | 183 | ||
174 | # | 184 | # |
175 | # Freescale MXC Implementations | 185 | # Freescale MXC Implementations |
@@ -178,6 +188,7 @@ CONFIG_ARCH_MXC=y | |||
178 | # CONFIG_ARCH_MX2 is not set | 188 | # CONFIG_ARCH_MX2 is not set |
179 | CONFIG_ARCH_MX3=y | 189 | CONFIG_ARCH_MX3=y |
180 | CONFIG_ARCH_MX31=y | 190 | CONFIG_ARCH_MX31=y |
191 | CONFIG_ARCH_MX35=y | ||
181 | 192 | ||
182 | # | 193 | # |
183 | # MX3 platforms: | 194 | # MX3 platforms: |
@@ -185,12 +196,19 @@ CONFIG_ARCH_MX31=y | |||
185 | CONFIG_MACH_MX31ADS=y | 196 | CONFIG_MACH_MX31ADS=y |
186 | CONFIG_MACH_MX31ADS_WM1133_EV1=y | 197 | CONFIG_MACH_MX31ADS_WM1133_EV1=y |
187 | CONFIG_MACH_PCM037=y | 198 | CONFIG_MACH_PCM037=y |
199 | CONFIG_MACH_PCM037_EET=y | ||
188 | CONFIG_MACH_MX31LITE=y | 200 | CONFIG_MACH_MX31LITE=y |
189 | CONFIG_MACH_MX31_3DS=y | 201 | CONFIG_MACH_MX31_3DS=y |
190 | CONFIG_MACH_MX31MOBOARD=y | 202 | CONFIG_MACH_MX31MOBOARD=y |
203 | CONFIG_MACH_MX31LILLY=y | ||
191 | CONFIG_MACH_QONG=y | 204 | CONFIG_MACH_QONG=y |
205 | CONFIG_MACH_PCM043=y | ||
206 | CONFIG_MACH_ARMADILLO5X0=y | ||
207 | CONFIG_MACH_MX35_3DS=y | ||
192 | CONFIG_MXC_IRQ_PRIOR=y | 208 | CONFIG_MXC_IRQ_PRIOR=y |
193 | CONFIG_MXC_PWM=y | 209 | CONFIG_MXC_PWM=y |
210 | CONFIG_ARCH_HAS_RNGA=y | ||
211 | CONFIG_ARCH_MXC_IOMUX_V3=y | ||
194 | 212 | ||
195 | # | 213 | # |
196 | # Processor Type | 214 | # Processor Type |
@@ -218,6 +236,7 @@ CONFIG_ARM_THUMB=y | |||
218 | # CONFIG_CPU_BPREDICT_DISABLE is not set | 236 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
219 | CONFIG_OUTER_CACHE=y | 237 | CONFIG_OUTER_CACHE=y |
220 | CONFIG_CACHE_L2X0=y | 238 | CONFIG_CACHE_L2X0=y |
239 | # CONFIG_ARM_ERRATA_411920 is not set | ||
221 | CONFIG_COMMON_CLKDEV=y | 240 | CONFIG_COMMON_CLKDEV=y |
222 | 241 | ||
223 | # | 242 | # |
@@ -242,7 +261,6 @@ CONFIG_PREEMPT=y | |||
242 | CONFIG_HZ=100 | 261 | CONFIG_HZ=100 |
243 | CONFIG_AEABI=y | 262 | CONFIG_AEABI=y |
244 | CONFIG_OABI_COMPAT=y | 263 | CONFIG_OABI_COMPAT=y |
245 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
246 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | 264 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set |
247 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | 265 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set |
248 | # CONFIG_HIGHMEM is not set | 266 | # CONFIG_HIGHMEM is not set |
@@ -257,10 +275,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
257 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 275 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
258 | CONFIG_ZONE_DMA_FLAG=0 | 276 | CONFIG_ZONE_DMA_FLAG=0 |
259 | CONFIG_VIRT_TO_BUS=y | 277 | CONFIG_VIRT_TO_BUS=y |
260 | CONFIG_UNEVICTABLE_LRU=y | ||
261 | CONFIG_HAVE_MLOCK=y | 278 | CONFIG_HAVE_MLOCK=y |
262 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 279 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
280 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
263 | CONFIG_ALIGNMENT_TRAP=y | 281 | CONFIG_ALIGNMENT_TRAP=y |
282 | # CONFIG_UACCESS_WITH_MEMCPY is not set | ||
264 | 283 | ||
265 | # | 284 | # |
266 | # Boot options | 285 | # Boot options |
@@ -362,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
362 | # CONFIG_ECONET is not set | 381 | # CONFIG_ECONET is not set |
363 | # CONFIG_WAN_ROUTER is not set | 382 | # CONFIG_WAN_ROUTER is not set |
364 | # CONFIG_PHONET is not set | 383 | # CONFIG_PHONET is not set |
384 | # CONFIG_IEEE802154 is not set | ||
365 | # CONFIG_NET_SCHED is not set | 385 | # CONFIG_NET_SCHED is not set |
366 | # CONFIG_DCB is not set | 386 | # CONFIG_DCB is not set |
367 | 387 | ||
@@ -465,7 +485,16 @@ CONFIG_MTD_PHYSMAP=y | |||
465 | # CONFIG_MTD_DOC2000 is not set | 485 | # CONFIG_MTD_DOC2000 is not set |
466 | # CONFIG_MTD_DOC2001 is not set | 486 | # CONFIG_MTD_DOC2001 is not set |
467 | # CONFIG_MTD_DOC2001PLUS is not set | 487 | # CONFIG_MTD_DOC2001PLUS is not set |
468 | # CONFIG_MTD_NAND is not set | 488 | CONFIG_MTD_NAND=y |
489 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
490 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
491 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
492 | # CONFIG_MTD_NAND_GPIO is not set | ||
493 | CONFIG_MTD_NAND_IDS=y | ||
494 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
495 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
496 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
497 | CONFIG_MTD_NAND_MXC=y | ||
469 | # CONFIG_MTD_ONENAND is not set | 498 | # CONFIG_MTD_ONENAND is not set |
470 | 499 | ||
471 | # | 500 | # |
@@ -476,10 +505,30 @@ CONFIG_MTD_PHYSMAP=y | |||
476 | # | 505 | # |
477 | # UBI - Unsorted block images | 506 | # UBI - Unsorted block images |
478 | # | 507 | # |
479 | # CONFIG_MTD_UBI is not set | 508 | CONFIG_MTD_UBI=y |
509 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 | ||
510 | CONFIG_MTD_UBI_BEB_RESERVE=1 | ||
511 | # CONFIG_MTD_UBI_GLUEBI is not set | ||
512 | |||
513 | # | ||
514 | # UBI debugging options | ||
515 | # | ||
516 | # CONFIG_MTD_UBI_DEBUG is not set | ||
480 | # CONFIG_PARPORT is not set | 517 | # CONFIG_PARPORT is not set |
481 | # CONFIG_BLK_DEV is not set | 518 | # CONFIG_BLK_DEV is not set |
482 | # CONFIG_MISC_DEVICES is not set | 519 | CONFIG_MISC_DEVICES=y |
520 | # CONFIG_ICS932S401 is not set | ||
521 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
522 | # CONFIG_ISL29003 is not set | ||
523 | # CONFIG_C2PORT is not set | ||
524 | |||
525 | # | ||
526 | # EEPROM support | ||
527 | # | ||
528 | CONFIG_EEPROM_AT24=y | ||
529 | # CONFIG_EEPROM_LEGACY is not set | ||
530 | # CONFIG_EEPROM_MAX6875 is not set | ||
531 | # CONFIG_EEPROM_93CX6 is not set | ||
483 | CONFIG_HAVE_IDE=y | 532 | CONFIG_HAVE_IDE=y |
484 | # CONFIG_IDE is not set | 533 | # CONFIG_IDE is not set |
485 | 534 | ||
@@ -493,7 +542,6 @@ CONFIG_HAVE_IDE=y | |||
493 | # CONFIG_ATA is not set | 542 | # CONFIG_ATA is not set |
494 | # CONFIG_MD is not set | 543 | # CONFIG_MD is not set |
495 | CONFIG_NETDEVICES=y | 544 | CONFIG_NETDEVICES=y |
496 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
497 | # CONFIG_DUMMY is not set | 545 | # CONFIG_DUMMY is not set |
498 | # CONFIG_BONDING is not set | 546 | # CONFIG_BONDING is not set |
499 | # CONFIG_MACVLAN is not set | 547 | # CONFIG_MACVLAN is not set |
@@ -528,7 +576,7 @@ CONFIG_MII=y | |||
528 | # CONFIG_ETHOC is not set | 576 | # CONFIG_ETHOC is not set |
529 | # CONFIG_SMC911X is not set | 577 | # CONFIG_SMC911X is not set |
530 | CONFIG_SMSC911X=y | 578 | CONFIG_SMSC911X=y |
531 | # CONFIG_DNET is not set | 579 | CONFIG_DNET=y |
532 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 580 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
533 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 581 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
534 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 582 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
@@ -537,8 +585,10 @@ CONFIG_SMSC911X=y | |||
537 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 585 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
538 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 586 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
539 | # CONFIG_B44 is not set | 587 | # CONFIG_B44 is not set |
540 | CONFIG_CS89x0=y | 588 | # CONFIG_CS89x0 is not set |
541 | CONFIG_CS89x0_NONISA_IRQ=y | 589 | # CONFIG_KS8842 is not set |
590 | CONFIG_FEC=y | ||
591 | # CONFIG_FEC2 is not set | ||
542 | # CONFIG_NETDEV_1000 is not set | 592 | # CONFIG_NETDEV_1000 is not set |
543 | # CONFIG_NETDEV_10000 is not set | 593 | # CONFIG_NETDEV_10000 is not set |
544 | 594 | ||
@@ -609,6 +659,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
609 | # | 659 | # |
610 | # I2C system bus drivers (mostly embedded / system-on-chip) | 660 | # I2C system bus drivers (mostly embedded / system-on-chip) |
611 | # | 661 | # |
662 | # CONFIG_I2C_DESIGNWARE is not set | ||
612 | # CONFIG_I2C_GPIO is not set | 663 | # CONFIG_I2C_GPIO is not set |
613 | CONFIG_I2C_IMX=y | 664 | CONFIG_I2C_IMX=y |
614 | # CONFIG_I2C_OCORES is not set | 665 | # CONFIG_I2C_OCORES is not set |
@@ -633,7 +684,6 @@ CONFIG_I2C_IMX=y | |||
633 | # CONFIG_SENSORS_PCF8574 is not set | 684 | # CONFIG_SENSORS_PCF8574 is not set |
634 | # CONFIG_PCF8575 is not set | 685 | # CONFIG_PCF8575 is not set |
635 | # CONFIG_SENSORS_PCA9539 is not set | 686 | # CONFIG_SENSORS_PCA9539 is not set |
636 | # CONFIG_SENSORS_MAX6875 is not set | ||
637 | # CONFIG_SENSORS_TSL2550 is not set | 687 | # CONFIG_SENSORS_TSL2550 is not set |
638 | # CONFIG_I2C_DEBUG_CORE is not set | 688 | # CONFIG_I2C_DEBUG_CORE is not set |
639 | # CONFIG_I2C_DEBUG_ALGO is not set | 689 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -669,6 +719,7 @@ CONFIG_W1=y | |||
669 | # | 719 | # |
670 | # CONFIG_W1_MASTER_DS2482 is not set | 720 | # CONFIG_W1_MASTER_DS2482 is not set |
671 | CONFIG_W1_MASTER_MXC=y | 721 | CONFIG_W1_MASTER_MXC=y |
722 | # CONFIG_W1_MASTER_DS1WM is not set | ||
672 | # CONFIG_W1_MASTER_GPIO is not set | 723 | # CONFIG_W1_MASTER_GPIO is not set |
673 | 724 | ||
674 | # | 725 | # |
@@ -703,6 +754,8 @@ CONFIG_SSB_POSSIBLE=y | |||
703 | # CONFIG_TPS65010 is not set | 754 | # CONFIG_TPS65010 is not set |
704 | # CONFIG_TWL4030_CORE is not set | 755 | # CONFIG_TWL4030_CORE is not set |
705 | # CONFIG_MFD_TMIO is not set | 756 | # CONFIG_MFD_TMIO is not set |
757 | # CONFIG_MFD_T7L66XB is not set | ||
758 | # CONFIG_MFD_TC6387XB is not set | ||
706 | # CONFIG_MFD_TC6393XB is not set | 759 | # CONFIG_MFD_TC6393XB is not set |
707 | # CONFIG_PMIC_DA903X is not set | 760 | # CONFIG_PMIC_DA903X is not set |
708 | # CONFIG_MFD_WM8400 is not set | 761 | # CONFIG_MFD_WM8400 is not set |
@@ -711,10 +764,8 @@ CONFIG_MFD_WM8350_CONFIG_MODE_0=y | |||
711 | CONFIG_MFD_WM8352_CONFIG_MODE_0=y | 764 | CONFIG_MFD_WM8352_CONFIG_MODE_0=y |
712 | CONFIG_MFD_WM8350_I2C=y | 765 | CONFIG_MFD_WM8350_I2C=y |
713 | # CONFIG_MFD_PCF50633 is not set | 766 | # CONFIG_MFD_PCF50633 is not set |
714 | 767 | # CONFIG_AB3100_CORE is not set | |
715 | # | 768 | CONFIG_MEDIA_SUPPORT=y |
716 | # Multimedia devices | ||
717 | # | ||
718 | 769 | ||
719 | # | 770 | # |
720 | # Multimedia core support | 771 | # Multimedia core support |
@@ -758,8 +809,10 @@ CONFIG_SOC_CAMERA_MT9T031=y | |||
758 | CONFIG_SOC_CAMERA_MT9V022=y | 809 | CONFIG_SOC_CAMERA_MT9V022=y |
759 | CONFIG_SOC_CAMERA_TW9910=y | 810 | CONFIG_SOC_CAMERA_TW9910=y |
760 | # CONFIG_SOC_CAMERA_PLATFORM is not set | 811 | # CONFIG_SOC_CAMERA_PLATFORM is not set |
761 | # CONFIG_SOC_CAMERA_OV772X is not set | 812 | CONFIG_SOC_CAMERA_OV772X=y |
813 | CONFIG_MX3_VIDEO=y | ||
762 | CONFIG_VIDEO_MX3=y | 814 | CONFIG_VIDEO_MX3=y |
815 | # CONFIG_VIDEO_SH_MOBILE_CEU is not set | ||
763 | # CONFIG_RADIO_ADAPTERS is not set | 816 | # CONFIG_RADIO_ADAPTERS is not set |
764 | # CONFIG_DAB is not set | 817 | # CONFIG_DAB is not set |
765 | 818 | ||
@@ -847,8 +900,11 @@ CONFIG_REGULATOR=y | |||
847 | # CONFIG_REGULATOR_DEBUG is not set | 900 | # CONFIG_REGULATOR_DEBUG is not set |
848 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | 901 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set |
849 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | 902 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set |
903 | # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set | ||
850 | # CONFIG_REGULATOR_BQ24022 is not set | 904 | # CONFIG_REGULATOR_BQ24022 is not set |
905 | # CONFIG_REGULATOR_MAX1586 is not set | ||
851 | CONFIG_REGULATOR_WM8350=y | 906 | CONFIG_REGULATOR_WM8350=y |
907 | # CONFIG_REGULATOR_LP3971 is not set | ||
852 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
853 | # CONFIG_STAGING is not set | 909 | # CONFIG_STAGING is not set |
854 | 910 | ||
@@ -861,10 +917,12 @@ CONFIG_REGULATOR_WM8350=y | |||
861 | # CONFIG_REISERFS_FS is not set | 917 | # CONFIG_REISERFS_FS is not set |
862 | # CONFIG_JFS_FS is not set | 918 | # CONFIG_JFS_FS is not set |
863 | # CONFIG_FS_POSIX_ACL is not set | 919 | # CONFIG_FS_POSIX_ACL is not set |
864 | CONFIG_FILE_LOCKING=y | ||
865 | # CONFIG_XFS_FS is not set | 920 | # CONFIG_XFS_FS is not set |
921 | # CONFIG_GFS2_FS is not set | ||
866 | # CONFIG_OCFS2_FS is not set | 922 | # CONFIG_OCFS2_FS is not set |
867 | # CONFIG_BTRFS_FS is not set | 923 | # CONFIG_BTRFS_FS is not set |
924 | CONFIG_FILE_LOCKING=y | ||
925 | CONFIG_FSNOTIFY=y | ||
868 | # CONFIG_DNOTIFY is not set | 926 | # CONFIG_DNOTIFY is not set |
869 | CONFIG_INOTIFY=y | 927 | CONFIG_INOTIFY=y |
870 | CONFIG_INOTIFY_USER=y | 928 | CONFIG_INOTIFY_USER=y |
@@ -921,6 +979,12 @@ CONFIG_JFFS2_ZLIB=y | |||
921 | # CONFIG_JFFS2_LZO is not set | 979 | # CONFIG_JFFS2_LZO is not set |
922 | CONFIG_JFFS2_RTIME=y | 980 | CONFIG_JFFS2_RTIME=y |
923 | # CONFIG_JFFS2_RUBIN is not set | 981 | # CONFIG_JFFS2_RUBIN is not set |
982 | CONFIG_UBIFS_FS=y | ||
983 | # CONFIG_UBIFS_FS_XATTR is not set | ||
984 | # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set | ||
985 | CONFIG_UBIFS_FS_LZO=y | ||
986 | CONFIG_UBIFS_FS_ZLIB=y | ||
987 | # CONFIG_UBIFS_FS_DEBUG is not set | ||
924 | # CONFIG_CRAMFS is not set | 988 | # CONFIG_CRAMFS is not set |
925 | # CONFIG_SQUASHFS is not set | 989 | # CONFIG_SQUASHFS is not set |
926 | # CONFIG_VXFS_FS is not set | 990 | # CONFIG_VXFS_FS is not set |
@@ -937,6 +1001,7 @@ CONFIG_NFS_FS=y | |||
937 | CONFIG_NFS_V3=y | 1001 | CONFIG_NFS_V3=y |
938 | # CONFIG_NFS_V3_ACL is not set | 1002 | # CONFIG_NFS_V3_ACL is not set |
939 | CONFIG_NFS_V4=y | 1003 | CONFIG_NFS_V4=y |
1004 | # CONFIG_NFS_V4_1 is not set | ||
940 | CONFIG_ROOT_NFS=y | 1005 | CONFIG_ROOT_NFS=y |
941 | # CONFIG_NFSD is not set | 1006 | # CONFIG_NFSD is not set |
942 | CONFIG_LOCKD=y | 1007 | CONFIG_LOCKD=y |
@@ -979,22 +1044,7 @@ CONFIG_FRAME_WARN=1024 | |||
979 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1044 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
980 | CONFIG_HAVE_FUNCTION_TRACER=y | 1045 | CONFIG_HAVE_FUNCTION_TRACER=y |
981 | CONFIG_TRACING_SUPPORT=y | 1046 | CONFIG_TRACING_SUPPORT=y |
982 | 1047 | # CONFIG_FTRACE is not set | |
983 | # | ||
984 | # Tracers | ||
985 | # | ||
986 | # CONFIG_FUNCTION_TRACER is not set | ||
987 | # CONFIG_IRQSOFF_TRACER is not set | ||
988 | # CONFIG_PREEMPT_TRACER is not set | ||
989 | # CONFIG_SCHED_TRACER is not set | ||
990 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
991 | # CONFIG_EVENT_TRACER is not set | ||
992 | # CONFIG_BOOT_TRACER is not set | ||
993 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
994 | # CONFIG_STACK_TRACER is not set | ||
995 | # CONFIG_KMEMTRACE is not set | ||
996 | # CONFIG_WORKQUEUE_TRACER is not set | ||
997 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
998 | # CONFIG_SAMPLES is not set | 1048 | # CONFIG_SAMPLES is not set |
999 | CONFIG_HAVE_ARCH_KGDB=y | 1049 | CONFIG_HAVE_ARCH_KGDB=y |
1000 | CONFIG_ARM_UNWIND=y | 1050 | CONFIG_ARM_UNWIND=y |
@@ -1094,9 +1144,9 @@ CONFIG_CRYPTO_DES=y | |||
1094 | # | 1144 | # |
1095 | # Compression | 1145 | # Compression |
1096 | # | 1146 | # |
1097 | # CONFIG_CRYPTO_DEFLATE is not set | 1147 | CONFIG_CRYPTO_DEFLATE=y |
1098 | # CONFIG_CRYPTO_ZLIB is not set | 1148 | # CONFIG_CRYPTO_ZLIB is not set |
1099 | # CONFIG_CRYPTO_LZO is not set | 1149 | CONFIG_CRYPTO_LZO=y |
1100 | 1150 | ||
1101 | # | 1151 | # |
1102 | # Random Number Generation | 1152 | # Random Number Generation |
@@ -1109,9 +1159,10 @@ CONFIG_CRYPTO_HW=y | |||
1109 | # Library routines | 1159 | # Library routines |
1110 | # | 1160 | # |
1111 | CONFIG_BITREVERSE=y | 1161 | CONFIG_BITREVERSE=y |
1162 | CONFIG_RATIONAL=y | ||
1112 | CONFIG_GENERIC_FIND_LAST_BIT=y | 1163 | CONFIG_GENERIC_FIND_LAST_BIT=y |
1113 | # CONFIG_CRC_CCITT is not set | 1164 | # CONFIG_CRC_CCITT is not set |
1114 | # CONFIG_CRC16 is not set | 1165 | CONFIG_CRC16=y |
1115 | # CONFIG_CRC_T10DIF is not set | 1166 | # CONFIG_CRC_T10DIF is not set |
1116 | # CONFIG_CRC_ITU_T is not set | 1167 | # CONFIG_CRC_ITU_T is not set |
1117 | CONFIG_CRC32=y | 1168 | CONFIG_CRC32=y |
@@ -1119,6 +1170,8 @@ CONFIG_CRC32=y | |||
1119 | # CONFIG_LIBCRC32C is not set | 1170 | # CONFIG_LIBCRC32C is not set |
1120 | CONFIG_ZLIB_INFLATE=y | 1171 | CONFIG_ZLIB_INFLATE=y |
1121 | CONFIG_ZLIB_DEFLATE=y | 1172 | CONFIG_ZLIB_DEFLATE=y |
1173 | CONFIG_LZO_COMPRESS=y | ||
1174 | CONFIG_LZO_DECOMPRESS=y | ||
1122 | CONFIG_HAS_IOMEM=y | 1175 | CONFIG_HAS_IOMEM=y |
1123 | CONFIG_HAS_IOPORT=y | 1176 | CONFIG_HAS_IOPORT=y |
1124 | CONFIG_HAS_DMA=y | 1177 | CONFIG_HAS_DMA=y |
diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index 28be17fbc157..d5ff4776cd0a 100644 --- a/arch/arm/configs/omap3_evm_defconfig +++ b/arch/arm/configs/omap3_evm_defconfig | |||
@@ -1107,7 +1107,7 @@ CONFIG_USB_ZERO=m | |||
1107 | CONFIG_USB_OTG_UTILS=y | 1107 | CONFIG_USB_OTG_UTILS=y |
1108 | # CONFIG_USB_GPIO_VBUS is not set | 1108 | # CONFIG_USB_GPIO_VBUS is not set |
1109 | # CONFIG_ISP1301_OMAP is not set | 1109 | # CONFIG_ISP1301_OMAP is not set |
1110 | CONFIG_TWL4030_USB=y | 1110 | # CONFIG_TWL4030_USB is not set |
1111 | # CONFIG_NOP_USB_XCEIV is not set | 1111 | # CONFIG_NOP_USB_XCEIV is not set |
1112 | CONFIG_MMC=y | 1112 | CONFIG_MMC=y |
1113 | # CONFIG_MMC_DEBUG is not set | 1113 | # CONFIG_MMC_DEBUG is not set |
diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig index eb2cb31825c0..f238df66efd4 100644 --- a/arch/arm/configs/rx51_defconfig +++ b/arch/arm/configs/rx51_defconfig | |||
@@ -282,7 +282,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
282 | # | 282 | # |
283 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 283 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
284 | CONFIG_ZBOOT_ROM_BSS=0x0 | 284 | CONFIG_ZBOOT_ROM_BSS=0x0 |
285 | CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0" | 285 | CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0 console=ttyS2,115200n8" |
286 | # CONFIG_XIP_KERNEL is not set | 286 | # CONFIG_XIP_KERNEL is not set |
287 | # CONFIG_KEXEC is not set | 287 | # CONFIG_KEXEC is not set |
288 | 288 | ||
@@ -1354,7 +1354,7 @@ CONFIG_USB_OTG_UTILS=y | |||
1354 | # CONFIG_USB_GPIO_VBUS is not set | 1354 | # CONFIG_USB_GPIO_VBUS is not set |
1355 | # CONFIG_ISP1301_OMAP is not set | 1355 | # CONFIG_ISP1301_OMAP is not set |
1356 | CONFIG_TWL4030_USB=y | 1356 | CONFIG_TWL4030_USB=y |
1357 | CONFIG_MMC=m | 1357 | CONFIG_MMC=y |
1358 | # CONFIG_MMC_DEBUG is not set | 1358 | # CONFIG_MMC_DEBUG is not set |
1359 | # CONFIG_MMC_UNSAFE_RESUME is not set | 1359 | # CONFIG_MMC_UNSAFE_RESUME is not set |
1360 | 1360 | ||
@@ -1449,7 +1449,8 @@ CONFIG_RTC_DRV_TWL4030=m | |||
1449 | # on-CPU RTC drivers | 1449 | # on-CPU RTC drivers |
1450 | # | 1450 | # |
1451 | # CONFIG_DMADEVICES is not set | 1451 | # CONFIG_DMADEVICES is not set |
1452 | # CONFIG_REGULATOR is not set | 1452 | CONFIG_REGULATOR=y |
1453 | CONFIG_REGULATOR_TWL4030=y | ||
1453 | # CONFIG_UIO is not set | 1454 | # CONFIG_UIO is not set |
1454 | # CONFIG_STAGING is not set | 1455 | # CONFIG_STAGING is not set |
1455 | 1456 | ||
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h index 9e07fe507029..9ed2377fe8e5 100644 --- a/arch/arm/include/asm/atomic.h +++ b/arch/arm/include/asm/atomic.h | |||
@@ -159,8 +159,6 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) | |||
159 | 159 | ||
160 | #else /* ARM_ARCH_6 */ | 160 | #else /* ARM_ARCH_6 */ |
161 | 161 | ||
162 | #include <asm/system.h> | ||
163 | |||
164 | #ifdef CONFIG_SMP | 162 | #ifdef CONFIG_SMP |
165 | #error SMP not supported on pre-ARMv6 CPUs | 163 | #error SMP not supported on pre-ARMv6 CPUs |
166 | #endif | 164 | #endif |
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index ee1304f22f94..5ccce0a9b03c 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h | |||
@@ -201,7 +201,8 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } | |||
201 | struct membank { | 201 | struct membank { |
202 | unsigned long start; | 202 | unsigned long start; |
203 | unsigned long size; | 203 | unsigned long size; |
204 | int node; | 204 | unsigned short node; |
205 | unsigned short highmem; | ||
205 | }; | 206 | }; |
206 | 207 | ||
207 | struct meminfo { | 208 | struct meminfo { |
diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h index 321c83e43a1e..f41a6f57cd12 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h | |||
@@ -102,8 +102,8 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) | |||
102 | } | 102 | } |
103 | 103 | ||
104 | #define tlb_remove_page(tlb,page) free_page_and_swap_cache(page) | 104 | #define tlb_remove_page(tlb,page) free_page_and_swap_cache(page) |
105 | #define pte_free_tlb(tlb, ptep) pte_free((tlb)->mm, ptep) | 105 | #define pte_free_tlb(tlb, ptep, addr) pte_free((tlb)->mm, ptep) |
106 | #define pmd_free_tlb(tlb, pmdp) pmd_free((tlb)->mm, pmdp) | 106 | #define pmd_free_tlb(tlb, pmdp, addr) pmd_free((tlb)->mm, pmdp) |
107 | 107 | ||
108 | #define tlb_migrate_finish(mm) do { } while (0) | 108 | #define tlb_migrate_finish(mm) do { } while (0) |
109 | 109 | ||
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 366e5097a41a..8c3de1a350b5 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -148,7 +148,7 @@ trace: | |||
148 | sub r0, r0, #MCOUNT_INSN_SIZE | 148 | sub r0, r0, #MCOUNT_INSN_SIZE |
149 | mov lr, pc | 149 | mov lr, pc |
150 | mov pc, r2 | 150 | mov pc, r2 |
151 | mov lr, r1 @ restore lr | 151 | ldr lr, [fp, #-4] @ restore lr |
152 | ldmia sp!, {r0-r3, pc} | 152 | ldmia sp!, {r0-r3, pc} |
153 | 153 | ||
154 | #endif /* CONFIG_DYNAMIC_FTRACE */ | 154 | #endif /* CONFIG_DYNAMIC_FTRACE */ |
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 93bb4247b7ed..f6bc5d442782 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c | |||
@@ -133,7 +133,7 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, | |||
133 | } | 133 | } |
134 | 134 | ||
135 | #ifdef CONFIG_CRUNCH | 135 | #ifdef CONFIG_CRUNCH |
136 | static int preserve_crunch_context(struct crunch_sigframe *frame) | 136 | static int preserve_crunch_context(struct crunch_sigframe __user *frame) |
137 | { | 137 | { |
138 | char kbuf[sizeof(*frame) + 8]; | 138 | char kbuf[sizeof(*frame) + 8]; |
139 | struct crunch_sigframe *kframe; | 139 | struct crunch_sigframe *kframe; |
@@ -146,7 +146,7 @@ static int preserve_crunch_context(struct crunch_sigframe *frame) | |||
146 | return __copy_to_user(frame, kframe, sizeof(*frame)); | 146 | return __copy_to_user(frame, kframe, sizeof(*frame)); |
147 | } | 147 | } |
148 | 148 | ||
149 | static int restore_crunch_context(struct crunch_sigframe *frame) | 149 | static int restore_crunch_context(struct crunch_sigframe __user *frame) |
150 | { | 150 | { |
151 | char kbuf[sizeof(*frame) + 8]; | 151 | char kbuf[sizeof(*frame) + 8]; |
152 | struct crunch_sigframe *kframe; | 152 | struct crunch_sigframe *kframe; |
diff --git a/arch/arm/mach-at91/include/mach/at_hdmac.h b/arch/arm/mach-at91/include/mach/at_hdmac.h new file mode 100644 index 000000000000..187cb58345c0 --- /dev/null +++ b/arch/arm/mach-at91/include/mach/at_hdmac.h | |||
@@ -0,0 +1,102 @@ | |||
1 | /* | ||
2 | * Header file for the Atmel AHB DMA Controller driver | ||
3 | * | ||
4 | * Copyright (C) 2008 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | */ | ||
11 | #ifndef AT_HDMAC_H | ||
12 | #define AT_HDMAC_H | ||
13 | |||
14 | #include <linux/dmaengine.h> | ||
15 | |||
16 | /** | ||
17 | * struct at_dma_platform_data - Controller configuration parameters | ||
18 | * @nr_channels: Number of channels supported by hardware (max 8) | ||
19 | * @cap_mask: dma_capability flags supported by the platform | ||
20 | */ | ||
21 | struct at_dma_platform_data { | ||
22 | unsigned int nr_channels; | ||
23 | dma_cap_mask_t cap_mask; | ||
24 | }; | ||
25 | |||
26 | /** | ||
27 | * enum at_dma_slave_width - DMA slave register access width. | ||
28 | * @AT_DMA_SLAVE_WIDTH_8BIT: Do 8-bit slave register accesses | ||
29 | * @AT_DMA_SLAVE_WIDTH_16BIT: Do 16-bit slave register accesses | ||
30 | * @AT_DMA_SLAVE_WIDTH_32BIT: Do 32-bit slave register accesses | ||
31 | */ | ||
32 | enum at_dma_slave_width { | ||
33 | AT_DMA_SLAVE_WIDTH_8BIT = 0, | ||
34 | AT_DMA_SLAVE_WIDTH_16BIT, | ||
35 | AT_DMA_SLAVE_WIDTH_32BIT, | ||
36 | }; | ||
37 | |||
38 | /** | ||
39 | * struct at_dma_slave - Controller-specific information about a slave | ||
40 | * @dma_dev: required DMA master device | ||
41 | * @tx_reg: physical address of data register used for | ||
42 | * memory-to-peripheral transfers | ||
43 | * @rx_reg: physical address of data register used for | ||
44 | * peripheral-to-memory transfers | ||
45 | * @reg_width: peripheral register width | ||
46 | * @cfg: Platform-specific initializer for the CFG register | ||
47 | * @ctrla: Platform-specific initializer for the CTRLA register | ||
48 | */ | ||
49 | struct at_dma_slave { | ||
50 | struct device *dma_dev; | ||
51 | dma_addr_t tx_reg; | ||
52 | dma_addr_t rx_reg; | ||
53 | enum at_dma_slave_width reg_width; | ||
54 | u32 cfg; | ||
55 | u32 ctrla; | ||
56 | }; | ||
57 | |||
58 | |||
59 | /* Platform-configurable bits in CFG */ | ||
60 | #define ATC_SRC_PER(h) (0xFU & (h)) /* Channel src rq associated with periph handshaking ifc h */ | ||
61 | #define ATC_DST_PER(h) ((0xFU & (h)) << 4) /* Channel dst rq associated with periph handshaking ifc h */ | ||
62 | #define ATC_SRC_REP (0x1 << 8) /* Source Replay Mod */ | ||
63 | #define ATC_SRC_H2SEL (0x1 << 9) /* Source Handshaking Mod */ | ||
64 | #define ATC_SRC_H2SEL_SW (0x0 << 9) | ||
65 | #define ATC_SRC_H2SEL_HW (0x1 << 9) | ||
66 | #define ATC_DST_REP (0x1 << 12) /* Destination Replay Mod */ | ||
67 | #define ATC_DST_H2SEL (0x1 << 13) /* Destination Handshaking Mod */ | ||
68 | #define ATC_DST_H2SEL_SW (0x0 << 13) | ||
69 | #define ATC_DST_H2SEL_HW (0x1 << 13) | ||
70 | #define ATC_SOD (0x1 << 16) /* Stop On Done */ | ||
71 | #define ATC_LOCK_IF (0x1 << 20) /* Interface Lock */ | ||
72 | #define ATC_LOCK_B (0x1 << 21) /* AHB Bus Lock */ | ||
73 | #define ATC_LOCK_IF_L (0x1 << 22) /* Master Interface Arbiter Lock */ | ||
74 | #define ATC_LOCK_IF_L_CHUNK (0x0 << 22) | ||
75 | #define ATC_LOCK_IF_L_BUFFER (0x1 << 22) | ||
76 | #define ATC_AHB_PROT_MASK (0x7 << 24) /* AHB Protection */ | ||
77 | #define ATC_FIFOCFG_MASK (0x3 << 28) /* FIFO Request Configuration */ | ||
78 | #define ATC_FIFOCFG_LARGESTBURST (0x0 << 28) | ||
79 | #define ATC_FIFOCFG_HALFFIFO (0x1 << 28) | ||
80 | #define ATC_FIFOCFG_ENOUGHSPACE (0x2 << 28) | ||
81 | |||
82 | /* Platform-configurable bits in CTRLA */ | ||
83 | #define ATC_SCSIZE_MASK (0x7 << 16) /* Source Chunk Transfer Size */ | ||
84 | #define ATC_SCSIZE_1 (0x0 << 16) | ||
85 | #define ATC_SCSIZE_4 (0x1 << 16) | ||
86 | #define ATC_SCSIZE_8 (0x2 << 16) | ||
87 | #define ATC_SCSIZE_16 (0x3 << 16) | ||
88 | #define ATC_SCSIZE_32 (0x4 << 16) | ||
89 | #define ATC_SCSIZE_64 (0x5 << 16) | ||
90 | #define ATC_SCSIZE_128 (0x6 << 16) | ||
91 | #define ATC_SCSIZE_256 (0x7 << 16) | ||
92 | #define ATC_DCSIZE_MASK (0x7 << 20) /* Destination Chunk Transfer Size */ | ||
93 | #define ATC_DCSIZE_1 (0x0 << 20) | ||
94 | #define ATC_DCSIZE_4 (0x1 << 20) | ||
95 | #define ATC_DCSIZE_8 (0x2 << 20) | ||
96 | #define ATC_DCSIZE_16 (0x3 << 20) | ||
97 | #define ATC_DCSIZE_32 (0x4 << 20) | ||
98 | #define ATC_DCSIZE_64 (0x5 << 20) | ||
99 | #define ATC_DCSIZE_128 (0x6 << 20) | ||
100 | #define ATC_DCSIZE_256 (0x7 << 20) | ||
101 | |||
102 | #endif /* AT_HDMAC_H */ | ||
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 5ac2f565d860..d6ab64ccd496 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <mach/serial.h> | 37 | #include <mach/serial.h> |
38 | #include <mach/nand.h> | 38 | #include <mach/nand.h> |
39 | #include <mach/mmc.h> | 39 | #include <mach/mmc.h> |
40 | #include <mach/common.h> | ||
41 | 40 | ||
42 | #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000 | 41 | #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000 |
43 | #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 | 42 | #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index 28c9008df4f4..84ad5d161a87 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <mach/serial.h> | 36 | #include <mach/serial.h> |
37 | #include <mach/nand.h> | 37 | #include <mach/nand.h> |
38 | #include <mach/mmc.h> | 38 | #include <mach/mmc.h> |
39 | #include <mach/common.h> | ||
40 | 39 | ||
41 | #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000 | 40 | #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e10000 |
42 | #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 | 41 | #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index d9d40450bdc5..56c8cd01de9a 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <mach/nand.h> | 45 | #include <mach/nand.h> |
46 | #include <mach/mmc.h> | 46 | #include <mach/mmc.h> |
47 | #include <mach/emac.h> | 47 | #include <mach/emac.h> |
48 | #include <mach/common.h> | ||
49 | 48 | ||
50 | #define DM644X_EVM_PHY_MASK (0x2) | 49 | #define DM644X_EVM_PHY_MASK (0x2) |
51 | #define DM644X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ | 50 | #define DM644X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ |
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index e17de6352624..8657e72debc1 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <mach/i2c.h> | 47 | #include <mach/i2c.h> |
48 | #include <mach/mmc.h> | 48 | #include <mach/mmc.h> |
49 | #include <mach/emac.h> | 49 | #include <mach/emac.h> |
50 | #include <mach/common.h> | ||
51 | 50 | ||
52 | #define DM646X_EVM_PHY_MASK (0x2) | 51 | #define DM646X_EVM_PHY_MASK (0x2) |
53 | #define DM646X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ | 52 | #define DM646X_EVM_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ |
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c index 748a8e48541e..7acdfd8ac071 100644 --- a/arch/arm/mach-davinci/board-sffsdr.c +++ b/arch/arm/mach-davinci/board-sffsdr.c | |||
@@ -52,7 +52,6 @@ | |||
52 | #include <mach/serial.h> | 52 | #include <mach/serial.h> |
53 | #include <mach/psc.h> | 53 | #include <mach/psc.h> |
54 | #include <mach/mux.h> | 54 | #include <mach/mux.h> |
55 | #include <mach/common.h> | ||
56 | 55 | ||
57 | #define SFFSDR_PHY_MASK (0x2) | 56 | #define SFFSDR_PHY_MASK (0x2) |
58 | #define SFFSDR_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ | 57 | #define SFFSDR_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ |
diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h index 34ddec081c40..411734422c1d 100644 --- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h +++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h | |||
@@ -41,9 +41,6 @@ | |||
41 | #define TS72XX_OPTIONS2_TS9420_BOOT 0x02 | 41 | #define TS72XX_OPTIONS2_TS9420_BOOT 0x02 |
42 | 42 | ||
43 | 43 | ||
44 | #define TS72XX_NOR_PHYS_BASE 0x60000000 | ||
45 | #define TS72XX_NOR2_PHYS_BASE 0x62000000 | ||
46 | |||
47 | #define TS72XX_NAND1_DATA_PHYS_BASE 0x60000000 | 44 | #define TS72XX_NAND1_DATA_PHYS_BASE 0x60000000 |
48 | #define TS72XX_NAND2_DATA_PHYS_BASE 0x70000000 | 45 | #define TS72XX_NAND2_DATA_PHYS_BASE 0x70000000 |
49 | #define TS72XX_NAND_DATA_VIRT_BASE 0xfebfc000 | 46 | #define TS72XX_NAND_DATA_VIRT_BASE 0xfebfc000 |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 7ee024d34829..aaf1371412af 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
@@ -112,13 +112,16 @@ static void __init ts72xx_map_io(void) | |||
112 | } | 112 | } |
113 | } | 113 | } |
114 | 114 | ||
115 | /************************************************************************* | ||
116 | * NOR flash (TS-7200 only) | ||
117 | *************************************************************************/ | ||
115 | static struct physmap_flash_data ts72xx_flash_data = { | 118 | static struct physmap_flash_data ts72xx_flash_data = { |
116 | .width = 1, | 119 | .width = 2, |
117 | }; | 120 | }; |
118 | 121 | ||
119 | static struct resource ts72xx_flash_resource = { | 122 | static struct resource ts72xx_flash_resource = { |
120 | .start = TS72XX_NOR_PHYS_BASE, | 123 | .start = EP93XX_CS6_PHYS_BASE, |
121 | .end = TS72XX_NOR_PHYS_BASE + SZ_16M - 1, | 124 | .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1, |
122 | .flags = IORESOURCE_MEM, | 125 | .flags = IORESOURCE_MEM, |
123 | }; | 126 | }; |
124 | 127 | ||
@@ -132,6 +135,12 @@ static struct platform_device ts72xx_flash = { | |||
132 | .resource = &ts72xx_flash_resource, | 135 | .resource = &ts72xx_flash_resource, |
133 | }; | 136 | }; |
134 | 137 | ||
138 | static void __init ts72xx_register_flash(void) | ||
139 | { | ||
140 | if (board_is_ts7200()) | ||
141 | platform_device_register(&ts72xx_flash); | ||
142 | } | ||
143 | |||
135 | static unsigned char ts72xx_rtc_readbyte(unsigned long addr) | 144 | static unsigned char ts72xx_rtc_readbyte(unsigned long addr) |
136 | { | 145 | { |
137 | __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE); | 146 | __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE); |
@@ -165,8 +174,7 @@ static struct ep93xx_eth_data ts72xx_eth_data = { | |||
165 | static void __init ts72xx_init_machine(void) | 174 | static void __init ts72xx_init_machine(void) |
166 | { | 175 | { |
167 | ep93xx_init_devices(); | 176 | ep93xx_init_devices(); |
168 | if (board_is_ts7200()) | 177 | ts72xx_register_flash(); |
169 | platform_device_register(&ts72xx_flash); | ||
170 | platform_device_register(&ts72xx_rtc_device); | 178 | platform_device_register(&ts72xx_rtc_device); |
171 | 179 | ||
172 | ep93xx_register_eth(&ts72xx_eth_data, 1); | 180 | ep93xx_register_eth(&ts72xx_eth_data, 1); |
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index ce63048d45eb..8a947d42a6f1 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include <mach/hardware.h> | 18 | #include <mach/hardware.h> |
19 | 19 | ||
20 | #define IO_SPACE_LIMIT 0xffff0000 | 20 | #define IO_SPACE_LIMIT 0x0000ffff |
21 | 21 | ||
22 | extern int (*ixp4xx_pci_read)(u32 addr, u32 cmd, u32* data); | 22 | extern int (*ixp4xx_pci_read)(u32 addr, u32 cmd, u32* data); |
23 | extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data); | 23 | extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data); |
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index 01aa213c0a6f..ec1a64f263d2 100644 --- a/arch/arm/mach-kirkwood/ts219-setup.c +++ b/arch/arm/mach-kirkwood/ts219-setup.c | |||
@@ -206,6 +206,15 @@ static void __init qnap_ts219_init(void) | |||
206 | 206 | ||
207 | } | 207 | } |
208 | 208 | ||
209 | static int __init ts219_pci_init(void) | ||
210 | { | ||
211 | if (machine_is_ts219()) | ||
212 | kirkwood_pcie_init(); | ||
213 | |||
214 | return 0; | ||
215 | } | ||
216 | subsys_initcall(ts219_pci_init); | ||
217 | |||
209 | MACHINE_START(TS219, "QNAP TS-119/TS-219") | 218 | MACHINE_START(TS219, "QNAP TS-119/TS-219") |
210 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ | 219 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ |
211 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, | 220 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, |
diff --git a/arch/arm/mach-ks8695/include/mach/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h index 1d640d075b7e..e0f911d9e021 100644 --- a/arch/arm/mach-ks8695/include/mach/hardware.h +++ b/arch/arm/mach-ks8695/include/mach/hardware.h | |||
@@ -17,6 +17,11 @@ | |||
17 | #include <asm/sizes.h> | 17 | #include <asm/sizes.h> |
18 | 18 | ||
19 | /* | 19 | /* |
20 | * Clocks are derived from MCLK, which is 25Mhz | ||
21 | */ | ||
22 | #define KS8695_CLOCK_RATE 25000000 | ||
23 | |||
24 | /* | ||
20 | * Physical RAM address. | 25 | * Physical RAM address. |
21 | */ | 26 | */ |
22 | #define KS8695_SDRAM_PA 0x00000000 | 27 | #define KS8695_SDRAM_PA 0x00000000 |
diff --git a/arch/arm/mach-ks8695/include/mach/timex.h b/arch/arm/mach-ks8695/include/mach/timex.h index 4682e350369b..10f716371bd3 100644 --- a/arch/arm/mach-ks8695/include/mach/timex.h +++ b/arch/arm/mach-ks8695/include/mach/timex.h | |||
@@ -14,7 +14,8 @@ | |||
14 | #ifndef __ASM_ARCH_TIMEX_H | 14 | #ifndef __ASM_ARCH_TIMEX_H |
15 | #define __ASM_ARCH_TIMEX_H | 15 | #define __ASM_ARCH_TIMEX_H |
16 | 16 | ||
17 | /* timers are derived from MCLK, which is 25MHz */ | 17 | #include <mach/hardware.h> |
18 | #define CLOCK_TICK_RATE 25000000 | 18 | |
19 | #define CLOCK_TICK_RATE KS8695_CLOCK_RATE | ||
19 | 20 | ||
20 | #endif | 21 | #endif |
diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c index f5ebcc0fcab9..78499667eb7b 100644 --- a/arch/arm/mach-ks8695/pci.c +++ b/arch/arm/mach-ks8695/pci.c | |||
@@ -245,6 +245,9 @@ static int ks8695_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs | |||
245 | 245 | ||
246 | static void __init ks8695_pci_preinit(void) | 246 | static void __init ks8695_pci_preinit(void) |
247 | { | 247 | { |
248 | /* make software reset to avoid freeze if PCI bus was messed up */ | ||
249 | __raw_writel(0x80000000, KS8695_PCI_VA + KS8695_PBCS); | ||
250 | |||
248 | /* stage 1 initialization, subid, subdevice = 0x0001 */ | 251 | /* stage 1 initialization, subid, subdevice = 0x0001 */ |
249 | __raw_writel(0x00010001, KS8695_PCI_VA + KS8695_CRCSID); | 252 | __raw_writel(0x00010001, KS8695_PCI_VA + KS8695_CRCSID); |
250 | 253 | ||
diff --git a/arch/arm/mach-mx3/mx31moboard-devboard.c b/arch/arm/mach-mx3/mx31moboard-devboard.c index 4704405165a1..b48581e7dedd 100644 --- a/arch/arm/mach-mx3/mx31moboard-devboard.c +++ b/arch/arm/mach-mx3/mx31moboard-devboard.c | |||
@@ -63,7 +63,7 @@ static struct imxuart_platform_data uart_pdata = { | |||
63 | 63 | ||
64 | static int devboard_sdhc2_get_ro(struct device *dev) | 64 | static int devboard_sdhc2_get_ro(struct device *dev) |
65 | { | 65 | { |
66 | return gpio_get_value(SDHC2_WP); | 66 | return !gpio_get_value(SDHC2_WP); |
67 | } | 67 | } |
68 | 68 | ||
69 | static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | 69 | static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq, |
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c index 641c3d6153ae..901fb0166c0e 100644 --- a/arch/arm/mach-mx3/mx31moboard-marxbot.c +++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c | |||
@@ -67,7 +67,7 @@ static unsigned int marxbot_pins[] = { | |||
67 | 67 | ||
68 | static int marxbot_sdhc2_get_ro(struct device *dev) | 68 | static int marxbot_sdhc2_get_ro(struct device *dev) |
69 | { | 69 | { |
70 | return gpio_get_value(SDHC2_WP); | 70 | return !gpio_get_value(SDHC2_WP); |
71 | } | 71 | } |
72 | 72 | ||
73 | static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | 73 | static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq, |
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c index a17f2e411609..2a2da4739ecf 100644 --- a/arch/arm/mach-mx3/mx31moboard.c +++ b/arch/arm/mach-mx3/mx31moboard.c | |||
@@ -94,7 +94,7 @@ static struct imxi2c_platform_data moboard_i2c1_pdata = { | |||
94 | 94 | ||
95 | static int moboard_sdhc1_get_ro(struct device *dev) | 95 | static int moboard_sdhc1_get_ro(struct device *dev) |
96 | { | 96 | { |
97 | return gpio_get_value(SDHC1_WP); | 97 | return !gpio_get_value(SDHC1_WP); |
98 | } | 98 | } |
99 | 99 | ||
100 | static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq, | 100 | static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq, |
diff --git a/arch/arm/mach-mx3/pcm037_eet.c b/arch/arm/mach-mx3/pcm037_eet.c index fe52fb1bb8b7..8d386000fc40 100644 --- a/arch/arm/mach-mx3/pcm037_eet.c +++ b/arch/arm/mach-mx3/pcm037_eet.c | |||
@@ -24,15 +24,6 @@ | |||
24 | #include "devices.h" | 24 | #include "devices.h" |
25 | 25 | ||
26 | static unsigned int pcm037_eet_pins[] = { | 26 | static unsigned int pcm037_eet_pins[] = { |
27 | /* SPI #1 */ | ||
28 | MX31_PIN_CSPI1_MISO__MISO, | ||
29 | MX31_PIN_CSPI1_MOSI__MOSI, | ||
30 | MX31_PIN_CSPI1_SCLK__SCLK, | ||
31 | MX31_PIN_CSPI1_SPI_RDY__SPI_RDY, | ||
32 | MX31_PIN_CSPI1_SS0__SS0, | ||
33 | MX31_PIN_CSPI1_SS1__SS1, | ||
34 | MX31_PIN_CSPI1_SS2__SS2, | ||
35 | |||
36 | /* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */ | 27 | /* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */ |
37 | IOMUX_MODE(MX31_PIN_KEY_COL7, IOMUX_CONFIG_GPIO), | 28 | IOMUX_MODE(MX31_PIN_KEY_COL7, IOMUX_CONFIG_GPIO), |
38 | /* GPIO keys */ | 29 | /* GPIO keys */ |
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index a2d7814896be..505d98cfe508 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #include <mach/irqs.h> | 20 | #include <mach/irqs.h> |
21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
22 | #include <mach/irqs.h> | ||
23 | #include <mach/mux.h> | 22 | #include <mach/mux.h> |
24 | #include <mach/cpu.h> | 23 | #include <mach/cpu.h> |
25 | #include <mach/mcbsp.h> | 24 | #include <mach/mcbsp.h> |
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 9c3fdcdf76c3..8ec2a132904d 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
@@ -141,7 +141,7 @@ static inline void board_smc91x_init(void) | |||
141 | 141 | ||
142 | static void __init omap_2430sdp_init_irq(void) | 142 | static void __init omap_2430sdp_init_irq(void) |
143 | { | 143 | { |
144 | omap2_init_common_hw(NULL); | 144 | omap2_init_common_hw(NULL, NULL); |
145 | omap_init_irq(); | 145 | omap_init_irq(); |
146 | omap_gpio_init(); | 146 | omap_gpio_init(); |
147 | } | 147 | } |
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 496a90e4ea7a..ac262cd74503 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
@@ -169,7 +169,7 @@ static struct platform_device *sdp3430_devices[] __initdata = { | |||
169 | 169 | ||
170 | static void __init omap_3430sdp_init_irq(void) | 170 | static void __init omap_3430sdp_init_irq(void) |
171 | { | 171 | { |
172 | omap2_init_common_hw(hyb18m512160af6_sdrc_params); | 172 | omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL); |
173 | omap_init_irq(); | 173 | omap_init_irq(); |
174 | omap_gpio_init(); | 174 | omap_gpio_init(); |
175 | } | 175 | } |
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 57e477bd89c6..b0c7402248f7 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
@@ -59,7 +59,7 @@ static void __init gic_init_irq(void) | |||
59 | 59 | ||
60 | static void __init omap_4430sdp_init_irq(void) | 60 | static void __init omap_4430sdp_init_irq(void) |
61 | { | 61 | { |
62 | omap2_init_common_hw(NULL); | 62 | omap2_init_common_hw(NULL, NULL); |
63 | #ifdef CONFIG_OMAP_32K_TIMER | 63 | #ifdef CONFIG_OMAP_32K_TIMER |
64 | omap2_gp_clockevent_set_gptimer(1); | 64 | omap2_gp_clockevent_set_gptimer(1); |
65 | #endif | 65 | #endif |
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 06dfba888b0c..dcfc20d03894 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -250,7 +250,7 @@ out: | |||
250 | 250 | ||
251 | static void __init omap_apollon_init_irq(void) | 251 | static void __init omap_apollon_init_irq(void) |
252 | { | 252 | { |
253 | omap2_init_common_hw(NULL); | 253 | omap2_init_common_hw(NULL, NULL); |
254 | omap_init_irq(); | 254 | omap_init_irq(); |
255 | omap_gpio_init(); | 255 | omap_gpio_init(); |
256 | apollon_init_smc91x(); | 256 | apollon_init_smc91x(); |
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 3492162a65c3..fd00aa03690c 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | static void __init omap_generic_init_irq(void) | 34 | static void __init omap_generic_init_irq(void) |
35 | { | 35 | { |
36 | omap2_init_common_hw(NULL); | 36 | omap2_init_common_hw(NULL, NULL); |
37 | omap_init_irq(); | 37 | omap_init_irq(); |
38 | } | 38 | } |
39 | 39 | ||
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index e7d017cdc438..7b1d61d5bb2c 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -270,7 +270,7 @@ static void __init h4_init_flash(void) | |||
270 | 270 | ||
271 | static void __init omap_h4_init_irq(void) | 271 | static void __init omap_h4_init_irq(void) |
272 | { | 272 | { |
273 | omap2_init_common_hw(NULL); | 273 | omap2_init_common_hw(NULL, NULL); |
274 | omap_init_irq(); | 274 | omap_init_irq(); |
275 | omap_gpio_init(); | 275 | omap_gpio_init(); |
276 | h4_init_flash(); | 276 | h4_init_flash(); |
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index d8bc0a7dcb8d..ea383f88cb1b 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
@@ -270,7 +270,7 @@ static inline void __init ldp_init_smsc911x(void) | |||
270 | 270 | ||
271 | static void __init omap_ldp_init_irq(void) | 271 | static void __init omap_ldp_init_irq(void) |
272 | { | 272 | { |
273 | omap2_init_common_hw(NULL); | 273 | omap2_init_common_hw(NULL, NULL); |
274 | omap_init_irq(); | 274 | omap_init_irq(); |
275 | omap_gpio_init(); | 275 | omap_gpio_init(); |
276 | ldp_init_smsc911x(); | 276 | ldp_init_smsc911x(); |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 991ac9c38032..e00ba128cece 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -282,7 +282,8 @@ static int __init omap3_beagle_i2c_init(void) | |||
282 | 282 | ||
283 | static void __init omap3_beagle_init_irq(void) | 283 | static void __init omap3_beagle_init_irq(void) |
284 | { | 284 | { |
285 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params); | 285 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, |
286 | mt46h32m32lf6_sdrc_params); | ||
286 | omap_init_irq(); | 287 | omap_init_irq(); |
287 | #ifdef CONFIG_OMAP_32K_TIMER | 288 | #ifdef CONFIG_OMAP_32K_TIMER |
288 | omap2_gp_clockevent_set_gptimer(12); | 289 | omap2_gp_clockevent_set_gptimer(12); |
@@ -408,6 +409,10 @@ static void __init omap3_beagle_init(void) | |||
408 | 409 | ||
409 | usb_musb_init(); | 410 | usb_musb_init(); |
410 | omap3beagle_flash_init(); | 411 | omap3beagle_flash_init(); |
412 | |||
413 | /* Ensure SDRC pins are mux'd for self-refresh */ | ||
414 | omap_cfg_reg(H16_34XX_SDRC_CKE0); | ||
415 | omap_cfg_reg(H17_34XX_SDRC_CKE1); | ||
411 | } | 416 | } |
412 | 417 | ||
413 | static void __init omap3_beagle_map_io(void) | 418 | static void __init omap3_beagle_map_io(void) |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index d3cc145814d0..c4b144647dc5 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
26 | #include <linux/spi/ads7846.h> | 26 | #include <linux/spi/ads7846.h> |
27 | #include <linux/i2c/twl4030.h> | 27 | #include <linux/i2c/twl4030.h> |
28 | #include <linux/usb/otg.h> | ||
28 | 29 | ||
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
30 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
@@ -279,7 +280,7 @@ struct spi_board_info omap3evm_spi_board_info[] = { | |||
279 | 280 | ||
280 | static void __init omap3_evm_init_irq(void) | 281 | static void __init omap3_evm_init_irq(void) |
281 | { | 282 | { |
282 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params); | 283 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, NULL); |
283 | omap_init_irq(); | 284 | omap_init_irq(); |
284 | omap_gpio_init(); | 285 | omap_gpio_init(); |
285 | omap3evm_init_smc911x(); | 286 | omap3evm_init_smc911x(); |
@@ -307,6 +308,10 @@ static void __init omap3_evm_init(void) | |||
307 | ARRAY_SIZE(omap3evm_spi_board_info)); | 308 | ARRAY_SIZE(omap3evm_spi_board_info)); |
308 | 309 | ||
309 | omap_serial_init(); | 310 | omap_serial_init(); |
311 | #ifdef CONFIG_NOP_USB_XCEIV | ||
312 | /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */ | ||
313 | usb_nop_xceiv_register(); | ||
314 | #endif | ||
310 | usb_musb_init(); | 315 | usb_musb_init(); |
311 | ads7846_dev_init(); | 316 | ads7846_dev_init(); |
312 | } | 317 | } |
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index e32aa23ce962..864ee3d021f7 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <mach/mcspi.h> | 40 | #include <mach/mcspi.h> |
41 | #include <mach/usb.h> | 41 | #include <mach/usb.h> |
42 | #include <mach/keypad.h> | 42 | #include <mach/keypad.h> |
43 | #include <mach/mux.h> | ||
43 | 44 | ||
44 | #include "sdram-micron-mt46h32m32lf-6.h" | 45 | #include "sdram-micron-mt46h32m32lf-6.h" |
45 | #include "mmc-twl4030.h" | 46 | #include "mmc-twl4030.h" |
@@ -310,7 +311,8 @@ static int __init omap3pandora_i2c_init(void) | |||
310 | 311 | ||
311 | static void __init omap3pandora_init_irq(void) | 312 | static void __init omap3pandora_init_irq(void) |
312 | { | 313 | { |
313 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params); | 314 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, |
315 | mt46h32m32lf6_sdrc_params); | ||
314 | omap_init_irq(); | 316 | omap_init_irq(); |
315 | omap_gpio_init(); | 317 | omap_gpio_init(); |
316 | } | 318 | } |
@@ -397,6 +399,10 @@ static void __init omap3pandora_init(void) | |||
397 | omap3pandora_ads7846_init(); | 399 | omap3pandora_ads7846_init(); |
398 | pandora_keys_gpio_init(); | 400 | pandora_keys_gpio_init(); |
399 | usb_musb_init(); | 401 | usb_musb_init(); |
402 | |||
403 | /* Ensure SDRC pins are mux'd for self-refresh */ | ||
404 | omap_cfg_reg(H16_34XX_SDRC_CKE0); | ||
405 | omap_cfg_reg(H17_34XX_SDRC_CKE1); | ||
400 | } | 406 | } |
401 | 407 | ||
402 | static void __init omap3pandora_map_io(void) | 408 | static void __init omap3pandora_map_io(void) |
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index dff5528fbfb5..6bce23004aa4 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <mach/gpmc.h> | 44 | #include <mach/gpmc.h> |
45 | #include <mach/hardware.h> | 45 | #include <mach/hardware.h> |
46 | #include <mach/nand.h> | 46 | #include <mach/nand.h> |
47 | #include <mach/mux.h> | ||
47 | #include <mach/usb.h> | 48 | #include <mach/usb.h> |
48 | 49 | ||
49 | #include "sdram-micron-mt46h32m32lf-6.h" | 50 | #include "sdram-micron-mt46h32m32lf-6.h" |
@@ -51,6 +52,7 @@ | |||
51 | 52 | ||
52 | #define OVERO_GPIO_BT_XGATE 15 | 53 | #define OVERO_GPIO_BT_XGATE 15 |
53 | #define OVERO_GPIO_W2W_NRESET 16 | 54 | #define OVERO_GPIO_W2W_NRESET 16 |
55 | #define OVERO_GPIO_PENDOWN 114 | ||
54 | #define OVERO_GPIO_BT_NRESET 164 | 56 | #define OVERO_GPIO_BT_NRESET 164 |
55 | #define OVERO_GPIO_USBH_CPEN 168 | 57 | #define OVERO_GPIO_USBH_CPEN 168 |
56 | #define OVERO_GPIO_USBH_NRESET 183 | 58 | #define OVERO_GPIO_USBH_NRESET 183 |
@@ -146,7 +148,7 @@ static struct platform_device overo_smsc911x_device = { | |||
146 | .name = "smsc911x", | 148 | .name = "smsc911x", |
147 | .id = -1, | 149 | .id = -1, |
148 | .num_resources = ARRAY_SIZE(overo_smsc911x_resources), | 150 | .num_resources = ARRAY_SIZE(overo_smsc911x_resources), |
149 | .resource = &overo_smsc911x_resources, | 151 | .resource = overo_smsc911x_resources, |
150 | .dev = { | 152 | .dev = { |
151 | .platform_data = &overo_smsc911x_config, | 153 | .platform_data = &overo_smsc911x_config, |
152 | }, | 154 | }, |
@@ -360,7 +362,8 @@ static int __init overo_i2c_init(void) | |||
360 | 362 | ||
361 | static void __init overo_init_irq(void) | 363 | static void __init overo_init_irq(void) |
362 | { | 364 | { |
363 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params); | 365 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, |
366 | mt46h32m32lf6_sdrc_params); | ||
364 | omap_init_irq(); | 367 | omap_init_irq(); |
365 | omap_gpio_init(); | 368 | omap_gpio_init(); |
366 | } | 369 | } |
@@ -395,6 +398,10 @@ static void __init overo_init(void) | |||
395 | overo_ads7846_init(); | 398 | overo_ads7846_init(); |
396 | overo_init_smsc911x(); | 399 | overo_init_smsc911x(); |
397 | 400 | ||
401 | /* Ensure SDRC pins are mux'd for self-refresh */ | ||
402 | omap_cfg_reg(H16_34XX_SDRC_CKE0); | ||
403 | omap_cfg_reg(H17_34XX_SDRC_CKE1); | ||
404 | |||
398 | if ((gpio_request(OVERO_GPIO_W2W_NRESET, | 405 | if ((gpio_request(OVERO_GPIO_W2W_NRESET, |
399 | "OVERO_GPIO_W2W_NRESET") == 0) && | 406 | "OVERO_GPIO_W2W_NRESET") == 0) && |
400 | (gpio_direction_output(OVERO_GPIO_W2W_NRESET, 1) == 0)) { | 407 | (gpio_direction_output(OVERO_GPIO_W2W_NRESET, 1) == 0)) { |
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 9a0bf6744a05..56d931a425f7 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -278,6 +278,10 @@ static struct twl4030_gpio_platform_data rx51_gpio_data = { | |||
278 | .setup = rx51_twlgpio_setup, | 278 | .setup = rx51_twlgpio_setup, |
279 | }; | 279 | }; |
280 | 280 | ||
281 | static struct twl4030_usb_data rx51_usb_data = { | ||
282 | .usb_mode = T2_USB_MODE_ULPI, | ||
283 | }; | ||
284 | |||
281 | static struct twl4030_platform_data rx51_twldata = { | 285 | static struct twl4030_platform_data rx51_twldata = { |
282 | .irq_base = TWL4030_IRQ_BASE, | 286 | .irq_base = TWL4030_IRQ_BASE, |
283 | .irq_end = TWL4030_IRQ_END, | 287 | .irq_end = TWL4030_IRQ_END, |
@@ -286,6 +290,7 @@ static struct twl4030_platform_data rx51_twldata = { | |||
286 | .gpio = &rx51_gpio_data, | 290 | .gpio = &rx51_gpio_data, |
287 | .keypad = &rx51_kp_data, | 291 | .keypad = &rx51_kp_data, |
288 | .madc = &rx51_madc_data, | 292 | .madc = &rx51_madc_data, |
293 | .usb = &rx51_usb_data, | ||
289 | 294 | ||
290 | .vaux1 = &rx51_vaux1, | 295 | .vaux1 = &rx51_vaux1, |
291 | .vaux2 = &rx51_vaux2, | 296 | .vaux2 = &rx51_vaux2, |
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 374ff63c3eb2..1c9e07fe8266 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
@@ -61,7 +61,7 @@ static struct omap_board_config_kernel rx51_config[] = { | |||
61 | 61 | ||
62 | static void __init rx51_init_irq(void) | 62 | static void __init rx51_init_irq(void) |
63 | { | 63 | { |
64 | omap2_init_common_hw(NULL); | 64 | omap2_init_common_hw(NULL, NULL); |
65 | omap_init_irq(); | 65 | omap_init_irq(); |
66 | omap_gpio_init(); | 66 | omap_gpio_init(); |
67 | } | 67 | } |
@@ -75,6 +75,10 @@ static void __init rx51_init(void) | |||
75 | omap_serial_init(); | 75 | omap_serial_init(); |
76 | usb_musb_init(); | 76 | usb_musb_init(); |
77 | rx51_peripherals_init(); | 77 | rx51_peripherals_init(); |
78 | |||
79 | /* Ensure SDRC pins are mux'd for self-refresh */ | ||
80 | omap_cfg_reg(H16_34XX_SDRC_CKE0); | ||
81 | omap_cfg_reg(H17_34XX_SDRC_CKE1); | ||
78 | } | 82 | } |
79 | 83 | ||
80 | static void __init rx51_map_io(void) | 84 | static void __init rx51_map_io(void) |
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index bcc0f7632dea..427b7b8b1237 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | static void __init omap_zoom2_init_irq(void) | 26 | static void __init omap_zoom2_init_irq(void) |
27 | { | 27 | { |
28 | omap2_init_common_hw(NULL); | 28 | omap2_init_common_hw(NULL, NULL); |
29 | omap_init_irq(); | 29 | omap_init_irq(); |
30 | omap_gpio_init(); | 30 | omap_gpio_init(); |
31 | } | 31 | } |
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index b0665f161c03..456e2ad5f621 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <mach/clock.h> | 27 | #include <mach/clock.h> |
28 | #include <mach/clockdomain.h> | 28 | #include <mach/clockdomain.h> |
29 | #include <mach/cpu.h> | 29 | #include <mach/cpu.h> |
30 | #include <mach/prcm.h> | ||
30 | #include <asm/div64.h> | 31 | #include <asm/div64.h> |
31 | 32 | ||
32 | #include <mach/sdrc.h> | 33 | #include <mach/sdrc.h> |
@@ -38,8 +39,6 @@ | |||
38 | #include "cm-regbits-24xx.h" | 39 | #include "cm-regbits-24xx.h" |
39 | #include "cm-regbits-34xx.h" | 40 | #include "cm-regbits-34xx.h" |
40 | 41 | ||
41 | #define MAX_CLOCK_ENABLE_WAIT 100000 | ||
42 | |||
43 | /* DPLL rate rounding: minimum DPLL multiplier, divider values */ | 42 | /* DPLL rate rounding: minimum DPLL multiplier, divider values */ |
44 | #define DPLL_MIN_MULTIPLIER 1 | 43 | #define DPLL_MIN_MULTIPLIER 1 |
45 | #define DPLL_MIN_DIVIDER 1 | 44 | #define DPLL_MIN_DIVIDER 1 |
@@ -274,83 +273,97 @@ unsigned long omap2_fixed_divisor_recalc(struct clk *clk) | |||
274 | } | 273 | } |
275 | 274 | ||
276 | /** | 275 | /** |
277 | * omap2_wait_clock_ready - wait for clock to enable | 276 | * omap2_clk_dflt_find_companion - find companion clock to @clk |
278 | * @reg: physical address of clock IDLEST register | 277 | * @clk: struct clk * to find the companion clock of |
279 | * @mask: value to mask against to determine if the clock is active | 278 | * @other_reg: void __iomem ** to return the companion clock CM_*CLKEN va in |
280 | * @name: name of the clock (for printk) | 279 | * @other_bit: u8 ** to return the companion clock bit shift in |
280 | * | ||
281 | * Note: We don't need special code here for INVERT_ENABLE for the | ||
282 | * time being since INVERT_ENABLE only applies to clocks enabled by | ||
283 | * CM_CLKEN_PLL | ||
281 | * | 284 | * |
282 | * Returns 1 if the clock enabled in time, or 0 if it failed to enable | 285 | * Convert CM_ICLKEN* <-> CM_FCLKEN*. This conversion assumes it's |
283 | * in roughly MAX_CLOCK_ENABLE_WAIT microseconds. | 286 | * just a matter of XORing the bits. |
287 | * | ||
288 | * Some clocks don't have companion clocks. For example, modules with | ||
289 | * only an interface clock (such as MAILBOXES) don't have a companion | ||
290 | * clock. Right now, this code relies on the hardware exporting a bit | ||
291 | * in the correct companion register that indicates that the | ||
292 | * nonexistent 'companion clock' is active. Future patches will | ||
293 | * associate this type of code with per-module data structures to | ||
294 | * avoid this issue, and remove the casts. No return value. | ||
284 | */ | 295 | */ |
285 | int omap2_wait_clock_ready(void __iomem *reg, u32 mask, const char *name) | 296 | void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg, |
297 | u8 *other_bit) | ||
286 | { | 298 | { |
287 | int i = 0; | 299 | u32 r; |
288 | int ena = 0; | ||
289 | 300 | ||
290 | /* | 301 | /* |
291 | * 24xx uses 0 to indicate not ready, and 1 to indicate ready. | 302 | * Convert CM_ICLKEN* <-> CM_FCLKEN*. This conversion assumes |
292 | * 34xx reverses this, just to keep us on our toes | 303 | * it's just a matter of XORing the bits. |
293 | */ | 304 | */ |
294 | if (cpu_mask & (RATE_IN_242X | RATE_IN_243X)) | 305 | r = ((__force u32)clk->enable_reg ^ (CM_FCLKEN ^ CM_ICLKEN)); |
295 | ena = mask; | ||
296 | else if (cpu_mask & RATE_IN_343X) | ||
297 | ena = 0; | ||
298 | |||
299 | /* Wait for lock */ | ||
300 | while (((__raw_readl(reg) & mask) != ena) && | ||
301 | (i++ < MAX_CLOCK_ENABLE_WAIT)) { | ||
302 | udelay(1); | ||
303 | } | ||
304 | |||
305 | if (i <= MAX_CLOCK_ENABLE_WAIT) | ||
306 | pr_debug("Clock %s stable after %d loops\n", name, i); | ||
307 | else | ||
308 | printk(KERN_ERR "Clock %s didn't enable in %d tries\n", | ||
309 | name, MAX_CLOCK_ENABLE_WAIT); | ||
310 | |||
311 | |||
312 | return (i < MAX_CLOCK_ENABLE_WAIT) ? 1 : 0; | ||
313 | }; | ||
314 | 306 | ||
307 | *other_reg = (__force void __iomem *)r; | ||
308 | *other_bit = clk->enable_bit; | ||
309 | } | ||
315 | 310 | ||
316 | /* | 311 | /** |
317 | * Note: We don't need special code here for INVERT_ENABLE | 312 | * omap2_clk_dflt_find_idlest - find CM_IDLEST reg va, bit shift for @clk |
318 | * for the time being since INVERT_ENABLE only applies to clocks enabled by | 313 | * @clk: struct clk * to find IDLEST info for |
319 | * CM_CLKEN_PLL | 314 | * @idlest_reg: void __iomem ** to return the CM_IDLEST va in |
315 | * @idlest_bit: u8 ** to return the CM_IDLEST bit shift in | ||
316 | * | ||
317 | * Return the CM_IDLEST register address and bit shift corresponding | ||
318 | * to the module that "owns" this clock. This default code assumes | ||
319 | * that the CM_IDLEST bit shift is the CM_*CLKEN bit shift, and that | ||
320 | * the IDLEST register address ID corresponds to the CM_*CLKEN | ||
321 | * register address ID (e.g., that CM_FCLKEN2 corresponds to | ||
322 | * CM_IDLEST2). This is not true for all modules. No return value. | ||
320 | */ | 323 | */ |
321 | static void omap2_clk_wait_ready(struct clk *clk) | 324 | void omap2_clk_dflt_find_idlest(struct clk *clk, void __iomem **idlest_reg, |
325 | u8 *idlest_bit) | ||
322 | { | 326 | { |
323 | void __iomem *reg, *other_reg, *st_reg; | 327 | u32 r; |
324 | u32 bit; | ||
325 | 328 | ||
326 | /* | 329 | r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20); |
327 | * REVISIT: This code is pretty ugly. It would be nice to generalize | 330 | *idlest_reg = (__force void __iomem *)r; |
328 | * it and pull it into struct clk itself somehow. | 331 | *idlest_bit = clk->enable_bit; |
329 | */ | 332 | } |
330 | reg = clk->enable_reg; | ||
331 | 333 | ||
332 | /* | 334 | /** |
333 | * Convert CM_ICLKEN* <-> CM_FCLKEN*. This conversion assumes | 335 | * omap2_module_wait_ready - wait for an OMAP module to leave IDLE |
334 | * it's just a matter of XORing the bits. | 336 | * @clk: struct clk * belonging to the module |
335 | */ | 337 | * |
336 | other_reg = (void __iomem *)((u32)reg ^ (CM_FCLKEN ^ CM_ICLKEN)); | 338 | * If the necessary clocks for the OMAP hardware IP block that |
339 | * corresponds to clock @clk are enabled, then wait for the module to | ||
340 | * indicate readiness (i.e., to leave IDLE). This code does not | ||
341 | * belong in the clock code and will be moved in the medium term to | ||
342 | * module-dependent code. No return value. | ||
343 | */ | ||
344 | static void omap2_module_wait_ready(struct clk *clk) | ||
345 | { | ||
346 | void __iomem *companion_reg, *idlest_reg; | ||
347 | u8 other_bit, idlest_bit; | ||
348 | |||
349 | /* Not all modules have multiple clocks that their IDLEST depends on */ | ||
350 | if (clk->ops->find_companion) { | ||
351 | clk->ops->find_companion(clk, &companion_reg, &other_bit); | ||
352 | if (!(__raw_readl(companion_reg) & (1 << other_bit))) | ||
353 | return; | ||
354 | } | ||
337 | 355 | ||
338 | /* Check if both functional and interface clocks | 356 | clk->ops->find_idlest(clk, &idlest_reg, &idlest_bit); |
339 | * are running. */ | ||
340 | bit = 1 << clk->enable_bit; | ||
341 | if (!(__raw_readl(other_reg) & bit)) | ||
342 | return; | ||
343 | st_reg = (void __iomem *)(((u32)other_reg & ~0xf0) | 0x20); /* CM_IDLEST* */ | ||
344 | 357 | ||
345 | omap2_wait_clock_ready(st_reg, bit, clk->name); | 358 | omap2_cm_wait_idlest(idlest_reg, (1 << idlest_bit), clk->name); |
346 | } | 359 | } |
347 | 360 | ||
348 | static int omap2_dflt_clk_enable(struct clk *clk) | 361 | int omap2_dflt_clk_enable(struct clk *clk) |
349 | { | 362 | { |
350 | u32 v; | 363 | u32 v; |
351 | 364 | ||
352 | if (unlikely(clk->enable_reg == NULL)) { | 365 | if (unlikely(clk->enable_reg == NULL)) { |
353 | printk(KERN_ERR "clock.c: Enable for %s without enable code\n", | 366 | pr_err("clock.c: Enable for %s without enable code\n", |
354 | clk->name); | 367 | clk->name); |
355 | return 0; /* REVISIT: -EINVAL */ | 368 | return 0; /* REVISIT: -EINVAL */ |
356 | } | 369 | } |
@@ -363,26 +376,13 @@ static int omap2_dflt_clk_enable(struct clk *clk) | |||
363 | __raw_writel(v, clk->enable_reg); | 376 | __raw_writel(v, clk->enable_reg); |
364 | v = __raw_readl(clk->enable_reg); /* OCP barrier */ | 377 | v = __raw_readl(clk->enable_reg); /* OCP barrier */ |
365 | 378 | ||
366 | return 0; | 379 | if (clk->ops->find_idlest) |
367 | } | 380 | omap2_module_wait_ready(clk); |
368 | 381 | ||
369 | static int omap2_dflt_clk_enable_wait(struct clk *clk) | 382 | return 0; |
370 | { | ||
371 | int ret; | ||
372 | |||
373 | if (!clk->enable_reg) { | ||
374 | printk(KERN_ERR "clock.c: Enable for %s without enable code\n", | ||
375 | clk->name); | ||
376 | return 0; /* REVISIT: -EINVAL */ | ||
377 | } | ||
378 | |||
379 | ret = omap2_dflt_clk_enable(clk); | ||
380 | if (ret == 0) | ||
381 | omap2_clk_wait_ready(clk); | ||
382 | return ret; | ||
383 | } | 383 | } |
384 | 384 | ||
385 | static void omap2_dflt_clk_disable(struct clk *clk) | 385 | void omap2_dflt_clk_disable(struct clk *clk) |
386 | { | 386 | { |
387 | u32 v; | 387 | u32 v; |
388 | 388 | ||
@@ -406,8 +406,10 @@ static void omap2_dflt_clk_disable(struct clk *clk) | |||
406 | } | 406 | } |
407 | 407 | ||
408 | const struct clkops clkops_omap2_dflt_wait = { | 408 | const struct clkops clkops_omap2_dflt_wait = { |
409 | .enable = omap2_dflt_clk_enable_wait, | 409 | .enable = omap2_dflt_clk_enable, |
410 | .disable = omap2_dflt_clk_disable, | 410 | .disable = omap2_dflt_clk_disable, |
411 | .find_companion = omap2_clk_dflt_find_companion, | ||
412 | .find_idlest = omap2_clk_dflt_find_idlest, | ||
411 | }; | 413 | }; |
412 | 414 | ||
413 | const struct clkops clkops_omap2_dflt = { | 415 | const struct clkops clkops_omap2_dflt = { |
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index 2679ddfa6424..9ae7540f8af2 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h | |||
@@ -65,6 +65,12 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long rate); | |||
65 | u32 omap2_get_dpll_rate(struct clk *clk); | 65 | u32 omap2_get_dpll_rate(struct clk *clk); |
66 | int omap2_wait_clock_ready(void __iomem *reg, u32 cval, const char *name); | 66 | int omap2_wait_clock_ready(void __iomem *reg, u32 cval, const char *name); |
67 | void omap2_clk_prepare_for_reboot(void); | 67 | void omap2_clk_prepare_for_reboot(void); |
68 | int omap2_dflt_clk_enable(struct clk *clk); | ||
69 | void omap2_dflt_clk_disable(struct clk *clk); | ||
70 | void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg, | ||
71 | u8 *other_bit); | ||
72 | void omap2_clk_dflt_find_idlest(struct clk *clk, void __iomem **idlest_reg, | ||
73 | u8 *idlest_bit); | ||
68 | 74 | ||
69 | extern const struct clkops clkops_omap2_dflt_wait; | 75 | extern const struct clkops clkops_omap2_dflt_wait; |
70 | extern const struct clkops clkops_omap2_dflt; | 76 | extern const struct clkops clkops_omap2_dflt; |
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index 44de0271fc2f..bc5d3ac66611 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #include <mach/clock.h> | 31 | #include <mach/clock.h> |
32 | #include <mach/sram.h> | 32 | #include <mach/sram.h> |
33 | #include <mach/prcm.h> | ||
33 | #include <asm/div64.h> | 34 | #include <asm/div64.h> |
34 | #include <asm/clkdev.h> | 35 | #include <asm/clkdev.h> |
35 | 36 | ||
@@ -43,6 +44,18 @@ | |||
43 | static const struct clkops clkops_oscck; | 44 | static const struct clkops clkops_oscck; |
44 | static const struct clkops clkops_fixed; | 45 | static const struct clkops clkops_fixed; |
45 | 46 | ||
47 | static void omap2430_clk_i2chs_find_idlest(struct clk *clk, | ||
48 | void __iomem **idlest_reg, | ||
49 | u8 *idlest_bit); | ||
50 | |||
51 | /* 2430 I2CHS has non-standard IDLEST register */ | ||
52 | static const struct clkops clkops_omap2430_i2chs_wait = { | ||
53 | .enable = omap2_dflt_clk_enable, | ||
54 | .disable = omap2_dflt_clk_disable, | ||
55 | .find_idlest = omap2430_clk_i2chs_find_idlest, | ||
56 | .find_companion = omap2_clk_dflt_find_companion, | ||
57 | }; | ||
58 | |||
46 | #include "clock24xx.h" | 59 | #include "clock24xx.h" |
47 | 60 | ||
48 | struct omap_clk { | 61 | struct omap_clk { |
@@ -240,6 +253,26 @@ static void __iomem *prcm_clksrc_ctrl; | |||
240 | *-------------------------------------------------------------------------*/ | 253 | *-------------------------------------------------------------------------*/ |
241 | 254 | ||
242 | /** | 255 | /** |
256 | * omap2430_clk_i2chs_find_idlest - return CM_IDLEST info for 2430 I2CHS | ||
257 | * @clk: struct clk * being enabled | ||
258 | * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into | ||
259 | * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into | ||
260 | * | ||
261 | * OMAP2430 I2CHS CM_IDLEST bits are in CM_IDLEST1_CORE, but the | ||
262 | * CM_*CLKEN bits are in CM_{I,F}CLKEN2_CORE. This custom function | ||
263 | * passes back the correct CM_IDLEST register address for I2CHS | ||
264 | * modules. No return value. | ||
265 | */ | ||
266 | static void omap2430_clk_i2chs_find_idlest(struct clk *clk, | ||
267 | void __iomem **idlest_reg, | ||
268 | u8 *idlest_bit) | ||
269 | { | ||
270 | *idlest_reg = OMAP_CM_REGADDR(CORE_MOD, CM_IDLEST); | ||
271 | *idlest_bit = clk->enable_bit; | ||
272 | } | ||
273 | |||
274 | |||
275 | /** | ||
243 | * omap2xxx_clk_get_core_rate - return the CORE_CLK rate | 276 | * omap2xxx_clk_get_core_rate - return the CORE_CLK rate |
244 | * @clk: pointer to the combined dpll_ck + core_ck (currently "dpll_ck") | 277 | * @clk: pointer to the combined dpll_ck + core_ck (currently "dpll_ck") |
245 | * | 278 | * |
@@ -325,8 +358,8 @@ static int omap2_clk_fixed_enable(struct clk *clk) | |||
325 | else if (clk == &apll54_ck) | 358 | else if (clk == &apll54_ck) |
326 | cval = OMAP24XX_ST_54M_APLL; | 359 | cval = OMAP24XX_ST_54M_APLL; |
327 | 360 | ||
328 | omap2_wait_clock_ready(OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), cval, | 361 | omap2_cm_wait_idlest(OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), cval, |
329 | clk->name); | 362 | clk->name); |
330 | 363 | ||
331 | /* | 364 | /* |
332 | * REVISIT: Should we return an error code if omap2_wait_clock_ready() | 365 | * REVISIT: Should we return an error code if omap2_wait_clock_ready() |
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h index 458f00cdcbea..d19cf7a7d8db 100644 --- a/arch/arm/mach-omap2/clock24xx.h +++ b/arch/arm/mach-omap2/clock24xx.h | |||
@@ -2337,7 +2337,7 @@ static struct clk i2c2_fck = { | |||
2337 | 2337 | ||
2338 | static struct clk i2chs2_fck = { | 2338 | static struct clk i2chs2_fck = { |
2339 | .name = "i2c_fck", | 2339 | .name = "i2c_fck", |
2340 | .ops = &clkops_omap2_dflt_wait, | 2340 | .ops = &clkops_omap2430_i2chs_wait, |
2341 | .id = 2, | 2341 | .id = 2, |
2342 | .parent = &func_96m_ck, | 2342 | .parent = &func_96m_ck, |
2343 | .clkdm_name = "core_l4_clkdm", | 2343 | .clkdm_name = "core_l4_clkdm", |
@@ -2370,7 +2370,7 @@ static struct clk i2c1_fck = { | |||
2370 | 2370 | ||
2371 | static struct clk i2chs1_fck = { | 2371 | static struct clk i2chs1_fck = { |
2372 | .name = "i2c_fck", | 2372 | .name = "i2c_fck", |
2373 | .ops = &clkops_omap2_dflt_wait, | 2373 | .ops = &clkops_omap2430_i2chs_wait, |
2374 | .id = 1, | 2374 | .id = 1, |
2375 | .parent = &func_96m_ck, | 2375 | .parent = &func_96m_ck, |
2376 | .clkdm_name = "core_l4_clkdm", | 2376 | .clkdm_name = "core_l4_clkdm", |
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 045da923e75b..cd7819cc0c9e 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * OMAP3-specific clock framework functions | 2 | * OMAP3-specific clock framework functions |
3 | * | 3 | * |
4 | * Copyright (C) 2007-2008 Texas Instruments, Inc. | 4 | * Copyright (C) 2007-2008 Texas Instruments, Inc. |
5 | * Copyright (C) 2007-2008 Nokia Corporation | 5 | * Copyright (C) 2007-2009 Nokia Corporation |
6 | * | 6 | * |
7 | * Written by Paul Walmsley | 7 | * Written by Paul Walmsley |
8 | * Testing and integration fixes by Jouni Högander | 8 | * Testing and integration fixes by Jouni Högander |
@@ -41,6 +41,37 @@ | |||
41 | 41 | ||
42 | static const struct clkops clkops_noncore_dpll_ops; | 42 | static const struct clkops clkops_noncore_dpll_ops; |
43 | 43 | ||
44 | static void omap3430es2_clk_ssi_find_idlest(struct clk *clk, | ||
45 | void __iomem **idlest_reg, | ||
46 | u8 *idlest_bit); | ||
47 | static void omap3430es2_clk_hsotgusb_find_idlest(struct clk *clk, | ||
48 | void __iomem **idlest_reg, | ||
49 | u8 *idlest_bit); | ||
50 | static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk *clk, | ||
51 | void __iomem **idlest_reg, | ||
52 | u8 *idlest_bit); | ||
53 | |||
54 | static const struct clkops clkops_omap3430es2_ssi_wait = { | ||
55 | .enable = omap2_dflt_clk_enable, | ||
56 | .disable = omap2_dflt_clk_disable, | ||
57 | .find_idlest = omap3430es2_clk_ssi_find_idlest, | ||
58 | .find_companion = omap2_clk_dflt_find_companion, | ||
59 | }; | ||
60 | |||
61 | static const struct clkops clkops_omap3430es2_hsotgusb_wait = { | ||
62 | .enable = omap2_dflt_clk_enable, | ||
63 | .disable = omap2_dflt_clk_disable, | ||
64 | .find_idlest = omap3430es2_clk_hsotgusb_find_idlest, | ||
65 | .find_companion = omap2_clk_dflt_find_companion, | ||
66 | }; | ||
67 | |||
68 | static const struct clkops clkops_omap3430es2_dss_usbhost_wait = { | ||
69 | .enable = omap2_dflt_clk_enable, | ||
70 | .disable = omap2_dflt_clk_disable, | ||
71 | .find_idlest = omap3430es2_clk_dss_usbhost_find_idlest, | ||
72 | .find_companion = omap2_clk_dflt_find_companion, | ||
73 | }; | ||
74 | |||
44 | #include "clock34xx.h" | 75 | #include "clock34xx.h" |
45 | 76 | ||
46 | struct omap_clk { | 77 | struct omap_clk { |
@@ -157,10 +188,13 @@ static struct omap_clk omap34xx_clks[] = { | |||
157 | CLK(NULL, "fshostusb_fck", &fshostusb_fck, CK_3430ES1), | 188 | CLK(NULL, "fshostusb_fck", &fshostusb_fck, CK_3430ES1), |
158 | CLK(NULL, "core_12m_fck", &core_12m_fck, CK_343X), | 189 | CLK(NULL, "core_12m_fck", &core_12m_fck, CK_343X), |
159 | CLK("omap_hdq.0", "fck", &hdq_fck, CK_343X), | 190 | CLK("omap_hdq.0", "fck", &hdq_fck, CK_343X), |
160 | CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck, CK_343X), | 191 | CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es1, CK_3430ES1), |
161 | CLK(NULL, "ssi_sst_fck", &ssi_sst_fck, CK_343X), | 192 | CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2), |
193 | CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es1, CK_3430ES1), | ||
194 | CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2), | ||
162 | CLK(NULL, "core_l3_ick", &core_l3_ick, CK_343X), | 195 | CLK(NULL, "core_l3_ick", &core_l3_ick, CK_343X), |
163 | CLK("musb_hdrc", "ick", &hsotgusb_ick, CK_343X), | 196 | CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es1, CK_3430ES1), |
197 | CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es2, CK_3430ES2), | ||
164 | CLK(NULL, "sdrc_ick", &sdrc_ick, CK_343X), | 198 | CLK(NULL, "sdrc_ick", &sdrc_ick, CK_343X), |
165 | CLK(NULL, "gpmc_fck", &gpmc_fck, CK_343X), | 199 | CLK(NULL, "gpmc_fck", &gpmc_fck, CK_343X), |
166 | CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X), | 200 | CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X), |
@@ -193,18 +227,21 @@ static struct omap_clk omap34xx_clks[] = { | |||
193 | CLK(NULL, "mailboxes_ick", &mailboxes_ick, CK_343X), | 227 | CLK(NULL, "mailboxes_ick", &mailboxes_ick, CK_343X), |
194 | CLK(NULL, "omapctrl_ick", &omapctrl_ick, CK_343X), | 228 | CLK(NULL, "omapctrl_ick", &omapctrl_ick, CK_343X), |
195 | CLK(NULL, "ssi_l4_ick", &ssi_l4_ick, CK_343X), | 229 | CLK(NULL, "ssi_l4_ick", &ssi_l4_ick, CK_343X), |
196 | CLK(NULL, "ssi_ick", &ssi_ick, CK_343X), | 230 | CLK(NULL, "ssi_ick", &ssi_ick_3430es1, CK_3430ES1), |
231 | CLK(NULL, "ssi_ick", &ssi_ick_3430es2, CK_3430ES2), | ||
197 | CLK(NULL, "usb_l4_ick", &usb_l4_ick, CK_3430ES1), | 232 | CLK(NULL, "usb_l4_ick", &usb_l4_ick, CK_3430ES1), |
198 | CLK(NULL, "security_l4_ick2", &security_l4_ick2, CK_343X), | 233 | CLK(NULL, "security_l4_ick2", &security_l4_ick2, CK_343X), |
199 | CLK(NULL, "aes1_ick", &aes1_ick, CK_343X), | 234 | CLK(NULL, "aes1_ick", &aes1_ick, CK_343X), |
200 | CLK("omap_rng", "ick", &rng_ick, CK_343X), | 235 | CLK("omap_rng", "ick", &rng_ick, CK_343X), |
201 | CLK(NULL, "sha11_ick", &sha11_ick, CK_343X), | 236 | CLK(NULL, "sha11_ick", &sha11_ick, CK_343X), |
202 | CLK(NULL, "des1_ick", &des1_ick, CK_343X), | 237 | CLK(NULL, "des1_ick", &des1_ick, CK_343X), |
203 | CLK("omapfb", "dss1_fck", &dss1_alwon_fck, CK_343X), | 238 | CLK("omapfb", "dss1_fck", &dss1_alwon_fck_3430es1, CK_3430ES1), |
239 | CLK("omapfb", "dss1_fck", &dss1_alwon_fck_3430es2, CK_3430ES2), | ||
204 | CLK("omapfb", "tv_fck", &dss_tv_fck, CK_343X), | 240 | CLK("omapfb", "tv_fck", &dss_tv_fck, CK_343X), |
205 | CLK("omapfb", "video_fck", &dss_96m_fck, CK_343X), | 241 | CLK("omapfb", "video_fck", &dss_96m_fck, CK_343X), |
206 | CLK("omapfb", "dss2_fck", &dss2_alwon_fck, CK_343X), | 242 | CLK("omapfb", "dss2_fck", &dss2_alwon_fck, CK_343X), |
207 | CLK("omapfb", "ick", &dss_ick, CK_343X), | 243 | CLK("omapfb", "ick", &dss_ick_3430es1, CK_3430ES1), |
244 | CLK("omapfb", "ick", &dss_ick_3430es2, CK_3430ES2), | ||
208 | CLK(NULL, "cam_mclk", &cam_mclk, CK_343X), | 245 | CLK(NULL, "cam_mclk", &cam_mclk, CK_343X), |
209 | CLK(NULL, "cam_ick", &cam_ick, CK_343X), | 246 | CLK(NULL, "cam_ick", &cam_ick, CK_343X), |
210 | CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_343X), | 247 | CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_343X), |
@@ -301,6 +338,73 @@ static struct omap_clk omap34xx_clks[] = { | |||
301 | #define SDRC_MPURATE_LOOPS 96 | 338 | #define SDRC_MPURATE_LOOPS 96 |
302 | 339 | ||
303 | /** | 340 | /** |
341 | * omap3430es2_clk_ssi_find_idlest - return CM_IDLEST info for SSI | ||
342 | * @clk: struct clk * being enabled | ||
343 | * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into | ||
344 | * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into | ||
345 | * | ||
346 | * The OMAP3430ES2 SSI target CM_IDLEST bit is at a different shift | ||
347 | * from the CM_{I,F}CLKEN bit. Pass back the correct info via | ||
348 | * @idlest_reg and @idlest_bit. No return value. | ||
349 | */ | ||
350 | static void omap3430es2_clk_ssi_find_idlest(struct clk *clk, | ||
351 | void __iomem **idlest_reg, | ||
352 | u8 *idlest_bit) | ||
353 | { | ||
354 | u32 r; | ||
355 | |||
356 | r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20); | ||
357 | *idlest_reg = (__force void __iomem *)r; | ||
358 | *idlest_bit = OMAP3430ES2_ST_SSI_IDLE_SHIFT; | ||
359 | } | ||
360 | |||
361 | /** | ||
362 | * omap3430es2_clk_dss_usbhost_find_idlest - CM_IDLEST info for DSS, USBHOST | ||
363 | * @clk: struct clk * being enabled | ||
364 | * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into | ||
365 | * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into | ||
366 | * | ||
367 | * Some OMAP modules on OMAP3 ES2+ chips have both initiator and | ||
368 | * target IDLEST bits. For our purposes, we are concerned with the | ||
369 | * target IDLEST bits, which exist at a different bit position than | ||
370 | * the *CLKEN bit position for these modules (DSS and USBHOST) (The | ||
371 | * default find_idlest code assumes that they are at the same | ||
372 | * position.) No return value. | ||
373 | */ | ||
374 | static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk *clk, | ||
375 | void __iomem **idlest_reg, | ||
376 | u8 *idlest_bit) | ||
377 | { | ||
378 | u32 r; | ||
379 | |||
380 | r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20); | ||
381 | *idlest_reg = (__force void __iomem *)r; | ||
382 | /* USBHOST_IDLE has same shift */ | ||
383 | *idlest_bit = OMAP3430ES2_ST_DSS_IDLE_SHIFT; | ||
384 | } | ||
385 | |||
386 | /** | ||
387 | * omap3430es2_clk_hsotgusb_find_idlest - return CM_IDLEST info for HSOTGUSB | ||
388 | * @clk: struct clk * being enabled | ||
389 | * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into | ||
390 | * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into | ||
391 | * | ||
392 | * The OMAP3430ES2 HSOTGUSB target CM_IDLEST bit is at a different | ||
393 | * shift from the CM_{I,F}CLKEN bit. Pass back the correct info via | ||
394 | * @idlest_reg and @idlest_bit. No return value. | ||
395 | */ | ||
396 | static void omap3430es2_clk_hsotgusb_find_idlest(struct clk *clk, | ||
397 | void __iomem **idlest_reg, | ||
398 | u8 *idlest_bit) | ||
399 | { | ||
400 | u32 r; | ||
401 | |||
402 | r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20); | ||
403 | *idlest_reg = (__force void __iomem *)r; | ||
404 | *idlest_bit = OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT; | ||
405 | } | ||
406 | |||
407 | /** | ||
304 | * omap3_dpll_recalc - recalculate DPLL rate | 408 | * omap3_dpll_recalc - recalculate DPLL rate |
305 | * @clk: DPLL struct clk | 409 | * @clk: DPLL struct clk |
306 | * | 410 | * |
@@ -725,7 +829,9 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) | |||
725 | u32 unlock_dll = 0; | 829 | u32 unlock_dll = 0; |
726 | u32 c; | 830 | u32 c; |
727 | unsigned long validrate, sdrcrate, mpurate; | 831 | unsigned long validrate, sdrcrate, mpurate; |
728 | struct omap_sdrc_params *sp; | 832 | struct omap_sdrc_params *sdrc_cs0; |
833 | struct omap_sdrc_params *sdrc_cs1; | ||
834 | int ret; | ||
729 | 835 | ||
730 | if (!clk || !rate) | 836 | if (!clk || !rate) |
731 | return -EINVAL; | 837 | return -EINVAL; |
@@ -743,8 +849,8 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) | |||
743 | else | 849 | else |
744 | sdrcrate >>= ((clk->rate / rate) >> 1); | 850 | sdrcrate >>= ((clk->rate / rate) >> 1); |
745 | 851 | ||
746 | sp = omap2_sdrc_get_params(sdrcrate); | 852 | ret = omap2_sdrc_get_params(sdrcrate, &sdrc_cs0, &sdrc_cs1); |
747 | if (!sp) | 853 | if (ret) |
748 | return -EINVAL; | 854 | return -EINVAL; |
749 | 855 | ||
750 | if (sdrcrate < MIN_SDRC_DLL_LOCK_FREQ) { | 856 | if (sdrcrate < MIN_SDRC_DLL_LOCK_FREQ) { |
@@ -765,12 +871,29 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) | |||
765 | 871 | ||
766 | pr_debug("clock: changing CORE DPLL rate from %lu to %lu\n", clk->rate, | 872 | pr_debug("clock: changing CORE DPLL rate from %lu to %lu\n", clk->rate, |
767 | validrate); | 873 | validrate); |
768 | pr_debug("clock: SDRC timing params used: %08x %08x %08x\n", | 874 | pr_debug("clock: SDRC CS0 timing params used:" |
769 | sp->rfr_ctrl, sp->actim_ctrla, sp->actim_ctrlb); | 875 | " RFR %08x CTRLA %08x CTRLB %08x MR %08x\n", |
770 | 876 | sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla, | |
771 | omap3_configure_core_dpll(sp->rfr_ctrl, sp->actim_ctrla, | 877 | sdrc_cs0->actim_ctrlb, sdrc_cs0->mr); |
772 | sp->actim_ctrlb, new_div, unlock_dll, c, | 878 | if (sdrc_cs1) |
773 | sp->mr, rate > clk->rate); | 879 | pr_debug("clock: SDRC CS1 timing params used: " |
880 | " RFR %08x CTRLA %08x CTRLB %08x MR %08x\n", | ||
881 | sdrc_cs1->rfr_ctrl, sdrc_cs1->actim_ctrla, | ||
882 | sdrc_cs1->actim_ctrlb, sdrc_cs1->mr); | ||
883 | |||
884 | if (sdrc_cs1) | ||
885 | omap3_configure_core_dpll( | ||
886 | new_div, unlock_dll, c, rate > clk->rate, | ||
887 | sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla, | ||
888 | sdrc_cs0->actim_ctrlb, sdrc_cs0->mr, | ||
889 | sdrc_cs1->rfr_ctrl, sdrc_cs1->actim_ctrla, | ||
890 | sdrc_cs1->actim_ctrlb, sdrc_cs1->mr); | ||
891 | else | ||
892 | omap3_configure_core_dpll( | ||
893 | new_div, unlock_dll, c, rate > clk->rate, | ||
894 | sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla, | ||
895 | sdrc_cs0->actim_ctrlb, sdrc_cs0->mr, | ||
896 | 0, 0, 0, 0); | ||
774 | 897 | ||
775 | return 0; | 898 | return 0; |
776 | } | 899 | } |
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index e433aec4efdd..57cc2725b923 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h | |||
@@ -1568,7 +1568,7 @@ static const struct clksel ssi_ssr_clksel[] = { | |||
1568 | { .parent = NULL } | 1568 | { .parent = NULL } |
1569 | }; | 1569 | }; |
1570 | 1570 | ||
1571 | static struct clk ssi_ssr_fck = { | 1571 | static struct clk ssi_ssr_fck_3430es1 = { |
1572 | .name = "ssi_ssr_fck", | 1572 | .name = "ssi_ssr_fck", |
1573 | .ops = &clkops_omap2_dflt, | 1573 | .ops = &clkops_omap2_dflt, |
1574 | .init = &omap2_init_clksel_parent, | 1574 | .init = &omap2_init_clksel_parent, |
@@ -1581,10 +1581,31 @@ static struct clk ssi_ssr_fck = { | |||
1581 | .recalc = &omap2_clksel_recalc, | 1581 | .recalc = &omap2_clksel_recalc, |
1582 | }; | 1582 | }; |
1583 | 1583 | ||
1584 | static struct clk ssi_sst_fck = { | 1584 | static struct clk ssi_ssr_fck_3430es2 = { |
1585 | .name = "ssi_ssr_fck", | ||
1586 | .ops = &clkops_omap3430es2_ssi_wait, | ||
1587 | .init = &omap2_init_clksel_parent, | ||
1588 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | ||
1589 | .enable_bit = OMAP3430_EN_SSI_SHIFT, | ||
1590 | .clksel_reg = OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL), | ||
1591 | .clksel_mask = OMAP3430_CLKSEL_SSI_MASK, | ||
1592 | .clksel = ssi_ssr_clksel, | ||
1593 | .clkdm_name = "core_l4_clkdm", | ||
1594 | .recalc = &omap2_clksel_recalc, | ||
1595 | }; | ||
1596 | |||
1597 | static struct clk ssi_sst_fck_3430es1 = { | ||
1585 | .name = "ssi_sst_fck", | 1598 | .name = "ssi_sst_fck", |
1586 | .ops = &clkops_null, | 1599 | .ops = &clkops_null, |
1587 | .parent = &ssi_ssr_fck, | 1600 | .parent = &ssi_ssr_fck_3430es1, |
1601 | .fixed_div = 2, | ||
1602 | .recalc = &omap2_fixed_divisor_recalc, | ||
1603 | }; | ||
1604 | |||
1605 | static struct clk ssi_sst_fck_3430es2 = { | ||
1606 | .name = "ssi_sst_fck", | ||
1607 | .ops = &clkops_null, | ||
1608 | .parent = &ssi_ssr_fck_3430es2, | ||
1588 | .fixed_div = 2, | 1609 | .fixed_div = 2, |
1589 | .recalc = &omap2_fixed_divisor_recalc, | 1610 | .recalc = &omap2_fixed_divisor_recalc, |
1590 | }; | 1611 | }; |
@@ -1606,9 +1627,19 @@ static struct clk core_l3_ick = { | |||
1606 | .recalc = &followparent_recalc, | 1627 | .recalc = &followparent_recalc, |
1607 | }; | 1628 | }; |
1608 | 1629 | ||
1609 | static struct clk hsotgusb_ick = { | 1630 | static struct clk hsotgusb_ick_3430es1 = { |
1610 | .name = "hsotgusb_ick", | 1631 | .name = "hsotgusb_ick", |
1611 | .ops = &clkops_omap2_dflt_wait, | 1632 | .ops = &clkops_omap2_dflt, |
1633 | .parent = &core_l3_ick, | ||
1634 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | ||
1635 | .enable_bit = OMAP3430_EN_HSOTGUSB_SHIFT, | ||
1636 | .clkdm_name = "core_l3_clkdm", | ||
1637 | .recalc = &followparent_recalc, | ||
1638 | }; | ||
1639 | |||
1640 | static struct clk hsotgusb_ick_3430es2 = { | ||
1641 | .name = "hsotgusb_ick", | ||
1642 | .ops = &clkops_omap3430es2_hsotgusb_wait, | ||
1612 | .parent = &core_l3_ick, | 1643 | .parent = &core_l3_ick, |
1613 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | 1644 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), |
1614 | .enable_bit = OMAP3430_EN_HSOTGUSB_SHIFT, | 1645 | .enable_bit = OMAP3430_EN_HSOTGUSB_SHIFT, |
@@ -1947,7 +1978,7 @@ static struct clk ssi_l4_ick = { | |||
1947 | .recalc = &followparent_recalc, | 1978 | .recalc = &followparent_recalc, |
1948 | }; | 1979 | }; |
1949 | 1980 | ||
1950 | static struct clk ssi_ick = { | 1981 | static struct clk ssi_ick_3430es1 = { |
1951 | .name = "ssi_ick", | 1982 | .name = "ssi_ick", |
1952 | .ops = &clkops_omap2_dflt, | 1983 | .ops = &clkops_omap2_dflt, |
1953 | .parent = &ssi_l4_ick, | 1984 | .parent = &ssi_l4_ick, |
@@ -1957,6 +1988,16 @@ static struct clk ssi_ick = { | |||
1957 | .recalc = &followparent_recalc, | 1988 | .recalc = &followparent_recalc, |
1958 | }; | 1989 | }; |
1959 | 1990 | ||
1991 | static struct clk ssi_ick_3430es2 = { | ||
1992 | .name = "ssi_ick", | ||
1993 | .ops = &clkops_omap3430es2_ssi_wait, | ||
1994 | .parent = &ssi_l4_ick, | ||
1995 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | ||
1996 | .enable_bit = OMAP3430_EN_SSI_SHIFT, | ||
1997 | .clkdm_name = "core_l4_clkdm", | ||
1998 | .recalc = &followparent_recalc, | ||
1999 | }; | ||
2000 | |||
1960 | /* REVISIT: Technically the TRM claims that this is CORE_CLK based, | 2001 | /* REVISIT: Technically the TRM claims that this is CORE_CLK based, |
1961 | * but l4_ick makes more sense to me */ | 2002 | * but l4_ick makes more sense to me */ |
1962 | 2003 | ||
@@ -2024,7 +2065,7 @@ static struct clk des1_ick = { | |||
2024 | }; | 2065 | }; |
2025 | 2066 | ||
2026 | /* DSS */ | 2067 | /* DSS */ |
2027 | static struct clk dss1_alwon_fck = { | 2068 | static struct clk dss1_alwon_fck_3430es1 = { |
2028 | .name = "dss1_alwon_fck", | 2069 | .name = "dss1_alwon_fck", |
2029 | .ops = &clkops_omap2_dflt, | 2070 | .ops = &clkops_omap2_dflt, |
2030 | .parent = &dpll4_m4x2_ck, | 2071 | .parent = &dpll4_m4x2_ck, |
@@ -2034,6 +2075,16 @@ static struct clk dss1_alwon_fck = { | |||
2034 | .recalc = &followparent_recalc, | 2075 | .recalc = &followparent_recalc, |
2035 | }; | 2076 | }; |
2036 | 2077 | ||
2078 | static struct clk dss1_alwon_fck_3430es2 = { | ||
2079 | .name = "dss1_alwon_fck", | ||
2080 | .ops = &clkops_omap3430es2_dss_usbhost_wait, | ||
2081 | .parent = &dpll4_m4x2_ck, | ||
2082 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_FCLKEN), | ||
2083 | .enable_bit = OMAP3430_EN_DSS1_SHIFT, | ||
2084 | .clkdm_name = "dss_clkdm", | ||
2085 | .recalc = &followparent_recalc, | ||
2086 | }; | ||
2087 | |||
2037 | static struct clk dss_tv_fck = { | 2088 | static struct clk dss_tv_fck = { |
2038 | .name = "dss_tv_fck", | 2089 | .name = "dss_tv_fck", |
2039 | .ops = &clkops_omap2_dflt, | 2090 | .ops = &clkops_omap2_dflt, |
@@ -2067,7 +2118,7 @@ static struct clk dss2_alwon_fck = { | |||
2067 | .recalc = &followparent_recalc, | 2118 | .recalc = &followparent_recalc, |
2068 | }; | 2119 | }; |
2069 | 2120 | ||
2070 | static struct clk dss_ick = { | 2121 | static struct clk dss_ick_3430es1 = { |
2071 | /* Handles both L3 and L4 clocks */ | 2122 | /* Handles both L3 and L4 clocks */ |
2072 | .name = "dss_ick", | 2123 | .name = "dss_ick", |
2073 | .ops = &clkops_omap2_dflt, | 2124 | .ops = &clkops_omap2_dflt, |
@@ -2079,6 +2130,18 @@ static struct clk dss_ick = { | |||
2079 | .recalc = &followparent_recalc, | 2130 | .recalc = &followparent_recalc, |
2080 | }; | 2131 | }; |
2081 | 2132 | ||
2133 | static struct clk dss_ick_3430es2 = { | ||
2134 | /* Handles both L3 and L4 clocks */ | ||
2135 | .name = "dss_ick", | ||
2136 | .ops = &clkops_omap3430es2_dss_usbhost_wait, | ||
2137 | .parent = &l4_ick, | ||
2138 | .init = &omap2_init_clk_clkdm, | ||
2139 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_ICLKEN), | ||
2140 | .enable_bit = OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT, | ||
2141 | .clkdm_name = "dss_clkdm", | ||
2142 | .recalc = &followparent_recalc, | ||
2143 | }; | ||
2144 | |||
2082 | /* CAM */ | 2145 | /* CAM */ |
2083 | 2146 | ||
2084 | static struct clk cam_mclk = { | 2147 | static struct clk cam_mclk = { |
@@ -2118,7 +2181,7 @@ static struct clk csi2_96m_fck = { | |||
2118 | 2181 | ||
2119 | static struct clk usbhost_120m_fck = { | 2182 | static struct clk usbhost_120m_fck = { |
2120 | .name = "usbhost_120m_fck", | 2183 | .name = "usbhost_120m_fck", |
2121 | .ops = &clkops_omap2_dflt_wait, | 2184 | .ops = &clkops_omap2_dflt, |
2122 | .parent = &dpll5_m2_ck, | 2185 | .parent = &dpll5_m2_ck, |
2123 | .init = &omap2_init_clk_clkdm, | 2186 | .init = &omap2_init_clk_clkdm, |
2124 | .enable_reg = OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_FCLKEN), | 2187 | .enable_reg = OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_FCLKEN), |
@@ -2129,7 +2192,7 @@ static struct clk usbhost_120m_fck = { | |||
2129 | 2192 | ||
2130 | static struct clk usbhost_48m_fck = { | 2193 | static struct clk usbhost_48m_fck = { |
2131 | .name = "usbhost_48m_fck", | 2194 | .name = "usbhost_48m_fck", |
2132 | .ops = &clkops_omap2_dflt_wait, | 2195 | .ops = &clkops_omap3430es2_dss_usbhost_wait, |
2133 | .parent = &omap_48m_fck, | 2196 | .parent = &omap_48m_fck, |
2134 | .init = &omap2_init_clk_clkdm, | 2197 | .init = &omap2_init_clk_clkdm, |
2135 | .enable_reg = OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_FCLKEN), | 2198 | .enable_reg = OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_FCLKEN), |
@@ -2141,7 +2204,7 @@ static struct clk usbhost_48m_fck = { | |||
2141 | static struct clk usbhost_ick = { | 2204 | static struct clk usbhost_ick = { |
2142 | /* Handles both L3 and L4 clocks */ | 2205 | /* Handles both L3 and L4 clocks */ |
2143 | .name = "usbhost_ick", | 2206 | .name = "usbhost_ick", |
2144 | .ops = &clkops_omap2_dflt_wait, | 2207 | .ops = &clkops_omap3430es2_dss_usbhost_wait, |
2145 | .parent = &l4_ick, | 2208 | .parent = &l4_ick, |
2146 | .init = &omap2_init_clk_clkdm, | 2209 | .init = &omap2_init_clk_clkdm, |
2147 | .enable_reg = OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_ICLKEN), | 2210 | .enable_reg = OMAP_CM_REGADDR(OMAP3430ES2_USBHOST_MOD, CM_ICLKEN), |
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h index 1d3c93bf86d3..f3c91a1ca391 100644 --- a/arch/arm/mach-omap2/cm.h +++ b/arch/arm/mach-omap2/cm.h | |||
@@ -29,9 +29,9 @@ | |||
29 | * These registers appear once per CM module. | 29 | * These registers appear once per CM module. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #define OMAP3430_CM_REVISION OMAP_CM_REGADDR(OCP_MOD, 0x0000) | 32 | #define OMAP3430_CM_REVISION OMAP34XX_CM_REGADDR(OCP_MOD, 0x0000) |
33 | #define OMAP3430_CM_SYSCONFIG OMAP_CM_REGADDR(OCP_MOD, 0x0010) | 33 | #define OMAP3430_CM_SYSCONFIG OMAP34XX_CM_REGADDR(OCP_MOD, 0x0010) |
34 | #define OMAP3430_CM_POLCTRL OMAP_CM_REGADDR(OCP_MOD, 0x009c) | 34 | #define OMAP3430_CM_POLCTRL OMAP34XX_CM_REGADDR(OCP_MOD, 0x009c) |
35 | 35 | ||
36 | #define OMAP3_CM_CLKOUT_CTRL_OFFSET 0x0070 | 36 | #define OMAP3_CM_CLKOUT_CTRL_OFFSET 0x0070 |
37 | #define OMAP3430_CM_CLKOUT_CTRL OMAP_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070) | 37 | #define OMAP3430_CM_CLKOUT_CTRL OMAP_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070) |
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 3a86b0f66031..e9b9bcb19b4e 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -276,14 +276,15 @@ static int __init _omap2_init_reprogram_sdrc(void) | |||
276 | return v; | 276 | return v; |
277 | } | 277 | } |
278 | 278 | ||
279 | void __init omap2_init_common_hw(struct omap_sdrc_params *sp) | 279 | void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, |
280 | struct omap_sdrc_params *sdrc_cs1) | ||
280 | { | 281 | { |
281 | omap2_mux_init(); | 282 | omap2_mux_init(); |
282 | #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */ | 283 | #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */ |
283 | pwrdm_init(powerdomains_omap); | 284 | pwrdm_init(powerdomains_omap); |
284 | clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); | 285 | clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); |
285 | omap2_clk_init(); | 286 | omap2_clk_init(); |
286 | omap2_sdrc_init(sp); | 287 | omap2_sdrc_init(sdrc_cs0, sdrc_cs1); |
287 | _omap2_init_reprogram_sdrc(); | 288 | _omap2_init_reprogram_sdrc(); |
288 | #endif | 289 | #endif |
289 | gpmc_init(); | 290 | gpmc_init(); |
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index a5c0f0435cd6..99b6e1546311 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #include <mach/irqs.h> | 20 | #include <mach/irqs.h> |
21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
22 | #include <mach/irqs.h> | ||
23 | #include <mach/mux.h> | 22 | #include <mach/mux.h> |
24 | #include <mach/cpu.h> | 23 | #include <mach/cpu.h> |
25 | #include <mach/mcbsp.h> | 24 | #include <mach/mcbsp.h> |
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 1541fd4c8d0f..3c04c2f1b23f 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c | |||
@@ -119,6 +119,7 @@ static int twl_mmc_late_init(struct device *dev) | |||
119 | if (i != 0) | 119 | if (i != 0) |
120 | break; | 120 | break; |
121 | ret = PTR_ERR(reg); | 121 | ret = PTR_ERR(reg); |
122 | hsmmc[i].vcc = NULL; | ||
122 | goto err; | 123 | goto err; |
123 | } | 124 | } |
124 | hsmmc[i].vcc = reg; | 125 | hsmmc[i].vcc = reg; |
@@ -165,8 +166,13 @@ done: | |||
165 | static void twl_mmc_cleanup(struct device *dev) | 166 | static void twl_mmc_cleanup(struct device *dev) |
166 | { | 167 | { |
167 | struct omap_mmc_platform_data *mmc = dev->platform_data; | 168 | struct omap_mmc_platform_data *mmc = dev->platform_data; |
169 | int i; | ||
168 | 170 | ||
169 | gpio_free(mmc->slots[0].switch_pin); | 171 | gpio_free(mmc->slots[0].switch_pin); |
172 | for(i = 0; i < ARRAY_SIZE(hsmmc); i++) { | ||
173 | regulator_put(hsmmc[i].vcc); | ||
174 | regulator_put(hsmmc[i].vcc_aux); | ||
175 | } | ||
170 | } | 176 | } |
171 | 177 | ||
172 | #ifdef CONFIG_PM | 178 | #ifdef CONFIG_PM |
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 026c4fc883a7..43d6b92b65f2 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c | |||
@@ -486,6 +486,12 @@ MUX_CFG_34XX("H19_34XX_GPIO164_OUT", 0x19c, | |||
486 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) | 486 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) |
487 | MUX_CFG_34XX("J25_34XX_GPIO170", 0x1c6, | 487 | MUX_CFG_34XX("J25_34XX_GPIO170", 0x1c6, |
488 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | 488 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) |
489 | |||
490 | /* OMAP3 SDRC CKE signals to SDR/DDR ram chips */ | ||
491 | MUX_CFG_34XX("H16_34XX_SDRC_CKE0", 0x262, | ||
492 | OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_OUTPUT) | ||
493 | MUX_CFG_34XX("H17_34XX_SDRC_CKE1", 0x264, | ||
494 | OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_OUTPUT) | ||
489 | }; | 495 | }; |
490 | 496 | ||
491 | #define OMAP34XX_PINS_SZ ARRAY_SIZE(omap34xx_pins) | 497 | #define OMAP34XX_PINS_SZ ARRAY_SIZE(omap34xx_pins) |
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index f7b3baf76678..21201cd4117b 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h | |||
@@ -11,9 +11,6 @@ | |||
11 | #ifndef __ARCH_ARM_MACH_OMAP2_PM_H | 11 | #ifndef __ARCH_ARM_MACH_OMAP2_PM_H |
12 | #define __ARCH_ARM_MACH_OMAP2_PM_H | 12 | #define __ARCH_ARM_MACH_OMAP2_PM_H |
13 | 13 | ||
14 | extern int omap2_pm_init(void); | ||
15 | extern int omap3_pm_init(void); | ||
16 | |||
17 | #ifdef CONFIG_PM_DEBUG | 14 | #ifdef CONFIG_PM_DEBUG |
18 | extern void omap2_pm_dump(int mode, int resume, unsigned int us); | 15 | extern void omap2_pm_dump(int mode, int resume, unsigned int us); |
19 | extern int omap2_pm_debug; | 16 | extern int omap2_pm_debug; |
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index db1025562fb0..528dbdc26e23 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c | |||
@@ -470,7 +470,7 @@ static void __init prcm_setup_regs(void) | |||
470 | WKUP_MOD, PM_WKEN); | 470 | WKUP_MOD, PM_WKEN); |
471 | } | 471 | } |
472 | 472 | ||
473 | int __init omap2_pm_init(void) | 473 | static int __init omap2_pm_init(void) |
474 | { | 474 | { |
475 | u32 l; | 475 | u32 l; |
476 | 476 | ||
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 841d4c5ed8be..488d595d8e4b 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -39,7 +39,9 @@ | |||
39 | struct power_state { | 39 | struct power_state { |
40 | struct powerdomain *pwrdm; | 40 | struct powerdomain *pwrdm; |
41 | u32 next_state; | 41 | u32 next_state; |
42 | #ifdef CONFIG_SUSPEND | ||
42 | u32 saved_state; | 43 | u32 saved_state; |
44 | #endif | ||
43 | struct list_head node; | 45 | struct list_head node; |
44 | }; | 46 | }; |
45 | 47 | ||
@@ -293,6 +295,9 @@ out: | |||
293 | local_irq_enable(); | 295 | local_irq_enable(); |
294 | } | 296 | } |
295 | 297 | ||
298 | #ifdef CONFIG_SUSPEND | ||
299 | static suspend_state_t suspend_state; | ||
300 | |||
296 | static int omap3_pm_prepare(void) | 301 | static int omap3_pm_prepare(void) |
297 | { | 302 | { |
298 | disable_hlt(); | 303 | disable_hlt(); |
@@ -321,7 +326,6 @@ static int omap3_pm_suspend(void) | |||
321 | restore: | 326 | restore: |
322 | /* Restore next_pwrsts */ | 327 | /* Restore next_pwrsts */ |
323 | list_for_each_entry(pwrst, &pwrst_list, node) { | 328 | list_for_each_entry(pwrst, &pwrst_list, node) { |
324 | set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); | ||
325 | state = pwrdm_read_prev_pwrst(pwrst->pwrdm); | 329 | state = pwrdm_read_prev_pwrst(pwrst->pwrdm); |
326 | if (state > pwrst->next_state) { | 330 | if (state > pwrst->next_state) { |
327 | printk(KERN_INFO "Powerdomain (%s) didn't enter " | 331 | printk(KERN_INFO "Powerdomain (%s) didn't enter " |
@@ -329,6 +333,7 @@ restore: | |||
329 | pwrst->pwrdm->name, pwrst->next_state); | 333 | pwrst->pwrdm->name, pwrst->next_state); |
330 | ret = -1; | 334 | ret = -1; |
331 | } | 335 | } |
336 | set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); | ||
332 | } | 337 | } |
333 | if (ret) | 338 | if (ret) |
334 | printk(KERN_ERR "Could not enter target state in pm_suspend\n"); | 339 | printk(KERN_ERR "Could not enter target state in pm_suspend\n"); |
@@ -339,11 +344,11 @@ restore: | |||
339 | return ret; | 344 | return ret; |
340 | } | 345 | } |
341 | 346 | ||
342 | static int omap3_pm_enter(suspend_state_t state) | 347 | static int omap3_pm_enter(suspend_state_t unused) |
343 | { | 348 | { |
344 | int ret = 0; | 349 | int ret = 0; |
345 | 350 | ||
346 | switch (state) { | 351 | switch (suspend_state) { |
347 | case PM_SUSPEND_STANDBY: | 352 | case PM_SUSPEND_STANDBY: |
348 | case PM_SUSPEND_MEM: | 353 | case PM_SUSPEND_MEM: |
349 | ret = omap3_pm_suspend(); | 354 | ret = omap3_pm_suspend(); |
@@ -360,12 +365,30 @@ static void omap3_pm_finish(void) | |||
360 | enable_hlt(); | 365 | enable_hlt(); |
361 | } | 366 | } |
362 | 367 | ||
368 | /* Hooks to enable / disable UART interrupts during suspend */ | ||
369 | static int omap3_pm_begin(suspend_state_t state) | ||
370 | { | ||
371 | suspend_state = state; | ||
372 | omap_uart_enable_irqs(0); | ||
373 | return 0; | ||
374 | } | ||
375 | |||
376 | static void omap3_pm_end(void) | ||
377 | { | ||
378 | suspend_state = PM_SUSPEND_ON; | ||
379 | omap_uart_enable_irqs(1); | ||
380 | return; | ||
381 | } | ||
382 | |||
363 | static struct platform_suspend_ops omap_pm_ops = { | 383 | static struct platform_suspend_ops omap_pm_ops = { |
384 | .begin = omap3_pm_begin, | ||
385 | .end = omap3_pm_end, | ||
364 | .prepare = omap3_pm_prepare, | 386 | .prepare = omap3_pm_prepare, |
365 | .enter = omap3_pm_enter, | 387 | .enter = omap3_pm_enter, |
366 | .finish = omap3_pm_finish, | 388 | .finish = omap3_pm_finish, |
367 | .valid = suspend_valid_only_mem, | 389 | .valid = suspend_valid_only_mem, |
368 | }; | 390 | }; |
391 | #endif /* CONFIG_SUSPEND */ | ||
369 | 392 | ||
370 | 393 | ||
371 | /** | 394 | /** |
@@ -613,6 +636,24 @@ static void __init prcm_setup_regs(void) | |||
613 | /* Clear any pending PRCM interrupts */ | 636 | /* Clear any pending PRCM interrupts */ |
614 | prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET); | 637 | prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET); |
615 | 638 | ||
639 | /* Don't attach IVA interrupts */ | ||
640 | prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL); | ||
641 | prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1); | ||
642 | prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3); | ||
643 | prm_write_mod_reg(0, OMAP3430_PER_MOD, OMAP3430_PM_IVAGRPSEL); | ||
644 | |||
645 | /* Clear any pending 'reset' flags */ | ||
646 | prm_write_mod_reg(0xffffffff, MPU_MOD, RM_RSTST); | ||
647 | prm_write_mod_reg(0xffffffff, CORE_MOD, RM_RSTST); | ||
648 | prm_write_mod_reg(0xffffffff, OMAP3430_PER_MOD, RM_RSTST); | ||
649 | prm_write_mod_reg(0xffffffff, OMAP3430_EMU_MOD, RM_RSTST); | ||
650 | prm_write_mod_reg(0xffffffff, OMAP3430_NEON_MOD, RM_RSTST); | ||
651 | prm_write_mod_reg(0xffffffff, OMAP3430_DSS_MOD, RM_RSTST); | ||
652 | prm_write_mod_reg(0xffffffff, OMAP3430ES2_USBHOST_MOD, RM_RSTST); | ||
653 | |||
654 | /* Clear any pending PRCM interrupts */ | ||
655 | prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET); | ||
656 | |||
616 | omap3_iva_idle(); | 657 | omap3_iva_idle(); |
617 | omap3_d2d_idle(); | 658 | omap3_d2d_idle(); |
618 | } | 659 | } |
@@ -652,7 +693,7 @@ static int __init clkdms_setup(struct clockdomain *clkdm) | |||
652 | return 0; | 693 | return 0; |
653 | } | 694 | } |
654 | 695 | ||
655 | int __init omap3_pm_init(void) | 696 | static int __init omap3_pm_init(void) |
656 | { | 697 | { |
657 | struct power_state *pwrst, *tmp; | 698 | struct power_state *pwrst, *tmp; |
658 | int ret; | 699 | int ret; |
@@ -692,7 +733,9 @@ int __init omap3_pm_init(void) | |||
692 | _omap_sram_idle = omap_sram_push(omap34xx_cpu_suspend, | 733 | _omap_sram_idle = omap_sram_push(omap34xx_cpu_suspend, |
693 | omap34xx_cpu_suspend_sz); | 734 | omap34xx_cpu_suspend_sz); |
694 | 735 | ||
736 | #ifdef CONFIG_SUSPEND | ||
695 | suspend_set_ops(&omap_pm_ops); | 737 | suspend_set_ops(&omap_pm_ops); |
738 | #endif /* CONFIG_SUSPEND */ | ||
696 | 739 | ||
697 | pm_idle = omap3_pm_idle; | 740 | pm_idle = omap3_pm_idle; |
698 | 741 | ||
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index f945156d5585..ced555a4cd1a 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/delay.h> | ||
20 | 21 | ||
21 | #include <mach/common.h> | 22 | #include <mach/common.h> |
22 | #include <mach/prcm.h> | 23 | #include <mach/prcm.h> |
@@ -28,6 +29,8 @@ | |||
28 | static void __iomem *prm_base; | 29 | static void __iomem *prm_base; |
29 | static void __iomem *cm_base; | 30 | static void __iomem *cm_base; |
30 | 31 | ||
32 | #define MAX_MODULE_ENABLE_WAIT 100000 | ||
33 | |||
31 | u32 omap_prcm_get_reset_sources(void) | 34 | u32 omap_prcm_get_reset_sources(void) |
32 | { | 35 | { |
33 | /* XXX This presumably needs modification for 34XX */ | 36 | /* XXX This presumably needs modification for 34XX */ |
@@ -120,6 +123,46 @@ u32 cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx) | |||
120 | } | 123 | } |
121 | EXPORT_SYMBOL(cm_rmw_mod_reg_bits); | 124 | EXPORT_SYMBOL(cm_rmw_mod_reg_bits); |
122 | 125 | ||
126 | /** | ||
127 | * omap2_cm_wait_idlest - wait for IDLEST bit to indicate module readiness | ||
128 | * @reg: physical address of module IDLEST register | ||
129 | * @mask: value to mask against to determine if the module is active | ||
130 | * @name: name of the clock (for printk) | ||
131 | * | ||
132 | * Returns 1 if the module indicated readiness in time, or 0 if it | ||
133 | * failed to enable in roughly MAX_MODULE_ENABLE_WAIT microseconds. | ||
134 | */ | ||
135 | int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, const char *name) | ||
136 | { | ||
137 | int i = 0; | ||
138 | int ena = 0; | ||
139 | |||
140 | /* | ||
141 | * 24xx uses 0 to indicate not ready, and 1 to indicate ready. | ||
142 | * 34xx reverses this, just to keep us on our toes | ||
143 | */ | ||
144 | if (cpu_is_omap24xx()) | ||
145 | ena = mask; | ||
146 | else if (cpu_is_omap34xx()) | ||
147 | ena = 0; | ||
148 | else | ||
149 | BUG(); | ||
150 | |||
151 | /* Wait for lock */ | ||
152 | while (((__raw_readl(reg) & mask) != ena) && | ||
153 | (i++ < MAX_MODULE_ENABLE_WAIT)) | ||
154 | udelay(1); | ||
155 | |||
156 | if (i < MAX_MODULE_ENABLE_WAIT) | ||
157 | pr_debug("cm: Module associated with clock %s ready after %d " | ||
158 | "loops\n", name, i); | ||
159 | else | ||
160 | pr_err("cm: Module associated with clock %s didn't enable in " | ||
161 | "%d tries\n", name, MAX_MODULE_ENABLE_WAIT); | ||
162 | |||
163 | return (i < MAX_MODULE_ENABLE_WAIT) ? 1 : 0; | ||
164 | }; | ||
165 | |||
123 | void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) | 166 | void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) |
124 | { | 167 | { |
125 | prm_base = omap2_globals->prm; | 168 | prm_base = omap2_globals->prm; |
diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c index 2045441e8385..9e3bd4fa7810 100644 --- a/arch/arm/mach-omap2/sdrc.c +++ b/arch/arm/mach-omap2/sdrc.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <mach/sdrc.h> | 32 | #include <mach/sdrc.h> |
33 | #include "sdrc.h" | 33 | #include "sdrc.h" |
34 | 34 | ||
35 | static struct omap_sdrc_params *sdrc_init_params; | 35 | static struct omap_sdrc_params *sdrc_init_params_cs0, *sdrc_init_params_cs1; |
36 | 36 | ||
37 | void __iomem *omap2_sdrc_base; | 37 | void __iomem *omap2_sdrc_base; |
38 | void __iomem *omap2_sms_base; | 38 | void __iomem *omap2_sms_base; |
@@ -45,33 +45,49 @@ void __iomem *omap2_sms_base; | |||
45 | /** | 45 | /** |
46 | * omap2_sdrc_get_params - return SDRC register values for a given clock rate | 46 | * omap2_sdrc_get_params - return SDRC register values for a given clock rate |
47 | * @r: SDRC clock rate (in Hz) | 47 | * @r: SDRC clock rate (in Hz) |
48 | * @sdrc_cs0: chip select 0 ram timings ** | ||
49 | * @sdrc_cs1: chip select 1 ram timings ** | ||
48 | * | 50 | * |
49 | * Return pre-calculated values for the SDRC_ACTIM_CTRLA, | 51 | * Return pre-calculated values for the SDRC_ACTIM_CTRLA, |
50 | * SDRC_ACTIM_CTRLB, SDRC_RFR_CTRL, and SDRC_MR registers, for a given | 52 | * SDRC_ACTIM_CTRLB, SDRC_RFR_CTRL and SDRC_MR registers in sdrc_cs[01] |
51 | * SDRC clock rate 'r'. These parameters control various timing | 53 | * structs,for a given SDRC clock rate 'r'. |
52 | * delays in the SDRAM controller that are expressed in terms of the | 54 | * These parameters control various timing delays in the SDRAM controller |
53 | * number of SDRC clock cycles to wait; hence the clock rate | 55 | * that are expressed in terms of the number of SDRC clock cycles to |
54 | * dependency. Note that sdrc_init_params must be sorted rate | 56 | * wait; hence the clock rate dependency. |
55 | * descending. Also assumes that both chip-selects use the same | 57 | * |
56 | * timing parameters. Returns a struct omap_sdrc_params * upon | 58 | * Supports 2 different timing parameters for both chip selects. |
57 | * success, or NULL upon failure. | 59 | * |
60 | * Note 1: the sdrc_init_params_cs[01] must be sorted rate descending. | ||
61 | * Note 2: If sdrc_init_params_cs_1 is not NULL it must be of same size | ||
62 | * as sdrc_init_params_cs_0. | ||
63 | * | ||
64 | * Fills in the struct omap_sdrc_params * for each chip select. | ||
65 | * Returns 0 upon success or -1 upon failure. | ||
58 | */ | 66 | */ |
59 | struct omap_sdrc_params *omap2_sdrc_get_params(unsigned long r) | 67 | int omap2_sdrc_get_params(unsigned long r, |
68 | struct omap_sdrc_params **sdrc_cs0, | ||
69 | struct omap_sdrc_params **sdrc_cs1) | ||
60 | { | 70 | { |
61 | struct omap_sdrc_params *sp; | 71 | struct omap_sdrc_params *sp0, *sp1; |
62 | 72 | ||
63 | if (!sdrc_init_params) | 73 | if (!sdrc_init_params_cs0) |
64 | return NULL; | 74 | return -1; |
65 | 75 | ||
66 | sp = sdrc_init_params; | 76 | sp0 = sdrc_init_params_cs0; |
77 | sp1 = sdrc_init_params_cs1; | ||
67 | 78 | ||
68 | while (sp->rate && sp->rate != r) | 79 | while (sp0->rate && sp0->rate != r) { |
69 | sp++; | 80 | sp0++; |
81 | if (sdrc_init_params_cs1) | ||
82 | sp1++; | ||
83 | } | ||
70 | 84 | ||
71 | if (!sp->rate) | 85 | if (!sp0->rate) |
72 | return NULL; | 86 | return -1; |
73 | 87 | ||
74 | return sp; | 88 | *sdrc_cs0 = sp0; |
89 | *sdrc_cs1 = sp1; | ||
90 | return 0; | ||
75 | } | 91 | } |
76 | 92 | ||
77 | 93 | ||
@@ -83,13 +99,15 @@ void __init omap2_set_globals_sdrc(struct omap_globals *omap2_globals) | |||
83 | 99 | ||
84 | /** | 100 | /** |
85 | * omap2_sdrc_init - initialize SMS, SDRC devices on boot | 101 | * omap2_sdrc_init - initialize SMS, SDRC devices on boot |
86 | * @sp: pointer to a null-terminated list of struct omap_sdrc_params | 102 | * @sdrc_cs[01]: pointers to a null-terminated list of struct omap_sdrc_params |
103 | * Support for 2 chip selects timings | ||
87 | * | 104 | * |
88 | * Turn on smart idle modes for SDRAM scheduler and controller. | 105 | * Turn on smart idle modes for SDRAM scheduler and controller. |
89 | * Program a known-good configuration for the SDRC to deal with buggy | 106 | * Program a known-good configuration for the SDRC to deal with buggy |
90 | * bootloaders. | 107 | * bootloaders. |
91 | */ | 108 | */ |
92 | void __init omap2_sdrc_init(struct omap_sdrc_params *sp) | 109 | void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0, |
110 | struct omap_sdrc_params *sdrc_cs1) | ||
93 | { | 111 | { |
94 | u32 l; | 112 | u32 l; |
95 | 113 | ||
@@ -103,11 +121,15 @@ void __init omap2_sdrc_init(struct omap_sdrc_params *sp) | |||
103 | l |= (0x2 << 3); | 121 | l |= (0x2 << 3); |
104 | sdrc_write_reg(l, SDRC_SYSCONFIG); | 122 | sdrc_write_reg(l, SDRC_SYSCONFIG); |
105 | 123 | ||
106 | sdrc_init_params = sp; | 124 | sdrc_init_params_cs0 = sdrc_cs0; |
125 | sdrc_init_params_cs1 = sdrc_cs1; | ||
107 | 126 | ||
108 | /* XXX Enable SRFRONIDLEREQ here also? */ | 127 | /* XXX Enable SRFRONIDLEREQ here also? */ |
128 | /* | ||
129 | * PWDENA should not be set due to 34xx erratum 1.150 - PWDENA | ||
130 | * can cause random memory corruption | ||
131 | */ | ||
109 | l = (1 << SDRC_POWER_EXTCLKDIS_SHIFT) | | 132 | l = (1 << SDRC_POWER_EXTCLKDIS_SHIFT) | |
110 | (1 << SDRC_POWER_PWDENA_SHIFT) | | ||
111 | (1 << SDRC_POWER_PAGEPOLICY_SHIFT); | 133 | (1 << SDRC_POWER_PAGEPOLICY_SHIFT); |
112 | sdrc_write_reg(l, SDRC_POWER); | 134 | sdrc_write_reg(l, SDRC_POWER); |
113 | } | 135 | } |
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index b094c15bfe47..a7421a50410b 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -54,6 +54,7 @@ struct omap_uart_state { | |||
54 | 54 | ||
55 | struct plat_serial8250_port *p; | 55 | struct plat_serial8250_port *p; |
56 | struct list_head node; | 56 | struct list_head node; |
57 | struct platform_device pdev; | ||
57 | 58 | ||
58 | #if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) | 59 | #if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) |
59 | int context_valid; | 60 | int context_valid; |
@@ -68,10 +69,9 @@ struct omap_uart_state { | |||
68 | #endif | 69 | #endif |
69 | }; | 70 | }; |
70 | 71 | ||
71 | static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS]; | ||
72 | static LIST_HEAD(uart_list); | 72 | static LIST_HEAD(uart_list); |
73 | 73 | ||
74 | static struct plat_serial8250_port serial_platform_data[] = { | 74 | static struct plat_serial8250_port serial_platform_data0[] = { |
75 | { | 75 | { |
76 | .membase = IO_ADDRESS(OMAP_UART1_BASE), | 76 | .membase = IO_ADDRESS(OMAP_UART1_BASE), |
77 | .mapbase = OMAP_UART1_BASE, | 77 | .mapbase = OMAP_UART1_BASE, |
@@ -81,6 +81,12 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
81 | .regshift = 2, | 81 | .regshift = 2, |
82 | .uartclk = OMAP24XX_BASE_BAUD * 16, | 82 | .uartclk = OMAP24XX_BASE_BAUD * 16, |
83 | }, { | 83 | }, { |
84 | .flags = 0 | ||
85 | } | ||
86 | }; | ||
87 | |||
88 | static struct plat_serial8250_port serial_platform_data1[] = { | ||
89 | { | ||
84 | .membase = IO_ADDRESS(OMAP_UART2_BASE), | 90 | .membase = IO_ADDRESS(OMAP_UART2_BASE), |
85 | .mapbase = OMAP_UART2_BASE, | 91 | .mapbase = OMAP_UART2_BASE, |
86 | .irq = 73, | 92 | .irq = 73, |
@@ -89,6 +95,12 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
89 | .regshift = 2, | 95 | .regshift = 2, |
90 | .uartclk = OMAP24XX_BASE_BAUD * 16, | 96 | .uartclk = OMAP24XX_BASE_BAUD * 16, |
91 | }, { | 97 | }, { |
98 | .flags = 0 | ||
99 | } | ||
100 | }; | ||
101 | |||
102 | static struct plat_serial8250_port serial_platform_data2[] = { | ||
103 | { | ||
92 | .membase = IO_ADDRESS(OMAP_UART3_BASE), | 104 | .membase = IO_ADDRESS(OMAP_UART3_BASE), |
93 | .mapbase = OMAP_UART3_BASE, | 105 | .mapbase = OMAP_UART3_BASE, |
94 | .irq = 74, | 106 | .irq = 74, |
@@ -217,6 +229,40 @@ static inline void omap_uart_disable_clocks(struct omap_uart_state *uart) | |||
217 | clk_disable(uart->fck); | 229 | clk_disable(uart->fck); |
218 | } | 230 | } |
219 | 231 | ||
232 | static void omap_uart_enable_wakeup(struct omap_uart_state *uart) | ||
233 | { | ||
234 | /* Set wake-enable bit */ | ||
235 | if (uart->wk_en && uart->wk_mask) { | ||
236 | u32 v = __raw_readl(uart->wk_en); | ||
237 | v |= uart->wk_mask; | ||
238 | __raw_writel(v, uart->wk_en); | ||
239 | } | ||
240 | |||
241 | /* Ensure IOPAD wake-enables are set */ | ||
242 | if (cpu_is_omap34xx() && uart->padconf) { | ||
243 | u16 v = omap_ctrl_readw(uart->padconf); | ||
244 | v |= OMAP3_PADCONF_WAKEUPENABLE0; | ||
245 | omap_ctrl_writew(v, uart->padconf); | ||
246 | } | ||
247 | } | ||
248 | |||
249 | static void omap_uart_disable_wakeup(struct omap_uart_state *uart) | ||
250 | { | ||
251 | /* Clear wake-enable bit */ | ||
252 | if (uart->wk_en && uart->wk_mask) { | ||
253 | u32 v = __raw_readl(uart->wk_en); | ||
254 | v &= ~uart->wk_mask; | ||
255 | __raw_writel(v, uart->wk_en); | ||
256 | } | ||
257 | |||
258 | /* Ensure IOPAD wake-enables are cleared */ | ||
259 | if (cpu_is_omap34xx() && uart->padconf) { | ||
260 | u16 v = omap_ctrl_readw(uart->padconf); | ||
261 | v &= ~OMAP3_PADCONF_WAKEUPENABLE0; | ||
262 | omap_ctrl_writew(v, uart->padconf); | ||
263 | } | ||
264 | } | ||
265 | |||
220 | static void omap_uart_smart_idle_enable(struct omap_uart_state *uart, | 266 | static void omap_uart_smart_idle_enable(struct omap_uart_state *uart, |
221 | int enable) | 267 | int enable) |
222 | { | 268 | { |
@@ -246,6 +292,11 @@ static void omap_uart_block_sleep(struct omap_uart_state *uart) | |||
246 | 292 | ||
247 | static void omap_uart_allow_sleep(struct omap_uart_state *uart) | 293 | static void omap_uart_allow_sleep(struct omap_uart_state *uart) |
248 | { | 294 | { |
295 | if (device_may_wakeup(&uart->pdev.dev)) | ||
296 | omap_uart_enable_wakeup(uart); | ||
297 | else | ||
298 | omap_uart_disable_wakeup(uart); | ||
299 | |||
249 | if (!uart->clocked) | 300 | if (!uart->clocked) |
250 | return; | 301 | return; |
251 | 302 | ||
@@ -292,7 +343,6 @@ void omap_uart_resume_idle(int num) | |||
292 | /* Check for normal UART wakeup */ | 343 | /* Check for normal UART wakeup */ |
293 | if (__raw_readl(uart->wk_st) & uart->wk_mask) | 344 | if (__raw_readl(uart->wk_st) & uart->wk_mask) |
294 | omap_uart_block_sleep(uart); | 345 | omap_uart_block_sleep(uart); |
295 | |||
296 | return; | 346 | return; |
297 | } | 347 | } |
298 | } | 348 | } |
@@ -346,16 +396,13 @@ static irqreturn_t omap_uart_interrupt(int irq, void *dev_id) | |||
346 | return IRQ_NONE; | 396 | return IRQ_NONE; |
347 | } | 397 | } |
348 | 398 | ||
349 | static u32 sleep_timeout = DEFAULT_TIMEOUT; | ||
350 | |||
351 | static void omap_uart_idle_init(struct omap_uart_state *uart) | 399 | static void omap_uart_idle_init(struct omap_uart_state *uart) |
352 | { | 400 | { |
353 | u32 v; | ||
354 | struct plat_serial8250_port *p = uart->p; | 401 | struct plat_serial8250_port *p = uart->p; |
355 | int ret; | 402 | int ret; |
356 | 403 | ||
357 | uart->can_sleep = 0; | 404 | uart->can_sleep = 0; |
358 | uart->timeout = sleep_timeout; | 405 | uart->timeout = DEFAULT_TIMEOUT; |
359 | setup_timer(&uart->timer, omap_uart_idle_timer, | 406 | setup_timer(&uart->timer, omap_uart_idle_timer, |
360 | (unsigned long) uart); | 407 | (unsigned long) uart); |
361 | mod_timer(&uart->timer, jiffies + uart->timeout); | 408 | mod_timer(&uart->timer, jiffies + uart->timeout); |
@@ -413,76 +460,101 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) | |||
413 | uart->padconf = 0; | 460 | uart->padconf = 0; |
414 | } | 461 | } |
415 | 462 | ||
416 | /* Set wake-enable bit */ | ||
417 | if (uart->wk_en && uart->wk_mask) { | ||
418 | v = __raw_readl(uart->wk_en); | ||
419 | v |= uart->wk_mask; | ||
420 | __raw_writel(v, uart->wk_en); | ||
421 | } | ||
422 | |||
423 | /* Ensure IOPAD wake-enables are set */ | ||
424 | if (cpu_is_omap34xx() && uart->padconf) { | ||
425 | u16 v; | ||
426 | |||
427 | v = omap_ctrl_readw(uart->padconf); | ||
428 | v |= OMAP3_PADCONF_WAKEUPENABLE0; | ||
429 | omap_ctrl_writew(v, uart->padconf); | ||
430 | } | ||
431 | |||
432 | p->flags |= UPF_SHARE_IRQ; | 463 | p->flags |= UPF_SHARE_IRQ; |
433 | ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, | 464 | ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, |
434 | "serial idle", (void *)uart); | 465 | "serial idle", (void *)uart); |
435 | WARN_ON(ret); | 466 | WARN_ON(ret); |
436 | } | 467 | } |
437 | 468 | ||
438 | static ssize_t sleep_timeout_show(struct kobject *kobj, | 469 | void omap_uart_enable_irqs(int enable) |
439 | struct kobj_attribute *attr, | 470 | { |
471 | int ret; | ||
472 | struct omap_uart_state *uart; | ||
473 | |||
474 | list_for_each_entry(uart, &uart_list, node) { | ||
475 | if (enable) | ||
476 | ret = request_irq(uart->p->irq, omap_uart_interrupt, | ||
477 | IRQF_SHARED, "serial idle", (void *)uart); | ||
478 | else | ||
479 | free_irq(uart->p->irq, (void *)uart); | ||
480 | } | ||
481 | } | ||
482 | |||
483 | static ssize_t sleep_timeout_show(struct device *dev, | ||
484 | struct device_attribute *attr, | ||
440 | char *buf) | 485 | char *buf) |
441 | { | 486 | { |
442 | return sprintf(buf, "%u\n", sleep_timeout / HZ); | 487 | struct platform_device *pdev = container_of(dev, |
488 | struct platform_device, dev); | ||
489 | struct omap_uart_state *uart = container_of(pdev, | ||
490 | struct omap_uart_state, pdev); | ||
491 | |||
492 | return sprintf(buf, "%u\n", uart->timeout / HZ); | ||
443 | } | 493 | } |
444 | 494 | ||
445 | static ssize_t sleep_timeout_store(struct kobject *kobj, | 495 | static ssize_t sleep_timeout_store(struct device *dev, |
446 | struct kobj_attribute *attr, | 496 | struct device_attribute *attr, |
447 | const char *buf, size_t n) | 497 | const char *buf, size_t n) |
448 | { | 498 | { |
449 | struct omap_uart_state *uart; | 499 | struct platform_device *pdev = container_of(dev, |
500 | struct platform_device, dev); | ||
501 | struct omap_uart_state *uart = container_of(pdev, | ||
502 | struct omap_uart_state, pdev); | ||
450 | unsigned int value; | 503 | unsigned int value; |
451 | 504 | ||
452 | if (sscanf(buf, "%u", &value) != 1) { | 505 | if (sscanf(buf, "%u", &value) != 1) { |
453 | printk(KERN_ERR "sleep_timeout_store: Invalid value\n"); | 506 | printk(KERN_ERR "sleep_timeout_store: Invalid value\n"); |
454 | return -EINVAL; | 507 | return -EINVAL; |
455 | } | 508 | } |
456 | sleep_timeout = value * HZ; | 509 | |
457 | list_for_each_entry(uart, &uart_list, node) { | 510 | uart->timeout = value * HZ; |
458 | uart->timeout = sleep_timeout; | 511 | if (uart->timeout) |
459 | if (uart->timeout) | 512 | mod_timer(&uart->timer, jiffies + uart->timeout); |
460 | mod_timer(&uart->timer, jiffies + uart->timeout); | 513 | else |
461 | else | 514 | /* A zero value means disable timeout feature */ |
462 | /* A zero value means disable timeout feature */ | 515 | omap_uart_block_sleep(uart); |
463 | omap_uart_block_sleep(uart); | 516 | |
464 | } | ||
465 | return n; | 517 | return n; |
466 | } | 518 | } |
467 | 519 | ||
468 | static struct kobj_attribute sleep_timeout_attr = | 520 | DEVICE_ATTR(sleep_timeout, 0644, sleep_timeout_show, sleep_timeout_store); |
469 | __ATTR(sleep_timeout, 0644, sleep_timeout_show, sleep_timeout_store); | 521 | #define DEV_CREATE_FILE(dev, attr) WARN_ON(device_create_file(dev, attr)) |
470 | |||
471 | #else | 522 | #else |
472 | static inline void omap_uart_idle_init(struct omap_uart_state *uart) {} | 523 | static inline void omap_uart_idle_init(struct omap_uart_state *uart) {} |
524 | #define DEV_CREATE_FILE(dev, attr) | ||
473 | #endif /* CONFIG_PM */ | 525 | #endif /* CONFIG_PM */ |
474 | 526 | ||
475 | static struct platform_device serial_device = { | 527 | static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = { |
476 | .name = "serial8250", | 528 | { |
477 | .id = PLAT8250_DEV_PLATFORM, | 529 | .pdev = { |
478 | .dev = { | 530 | .name = "serial8250", |
479 | .platform_data = serial_platform_data, | 531 | .id = PLAT8250_DEV_PLATFORM, |
532 | .dev = { | ||
533 | .platform_data = serial_platform_data0, | ||
534 | }, | ||
535 | }, | ||
536 | }, { | ||
537 | .pdev = { | ||
538 | .name = "serial8250", | ||
539 | .id = PLAT8250_DEV_PLATFORM1, | ||
540 | .dev = { | ||
541 | .platform_data = serial_platform_data1, | ||
542 | }, | ||
543 | }, | ||
544 | }, { | ||
545 | .pdev = { | ||
546 | .name = "serial8250", | ||
547 | .id = PLAT8250_DEV_PLATFORM2, | ||
548 | .dev = { | ||
549 | .platform_data = serial_platform_data2, | ||
550 | }, | ||
551 | }, | ||
480 | }, | 552 | }, |
481 | }; | 553 | }; |
482 | 554 | ||
483 | void __init omap_serial_init(void) | 555 | void __init omap_serial_init(void) |
484 | { | 556 | { |
485 | int i, err; | 557 | int i; |
486 | const struct omap_uart_config *info; | 558 | const struct omap_uart_config *info; |
487 | char name[16]; | 559 | char name[16]; |
488 | 560 | ||
@@ -496,14 +568,12 @@ void __init omap_serial_init(void) | |||
496 | 568 | ||
497 | if (info == NULL) | 569 | if (info == NULL) |
498 | return; | 570 | return; |
499 | if (cpu_is_omap44xx()) { | ||
500 | for (i = 0; i < OMAP_MAX_NR_PORTS; i++) | ||
501 | serial_platform_data[i].irq += 32; | ||
502 | } | ||
503 | 571 | ||
504 | for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { | 572 | for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { |
505 | struct plat_serial8250_port *p = serial_platform_data + i; | ||
506 | struct omap_uart_state *uart = &omap_uart[i]; | 573 | struct omap_uart_state *uart = &omap_uart[i]; |
574 | struct platform_device *pdev = &uart->pdev; | ||
575 | struct device *dev = &pdev->dev; | ||
576 | struct plat_serial8250_port *p = dev->platform_data; | ||
507 | 577 | ||
508 | if (!(info->enabled_uarts & (1 << i))) { | 578 | if (!(info->enabled_uarts & (1 << i))) { |
509 | p->membase = NULL; | 579 | p->membase = NULL; |
@@ -531,20 +601,21 @@ void __init omap_serial_init(void) | |||
531 | uart->num = i; | 601 | uart->num = i; |
532 | p->private_data = uart; | 602 | p->private_data = uart; |
533 | uart->p = p; | 603 | uart->p = p; |
534 | list_add(&uart->node, &uart_list); | 604 | list_add_tail(&uart->node, &uart_list); |
605 | |||
606 | if (cpu_is_omap44xx()) | ||
607 | p->irq += 32; | ||
535 | 608 | ||
536 | omap_uart_enable_clocks(uart); | 609 | omap_uart_enable_clocks(uart); |
537 | omap_uart_reset(uart); | 610 | omap_uart_reset(uart); |
538 | omap_uart_idle_init(uart); | 611 | omap_uart_idle_init(uart); |
539 | } | ||
540 | |||
541 | err = platform_device_register(&serial_device); | ||
542 | |||
543 | #ifdef CONFIG_PM | ||
544 | if (!err) | ||
545 | err = sysfs_create_file(&serial_device.dev.kobj, | ||
546 | &sleep_timeout_attr.attr); | ||
547 | #endif | ||
548 | 612 | ||
613 | if (WARN_ON(platform_device_register(pdev))) | ||
614 | continue; | ||
615 | if ((cpu_is_omap34xx() && uart->padconf) || | ||
616 | (uart->wk_en && uart->wk_mask)) { | ||
617 | device_init_wakeup(dev, true); | ||
618 | DEV_CREATE_FILE(dev, &dev_attr_sleep_timeout); | ||
619 | } | ||
620 | } | ||
549 | } | 621 | } |
550 | |||
diff --git a/arch/arm/mach-omap2/sram34xx.S b/arch/arm/mach-omap2/sram34xx.S index f41f8d96ddba..82aa4a3d160c 100644 --- a/arch/arm/mach-omap2/sram34xx.S +++ b/arch/arm/mach-omap2/sram34xx.S | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | .text | 37 | .text |
38 | 38 | ||
39 | /* r4 parameters */ | 39 | /* r1 parameters */ |
40 | #define SDRC_NO_UNLOCK_DLL 0x0 | 40 | #define SDRC_NO_UNLOCK_DLL 0x0 |
41 | #define SDRC_UNLOCK_DLL 0x1 | 41 | #define SDRC_UNLOCK_DLL 0x1 |
42 | 42 | ||
@@ -58,7 +58,6 @@ | |||
58 | 58 | ||
59 | /* SDRC_POWER bit settings */ | 59 | /* SDRC_POWER bit settings */ |
60 | #define SRFRONIDLEREQ_MASK 0x40 | 60 | #define SRFRONIDLEREQ_MASK 0x40 |
61 | #define PWDENA_MASK 0x4 | ||
62 | 61 | ||
63 | /* CM_IDLEST1_CORE bit settings */ | 62 | /* CM_IDLEST1_CORE bit settings */ |
64 | #define ST_SDRC_MASK 0x2 | 63 | #define ST_SDRC_MASK 0x2 |
@@ -71,41 +70,72 @@ | |||
71 | 70 | ||
72 | /* | 71 | /* |
73 | * omap3_sram_configure_core_dpll - change DPLL3 M2 divider | 72 | * omap3_sram_configure_core_dpll - change DPLL3 M2 divider |
74 | * r0 = new SDRC_RFR_CTRL register contents | 73 | * |
75 | * r1 = new SDRC_ACTIM_CTRLA register contents | 74 | * Params passed in registers: |
76 | * r2 = new SDRC_ACTIM_CTRLB register contents | 75 | * r0 = new M2 divider setting (only 1 and 2 supported right now) |
77 | * r3 = new M2 divider setting (only 1 and 2 supported right now) | 76 | * r1 = unlock SDRC DLL? (1 = yes, 0 = no). Only unlock DLL for |
78 | * r4 = unlock SDRC DLL? (1 = yes, 0 = no). Only unlock DLL for | ||
79 | * SDRC rates < 83MHz | 77 | * SDRC rates < 83MHz |
80 | * r5 = number of MPU cycles to wait for SDRC to stabilize after | 78 | * r2 = number of MPU cycles to wait for SDRC to stabilize after |
81 | * reprogramming the SDRC when switching to a slower MPU speed | 79 | * reprogramming the SDRC when switching to a slower MPU speed |
82 | * r6 = new SDRC_MR_0 register value | 80 | * r3 = increasing SDRC rate? (1 = yes, 0 = no) |
83 | * r7 = increasing SDRC rate? (1 = yes, 0 = no) | 81 | * |
82 | * Params passed via the stack. The needed params will be copied in SRAM | ||
83 | * before use by the code in SRAM (SDRAM is not accessible during SDRC | ||
84 | * reconfiguration): | ||
85 | * new SDRC_RFR_CTRL_0 register contents | ||
86 | * new SDRC_ACTIM_CTRL_A_0 register contents | ||
87 | * new SDRC_ACTIM_CTRL_B_0 register contents | ||
88 | * new SDRC_MR_0 register value | ||
89 | * new SDRC_RFR_CTRL_1 register contents | ||
90 | * new SDRC_ACTIM_CTRL_A_1 register contents | ||
91 | * new SDRC_ACTIM_CTRL_B_1 register contents | ||
92 | * new SDRC_MR_1 register value | ||
84 | * | 93 | * |
94 | * If the param SDRC_RFR_CTRL_1 is 0, the parameters | ||
95 | * are not programmed into the SDRC CS1 registers | ||
85 | */ | 96 | */ |
86 | ENTRY(omap3_sram_configure_core_dpll) | 97 | ENTRY(omap3_sram_configure_core_dpll) |
87 | stmfd sp!, {r1-r12, lr} @ store regs to stack | 98 | stmfd sp!, {r1-r12, lr} @ store regs to stack |
88 | ldr r4, [sp, #52] @ pull extra args off the stack | 99 | |
89 | ldr r5, [sp, #56] @ load extra args from the stack | 100 | @ pull the extra args off the stack |
90 | ldr r6, [sp, #60] @ load extra args from the stack | 101 | @ and store them in SRAM |
91 | ldr r7, [sp, #64] @ load extra args from the stack | 102 | ldr r4, [sp, #52] |
103 | str r4, omap_sdrc_rfr_ctrl_0_val | ||
104 | ldr r4, [sp, #56] | ||
105 | str r4, omap_sdrc_actim_ctrl_a_0_val | ||
106 | ldr r4, [sp, #60] | ||
107 | str r4, omap_sdrc_actim_ctrl_b_0_val | ||
108 | ldr r4, [sp, #64] | ||
109 | str r4, omap_sdrc_mr_0_val | ||
110 | ldr r4, [sp, #68] | ||
111 | str r4, omap_sdrc_rfr_ctrl_1_val | ||
112 | cmp r4, #0 @ if SDRC_RFR_CTRL_1 is 0, | ||
113 | beq skip_cs1_params @ do not use cs1 params | ||
114 | ldr r4, [sp, #72] | ||
115 | str r4, omap_sdrc_actim_ctrl_a_1_val | ||
116 | ldr r4, [sp, #76] | ||
117 | str r4, omap_sdrc_actim_ctrl_b_1_val | ||
118 | ldr r4, [sp, #80] | ||
119 | str r4, omap_sdrc_mr_1_val | ||
120 | skip_cs1_params: | ||
92 | dsb @ flush buffered writes to interconnect | 121 | dsb @ flush buffered writes to interconnect |
93 | cmp r7, #1 @ if increasing SDRC clk rate, | 122 | |
123 | cmp r3, #1 @ if increasing SDRC clk rate, | ||
94 | bleq configure_sdrc @ program the SDRC regs early (for RFR) | 124 | bleq configure_sdrc @ program the SDRC regs early (for RFR) |
95 | cmp r4, #SDRC_UNLOCK_DLL @ set the intended DLL state | 125 | cmp r1, #SDRC_UNLOCK_DLL @ set the intended DLL state |
96 | bleq unlock_dll | 126 | bleq unlock_dll |
97 | blne lock_dll | 127 | blne lock_dll |
98 | bl sdram_in_selfrefresh @ put SDRAM in self refresh, idle SDRC | 128 | bl sdram_in_selfrefresh @ put SDRAM in self refresh, idle SDRC |
99 | bl configure_core_dpll @ change the DPLL3 M2 divider | 129 | bl configure_core_dpll @ change the DPLL3 M2 divider |
130 | mov r12, r2 | ||
131 | bl wait_clk_stable @ wait for SDRC to stabilize | ||
100 | bl enable_sdrc @ take SDRC out of idle | 132 | bl enable_sdrc @ take SDRC out of idle |
101 | cmp r4, #SDRC_UNLOCK_DLL @ wait for DLL status to change | 133 | cmp r1, #SDRC_UNLOCK_DLL @ wait for DLL status to change |
102 | bleq wait_dll_unlock | 134 | bleq wait_dll_unlock |
103 | blne wait_dll_lock | 135 | blne wait_dll_lock |
104 | cmp r7, #1 @ if increasing SDRC clk rate, | 136 | cmp r3, #1 @ if increasing SDRC clk rate, |
105 | beq return_to_sdram @ return to SDRAM code, otherwise, | 137 | beq return_to_sdram @ return to SDRAM code, otherwise, |
106 | bl configure_sdrc @ reprogram SDRC regs now | 138 | bl configure_sdrc @ reprogram SDRC regs now |
107 | mov r12, r5 | ||
108 | bl wait_clk_stable @ wait for SDRC to stabilize | ||
109 | return_to_sdram: | 139 | return_to_sdram: |
110 | isb @ prevent speculative exec past here | 140 | isb @ prevent speculative exec past here |
111 | mov r0, #0 @ return value | 141 | mov r0, #0 @ return value |
@@ -113,7 +143,7 @@ return_to_sdram: | |||
113 | unlock_dll: | 143 | unlock_dll: |
114 | ldr r11, omap3_sdrc_dlla_ctrl | 144 | ldr r11, omap3_sdrc_dlla_ctrl |
115 | ldr r12, [r11] | 145 | ldr r12, [r11] |
116 | and r12, r12, #FIXEDDELAY_MASK | 146 | bic r12, r12, #FIXEDDELAY_MASK |
117 | orr r12, r12, #FIXEDDELAY_DEFAULT | 147 | orr r12, r12, #FIXEDDELAY_DEFAULT |
118 | orr r12, r12, #DLLIDLE_MASK | 148 | orr r12, r12, #DLLIDLE_MASK |
119 | str r12, [r11] @ (no OCP barrier needed) | 149 | str r12, [r11] @ (no OCP barrier needed) |
@@ -129,7 +159,6 @@ sdram_in_selfrefresh: | |||
129 | ldr r12, [r11] @ read the contents of SDRC_POWER | 159 | ldr r12, [r11] @ read the contents of SDRC_POWER |
130 | mov r9, r12 @ keep a copy of SDRC_POWER bits | 160 | mov r9, r12 @ keep a copy of SDRC_POWER bits |
131 | orr r12, r12, #SRFRONIDLEREQ_MASK @ enable self refresh on idle | 161 | orr r12, r12, #SRFRONIDLEREQ_MASK @ enable self refresh on idle |
132 | bic r12, r12, #PWDENA_MASK @ clear PWDENA | ||
133 | str r12, [r11] @ write back to SDRC_POWER register | 162 | str r12, [r11] @ write back to SDRC_POWER register |
134 | ldr r12, [r11] @ posted-write barrier for SDRC | 163 | ldr r12, [r11] @ posted-write barrier for SDRC |
135 | idle_sdrc: | 164 | idle_sdrc: |
@@ -149,7 +178,7 @@ configure_core_dpll: | |||
149 | ldr r12, [r11] | 178 | ldr r12, [r11] |
150 | ldr r10, core_m2_mask_val @ modify m2 for core dpll | 179 | ldr r10, core_m2_mask_val @ modify m2 for core dpll |
151 | and r12, r12, r10 | 180 | and r12, r12, r10 |
152 | orr r12, r12, r3, lsl #CORE_DPLL_CLKOUT_DIV_SHIFT | 181 | orr r12, r12, r0, lsl #CORE_DPLL_CLKOUT_DIV_SHIFT |
153 | str r12, [r11] | 182 | str r12, [r11] |
154 | ldr r12, [r11] @ posted-write barrier for CM | 183 | ldr r12, [r11] @ posted-write barrier for CM |
155 | bx lr | 184 | bx lr |
@@ -187,15 +216,34 @@ wait_dll_unlock: | |||
187 | bne wait_dll_unlock | 216 | bne wait_dll_unlock |
188 | bx lr | 217 | bx lr |
189 | configure_sdrc: | 218 | configure_sdrc: |
190 | ldr r11, omap3_sdrc_rfr_ctrl | 219 | ldr r12, omap_sdrc_rfr_ctrl_0_val @ fetch value from SRAM |
191 | str r0, [r11] | 220 | ldr r11, omap3_sdrc_rfr_ctrl_0 @ fetch addr from SRAM |
192 | ldr r11, omap3_sdrc_actim_ctrla | 221 | str r12, [r11] @ store |
193 | str r1, [r11] | 222 | ldr r12, omap_sdrc_actim_ctrl_a_0_val |
194 | ldr r11, omap3_sdrc_actim_ctrlb | 223 | ldr r11, omap3_sdrc_actim_ctrl_a_0 |
195 | str r2, [r11] | 224 | str r12, [r11] |
225 | ldr r12, omap_sdrc_actim_ctrl_b_0_val | ||
226 | ldr r11, omap3_sdrc_actim_ctrl_b_0 | ||
227 | str r12, [r11] | ||
228 | ldr r12, omap_sdrc_mr_0_val | ||
196 | ldr r11, omap3_sdrc_mr_0 | 229 | ldr r11, omap3_sdrc_mr_0 |
197 | str r6, [r11] | 230 | str r12, [r11] |
198 | ldr r6, [r11] @ posted-write barrier for SDRC | 231 | ldr r12, omap_sdrc_rfr_ctrl_1_val |
232 | cmp r12, #0 @ if SDRC_RFR_CTRL_1 is 0, | ||
233 | beq skip_cs1_prog @ do not program cs1 params | ||
234 | ldr r11, omap3_sdrc_rfr_ctrl_1 | ||
235 | str r12, [r11] | ||
236 | ldr r12, omap_sdrc_actim_ctrl_a_1_val | ||
237 | ldr r11, omap3_sdrc_actim_ctrl_a_1 | ||
238 | str r12, [r11] | ||
239 | ldr r12, omap_sdrc_actim_ctrl_b_1_val | ||
240 | ldr r11, omap3_sdrc_actim_ctrl_b_1 | ||
241 | str r12, [r11] | ||
242 | ldr r12, omap_sdrc_mr_1_val | ||
243 | ldr r11, omap3_sdrc_mr_1 | ||
244 | str r12, [r11] | ||
245 | skip_cs1_prog: | ||
246 | ldr r12, [r11] @ posted-write barrier for SDRC | ||
199 | bx lr | 247 | bx lr |
200 | 248 | ||
201 | omap3_sdrc_power: | 249 | omap3_sdrc_power: |
@@ -206,14 +254,40 @@ omap3_cm_idlest1_core: | |||
206 | .word OMAP34XX_CM_REGADDR(CORE_MOD, CM_IDLEST) | 254 | .word OMAP34XX_CM_REGADDR(CORE_MOD, CM_IDLEST) |
207 | omap3_cm_iclken1_core: | 255 | omap3_cm_iclken1_core: |
208 | .word OMAP34XX_CM_REGADDR(CORE_MOD, CM_ICLKEN1) | 256 | .word OMAP34XX_CM_REGADDR(CORE_MOD, CM_ICLKEN1) |
209 | omap3_sdrc_rfr_ctrl: | 257 | |
258 | omap3_sdrc_rfr_ctrl_0: | ||
210 | .word OMAP34XX_SDRC_REGADDR(SDRC_RFR_CTRL_0) | 259 | .word OMAP34XX_SDRC_REGADDR(SDRC_RFR_CTRL_0) |
211 | omap3_sdrc_actim_ctrla: | 260 | omap3_sdrc_rfr_ctrl_1: |
261 | .word OMAP34XX_SDRC_REGADDR(SDRC_RFR_CTRL_1) | ||
262 | omap3_sdrc_actim_ctrl_a_0: | ||
212 | .word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A_0) | 263 | .word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A_0) |
213 | omap3_sdrc_actim_ctrlb: | 264 | omap3_sdrc_actim_ctrl_a_1: |
265 | .word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_A_1) | ||
266 | omap3_sdrc_actim_ctrl_b_0: | ||
214 | .word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B_0) | 267 | .word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B_0) |
268 | omap3_sdrc_actim_ctrl_b_1: | ||
269 | .word OMAP34XX_SDRC_REGADDR(SDRC_ACTIM_CTRL_B_1) | ||
215 | omap3_sdrc_mr_0: | 270 | omap3_sdrc_mr_0: |
216 | .word OMAP34XX_SDRC_REGADDR(SDRC_MR_0) | 271 | .word OMAP34XX_SDRC_REGADDR(SDRC_MR_0) |
272 | omap3_sdrc_mr_1: | ||
273 | .word OMAP34XX_SDRC_REGADDR(SDRC_MR_1) | ||
274 | omap_sdrc_rfr_ctrl_0_val: | ||
275 | .word 0xDEADBEEF | ||
276 | omap_sdrc_rfr_ctrl_1_val: | ||
277 | .word 0xDEADBEEF | ||
278 | omap_sdrc_actim_ctrl_a_0_val: | ||
279 | .word 0xDEADBEEF | ||
280 | omap_sdrc_actim_ctrl_a_1_val: | ||
281 | .word 0xDEADBEEF | ||
282 | omap_sdrc_actim_ctrl_b_0_val: | ||
283 | .word 0xDEADBEEF | ||
284 | omap_sdrc_actim_ctrl_b_1_val: | ||
285 | .word 0xDEADBEEF | ||
286 | omap_sdrc_mr_0_val: | ||
287 | .word 0xDEADBEEF | ||
288 | omap_sdrc_mr_1_val: | ||
289 | .word 0xDEADBEEF | ||
290 | |||
217 | omap3_sdrc_dlla_status: | 291 | omap3_sdrc_dlla_status: |
218 | .word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS) | 292 | .word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS) |
219 | omap3_sdrc_dlla_ctrl: | 293 | omap3_sdrc_dlla_ctrl: |
@@ -223,3 +297,4 @@ core_m2_mask_val: | |||
223 | 297 | ||
224 | ENTRY(omap3_sram_configure_core_dpll_sz) | 298 | ENTRY(omap3_sram_configure_core_dpll_sz) |
225 | .word . - omap3_sram_configure_core_dpll | 299 | .word . - omap3_sram_configure_core_dpll |
300 | |||
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index d85296dc896c..739e59e8025c 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c | |||
@@ -155,20 +155,6 @@ static struct platform_device musb_device = { | |||
155 | .resource = musb_resources, | 155 | .resource = musb_resources, |
156 | }; | 156 | }; |
157 | 157 | ||
158 | #ifdef CONFIG_NOP_USB_XCEIV | ||
159 | static u64 nop_xceiv_dmamask = DMA_BIT_MASK(32); | ||
160 | |||
161 | static struct platform_device nop_xceiv_device = { | ||
162 | .name = "nop_usb_xceiv", | ||
163 | .id = -1, | ||
164 | .dev = { | ||
165 | .dma_mask = &nop_xceiv_dmamask, | ||
166 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
167 | .platform_data = NULL, | ||
168 | }, | ||
169 | }; | ||
170 | #endif | ||
171 | |||
172 | void __init usb_musb_init(void) | 158 | void __init usb_musb_init(void) |
173 | { | 159 | { |
174 | if (cpu_is_omap243x()) | 160 | if (cpu_is_omap243x()) |
@@ -183,13 +169,6 @@ void __init usb_musb_init(void) | |||
183 | */ | 169 | */ |
184 | musb_plat.clock = "ick"; | 170 | musb_plat.clock = "ick"; |
185 | 171 | ||
186 | #ifdef CONFIG_NOP_USB_XCEIV | ||
187 | if (platform_device_register(&nop_xceiv_device) < 0) { | ||
188 | printk(KERN_ERR "Unable to register NOP-XCEIV device\n"); | ||
189 | return; | ||
190 | } | ||
191 | #endif | ||
192 | |||
193 | if (platform_device_register(&musb_device) < 0) { | 172 | if (platform_device_register(&musb_device) < 0) { |
194 | printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); | 173 | printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); |
195 | return; | 174 | return; |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 63b10d9bb1d3..9cd09465a0e8 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -1141,12 +1141,16 @@ struct power_supply_info em_x270_psy_info = { | |||
1141 | 1141 | ||
1142 | static void em_x270_battery_low(void) | 1142 | static void em_x270_battery_low(void) |
1143 | { | 1143 | { |
1144 | #if defined(CONFIG_APM_EMULATION) | ||
1144 | apm_queue_event(APM_LOW_BATTERY); | 1145 | apm_queue_event(APM_LOW_BATTERY); |
1146 | #endif | ||
1145 | } | 1147 | } |
1146 | 1148 | ||
1147 | static void em_x270_battery_critical(void) | 1149 | static void em_x270_battery_critical(void) |
1148 | { | 1150 | { |
1151 | #if defined(CONFIG_APM_EMULATION) | ||
1149 | apm_queue_event(APM_CRITICAL_SUSPEND); | 1152 | apm_queue_event(APM_CRITICAL_SUSPEND); |
1153 | #endif | ||
1150 | } | 1154 | } |
1151 | 1155 | ||
1152 | struct da9030_battery_info em_x270_batterty_info = { | 1156 | struct da9030_battery_info em_x270_batterty_info = { |
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index ed70f281dd09..169fcc18154e 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c | |||
@@ -128,6 +128,10 @@ static unsigned long palmld_pin_config[] __initdata = { | |||
128 | GPIO38_GPIO, /* wifi ready */ | 128 | GPIO38_GPIO, /* wifi ready */ |
129 | GPIO81_GPIO, /* wifi reset */ | 129 | GPIO81_GPIO, /* wifi reset */ |
130 | 130 | ||
131 | /* FFUART */ | ||
132 | GPIO34_FFUART_RXD, | ||
133 | GPIO39_FFUART_TXD, | ||
134 | |||
131 | /* HDD */ | 135 | /* HDD */ |
132 | GPIO98_GPIO, /* HDD reset */ | 136 | GPIO98_GPIO, /* HDD reset */ |
133 | GPIO115_GPIO, /* HDD power */ | 137 | GPIO115_GPIO, /* HDD power */ |
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index aae64a12a734..33f726ff55e5 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c | |||
@@ -111,6 +111,10 @@ static unsigned long palmt5_pin_config[] __initdata = { | |||
111 | /* PWM */ | 111 | /* PWM */ |
112 | GPIO16_PWM0_OUT, | 112 | GPIO16_PWM0_OUT, |
113 | 113 | ||
114 | /* FFUART */ | ||
115 | GPIO34_FFUART_RXD, | ||
116 | GPIO39_FFUART_TXD, | ||
117 | |||
114 | /* MISC */ | 118 | /* MISC */ |
115 | GPIO10_GPIO, /* hotsync button */ | 119 | GPIO10_GPIO, /* hotsync button */ |
116 | GPIO90_GPIO, /* power detect */ | 120 | GPIO90_GPIO, /* power detect */ |
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 6c15d84bde53..83d020879581 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
@@ -127,6 +127,10 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
127 | GPIO76_LCD_PCLK, | 127 | GPIO76_LCD_PCLK, |
128 | GPIO77_LCD_BIAS, | 128 | GPIO77_LCD_BIAS, |
129 | 129 | ||
130 | /* FFUART */ | ||
131 | GPIO34_FFUART_RXD, | ||
132 | GPIO39_FFUART_TXD, | ||
133 | |||
130 | /* MISC. */ | 134 | /* MISC. */ |
131 | GPIO10_GPIO, /* hotsync button */ | 135 | GPIO10_GPIO, /* hotsync button */ |
132 | GPIO12_GPIO, /* power detect */ | 136 | GPIO12_GPIO, /* power detect */ |
diff --git a/arch/arm/mach-pxa/treo680.c b/arch/arm/mach-pxa/treo680.c index a06f19edebb3..753ec4df17b9 100644 --- a/arch/arm/mach-pxa/treo680.c +++ b/arch/arm/mach-pxa/treo680.c | |||
@@ -409,7 +409,7 @@ err1: | |||
409 | 409 | ||
410 | static void treo680_irda_shutdown(struct device *dev) | 410 | static void treo680_irda_shutdown(struct device *dev) |
411 | { | 411 | { |
412 | gpio_free(GPIO_NR_TREO680_AMP_EN); | 412 | gpio_free(GPIO_NR_TREO680_IR_EN); |
413 | } | 413 | } |
414 | 414 | ||
415 | static struct pxaficp_platform_data treo680_ficp_info = { | 415 | static struct pxaficp_platform_data treo680_ficp_info = { |
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index cefd1c0a854a..84095440a878 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -197,10 +197,12 @@ static void __init zylonite_detect_lcd_panel(void) | |||
197 | for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { | 197 | for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { |
198 | id = id << 1; | 198 | id = id << 1; |
199 | gpio = mfp_to_gpio(lcd_detect_pins[i]); | 199 | gpio = mfp_to_gpio(lcd_detect_pins[i]); |
200 | gpio_request(gpio, "LCD_ID_PINS"); | ||
200 | gpio_direction_input(gpio); | 201 | gpio_direction_input(gpio); |
201 | 202 | ||
202 | if (gpio_get_value(gpio)) | 203 | if (gpio_get_value(gpio)) |
203 | id = id | 0x1; | 204 | id = id | 0x1; |
205 | gpio_free(gpio); | ||
204 | } | 206 | } |
205 | 207 | ||
206 | /* lcd id, flush out bit 1 */ | 208 | /* lcd id, flush out bit 1 */ |
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index cc5a22833605..60d08f23f5e4 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
@@ -176,10 +176,12 @@ static void __init zylonite_detect_lcd_panel(void) | |||
176 | for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { | 176 | for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { |
177 | id = id << 1; | 177 | id = id << 1; |
178 | gpio = mfp_to_gpio(lcd_detect_pins[i]); | 178 | gpio = mfp_to_gpio(lcd_detect_pins[i]); |
179 | gpio_request(gpio, "LCD_ID_PINS"); | ||
179 | gpio_direction_input(gpio); | 180 | gpio_direction_input(gpio); |
180 | 181 | ||
181 | if (gpio_get_value(gpio)) | 182 | if (gpio_get_value(gpio)) |
182 | id = id | 0x1; | 183 | id = id | 0x1; |
184 | gpio_free(gpio); | ||
183 | } | 185 | } |
184 | 186 | ||
185 | /* lcd id, flush out bit 1 */ | 187 | /* lcd id, flush out bit 1 */ |
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-core.h b/arch/arm/mach-s3c2410/include/mach/gpio-core.h index 8fe192081d3a..f8b879a7973c 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio-core.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h | |||
@@ -28,7 +28,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin) | |||
28 | return NULL; | 28 | return NULL; |
29 | 29 | ||
30 | chip = &s3c24xx_gpios[pin/32]; | 30 | chip = &s3c24xx_gpios[pin/32]; |
31 | return (S3C2410_GPIO_OFFSET(pin) > chip->chip.ngpio) ? chip : NULL; | 31 | return (S3C2410_GPIO_OFFSET(pin) < chip->chip.ngpio) ? chip : NULL; |
32 | } | 32 | } |
33 | 33 | ||
34 | #endif /* __ASM_ARCH_GPIO_CORE_H */ | 34 | #endif /* __ASM_ARCH_GPIO_CORE_H */ |
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 7936085dd758..2e9b8ccd8ec2 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c | |||
@@ -510,7 +510,7 @@ static struct db_chip db_chips[] __initdata = { | |||
510 | } | 510 | } |
511 | }; | 511 | }; |
512 | 512 | ||
513 | static void u300_init_check_chip(void) | 513 | static void __init u300_init_check_chip(void) |
514 | { | 514 | { |
515 | 515 | ||
516 | u16 val; | 516 | u16 val; |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 8277802ec859..3a7279c1ce5e 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -120,6 +120,32 @@ void show_mem(void) | |||
120 | printk("%d pages swap cached\n", cached); | 120 | printk("%d pages swap cached\n", cached); |
121 | } | 121 | } |
122 | 122 | ||
123 | static void __init find_node_limits(int node, struct meminfo *mi, | ||
124 | unsigned long *min, unsigned long *max_low, unsigned long *max_high) | ||
125 | { | ||
126 | int i; | ||
127 | |||
128 | *min = -1UL; | ||
129 | *max_low = *max_high = 0; | ||
130 | |||
131 | for_each_nodebank(i, mi, node) { | ||
132 | struct membank *bank = &mi->bank[i]; | ||
133 | unsigned long start, end; | ||
134 | |||
135 | start = bank_pfn_start(bank); | ||
136 | end = bank_pfn_end(bank); | ||
137 | |||
138 | if (*min > start) | ||
139 | *min = start; | ||
140 | if (*max_high < end) | ||
141 | *max_high = end; | ||
142 | if (bank->highmem) | ||
143 | continue; | ||
144 | if (*max_low < end) | ||
145 | *max_low = end; | ||
146 | } | ||
147 | } | ||
148 | |||
123 | /* | 149 | /* |
124 | * FIXME: We really want to avoid allocating the bootmap bitmap | 150 | * FIXME: We really want to avoid allocating the bootmap bitmap |
125 | * over the top of the initrd. Hopefully, this is located towards | 151 | * over the top of the initrd. Hopefully, this is located towards |
@@ -210,41 +236,25 @@ static inline void map_memory_bank(struct membank *bank) | |||
210 | #endif | 236 | #endif |
211 | } | 237 | } |
212 | 238 | ||
213 | static unsigned long __init bootmem_init_node(int node, struct meminfo *mi) | 239 | static void __init bootmem_init_node(int node, struct meminfo *mi, |
240 | unsigned long start_pfn, unsigned long end_pfn) | ||
214 | { | 241 | { |
215 | unsigned long start_pfn, end_pfn, boot_pfn; | 242 | unsigned long boot_pfn; |
216 | unsigned int boot_pages; | 243 | unsigned int boot_pages; |
217 | pg_data_t *pgdat; | 244 | pg_data_t *pgdat; |
218 | int i; | 245 | int i; |
219 | 246 | ||
220 | start_pfn = -1UL; | ||
221 | end_pfn = 0; | ||
222 | |||
223 | /* | 247 | /* |
224 | * Calculate the pfn range, and map the memory banks for this node. | 248 | * Map the memory banks for this node. |
225 | */ | 249 | */ |
226 | for_each_nodebank(i, mi, node) { | 250 | for_each_nodebank(i, mi, node) { |
227 | struct membank *bank = &mi->bank[i]; | 251 | struct membank *bank = &mi->bank[i]; |
228 | unsigned long start, end; | ||
229 | 252 | ||
230 | start = bank_pfn_start(bank); | 253 | if (!bank->highmem) |
231 | end = bank_pfn_end(bank); | 254 | map_memory_bank(bank); |
232 | |||
233 | if (start_pfn > start) | ||
234 | start_pfn = start; | ||
235 | if (end_pfn < end) | ||
236 | end_pfn = end; | ||
237 | |||
238 | map_memory_bank(bank); | ||
239 | } | 255 | } |
240 | 256 | ||
241 | /* | 257 | /* |
242 | * If there is no memory in this node, ignore it. | ||
243 | */ | ||
244 | if (end_pfn == 0) | ||
245 | return end_pfn; | ||
246 | |||
247 | /* | ||
248 | * Allocate the bootmem bitmap page. | 258 | * Allocate the bootmem bitmap page. |
249 | */ | 259 | */ |
250 | boot_pages = bootmem_bootmap_pages(end_pfn - start_pfn); | 260 | boot_pages = bootmem_bootmap_pages(end_pfn - start_pfn); |
@@ -260,7 +270,8 @@ static unsigned long __init bootmem_init_node(int node, struct meminfo *mi) | |||
260 | 270 | ||
261 | for_each_nodebank(i, mi, node) { | 271 | for_each_nodebank(i, mi, node) { |
262 | struct membank *bank = &mi->bank[i]; | 272 | struct membank *bank = &mi->bank[i]; |
263 | free_bootmem_node(pgdat, bank_phys_start(bank), bank_phys_size(bank)); | 273 | if (!bank->highmem) |
274 | free_bootmem_node(pgdat, bank_phys_start(bank), bank_phys_size(bank)); | ||
264 | memory_present(node, bank_pfn_start(bank), bank_pfn_end(bank)); | 275 | memory_present(node, bank_pfn_start(bank), bank_pfn_end(bank)); |
265 | } | 276 | } |
266 | 277 | ||
@@ -269,8 +280,6 @@ static unsigned long __init bootmem_init_node(int node, struct meminfo *mi) | |||
269 | */ | 280 | */ |
270 | reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT, | 281 | reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT, |
271 | boot_pages << PAGE_SHIFT, BOOTMEM_DEFAULT); | 282 | boot_pages << PAGE_SHIFT, BOOTMEM_DEFAULT); |
272 | |||
273 | return end_pfn; | ||
274 | } | 283 | } |
275 | 284 | ||
276 | static void __init bootmem_reserve_initrd(int node) | 285 | static void __init bootmem_reserve_initrd(int node) |
@@ -297,33 +306,39 @@ static void __init bootmem_reserve_initrd(int node) | |||
297 | static void __init bootmem_free_node(int node, struct meminfo *mi) | 306 | static void __init bootmem_free_node(int node, struct meminfo *mi) |
298 | { | 307 | { |
299 | unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; | 308 | unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; |
300 | unsigned long start_pfn, end_pfn; | 309 | unsigned long min, max_low, max_high; |
301 | pg_data_t *pgdat = NODE_DATA(node); | ||
302 | int i; | 310 | int i; |
303 | 311 | ||
304 | start_pfn = pgdat->bdata->node_min_pfn; | 312 | find_node_limits(node, mi, &min, &max_low, &max_high); |
305 | end_pfn = pgdat->bdata->node_low_pfn; | ||
306 | 313 | ||
307 | /* | 314 | /* |
308 | * initialise the zones within this node. | 315 | * initialise the zones within this node. |
309 | */ | 316 | */ |
310 | memset(zone_size, 0, sizeof(zone_size)); | 317 | memset(zone_size, 0, sizeof(zone_size)); |
311 | memset(zhole_size, 0, sizeof(zhole_size)); | ||
312 | 318 | ||
313 | /* | 319 | /* |
314 | * The size of this node has already been determined. If we need | 320 | * The size of this node has already been determined. If we need |
315 | * to do anything fancy with the allocation of this memory to the | 321 | * to do anything fancy with the allocation of this memory to the |
316 | * zones, now is the time to do it. | 322 | * zones, now is the time to do it. |
317 | */ | 323 | */ |
318 | zone_size[0] = end_pfn - start_pfn; | 324 | zone_size[0] = max_low - min; |
325 | #ifdef CONFIG_HIGHMEM | ||
326 | zone_size[ZONE_HIGHMEM] = max_high - max_low; | ||
327 | #endif | ||
319 | 328 | ||
320 | /* | 329 | /* |
321 | * For each bank in this node, calculate the size of the holes. | 330 | * For each bank in this node, calculate the size of the holes. |
322 | * holes = node_size - sum(bank_sizes_in_node) | 331 | * holes = node_size - sum(bank_sizes_in_node) |
323 | */ | 332 | */ |
324 | zhole_size[0] = zone_size[0]; | 333 | memcpy(zhole_size, zone_size, sizeof(zhole_size)); |
325 | for_each_nodebank(i, mi, node) | 334 | for_each_nodebank(i, mi, node) { |
326 | zhole_size[0] -= bank_pfn_size(&mi->bank[i]); | 335 | int idx = 0; |
336 | #ifdef CONFIG_HIGHMEM | ||
337 | if (mi->bank[i].highmem) | ||
338 | idx = ZONE_HIGHMEM; | ||
339 | #endif | ||
340 | zhole_size[idx] -= bank_pfn_size(&mi->bank[i]); | ||
341 | } | ||
327 | 342 | ||
328 | /* | 343 | /* |
329 | * Adjust the sizes according to any special requirements for | 344 | * Adjust the sizes according to any special requirements for |
@@ -331,13 +346,13 @@ static void __init bootmem_free_node(int node, struct meminfo *mi) | |||
331 | */ | 346 | */ |
332 | arch_adjust_zones(node, zone_size, zhole_size); | 347 | arch_adjust_zones(node, zone_size, zhole_size); |
333 | 348 | ||
334 | free_area_init_node(node, zone_size, start_pfn, zhole_size); | 349 | free_area_init_node(node, zone_size, min, zhole_size); |
335 | } | 350 | } |
336 | 351 | ||
337 | void __init bootmem_init(void) | 352 | void __init bootmem_init(void) |
338 | { | 353 | { |
339 | struct meminfo *mi = &meminfo; | 354 | struct meminfo *mi = &meminfo; |
340 | unsigned long memend_pfn = 0; | 355 | unsigned long min, max_low, max_high; |
341 | int node, initrd_node; | 356 | int node, initrd_node; |
342 | 357 | ||
343 | /* | 358 | /* |
@@ -345,11 +360,29 @@ void __init bootmem_init(void) | |||
345 | */ | 360 | */ |
346 | initrd_node = check_initrd(mi); | 361 | initrd_node = check_initrd(mi); |
347 | 362 | ||
363 | max_low = max_high = 0; | ||
364 | |||
348 | /* | 365 | /* |
349 | * Run through each node initialising the bootmem allocator. | 366 | * Run through each node initialising the bootmem allocator. |
350 | */ | 367 | */ |
351 | for_each_node(node) { | 368 | for_each_node(node) { |
352 | unsigned long end_pfn = bootmem_init_node(node, mi); | 369 | unsigned long node_low, node_high; |
370 | |||
371 | find_node_limits(node, mi, &min, &node_low, &node_high); | ||
372 | |||
373 | if (node_low > max_low) | ||
374 | max_low = node_low; | ||
375 | if (node_high > max_high) | ||
376 | max_high = node_high; | ||
377 | |||
378 | /* | ||
379 | * If there is no memory in this node, ignore it. | ||
380 | * (We can't have nodes which have no lowmem) | ||
381 | */ | ||
382 | if (node_low == 0) | ||
383 | continue; | ||
384 | |||
385 | bootmem_init_node(node, mi, min, node_low); | ||
353 | 386 | ||
354 | /* | 387 | /* |
355 | * Reserve any special node zero regions. | 388 | * Reserve any special node zero regions. |
@@ -362,12 +395,6 @@ void __init bootmem_init(void) | |||
362 | */ | 395 | */ |
363 | if (node == initrd_node) | 396 | if (node == initrd_node) |
364 | bootmem_reserve_initrd(node); | 397 | bootmem_reserve_initrd(node); |
365 | |||
366 | /* | ||
367 | * Remember the highest memory PFN. | ||
368 | */ | ||
369 | if (end_pfn > memend_pfn) | ||
370 | memend_pfn = end_pfn; | ||
371 | } | 398 | } |
372 | 399 | ||
373 | /* | 400 | /* |
@@ -383,7 +410,7 @@ void __init bootmem_init(void) | |||
383 | for_each_node(node) | 410 | for_each_node(node) |
384 | bootmem_free_node(node, mi); | 411 | bootmem_free_node(node, mi); |
385 | 412 | ||
386 | high_memory = __va((memend_pfn << PAGE_SHIFT) - 1) + 1; | 413 | high_memory = __va((max_low << PAGE_SHIFT) - 1) + 1; |
387 | 414 | ||
388 | /* | 415 | /* |
389 | * This doesn't seem to be used by the Linux memory manager any | 416 | * This doesn't seem to be used by the Linux memory manager any |
@@ -393,7 +420,8 @@ void __init bootmem_init(void) | |||
393 | * Note: max_low_pfn and max_pfn reflect the number of _pages_ in | 420 | * Note: max_low_pfn and max_pfn reflect the number of _pages_ in |
394 | * the system, not the maximum PFN. | 421 | * the system, not the maximum PFN. |
395 | */ | 422 | */ |
396 | max_pfn = max_low_pfn = memend_pfn - PHYS_PFN_OFFSET; | 423 | max_low_pfn = max_low - PHYS_PFN_OFFSET; |
424 | max_pfn = max_high - PHYS_PFN_OFFSET; | ||
397 | } | 425 | } |
398 | 426 | ||
399 | static inline int free_area(unsigned long pfn, unsigned long end, char *s) | 427 | static inline int free_area(unsigned long pfn, unsigned long end, char *s) |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 4722582b17b8..4426ee67ceca 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -687,13 +687,19 @@ __early_param("vmalloc=", early_vmalloc); | |||
687 | 687 | ||
688 | static void __init sanity_check_meminfo(void) | 688 | static void __init sanity_check_meminfo(void) |
689 | { | 689 | { |
690 | int i, j; | 690 | int i, j, highmem = 0; |
691 | 691 | ||
692 | for (i = 0, j = 0; i < meminfo.nr_banks; i++) { | 692 | for (i = 0, j = 0; i < meminfo.nr_banks; i++) { |
693 | struct membank *bank = &meminfo.bank[j]; | 693 | struct membank *bank = &meminfo.bank[j]; |
694 | *bank = meminfo.bank[i]; | 694 | *bank = meminfo.bank[i]; |
695 | 695 | ||
696 | #ifdef CONFIG_HIGHMEM | 696 | #ifdef CONFIG_HIGHMEM |
697 | if (__va(bank->start) > VMALLOC_MIN || | ||
698 | __va(bank->start) < (void *)PAGE_OFFSET) | ||
699 | highmem = 1; | ||
700 | |||
701 | bank->highmem = highmem; | ||
702 | |||
697 | /* | 703 | /* |
698 | * Split those memory banks which are partially overlapping | 704 | * Split those memory banks which are partially overlapping |
699 | * the vmalloc area greatly simplifying things later. | 705 | * the vmalloc area greatly simplifying things later. |
@@ -714,6 +720,7 @@ static void __init sanity_check_meminfo(void) | |||
714 | i++; | 720 | i++; |
715 | bank[1].size -= VMALLOC_MIN - __va(bank->start); | 721 | bank[1].size -= VMALLOC_MIN - __va(bank->start); |
716 | bank[1].start = __pa(VMALLOC_MIN - 1) + 1; | 722 | bank[1].start = __pa(VMALLOC_MIN - 1) + 1; |
723 | bank[1].highmem = highmem = 1; | ||
717 | j++; | 724 | j++; |
718 | } | 725 | } |
719 | bank->size = VMALLOC_MIN - __va(bank->start); | 726 | bank->size = VMALLOC_MIN - __va(bank->start); |
diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c index 843e8af64066..1868c0d8f9b5 100644 --- a/arch/arm/plat-omap/cpu-omap.c +++ b/arch/arm/plat-omap/cpu-omap.c | |||
@@ -78,10 +78,10 @@ static int omap_target(struct cpufreq_policy *policy, | |||
78 | 78 | ||
79 | /* Ensure desired rate is within allowed range. Some govenors | 79 | /* Ensure desired rate is within allowed range. Some govenors |
80 | * (ondemand) will just pass target_freq=0 to get the minimum. */ | 80 | * (ondemand) will just pass target_freq=0 to get the minimum. */ |
81 | if (target_freq < policy->cpuinfo.min_freq) | 81 | if (target_freq < policy->min) |
82 | target_freq = policy->cpuinfo.min_freq; | 82 | target_freq = policy->min; |
83 | if (target_freq > policy->cpuinfo.max_freq) | 83 | if (target_freq > policy->max) |
84 | target_freq = policy->cpuinfo.max_freq; | 84 | target_freq = policy->max; |
85 | 85 | ||
86 | freqs.old = omap_getspeed(0); | 86 | freqs.old = omap_getspeed(0); |
87 | freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; | 87 | freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; |
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 7677a4a1cef2..e3ac94f09006 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -946,7 +946,9 @@ void omap_start_dma(int lch) | |||
946 | 946 | ||
947 | cur_lch = next_lch; | 947 | cur_lch = next_lch; |
948 | } while (next_lch != -1); | 948 | } while (next_lch != -1); |
949 | } else if (cpu_class_is_omap2()) { | 949 | } else if (cpu_is_omap242x() || |
950 | (cpu_is_omap243x() && omap_type() <= OMAP2430_REV_ES1_0)) { | ||
951 | |||
950 | /* Errata: Need to write lch even if not using chaining */ | 952 | /* Errata: Need to write lch even if not using chaining */ |
951 | dma_write(lch, CLNK_CTRL(lch)); | 953 | dma_write(lch, CLNK_CTRL(lch)); |
952 | } | 954 | } |
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 26b387c12423..9298bc0ab171 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
@@ -476,14 +476,12 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) | |||
476 | __raw_writel(l, reg); | 476 | __raw_writel(l, reg); |
477 | } | 477 | } |
478 | 478 | ||
479 | static int __omap_get_gpio_datain(int gpio) | 479 | static int _get_gpio_datain(struct gpio_bank *bank, int gpio) |
480 | { | 480 | { |
481 | struct gpio_bank *bank; | ||
482 | void __iomem *reg; | 481 | void __iomem *reg; |
483 | 482 | ||
484 | if (check_gpio(gpio) < 0) | 483 | if (check_gpio(gpio) < 0) |
485 | return -EINVAL; | 484 | return -EINVAL; |
486 | bank = get_gpio_bank(gpio); | ||
487 | reg = bank->base; | 485 | reg = bank->base; |
488 | switch (bank->method) { | 486 | switch (bank->method) { |
489 | #ifdef CONFIG_ARCH_OMAP1 | 487 | #ifdef CONFIG_ARCH_OMAP1 |
@@ -524,6 +522,53 @@ static int __omap_get_gpio_datain(int gpio) | |||
524 | & (1 << get_gpio_index(gpio))) != 0; | 522 | & (1 << get_gpio_index(gpio))) != 0; |
525 | } | 523 | } |
526 | 524 | ||
525 | static int _get_gpio_dataout(struct gpio_bank *bank, int gpio) | ||
526 | { | ||
527 | void __iomem *reg; | ||
528 | |||
529 | if (check_gpio(gpio) < 0) | ||
530 | return -EINVAL; | ||
531 | reg = bank->base; | ||
532 | |||
533 | switch (bank->method) { | ||
534 | #ifdef CONFIG_ARCH_OMAP1 | ||
535 | case METHOD_MPUIO: | ||
536 | reg += OMAP_MPUIO_OUTPUT; | ||
537 | break; | ||
538 | #endif | ||
539 | #ifdef CONFIG_ARCH_OMAP15XX | ||
540 | case METHOD_GPIO_1510: | ||
541 | reg += OMAP1510_GPIO_DATA_OUTPUT; | ||
542 | break; | ||
543 | #endif | ||
544 | #ifdef CONFIG_ARCH_OMAP16XX | ||
545 | case METHOD_GPIO_1610: | ||
546 | reg += OMAP1610_GPIO_DATAOUT; | ||
547 | break; | ||
548 | #endif | ||
549 | #ifdef CONFIG_ARCH_OMAP730 | ||
550 | case METHOD_GPIO_730: | ||
551 | reg += OMAP730_GPIO_DATA_OUTPUT; | ||
552 | break; | ||
553 | #endif | ||
554 | #ifdef CONFIG_ARCH_OMAP850 | ||
555 | case METHOD_GPIO_850: | ||
556 | reg += OMAP850_GPIO_DATA_OUTPUT; | ||
557 | break; | ||
558 | #endif | ||
559 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ | ||
560 | defined(CONFIG_ARCH_OMAP4) | ||
561 | case METHOD_GPIO_24XX: | ||
562 | reg += OMAP24XX_GPIO_DATAOUT; | ||
563 | break; | ||
564 | #endif | ||
565 | default: | ||
566 | return -EINVAL; | ||
567 | } | ||
568 | |||
569 | return (__raw_readl(reg) & (1 << get_gpio_index(gpio))) != 0; | ||
570 | } | ||
571 | |||
527 | #define MOD_REG_BIT(reg, bit_mask, set) \ | 572 | #define MOD_REG_BIT(reg, bit_mask, set) \ |
528 | do { \ | 573 | do { \ |
529 | int l = __raw_readl(base + reg); \ | 574 | int l = __raw_readl(base + reg); \ |
@@ -1189,6 +1234,7 @@ static void gpio_mask_irq(unsigned int irq) | |||
1189 | struct gpio_bank *bank = get_irq_chip_data(irq); | 1234 | struct gpio_bank *bank = get_irq_chip_data(irq); |
1190 | 1235 | ||
1191 | _set_gpio_irqenable(bank, gpio, 0); | 1236 | _set_gpio_irqenable(bank, gpio, 0); |
1237 | _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE); | ||
1192 | } | 1238 | } |
1193 | 1239 | ||
1194 | static void gpio_unmask_irq(unsigned int irq) | 1240 | static void gpio_unmask_irq(unsigned int irq) |
@@ -1196,6 +1242,11 @@ static void gpio_unmask_irq(unsigned int irq) | |||
1196 | unsigned int gpio = irq - IH_GPIO_BASE; | 1242 | unsigned int gpio = irq - IH_GPIO_BASE; |
1197 | struct gpio_bank *bank = get_irq_chip_data(irq); | 1243 | struct gpio_bank *bank = get_irq_chip_data(irq); |
1198 | unsigned int irq_mask = 1 << get_gpio_index(gpio); | 1244 | unsigned int irq_mask = 1 << get_gpio_index(gpio); |
1245 | struct irq_desc *desc = irq_to_desc(irq); | ||
1246 | u32 trigger = desc->status & IRQ_TYPE_SENSE_MASK; | ||
1247 | |||
1248 | if (trigger) | ||
1249 | _set_gpio_triggering(bank, get_gpio_index(gpio), trigger); | ||
1199 | 1250 | ||
1200 | /* For level-triggered GPIOs, the clearing must be done after | 1251 | /* For level-triggered GPIOs, the clearing must be done after |
1201 | * the HW source is cleared, thus after the handler has run */ | 1252 | * the HW source is cleared, thus after the handler has run */ |
@@ -1350,9 +1401,49 @@ static int gpio_input(struct gpio_chip *chip, unsigned offset) | |||
1350 | return 0; | 1401 | return 0; |
1351 | } | 1402 | } |
1352 | 1403 | ||
1404 | static int gpio_is_input(struct gpio_bank *bank, int mask) | ||
1405 | { | ||
1406 | void __iomem *reg = bank->base; | ||
1407 | |||
1408 | switch (bank->method) { | ||
1409 | case METHOD_MPUIO: | ||
1410 | reg += OMAP_MPUIO_IO_CNTL; | ||
1411 | break; | ||
1412 | case METHOD_GPIO_1510: | ||
1413 | reg += OMAP1510_GPIO_DIR_CONTROL; | ||
1414 | break; | ||
1415 | case METHOD_GPIO_1610: | ||
1416 | reg += OMAP1610_GPIO_DIRECTION; | ||
1417 | break; | ||
1418 | case METHOD_GPIO_730: | ||
1419 | reg += OMAP730_GPIO_DIR_CONTROL; | ||
1420 | break; | ||
1421 | case METHOD_GPIO_850: | ||
1422 | reg += OMAP850_GPIO_DIR_CONTROL; | ||
1423 | break; | ||
1424 | case METHOD_GPIO_24XX: | ||
1425 | reg += OMAP24XX_GPIO_OE; | ||
1426 | break; | ||
1427 | } | ||
1428 | return __raw_readl(reg) & mask; | ||
1429 | } | ||
1430 | |||
1353 | static int gpio_get(struct gpio_chip *chip, unsigned offset) | 1431 | static int gpio_get(struct gpio_chip *chip, unsigned offset) |
1354 | { | 1432 | { |
1355 | return __omap_get_gpio_datain(chip->base + offset); | 1433 | struct gpio_bank *bank; |
1434 | void __iomem *reg; | ||
1435 | int gpio; | ||
1436 | u32 mask; | ||
1437 | |||
1438 | gpio = chip->base + offset; | ||
1439 | bank = get_gpio_bank(gpio); | ||
1440 | reg = bank->base; | ||
1441 | mask = 1 << get_gpio_index(gpio); | ||
1442 | |||
1443 | if (gpio_is_input(bank, mask)) | ||
1444 | return _get_gpio_datain(bank, gpio); | ||
1445 | else | ||
1446 | return _get_gpio_dataout(bank, gpio); | ||
1356 | } | 1447 | } |
1357 | 1448 | ||
1358 | static int gpio_output(struct gpio_chip *chip, unsigned offset, int value) | 1449 | static int gpio_output(struct gpio_chip *chip, unsigned offset, int value) |
@@ -1886,34 +1977,6 @@ arch_initcall(omap_gpio_sysinit); | |||
1886 | #include <linux/debugfs.h> | 1977 | #include <linux/debugfs.h> |
1887 | #include <linux/seq_file.h> | 1978 | #include <linux/seq_file.h> |
1888 | 1979 | ||
1889 | static int gpio_is_input(struct gpio_bank *bank, int mask) | ||
1890 | { | ||
1891 | void __iomem *reg = bank->base; | ||
1892 | |||
1893 | switch (bank->method) { | ||
1894 | case METHOD_MPUIO: | ||
1895 | reg += OMAP_MPUIO_IO_CNTL; | ||
1896 | break; | ||
1897 | case METHOD_GPIO_1510: | ||
1898 | reg += OMAP1510_GPIO_DIR_CONTROL; | ||
1899 | break; | ||
1900 | case METHOD_GPIO_1610: | ||
1901 | reg += OMAP1610_GPIO_DIRECTION; | ||
1902 | break; | ||
1903 | case METHOD_GPIO_730: | ||
1904 | reg += OMAP730_GPIO_DIR_CONTROL; | ||
1905 | break; | ||
1906 | case METHOD_GPIO_850: | ||
1907 | reg += OMAP850_GPIO_DIR_CONTROL; | ||
1908 | break; | ||
1909 | case METHOD_GPIO_24XX: | ||
1910 | reg += OMAP24XX_GPIO_OE; | ||
1911 | break; | ||
1912 | } | ||
1913 | return __raw_readl(reg) & mask; | ||
1914 | } | ||
1915 | |||
1916 | |||
1917 | static int dbg_gpio_show(struct seq_file *s, void *unused) | 1980 | static int dbg_gpio_show(struct seq_file *s, void *unused) |
1918 | { | 1981 | { |
1919 | unsigned i, j, gpio; | 1982 | unsigned i, j, gpio; |
diff --git a/arch/arm/plat-omap/include/mach/clock.h b/arch/arm/plat-omap/include/mach/clock.h index f9f65e1ba3f1..4b8b0d65cbf2 100644 --- a/arch/arm/plat-omap/include/mach/clock.h +++ b/arch/arm/plat-omap/include/mach/clock.h | |||
@@ -20,6 +20,8 @@ struct clockdomain; | |||
20 | struct clkops { | 20 | struct clkops { |
21 | int (*enable)(struct clk *); | 21 | int (*enable)(struct clk *); |
22 | void (*disable)(struct clk *); | 22 | void (*disable)(struct clk *); |
23 | void (*find_idlest)(struct clk *, void __iomem **, u8 *); | ||
24 | void (*find_companion)(struct clk *, void __iomem **, u8 *); | ||
23 | }; | 25 | }; |
24 | 26 | ||
25 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ | 27 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h index 285eaa3a8275..11e73d9e8928 100644 --- a/arch/arm/plat-omap/include/mach/cpu.h +++ b/arch/arm/plat-omap/include/mach/cpu.h | |||
@@ -378,9 +378,6 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
378 | #define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx() || \ | 378 | #define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx() || \ |
379 | cpu_is_omap44xx()) | 379 | cpu_is_omap44xx()) |
380 | 380 | ||
381 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ | ||
382 | defined(CONFIG_ARCH_OMAP4) | ||
383 | |||
384 | /* Various silicon revisions for omap2 */ | 381 | /* Various silicon revisions for omap2 */ |
385 | #define OMAP242X_CLASS 0x24200024 | 382 | #define OMAP242X_CLASS 0x24200024 |
386 | #define OMAP2420_REV_ES1_0 0x24200024 | 383 | #define OMAP2420_REV_ES1_0 0x24200024 |
@@ -436,5 +433,3 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
436 | 433 | ||
437 | int omap_chip_is(struct omap_chip_id oci); | 434 | int omap_chip_is(struct omap_chip_id oci); |
438 | void omap2_check_revision(void); | 435 | void omap2_check_revision(void); |
439 | |||
440 | #endif /* defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) */ | ||
diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h index 73f483d56ca6..21fb0efdda86 100644 --- a/arch/arm/plat-omap/include/mach/io.h +++ b/arch/arm/plat-omap/include/mach/io.h | |||
@@ -228,7 +228,8 @@ extern void omap1_map_common_io(void); | |||
228 | extern void omap1_init_common_hw(void); | 228 | extern void omap1_init_common_hw(void); |
229 | 229 | ||
230 | extern void omap2_map_common_io(void); | 230 | extern void omap2_map_common_io(void); |
231 | extern void omap2_init_common_hw(struct omap_sdrc_params *sp); | 231 | extern void omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, |
232 | struct omap_sdrc_params *sdrc_cs1); | ||
232 | 233 | ||
233 | #define __arch_ioremap(p,s,t) omap_ioremap(p,s,t) | 234 | #define __arch_ioremap(p,s,t) omap_ioremap(p,s,t) |
234 | #define __arch_iounmap(v) omap_iounmap(v) | 235 | #define __arch_iounmap(v) omap_iounmap(v) |
diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h index 85a621705766..80281c458baf 100644 --- a/arch/arm/plat-omap/include/mach/mux.h +++ b/arch/arm/plat-omap/include/mach/mux.h | |||
@@ -853,6 +853,10 @@ enum omap34xx_index { | |||
853 | AE5_34XX_GPIO143, | 853 | AE5_34XX_GPIO143, |
854 | H19_34XX_GPIO164_OUT, | 854 | H19_34XX_GPIO164_OUT, |
855 | J25_34XX_GPIO170, | 855 | J25_34XX_GPIO170, |
856 | |||
857 | /* OMAP3 SDRC CKE signals to SDR/DDR ram chips */ | ||
858 | H16_34XX_SDRC_CKE0, | ||
859 | H17_34XX_SDRC_CKE1, | ||
856 | }; | 860 | }; |
857 | 861 | ||
858 | struct omap_mux_cfg { | 862 | struct omap_mux_cfg { |
diff --git a/arch/arm/plat-omap/include/mach/prcm.h b/arch/arm/plat-omap/include/mach/prcm.h index 24ac3c715912..cda2a70397b4 100644 --- a/arch/arm/plat-omap/include/mach/prcm.h +++ b/arch/arm/plat-omap/include/mach/prcm.h | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | u32 omap_prcm_get_reset_sources(void); | 26 | u32 omap_prcm_get_reset_sources(void); |
27 | void omap_prcm_arch_reset(char mode); | 27 | void omap_prcm_arch_reset(char mode); |
28 | int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, const char *name); | ||
28 | 29 | ||
29 | #endif | 30 | #endif |
30 | 31 | ||
diff --git a/arch/arm/plat-omap/include/mach/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h index adc73522491f..0be18e4ff182 100644 --- a/arch/arm/plat-omap/include/mach/sdrc.h +++ b/arch/arm/plat-omap/include/mach/sdrc.h | |||
@@ -30,6 +30,10 @@ | |||
30 | #define SDRC_ACTIM_CTRL_A_0 0x09c | 30 | #define SDRC_ACTIM_CTRL_A_0 0x09c |
31 | #define SDRC_ACTIM_CTRL_B_0 0x0a0 | 31 | #define SDRC_ACTIM_CTRL_B_0 0x0a0 |
32 | #define SDRC_RFR_CTRL_0 0x0a4 | 32 | #define SDRC_RFR_CTRL_0 0x0a4 |
33 | #define SDRC_MR_1 0x0B4 | ||
34 | #define SDRC_ACTIM_CTRL_A_1 0x0C4 | ||
35 | #define SDRC_ACTIM_CTRL_B_1 0x0C8 | ||
36 | #define SDRC_RFR_CTRL_1 0x0D4 | ||
33 | 37 | ||
34 | /* | 38 | /* |
35 | * These values represent the number of memory clock cycles between | 39 | * These values represent the number of memory clock cycles between |
@@ -102,8 +106,11 @@ struct omap_sdrc_params { | |||
102 | u32 mr; | 106 | u32 mr; |
103 | }; | 107 | }; |
104 | 108 | ||
105 | void __init omap2_sdrc_init(struct omap_sdrc_params *sp); | 109 | void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0, |
106 | struct omap_sdrc_params *omap2_sdrc_get_params(unsigned long r); | 110 | struct omap_sdrc_params *sdrc_cs1); |
111 | int omap2_sdrc_get_params(unsigned long r, | ||
112 | struct omap_sdrc_params **sdrc_cs0, | ||
113 | struct omap_sdrc_params **sdrc_cs1); | ||
107 | 114 | ||
108 | #ifdef CONFIG_ARCH_OMAP2 | 115 | #ifdef CONFIG_ARCH_OMAP2 |
109 | 116 | ||
diff --git a/arch/arm/plat-omap/include/mach/serial.h b/arch/arm/plat-omap/include/mach/serial.h index 13abd02d1527..def0529c75eb 100644 --- a/arch/arm/plat-omap/include/mach/serial.h +++ b/arch/arm/plat-omap/include/mach/serial.h | |||
@@ -59,6 +59,7 @@ extern void omap_uart_check_wakeup(void); | |||
59 | extern void omap_uart_prepare_suspend(void); | 59 | extern void omap_uart_prepare_suspend(void); |
60 | extern void omap_uart_prepare_idle(int num); | 60 | extern void omap_uart_prepare_idle(int num); |
61 | extern void omap_uart_resume_idle(int num); | 61 | extern void omap_uart_resume_idle(int num); |
62 | extern void omap_uart_enable_irqs(int enable); | ||
62 | #endif | 63 | #endif |
63 | 64 | ||
64 | #endif | 65 | #endif |
diff --git a/arch/arm/plat-omap/include/mach/sram.h b/arch/arm/plat-omap/include/mach/sram.h index 4d53cc59d7a3..8974e3fc2691 100644 --- a/arch/arm/plat-omap/include/mach/sram.h +++ b/arch/arm/plat-omap/include/mach/sram.h | |||
@@ -21,11 +21,12 @@ extern void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, | |||
21 | u32 mem_type); | 21 | u32 mem_type); |
22 | extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); | 22 | extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); |
23 | 23 | ||
24 | extern u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, | 24 | extern u32 omap3_configure_core_dpll( |
25 | u32 sdrc_actim_ctrla, | 25 | u32 m2, u32 unlock_dll, u32 f, u32 inc, |
26 | u32 sdrc_actim_ctrlb, u32 m2, | 26 | u32 sdrc_rfr_ctrl_0, u32 sdrc_actim_ctrl_a_0, |
27 | u32 unlock_dll, u32 f, u32 sdrc_mr, | 27 | u32 sdrc_actim_ctrl_b_0, u32 sdrc_mr_0, |
28 | u32 inc); | 28 | u32 sdrc_rfr_ctrl_1, u32 sdrc_actim_ctrl_a_1, |
29 | u32 sdrc_actim_ctrl_b_1, u32 sdrc_mr_1); | ||
29 | 30 | ||
30 | /* Do not use these */ | 31 | /* Do not use these */ |
31 | extern void omap1_sram_reprogram_clock(u32 ckctl, u32 dpllctl); | 32 | extern void omap1_sram_reprogram_clock(u32 ckctl, u32 dpllctl); |
@@ -59,12 +60,12 @@ extern void omap243x_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, | |||
59 | u32 mem_type); | 60 | u32 mem_type); |
60 | extern unsigned long omap243x_sram_reprogram_sdrc_sz; | 61 | extern unsigned long omap243x_sram_reprogram_sdrc_sz; |
61 | 62 | ||
62 | 63 | extern u32 omap3_sram_configure_core_dpll( | |
63 | extern u32 omap3_sram_configure_core_dpll(u32 sdrc_rfr_ctrl, | 64 | u32 m2, u32 unlock_dll, u32 f, u32 inc, |
64 | u32 sdrc_actim_ctrla, | 65 | u32 sdrc_rfr_ctrl_0, u32 sdrc_actim_ctrl_a_0, |
65 | u32 sdrc_actim_ctrlb, u32 m2, | 66 | u32 sdrc_actim_ctrl_b_0, u32 sdrc_mr_0, |
66 | u32 unlock_dll, u32 f, u32 sdrc_mr, | 67 | u32 sdrc_rfr_ctrl_1, u32 sdrc_actim_ctrl_a_1, |
67 | u32 inc); | 68 | u32 sdrc_actim_ctrl_b_1, u32 sdrc_mr_1); |
68 | extern unsigned long omap3_sram_configure_core_dpll_sz; | 69 | extern unsigned long omap3_sram_configure_core_dpll_sz; |
69 | 70 | ||
70 | #endif | 71 | #endif |
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 4ea73804d21e..5eae7876979c 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
@@ -44,9 +44,9 @@ | |||
44 | #define OMAP2_SRAM_VA 0xe3000000 | 44 | #define OMAP2_SRAM_VA 0xe3000000 |
45 | #define OMAP2_SRAM_PUB_VA (OMAP2_SRAM_VA + 0x800) | 45 | #define OMAP2_SRAM_PUB_VA (OMAP2_SRAM_VA + 0x800) |
46 | #define OMAP3_SRAM_PA 0x40200000 | 46 | #define OMAP3_SRAM_PA 0x40200000 |
47 | #define OMAP3_SRAM_VA 0xd7000000 | 47 | #define OMAP3_SRAM_VA 0xe3000000 |
48 | #define OMAP3_SRAM_PUB_PA 0x40208000 | 48 | #define OMAP3_SRAM_PUB_PA 0x40208000 |
49 | #define OMAP3_SRAM_PUB_VA 0xd7008000 | 49 | #define OMAP3_SRAM_PUB_VA (OMAP3_SRAM_VA + 0x8000) |
50 | #define OMAP4_SRAM_PA 0x40200000 /*0x402f0000*/ | 50 | #define OMAP4_SRAM_PA 0x40200000 /*0x402f0000*/ |
51 | #define OMAP4_SRAM_VA 0xd7000000 /*0xd70f0000*/ | 51 | #define OMAP4_SRAM_VA 0xd7000000 /*0xd70f0000*/ |
52 | 52 | ||
@@ -373,20 +373,26 @@ static inline int omap243x_sram_init(void) | |||
373 | 373 | ||
374 | #ifdef CONFIG_ARCH_OMAP3 | 374 | #ifdef CONFIG_ARCH_OMAP3 |
375 | 375 | ||
376 | static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl, | 376 | static u32 (*_omap3_sram_configure_core_dpll)( |
377 | u32 sdrc_actim_ctrla, | 377 | u32 m2, u32 unlock_dll, u32 f, u32 inc, |
378 | u32 sdrc_actim_ctrlb, | 378 | u32 sdrc_rfr_ctrl_0, u32 sdrc_actim_ctrl_a_0, |
379 | u32 m2, u32 unlock_dll, | 379 | u32 sdrc_actim_ctrl_b_0, u32 sdrc_mr_0, |
380 | u32 f, u32 sdrc_mr, u32 inc); | 380 | u32 sdrc_rfr_ctrl_1, u32 sdrc_actim_ctrl_a_1, |
381 | u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla, | 381 | u32 sdrc_actim_ctrl_b_1, u32 sdrc_mr_1); |
382 | u32 sdrc_actim_ctrlb, u32 m2, u32 unlock_dll, | 382 | |
383 | u32 f, u32 sdrc_mr, u32 inc) | 383 | u32 omap3_configure_core_dpll(u32 m2, u32 unlock_dll, u32 f, u32 inc, |
384 | u32 sdrc_rfr_ctrl_0, u32 sdrc_actim_ctrl_a_0, | ||
385 | u32 sdrc_actim_ctrl_b_0, u32 sdrc_mr_0, | ||
386 | u32 sdrc_rfr_ctrl_1, u32 sdrc_actim_ctrl_a_1, | ||
387 | u32 sdrc_actim_ctrl_b_1, u32 sdrc_mr_1) | ||
384 | { | 388 | { |
385 | BUG_ON(!_omap3_sram_configure_core_dpll); | 389 | BUG_ON(!_omap3_sram_configure_core_dpll); |
386 | return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl, | 390 | return _omap3_sram_configure_core_dpll( |
387 | sdrc_actim_ctrla, | 391 | m2, unlock_dll, f, inc, |
388 | sdrc_actim_ctrlb, m2, | 392 | sdrc_rfr_ctrl_0, sdrc_actim_ctrl_a_0, |
389 | unlock_dll, f, sdrc_mr, inc); | 393 | sdrc_actim_ctrl_b_0, sdrc_mr_0, |
394 | sdrc_rfr_ctrl_1, sdrc_actim_ctrl_a_1, | ||
395 | sdrc_actim_ctrl_b_1, sdrc_mr_1); | ||
390 | } | 396 | } |
391 | 397 | ||
392 | /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */ | 398 | /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */ |
diff --git a/arch/arm/plat-orion/include/plat/gpio.h b/arch/arm/plat-orion/include/plat/gpio.h index 9646a94ed3d0..07c430fdc9ef 100644 --- a/arch/arm/plat-orion/include/plat/gpio.h +++ b/arch/arm/plat-orion/include/plat/gpio.h | |||
@@ -11,6 +11,8 @@ | |||
11 | #ifndef __PLAT_GPIO_H | 11 | #ifndef __PLAT_GPIO_H |
12 | #define __PLAT_GPIO_H | 12 | #define __PLAT_GPIO_H |
13 | 13 | ||
14 | #include <linux/init.h> | ||
15 | |||
14 | /* | 16 | /* |
15 | * GENERIC_GPIO primitives. | 17 | * GENERIC_GPIO primitives. |
16 | */ | 18 | */ |
diff --git a/arch/arm/plat-s3c24xx/clock-dclk.c b/arch/arm/plat-s3c24xx/clock-dclk.c index 5b75a797b5ab..0afb217a775e 100644 --- a/arch/arm/plat-s3c24xx/clock-dclk.c +++ b/arch/arm/plat-s3c24xx/clock-dclk.c | |||
@@ -129,7 +129,7 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent) | |||
129 | 129 | ||
130 | /* calculate the MISCCR setting for the clock */ | 130 | /* calculate the MISCCR setting for the clock */ |
131 | 131 | ||
132 | if (parent == &clk_xtal) | 132 | if (parent == &clk_mpll) |
133 | source = S3C2410_MISCCR_CLK0_MPLL; | 133 | source = S3C2410_MISCCR_CLK0_MPLL; |
134 | else if (parent == &clk_upll) | 134 | else if (parent == &clk_upll) |
135 | source = S3C2410_MISCCR_CLK0_UPLL; | 135 | source = S3C2410_MISCCR_CLK0_UPLL; |
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c index 0120b760315b..82a6d4de02a3 100644 --- a/arch/arm/plat-s3c24xx/pwm.c +++ b/arch/arm/plat-s3c24xx/pwm.c | |||
@@ -246,6 +246,10 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) | |||
246 | 246 | ||
247 | tcmp = duty_ns / tin_ns; | 247 | tcmp = duty_ns / tin_ns; |
248 | tcmp = tcnt - tcmp; | 248 | tcmp = tcnt - tcmp; |
249 | /* the pwm hw only checks the compare register after a decrement, | ||
250 | so the pin never toggles if tcmp = tcnt */ | ||
251 | if (tcmp == tcnt) | ||
252 | tcmp--; | ||
249 | 253 | ||
250 | pwm_dbg(pwm, "tin_ns=%lu, tcmp=%ld/%lu\n", tin_ns, tcmp, tcnt); | 254 | pwm_dbg(pwm, "tin_ns=%lu, tcmp=%ld/%lu\n", tin_ns, tcmp, tcnt); |
251 | 255 | ||
diff --git a/arch/arm/plat-s3c64xx/pm.c b/arch/arm/plat-s3c64xx/pm.c index 07a6516a4f3c..47632fc7eb66 100644 --- a/arch/arm/plat-s3c64xx/pm.c +++ b/arch/arm/plat-s3c64xx/pm.c | |||
@@ -117,8 +117,6 @@ void s3c_pm_save_core(void) | |||
117 | * this. | 117 | * this. |
118 | */ | 118 | */ |
119 | 119 | ||
120 | #include <plat/regs-gpio.h> | ||
121 | |||
122 | static void s3c64xx_cpu_suspend(void) | 120 | static void s3c64xx_cpu_suspend(void) |
123 | { | 121 | { |
124 | unsigned long tmp; | 122 | unsigned long tmp; |
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c index 1debc1f9f987..febac1950d8e 100644 --- a/arch/arm/plat-s3c64xx/s3c6400-clock.c +++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c | |||
@@ -153,7 +153,7 @@ static unsigned long s3c64xx_clk_arm_round_rate(struct clk *clk, | |||
153 | u32 div; | 153 | u32 div; |
154 | 154 | ||
155 | if (parent < rate) | 155 | if (parent < rate) |
156 | return rate; | 156 | return parent; |
157 | 157 | ||
158 | div = (parent / rate) - 1; | 158 | div = (parent / rate) - 1; |
159 | if (div > armclk_mask) | 159 | if (div > armclk_mask) |
@@ -175,7 +175,7 @@ static int s3c64xx_clk_arm_set_rate(struct clk *clk, unsigned long rate) | |||
175 | div = clk_get_rate(clk->parent) / rate; | 175 | div = clk_get_rate(clk->parent) / rate; |
176 | 176 | ||
177 | val = __raw_readl(S3C_CLK_DIV0); | 177 | val = __raw_readl(S3C_CLK_DIV0); |
178 | val &= armclk_mask; | 178 | val &= ~armclk_mask; |
179 | val |= (div - 1); | 179 | val |= (div - 1); |
180 | __raw_writel(val, S3C_CLK_DIV0); | 180 | __raw_writel(val, S3C_CLK_DIV0); |
181 | 181 | ||
diff --git a/arch/arm/plat-stmp3xxx/pinmux.c b/arch/arm/plat-stmp3xxx/pinmux.c index d41200382208..6d6b1a468eda 100644 --- a/arch/arm/plat-stmp3xxx/pinmux.c +++ b/arch/arm/plat-stmp3xxx/pinmux.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/sysdev.h> | 22 | #include <linux/sysdev.h> |
23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
24 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
25 | #include <linux/sysdev.h> | ||
26 | #include <linux/irq.h> | 25 | #include <linux/irq.h> |
27 | 26 | ||
28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c index 46c9b0a224cf..75f19f47fb2f 100644 --- a/arch/avr32/boards/favr-32/setup.c +++ b/arch/avr32/boards/favr-32/setup.c | |||
@@ -72,6 +72,10 @@ static struct ads7846_platform_data ads7843_data = { | |||
72 | .debounce_max = 20, | 72 | .debounce_max = 20, |
73 | .debounce_rep = 4, | 73 | .debounce_rep = 4, |
74 | .debounce_tol = 5, | 74 | .debounce_tol = 5, |
75 | |||
76 | .keep_vref_on = true, | ||
77 | .settle_delay_usecs = 500, | ||
78 | .penirq_recheck_delay_usecs = 100, | ||
75 | }; | 79 | }; |
76 | 80 | ||
77 | static struct spi_board_info __initdata spi1_board_info[] = { | 81 | static struct spi_board_info __initdata spi1_board_info[] = { |
diff --git a/arch/avr32/include/asm/pgalloc.h b/arch/avr32/include/asm/pgalloc.h index 640821323943..92ecd8446ef8 100644 --- a/arch/avr32/include/asm/pgalloc.h +++ b/arch/avr32/include/asm/pgalloc.h | |||
@@ -83,7 +83,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | |||
83 | quicklist_free_page(QUICK_PT, NULL, pte); | 83 | quicklist_free_page(QUICK_PT, NULL, pte); |
84 | } | 84 | } |
85 | 85 | ||
86 | #define __pte_free_tlb(tlb,pte) \ | 86 | #define __pte_free_tlb(tlb,pte,addr) \ |
87 | do { \ | 87 | do { \ |
88 | pgtable_page_dtor(pte); \ | 88 | pgtable_page_dtor(pte); \ |
89 | tlb_remove_page((tlb), pte); \ | 89 | tlb_remove_page((tlb), pte); \ |
diff --git a/arch/avr32/lib/memcpy.S b/arch/avr32/lib/memcpy.S index 0abb26142b64..c2ca49d705af 100644 --- a/arch/avr32/lib/memcpy.S +++ b/arch/avr32/lib/memcpy.S | |||
@@ -24,8 +24,8 @@ memcpy: | |||
24 | brne 1f | 24 | brne 1f |
25 | 25 | ||
26 | /* At this point, "from" is word-aligned */ | 26 | /* At this point, "from" is word-aligned */ |
27 | 2: sub r10, 4 | 27 | 2: mov r9, r12 |
28 | mov r9, r12 | 28 | 5: sub r10, 4 |
29 | brlt 4f | 29 | brlt 4f |
30 | 30 | ||
31 | 3: ld.w r8, r11++ | 31 | 3: ld.w r8, r11++ |
@@ -49,6 +49,7 @@ memcpy: | |||
49 | 49 | ||
50 | /* Handle unaligned "from" pointer */ | 50 | /* Handle unaligned "from" pointer */ |
51 | 1: sub r10, 4 | 51 | 1: sub r10, 4 |
52 | movlt r9, r12 | ||
52 | brlt 4b | 53 | brlt 4b |
53 | add r10, r9 | 54 | add r10, r9 |
54 | lsl r9, 2 | 55 | lsl r9, 2 |
@@ -59,4 +60,13 @@ memcpy: | |||
59 | st.b r12++, r8 | 60 | st.b r12++, r8 |
60 | ld.ub r8, r11++ | 61 | ld.ub r8, r11++ |
61 | st.b r12++, r8 | 62 | st.b r12++, r8 |
62 | rjmp 2b | 63 | mov r8, r12 |
64 | add pc, pc, r9 | ||
65 | sub r8, 1 | ||
66 | nop | ||
67 | sub r8, 1 | ||
68 | nop | ||
69 | sub r8, 1 | ||
70 | nop | ||
71 | mov r9, r8 | ||
72 | rjmp 5b | ||
diff --git a/arch/cris/include/asm/pgalloc.h b/arch/cris/include/asm/pgalloc.h index a1ba761d0573..6da975db112f 100644 --- a/arch/cris/include/asm/pgalloc.h +++ b/arch/cris/include/asm/pgalloc.h | |||
@@ -47,7 +47,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | |||
47 | __free_page(pte); | 47 | __free_page(pte); |
48 | } | 48 | } |
49 | 49 | ||
50 | #define __pte_free_tlb(tlb,pte) \ | 50 | #define __pte_free_tlb(tlb,pte,address) \ |
51 | do { \ | 51 | do { \ |
52 | pgtable_page_dtor(pte); \ | 52 | pgtable_page_dtor(pte); \ |
53 | tlb_remove_page((tlb), pte); \ | 53 | tlb_remove_page((tlb), pte); \ |
diff --git a/arch/frv/include/asm/pgalloc.h b/arch/frv/include/asm/pgalloc.h index 971e6addb009..416d19a632f2 100644 --- a/arch/frv/include/asm/pgalloc.h +++ b/arch/frv/include/asm/pgalloc.h | |||
@@ -49,7 +49,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | |||
49 | __free_page(pte); | 49 | __free_page(pte); |
50 | } | 50 | } |
51 | 51 | ||
52 | #define __pte_free_tlb(tlb,pte) \ | 52 | #define __pte_free_tlb(tlb,pte,address) \ |
53 | do { \ | 53 | do { \ |
54 | pgtable_page_dtor(pte); \ | 54 | pgtable_page_dtor(pte); \ |
55 | tlb_remove_page((tlb),(pte)); \ | 55 | tlb_remove_page((tlb),(pte)); \ |
@@ -62,7 +62,7 @@ do { \ | |||
62 | */ | 62 | */ |
63 | #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *) 2); }) | 63 | #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *) 2); }) |
64 | #define pmd_free(mm, x) do { } while (0) | 64 | #define pmd_free(mm, x) do { } while (0) |
65 | #define __pmd_free_tlb(tlb,x) do { } while (0) | 65 | #define __pmd_free_tlb(tlb,x,a) do { } while (0) |
66 | 66 | ||
67 | #endif /* CONFIG_MMU */ | 67 | #endif /* CONFIG_MMU */ |
68 | 68 | ||
diff --git a/arch/frv/include/asm/pgtable.h b/arch/frv/include/asm/pgtable.h index 33233011b1c1..22c60692b551 100644 --- a/arch/frv/include/asm/pgtable.h +++ b/arch/frv/include/asm/pgtable.h | |||
@@ -225,7 +225,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) | |||
225 | */ | 225 | */ |
226 | #define pud_alloc_one(mm, address) NULL | 226 | #define pud_alloc_one(mm, address) NULL |
227 | #define pud_free(mm, x) do { } while (0) | 227 | #define pud_free(mm, x) do { } while (0) |
228 | #define __pud_free_tlb(tlb, x) do { } while (0) | 228 | #define __pud_free_tlb(tlb, x, address) do { } while (0) |
229 | 229 | ||
230 | /* | 230 | /* |
231 | * The "pud_xxx()" functions here are trivial for a folded two-level | 231 | * The "pud_xxx()" functions here are trivial for a folded two-level |
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 58a7e46affda..e7cbaa02cd0b 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
@@ -41,11 +41,6 @@ $(error Sorry, you need a newer version of the assember, one that is built from | |||
41 | ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz) | 41 | ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz) |
42 | endif | 42 | endif |
43 | 43 | ||
44 | ifeq ($(call cc-version),0304) | ||
45 | cflags-$(CONFIG_ITANIUM) += -mtune=merced | ||
46 | cflags-$(CONFIG_MCKINLEY) += -mtune=mckinley | ||
47 | endif | ||
48 | |||
49 | KBUILD_CFLAGS += $(cflags-y) | 44 | KBUILD_CFLAGS += $(cflags-y) |
50 | head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o | 45 | head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o |
51 | 46 | ||
diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h index e2ca80037335..57a2787bc9fb 100644 --- a/arch/ia64/include/asm/bitops.h +++ b/arch/ia64/include/asm/bitops.h | |||
@@ -286,7 +286,7 @@ __test_and_clear_bit(int nr, volatile void * addr) | |||
286 | { | 286 | { |
287 | __u32 *p = (__u32 *) addr + (nr >> 5); | 287 | __u32 *p = (__u32 *) addr + (nr >> 5); |
288 | __u32 m = 1 << (nr & 31); | 288 | __u32 m = 1 << (nr & 31); |
289 | int oldbitset = *p & m; | 289 | int oldbitset = (*p & m) != 0; |
290 | 290 | ||
291 | *p &= ~m; | 291 | *p &= ~m; |
292 | return oldbitset; | 292 | return oldbitset; |
diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h index b9ac1a6fc216..96a8d927db28 100644 --- a/arch/ia64/include/asm/pgalloc.h +++ b/arch/ia64/include/asm/pgalloc.h | |||
@@ -48,7 +48,7 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud) | |||
48 | { | 48 | { |
49 | quicklist_free(0, NULL, pud); | 49 | quicklist_free(0, NULL, pud); |
50 | } | 50 | } |
51 | #define __pud_free_tlb(tlb, pud) pud_free((tlb)->mm, pud) | 51 | #define __pud_free_tlb(tlb, pud, address) pud_free((tlb)->mm, pud) |
52 | #endif /* CONFIG_PGTABLE_4 */ | 52 | #endif /* CONFIG_PGTABLE_4 */ |
53 | 53 | ||
54 | static inline void | 54 | static inline void |
@@ -67,7 +67,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) | |||
67 | quicklist_free(0, NULL, pmd); | 67 | quicklist_free(0, NULL, pmd); |
68 | } | 68 | } |
69 | 69 | ||
70 | #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd) | 70 | #define __pmd_free_tlb(tlb, pmd, address) pmd_free((tlb)->mm, pmd) |
71 | 71 | ||
72 | static inline void | 72 | static inline void |
73 | pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, pgtable_t pte) | 73 | pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, pgtable_t pte) |
@@ -117,6 +117,6 @@ static inline void check_pgt_cache(void) | |||
117 | quicklist_trim(0, NULL, 25, 16); | 117 | quicklist_trim(0, NULL, 25, 16); |
118 | } | 118 | } |
119 | 119 | ||
120 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) | 120 | #define __pte_free_tlb(tlb, pte, address) pte_free((tlb)->mm, pte) |
121 | 121 | ||
122 | #endif /* _ASM_IA64_PGALLOC_H */ | 122 | #endif /* _ASM_IA64_PGALLOC_H */ |
diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 0a9cc73d35c7..8840a690d1e7 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h | |||
@@ -155,7 +155,6 @@ | |||
155 | #include <linux/bitops.h> | 155 | #include <linux/bitops.h> |
156 | #include <asm/cacheflush.h> | 156 | #include <asm/cacheflush.h> |
157 | #include <asm/mmu_context.h> | 157 | #include <asm/mmu_context.h> |
158 | #include <asm/processor.h> | ||
159 | 158 | ||
160 | /* | 159 | /* |
161 | * Next come the mappings that determine how mmap() protection bits | 160 | * Next come the mappings that determine how mmap() protection bits |
diff --git a/arch/ia64/include/asm/tlb.h b/arch/ia64/include/asm/tlb.h index 20d8a39680c2..85d965cb19a0 100644 --- a/arch/ia64/include/asm/tlb.h +++ b/arch/ia64/include/asm/tlb.h | |||
@@ -236,22 +236,22 @@ do { \ | |||
236 | __tlb_remove_tlb_entry(tlb, ptep, addr); \ | 236 | __tlb_remove_tlb_entry(tlb, ptep, addr); \ |
237 | } while (0) | 237 | } while (0) |
238 | 238 | ||
239 | #define pte_free_tlb(tlb, ptep) \ | 239 | #define pte_free_tlb(tlb, ptep, address) \ |
240 | do { \ | 240 | do { \ |
241 | tlb->need_flush = 1; \ | 241 | tlb->need_flush = 1; \ |
242 | __pte_free_tlb(tlb, ptep); \ | 242 | __pte_free_tlb(tlb, ptep, address); \ |
243 | } while (0) | 243 | } while (0) |
244 | 244 | ||
245 | #define pmd_free_tlb(tlb, ptep) \ | 245 | #define pmd_free_tlb(tlb, ptep, address) \ |
246 | do { \ | 246 | do { \ |
247 | tlb->need_flush = 1; \ | 247 | tlb->need_flush = 1; \ |
248 | __pmd_free_tlb(tlb, ptep); \ | 248 | __pmd_free_tlb(tlb, ptep, address); \ |
249 | } while (0) | 249 | } while (0) |
250 | 250 | ||
251 | #define pud_free_tlb(tlb, pudp) \ | 251 | #define pud_free_tlb(tlb, pudp, address) \ |
252 | do { \ | 252 | do { \ |
253 | tlb->need_flush = 1; \ | 253 | tlb->need_flush = 1; \ |
254 | __pud_free_tlb(tlb, pudp); \ | 254 | __pud_free_tlb(tlb, pudp, address); \ |
255 | } while (0) | 255 | } while (0) |
256 | 256 | ||
257 | #endif /* _ASM_IA64_TLB_H */ | 257 | #endif /* _ASM_IA64_TLB_H */ |
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c index 2d311864e359..8ebccb589e1c 100644 --- a/arch/ia64/kernel/ia64_ksyms.c +++ b/arch/ia64/kernel/ia64_ksyms.c | |||
@@ -21,6 +21,7 @@ EXPORT_SYMBOL(csum_ipv6_magic); | |||
21 | 21 | ||
22 | #include <asm/page.h> | 22 | #include <asm/page.h> |
23 | EXPORT_SYMBOL(clear_page); | 23 | EXPORT_SYMBOL(clear_page); |
24 | EXPORT_SYMBOL(copy_page); | ||
24 | 25 | ||
25 | #ifdef CONFIG_VIRTUAL_MEM_MAP | 26 | #ifdef CONFIG_VIRTUAL_MEM_MAP |
26 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
@@ -60,9 +61,6 @@ EXPORT_SYMBOL(__udivdi3); | |||
60 | EXPORT_SYMBOL(__moddi3); | 61 | EXPORT_SYMBOL(__moddi3); |
61 | EXPORT_SYMBOL(__umoddi3); | 62 | EXPORT_SYMBOL(__umoddi3); |
62 | 63 | ||
63 | #include <asm/page.h> | ||
64 | EXPORT_SYMBOL(copy_page); | ||
65 | |||
66 | #if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE) | 64 | #if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE) |
67 | extern void xor_ia64_2(void); | 65 | extern void xor_ia64_2(void); |
68 | extern void xor_ia64_3(void); | 66 | extern void xor_ia64_3(void); |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index c48b03f2b61d..dab4d393908c 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -1072,6 +1072,10 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base) | |||
1072 | } | 1072 | } |
1073 | 1073 | ||
1074 | addr = ioremap(phys_addr, 0); | 1074 | addr = ioremap(phys_addr, 0); |
1075 | if (addr == NULL) { | ||
1076 | spin_unlock_irqrestore(&iosapic_lock, flags); | ||
1077 | return -ENOMEM; | ||
1078 | } | ||
1075 | ver = iosapic_version(addr); | 1079 | ver = iosapic_version(addr); |
1076 | if ((err = iosapic_check_gsi_range(gsi_base, ver))) { | 1080 | if ((err = iosapic_check_gsi_range(gsi_base, ver))) { |
1077 | iounmap(addr); | 1081 | iounmap(addr); |
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index 05695962fe44..f6b1ff0aea76 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c | |||
@@ -69,11 +69,6 @@ iommu_dma_init(void) | |||
69 | 69 | ||
70 | int iommu_dma_supported(struct device *dev, u64 mask) | 70 | int iommu_dma_supported(struct device *dev, u64 mask) |
71 | { | 71 | { |
72 | struct dma_map_ops *ops = platform_dma_get_ops(dev); | ||
73 | |||
74 | if (ops->dma_supported) | ||
75 | return ops->dma_supported(dev, mask); | ||
76 | |||
77 | /* Copied from i386. Doesn't make much sense, because it will | 72 | /* Copied from i386. Doesn't make much sense, because it will |
78 | only work for pci_alloc_coherent. | 73 | only work for pci_alloc_coherent. |
79 | The caller just has to use GFP_DMA in this case. */ | 74 | The caller just has to use GFP_DMA in this case. */ |
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index bc80dff1df7a..8f060352e129 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
@@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) | |||
372 | retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, | 372 | retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj, |
373 | &cache_ktype_percpu_entry, &sys_dev->kobj, | 373 | &cache_ktype_percpu_entry, &sys_dev->kobj, |
374 | "%s", "cache"); | 374 | "%s", "cache"); |
375 | if (unlikely(retval < 0)) { | ||
376 | cpu_cache_sysfs_exit(cpu); | ||
377 | return retval; | ||
378 | } | ||
375 | 379 | ||
376 | for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { | 380 | for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) { |
377 | this_object = LEAF_KOBJECT_PTR(cpu,i); | 381 | this_object = LEAF_KOBJECT_PTR(cpu,i); |
@@ -385,7 +389,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) | |||
385 | } | 389 | } |
386 | kobject_put(&all_cpu_cache_info[cpu].kobj); | 390 | kobject_put(&all_cpu_cache_info[cpu].kobj); |
387 | cpu_cache_sysfs_exit(cpu); | 391 | cpu_cache_sysfs_exit(cpu); |
388 | break; | 392 | return retval; |
389 | } | 393 | } |
390 | kobject_uevent(&(this_object->kobj), KOBJ_ADD); | 394 | kobject_uevent(&(this_object->kobj), KOBJ_ADD); |
391 | } | 395 | } |
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c index 21f63fffc379..9bf55afd08d0 100644 --- a/arch/ia64/kvm/mmio.c +++ b/arch/ia64/kvm/mmio.c | |||
@@ -247,7 +247,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma) | |||
247 | vcpu_get_fpreg(vcpu, inst.M9.f2, &v); | 247 | vcpu_get_fpreg(vcpu, inst.M9.f2, &v); |
248 | /* Write high word. FIXME: this is a kludge! */ | 248 | /* Write high word. FIXME: this is a kludge! */ |
249 | v.u.bits[1] &= 0x3ffff; | 249 | v.u.bits[1] &= 0x3ffff; |
250 | mmio_access(vcpu, padr + 8, &v.u.bits[1], 8, ma, IOREQ_WRITE); | 250 | mmio_access(vcpu, padr + 8, (u64 *)&v.u.bits[1], 8, |
251 | ma, IOREQ_WRITE); | ||
251 | data = v.u.bits[0]; | 252 | data = v.u.bits[0]; |
252 | size = 3; | 253 | size = 3; |
253 | } else if (inst.M10.major == 7 && inst.M10.x6 == 0x3B) { | 254 | } else if (inst.M10.major == 7 && inst.M10.x6 == 0x3B) { |
@@ -265,7 +266,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma) | |||
265 | 266 | ||
266 | /* Write high word.FIXME: this is a kludge! */ | 267 | /* Write high word.FIXME: this is a kludge! */ |
267 | v.u.bits[1] &= 0x3ffff; | 268 | v.u.bits[1] &= 0x3ffff; |
268 | mmio_access(vcpu, padr + 8, &v.u.bits[1], 8, ma, IOREQ_WRITE); | 269 | mmio_access(vcpu, padr + 8, (u64 *)&v.u.bits[1], |
270 | 8, ma, IOREQ_WRITE); | ||
269 | data = v.u.bits[0]; | 271 | data = v.u.bits[0]; |
270 | size = 3; | 272 | size = 3; |
271 | } else if (inst.M10.major == 7 && inst.M10.x6 == 0x31) { | 273 | } else if (inst.M10.major == 7 && inst.M10.x6 == 0x31) { |
diff --git a/arch/ia64/kvm/vcpu.c b/arch/ia64/kvm/vcpu.c index 46b02cbcc874..cc406d064a09 100644 --- a/arch/ia64/kvm/vcpu.c +++ b/arch/ia64/kvm/vcpu.c | |||
@@ -461,7 +461,7 @@ void setreg(unsigned long regnum, unsigned long val, | |||
461 | u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg) | 461 | u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg) |
462 | { | 462 | { |
463 | struct kvm_pt_regs *regs = vcpu_regs(vcpu); | 463 | struct kvm_pt_regs *regs = vcpu_regs(vcpu); |
464 | u64 val; | 464 | unsigned long val; |
465 | 465 | ||
466 | if (!reg) | 466 | if (!reg) |
467 | return 0; | 467 | return 0; |
@@ -469,7 +469,7 @@ u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg) | |||
469 | return val; | 469 | return val; |
470 | } | 470 | } |
471 | 471 | ||
472 | void vcpu_set_gr(struct kvm_vcpu *vcpu, u64 reg, u64 value, int nat) | 472 | void vcpu_set_gr(struct kvm_vcpu *vcpu, unsigned long reg, u64 value, int nat) |
473 | { | 473 | { |
474 | struct kvm_pt_regs *regs = vcpu_regs(vcpu); | 474 | struct kvm_pt_regs *regs = vcpu_regs(vcpu); |
475 | long sof = (regs->cr_ifs) & 0x7f; | 475 | long sof = (regs->cr_ifs) & 0x7f; |
@@ -1072,7 +1072,7 @@ void kvm_ttag(struct kvm_vcpu *vcpu, INST64 inst) | |||
1072 | vcpu_set_gr(vcpu, inst.M46.r1, tag, 0); | 1072 | vcpu_set_gr(vcpu, inst.M46.r1, tag, 0); |
1073 | } | 1073 | } |
1074 | 1074 | ||
1075 | int vcpu_tpa(struct kvm_vcpu *vcpu, u64 vadr, u64 *padr) | 1075 | int vcpu_tpa(struct kvm_vcpu *vcpu, u64 vadr, unsigned long *padr) |
1076 | { | 1076 | { |
1077 | struct thash_data *data; | 1077 | struct thash_data *data; |
1078 | union ia64_isr visr, pt_isr; | 1078 | union ia64_isr visr, pt_isr; |
diff --git a/arch/ia64/kvm/vcpu.h b/arch/ia64/kvm/vcpu.h index 042af92ced83..360724d3ae69 100644 --- a/arch/ia64/kvm/vcpu.h +++ b/arch/ia64/kvm/vcpu.h | |||
@@ -686,14 +686,15 @@ static inline int highest_inservice_irq(struct kvm_vcpu *vcpu) | |||
686 | return highest_bits((int *)&(VMX(vcpu, insvc[0]))); | 686 | return highest_bits((int *)&(VMX(vcpu, insvc[0]))); |
687 | } | 687 | } |
688 | 688 | ||
689 | extern void vcpu_get_fpreg(struct kvm_vcpu *vcpu, u64 reg, | 689 | extern void vcpu_get_fpreg(struct kvm_vcpu *vcpu, unsigned long reg, |
690 | struct ia64_fpreg *val); | 690 | struct ia64_fpreg *val); |
691 | extern void vcpu_set_fpreg(struct kvm_vcpu *vcpu, u64 reg, | 691 | extern void vcpu_set_fpreg(struct kvm_vcpu *vcpu, unsigned long reg, |
692 | struct ia64_fpreg *val); | 692 | struct ia64_fpreg *val); |
693 | extern u64 vcpu_get_gr(struct kvm_vcpu *vcpu, u64 reg); | 693 | extern u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg); |
694 | extern void vcpu_set_gr(struct kvm_vcpu *vcpu, u64 reg, u64 val, int nat); | 694 | extern void vcpu_set_gr(struct kvm_vcpu *vcpu, unsigned long reg, |
695 | extern u64 vcpu_get_psr(struct kvm_vcpu *vcpu); | 695 | u64 val, int nat); |
696 | extern void vcpu_set_psr(struct kvm_vcpu *vcpu, u64 val); | 696 | extern unsigned long vcpu_get_psr(struct kvm_vcpu *vcpu); |
697 | extern void vcpu_set_psr(struct kvm_vcpu *vcpu, unsigned long val); | ||
697 | extern u64 vcpu_thash(struct kvm_vcpu *vcpu, u64 vadr); | 698 | extern u64 vcpu_thash(struct kvm_vcpu *vcpu, u64 vadr); |
698 | extern void vcpu_bsw0(struct kvm_vcpu *vcpu); | 699 | extern void vcpu_bsw0(struct kvm_vcpu *vcpu); |
699 | extern void thash_vhpt_insert(struct kvm_vcpu *v, u64 pte, | 700 | extern void thash_vhpt_insert(struct kvm_vcpu *v, u64 pte, |
diff --git a/arch/m32r/include/asm/pgalloc.h b/arch/m32r/include/asm/pgalloc.h index f11a2b909cdb..0fc736198979 100644 --- a/arch/m32r/include/asm/pgalloc.h +++ b/arch/m32r/include/asm/pgalloc.h | |||
@@ -58,7 +58,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | |||
58 | __free_page(pte); | 58 | __free_page(pte); |
59 | } | 59 | } |
60 | 60 | ||
61 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte)) | 61 | #define __pte_free_tlb(tlb, pte, addr) pte_free((tlb)->mm, (pte)) |
62 | 62 | ||
63 | /* | 63 | /* |
64 | * allocating and freeing a pmd is trivial: the 1-entry pmd is | 64 | * allocating and freeing a pmd is trivial: the 1-entry pmd is |
@@ -68,7 +68,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | |||
68 | 68 | ||
69 | #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); }) | 69 | #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); }) |
70 | #define pmd_free(mm, x) do { } while (0) | 70 | #define pmd_free(mm, x) do { } while (0) |
71 | #define __pmd_free_tlb(tlb, x) do { } while (0) | 71 | #define __pmd_free_tlb(tlb, x, addr) do { } while (0) |
72 | #define pgd_populate(mm, pmd, pte) BUG() | 72 | #define pgd_populate(mm, pmd, pte) BUG() |
73 | 73 | ||
74 | #define check_pgt_cache() do { } while (0) | 74 | #define check_pgt_cache() do { } while (0) |
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 6e562751ad51..6c74751c7b82 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c | |||
@@ -574,10 +574,11 @@ static int a2000_hwclk(int op, struct rtc_time *t) | |||
574 | 574 | ||
575 | tod_2000.cntrl1 = TOD2000_CNTRL1_HOLD; | 575 | tod_2000.cntrl1 = TOD2000_CNTRL1_HOLD; |
576 | 576 | ||
577 | while ((tod_2000.cntrl1 & TOD2000_CNTRL1_BUSY) && cnt--) { | 577 | while ((tod_2000.cntrl1 & TOD2000_CNTRL1_BUSY) && cnt) { |
578 | tod_2000.cntrl1 &= ~TOD2000_CNTRL1_HOLD; | 578 | tod_2000.cntrl1 &= ~TOD2000_CNTRL1_HOLD; |
579 | udelay(70); | 579 | udelay(70); |
580 | tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; | 580 | tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; |
581 | --cnt; | ||
581 | } | 582 | } |
582 | 583 | ||
583 | if (!cnt) | 584 | if (!cnt) |
@@ -649,10 +650,11 @@ static int amiga_set_clock_mmss(unsigned long nowtime) | |||
649 | 650 | ||
650 | tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; | 651 | tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; |
651 | 652 | ||
652 | while ((tod_2000.cntrl1 & TOD2000_CNTRL1_BUSY) && cnt--) { | 653 | while ((tod_2000.cntrl1 & TOD2000_CNTRL1_BUSY) && cnt) { |
653 | tod_2000.cntrl1 &= ~TOD2000_CNTRL1_HOLD; | 654 | tod_2000.cntrl1 &= ~TOD2000_CNTRL1_HOLD; |
654 | udelay(70); | 655 | udelay(70); |
655 | tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; | 656 | tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; |
657 | --cnt; | ||
656 | } | 658 | } |
657 | 659 | ||
658 | if (!cnt) | 660 | if (!cnt) |
diff --git a/arch/m68k/include/asm/motorola_pgalloc.h b/arch/m68k/include/asm/motorola_pgalloc.h index d08bf6261df8..2f02f264e694 100644 --- a/arch/m68k/include/asm/motorola_pgalloc.h +++ b/arch/m68k/include/asm/motorola_pgalloc.h | |||
@@ -36,12 +36,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres | |||
36 | return NULL; | 36 | return NULL; |
37 | 37 | ||
38 | pte = kmap(page); | 38 | pte = kmap(page); |
39 | if (pte) { | 39 | __flush_page_to_ram(pte); |
40 | __flush_page_to_ram(pte); | 40 | flush_tlb_kernel_page(pte); |
41 | flush_tlb_kernel_page(pte); | 41 | nocache_page(pte); |
42 | nocache_page(pte); | 42 | kunmap(page); |
43 | } | ||
44 | kunmap(pte); | ||
45 | pgtable_page_ctor(page); | 43 | pgtable_page_ctor(page); |
46 | return page; | 44 | return page; |
47 | } | 45 | } |
@@ -54,7 +52,8 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t page) | |||
54 | __free_page(page); | 52 | __free_page(page); |
55 | } | 53 | } |
56 | 54 | ||
57 | static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page) | 55 | static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page, |
56 | unsigned long address) | ||
58 | { | 57 | { |
59 | pgtable_page_dtor(page); | 58 | pgtable_page_dtor(page); |
60 | cache_page(kmap(page)); | 59 | cache_page(kmap(page)); |
@@ -73,7 +72,8 @@ static inline int pmd_free(struct mm_struct *mm, pmd_t *pmd) | |||
73 | return free_pointer_table(pmd); | 72 | return free_pointer_table(pmd); |
74 | } | 73 | } |
75 | 74 | ||
76 | static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) | 75 | static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, |
76 | unsigned long address) | ||
77 | { | 77 | { |
78 | return free_pointer_table(pmd); | 78 | return free_pointer_table(pmd); |
79 | } | 79 | } |
diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h index 0b604f0f192d..fe60e1abaee8 100644 --- a/arch/m68k/include/asm/pgtable_mm.h +++ b/arch/m68k/include/asm/pgtable_mm.h | |||
@@ -135,8 +135,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, | |||
135 | #endif | 135 | #endif |
136 | 136 | ||
137 | #ifndef __ASSEMBLY__ | 137 | #ifndef __ASSEMBLY__ |
138 | #include <asm-generic/pgtable.h> | ||
139 | |||
140 | /* | 138 | /* |
141 | * Macro to mark a page protection value as "uncacheable". | 139 | * Macro to mark a page protection value as "uncacheable". |
142 | */ | 140 | */ |
@@ -154,6 +152,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, | |||
154 | ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \ | 152 | ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \ |
155 | : (prot))) | 153 | : (prot))) |
156 | 154 | ||
155 | #include <asm-generic/pgtable.h> | ||
157 | #endif /* !__ASSEMBLY__ */ | 156 | #endif /* !__ASSEMBLY__ */ |
158 | 157 | ||
159 | /* | 158 | /* |
diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index d4c83f143816..48d80d5a666f 100644 --- a/arch/m68k/include/asm/sun3_pgalloc.h +++ b/arch/m68k/include/asm/sun3_pgalloc.h | |||
@@ -32,7 +32,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t page) | |||
32 | __free_page(page); | 32 | __free_page(page); |
33 | } | 33 | } |
34 | 34 | ||
35 | #define __pte_free_tlb(tlb,pte) \ | 35 | #define __pte_free_tlb(tlb,pte,addr) \ |
36 | do { \ | 36 | do { \ |
37 | pgtable_page_dtor(pte); \ | 37 | pgtable_page_dtor(pte); \ |
38 | tlb_remove_page((tlb), pte); \ | 38 | tlb_remove_page((tlb), pte); \ |
@@ -80,7 +80,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page | |||
80 | * inside the pgd, so has no extra memory associated with it. | 80 | * inside the pgd, so has no extra memory associated with it. |
81 | */ | 81 | */ |
82 | #define pmd_free(mm, x) do { } while (0) | 82 | #define pmd_free(mm, x) do { } while (0) |
83 | #define __pmd_free_tlb(tlb, x) do { } while (0) | 83 | #define __pmd_free_tlb(tlb, x, addr) do { } while (0) |
84 | 84 | ||
85 | static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) | 85 | static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) |
86 | { | 86 | { |
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index aa29a8640f74..946d8691f2b0 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h | |||
@@ -334,10 +334,12 @@ | |||
334 | #define __NR_inotify_init1 328 | 334 | #define __NR_inotify_init1 328 |
335 | #define __NR_preadv 329 | 335 | #define __NR_preadv 329 |
336 | #define __NR_pwritev 330 | 336 | #define __NR_pwritev 330 |
337 | #define __NR_rt_tgsigqueueinfo 331 | ||
338 | #define __NR_perf_counter_open 332 | ||
337 | 339 | ||
338 | #ifdef __KERNEL__ | 340 | #ifdef __KERNEL__ |
339 | 341 | ||
340 | #define NR_syscalls 331 | 342 | #define NR_syscalls 333 |
341 | 343 | ||
342 | #define __ARCH_WANT_IPC_PARSE_VERSION | 344 | #define __ARCH_WANT_IPC_PARSE_VERSION |
343 | #define __ARCH_WANT_OLD_READDIR | 345 | #define __ARCH_WANT_OLD_READDIR |
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 8744f60c07a9..c3735cd6207e 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
@@ -755,4 +755,6 @@ sys_call_table: | |||
755 | .long sys_inotify_init1 | 755 | .long sys_inotify_init1 |
756 | .long sys_preadv | 756 | .long sys_preadv |
757 | .long sys_pwritev /* 330 */ | 757 | .long sys_pwritev /* 330 */ |
758 | .long sys_rt_tgsigqueueinfo | ||
759 | .long sys_perf_counter_open | ||
758 | 760 | ||
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index c0b8782832fd..0ae123e08985 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S | |||
@@ -349,6 +349,8 @@ ENTRY(sys_call_table) | |||
349 | .long sys_inotify_init1 | 349 | .long sys_inotify_init1 |
350 | .long sys_preadv | 350 | .long sys_preadv |
351 | .long sys_pwritev /* 330 */ | 351 | .long sys_pwritev /* 330 */ |
352 | .long sys_rt_tgsigqueueinfo | ||
353 | .long sys_perf_counter_open | ||
352 | 354 | ||
353 | .rept NR_syscalls-(.-sys_call_table)/4 | 355 | .rept NR_syscalls-(.-sys_call_table)/4 |
354 | .long sys_ni_syscall | 356 | .long sys_ni_syscall |
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index d0bcf80a1136..8439598d4655 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile | |||
@@ -6,14 +6,16 @@ endif | |||
6 | 6 | ||
7 | # What CPU vesion are we building for, and crack it open | 7 | # What CPU vesion are we building for, and crack it open |
8 | # as major.minor.rev | 8 | # as major.minor.rev |
9 | CPU_VER=$(subst ",,$(CONFIG_XILINX_MICROBLAZE0_HW_VER) ) | 9 | CPU_VER := $(shell echo $(CONFIG_XILINX_MICROBLAZE0_HW_VER)) |
10 | CPU_MAJOR=$(shell echo $(CPU_VER) | cut -d '.' -f 1) | 10 | CPU_MAJOR := $(shell echo $(CPU_VER) | cut -d '.' -f 1) |
11 | CPU_MINOR=$(shell echo $(CPU_VER) | cut -d '.' -f 2) | 11 | CPU_MINOR := $(shell echo $(CPU_VER) | cut -d '.' -f 2) |
12 | CPU_REV=$(shell echo $(CPU_VER) | cut -d '.' -f 3) | 12 | CPU_REV := $(shell echo $(CPU_VER) | cut -d '.' -f 3) |
13 | 13 | ||
14 | export CPU_VER CPU_MAJOR CPU_MINOR CPU_REV | 14 | export CPU_VER CPU_MAJOR CPU_MINOR CPU_REV |
15 | 15 | ||
16 | # Use cpu-related CONFIG_ vars to set compile options. | 16 | # Use cpu-related CONFIG_ vars to set compile options. |
17 | # The various CONFIG_XILINX cpu features options are integers 0/1/2... | ||
18 | # rather than bools y/n | ||
17 | 19 | ||
18 | # Work out HW multipler support. This is icky. | 20 | # Work out HW multipler support. This is icky. |
19 | # 1. Spartan2 has no HW multiplers. | 21 | # 1. Spartan2 has no HW multiplers. |
@@ -34,30 +36,29 @@ CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare | |||
34 | 36 | ||
35 | CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) | 37 | CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) |
36 | 38 | ||
37 | # The various CONFIG_XILINX cpu features options are integers 0/1/2... | ||
38 | # rather than bools y/n | ||
39 | |||
40 | # r31 holds current when in kernel mode | 39 | # r31 holds current when in kernel mode |
41 | CFLAGS_KERNEL += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2) | 40 | KBUILD_KERNEL += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2) |
42 | 41 | ||
43 | LDFLAGS := | 42 | LDFLAGS := |
44 | LDFLAGS_vmlinux := | 43 | LDFLAGS_vmlinux := |
45 | LDFLAGS_BLOB := --format binary --oformat elf32-microblaze | ||
46 | 44 | ||
47 | LIBGCC := $(shell $(CC) $(CFLAGS_KERNEL) -print-libgcc-file-name) | 45 | LIBGCC := $(shell $(CC) $(KBUILD_KERNEL) -print-libgcc-file-name) |
48 | 46 | ||
49 | head-y := arch/microblaze/kernel/head.o | 47 | head-y := arch/microblaze/kernel/head.o |
50 | libs-y += arch/microblaze/lib/ $(LIBGCC) | 48 | libs-y += arch/microblaze/lib/ |
51 | core-y += arch/microblaze/kernel/ arch/microblaze/mm/ \ | 49 | libs-y += $(LIBGCC) |
52 | arch/microblaze/platform/ | 50 | core-y += arch/microblaze/kernel/ |
51 | core-y += arch/microblaze/mm/ | ||
52 | core-y += arch/microblaze/platform/ | ||
53 | 53 | ||
54 | boot := arch/$(ARCH)/boot | 54 | boot := arch/microblaze/boot |
55 | 55 | ||
56 | # defines filename extension depending memory management type | 56 | # defines filename extension depending memory management type |
57 | ifeq ($(CONFIG_MMU),) | 57 | ifeq ($(CONFIG_MMU),) |
58 | MMUEXT := -nommu | 58 | MMU := -nommu |
59 | endif | 59 | endif |
60 | export MMUEXT | 60 | |
61 | export MMU | ||
61 | 62 | ||
62 | all: linux.bin | 63 | all: linux.bin |
63 | 64 | ||
diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig index bd0b85ec38f5..09c32962b66f 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.30-rc6 | 3 | # Linux kernel version: 2.6.31-rc6 |
4 | # Fri May 22 10:02:33 2009 | 4 | # Tue Aug 18 11:00:02 2009 |
5 | # | 5 | # |
6 | CONFIG_MICROBLAZE=y | 6 | CONFIG_MICROBLAZE=y |
7 | # CONFIG_SWAP is not set | 7 | # CONFIG_SWAP is not set |
@@ -18,7 +18,11 @@ CONFIG_GENERIC_TIME=y | |||
18 | CONFIG_GENERIC_CLOCKEVENTS=y | 18 | 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 | ||
22 | # CONFIG_PCI is not set | ||
23 | CONFIG_NO_DMA=y | ||
21 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
25 | CONFIG_CONSTRUCTORS=y | ||
22 | 26 | ||
23 | # | 27 | # |
24 | # General setup | 28 | # General setup |
@@ -59,8 +63,8 @@ CONFIG_INITRAMFS_ROOT_GID=0 | |||
59 | CONFIG_RD_GZIP=y | 63 | CONFIG_RD_GZIP=y |
60 | # CONFIG_RD_BZIP2 is not set | 64 | # CONFIG_RD_BZIP2 is not set |
61 | # CONFIG_RD_LZMA is not set | 65 | # CONFIG_RD_LZMA is not set |
62 | CONFIG_INITRAMFS_COMPRESSION_NONE=y | 66 | # CONFIG_INITRAMFS_COMPRESSION_NONE is not set |
63 | # CONFIG_INITRAMFS_COMPRESSION_GZIP is not set | 67 | CONFIG_INITRAMFS_COMPRESSION_GZIP=y |
64 | # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set | 68 | # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set |
65 | # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set | 69 | # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set |
66 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 70 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -71,7 +75,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
71 | CONFIG_KALLSYMS=y | 75 | CONFIG_KALLSYMS=y |
72 | CONFIG_KALLSYMS_ALL=y | 76 | CONFIG_KALLSYMS_ALL=y |
73 | CONFIG_KALLSYMS_EXTRA_PASS=y | 77 | CONFIG_KALLSYMS_EXTRA_PASS=y |
74 | # CONFIG_STRIP_ASM_SYMS is not set | ||
75 | # CONFIG_HOTPLUG is not set | 78 | # CONFIG_HOTPLUG is not set |
76 | CONFIG_PRINTK=y | 79 | CONFIG_PRINTK=y |
77 | CONFIG_BUG=y | 80 | CONFIG_BUG=y |
@@ -84,13 +87,22 @@ CONFIG_TIMERFD=y | |||
84 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
85 | # CONFIG_SHMEM is not set | 88 | # CONFIG_SHMEM is not set |
86 | CONFIG_AIO=y | 89 | CONFIG_AIO=y |
90 | |||
91 | # | ||
92 | # Performance Counters | ||
93 | # | ||
87 | CONFIG_VM_EVENT_COUNTERS=y | 94 | CONFIG_VM_EVENT_COUNTERS=y |
95 | # CONFIG_STRIP_ASM_SYMS is not set | ||
88 | CONFIG_COMPAT_BRK=y | 96 | CONFIG_COMPAT_BRK=y |
89 | CONFIG_SLAB=y | 97 | CONFIG_SLAB=y |
90 | # CONFIG_SLUB is not set | 98 | # CONFIG_SLUB is not set |
91 | # CONFIG_SLOB is not set | 99 | # CONFIG_SLOB is not set |
92 | # CONFIG_PROFILING is not set | 100 | # CONFIG_PROFILING is not set |
93 | # CONFIG_MARKERS is not set | 101 | # CONFIG_MARKERS is not set |
102 | |||
103 | # | ||
104 | # GCOV-based kernel profiling | ||
105 | # | ||
94 | # CONFIG_SLOW_WORK is not set | 106 | # CONFIG_SLOW_WORK is not set |
95 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 107 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
96 | CONFIG_SLABINFO=y | 108 | CONFIG_SLABINFO=y |
@@ -102,7 +114,7 @@ CONFIG_MODULE_UNLOAD=y | |||
102 | # CONFIG_MODVERSIONS is not set | 114 | # CONFIG_MODVERSIONS is not set |
103 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 115 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
104 | CONFIG_BLOCK=y | 116 | CONFIG_BLOCK=y |
105 | # CONFIG_LBD is not set | 117 | CONFIG_LBDAF=y |
106 | # CONFIG_BLK_DEV_BSG is not set | 118 | # CONFIG_BLK_DEV_BSG is not set |
107 | # CONFIG_BLK_DEV_INTEGRITY is not set | 119 | # CONFIG_BLK_DEV_INTEGRITY is not set |
108 | 120 | ||
@@ -194,9 +206,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
194 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 206 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
195 | CONFIG_ZONE_DMA_FLAG=0 | 207 | CONFIG_ZONE_DMA_FLAG=0 |
196 | CONFIG_VIRT_TO_BUS=y | 208 | CONFIG_VIRT_TO_BUS=y |
197 | CONFIG_UNEVICTABLE_LRU=y | ||
198 | CONFIG_HAVE_MLOCK=y | 209 | CONFIG_HAVE_MLOCK=y |
199 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 210 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
211 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
200 | 212 | ||
201 | # | 213 | # |
202 | # Exectuable file formats | 214 | # Exectuable file formats |
@@ -262,6 +274,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
262 | # CONFIG_ECONET is not set | 274 | # CONFIG_ECONET is not set |
263 | # CONFIG_WAN_ROUTER is not set | 275 | # CONFIG_WAN_ROUTER is not set |
264 | # CONFIG_PHONET is not set | 276 | # CONFIG_PHONET is not set |
277 | # CONFIG_IEEE802154 is not set | ||
265 | # CONFIG_NET_SCHED is not set | 278 | # CONFIG_NET_SCHED is not set |
266 | # CONFIG_DCB is not set | 279 | # CONFIG_DCB is not set |
267 | 280 | ||
@@ -325,7 +338,6 @@ CONFIG_MISC_DEVICES=y | |||
325 | # CONFIG_ATA is not set | 338 | # CONFIG_ATA is not set |
326 | # CONFIG_MD is not set | 339 | # CONFIG_MD is not set |
327 | CONFIG_NETDEVICES=y | 340 | CONFIG_NETDEVICES=y |
328 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
329 | # CONFIG_DUMMY is not set | 341 | # CONFIG_DUMMY is not set |
330 | # CONFIG_BONDING is not set | 342 | # CONFIG_BONDING is not set |
331 | # CONFIG_MACVLAN is not set | 343 | # CONFIG_MACVLAN is not set |
@@ -344,7 +356,7 @@ CONFIG_NET_ETHERNET=y | |||
344 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | 356 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set |
345 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 357 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
346 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 358 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
347 | # CONFIG_B44 is not set | 359 | # CONFIG_KS8842 is not set |
348 | CONFIG_NETDEV_1000=y | 360 | CONFIG_NETDEV_1000=y |
349 | CONFIG_NETDEV_10000=y | 361 | CONFIG_NETDEV_10000=y |
350 | 362 | ||
@@ -410,6 +422,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
410 | # CONFIG_TCG_TPM is not set | 422 | # CONFIG_TCG_TPM is not set |
411 | # CONFIG_I2C is not set | 423 | # CONFIG_I2C is not set |
412 | # CONFIG_SPI is not set | 424 | # CONFIG_SPI is not set |
425 | |||
426 | # | ||
427 | # PPS support | ||
428 | # | ||
429 | # CONFIG_PPS is not set | ||
413 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 430 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
414 | # CONFIG_GPIOLIB is not set | 431 | # CONFIG_GPIOLIB is not set |
415 | # CONFIG_W1 is not set | 432 | # CONFIG_W1 is not set |
@@ -418,12 +435,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | |||
418 | # CONFIG_THERMAL is not set | 435 | # CONFIG_THERMAL is not set |
419 | # CONFIG_THERMAL_HWMON is not set | 436 | # CONFIG_THERMAL_HWMON is not set |
420 | # CONFIG_WATCHDOG is not set | 437 | # CONFIG_WATCHDOG is not set |
421 | CONFIG_SSB_POSSIBLE=y | ||
422 | |||
423 | # | ||
424 | # Sonics Silicon Backplane | ||
425 | # | ||
426 | # CONFIG_SSB is not set | ||
427 | 438 | ||
428 | # | 439 | # |
429 | # Multifunction device drivers | 440 | # Multifunction device drivers |
@@ -433,22 +444,7 @@ CONFIG_SSB_POSSIBLE=y | |||
433 | # CONFIG_HTC_PASIC3 is not set | 444 | # CONFIG_HTC_PASIC3 is not set |
434 | # CONFIG_MFD_TMIO is not set | 445 | # CONFIG_MFD_TMIO is not set |
435 | # CONFIG_REGULATOR is not set | 446 | # CONFIG_REGULATOR is not set |
436 | 447 | # CONFIG_MEDIA_SUPPORT is not set | |
437 | # | ||
438 | # Multimedia devices | ||
439 | # | ||
440 | |||
441 | # | ||
442 | # Multimedia core support | ||
443 | # | ||
444 | # CONFIG_VIDEO_DEV is not set | ||
445 | # CONFIG_DVB_CORE is not set | ||
446 | # CONFIG_VIDEO_MEDIA is not set | ||
447 | |||
448 | # | ||
449 | # Multimedia drivers | ||
450 | # | ||
451 | # CONFIG_DAB is not set | ||
452 | 448 | ||
453 | # | 449 | # |
454 | # Graphics support | 450 | # Graphics support |
@@ -469,9 +465,12 @@ CONFIG_SSB_POSSIBLE=y | |||
469 | # CONFIG_NEW_LEDS is not set | 465 | # CONFIG_NEW_LEDS is not set |
470 | # CONFIG_ACCESSIBILITY is not set | 466 | # CONFIG_ACCESSIBILITY is not set |
471 | # CONFIG_RTC_CLASS is not set | 467 | # CONFIG_RTC_CLASS is not set |
472 | # CONFIG_DMADEVICES is not set | ||
473 | # CONFIG_AUXDISPLAY is not set | 468 | # CONFIG_AUXDISPLAY is not set |
474 | # CONFIG_UIO is not set | 469 | # CONFIG_UIO is not set |
470 | |||
471 | # | ||
472 | # TI VLYNQ | ||
473 | # | ||
475 | # CONFIG_STAGING is not set | 474 | # CONFIG_STAGING is not set |
476 | 475 | ||
477 | # | 476 | # |
@@ -485,12 +484,15 @@ CONFIG_EXT2_FS=y | |||
485 | # CONFIG_REISERFS_FS is not set | 484 | # CONFIG_REISERFS_FS is not set |
486 | # CONFIG_JFS_FS is not set | 485 | # CONFIG_JFS_FS is not set |
487 | # CONFIG_FS_POSIX_ACL is not set | 486 | # CONFIG_FS_POSIX_ACL is not set |
488 | CONFIG_FILE_LOCKING=y | ||
489 | # CONFIG_XFS_FS is not set | 487 | # CONFIG_XFS_FS is not set |
488 | # CONFIG_GFS2_FS is not set | ||
490 | # CONFIG_OCFS2_FS is not set | 489 | # CONFIG_OCFS2_FS is not set |
491 | # CONFIG_BTRFS_FS is not set | 490 | # CONFIG_BTRFS_FS is not set |
491 | CONFIG_FILE_LOCKING=y | ||
492 | CONFIG_FSNOTIFY=y | ||
492 | # CONFIG_DNOTIFY is not set | 493 | # CONFIG_DNOTIFY is not set |
493 | # CONFIG_INOTIFY is not set | 494 | # CONFIG_INOTIFY is not set |
495 | CONFIG_INOTIFY_USER=y | ||
494 | # CONFIG_QUOTA is not set | 496 | # CONFIG_QUOTA is not set |
495 | # CONFIG_AUTOFS_FS is not set | 497 | # CONFIG_AUTOFS_FS is not set |
496 | # CONFIG_AUTOFS4_FS is not set | 498 | # CONFIG_AUTOFS4_FS is not set |
@@ -678,6 +680,7 @@ CONFIG_DEBUG_INFO=y | |||
678 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | 680 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set |
679 | # CONFIG_PAGE_POISONING is not set | 681 | # CONFIG_PAGE_POISONING is not set |
680 | # CONFIG_SAMPLES is not set | 682 | # CONFIG_SAMPLES is not set |
683 | # CONFIG_KMEMCHECK is not set | ||
681 | CONFIG_EARLY_PRINTK=y | 684 | CONFIG_EARLY_PRINTK=y |
682 | CONFIG_HEART_BEAT=y | 685 | CONFIG_HEART_BEAT=y |
683 | CONFIG_DEBUG_BOOTMEM=y | 686 | CONFIG_DEBUG_BOOTMEM=y |
@@ -793,6 +796,5 @@ CONFIG_ZLIB_INFLATE=y | |||
793 | CONFIG_DECOMPRESS_GZIP=y | 796 | CONFIG_DECOMPRESS_GZIP=y |
794 | CONFIG_HAS_IOMEM=y | 797 | CONFIG_HAS_IOMEM=y |
795 | CONFIG_HAS_IOPORT=y | 798 | CONFIG_HAS_IOPORT=y |
796 | CONFIG_HAS_DMA=y | ||
797 | CONFIG_HAVE_LMB=y | 799 | CONFIG_HAVE_LMB=y |
798 | CONFIG_NLATTR=y | 800 | CONFIG_NLATTR=y |
diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig index 4ef6af0a8f31..8b638615a972 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.30-rc5 | 3 | # Linux kernel version: 2.6.31-rc6 |
4 | # Mon May 11 09:01:02 2009 | 4 | # Tue Aug 18 10:35:30 2009 |
5 | # | 5 | # |
6 | CONFIG_MICROBLAZE=y | 6 | CONFIG_MICROBLAZE=y |
7 | # CONFIG_SWAP is not set | 7 | # CONFIG_SWAP is not set |
@@ -17,9 +17,12 @@ CONFIG_GENERIC_TIME=y | |||
17 | # CONFIG_GENERIC_TIME_VSYSCALL is not set | 17 | # CONFIG_GENERIC_TIME_VSYSCALL is not set |
18 | CONFIG_GENERIC_CLOCKEVENTS=y | 18 | 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 | ||
21 | CONFIG_GENERIC_CSUM=y | ||
20 | # CONFIG_PCI is not set | 22 | # CONFIG_PCI is not set |
21 | # CONFIG_NO_DMA is not set | 23 | CONFIG_NO_DMA=y |
22 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
25 | CONFIG_CONSTRUCTORS=y | ||
23 | 26 | ||
24 | # | 27 | # |
25 | # General setup | 28 | # General setup |
@@ -64,7 +67,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
64 | CONFIG_KALLSYMS=y | 67 | CONFIG_KALLSYMS=y |
65 | CONFIG_KALLSYMS_ALL=y | 68 | CONFIG_KALLSYMS_ALL=y |
66 | CONFIG_KALLSYMS_EXTRA_PASS=y | 69 | CONFIG_KALLSYMS_EXTRA_PASS=y |
67 | # CONFIG_STRIP_ASM_SYMS is not set | ||
68 | # CONFIG_HOTPLUG is not set | 70 | # CONFIG_HOTPLUG is not set |
69 | CONFIG_PRINTK=y | 71 | CONFIG_PRINTK=y |
70 | CONFIG_BUG=y | 72 | CONFIG_BUG=y |
@@ -76,13 +78,23 @@ CONFIG_SIGNALFD=y | |||
76 | CONFIG_TIMERFD=y | 78 | CONFIG_TIMERFD=y |
77 | CONFIG_EVENTFD=y | 79 | CONFIG_EVENTFD=y |
78 | CONFIG_AIO=y | 80 | CONFIG_AIO=y |
81 | |||
82 | # | ||
83 | # Performance Counters | ||
84 | # | ||
79 | CONFIG_VM_EVENT_COUNTERS=y | 85 | CONFIG_VM_EVENT_COUNTERS=y |
86 | # CONFIG_STRIP_ASM_SYMS is not set | ||
80 | CONFIG_COMPAT_BRK=y | 87 | CONFIG_COMPAT_BRK=y |
81 | CONFIG_SLAB=y | 88 | CONFIG_SLAB=y |
82 | # CONFIG_SLUB is not set | 89 | # CONFIG_SLUB is not set |
83 | # CONFIG_SLOB is not set | 90 | # CONFIG_SLOB is not set |
84 | # CONFIG_PROFILING is not set | 91 | # CONFIG_PROFILING is not set |
85 | # CONFIG_MARKERS is not set | 92 | # CONFIG_MARKERS is not set |
93 | |||
94 | # | ||
95 | # GCOV-based kernel profiling | ||
96 | # | ||
97 | # CONFIG_GCOV_KERNEL is not set | ||
86 | # CONFIG_SLOW_WORK is not set | 98 | # CONFIG_SLOW_WORK is not set |
87 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 99 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
88 | CONFIG_SLABINFO=y | 100 | CONFIG_SLABINFO=y |
@@ -95,7 +107,7 @@ CONFIG_MODULE_UNLOAD=y | |||
95 | # CONFIG_MODVERSIONS is not set | 107 | # CONFIG_MODVERSIONS is not set |
96 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 108 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
97 | CONFIG_BLOCK=y | 109 | CONFIG_BLOCK=y |
98 | # CONFIG_LBD is not set | 110 | CONFIG_LBDAF=y |
99 | # CONFIG_BLK_DEV_BSG is not set | 111 | # CONFIG_BLK_DEV_BSG is not set |
100 | # CONFIG_BLK_DEV_INTEGRITY is not set | 112 | # CONFIG_BLK_DEV_INTEGRITY is not set |
101 | 113 | ||
@@ -156,8 +168,16 @@ CONFIG_CMDLINE_BOOL=y | |||
156 | CONFIG_CMDLINE="console=ttyUL0,115200" | 168 | CONFIG_CMDLINE="console=ttyUL0,115200" |
157 | # CONFIG_CMDLINE_FORCE is not set | 169 | # CONFIG_CMDLINE_FORCE is not set |
158 | CONFIG_OF=y | 170 | CONFIG_OF=y |
159 | CONFIG_OF_DEVICE=y | ||
160 | CONFIG_PROC_DEVICETREE=y | 171 | CONFIG_PROC_DEVICETREE=y |
172 | |||
173 | # | ||
174 | # Advanced setup | ||
175 | # | ||
176 | |||
177 | # | ||
178 | # Default settings for advanced configuration options are used | ||
179 | # | ||
180 | CONFIG_KERNEL_START=0x90000000 | ||
161 | CONFIG_SELECT_MEMORY_MODEL=y | 181 | CONFIG_SELECT_MEMORY_MODEL=y |
162 | CONFIG_FLATMEM_MANUAL=y | 182 | CONFIG_FLATMEM_MANUAL=y |
163 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 183 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -169,7 +189,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
169 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 189 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
170 | CONFIG_ZONE_DMA_FLAG=0 | 190 | CONFIG_ZONE_DMA_FLAG=0 |
171 | CONFIG_VIRT_TO_BUS=y | 191 | CONFIG_VIRT_TO_BUS=y |
172 | CONFIG_UNEVICTABLE_LRU=y | 192 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
173 | CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 | 193 | CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 |
174 | 194 | ||
175 | # | 195 | # |
@@ -237,6 +257,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
237 | # CONFIG_ECONET is not set | 257 | # CONFIG_ECONET is not set |
238 | # CONFIG_WAN_ROUTER is not set | 258 | # CONFIG_WAN_ROUTER is not set |
239 | # CONFIG_PHONET is not set | 259 | # CONFIG_PHONET is not set |
260 | # CONFIG_IEEE802154 is not set | ||
240 | # CONFIG_NET_SCHED is not set | 261 | # CONFIG_NET_SCHED is not set |
241 | # CONFIG_DCB is not set | 262 | # CONFIG_DCB is not set |
242 | 263 | ||
@@ -254,7 +275,11 @@ CONFIG_WIRELESS=y | |||
254 | CONFIG_WIRELESS_OLD_REGULATORY=y | 275 | CONFIG_WIRELESS_OLD_REGULATORY=y |
255 | # CONFIG_WIRELESS_EXT is not set | 276 | # CONFIG_WIRELESS_EXT is not set |
256 | # CONFIG_LIB80211 is not set | 277 | # CONFIG_LIB80211 is not set |
257 | # CONFIG_MAC80211 is not set | 278 | |
279 | # | ||
280 | # CFG80211 needs to be enabled for MAC80211 | ||
281 | # | ||
282 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
258 | # CONFIG_WIMAX is not set | 283 | # CONFIG_WIMAX is not set |
259 | # CONFIG_RFKILL is not set | 284 | # CONFIG_RFKILL is not set |
260 | # CONFIG_NET_9P is not set | 285 | # CONFIG_NET_9P is not set |
@@ -353,6 +378,7 @@ CONFIG_MTD_UCLINUX=y | |||
353 | # UBI - Unsorted block images | 378 | # UBI - Unsorted block images |
354 | # | 379 | # |
355 | # CONFIG_MTD_UBI is not set | 380 | # CONFIG_MTD_UBI is not set |
381 | CONFIG_OF_DEVICE=y | ||
356 | # CONFIG_PARPORT is not set | 382 | # CONFIG_PARPORT is not set |
357 | CONFIG_BLK_DEV=y | 383 | CONFIG_BLK_DEV=y |
358 | # CONFIG_BLK_DEV_COW_COMMON is not set | 384 | # CONFIG_BLK_DEV_COW_COMMON is not set |
@@ -364,6 +390,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
364 | # CONFIG_BLK_DEV_XIP is not set | 390 | # CONFIG_BLK_DEV_XIP is not set |
365 | # CONFIG_CDROM_PKTCDVD is not set | 391 | # CONFIG_CDROM_PKTCDVD is not set |
366 | # CONFIG_ATA_OVER_ETH is not set | 392 | # CONFIG_ATA_OVER_ETH is not set |
393 | # CONFIG_XILINX_SYSACE is not set | ||
367 | CONFIG_MISC_DEVICES=y | 394 | CONFIG_MISC_DEVICES=y |
368 | # CONFIG_ENCLOSURE_SERVICES is not set | 395 | # CONFIG_ENCLOSURE_SERVICES is not set |
369 | # CONFIG_C2PORT is not set | 396 | # CONFIG_C2PORT is not set |
@@ -383,7 +410,6 @@ CONFIG_MISC_DEVICES=y | |||
383 | # CONFIG_ATA is not set | 410 | # CONFIG_ATA is not set |
384 | # CONFIG_MD is not set | 411 | # CONFIG_MD is not set |
385 | CONFIG_NETDEVICES=y | 412 | CONFIG_NETDEVICES=y |
386 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
387 | # CONFIG_DUMMY is not set | 413 | # CONFIG_DUMMY is not set |
388 | # CONFIG_BONDING is not set | 414 | # CONFIG_BONDING is not set |
389 | # CONFIG_MACVLAN is not set | 415 | # CONFIG_MACVLAN is not set |
@@ -402,7 +428,7 @@ CONFIG_NET_ETHERNET=y | |||
402 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | 428 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set |
403 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 429 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
404 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 430 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
405 | # CONFIG_B44 is not set | 431 | # CONFIG_KS8842 is not set |
406 | CONFIG_NETDEV_1000=y | 432 | CONFIG_NETDEV_1000=y |
407 | CONFIG_NETDEV_10000=y | 433 | CONFIG_NETDEV_10000=y |
408 | 434 | ||
@@ -463,23 +489,25 @@ CONFIG_HW_RANDOM=y | |||
463 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | 489 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set |
464 | # CONFIG_RTC is not set | 490 | # CONFIG_RTC is not set |
465 | # CONFIG_GEN_RTC is not set | 491 | # CONFIG_GEN_RTC is not set |
492 | # CONFIG_XILINX_HWICAP is not set | ||
466 | # CONFIG_R3964 is not set | 493 | # CONFIG_R3964 is not set |
467 | # CONFIG_RAW_DRIVER is not set | 494 | # CONFIG_RAW_DRIVER is not set |
468 | # CONFIG_TCG_TPM is not set | 495 | # CONFIG_TCG_TPM is not set |
469 | # CONFIG_I2C is not set | 496 | # CONFIG_I2C is not set |
470 | # CONFIG_SPI is not set | 497 | # CONFIG_SPI is not set |
498 | |||
499 | # | ||
500 | # PPS support | ||
501 | # | ||
502 | # CONFIG_PPS is not set | ||
503 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
504 | # CONFIG_GPIOLIB is not set | ||
471 | # CONFIG_W1 is not set | 505 | # CONFIG_W1 is not set |
472 | # CONFIG_POWER_SUPPLY is not set | 506 | # CONFIG_POWER_SUPPLY is not set |
473 | # CONFIG_HWMON is not set | 507 | # CONFIG_HWMON is not set |
474 | # CONFIG_THERMAL is not set | 508 | # CONFIG_THERMAL is not set |
475 | # CONFIG_THERMAL_HWMON is not set | 509 | # CONFIG_THERMAL_HWMON is not set |
476 | # CONFIG_WATCHDOG is not set | 510 | # CONFIG_WATCHDOG is not set |
477 | CONFIG_SSB_POSSIBLE=y | ||
478 | |||
479 | # | ||
480 | # Sonics Silicon Backplane | ||
481 | # | ||
482 | # CONFIG_SSB is not set | ||
483 | 511 | ||
484 | # | 512 | # |
485 | # Multifunction device drivers | 513 | # Multifunction device drivers |
@@ -489,22 +517,7 @@ CONFIG_SSB_POSSIBLE=y | |||
489 | # CONFIG_HTC_PASIC3 is not set | 517 | # CONFIG_HTC_PASIC3 is not set |
490 | # CONFIG_MFD_TMIO is not set | 518 | # CONFIG_MFD_TMIO is not set |
491 | # CONFIG_REGULATOR is not set | 519 | # CONFIG_REGULATOR is not set |
492 | 520 | # CONFIG_MEDIA_SUPPORT is not set | |
493 | # | ||
494 | # Multimedia devices | ||
495 | # | ||
496 | |||
497 | # | ||
498 | # Multimedia core support | ||
499 | # | ||
500 | # CONFIG_VIDEO_DEV is not set | ||
501 | # CONFIG_DVB_CORE is not set | ||
502 | # CONFIG_VIDEO_MEDIA is not set | ||
503 | |||
504 | # | ||
505 | # Multimedia drivers | ||
506 | # | ||
507 | CONFIG_DAB=y | ||
508 | 521 | ||
509 | # | 522 | # |
510 | # Graphics support | 523 | # Graphics support |
@@ -520,9 +533,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
520 | # CONFIG_DISPLAY_SUPPORT is not set | 533 | # CONFIG_DISPLAY_SUPPORT is not set |
521 | # CONFIG_SOUND is not set | 534 | # CONFIG_SOUND is not set |
522 | CONFIG_USB_SUPPORT=y | 535 | CONFIG_USB_SUPPORT=y |
523 | # CONFIG_USB_ARCH_HAS_HCD is not set | 536 | CONFIG_USB_ARCH_HAS_HCD=y |
524 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 537 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
525 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 538 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
539 | # CONFIG_USB is not set | ||
526 | # CONFIG_USB_OTG_WHITELIST is not set | 540 | # CONFIG_USB_OTG_WHITELIST is not set |
527 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 541 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
528 | 542 | ||
@@ -543,9 +557,12 @@ CONFIG_USB_SUPPORT=y | |||
543 | # CONFIG_NEW_LEDS is not set | 557 | # CONFIG_NEW_LEDS is not set |
544 | # CONFIG_ACCESSIBILITY is not set | 558 | # CONFIG_ACCESSIBILITY is not set |
545 | # CONFIG_RTC_CLASS is not set | 559 | # CONFIG_RTC_CLASS is not set |
546 | # CONFIG_DMADEVICES is not set | ||
547 | # CONFIG_AUXDISPLAY is not set | 560 | # CONFIG_AUXDISPLAY is not set |
548 | # CONFIG_UIO is not set | 561 | # CONFIG_UIO is not set |
562 | |||
563 | # | ||
564 | # TI VLYNQ | ||
565 | # | ||
549 | # CONFIG_STAGING is not set | 566 | # CONFIG_STAGING is not set |
550 | 567 | ||
551 | # | 568 | # |
@@ -558,12 +575,15 @@ CONFIG_EXT2_FS=y | |||
558 | # CONFIG_REISERFS_FS is not set | 575 | # CONFIG_REISERFS_FS is not set |
559 | # CONFIG_JFS_FS is not set | 576 | # CONFIG_JFS_FS is not set |
560 | CONFIG_FS_POSIX_ACL=y | 577 | CONFIG_FS_POSIX_ACL=y |
561 | CONFIG_FILE_LOCKING=y | ||
562 | # CONFIG_XFS_FS is not set | 578 | # CONFIG_XFS_FS is not set |
579 | # CONFIG_GFS2_FS is not set | ||
563 | # CONFIG_OCFS2_FS is not set | 580 | # CONFIG_OCFS2_FS is not set |
564 | # CONFIG_BTRFS_FS is not set | 581 | # CONFIG_BTRFS_FS is not set |
582 | CONFIG_FILE_LOCKING=y | ||
583 | CONFIG_FSNOTIFY=y | ||
565 | # CONFIG_DNOTIFY is not set | 584 | # CONFIG_DNOTIFY is not set |
566 | # CONFIG_INOTIFY is not set | 585 | # CONFIG_INOTIFY is not set |
586 | CONFIG_INOTIFY_USER=y | ||
567 | # CONFIG_QUOTA is not set | 587 | # CONFIG_QUOTA is not set |
568 | # CONFIG_AUTOFS_FS is not set | 588 | # CONFIG_AUTOFS_FS is not set |
569 | # CONFIG_AUTOFS4_FS is not set | 589 | # CONFIG_AUTOFS4_FS is not set |
@@ -813,6 +833,5 @@ CONFIG_GENERIC_FIND_LAST_BIT=y | |||
813 | CONFIG_ZLIB_INFLATE=y | 833 | CONFIG_ZLIB_INFLATE=y |
814 | CONFIG_HAS_IOMEM=y | 834 | CONFIG_HAS_IOMEM=y |
815 | CONFIG_HAS_IOPORT=y | 835 | CONFIG_HAS_IOPORT=y |
816 | CONFIG_HAS_DMA=y | ||
817 | CONFIG_HAVE_LMB=y | 836 | CONFIG_HAVE_LMB=y |
818 | CONFIG_NLATTR=y | 837 | CONFIG_NLATTR=y |
diff --git a/arch/microblaze/include/asm/hardirq.h b/arch/microblaze/include/asm/hardirq.h index 41e1e1aa36ac..cd1ac9aad56c 100644 --- a/arch/microblaze/include/asm/hardirq.h +++ b/arch/microblaze/include/asm/hardirq.h | |||
@@ -12,8 +12,6 @@ | |||
12 | /* should be defined in each interrupt controller driver */ | 12 | /* should be defined in each interrupt controller driver */ |
13 | extern unsigned int get_irq(struct pt_regs *regs); | 13 | extern unsigned int get_irq(struct pt_regs *regs); |
14 | 14 | ||
15 | #define ack_bad_irq ack_bad_irq | ||
16 | void ack_bad_irq(unsigned int irq); | ||
17 | #include <asm-generic/hardirq.h> | 15 | #include <asm-generic/hardirq.h> |
18 | 16 | ||
19 | #endif /* _ASM_MICROBLAZE_HARDIRQ_H */ | 17 | #endif /* _ASM_MICROBLAZE_HARDIRQ_H */ |
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 5c173424d074..7c3ec13b44d8 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <asm/byteorder.h> | 14 | #include <asm/byteorder.h> |
15 | #include <asm/page.h> | 15 | #include <asm/page.h> |
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <asm/byteorder.h> | ||
18 | #include <linux/mm.h> /* Get struct page {...} */ | 17 | #include <linux/mm.h> /* Get struct page {...} */ |
19 | 18 | ||
20 | 19 | ||
diff --git a/arch/microblaze/include/asm/pgalloc.h b/arch/microblaze/include/asm/pgalloc.h index 59a757e46ba5..b0131da1387b 100644 --- a/arch/microblaze/include/asm/pgalloc.h +++ b/arch/microblaze/include/asm/pgalloc.h | |||
@@ -180,7 +180,7 @@ extern inline void pte_free(struct mm_struct *mm, struct page *ptepage) | |||
180 | __free_page(ptepage); | 180 | __free_page(ptepage); |
181 | } | 181 | } |
182 | 182 | ||
183 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte)) | 183 | #define __pte_free_tlb(tlb, pte, addr) pte_free((tlb)->mm, (pte)) |
184 | 184 | ||
185 | #define pmd_populate(mm, pmd, pte) (pmd_val(*(pmd)) = page_address(pte)) | 185 | #define pmd_populate(mm, pmd, pte) (pmd_val(*(pmd)) = page_address(pte)) |
186 | 186 | ||
@@ -193,7 +193,7 @@ extern inline void pte_free(struct mm_struct *mm, struct page *ptepage) | |||
193 | */ | 193 | */ |
194 | #define pmd_alloc_one(mm, address) ({ BUG(); ((pmd_t *)2); }) | 194 | #define pmd_alloc_one(mm, address) ({ BUG(); ((pmd_t *)2); }) |
195 | /*#define pmd_free(mm, x) do { } while (0)*/ | 195 | /*#define pmd_free(mm, x) do { } while (0)*/ |
196 | #define __pmd_free_tlb(tlb, x) do { } while (0) | 196 | #define __pmd_free_tlb(tlb, x, addr) do { } while (0) |
197 | #define pgd_populate(mm, pmd, pte) BUG() | 197 | #define pgd_populate(mm, pmd, pte) BUG() |
198 | 198 | ||
199 | extern int do_check_pgt_cache(int, int); | 199 | extern int do_check_pgt_cache(int, int); |
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index 4c57a586a989..cc3a4dfc3eaa 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h | |||
@@ -185,6 +185,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } | |||
185 | 185 | ||
186 | /* Definitions for MicroBlaze. */ | 186 | /* Definitions for MicroBlaze. */ |
187 | #define _PAGE_GUARDED 0x001 /* G: page is guarded from prefetch */ | 187 | #define _PAGE_GUARDED 0x001 /* G: page is guarded from prefetch */ |
188 | #define _PAGE_FILE 0x001 /* when !present: nonlinear file mapping */ | ||
188 | #define _PAGE_PRESENT 0x002 /* software: PTE contains a translation */ | 189 | #define _PAGE_PRESENT 0x002 /* software: PTE contains a translation */ |
189 | #define _PAGE_NO_CACHE 0x004 /* I: caching is inhibited */ | 190 | #define _PAGE_NO_CACHE 0x004 /* I: caching is inhibited */ |
190 | #define _PAGE_WRITETHRU 0x008 /* W: caching is write-through */ | 191 | #define _PAGE_WRITETHRU 0x008 /* W: caching is write-through */ |
@@ -320,8 +321,7 @@ static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW; } | |||
320 | static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXEC; } | 321 | static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXEC; } |
321 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } | 322 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } |
322 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } | 323 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } |
323 | /* FIXME */ | 324 | static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } |
324 | static inline int pte_file(pte_t pte) { return 0; } | ||
325 | 325 | ||
326 | static inline void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; } | 326 | static inline void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; } |
327 | static inline void pte_cache(pte_t pte) { pte_val(pte) &= ~_PAGE_NO_CACHE; } | 327 | static inline void pte_cache(pte_t pte) { pte_val(pte) &= ~_PAGE_NO_CACHE; } |
@@ -488,7 +488,7 @@ static inline pmd_t *pmd_offset(pgd_t *dir, unsigned long address) | |||
488 | /* Encode and decode a nonlinear file mapping entry */ | 488 | /* Encode and decode a nonlinear file mapping entry */ |
489 | #define PTE_FILE_MAX_BITS 29 | 489 | #define PTE_FILE_MAX_BITS 29 |
490 | #define pte_to_pgoff(pte) (pte_val(pte) >> 3) | 490 | #define pte_to_pgoff(pte) (pte_val(pte) >> 3) |
491 | #define pgoff_to_pte(off) ((pte_t) { ((off) << 3) }) | 491 | #define pgoff_to_pte(off) ((pte_t) { ((off) << 3) | _PAGE_FILE }) |
492 | 492 | ||
493 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | 493 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
494 | 494 | ||
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 20f7b3a926e8..37e6f305a68e 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -16,6 +16,18 @@ | |||
16 | #define _ASM_MICROBLAZE_PROM_H | 16 | #define _ASM_MICROBLAZE_PROM_H |
17 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |
18 | 18 | ||
19 | /* Definitions used by the flattened device tree */ | ||
20 | #define OF_DT_HEADER 0xd00dfeed /* marker */ | ||
21 | #define OF_DT_BEGIN_NODE 0x1 /* Start of node, full name */ | ||
22 | #define OF_DT_END_NODE 0x2 /* End node */ | ||
23 | #define OF_DT_PROP 0x3 /* Property: name off, size, content */ | ||
24 | #define OF_DT_NOP 0x4 /* nop */ | ||
25 | #define OF_DT_END 0x9 | ||
26 | |||
27 | #define OF_DT_VERSION 0x10 | ||
28 | |||
29 | #ifndef __ASSEMBLY__ | ||
30 | |||
19 | #include <linux/types.h> | 31 | #include <linux/types.h> |
20 | #include <linux/proc_fs.h> | 32 | #include <linux/proc_fs.h> |
21 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
@@ -29,16 +41,6 @@ | |||
29 | #define of_prop_cmp(s1, s2) strcmp((s1), (s2)) | 41 | #define of_prop_cmp(s1, s2) strcmp((s1), (s2)) |
30 | #define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) | 42 | #define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) |
31 | 43 | ||
32 | /* Definitions used by the flattened device tree */ | ||
33 | #define OF_DT_HEADER 0xd00dfeed /* marker */ | ||
34 | #define OF_DT_BEGIN_NODE 0x1 /* Start of node, full name */ | ||
35 | #define OF_DT_END_NODE 0x2 /* End node */ | ||
36 | #define OF_DT_PROP 0x3 /* Property: name off, size, content */ | ||
37 | #define OF_DT_NOP 0x4 /* nop */ | ||
38 | #define OF_DT_END 0x9 | ||
39 | |||
40 | #define OF_DT_VERSION 0x10 | ||
41 | |||
42 | /* | 44 | /* |
43 | * This is what gets passed to the kernel by prom_init or kexec | 45 | * This is what gets passed to the kernel by prom_init or kexec |
44 | * | 46 | * |
@@ -309,5 +311,6 @@ extern void __iomem *of_iomap(struct device_node *device, int index); | |||
309 | */ | 311 | */ |
310 | #include <linux/of.h> | 312 | #include <linux/of.h> |
311 | 313 | ||
314 | #endif /* __ASSEMBLY__ */ | ||
312 | #endif /* __KERNEL__ */ | 315 | #endif /* __KERNEL__ */ |
313 | #endif /* _ASM_MICROBLAZE_PROM_H */ | 316 | #endif /* _ASM_MICROBLAZE_PROM_H */ |
diff --git a/arch/microblaze/include/asm/tlb.h b/arch/microblaze/include/asm/tlb.h index c472d2801132..e8abd4a0349c 100644 --- a/arch/microblaze/include/asm/tlb.h +++ b/arch/microblaze/include/asm/tlb.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef _ASM_MICROBLAZE_TLB_H | 11 | #ifndef _ASM_MICROBLAZE_TLB_H |
12 | #define _ASM_MICROBLAZE_TLB_H | 12 | #define _ASM_MICROBLAZE_TLB_H |
13 | 13 | ||
14 | #define tlb_flush(tlb) do {} while (0) | 14 | #define tlb_flush(tlb) flush_tlb_mm((tlb)->mm) |
15 | 15 | ||
16 | #include <asm-generic/tlb.h> | 16 | #include <asm-generic/tlb.h> |
17 | 17 | ||
diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h index 65adad61e7e9..5431b4631a7a 100644 --- a/arch/microblaze/include/asm/uaccess.h +++ b/arch/microblaze/include/asm/uaccess.h | |||
@@ -189,7 +189,7 @@ extern long strnlen_user(const char *src, long count); | |||
189 | 189 | ||
190 | #define __put_user(x, ptr) \ | 190 | #define __put_user(x, ptr) \ |
191 | ({ \ | 191 | ({ \ |
192 | __typeof__(*(ptr)) __gu_val = x; \ | 192 | __typeof__(*(ptr)) volatile __gu_val = (x); \ |
193 | long __gu_err = 0; \ | 193 | long __gu_err = 0; \ |
194 | switch (sizeof(__gu_val)) { \ | 194 | switch (sizeof(__gu_val)) { \ |
195 | case 1: \ | 195 | case 1: \ |
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile index f4a5e19a20eb..d487729683de 100644 --- a/arch/microblaze/kernel/Makefile +++ b/arch/microblaze/kernel/Makefile | |||
@@ -17,4 +17,4 @@ obj-$(CONFIG_HEART_BEAT) += heartbeat.o | |||
17 | obj-$(CONFIG_MODULES) += microblaze_ksyms.o module.o | 17 | obj-$(CONFIG_MODULES) += microblaze_ksyms.o module.o |
18 | obj-$(CONFIG_MMU) += misc.o | 18 | obj-$(CONFIG_MMU) += misc.o |
19 | 19 | ||
20 | obj-y += entry$(MMUEXT).o | 20 | obj-y += entry$(MMU).o |
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c index 153f57c57b6d..c259786e7faa 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #define CI(c, p) { ci->c = PVR_##p(pvr); } | 23 | #define CI(c, p) { ci->c = PVR_##p(pvr); } |
24 | #define err_printk(x) \ | 24 | #define err_printk(x) \ |
25 | early_printk("ERROR: Microblaze " x " - different for PVR and DTS\n"); | 25 | early_printk("ERROR: Microblaze " x "-different for PVR and DTS\n"); |
26 | 26 | ||
27 | void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu) | 27 | void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu) |
28 | { | 28 | { |
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-static.c b/arch/microblaze/kernel/cpu/cpuinfo-static.c index 450ca6bb828d..adb448f93d5f 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-static.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c | |||
@@ -18,7 +18,7 @@ static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; | |||
18 | static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; | 18 | static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; |
19 | 19 | ||
20 | #define err_printk(x) \ | 20 | #define err_printk(x) \ |
21 | early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n"); | 21 | early_printk("ERROR: Microblaze " x "-different for kernel and DTS\n"); |
22 | 22 | ||
23 | void __init set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu) | 23 | void __init set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu) |
24 | { | 24 | { |
diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c index a10bea119b94..c411c6757deb 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo.c +++ b/arch/microblaze/kernel/cpu/cpuinfo.c | |||
@@ -26,6 +26,8 @@ const struct cpu_ver_key cpu_ver_lookup[] = { | |||
26 | {"7.10.b", 0x09}, | 26 | {"7.10.b", 0x09}, |
27 | {"7.10.c", 0x0a}, | 27 | {"7.10.c", 0x0a}, |
28 | {"7.10.d", 0x0b}, | 28 | {"7.10.d", 0x0b}, |
29 | {"7.20.a", 0x0c}, | ||
30 | {"7.20.b", 0x0d}, | ||
29 | /* FIXME There is no keycode defined in MBV for these versions */ | 31 | /* FIXME There is no keycode defined in MBV for these versions */ |
30 | {"2.10.a", 0x10}, | 32 | {"2.10.a", 0x10}, |
31 | {"3.00.a", 0x20}, | 33 | {"3.00.a", 0x20}, |
diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S index e568d6ec621b..e41c6ce2a7be 100644 --- a/arch/microblaze/kernel/head.S +++ b/arch/microblaze/kernel/head.S | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/linkage.h> | 31 | #include <linux/linkage.h> |
32 | #include <asm/thread_info.h> | 32 | #include <asm/thread_info.h> |
33 | #include <asm/page.h> | 33 | #include <asm/page.h> |
34 | #include <asm/prom.h> /* for OF_DT_HEADER */ | ||
34 | 35 | ||
35 | #ifdef CONFIG_MMU | 36 | #ifdef CONFIG_MMU |
36 | #include <asm/setup.h> /* COMMAND_LINE_SIZE */ | 37 | #include <asm/setup.h> /* COMMAND_LINE_SIZE */ |
@@ -54,11 +55,19 @@ ENTRY(_start) | |||
54 | andi r1, r1, ~2 | 55 | andi r1, r1, ~2 |
55 | mts rmsr, r1 | 56 | mts rmsr, r1 |
56 | 57 | ||
57 | /* save fdt to kernel location */ | 58 | /* r7 may point to an FDT, or there may be one linked in. |
58 | /* r7 stores pointer to fdt blob */ | 59 | if it's in r7, we've got to save it away ASAP. |
59 | beqi r7, no_fdt_arg | 60 | We ensure r7 points to a valid FDT, just in case the bootloader |
61 | is broken or non-existent */ | ||
62 | beqi r7, no_fdt_arg /* NULL pointer? don't copy */ | ||
63 | lw r11, r0, r7 /* Does r7 point to a */ | ||
64 | rsubi r11, r11, OF_DT_HEADER /* valid FDT? */ | ||
65 | beqi r11, _prepare_copy_fdt | ||
66 | or r7, r0, r0 /* clear R7 when not valid DTB */ | ||
67 | bnei r11, no_fdt_arg /* No - get out of here */ | ||
68 | _prepare_copy_fdt: | ||
60 | or r11, r0, r0 /* incremment */ | 69 | or r11, r0, r0 /* incremment */ |
61 | ori r4, r0, TOPHYS(_fdt_start) /* save bram context */ | 70 | ori r4, r0, TOPHYS(_fdt_start) |
62 | ori r3, r0, (0x4000 - 4) | 71 | ori r3, r0, (0x4000 - 4) |
63 | _copy_fdt: | 72 | _copy_fdt: |
64 | lw r12, r7, r11 /* r12 = r7 + r11 */ | 73 | lw r12, r7, r11 /* r12 = r7 + r11 */ |
diff --git a/arch/microblaze/kernel/hw_exception_handler.S b/arch/microblaze/kernel/hw_exception_handler.S index 9d591cd74fc2..3288c9737671 100644 --- a/arch/microblaze/kernel/hw_exception_handler.S +++ b/arch/microblaze/kernel/hw_exception_handler.S | |||
@@ -74,6 +74,7 @@ | |||
74 | 74 | ||
75 | #include <asm/mmu.h> | 75 | #include <asm/mmu.h> |
76 | #include <asm/pgtable.h> | 76 | #include <asm/pgtable.h> |
77 | #include <asm/signal.h> | ||
77 | #include <asm/asm-offsets.h> | 78 | #include <asm/asm-offsets.h> |
78 | 79 | ||
79 | /* Helpful Macros */ | 80 | /* Helpful Macros */ |
@@ -428,19 +429,9 @@ handle_unaligned_ex: | |||
428 | mfs r17, rbtr; /* ESR[DS] set - return address in BTR */ | 429 | mfs r17, rbtr; /* ESR[DS] set - return address in BTR */ |
429 | nop | 430 | nop |
430 | _no_delayslot: | 431 | _no_delayslot: |
431 | #endif | 432 | /* jump to high level unaligned handler */ |
432 | 433 | RESTORE_STATE; | |
433 | #ifdef CONFIG_MMU | 434 | bri unaligned_data_trap |
434 | /* Check if unaligned address is last on a 4k page */ | ||
435 | andi r5, r4, 0xffc | ||
436 | xori r5, r5, 0xffc | ||
437 | bnei r5, _unaligned_ex2 | ||
438 | _unaligned_ex1: | ||
439 | RESTORE_STATE; | ||
440 | /* Another page must be accessed or physical address not in page table */ | ||
441 | bri unaligned_data_trap | ||
442 | |||
443 | _unaligned_ex2: | ||
444 | #endif | 435 | #endif |
445 | andi r6, r3, 0x3E0; /* Mask and extract the register operand */ | 436 | andi r6, r3, 0x3E0; /* Mask and extract the register operand */ |
446 | srl r6, r6; /* r6 >> 5 */ | 437 | srl r6, r6; /* r6 >> 5 */ |
@@ -450,45 +441,6 @@ _no_delayslot: | |||
450 | srl r6, r6; | 441 | srl r6, r6; |
451 | /* Store the register operand in a temporary location */ | 442 | /* Store the register operand in a temporary location */ |
452 | sbi r6, r0, TOPHYS(ex_reg_op); | 443 | sbi r6, r0, TOPHYS(ex_reg_op); |
453 | #ifdef CONFIG_MMU | ||
454 | /* Get physical address */ | ||
455 | /* If we are faulting a kernel address, we have to use the | ||
456 | * kernel page tables. | ||
457 | */ | ||
458 | ori r5, r0, CONFIG_KERNEL_START | ||
459 | cmpu r5, r4, r5 | ||
460 | bgti r5, _unaligned_ex3 | ||
461 | ori r5, r0, swapper_pg_dir | ||
462 | bri _unaligned_ex4 | ||
463 | |||
464 | /* Get the PGD for the current thread. */ | ||
465 | _unaligned_ex3: /* user thread */ | ||
466 | addi r5 ,CURRENT_TASK, TOPHYS(0); /* get current task address */ | ||
467 | lwi r5, r5, TASK_THREAD + PGDIR | ||
468 | _unaligned_ex4: | ||
469 | tophys(r5,r5) | ||
470 | BSRLI(r6,r4,20) /* Create L1 (pgdir/pmd) address */ | ||
471 | andi r6, r6, 0xffc | ||
472 | /* Assume pgdir aligned on 4K boundary, no need for "andi r5,r5,0xfffff003" */ | ||
473 | or r5, r5, r6 | ||
474 | lwi r6, r5, 0 /* Get L1 entry */ | ||
475 | andi r5, r6, 0xfffff000 /* Extract L2 (pte) base address. */ | ||
476 | beqi r5, _unaligned_ex1 /* Bail if no table */ | ||
477 | |||
478 | tophys(r5,r5) | ||
479 | BSRLI(r6,r4,10) /* Compute PTE address */ | ||
480 | andi r6, r6, 0xffc | ||
481 | andi r5, r5, 0xfffff003 | ||
482 | or r5, r5, r6 | ||
483 | lwi r5, r5, 0 /* Get Linux PTE */ | ||
484 | |||
485 | andi r6, r5, _PAGE_PRESENT | ||
486 | beqi r6, _unaligned_ex1 /* Bail if no page */ | ||
487 | |||
488 | andi r5, r5, 0xfffff000 /* Extract RPN */ | ||
489 | andi r4, r4, 0x00000fff /* Extract offset */ | ||
490 | or r4, r4, r5 /* Create physical address */ | ||
491 | #endif /* CONFIG_MMU */ | ||
492 | 444 | ||
493 | andi r6, r3, 0x400; /* Extract ESR[S] */ | 445 | andi r6, r3, 0x400; /* Extract ESR[S] */ |
494 | bnei r6, ex_sw; | 446 | bnei r6, ex_sw; |
@@ -959,15 +911,15 @@ _unaligned_data_exception: | |||
959 | andi r6, r3, 0x800; /* Extract ESR[W] - delay slot */ | 911 | andi r6, r3, 0x800; /* Extract ESR[W] - delay slot */ |
960 | ex_lw_vm: | 912 | ex_lw_vm: |
961 | beqid r6, ex_lhw_vm; | 913 | beqid r6, ex_lhw_vm; |
962 | lbui r5, r4, 0; /* Exception address in r4 - delay slot */ | 914 | load1: lbui r5, r4, 0; /* Exception address in r4 - delay slot */ |
963 | /* Load a word, byte-by-byte from destination address and save it in tmp space*/ | 915 | /* Load a word, byte-by-byte from destination address and save it in tmp space*/ |
964 | la r6, r0, ex_tmp_data_loc_0; | 916 | la r6, r0, ex_tmp_data_loc_0; |
965 | sbi r5, r6, 0; | 917 | sbi r5, r6, 0; |
966 | lbui r5, r4, 1; | 918 | load2: lbui r5, r4, 1; |
967 | sbi r5, r6, 1; | 919 | sbi r5, r6, 1; |
968 | lbui r5, r4, 2; | 920 | load3: lbui r5, r4, 2; |
969 | sbi r5, r6, 2; | 921 | sbi r5, r6, 2; |
970 | lbui r5, r4, 3; | 922 | load4: lbui r5, r4, 3; |
971 | sbi r5, r6, 3; | 923 | sbi r5, r6, 3; |
972 | brid ex_lw_tail_vm; | 924 | brid ex_lw_tail_vm; |
973 | /* Get the destination register value into r3 - delay slot */ | 925 | /* Get the destination register value into r3 - delay slot */ |
@@ -977,7 +929,7 @@ ex_lhw_vm: | |||
977 | * save it in tmp space */ | 929 | * save it in tmp space */ |
978 | la r6, r0, ex_tmp_data_loc_0; | 930 | la r6, r0, ex_tmp_data_loc_0; |
979 | sbi r5, r6, 0; | 931 | sbi r5, r6, 0; |
980 | lbui r5, r4, 1; | 932 | load5: lbui r5, r4, 1; |
981 | sbi r5, r6, 1; | 933 | sbi r5, r6, 1; |
982 | lhui r3, r6, 0; /* Get the destination register value into r3 */ | 934 | lhui r3, r6, 0; /* Get the destination register value into r3 */ |
983 | ex_lw_tail_vm: | 935 | ex_lw_tail_vm: |
@@ -996,22 +948,53 @@ ex_sw_tail_vm: | |||
996 | swi r3, r5, 0; /* Get the word - delay slot */ | 948 | swi r3, r5, 0; /* Get the word - delay slot */ |
997 | /* Store the word, byte-by-byte into destination address */ | 949 | /* Store the word, byte-by-byte into destination address */ |
998 | lbui r3, r5, 0; | 950 | lbui r3, r5, 0; |
999 | sbi r3, r4, 0; | 951 | store1: sbi r3, r4, 0; |
1000 | lbui r3, r5, 1; | 952 | lbui r3, r5, 1; |
1001 | sbi r3, r4, 1; | 953 | store2: sbi r3, r4, 1; |
1002 | lbui r3, r5, 2; | 954 | lbui r3, r5, 2; |
1003 | sbi r3, r4, 2; | 955 | store3: sbi r3, r4, 2; |
1004 | lbui r3, r5, 3; | 956 | lbui r3, r5, 3; |
1005 | brid ret_from_exc; | 957 | brid ret_from_exc; |
1006 | sbi r3, r4, 3; /* Delay slot */ | 958 | store4: sbi r3, r4, 3; /* Delay slot */ |
1007 | ex_shw_vm: | 959 | ex_shw_vm: |
1008 | /* Store the lower half-word, byte-by-byte into destination address */ | 960 | /* Store the lower half-word, byte-by-byte into destination address */ |
1009 | lbui r3, r5, 2; | 961 | lbui r3, r5, 2; |
1010 | sbi r3, r4, 0; | 962 | store5: sbi r3, r4, 0; |
1011 | lbui r3, r5, 3; | 963 | lbui r3, r5, 3; |
1012 | brid ret_from_exc; | 964 | brid ret_from_exc; |
1013 | sbi r3, r4, 1; /* Delay slot */ | 965 | store6: sbi r3, r4, 1; /* Delay slot */ |
1014 | ex_sw_end_vm: /* Exception handling of store word, ends. */ | 966 | ex_sw_end_vm: /* Exception handling of store word, ends. */ |
967 | |||
968 | /* We have to prevent cases that get/put_user macros get unaligned pointer | ||
969 | * to bad page area. We have to find out which origin instruction caused it | ||
970 | * and called fixup for that origin instruction not instruction in unaligned | ||
971 | * handler */ | ||
972 | ex_unaligned_fixup: | ||
973 | ori r5, r7, 0 /* setup pointer to pt_regs */ | ||
974 | lwi r6, r7, PT_PC; /* faulting address is one instruction above */ | ||
975 | addik r6, r6, -4 /* for finding proper fixup */ | ||
976 | swi r6, r7, PT_PC; /* a save back it to PT_PC */ | ||
977 | addik r7, r0, SIGSEGV | ||
978 | /* call bad_page_fault for finding aligned fixup, fixup address is saved | ||
979 | * in PT_PC which is used as return address from exception */ | ||
980 | la r15, r0, ret_from_exc-8 /* setup return address */ | ||
981 | brid bad_page_fault | ||
982 | nop | ||
983 | |||
984 | /* We prevent all load/store because it could failed any attempt to access */ | ||
985 | .section __ex_table,"a"; | ||
986 | .word load1,ex_unaligned_fixup; | ||
987 | .word load2,ex_unaligned_fixup; | ||
988 | .word load3,ex_unaligned_fixup; | ||
989 | .word load4,ex_unaligned_fixup; | ||
990 | .word load5,ex_unaligned_fixup; | ||
991 | .word store1,ex_unaligned_fixup; | ||
992 | .word store2,ex_unaligned_fixup; | ||
993 | .word store3,ex_unaligned_fixup; | ||
994 | .word store4,ex_unaligned_fixup; | ||
995 | .word store5,ex_unaligned_fixup; | ||
996 | .word store6,ex_unaligned_fixup; | ||
997 | .previous; | ||
1015 | .end _unaligned_data_exception | 998 | .end _unaligned_data_exception |
1016 | #endif /* CONFIG_MMU */ | 999 | #endif /* CONFIG_MMU */ |
1017 | 1000 | ||
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c index b15605299a57..6eea6f92b84e 100644 --- a/arch/microblaze/kernel/intc.c +++ b/arch/microblaze/kernel/intc.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/irq.h> | 12 | #include <linux/irq.h> |
13 | #include <asm/page.h> | 13 | #include <asm/page.h> |
14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
15 | #include <linux/bug.h> | ||
15 | 16 | ||
16 | #include <asm/prom.h> | 17 | #include <asm/prom.h> |
17 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
@@ -130,6 +131,7 @@ void __init init_IRQ(void) | |||
130 | if (intc) | 131 | if (intc) |
131 | break; | 132 | break; |
132 | } | 133 | } |
134 | BUG_ON(!intc); | ||
133 | 135 | ||
134 | intc_baseaddr = *(int *) of_get_property(intc, "reg", NULL); | 136 | intc_baseaddr = *(int *) of_get_property(intc, "reg", NULL); |
135 | intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE); | 137 | intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE); |
diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c index f688ee93e3b9..7d5ddd62d4d2 100644 --- a/arch/microblaze/kernel/irq.c +++ b/arch/microblaze/kernel/irq.c | |||
@@ -30,15 +30,6 @@ unsigned int irq_of_parse_and_map(struct device_node *dev, int index) | |||
30 | } | 30 | } |
31 | EXPORT_SYMBOL_GPL(irq_of_parse_and_map); | 31 | EXPORT_SYMBOL_GPL(irq_of_parse_and_map); |
32 | 32 | ||
33 | /* | ||
34 | * 'what should we do if we get a hw irq event on an illegal vector'. | ||
35 | * each architecture has to answer this themselves. | ||
36 | */ | ||
37 | void ack_bad_irq(unsigned int irq) | ||
38 | { | ||
39 | printk(KERN_WARNING "unexpected IRQ trap at vector %02x\n", irq); | ||
40 | } | ||
41 | |||
42 | static u32 concurrent_irq; | 33 | static u32 concurrent_irq; |
43 | 34 | ||
44 | void do_IRQ(struct pt_regs *regs) | 35 | void do_IRQ(struct pt_regs *regs) |
diff --git a/arch/microblaze/kernel/module.c b/arch/microblaze/kernel/module.c index 51414171326f..5a45b1adfef1 100644 --- a/arch/microblaze/kernel/module.c +++ b/arch/microblaze/kernel/module.c | |||
@@ -57,7 +57,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, | |||
57 | Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr; | 57 | Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr; |
58 | Elf32_Sym *sym; | 58 | Elf32_Sym *sym; |
59 | unsigned long int *location; | 59 | unsigned long int *location; |
60 | unsigned long int locoffs; | ||
61 | unsigned long int value; | 60 | unsigned long int value; |
62 | #if __GNUC__ < 4 | 61 | #if __GNUC__ < 4 |
63 | unsigned long int old_value; | 62 | unsigned long int old_value; |
@@ -113,10 +112,12 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, | |||
113 | break; | 112 | break; |
114 | 113 | ||
115 | case R_MICROBLAZE_64_PCREL: | 114 | case R_MICROBLAZE_64_PCREL: |
116 | locoffs = (location[0] & 0xFFFF) << 16 | | 115 | #if __GNUC__ < 4 |
116 | old_value = (location[0] & 0xFFFF) << 16 | | ||
117 | (location[1] & 0xFFFF); | 117 | (location[1] & 0xFFFF); |
118 | value -= (unsigned long int)(location) + 4 + | 118 | value -= old_value; |
119 | locoffs; | 119 | #endif |
120 | value -= (unsigned long int)(location) + 4; | ||
120 | location[0] = (location[0] & 0xFFFF0000) | | 121 | location[0] = (location[0] & 0xFFFF0000) | |
121 | (value >> 16); | 122 | (value >> 16); |
122 | location[1] = (location[1] & 0xFFFF0000) | | 123 | location[1] = (location[1] & 0xFFFF0000) | |
@@ -125,6 +126,14 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, | |||
125 | value); | 126 | value); |
126 | break; | 127 | break; |
127 | 128 | ||
129 | case R_MICROBLAZE_32_PCREL_LO: | ||
130 | pr_debug("R_MICROBLAZE_32_PCREL_LO\n"); | ||
131 | break; | ||
132 | |||
133 | case R_MICROBLAZE_64_NONE: | ||
134 | pr_debug("R_MICROBLAZE_NONE\n"); | ||
135 | break; | ||
136 | |||
128 | case R_MICROBLAZE_NONE: | 137 | case R_MICROBLAZE_NONE: |
129 | pr_debug("R_MICROBLAZE_NONE\n"); | 138 | pr_debug("R_MICROBLAZE_NONE\n"); |
130 | break; | 139 | break; |
@@ -133,7 +142,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, | |||
133 | printk(KERN_ERR "module %s: " | 142 | printk(KERN_ERR "module %s: " |
134 | "Unknown relocation: %u\n", | 143 | "Unknown relocation: %u\n", |
135 | module->name, | 144 | module->name, |
136 | ELF32_R_TYPE(rela->r_info)); | 145 | ELF32_R_TYPE(rela[i].r_info)); |
137 | return -ENOEXEC; | 146 | return -ENOEXEC; |
138 | } | 147 | } |
139 | } | 148 | } |
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 8709bea09604..2a97bf513b64 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c | |||
@@ -138,8 +138,12 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
138 | setup_early_printk(NULL); | 138 | setup_early_printk(NULL); |
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | early_printk("Ramdisk addr 0x%08x, FDT 0x%08x\n", ram, fdt); | 141 | early_printk("Ramdisk addr 0x%08x, ", ram); |
142 | printk(KERN_NOTICE "Found FDT at 0x%08x\n", fdt); | 142 | if (fdt) |
143 | early_printk("FDT at 0x%08x\n", fdt); | ||
144 | else | ||
145 | early_printk("Compiled-in FDT at 0x%08x\n", | ||
146 | (unsigned int)_fdt_start); | ||
143 | 147 | ||
144 | #ifdef CONFIG_MTD_UCLINUX | 148 | #ifdef CONFIG_MTD_UCLINUX |
145 | early_printk("Found romfs @ 0x%08x (0x%08x)\n", | 149 | early_printk("Found romfs @ 0x%08x (0x%08x)\n", |
diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c index e000bce09b2b..b96f1682bb24 100644 --- a/arch/microblaze/kernel/sys_microblaze.c +++ b/arch/microblaze/kernel/sys_microblaze.c | |||
@@ -33,105 +33,6 @@ | |||
33 | #include <linux/unistd.h> | 33 | #include <linux/unistd.h> |
34 | 34 | ||
35 | #include <asm/syscalls.h> | 35 | #include <asm/syscalls.h> |
36 | /* | ||
37 | * sys_ipc() is the de-multiplexer for the SysV IPC calls.. | ||
38 | * | ||
39 | * This is really horribly ugly. This will be remove with new toolchain. | ||
40 | */ | ||
41 | asmlinkage long | ||
42 | sys_ipc(uint call, int first, int second, int third, void *ptr, long fifth) | ||
43 | { | ||
44 | int version, ret; | ||
45 | |||
46 | version = call >> 16; /* hack for backward compatibility */ | ||
47 | call &= 0xffff; | ||
48 | |||
49 | ret = -EINVAL; | ||
50 | switch (call) { | ||
51 | case SEMOP: | ||
52 | ret = sys_semop(first, (struct sembuf *)ptr, second); | ||
53 | break; | ||
54 | case SEMGET: | ||
55 | ret = sys_semget(first, second, third); | ||
56 | break; | ||
57 | case SEMCTL: | ||
58 | { | ||
59 | union semun fourth; | ||
60 | |||
61 | if (!ptr) | ||
62 | break; | ||
63 | ret = (access_ok(VERIFY_READ, ptr, sizeof(long)) ? 0 : -EFAULT) | ||
64 | || (get_user(fourth.__pad, (void **)ptr)) ; | ||
65 | if (ret) | ||
66 | break; | ||
67 | ret = sys_semctl(first, second, third, fourth); | ||
68 | break; | ||
69 | } | ||
70 | case MSGSND: | ||
71 | ret = sys_msgsnd(first, (struct msgbuf *) ptr, second, third); | ||
72 | break; | ||
73 | case MSGRCV: | ||
74 | switch (version) { | ||
75 | case 0: { | ||
76 | struct ipc_kludge tmp; | ||
77 | |||
78 | if (!ptr) | ||
79 | break; | ||
80 | ret = (access_ok(VERIFY_READ, ptr, sizeof(tmp)) | ||
81 | ? 0 : -EFAULT) || copy_from_user(&tmp, | ||
82 | (struct ipc_kludge *) ptr, sizeof(tmp)); | ||
83 | if (ret) | ||
84 | break; | ||
85 | ret = sys_msgrcv(first, tmp.msgp, second, tmp.msgtyp, | ||
86 | third); | ||
87 | break; | ||
88 | } | ||
89 | default: | ||
90 | ret = sys_msgrcv(first, (struct msgbuf *) ptr, | ||
91 | second, fifth, third); | ||
92 | break; | ||
93 | } | ||
94 | break; | ||
95 | case MSGGET: | ||
96 | ret = sys_msgget((key_t) first, second); | ||
97 | break; | ||
98 | case MSGCTL: | ||
99 | ret = sys_msgctl(first, second, (struct msqid_ds *) ptr); | ||
100 | break; | ||
101 | case SHMAT: | ||
102 | switch (version) { | ||
103 | default: { | ||
104 | ulong raddr; | ||
105 | ret = access_ok(VERIFY_WRITE, (ulong *) third, | ||
106 | sizeof(ulong)) ? 0 : -EFAULT; | ||
107 | if (ret) | ||
108 | break; | ||
109 | ret = do_shmat(first, (char *) ptr, second, &raddr); | ||
110 | if (ret) | ||
111 | break; | ||
112 | ret = put_user(raddr, (ulong *) third); | ||
113 | break; | ||
114 | } | ||
115 | case 1: /* iBCS2 emulator entry point */ | ||
116 | if (!segment_eq(get_fs(), get_ds())) | ||
117 | break; | ||
118 | ret = do_shmat(first, (char *) ptr, second, | ||
119 | (ulong *) third); | ||
120 | break; | ||
121 | } | ||
122 | break; | ||
123 | case SHMDT: | ||
124 | ret = sys_shmdt((char *)ptr); | ||
125 | break; | ||
126 | case SHMGET: | ||
127 | ret = sys_shmget(first, second, third); | ||
128 | break; | ||
129 | case SHMCTL: | ||
130 | ret = sys_shmctl(first, second, (struct shmid_ds *) ptr); | ||
131 | break; | ||
132 | } | ||
133 | return ret; | ||
134 | } | ||
135 | 36 | ||
136 | asmlinkage long microblaze_vfork(struct pt_regs *regs) | 37 | asmlinkage long microblaze_vfork(struct pt_regs *regs) |
137 | { | 38 | { |
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 31b32a6c5f4e..457216097dfd 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S | |||
@@ -121,7 +121,7 @@ ENTRY(sys_call_table) | |||
121 | .long sys_wait4 | 121 | .long sys_wait4 |
122 | .long sys_swapoff /* 115 */ | 122 | .long sys_swapoff /* 115 */ |
123 | .long sys_sysinfo | 123 | .long sys_sysinfo |
124 | .long sys_ipc | 124 | .long sys_ni_syscall /* old sys_ipc */ |
125 | .long sys_fsync | 125 | .long sys_fsync |
126 | .long sys_ni_syscall /* sys_sigreturn_wrapper */ | 126 | .long sys_ni_syscall /* sys_sigreturn_wrapper */ |
127 | .long sys_clone /* 120 */ | 127 | .long sys_clone /* 120 */ |
@@ -313,7 +313,7 @@ ENTRY(sys_call_table) | |||
313 | .long sys_fchmodat | 313 | .long sys_fchmodat |
314 | .long sys_faccessat | 314 | .long sys_faccessat |
315 | .long sys_ni_syscall /* pselect6 */ | 315 | .long sys_ni_syscall /* pselect6 */ |
316 | .long sys_ni_syscall /* sys_ppoll */ | 316 | .long sys_ppoll |
317 | .long sys_unshare /* 310 */ | 317 | .long sys_unshare /* 310 */ |
318 | .long sys_set_robust_list | 318 | .long sys_set_robust_list |
319 | .long sys_get_robust_list | 319 | .long sys_get_robust_list |
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index bdfa2f9f0c81..5499deae7fa6 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/clocksource.h> | 22 | #include <linux/clocksource.h> |
23 | #include <linux/clockchips.h> | 23 | #include <linux/clockchips.h> |
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | #include <linux/bug.h> | ||
25 | #include <asm/cpuinfo.h> | 26 | #include <asm/cpuinfo.h> |
26 | #include <asm/setup.h> | 27 | #include <asm/setup.h> |
27 | #include <asm/prom.h> | 28 | #include <asm/prom.h> |
@@ -234,6 +235,7 @@ void __init time_init(void) | |||
234 | if (timer) | 235 | if (timer) |
235 | break; | 236 | break; |
236 | } | 237 | } |
238 | BUG_ON(!timer); | ||
237 | 239 | ||
238 | timer_baseaddr = *(int *) of_get_property(timer, "reg", NULL); | 240 | timer_baseaddr = *(int *) of_get_property(timer, "reg", NULL); |
239 | timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE); | 241 | timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE); |
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c index 956607a63f4c..d9d249a66ff2 100644 --- a/arch/microblaze/mm/fault.c +++ b/arch/microblaze/mm/fault.c | |||
@@ -69,7 +69,7 @@ static int store_updates_sp(struct pt_regs *regs) | |||
69 | * It is called from do_page_fault above and from some of the procedures | 69 | * It is called from do_page_fault above and from some of the procedures |
70 | * in traps.c. | 70 | * in traps.c. |
71 | */ | 71 | */ |
72 | static void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) | 72 | void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) |
73 | { | 73 | { |
74 | const struct exception_table_entry *fixup; | 74 | const struct exception_table_entry *fixup; |
75 | /* MS: no context */ | 75 | /* MS: no context */ |
@@ -122,15 +122,10 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, | |||
122 | } | 122 | } |
123 | #endif /* CONFIG_KGDB */ | 123 | #endif /* CONFIG_KGDB */ |
124 | 124 | ||
125 | if (in_atomic() || mm == NULL) { | 125 | if (in_atomic() || !mm) { |
126 | /* FIXME */ | 126 | if (kernel_mode(regs)) |
127 | if (kernel_mode(regs)) { | 127 | goto bad_area_nosemaphore; |
128 | printk(KERN_EMERG | 128 | |
129 | "Page fault in kernel mode - Oooou!!! pid %d\n", | ||
130 | current->pid); | ||
131 | _exception(SIGSEGV, regs, code, address); | ||
132 | return; | ||
133 | } | ||
134 | /* in_atomic() in user mode is really bad, | 129 | /* in_atomic() in user mode is really bad, |
135 | as is current->mm == NULL. */ | 130 | as is current->mm == NULL. */ |
136 | printk(KERN_EMERG "Page fault in user mode with " | 131 | printk(KERN_EMERG "Page fault in user mode with " |
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 8d92c4efe9a4..f207f1a94dbc 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
@@ -130,13 +130,13 @@ void __init setup_memory(void) | |||
130 | * (in case the address isn't page-aligned). | 130 | * (in case the address isn't page-aligned). |
131 | */ | 131 | */ |
132 | #ifndef CONFIG_MMU | 132 | #ifndef CONFIG_MMU |
133 | map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)_end)), | 133 | map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)klimit)), |
134 | min_low_pfn, max_low_pfn); | 134 | min_low_pfn, max_low_pfn); |
135 | #else | 135 | #else |
136 | map_size = init_bootmem_node(&contig_page_data, | 136 | map_size = init_bootmem_node(&contig_page_data, |
137 | PFN_UP(TOPHYS((u32)_end)), min_low_pfn, max_low_pfn); | 137 | PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); |
138 | #endif | 138 | #endif |
139 | lmb_reserve(PFN_UP(TOPHYS((u32)_end)) << PAGE_SHIFT, map_size); | 139 | lmb_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); |
140 | 140 | ||
141 | /* free bootmem is whole main memory */ | 141 | /* free bootmem is whole main memory */ |
142 | free_bootmem(memory_start, memory_size); | 142 | free_bootmem(memory_start, memory_size); |
diff --git a/arch/mips/alchemy/mtx-1/platform.c b/arch/mips/alchemy/mtx-1/platform.c index 8b5914d1241f..e30e42add697 100644 --- a/arch/mips/alchemy/mtx-1/platform.c +++ b/arch/mips/alchemy/mtx-1/platform.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * MTX-1 platform devices registration | 2 | * MTX-1 platform devices registration |
3 | * | 3 | * |
4 | * Copyright (C) 2007, Florian Fainelli <florian@openwrt.org> | 4 | * Copyright (C) 2007-2009, Florian Fainelli <florian@openwrt.org> |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License as published by | 7 | * it under the terms of the GNU General Public License as published by |
@@ -142,7 +142,17 @@ static struct __initdata platform_device * mtx1_devs[] = { | |||
142 | 142 | ||
143 | static int __init mtx1_register_devices(void) | 143 | static int __init mtx1_register_devices(void) |
144 | { | 144 | { |
145 | gpio_direction_input(207); | 145 | int rc; |
146 | |||
147 | rc = gpio_request(mtx1_gpio_button[0].gpio, | ||
148 | mtx1_gpio_button[0].desc); | ||
149 | if (rc < 0) { | ||
150 | printk(KERN_INFO "mtx1: failed to request %d\n", | ||
151 | mtx1_gpio_button[0].gpio); | ||
152 | goto out; | ||
153 | } | ||
154 | gpio_direction_input(mtx1_gpio_button[0].gpio); | ||
155 | out: | ||
146 | return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs)); | 156 | return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs)); |
147 | } | 157 | } |
148 | 158 | ||
diff --git a/arch/mips/ar7/Makefile b/arch/mips/ar7/Makefile index 7435e44b3964..26bc5da18997 100644 --- a/arch/mips/ar7/Makefile +++ b/arch/mips/ar7/Makefile | |||
@@ -8,3 +8,4 @@ obj-y := \ | |||
8 | platform.o \ | 8 | platform.o \ |
9 | gpio.o \ | 9 | gpio.o \ |
10 | clock.o | 10 | clock.o |
11 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c index 27dc6663f2fa..cc65c8eb391b 100644 --- a/arch/mips/ar7/clock.c +++ b/arch/mips/ar7/clock.c | |||
@@ -264,19 +264,6 @@ static void __init tnetd7300_init_clocks(void) | |||
264 | iounmap(bootcr); | 264 | iounmap(bootcr); |
265 | } | 265 | } |
266 | 266 | ||
267 | static int tnetd7200_get_clock(int base, struct tnetd7200_clock *clock, | ||
268 | u32 *bootcr, u32 bus_clock) | ||
269 | { | ||
270 | int divisor = ((readl(&clock->prediv) & 0x1f) + 1) * | ||
271 | ((readl(&clock->postdiv) & 0x1f) + 1); | ||
272 | |||
273 | if (*bootcr & BOOT_PLL_BYPASS) | ||
274 | return base / divisor; | ||
275 | |||
276 | return base * ((readl(&clock->mul) & 0xf) + 1) / divisor; | ||
277 | } | ||
278 | |||
279 | |||
280 | static void tnetd7200_set_clock(int base, struct tnetd7200_clock *clock, | 267 | static void tnetd7200_set_clock(int base, struct tnetd7200_clock *clock, |
281 | int prediv, int postdiv, int postdiv2, int mul, u32 frequency) | 268 | int prediv, int postdiv, int postdiv2, int mul, u32 frequency) |
282 | { | 269 | { |
diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c index 46fed44825a6..696c723dc6d4 100644 --- a/arch/mips/ar7/memory.c +++ b/arch/mips/ar7/memory.c | |||
@@ -52,7 +52,7 @@ static int __init memsize(void) | |||
52 | size <<= 1; | 52 | size <<= 1; |
53 | } while (size < (64 << 20)); | 53 | } while (size < (64 << 20)); |
54 | 54 | ||
55 | writel(tmpaddr, &addr); | 55 | writel((u32)tmpaddr, &addr); |
56 | 56 | ||
57 | return size; | 57 | return size; |
58 | } | 58 | } |
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c index 542244961780..2ecab6155932 100644 --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/serial_8250.h> | 28 | #include <linux/serial_8250.h> |
29 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | #include <linux/version.h> | ||
32 | #include <linux/vlynq.h> | 31 | #include <linux/vlynq.h> |
33 | #include <linux/leds.h> | 32 | #include <linux/leds.h> |
34 | #include <linux/string.h> | 33 | #include <linux/string.h> |
@@ -243,13 +242,13 @@ static struct platform_device physmap_flash = { | |||
243 | .num_resources = 1, | 242 | .num_resources = 1, |
244 | }; | 243 | }; |
245 | 244 | ||
246 | static u64 cpmac_dma_mask = DMA_32BIT_MASK; | 245 | static u64 cpmac_dma_mask = DMA_BIT_MASK(32); |
247 | static struct platform_device cpmac_low = { | 246 | static struct platform_device cpmac_low = { |
248 | .id = 0, | 247 | .id = 0, |
249 | .name = "cpmac", | 248 | .name = "cpmac", |
250 | .dev = { | 249 | .dev = { |
251 | .dma_mask = &cpmac_dma_mask, | 250 | .dma_mask = &cpmac_dma_mask, |
252 | .coherent_dma_mask = DMA_32BIT_MASK, | 251 | .coherent_dma_mask = DMA_BIT_MASK(32), |
253 | .platform_data = &cpmac_low_data, | 252 | .platform_data = &cpmac_low_data, |
254 | }, | 253 | }, |
255 | .resource = cpmac_low_res, | 254 | .resource = cpmac_low_res, |
@@ -261,7 +260,7 @@ static struct platform_device cpmac_high = { | |||
261 | .name = "cpmac", | 260 | .name = "cpmac", |
262 | .dev = { | 261 | .dev = { |
263 | .dma_mask = &cpmac_dma_mask, | 262 | .dma_mask = &cpmac_dma_mask, |
264 | .coherent_dma_mask = DMA_32BIT_MASK, | 263 | .coherent_dma_mask = DMA_BIT_MASK(32), |
265 | .platform_data = &cpmac_high_data, | 264 | .platform_data = &cpmac_high_data, |
266 | }, | 265 | }, |
267 | .resource = cpmac_high_res, | 266 | .resource = cpmac_high_res, |
@@ -481,6 +480,7 @@ static void __init detect_leds(void) | |||
481 | static int __init ar7_register_devices(void) | 480 | static int __init ar7_register_devices(void) |
482 | { | 481 | { |
483 | int res; | 482 | int res; |
483 | #ifdef CONFIG_SERIAL_8250 | ||
484 | static struct uart_port uart_port[2]; | 484 | static struct uart_port uart_port[2]; |
485 | 485 | ||
486 | memset(uart_port, 0, sizeof(struct uart_port) * 2); | 486 | memset(uart_port, 0, sizeof(struct uart_port) * 2); |
@@ -512,7 +512,7 @@ static int __init ar7_register_devices(void) | |||
512 | if (res) | 512 | if (res) |
513 | return res; | 513 | return res; |
514 | } | 514 | } |
515 | 515 | #endif /* CONFIG_SERIAL_8250 */ | |
516 | res = platform_device_register(&physmap_flash); | 516 | res = platform_device_register(&physmap_flash); |
517 | if (res) | 517 | if (res) |
518 | return res; | 518 | return res; |
diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c index a320bceb2f9d..5ad6f1db6567 100644 --- a/arch/mips/ar7/prom.c +++ b/arch/mips/ar7/prom.c | |||
@@ -144,7 +144,7 @@ static char * __init lookup_psp_var_map(u8 num) | |||
144 | { | 144 | { |
145 | int i; | 145 | int i; |
146 | 146 | ||
147 | for (i = 0; i < sizeof(psp_var_map); i++) | 147 | for (i = 0; i < ARRAY_SIZE(psp_var_map); i++) |
148 | if (psp_var_map[i].num == num) | 148 | if (psp_var_map[i].num == num) |
149 | return psp_var_map[i].value; | 149 | return psp_var_map[i].value; |
150 | 150 | ||
diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c index 6ebb5f16d967..39f6b5b96463 100644 --- a/arch/mips/ar7/setup.c +++ b/arch/mips/ar7/setup.c | |||
@@ -15,7 +15,6 @@ | |||
15 | * with this program; if not, write to the Free Software Foundation, Inc., | 15 | * with this program; if not, write to the Free Software Foundation, Inc., |
16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
17 | */ | 17 | */ |
18 | #include <linux/version.h> | ||
19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
21 | #include <linux/pm.h> | 20 | #include <linux/pm.h> |
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index 0b891a9c6253..32d51a31dc48 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c | |||
@@ -194,11 +194,11 @@ static void octeon_init_secondary(void) | |||
194 | void octeon_prepare_cpus(unsigned int max_cpus) | 194 | void octeon_prepare_cpus(unsigned int max_cpus) |
195 | { | 195 | { |
196 | cvmx_write_csr(CVMX_CIU_MBOX_CLRX(cvmx_get_core_num()), 0xffffffff); | 196 | cvmx_write_csr(CVMX_CIU_MBOX_CLRX(cvmx_get_core_num()), 0xffffffff); |
197 | if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, IRQF_SHARED, | 197 | if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, IRQF_DISABLED, |
198 | "mailbox0", mailbox_interrupt)) { | 198 | "mailbox0", mailbox_interrupt)) { |
199 | panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n"); | 199 | panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n"); |
200 | } | 200 | } |
201 | if (request_irq(OCTEON_IRQ_MBOX1, mailbox_interrupt, IRQF_SHARED, | 201 | if (request_irq(OCTEON_IRQ_MBOX1, mailbox_interrupt, IRQF_DISABLED, |
202 | "mailbox1", mailbox_interrupt)) { | 202 | "mailbox1", mailbox_interrupt)) { |
203 | panic("Cannot request_irq(OCTEON_IRQ_MBOX1)\n"); | 203 | panic("Cannot request_irq(OCTEON_IRQ_MBOX1)\n"); |
204 | } | 204 | } |
diff --git a/arch/mips/dec/ecc-berr.c b/arch/mips/dec/ecc-berr.c index 6a17c9b508ea..7abce661b90f 100644 --- a/arch/mips/dec/ecc-berr.c +++ b/arch/mips/dec/ecc-berr.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/dec/ecc-berr.c | ||
3 | * | ||
4 | * Bus error event handling code for systems equipped with ECC | 2 | * Bus error event handling code for systems equipped with ECC |
5 | * handling logic, i.e. DECstation/DECsystem 5000/200 (KN02), | 3 | * handling logic, i.e. DECstation/DECsystem 5000/200 (KN02), |
6 | * 5000/240 (KN03), 5000/260 (KN05) and DECsystem 5900 (KN03), | 4 | * 5000/240 (KN03), 5000/260 (KN05) and DECsystem 5900 (KN03), |
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S index 00cecdcc75f2..82c852818781 100644 --- a/arch/mips/dec/int-handler.S +++ b/arch/mips/dec/int-handler.S | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/dec/int-handler.S | ||
3 | * | ||
4 | * Copyright (C) 1995, 1996, 1997 Paul M. Antoine and Harald Koerfgen | 2 | * Copyright (C) 1995, 1996, 1997 Paul M. Antoine and Harald Koerfgen |
5 | * Copyright (C) 2000, 2001, 2002, 2003, 2005 Maciej W. Rozycki | 3 | * Copyright (C) 2000, 2001, 2002, 2003, 2005 Maciej W. Rozycki |
6 | * | 4 | * |
diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c index 3acb133668dc..cb41954fc321 100644 --- a/arch/mips/dec/ioasic-irq.c +++ b/arch/mips/dec/ioasic-irq.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/dec/ioasic-irq.c | ||
3 | * | ||
4 | * DEC I/O ASIC interrupts. | 2 | * DEC I/O ASIC interrupts. |
5 | * | 3 | * |
6 | * Copyright (c) 2002, 2003 Maciej W. Rozycki | 4 | * Copyright (c) 2002, 2003 Maciej W. Rozycki |
diff --git a/arch/mips/dec/kn01-berr.c b/arch/mips/dec/kn01-berr.c index d3b8002bf1e7..b0dc6d53edd6 100644 --- a/arch/mips/dec/kn01-berr.c +++ b/arch/mips/dec/kn01-berr.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/dec/kn01-berr.c | ||
3 | * | ||
4 | * Bus error event handling code for DECstation/DECsystem 3100 | 2 | * Bus error event handling code for DECstation/DECsystem 3100 |
5 | * and 2100 (KN01) systems equipped with parity error detection | 3 | * and 2100 (KN01) systems equipped with parity error detection |
6 | * logic. | 4 | * logic. |
diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c index 02439dc0ba83..ed90a8deabcc 100644 --- a/arch/mips/dec/kn02-irq.c +++ b/arch/mips/dec/kn02-irq.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/dec/kn02-irq.c | ||
3 | * | ||
4 | * DECstation 5000/200 (KN02) Control and Status Register | 2 | * DECstation 5000/200 (KN02) Control and Status Register |
5 | * interrupts. | 3 | * interrupts. |
6 | * | 4 | * |
diff --git a/arch/mips/dec/kn02xa-berr.c b/arch/mips/dec/kn02xa-berr.c index 5f04545c3606..07ca5405d48d 100644 --- a/arch/mips/dec/kn02xa-berr.c +++ b/arch/mips/dec/kn02xa-berr.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/dec/kn02xa-berr.c | ||
3 | * | ||
4 | * Bus error event handling code for 5000-series systems equipped | 2 | * Bus error event handling code for 5000-series systems equipped |
5 | * with parity error detection logic, i.e. DECstation/DECsystem | 3 | * with parity error detection logic, i.e. DECstation/DECsystem |
6 | * 5000/120, /125, /133 (KN02-BA), 5000/150 (KN04-BA) and Personal | 4 | * 5000/120, /125, /133 (KN02-BA), 5000/150 (KN04-BA) and Personal |
diff --git a/arch/mips/dec/prom/call_o32.S b/arch/mips/dec/prom/call_o32.S index e523454bda3a..8c8498159e43 100644 --- a/arch/mips/dec/prom/call_o32.S +++ b/arch/mips/dec/prom/call_o32.S | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/dec/prom/call_o32.S | ||
3 | * | ||
4 | * O32 interface for the 64 (or N32) ABI. | 2 | * O32 interface for the 64 (or N32) ABI. |
5 | * | 3 | * |
6 | * Copyright (C) 2002 Maciej W. Rozycki | 4 | * Copyright (C) 2002 Maciej W. Rozycki |
diff --git a/arch/mips/dec/prom/console.c b/arch/mips/dec/prom/console.c index 078e1a12421d..caa6e047caf1 100644 --- a/arch/mips/dec/prom/console.c +++ b/arch/mips/dec/prom/console.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/dec/prom/console.c | ||
3 | * | ||
4 | * DECstation PROM-based early console support. | 2 | * DECstation PROM-based early console support. |
5 | * | 3 | * |
6 | * Copyright (C) 2004, 2007 Maciej W. Rozycki | 4 | * Copyright (C) 2004, 2007 Maciej W. Rozycki |
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 1359c03ded51..463136e6685a 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/dec/time.c | ||
3 | * | ||
4 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds | 2 | * Copyright (C) 1991, 1992, 1995 Linus Torvalds |
5 | * Copyright (C) 2000, 2003 Maciej W. Rozycki | 3 | * Copyright (C) 2000, 2003 Maciej W. Rozycki |
6 | * | 4 | * |
diff --git a/arch/mips/emma/common/Makefile b/arch/mips/emma/common/Makefile index c392d28c1ef1..f27d84d1904f 100644 --- a/arch/mips/emma/common/Makefile +++ b/arch/mips/emma/common/Makefile | |||
@@ -1,7 +1,4 @@ | |||
1 | # | 1 | # |
2 | # arch/mips/emma2rh/common/Makefile | ||
3 | # Makefile for the common code of NEC EMMA2RH based board. | ||
4 | # | ||
5 | # Copyright (C) NEC Electronics Corporation 2005-2006 | 2 | # Copyright (C) NEC Electronics Corporation 2005-2006 |
6 | # | 3 | # |
7 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
diff --git a/arch/mips/emma/common/prom.c b/arch/mips/emma/common/prom.c index 120f53fbdb45..708f08761406 100644 --- a/arch/mips/emma/common/prom.c +++ b/arch/mips/emma/common/prom.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/emma2rh/common/prom.c | ||
3 | * This file is prom file. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2004-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2004-2006 |
6 | * | 3 | * |
7 | * This file is based on the arch/mips/ddb5xxx/common/prom.c | 4 | * This file is based on the arch/mips/ddb5xxx/common/prom.c |
diff --git a/arch/mips/emma/markeins/Makefile b/arch/mips/emma/markeins/Makefile index 16e0017ba919..f8ba2508fa2b 100644 --- a/arch/mips/emma/markeins/Makefile +++ b/arch/mips/emma/markeins/Makefile | |||
@@ -1,7 +1,4 @@ | |||
1 | # | 1 | # |
2 | # arch/mips/emma2rh/markeins/Makefile | ||
3 | # Makefile for the common code of NEC EMMA2RH based board. | ||
4 | # | ||
5 | # Copyright (C) NEC Electronics Corporation 2005-2006 | 2 | # Copyright (C) NEC Electronics Corporation 2005-2006 |
6 | # | 3 | # |
7 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
diff --git a/arch/mips/emma/markeins/irq.c b/arch/mips/emma/markeins/irq.c index 43828ae796ec..9504b7ee0b7c 100644 --- a/arch/mips/emma/markeins/irq.c +++ b/arch/mips/emma/markeins/irq.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/emma2rh/markeins/irq.c | ||
3 | * This file defines the irq handler for EMMA2RH. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2004-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2004-2006 |
6 | * | 3 | * |
7 | * This file is based on the arch/mips/ddb5xxx/ddb5477/irq.c | 4 | * This file is based on the arch/mips/ddb5xxx/ddb5477/irq.c |
diff --git a/arch/mips/emma/markeins/led.c b/arch/mips/emma/markeins/led.c index 377a181b6561..49755896857f 100644 --- a/arch/mips/emma/markeins/led.c +++ b/arch/mips/emma/markeins/led.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/emma2rh/markeins/led.c | ||
3 | * This file defines the led display for Mark-eins. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2004-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2004-2006 |
6 | * | 3 | * |
7 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/mips/emma/markeins/platform.c b/arch/mips/emma/markeins/platform.c index 80ae12ef87db..b05b08b92a34 100644 --- a/arch/mips/emma/markeins/platform.c +++ b/arch/mips/emma/markeins/platform.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/emma2rh/markeins/platofrm.c | ||
3 | * This file sets up platform devices for EMMA2RH Mark-eins. | ||
4 | * | ||
5 | * Copyright(C) MontaVista Software Inc, 2006 | 2 | * Copyright(C) MontaVista Software Inc, 2006 |
6 | * | 3 | * |
7 | * Author: dmitry pervushin <dpervushin@ru.mvista.com> | 4 | * Author: dmitry pervushin <dpervushin@ru.mvista.com> |
diff --git a/arch/mips/emma/markeins/setup.c b/arch/mips/emma/markeins/setup.c index 67f456500084..335dc8c1a1bb 100644 --- a/arch/mips/emma/markeins/setup.c +++ b/arch/mips/emma/markeins/setup.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/emma2rh/markeins/setup.c | ||
3 | * This file is setup for EMMA2RH Mark-eins. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2004-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2004-2006 |
6 | * | 3 | * |
7 | * This file is based on the arch/mips/ddb5xxx/ddb5477/setup.c. | 4 | * This file is based on the arch/mips/ddb5xxx/ddb5477/setup.c. |
diff --git a/arch/mips/fw/lib/call_o32.S b/arch/mips/fw/lib/call_o32.S index bdf7d1d4081a..e0a68713b3c3 100644 --- a/arch/mips/fw/lib/call_o32.S +++ b/arch/mips/fw/lib/call_o32.S | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/dec/prom/call_o32.S | ||
3 | * | ||
4 | * O32 interface for the 64 (or N32) ABI. | 2 | * O32 interface for the 64 (or N32) ABI. |
5 | * | 3 | * |
6 | * Copyright (C) 2002 Maciej W. Rozycki | 4 | * Copyright (C) 2002 Maciej W. Rozycki |
diff --git a/arch/mips/include/asm/emma/emma2rh.h b/arch/mips/include/asm/emma/emma2rh.h index 30aea91de626..2afb2fe11b30 100644 --- a/arch/mips/include/asm/emma/emma2rh.h +++ b/arch/mips/include/asm/emma/emma2rh.h | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/include/asm/emma/emma2rh.h | ||
3 | * This file is EMMA2RH common header. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2005-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2005-2006 |
6 | * | 3 | * |
7 | * This file based on include/asm-mips/ddb5xxx/ddb5xxx.h | 4 | * This file based on include/asm-mips/ddb5xxx/ddb5xxx.h |
diff --git a/arch/mips/include/asm/emma/markeins.h b/arch/mips/include/asm/emma/markeins.h index 973b0628490d..2618bf230248 100644 --- a/arch/mips/include/asm/emma/markeins.h +++ b/arch/mips/include/asm/emma/markeins.h | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-mips/emma2rh/markeins.h | ||
3 | * This file is EMMA2RH board depended header. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2005-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2005-2006 |
6 | * | 3 | * |
7 | * This file based on include/asm-mips/ddb5xxx/ddb5xxx.h | 4 | * This file based on include/asm-mips/ddb5xxx/ddb5xxx.h |
diff --git a/arch/mips/include/asm/gic.h b/arch/mips/include/asm/gic.h index 10292e37c1f7..a8f57341f123 100644 --- a/arch/mips/include/asm/gic.h +++ b/arch/mips/include/asm/gic.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #define GIC_TRIG_EDGE 1 | 20 | #define GIC_TRIG_EDGE 1 |
21 | #define GIC_TRIG_LEVEL 0 | 21 | #define GIC_TRIG_LEVEL 0 |
22 | 22 | ||
23 | #if CONFIG_SMP | 23 | #ifdef CONFIG_SMP |
24 | #define GIC_NUM_INTRS (24 + NR_CPUS * 2) | 24 | #define GIC_NUM_INTRS (24 + NR_CPUS * 2) |
25 | #else | 25 | #else |
26 | #define GIC_NUM_INTRS 32 | 26 | #define GIC_NUM_INTRS 32 |
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index 96a14a426a7c..4320239cf4ef 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h | |||
@@ -32,10 +32,12 @@ | |||
32 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | 32 | #define PAGE_SIZE (1UL << PAGE_SHIFT) |
33 | #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) | 33 | #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) |
34 | 34 | ||
35 | #ifdef CONFIG_HUGETLB_PAGE | ||
35 | #define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3) | 36 | #define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3) |
36 | #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) | 37 | #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) |
37 | #define HPAGE_MASK (~(HPAGE_SIZE - 1)) | 38 | #define HPAGE_MASK (~(HPAGE_SIZE - 1)) |
38 | #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) | 39 | #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) |
40 | #endif /* CONFIG_HUGETLB_PAGE */ | ||
39 | 41 | ||
40 | #ifndef __ASSEMBLY__ | 42 | #ifndef __ASSEMBLY__ |
41 | 43 | ||
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h index 1275831dda29..3738f4b48cbd 100644 --- a/arch/mips/include/asm/pgalloc.h +++ b/arch/mips/include/asm/pgalloc.h | |||
@@ -98,23 +98,12 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | |||
98 | __free_pages(pte, PTE_ORDER); | 98 | __free_pages(pte, PTE_ORDER); |
99 | } | 99 | } |
100 | 100 | ||
101 | #define __pte_free_tlb(tlb,pte) \ | 101 | #define __pte_free_tlb(tlb,pte,address) \ |
102 | do { \ | 102 | do { \ |
103 | pgtable_page_dtor(pte); \ | 103 | pgtable_page_dtor(pte); \ |
104 | tlb_remove_page((tlb), pte); \ | 104 | tlb_remove_page((tlb), pte); \ |
105 | } while (0) | 105 | } while (0) |
106 | 106 | ||
107 | #ifdef CONFIG_32BIT | ||
108 | |||
109 | /* | ||
110 | * allocating and freeing a pmd is trivial: the 1-entry pmd is | ||
111 | * inside the pgd, so has no extra memory associated with it. | ||
112 | */ | ||
113 | #define pmd_free(mm, x) do { } while (0) | ||
114 | #define __pmd_free_tlb(tlb, x) do { } while (0) | ||
115 | |||
116 | #endif | ||
117 | |||
118 | #ifdef CONFIG_64BIT | 107 | #ifdef CONFIG_64BIT |
119 | 108 | ||
120 | static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) | 109 | static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) |
@@ -132,7 +121,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) | |||
132 | free_pages((unsigned long)pmd, PMD_ORDER); | 121 | free_pages((unsigned long)pmd, PMD_ORDER); |
133 | } | 122 | } |
134 | 123 | ||
135 | #define __pmd_free_tlb(tlb, x) pmd_free((tlb)->mm, x) | 124 | #define __pmd_free_tlb(tlb, x, addr) pmd_free((tlb)->mm, x) |
136 | 125 | ||
137 | #endif | 126 | #endif |
138 | 127 | ||
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/war.h b/arch/mips/include/asm/pmc-sierra/msp71xx/war.h index 0bf48fc1892b..9e2ee429c529 100644 --- a/arch/mips/include/asm/pmc-sierra/msp71xx/war.h +++ b/arch/mips/include/asm/pmc-sierra/msp71xx/war.h | |||
@@ -23,6 +23,8 @@ | |||
23 | #if defined(CONFIG_PMC_MSP7120_EVAL) || defined(CONFIG_PMC_MSP7120_GW) || \ | 23 | #if defined(CONFIG_PMC_MSP7120_EVAL) || defined(CONFIG_PMC_MSP7120_GW) || \ |
24 | defined(CONFIG_PMC_MSP7120_FPGA) | 24 | defined(CONFIG_PMC_MSP7120_FPGA) |
25 | #define MIPS34K_MISSED_ITLB_WAR 1 | 25 | #define MIPS34K_MISSED_ITLB_WAR 1 |
26 | #else | ||
27 | #define MIPS34K_MISSED_ITLB_WAR 0 | ||
26 | #endif | 28 | #endif |
27 | 29 | ||
28 | #endif /* __ASM_MIPS_PMC_SIERRA_WAR_H */ | 30 | #endif /* __ASM_MIPS_PMC_SIERRA_WAR_H */ |
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h index 0f926aa0cb47..087a8884ef06 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h | |||
@@ -311,8 +311,9 @@ extern void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long | |||
311 | 311 | ||
312 | unsigned long get_wchan(struct task_struct *p); | 312 | unsigned long get_wchan(struct task_struct *p); |
313 | 313 | ||
314 | #define __KSTK_TOS(tsk) ((unsigned long)task_stack_page(tsk) + THREAD_SIZE - 32) | 314 | #define __KSTK_TOS(tsk) ((unsigned long)task_stack_page(tsk) + \ |
315 | #define task_pt_regs(tsk) ((struct pt_regs *)__KSTK_TOS(tsk) - 1) | 315 | THREAD_SIZE - 32 - sizeof(struct pt_regs)) |
316 | #define task_pt_regs(tsk) ((struct pt_regs *)__KSTK_TOS(tsk)) | ||
316 | #define KSTK_EIP(tsk) (task_pt_regs(tsk)->cp0_epc) | 317 | #define KSTK_EIP(tsk) (task_pt_regs(tsk)->cp0_epc) |
317 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->regs[29]) | 318 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->regs[29]) |
318 | #define KSTK_STATUS(tsk) (task_pt_regs(tsk)->cp0_status) | 319 | #define KSTK_STATUS(tsk) (task_pt_regs(tsk)->cp0_status) |
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h index b70c49fdda26..e753a777949b 100644 --- a/arch/mips/include/asm/unistd.h +++ b/arch/mips/include/asm/unistd.h | |||
@@ -354,16 +354,17 @@ | |||
354 | #define __NR_pwritev (__NR_Linux + 331) | 354 | #define __NR_pwritev (__NR_Linux + 331) |
355 | #define __NR_rt_tgsigqueueinfo (__NR_Linux + 332) | 355 | #define __NR_rt_tgsigqueueinfo (__NR_Linux + 332) |
356 | #define __NR_perf_counter_open (__NR_Linux + 333) | 356 | #define __NR_perf_counter_open (__NR_Linux + 333) |
357 | #define __NR_accept4 (__NR_Linux + 334) | ||
357 | 358 | ||
358 | /* | 359 | /* |
359 | * Offset of the last Linux o32 flavoured syscall | 360 | * Offset of the last Linux o32 flavoured syscall |
360 | */ | 361 | */ |
361 | #define __NR_Linux_syscalls 333 | 362 | #define __NR_Linux_syscalls 334 |
362 | 363 | ||
363 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 364 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
364 | 365 | ||
365 | #define __NR_O32_Linux 4000 | 366 | #define __NR_O32_Linux 4000 |
366 | #define __NR_O32_Linux_syscalls 333 | 367 | #define __NR_O32_Linux_syscalls 334 |
367 | 368 | ||
368 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 369 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
369 | 370 | ||
@@ -664,16 +665,17 @@ | |||
664 | #define __NR_pwritev (__NR_Linux + 290) | 665 | #define __NR_pwritev (__NR_Linux + 290) |
665 | #define __NR_rt_tgsigqueueinfo (__NR_Linux + 291) | 666 | #define __NR_rt_tgsigqueueinfo (__NR_Linux + 291) |
666 | #define __NR_perf_counter_open (__NR_Linux + 292) | 667 | #define __NR_perf_counter_open (__NR_Linux + 292) |
668 | #define __NR_accept4 (__NR_Linux + 293) | ||
667 | 669 | ||
668 | /* | 670 | /* |
669 | * Offset of the last Linux 64-bit flavoured syscall | 671 | * Offset of the last Linux 64-bit flavoured syscall |
670 | */ | 672 | */ |
671 | #define __NR_Linux_syscalls 292 | 673 | #define __NR_Linux_syscalls 293 |
672 | 674 | ||
673 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 675 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
674 | 676 | ||
675 | #define __NR_64_Linux 5000 | 677 | #define __NR_64_Linux 5000 |
676 | #define __NR_64_Linux_syscalls 292 | 678 | #define __NR_64_Linux_syscalls 293 |
677 | 679 | ||
678 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 680 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
679 | 681 | ||
@@ -978,16 +980,17 @@ | |||
978 | #define __NR_pwritev (__NR_Linux + 294) | 980 | #define __NR_pwritev (__NR_Linux + 294) |
979 | #define __NR_rt_tgsigqueueinfo (__NR_Linux + 295) | 981 | #define __NR_rt_tgsigqueueinfo (__NR_Linux + 295) |
980 | #define __NR_perf_counter_open (__NR_Linux + 296) | 982 | #define __NR_perf_counter_open (__NR_Linux + 296) |
983 | #define __NR_accept4 (__NR_Linux + 297) | ||
981 | 984 | ||
982 | /* | 985 | /* |
983 | * Offset of the last N32 flavoured syscall | 986 | * Offset of the last N32 flavoured syscall |
984 | */ | 987 | */ |
985 | #define __NR_Linux_syscalls 296 | 988 | #define __NR_Linux_syscalls 297 |
986 | 989 | ||
987 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 990 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
988 | 991 | ||
989 | #define __NR_N32_Linux 6000 | 992 | #define __NR_N32_Linux 6000 |
990 | #define __NR_N32_Linux_syscalls 296 | 993 | #define __NR_N32_Linux_syscalls 297 |
991 | 994 | ||
992 | #ifdef __KERNEL__ | 995 | #ifdef __KERNEL__ |
993 | 996 | ||
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index f0fd636723be..0d64d0f46418 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c | |||
@@ -190,7 +190,7 @@ int vdma_free(unsigned long laddr) | |||
190 | return -1; | 190 | return -1; |
191 | } | 191 | } |
192 | 192 | ||
193 | while (pgtbl[i].owner == laddr && i < VDMA_PGTBL_ENTRIES) { | 193 | while (i < VDMA_PGTBL_ENTRIES && pgtbl[i].owner == laddr) { |
194 | pgtbl[i].owner = VDMA_PAGE_EMPTY; | 194 | pgtbl[i].owner = VDMA_PAGE_EMPTY; |
195 | i++; | 195 | i++; |
196 | } | 196 | } |
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index 492a0a8d70fb..531ce7b16124 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S | |||
@@ -188,7 +188,8 @@ NESTED(kernel_entry, 16, sp) # kernel entry point | |||
188 | 188 | ||
189 | MTC0 zero, CP0_CONTEXT # clear context register | 189 | MTC0 zero, CP0_CONTEXT # clear context register |
190 | PTR_LA $28, init_thread_union | 190 | PTR_LA $28, init_thread_union |
191 | PTR_LI sp, _THREAD_SIZE - 32 | 191 | /* Set the SP after an empty pt_regs. */ |
192 | PTR_LI sp, _THREAD_SIZE - 32 - PT_SIZE | ||
192 | PTR_ADDU sp, $28 | 193 | PTR_ADDU sp, $28 |
193 | set_saved_sp sp, t0, t1 | 194 | set_saved_sp sp, t0, t1 |
194 | PTR_SUBU sp, 4 * SZREG # init stack pointer | 195 | PTR_SUBU sp, 4 * SZREG # init stack pointer |
diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c index a4d1462c27f7..9b78029bea70 100644 --- a/arch/mips/kernel/irq_txx9.c +++ b/arch/mips/kernel/irq_txx9.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/kernel/irq_txx9.c | ||
3 | * | ||
4 | * Based on linux/arch/mips/jmr3927/rbhma3100/irq.c, | 2 | * Based on linux/arch/mips/jmr3927/rbhma3100/irq.c, |
5 | * linux/arch/mips/tx4927/common/tx4927_irq.c, | 3 | * linux/arch/mips/tx4927/common/tx4927_irq.c, |
6 | * linux/arch/mips/tx4938/common/irq.c | 4 | * linux/arch/mips/tx4938/common/irq.c |
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c index 3e9100dcc12d..6f51dda87fce 100644 --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c | |||
@@ -98,7 +98,8 @@ static int apply_r_mips_32_rela(struct module *me, u32 *location, Elf_Addr v) | |||
98 | static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v) | 98 | static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v) |
99 | { | 99 | { |
100 | if (v % 4) { | 100 | if (v % 4) { |
101 | printk(KERN_ERR "module %s: dangerous relocation\n", me->name); | 101 | pr_err("module %s: dangerous R_MIPS_26 REL relocation\n", |
102 | me->name); | ||
102 | return -ENOEXEC; | 103 | return -ENOEXEC; |
103 | } | 104 | } |
104 | 105 | ||
@@ -118,7 +119,8 @@ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v) | |||
118 | static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v) | 119 | static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v) |
119 | { | 120 | { |
120 | if (v % 4) { | 121 | if (v % 4) { |
121 | printk(KERN_ERR "module %s: dangerous relocation\n", me->name); | 122 | pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n", |
123 | me->name); | ||
122 | return -ENOEXEC; | 124 | return -ENOEXEC; |
123 | } | 125 | } |
124 | 126 | ||
@@ -222,7 +224,7 @@ static int apply_r_mips_lo16_rel(struct module *me, u32 *location, Elf_Addr v) | |||
222 | return 0; | 224 | return 0; |
223 | 225 | ||
224 | out_danger: | 226 | out_danger: |
225 | printk(KERN_ERR "module %s: dangerous " "relocation\n", me->name); | 227 | pr_err("module %s: dangerous R_MIPS_LO16 REL relocation\n", me->name); |
226 | 228 | ||
227 | return -ENOEXEC; | 229 | return -ENOEXEC; |
228 | } | 230 | } |
@@ -301,7 +303,7 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab, | |||
301 | /* This is the symbol it is referring to */ | 303 | /* This is the symbol it is referring to */ |
302 | sym = (Elf_Sym *)sechdrs[symindex].sh_addr | 304 | sym = (Elf_Sym *)sechdrs[symindex].sh_addr |
303 | + ELF_MIPS_R_SYM(rel[i]); | 305 | + ELF_MIPS_R_SYM(rel[i]); |
304 | if (!sym->st_value) { | 306 | if (IS_ERR_VALUE(sym->st_value)) { |
305 | /* Ignore unresolved weak symbol */ | 307 | /* Ignore unresolved weak symbol */ |
306 | if (ELF_ST_BIND(sym->st_info) == STB_WEAK) | 308 | if (ELF_ST_BIND(sym->st_info) == STB_WEAK) |
307 | continue; | 309 | continue; |
@@ -341,7 +343,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, | |||
341 | /* This is the symbol it is referring to */ | 343 | /* This is the symbol it is referring to */ |
342 | sym = (Elf_Sym *)sechdrs[symindex].sh_addr | 344 | sym = (Elf_Sym *)sechdrs[symindex].sh_addr |
343 | + ELF_MIPS_R_SYM(rel[i]); | 345 | + ELF_MIPS_R_SYM(rel[i]); |
344 | if (!sym->st_value) { | 346 | if (IS_ERR_VALUE(sym->st_value)) { |
345 | /* Ignore unresolved weak symbol */ | 347 | /* Ignore unresolved weak symbol */ |
346 | if (ELF_ST_BIND(sym->st_info) == STB_WEAK) | 348 | if (ELF_ST_BIND(sym->st_info) == STB_WEAK) |
347 | continue; | 349 | continue; |
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index e0a4ac18fa07..26109c4d5170 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/kernel/proc.c | ||
3 | * | ||
4 | * Copyright (C) 1995, 1996, 2001 Ralf Baechle | 2 | * Copyright (C) 1995, 1996, 2001 Ralf Baechle |
5 | * Copyright (C) 2001, 2004 MIPS Technologies, Inc. | 3 | * Copyright (C) 2001, 2004 MIPS Technologies, Inc. |
6 | * Copyright (C) 2004 Maciej W. Rozycki | 4 | * Copyright (C) 2004 Maciej W. Rozycki |
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index c09d681b7181..f3d73e1831c1 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c | |||
@@ -115,7 +115,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, | |||
115 | { | 115 | { |
116 | struct thread_info *ti = task_thread_info(p); | 116 | struct thread_info *ti = task_thread_info(p); |
117 | struct pt_regs *childregs; | 117 | struct pt_regs *childregs; |
118 | long childksp; | 118 | unsigned long childksp; |
119 | p->set_child_tid = p->clear_child_tid = NULL; | 119 | p->set_child_tid = p->clear_child_tid = NULL; |
120 | 120 | ||
121 | childksp = (unsigned long)task_stack_page(p) + THREAD_SIZE - 32; | 121 | childksp = (unsigned long)task_stack_page(p) + THREAD_SIZE - 32; |
@@ -132,6 +132,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, | |||
132 | 132 | ||
133 | /* set up new TSS. */ | 133 | /* set up new TSS. */ |
134 | childregs = (struct pt_regs *) childksp - 1; | 134 | childregs = (struct pt_regs *) childksp - 1; |
135 | /* Put the stack after the struct pt_regs. */ | ||
136 | childksp = (unsigned long) childregs; | ||
135 | *childregs = *regs; | 137 | *childregs = *regs; |
136 | childregs->regs[7] = 0; /* Clear error flag */ | 138 | childregs->regs[7] = 0; /* Clear error flag */ |
137 | 139 | ||
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 20a86e08fd58..b57082123536 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
@@ -654,6 +654,7 @@ einval: li v0, -ENOSYS | |||
654 | sys sys_pwritev 6 | 654 | sys sys_pwritev 6 |
655 | sys sys_rt_tgsigqueueinfo 4 | 655 | sys sys_rt_tgsigqueueinfo 4 |
656 | sys sys_perf_counter_open 5 | 656 | sys sys_perf_counter_open 5 |
657 | sys sys_accept4 4 | ||
657 | .endm | 658 | .endm |
658 | 659 | ||
659 | /* We pre-compute the number of _instruction_ bytes needed to | 660 | /* We pre-compute the number of _instruction_ bytes needed to |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index b046130d4c5d..3d866f24e064 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
@@ -491,4 +491,5 @@ sys_call_table: | |||
491 | PTR sys_pwritev /* 5390 */ | 491 | PTR sys_pwritev /* 5390 */ |
492 | PTR sys_rt_tgsigqueueinfo | 492 | PTR sys_rt_tgsigqueueinfo |
493 | PTR sys_perf_counter_open | 493 | PTR sys_perf_counter_open |
494 | PTR sys_accept4 | ||
494 | .size sys_call_table,.-sys_call_table | 495 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 15874f9812cc..e855b118a079 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
@@ -417,4 +417,5 @@ EXPORT(sysn32_call_table) | |||
417 | PTR sys_pwritev | 417 | PTR sys_pwritev |
418 | PTR compat_sys_rt_tgsigqueueinfo /* 5295 */ | 418 | PTR compat_sys_rt_tgsigqueueinfo /* 5295 */ |
419 | PTR sys_perf_counter_open | 419 | PTR sys_perf_counter_open |
420 | PTR sys_accept4 | ||
420 | .size sysn32_call_table,.-sysn32_call_table | 421 | .size sysn32_call_table,.-sysn32_call_table |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 781e0f1e9533..0c49f1a660be 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -537,4 +537,5 @@ sys_call_table: | |||
537 | PTR compat_sys_pwritev | 537 | PTR compat_sys_pwritev |
538 | PTR compat_sys_rt_tgsigqueueinfo | 538 | PTR compat_sys_rt_tgsigqueueinfo |
539 | PTR sys_perf_counter_open | 539 | PTR sys_perf_counter_open |
540 | PTR sys_accept4 | ||
540 | .size sys_call_table,.-sys_call_table | 541 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 8a0626cbb108..c16bb6d6c25c 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -465,11 +465,8 @@ void smtc_prepare_cpus(int cpus) | |||
465 | smtc_configure_tlb(); | 465 | smtc_configure_tlb(); |
466 | 466 | ||
467 | for (tc = 0, vpe = 0 ; (vpe < nvpe) && (tc < ntc) ; vpe++) { | 467 | for (tc = 0, vpe = 0 ; (vpe < nvpe) && (tc < ntc) ; vpe++) { |
468 | /* | 468 | if (tcpervpe[vpe] == 0) |
469 | * Set the MVP bits. | 469 | continue; |
470 | */ | ||
471 | settc(tc); | ||
472 | write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | VPECONF0_MVP); | ||
473 | if (vpe != 0) | 470 | if (vpe != 0) |
474 | printk(", "); | 471 | printk(", "); |
475 | printk("VPE %d: TC", vpe); | 472 | printk("VPE %d: TC", vpe); |
@@ -488,6 +485,12 @@ void smtc_prepare_cpus(int cpus) | |||
488 | } | 485 | } |
489 | if (vpe != 0) { | 486 | if (vpe != 0) { |
490 | /* | 487 | /* |
488 | * Allow this VPE to control others. | ||
489 | */ | ||
490 | write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | | ||
491 | VPECONF0_MVP); | ||
492 | |||
493 | /* | ||
491 | * Clear any stale software interrupts from VPE's Cause | 494 | * Clear any stale software interrupts from VPE's Cause |
492 | */ | 495 | */ |
493 | write_vpe_c0_cause(0); | 496 | write_vpe_c0_cause(0); |
diff --git a/arch/mips/kernel/stacktrace.c b/arch/mips/kernel/stacktrace.c index 58f5cd76c8c3..d52ff77baf3f 100644 --- a/arch/mips/kernel/stacktrace.c +++ b/arch/mips/kernel/stacktrace.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/kernel/stacktrace.c | ||
3 | * | ||
4 | * Stack trace management functions | 2 | * Stack trace management functions |
5 | * | 3 | * |
6 | * Copyright (C) 2006 Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 4 | * Copyright (C) 2006 Atsushi Nemoto <anemo@mba.ocn.ne.jp> |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 07b9ec2c6e3d..9a1ab7e87fd4 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
@@ -73,7 +73,7 @@ static int major; | |||
73 | static const int minor = 1; /* fixed for now */ | 73 | static const int minor = 1; /* fixed for now */ |
74 | 74 | ||
75 | #ifdef CONFIG_MIPS_APSP_KSPD | 75 | #ifdef CONFIG_MIPS_APSP_KSPD |
76 | static struct kspd_notifications kspd_events; | 76 | static struct kspd_notifications kspd_events; |
77 | static int kspd_events_reqd = 0; | 77 | static int kspd_events_reqd = 0; |
78 | #endif | 78 | #endif |
79 | 79 | ||
@@ -155,10 +155,9 @@ struct { | |||
155 | }; | 155 | }; |
156 | 156 | ||
157 | static void release_progmem(void *ptr); | 157 | static void release_progmem(void *ptr); |
158 | extern void save_gp_address(unsigned int secbase, unsigned int rel); | ||
159 | 158 | ||
160 | /* get the vpe associated with this minor */ | 159 | /* get the vpe associated with this minor */ |
161 | struct vpe *get_vpe(int minor) | 160 | static struct vpe *get_vpe(int minor) |
162 | { | 161 | { |
163 | struct vpe *v; | 162 | struct vpe *v; |
164 | 163 | ||
@@ -174,7 +173,7 @@ struct vpe *get_vpe(int minor) | |||
174 | } | 173 | } |
175 | 174 | ||
176 | /* get the vpe associated with this minor */ | 175 | /* get the vpe associated with this minor */ |
177 | struct tc *get_tc(int index) | 176 | static struct tc *get_tc(int index) |
178 | { | 177 | { |
179 | struct tc *t; | 178 | struct tc *t; |
180 | 179 | ||
@@ -186,20 +185,8 @@ struct tc *get_tc(int index) | |||
186 | return NULL; | 185 | return NULL; |
187 | } | 186 | } |
188 | 187 | ||
189 | struct tc *get_tc_unused(void) | ||
190 | { | ||
191 | struct tc *t; | ||
192 | |||
193 | list_for_each_entry(t, &vpecontrol.tc_list, list) { | ||
194 | if (t->state == TC_STATE_UNUSED) | ||
195 | return t; | ||
196 | } | ||
197 | |||
198 | return NULL; | ||
199 | } | ||
200 | |||
201 | /* allocate a vpe and associate it with this minor (or index) */ | 188 | /* allocate a vpe and associate it with this minor (or index) */ |
202 | struct vpe *alloc_vpe(int minor) | 189 | static struct vpe *alloc_vpe(int minor) |
203 | { | 190 | { |
204 | struct vpe *v; | 191 | struct vpe *v; |
205 | 192 | ||
@@ -216,7 +203,7 @@ struct vpe *alloc_vpe(int minor) | |||
216 | } | 203 | } |
217 | 204 | ||
218 | /* allocate a tc. At startup only tc0 is running, all other can be halted. */ | 205 | /* allocate a tc. At startup only tc0 is running, all other can be halted. */ |
219 | struct tc *alloc_tc(int index) | 206 | static struct tc *alloc_tc(int index) |
220 | { | 207 | { |
221 | struct tc *tc; | 208 | struct tc *tc; |
222 | 209 | ||
@@ -232,7 +219,7 @@ out: | |||
232 | } | 219 | } |
233 | 220 | ||
234 | /* clean up and free everything */ | 221 | /* clean up and free everything */ |
235 | void release_vpe(struct vpe *v) | 222 | static void release_vpe(struct vpe *v) |
236 | { | 223 | { |
237 | list_del(&v->list); | 224 | list_del(&v->list); |
238 | if (v->load_addr) | 225 | if (v->load_addr) |
@@ -240,7 +227,7 @@ void release_vpe(struct vpe *v) | |||
240 | kfree(v); | 227 | kfree(v); |
241 | } | 228 | } |
242 | 229 | ||
243 | void dump_mtregs(void) | 230 | static void dump_mtregs(void) |
244 | { | 231 | { |
245 | unsigned long val; | 232 | unsigned long val; |
246 | 233 | ||
@@ -327,7 +314,8 @@ static void layout_sections(struct module *mod, const Elf_Ehdr * hdr, | |||
327 | || (s->sh_flags & masks[m][1]) | 314 | || (s->sh_flags & masks[m][1]) |
328 | || s->sh_entsize != ~0UL) | 315 | || s->sh_entsize != ~0UL) |
329 | continue; | 316 | continue; |
330 | s->sh_entsize = get_offset(&mod->core_size, s); | 317 | s->sh_entsize = |
318 | get_offset((unsigned long *)&mod->core_size, s); | ||
331 | } | 319 | } |
332 | 320 | ||
333 | if (m == 0) | 321 | if (m == 0) |
@@ -461,16 +449,15 @@ static int apply_r_mips_lo16(struct module *me, uint32_t *location, | |||
461 | { | 449 | { |
462 | unsigned long insnlo = *location; | 450 | unsigned long insnlo = *location; |
463 | Elf32_Addr val, vallo; | 451 | Elf32_Addr val, vallo; |
452 | struct mips_hi16 *l, *next; | ||
464 | 453 | ||
465 | /* Sign extend the addend we extract from the lo insn. */ | 454 | /* Sign extend the addend we extract from the lo insn. */ |
466 | vallo = ((insnlo & 0xffff) ^ 0x8000) - 0x8000; | 455 | vallo = ((insnlo & 0xffff) ^ 0x8000) - 0x8000; |
467 | 456 | ||
468 | if (mips_hi16_list != NULL) { | 457 | if (mips_hi16_list != NULL) { |
469 | struct mips_hi16 *l; | ||
470 | 458 | ||
471 | l = mips_hi16_list; | 459 | l = mips_hi16_list; |
472 | while (l != NULL) { | 460 | while (l != NULL) { |
473 | struct mips_hi16 *next; | ||
474 | unsigned long insn; | 461 | unsigned long insn; |
475 | 462 | ||
476 | /* | 463 | /* |
@@ -480,7 +467,7 @@ static int apply_r_mips_lo16(struct module *me, uint32_t *location, | |||
480 | printk(KERN_DEBUG "VPE loader: " | 467 | printk(KERN_DEBUG "VPE loader: " |
481 | "apply_r_mips_lo16/hi16: \t" | 468 | "apply_r_mips_lo16/hi16: \t" |
482 | "inconsistent value information\n"); | 469 | "inconsistent value information\n"); |
483 | return -ENOEXEC; | 470 | goto out_free; |
484 | } | 471 | } |
485 | 472 | ||
486 | /* | 473 | /* |
@@ -518,6 +505,16 @@ static int apply_r_mips_lo16(struct module *me, uint32_t *location, | |||
518 | *location = insnlo; | 505 | *location = insnlo; |
519 | 506 | ||
520 | return 0; | 507 | return 0; |
508 | |||
509 | out_free: | ||
510 | while (l != NULL) { | ||
511 | next = l->next; | ||
512 | kfree(l); | ||
513 | l = next; | ||
514 | } | ||
515 | mips_hi16_list = NULL; | ||
516 | |||
517 | return -ENOEXEC; | ||
521 | } | 518 | } |
522 | 519 | ||
523 | static int (*reloc_handlers[]) (struct module *me, uint32_t *location, | 520 | static int (*reloc_handlers[]) (struct module *me, uint32_t *location, |
@@ -541,7 +538,7 @@ static char *rstrs[] = { | |||
541 | [R_MIPS_PC16] = "MIPS_PC16" | 538 | [R_MIPS_PC16] = "MIPS_PC16" |
542 | }; | 539 | }; |
543 | 540 | ||
544 | int apply_relocations(Elf32_Shdr *sechdrs, | 541 | static int apply_relocations(Elf32_Shdr *sechdrs, |
545 | const char *strtab, | 542 | const char *strtab, |
546 | unsigned int symindex, | 543 | unsigned int symindex, |
547 | unsigned int relsec, | 544 | unsigned int relsec, |
@@ -586,7 +583,7 @@ int apply_relocations(Elf32_Shdr *sechdrs, | |||
586 | return 0; | 583 | return 0; |
587 | } | 584 | } |
588 | 585 | ||
589 | void save_gp_address(unsigned int secbase, unsigned int rel) | 586 | static inline void save_gp_address(unsigned int secbase, unsigned int rel) |
590 | { | 587 | { |
591 | gp_addr = secbase + rel; | 588 | gp_addr = secbase + rel; |
592 | gp_offs = gp_addr - (secbase & 0xffff0000); | 589 | gp_offs = gp_addr - (secbase & 0xffff0000); |
diff --git a/arch/mips/mipssim/sim_time.c b/arch/mips/mipssim/sim_time.c index 0cea932f1241..5492c42f7650 100644 --- a/arch/mips/mipssim/sim_time.c +++ b/arch/mips/mipssim/sim_time.c | |||
@@ -89,13 +89,13 @@ unsigned __cpuinit get_c0_compare_int(void) | |||
89 | if (cpu_has_veic) { | 89 | if (cpu_has_veic) { |
90 | set_vi_handler(MSC01E_INT_CPUCTR, mips_timer_dispatch); | 90 | set_vi_handler(MSC01E_INT_CPUCTR, mips_timer_dispatch); |
91 | mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR; | 91 | mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR; |
92 | } else { | 92 | |
93 | #endif | 93 | return mips_cpu_timer_irq; |
94 | { | ||
95 | if (cpu_has_vint) | ||
96 | set_vi_handler(cp0_compare_irq, mips_timer_dispatch); | ||
97 | mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq; | ||
98 | } | 94 | } |
95 | #endif | ||
96 | if (cpu_has_vint) | ||
97 | set_vi_handler(cp0_compare_irq, mips_timer_dispatch); | ||
98 | mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq; | ||
99 | 99 | ||
100 | return mips_cpu_timer_irq; | 100 | return mips_cpu_timer_irq; |
101 | } | 101 | } |
diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c index b165cdcb2818..10ab69f7183f 100644 --- a/arch/mips/mm/c-octeon.c +++ b/arch/mips/mm/c-octeon.c | |||
@@ -289,7 +289,7 @@ static void cache_parity_error_octeon(int non_recoverable) | |||
289 | } | 289 | } |
290 | 290 | ||
291 | /** | 291 | /** |
292 | * Called when the the exception is not recoverable | 292 | * Called when the the exception is recoverable |
293 | */ | 293 | */ |
294 | 294 | ||
295 | asmlinkage void cache_parity_error_octeon_recoverable(void) | 295 | asmlinkage void cache_parity_error_octeon_recoverable(void) |
@@ -298,7 +298,7 @@ asmlinkage void cache_parity_error_octeon_recoverable(void) | |||
298 | } | 298 | } |
299 | 299 | ||
300 | /** | 300 | /** |
301 | * Called when the the exception is recoverable | 301 | * Called when the the exception is not recoverable |
302 | */ | 302 | */ |
303 | 303 | ||
304 | asmlinkage void cache_parity_error_octeon_non_recoverable(void) | 304 | asmlinkage void cache_parity_error_octeon_non_recoverable(void) |
diff --git a/arch/mips/mm/extable.c b/arch/mips/mm/extable.c index 297fb9f390dc..9d25d2ba4b9e 100644 --- a/arch/mips/mm/extable.c +++ b/arch/mips/mm/extable.c | |||
@@ -1,5 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/mm/extable.c | 2 | * This file is subject to the terms and conditions of the GNU General Public |
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 1997, 99, 2001 - 2004 Ralf Baechle <ralf@linux-mips.org> | ||
3 | */ | 7 | */ |
4 | #include <linux/module.h> | 8 | #include <linux/module.h> |
5 | #include <linux/spinlock.h> | 9 | #include <linux/spinlock.h> |
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index 6751ce9ede9e..f956ecbb8136 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c | |||
@@ -171,6 +171,7 @@ out_of_memory: | |||
171 | * We ran out of memory, call the OOM killer, and return the userspace | 171 | * We ran out of memory, call the OOM killer, and return the userspace |
172 | * (which will retry the fault, or kill us if we got oom-killed). | 172 | * (which will retry the fault, or kill us if we got oom-killed). |
173 | */ | 173 | */ |
174 | up_read(&mm->mmap_sem); | ||
174 | pagefault_out_of_memory(); | 175 | pagefault_out_of_memory(); |
175 | return; | 176 | return; |
176 | 177 | ||
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c index a8756f82c31b..3e0a9b35ba5c 100644 --- a/arch/mips/mti-malta/malta-int.c +++ b/arch/mips/mti-malta/malta-int.c | |||
@@ -331,6 +331,7 @@ static struct irqaction irq_call = { | |||
331 | .flags = IRQF_DISABLED|IRQF_PERCPU, | 331 | .flags = IRQF_DISABLED|IRQF_PERCPU, |
332 | .name = "IPI_call" | 332 | .name = "IPI_call" |
333 | }; | 333 | }; |
334 | #endif /* CONFIG_MIPS_MT_SMP */ | ||
334 | 335 | ||
335 | static int gic_resched_int_base; | 336 | static int gic_resched_int_base; |
336 | static int gic_call_int_base; | 337 | static int gic_call_int_base; |
@@ -346,7 +347,6 @@ unsigned int plat_ipi_resched_int_xlate(unsigned int cpu) | |||
346 | { | 347 | { |
347 | return GIC_RESCHED_INT(cpu); | 348 | return GIC_RESCHED_INT(cpu); |
348 | } | 349 | } |
349 | #endif /* CONFIG_MIPS_MT_SMP */ | ||
350 | 350 | ||
351 | static struct irqaction i8259irq = { | 351 | static struct irqaction i8259irq = { |
352 | .handler = no_action, | 352 | .handler = no_action, |
diff --git a/arch/mips/nxp/pnx8550/common/time.c b/arch/mips/nxp/pnx8550/common/time.c index 8df43e9e4d90..18b192784877 100644 --- a/arch/mips/nxp/pnx8550/common/time.c +++ b/arch/mips/nxp/pnx8550/common/time.c | |||
@@ -138,7 +138,7 @@ __init void plat_time_init(void) | |||
138 | * HZ timer interrupts per second. | 138 | * HZ timer interrupts per second. |
139 | */ | 139 | */ |
140 | mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p)); | 140 | mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p)); |
141 | cpj = (mips_hpt_frequency + HZ / 2) / HZ; | 141 | cpj = DIV_ROUND_CLOSEST(mips_hpt_frequency, HZ); |
142 | write_c0_count(0); | 142 | write_c0_count(0); |
143 | timer_ack(); | 143 | timer_ack(); |
144 | 144 | ||
diff --git a/arch/mips/pci/fixup-emma2rh.c b/arch/mips/pci/fixup-emma2rh.c index fba5aad00d51..0d9ccf4dfc5a 100644 --- a/arch/mips/pci/fixup-emma2rh.c +++ b/arch/mips/pci/fixup-emma2rh.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/pci/fixup-emma2rh.c | ||
3 | * This file defines the PCI configration. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2004-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2004-2006 |
6 | * | 3 | * |
7 | * This file is based on the arch/mips/ddb5xxx/ddb5477/pci.c | 4 | * This file is based on the arch/mips/ddb5xxx/ddb5477/pci.c |
diff --git a/arch/mips/pci/fixup-sb1250.c b/arch/mips/pci/fixup-sb1250.c index 0ad39e53f7b1..f0bb9146e6c0 100644 --- a/arch/mips/pci/fixup-sb1250.c +++ b/arch/mips/pci/fixup-sb1250.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/pci/fixup-sb1250.c | ||
3 | * | ||
4 | * Copyright (C) 2004, 2006 MIPS Technologies, Inc. All rights reserved. | 2 | * Copyright (C) 2004, 2006 MIPS Technologies, Inc. All rights reserved. |
5 | * Author: Maciej W. Rozycki <macro@mips.com> | 3 | * Author: Maciej W. Rozycki <macro@mips.com> |
6 | * | 4 | * |
diff --git a/arch/mips/pci/ops-emma2rh.c b/arch/mips/pci/ops-emma2rh.c index 5947a70b0b7f..710aef5c070e 100644 --- a/arch/mips/pci/ops-emma2rh.c +++ b/arch/mips/pci/ops-emma2rh.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/pci/ops-emma2rh.c | ||
3 | * This file defines the PCI operation for EMMA2RH. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2004-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2004-2006 |
6 | * | 3 | * |
7 | * This file is based on the arch/mips/pci/ops-vr41xx.c | 4 | * This file is based on the arch/mips/pci/ops-vr41xx.c |
diff --git a/arch/mips/pci/pci-emma2rh.c b/arch/mips/pci/pci-emma2rh.c index 2df4190232cd..773e34ff4d1c 100644 --- a/arch/mips/pci/pci-emma2rh.c +++ b/arch/mips/pci/pci-emma2rh.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/pci/pci-emma2rh.c | ||
3 | * This file defines the PCI configration. | ||
4 | * | ||
5 | * Copyright (C) NEC Electronics Corporation 2004-2006 | 2 | * Copyright (C) NEC Electronics Corporation 2004-2006 |
6 | * | 3 | * |
7 | * This file is based on the arch/mips/ddb5xxx/ddb5477/pci.c | 4 | * This file is based on the arch/mips/ddb5xxx/ddb5477/pci.c |
diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c index aaa900596792..a5807406a7f1 100644 --- a/arch/mips/pci/pci-tx4927.c +++ b/arch/mips/pci/pci-tx4927.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/pci/pci-tx4927.c | ||
3 | * | ||
4 | * Based on linux/arch/mips/txx9/rbtx4938/setup.c, | 2 | * Based on linux/arch/mips/txx9/rbtx4938/setup.c, |
5 | * and RBTX49xx patch from CELF patch archive. | 3 | * and RBTX49xx patch from CELF patch archive. |
6 | * | 4 | * |
diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c index 1ea257bc3b8f..20e45f30b2ef 100644 --- a/arch/mips/pci/pci-tx4938.c +++ b/arch/mips/pci/pci-tx4938.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/pci/pci-tx4938.c | ||
3 | * | ||
4 | * Based on linux/arch/mips/txx9/rbtx4938/setup.c, | 2 | * Based on linux/arch/mips/txx9/rbtx4938/setup.c, |
5 | * and RBTX49xx patch from CELF patch archive. | 3 | * and RBTX49xx patch from CELF patch archive. |
6 | * | 4 | * |
diff --git a/arch/mips/pci/pci-tx4939.c b/arch/mips/pci/pci-tx4939.c index 5fecf1cdc325..9ef840693baf 100644 --- a/arch/mips/pci/pci-tx4939.c +++ b/arch/mips/pci/pci-tx4939.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/pci/pci-tx4939.c | ||
3 | * | ||
4 | * Based on linux/arch/mips/txx9/rbtx4939/setup.c, | 2 | * Based on linux/arch/mips/txx9/rbtx4939/setup.c, |
5 | * and RBTX49xx patch from CELF patch archive. | 3 | * and RBTX49xx patch from CELF patch archive. |
6 | * | 4 | * |
diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c index 75262247f3e4..6aa5c542d52d 100644 --- a/arch/mips/pci/pcie-octeon.c +++ b/arch/mips/pci/pcie-octeon.c | |||
@@ -1040,19 +1040,29 @@ static inline int octeon_pcie_read_config(int pcie_port, struct pci_bus *bus, | |||
1040 | int bus_number = bus->number; | 1040 | int bus_number = bus->number; |
1041 | 1041 | ||
1042 | /* | 1042 | /* |
1043 | * We need to force the bus number to be zero on the root | 1043 | * For the top level bus make sure our hardware bus number |
1044 | * bus. Linux numbers the 2nd root bus to start after all | 1044 | * matches the software one. |
1045 | * buses on root 0. | ||
1046 | */ | 1045 | */ |
1047 | if (bus->parent == NULL) | 1046 | if (bus->parent == NULL) { |
1048 | bus_number = 0; | 1047 | union cvmx_pciercx_cfg006 pciercx_cfg006; |
1048 | pciercx_cfg006.u32 = cvmx_pcie_cfgx_read(pcie_port, | ||
1049 | CVMX_PCIERCX_CFG006(pcie_port)); | ||
1050 | if (pciercx_cfg006.s.pbnum != bus_number) { | ||
1051 | pciercx_cfg006.s.pbnum = bus_number; | ||
1052 | pciercx_cfg006.s.sbnum = bus_number; | ||
1053 | pciercx_cfg006.s.subbnum = bus_number; | ||
1054 | cvmx_pcie_cfgx_write(pcie_port, | ||
1055 | CVMX_PCIERCX_CFG006(pcie_port), | ||
1056 | pciercx_cfg006.u32); | ||
1057 | } | ||
1058 | } | ||
1049 | 1059 | ||
1050 | /* | 1060 | /* |
1051 | * PCIe only has a single device connected to Octeon. It is | 1061 | * PCIe only has a single device connected to Octeon. It is |
1052 | * always device ID 0. Don't bother doing reads for other | 1062 | * always device ID 0. Don't bother doing reads for other |
1053 | * device IDs on the first segment. | 1063 | * device IDs on the first segment. |
1054 | */ | 1064 | */ |
1055 | if ((bus_number == 0) && (devfn >> 3 != 0)) | 1065 | if ((bus->parent == NULL) && (devfn >> 3 != 0)) |
1056 | return PCIBIOS_FUNC_NOT_SUPPORTED; | 1066 | return PCIBIOS_FUNC_NOT_SUPPORTED; |
1057 | 1067 | ||
1058 | /* | 1068 | /* |
@@ -1070,7 +1080,7 @@ static inline int octeon_pcie_read_config(int pcie_port, struct pci_bus *bus, | |||
1070 | * bridge only respondes to device ID 0, function | 1080 | * bridge only respondes to device ID 0, function |
1071 | * 0-1 | 1081 | * 0-1 |
1072 | */ | 1082 | */ |
1073 | if ((bus_number == 0) && (devfn >= 2)) | 1083 | if ((bus->parent == NULL) && (devfn >= 2)) |
1074 | return PCIBIOS_FUNC_NOT_SUPPORTED; | 1084 | return PCIBIOS_FUNC_NOT_SUPPORTED; |
1075 | /* | 1085 | /* |
1076 | * The PCI-X slots are device ID 2,3. Choose one of | 1086 | * The PCI-X slots are device ID 2,3. Choose one of |
@@ -1167,13 +1177,6 @@ static inline int octeon_pcie_write_config(int pcie_port, struct pci_bus *bus, | |||
1167 | int size, u32 val) | 1177 | int size, u32 val) |
1168 | { | 1178 | { |
1169 | int bus_number = bus->number; | 1179 | int bus_number = bus->number; |
1170 | /* | ||
1171 | * We need to force the bus number to be zero on the root | ||
1172 | * bus. Linux numbers the 2nd root bus to start after all | ||
1173 | * busses on root 0. | ||
1174 | */ | ||
1175 | if (bus->parent == NULL) | ||
1176 | bus_number = 0; | ||
1177 | 1180 | ||
1178 | switch (size) { | 1181 | switch (size) { |
1179 | case 4: | 1182 | case 4: |
diff --git a/arch/mips/pmc-sierra/msp71xx/gpio.c b/arch/mips/pmc-sierra/msp71xx/gpio.c index 69848c5813e2..aaccbe524386 100644 --- a/arch/mips/pmc-sierra/msp71xx/gpio.c +++ b/arch/mips/pmc-sierra/msp71xx/gpio.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * @file /arch/mips/pmc-sierra/msp71xx/gpio.c | ||
3 | * | ||
4 | * Generic PMC MSP71xx GPIO handling. These base gpio are controlled by two | 2 | * Generic PMC MSP71xx GPIO handling. These base gpio are controlled by two |
5 | * types of registers. The data register sets the output level when in output | 3 | * types of registers. The data register sets the output level when in output |
6 | * mode and when in input mode will contain the value at the input. The config | 4 | * mode and when in input mode will contain the value at the input. The config |
diff --git a/arch/mips/pmc-sierra/msp71xx/gpio_extended.c b/arch/mips/pmc-sierra/msp71xx/gpio_extended.c index fc6dbc6cf1c0..2a99f360fae4 100644 --- a/arch/mips/pmc-sierra/msp71xx/gpio_extended.c +++ b/arch/mips/pmc-sierra/msp71xx/gpio_extended.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * @file /arch/mips/pmc-sierra/msp71xx/gpio_extended.c | ||
3 | * | ||
4 | * Generic PMC MSP71xx EXTENDED (EXD) GPIO handling. The extended gpio is | 2 | * Generic PMC MSP71xx EXTENDED (EXD) GPIO handling. The extended gpio is |
5 | * a set of hardware registers that have no need for explicit locking as | 3 | * a set of hardware registers that have no need for explicit locking as |
6 | * it is handled by unique method of writing individual set/clr bits. | 4 | * it is handled by unique method of writing individual set/clr bits. |
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c index f5f1b8d2bb9a..61f390232346 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c | |||
@@ -45,13 +45,6 @@ static inline void mask_msp_slp_irq(unsigned int irq) | |||
45 | */ | 45 | */ |
46 | static inline void ack_msp_slp_irq(unsigned int irq) | 46 | static inline void ack_msp_slp_irq(unsigned int irq) |
47 | { | 47 | { |
48 | mask_slp_irq(irq); | ||
49 | |||
50 | /* | ||
51 | * only really necessary for 18, 16-14 and sometimes 3:0 (since | ||
52 | * these can be edge sensitive) but it doesn't hurt for the others. | ||
53 | */ | ||
54 | |||
55 | /* check for PER interrupt range */ | 48 | /* check for PER interrupt range */ |
56 | if (irq < MSP_PER_INTBASE) | 49 | if (irq < MSP_PER_INTBASE) |
57 | *SLP_INT_STS_REG = (1 << (irq - MSP_SLP_INTBASE)); | 50 | *SLP_INT_STS_REG = (1 << (irq - MSP_SLP_INTBASE)); |
@@ -62,8 +55,7 @@ static inline void ack_msp_slp_irq(unsigned int irq) | |||
62 | static struct irq_chip msp_slp_irq_controller = { | 55 | static struct irq_chip msp_slp_irq_controller = { |
63 | .name = "MSP_SLP", | 56 | .name = "MSP_SLP", |
64 | .ack = ack_msp_slp_irq, | 57 | .ack = ack_msp_slp_irq, |
65 | .mask = ack_msp_slp_irq, | 58 | .mask = mask_msp_slp_irq, |
66 | .mask_ack = ack_msp_slp_irq, | ||
67 | .unmask = unmask_msp_slp_irq, | 59 | .unmask = unmask_msp_slp_irq, |
68 | }; | 60 | }; |
69 | 61 | ||
@@ -79,7 +71,7 @@ void __init msp_slp_irq_init(void) | |||
79 | 71 | ||
80 | /* initialize all the IRQ descriptors */ | 72 | /* initialize all the IRQ descriptors */ |
81 | for (i = MSP_SLP_INTBASE; i < MSP_PER_INTBASE + 32; i++) | 73 | for (i = MSP_SLP_INTBASE; i < MSP_PER_INTBASE + 32; i++) |
82 | set_irq_chip_and_handler(i, &msp_slp_irq_controller | 74 | set_irq_chip_and_handler(i, &msp_slp_irq_controller, |
83 | handle_level_irq); | 75 | handle_level_irq); |
84 | } | 76 | } |
85 | 77 | ||
diff --git a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c index caf5e9a0acc7..fc990cb31941 100644 --- a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c +++ b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | ||
3 | * | ||
4 | * Copyright (C) 2003 PMC-Sierra Inc. | 2 | * Copyright (C) 2003 PMC-Sierra Inc. |
5 | * Author: Manish Lachwani (lachwani@pmc-sierra.com) | 3 | * Author: Manish Lachwani (lachwani@pmc-sierra.com) |
6 | * | 4 | * |
diff --git a/arch/mips/sibyte/swarm/swarm-i2c.c b/arch/mips/sibyte/swarm/swarm-i2c.c index 4282ac9d01d2..062505054d42 100644 --- a/arch/mips/sibyte/swarm/swarm-i2c.c +++ b/arch/mips/sibyte/swarm/swarm-i2c.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/mips/sibyte/swarm/swarm-i2c.c | ||
3 | * | ||
4 | * Broadcom BCM91250A (SWARM), etc. I2C platform setup. | 2 | * Broadcom BCM91250A (SWARM), etc. I2C platform setup. |
5 | * | 3 | * |
6 | * Copyright (c) 2008 Maciej W. Rozycki | 4 | * Copyright (c) 2008 Maciej W. Rozycki |
diff --git a/arch/mips/txx9/generic/mem_tx4927.c b/arch/mips/txx9/generic/mem_tx4927.c index ef6ea6e97873..70f9626f8227 100644 --- a/arch/mips/txx9/generic/mem_tx4927.c +++ b/arch/mips/txx9/generic/mem_tx4927.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/txx9/generic/mem_tx4927.c | ||
3 | * | ||
4 | * common tx4927 memory interface | 2 | * common tx4927 memory interface |
5 | * | 3 | * |
6 | * Author: MontaVista Software, Inc. | 4 | * Author: MontaVista Software, Inc. |
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 3b7d77d61ce0..a205e2ba8e7b 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/mips/txx9/generic/setup.c | ||
3 | * | ||
4 | * Based on linux/arch/mips/txx9/rbtx4938/setup.c, | 2 | * Based on linux/arch/mips/txx9/rbtx4938/setup.c, |
5 | * and RBTX49xx patch from CELF patch archive. | 3 | * and RBTX49xx patch from CELF patch archive. |
6 | * | 4 | * |
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c index c033ffe71cdf..b0c241ecf603 100644 --- a/arch/mips/txx9/rbtx4939/setup.c +++ b/arch/mips/txx9/rbtx4939/setup.c | |||
@@ -512,10 +512,10 @@ static void __init rbtx4939_setup(void) | |||
512 | rbtx4939_ebusc_setup(); | 512 | rbtx4939_ebusc_setup(); |
513 | /* always enable ATA0 */ | 513 | /* always enable ATA0 */ |
514 | txx9_set64(&tx4939_ccfgptr->pcfg, TX4939_PCFG_ATA0MODE); | 514 | txx9_set64(&tx4939_ccfgptr->pcfg, TX4939_PCFG_ATA0MODE); |
515 | rbtx4939_update_ioc_pen(); | ||
516 | if (txx9_master_clock == 0) | 515 | if (txx9_master_clock == 0) |
517 | txx9_master_clock = 20000000; | 516 | txx9_master_clock = 20000000; |
518 | tx4939_setup(); | 517 | tx4939_setup(); |
518 | rbtx4939_update_ioc_pen(); | ||
519 | #ifdef HAVE_RBTX4939_IOSWAB | 519 | #ifdef HAVE_RBTX4939_IOSWAB |
520 | ioswabw = rbtx4939_ioswabw; | 520 | ioswabw = rbtx4939_ioswabw; |
521 | __mem_ioswabw = rbtx4939_mem_ioswabw; | 521 | __mem_ioswabw = rbtx4939_mem_ioswabw; |
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 35d2ed6396f6..19aecc90f7a4 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h | |||
@@ -59,7 +59,6 @@ void pcibios_penalize_isa_irq(int irq); | |||
59 | #include <linux/slab.h> | 59 | #include <linux/slab.h> |
60 | #include <asm/scatterlist.h> | 60 | #include <asm/scatterlist.h> |
61 | #include <linux/string.h> | 61 | #include <linux/string.h> |
62 | #include <linux/mm.h> | ||
63 | #include <asm/io.h> | 62 | #include <asm/io.h> |
64 | 63 | ||
65 | struct pci_dev; | 64 | struct pci_dev; |
diff --git a/arch/mn10300/include/asm/pgalloc.h b/arch/mn10300/include/asm/pgalloc.h index ec057e1bd4cf..a19f11327cd8 100644 --- a/arch/mn10300/include/asm/pgalloc.h +++ b/arch/mn10300/include/asm/pgalloc.h | |||
@@ -51,6 +51,6 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte) | |||
51 | } | 51 | } |
52 | 52 | ||
53 | 53 | ||
54 | #define __pte_free_tlb(tlb, pte) tlb_remove_page((tlb), (pte)) | 54 | #define __pte_free_tlb(tlb, pte, addr) tlb_remove_page((tlb), (pte)) |
55 | 55 | ||
56 | #endif /* _ASM_PGALLOC_H */ | 56 | #endif /* _ASM_PGALLOC_H */ |
diff --git a/arch/parisc/include/asm/tlb.h b/arch/parisc/include/asm/tlb.h index 383b1db310ee..07924903989e 100644 --- a/arch/parisc/include/asm/tlb.h +++ b/arch/parisc/include/asm/tlb.h | |||
@@ -21,7 +21,7 @@ do { if (!(tlb)->fullmm) \ | |||
21 | 21 | ||
22 | #include <asm-generic/tlb.h> | 22 | #include <asm-generic/tlb.h> |
23 | 23 | ||
24 | #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd) | 24 | #define __pmd_free_tlb(tlb, pmd, addr) pmd_free((tlb)->mm, pmd) |
25 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) | 25 | #define __pte_free_tlb(tlb, pte, addr) pte_free((tlb)->mm, pte) |
26 | 26 | ||
27 | #endif | 27 | #endif |
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index ae3e70cd1e14..e552e547cb93 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
@@ -553,7 +553,7 @@ | |||
553 | * on most of those machines only handles cache transactions. | 553 | * on most of those machines only handles cache transactions. |
554 | */ | 554 | */ |
555 | extrd,u,*= \pte,_PAGE_NO_CACHE_BIT+32,1,%r0 | 555 | extrd,u,*= \pte,_PAGE_NO_CACHE_BIT+32,1,%r0 |
556 | depi 1,12,1,\prot | 556 | depdi 1,12,1,\prot |
557 | 557 | ||
558 | /* Drop prot bits and convert to page addr for iitlbt and idtlbt */ | 558 | /* Drop prot bits and convert to page addr for iitlbt and idtlbt */ |
559 | convert_for_tlb_insert20 \pte | 559 | convert_for_tlb_insert20 \pte |
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index ef5caf2e6ed0..61ee0eec4e69 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c | |||
@@ -86,8 +86,12 @@ | |||
86 | * the bottom of the table, which has a maximum signed displacement of | 86 | * the bottom of the table, which has a maximum signed displacement of |
87 | * 0x3fff; however, since we're only going forward, this becomes | 87 | * 0x3fff; however, since we're only going forward, this becomes |
88 | * 0x1fff, and thus, since each GOT entry is 8 bytes long we can have | 88 | * 0x1fff, and thus, since each GOT entry is 8 bytes long we can have |
89 | * at most 1023 entries */ | 89 | * at most 1023 entries. |
90 | #define MAX_GOTS 1023 | 90 | * To overcome this 14bit displacement with some kernel modules, we'll |
91 | * use instead the unusal 16bit displacement method (see reassemble_16a) | ||
92 | * which gives us a maximum positive displacement of 0x7fff, and as such | ||
93 | * allows us to allocate up to 4095 GOT entries. */ | ||
94 | #define MAX_GOTS 4095 | ||
91 | 95 | ||
92 | /* three functions to determine where in the module core | 96 | /* three functions to determine where in the module core |
93 | * or init pieces the location is */ | 97 | * or init pieces the location is */ |
@@ -145,12 +149,40 @@ struct stub_entry { | |||
145 | /* The reassemble_* functions prepare an immediate value for | 149 | /* The reassemble_* functions prepare an immediate value for |
146 | insertion into an opcode. pa-risc uses all sorts of weird bitfields | 150 | insertion into an opcode. pa-risc uses all sorts of weird bitfields |
147 | in the instruction to hold the value. */ | 151 | in the instruction to hold the value. */ |
152 | static inline int sign_unext(int x, int len) | ||
153 | { | ||
154 | int len_ones; | ||
155 | |||
156 | len_ones = (1 << len) - 1; | ||
157 | return x & len_ones; | ||
158 | } | ||
159 | |||
160 | static inline int low_sign_unext(int x, int len) | ||
161 | { | ||
162 | int sign, temp; | ||
163 | |||
164 | sign = (x >> (len-1)) & 1; | ||
165 | temp = sign_unext(x, len-1); | ||
166 | return (temp << 1) | sign; | ||
167 | } | ||
168 | |||
148 | static inline int reassemble_14(int as14) | 169 | static inline int reassemble_14(int as14) |
149 | { | 170 | { |
150 | return (((as14 & 0x1fff) << 1) | | 171 | return (((as14 & 0x1fff) << 1) | |
151 | ((as14 & 0x2000) >> 13)); | 172 | ((as14 & 0x2000) >> 13)); |
152 | } | 173 | } |
153 | 174 | ||
175 | static inline int reassemble_16a(int as16) | ||
176 | { | ||
177 | int s, t; | ||
178 | |||
179 | /* Unusual 16-bit encoding, for wide mode only. */ | ||
180 | t = (as16 << 1) & 0xffff; | ||
181 | s = (as16 & 0x8000); | ||
182 | return (t ^ s ^ (s >> 1)) | (s >> 15); | ||
183 | } | ||
184 | |||
185 | |||
154 | static inline int reassemble_17(int as17) | 186 | static inline int reassemble_17(int as17) |
155 | { | 187 | { |
156 | return (((as17 & 0x10000) >> 16) | | 188 | return (((as17 & 0x10000) >> 16) | |
@@ -407,6 +439,7 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend, | |||
407 | enum elf_stub_type stub_type, Elf_Addr loc0, unsigned int targetsec) | 439 | enum elf_stub_type stub_type, Elf_Addr loc0, unsigned int targetsec) |
408 | { | 440 | { |
409 | struct stub_entry *stub; | 441 | struct stub_entry *stub; |
442 | int __maybe_unused d; | ||
410 | 443 | ||
411 | /* initialize stub_offset to point in front of the section */ | 444 | /* initialize stub_offset to point in front of the section */ |
412 | if (!me->arch.section[targetsec].stub_offset) { | 445 | if (!me->arch.section[targetsec].stub_offset) { |
@@ -460,12 +493,19 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend, | |||
460 | */ | 493 | */ |
461 | switch (stub_type) { | 494 | switch (stub_type) { |
462 | case ELF_STUB_GOT: | 495 | case ELF_STUB_GOT: |
463 | stub->insns[0] = 0x537b0000; /* ldd 0(%dp),%dp */ | 496 | d = get_got(me, value, addend); |
497 | if (d <= 15) { | ||
498 | /* Format 5 */ | ||
499 | stub->insns[0] = 0x0f6010db; /* ldd 0(%dp),%dp */ | ||
500 | stub->insns[0] |= low_sign_unext(d, 5) << 16; | ||
501 | } else { | ||
502 | /* Format 3 */ | ||
503 | stub->insns[0] = 0x537b0000; /* ldd 0(%dp),%dp */ | ||
504 | stub->insns[0] |= reassemble_16a(d); | ||
505 | } | ||
464 | stub->insns[1] = 0x53610020; /* ldd 10(%dp),%r1 */ | 506 | stub->insns[1] = 0x53610020; /* ldd 10(%dp),%r1 */ |
465 | stub->insns[2] = 0xe820d000; /* bve (%r1) */ | 507 | stub->insns[2] = 0xe820d000; /* bve (%r1) */ |
466 | stub->insns[3] = 0x537b0030; /* ldd 18(%dp),%dp */ | 508 | stub->insns[3] = 0x537b0030; /* ldd 18(%dp),%dp */ |
467 | |||
468 | stub->insns[0] |= reassemble_14(get_got(me, value, addend) & 0x3fff); | ||
469 | break; | 509 | break; |
470 | case ELF_STUB_MILLI: | 510 | case ELF_STUB_MILLI: |
471 | stub->insns[0] = 0x20200000; /* ldil 0,%r1 */ | 511 | stub->insns[0] = 0x20200000; /* ldil 0,%r1 */ |
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 224b4f0704b8..4f06dbc0d27e 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
@@ -410,7 +410,7 @@ | |||
410 | bus-range = <0 0>; | 410 | bus-range = <0 0>; |
411 | ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 | 411 | ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 |
412 | 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 | 412 | 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 |
413 | 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>; | 413 | 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>; |
414 | sleep = <&pmc 0x00010000>; | 414 | sleep = <&pmc 0x00010000>; |
415 | clock-frequency = <66666666>; | 415 | clock-frequency = <66666666>; |
416 | #interrupt-cells = <1>; | 416 | #interrupt-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 474ea2fa3f86..aabf3437cadf 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
@@ -394,7 +394,7 @@ | |||
394 | bus-range = <0 0>; | 394 | bus-range = <0 0>; |
395 | ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 | 395 | ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 |
396 | 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 | 396 | 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 |
397 | 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>; | 397 | 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>; |
398 | sleep = <&pmc 0x00010000>; | 398 | sleep = <&pmc 0x00010000>; |
399 | clock-frequency = <66666666>; | 399 | clock-frequency = <66666666>; |
400 | #interrupt-cells = <1>; | 400 | #interrupt-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index d4838af8d379..9b1da864d890 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
@@ -424,7 +424,7 @@ | |||
424 | bus-range = <0x0 0x0>; | 424 | bus-range = <0x0 0x0>; |
425 | ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 | 425 | ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 |
426 | 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 | 426 | 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 |
427 | 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>; | 427 | 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>; |
428 | sleep = <&pmc 0x00010000>; | 428 | sleep = <&pmc 0x00010000>; |
429 | clock-frequency = <66666666>; | 429 | clock-frequency = <66666666>; |
430 | #interrupt-cells = <1>; | 430 | #interrupt-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts index a680165292f2..9e4ce99e1613 100644 --- a/arch/powerpc/boot/dts/mpc8569mds.dts +++ b/arch/powerpc/boot/dts/mpc8569mds.dts | |||
@@ -501,6 +501,10 @@ | |||
501 | reg = <0x6>; | 501 | reg = <0x6>; |
502 | device_type = "ethernet-phy"; | 502 | device_type = "ethernet-phy"; |
503 | }; | 503 | }; |
504 | tbi-phy@11 { | ||
505 | reg = <0x11>; | ||
506 | device_type = "tbi-phy"; | ||
507 | }; | ||
504 | }; | 508 | }; |
505 | mdio@3520 { | 509 | mdio@3520 { |
506 | #address-cells = <1>; | 510 | #address-cells = <1>; |
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig index 278939713775..a2df0635b6de 100644 --- a/arch/powerpc/configs/83xx/asp8347_defconfig +++ b/arch/powerpc/configs/83xx/asp8347_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:05 2009 | 4 | # Wed Jul 29 23:32:02 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | CONFIG_FSL_EMB_PERFMON=y | 20 | CONFIG_FSL_EMB_PERFMON=y |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,6 +56,7 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | # CONFIG_DEFAULT_UIMAGE is not set | 60 | # CONFIG_DEFAULT_UIMAGE is not set |
57 | CONFIG_REDBOOT=y | 61 | CONFIG_REDBOOT=y |
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 62 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
@@ -60,6 +64,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
60 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
61 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
63 | 68 | ||
64 | # | 69 | # |
65 | # General setup | 70 | # General setup |
@@ -108,7 +113,6 @@ CONFIG_ANON_INODES=y | |||
108 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
109 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
110 | # CONFIG_KALLSYMS is not set | 115 | # CONFIG_KALLSYMS is not set |
111 | # CONFIG_STRIP_ASM_SYMS is not set | ||
112 | CONFIG_HOTPLUG=y | 116 | CONFIG_HOTPLUG=y |
113 | CONFIG_PRINTK=y | 117 | CONFIG_PRINTK=y |
114 | CONFIG_BUG=y | 118 | CONFIG_BUG=y |
@@ -121,9 +125,16 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 126 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 127 | CONFIG_AIO=y |
128 | CONFIG_HAVE_PERF_COUNTERS=y | ||
129 | |||
130 | # | ||
131 | # Performance Counters | ||
132 | # | ||
133 | # CONFIG_PERF_COUNTERS is not set | ||
124 | CONFIG_VM_EVENT_COUNTERS=y | 134 | CONFIG_VM_EVENT_COUNTERS=y |
125 | CONFIG_PCI_QUIRKS=y | 135 | CONFIG_PCI_QUIRKS=y |
126 | CONFIG_SLUB_DEBUG=y | 136 | CONFIG_SLUB_DEBUG=y |
137 | # CONFIG_STRIP_ASM_SYMS is not set | ||
127 | CONFIG_COMPAT_BRK=y | 138 | CONFIG_COMPAT_BRK=y |
128 | # CONFIG_SLAB is not set | 139 | # CONFIG_SLAB is not set |
129 | CONFIG_SLUB=y | 140 | CONFIG_SLUB=y |
@@ -136,6 +147,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
136 | CONFIG_HAVE_KPROBES=y | 147 | CONFIG_HAVE_KPROBES=y |
137 | CONFIG_HAVE_KRETPROBES=y | 148 | CONFIG_HAVE_KRETPROBES=y |
138 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 149 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
150 | |||
151 | # | ||
152 | # GCOV-based kernel profiling | ||
153 | # | ||
139 | # CONFIG_SLOW_WORK is not set | 154 | # CONFIG_SLOW_WORK is not set |
140 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 155 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
141 | CONFIG_SLABINFO=y | 156 | CONFIG_SLABINFO=y |
@@ -148,7 +163,7 @@ CONFIG_MODULE_UNLOAD=y | |||
148 | # CONFIG_MODVERSIONS is not set | 163 | # CONFIG_MODVERSIONS is not set |
149 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 164 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
150 | CONFIG_BLOCK=y | 165 | CONFIG_BLOCK=y |
151 | # CONFIG_LBD is not set | 166 | CONFIG_LBDAF=y |
152 | # CONFIG_BLK_DEV_BSG is not set | 167 | # CONFIG_BLK_DEV_BSG is not set |
153 | # CONFIG_BLK_DEV_INTEGRITY is not set | 168 | # CONFIG_BLK_DEV_INTEGRITY is not set |
154 | 169 | ||
@@ -190,6 +205,7 @@ CONFIG_PPC_83xx=y | |||
190 | # CONFIG_MPC837x_RDB is not set | 205 | # CONFIG_MPC837x_RDB is not set |
191 | # CONFIG_SBC834x is not set | 206 | # CONFIG_SBC834x is not set |
192 | CONFIG_ASP834x=y | 207 | CONFIG_ASP834x=y |
208 | # CONFIG_KMETER1 is not set | ||
193 | CONFIG_PPC_MPC834x=y | 209 | CONFIG_PPC_MPC834x=y |
194 | # CONFIG_PPC_86xx is not set | 210 | # CONFIG_PPC_86xx is not set |
195 | # CONFIG_EMBEDDED6xx is not set | 211 | # CONFIG_EMBEDDED6xx is not set |
@@ -235,6 +251,7 @@ CONFIG_BINFMT_ELF=y | |||
235 | # CONFIG_HAVE_AOUT is not set | 251 | # CONFIG_HAVE_AOUT is not set |
236 | # CONFIG_BINFMT_MISC is not set | 252 | # CONFIG_BINFMT_MISC is not set |
237 | # CONFIG_IOMMU_HELPER is not set | 253 | # CONFIG_IOMMU_HELPER is not set |
254 | # CONFIG_SWIOTLB is not set | ||
238 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
239 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 256 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
240 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 257 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -255,9 +272,9 @@ CONFIG_MIGRATION=y | |||
255 | CONFIG_ZONE_DMA_FLAG=1 | 272 | CONFIG_ZONE_DMA_FLAG=1 |
256 | CONFIG_BOUNCE=y | 273 | CONFIG_BOUNCE=y |
257 | CONFIG_VIRT_TO_BUS=y | 274 | CONFIG_VIRT_TO_BUS=y |
258 | CONFIG_UNEVICTABLE_LRU=y | ||
259 | CONFIG_HAVE_MLOCK=y | 275 | CONFIG_HAVE_MLOCK=y |
260 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 276 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
277 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
261 | CONFIG_PPC_4K_PAGES=y | 278 | CONFIG_PPC_4K_PAGES=y |
262 | # CONFIG_PPC_16K_PAGES is not set | 279 | # CONFIG_PPC_16K_PAGES is not set |
263 | # CONFIG_PPC_64K_PAGES is not set | 280 | # CONFIG_PPC_64K_PAGES is not set |
@@ -366,6 +383,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
366 | # CONFIG_ECONET is not set | 383 | # CONFIG_ECONET is not set |
367 | # CONFIG_WAN_ROUTER is not set | 384 | # CONFIG_WAN_ROUTER is not set |
368 | # CONFIG_PHONET is not set | 385 | # CONFIG_PHONET is not set |
386 | # CONFIG_IEEE802154 is not set | ||
369 | # CONFIG_NET_SCHED is not set | 387 | # CONFIG_NET_SCHED is not set |
370 | # CONFIG_DCB is not set | 388 | # CONFIG_DCB is not set |
371 | 389 | ||
@@ -383,7 +401,11 @@ CONFIG_WIRELESS=y | |||
383 | CONFIG_WIRELESS_OLD_REGULATORY=y | 401 | CONFIG_WIRELESS_OLD_REGULATORY=y |
384 | # CONFIG_WIRELESS_EXT is not set | 402 | # CONFIG_WIRELESS_EXT is not set |
385 | # CONFIG_LIB80211 is not set | 403 | # CONFIG_LIB80211 is not set |
386 | # CONFIG_MAC80211 is not set | 404 | |
405 | # | ||
406 | # CFG80211 needs to be enabled for MAC80211 | ||
407 | # | ||
408 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
387 | # CONFIG_WIMAX is not set | 409 | # CONFIG_WIMAX is not set |
388 | # CONFIG_RFKILL is not set | 410 | # CONFIG_RFKILL is not set |
389 | # CONFIG_NET_9P is not set | 411 | # CONFIG_NET_9P is not set |
@@ -490,6 +512,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
490 | # CONFIG_MTD_UBI is not set | 512 | # CONFIG_MTD_UBI is not set |
491 | CONFIG_OF_DEVICE=y | 513 | CONFIG_OF_DEVICE=y |
492 | CONFIG_OF_I2C=y | 514 | CONFIG_OF_I2C=y |
515 | CONFIG_OF_MDIO=y | ||
493 | # CONFIG_PARPORT is not set | 516 | # CONFIG_PARPORT is not set |
494 | CONFIG_BLK_DEV=y | 517 | CONFIG_BLK_DEV=y |
495 | # CONFIG_BLK_DEV_FD is not set | 518 | # CONFIG_BLK_DEV_FD is not set |
@@ -525,7 +548,9 @@ CONFIG_MISC_DEVICES=y | |||
525 | # | 548 | # |
526 | # CONFIG_EEPROM_AT24 is not set | 549 | # CONFIG_EEPROM_AT24 is not set |
527 | # CONFIG_EEPROM_LEGACY is not set | 550 | # CONFIG_EEPROM_LEGACY is not set |
551 | # CONFIG_EEPROM_MAX6875 is not set | ||
528 | # CONFIG_EEPROM_93CX6 is not set | 552 | # CONFIG_EEPROM_93CX6 is not set |
553 | # CONFIG_CB710_CORE is not set | ||
529 | CONFIG_HAVE_IDE=y | 554 | CONFIG_HAVE_IDE=y |
530 | # CONFIG_IDE is not set | 555 | # CONFIG_IDE is not set |
531 | 556 | ||
@@ -545,14 +570,17 @@ CONFIG_HAVE_IDE=y | |||
545 | # | 570 | # |
546 | 571 | ||
547 | # | 572 | # |
548 | # Enable only one of the two stacks, unless you know what you are doing | 573 | # You can enable one or both FireWire driver stacks. |
574 | # | ||
575 | |||
576 | # | ||
577 | # See the help texts for more information. | ||
549 | # | 578 | # |
550 | # CONFIG_FIREWIRE is not set | 579 | # CONFIG_FIREWIRE is not set |
551 | # CONFIG_IEEE1394 is not set | 580 | # CONFIG_IEEE1394 is not set |
552 | # CONFIG_I2O is not set | 581 | # CONFIG_I2O is not set |
553 | # CONFIG_MACINTOSH_DRIVERS is not set | 582 | # CONFIG_MACINTOSH_DRIVERS is not set |
554 | CONFIG_NETDEVICES=y | 583 | CONFIG_NETDEVICES=y |
555 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
556 | # CONFIG_DUMMY is not set | 584 | # CONFIG_DUMMY is not set |
557 | # CONFIG_BONDING is not set | 585 | # CONFIG_BONDING is not set |
558 | # CONFIG_MACVLAN is not set | 586 | # CONFIG_MACVLAN is not set |
@@ -599,6 +627,7 @@ CONFIG_MII=y | |||
599 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 627 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
600 | # CONFIG_NET_PCI is not set | 628 | # CONFIG_NET_PCI is not set |
601 | # CONFIG_B44 is not set | 629 | # CONFIG_B44 is not set |
630 | # CONFIG_KS8842 is not set | ||
602 | # CONFIG_ATL2 is not set | 631 | # CONFIG_ATL2 is not set |
603 | CONFIG_NETDEV_1000=y | 632 | CONFIG_NETDEV_1000=y |
604 | # CONFIG_ACENIC is not set | 633 | # CONFIG_ACENIC is not set |
@@ -618,8 +647,10 @@ CONFIG_NETDEV_1000=y | |||
618 | # CONFIG_VIA_VELOCITY is not set | 647 | # CONFIG_VIA_VELOCITY is not set |
619 | # CONFIG_TIGON3 is not set | 648 | # CONFIG_TIGON3 is not set |
620 | # CONFIG_BNX2 is not set | 649 | # CONFIG_BNX2 is not set |
650 | # CONFIG_CNIC is not set | ||
621 | CONFIG_FSL_PQ_MDIO=y | 651 | CONFIG_FSL_PQ_MDIO=y |
622 | CONFIG_GIANFAR=y | 652 | CONFIG_GIANFAR=y |
653 | # CONFIG_MV643XX_ETH is not set | ||
623 | # CONFIG_QLA3XXX is not set | 654 | # CONFIG_QLA3XXX is not set |
624 | # CONFIG_ATL1 is not set | 655 | # CONFIG_ATL1 is not set |
625 | # CONFIG_ATL1E is not set | 656 | # CONFIG_ATL1E is not set |
@@ -786,13 +817,17 @@ CONFIG_I2C_MPC=y | |||
786 | # CONFIG_SENSORS_PCF8574 is not set | 817 | # CONFIG_SENSORS_PCF8574 is not set |
787 | # CONFIG_PCF8575 is not set | 818 | # CONFIG_PCF8575 is not set |
788 | # CONFIG_SENSORS_PCA9539 is not set | 819 | # CONFIG_SENSORS_PCA9539 is not set |
789 | # CONFIG_SENSORS_MAX6875 is not set | ||
790 | # CONFIG_SENSORS_TSL2550 is not set | 820 | # CONFIG_SENSORS_TSL2550 is not set |
791 | # CONFIG_I2C_DEBUG_CORE is not set | 821 | # CONFIG_I2C_DEBUG_CORE is not set |
792 | # CONFIG_I2C_DEBUG_ALGO is not set | 822 | # CONFIG_I2C_DEBUG_ALGO is not set |
793 | # CONFIG_I2C_DEBUG_BUS is not set | 823 | # CONFIG_I2C_DEBUG_BUS is not set |
794 | # CONFIG_I2C_DEBUG_CHIP is not set | 824 | # CONFIG_I2C_DEBUG_CHIP is not set |
795 | # CONFIG_SPI is not set | 825 | # CONFIG_SPI is not set |
826 | |||
827 | # | ||
828 | # PPS support | ||
829 | # | ||
830 | # CONFIG_PPS is not set | ||
796 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 831 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
797 | # CONFIG_GPIOLIB is not set | 832 | # CONFIG_GPIOLIB is not set |
798 | # CONFIG_W1 is not set | 833 | # CONFIG_W1 is not set |
@@ -847,6 +882,7 @@ CONFIG_HWMON=y | |||
847 | # CONFIG_SENSORS_SMSC47B397 is not set | 882 | # CONFIG_SENSORS_SMSC47B397 is not set |
848 | # CONFIG_SENSORS_ADS7828 is not set | 883 | # CONFIG_SENSORS_ADS7828 is not set |
849 | # CONFIG_SENSORS_THMC50 is not set | 884 | # CONFIG_SENSORS_THMC50 is not set |
885 | # CONFIG_SENSORS_TMP401 is not set | ||
850 | # CONFIG_SENSORS_VIA686A is not set | 886 | # CONFIG_SENSORS_VIA686A is not set |
851 | # CONFIG_SENSORS_VT1211 is not set | 887 | # CONFIG_SENSORS_VT1211 is not set |
852 | # CONFIG_SENSORS_VT8231 is not set | 888 | # CONFIG_SENSORS_VT8231 is not set |
@@ -900,24 +936,9 @@ CONFIG_SSB_POSSIBLE=y | |||
900 | # CONFIG_MFD_WM8400 is not set | 936 | # CONFIG_MFD_WM8400 is not set |
901 | # CONFIG_MFD_WM8350_I2C is not set | 937 | # CONFIG_MFD_WM8350_I2C is not set |
902 | # CONFIG_MFD_PCF50633 is not set | 938 | # CONFIG_MFD_PCF50633 is not set |
939 | # CONFIG_AB3100_CORE is not set | ||
903 | # CONFIG_REGULATOR is not set | 940 | # CONFIG_REGULATOR is not set |
904 | 941 | # CONFIG_MEDIA_SUPPORT is not set | |
905 | # | ||
906 | # Multimedia devices | ||
907 | # | ||
908 | |||
909 | # | ||
910 | # Multimedia core support | ||
911 | # | ||
912 | # CONFIG_VIDEO_DEV is not set | ||
913 | # CONFIG_DVB_CORE is not set | ||
914 | # CONFIG_VIDEO_MEDIA is not set | ||
915 | |||
916 | # | ||
917 | # Multimedia drivers | ||
918 | # | ||
919 | CONFIG_DAB=y | ||
920 | # CONFIG_USB_DABUSB is not set | ||
921 | 942 | ||
922 | # | 943 | # |
923 | # Graphics support | 944 | # Graphics support |
@@ -960,6 +981,7 @@ CONFIG_USB_MON=y | |||
960 | # USB Host Controller Drivers | 981 | # USB Host Controller Drivers |
961 | # | 982 | # |
962 | # CONFIG_USB_C67X00_HCD is not set | 983 | # CONFIG_USB_C67X00_HCD is not set |
984 | # CONFIG_USB_XHCI_HCD is not set | ||
963 | CONFIG_USB_EHCI_HCD=y | 985 | CONFIG_USB_EHCI_HCD=y |
964 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 986 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
965 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 987 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1069,6 +1091,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
1069 | # CONFIG_RTC_DRV_S35390A is not set | 1091 | # CONFIG_RTC_DRV_S35390A is not set |
1070 | # CONFIG_RTC_DRV_FM3130 is not set | 1092 | # CONFIG_RTC_DRV_FM3130 is not set |
1071 | # CONFIG_RTC_DRV_RX8581 is not set | 1093 | # CONFIG_RTC_DRV_RX8581 is not set |
1094 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1072 | 1095 | ||
1073 | # | 1096 | # |
1074 | # SPI RTC drivers | 1097 | # SPI RTC drivers |
@@ -1096,6 +1119,10 @@ CONFIG_RTC_DRV_DS1374=y | |||
1096 | # CONFIG_DMADEVICES is not set | 1119 | # CONFIG_DMADEVICES is not set |
1097 | # CONFIG_AUXDISPLAY is not set | 1120 | # CONFIG_AUXDISPLAY is not set |
1098 | # CONFIG_UIO is not set | 1121 | # CONFIG_UIO is not set |
1122 | |||
1123 | # | ||
1124 | # TI VLYNQ | ||
1125 | # | ||
1099 | # CONFIG_STAGING is not set | 1126 | # CONFIG_STAGING is not set |
1100 | 1127 | ||
1101 | # | 1128 | # |
@@ -1115,10 +1142,12 @@ CONFIG_FS_MBCACHE=y | |||
1115 | # CONFIG_REISERFS_FS is not set | 1142 | # CONFIG_REISERFS_FS is not set |
1116 | # CONFIG_JFS_FS is not set | 1143 | # CONFIG_JFS_FS is not set |
1117 | # CONFIG_FS_POSIX_ACL is not set | 1144 | # CONFIG_FS_POSIX_ACL is not set |
1118 | CONFIG_FILE_LOCKING=y | ||
1119 | # CONFIG_XFS_FS is not set | 1145 | # CONFIG_XFS_FS is not set |
1146 | # CONFIG_GFS2_FS is not set | ||
1120 | # CONFIG_OCFS2_FS is not set | 1147 | # CONFIG_OCFS2_FS is not set |
1121 | # CONFIG_BTRFS_FS is not set | 1148 | # CONFIG_BTRFS_FS is not set |
1149 | CONFIG_FILE_LOCKING=y | ||
1150 | CONFIG_FSNOTIFY=y | ||
1122 | CONFIG_DNOTIFY=y | 1151 | CONFIG_DNOTIFY=y |
1123 | CONFIG_INOTIFY=y | 1152 | CONFIG_INOTIFY=y |
1124 | CONFIG_INOTIFY_USER=y | 1153 | CONFIG_INOTIFY_USER=y |
@@ -1192,6 +1221,7 @@ CONFIG_NFS_FS=y | |||
1192 | CONFIG_NFS_V3=y | 1221 | CONFIG_NFS_V3=y |
1193 | # CONFIG_NFS_V3_ACL is not set | 1222 | # CONFIG_NFS_V3_ACL is not set |
1194 | CONFIG_NFS_V4=y | 1223 | CONFIG_NFS_V4=y |
1224 | # CONFIG_NFS_V4_1 is not set | ||
1195 | CONFIG_ROOT_NFS=y | 1225 | CONFIG_ROOT_NFS=y |
1196 | # CONFIG_NFSD is not set | 1226 | # CONFIG_NFSD is not set |
1197 | CONFIG_LOCKD=y | 1227 | CONFIG_LOCKD=y |
@@ -1287,6 +1317,7 @@ CONFIG_HAS_IOPORT=y | |||
1287 | CONFIG_HAS_DMA=y | 1317 | CONFIG_HAS_DMA=y |
1288 | CONFIG_HAVE_LMB=y | 1318 | CONFIG_HAVE_LMB=y |
1289 | CONFIG_NLATTR=y | 1319 | CONFIG_NLATTR=y |
1320 | CONFIG_GENERIC_ATOMIC64=y | ||
1290 | 1321 | ||
1291 | # | 1322 | # |
1292 | # Kernel hacking | 1323 | # Kernel hacking |
@@ -1312,22 +1343,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1312 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1343 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1313 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1344 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1314 | CONFIG_TRACING_SUPPORT=y | 1345 | CONFIG_TRACING_SUPPORT=y |
1315 | 1346 | # CONFIG_FTRACE is not set | |
1316 | # | ||
1317 | # Tracers | ||
1318 | # | ||
1319 | # CONFIG_FUNCTION_TRACER is not set | ||
1320 | # CONFIG_SCHED_TRACER is not set | ||
1321 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1322 | # CONFIG_EVENT_TRACER is not set | ||
1323 | # CONFIG_BOOT_TRACER is not set | ||
1324 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1325 | # CONFIG_STACK_TRACER is not set | ||
1326 | # CONFIG_KMEMTRACE is not set | ||
1327 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1328 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1329 | # CONFIG_SAMPLES is not set | 1347 | # CONFIG_SAMPLES is not set |
1330 | CONFIG_HAVE_ARCH_KGDB=y | 1348 | CONFIG_HAVE_ARCH_KGDB=y |
1349 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1350 | CONFIG_PPC_WERROR=y | ||
1331 | CONFIG_PRINT_STACK_DEPTH=64 | 1351 | CONFIG_PRINT_STACK_DEPTH=64 |
1332 | # CONFIG_IRQSTACKS is not set | 1352 | # CONFIG_IRQSTACKS is not set |
1333 | # CONFIG_BOOTX_TEXT is not set | 1353 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig index bf0853f29f31..93ebd443a18f 100644 --- a/arch/powerpc/configs/83xx/kmeter1_defconfig +++ b/arch/powerpc/configs/83xx/kmeter1_defconfig | |||
@@ -1,25 +1,28 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Fri Apr 3 10:34:33 2009 | 4 | # Wed Jul 29 23:32:03 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | ||
18 | CONFIG_6xx=y | ||
17 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
20 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
24 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
25 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -30,21 +33,22 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
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 |
45 | CONFIG_EARLY_PRINTK=y | 49 | CONFIG_EARLY_PRINTK=y |
46 | CONFIG_GENERIC_NVRAM=y | 50 | CONFIG_GENERIC_NVRAM=y |
47 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 51 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
48 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 52 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
49 | CONFIG_PPC_OF=y | 53 | CONFIG_PPC_OF=y |
50 | CONFIG_OF=y | 54 | CONFIG_OF=y |
@@ -52,11 +56,14 @@ 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=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
57 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
58 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
60 | 67 | ||
61 | # | 68 | # |
62 | # General setup | 69 | # General setup |
@@ -71,19 +78,30 @@ CONFIG_LOCALVERSION_AUTO=y | |||
71 | CONFIG_SYSVIPC=y | 78 | CONFIG_SYSVIPC=y |
72 | CONFIG_SYSVIPC_SYSCTL=y | 79 | CONFIG_SYSVIPC_SYSCTL=y |
73 | CONFIG_POSIX_MQUEUE=y | 80 | CONFIG_POSIX_MQUEUE=y |
81 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
74 | # CONFIG_BSD_PROCESS_ACCT is not set | 82 | # CONFIG_BSD_PROCESS_ACCT is not set |
75 | # CONFIG_TASKSTATS is not set | 83 | # CONFIG_TASKSTATS is not set |
76 | # CONFIG_AUDIT is not set | 84 | # CONFIG_AUDIT is not set |
85 | |||
86 | # | ||
87 | # RCU Subsystem | ||
88 | # | ||
89 | CONFIG_CLASSIC_RCU=y | ||
90 | # CONFIG_TREE_RCU is not set | ||
91 | # CONFIG_PREEMPT_RCU is not set | ||
92 | # CONFIG_TREE_RCU_TRACE is not set | ||
93 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
77 | # CONFIG_IKCONFIG is not set | 94 | # CONFIG_IKCONFIG is not set |
78 | CONFIG_LOG_BUF_SHIFT=14 | 95 | CONFIG_LOG_BUF_SHIFT=14 |
79 | # CONFIG_CGROUPS is not set | ||
80 | # CONFIG_GROUP_SCHED is not set | 96 | # CONFIG_GROUP_SCHED is not set |
97 | # CONFIG_CGROUPS is not set | ||
81 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 98 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
82 | # CONFIG_RELAY is not set | 99 | # CONFIG_RELAY is not set |
83 | # CONFIG_NAMESPACES is not set | 100 | # CONFIG_NAMESPACES is not set |
84 | # CONFIG_BLK_DEV_INITRD is not set | 101 | # CONFIG_BLK_DEV_INITRD is not set |
85 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 102 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
86 | CONFIG_SYSCTL=y | 103 | CONFIG_SYSCTL=y |
104 | CONFIG_ANON_INODES=y | ||
87 | CONFIG_EMBEDDED=y | 105 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 106 | CONFIG_SYSCTL_SYSCALL=y |
89 | CONFIG_KALLSYMS=y | 107 | CONFIG_KALLSYMS=y |
@@ -93,17 +111,23 @@ CONFIG_KALLSYMS_ALL=y | |||
93 | CONFIG_PRINTK=y | 111 | CONFIG_PRINTK=y |
94 | CONFIG_BUG=y | 112 | CONFIG_BUG=y |
95 | CONFIG_ELF_CORE=y | 113 | CONFIG_ELF_CORE=y |
96 | CONFIG_COMPAT_BRK=y | ||
97 | CONFIG_BASE_FULL=y | 114 | CONFIG_BASE_FULL=y |
98 | CONFIG_FUTEX=y | 115 | CONFIG_FUTEX=y |
99 | CONFIG_ANON_INODES=y | ||
100 | CONFIG_EPOLL=y | 116 | CONFIG_EPOLL=y |
101 | CONFIG_SIGNALFD=y | 117 | CONFIG_SIGNALFD=y |
102 | CONFIG_TIMERFD=y | 118 | CONFIG_TIMERFD=y |
103 | CONFIG_EVENTFD=y | 119 | CONFIG_EVENTFD=y |
104 | CONFIG_SHMEM=y | 120 | CONFIG_SHMEM=y |
105 | CONFIG_AIO=y | 121 | CONFIG_AIO=y |
122 | CONFIG_HAVE_PERF_COUNTERS=y | ||
123 | |||
124 | # | ||
125 | # Performance Counters | ||
126 | # | ||
127 | # CONFIG_PERF_COUNTERS is not set | ||
106 | CONFIG_VM_EVENT_COUNTERS=y | 128 | CONFIG_VM_EVENT_COUNTERS=y |
129 | # CONFIG_STRIP_ASM_SYMS is not set | ||
130 | CONFIG_COMPAT_BRK=y | ||
107 | CONFIG_SLAB=y | 131 | CONFIG_SLAB=y |
108 | # CONFIG_SLUB is not set | 132 | # CONFIG_SLUB is not set |
109 | # CONFIG_SLOB is not set | 133 | # CONFIG_SLOB is not set |
@@ -116,10 +140,15 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
116 | CONFIG_HAVE_KPROBES=y | 140 | CONFIG_HAVE_KPROBES=y |
117 | CONFIG_HAVE_KRETPROBES=y | 141 | CONFIG_HAVE_KRETPROBES=y |
118 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 142 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
143 | |||
144 | # | ||
145 | # GCOV-based kernel profiling | ||
146 | # | ||
147 | # CONFIG_GCOV_KERNEL is not set | ||
148 | # CONFIG_SLOW_WORK is not set | ||
119 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 149 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
120 | CONFIG_SLABINFO=y | 150 | CONFIG_SLABINFO=y |
121 | CONFIG_RT_MUTEXES=y | 151 | CONFIG_RT_MUTEXES=y |
122 | # CONFIG_TINY_SHMEM is not set | ||
123 | CONFIG_BASE_SMALL=0 | 152 | CONFIG_BASE_SMALL=0 |
124 | CONFIG_MODULES=y | 153 | CONFIG_MODULES=y |
125 | # CONFIG_MODULE_FORCE_LOAD is not set | 154 | # CONFIG_MODULE_FORCE_LOAD is not set |
@@ -127,11 +156,8 @@ CONFIG_MODULE_UNLOAD=y | |||
127 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 156 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
128 | # CONFIG_MODVERSIONS is not set | 157 | # CONFIG_MODVERSIONS is not set |
129 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 158 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
130 | CONFIG_KMOD=y | ||
131 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
132 | # CONFIG_LBD is not set | 160 | CONFIG_LBDAF=y |
133 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
134 | # CONFIG_LSF is not set | ||
135 | # CONFIG_BLK_DEV_BSG is not set | 161 | # CONFIG_BLK_DEV_BSG is not set |
136 | # CONFIG_BLK_DEV_INTEGRITY is not set | 162 | # CONFIG_BLK_DEV_INTEGRITY is not set |
137 | 163 | ||
@@ -147,14 +173,11 @@ CONFIG_IOSCHED_NOOP=y | |||
147 | # CONFIG_DEFAULT_CFQ is not set | 173 | # CONFIG_DEFAULT_CFQ is not set |
148 | CONFIG_DEFAULT_NOOP=y | 174 | CONFIG_DEFAULT_NOOP=y |
149 | CONFIG_DEFAULT_IOSCHED="noop" | 175 | CONFIG_DEFAULT_IOSCHED="noop" |
150 | CONFIG_CLASSIC_RCU=y | ||
151 | # CONFIG_FREEZER is not set | 176 | # CONFIG_FREEZER is not set |
152 | 177 | ||
153 | # | 178 | # |
154 | # Platform support | 179 | # Platform support |
155 | # | 180 | # |
156 | CONFIG_PPC_MULTIPLATFORM=y | ||
157 | CONFIG_CLASSIC32=y | ||
158 | # CONFIG_PPC_CHRP is not set | 181 | # CONFIG_PPC_CHRP is not set |
159 | # CONFIG_MPC5121_ADS is not set | 182 | # CONFIG_MPC5121_ADS is not set |
160 | # CONFIG_MPC5121_GENERIC is not set | 183 | # CONFIG_MPC5121_GENERIC is not set |
@@ -179,6 +202,8 @@ CONFIG_PPC_83xx=y | |||
179 | CONFIG_KMETER1=y | 202 | CONFIG_KMETER1=y |
180 | # CONFIG_PPC_86xx is not set | 203 | # CONFIG_PPC_86xx is not set |
181 | # CONFIG_EMBEDDED6xx is not set | 204 | # CONFIG_EMBEDDED6xx is not set |
205 | # CONFIG_AMIGAONE is not set | ||
206 | CONFIG_PPC_OF_BOOT_TRAMPOLINE=y | ||
182 | CONFIG_IPIC=y | 207 | CONFIG_IPIC=y |
183 | # CONFIG_MPIC is not set | 208 | # CONFIG_MPIC is not set |
184 | # CONFIG_MPIC_WEIRD is not set | 209 | # CONFIG_MPIC_WEIRD is not set |
@@ -194,6 +219,8 @@ CONFIG_IPIC=y | |||
194 | CONFIG_QUICC_ENGINE=y | 219 | CONFIG_QUICC_ENGINE=y |
195 | # CONFIG_QE_GPIO is not set | 220 | # CONFIG_QE_GPIO is not set |
196 | # CONFIG_FSL_ULI1575 is not set | 221 | # CONFIG_FSL_ULI1575 is not set |
222 | # CONFIG_SIMPLE_GPIO is not set | ||
223 | # CONFIG_MCU_MPC8349EMITX is not set | ||
197 | 224 | ||
198 | # | 225 | # |
199 | # Kernel options | 226 | # Kernel options |
@@ -212,16 +239,17 @@ CONFIG_SCHED_HRTICK=y | |||
212 | # CONFIG_PREEMPT_NONE is not set | 239 | # CONFIG_PREEMPT_NONE is not set |
213 | # CONFIG_PREEMPT_VOLUNTARY is not set | 240 | # CONFIG_PREEMPT_VOLUNTARY is not set |
214 | CONFIG_PREEMPT=y | 241 | CONFIG_PREEMPT=y |
215 | # CONFIG_PREEMPT_RCU is not set | ||
216 | CONFIG_BINFMT_ELF=y | 242 | CONFIG_BINFMT_ELF=y |
217 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 243 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
218 | # CONFIG_HAVE_AOUT is not set | 244 | # CONFIG_HAVE_AOUT is not set |
219 | # CONFIG_BINFMT_MISC is not set | 245 | # CONFIG_BINFMT_MISC is not set |
220 | # CONFIG_IOMMU_HELPER is not set | 246 | # CONFIG_IOMMU_HELPER is not set |
247 | # CONFIG_SWIOTLB is not set | ||
221 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 248 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
222 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 249 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
223 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 250 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
224 | # CONFIG_KEXEC is not set | 251 | # CONFIG_KEXEC is not set |
252 | # CONFIG_CRASH_DUMP is not set | ||
225 | CONFIG_ARCH_FLATMEM_ENABLE=y | 253 | CONFIG_ARCH_FLATMEM_ENABLE=y |
226 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 254 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
227 | CONFIG_SELECT_MEMORY_MODEL=y | 255 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -233,12 +261,17 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
233 | CONFIG_PAGEFLAGS_EXTENDED=y | 261 | CONFIG_PAGEFLAGS_EXTENDED=y |
234 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 262 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
235 | CONFIG_MIGRATION=y | 263 | CONFIG_MIGRATION=y |
236 | # CONFIG_RESOURCES_64BIT is not set | ||
237 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 264 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
238 | CONFIG_ZONE_DMA_FLAG=1 | 265 | CONFIG_ZONE_DMA_FLAG=1 |
239 | CONFIG_BOUNCE=y | 266 | CONFIG_BOUNCE=y |
240 | CONFIG_VIRT_TO_BUS=y | 267 | CONFIG_VIRT_TO_BUS=y |
241 | CONFIG_UNEVICTABLE_LRU=y | 268 | CONFIG_HAVE_MLOCK=y |
269 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | ||
270 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
271 | CONFIG_PPC_4K_PAGES=y | ||
272 | # CONFIG_PPC_16K_PAGES is not set | ||
273 | # CONFIG_PPC_64K_PAGES is not set | ||
274 | # CONFIG_PPC_256K_PAGES is not set | ||
242 | CONFIG_FORCE_MAX_ZONEORDER=11 | 275 | CONFIG_FORCE_MAX_ZONEORDER=11 |
243 | CONFIG_PROC_DEVICETREE=y | 276 | CONFIG_PROC_DEVICETREE=y |
244 | # CONFIG_CMDLINE_BOOL is not set | 277 | # CONFIG_CMDLINE_BOOL is not set |
@@ -331,7 +364,10 @@ CONFIG_LLC=m | |||
331 | # CONFIG_LAPB is not set | 364 | # CONFIG_LAPB is not set |
332 | # CONFIG_ECONET is not set | 365 | # CONFIG_ECONET is not set |
333 | # CONFIG_WAN_ROUTER is not set | 366 | # CONFIG_WAN_ROUTER is not set |
367 | # CONFIG_PHONET is not set | ||
368 | # CONFIG_IEEE802154 is not set | ||
334 | # CONFIG_NET_SCHED is not set | 369 | # CONFIG_NET_SCHED is not set |
370 | # CONFIG_DCB is not set | ||
335 | 371 | ||
336 | # | 372 | # |
337 | # Network testing | 373 | # Network testing |
@@ -342,8 +378,8 @@ CONFIG_LLC=m | |||
342 | # CONFIG_IRDA is not set | 378 | # CONFIG_IRDA is not set |
343 | # CONFIG_BT is not set | 379 | # CONFIG_BT is not set |
344 | # CONFIG_AF_RXRPC is not set | 380 | # CONFIG_AF_RXRPC is not set |
345 | # CONFIG_PHONET is not set | ||
346 | # CONFIG_WIRELESS is not set | 381 | # CONFIG_WIRELESS is not set |
382 | # CONFIG_WIMAX is not set | ||
347 | # CONFIG_RFKILL is not set | 383 | # CONFIG_RFKILL is not set |
348 | # CONFIG_NET_9P is not set | 384 | # CONFIG_NET_9P is not set |
349 | 385 | ||
@@ -362,6 +398,7 @@ CONFIG_MTD=y | |||
362 | # CONFIG_MTD_DEBUG is not set | 398 | # CONFIG_MTD_DEBUG is not set |
363 | CONFIG_MTD_CONCAT=y | 399 | CONFIG_MTD_CONCAT=y |
364 | CONFIG_MTD_PARTITIONS=y | 400 | CONFIG_MTD_PARTITIONS=y |
401 | # CONFIG_MTD_TESTS is not set | ||
365 | # CONFIG_MTD_REDBOOT_PARTS is not set | 402 | # CONFIG_MTD_REDBOOT_PARTS is not set |
366 | CONFIG_MTD_CMDLINE_PARTS=y | 403 | CONFIG_MTD_CMDLINE_PARTS=y |
367 | CONFIG_MTD_OF_PARTS=y | 404 | CONFIG_MTD_OF_PARTS=y |
@@ -431,6 +468,11 @@ CONFIG_MTD_PHRAM=y | |||
431 | # CONFIG_MTD_ONENAND is not set | 468 | # CONFIG_MTD_ONENAND is not set |
432 | 469 | ||
433 | # | 470 | # |
471 | # LPDDR flash memory drivers | ||
472 | # | ||
473 | # CONFIG_MTD_LPDDR is not set | ||
474 | |||
475 | # | ||
434 | # UBI - Unsorted block images | 476 | # UBI - Unsorted block images |
435 | # | 477 | # |
436 | CONFIG_MTD_UBI=y | 478 | CONFIG_MTD_UBI=y |
@@ -445,7 +487,6 @@ CONFIG_MTD_UBI_DEBUG=y | |||
445 | # CONFIG_MTD_UBI_DEBUG_MSG is not set | 487 | # CONFIG_MTD_UBI_DEBUG_MSG is not set |
446 | # CONFIG_MTD_UBI_DEBUG_PARANOID is not set | 488 | # CONFIG_MTD_UBI_DEBUG_PARANOID is not set |
447 | # CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set | 489 | # CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set |
448 | # CONFIG_MTD_UBI_DEBUG_USERSPACE_IO is not set | ||
449 | # CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set | 490 | # CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set |
450 | # CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set | 491 | # CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set |
451 | # CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set | 492 | # CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set |
@@ -459,6 +500,7 @@ CONFIG_MTD_UBI_DEBUG=y | |||
459 | # CONFIG_MTD_UBI_DEBUG_MSG_IO is not set | 500 | # CONFIG_MTD_UBI_DEBUG_MSG_IO is not set |
460 | CONFIG_OF_DEVICE=y | 501 | CONFIG_OF_DEVICE=y |
461 | CONFIG_OF_I2C=y | 502 | CONFIG_OF_I2C=y |
503 | CONFIG_OF_MDIO=y | ||
462 | # CONFIG_PARPORT is not set | 504 | # CONFIG_PARPORT is not set |
463 | CONFIG_BLK_DEV=y | 505 | CONFIG_BLK_DEV=y |
464 | # CONFIG_BLK_DEV_FD is not set | 506 | # CONFIG_BLK_DEV_FD is not set |
@@ -505,10 +547,15 @@ CONFIG_MARVELL_PHY=y | |||
505 | # CONFIG_BROADCOM_PHY is not set | 547 | # CONFIG_BROADCOM_PHY is not set |
506 | # CONFIG_ICPLUS_PHY is not set | 548 | # CONFIG_ICPLUS_PHY is not set |
507 | # CONFIG_REALTEK_PHY is not set | 549 | # CONFIG_REALTEK_PHY is not set |
550 | # CONFIG_NATIONAL_PHY is not set | ||
551 | # CONFIG_STE10XP is not set | ||
552 | # CONFIG_LSI_ET1011C_PHY is not set | ||
508 | # CONFIG_FIXED_PHY is not set | 553 | # CONFIG_FIXED_PHY is not set |
509 | # CONFIG_MDIO_BITBANG is not set | 554 | # CONFIG_MDIO_BITBANG is not set |
510 | CONFIG_NET_ETHERNET=y | 555 | CONFIG_NET_ETHERNET=y |
511 | CONFIG_MII=y | 556 | CONFIG_MII=y |
557 | # CONFIG_ETHOC is not set | ||
558 | # CONFIG_DNET is not set | ||
512 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 559 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
513 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 560 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
514 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 561 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
@@ -517,11 +564,12 @@ CONFIG_MII=y | |||
517 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 564 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
518 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 565 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
519 | # CONFIG_B44 is not set | 566 | # CONFIG_B44 is not set |
567 | # CONFIG_KS8842 is not set | ||
520 | CONFIG_NETDEV_1000=y | 568 | CONFIG_NETDEV_1000=y |
569 | CONFIG_FSL_PQ_MDIO=y | ||
521 | # CONFIG_GIANFAR is not set | 570 | # CONFIG_GIANFAR is not set |
522 | CONFIG_UCC_GETH=y | 571 | CONFIG_UCC_GETH=y |
523 | # CONFIG_UGETH_MAGIC_PACKET is not set | 572 | # CONFIG_UGETH_MAGIC_PACKET is not set |
524 | # CONFIG_UGETH_FILTERING is not set | ||
525 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 573 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
526 | # CONFIG_MV643XX_ETH is not set | 574 | # CONFIG_MV643XX_ETH is not set |
527 | # CONFIG_NETDEV_10000 is not set | 575 | # CONFIG_NETDEV_10000 is not set |
@@ -531,7 +579,10 @@ CONFIG_UCC_GETH=y | |||
531 | # | 579 | # |
532 | # CONFIG_WLAN_PRE80211 is not set | 580 | # CONFIG_WLAN_PRE80211 is not set |
533 | # CONFIG_WLAN_80211 is not set | 581 | # CONFIG_WLAN_80211 is not set |
534 | # CONFIG_IWLWIFI_LEDS is not set | 582 | |
583 | # | ||
584 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
585 | # | ||
535 | CONFIG_WAN=y | 586 | CONFIG_WAN=y |
536 | CONFIG_HDLC=y | 587 | CONFIG_HDLC=y |
537 | # CONFIG_HDLC_RAW is not set | 588 | # CONFIG_HDLC_RAW is not set |
@@ -543,8 +594,6 @@ CONFIG_HDLC=y | |||
543 | # | 594 | # |
544 | # X.25/LAPB support is disabled | 595 | # X.25/LAPB support is disabled |
545 | # | 596 | # |
546 | CONFIG_HDLC_KM=y | ||
547 | CONFIG_FS_UCC_HDLC=y | ||
548 | # CONFIG_DLCI is not set | 597 | # CONFIG_DLCI is not set |
549 | CONFIG_PPP=y | 598 | CONFIG_PPP=y |
550 | CONFIG_PPP_MULTILINK=y | 599 | CONFIG_PPP_MULTILINK=y |
@@ -600,16 +649,18 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
600 | # CONFIG_SERIAL_OF_PLATFORM is not set | 649 | # CONFIG_SERIAL_OF_PLATFORM is not set |
601 | # CONFIG_SERIAL_QE is not set | 650 | # CONFIG_SERIAL_QE is not set |
602 | CONFIG_UNIX98_PTYS=y | 651 | CONFIG_UNIX98_PTYS=y |
652 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
603 | CONFIG_LEGACY_PTYS=y | 653 | CONFIG_LEGACY_PTYS=y |
604 | CONFIG_LEGACY_PTY_COUNT=256 | 654 | CONFIG_LEGACY_PTY_COUNT=256 |
655 | # CONFIG_HVC_UDBG is not set | ||
605 | # CONFIG_IPMI_HANDLER is not set | 656 | # CONFIG_IPMI_HANDLER is not set |
606 | CONFIG_HW_RANDOM=y | 657 | CONFIG_HW_RANDOM=y |
658 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | ||
607 | # CONFIG_NVRAM is not set | 659 | # CONFIG_NVRAM is not set |
608 | # CONFIG_GEN_RTC is not set | 660 | # CONFIG_GEN_RTC is not set |
609 | # CONFIG_R3964 is not set | 661 | # CONFIG_R3964 is not set |
610 | # CONFIG_RAW_DRIVER is not set | 662 | # CONFIG_RAW_DRIVER is not set |
611 | # CONFIG_TCG_TPM is not set | 663 | # CONFIG_TCG_TPM is not set |
612 | CONFIG_BOOTCOUNT=y | ||
613 | CONFIG_I2C=y | 664 | CONFIG_I2C=y |
614 | CONFIG_I2C_BOARDINFO=y | 665 | CONFIG_I2C_BOARDINFO=y |
615 | CONFIG_I2C_CHARDEV=y | 666 | CONFIG_I2C_CHARDEV=y |
@@ -642,20 +693,20 @@ CONFIG_I2C_MPC=y | |||
642 | # Miscellaneous I2C Chip support | 693 | # Miscellaneous I2C Chip support |
643 | # | 694 | # |
644 | # CONFIG_DS1682 is not set | 695 | # CONFIG_DS1682 is not set |
645 | # CONFIG_AT24 is not set | ||
646 | # CONFIG_SENSORS_EEPROM is not set | ||
647 | # CONFIG_SENSORS_PCF8574 is not set | 696 | # CONFIG_SENSORS_PCF8574 is not set |
648 | # CONFIG_PCF8575 is not set | 697 | # CONFIG_PCF8575 is not set |
649 | # CONFIG_SENSORS_PCA9539 is not set | 698 | # CONFIG_SENSORS_PCA9539 is not set |
650 | # CONFIG_SENSORS_PCF8591 is not set | ||
651 | # CONFIG_SENSORS_MAX6875 is not set | ||
652 | # CONFIG_SENSORS_TSL2550 is not set | 699 | # CONFIG_SENSORS_TSL2550 is not set |
653 | # CONFIG_MCU_MPC8349EMITX is not set | ||
654 | # CONFIG_I2C_DEBUG_CORE is not set | 700 | # CONFIG_I2C_DEBUG_CORE is not set |
655 | # CONFIG_I2C_DEBUG_ALGO is not set | 701 | # CONFIG_I2C_DEBUG_ALGO is not set |
656 | # CONFIG_I2C_DEBUG_BUS is not set | 702 | # CONFIG_I2C_DEBUG_BUS is not set |
657 | # CONFIG_I2C_DEBUG_CHIP is not set | 703 | # CONFIG_I2C_DEBUG_CHIP is not set |
658 | # CONFIG_SPI is not set | 704 | # CONFIG_SPI is not set |
705 | |||
706 | # | ||
707 | # PPS support | ||
708 | # | ||
709 | # CONFIG_PPS is not set | ||
659 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 710 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
660 | # CONFIG_GPIOLIB is not set | 711 | # CONFIG_GPIOLIB is not set |
661 | # CONFIG_W1 is not set | 712 | # CONFIG_W1 is not set |
@@ -677,27 +728,15 @@ CONFIG_SSB_POSSIBLE=y | |||
677 | # CONFIG_MFD_CORE is not set | 728 | # CONFIG_MFD_CORE is not set |
678 | # CONFIG_MFD_SM501 is not set | 729 | # CONFIG_MFD_SM501 is not set |
679 | # CONFIG_HTC_PASIC3 is not set | 730 | # CONFIG_HTC_PASIC3 is not set |
731 | # CONFIG_TWL4030_CORE is not set | ||
680 | # CONFIG_MFD_TMIO is not set | 732 | # CONFIG_MFD_TMIO is not set |
681 | # CONFIG_PMIC_DA903X is not set | 733 | # CONFIG_PMIC_DA903X is not set |
682 | # CONFIG_MFD_WM8400 is not set | 734 | # CONFIG_MFD_WM8400 is not set |
683 | # CONFIG_MFD_WM8350_I2C is not set | 735 | # CONFIG_MFD_WM8350_I2C is not set |
736 | # CONFIG_MFD_PCF50633 is not set | ||
737 | # CONFIG_AB3100_CORE is not set | ||
684 | # CONFIG_REGULATOR is not set | 738 | # CONFIG_REGULATOR is not set |
685 | 739 | # 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 | 740 | ||
702 | # | 741 | # |
703 | # Graphics support | 742 | # Graphics support |
@@ -720,11 +759,16 @@ CONFIG_SSB_POSSIBLE=y | |||
720 | # CONFIG_EDAC is not set | 759 | # CONFIG_EDAC is not set |
721 | # CONFIG_RTC_CLASS is not set | 760 | # CONFIG_RTC_CLASS is not set |
722 | # CONFIG_DMADEVICES is not set | 761 | # CONFIG_DMADEVICES is not set |
762 | # CONFIG_AUXDISPLAY is not set | ||
723 | CONFIG_UIO=y | 763 | CONFIG_UIO=y |
724 | # CONFIG_UIO_PDRV is not set | 764 | # CONFIG_UIO_PDRV is not set |
725 | # CONFIG_UIO_PDRV_GENIRQ is not set | 765 | # CONFIG_UIO_PDRV_GENIRQ is not set |
726 | # CONFIG_UIO_SMX is not set | 766 | # CONFIG_UIO_SMX is not set |
727 | # CONFIG_UIO_SERCOS3 is not set | 767 | # CONFIG_UIO_SERCOS3 is not set |
768 | |||
769 | # | ||
770 | # TI VLYNQ | ||
771 | # | ||
728 | # CONFIG_STAGING is not set | 772 | # CONFIG_STAGING is not set |
729 | 773 | ||
730 | # | 774 | # |
@@ -736,9 +780,12 @@ CONFIG_UIO=y | |||
736 | # CONFIG_REISERFS_FS is not set | 780 | # CONFIG_REISERFS_FS is not set |
737 | # CONFIG_JFS_FS is not set | 781 | # CONFIG_JFS_FS is not set |
738 | # CONFIG_FS_POSIX_ACL is not set | 782 | # CONFIG_FS_POSIX_ACL is not set |
739 | CONFIG_FILE_LOCKING=y | ||
740 | # CONFIG_XFS_FS is not set | 783 | # CONFIG_XFS_FS is not set |
784 | # CONFIG_GFS2_FS is not set | ||
741 | # CONFIG_OCFS2_FS is not set | 785 | # CONFIG_OCFS2_FS is not set |
786 | # CONFIG_BTRFS_FS is not set | ||
787 | CONFIG_FILE_LOCKING=y | ||
788 | CONFIG_FSNOTIFY=y | ||
742 | # CONFIG_DNOTIFY is not set | 789 | # CONFIG_DNOTIFY is not set |
743 | CONFIG_INOTIFY=y | 790 | CONFIG_INOTIFY=y |
744 | CONFIG_INOTIFY_USER=y | 791 | CONFIG_INOTIFY_USER=y |
@@ -748,6 +795,11 @@ CONFIG_INOTIFY_USER=y | |||
748 | # CONFIG_FUSE_FS is not set | 795 | # CONFIG_FUSE_FS is not set |
749 | 796 | ||
750 | # | 797 | # |
798 | # Caches | ||
799 | # | ||
800 | # CONFIG_FSCACHE is not set | ||
801 | |||
802 | # | ||
751 | # CD-ROM/DVD Filesystems | 803 | # CD-ROM/DVD Filesystems |
752 | # | 804 | # |
753 | # CONFIG_ISO9660_FS is not set | 805 | # CONFIG_ISO9660_FS is not set |
@@ -772,10 +824,7 @@ CONFIG_TMPFS=y | |||
772 | # CONFIG_TMPFS_POSIX_ACL is not set | 824 | # CONFIG_TMPFS_POSIX_ACL is not set |
773 | # CONFIG_HUGETLB_PAGE is not set | 825 | # CONFIG_HUGETLB_PAGE is not set |
774 | # CONFIG_CONFIGFS_FS is not set | 826 | # CONFIG_CONFIGFS_FS is not set |
775 | 827 | CONFIG_MISC_FILESYSTEMS=y | |
776 | # | ||
777 | # Miscellaneous filesystems | ||
778 | # | ||
779 | # CONFIG_ADFS_FS is not set | 828 | # CONFIG_ADFS_FS is not set |
780 | # CONFIG_AFFS_FS is not set | 829 | # CONFIG_AFFS_FS is not set |
781 | # CONFIG_HFS_FS is not set | 830 | # CONFIG_HFS_FS is not set |
@@ -796,6 +845,7 @@ CONFIG_JFFS2_RTIME=y | |||
796 | # CONFIG_JFFS2_RUBIN is not set | 845 | # CONFIG_JFFS2_RUBIN is not set |
797 | # CONFIG_UBIFS_FS is not set | 846 | # CONFIG_UBIFS_FS is not set |
798 | # CONFIG_CRAMFS is not set | 847 | # CONFIG_CRAMFS is not set |
848 | # CONFIG_SQUASHFS is not set | ||
799 | # CONFIG_VXFS_FS is not set | 849 | # CONFIG_VXFS_FS is not set |
800 | # CONFIG_MINIX_FS is not set | 850 | # CONFIG_MINIX_FS is not set |
801 | # CONFIG_OMFS_FS is not set | 851 | # CONFIG_OMFS_FS is not set |
@@ -804,6 +854,7 @@ CONFIG_JFFS2_RTIME=y | |||
804 | # CONFIG_ROMFS_FS is not set | 854 | # CONFIG_ROMFS_FS is not set |
805 | # CONFIG_SYSV_FS is not set | 855 | # CONFIG_SYSV_FS is not set |
806 | # CONFIG_UFS_FS is not set | 856 | # CONFIG_UFS_FS is not set |
857 | # CONFIG_NILFS2_FS is not set | ||
807 | CONFIG_NETWORK_FILESYSTEMS=y | 858 | CONFIG_NETWORK_FILESYSTEMS=y |
808 | CONFIG_NFS_FS=y | 859 | CONFIG_NFS_FS=y |
809 | CONFIG_NFS_V3=y | 860 | CONFIG_NFS_V3=y |
@@ -815,7 +866,6 @@ CONFIG_LOCKD=y | |||
815 | CONFIG_LOCKD_V4=y | 866 | CONFIG_LOCKD_V4=y |
816 | CONFIG_NFS_COMMON=y | 867 | CONFIG_NFS_COMMON=y |
817 | CONFIG_SUNRPC=y | 868 | CONFIG_SUNRPC=y |
818 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
819 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 869 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
820 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 870 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
821 | # CONFIG_SMB_FS is not set | 871 | # CONFIG_SMB_FS is not set |
@@ -845,11 +895,13 @@ CONFIG_PARTITION_ADVANCED=y | |||
845 | # CONFIG_DLM is not set | 895 | # CONFIG_DLM is not set |
846 | CONFIG_UCC_FAST=y | 896 | CONFIG_UCC_FAST=y |
847 | CONFIG_UCC=y | 897 | CONFIG_UCC=y |
898 | # CONFIG_BINARY_PRINTF is not set | ||
848 | 899 | ||
849 | # | 900 | # |
850 | # Library routines | 901 | # Library routines |
851 | # | 902 | # |
852 | CONFIG_BITREVERSE=y | 903 | CONFIG_BITREVERSE=y |
904 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
853 | # CONFIG_CRC_CCITT is not set | 905 | # CONFIG_CRC_CCITT is not set |
854 | # CONFIG_CRC16 is not set | 906 | # CONFIG_CRC16 is not set |
855 | # CONFIG_CRC_T10DIF is not set | 907 | # CONFIG_CRC_T10DIF is not set |
@@ -859,11 +911,12 @@ CONFIG_CRC32=y | |||
859 | # CONFIG_LIBCRC32C is not set | 911 | # CONFIG_LIBCRC32C is not set |
860 | CONFIG_ZLIB_INFLATE=y | 912 | CONFIG_ZLIB_INFLATE=y |
861 | CONFIG_ZLIB_DEFLATE=y | 913 | CONFIG_ZLIB_DEFLATE=y |
862 | CONFIG_PLIST=y | ||
863 | CONFIG_HAS_IOMEM=y | 914 | CONFIG_HAS_IOMEM=y |
864 | CONFIG_HAS_IOPORT=y | 915 | CONFIG_HAS_IOPORT=y |
865 | CONFIG_HAS_DMA=y | 916 | CONFIG_HAS_DMA=y |
866 | CONFIG_HAVE_LMB=y | 917 | CONFIG_HAVE_LMB=y |
918 | CONFIG_NLATTR=y | ||
919 | CONFIG_GENERIC_ATOMIC64=y | ||
867 | 920 | ||
868 | # | 921 | # |
869 | # Kernel hacking | 922 | # Kernel hacking |
@@ -883,13 +936,18 @@ CONFIG_DEBUG_FS=y | |||
883 | # CONFIG_LATENCYTOP is not set | 936 | # CONFIG_LATENCYTOP is not set |
884 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 937 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
885 | CONFIG_HAVE_FUNCTION_TRACER=y | 938 | CONFIG_HAVE_FUNCTION_TRACER=y |
886 | 939 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |
887 | # | 940 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
888 | # Tracers | 941 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
889 | # | 942 | CONFIG_TRACING_SUPPORT=y |
890 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 943 | # CONFIG_FTRACE is not set |
944 | # CONFIG_DYNAMIC_DEBUG is not set | ||
891 | # CONFIG_SAMPLES is not set | 945 | # CONFIG_SAMPLES is not set |
892 | CONFIG_HAVE_ARCH_KGDB=y | 946 | CONFIG_HAVE_ARCH_KGDB=y |
947 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
948 | CONFIG_PPC_WERROR=y | ||
949 | CONFIG_PRINT_STACK_DEPTH=64 | ||
950 | # CONFIG_PPC_EMULATED_STATS is not set | ||
893 | # CONFIG_IRQSTACKS is not set | 951 | # CONFIG_IRQSTACKS is not set |
894 | # CONFIG_VIRQ_DEBUG is not set | 952 | # CONFIG_VIRQ_DEBUG is not set |
895 | # CONFIG_BOOTX_TEXT is not set | 953 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index c5c0fe71a438..ff33a7db2eab 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:06 2009 | 4 | # Wed Jul 29 23:32:04 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,9 +124,16 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
125 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -135,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
135 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
136 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
138 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
140 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -147,7 +162,7 @@ CONFIG_MODULE_UNLOAD=y | |||
147 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
150 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
151 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
152 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
153 | 168 | ||
@@ -189,6 +204,7 @@ CONFIG_MPC831x_RDB=y | |||
189 | # CONFIG_MPC837x_RDB is not set | 204 | # CONFIG_MPC837x_RDB is not set |
190 | # CONFIG_SBC834x is not set | 205 | # CONFIG_SBC834x is not set |
191 | # CONFIG_ASP834x is not set | 206 | # CONFIG_ASP834x is not set |
207 | # CONFIG_KMETER1 is not set | ||
192 | CONFIG_PPC_MPC831x=y | 208 | CONFIG_PPC_MPC831x=y |
193 | # CONFIG_PPC_86xx is not set | 209 | # CONFIG_PPC_86xx is not set |
194 | # CONFIG_EMBEDDED6xx is not set | 210 | # CONFIG_EMBEDDED6xx is not set |
@@ -234,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -254,9 +271,9 @@ CONFIG_MIGRATION=y | |||
254 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
256 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
257 | CONFIG_UNEVICTABLE_LRU=y | ||
258 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
259 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
260 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
261 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
262 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -366,6 +383,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
366 | # CONFIG_ECONET is not set | 383 | # CONFIG_ECONET is not set |
367 | # CONFIG_WAN_ROUTER is not set | 384 | # CONFIG_WAN_ROUTER is not set |
368 | # CONFIG_PHONET is not set | 385 | # CONFIG_PHONET is not set |
386 | # CONFIG_IEEE802154 is not set | ||
369 | # CONFIG_NET_SCHED is not set | 387 | # CONFIG_NET_SCHED is not set |
370 | # CONFIG_DCB is not set | 388 | # CONFIG_DCB is not set |
371 | 389 | ||
@@ -383,7 +401,11 @@ CONFIG_WIRELESS=y | |||
383 | CONFIG_WIRELESS_OLD_REGULATORY=y | 401 | CONFIG_WIRELESS_OLD_REGULATORY=y |
384 | # CONFIG_WIRELESS_EXT is not set | 402 | # CONFIG_WIRELESS_EXT is not set |
385 | # CONFIG_LIB80211 is not set | 403 | # CONFIG_LIB80211 is not set |
386 | # CONFIG_MAC80211 is not set | 404 | |
405 | # | ||
406 | # CFG80211 needs to be enabled for MAC80211 | ||
407 | # | ||
408 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
387 | # CONFIG_WIMAX is not set | 409 | # CONFIG_WIMAX is not set |
388 | # CONFIG_RFKILL is not set | 410 | # CONFIG_RFKILL is not set |
389 | # CONFIG_NET_9P is not set | 411 | # CONFIG_NET_9P is not set |
@@ -503,6 +525,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
503 | CONFIG_OF_DEVICE=y | 525 | CONFIG_OF_DEVICE=y |
504 | CONFIG_OF_I2C=y | 526 | CONFIG_OF_I2C=y |
505 | CONFIG_OF_SPI=y | 527 | CONFIG_OF_SPI=y |
528 | CONFIG_OF_MDIO=y | ||
506 | # CONFIG_PARPORT is not set | 529 | # CONFIG_PARPORT is not set |
507 | CONFIG_BLK_DEV=y | 530 | CONFIG_BLK_DEV=y |
508 | # CONFIG_BLK_DEV_FD is not set | 531 | # CONFIG_BLK_DEV_FD is not set |
@@ -539,7 +562,9 @@ CONFIG_MISC_DEVICES=y | |||
539 | # CONFIG_EEPROM_AT24 is not set | 562 | # CONFIG_EEPROM_AT24 is not set |
540 | # CONFIG_EEPROM_AT25 is not set | 563 | # CONFIG_EEPROM_AT25 is not set |
541 | # CONFIG_EEPROM_LEGACY is not set | 564 | # CONFIG_EEPROM_LEGACY is not set |
565 | # CONFIG_EEPROM_MAX6875 is not set | ||
542 | # CONFIG_EEPROM_93CX6 is not set | 566 | # CONFIG_EEPROM_93CX6 is not set |
567 | # CONFIG_CB710_CORE is not set | ||
543 | CONFIG_HAVE_IDE=y | 568 | CONFIG_HAVE_IDE=y |
544 | # CONFIG_IDE is not set | 569 | # CONFIG_IDE is not set |
545 | 570 | ||
@@ -562,10 +587,6 @@ CONFIG_SCSI_PROC_FS=y | |||
562 | # CONFIG_BLK_DEV_SR is not set | 587 | # CONFIG_BLK_DEV_SR is not set |
563 | CONFIG_CHR_DEV_SG=y | 588 | CONFIG_CHR_DEV_SG=y |
564 | # CONFIG_CHR_DEV_SCH is not set | 589 | # CONFIG_CHR_DEV_SCH is not set |
565 | |||
566 | # | ||
567 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
568 | # | ||
569 | # CONFIG_SCSI_MULTI_LUN is not set | 590 | # CONFIG_SCSI_MULTI_LUN is not set |
570 | # CONFIG_SCSI_CONSTANTS is not set | 591 | # CONFIG_SCSI_CONSTANTS is not set |
571 | # CONFIG_SCSI_LOGGING is not set | 592 | # CONFIG_SCSI_LOGGING is not set |
@@ -583,6 +604,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
583 | CONFIG_SCSI_LOWLEVEL=y | 604 | CONFIG_SCSI_LOWLEVEL=y |
584 | # CONFIG_ISCSI_TCP is not set | 605 | # CONFIG_ISCSI_TCP is not set |
585 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 606 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
607 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
586 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 608 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
587 | # CONFIG_SCSI_3W_9XXX is not set | 609 | # CONFIG_SCSI_3W_9XXX is not set |
588 | # CONFIG_SCSI_ACARD is not set | 610 | # CONFIG_SCSI_ACARD is not set |
@@ -591,6 +613,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
591 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 613 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
592 | # CONFIG_SCSI_AIC79XX is not set | 614 | # CONFIG_SCSI_AIC79XX is not set |
593 | # CONFIG_SCSI_AIC94XX is not set | 615 | # CONFIG_SCSI_AIC94XX is not set |
616 | # CONFIG_SCSI_MVSAS is not set | ||
594 | # CONFIG_SCSI_DPT_I2O is not set | 617 | # CONFIG_SCSI_DPT_I2O is not set |
595 | # CONFIG_SCSI_ADVANSYS is not set | 618 | # CONFIG_SCSI_ADVANSYS is not set |
596 | # CONFIG_SCSI_ARCMSR is not set | 619 | # CONFIG_SCSI_ARCMSR is not set |
@@ -610,7 +633,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
610 | # CONFIG_SCSI_IPS is not set | 633 | # CONFIG_SCSI_IPS is not set |
611 | # CONFIG_SCSI_INITIO is not set | 634 | # CONFIG_SCSI_INITIO is not set |
612 | # CONFIG_SCSI_INIA100 is not set | 635 | # CONFIG_SCSI_INIA100 is not set |
613 | # CONFIG_SCSI_MVSAS is not set | ||
614 | # CONFIG_SCSI_STEX is not set | 636 | # CONFIG_SCSI_STEX is not set |
615 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 637 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
616 | # CONFIG_SCSI_QLOGIC_1280 is not set | 638 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -643,14 +665,17 @@ CONFIG_MD_RAID1=y | |||
643 | # | 665 | # |
644 | 666 | ||
645 | # | 667 | # |
646 | # Enable only one of the two stacks, unless you know what you are doing | 668 | # You can enable one or both FireWire driver stacks. |
669 | # | ||
670 | |||
671 | # | ||
672 | # See the help texts for more information. | ||
647 | # | 673 | # |
648 | # CONFIG_FIREWIRE is not set | 674 | # CONFIG_FIREWIRE is not set |
649 | # CONFIG_IEEE1394 is not set | 675 | # CONFIG_IEEE1394 is not set |
650 | # CONFIG_I2O is not set | 676 | # CONFIG_I2O is not set |
651 | # CONFIG_MACINTOSH_DRIVERS is not set | 677 | # CONFIG_MACINTOSH_DRIVERS is not set |
652 | CONFIG_NETDEVICES=y | 678 | CONFIG_NETDEVICES=y |
653 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
654 | # CONFIG_DUMMY is not set | 679 | # CONFIG_DUMMY is not set |
655 | # CONFIG_BONDING is not set | 680 | # CONFIG_BONDING is not set |
656 | # CONFIG_MACVLAN is not set | 681 | # CONFIG_MACVLAN is not set |
@@ -714,6 +739,8 @@ CONFIG_E100=y | |||
714 | # CONFIG_SMSC9420 is not set | 739 | # CONFIG_SMSC9420 is not set |
715 | # CONFIG_SUNDANCE is not set | 740 | # CONFIG_SUNDANCE is not set |
716 | # CONFIG_TLAN is not set | 741 | # CONFIG_TLAN is not set |
742 | # CONFIG_KS8842 is not set | ||
743 | # CONFIG_KS8851 is not set | ||
717 | # CONFIG_VIA_RHINE is not set | 744 | # CONFIG_VIA_RHINE is not set |
718 | # CONFIG_SC92031 is not set | 745 | # CONFIG_SC92031 is not set |
719 | # CONFIG_ATL2 is not set | 746 | # CONFIG_ATL2 is not set |
@@ -735,8 +762,10 @@ CONFIG_NETDEV_1000=y | |||
735 | # CONFIG_VIA_VELOCITY is not set | 762 | # CONFIG_VIA_VELOCITY is not set |
736 | # CONFIG_TIGON3 is not set | 763 | # CONFIG_TIGON3 is not set |
737 | # CONFIG_BNX2 is not set | 764 | # CONFIG_BNX2 is not set |
765 | # CONFIG_CNIC is not set | ||
738 | CONFIG_FSL_PQ_MDIO=y | 766 | CONFIG_FSL_PQ_MDIO=y |
739 | CONFIG_GIANFAR=y | 767 | CONFIG_GIANFAR=y |
768 | # CONFIG_MV643XX_ETH is not set | ||
740 | # CONFIG_QLA3XXX is not set | 769 | # CONFIG_QLA3XXX is not set |
741 | # CONFIG_ATL1 is not set | 770 | # CONFIG_ATL1 is not set |
742 | # CONFIG_ATL1E is not set | 771 | # CONFIG_ATL1E is not set |
@@ -924,7 +953,6 @@ CONFIG_I2C_MPC=y | |||
924 | # CONFIG_SENSORS_PCF8574 is not set | 953 | # CONFIG_SENSORS_PCF8574 is not set |
925 | # CONFIG_PCF8575 is not set | 954 | # CONFIG_PCF8575 is not set |
926 | # CONFIG_SENSORS_PCA9539 is not set | 955 | # CONFIG_SENSORS_PCA9539 is not set |
927 | # CONFIG_SENSORS_MAX6875 is not set | ||
928 | # CONFIG_SENSORS_TSL2550 is not set | 956 | # CONFIG_SENSORS_TSL2550 is not set |
929 | # CONFIG_I2C_DEBUG_CORE is not set | 957 | # CONFIG_I2C_DEBUG_CORE is not set |
930 | # CONFIG_I2C_DEBUG_ALGO is not set | 958 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -938,13 +966,18 @@ CONFIG_SPI_MASTER=y | |||
938 | # SPI Master Controller Drivers | 966 | # SPI Master Controller Drivers |
939 | # | 967 | # |
940 | CONFIG_SPI_BITBANG=y | 968 | CONFIG_SPI_BITBANG=y |
941 | CONFIG_SPI_MPC83xx=y | 969 | # CONFIG_SPI_MPC8xxx is not set |
942 | 970 | ||
943 | # | 971 | # |
944 | # SPI Protocol Masters | 972 | # SPI Protocol Masters |
945 | # | 973 | # |
946 | # CONFIG_SPI_SPIDEV is not set | 974 | # CONFIG_SPI_SPIDEV is not set |
947 | # CONFIG_SPI_TLE62X0 is not set | 975 | # CONFIG_SPI_TLE62X0 is not set |
976 | |||
977 | # | ||
978 | # PPS support | ||
979 | # | ||
980 | # CONFIG_PPS is not set | ||
948 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 981 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
949 | # CONFIG_GPIOLIB is not set | 982 | # CONFIG_GPIOLIB is not set |
950 | # CONFIG_W1 is not set | 983 | # CONFIG_W1 is not set |
@@ -1002,6 +1035,7 @@ CONFIG_HWMON=y | |||
1002 | # CONFIG_SENSORS_SMSC47B397 is not set | 1035 | # CONFIG_SENSORS_SMSC47B397 is not set |
1003 | # CONFIG_SENSORS_ADS7828 is not set | 1036 | # CONFIG_SENSORS_ADS7828 is not set |
1004 | # CONFIG_SENSORS_THMC50 is not set | 1037 | # CONFIG_SENSORS_THMC50 is not set |
1038 | # CONFIG_SENSORS_TMP401 is not set | ||
1005 | # CONFIG_SENSORS_VIA686A is not set | 1039 | # CONFIG_SENSORS_VIA686A is not set |
1006 | # CONFIG_SENSORS_VT1211 is not set | 1040 | # CONFIG_SENSORS_VT1211 is not set |
1007 | # CONFIG_SENSORS_VT8231 is not set | 1041 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1056,24 +1090,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1056 | # CONFIG_MFD_WM8400 is not set | 1090 | # CONFIG_MFD_WM8400 is not set |
1057 | # CONFIG_MFD_WM8350_I2C is not set | 1091 | # CONFIG_MFD_WM8350_I2C is not set |
1058 | # CONFIG_MFD_PCF50633 is not set | 1092 | # CONFIG_MFD_PCF50633 is not set |
1093 | # CONFIG_AB3100_CORE is not set | ||
1094 | # CONFIG_EZX_PCAP is not set | ||
1059 | # CONFIG_REGULATOR is not set | 1095 | # CONFIG_REGULATOR is not set |
1060 | 1096 | # CONFIG_MEDIA_SUPPORT is not set | |
1061 | # | ||
1062 | # Multimedia devices | ||
1063 | # | ||
1064 | |||
1065 | # | ||
1066 | # Multimedia core support | ||
1067 | # | ||
1068 | # CONFIG_VIDEO_DEV is not set | ||
1069 | # CONFIG_DVB_CORE is not set | ||
1070 | # CONFIG_VIDEO_MEDIA is not set | ||
1071 | |||
1072 | # | ||
1073 | # Multimedia drivers | ||
1074 | # | ||
1075 | CONFIG_DAB=y | ||
1076 | # CONFIG_USB_DABUSB is not set | ||
1077 | 1097 | ||
1078 | # | 1098 | # |
1079 | # Graphics support | 1099 | # Graphics support |
@@ -1135,6 +1155,7 @@ CONFIG_USB_MON=y | |||
1135 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
1136 | # | 1156 | # |
1137 | # CONFIG_USB_C67X00_HCD is not set | 1157 | # CONFIG_USB_C67X00_HCD is not set |
1158 | # CONFIG_USB_XHCI_HCD is not set | ||
1138 | CONFIG_USB_EHCI_HCD=y | 1159 | CONFIG_USB_EHCI_HCD=y |
1139 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1160 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1140 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1161 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1144,9 +1165,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1144 | # CONFIG_USB_ISP116X_HCD is not set | 1165 | # CONFIG_USB_ISP116X_HCD is not set |
1145 | # CONFIG_USB_ISP1760_HCD is not set | 1166 | # CONFIG_USB_ISP1760_HCD is not set |
1146 | CONFIG_USB_OHCI_HCD=y | 1167 | CONFIG_USB_OHCI_HCD=y |
1147 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1148 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1168 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1149 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 1169 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
1170 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1150 | CONFIG_USB_OHCI_HCD_PCI=y | 1171 | CONFIG_USB_OHCI_HCD_PCI=y |
1151 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1172 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1152 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1173 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1235,8 +1256,9 @@ CONFIG_USB_GADGET_SELECTED=y | |||
1235 | # CONFIG_USB_GADGET_OMAP is not set | 1256 | # CONFIG_USB_GADGET_OMAP is not set |
1236 | # CONFIG_USB_GADGET_PXA25X is not set | 1257 | # CONFIG_USB_GADGET_PXA25X is not set |
1237 | # CONFIG_USB_GADGET_PXA27X is not set | 1258 | # CONFIG_USB_GADGET_PXA27X is not set |
1238 | # CONFIG_USB_GADGET_S3C2410 is not set | 1259 | # CONFIG_USB_GADGET_S3C_HSOTG is not set |
1239 | # CONFIG_USB_GADGET_IMX is not set | 1260 | # CONFIG_USB_GADGET_IMX is not set |
1261 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
1240 | # CONFIG_USB_GADGET_M66592 is not set | 1262 | # CONFIG_USB_GADGET_M66592 is not set |
1241 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 1263 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
1242 | # CONFIG_USB_GADGET_FSL_QE is not set | 1264 | # CONFIG_USB_GADGET_FSL_QE is not set |
@@ -1244,9 +1266,11 @@ CONFIG_USB_GADGET_SELECTED=y | |||
1244 | CONFIG_USB_GADGET_NET2280=y | 1266 | CONFIG_USB_GADGET_NET2280=y |
1245 | CONFIG_USB_NET2280=y | 1267 | CONFIG_USB_NET2280=y |
1246 | # CONFIG_USB_GADGET_GOKU is not set | 1268 | # CONFIG_USB_GADGET_GOKU is not set |
1269 | # CONFIG_USB_GADGET_LANGWELL is not set | ||
1247 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 1270 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
1248 | CONFIG_USB_GADGET_DUALSPEED=y | 1271 | CONFIG_USB_GADGET_DUALSPEED=y |
1249 | # CONFIG_USB_ZERO is not set | 1272 | # CONFIG_USB_ZERO is not set |
1273 | # CONFIG_USB_AUDIO is not set | ||
1250 | CONFIG_USB_ETH=y | 1274 | CONFIG_USB_ETH=y |
1251 | CONFIG_USB_ETH_RNDIS=y | 1275 | CONFIG_USB_ETH_RNDIS=y |
1252 | # CONFIG_USB_GADGETFS is not set | 1276 | # CONFIG_USB_GADGETFS is not set |
@@ -1298,6 +1322,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1298 | # CONFIG_RTC_DRV_S35390A is not set | 1322 | # CONFIG_RTC_DRV_S35390A is not set |
1299 | # CONFIG_RTC_DRV_FM3130 is not set | 1323 | # CONFIG_RTC_DRV_FM3130 is not set |
1300 | # CONFIG_RTC_DRV_RX8581 is not set | 1324 | # CONFIG_RTC_DRV_RX8581 is not set |
1325 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1301 | 1326 | ||
1302 | # | 1327 | # |
1303 | # SPI RTC drivers | 1328 | # SPI RTC drivers |
@@ -1332,6 +1357,10 @@ CONFIG_RTC_DRV_DS1307=y | |||
1332 | # CONFIG_DMADEVICES is not set | 1357 | # CONFIG_DMADEVICES is not set |
1333 | # CONFIG_AUXDISPLAY is not set | 1358 | # CONFIG_AUXDISPLAY is not set |
1334 | # CONFIG_UIO is not set | 1359 | # CONFIG_UIO is not set |
1360 | |||
1361 | # | ||
1362 | # TI VLYNQ | ||
1363 | # | ||
1335 | # CONFIG_STAGING is not set | 1364 | # CONFIG_STAGING is not set |
1336 | 1365 | ||
1337 | # | 1366 | # |
@@ -1351,10 +1380,12 @@ CONFIG_FS_MBCACHE=y | |||
1351 | # CONFIG_REISERFS_FS is not set | 1380 | # CONFIG_REISERFS_FS is not set |
1352 | # CONFIG_JFS_FS is not set | 1381 | # CONFIG_JFS_FS is not set |
1353 | # CONFIG_FS_POSIX_ACL is not set | 1382 | # CONFIG_FS_POSIX_ACL is not set |
1354 | CONFIG_FILE_LOCKING=y | ||
1355 | # CONFIG_XFS_FS is not set | 1383 | # CONFIG_XFS_FS is not set |
1384 | # CONFIG_GFS2_FS is not set | ||
1356 | # CONFIG_OCFS2_FS is not set | 1385 | # CONFIG_OCFS2_FS is not set |
1357 | # CONFIG_BTRFS_FS is not set | 1386 | # CONFIG_BTRFS_FS is not set |
1387 | CONFIG_FILE_LOCKING=y | ||
1388 | CONFIG_FSNOTIFY=y | ||
1358 | CONFIG_DNOTIFY=y | 1389 | CONFIG_DNOTIFY=y |
1359 | CONFIG_INOTIFY=y | 1390 | CONFIG_INOTIFY=y |
1360 | CONFIG_INOTIFY_USER=y | 1391 | CONFIG_INOTIFY_USER=y |
@@ -1428,6 +1459,7 @@ CONFIG_NFS_FS=y | |||
1428 | CONFIG_NFS_V3=y | 1459 | CONFIG_NFS_V3=y |
1429 | # CONFIG_NFS_V3_ACL is not set | 1460 | # CONFIG_NFS_V3_ACL is not set |
1430 | CONFIG_NFS_V4=y | 1461 | CONFIG_NFS_V4=y |
1462 | # CONFIG_NFS_V4_1 is not set | ||
1431 | CONFIG_ROOT_NFS=y | 1463 | CONFIG_ROOT_NFS=y |
1432 | # CONFIG_NFSD is not set | 1464 | # CONFIG_NFSD is not set |
1433 | CONFIG_LOCKD=y | 1465 | CONFIG_LOCKD=y |
@@ -1464,7 +1496,46 @@ CONFIG_MSDOS_PARTITION=y | |||
1464 | # CONFIG_KARMA_PARTITION is not set | 1496 | # CONFIG_KARMA_PARTITION is not set |
1465 | # CONFIG_EFI_PARTITION is not set | 1497 | # CONFIG_EFI_PARTITION is not set |
1466 | # CONFIG_SYSV68_PARTITION is not set | 1498 | # CONFIG_SYSV68_PARTITION is not set |
1467 | # CONFIG_NLS is not set | 1499 | CONFIG_NLS=y |
1500 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1501 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1502 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1503 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1504 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1505 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1506 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1507 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1508 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1509 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1510 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1511 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1512 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1513 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1514 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1515 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1516 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1517 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1518 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1519 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1520 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1521 | # CONFIG_NLS_ISO8859_8 is not set | ||
1522 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1523 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1524 | # CONFIG_NLS_ASCII is not set | ||
1525 | # CONFIG_NLS_ISO8859_1 is not set | ||
1526 | # CONFIG_NLS_ISO8859_2 is not set | ||
1527 | # CONFIG_NLS_ISO8859_3 is not set | ||
1528 | # CONFIG_NLS_ISO8859_4 is not set | ||
1529 | # CONFIG_NLS_ISO8859_5 is not set | ||
1530 | # CONFIG_NLS_ISO8859_6 is not set | ||
1531 | # CONFIG_NLS_ISO8859_7 is not set | ||
1532 | # CONFIG_NLS_ISO8859_9 is not set | ||
1533 | # CONFIG_NLS_ISO8859_13 is not set | ||
1534 | # CONFIG_NLS_ISO8859_14 is not set | ||
1535 | # CONFIG_NLS_ISO8859_15 is not set | ||
1536 | # CONFIG_NLS_KOI8_R is not set | ||
1537 | # CONFIG_NLS_KOI8_U is not set | ||
1538 | # CONFIG_NLS_UTF8 is not set | ||
1468 | # CONFIG_DLM is not set | 1539 | # CONFIG_DLM is not set |
1469 | # CONFIG_BINARY_PRINTF is not set | 1540 | # CONFIG_BINARY_PRINTF is not set |
1470 | 1541 | ||
@@ -1488,6 +1559,7 @@ CONFIG_HAS_IOPORT=y | |||
1488 | CONFIG_HAS_DMA=y | 1559 | CONFIG_HAS_DMA=y |
1489 | CONFIG_HAVE_LMB=y | 1560 | CONFIG_HAVE_LMB=y |
1490 | CONFIG_NLATTR=y | 1561 | CONFIG_NLATTR=y |
1562 | CONFIG_GENERIC_ATOMIC64=y | ||
1491 | 1563 | ||
1492 | # | 1564 | # |
1493 | # Kernel hacking | 1565 | # Kernel hacking |
@@ -1518,6 +1590,9 @@ CONFIG_SCHED_DEBUG=y | |||
1518 | # CONFIG_RT_MUTEX_TESTER is not set | 1590 | # CONFIG_RT_MUTEX_TESTER is not set |
1519 | # CONFIG_DEBUG_SPINLOCK is not set | 1591 | # CONFIG_DEBUG_SPINLOCK is not set |
1520 | # CONFIG_DEBUG_MUTEXES is not set | 1592 | # CONFIG_DEBUG_MUTEXES is not set |
1593 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1594 | # CONFIG_PROVE_LOCKING is not set | ||
1595 | # CONFIG_LOCK_STAT is not set | ||
1521 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1596 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1522 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1597 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1523 | # CONFIG_DEBUG_KOBJECT is not set | 1598 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1529,7 +1604,6 @@ CONFIG_SCHED_DEBUG=y | |||
1529 | # CONFIG_DEBUG_LIST is not set | 1604 | # CONFIG_DEBUG_LIST is not set |
1530 | # CONFIG_DEBUG_SG is not set | 1605 | # CONFIG_DEBUG_SG is not set |
1531 | # CONFIG_DEBUG_NOTIFIERS is not set | 1606 | # CONFIG_DEBUG_NOTIFIERS is not set |
1532 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1533 | # CONFIG_RCU_TORTURE_TEST is not set | 1607 | # CONFIG_RCU_TORTURE_TEST is not set |
1534 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1608 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1535 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1609 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1543,16 +1617,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1543 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1617 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1544 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1618 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1545 | CONFIG_TRACING_SUPPORT=y | 1619 | CONFIG_TRACING_SUPPORT=y |
1546 | 1620 | CONFIG_FTRACE=y | |
1547 | # | ||
1548 | # Tracers | ||
1549 | # | ||
1550 | # CONFIG_FUNCTION_TRACER is not set | 1621 | # CONFIG_FUNCTION_TRACER is not set |
1622 | # CONFIG_IRQSOFF_TRACER is not set | ||
1551 | # CONFIG_SCHED_TRACER is not set | 1623 | # CONFIG_SCHED_TRACER is not set |
1552 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1624 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1553 | # CONFIG_EVENT_TRACER is not set | ||
1554 | # CONFIG_BOOT_TRACER is not set | 1625 | # CONFIG_BOOT_TRACER is not set |
1555 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1626 | CONFIG_BRANCH_PROFILE_NONE=y |
1627 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1628 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1556 | # CONFIG_STACK_TRACER is not set | 1629 | # CONFIG_STACK_TRACER is not set |
1557 | # CONFIG_KMEMTRACE is not set | 1630 | # CONFIG_KMEMTRACE is not set |
1558 | # CONFIG_WORKQUEUE_TRACER is not set | 1631 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1560,6 +1633,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1560 | # CONFIG_SAMPLES is not set | 1633 | # CONFIG_SAMPLES is not set |
1561 | CONFIG_HAVE_ARCH_KGDB=y | 1634 | CONFIG_HAVE_ARCH_KGDB=y |
1562 | # CONFIG_KGDB is not set | 1635 | # CONFIG_KGDB is not set |
1636 | # CONFIG_KMEMCHECK is not set | ||
1637 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1638 | CONFIG_PPC_WERROR=y | ||
1563 | CONFIG_PRINT_STACK_DEPTH=64 | 1639 | CONFIG_PRINT_STACK_DEPTH=64 |
1564 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1640 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1565 | # CONFIG_DEBUG_STACK_USAGE is not set | 1641 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index af4952feba36..76237d466702 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:06 2009 | 4 | # Wed Jul 29 23:32:05 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,9 +124,16 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
125 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -135,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
135 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
136 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
138 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
140 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -147,7 +162,7 @@ CONFIG_MODULE_UNLOAD=y | |||
147 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
150 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
151 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
152 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
153 | 168 | ||
@@ -189,6 +204,7 @@ CONFIG_MPC831x_RDB=y | |||
189 | # CONFIG_MPC837x_RDB is not set | 204 | # CONFIG_MPC837x_RDB is not set |
190 | # CONFIG_SBC834x is not set | 205 | # CONFIG_SBC834x is not set |
191 | # CONFIG_ASP834x is not set | 206 | # CONFIG_ASP834x is not set |
207 | # CONFIG_KMETER1 is not set | ||
192 | CONFIG_PPC_MPC831x=y | 208 | CONFIG_PPC_MPC831x=y |
193 | # CONFIG_PPC_86xx is not set | 209 | # CONFIG_PPC_86xx is not set |
194 | # CONFIG_EMBEDDED6xx is not set | 210 | # CONFIG_EMBEDDED6xx is not set |
@@ -234,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -254,9 +271,9 @@ CONFIG_MIGRATION=y | |||
254 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
256 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
257 | CONFIG_UNEVICTABLE_LRU=y | ||
258 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
259 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
260 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
261 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
262 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -366,6 +383,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
366 | # CONFIG_ECONET is not set | 383 | # CONFIG_ECONET is not set |
367 | # CONFIG_WAN_ROUTER is not set | 384 | # CONFIG_WAN_ROUTER is not set |
368 | # CONFIG_PHONET is not set | 385 | # CONFIG_PHONET is not set |
386 | # CONFIG_IEEE802154 is not set | ||
369 | # CONFIG_NET_SCHED is not set | 387 | # CONFIG_NET_SCHED is not set |
370 | # CONFIG_DCB is not set | 388 | # CONFIG_DCB is not set |
371 | 389 | ||
@@ -383,7 +401,11 @@ CONFIG_WIRELESS=y | |||
383 | CONFIG_WIRELESS_OLD_REGULATORY=y | 401 | CONFIG_WIRELESS_OLD_REGULATORY=y |
384 | # CONFIG_WIRELESS_EXT is not set | 402 | # CONFIG_WIRELESS_EXT is not set |
385 | # CONFIG_LIB80211 is not set | 403 | # CONFIG_LIB80211 is not set |
386 | # CONFIG_MAC80211 is not set | 404 | |
405 | # | ||
406 | # CFG80211 needs to be enabled for MAC80211 | ||
407 | # | ||
408 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
387 | # CONFIG_WIMAX is not set | 409 | # CONFIG_WIMAX is not set |
388 | # CONFIG_RFKILL is not set | 410 | # CONFIG_RFKILL is not set |
389 | # CONFIG_NET_9P is not set | 411 | # CONFIG_NET_9P is not set |
@@ -503,6 +525,7 @@ CONFIG_MTD_NAND_IDS=y | |||
503 | CONFIG_OF_DEVICE=y | 525 | CONFIG_OF_DEVICE=y |
504 | CONFIG_OF_I2C=y | 526 | CONFIG_OF_I2C=y |
505 | CONFIG_OF_SPI=y | 527 | CONFIG_OF_SPI=y |
528 | CONFIG_OF_MDIO=y | ||
506 | # CONFIG_PARPORT is not set | 529 | # CONFIG_PARPORT is not set |
507 | CONFIG_BLK_DEV=y | 530 | CONFIG_BLK_DEV=y |
508 | # CONFIG_BLK_DEV_FD is not set | 531 | # CONFIG_BLK_DEV_FD is not set |
@@ -539,7 +562,9 @@ CONFIG_MISC_DEVICES=y | |||
539 | # CONFIG_EEPROM_AT24 is not set | 562 | # CONFIG_EEPROM_AT24 is not set |
540 | # CONFIG_EEPROM_AT25 is not set | 563 | # CONFIG_EEPROM_AT25 is not set |
541 | # CONFIG_EEPROM_LEGACY is not set | 564 | # CONFIG_EEPROM_LEGACY is not set |
565 | # CONFIG_EEPROM_MAX6875 is not set | ||
542 | # CONFIG_EEPROM_93CX6 is not set | 566 | # CONFIG_EEPROM_93CX6 is not set |
567 | # CONFIG_CB710_CORE is not set | ||
543 | CONFIG_HAVE_IDE=y | 568 | CONFIG_HAVE_IDE=y |
544 | # CONFIG_IDE is not set | 569 | # CONFIG_IDE is not set |
545 | 570 | ||
@@ -562,10 +587,6 @@ CONFIG_SCSI_PROC_FS=y | |||
562 | # CONFIG_BLK_DEV_SR is not set | 587 | # CONFIG_BLK_DEV_SR is not set |
563 | CONFIG_CHR_DEV_SG=y | 588 | CONFIG_CHR_DEV_SG=y |
564 | # CONFIG_CHR_DEV_SCH is not set | 589 | # CONFIG_CHR_DEV_SCH is not set |
565 | |||
566 | # | ||
567 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
568 | # | ||
569 | # CONFIG_SCSI_MULTI_LUN is not set | 590 | # CONFIG_SCSI_MULTI_LUN is not set |
570 | # CONFIG_SCSI_CONSTANTS is not set | 591 | # CONFIG_SCSI_CONSTANTS is not set |
571 | # CONFIG_SCSI_LOGGING is not set | 592 | # CONFIG_SCSI_LOGGING is not set |
@@ -583,6 +604,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
583 | CONFIG_SCSI_LOWLEVEL=y | 604 | CONFIG_SCSI_LOWLEVEL=y |
584 | # CONFIG_ISCSI_TCP is not set | 605 | # CONFIG_ISCSI_TCP is not set |
585 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 606 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
607 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
586 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 608 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
587 | # CONFIG_SCSI_3W_9XXX is not set | 609 | # CONFIG_SCSI_3W_9XXX is not set |
588 | # CONFIG_SCSI_ACARD is not set | 610 | # CONFIG_SCSI_ACARD is not set |
@@ -591,6 +613,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
591 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 613 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
592 | # CONFIG_SCSI_AIC79XX is not set | 614 | # CONFIG_SCSI_AIC79XX is not set |
593 | # CONFIG_SCSI_AIC94XX is not set | 615 | # CONFIG_SCSI_AIC94XX is not set |
616 | # CONFIG_SCSI_MVSAS is not set | ||
594 | # CONFIG_SCSI_DPT_I2O is not set | 617 | # CONFIG_SCSI_DPT_I2O is not set |
595 | # CONFIG_SCSI_ADVANSYS is not set | 618 | # CONFIG_SCSI_ADVANSYS is not set |
596 | # CONFIG_SCSI_ARCMSR is not set | 619 | # CONFIG_SCSI_ARCMSR is not set |
@@ -610,7 +633,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
610 | # CONFIG_SCSI_IPS is not set | 633 | # CONFIG_SCSI_IPS is not set |
611 | # CONFIG_SCSI_INITIO is not set | 634 | # CONFIG_SCSI_INITIO is not set |
612 | # CONFIG_SCSI_INIA100 is not set | 635 | # CONFIG_SCSI_INIA100 is not set |
613 | # CONFIG_SCSI_MVSAS is not set | ||
614 | # CONFIG_SCSI_STEX is not set | 636 | # CONFIG_SCSI_STEX is not set |
615 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 637 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
616 | # CONFIG_SCSI_IPR is not set | 638 | # CONFIG_SCSI_IPR is not set |
@@ -704,14 +726,17 @@ CONFIG_MD_RAID1=y | |||
704 | # | 726 | # |
705 | 727 | ||
706 | # | 728 | # |
707 | # Enable only one of the two stacks, unless you know what you are doing | 729 | # You can enable one or both FireWire driver stacks. |
730 | # | ||
731 | |||
732 | # | ||
733 | # See the help texts for more information. | ||
708 | # | 734 | # |
709 | # CONFIG_FIREWIRE is not set | 735 | # CONFIG_FIREWIRE is not set |
710 | # CONFIG_IEEE1394 is not set | 736 | # CONFIG_IEEE1394 is not set |
711 | # CONFIG_I2O is not set | 737 | # CONFIG_I2O is not set |
712 | # CONFIG_MACINTOSH_DRIVERS is not set | 738 | # CONFIG_MACINTOSH_DRIVERS is not set |
713 | CONFIG_NETDEVICES=y | 739 | CONFIG_NETDEVICES=y |
714 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
715 | # CONFIG_DUMMY is not set | 740 | # CONFIG_DUMMY is not set |
716 | # CONFIG_BONDING is not set | 741 | # CONFIG_BONDING is not set |
717 | # CONFIG_MACVLAN is not set | 742 | # CONFIG_MACVLAN is not set |
@@ -775,6 +800,8 @@ CONFIG_E100=y | |||
775 | # CONFIG_SMSC9420 is not set | 800 | # CONFIG_SMSC9420 is not set |
776 | # CONFIG_SUNDANCE is not set | 801 | # CONFIG_SUNDANCE is not set |
777 | # CONFIG_TLAN is not set | 802 | # CONFIG_TLAN is not set |
803 | # CONFIG_KS8842 is not set | ||
804 | # CONFIG_KS8851 is not set | ||
778 | # CONFIG_VIA_RHINE is not set | 805 | # CONFIG_VIA_RHINE is not set |
779 | # CONFIG_SC92031 is not set | 806 | # CONFIG_SC92031 is not set |
780 | # CONFIG_ATL2 is not set | 807 | # CONFIG_ATL2 is not set |
@@ -796,8 +823,10 @@ CONFIG_NETDEV_1000=y | |||
796 | # CONFIG_VIA_VELOCITY is not set | 823 | # CONFIG_VIA_VELOCITY is not set |
797 | # CONFIG_TIGON3 is not set | 824 | # CONFIG_TIGON3 is not set |
798 | # CONFIG_BNX2 is not set | 825 | # CONFIG_BNX2 is not set |
826 | # CONFIG_CNIC is not set | ||
799 | CONFIG_FSL_PQ_MDIO=y | 827 | CONFIG_FSL_PQ_MDIO=y |
800 | CONFIG_GIANFAR=y | 828 | CONFIG_GIANFAR=y |
829 | # CONFIG_MV643XX_ETH is not set | ||
801 | # CONFIG_QLA3XXX is not set | 830 | # CONFIG_QLA3XXX is not set |
802 | # CONFIG_ATL1 is not set | 831 | # CONFIG_ATL1 is not set |
803 | # CONFIG_ATL1E is not set | 832 | # CONFIG_ATL1E is not set |
@@ -985,7 +1014,6 @@ CONFIG_I2C_MPC=y | |||
985 | # CONFIG_SENSORS_PCF8574 is not set | 1014 | # CONFIG_SENSORS_PCF8574 is not set |
986 | # CONFIG_PCF8575 is not set | 1015 | # CONFIG_PCF8575 is not set |
987 | # CONFIG_SENSORS_PCA9539 is not set | 1016 | # CONFIG_SENSORS_PCA9539 is not set |
988 | # CONFIG_SENSORS_MAX6875 is not set | ||
989 | # CONFIG_SENSORS_TSL2550 is not set | 1017 | # CONFIG_SENSORS_TSL2550 is not set |
990 | # CONFIG_I2C_DEBUG_CORE is not set | 1018 | # CONFIG_I2C_DEBUG_CORE is not set |
991 | # CONFIG_I2C_DEBUG_ALGO is not set | 1019 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -999,13 +1027,18 @@ CONFIG_SPI_MASTER=y | |||
999 | # SPI Master Controller Drivers | 1027 | # SPI Master Controller Drivers |
1000 | # | 1028 | # |
1001 | CONFIG_SPI_BITBANG=y | 1029 | CONFIG_SPI_BITBANG=y |
1002 | CONFIG_SPI_MPC83xx=y | 1030 | # CONFIG_SPI_MPC8xxx is not set |
1003 | 1031 | ||
1004 | # | 1032 | # |
1005 | # SPI Protocol Masters | 1033 | # SPI Protocol Masters |
1006 | # | 1034 | # |
1007 | # CONFIG_SPI_SPIDEV is not set | 1035 | # CONFIG_SPI_SPIDEV is not set |
1008 | # CONFIG_SPI_TLE62X0 is not set | 1036 | # CONFIG_SPI_TLE62X0 is not set |
1037 | |||
1038 | # | ||
1039 | # PPS support | ||
1040 | # | ||
1041 | # CONFIG_PPS is not set | ||
1009 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1042 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
1010 | # CONFIG_GPIOLIB is not set | 1043 | # CONFIG_GPIOLIB is not set |
1011 | # CONFIG_W1 is not set | 1044 | # CONFIG_W1 is not set |
@@ -1063,6 +1096,7 @@ CONFIG_HWMON=y | |||
1063 | # CONFIG_SENSORS_SMSC47B397 is not set | 1096 | # CONFIG_SENSORS_SMSC47B397 is not set |
1064 | # CONFIG_SENSORS_ADS7828 is not set | 1097 | # CONFIG_SENSORS_ADS7828 is not set |
1065 | # CONFIG_SENSORS_THMC50 is not set | 1098 | # CONFIG_SENSORS_THMC50 is not set |
1099 | # CONFIG_SENSORS_TMP401 is not set | ||
1066 | # CONFIG_SENSORS_VIA686A is not set | 1100 | # CONFIG_SENSORS_VIA686A is not set |
1067 | # CONFIG_SENSORS_VT1211 is not set | 1101 | # CONFIG_SENSORS_VT1211 is not set |
1068 | # CONFIG_SENSORS_VT8231 is not set | 1102 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1117,24 +1151,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1117 | # CONFIG_MFD_WM8400 is not set | 1151 | # CONFIG_MFD_WM8400 is not set |
1118 | # CONFIG_MFD_WM8350_I2C is not set | 1152 | # CONFIG_MFD_WM8350_I2C is not set |
1119 | # CONFIG_MFD_PCF50633 is not set | 1153 | # CONFIG_MFD_PCF50633 is not set |
1154 | # CONFIG_AB3100_CORE is not set | ||
1155 | # CONFIG_EZX_PCAP is not set | ||
1120 | # CONFIG_REGULATOR is not set | 1156 | # CONFIG_REGULATOR is not set |
1121 | 1157 | # CONFIG_MEDIA_SUPPORT is not set | |
1122 | # | ||
1123 | # Multimedia devices | ||
1124 | # | ||
1125 | |||
1126 | # | ||
1127 | # Multimedia core support | ||
1128 | # | ||
1129 | # CONFIG_VIDEO_DEV is not set | ||
1130 | # CONFIG_DVB_CORE is not set | ||
1131 | # CONFIG_VIDEO_MEDIA is not set | ||
1132 | |||
1133 | # | ||
1134 | # Multimedia drivers | ||
1135 | # | ||
1136 | CONFIG_DAB=y | ||
1137 | # CONFIG_USB_DABUSB is not set | ||
1138 | 1158 | ||
1139 | # | 1159 | # |
1140 | # Graphics support | 1160 | # Graphics support |
@@ -1196,6 +1216,7 @@ CONFIG_USB_MON=y | |||
1196 | # USB Host Controller Drivers | 1216 | # USB Host Controller Drivers |
1197 | # | 1217 | # |
1198 | # CONFIG_USB_C67X00_HCD is not set | 1218 | # CONFIG_USB_C67X00_HCD is not set |
1219 | # CONFIG_USB_XHCI_HCD is not set | ||
1199 | CONFIG_USB_EHCI_HCD=y | 1220 | CONFIG_USB_EHCI_HCD=y |
1200 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1221 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1201 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1222 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1205,9 +1226,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1205 | # CONFIG_USB_ISP116X_HCD is not set | 1226 | # CONFIG_USB_ISP116X_HCD is not set |
1206 | # CONFIG_USB_ISP1760_HCD is not set | 1227 | # CONFIG_USB_ISP1760_HCD is not set |
1207 | CONFIG_USB_OHCI_HCD=y | 1228 | CONFIG_USB_OHCI_HCD=y |
1208 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1209 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1229 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1210 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 1230 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
1231 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1211 | CONFIG_USB_OHCI_HCD_PCI=y | 1232 | CONFIG_USB_OHCI_HCD_PCI=y |
1212 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1233 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1213 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1234 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1296,8 +1317,9 @@ CONFIG_USB_GADGET_SELECTED=y | |||
1296 | # CONFIG_USB_GADGET_OMAP is not set | 1317 | # CONFIG_USB_GADGET_OMAP is not set |
1297 | # CONFIG_USB_GADGET_PXA25X is not set | 1318 | # CONFIG_USB_GADGET_PXA25X is not set |
1298 | # CONFIG_USB_GADGET_PXA27X is not set | 1319 | # CONFIG_USB_GADGET_PXA27X is not set |
1299 | # CONFIG_USB_GADGET_S3C2410 is not set | 1320 | # CONFIG_USB_GADGET_S3C_HSOTG is not set |
1300 | # CONFIG_USB_GADGET_IMX is not set | 1321 | # CONFIG_USB_GADGET_IMX is not set |
1322 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
1301 | # CONFIG_USB_GADGET_M66592 is not set | 1323 | # CONFIG_USB_GADGET_M66592 is not set |
1302 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 1324 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
1303 | # CONFIG_USB_GADGET_FSL_QE is not set | 1325 | # CONFIG_USB_GADGET_FSL_QE is not set |
@@ -1305,9 +1327,11 @@ CONFIG_USB_GADGET_SELECTED=y | |||
1305 | CONFIG_USB_GADGET_NET2280=y | 1327 | CONFIG_USB_GADGET_NET2280=y |
1306 | CONFIG_USB_NET2280=y | 1328 | CONFIG_USB_NET2280=y |
1307 | # CONFIG_USB_GADGET_GOKU is not set | 1329 | # CONFIG_USB_GADGET_GOKU is not set |
1330 | # CONFIG_USB_GADGET_LANGWELL is not set | ||
1308 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 1331 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
1309 | CONFIG_USB_GADGET_DUALSPEED=y | 1332 | CONFIG_USB_GADGET_DUALSPEED=y |
1310 | # CONFIG_USB_ZERO is not set | 1333 | # CONFIG_USB_ZERO is not set |
1334 | # CONFIG_USB_AUDIO is not set | ||
1311 | CONFIG_USB_ETH=y | 1335 | CONFIG_USB_ETH=y |
1312 | CONFIG_USB_ETH_RNDIS=y | 1336 | CONFIG_USB_ETH_RNDIS=y |
1313 | # CONFIG_USB_GADGETFS is not set | 1337 | # CONFIG_USB_GADGETFS is not set |
@@ -1359,6 +1383,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1359 | # CONFIG_RTC_DRV_S35390A is not set | 1383 | # CONFIG_RTC_DRV_S35390A is not set |
1360 | # CONFIG_RTC_DRV_FM3130 is not set | 1384 | # CONFIG_RTC_DRV_FM3130 is not set |
1361 | # CONFIG_RTC_DRV_RX8581 is not set | 1385 | # CONFIG_RTC_DRV_RX8581 is not set |
1386 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1362 | 1387 | ||
1363 | # | 1388 | # |
1364 | # SPI RTC drivers | 1389 | # SPI RTC drivers |
@@ -1393,6 +1418,10 @@ CONFIG_RTC_DRV_DS1307=y | |||
1393 | # CONFIG_DMADEVICES is not set | 1418 | # CONFIG_DMADEVICES is not set |
1394 | # CONFIG_AUXDISPLAY is not set | 1419 | # CONFIG_AUXDISPLAY is not set |
1395 | # CONFIG_UIO is not set | 1420 | # CONFIG_UIO is not set |
1421 | |||
1422 | # | ||
1423 | # TI VLYNQ | ||
1424 | # | ||
1396 | # CONFIG_STAGING is not set | 1425 | # CONFIG_STAGING is not set |
1397 | 1426 | ||
1398 | # | 1427 | # |
@@ -1412,10 +1441,12 @@ CONFIG_FS_MBCACHE=y | |||
1412 | # CONFIG_REISERFS_FS is not set | 1441 | # CONFIG_REISERFS_FS is not set |
1413 | # CONFIG_JFS_FS is not set | 1442 | # CONFIG_JFS_FS is not set |
1414 | # CONFIG_FS_POSIX_ACL is not set | 1443 | # CONFIG_FS_POSIX_ACL is not set |
1415 | CONFIG_FILE_LOCKING=y | ||
1416 | # CONFIG_XFS_FS is not set | 1444 | # CONFIG_XFS_FS is not set |
1445 | # CONFIG_GFS2_FS is not set | ||
1417 | # CONFIG_OCFS2_FS is not set | 1446 | # CONFIG_OCFS2_FS is not set |
1418 | # CONFIG_BTRFS_FS is not set | 1447 | # CONFIG_BTRFS_FS is not set |
1448 | CONFIG_FILE_LOCKING=y | ||
1449 | CONFIG_FSNOTIFY=y | ||
1419 | CONFIG_DNOTIFY=y | 1450 | CONFIG_DNOTIFY=y |
1420 | CONFIG_INOTIFY=y | 1451 | CONFIG_INOTIFY=y |
1421 | CONFIG_INOTIFY_USER=y | 1452 | CONFIG_INOTIFY_USER=y |
@@ -1489,6 +1520,7 @@ CONFIG_NFS_FS=y | |||
1489 | CONFIG_NFS_V3=y | 1520 | CONFIG_NFS_V3=y |
1490 | # CONFIG_NFS_V3_ACL is not set | 1521 | # CONFIG_NFS_V3_ACL is not set |
1491 | CONFIG_NFS_V4=y | 1522 | CONFIG_NFS_V4=y |
1523 | # CONFIG_NFS_V4_1 is not set | ||
1492 | CONFIG_ROOT_NFS=y | 1524 | CONFIG_ROOT_NFS=y |
1493 | # CONFIG_NFSD is not set | 1525 | # CONFIG_NFSD is not set |
1494 | CONFIG_LOCKD=y | 1526 | CONFIG_LOCKD=y |
@@ -1525,7 +1557,46 @@ CONFIG_MSDOS_PARTITION=y | |||
1525 | # CONFIG_KARMA_PARTITION is not set | 1557 | # CONFIG_KARMA_PARTITION is not set |
1526 | # CONFIG_EFI_PARTITION is not set | 1558 | # CONFIG_EFI_PARTITION is not set |
1527 | # CONFIG_SYSV68_PARTITION is not set | 1559 | # CONFIG_SYSV68_PARTITION is not set |
1528 | # CONFIG_NLS is not set | 1560 | CONFIG_NLS=y |
1561 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1562 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1563 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1564 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1565 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1566 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1567 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1568 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1569 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1570 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1571 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1572 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1573 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1574 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1575 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1576 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1577 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1578 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1579 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1580 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1581 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1582 | # CONFIG_NLS_ISO8859_8 is not set | ||
1583 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1584 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1585 | # CONFIG_NLS_ASCII is not set | ||
1586 | # CONFIG_NLS_ISO8859_1 is not set | ||
1587 | # CONFIG_NLS_ISO8859_2 is not set | ||
1588 | # CONFIG_NLS_ISO8859_3 is not set | ||
1589 | # CONFIG_NLS_ISO8859_4 is not set | ||
1590 | # CONFIG_NLS_ISO8859_5 is not set | ||
1591 | # CONFIG_NLS_ISO8859_6 is not set | ||
1592 | # CONFIG_NLS_ISO8859_7 is not set | ||
1593 | # CONFIG_NLS_ISO8859_9 is not set | ||
1594 | # CONFIG_NLS_ISO8859_13 is not set | ||
1595 | # CONFIG_NLS_ISO8859_14 is not set | ||
1596 | # CONFIG_NLS_ISO8859_15 is not set | ||
1597 | # CONFIG_NLS_KOI8_R is not set | ||
1598 | # CONFIG_NLS_KOI8_U is not set | ||
1599 | # CONFIG_NLS_UTF8 is not set | ||
1529 | # CONFIG_DLM is not set | 1600 | # CONFIG_DLM is not set |
1530 | # CONFIG_BINARY_PRINTF is not set | 1601 | # CONFIG_BINARY_PRINTF is not set |
1531 | 1602 | ||
@@ -1549,6 +1620,7 @@ CONFIG_HAS_IOPORT=y | |||
1549 | CONFIG_HAS_DMA=y | 1620 | CONFIG_HAS_DMA=y |
1550 | CONFIG_HAVE_LMB=y | 1621 | CONFIG_HAVE_LMB=y |
1551 | CONFIG_NLATTR=y | 1622 | CONFIG_NLATTR=y |
1623 | CONFIG_GENERIC_ATOMIC64=y | ||
1552 | 1624 | ||
1553 | # | 1625 | # |
1554 | # Kernel hacking | 1626 | # Kernel hacking |
@@ -1579,6 +1651,9 @@ CONFIG_SCHED_DEBUG=y | |||
1579 | # CONFIG_RT_MUTEX_TESTER is not set | 1651 | # CONFIG_RT_MUTEX_TESTER is not set |
1580 | # CONFIG_DEBUG_SPINLOCK is not set | 1652 | # CONFIG_DEBUG_SPINLOCK is not set |
1581 | # CONFIG_DEBUG_MUTEXES is not set | 1653 | # CONFIG_DEBUG_MUTEXES is not set |
1654 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1655 | # CONFIG_PROVE_LOCKING is not set | ||
1656 | # CONFIG_LOCK_STAT is not set | ||
1582 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1657 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1583 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1658 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1584 | # CONFIG_DEBUG_KOBJECT is not set | 1659 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1590,7 +1665,6 @@ CONFIG_SCHED_DEBUG=y | |||
1590 | # CONFIG_DEBUG_LIST is not set | 1665 | # CONFIG_DEBUG_LIST is not set |
1591 | # CONFIG_DEBUG_SG is not set | 1666 | # CONFIG_DEBUG_SG is not set |
1592 | # CONFIG_DEBUG_NOTIFIERS is not set | 1667 | # CONFIG_DEBUG_NOTIFIERS is not set |
1593 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1594 | # CONFIG_RCU_TORTURE_TEST is not set | 1668 | # CONFIG_RCU_TORTURE_TEST is not set |
1595 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1669 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1596 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1670 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1604,16 +1678,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1604 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1678 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1605 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1679 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1606 | CONFIG_TRACING_SUPPORT=y | 1680 | CONFIG_TRACING_SUPPORT=y |
1607 | 1681 | CONFIG_FTRACE=y | |
1608 | # | ||
1609 | # Tracers | ||
1610 | # | ||
1611 | # CONFIG_FUNCTION_TRACER is not set | 1682 | # CONFIG_FUNCTION_TRACER is not set |
1683 | # CONFIG_IRQSOFF_TRACER is not set | ||
1612 | # CONFIG_SCHED_TRACER is not set | 1684 | # CONFIG_SCHED_TRACER is not set |
1613 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1685 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1614 | # CONFIG_EVENT_TRACER is not set | ||
1615 | # CONFIG_BOOT_TRACER is not set | 1686 | # CONFIG_BOOT_TRACER is not set |
1616 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1687 | CONFIG_BRANCH_PROFILE_NONE=y |
1688 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1689 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1617 | # CONFIG_STACK_TRACER is not set | 1690 | # CONFIG_STACK_TRACER is not set |
1618 | # CONFIG_KMEMTRACE is not set | 1691 | # CONFIG_KMEMTRACE is not set |
1619 | # CONFIG_WORKQUEUE_TRACER is not set | 1692 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1621,6 +1694,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1621 | # CONFIG_SAMPLES is not set | 1694 | # CONFIG_SAMPLES is not set |
1622 | CONFIG_HAVE_ARCH_KGDB=y | 1695 | CONFIG_HAVE_ARCH_KGDB=y |
1623 | # CONFIG_KGDB is not set | 1696 | # CONFIG_KGDB is not set |
1697 | # CONFIG_KMEMCHECK is not set | ||
1698 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1699 | CONFIG_PPC_WERROR=y | ||
1624 | CONFIG_PRINT_STACK_DEPTH=64 | 1700 | CONFIG_PRINT_STACK_DEPTH=64 |
1625 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1701 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1626 | # CONFIG_DEBUG_STACK_USAGE is not set | 1702 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index 8c8f660b4fc7..e0e36a113409 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:07 2009 | 4 | # Wed Jul 29 23:32:06 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,9 +124,16 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
125 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -135,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
135 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
136 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
138 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
140 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -147,7 +162,7 @@ CONFIG_MODULE_UNLOAD=y | |||
147 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
150 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
151 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
152 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
153 | 168 | ||
@@ -189,6 +204,7 @@ CONFIG_MPC832x_MDS=y | |||
189 | # CONFIG_MPC837x_RDB is not set | 204 | # CONFIG_MPC837x_RDB is not set |
190 | # CONFIG_SBC834x is not set | 205 | # CONFIG_SBC834x is not set |
191 | # CONFIG_ASP834x is not set | 206 | # CONFIG_ASP834x is not set |
207 | # CONFIG_KMETER1 is not set | ||
192 | CONFIG_PPC_MPC832x=y | 208 | CONFIG_PPC_MPC832x=y |
193 | # CONFIG_PPC_86xx is not set | 209 | # CONFIG_PPC_86xx is not set |
194 | # CONFIG_EMBEDDED6xx is not set | 210 | # CONFIG_EMBEDDED6xx is not set |
@@ -235,6 +251,7 @@ CONFIG_BINFMT_ELF=y | |||
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | CONFIG_MATH_EMULATION=y | 252 | CONFIG_MATH_EMULATION=y |
237 | # CONFIG_IOMMU_HELPER is not set | 253 | # CONFIG_IOMMU_HELPER is not set |
254 | # CONFIG_SWIOTLB is not set | ||
238 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
239 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 256 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
240 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 257 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -255,9 +272,9 @@ CONFIG_MIGRATION=y | |||
255 | CONFIG_ZONE_DMA_FLAG=1 | 272 | CONFIG_ZONE_DMA_FLAG=1 |
256 | CONFIG_BOUNCE=y | 273 | CONFIG_BOUNCE=y |
257 | CONFIG_VIRT_TO_BUS=y | 274 | CONFIG_VIRT_TO_BUS=y |
258 | CONFIG_UNEVICTABLE_LRU=y | ||
259 | CONFIG_HAVE_MLOCK=y | 275 | CONFIG_HAVE_MLOCK=y |
260 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 276 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
277 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
261 | CONFIG_PPC_4K_PAGES=y | 278 | CONFIG_PPC_4K_PAGES=y |
262 | # CONFIG_PPC_16K_PAGES is not set | 279 | # CONFIG_PPC_16K_PAGES is not set |
263 | # CONFIG_PPC_64K_PAGES is not set | 280 | # CONFIG_PPC_64K_PAGES is not set |
@@ -366,6 +383,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
366 | # CONFIG_ECONET is not set | 383 | # CONFIG_ECONET is not set |
367 | # CONFIG_WAN_ROUTER is not set | 384 | # CONFIG_WAN_ROUTER is not set |
368 | # CONFIG_PHONET is not set | 385 | # CONFIG_PHONET is not set |
386 | # CONFIG_IEEE802154 is not set | ||
369 | # CONFIG_NET_SCHED is not set | 387 | # CONFIG_NET_SCHED is not set |
370 | # CONFIG_DCB is not set | 388 | # CONFIG_DCB is not set |
371 | 389 | ||
@@ -383,7 +401,11 @@ CONFIG_WIRELESS=y | |||
383 | CONFIG_WIRELESS_OLD_REGULATORY=y | 401 | CONFIG_WIRELESS_OLD_REGULATORY=y |
384 | # CONFIG_WIRELESS_EXT is not set | 402 | # CONFIG_WIRELESS_EXT is not set |
385 | # CONFIG_LIB80211 is not set | 403 | # CONFIG_LIB80211 is not set |
386 | # CONFIG_MAC80211 is not set | 404 | |
405 | # | ||
406 | # CFG80211 needs to be enabled for MAC80211 | ||
407 | # | ||
408 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
387 | # CONFIG_WIMAX is not set | 409 | # CONFIG_WIMAX is not set |
388 | # CONFIG_RFKILL is not set | 410 | # CONFIG_RFKILL is not set |
389 | # CONFIG_NET_9P is not set | 411 | # CONFIG_NET_9P is not set |
@@ -404,6 +426,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
404 | # CONFIG_MTD is not set | 426 | # CONFIG_MTD is not set |
405 | CONFIG_OF_DEVICE=y | 427 | CONFIG_OF_DEVICE=y |
406 | CONFIG_OF_I2C=y | 428 | CONFIG_OF_I2C=y |
429 | CONFIG_OF_MDIO=y | ||
407 | # CONFIG_PARPORT is not set | 430 | # CONFIG_PARPORT is not set |
408 | CONFIG_BLK_DEV=y | 431 | CONFIG_BLK_DEV=y |
409 | # CONFIG_BLK_DEV_FD is not set | 432 | # CONFIG_BLK_DEV_FD is not set |
@@ -438,7 +461,9 @@ CONFIG_MISC_DEVICES=y | |||
438 | # | 461 | # |
439 | # CONFIG_EEPROM_AT24 is not set | 462 | # CONFIG_EEPROM_AT24 is not set |
440 | # CONFIG_EEPROM_LEGACY is not set | 463 | # CONFIG_EEPROM_LEGACY is not set |
464 | # CONFIG_EEPROM_MAX6875 is not set | ||
441 | # CONFIG_EEPROM_93CX6 is not set | 465 | # CONFIG_EEPROM_93CX6 is not set |
466 | # CONFIG_CB710_CORE is not set | ||
442 | CONFIG_HAVE_IDE=y | 467 | CONFIG_HAVE_IDE=y |
443 | # CONFIG_IDE is not set | 468 | # CONFIG_IDE is not set |
444 | 469 | ||
@@ -461,10 +486,6 @@ CONFIG_SCSI_PROC_FS=y | |||
461 | # CONFIG_BLK_DEV_SR is not set | 486 | # CONFIG_BLK_DEV_SR is not set |
462 | # CONFIG_CHR_DEV_SG is not set | 487 | # CONFIG_CHR_DEV_SG is not set |
463 | # CONFIG_CHR_DEV_SCH is not set | 488 | # CONFIG_CHR_DEV_SCH is not set |
464 | |||
465 | # | ||
466 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
467 | # | ||
468 | # CONFIG_SCSI_MULTI_LUN is not set | 489 | # CONFIG_SCSI_MULTI_LUN is not set |
469 | # CONFIG_SCSI_CONSTANTS is not set | 490 | # CONFIG_SCSI_CONSTANTS is not set |
470 | # CONFIG_SCSI_LOGGING is not set | 491 | # CONFIG_SCSI_LOGGING is not set |
@@ -482,6 +503,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
482 | CONFIG_SCSI_LOWLEVEL=y | 503 | CONFIG_SCSI_LOWLEVEL=y |
483 | # CONFIG_ISCSI_TCP is not set | 504 | # CONFIG_ISCSI_TCP is not set |
484 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 505 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
506 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
485 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 507 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
486 | # CONFIG_SCSI_3W_9XXX is not set | 508 | # CONFIG_SCSI_3W_9XXX is not set |
487 | # CONFIG_SCSI_ACARD is not set | 509 | # CONFIG_SCSI_ACARD is not set |
@@ -490,6 +512,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
490 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 512 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
491 | # CONFIG_SCSI_AIC79XX is not set | 513 | # CONFIG_SCSI_AIC79XX is not set |
492 | # CONFIG_SCSI_AIC94XX is not set | 514 | # CONFIG_SCSI_AIC94XX is not set |
515 | # CONFIG_SCSI_MVSAS is not set | ||
493 | # CONFIG_SCSI_DPT_I2O is not set | 516 | # CONFIG_SCSI_DPT_I2O is not set |
494 | # CONFIG_SCSI_ADVANSYS is not set | 517 | # CONFIG_SCSI_ADVANSYS is not set |
495 | # CONFIG_SCSI_ARCMSR is not set | 518 | # CONFIG_SCSI_ARCMSR is not set |
@@ -509,7 +532,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
509 | # CONFIG_SCSI_IPS is not set | 532 | # CONFIG_SCSI_IPS is not set |
510 | # CONFIG_SCSI_INITIO is not set | 533 | # CONFIG_SCSI_INITIO is not set |
511 | # CONFIG_SCSI_INIA100 is not set | 534 | # CONFIG_SCSI_INIA100 is not set |
512 | # CONFIG_SCSI_MVSAS is not set | ||
513 | # CONFIG_SCSI_STEX is not set | 535 | # CONFIG_SCSI_STEX is not set |
514 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 536 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
515 | # CONFIG_SCSI_QLOGIC_1280 is not set | 537 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -532,14 +554,17 @@ CONFIG_SCSI_LOWLEVEL=y | |||
532 | # | 554 | # |
533 | 555 | ||
534 | # | 556 | # |
535 | # Enable only one of the two stacks, unless you know what you are doing | 557 | # You can enable one or both FireWire driver stacks. |
558 | # | ||
559 | |||
560 | # | ||
561 | # See the help texts for more information. | ||
536 | # | 562 | # |
537 | # CONFIG_FIREWIRE is not set | 563 | # CONFIG_FIREWIRE is not set |
538 | # CONFIG_IEEE1394 is not set | 564 | # CONFIG_IEEE1394 is not set |
539 | # CONFIG_I2O is not set | 565 | # CONFIG_I2O is not set |
540 | # CONFIG_MACINTOSH_DRIVERS is not set | 566 | # CONFIG_MACINTOSH_DRIVERS is not set |
541 | CONFIG_NETDEVICES=y | 567 | CONFIG_NETDEVICES=y |
542 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
543 | # CONFIG_DUMMY is not set | 568 | # CONFIG_DUMMY is not set |
544 | # CONFIG_BONDING is not set | 569 | # CONFIG_BONDING is not set |
545 | # CONFIG_MACVLAN is not set | 570 | # CONFIG_MACVLAN is not set |
@@ -586,6 +611,7 @@ CONFIG_MII=y | |||
586 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 611 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
587 | # CONFIG_NET_PCI is not set | 612 | # CONFIG_NET_PCI is not set |
588 | # CONFIG_B44 is not set | 613 | # CONFIG_B44 is not set |
614 | # CONFIG_KS8842 is not set | ||
589 | # CONFIG_ATL2 is not set | 615 | # CONFIG_ATL2 is not set |
590 | CONFIG_NETDEV_1000=y | 616 | CONFIG_NETDEV_1000=y |
591 | # CONFIG_ACENIC is not set | 617 | # CONFIG_ACENIC is not set |
@@ -605,11 +631,13 @@ CONFIG_NETDEV_1000=y | |||
605 | # CONFIG_VIA_VELOCITY is not set | 631 | # CONFIG_VIA_VELOCITY is not set |
606 | # CONFIG_TIGON3 is not set | 632 | # CONFIG_TIGON3 is not set |
607 | # CONFIG_BNX2 is not set | 633 | # CONFIG_BNX2 is not set |
634 | # CONFIG_CNIC is not set | ||
608 | CONFIG_FSL_PQ_MDIO=y | 635 | CONFIG_FSL_PQ_MDIO=y |
609 | # CONFIG_GIANFAR is not set | 636 | # CONFIG_GIANFAR is not set |
610 | CONFIG_UCC_GETH=y | 637 | CONFIG_UCC_GETH=y |
611 | # CONFIG_UGETH_MAGIC_PACKET is not set | 638 | # CONFIG_UGETH_MAGIC_PACKET is not set |
612 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 639 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
640 | # CONFIG_MV643XX_ETH is not set | ||
613 | # CONFIG_QLA3XXX is not set | 641 | # CONFIG_QLA3XXX is not set |
614 | # CONFIG_ATL1 is not set | 642 | # CONFIG_ATL1 is not set |
615 | # CONFIG_ATL1E is not set | 643 | # CONFIG_ATL1E is not set |
@@ -787,13 +815,17 @@ CONFIG_I2C_MPC=y | |||
787 | # CONFIG_SENSORS_PCF8574 is not set | 815 | # CONFIG_SENSORS_PCF8574 is not set |
788 | # CONFIG_PCF8575 is not set | 816 | # CONFIG_PCF8575 is not set |
789 | # CONFIG_SENSORS_PCA9539 is not set | 817 | # CONFIG_SENSORS_PCA9539 is not set |
790 | # CONFIG_SENSORS_MAX6875 is not set | ||
791 | # CONFIG_SENSORS_TSL2550 is not set | 818 | # CONFIG_SENSORS_TSL2550 is not set |
792 | # CONFIG_I2C_DEBUG_CORE is not set | 819 | # CONFIG_I2C_DEBUG_CORE is not set |
793 | # CONFIG_I2C_DEBUG_ALGO is not set | 820 | # CONFIG_I2C_DEBUG_ALGO is not set |
794 | # CONFIG_I2C_DEBUG_BUS is not set | 821 | # CONFIG_I2C_DEBUG_BUS is not set |
795 | # CONFIG_I2C_DEBUG_CHIP is not set | 822 | # CONFIG_I2C_DEBUG_CHIP is not set |
796 | # CONFIG_SPI is not set | 823 | # CONFIG_SPI is not set |
824 | |||
825 | # | ||
826 | # PPS support | ||
827 | # | ||
828 | # CONFIG_PPS is not set | ||
797 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 829 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
798 | # CONFIG_GPIOLIB is not set | 830 | # CONFIG_GPIOLIB is not set |
799 | # CONFIG_W1 is not set | 831 | # CONFIG_W1 is not set |
@@ -848,6 +880,7 @@ CONFIG_HWMON=y | |||
848 | # CONFIG_SENSORS_SMSC47B397 is not set | 880 | # CONFIG_SENSORS_SMSC47B397 is not set |
849 | # CONFIG_SENSORS_ADS7828 is not set | 881 | # CONFIG_SENSORS_ADS7828 is not set |
850 | # CONFIG_SENSORS_THMC50 is not set | 882 | # CONFIG_SENSORS_THMC50 is not set |
883 | # CONFIG_SENSORS_TMP401 is not set | ||
851 | # CONFIG_SENSORS_VIA686A is not set | 884 | # CONFIG_SENSORS_VIA686A is not set |
852 | # CONFIG_SENSORS_VT1211 is not set | 885 | # CONFIG_SENSORS_VT1211 is not set |
853 | # CONFIG_SENSORS_VT8231 is not set | 886 | # CONFIG_SENSORS_VT8231 is not set |
@@ -896,23 +929,9 @@ CONFIG_SSB_POSSIBLE=y | |||
896 | # CONFIG_MFD_WM8400 is not set | 929 | # CONFIG_MFD_WM8400 is not set |
897 | # CONFIG_MFD_WM8350_I2C is not set | 930 | # CONFIG_MFD_WM8350_I2C is not set |
898 | # CONFIG_MFD_PCF50633 is not set | 931 | # CONFIG_MFD_PCF50633 is not set |
932 | # CONFIG_AB3100_CORE is not set | ||
899 | # CONFIG_REGULATOR is not set | 933 | # CONFIG_REGULATOR is not set |
900 | 934 | # CONFIG_MEDIA_SUPPORT is not set | |
901 | # | ||
902 | # Multimedia devices | ||
903 | # | ||
904 | |||
905 | # | ||
906 | # Multimedia core support | ||
907 | # | ||
908 | # CONFIG_VIDEO_DEV is not set | ||
909 | # CONFIG_DVB_CORE is not set | ||
910 | # CONFIG_VIDEO_MEDIA is not set | ||
911 | |||
912 | # | ||
913 | # Multimedia drivers | ||
914 | # | ||
915 | CONFIG_DAB=y | ||
916 | 935 | ||
917 | # | 936 | # |
918 | # Graphics support | 937 | # Graphics support |
@@ -996,6 +1015,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
996 | # CONFIG_RTC_DRV_S35390A is not set | 1015 | # CONFIG_RTC_DRV_S35390A is not set |
997 | # CONFIG_RTC_DRV_FM3130 is not set | 1016 | # CONFIG_RTC_DRV_FM3130 is not set |
998 | # CONFIG_RTC_DRV_RX8581 is not set | 1017 | # CONFIG_RTC_DRV_RX8581 is not set |
1018 | # CONFIG_RTC_DRV_RX8025 is not set | ||
999 | 1019 | ||
1000 | # | 1020 | # |
1001 | # SPI RTC drivers | 1021 | # SPI RTC drivers |
@@ -1023,6 +1043,10 @@ CONFIG_RTC_DRV_DS1374=y | |||
1023 | # CONFIG_DMADEVICES is not set | 1043 | # CONFIG_DMADEVICES is not set |
1024 | # CONFIG_AUXDISPLAY is not set | 1044 | # CONFIG_AUXDISPLAY is not set |
1025 | # CONFIG_UIO is not set | 1045 | # CONFIG_UIO is not set |
1046 | |||
1047 | # | ||
1048 | # TI VLYNQ | ||
1049 | # | ||
1026 | # CONFIG_STAGING is not set | 1050 | # CONFIG_STAGING is not set |
1027 | 1051 | ||
1028 | # | 1052 | # |
@@ -1042,10 +1066,12 @@ CONFIG_FS_MBCACHE=y | |||
1042 | # CONFIG_REISERFS_FS is not set | 1066 | # CONFIG_REISERFS_FS is not set |
1043 | # CONFIG_JFS_FS is not set | 1067 | # CONFIG_JFS_FS is not set |
1044 | # CONFIG_FS_POSIX_ACL is not set | 1068 | # CONFIG_FS_POSIX_ACL is not set |
1045 | CONFIG_FILE_LOCKING=y | ||
1046 | # CONFIG_XFS_FS is not set | 1069 | # CONFIG_XFS_FS is not set |
1070 | # CONFIG_GFS2_FS is not set | ||
1047 | # CONFIG_OCFS2_FS is not set | 1071 | # CONFIG_OCFS2_FS is not set |
1048 | # CONFIG_BTRFS_FS is not set | 1072 | # CONFIG_BTRFS_FS is not set |
1073 | CONFIG_FILE_LOCKING=y | ||
1074 | CONFIG_FSNOTIFY=y | ||
1049 | CONFIG_DNOTIFY=y | 1075 | CONFIG_DNOTIFY=y |
1050 | CONFIG_INOTIFY=y | 1076 | CONFIG_INOTIFY=y |
1051 | CONFIG_INOTIFY_USER=y | 1077 | CONFIG_INOTIFY_USER=y |
@@ -1108,6 +1134,7 @@ CONFIG_NFS_FS=y | |||
1108 | CONFIG_NFS_V3=y | 1134 | CONFIG_NFS_V3=y |
1109 | # CONFIG_NFS_V3_ACL is not set | 1135 | # CONFIG_NFS_V3_ACL is not set |
1110 | CONFIG_NFS_V4=y | 1136 | CONFIG_NFS_V4=y |
1137 | # CONFIG_NFS_V4_1 is not set | ||
1111 | CONFIG_ROOT_NFS=y | 1138 | CONFIG_ROOT_NFS=y |
1112 | # CONFIG_NFSD is not set | 1139 | # CONFIG_NFSD is not set |
1113 | CONFIG_LOCKD=y | 1140 | CONFIG_LOCKD=y |
@@ -1165,6 +1192,7 @@ CONFIG_HAS_IOPORT=y | |||
1165 | CONFIG_HAS_DMA=y | 1192 | CONFIG_HAS_DMA=y |
1166 | CONFIG_HAVE_LMB=y | 1193 | CONFIG_HAVE_LMB=y |
1167 | CONFIG_NLATTR=y | 1194 | CONFIG_NLATTR=y |
1195 | CONFIG_GENERIC_ATOMIC64=y | ||
1168 | 1196 | ||
1169 | # | 1197 | # |
1170 | # Kernel hacking | 1198 | # Kernel hacking |
@@ -1190,22 +1218,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1190 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1218 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1191 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1219 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1192 | CONFIG_TRACING_SUPPORT=y | 1220 | CONFIG_TRACING_SUPPORT=y |
1193 | 1221 | # CONFIG_FTRACE is not set | |
1194 | # | ||
1195 | # Tracers | ||
1196 | # | ||
1197 | # CONFIG_FUNCTION_TRACER is not set | ||
1198 | # CONFIG_SCHED_TRACER is not set | ||
1199 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1200 | # CONFIG_EVENT_TRACER is not set | ||
1201 | # CONFIG_BOOT_TRACER is not set | ||
1202 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1203 | # CONFIG_STACK_TRACER is not set | ||
1204 | # CONFIG_KMEMTRACE is not set | ||
1205 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1206 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1207 | # CONFIG_SAMPLES is not set | 1222 | # CONFIG_SAMPLES is not set |
1208 | CONFIG_HAVE_ARCH_KGDB=y | 1223 | CONFIG_HAVE_ARCH_KGDB=y |
1224 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1225 | CONFIG_PPC_WERROR=y | ||
1209 | CONFIG_PRINT_STACK_DEPTH=64 | 1226 | CONFIG_PRINT_STACK_DEPTH=64 |
1210 | # CONFIG_IRQSTACKS is not set | 1227 | # CONFIG_IRQSTACKS is not set |
1211 | # CONFIG_BOOTX_TEXT is not set | 1228 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index 227dbba76795..4f27d4548223 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:08 2009 | 4 | # Wed Jul 29 23:32:07 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,9 +124,16 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
125 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -135,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
135 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
136 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
138 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
140 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -147,7 +162,7 @@ CONFIG_MODULE_UNLOAD=y | |||
147 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
150 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
151 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
152 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
153 | 168 | ||
@@ -189,6 +204,7 @@ CONFIG_MPC832x_RDB=y | |||
189 | # CONFIG_MPC837x_RDB is not set | 204 | # CONFIG_MPC837x_RDB is not set |
190 | # CONFIG_SBC834x is not set | 205 | # CONFIG_SBC834x is not set |
191 | # CONFIG_ASP834x is not set | 206 | # CONFIG_ASP834x is not set |
207 | # CONFIG_KMETER1 is not set | ||
192 | CONFIG_PPC_MPC832x=y | 208 | CONFIG_PPC_MPC832x=y |
193 | # CONFIG_PPC_86xx is not set | 209 | # CONFIG_PPC_86xx is not set |
194 | # CONFIG_EMBEDDED6xx is not set | 210 | # CONFIG_EMBEDDED6xx is not set |
@@ -235,6 +251,7 @@ CONFIG_BINFMT_ELF=y | |||
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | CONFIG_MATH_EMULATION=y | 252 | CONFIG_MATH_EMULATION=y |
237 | # CONFIG_IOMMU_HELPER is not set | 253 | # CONFIG_IOMMU_HELPER is not set |
254 | # CONFIG_SWIOTLB is not set | ||
238 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
239 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 256 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
240 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 257 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -255,9 +272,9 @@ CONFIG_MIGRATION=y | |||
255 | CONFIG_ZONE_DMA_FLAG=1 | 272 | CONFIG_ZONE_DMA_FLAG=1 |
256 | CONFIG_BOUNCE=y | 273 | CONFIG_BOUNCE=y |
257 | CONFIG_VIRT_TO_BUS=y | 274 | CONFIG_VIRT_TO_BUS=y |
258 | CONFIG_UNEVICTABLE_LRU=y | ||
259 | CONFIG_HAVE_MLOCK=y | 275 | CONFIG_HAVE_MLOCK=y |
260 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 276 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
277 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
261 | CONFIG_PPC_4K_PAGES=y | 278 | CONFIG_PPC_4K_PAGES=y |
262 | # CONFIG_PPC_16K_PAGES is not set | 279 | # CONFIG_PPC_16K_PAGES is not set |
263 | # CONFIG_PPC_64K_PAGES is not set | 280 | # CONFIG_PPC_64K_PAGES is not set |
@@ -366,6 +383,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
366 | # CONFIG_ECONET is not set | 383 | # CONFIG_ECONET is not set |
367 | # CONFIG_WAN_ROUTER is not set | 384 | # CONFIG_WAN_ROUTER is not set |
368 | # CONFIG_PHONET is not set | 385 | # CONFIG_PHONET is not set |
386 | # CONFIG_IEEE802154 is not set | ||
369 | # CONFIG_NET_SCHED is not set | 387 | # CONFIG_NET_SCHED is not set |
370 | # CONFIG_DCB is not set | 388 | # CONFIG_DCB is not set |
371 | 389 | ||
@@ -383,7 +401,11 @@ CONFIG_WIRELESS=y | |||
383 | CONFIG_WIRELESS_OLD_REGULATORY=y | 401 | CONFIG_WIRELESS_OLD_REGULATORY=y |
384 | # CONFIG_WIRELESS_EXT is not set | 402 | # CONFIG_WIRELESS_EXT is not set |
385 | # CONFIG_LIB80211 is not set | 403 | # CONFIG_LIB80211 is not set |
386 | # CONFIG_MAC80211 is not set | 404 | |
405 | # | ||
406 | # CFG80211 needs to be enabled for MAC80211 | ||
407 | # | ||
408 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
387 | # CONFIG_WIMAX is not set | 409 | # CONFIG_WIMAX is not set |
388 | # CONFIG_RFKILL is not set | 410 | # CONFIG_RFKILL is not set |
389 | # CONFIG_NET_9P is not set | 411 | # CONFIG_NET_9P is not set |
@@ -405,6 +427,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
405 | CONFIG_OF_DEVICE=y | 427 | CONFIG_OF_DEVICE=y |
406 | CONFIG_OF_I2C=y | 428 | CONFIG_OF_I2C=y |
407 | CONFIG_OF_SPI=y | 429 | CONFIG_OF_SPI=y |
430 | CONFIG_OF_MDIO=y | ||
408 | # CONFIG_PARPORT is not set | 431 | # CONFIG_PARPORT is not set |
409 | CONFIG_BLK_DEV=y | 432 | CONFIG_BLK_DEV=y |
410 | # CONFIG_BLK_DEV_FD is not set | 433 | # CONFIG_BLK_DEV_FD is not set |
@@ -441,7 +464,9 @@ CONFIG_MISC_DEVICES=y | |||
441 | # CONFIG_EEPROM_AT24 is not set | 464 | # CONFIG_EEPROM_AT24 is not set |
442 | # CONFIG_EEPROM_AT25 is not set | 465 | # CONFIG_EEPROM_AT25 is not set |
443 | # CONFIG_EEPROM_LEGACY is not set | 466 | # CONFIG_EEPROM_LEGACY is not set |
467 | # CONFIG_EEPROM_MAX6875 is not set | ||
444 | # CONFIG_EEPROM_93CX6 is not set | 468 | # CONFIG_EEPROM_93CX6 is not set |
469 | # CONFIG_CB710_CORE is not set | ||
445 | CONFIG_HAVE_IDE=y | 470 | CONFIG_HAVE_IDE=y |
446 | # CONFIG_IDE is not set | 471 | # CONFIG_IDE is not set |
447 | 472 | ||
@@ -464,10 +489,6 @@ CONFIG_BLK_DEV_SD=y | |||
464 | # CONFIG_BLK_DEV_SR is not set | 489 | # CONFIG_BLK_DEV_SR is not set |
465 | # CONFIG_CHR_DEV_SG is not set | 490 | # CONFIG_CHR_DEV_SG is not set |
466 | # CONFIG_CHR_DEV_SCH is not set | 491 | # CONFIG_CHR_DEV_SCH is not set |
467 | |||
468 | # | ||
469 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
470 | # | ||
471 | # CONFIG_SCSI_MULTI_LUN is not set | 492 | # CONFIG_SCSI_MULTI_LUN is not set |
472 | # CONFIG_SCSI_CONSTANTS is not set | 493 | # CONFIG_SCSI_CONSTANTS is not set |
473 | # CONFIG_SCSI_LOGGING is not set | 494 | # CONFIG_SCSI_LOGGING is not set |
@@ -485,6 +506,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
485 | CONFIG_SCSI_LOWLEVEL=y | 506 | CONFIG_SCSI_LOWLEVEL=y |
486 | # CONFIG_ISCSI_TCP is not set | 507 | # CONFIG_ISCSI_TCP is not set |
487 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 508 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
509 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
488 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 510 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
489 | # CONFIG_SCSI_3W_9XXX is not set | 511 | # CONFIG_SCSI_3W_9XXX is not set |
490 | # CONFIG_SCSI_ACARD is not set | 512 | # CONFIG_SCSI_ACARD is not set |
@@ -493,6 +515,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
493 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 515 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
494 | # CONFIG_SCSI_AIC79XX is not set | 516 | # CONFIG_SCSI_AIC79XX is not set |
495 | # CONFIG_SCSI_AIC94XX is not set | 517 | # CONFIG_SCSI_AIC94XX is not set |
518 | # CONFIG_SCSI_MVSAS is not set | ||
496 | # CONFIG_SCSI_DPT_I2O is not set | 519 | # CONFIG_SCSI_DPT_I2O is not set |
497 | # CONFIG_SCSI_ADVANSYS is not set | 520 | # CONFIG_SCSI_ADVANSYS is not set |
498 | # CONFIG_SCSI_ARCMSR is not set | 521 | # CONFIG_SCSI_ARCMSR is not set |
@@ -512,7 +535,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
512 | # CONFIG_SCSI_IPS is not set | 535 | # CONFIG_SCSI_IPS is not set |
513 | # CONFIG_SCSI_INITIO is not set | 536 | # CONFIG_SCSI_INITIO is not set |
514 | # CONFIG_SCSI_INIA100 is not set | 537 | # CONFIG_SCSI_INIA100 is not set |
515 | # CONFIG_SCSI_MVSAS is not set | ||
516 | # CONFIG_SCSI_STEX is not set | 538 | # CONFIG_SCSI_STEX is not set |
517 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 539 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
518 | # CONFIG_SCSI_QLOGIC_1280 is not set | 540 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -535,14 +557,17 @@ CONFIG_SCSI_LOWLEVEL=y | |||
535 | # | 557 | # |
536 | 558 | ||
537 | # | 559 | # |
538 | # Enable only one of the two stacks, unless you know what you are doing | 560 | # You can enable one or both FireWire driver stacks. |
561 | # | ||
562 | |||
563 | # | ||
564 | # See the help texts for more information. | ||
539 | # | 565 | # |
540 | # CONFIG_FIREWIRE is not set | 566 | # CONFIG_FIREWIRE is not set |
541 | # CONFIG_IEEE1394 is not set | 567 | # CONFIG_IEEE1394 is not set |
542 | # CONFIG_I2O is not set | 568 | # CONFIG_I2O is not set |
543 | # CONFIG_MACINTOSH_DRIVERS is not set | 569 | # CONFIG_MACINTOSH_DRIVERS is not set |
544 | CONFIG_NETDEVICES=y | 570 | CONFIG_NETDEVICES=y |
545 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
546 | # CONFIG_DUMMY is not set | 571 | # CONFIG_DUMMY is not set |
547 | # CONFIG_BONDING is not set | 572 | # CONFIG_BONDING is not set |
548 | # CONFIG_MACVLAN is not set | 573 | # CONFIG_MACVLAN is not set |
@@ -590,6 +615,8 @@ CONFIG_MII=y | |||
590 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 615 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
591 | # CONFIG_NET_PCI is not set | 616 | # CONFIG_NET_PCI is not set |
592 | # CONFIG_B44 is not set | 617 | # CONFIG_B44 is not set |
618 | # CONFIG_KS8842 is not set | ||
619 | # CONFIG_KS8851 is not set | ||
593 | # CONFIG_ATL2 is not set | 620 | # CONFIG_ATL2 is not set |
594 | CONFIG_NETDEV_1000=y | 621 | CONFIG_NETDEV_1000=y |
595 | # CONFIG_ACENIC is not set | 622 | # CONFIG_ACENIC is not set |
@@ -609,11 +636,13 @@ CONFIG_E1000=y | |||
609 | # CONFIG_VIA_VELOCITY is not set | 636 | # CONFIG_VIA_VELOCITY is not set |
610 | # CONFIG_TIGON3 is not set | 637 | # CONFIG_TIGON3 is not set |
611 | # CONFIG_BNX2 is not set | 638 | # CONFIG_BNX2 is not set |
639 | # CONFIG_CNIC is not set | ||
612 | CONFIG_FSL_PQ_MDIO=y | 640 | CONFIG_FSL_PQ_MDIO=y |
613 | # CONFIG_GIANFAR is not set | 641 | # CONFIG_GIANFAR is not set |
614 | CONFIG_UCC_GETH=y | 642 | CONFIG_UCC_GETH=y |
615 | # CONFIG_UGETH_MAGIC_PACKET is not set | 643 | # CONFIG_UGETH_MAGIC_PACKET is not set |
616 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 644 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
645 | # CONFIG_MV643XX_ETH is not set | ||
617 | # CONFIG_QLA3XXX is not set | 646 | # CONFIG_QLA3XXX is not set |
618 | # CONFIG_ATL1 is not set | 647 | # CONFIG_ATL1 is not set |
619 | # CONFIG_ATL1E is not set | 648 | # CONFIG_ATL1E is not set |
@@ -804,7 +833,6 @@ CONFIG_I2C_MPC=y | |||
804 | # CONFIG_SENSORS_PCF8574 is not set | 833 | # CONFIG_SENSORS_PCF8574 is not set |
805 | # CONFIG_PCF8575 is not set | 834 | # CONFIG_PCF8575 is not set |
806 | # CONFIG_SENSORS_PCA9539 is not set | 835 | # CONFIG_SENSORS_PCA9539 is not set |
807 | # CONFIG_SENSORS_MAX6875 is not set | ||
808 | # CONFIG_SENSORS_TSL2550 is not set | 836 | # CONFIG_SENSORS_TSL2550 is not set |
809 | # CONFIG_I2C_DEBUG_CORE is not set | 837 | # CONFIG_I2C_DEBUG_CORE is not set |
810 | # CONFIG_I2C_DEBUG_ALGO is not set | 838 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -817,13 +845,18 @@ CONFIG_SPI_MASTER=y | |||
817 | # SPI Master Controller Drivers | 845 | # SPI Master Controller Drivers |
818 | # | 846 | # |
819 | CONFIG_SPI_BITBANG=y | 847 | CONFIG_SPI_BITBANG=y |
820 | CONFIG_SPI_MPC83xx=y | 848 | # CONFIG_SPI_MPC8xxx is not set |
821 | 849 | ||
822 | # | 850 | # |
823 | # SPI Protocol Masters | 851 | # SPI Protocol Masters |
824 | # | 852 | # |
825 | # CONFIG_SPI_SPIDEV is not set | 853 | # CONFIG_SPI_SPIDEV is not set |
826 | # CONFIG_SPI_TLE62X0 is not set | 854 | # CONFIG_SPI_TLE62X0 is not set |
855 | |||
856 | # | ||
857 | # PPS support | ||
858 | # | ||
859 | # CONFIG_PPS is not set | ||
827 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 860 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
828 | # CONFIG_GPIOLIB is not set | 861 | # CONFIG_GPIOLIB is not set |
829 | # CONFIG_W1 is not set | 862 | # CONFIG_W1 is not set |
@@ -881,6 +914,7 @@ CONFIG_HWMON=y | |||
881 | # CONFIG_SENSORS_SMSC47B397 is not set | 914 | # CONFIG_SENSORS_SMSC47B397 is not set |
882 | # CONFIG_SENSORS_ADS7828 is not set | 915 | # CONFIG_SENSORS_ADS7828 is not set |
883 | # CONFIG_SENSORS_THMC50 is not set | 916 | # CONFIG_SENSORS_THMC50 is not set |
917 | # CONFIG_SENSORS_TMP401 is not set | ||
884 | # CONFIG_SENSORS_VIA686A is not set | 918 | # CONFIG_SENSORS_VIA686A is not set |
885 | # CONFIG_SENSORS_VT1211 is not set | 919 | # CONFIG_SENSORS_VT1211 is not set |
886 | # CONFIG_SENSORS_VT8231 is not set | 920 | # CONFIG_SENSORS_VT8231 is not set |
@@ -935,24 +969,10 @@ CONFIG_SSB_POSSIBLE=y | |||
935 | # CONFIG_MFD_WM8400 is not set | 969 | # CONFIG_MFD_WM8400 is not set |
936 | # CONFIG_MFD_WM8350_I2C is not set | 970 | # CONFIG_MFD_WM8350_I2C is not set |
937 | # CONFIG_MFD_PCF50633 is not set | 971 | # CONFIG_MFD_PCF50633 is not set |
972 | # CONFIG_AB3100_CORE is not set | ||
973 | # CONFIG_EZX_PCAP is not set | ||
938 | # CONFIG_REGULATOR is not set | 974 | # CONFIG_REGULATOR is not set |
939 | 975 | # CONFIG_MEDIA_SUPPORT is not set | |
940 | # | ||
941 | # Multimedia devices | ||
942 | # | ||
943 | |||
944 | # | ||
945 | # Multimedia core support | ||
946 | # | ||
947 | # CONFIG_VIDEO_DEV is not set | ||
948 | # CONFIG_DVB_CORE is not set | ||
949 | # CONFIG_VIDEO_MEDIA is not set | ||
950 | |||
951 | # | ||
952 | # Multimedia drivers | ||
953 | # | ||
954 | CONFIG_DAB=y | ||
955 | # CONFIG_USB_DABUSB is not set | ||
956 | 976 | ||
957 | # | 977 | # |
958 | # Graphics support | 978 | # Graphics support |
@@ -1014,6 +1034,7 @@ CONFIG_USB_MON=y | |||
1014 | # USB Host Controller Drivers | 1034 | # USB Host Controller Drivers |
1015 | # | 1035 | # |
1016 | # CONFIG_USB_C67X00_HCD is not set | 1036 | # CONFIG_USB_C67X00_HCD is not set |
1037 | # CONFIG_USB_XHCI_HCD is not set | ||
1017 | CONFIG_USB_EHCI_HCD=y | 1038 | CONFIG_USB_EHCI_HCD=y |
1018 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1039 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1019 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1040 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1023,9 +1044,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1023 | # CONFIG_USB_ISP116X_HCD is not set | 1044 | # CONFIG_USB_ISP116X_HCD is not set |
1024 | # CONFIG_USB_ISP1760_HCD is not set | 1045 | # CONFIG_USB_ISP1760_HCD is not set |
1025 | CONFIG_USB_OHCI_HCD=y | 1046 | CONFIG_USB_OHCI_HCD=y |
1026 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1027 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1047 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1028 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 1048 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
1049 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1029 | CONFIG_USB_OHCI_HCD_PCI=y | 1050 | CONFIG_USB_OHCI_HCD_PCI=y |
1030 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1051 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1031 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1052 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1127,6 +1148,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
1127 | # CONFIG_MMC_WBSD is not set | 1148 | # CONFIG_MMC_WBSD is not set |
1128 | # CONFIG_MMC_TIFM_SD is not set | 1149 | # CONFIG_MMC_TIFM_SD is not set |
1129 | CONFIG_MMC_SPI=y | 1150 | CONFIG_MMC_SPI=y |
1151 | # CONFIG_MMC_CB710 is not set | ||
1152 | # CONFIG_MMC_VIA_SDMMC is not set | ||
1130 | # CONFIG_MEMSTICK is not set | 1153 | # CONFIG_MEMSTICK is not set |
1131 | # CONFIG_NEW_LEDS is not set | 1154 | # CONFIG_NEW_LEDS is not set |
1132 | # CONFIG_ACCESSIBILITY is not set | 1155 | # CONFIG_ACCESSIBILITY is not set |
@@ -1136,6 +1159,10 @@ CONFIG_MMC_SPI=y | |||
1136 | # CONFIG_DMADEVICES is not set | 1159 | # CONFIG_DMADEVICES is not set |
1137 | # CONFIG_AUXDISPLAY is not set | 1160 | # CONFIG_AUXDISPLAY is not set |
1138 | # CONFIG_UIO is not set | 1161 | # CONFIG_UIO is not set |
1162 | |||
1163 | # | ||
1164 | # TI VLYNQ | ||
1165 | # | ||
1139 | # CONFIG_STAGING is not set | 1166 | # CONFIG_STAGING is not set |
1140 | 1167 | ||
1141 | # | 1168 | # |
@@ -1155,10 +1182,12 @@ CONFIG_FS_MBCACHE=y | |||
1155 | # CONFIG_REISERFS_FS is not set | 1182 | # CONFIG_REISERFS_FS is not set |
1156 | # CONFIG_JFS_FS is not set | 1183 | # CONFIG_JFS_FS is not set |
1157 | # CONFIG_FS_POSIX_ACL is not set | 1184 | # CONFIG_FS_POSIX_ACL is not set |
1158 | CONFIG_FILE_LOCKING=y | ||
1159 | # CONFIG_XFS_FS is not set | 1185 | # CONFIG_XFS_FS is not set |
1186 | # CONFIG_GFS2_FS is not set | ||
1160 | # CONFIG_OCFS2_FS is not set | 1187 | # CONFIG_OCFS2_FS is not set |
1161 | # CONFIG_BTRFS_FS is not set | 1188 | # CONFIG_BTRFS_FS is not set |
1189 | CONFIG_FILE_LOCKING=y | ||
1190 | CONFIG_FSNOTIFY=y | ||
1162 | CONFIG_DNOTIFY=y | 1191 | CONFIG_DNOTIFY=y |
1163 | CONFIG_INOTIFY=y | 1192 | CONFIG_INOTIFY=y |
1164 | CONFIG_INOTIFY_USER=y | 1193 | CONFIG_INOTIFY_USER=y |
@@ -1224,6 +1253,7 @@ CONFIG_NFS_FS=y | |||
1224 | CONFIG_NFS_V3=y | 1253 | CONFIG_NFS_V3=y |
1225 | # CONFIG_NFS_V3_ACL is not set | 1254 | # CONFIG_NFS_V3_ACL is not set |
1226 | CONFIG_NFS_V4=y | 1255 | CONFIG_NFS_V4=y |
1256 | # CONFIG_NFS_V4_1 is not set | ||
1227 | CONFIG_ROOT_NFS=y | 1257 | CONFIG_ROOT_NFS=y |
1228 | # CONFIG_NFSD is not set | 1258 | # CONFIG_NFSD is not set |
1229 | CONFIG_LOCKD=y | 1259 | CONFIG_LOCKD=y |
@@ -1325,6 +1355,7 @@ CONFIG_HAS_IOPORT=y | |||
1325 | CONFIG_HAS_DMA=y | 1355 | CONFIG_HAS_DMA=y |
1326 | CONFIG_HAVE_LMB=y | 1356 | CONFIG_HAVE_LMB=y |
1327 | CONFIG_NLATTR=y | 1357 | CONFIG_NLATTR=y |
1358 | CONFIG_GENERIC_ATOMIC64=y | ||
1328 | 1359 | ||
1329 | # | 1360 | # |
1330 | # Kernel hacking | 1361 | # Kernel hacking |
@@ -1350,22 +1381,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1350 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1381 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1351 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1382 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1352 | CONFIG_TRACING_SUPPORT=y | 1383 | CONFIG_TRACING_SUPPORT=y |
1353 | 1384 | # CONFIG_FTRACE is not set | |
1354 | # | ||
1355 | # Tracers | ||
1356 | # | ||
1357 | # CONFIG_FUNCTION_TRACER is not set | ||
1358 | # CONFIG_SCHED_TRACER is not set | ||
1359 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1360 | # CONFIG_EVENT_TRACER is not set | ||
1361 | # CONFIG_BOOT_TRACER is not set | ||
1362 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1363 | # CONFIG_STACK_TRACER is not set | ||
1364 | # CONFIG_KMEMTRACE is not set | ||
1365 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1366 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1367 | # CONFIG_SAMPLES is not set | 1385 | # CONFIG_SAMPLES is not set |
1368 | CONFIG_HAVE_ARCH_KGDB=y | 1386 | CONFIG_HAVE_ARCH_KGDB=y |
1387 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1388 | CONFIG_PPC_WERROR=y | ||
1369 | CONFIG_PRINT_STACK_DEPTH=64 | 1389 | CONFIG_PRINT_STACK_DEPTH=64 |
1370 | # CONFIG_IRQSTACKS is not set | 1390 | # CONFIG_IRQSTACKS is not set |
1371 | # CONFIG_BOOTX_TEXT is not set | 1391 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index 24ee7fcac87e..648dac0c9d8d 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:09 2009 | 4 | # Wed Jul 29 23:32:07 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,9 +124,16 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
125 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -135,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
135 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
136 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
138 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
140 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -147,7 +162,7 @@ CONFIG_MODULE_UNLOAD=y | |||
147 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
150 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
151 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
152 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
153 | 168 | ||
@@ -189,6 +204,7 @@ CONFIG_MPC834x_ITX=y | |||
189 | # CONFIG_MPC837x_RDB is not set | 204 | # CONFIG_MPC837x_RDB is not set |
190 | # CONFIG_SBC834x is not set | 205 | # CONFIG_SBC834x is not set |
191 | # CONFIG_ASP834x is not set | 206 | # CONFIG_ASP834x is not set |
207 | # CONFIG_KMETER1 is not set | ||
192 | CONFIG_PPC_MPC834x=y | 208 | CONFIG_PPC_MPC834x=y |
193 | # CONFIG_PPC_86xx is not set | 209 | # CONFIG_PPC_86xx is not set |
194 | # CONFIG_EMBEDDED6xx is not set | 210 | # CONFIG_EMBEDDED6xx is not set |
@@ -234,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -254,9 +271,9 @@ CONFIG_MIGRATION=y | |||
254 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
256 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
257 | CONFIG_UNEVICTABLE_LRU=y | ||
258 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
259 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
260 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
261 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
262 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -365,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
365 | # CONFIG_ECONET is not set | 382 | # CONFIG_ECONET is not set |
366 | # CONFIG_WAN_ROUTER is not set | 383 | # CONFIG_WAN_ROUTER is not set |
367 | # CONFIG_PHONET is not set | 384 | # CONFIG_PHONET is not set |
385 | # CONFIG_IEEE802154 is not set | ||
368 | # CONFIG_NET_SCHED is not set | 386 | # CONFIG_NET_SCHED is not set |
369 | # CONFIG_DCB is not set | 387 | # CONFIG_DCB is not set |
370 | 388 | ||
@@ -382,7 +400,11 @@ CONFIG_WIRELESS=y | |||
382 | CONFIG_WIRELESS_OLD_REGULATORY=y | 400 | CONFIG_WIRELESS_OLD_REGULATORY=y |
383 | # CONFIG_WIRELESS_EXT is not set | 401 | # CONFIG_WIRELESS_EXT is not set |
384 | # CONFIG_LIB80211 is not set | 402 | # CONFIG_LIB80211 is not set |
385 | # CONFIG_MAC80211 is not set | 403 | |
404 | # | ||
405 | # CFG80211 needs to be enabled for MAC80211 | ||
406 | # | ||
407 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
386 | # CONFIG_WIMAX is not set | 408 | # CONFIG_WIMAX is not set |
387 | # CONFIG_RFKILL is not set | 409 | # CONFIG_RFKILL is not set |
388 | # CONFIG_NET_9P is not set | 410 | # CONFIG_NET_9P is not set |
@@ -487,6 +509,7 @@ CONFIG_MTD_PHYSMAP=y | |||
487 | CONFIG_OF_DEVICE=y | 509 | CONFIG_OF_DEVICE=y |
488 | CONFIG_OF_I2C=y | 510 | CONFIG_OF_I2C=y |
489 | CONFIG_OF_SPI=y | 511 | CONFIG_OF_SPI=y |
512 | CONFIG_OF_MDIO=y | ||
490 | # CONFIG_PARPORT is not set | 513 | # CONFIG_PARPORT is not set |
491 | CONFIG_BLK_DEV=y | 514 | CONFIG_BLK_DEV=y |
492 | # CONFIG_BLK_DEV_FD is not set | 515 | # CONFIG_BLK_DEV_FD is not set |
@@ -523,7 +546,9 @@ CONFIG_MISC_DEVICES=y | |||
523 | # CONFIG_EEPROM_AT24 is not set | 546 | # CONFIG_EEPROM_AT24 is not set |
524 | # CONFIG_EEPROM_AT25 is not set | 547 | # CONFIG_EEPROM_AT25 is not set |
525 | # CONFIG_EEPROM_LEGACY is not set | 548 | # CONFIG_EEPROM_LEGACY is not set |
549 | # CONFIG_EEPROM_MAX6875 is not set | ||
526 | # CONFIG_EEPROM_93CX6 is not set | 550 | # CONFIG_EEPROM_93CX6 is not set |
551 | # CONFIG_CB710_CORE is not set | ||
527 | CONFIG_HAVE_IDE=y | 552 | CONFIG_HAVE_IDE=y |
528 | CONFIG_IDE=y | 553 | CONFIG_IDE=y |
529 | 554 | ||
@@ -594,10 +619,6 @@ CONFIG_BLK_DEV_SD=y | |||
594 | # CONFIG_BLK_DEV_SR is not set | 619 | # CONFIG_BLK_DEV_SR is not set |
595 | CONFIG_CHR_DEV_SG=y | 620 | CONFIG_CHR_DEV_SG=y |
596 | # CONFIG_CHR_DEV_SCH is not set | 621 | # CONFIG_CHR_DEV_SCH is not set |
597 | |||
598 | # | ||
599 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
600 | # | ||
601 | # CONFIG_SCSI_MULTI_LUN is not set | 622 | # CONFIG_SCSI_MULTI_LUN is not set |
602 | # CONFIG_SCSI_CONSTANTS is not set | 623 | # CONFIG_SCSI_CONSTANTS is not set |
603 | # CONFIG_SCSI_LOGGING is not set | 624 | # CONFIG_SCSI_LOGGING is not set |
@@ -615,6 +636,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
615 | CONFIG_SCSI_LOWLEVEL=y | 636 | CONFIG_SCSI_LOWLEVEL=y |
616 | # CONFIG_ISCSI_TCP is not set | 637 | # CONFIG_ISCSI_TCP is not set |
617 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 638 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
639 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
618 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 640 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
619 | # CONFIG_SCSI_3W_9XXX is not set | 641 | # CONFIG_SCSI_3W_9XXX is not set |
620 | # CONFIG_SCSI_ACARD is not set | 642 | # CONFIG_SCSI_ACARD is not set |
@@ -623,6 +645,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
623 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 645 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
624 | # CONFIG_SCSI_AIC79XX is not set | 646 | # CONFIG_SCSI_AIC79XX is not set |
625 | # CONFIG_SCSI_AIC94XX is not set | 647 | # CONFIG_SCSI_AIC94XX is not set |
648 | # CONFIG_SCSI_MVSAS is not set | ||
626 | # CONFIG_SCSI_DPT_I2O is not set | 649 | # CONFIG_SCSI_DPT_I2O is not set |
627 | # CONFIG_SCSI_ADVANSYS is not set | 650 | # CONFIG_SCSI_ADVANSYS is not set |
628 | # CONFIG_SCSI_ARCMSR is not set | 651 | # CONFIG_SCSI_ARCMSR is not set |
@@ -642,7 +665,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
642 | # CONFIG_SCSI_IPS is not set | 665 | # CONFIG_SCSI_IPS is not set |
643 | # CONFIG_SCSI_INITIO is not set | 666 | # CONFIG_SCSI_INITIO is not set |
644 | # CONFIG_SCSI_INIA100 is not set | 667 | # CONFIG_SCSI_INIA100 is not set |
645 | # CONFIG_SCSI_MVSAS is not set | ||
646 | # CONFIG_SCSI_STEX is not set | 668 | # CONFIG_SCSI_STEX is not set |
647 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 669 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
648 | # CONFIG_SCSI_IPR is not set | 670 | # CONFIG_SCSI_IPR is not set |
@@ -737,14 +759,17 @@ CONFIG_MD_RAID1=y | |||
737 | # | 759 | # |
738 | 760 | ||
739 | # | 761 | # |
740 | # Enable only one of the two stacks, unless you know what you are doing | 762 | # You can enable one or both FireWire driver stacks. |
763 | # | ||
764 | |||
765 | # | ||
766 | # See the help texts for more information. | ||
741 | # | 767 | # |
742 | # CONFIG_FIREWIRE is not set | 768 | # CONFIG_FIREWIRE is not set |
743 | # CONFIG_IEEE1394 is not set | 769 | # CONFIG_IEEE1394 is not set |
744 | # CONFIG_I2O is not set | 770 | # CONFIG_I2O is not set |
745 | # CONFIG_MACINTOSH_DRIVERS is not set | 771 | # CONFIG_MACINTOSH_DRIVERS is not set |
746 | CONFIG_NETDEVICES=y | 772 | CONFIG_NETDEVICES=y |
747 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
748 | # CONFIG_DUMMY is not set | 773 | # CONFIG_DUMMY is not set |
749 | # CONFIG_BONDING is not set | 774 | # CONFIG_BONDING is not set |
750 | # CONFIG_MACVLAN is not set | 775 | # CONFIG_MACVLAN is not set |
@@ -791,8 +816,10 @@ CONFIG_NETDEV_1000=y | |||
791 | # CONFIG_VIA_VELOCITY is not set | 816 | # CONFIG_VIA_VELOCITY is not set |
792 | # CONFIG_TIGON3 is not set | 817 | # CONFIG_TIGON3 is not set |
793 | # CONFIG_BNX2 is not set | 818 | # CONFIG_BNX2 is not set |
819 | # CONFIG_CNIC is not set | ||
794 | CONFIG_FSL_PQ_MDIO=y | 820 | CONFIG_FSL_PQ_MDIO=y |
795 | CONFIG_GIANFAR=y | 821 | CONFIG_GIANFAR=y |
822 | # CONFIG_MV643XX_ETH is not set | ||
796 | # CONFIG_QLA3XXX is not set | 823 | # CONFIG_QLA3XXX is not set |
797 | # CONFIG_ATL1 is not set | 824 | # CONFIG_ATL1 is not set |
798 | # CONFIG_ATL1E is not set | 825 | # CONFIG_ATL1E is not set |
@@ -960,7 +987,6 @@ CONFIG_I2C_MPC=y | |||
960 | CONFIG_SENSORS_PCF8574=y | 987 | CONFIG_SENSORS_PCF8574=y |
961 | # CONFIG_PCF8575 is not set | 988 | # CONFIG_PCF8575 is not set |
962 | # CONFIG_SENSORS_PCA9539 is not set | 989 | # CONFIG_SENSORS_PCA9539 is not set |
963 | # CONFIG_SENSORS_MAX6875 is not set | ||
964 | # CONFIG_SENSORS_TSL2550 is not set | 990 | # CONFIG_SENSORS_TSL2550 is not set |
965 | # CONFIG_I2C_DEBUG_CORE is not set | 991 | # CONFIG_I2C_DEBUG_CORE is not set |
966 | # CONFIG_I2C_DEBUG_ALGO is not set | 992 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -973,13 +999,18 @@ CONFIG_SPI_MASTER=y | |||
973 | # SPI Master Controller Drivers | 999 | # SPI Master Controller Drivers |
974 | # | 1000 | # |
975 | CONFIG_SPI_BITBANG=y | 1001 | CONFIG_SPI_BITBANG=y |
976 | CONFIG_SPI_MPC83xx=y | 1002 | # CONFIG_SPI_MPC8xxx is not set |
977 | 1003 | ||
978 | # | 1004 | # |
979 | # SPI Protocol Masters | 1005 | # SPI Protocol Masters |
980 | # | 1006 | # |
981 | # CONFIG_SPI_SPIDEV is not set | 1007 | # CONFIG_SPI_SPIDEV is not set |
982 | # CONFIG_SPI_TLE62X0 is not set | 1008 | # CONFIG_SPI_TLE62X0 is not set |
1009 | |||
1010 | # | ||
1011 | # PPS support | ||
1012 | # | ||
1013 | # CONFIG_PPS is not set | ||
983 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1014 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
984 | # CONFIG_GPIOLIB is not set | 1015 | # CONFIG_GPIOLIB is not set |
985 | # CONFIG_W1 is not set | 1016 | # CONFIG_W1 is not set |
@@ -1026,24 +1057,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1026 | # CONFIG_MFD_WM8400 is not set | 1057 | # CONFIG_MFD_WM8400 is not set |
1027 | # CONFIG_MFD_WM8350_I2C is not set | 1058 | # CONFIG_MFD_WM8350_I2C is not set |
1028 | # CONFIG_MFD_PCF50633 is not set | 1059 | # CONFIG_MFD_PCF50633 is not set |
1060 | # CONFIG_AB3100_CORE is not set | ||
1061 | # CONFIG_EZX_PCAP is not set | ||
1029 | # CONFIG_REGULATOR is not set | 1062 | # CONFIG_REGULATOR is not set |
1030 | 1063 | # CONFIG_MEDIA_SUPPORT is not set | |
1031 | # | ||
1032 | # Multimedia devices | ||
1033 | # | ||
1034 | |||
1035 | # | ||
1036 | # Multimedia core support | ||
1037 | # | ||
1038 | # CONFIG_VIDEO_DEV is not set | ||
1039 | # CONFIG_DVB_CORE is not set | ||
1040 | # CONFIG_VIDEO_MEDIA is not set | ||
1041 | |||
1042 | # | ||
1043 | # Multimedia drivers | ||
1044 | # | ||
1045 | CONFIG_DAB=y | ||
1046 | # CONFIG_USB_DABUSB is not set | ||
1047 | 1064 | ||
1048 | # | 1065 | # |
1049 | # Graphics support | 1066 | # Graphics support |
@@ -1085,6 +1102,7 @@ CONFIG_USB_MON=y | |||
1085 | # USB Host Controller Drivers | 1102 | # USB Host Controller Drivers |
1086 | # | 1103 | # |
1087 | # CONFIG_USB_C67X00_HCD is not set | 1104 | # CONFIG_USB_C67X00_HCD is not set |
1105 | # CONFIG_USB_XHCI_HCD is not set | ||
1088 | CONFIG_USB_EHCI_HCD=y | 1106 | CONFIG_USB_EHCI_HCD=y |
1089 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1107 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1090 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1108 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1208,6 +1226,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1208 | # CONFIG_RTC_DRV_S35390A is not set | 1226 | # CONFIG_RTC_DRV_S35390A is not set |
1209 | # CONFIG_RTC_DRV_FM3130 is not set | 1227 | # CONFIG_RTC_DRV_FM3130 is not set |
1210 | # CONFIG_RTC_DRV_RX8581 is not set | 1228 | # CONFIG_RTC_DRV_RX8581 is not set |
1229 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1211 | 1230 | ||
1212 | # | 1231 | # |
1213 | # SPI RTC drivers | 1232 | # SPI RTC drivers |
@@ -1242,6 +1261,10 @@ CONFIG_RTC_DRV_DS1307=y | |||
1242 | # CONFIG_DMADEVICES is not set | 1261 | # CONFIG_DMADEVICES is not set |
1243 | # CONFIG_AUXDISPLAY is not set | 1262 | # CONFIG_AUXDISPLAY is not set |
1244 | # CONFIG_UIO is not set | 1263 | # CONFIG_UIO is not set |
1264 | |||
1265 | # | ||
1266 | # TI VLYNQ | ||
1267 | # | ||
1245 | # CONFIG_STAGING is not set | 1268 | # CONFIG_STAGING is not set |
1246 | 1269 | ||
1247 | # | 1270 | # |
@@ -1261,10 +1284,12 @@ CONFIG_FS_MBCACHE=y | |||
1261 | # CONFIG_REISERFS_FS is not set | 1284 | # CONFIG_REISERFS_FS is not set |
1262 | # CONFIG_JFS_FS is not set | 1285 | # CONFIG_JFS_FS is not set |
1263 | # CONFIG_FS_POSIX_ACL is not set | 1286 | # CONFIG_FS_POSIX_ACL is not set |
1264 | CONFIG_FILE_LOCKING=y | ||
1265 | # CONFIG_XFS_FS is not set | 1287 | # CONFIG_XFS_FS is not set |
1288 | # CONFIG_GFS2_FS is not set | ||
1266 | # CONFIG_OCFS2_FS is not set | 1289 | # CONFIG_OCFS2_FS is not set |
1267 | # CONFIG_BTRFS_FS is not set | 1290 | # CONFIG_BTRFS_FS is not set |
1291 | CONFIG_FILE_LOCKING=y | ||
1292 | CONFIG_FSNOTIFY=y | ||
1268 | CONFIG_DNOTIFY=y | 1293 | CONFIG_DNOTIFY=y |
1269 | CONFIG_INOTIFY=y | 1294 | CONFIG_INOTIFY=y |
1270 | CONFIG_INOTIFY_USER=y | 1295 | CONFIG_INOTIFY_USER=y |
@@ -1331,6 +1356,7 @@ CONFIG_NFS_FS=y | |||
1331 | CONFIG_NFS_V3=y | 1356 | CONFIG_NFS_V3=y |
1332 | # CONFIG_NFS_V3_ACL is not set | 1357 | # CONFIG_NFS_V3_ACL is not set |
1333 | CONFIG_NFS_V4=y | 1358 | CONFIG_NFS_V4=y |
1359 | # CONFIG_NFS_V4_1 is not set | ||
1334 | CONFIG_ROOT_NFS=y | 1360 | CONFIG_ROOT_NFS=y |
1335 | # CONFIG_NFSD is not set | 1361 | # CONFIG_NFSD is not set |
1336 | CONFIG_LOCKD=y | 1362 | CONFIG_LOCKD=y |
@@ -1429,6 +1455,7 @@ CONFIG_HAS_IOPORT=y | |||
1429 | CONFIG_HAS_DMA=y | 1455 | CONFIG_HAS_DMA=y |
1430 | CONFIG_HAVE_LMB=y | 1456 | CONFIG_HAVE_LMB=y |
1431 | CONFIG_NLATTR=y | 1457 | CONFIG_NLATTR=y |
1458 | CONFIG_GENERIC_ATOMIC64=y | ||
1432 | 1459 | ||
1433 | # | 1460 | # |
1434 | # Kernel hacking | 1461 | # Kernel hacking |
@@ -1454,22 +1481,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1454 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1481 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1455 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1482 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1456 | CONFIG_TRACING_SUPPORT=y | 1483 | CONFIG_TRACING_SUPPORT=y |
1457 | 1484 | # CONFIG_FTRACE is not set | |
1458 | # | ||
1459 | # Tracers | ||
1460 | # | ||
1461 | # CONFIG_FUNCTION_TRACER is not set | ||
1462 | # CONFIG_SCHED_TRACER is not set | ||
1463 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1464 | # CONFIG_EVENT_TRACER is not set | ||
1465 | # CONFIG_BOOT_TRACER is not set | ||
1466 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1467 | # CONFIG_STACK_TRACER is not set | ||
1468 | # CONFIG_KMEMTRACE is not set | ||
1469 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1470 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1471 | # CONFIG_SAMPLES is not set | 1485 | # CONFIG_SAMPLES is not set |
1472 | CONFIG_HAVE_ARCH_KGDB=y | 1486 | CONFIG_HAVE_ARCH_KGDB=y |
1487 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1488 | CONFIG_PPC_WERROR=y | ||
1473 | CONFIG_PRINT_STACK_DEPTH=64 | 1489 | CONFIG_PRINT_STACK_DEPTH=64 |
1474 | # CONFIG_IRQSTACKS is not set | 1490 | # CONFIG_IRQSTACKS is not set |
1475 | # CONFIG_BOOTX_TEXT is not set | 1491 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index 7f39543205a9..bf6deb831dc3 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:10 2009 | 4 | # Wed Jul 29 23:32:08 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,9 +124,16 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
125 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -135,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
135 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
136 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
138 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
140 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -147,7 +162,7 @@ CONFIG_MODULE_UNLOAD=y | |||
147 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
150 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
151 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
152 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
153 | 168 | ||
@@ -189,6 +204,7 @@ CONFIG_MPC834x_ITX=y | |||
189 | # CONFIG_MPC837x_RDB is not set | 204 | # CONFIG_MPC837x_RDB is not set |
190 | # CONFIG_SBC834x is not set | 205 | # CONFIG_SBC834x is not set |
191 | # CONFIG_ASP834x is not set | 206 | # CONFIG_ASP834x is not set |
207 | # CONFIG_KMETER1 is not set | ||
192 | CONFIG_PPC_MPC834x=y | 208 | CONFIG_PPC_MPC834x=y |
193 | # CONFIG_PPC_86xx is not set | 209 | # CONFIG_PPC_86xx is not set |
194 | # CONFIG_EMBEDDED6xx is not set | 210 | # CONFIG_EMBEDDED6xx is not set |
@@ -234,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -254,9 +271,9 @@ CONFIG_MIGRATION=y | |||
254 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
256 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
257 | CONFIG_UNEVICTABLE_LRU=y | ||
258 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
259 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
260 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
261 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
262 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -365,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
365 | # CONFIG_ECONET is not set | 382 | # CONFIG_ECONET is not set |
366 | # CONFIG_WAN_ROUTER is not set | 383 | # CONFIG_WAN_ROUTER is not set |
367 | # CONFIG_PHONET is not set | 384 | # CONFIG_PHONET is not set |
385 | # CONFIG_IEEE802154 is not set | ||
368 | # CONFIG_NET_SCHED is not set | 386 | # CONFIG_NET_SCHED is not set |
369 | # CONFIG_DCB is not set | 387 | # CONFIG_DCB is not set |
370 | 388 | ||
@@ -382,7 +400,11 @@ CONFIG_WIRELESS=y | |||
382 | CONFIG_WIRELESS_OLD_REGULATORY=y | 400 | CONFIG_WIRELESS_OLD_REGULATORY=y |
383 | # CONFIG_WIRELESS_EXT is not set | 401 | # CONFIG_WIRELESS_EXT is not set |
384 | # CONFIG_LIB80211 is not set | 402 | # CONFIG_LIB80211 is not set |
385 | # CONFIG_MAC80211 is not set | 403 | |
404 | # | ||
405 | # CFG80211 needs to be enabled for MAC80211 | ||
406 | # | ||
407 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
386 | # CONFIG_WIMAX is not set | 408 | # CONFIG_WIMAX is not set |
387 | # CONFIG_RFKILL is not set | 409 | # CONFIG_RFKILL is not set |
388 | # CONFIG_NET_9P is not set | 410 | # CONFIG_NET_9P is not set |
@@ -487,6 +509,7 @@ CONFIG_MTD_PHYSMAP=y | |||
487 | CONFIG_OF_DEVICE=y | 509 | CONFIG_OF_DEVICE=y |
488 | CONFIG_OF_I2C=y | 510 | CONFIG_OF_I2C=y |
489 | CONFIG_OF_SPI=y | 511 | CONFIG_OF_SPI=y |
512 | CONFIG_OF_MDIO=y | ||
490 | # CONFIG_PARPORT is not set | 513 | # CONFIG_PARPORT is not set |
491 | CONFIG_BLK_DEV=y | 514 | CONFIG_BLK_DEV=y |
492 | # CONFIG_BLK_DEV_FD is not set | 515 | # CONFIG_BLK_DEV_FD is not set |
@@ -523,7 +546,9 @@ CONFIG_MISC_DEVICES=y | |||
523 | # CONFIG_EEPROM_AT24 is not set | 546 | # CONFIG_EEPROM_AT24 is not set |
524 | # CONFIG_EEPROM_AT25 is not set | 547 | # CONFIG_EEPROM_AT25 is not set |
525 | # CONFIG_EEPROM_LEGACY is not set | 548 | # CONFIG_EEPROM_LEGACY is not set |
549 | # CONFIG_EEPROM_MAX6875 is not set | ||
526 | # CONFIG_EEPROM_93CX6 is not set | 550 | # CONFIG_EEPROM_93CX6 is not set |
551 | # CONFIG_CB710_CORE is not set | ||
527 | CONFIG_HAVE_IDE=y | 552 | CONFIG_HAVE_IDE=y |
528 | # CONFIG_IDE is not set | 553 | # CONFIG_IDE is not set |
529 | 554 | ||
@@ -546,10 +571,6 @@ CONFIG_BLK_DEV_SD=y | |||
546 | # CONFIG_BLK_DEV_SR is not set | 571 | # CONFIG_BLK_DEV_SR is not set |
547 | CONFIG_CHR_DEV_SG=y | 572 | CONFIG_CHR_DEV_SG=y |
548 | # CONFIG_CHR_DEV_SCH is not set | 573 | # CONFIG_CHR_DEV_SCH is not set |
549 | |||
550 | # | ||
551 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
552 | # | ||
553 | # CONFIG_SCSI_MULTI_LUN is not set | 574 | # CONFIG_SCSI_MULTI_LUN is not set |
554 | # CONFIG_SCSI_CONSTANTS is not set | 575 | # CONFIG_SCSI_CONSTANTS is not set |
555 | # CONFIG_SCSI_LOGGING is not set | 576 | # CONFIG_SCSI_LOGGING is not set |
@@ -567,6 +588,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
567 | CONFIG_SCSI_LOWLEVEL=y | 588 | CONFIG_SCSI_LOWLEVEL=y |
568 | # CONFIG_ISCSI_TCP is not set | 589 | # CONFIG_ISCSI_TCP is not set |
569 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 590 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
591 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
570 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 592 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
571 | # CONFIG_SCSI_3W_9XXX is not set | 593 | # CONFIG_SCSI_3W_9XXX is not set |
572 | # CONFIG_SCSI_ACARD is not set | 594 | # CONFIG_SCSI_ACARD is not set |
@@ -575,6 +597,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
575 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 597 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
576 | # CONFIG_SCSI_AIC79XX is not set | 598 | # CONFIG_SCSI_AIC79XX is not set |
577 | # CONFIG_SCSI_AIC94XX is not set | 599 | # CONFIG_SCSI_AIC94XX is not set |
600 | # CONFIG_SCSI_MVSAS is not set | ||
578 | # CONFIG_SCSI_DPT_I2O is not set | 601 | # CONFIG_SCSI_DPT_I2O is not set |
579 | # CONFIG_SCSI_ADVANSYS is not set | 602 | # CONFIG_SCSI_ADVANSYS is not set |
580 | # CONFIG_SCSI_ARCMSR is not set | 603 | # CONFIG_SCSI_ARCMSR is not set |
@@ -594,7 +617,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
594 | # CONFIG_SCSI_IPS is not set | 617 | # CONFIG_SCSI_IPS is not set |
595 | # CONFIG_SCSI_INITIO is not set | 618 | # CONFIG_SCSI_INITIO is not set |
596 | # CONFIG_SCSI_INIA100 is not set | 619 | # CONFIG_SCSI_INIA100 is not set |
597 | # CONFIG_SCSI_MVSAS is not set | ||
598 | # CONFIG_SCSI_STEX is not set | 620 | # CONFIG_SCSI_STEX is not set |
599 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 621 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
600 | # CONFIG_SCSI_QLOGIC_1280 is not set | 622 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -617,14 +639,17 @@ CONFIG_SCSI_LOWLEVEL=y | |||
617 | # | 639 | # |
618 | 640 | ||
619 | # | 641 | # |
620 | # Enable only one of the two stacks, unless you know what you are doing | 642 | # You can enable one or both FireWire driver stacks. |
643 | # | ||
644 | |||
645 | # | ||
646 | # See the help texts for more information. | ||
621 | # | 647 | # |
622 | # CONFIG_FIREWIRE is not set | 648 | # CONFIG_FIREWIRE is not set |
623 | # CONFIG_IEEE1394 is not set | 649 | # CONFIG_IEEE1394 is not set |
624 | # CONFIG_I2O is not set | 650 | # CONFIG_I2O is not set |
625 | # CONFIG_MACINTOSH_DRIVERS is not set | 651 | # CONFIG_MACINTOSH_DRIVERS is not set |
626 | CONFIG_NETDEVICES=y | 652 | CONFIG_NETDEVICES=y |
627 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
628 | # CONFIG_DUMMY is not set | 653 | # CONFIG_DUMMY is not set |
629 | # CONFIG_BONDING is not set | 654 | # CONFIG_BONDING is not set |
630 | # CONFIG_MACVLAN is not set | 655 | # CONFIG_MACVLAN is not set |
@@ -671,8 +696,10 @@ CONFIG_NETDEV_1000=y | |||
671 | # CONFIG_VIA_VELOCITY is not set | 696 | # CONFIG_VIA_VELOCITY is not set |
672 | # CONFIG_TIGON3 is not set | 697 | # CONFIG_TIGON3 is not set |
673 | # CONFIG_BNX2 is not set | 698 | # CONFIG_BNX2 is not set |
699 | # CONFIG_CNIC is not set | ||
674 | CONFIG_FSL_PQ_MDIO=y | 700 | CONFIG_FSL_PQ_MDIO=y |
675 | CONFIG_GIANFAR=y | 701 | CONFIG_GIANFAR=y |
702 | # CONFIG_MV643XX_ETH is not set | ||
676 | # CONFIG_QLA3XXX is not set | 703 | # CONFIG_QLA3XXX is not set |
677 | # CONFIG_ATL1 is not set | 704 | # CONFIG_ATL1 is not set |
678 | # CONFIG_ATL1E is not set | 705 | # CONFIG_ATL1E is not set |
@@ -840,7 +867,6 @@ CONFIG_I2C_MPC=y | |||
840 | CONFIG_SENSORS_PCF8574=y | 867 | CONFIG_SENSORS_PCF8574=y |
841 | # CONFIG_PCF8575 is not set | 868 | # CONFIG_PCF8575 is not set |
842 | # CONFIG_SENSORS_PCA9539 is not set | 869 | # CONFIG_SENSORS_PCA9539 is not set |
843 | # CONFIG_SENSORS_MAX6875 is not set | ||
844 | # CONFIG_SENSORS_TSL2550 is not set | 870 | # CONFIG_SENSORS_TSL2550 is not set |
845 | # CONFIG_I2C_DEBUG_CORE is not set | 871 | # CONFIG_I2C_DEBUG_CORE is not set |
846 | # CONFIG_I2C_DEBUG_ALGO is not set | 872 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -853,13 +879,18 @@ CONFIG_SPI_MASTER=y | |||
853 | # SPI Master Controller Drivers | 879 | # SPI Master Controller Drivers |
854 | # | 880 | # |
855 | CONFIG_SPI_BITBANG=y | 881 | CONFIG_SPI_BITBANG=y |
856 | CONFIG_SPI_MPC83xx=y | 882 | # CONFIG_SPI_MPC8xxx is not set |
857 | 883 | ||
858 | # | 884 | # |
859 | # SPI Protocol Masters | 885 | # SPI Protocol Masters |
860 | # | 886 | # |
861 | # CONFIG_SPI_SPIDEV is not set | 887 | # CONFIG_SPI_SPIDEV is not set |
862 | # CONFIG_SPI_TLE62X0 is not set | 888 | # CONFIG_SPI_TLE62X0 is not set |
889 | |||
890 | # | ||
891 | # PPS support | ||
892 | # | ||
893 | # CONFIG_PPS is not set | ||
863 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 894 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
864 | # CONFIG_GPIOLIB is not set | 895 | # CONFIG_GPIOLIB is not set |
865 | # CONFIG_W1 is not set | 896 | # CONFIG_W1 is not set |
@@ -906,24 +937,10 @@ CONFIG_SSB_POSSIBLE=y | |||
906 | # CONFIG_MFD_WM8400 is not set | 937 | # CONFIG_MFD_WM8400 is not set |
907 | # CONFIG_MFD_WM8350_I2C is not set | 938 | # CONFIG_MFD_WM8350_I2C is not set |
908 | # CONFIG_MFD_PCF50633 is not set | 939 | # CONFIG_MFD_PCF50633 is not set |
940 | # CONFIG_AB3100_CORE is not set | ||
941 | # CONFIG_EZX_PCAP is not set | ||
909 | # CONFIG_REGULATOR is not set | 942 | # CONFIG_REGULATOR is not set |
910 | 943 | # CONFIG_MEDIA_SUPPORT is not set | |
911 | # | ||
912 | # Multimedia devices | ||
913 | # | ||
914 | |||
915 | # | ||
916 | # Multimedia core support | ||
917 | # | ||
918 | # CONFIG_VIDEO_DEV is not set | ||
919 | # CONFIG_DVB_CORE is not set | ||
920 | # CONFIG_VIDEO_MEDIA is not set | ||
921 | |||
922 | # | ||
923 | # Multimedia drivers | ||
924 | # | ||
925 | CONFIG_DAB=y | ||
926 | # CONFIG_USB_DABUSB is not set | ||
927 | 944 | ||
928 | # | 945 | # |
929 | # Graphics support | 946 | # Graphics support |
@@ -965,6 +982,7 @@ CONFIG_USB_MON=y | |||
965 | # USB Host Controller Drivers | 982 | # USB Host Controller Drivers |
966 | # | 983 | # |
967 | # CONFIG_USB_C67X00_HCD is not set | 984 | # CONFIG_USB_C67X00_HCD is not set |
985 | # CONFIG_USB_XHCI_HCD is not set | ||
968 | CONFIG_USB_EHCI_HCD=y | 986 | CONFIG_USB_EHCI_HCD=y |
969 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 987 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
970 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 988 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1087,6 +1105,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1087 | # CONFIG_RTC_DRV_S35390A is not set | 1105 | # CONFIG_RTC_DRV_S35390A is not set |
1088 | # CONFIG_RTC_DRV_FM3130 is not set | 1106 | # CONFIG_RTC_DRV_FM3130 is not set |
1089 | # CONFIG_RTC_DRV_RX8581 is not set | 1107 | # CONFIG_RTC_DRV_RX8581 is not set |
1108 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1090 | 1109 | ||
1091 | # | 1110 | # |
1092 | # SPI RTC drivers | 1111 | # SPI RTC drivers |
@@ -1121,6 +1140,10 @@ CONFIG_RTC_DRV_DS1307=y | |||
1121 | # CONFIG_DMADEVICES is not set | 1140 | # CONFIG_DMADEVICES is not set |
1122 | # CONFIG_AUXDISPLAY is not set | 1141 | # CONFIG_AUXDISPLAY is not set |
1123 | # CONFIG_UIO is not set | 1142 | # CONFIG_UIO is not set |
1143 | |||
1144 | # | ||
1145 | # TI VLYNQ | ||
1146 | # | ||
1124 | # CONFIG_STAGING is not set | 1147 | # CONFIG_STAGING is not set |
1125 | 1148 | ||
1126 | # | 1149 | # |
@@ -1140,10 +1163,12 @@ CONFIG_FS_MBCACHE=y | |||
1140 | # CONFIG_REISERFS_FS is not set | 1163 | # CONFIG_REISERFS_FS is not set |
1141 | # CONFIG_JFS_FS is not set | 1164 | # CONFIG_JFS_FS is not set |
1142 | # CONFIG_FS_POSIX_ACL is not set | 1165 | # CONFIG_FS_POSIX_ACL is not set |
1143 | CONFIG_FILE_LOCKING=y | ||
1144 | # CONFIG_XFS_FS is not set | 1166 | # CONFIG_XFS_FS is not set |
1167 | # CONFIG_GFS2_FS is not set | ||
1145 | # CONFIG_OCFS2_FS is not set | 1168 | # CONFIG_OCFS2_FS is not set |
1146 | # CONFIG_BTRFS_FS is not set | 1169 | # CONFIG_BTRFS_FS is not set |
1170 | CONFIG_FILE_LOCKING=y | ||
1171 | CONFIG_FSNOTIFY=y | ||
1147 | CONFIG_DNOTIFY=y | 1172 | CONFIG_DNOTIFY=y |
1148 | CONFIG_INOTIFY=y | 1173 | CONFIG_INOTIFY=y |
1149 | CONFIG_INOTIFY_USER=y | 1174 | CONFIG_INOTIFY_USER=y |
@@ -1210,6 +1235,7 @@ CONFIG_NFS_FS=y | |||
1210 | CONFIG_NFS_V3=y | 1235 | CONFIG_NFS_V3=y |
1211 | # CONFIG_NFS_V3_ACL is not set | 1236 | # CONFIG_NFS_V3_ACL is not set |
1212 | CONFIG_NFS_V4=y | 1237 | CONFIG_NFS_V4=y |
1238 | # CONFIG_NFS_V4_1 is not set | ||
1213 | CONFIG_ROOT_NFS=y | 1239 | CONFIG_ROOT_NFS=y |
1214 | # CONFIG_NFSD is not set | 1240 | # CONFIG_NFSD is not set |
1215 | CONFIG_LOCKD=y | 1241 | CONFIG_LOCKD=y |
@@ -1308,6 +1334,7 @@ CONFIG_HAS_IOPORT=y | |||
1308 | CONFIG_HAS_DMA=y | 1334 | CONFIG_HAS_DMA=y |
1309 | CONFIG_HAVE_LMB=y | 1335 | CONFIG_HAVE_LMB=y |
1310 | CONFIG_NLATTR=y | 1336 | CONFIG_NLATTR=y |
1337 | CONFIG_GENERIC_ATOMIC64=y | ||
1311 | 1338 | ||
1312 | # | 1339 | # |
1313 | # Kernel hacking | 1340 | # Kernel hacking |
@@ -1333,22 +1360,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1333 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1360 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1334 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1361 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1335 | CONFIG_TRACING_SUPPORT=y | 1362 | CONFIG_TRACING_SUPPORT=y |
1336 | 1363 | # CONFIG_FTRACE is not set | |
1337 | # | ||
1338 | # Tracers | ||
1339 | # | ||
1340 | # CONFIG_FUNCTION_TRACER is not set | ||
1341 | # CONFIG_SCHED_TRACER is not set | ||
1342 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1343 | # CONFIG_EVENT_TRACER is not set | ||
1344 | # CONFIG_BOOT_TRACER is not set | ||
1345 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1346 | # CONFIG_STACK_TRACER is not set | ||
1347 | # CONFIG_KMEMTRACE is not set | ||
1348 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1349 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1350 | # CONFIG_SAMPLES is not set | 1364 | # CONFIG_SAMPLES is not set |
1351 | CONFIG_HAVE_ARCH_KGDB=y | 1365 | CONFIG_HAVE_ARCH_KGDB=y |
1366 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1367 | CONFIG_PPC_WERROR=y | ||
1352 | CONFIG_PRINT_STACK_DEPTH=64 | 1368 | CONFIG_PRINT_STACK_DEPTH=64 |
1353 | # CONFIG_IRQSTACKS is not set | 1369 | # CONFIG_IRQSTACKS is not set |
1354 | # CONFIG_BOOTX_TEXT is not set | 1370 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index 1cd1fcac22c8..3236c47712c2 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:11 2009 | 4 | # Wed Jul 29 23:32:09 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,9 +124,16 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
125 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -135,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
135 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
136 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
138 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
140 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -147,7 +162,7 @@ CONFIG_MODULE_UNLOAD=y | |||
147 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
150 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
151 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
152 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
153 | 168 | ||
@@ -189,6 +204,7 @@ CONFIG_MPC834x_MDS=y | |||
189 | # CONFIG_MPC837x_RDB is not set | 204 | # CONFIG_MPC837x_RDB is not set |
190 | # CONFIG_SBC834x is not set | 205 | # CONFIG_SBC834x is not set |
191 | # CONFIG_ASP834x is not set | 206 | # CONFIG_ASP834x is not set |
207 | # CONFIG_KMETER1 is not set | ||
192 | CONFIG_PPC_MPC834x=y | 208 | CONFIG_PPC_MPC834x=y |
193 | # CONFIG_PPC_86xx is not set | 209 | # CONFIG_PPC_86xx is not set |
194 | # CONFIG_EMBEDDED6xx is not set | 210 | # CONFIG_EMBEDDED6xx is not set |
@@ -234,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -254,9 +271,9 @@ CONFIG_MIGRATION=y | |||
254 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
256 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
257 | CONFIG_UNEVICTABLE_LRU=y | ||
258 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
259 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
260 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
261 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
262 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -365,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
365 | # CONFIG_ECONET is not set | 382 | # CONFIG_ECONET is not set |
366 | # CONFIG_WAN_ROUTER is not set | 383 | # CONFIG_WAN_ROUTER is not set |
367 | # CONFIG_PHONET is not set | 384 | # CONFIG_PHONET is not set |
385 | # CONFIG_IEEE802154 is not set | ||
368 | # CONFIG_NET_SCHED is not set | 386 | # CONFIG_NET_SCHED is not set |
369 | # CONFIG_DCB is not set | 387 | # CONFIG_DCB is not set |
370 | 388 | ||
@@ -382,7 +400,11 @@ CONFIG_WIRELESS=y | |||
382 | CONFIG_WIRELESS_OLD_REGULATORY=y | 400 | CONFIG_WIRELESS_OLD_REGULATORY=y |
383 | # CONFIG_WIRELESS_EXT is not set | 401 | # CONFIG_WIRELESS_EXT is not set |
384 | # CONFIG_LIB80211 is not set | 402 | # CONFIG_LIB80211 is not set |
385 | # CONFIG_MAC80211 is not set | 403 | |
404 | # | ||
405 | # CFG80211 needs to be enabled for MAC80211 | ||
406 | # | ||
407 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
386 | # CONFIG_WIMAX is not set | 408 | # CONFIG_WIMAX is not set |
387 | # CONFIG_RFKILL is not set | 409 | # CONFIG_RFKILL is not set |
388 | # CONFIG_NET_9P is not set | 410 | # CONFIG_NET_9P is not set |
@@ -403,6 +425,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
403 | # CONFIG_MTD is not set | 425 | # CONFIG_MTD is not set |
404 | CONFIG_OF_DEVICE=y | 426 | CONFIG_OF_DEVICE=y |
405 | CONFIG_OF_I2C=y | 427 | CONFIG_OF_I2C=y |
428 | CONFIG_OF_MDIO=y | ||
406 | # CONFIG_PARPORT is not set | 429 | # CONFIG_PARPORT is not set |
407 | CONFIG_BLK_DEV=y | 430 | CONFIG_BLK_DEV=y |
408 | # CONFIG_BLK_DEV_FD is not set | 431 | # CONFIG_BLK_DEV_FD is not set |
@@ -437,7 +460,9 @@ CONFIG_MISC_DEVICES=y | |||
437 | # | 460 | # |
438 | # CONFIG_EEPROM_AT24 is not set | 461 | # CONFIG_EEPROM_AT24 is not set |
439 | # CONFIG_EEPROM_LEGACY is not set | 462 | # CONFIG_EEPROM_LEGACY is not set |
463 | # CONFIG_EEPROM_MAX6875 is not set | ||
440 | # CONFIG_EEPROM_93CX6 is not set | 464 | # CONFIG_EEPROM_93CX6 is not set |
465 | # CONFIG_CB710_CORE is not set | ||
441 | CONFIG_HAVE_IDE=y | 466 | CONFIG_HAVE_IDE=y |
442 | # CONFIG_IDE is not set | 467 | # CONFIG_IDE is not set |
443 | 468 | ||
@@ -457,14 +482,17 @@ CONFIG_HAVE_IDE=y | |||
457 | # | 482 | # |
458 | 483 | ||
459 | # | 484 | # |
460 | # Enable only one of the two stacks, unless you know what you are doing | 485 | # You can enable one or both FireWire driver stacks. |
486 | # | ||
487 | |||
488 | # | ||
489 | # See the help texts for more information. | ||
461 | # | 490 | # |
462 | # CONFIG_FIREWIRE is not set | 491 | # CONFIG_FIREWIRE is not set |
463 | # CONFIG_IEEE1394 is not set | 492 | # CONFIG_IEEE1394 is not set |
464 | # CONFIG_I2O is not set | 493 | # CONFIG_I2O is not set |
465 | # CONFIG_MACINTOSH_DRIVERS is not set | 494 | # CONFIG_MACINTOSH_DRIVERS is not set |
466 | CONFIG_NETDEVICES=y | 495 | CONFIG_NETDEVICES=y |
467 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
468 | # CONFIG_DUMMY is not set | 496 | # CONFIG_DUMMY is not set |
469 | # CONFIG_BONDING is not set | 497 | # CONFIG_BONDING is not set |
470 | # CONFIG_MACVLAN is not set | 498 | # CONFIG_MACVLAN is not set |
@@ -527,6 +555,7 @@ CONFIG_E100=y | |||
527 | # CONFIG_SMSC9420 is not set | 555 | # CONFIG_SMSC9420 is not set |
528 | # CONFIG_SUNDANCE is not set | 556 | # CONFIG_SUNDANCE is not set |
529 | # CONFIG_TLAN is not set | 557 | # CONFIG_TLAN is not set |
558 | # CONFIG_KS8842 is not set | ||
530 | # CONFIG_VIA_RHINE is not set | 559 | # CONFIG_VIA_RHINE is not set |
531 | # CONFIG_SC92031 is not set | 560 | # CONFIG_SC92031 is not set |
532 | # CONFIG_ATL2 is not set | 561 | # CONFIG_ATL2 is not set |
@@ -548,8 +577,10 @@ CONFIG_NETDEV_1000=y | |||
548 | # CONFIG_VIA_VELOCITY is not set | 577 | # CONFIG_VIA_VELOCITY is not set |
549 | # CONFIG_TIGON3 is not set | 578 | # CONFIG_TIGON3 is not set |
550 | # CONFIG_BNX2 is not set | 579 | # CONFIG_BNX2 is not set |
580 | # CONFIG_CNIC is not set | ||
551 | CONFIG_FSL_PQ_MDIO=y | 581 | CONFIG_FSL_PQ_MDIO=y |
552 | CONFIG_GIANFAR=y | 582 | CONFIG_GIANFAR=y |
583 | # CONFIG_MV643XX_ETH is not set | ||
553 | # CONFIG_QLA3XXX is not set | 584 | # CONFIG_QLA3XXX is not set |
554 | # CONFIG_ATL1 is not set | 585 | # CONFIG_ATL1 is not set |
555 | # CONFIG_ATL1E is not set | 586 | # CONFIG_ATL1E is not set |
@@ -724,13 +755,17 @@ CONFIG_I2C_MPC=y | |||
724 | # CONFIG_SENSORS_PCF8574 is not set | 755 | # CONFIG_SENSORS_PCF8574 is not set |
725 | # CONFIG_PCF8575 is not set | 756 | # CONFIG_PCF8575 is not set |
726 | # CONFIG_SENSORS_PCA9539 is not set | 757 | # CONFIG_SENSORS_PCA9539 is not set |
727 | # CONFIG_SENSORS_MAX6875 is not set | ||
728 | # CONFIG_SENSORS_TSL2550 is not set | 758 | # CONFIG_SENSORS_TSL2550 is not set |
729 | # CONFIG_I2C_DEBUG_CORE is not set | 759 | # CONFIG_I2C_DEBUG_CORE is not set |
730 | # CONFIG_I2C_DEBUG_ALGO is not set | 760 | # CONFIG_I2C_DEBUG_ALGO is not set |
731 | # CONFIG_I2C_DEBUG_BUS is not set | 761 | # CONFIG_I2C_DEBUG_BUS is not set |
732 | # CONFIG_I2C_DEBUG_CHIP is not set | 762 | # CONFIG_I2C_DEBUG_CHIP is not set |
733 | # CONFIG_SPI is not set | 763 | # CONFIG_SPI is not set |
764 | |||
765 | # | ||
766 | # PPS support | ||
767 | # | ||
768 | # CONFIG_PPS is not set | ||
734 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 769 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
735 | # CONFIG_GPIOLIB is not set | 770 | # CONFIG_GPIOLIB is not set |
736 | # CONFIG_W1 is not set | 771 | # CONFIG_W1 is not set |
@@ -785,6 +820,7 @@ CONFIG_HWMON=y | |||
785 | # CONFIG_SENSORS_SMSC47B397 is not set | 820 | # CONFIG_SENSORS_SMSC47B397 is not set |
786 | # CONFIG_SENSORS_ADS7828 is not set | 821 | # CONFIG_SENSORS_ADS7828 is not set |
787 | # CONFIG_SENSORS_THMC50 is not set | 822 | # CONFIG_SENSORS_THMC50 is not set |
823 | # CONFIG_SENSORS_TMP401 is not set | ||
788 | # CONFIG_SENSORS_VIA686A is not set | 824 | # CONFIG_SENSORS_VIA686A is not set |
789 | # CONFIG_SENSORS_VT1211 is not set | 825 | # CONFIG_SENSORS_VT1211 is not set |
790 | # CONFIG_SENSORS_VT8231 is not set | 826 | # CONFIG_SENSORS_VT8231 is not set |
@@ -833,23 +869,9 @@ CONFIG_SSB_POSSIBLE=y | |||
833 | # CONFIG_MFD_WM8400 is not set | 869 | # CONFIG_MFD_WM8400 is not set |
834 | # CONFIG_MFD_WM8350_I2C is not set | 870 | # CONFIG_MFD_WM8350_I2C is not set |
835 | # CONFIG_MFD_PCF50633 is not set | 871 | # CONFIG_MFD_PCF50633 is not set |
872 | # CONFIG_AB3100_CORE is not set | ||
836 | # CONFIG_REGULATOR is not set | 873 | # CONFIG_REGULATOR is not set |
837 | 874 | # CONFIG_MEDIA_SUPPORT is not set | |
838 | # | ||
839 | # Multimedia devices | ||
840 | # | ||
841 | |||
842 | # | ||
843 | # Multimedia core support | ||
844 | # | ||
845 | # CONFIG_VIDEO_DEV is not set | ||
846 | # CONFIG_DVB_CORE is not set | ||
847 | # CONFIG_VIDEO_MEDIA is not set | ||
848 | |||
849 | # | ||
850 | # Multimedia drivers | ||
851 | # | ||
852 | CONFIG_DAB=y | ||
853 | 875 | ||
854 | # | 876 | # |
855 | # Graphics support | 877 | # Graphics support |
@@ -933,6 +955,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
933 | # CONFIG_RTC_DRV_S35390A is not set | 955 | # CONFIG_RTC_DRV_S35390A is not set |
934 | # CONFIG_RTC_DRV_FM3130 is not set | 956 | # CONFIG_RTC_DRV_FM3130 is not set |
935 | # CONFIG_RTC_DRV_RX8581 is not set | 957 | # CONFIG_RTC_DRV_RX8581 is not set |
958 | # CONFIG_RTC_DRV_RX8025 is not set | ||
936 | 959 | ||
937 | # | 960 | # |
938 | # SPI RTC drivers | 961 | # SPI RTC drivers |
@@ -960,6 +983,10 @@ CONFIG_RTC_DRV_DS1374=y | |||
960 | # CONFIG_DMADEVICES is not set | 983 | # CONFIG_DMADEVICES is not set |
961 | # CONFIG_AUXDISPLAY is not set | 984 | # CONFIG_AUXDISPLAY is not set |
962 | # CONFIG_UIO is not set | 985 | # CONFIG_UIO is not set |
986 | |||
987 | # | ||
988 | # TI VLYNQ | ||
989 | # | ||
963 | # CONFIG_STAGING is not set | 990 | # CONFIG_STAGING is not set |
964 | 991 | ||
965 | # | 992 | # |
@@ -979,10 +1006,12 @@ CONFIG_FS_MBCACHE=y | |||
979 | # CONFIG_REISERFS_FS is not set | 1006 | # CONFIG_REISERFS_FS is not set |
980 | # CONFIG_JFS_FS is not set | 1007 | # CONFIG_JFS_FS is not set |
981 | # CONFIG_FS_POSIX_ACL is not set | 1008 | # CONFIG_FS_POSIX_ACL is not set |
982 | CONFIG_FILE_LOCKING=y | ||
983 | # CONFIG_XFS_FS is not set | 1009 | # CONFIG_XFS_FS is not set |
1010 | # CONFIG_GFS2_FS is not set | ||
984 | # CONFIG_OCFS2_FS is not set | 1011 | # CONFIG_OCFS2_FS is not set |
985 | # CONFIG_BTRFS_FS is not set | 1012 | # CONFIG_BTRFS_FS is not set |
1013 | CONFIG_FILE_LOCKING=y | ||
1014 | CONFIG_FSNOTIFY=y | ||
986 | CONFIG_DNOTIFY=y | 1015 | CONFIG_DNOTIFY=y |
987 | CONFIG_INOTIFY=y | 1016 | CONFIG_INOTIFY=y |
988 | CONFIG_INOTIFY_USER=y | 1017 | CONFIG_INOTIFY_USER=y |
@@ -1045,6 +1074,7 @@ CONFIG_NFS_FS=y | |||
1045 | CONFIG_NFS_V3=y | 1074 | CONFIG_NFS_V3=y |
1046 | # CONFIG_NFS_V3_ACL is not set | 1075 | # CONFIG_NFS_V3_ACL is not set |
1047 | CONFIG_NFS_V4=y | 1076 | CONFIG_NFS_V4=y |
1077 | # CONFIG_NFS_V4_1 is not set | ||
1048 | CONFIG_ROOT_NFS=y | 1078 | CONFIG_ROOT_NFS=y |
1049 | # CONFIG_NFSD is not set | 1079 | # CONFIG_NFSD is not set |
1050 | CONFIG_LOCKD=y | 1080 | CONFIG_LOCKD=y |
@@ -1100,6 +1130,7 @@ CONFIG_HAS_IOPORT=y | |||
1100 | CONFIG_HAS_DMA=y | 1130 | CONFIG_HAS_DMA=y |
1101 | CONFIG_HAVE_LMB=y | 1131 | CONFIG_HAVE_LMB=y |
1102 | CONFIG_NLATTR=y | 1132 | CONFIG_NLATTR=y |
1133 | CONFIG_GENERIC_ATOMIC64=y | ||
1103 | 1134 | ||
1104 | # | 1135 | # |
1105 | # Kernel hacking | 1136 | # Kernel hacking |
@@ -1125,22 +1156,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1125 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1156 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1126 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1157 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1127 | CONFIG_TRACING_SUPPORT=y | 1158 | CONFIG_TRACING_SUPPORT=y |
1128 | 1159 | # CONFIG_FTRACE is not set | |
1129 | # | ||
1130 | # Tracers | ||
1131 | # | ||
1132 | # CONFIG_FUNCTION_TRACER is not set | ||
1133 | # CONFIG_SCHED_TRACER is not set | ||
1134 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1135 | # CONFIG_EVENT_TRACER is not set | ||
1136 | # CONFIG_BOOT_TRACER is not set | ||
1137 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1138 | # CONFIG_STACK_TRACER is not set | ||
1139 | # CONFIG_KMEMTRACE is not set | ||
1140 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1141 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1142 | # CONFIG_SAMPLES is not set | 1160 | # CONFIG_SAMPLES is not set |
1143 | CONFIG_HAVE_ARCH_KGDB=y | 1161 | CONFIG_HAVE_ARCH_KGDB=y |
1162 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1163 | CONFIG_PPC_WERROR=y | ||
1144 | CONFIG_PRINT_STACK_DEPTH=64 | 1164 | CONFIG_PRINT_STACK_DEPTH=64 |
1145 | # CONFIG_IRQSTACKS is not set | 1165 | # CONFIG_IRQSTACKS is not set |
1146 | # CONFIG_BOOTX_TEXT is not set | 1166 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index ce5177393a0d..8c5299d74813 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:12 2009 | 4 | # Wed Jul 29 23:32:10 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,9 +124,16 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
125 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -135,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
135 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
136 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
138 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
139 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
140 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -147,7 +162,7 @@ CONFIG_MODULE_UNLOAD=y | |||
147 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
150 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
151 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
152 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
153 | 168 | ||
@@ -189,6 +204,7 @@ CONFIG_MPC836x_MDS=y | |||
189 | # CONFIG_MPC837x_RDB is not set | 204 | # CONFIG_MPC837x_RDB is not set |
190 | # CONFIG_SBC834x is not set | 205 | # CONFIG_SBC834x is not set |
191 | # CONFIG_ASP834x is not set | 206 | # CONFIG_ASP834x is not set |
207 | # CONFIG_KMETER1 is not set | ||
192 | # CONFIG_PPC_86xx is not set | 208 | # CONFIG_PPC_86xx is not set |
193 | # CONFIG_EMBEDDED6xx is not set | 209 | # CONFIG_EMBEDDED6xx is not set |
194 | # CONFIG_AMIGAONE is not set | 210 | # CONFIG_AMIGAONE is not set |
@@ -233,6 +249,7 @@ CONFIG_BINFMT_ELF=y | |||
233 | # CONFIG_HAVE_AOUT is not set | 249 | # CONFIG_HAVE_AOUT is not set |
234 | # CONFIG_BINFMT_MISC is not set | 250 | # CONFIG_BINFMT_MISC is not set |
235 | # CONFIG_IOMMU_HELPER is not set | 251 | # CONFIG_IOMMU_HELPER is not set |
252 | # CONFIG_SWIOTLB is not set | ||
236 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 253 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
237 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 254 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
238 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -253,9 +270,9 @@ CONFIG_MIGRATION=y | |||
253 | CONFIG_ZONE_DMA_FLAG=1 | 270 | CONFIG_ZONE_DMA_FLAG=1 |
254 | CONFIG_BOUNCE=y | 271 | CONFIG_BOUNCE=y |
255 | CONFIG_VIRT_TO_BUS=y | 272 | CONFIG_VIRT_TO_BUS=y |
256 | CONFIG_UNEVICTABLE_LRU=y | ||
257 | CONFIG_HAVE_MLOCK=y | 273 | CONFIG_HAVE_MLOCK=y |
258 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 274 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
275 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
259 | CONFIG_PPC_4K_PAGES=y | 276 | CONFIG_PPC_4K_PAGES=y |
260 | # CONFIG_PPC_16K_PAGES is not set | 277 | # CONFIG_PPC_16K_PAGES is not set |
261 | # CONFIG_PPC_64K_PAGES is not set | 278 | # CONFIG_PPC_64K_PAGES is not set |
@@ -364,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
364 | # CONFIG_ECONET is not set | 381 | # CONFIG_ECONET is not set |
365 | # CONFIG_WAN_ROUTER is not set | 382 | # CONFIG_WAN_ROUTER is not set |
366 | # CONFIG_PHONET is not set | 383 | # CONFIG_PHONET is not set |
384 | # CONFIG_IEEE802154 is not set | ||
367 | # CONFIG_NET_SCHED is not set | 385 | # CONFIG_NET_SCHED is not set |
368 | # CONFIG_DCB is not set | 386 | # CONFIG_DCB is not set |
369 | 387 | ||
@@ -381,7 +399,11 @@ CONFIG_WIRELESS=y | |||
381 | CONFIG_WIRELESS_OLD_REGULATORY=y | 399 | CONFIG_WIRELESS_OLD_REGULATORY=y |
382 | # CONFIG_WIRELESS_EXT is not set | 400 | # CONFIG_WIRELESS_EXT is not set |
383 | # CONFIG_LIB80211 is not set | 401 | # CONFIG_LIB80211 is not set |
384 | # CONFIG_MAC80211 is not set | 402 | |
403 | # | ||
404 | # CFG80211 needs to be enabled for MAC80211 | ||
405 | # | ||
406 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
385 | # CONFIG_WIMAX is not set | 407 | # CONFIG_WIMAX is not set |
386 | # CONFIG_RFKILL is not set | 408 | # CONFIG_RFKILL is not set |
387 | # CONFIG_NET_9P is not set | 409 | # CONFIG_NET_9P is not set |
@@ -485,6 +507,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
485 | # CONFIG_MTD_UBI is not set | 507 | # CONFIG_MTD_UBI is not set |
486 | CONFIG_OF_DEVICE=y | 508 | CONFIG_OF_DEVICE=y |
487 | CONFIG_OF_I2C=y | 509 | CONFIG_OF_I2C=y |
510 | CONFIG_OF_MDIO=y | ||
488 | # CONFIG_PARPORT is not set | 511 | # CONFIG_PARPORT is not set |
489 | CONFIG_BLK_DEV=y | 512 | CONFIG_BLK_DEV=y |
490 | # CONFIG_BLK_DEV_FD is not set | 513 | # CONFIG_BLK_DEV_FD is not set |
@@ -519,7 +542,9 @@ CONFIG_MISC_DEVICES=y | |||
519 | # | 542 | # |
520 | # CONFIG_EEPROM_AT24 is not set | 543 | # CONFIG_EEPROM_AT24 is not set |
521 | # CONFIG_EEPROM_LEGACY is not set | 544 | # CONFIG_EEPROM_LEGACY is not set |
545 | # CONFIG_EEPROM_MAX6875 is not set | ||
522 | # CONFIG_EEPROM_93CX6 is not set | 546 | # CONFIG_EEPROM_93CX6 is not set |
547 | # CONFIG_CB710_CORE is not set | ||
523 | CONFIG_HAVE_IDE=y | 548 | CONFIG_HAVE_IDE=y |
524 | # CONFIG_IDE is not set | 549 | # CONFIG_IDE is not set |
525 | 550 | ||
@@ -542,10 +567,6 @@ CONFIG_SCSI_PROC_FS=y | |||
542 | # CONFIG_BLK_DEV_SR is not set | 567 | # CONFIG_BLK_DEV_SR is not set |
543 | # CONFIG_CHR_DEV_SG is not set | 568 | # CONFIG_CHR_DEV_SG is not set |
544 | # CONFIG_CHR_DEV_SCH is not set | 569 | # CONFIG_CHR_DEV_SCH is not set |
545 | |||
546 | # | ||
547 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
548 | # | ||
549 | # CONFIG_SCSI_MULTI_LUN is not set | 570 | # CONFIG_SCSI_MULTI_LUN is not set |
550 | # CONFIG_SCSI_CONSTANTS is not set | 571 | # CONFIG_SCSI_CONSTANTS is not set |
551 | # CONFIG_SCSI_LOGGING is not set | 572 | # CONFIG_SCSI_LOGGING is not set |
@@ -563,6 +584,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
563 | CONFIG_SCSI_LOWLEVEL=y | 584 | CONFIG_SCSI_LOWLEVEL=y |
564 | # CONFIG_ISCSI_TCP is not set | 585 | # CONFIG_ISCSI_TCP is not set |
565 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 586 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
587 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
566 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 588 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
567 | # CONFIG_SCSI_3W_9XXX is not set | 589 | # CONFIG_SCSI_3W_9XXX is not set |
568 | # CONFIG_SCSI_ACARD is not set | 590 | # CONFIG_SCSI_ACARD is not set |
@@ -571,6 +593,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
571 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 593 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
572 | # CONFIG_SCSI_AIC79XX is not set | 594 | # CONFIG_SCSI_AIC79XX is not set |
573 | # CONFIG_SCSI_AIC94XX is not set | 595 | # CONFIG_SCSI_AIC94XX is not set |
596 | # CONFIG_SCSI_MVSAS is not set | ||
574 | # CONFIG_SCSI_DPT_I2O is not set | 597 | # CONFIG_SCSI_DPT_I2O is not set |
575 | # CONFIG_SCSI_ADVANSYS is not set | 598 | # CONFIG_SCSI_ADVANSYS is not set |
576 | # CONFIG_SCSI_ARCMSR is not set | 599 | # CONFIG_SCSI_ARCMSR is not set |
@@ -590,7 +613,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
590 | # CONFIG_SCSI_IPS is not set | 613 | # CONFIG_SCSI_IPS is not set |
591 | # CONFIG_SCSI_INITIO is not set | 614 | # CONFIG_SCSI_INITIO is not set |
592 | # CONFIG_SCSI_INIA100 is not set | 615 | # CONFIG_SCSI_INIA100 is not set |
593 | # CONFIG_SCSI_MVSAS is not set | ||
594 | # CONFIG_SCSI_STEX is not set | 616 | # CONFIG_SCSI_STEX is not set |
595 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 617 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
596 | # CONFIG_SCSI_QLOGIC_1280 is not set | 618 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -613,14 +635,17 @@ CONFIG_SCSI_LOWLEVEL=y | |||
613 | # | 635 | # |
614 | 636 | ||
615 | # | 637 | # |
616 | # Enable only one of the two stacks, unless you know what you are doing | 638 | # You can enable one or both FireWire driver stacks. |
639 | # | ||
640 | |||
641 | # | ||
642 | # See the help texts for more information. | ||
617 | # | 643 | # |
618 | # CONFIG_FIREWIRE is not set | 644 | # CONFIG_FIREWIRE is not set |
619 | # CONFIG_IEEE1394 is not set | 645 | # CONFIG_IEEE1394 is not set |
620 | # CONFIG_I2O is not set | 646 | # CONFIG_I2O is not set |
621 | # CONFIG_MACINTOSH_DRIVERS is not set | 647 | # CONFIG_MACINTOSH_DRIVERS is not set |
622 | CONFIG_NETDEVICES=y | 648 | CONFIG_NETDEVICES=y |
623 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
624 | # CONFIG_DUMMY is not set | 649 | # CONFIG_DUMMY is not set |
625 | # CONFIG_BONDING is not set | 650 | # CONFIG_BONDING is not set |
626 | # CONFIG_MACVLAN is not set | 651 | # CONFIG_MACVLAN is not set |
@@ -667,6 +692,7 @@ CONFIG_MII=y | |||
667 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 692 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
668 | # CONFIG_NET_PCI is not set | 693 | # CONFIG_NET_PCI is not set |
669 | # CONFIG_B44 is not set | 694 | # CONFIG_B44 is not set |
695 | # CONFIG_KS8842 is not set | ||
670 | # CONFIG_ATL2 is not set | 696 | # CONFIG_ATL2 is not set |
671 | CONFIG_NETDEV_1000=y | 697 | CONFIG_NETDEV_1000=y |
672 | # CONFIG_ACENIC is not set | 698 | # CONFIG_ACENIC is not set |
@@ -686,11 +712,13 @@ CONFIG_NETDEV_1000=y | |||
686 | # CONFIG_VIA_VELOCITY is not set | 712 | # CONFIG_VIA_VELOCITY is not set |
687 | # CONFIG_TIGON3 is not set | 713 | # CONFIG_TIGON3 is not set |
688 | # CONFIG_BNX2 is not set | 714 | # CONFIG_BNX2 is not set |
715 | # CONFIG_CNIC is not set | ||
689 | CONFIG_FSL_PQ_MDIO=y | 716 | CONFIG_FSL_PQ_MDIO=y |
690 | # CONFIG_GIANFAR is not set | 717 | # CONFIG_GIANFAR is not set |
691 | CONFIG_UCC_GETH=y | 718 | CONFIG_UCC_GETH=y |
692 | # CONFIG_UGETH_MAGIC_PACKET is not set | 719 | # CONFIG_UGETH_MAGIC_PACKET is not set |
693 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 720 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
721 | # CONFIG_MV643XX_ETH is not set | ||
694 | # CONFIG_QLA3XXX is not set | 722 | # CONFIG_QLA3XXX is not set |
695 | # CONFIG_ATL1 is not set | 723 | # CONFIG_ATL1 is not set |
696 | # CONFIG_ATL1E is not set | 724 | # CONFIG_ATL1E is not set |
@@ -868,13 +896,17 @@ CONFIG_I2C_MPC=y | |||
868 | # CONFIG_SENSORS_PCF8574 is not set | 896 | # CONFIG_SENSORS_PCF8574 is not set |
869 | # CONFIG_PCF8575 is not set | 897 | # CONFIG_PCF8575 is not set |
870 | # CONFIG_SENSORS_PCA9539 is not set | 898 | # CONFIG_SENSORS_PCA9539 is not set |
871 | # CONFIG_SENSORS_MAX6875 is not set | ||
872 | # CONFIG_SENSORS_TSL2550 is not set | 899 | # CONFIG_SENSORS_TSL2550 is not set |
873 | # CONFIG_I2C_DEBUG_CORE is not set | 900 | # CONFIG_I2C_DEBUG_CORE is not set |
874 | # CONFIG_I2C_DEBUG_ALGO is not set | 901 | # CONFIG_I2C_DEBUG_ALGO is not set |
875 | # CONFIG_I2C_DEBUG_BUS is not set | 902 | # CONFIG_I2C_DEBUG_BUS is not set |
876 | # CONFIG_I2C_DEBUG_CHIP is not set | 903 | # CONFIG_I2C_DEBUG_CHIP is not set |
877 | # CONFIG_SPI is not set | 904 | # CONFIG_SPI is not set |
905 | |||
906 | # | ||
907 | # PPS support | ||
908 | # | ||
909 | # CONFIG_PPS is not set | ||
878 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 910 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
879 | # CONFIG_GPIOLIB is not set | 911 | # CONFIG_GPIOLIB is not set |
880 | # CONFIG_W1 is not set | 912 | # CONFIG_W1 is not set |
@@ -929,6 +961,7 @@ CONFIG_HWMON=y | |||
929 | # CONFIG_SENSORS_SMSC47B397 is not set | 961 | # CONFIG_SENSORS_SMSC47B397 is not set |
930 | # CONFIG_SENSORS_ADS7828 is not set | 962 | # CONFIG_SENSORS_ADS7828 is not set |
931 | # CONFIG_SENSORS_THMC50 is not set | 963 | # CONFIG_SENSORS_THMC50 is not set |
964 | # CONFIG_SENSORS_TMP401 is not set | ||
932 | # CONFIG_SENSORS_VIA686A is not set | 965 | # CONFIG_SENSORS_VIA686A is not set |
933 | # CONFIG_SENSORS_VT1211 is not set | 966 | # CONFIG_SENSORS_VT1211 is not set |
934 | # CONFIG_SENSORS_VT8231 is not set | 967 | # CONFIG_SENSORS_VT8231 is not set |
@@ -977,23 +1010,9 @@ CONFIG_SSB_POSSIBLE=y | |||
977 | # CONFIG_MFD_WM8400 is not set | 1010 | # CONFIG_MFD_WM8400 is not set |
978 | # CONFIG_MFD_WM8350_I2C is not set | 1011 | # CONFIG_MFD_WM8350_I2C is not set |
979 | # CONFIG_MFD_PCF50633 is not set | 1012 | # CONFIG_MFD_PCF50633 is not set |
1013 | # CONFIG_AB3100_CORE is not set | ||
980 | # CONFIG_REGULATOR is not set | 1014 | # CONFIG_REGULATOR is not set |
981 | 1015 | # CONFIG_MEDIA_SUPPORT is not set | |
982 | # | ||
983 | # Multimedia devices | ||
984 | # | ||
985 | |||
986 | # | ||
987 | # Multimedia core support | ||
988 | # | ||
989 | # CONFIG_VIDEO_DEV is not set | ||
990 | # CONFIG_DVB_CORE is not set | ||
991 | # CONFIG_VIDEO_MEDIA is not set | ||
992 | |||
993 | # | ||
994 | # Multimedia drivers | ||
995 | # | ||
996 | CONFIG_DAB=y | ||
997 | 1016 | ||
998 | # | 1017 | # |
999 | # Graphics support | 1018 | # Graphics support |
@@ -1077,6 +1096,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
1077 | # CONFIG_RTC_DRV_S35390A is not set | 1096 | # CONFIG_RTC_DRV_S35390A is not set |
1078 | # CONFIG_RTC_DRV_FM3130 is not set | 1097 | # CONFIG_RTC_DRV_FM3130 is not set |
1079 | # CONFIG_RTC_DRV_RX8581 is not set | 1098 | # CONFIG_RTC_DRV_RX8581 is not set |
1099 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1080 | 1100 | ||
1081 | # | 1101 | # |
1082 | # SPI RTC drivers | 1102 | # SPI RTC drivers |
@@ -1104,6 +1124,10 @@ CONFIG_RTC_DRV_DS1374=y | |||
1104 | # CONFIG_DMADEVICES is not set | 1124 | # CONFIG_DMADEVICES is not set |
1105 | # CONFIG_AUXDISPLAY is not set | 1125 | # CONFIG_AUXDISPLAY is not set |
1106 | # CONFIG_UIO is not set | 1126 | # CONFIG_UIO is not set |
1127 | |||
1128 | # | ||
1129 | # TI VLYNQ | ||
1130 | # | ||
1107 | # CONFIG_STAGING is not set | 1131 | # CONFIG_STAGING is not set |
1108 | 1132 | ||
1109 | # | 1133 | # |
@@ -1123,10 +1147,12 @@ CONFIG_FS_MBCACHE=y | |||
1123 | # CONFIG_REISERFS_FS is not set | 1147 | # CONFIG_REISERFS_FS is not set |
1124 | # CONFIG_JFS_FS is not set | 1148 | # CONFIG_JFS_FS is not set |
1125 | # CONFIG_FS_POSIX_ACL is not set | 1149 | # CONFIG_FS_POSIX_ACL is not set |
1126 | CONFIG_FILE_LOCKING=y | ||
1127 | # CONFIG_XFS_FS is not set | 1150 | # CONFIG_XFS_FS is not set |
1151 | # CONFIG_GFS2_FS is not set | ||
1128 | # CONFIG_OCFS2_FS is not set | 1152 | # CONFIG_OCFS2_FS is not set |
1129 | # CONFIG_BTRFS_FS is not set | 1153 | # CONFIG_BTRFS_FS is not set |
1154 | CONFIG_FILE_LOCKING=y | ||
1155 | CONFIG_FSNOTIFY=y | ||
1130 | CONFIG_DNOTIFY=y | 1156 | CONFIG_DNOTIFY=y |
1131 | CONFIG_INOTIFY=y | 1157 | CONFIG_INOTIFY=y |
1132 | CONFIG_INOTIFY_USER=y | 1158 | CONFIG_INOTIFY_USER=y |
@@ -1190,6 +1216,7 @@ CONFIG_NFS_FS=y | |||
1190 | CONFIG_NFS_V3=y | 1216 | CONFIG_NFS_V3=y |
1191 | # CONFIG_NFS_V3_ACL is not set | 1217 | # CONFIG_NFS_V3_ACL is not set |
1192 | CONFIG_NFS_V4=y | 1218 | CONFIG_NFS_V4=y |
1219 | # CONFIG_NFS_V4_1 is not set | ||
1193 | CONFIG_ROOT_NFS=y | 1220 | CONFIG_ROOT_NFS=y |
1194 | # CONFIG_NFSD is not set | 1221 | # CONFIG_NFSD is not set |
1195 | CONFIG_LOCKD=y | 1222 | CONFIG_LOCKD=y |
@@ -1247,6 +1274,7 @@ CONFIG_HAS_IOPORT=y | |||
1247 | CONFIG_HAS_DMA=y | 1274 | CONFIG_HAS_DMA=y |
1248 | CONFIG_HAVE_LMB=y | 1275 | CONFIG_HAVE_LMB=y |
1249 | CONFIG_NLATTR=y | 1276 | CONFIG_NLATTR=y |
1277 | CONFIG_GENERIC_ATOMIC64=y | ||
1250 | 1278 | ||
1251 | # | 1279 | # |
1252 | # Kernel hacking | 1280 | # Kernel hacking |
@@ -1272,22 +1300,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1272 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1300 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1273 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1301 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1274 | CONFIG_TRACING_SUPPORT=y | 1302 | CONFIG_TRACING_SUPPORT=y |
1275 | 1303 | # CONFIG_FTRACE is not set | |
1276 | # | ||
1277 | # Tracers | ||
1278 | # | ||
1279 | # CONFIG_FUNCTION_TRACER is not set | ||
1280 | # CONFIG_SCHED_TRACER is not set | ||
1281 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1282 | # CONFIG_EVENT_TRACER is not set | ||
1283 | # CONFIG_BOOT_TRACER is not set | ||
1284 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1285 | # CONFIG_STACK_TRACER is not set | ||
1286 | # CONFIG_KMEMTRACE is not set | ||
1287 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1288 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1289 | # CONFIG_SAMPLES is not set | 1304 | # CONFIG_SAMPLES is not set |
1290 | CONFIG_HAVE_ARCH_KGDB=y | 1305 | CONFIG_HAVE_ARCH_KGDB=y |
1306 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1307 | CONFIG_PPC_WERROR=y | ||
1291 | CONFIG_PRINT_STACK_DEPTH=64 | 1308 | CONFIG_PRINT_STACK_DEPTH=64 |
1292 | # CONFIG_IRQSTACKS is not set | 1309 | # CONFIG_IRQSTACKS is not set |
1293 | # CONFIG_BOOTX_TEXT is not set | 1310 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig index 7f1d1383a249..ff31667a890b 100644 --- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:13 2009 | 4 | # Wed Jul 29 23:32:12 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | 47 | CONFIG_GENERIC_GPIO=y |
45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -54,12 +57,14 @@ CONFIG_PPC_UDBG_16550=y | |||
54 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
55 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
56 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
57 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 62 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
59 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
60 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
61 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
63 | 68 | ||
64 | # | 69 | # |
65 | # General setup | 70 | # General setup |
@@ -108,7 +113,6 @@ CONFIG_ANON_INODES=y | |||
108 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
109 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
110 | # CONFIG_KALLSYMS is not set | 115 | # CONFIG_KALLSYMS is not set |
111 | # CONFIG_STRIP_ASM_SYMS is not set | ||
112 | CONFIG_HOTPLUG=y | 116 | CONFIG_HOTPLUG=y |
113 | CONFIG_PRINTK=y | 117 | CONFIG_PRINTK=y |
114 | CONFIG_BUG=y | 118 | CONFIG_BUG=y |
@@ -121,9 +125,16 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 126 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 127 | CONFIG_AIO=y |
128 | CONFIG_HAVE_PERF_COUNTERS=y | ||
129 | |||
130 | # | ||
131 | # Performance Counters | ||
132 | # | ||
133 | # CONFIG_PERF_COUNTERS is not set | ||
124 | CONFIG_VM_EVENT_COUNTERS=y | 134 | CONFIG_VM_EVENT_COUNTERS=y |
125 | CONFIG_PCI_QUIRKS=y | 135 | CONFIG_PCI_QUIRKS=y |
126 | CONFIG_SLUB_DEBUG=y | 136 | CONFIG_SLUB_DEBUG=y |
137 | # CONFIG_STRIP_ASM_SYMS is not set | ||
127 | CONFIG_COMPAT_BRK=y | 138 | CONFIG_COMPAT_BRK=y |
128 | # CONFIG_SLAB is not set | 139 | # CONFIG_SLAB is not set |
129 | CONFIG_SLUB=y | 140 | CONFIG_SLUB=y |
@@ -136,6 +147,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
136 | CONFIG_HAVE_KPROBES=y | 147 | CONFIG_HAVE_KPROBES=y |
137 | CONFIG_HAVE_KRETPROBES=y | 148 | CONFIG_HAVE_KRETPROBES=y |
138 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 149 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
150 | |||
151 | # | ||
152 | # GCOV-based kernel profiling | ||
153 | # | ||
139 | # CONFIG_SLOW_WORK is not set | 154 | # CONFIG_SLOW_WORK is not set |
140 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 155 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
141 | CONFIG_SLABINFO=y | 156 | CONFIG_SLABINFO=y |
@@ -148,7 +163,7 @@ CONFIG_MODULE_UNLOAD=y | |||
148 | # CONFIG_MODVERSIONS is not set | 163 | # CONFIG_MODVERSIONS is not set |
149 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 164 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
150 | CONFIG_BLOCK=y | 165 | CONFIG_BLOCK=y |
151 | # CONFIG_LBD is not set | 166 | CONFIG_LBDAF=y |
152 | # CONFIG_BLK_DEV_BSG is not set | 167 | # CONFIG_BLK_DEV_BSG is not set |
153 | # CONFIG_BLK_DEV_INTEGRITY is not set | 168 | # CONFIG_BLK_DEV_INTEGRITY is not set |
154 | 169 | ||
@@ -190,6 +205,7 @@ CONFIG_MPC836x_RDK=y | |||
190 | # CONFIG_MPC837x_RDB is not set | 205 | # CONFIG_MPC837x_RDB is not set |
191 | # CONFIG_SBC834x is not set | 206 | # CONFIG_SBC834x is not set |
192 | # CONFIG_ASP834x is not set | 207 | # CONFIG_ASP834x is not set |
208 | # CONFIG_KMETER1 is not set | ||
193 | # CONFIG_PPC_86xx is not set | 209 | # CONFIG_PPC_86xx is not set |
194 | # CONFIG_EMBEDDED6xx is not set | 210 | # CONFIG_EMBEDDED6xx is not set |
195 | # CONFIG_AMIGAONE is not set | 211 | # CONFIG_AMIGAONE is not set |
@@ -233,6 +249,7 @@ CONFIG_BINFMT_ELF=y | |||
233 | # CONFIG_HAVE_AOUT is not set | 249 | # CONFIG_HAVE_AOUT is not set |
234 | # CONFIG_BINFMT_MISC is not set | 250 | # CONFIG_BINFMT_MISC is not set |
235 | # CONFIG_IOMMU_HELPER is not set | 251 | # CONFIG_IOMMU_HELPER is not set |
252 | # CONFIG_SWIOTLB is not set | ||
236 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 253 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
237 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 254 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
238 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -253,9 +270,9 @@ CONFIG_MIGRATION=y | |||
253 | CONFIG_ZONE_DMA_FLAG=1 | 270 | CONFIG_ZONE_DMA_FLAG=1 |
254 | CONFIG_BOUNCE=y | 271 | CONFIG_BOUNCE=y |
255 | CONFIG_VIRT_TO_BUS=y | 272 | CONFIG_VIRT_TO_BUS=y |
256 | CONFIG_UNEVICTABLE_LRU=y | ||
257 | CONFIG_HAVE_MLOCK=y | 273 | CONFIG_HAVE_MLOCK=y |
258 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 274 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
275 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
259 | CONFIG_PPC_4K_PAGES=y | 276 | CONFIG_PPC_4K_PAGES=y |
260 | # CONFIG_PPC_16K_PAGES is not set | 277 | # CONFIG_PPC_16K_PAGES is not set |
261 | # CONFIG_PPC_64K_PAGES is not set | 278 | # CONFIG_PPC_64K_PAGES is not set |
@@ -366,6 +383,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
366 | # CONFIG_ECONET is not set | 383 | # CONFIG_ECONET is not set |
367 | # CONFIG_WAN_ROUTER is not set | 384 | # CONFIG_WAN_ROUTER is not set |
368 | # CONFIG_PHONET is not set | 385 | # CONFIG_PHONET is not set |
386 | # CONFIG_IEEE802154 is not set | ||
369 | # CONFIG_NET_SCHED is not set | 387 | # CONFIG_NET_SCHED is not set |
370 | # CONFIG_DCB is not set | 388 | # CONFIG_DCB is not set |
371 | 389 | ||
@@ -383,7 +401,11 @@ CONFIG_WIRELESS=y | |||
383 | CONFIG_WIRELESS_OLD_REGULATORY=y | 401 | CONFIG_WIRELESS_OLD_REGULATORY=y |
384 | # CONFIG_WIRELESS_EXT is not set | 402 | # CONFIG_WIRELESS_EXT is not set |
385 | # CONFIG_LIB80211 is not set | 403 | # CONFIG_LIB80211 is not set |
386 | # CONFIG_MAC80211 is not set | 404 | |
405 | # | ||
406 | # CFG80211 needs to be enabled for MAC80211 | ||
407 | # | ||
408 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
387 | # CONFIG_WIMAX is not set | 409 | # CONFIG_WIMAX is not set |
388 | # CONFIG_RFKILL is not set | 410 | # CONFIG_RFKILL is not set |
389 | # CONFIG_NET_9P is not set | 411 | # CONFIG_NET_9P is not set |
@@ -498,6 +520,7 @@ CONFIG_OF_DEVICE=y | |||
498 | CONFIG_OF_GPIO=y | 520 | CONFIG_OF_GPIO=y |
499 | CONFIG_OF_I2C=y | 521 | CONFIG_OF_I2C=y |
500 | CONFIG_OF_SPI=y | 522 | CONFIG_OF_SPI=y |
523 | CONFIG_OF_MDIO=y | ||
501 | # CONFIG_PARPORT is not set | 524 | # CONFIG_PARPORT is not set |
502 | CONFIG_BLK_DEV=y | 525 | CONFIG_BLK_DEV=y |
503 | # CONFIG_BLK_DEV_FD is not set | 526 | # CONFIG_BLK_DEV_FD is not set |
@@ -533,7 +556,9 @@ CONFIG_MISC_DEVICES=y | |||
533 | # CONFIG_EEPROM_AT24 is not set | 556 | # CONFIG_EEPROM_AT24 is not set |
534 | # CONFIG_EEPROM_AT25 is not set | 557 | # CONFIG_EEPROM_AT25 is not set |
535 | # CONFIG_EEPROM_LEGACY is not set | 558 | # CONFIG_EEPROM_LEGACY is not set |
559 | # CONFIG_EEPROM_MAX6875 is not set | ||
536 | # CONFIG_EEPROM_93CX6 is not set | 560 | # CONFIG_EEPROM_93CX6 is not set |
561 | # CONFIG_CB710_CORE is not set | ||
537 | CONFIG_HAVE_IDE=y | 562 | CONFIG_HAVE_IDE=y |
538 | # CONFIG_IDE is not set | 563 | # CONFIG_IDE is not set |
539 | 564 | ||
@@ -553,14 +578,17 @@ CONFIG_HAVE_IDE=y | |||
553 | # | 578 | # |
554 | 579 | ||
555 | # | 580 | # |
556 | # Enable only one of the two stacks, unless you know what you are doing | 581 | # You can enable one or both FireWire driver stacks. |
582 | # | ||
583 | |||
584 | # | ||
585 | # See the help texts for more information. | ||
557 | # | 586 | # |
558 | # CONFIG_FIREWIRE is not set | 587 | # CONFIG_FIREWIRE is not set |
559 | # CONFIG_IEEE1394 is not set | 588 | # CONFIG_IEEE1394 is not set |
560 | # CONFIG_I2O is not set | 589 | # CONFIG_I2O is not set |
561 | # CONFIG_MACINTOSH_DRIVERS is not set | 590 | # CONFIG_MACINTOSH_DRIVERS is not set |
562 | CONFIG_NETDEVICES=y | 591 | CONFIG_NETDEVICES=y |
563 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
564 | # CONFIG_DUMMY is not set | 592 | # CONFIG_DUMMY is not set |
565 | # CONFIG_BONDING is not set | 593 | # CONFIG_BONDING is not set |
566 | # CONFIG_MACVLAN is not set | 594 | # CONFIG_MACVLAN is not set |
@@ -607,11 +635,13 @@ CONFIG_NETDEV_1000=y | |||
607 | # CONFIG_VIA_VELOCITY is not set | 635 | # CONFIG_VIA_VELOCITY is not set |
608 | # CONFIG_TIGON3 is not set | 636 | # CONFIG_TIGON3 is not set |
609 | # CONFIG_BNX2 is not set | 637 | # CONFIG_BNX2 is not set |
638 | # CONFIG_CNIC is not set | ||
610 | CONFIG_FSL_PQ_MDIO=y | 639 | CONFIG_FSL_PQ_MDIO=y |
611 | # CONFIG_GIANFAR is not set | 640 | # CONFIG_GIANFAR is not set |
612 | CONFIG_UCC_GETH=y | 641 | CONFIG_UCC_GETH=y |
613 | # CONFIG_UGETH_MAGIC_PACKET is not set | 642 | # CONFIG_UGETH_MAGIC_PACKET is not set |
614 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 643 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
644 | # CONFIG_MV643XX_ETH is not set | ||
615 | # CONFIG_QLA3XXX is not set | 645 | # CONFIG_QLA3XXX is not set |
616 | # CONFIG_ATL1 is not set | 646 | # CONFIG_ATL1 is not set |
617 | # CONFIG_ATL1E is not set | 647 | # CONFIG_ATL1E is not set |
@@ -777,7 +807,6 @@ CONFIG_I2C_MPC=y | |||
777 | # CONFIG_SENSORS_PCF8574 is not set | 807 | # CONFIG_SENSORS_PCF8574 is not set |
778 | # CONFIG_PCF8575 is not set | 808 | # CONFIG_PCF8575 is not set |
779 | # CONFIG_SENSORS_PCA9539 is not set | 809 | # CONFIG_SENSORS_PCA9539 is not set |
780 | # CONFIG_SENSORS_MAX6875 is not set | ||
781 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
782 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
783 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -791,13 +820,18 @@ CONFIG_SPI_MASTER=y | |||
791 | # | 820 | # |
792 | CONFIG_SPI_BITBANG=y | 821 | CONFIG_SPI_BITBANG=y |
793 | # CONFIG_SPI_GPIO is not set | 822 | # CONFIG_SPI_GPIO is not set |
794 | CONFIG_SPI_MPC83xx=y | 823 | # CONFIG_SPI_MPC8xxx is not set |
795 | 824 | ||
796 | # | 825 | # |
797 | # SPI Protocol Masters | 826 | # SPI Protocol Masters |
798 | # | 827 | # |
799 | CONFIG_SPI_SPIDEV=y | 828 | CONFIG_SPI_SPIDEV=y |
800 | # CONFIG_SPI_TLE62X0 is not set | 829 | # CONFIG_SPI_TLE62X0 is not set |
830 | |||
831 | # | ||
832 | # PPS support | ||
833 | # | ||
834 | # CONFIG_PPS is not set | ||
801 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 835 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
802 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 836 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
803 | CONFIG_GPIOLIB=y | 837 | CONFIG_GPIOLIB=y |
@@ -865,23 +899,10 @@ CONFIG_SSB_POSSIBLE=y | |||
865 | # CONFIG_MFD_WM8400 is not set | 899 | # CONFIG_MFD_WM8400 is not set |
866 | # CONFIG_MFD_WM8350_I2C is not set | 900 | # CONFIG_MFD_WM8350_I2C is not set |
867 | # CONFIG_MFD_PCF50633 is not set | 901 | # CONFIG_MFD_PCF50633 is not set |
902 | # CONFIG_AB3100_CORE is not set | ||
903 | # CONFIG_EZX_PCAP is not set | ||
868 | # CONFIG_REGULATOR is not set | 904 | # CONFIG_REGULATOR is not set |
869 | 905 | # CONFIG_MEDIA_SUPPORT is not set | |
870 | # | ||
871 | # Multimedia devices | ||
872 | # | ||
873 | |||
874 | # | ||
875 | # Multimedia core support | ||
876 | # | ||
877 | # CONFIG_VIDEO_DEV is not set | ||
878 | # CONFIG_DVB_CORE is not set | ||
879 | # CONFIG_VIDEO_MEDIA is not set | ||
880 | |||
881 | # | ||
882 | # Multimedia drivers | ||
883 | # | ||
884 | CONFIG_DAB=y | ||
885 | 906 | ||
886 | # | 907 | # |
887 | # Graphics support | 908 | # Graphics support |
@@ -990,6 +1011,10 @@ CONFIG_HID=y | |||
990 | # CONFIG_DMADEVICES is not set | 1011 | # CONFIG_DMADEVICES is not set |
991 | # CONFIG_AUXDISPLAY is not set | 1012 | # CONFIG_AUXDISPLAY is not set |
992 | # CONFIG_UIO is not set | 1013 | # CONFIG_UIO is not set |
1014 | |||
1015 | # | ||
1016 | # TI VLYNQ | ||
1017 | # | ||
993 | # CONFIG_STAGING is not set | 1018 | # CONFIG_STAGING is not set |
994 | 1019 | ||
995 | # | 1020 | # |
@@ -1009,10 +1034,12 @@ CONFIG_FS_MBCACHE=y | |||
1009 | # CONFIG_REISERFS_FS is not set | 1034 | # CONFIG_REISERFS_FS is not set |
1010 | # CONFIG_JFS_FS is not set | 1035 | # CONFIG_JFS_FS is not set |
1011 | # CONFIG_FS_POSIX_ACL is not set | 1036 | # CONFIG_FS_POSIX_ACL is not set |
1012 | CONFIG_FILE_LOCKING=y | ||
1013 | # CONFIG_XFS_FS is not set | 1037 | # CONFIG_XFS_FS is not set |
1038 | # CONFIG_GFS2_FS is not set | ||
1014 | # CONFIG_OCFS2_FS is not set | 1039 | # CONFIG_OCFS2_FS is not set |
1015 | # CONFIG_BTRFS_FS is not set | 1040 | # CONFIG_BTRFS_FS is not set |
1041 | CONFIG_FILE_LOCKING=y | ||
1042 | CONFIG_FSNOTIFY=y | ||
1016 | CONFIG_DNOTIFY=y | 1043 | CONFIG_DNOTIFY=y |
1017 | CONFIG_INOTIFY=y | 1044 | CONFIG_INOTIFY=y |
1018 | CONFIG_INOTIFY_USER=y | 1045 | CONFIG_INOTIFY_USER=y |
@@ -1086,6 +1113,7 @@ CONFIG_NFS_FS=y | |||
1086 | CONFIG_NFS_V3=y | 1113 | CONFIG_NFS_V3=y |
1087 | # CONFIG_NFS_V3_ACL is not set | 1114 | # CONFIG_NFS_V3_ACL is not set |
1088 | CONFIG_NFS_V4=y | 1115 | CONFIG_NFS_V4=y |
1116 | # CONFIG_NFS_V4_1 is not set | ||
1089 | CONFIG_ROOT_NFS=y | 1117 | CONFIG_ROOT_NFS=y |
1090 | # CONFIG_NFSD is not set | 1118 | # CONFIG_NFSD is not set |
1091 | CONFIG_LOCKD=y | 1119 | CONFIG_LOCKD=y |
@@ -1145,6 +1173,7 @@ CONFIG_HAS_IOPORT=y | |||
1145 | CONFIG_HAS_DMA=y | 1173 | CONFIG_HAS_DMA=y |
1146 | CONFIG_HAVE_LMB=y | 1174 | CONFIG_HAVE_LMB=y |
1147 | CONFIG_NLATTR=y | 1175 | CONFIG_NLATTR=y |
1176 | CONFIG_GENERIC_ATOMIC64=y | ||
1148 | 1177 | ||
1149 | # | 1178 | # |
1150 | # Kernel hacking | 1179 | # Kernel hacking |
@@ -1170,22 +1199,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1170 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1199 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1171 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1200 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1172 | CONFIG_TRACING_SUPPORT=y | 1201 | CONFIG_TRACING_SUPPORT=y |
1173 | 1202 | # CONFIG_FTRACE is not set | |
1174 | # | ||
1175 | # Tracers | ||
1176 | # | ||
1177 | # CONFIG_FUNCTION_TRACER is not set | ||
1178 | # CONFIG_SCHED_TRACER is not set | ||
1179 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1180 | # CONFIG_EVENT_TRACER is not set | ||
1181 | # CONFIG_BOOT_TRACER is not set | ||
1182 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1183 | # CONFIG_STACK_TRACER is not set | ||
1184 | # CONFIG_KMEMTRACE is not set | ||
1185 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1186 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1187 | # CONFIG_SAMPLES is not set | 1203 | # CONFIG_SAMPLES is not set |
1188 | CONFIG_HAVE_ARCH_KGDB=y | 1204 | CONFIG_HAVE_ARCH_KGDB=y |
1205 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1206 | CONFIG_PPC_WERROR=y | ||
1189 | CONFIG_PRINT_STACK_DEPTH=64 | 1207 | CONFIG_PRINT_STACK_DEPTH=64 |
1190 | # CONFIG_IRQSTACKS is not set | 1208 | # CONFIG_IRQSTACKS is not set |
1191 | # CONFIG_BOOTX_TEXT is not set | 1209 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index bf636fd560ad..e285ec0fe958 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:12 2009 | 4 | # Wed Jul 29 23:32:11 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -108,7 +113,6 @@ CONFIG_EMBEDDED=y | |||
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 115 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
111 | # CONFIG_STRIP_ASM_SYMS is not set | ||
112 | CONFIG_HOTPLUG=y | 116 | CONFIG_HOTPLUG=y |
113 | CONFIG_PRINTK=y | 117 | CONFIG_PRINTK=y |
114 | CONFIG_BUG=y | 118 | CONFIG_BUG=y |
@@ -121,8 +125,15 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 126 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 127 | CONFIG_AIO=y |
128 | CONFIG_HAVE_PERF_COUNTERS=y | ||
129 | |||
130 | # | ||
131 | # Performance Counters | ||
132 | # | ||
133 | # CONFIG_PERF_COUNTERS is not set | ||
124 | CONFIG_VM_EVENT_COUNTERS=y | 134 | CONFIG_VM_EVENT_COUNTERS=y |
125 | CONFIG_PCI_QUIRKS=y | 135 | CONFIG_PCI_QUIRKS=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | CONFIG_SLAB=y | 138 | CONFIG_SLAB=y |
128 | # CONFIG_SLUB is not set | 139 | # CONFIG_SLUB is not set |
@@ -136,6 +147,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
136 | CONFIG_HAVE_KPROBES=y | 147 | CONFIG_HAVE_KPROBES=y |
137 | CONFIG_HAVE_KRETPROBES=y | 148 | CONFIG_HAVE_KRETPROBES=y |
138 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 149 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
150 | |||
151 | # | ||
152 | # GCOV-based kernel profiling | ||
153 | # | ||
139 | # CONFIG_SLOW_WORK is not set | 154 | # CONFIG_SLOW_WORK is not set |
140 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 155 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
141 | CONFIG_SLABINFO=y | 156 | CONFIG_SLABINFO=y |
@@ -148,7 +163,7 @@ CONFIG_MODULE_UNLOAD=y | |||
148 | # CONFIG_MODVERSIONS is not set | 163 | # CONFIG_MODVERSIONS is not set |
149 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 164 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
150 | CONFIG_BLOCK=y | 165 | CONFIG_BLOCK=y |
151 | # CONFIG_LBD is not set | 166 | CONFIG_LBDAF=y |
152 | # CONFIG_BLK_DEV_BSG is not set | 167 | # CONFIG_BLK_DEV_BSG is not set |
153 | # CONFIG_BLK_DEV_INTEGRITY is not set | 168 | # CONFIG_BLK_DEV_INTEGRITY is not set |
154 | 169 | ||
@@ -190,6 +205,7 @@ CONFIG_MPC837x_MDS=y | |||
190 | # CONFIG_MPC837x_RDB is not set | 205 | # CONFIG_MPC837x_RDB is not set |
191 | # CONFIG_SBC834x is not set | 206 | # CONFIG_SBC834x is not set |
192 | # CONFIG_ASP834x is not set | 207 | # CONFIG_ASP834x is not set |
208 | # CONFIG_KMETER1 is not set | ||
193 | CONFIG_PPC_MPC837x=y | 209 | CONFIG_PPC_MPC837x=y |
194 | # CONFIG_PPC_86xx is not set | 210 | # CONFIG_PPC_86xx is not set |
195 | # CONFIG_EMBEDDED6xx is not set | 211 | # CONFIG_EMBEDDED6xx is not set |
@@ -234,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -254,9 +271,9 @@ CONFIG_MIGRATION=y | |||
254 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
256 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
257 | CONFIG_UNEVICTABLE_LRU=y | ||
258 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
259 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
260 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
261 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
262 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -365,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
365 | # CONFIG_ECONET is not set | 382 | # CONFIG_ECONET is not set |
366 | # CONFIG_WAN_ROUTER is not set | 383 | # CONFIG_WAN_ROUTER is not set |
367 | # CONFIG_PHONET is not set | 384 | # CONFIG_PHONET is not set |
385 | # CONFIG_IEEE802154 is not set | ||
368 | # CONFIG_NET_SCHED is not set | 386 | # CONFIG_NET_SCHED is not set |
369 | # CONFIG_DCB is not set | 387 | # CONFIG_DCB is not set |
370 | 388 | ||
@@ -382,7 +400,11 @@ CONFIG_WIRELESS=y | |||
382 | CONFIG_WIRELESS_OLD_REGULATORY=y | 400 | CONFIG_WIRELESS_OLD_REGULATORY=y |
383 | # CONFIG_WIRELESS_EXT is not set | 401 | # CONFIG_WIRELESS_EXT is not set |
384 | # CONFIG_LIB80211 is not set | 402 | # CONFIG_LIB80211 is not set |
385 | # CONFIG_MAC80211 is not set | 403 | |
404 | # | ||
405 | # CFG80211 needs to be enabled for MAC80211 | ||
406 | # | ||
407 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
386 | # CONFIG_WIMAX is not set | 408 | # CONFIG_WIMAX is not set |
387 | # CONFIG_RFKILL is not set | 409 | # CONFIG_RFKILL is not set |
388 | # CONFIG_NET_9P is not set | 410 | # CONFIG_NET_9P is not set |
@@ -403,6 +425,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
403 | # CONFIG_MTD is not set | 425 | # CONFIG_MTD is not set |
404 | CONFIG_OF_DEVICE=y | 426 | CONFIG_OF_DEVICE=y |
405 | CONFIG_OF_I2C=y | 427 | CONFIG_OF_I2C=y |
428 | CONFIG_OF_MDIO=y | ||
406 | # CONFIG_PARPORT is not set | 429 | # CONFIG_PARPORT is not set |
407 | CONFIG_BLK_DEV=y | 430 | CONFIG_BLK_DEV=y |
408 | # CONFIG_BLK_DEV_FD is not set | 431 | # CONFIG_BLK_DEV_FD is not set |
@@ -437,7 +460,9 @@ CONFIG_MISC_DEVICES=y | |||
437 | # | 460 | # |
438 | # CONFIG_EEPROM_AT24 is not set | 461 | # CONFIG_EEPROM_AT24 is not set |
439 | # CONFIG_EEPROM_LEGACY is not set | 462 | # CONFIG_EEPROM_LEGACY is not set |
463 | # CONFIG_EEPROM_MAX6875 is not set | ||
440 | # CONFIG_EEPROM_93CX6 is not set | 464 | # CONFIG_EEPROM_93CX6 is not set |
465 | # CONFIG_CB710_CORE is not set | ||
441 | CONFIG_HAVE_IDE=y | 466 | CONFIG_HAVE_IDE=y |
442 | # CONFIG_IDE is not set | 467 | # CONFIG_IDE is not set |
443 | 468 | ||
@@ -460,10 +485,6 @@ CONFIG_BLK_DEV_SD=y | |||
460 | # CONFIG_BLK_DEV_SR is not set | 485 | # CONFIG_BLK_DEV_SR is not set |
461 | CONFIG_CHR_DEV_SG=y | 486 | CONFIG_CHR_DEV_SG=y |
462 | # CONFIG_CHR_DEV_SCH is not set | 487 | # CONFIG_CHR_DEV_SCH is not set |
463 | |||
464 | # | ||
465 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
466 | # | ||
467 | # CONFIG_SCSI_MULTI_LUN is not set | 488 | # CONFIG_SCSI_MULTI_LUN is not set |
468 | # CONFIG_SCSI_CONSTANTS is not set | 489 | # CONFIG_SCSI_CONSTANTS is not set |
469 | # CONFIG_SCSI_LOGGING is not set | 490 | # CONFIG_SCSI_LOGGING is not set |
@@ -481,6 +502,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
481 | CONFIG_SCSI_LOWLEVEL=y | 502 | CONFIG_SCSI_LOWLEVEL=y |
482 | # CONFIG_ISCSI_TCP is not set | 503 | # CONFIG_ISCSI_TCP is not set |
483 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 504 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
505 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
484 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 506 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
485 | # CONFIG_SCSI_3W_9XXX is not set | 507 | # CONFIG_SCSI_3W_9XXX is not set |
486 | # CONFIG_SCSI_ACARD is not set | 508 | # CONFIG_SCSI_ACARD is not set |
@@ -489,6 +511,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
489 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 511 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
490 | # CONFIG_SCSI_AIC79XX is not set | 512 | # CONFIG_SCSI_AIC79XX is not set |
491 | # CONFIG_SCSI_AIC94XX is not set | 513 | # CONFIG_SCSI_AIC94XX is not set |
514 | # CONFIG_SCSI_MVSAS is not set | ||
492 | # CONFIG_SCSI_DPT_I2O is not set | 515 | # CONFIG_SCSI_DPT_I2O is not set |
493 | # CONFIG_SCSI_ADVANSYS is not set | 516 | # CONFIG_SCSI_ADVANSYS is not set |
494 | # CONFIG_SCSI_ARCMSR is not set | 517 | # CONFIG_SCSI_ARCMSR is not set |
@@ -508,7 +531,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
508 | # CONFIG_SCSI_IPS is not set | 531 | # CONFIG_SCSI_IPS is not set |
509 | # CONFIG_SCSI_INITIO is not set | 532 | # CONFIG_SCSI_INITIO is not set |
510 | # CONFIG_SCSI_INIA100 is not set | 533 | # CONFIG_SCSI_INIA100 is not set |
511 | # CONFIG_SCSI_MVSAS is not set | ||
512 | # CONFIG_SCSI_STEX is not set | 534 | # CONFIG_SCSI_STEX is not set |
513 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 535 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
514 | # CONFIG_SCSI_IPR is not set | 536 | # CONFIG_SCSI_IPR is not set |
@@ -592,14 +614,17 @@ CONFIG_ATA_SFF=y | |||
592 | # | 614 | # |
593 | 615 | ||
594 | # | 616 | # |
595 | # Enable only one of the two stacks, unless you know what you are doing | 617 | # You can enable one or both FireWire driver stacks. |
618 | # | ||
619 | |||
620 | # | ||
621 | # See the help texts for more information. | ||
596 | # | 622 | # |
597 | # CONFIG_FIREWIRE is not set | 623 | # CONFIG_FIREWIRE is not set |
598 | # CONFIG_IEEE1394 is not set | 624 | # CONFIG_IEEE1394 is not set |
599 | # CONFIG_I2O is not set | 625 | # CONFIG_I2O is not set |
600 | # CONFIG_MACINTOSH_DRIVERS is not set | 626 | # CONFIG_MACINTOSH_DRIVERS is not set |
601 | CONFIG_NETDEVICES=y | 627 | CONFIG_NETDEVICES=y |
602 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
603 | # CONFIG_DUMMY is not set | 628 | # CONFIG_DUMMY is not set |
604 | # CONFIG_BONDING is not set | 629 | # CONFIG_BONDING is not set |
605 | # CONFIG_MACVLAN is not set | 630 | # CONFIG_MACVLAN is not set |
@@ -646,6 +671,7 @@ CONFIG_MII=y | |||
646 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 671 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
647 | # CONFIG_NET_PCI is not set | 672 | # CONFIG_NET_PCI is not set |
648 | # CONFIG_B44 is not set | 673 | # CONFIG_B44 is not set |
674 | # CONFIG_KS8842 is not set | ||
649 | # CONFIG_ATL2 is not set | 675 | # CONFIG_ATL2 is not set |
650 | CONFIG_NETDEV_1000=y | 676 | CONFIG_NETDEV_1000=y |
651 | # CONFIG_ACENIC is not set | 677 | # CONFIG_ACENIC is not set |
@@ -665,8 +691,10 @@ CONFIG_NETDEV_1000=y | |||
665 | # CONFIG_VIA_VELOCITY is not set | 691 | # CONFIG_VIA_VELOCITY is not set |
666 | # CONFIG_TIGON3 is not set | 692 | # CONFIG_TIGON3 is not set |
667 | # CONFIG_BNX2 is not set | 693 | # CONFIG_BNX2 is not set |
694 | # CONFIG_CNIC is not set | ||
668 | CONFIG_FSL_PQ_MDIO=y | 695 | CONFIG_FSL_PQ_MDIO=y |
669 | CONFIG_GIANFAR=y | 696 | CONFIG_GIANFAR=y |
697 | # CONFIG_MV643XX_ETH is not set | ||
670 | # CONFIG_QLA3XXX is not set | 698 | # CONFIG_QLA3XXX is not set |
671 | # CONFIG_ATL1 is not set | 699 | # CONFIG_ATL1 is not set |
672 | # CONFIG_ATL1E is not set | 700 | # CONFIG_ATL1E is not set |
@@ -844,13 +872,17 @@ CONFIG_I2C_MPC=y | |||
844 | # CONFIG_SENSORS_PCF8574 is not set | 872 | # CONFIG_SENSORS_PCF8574 is not set |
845 | # CONFIG_PCF8575 is not set | 873 | # CONFIG_PCF8575 is not set |
846 | # CONFIG_SENSORS_PCA9539 is not set | 874 | # CONFIG_SENSORS_PCA9539 is not set |
847 | # CONFIG_SENSORS_MAX6875 is not set | ||
848 | # CONFIG_SENSORS_TSL2550 is not set | 875 | # CONFIG_SENSORS_TSL2550 is not set |
849 | # CONFIG_I2C_DEBUG_CORE is not set | 876 | # CONFIG_I2C_DEBUG_CORE is not set |
850 | # CONFIG_I2C_DEBUG_ALGO is not set | 877 | # CONFIG_I2C_DEBUG_ALGO is not set |
851 | # CONFIG_I2C_DEBUG_BUS is not set | 878 | # CONFIG_I2C_DEBUG_BUS is not set |
852 | # CONFIG_I2C_DEBUG_CHIP is not set | 879 | # CONFIG_I2C_DEBUG_CHIP is not set |
853 | # CONFIG_SPI is not set | 880 | # CONFIG_SPI is not set |
881 | |||
882 | # | ||
883 | # PPS support | ||
884 | # | ||
885 | # CONFIG_PPS is not set | ||
854 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 886 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
855 | # CONFIG_GPIOLIB is not set | 887 | # CONFIG_GPIOLIB is not set |
856 | # CONFIG_W1 is not set | 888 | # CONFIG_W1 is not set |
@@ -905,6 +937,7 @@ CONFIG_HWMON=y | |||
905 | # CONFIG_SENSORS_SMSC47B397 is not set | 937 | # CONFIG_SENSORS_SMSC47B397 is not set |
906 | # CONFIG_SENSORS_ADS7828 is not set | 938 | # CONFIG_SENSORS_ADS7828 is not set |
907 | # CONFIG_SENSORS_THMC50 is not set | 939 | # CONFIG_SENSORS_THMC50 is not set |
940 | # CONFIG_SENSORS_TMP401 is not set | ||
908 | # CONFIG_SENSORS_VIA686A is not set | 941 | # CONFIG_SENSORS_VIA686A is not set |
909 | # CONFIG_SENSORS_VT1211 is not set | 942 | # CONFIG_SENSORS_VT1211 is not set |
910 | # CONFIG_SENSORS_VT8231 is not set | 943 | # CONFIG_SENSORS_VT8231 is not set |
@@ -953,23 +986,9 @@ CONFIG_SSB_POSSIBLE=y | |||
953 | # CONFIG_MFD_WM8400 is not set | 986 | # CONFIG_MFD_WM8400 is not set |
954 | # CONFIG_MFD_WM8350_I2C is not set | 987 | # CONFIG_MFD_WM8350_I2C is not set |
955 | # CONFIG_MFD_PCF50633 is not set | 988 | # CONFIG_MFD_PCF50633 is not set |
989 | # CONFIG_AB3100_CORE is not set | ||
956 | # CONFIG_REGULATOR is not set | 990 | # CONFIG_REGULATOR is not set |
957 | 991 | # CONFIG_MEDIA_SUPPORT is not set | |
958 | # | ||
959 | # Multimedia devices | ||
960 | # | ||
961 | |||
962 | # | ||
963 | # Multimedia core support | ||
964 | # | ||
965 | # CONFIG_VIDEO_DEV is not set | ||
966 | # CONFIG_DVB_CORE is not set | ||
967 | # CONFIG_VIDEO_MEDIA is not set | ||
968 | |||
969 | # | ||
970 | # Multimedia drivers | ||
971 | # | ||
972 | CONFIG_DAB=y | ||
973 | 992 | ||
974 | # | 993 | # |
975 | # Graphics support | 994 | # Graphics support |
@@ -1026,6 +1045,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1026 | # CONFIG_DMADEVICES is not set | 1045 | # CONFIG_DMADEVICES is not set |
1027 | # CONFIG_AUXDISPLAY is not set | 1046 | # CONFIG_AUXDISPLAY is not set |
1028 | # CONFIG_UIO is not set | 1047 | # CONFIG_UIO is not set |
1048 | |||
1049 | # | ||
1050 | # TI VLYNQ | ||
1051 | # | ||
1029 | # CONFIG_STAGING is not set | 1052 | # CONFIG_STAGING is not set |
1030 | 1053 | ||
1031 | # | 1054 | # |
@@ -1045,10 +1068,12 @@ CONFIG_FS_MBCACHE=y | |||
1045 | # CONFIG_REISERFS_FS is not set | 1068 | # CONFIG_REISERFS_FS is not set |
1046 | # CONFIG_JFS_FS is not set | 1069 | # CONFIG_JFS_FS is not set |
1047 | # CONFIG_FS_POSIX_ACL is not set | 1070 | # CONFIG_FS_POSIX_ACL is not set |
1048 | CONFIG_FILE_LOCKING=y | ||
1049 | # CONFIG_XFS_FS is not set | 1071 | # CONFIG_XFS_FS is not set |
1072 | # CONFIG_GFS2_FS is not set | ||
1050 | # CONFIG_OCFS2_FS is not set | 1073 | # CONFIG_OCFS2_FS is not set |
1051 | # CONFIG_BTRFS_FS is not set | 1074 | # CONFIG_BTRFS_FS is not set |
1075 | CONFIG_FILE_LOCKING=y | ||
1076 | CONFIG_FSNOTIFY=y | ||
1052 | CONFIG_DNOTIFY=y | 1077 | CONFIG_DNOTIFY=y |
1053 | CONFIG_INOTIFY=y | 1078 | CONFIG_INOTIFY=y |
1054 | CONFIG_INOTIFY_USER=y | 1079 | CONFIG_INOTIFY_USER=y |
@@ -1111,6 +1136,7 @@ CONFIG_NFS_FS=y | |||
1111 | CONFIG_NFS_V3=y | 1136 | CONFIG_NFS_V3=y |
1112 | # CONFIG_NFS_V3_ACL is not set | 1137 | # CONFIG_NFS_V3_ACL is not set |
1113 | CONFIG_NFS_V4=y | 1138 | CONFIG_NFS_V4=y |
1139 | # CONFIG_NFS_V4_1 is not set | ||
1114 | CONFIG_ROOT_NFS=y | 1140 | CONFIG_ROOT_NFS=y |
1115 | # CONFIG_NFSD is not set | 1141 | # CONFIG_NFSD is not set |
1116 | CONFIG_LOCKD=y | 1142 | CONFIG_LOCKD=y |
@@ -1170,6 +1196,7 @@ CONFIG_HAS_IOPORT=y | |||
1170 | CONFIG_HAS_DMA=y | 1196 | CONFIG_HAS_DMA=y |
1171 | CONFIG_HAVE_LMB=y | 1197 | CONFIG_HAVE_LMB=y |
1172 | CONFIG_NLATTR=y | 1198 | CONFIG_NLATTR=y |
1199 | CONFIG_GENERIC_ATOMIC64=y | ||
1173 | 1200 | ||
1174 | # | 1201 | # |
1175 | # Kernel hacking | 1202 | # Kernel hacking |
@@ -1193,22 +1220,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1193 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1220 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1194 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1221 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1195 | CONFIG_TRACING_SUPPORT=y | 1222 | CONFIG_TRACING_SUPPORT=y |
1196 | 1223 | # CONFIG_FTRACE is not set | |
1197 | # | ||
1198 | # Tracers | ||
1199 | # | ||
1200 | # CONFIG_FUNCTION_TRACER is not set | ||
1201 | # CONFIG_SCHED_TRACER is not set | ||
1202 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1203 | # CONFIG_EVENT_TRACER is not set | ||
1204 | # CONFIG_BOOT_TRACER is not set | ||
1205 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1206 | # CONFIG_STACK_TRACER is not set | ||
1207 | # CONFIG_KMEMTRACE is not set | ||
1208 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1209 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1210 | # CONFIG_SAMPLES is not set | 1224 | # CONFIG_SAMPLES is not set |
1211 | CONFIG_HAVE_ARCH_KGDB=y | 1225 | CONFIG_HAVE_ARCH_KGDB=y |
1226 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1227 | CONFIG_PPC_WERROR=y | ||
1212 | CONFIG_PRINT_STACK_DEPTH=64 | 1228 | CONFIG_PRINT_STACK_DEPTH=64 |
1213 | # CONFIG_IRQSTACKS is not set | 1229 | # CONFIG_IRQSTACKS is not set |
1214 | # CONFIG_BOOTX_TEXT is not set | 1230 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index fe6454eacbdb..1ab3e4cd3018 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:14 2009 | 4 | # Wed Jul 29 23:32:13 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -108,7 +113,6 @@ CONFIG_EMBEDDED=y | |||
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 115 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
111 | # CONFIG_STRIP_ASM_SYMS is not set | ||
112 | CONFIG_HOTPLUG=y | 116 | CONFIG_HOTPLUG=y |
113 | CONFIG_PRINTK=y | 117 | CONFIG_PRINTK=y |
114 | CONFIG_BUG=y | 118 | CONFIG_BUG=y |
@@ -121,8 +125,15 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 126 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 127 | CONFIG_AIO=y |
128 | CONFIG_HAVE_PERF_COUNTERS=y | ||
129 | |||
130 | # | ||
131 | # Performance Counters | ||
132 | # | ||
133 | # CONFIG_PERF_COUNTERS is not set | ||
124 | CONFIG_VM_EVENT_COUNTERS=y | 134 | CONFIG_VM_EVENT_COUNTERS=y |
125 | CONFIG_PCI_QUIRKS=y | 135 | CONFIG_PCI_QUIRKS=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
127 | CONFIG_SLAB=y | 138 | CONFIG_SLAB=y |
128 | # CONFIG_SLUB is not set | 139 | # CONFIG_SLUB is not set |
@@ -136,6 +147,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
136 | CONFIG_HAVE_KPROBES=y | 147 | CONFIG_HAVE_KPROBES=y |
137 | CONFIG_HAVE_KRETPROBES=y | 148 | CONFIG_HAVE_KRETPROBES=y |
138 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 149 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
150 | |||
151 | # | ||
152 | # GCOV-based kernel profiling | ||
153 | # | ||
139 | # CONFIG_SLOW_WORK is not set | 154 | # CONFIG_SLOW_WORK is not set |
140 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 155 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
141 | CONFIG_SLABINFO=y | 156 | CONFIG_SLABINFO=y |
@@ -148,7 +163,7 @@ CONFIG_MODULE_UNLOAD=y | |||
148 | # CONFIG_MODVERSIONS is not set | 163 | # CONFIG_MODVERSIONS is not set |
149 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 164 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
150 | CONFIG_BLOCK=y | 165 | CONFIG_BLOCK=y |
151 | # CONFIG_LBD is not set | 166 | CONFIG_LBDAF=y |
152 | # CONFIG_BLK_DEV_BSG is not set | 167 | # CONFIG_BLK_DEV_BSG is not set |
153 | # CONFIG_BLK_DEV_INTEGRITY is not set | 168 | # CONFIG_BLK_DEV_INTEGRITY is not set |
154 | 169 | ||
@@ -190,6 +205,7 @@ CONFIG_PPC_83xx=y | |||
190 | CONFIG_MPC837x_RDB=y | 205 | CONFIG_MPC837x_RDB=y |
191 | # CONFIG_SBC834x is not set | 206 | # CONFIG_SBC834x is not set |
192 | # CONFIG_ASP834x is not set | 207 | # CONFIG_ASP834x is not set |
208 | # CONFIG_KMETER1 is not set | ||
193 | CONFIG_PPC_MPC837x=y | 209 | CONFIG_PPC_MPC837x=y |
194 | # CONFIG_PPC_86xx is not set | 210 | # CONFIG_PPC_86xx is not set |
195 | # CONFIG_EMBEDDED6xx is not set | 211 | # CONFIG_EMBEDDED6xx is not set |
@@ -234,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
235 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
236 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -254,9 +271,9 @@ CONFIG_MIGRATION=y | |||
254 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
256 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
257 | CONFIG_UNEVICTABLE_LRU=y | ||
258 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
259 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
260 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
261 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
262 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -360,6 +377,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
360 | # CONFIG_ECONET is not set | 377 | # CONFIG_ECONET is not set |
361 | # CONFIG_WAN_ROUTER is not set | 378 | # CONFIG_WAN_ROUTER is not set |
362 | # CONFIG_PHONET is not set | 379 | # CONFIG_PHONET is not set |
380 | # CONFIG_IEEE802154 is not set | ||
363 | # CONFIG_NET_SCHED is not set | 381 | # CONFIG_NET_SCHED is not set |
364 | # CONFIG_DCB is not set | 382 | # CONFIG_DCB is not set |
365 | 383 | ||
@@ -377,7 +395,11 @@ CONFIG_WIRELESS=y | |||
377 | CONFIG_WIRELESS_OLD_REGULATORY=y | 395 | CONFIG_WIRELESS_OLD_REGULATORY=y |
378 | # CONFIG_WIRELESS_EXT is not set | 396 | # CONFIG_WIRELESS_EXT is not set |
379 | # CONFIG_LIB80211 is not set | 397 | # CONFIG_LIB80211 is not set |
380 | # CONFIG_MAC80211 is not set | 398 | |
399 | # | ||
400 | # CFG80211 needs to be enabled for MAC80211 | ||
401 | # | ||
402 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
381 | # CONFIG_WIMAX is not set | 403 | # CONFIG_WIMAX is not set |
382 | # CONFIG_RFKILL is not set | 404 | # CONFIG_RFKILL is not set |
383 | # CONFIG_NET_9P is not set | 405 | # CONFIG_NET_9P is not set |
@@ -398,6 +420,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
398 | # CONFIG_MTD is not set | 420 | # CONFIG_MTD is not set |
399 | CONFIG_OF_DEVICE=y | 421 | CONFIG_OF_DEVICE=y |
400 | CONFIG_OF_I2C=y | 422 | CONFIG_OF_I2C=y |
423 | CONFIG_OF_MDIO=y | ||
401 | # CONFIG_PARPORT is not set | 424 | # CONFIG_PARPORT is not set |
402 | CONFIG_BLK_DEV=y | 425 | CONFIG_BLK_DEV=y |
403 | # CONFIG_BLK_DEV_FD is not set | 426 | # CONFIG_BLK_DEV_FD is not set |
@@ -433,7 +456,9 @@ CONFIG_MISC_DEVICES=y | |||
433 | # | 456 | # |
434 | # CONFIG_EEPROM_AT24 is not set | 457 | # CONFIG_EEPROM_AT24 is not set |
435 | # CONFIG_EEPROM_LEGACY is not set | 458 | # CONFIG_EEPROM_LEGACY is not set |
459 | # CONFIG_EEPROM_MAX6875 is not set | ||
436 | # CONFIG_EEPROM_93CX6 is not set | 460 | # CONFIG_EEPROM_93CX6 is not set |
461 | # CONFIG_CB710_CORE is not set | ||
437 | CONFIG_HAVE_IDE=y | 462 | CONFIG_HAVE_IDE=y |
438 | # CONFIG_IDE is not set | 463 | # CONFIG_IDE is not set |
439 | 464 | ||
@@ -456,10 +481,6 @@ CONFIG_BLK_DEV_SD=y | |||
456 | # CONFIG_BLK_DEV_SR is not set | 481 | # CONFIG_BLK_DEV_SR is not set |
457 | CONFIG_CHR_DEV_SG=y | 482 | CONFIG_CHR_DEV_SG=y |
458 | # CONFIG_CHR_DEV_SCH is not set | 483 | # CONFIG_CHR_DEV_SCH is not set |
459 | |||
460 | # | ||
461 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
462 | # | ||
463 | # CONFIG_SCSI_MULTI_LUN is not set | 484 | # CONFIG_SCSI_MULTI_LUN is not set |
464 | # CONFIG_SCSI_CONSTANTS is not set | 485 | # CONFIG_SCSI_CONSTANTS is not set |
465 | # CONFIG_SCSI_LOGGING is not set | 486 | # CONFIG_SCSI_LOGGING is not set |
@@ -476,6 +497,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
476 | # CONFIG_SCSI_SRP_ATTRS is not set | 497 | # CONFIG_SCSI_SRP_ATTRS is not set |
477 | CONFIG_SCSI_LOWLEVEL=y | 498 | CONFIG_SCSI_LOWLEVEL=y |
478 | # CONFIG_ISCSI_TCP is not set | 499 | # CONFIG_ISCSI_TCP is not set |
500 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
479 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 501 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
480 | # CONFIG_SCSI_3W_9XXX is not set | 502 | # CONFIG_SCSI_3W_9XXX is not set |
481 | # CONFIG_SCSI_ACARD is not set | 503 | # CONFIG_SCSI_ACARD is not set |
@@ -484,6 +506,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
484 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 506 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
485 | # CONFIG_SCSI_AIC79XX is not set | 507 | # CONFIG_SCSI_AIC79XX is not set |
486 | # CONFIG_SCSI_AIC94XX is not set | 508 | # CONFIG_SCSI_AIC94XX is not set |
509 | # CONFIG_SCSI_MVSAS is not set | ||
487 | # CONFIG_SCSI_DPT_I2O is not set | 510 | # CONFIG_SCSI_DPT_I2O is not set |
488 | # CONFIG_SCSI_ADVANSYS is not set | 511 | # CONFIG_SCSI_ADVANSYS is not set |
489 | # CONFIG_SCSI_ARCMSR is not set | 512 | # CONFIG_SCSI_ARCMSR is not set |
@@ -503,7 +526,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
503 | # CONFIG_SCSI_IPS is not set | 526 | # CONFIG_SCSI_IPS is not set |
504 | # CONFIG_SCSI_INITIO is not set | 527 | # CONFIG_SCSI_INITIO is not set |
505 | # CONFIG_SCSI_INIA100 is not set | 528 | # CONFIG_SCSI_INIA100 is not set |
506 | # CONFIG_SCSI_MVSAS is not set | ||
507 | # CONFIG_SCSI_STEX is not set | 529 | # CONFIG_SCSI_STEX is not set |
508 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 530 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
509 | # CONFIG_SCSI_IPR is not set | 531 | # CONFIG_SCSI_IPR is not set |
@@ -598,14 +620,17 @@ CONFIG_MD_RAID6_PQ=y | |||
598 | # | 620 | # |
599 | 621 | ||
600 | # | 622 | # |
601 | # Enable only one of the two stacks, unless you know what you are doing | 623 | # You can enable one or both FireWire driver stacks. |
624 | # | ||
625 | |||
626 | # | ||
627 | # See the help texts for more information. | ||
602 | # | 628 | # |
603 | # CONFIG_FIREWIRE is not set | 629 | # CONFIG_FIREWIRE is not set |
604 | # CONFIG_IEEE1394 is not set | 630 | # CONFIG_IEEE1394 is not set |
605 | # CONFIG_I2O is not set | 631 | # CONFIG_I2O is not set |
606 | # CONFIG_MACINTOSH_DRIVERS is not set | 632 | # CONFIG_MACINTOSH_DRIVERS is not set |
607 | CONFIG_NETDEVICES=y | 633 | CONFIG_NETDEVICES=y |
608 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
609 | # CONFIG_DUMMY is not set | 634 | # CONFIG_DUMMY is not set |
610 | # CONFIG_BONDING is not set | 635 | # CONFIG_BONDING is not set |
611 | # CONFIG_MACVLAN is not set | 636 | # CONFIG_MACVLAN is not set |
@@ -652,6 +677,7 @@ CONFIG_MII=y | |||
652 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 677 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
653 | # CONFIG_NET_PCI is not set | 678 | # CONFIG_NET_PCI is not set |
654 | # CONFIG_B44 is not set | 679 | # CONFIG_B44 is not set |
680 | # CONFIG_KS8842 is not set | ||
655 | # CONFIG_ATL2 is not set | 681 | # CONFIG_ATL2 is not set |
656 | CONFIG_NETDEV_1000=y | 682 | CONFIG_NETDEV_1000=y |
657 | # CONFIG_ACENIC is not set | 683 | # CONFIG_ACENIC is not set |
@@ -671,8 +697,10 @@ CONFIG_NETDEV_1000=y | |||
671 | # CONFIG_VIA_VELOCITY is not set | 697 | # CONFIG_VIA_VELOCITY is not set |
672 | # CONFIG_TIGON3 is not set | 698 | # CONFIG_TIGON3 is not set |
673 | # CONFIG_BNX2 is not set | 699 | # CONFIG_BNX2 is not set |
700 | # CONFIG_CNIC is not set | ||
674 | CONFIG_FSL_PQ_MDIO=y | 701 | CONFIG_FSL_PQ_MDIO=y |
675 | CONFIG_GIANFAR=y | 702 | CONFIG_GIANFAR=y |
703 | # CONFIG_MV643XX_ETH is not set | ||
676 | # CONFIG_QLA3XXX is not set | 704 | # CONFIG_QLA3XXX is not set |
677 | # CONFIG_ATL1 is not set | 705 | # CONFIG_ATL1 is not set |
678 | # CONFIG_ATL1E is not set | 706 | # CONFIG_ATL1E is not set |
@@ -842,13 +870,17 @@ CONFIG_I2C_MPC=y | |||
842 | # CONFIG_SENSORS_PCF8574 is not set | 870 | # CONFIG_SENSORS_PCF8574 is not set |
843 | # CONFIG_PCF8575 is not set | 871 | # CONFIG_PCF8575 is not set |
844 | # CONFIG_SENSORS_PCA9539 is not set | 872 | # CONFIG_SENSORS_PCA9539 is not set |
845 | # CONFIG_SENSORS_MAX6875 is not set | ||
846 | # CONFIG_SENSORS_TSL2550 is not set | 873 | # CONFIG_SENSORS_TSL2550 is not set |
847 | # CONFIG_I2C_DEBUG_CORE is not set | 874 | # CONFIG_I2C_DEBUG_CORE is not set |
848 | # CONFIG_I2C_DEBUG_ALGO is not set | 875 | # CONFIG_I2C_DEBUG_ALGO is not set |
849 | # CONFIG_I2C_DEBUG_BUS is not set | 876 | # CONFIG_I2C_DEBUG_BUS is not set |
850 | # CONFIG_I2C_DEBUG_CHIP is not set | 877 | # CONFIG_I2C_DEBUG_CHIP is not set |
851 | # CONFIG_SPI is not set | 878 | # CONFIG_SPI is not set |
879 | |||
880 | # | ||
881 | # PPS support | ||
882 | # | ||
883 | # CONFIG_PPS is not set | ||
852 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 884 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
853 | # CONFIG_GPIOLIB is not set | 885 | # CONFIG_GPIOLIB is not set |
854 | # CONFIG_W1 is not set | 886 | # CONFIG_W1 is not set |
@@ -903,6 +935,7 @@ CONFIG_HWMON=y | |||
903 | # CONFIG_SENSORS_SMSC47B397 is not set | 935 | # CONFIG_SENSORS_SMSC47B397 is not set |
904 | # CONFIG_SENSORS_ADS7828 is not set | 936 | # CONFIG_SENSORS_ADS7828 is not set |
905 | # CONFIG_SENSORS_THMC50 is not set | 937 | # CONFIG_SENSORS_THMC50 is not set |
938 | # CONFIG_SENSORS_TMP401 is not set | ||
906 | # CONFIG_SENSORS_VIA686A is not set | 939 | # CONFIG_SENSORS_VIA686A is not set |
907 | # CONFIG_SENSORS_VT1211 is not set | 940 | # CONFIG_SENSORS_VT1211 is not set |
908 | # CONFIG_SENSORS_VT8231 is not set | 941 | # CONFIG_SENSORS_VT8231 is not set |
@@ -956,24 +989,9 @@ CONFIG_SSB_POSSIBLE=y | |||
956 | # CONFIG_MFD_WM8400 is not set | 989 | # CONFIG_MFD_WM8400 is not set |
957 | # CONFIG_MFD_WM8350_I2C is not set | 990 | # CONFIG_MFD_WM8350_I2C is not set |
958 | # CONFIG_MFD_PCF50633 is not set | 991 | # CONFIG_MFD_PCF50633 is not set |
992 | # CONFIG_AB3100_CORE is not set | ||
959 | # CONFIG_REGULATOR is not set | 993 | # CONFIG_REGULATOR is not set |
960 | 994 | # CONFIG_MEDIA_SUPPORT is not set | |
961 | # | ||
962 | # Multimedia devices | ||
963 | # | ||
964 | |||
965 | # | ||
966 | # Multimedia core support | ||
967 | # | ||
968 | # CONFIG_VIDEO_DEV is not set | ||
969 | # CONFIG_DVB_CORE is not set | ||
970 | # CONFIG_VIDEO_MEDIA is not set | ||
971 | |||
972 | # | ||
973 | # Multimedia drivers | ||
974 | # | ||
975 | CONFIG_DAB=y | ||
976 | # CONFIG_USB_DABUSB is not set | ||
977 | 995 | ||
978 | # | 996 | # |
979 | # Graphics support | 997 | # Graphics support |
@@ -1011,7 +1029,7 @@ CONFIG_HID_BELKIN=y | |||
1011 | CONFIG_HID_CHERRY=y | 1029 | CONFIG_HID_CHERRY=y |
1012 | CONFIG_HID_CHICONY=y | 1030 | CONFIG_HID_CHICONY=y |
1013 | CONFIG_HID_CYPRESS=y | 1031 | CONFIG_HID_CYPRESS=y |
1014 | # CONFIG_DRAGONRISE_FF is not set | 1032 | # CONFIG_HID_DRAGONRISE is not set |
1015 | CONFIG_HID_EZKEY=y | 1033 | CONFIG_HID_EZKEY=y |
1016 | # CONFIG_HID_KYE is not set | 1034 | # CONFIG_HID_KYE is not set |
1017 | CONFIG_HID_GYRATION=y | 1035 | CONFIG_HID_GYRATION=y |
@@ -1028,10 +1046,11 @@ CONFIG_HID_PETALYNX=y | |||
1028 | CONFIG_HID_SAMSUNG=y | 1046 | CONFIG_HID_SAMSUNG=y |
1029 | CONFIG_HID_SONY=y | 1047 | CONFIG_HID_SONY=y |
1030 | CONFIG_HID_SUNPLUS=y | 1048 | CONFIG_HID_SUNPLUS=y |
1031 | # CONFIG_GREENASIA_FF is not set | 1049 | # CONFIG_HID_GREENASIA is not set |
1050 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1032 | # CONFIG_HID_TOPSEED is not set | 1051 | # CONFIG_HID_TOPSEED is not set |
1033 | CONFIG_THRUSTMASTER_FF=m | 1052 | # CONFIG_HID_THRUSTMASTER is not set |
1034 | CONFIG_ZEROPLUS_FF=m | 1053 | # CONFIG_HID_ZEROPLUS is not set |
1035 | CONFIG_USB_SUPPORT=y | 1054 | CONFIG_USB_SUPPORT=y |
1036 | CONFIG_USB_ARCH_HAS_HCD=y | 1055 | CONFIG_USB_ARCH_HAS_HCD=y |
1037 | CONFIG_USB_ARCH_HAS_OHCI=y | 1056 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1057,6 +1076,7 @@ CONFIG_USB_MON=y | |||
1057 | # USB Host Controller Drivers | 1076 | # USB Host Controller Drivers |
1058 | # | 1077 | # |
1059 | # CONFIG_USB_C67X00_HCD is not set | 1078 | # CONFIG_USB_C67X00_HCD is not set |
1079 | # CONFIG_USB_XHCI_HCD is not set | ||
1060 | CONFIG_USB_EHCI_HCD=y | 1080 | CONFIG_USB_EHCI_HCD=y |
1061 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1081 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1062 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1082 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1141,6 +1161,10 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1141 | # CONFIG_DMADEVICES is not set | 1161 | # CONFIG_DMADEVICES is not set |
1142 | # CONFIG_AUXDISPLAY is not set | 1162 | # CONFIG_AUXDISPLAY is not set |
1143 | # CONFIG_UIO is not set | 1163 | # CONFIG_UIO is not set |
1164 | |||
1165 | # | ||
1166 | # TI VLYNQ | ||
1167 | # | ||
1144 | # CONFIG_STAGING is not set | 1168 | # CONFIG_STAGING is not set |
1145 | 1169 | ||
1146 | # | 1170 | # |
@@ -1160,10 +1184,12 @@ CONFIG_FS_MBCACHE=y | |||
1160 | # CONFIG_REISERFS_FS is not set | 1184 | # CONFIG_REISERFS_FS is not set |
1161 | # CONFIG_JFS_FS is not set | 1185 | # CONFIG_JFS_FS is not set |
1162 | # CONFIG_FS_POSIX_ACL is not set | 1186 | # CONFIG_FS_POSIX_ACL is not set |
1163 | CONFIG_FILE_LOCKING=y | ||
1164 | # CONFIG_XFS_FS is not set | 1187 | # CONFIG_XFS_FS is not set |
1188 | # CONFIG_GFS2_FS is not set | ||
1165 | # CONFIG_OCFS2_FS is not set | 1189 | # CONFIG_OCFS2_FS is not set |
1166 | # CONFIG_BTRFS_FS is not set | 1190 | # CONFIG_BTRFS_FS is not set |
1191 | CONFIG_FILE_LOCKING=y | ||
1192 | CONFIG_FSNOTIFY=y | ||
1167 | CONFIG_DNOTIFY=y | 1193 | CONFIG_DNOTIFY=y |
1168 | CONFIG_INOTIFY=y | 1194 | CONFIG_INOTIFY=y |
1169 | CONFIG_INOTIFY_USER=y | 1195 | CONFIG_INOTIFY_USER=y |
@@ -1226,6 +1252,7 @@ CONFIG_NFS_FS=y | |||
1226 | CONFIG_NFS_V3=y | 1252 | CONFIG_NFS_V3=y |
1227 | # CONFIG_NFS_V3_ACL is not set | 1253 | # CONFIG_NFS_V3_ACL is not set |
1228 | CONFIG_NFS_V4=y | 1254 | CONFIG_NFS_V4=y |
1255 | # CONFIG_NFS_V4_1 is not set | ||
1229 | CONFIG_ROOT_NFS=y | 1256 | CONFIG_ROOT_NFS=y |
1230 | # CONFIG_NFSD is not set | 1257 | # CONFIG_NFSD is not set |
1231 | CONFIG_LOCKD=y | 1258 | CONFIG_LOCKD=y |
@@ -1262,7 +1289,46 @@ CONFIG_MSDOS_PARTITION=y | |||
1262 | # CONFIG_KARMA_PARTITION is not set | 1289 | # CONFIG_KARMA_PARTITION is not set |
1263 | # CONFIG_EFI_PARTITION is not set | 1290 | # CONFIG_EFI_PARTITION is not set |
1264 | # CONFIG_SYSV68_PARTITION is not set | 1291 | # CONFIG_SYSV68_PARTITION is not set |
1265 | # CONFIG_NLS is not set | 1292 | CONFIG_NLS=y |
1293 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1294 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1295 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1296 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1297 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1298 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1299 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1300 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1301 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1302 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1303 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1304 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1305 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1306 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1307 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1308 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1309 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1310 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1311 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1312 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1313 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1314 | # CONFIG_NLS_ISO8859_8 is not set | ||
1315 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1316 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1317 | # CONFIG_NLS_ASCII is not set | ||
1318 | # CONFIG_NLS_ISO8859_1 is not set | ||
1319 | # CONFIG_NLS_ISO8859_2 is not set | ||
1320 | # CONFIG_NLS_ISO8859_3 is not set | ||
1321 | # CONFIG_NLS_ISO8859_4 is not set | ||
1322 | # CONFIG_NLS_ISO8859_5 is not set | ||
1323 | # CONFIG_NLS_ISO8859_6 is not set | ||
1324 | # CONFIG_NLS_ISO8859_7 is not set | ||
1325 | # CONFIG_NLS_ISO8859_9 is not set | ||
1326 | # CONFIG_NLS_ISO8859_13 is not set | ||
1327 | # CONFIG_NLS_ISO8859_14 is not set | ||
1328 | # CONFIG_NLS_ISO8859_15 is not set | ||
1329 | # CONFIG_NLS_KOI8_R is not set | ||
1330 | # CONFIG_NLS_KOI8_U is not set | ||
1331 | # CONFIG_NLS_UTF8 is not set | ||
1266 | # CONFIG_DLM is not set | 1332 | # CONFIG_DLM is not set |
1267 | # CONFIG_BINARY_PRINTF is not set | 1333 | # CONFIG_BINARY_PRINTF is not set |
1268 | 1334 | ||
@@ -1285,6 +1351,7 @@ CONFIG_HAS_IOPORT=y | |||
1285 | CONFIG_HAS_DMA=y | 1351 | CONFIG_HAS_DMA=y |
1286 | CONFIG_HAVE_LMB=y | 1352 | CONFIG_HAVE_LMB=y |
1287 | CONFIG_NLATTR=y | 1353 | CONFIG_NLATTR=y |
1354 | CONFIG_GENERIC_ATOMIC64=y | ||
1288 | 1355 | ||
1289 | # | 1356 | # |
1290 | # Kernel hacking | 1357 | # Kernel hacking |
@@ -1308,22 +1375,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1308 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1375 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1309 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1376 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1310 | CONFIG_TRACING_SUPPORT=y | 1377 | CONFIG_TRACING_SUPPORT=y |
1311 | 1378 | # CONFIG_FTRACE is not set | |
1312 | # | ||
1313 | # Tracers | ||
1314 | # | ||
1315 | # CONFIG_FUNCTION_TRACER is not set | ||
1316 | # CONFIG_SCHED_TRACER is not set | ||
1317 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1318 | # CONFIG_EVENT_TRACER is not set | ||
1319 | # CONFIG_BOOT_TRACER is not set | ||
1320 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1321 | # CONFIG_STACK_TRACER is not set | ||
1322 | # CONFIG_KMEMTRACE is not set | ||
1323 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1324 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1325 | # CONFIG_SAMPLES is not set | 1379 | # CONFIG_SAMPLES is not set |
1326 | CONFIG_HAVE_ARCH_KGDB=y | 1380 | CONFIG_HAVE_ARCH_KGDB=y |
1381 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1382 | CONFIG_PPC_WERROR=y | ||
1327 | CONFIG_PRINT_STACK_DEPTH=64 | 1383 | CONFIG_PRINT_STACK_DEPTH=64 |
1328 | # CONFIG_IRQSTACKS is not set | 1384 | # CONFIG_IRQSTACKS is not set |
1329 | # CONFIG_BOOTX_TEXT is not set | 1385 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index fe08f672cb27..a592b5efdc4d 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:15 2009 | 4 | # Wed Jul 29 23:32:13 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,12 +56,14 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 61 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -107,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
107 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
108 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
109 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
110 | # CONFIG_STRIP_ASM_SYMS is not set | ||
111 | CONFIG_HOTPLUG=y | 115 | CONFIG_HOTPLUG=y |
112 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
113 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -120,8 +124,15 @@ CONFIG_TIMERFD=y | |||
120 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
121 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
122 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
123 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
124 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
135 | # CONFIG_STRIP_ASM_SYMS is not set | ||
125 | CONFIG_COMPAT_BRK=y | 136 | CONFIG_COMPAT_BRK=y |
126 | CONFIG_SLAB=y | 137 | CONFIG_SLAB=y |
127 | # CONFIG_SLUB is not set | 138 | # CONFIG_SLUB is not set |
@@ -134,6 +145,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
134 | CONFIG_HAVE_KPROBES=y | 145 | CONFIG_HAVE_KPROBES=y |
135 | CONFIG_HAVE_KRETPROBES=y | 146 | CONFIG_HAVE_KRETPROBES=y |
136 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 147 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
148 | |||
149 | # | ||
150 | # GCOV-based kernel profiling | ||
151 | # | ||
137 | # CONFIG_SLOW_WORK is not set | 152 | # CONFIG_SLOW_WORK is not set |
138 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 153 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
139 | CONFIG_SLABINFO=y | 154 | CONFIG_SLABINFO=y |
@@ -146,7 +161,7 @@ CONFIG_MODULE_UNLOAD=y | |||
146 | # CONFIG_MODVERSIONS is not set | 161 | # CONFIG_MODVERSIONS is not set |
147 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 162 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
148 | CONFIG_BLOCK=y | 163 | CONFIG_BLOCK=y |
149 | # CONFIG_LBD is not set | 164 | CONFIG_LBDAF=y |
150 | # CONFIG_BLK_DEV_BSG is not set | 165 | # CONFIG_BLK_DEV_BSG is not set |
151 | # CONFIG_BLK_DEV_INTEGRITY is not set | 166 | # CONFIG_BLK_DEV_INTEGRITY is not set |
152 | 167 | ||
@@ -188,6 +203,7 @@ CONFIG_PPC_83xx=y | |||
188 | # CONFIG_MPC837x_RDB is not set | 203 | # CONFIG_MPC837x_RDB is not set |
189 | CONFIG_SBC834x=y | 204 | CONFIG_SBC834x=y |
190 | # CONFIG_ASP834x is not set | 205 | # CONFIG_ASP834x is not set |
206 | # CONFIG_KMETER1 is not set | ||
191 | CONFIG_PPC_MPC834x=y | 207 | CONFIG_PPC_MPC834x=y |
192 | # CONFIG_PPC_86xx is not set | 208 | # CONFIG_PPC_86xx is not set |
193 | # CONFIG_EMBEDDED6xx is not set | 209 | # CONFIG_EMBEDDED6xx is not set |
@@ -232,6 +248,7 @@ CONFIG_BINFMT_ELF=y | |||
232 | # CONFIG_HAVE_AOUT is not set | 248 | # CONFIG_HAVE_AOUT is not set |
233 | # CONFIG_BINFMT_MISC is not set | 249 | # CONFIG_BINFMT_MISC is not set |
234 | # CONFIG_IOMMU_HELPER is not set | 250 | # CONFIG_IOMMU_HELPER is not set |
251 | # CONFIG_SWIOTLB is not set | ||
235 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 252 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
236 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 253 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -252,9 +269,9 @@ CONFIG_MIGRATION=y | |||
252 | CONFIG_ZONE_DMA_FLAG=1 | 269 | CONFIG_ZONE_DMA_FLAG=1 |
253 | CONFIG_BOUNCE=y | 270 | CONFIG_BOUNCE=y |
254 | CONFIG_VIRT_TO_BUS=y | 271 | CONFIG_VIRT_TO_BUS=y |
255 | CONFIG_UNEVICTABLE_LRU=y | ||
256 | CONFIG_HAVE_MLOCK=y | 272 | CONFIG_HAVE_MLOCK=y |
257 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 273 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
274 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
258 | CONFIG_PPC_4K_PAGES=y | 275 | CONFIG_PPC_4K_PAGES=y |
259 | # CONFIG_PPC_16K_PAGES is not set | 276 | # CONFIG_PPC_16K_PAGES is not set |
260 | # CONFIG_PPC_64K_PAGES is not set | 277 | # CONFIG_PPC_64K_PAGES is not set |
@@ -363,6 +380,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
363 | # CONFIG_ECONET is not set | 380 | # CONFIG_ECONET is not set |
364 | # CONFIG_WAN_ROUTER is not set | 381 | # CONFIG_WAN_ROUTER is not set |
365 | # CONFIG_PHONET is not set | 382 | # CONFIG_PHONET is not set |
383 | # CONFIG_IEEE802154 is not set | ||
366 | # CONFIG_NET_SCHED is not set | 384 | # CONFIG_NET_SCHED is not set |
367 | # CONFIG_DCB is not set | 385 | # CONFIG_DCB is not set |
368 | 386 | ||
@@ -380,7 +398,11 @@ CONFIG_WIRELESS=y | |||
380 | CONFIG_WIRELESS_OLD_REGULATORY=y | 398 | CONFIG_WIRELESS_OLD_REGULATORY=y |
381 | # CONFIG_WIRELESS_EXT is not set | 399 | # CONFIG_WIRELESS_EXT is not set |
382 | # CONFIG_LIB80211 is not set | 400 | # CONFIG_LIB80211 is not set |
383 | # CONFIG_MAC80211 is not set | 401 | |
402 | # | ||
403 | # CFG80211 needs to be enabled for MAC80211 | ||
404 | # | ||
405 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
384 | # CONFIG_WIMAX is not set | 406 | # CONFIG_WIMAX is not set |
385 | # CONFIG_RFKILL is not set | 407 | # CONFIG_RFKILL is not set |
386 | # CONFIG_NET_9P is not set | 408 | # CONFIG_NET_9P is not set |
@@ -401,6 +423,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
401 | # CONFIG_MTD is not set | 423 | # CONFIG_MTD is not set |
402 | CONFIG_OF_DEVICE=y | 424 | CONFIG_OF_DEVICE=y |
403 | CONFIG_OF_I2C=y | 425 | CONFIG_OF_I2C=y |
426 | CONFIG_OF_MDIO=y | ||
404 | # CONFIG_PARPORT is not set | 427 | # CONFIG_PARPORT is not set |
405 | CONFIG_BLK_DEV=y | 428 | CONFIG_BLK_DEV=y |
406 | # CONFIG_BLK_DEV_FD is not set | 429 | # CONFIG_BLK_DEV_FD is not set |
@@ -435,7 +458,9 @@ CONFIG_MISC_DEVICES=y | |||
435 | # | 458 | # |
436 | # CONFIG_EEPROM_AT24 is not set | 459 | # CONFIG_EEPROM_AT24 is not set |
437 | # CONFIG_EEPROM_LEGACY is not set | 460 | # CONFIG_EEPROM_LEGACY is not set |
461 | # CONFIG_EEPROM_MAX6875 is not set | ||
438 | # CONFIG_EEPROM_93CX6 is not set | 462 | # CONFIG_EEPROM_93CX6 is not set |
463 | # CONFIG_CB710_CORE is not set | ||
439 | CONFIG_HAVE_IDE=y | 464 | CONFIG_HAVE_IDE=y |
440 | # CONFIG_IDE is not set | 465 | # CONFIG_IDE is not set |
441 | 466 | ||
@@ -455,14 +480,17 @@ CONFIG_HAVE_IDE=y | |||
455 | # | 480 | # |
456 | 481 | ||
457 | # | 482 | # |
458 | # Enable only one of the two stacks, unless you know what you are doing | 483 | # You can enable one or both FireWire driver stacks. |
484 | # | ||
485 | |||
486 | # | ||
487 | # See the help texts for more information. | ||
459 | # | 488 | # |
460 | # CONFIG_FIREWIRE is not set | 489 | # CONFIG_FIREWIRE is not set |
461 | # CONFIG_IEEE1394 is not set | 490 | # CONFIG_IEEE1394 is not set |
462 | # CONFIG_I2O is not set | 491 | # CONFIG_I2O is not set |
463 | # CONFIG_MACINTOSH_DRIVERS is not set | 492 | # CONFIG_MACINTOSH_DRIVERS is not set |
464 | CONFIG_NETDEVICES=y | 493 | CONFIG_NETDEVICES=y |
465 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
466 | # CONFIG_DUMMY is not set | 494 | # CONFIG_DUMMY is not set |
467 | # CONFIG_BONDING is not set | 495 | # CONFIG_BONDING is not set |
468 | # CONFIG_MACVLAN is not set | 496 | # CONFIG_MACVLAN is not set |
@@ -509,6 +537,7 @@ CONFIG_MII=y | |||
509 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 537 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
510 | # CONFIG_NET_PCI is not set | 538 | # CONFIG_NET_PCI is not set |
511 | # CONFIG_B44 is not set | 539 | # CONFIG_B44 is not set |
540 | # CONFIG_KS8842 is not set | ||
512 | # CONFIG_ATL2 is not set | 541 | # CONFIG_ATL2 is not set |
513 | CONFIG_NETDEV_1000=y | 542 | CONFIG_NETDEV_1000=y |
514 | # CONFIG_ACENIC is not set | 543 | # CONFIG_ACENIC is not set |
@@ -528,8 +557,10 @@ CONFIG_NETDEV_1000=y | |||
528 | # CONFIG_VIA_VELOCITY is not set | 557 | # CONFIG_VIA_VELOCITY is not set |
529 | # CONFIG_TIGON3 is not set | 558 | # CONFIG_TIGON3 is not set |
530 | # CONFIG_BNX2 is not set | 559 | # CONFIG_BNX2 is not set |
560 | # CONFIG_CNIC is not set | ||
531 | CONFIG_FSL_PQ_MDIO=y | 561 | CONFIG_FSL_PQ_MDIO=y |
532 | CONFIG_GIANFAR=y | 562 | CONFIG_GIANFAR=y |
563 | # CONFIG_MV643XX_ETH is not set | ||
533 | # CONFIG_QLA3XXX is not set | 564 | # CONFIG_QLA3XXX is not set |
534 | # CONFIG_ATL1 is not set | 565 | # CONFIG_ATL1 is not set |
535 | # CONFIG_ATL1E is not set | 566 | # CONFIG_ATL1E is not set |
@@ -688,13 +719,17 @@ CONFIG_I2C_MPC=y | |||
688 | # CONFIG_SENSORS_PCF8574 is not set | 719 | # CONFIG_SENSORS_PCF8574 is not set |
689 | # CONFIG_PCF8575 is not set | 720 | # CONFIG_PCF8575 is not set |
690 | # CONFIG_SENSORS_PCA9539 is not set | 721 | # CONFIG_SENSORS_PCA9539 is not set |
691 | # CONFIG_SENSORS_MAX6875 is not set | ||
692 | # CONFIG_SENSORS_TSL2550 is not set | 722 | # CONFIG_SENSORS_TSL2550 is not set |
693 | # CONFIG_I2C_DEBUG_CORE is not set | 723 | # CONFIG_I2C_DEBUG_CORE is not set |
694 | # CONFIG_I2C_DEBUG_ALGO is not set | 724 | # CONFIG_I2C_DEBUG_ALGO is not set |
695 | # CONFIG_I2C_DEBUG_BUS is not set | 725 | # CONFIG_I2C_DEBUG_BUS is not set |
696 | # CONFIG_I2C_DEBUG_CHIP is not set | 726 | # CONFIG_I2C_DEBUG_CHIP is not set |
697 | # CONFIG_SPI is not set | 727 | # CONFIG_SPI is not set |
728 | |||
729 | # | ||
730 | # PPS support | ||
731 | # | ||
732 | # CONFIG_PPS is not set | ||
698 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 733 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
699 | # CONFIG_GPIOLIB is not set | 734 | # CONFIG_GPIOLIB is not set |
700 | # CONFIG_W1 is not set | 735 | # CONFIG_W1 is not set |
@@ -749,6 +784,7 @@ CONFIG_HWMON=y | |||
749 | # CONFIG_SENSORS_SMSC47B397 is not set | 784 | # CONFIG_SENSORS_SMSC47B397 is not set |
750 | # CONFIG_SENSORS_ADS7828 is not set | 785 | # CONFIG_SENSORS_ADS7828 is not set |
751 | # CONFIG_SENSORS_THMC50 is not set | 786 | # CONFIG_SENSORS_THMC50 is not set |
787 | # CONFIG_SENSORS_TMP401 is not set | ||
752 | # CONFIG_SENSORS_VIA686A is not set | 788 | # CONFIG_SENSORS_VIA686A is not set |
753 | # CONFIG_SENSORS_VT1211 is not set | 789 | # CONFIG_SENSORS_VT1211 is not set |
754 | # CONFIG_SENSORS_VT8231 is not set | 790 | # CONFIG_SENSORS_VT8231 is not set |
@@ -797,23 +833,9 @@ CONFIG_SSB_POSSIBLE=y | |||
797 | # CONFIG_MFD_WM8400 is not set | 833 | # CONFIG_MFD_WM8400 is not set |
798 | # CONFIG_MFD_WM8350_I2C is not set | 834 | # CONFIG_MFD_WM8350_I2C is not set |
799 | # CONFIG_MFD_PCF50633 is not set | 835 | # CONFIG_MFD_PCF50633 is not set |
836 | # CONFIG_AB3100_CORE is not set | ||
800 | # CONFIG_REGULATOR is not set | 837 | # CONFIG_REGULATOR is not set |
801 | 838 | # CONFIG_MEDIA_SUPPORT is not set | |
802 | # | ||
803 | # Multimedia devices | ||
804 | # | ||
805 | |||
806 | # | ||
807 | # Multimedia core support | ||
808 | # | ||
809 | # CONFIG_VIDEO_DEV is not set | ||
810 | # CONFIG_DVB_CORE is not set | ||
811 | # CONFIG_VIDEO_MEDIA is not set | ||
812 | |||
813 | # | ||
814 | # Multimedia drivers | ||
815 | # | ||
816 | # CONFIG_DAB is not set | ||
817 | 839 | ||
818 | # | 840 | # |
819 | # Graphics support | 841 | # Graphics support |
@@ -851,6 +873,10 @@ CONFIG_HID=y | |||
851 | # CONFIG_DMADEVICES is not set | 873 | # CONFIG_DMADEVICES is not set |
852 | # CONFIG_AUXDISPLAY is not set | 874 | # CONFIG_AUXDISPLAY is not set |
853 | # CONFIG_UIO is not set | 875 | # CONFIG_UIO is not set |
876 | |||
877 | # | ||
878 | # TI VLYNQ | ||
879 | # | ||
854 | # CONFIG_STAGING is not set | 880 | # CONFIG_STAGING is not set |
855 | 881 | ||
856 | # | 882 | # |
@@ -862,10 +888,12 @@ CONFIG_HID=y | |||
862 | # CONFIG_REISERFS_FS is not set | 888 | # CONFIG_REISERFS_FS is not set |
863 | # CONFIG_JFS_FS is not set | 889 | # CONFIG_JFS_FS is not set |
864 | # CONFIG_FS_POSIX_ACL is not set | 890 | # CONFIG_FS_POSIX_ACL is not set |
865 | CONFIG_FILE_LOCKING=y | ||
866 | # CONFIG_XFS_FS is not set | 891 | # CONFIG_XFS_FS is not set |
892 | # CONFIG_GFS2_FS is not set | ||
867 | # CONFIG_OCFS2_FS is not set | 893 | # CONFIG_OCFS2_FS is not set |
868 | # CONFIG_BTRFS_FS is not set | 894 | # CONFIG_BTRFS_FS is not set |
895 | CONFIG_FILE_LOCKING=y | ||
896 | CONFIG_FSNOTIFY=y | ||
869 | CONFIG_DNOTIFY=y | 897 | CONFIG_DNOTIFY=y |
870 | CONFIG_INOTIFY=y | 898 | CONFIG_INOTIFY=y |
871 | CONFIG_INOTIFY_USER=y | 899 | CONFIG_INOTIFY_USER=y |
@@ -928,6 +956,7 @@ CONFIG_NFS_FS=y | |||
928 | CONFIG_NFS_V3=y | 956 | CONFIG_NFS_V3=y |
929 | # CONFIG_NFS_V3_ACL is not set | 957 | # CONFIG_NFS_V3_ACL is not set |
930 | CONFIG_NFS_V4=y | 958 | CONFIG_NFS_V4=y |
959 | # CONFIG_NFS_V4_1 is not set | ||
931 | CONFIG_ROOT_NFS=y | 960 | CONFIG_ROOT_NFS=y |
932 | # CONFIG_NFSD is not set | 961 | # CONFIG_NFSD is not set |
933 | CONFIG_LOCKD=y | 962 | CONFIG_LOCKD=y |
@@ -971,6 +1000,7 @@ CONFIG_HAS_IOPORT=y | |||
971 | CONFIG_HAS_DMA=y | 1000 | CONFIG_HAS_DMA=y |
972 | CONFIG_HAVE_LMB=y | 1001 | CONFIG_HAVE_LMB=y |
973 | CONFIG_NLATTR=y | 1002 | CONFIG_NLATTR=y |
1003 | CONFIG_GENERIC_ATOMIC64=y | ||
974 | 1004 | ||
975 | # | 1005 | # |
976 | # Kernel hacking | 1006 | # Kernel hacking |
@@ -994,22 +1024,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
994 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1024 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
995 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1025 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
996 | CONFIG_TRACING_SUPPORT=y | 1026 | CONFIG_TRACING_SUPPORT=y |
997 | 1027 | # CONFIG_FTRACE is not set | |
998 | # | ||
999 | # Tracers | ||
1000 | # | ||
1001 | # CONFIG_FUNCTION_TRACER is not set | ||
1002 | # CONFIG_SCHED_TRACER is not set | ||
1003 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1004 | # CONFIG_EVENT_TRACER is not set | ||
1005 | # CONFIG_BOOT_TRACER is not set | ||
1006 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1007 | # CONFIG_STACK_TRACER is not set | ||
1008 | # CONFIG_KMEMTRACE is not set | ||
1009 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1010 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1011 | # CONFIG_SAMPLES is not set | 1028 | # CONFIG_SAMPLES is not set |
1012 | CONFIG_HAVE_ARCH_KGDB=y | 1029 | CONFIG_HAVE_ARCH_KGDB=y |
1030 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1031 | CONFIG_PPC_WERROR=y | ||
1013 | CONFIG_PRINT_STACK_DEPTH=64 | 1032 | CONFIG_PRINT_STACK_DEPTH=64 |
1014 | # CONFIG_IRQSTACKS is not set | 1033 | # CONFIG_IRQSTACKS is not set |
1015 | # CONFIG_BOOTX_TEXT is not set | 1034 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index 09146ddaa3ca..ff04e1028f5e 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:16 2009 | 4 | # Wed Jul 29 23:32:14 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -57,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
57 | # CONFIG_GENERIC_TBSYNC is not set | 58 | # CONFIG_GENERIC_TBSYNC is not set |
58 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
59 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
60 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
61 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
62 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
65 | 68 | ||
66 | # | 69 | # |
67 | # General setup | 70 | # General setup |
@@ -108,7 +111,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
108 | CONFIG_KALLSYMS=y | 111 | CONFIG_KALLSYMS=y |
109 | # CONFIG_KALLSYMS_ALL is not set | 112 | # CONFIG_KALLSYMS_ALL is not set |
110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 113 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
111 | # CONFIG_STRIP_ASM_SYMS is not set | ||
112 | CONFIG_HOTPLUG=y | 114 | CONFIG_HOTPLUG=y |
113 | CONFIG_PRINTK=y | 115 | CONFIG_PRINTK=y |
114 | CONFIG_BUG=y | 116 | CONFIG_BUG=y |
@@ -121,8 +123,15 @@ CONFIG_TIMERFD=y | |||
121 | CONFIG_EVENTFD=y | 123 | CONFIG_EVENTFD=y |
122 | CONFIG_SHMEM=y | 124 | CONFIG_SHMEM=y |
123 | CONFIG_AIO=y | 125 | CONFIG_AIO=y |
126 | CONFIG_HAVE_PERF_COUNTERS=y | ||
127 | |||
128 | # | ||
129 | # Performance Counters | ||
130 | # | ||
131 | # CONFIG_PERF_COUNTERS is not set | ||
124 | CONFIG_VM_EVENT_COUNTERS=y | 132 | CONFIG_VM_EVENT_COUNTERS=y |
125 | CONFIG_SLUB_DEBUG=y | 133 | CONFIG_SLUB_DEBUG=y |
134 | # CONFIG_STRIP_ASM_SYMS is not set | ||
126 | CONFIG_COMPAT_BRK=y | 135 | CONFIG_COMPAT_BRK=y |
127 | # CONFIG_SLAB is not set | 136 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | 137 | CONFIG_SLUB=y |
@@ -136,6 +145,11 @@ CONFIG_HAVE_KPROBES=y | |||
136 | CONFIG_HAVE_KRETPROBES=y | 145 | CONFIG_HAVE_KRETPROBES=y |
137 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 146 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
138 | CONFIG_HAVE_CLK=y | 147 | CONFIG_HAVE_CLK=y |
148 | |||
149 | # | ||
150 | # GCOV-based kernel profiling | ||
151 | # | ||
152 | # CONFIG_GCOV_KERNEL is not set | ||
139 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
140 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
141 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -143,7 +157,7 @@ CONFIG_RT_MUTEXES=y | |||
143 | CONFIG_BASE_SMALL=0 | 157 | CONFIG_BASE_SMALL=0 |
144 | # CONFIG_MODULES is not set | 158 | # CONFIG_MODULES is not set |
145 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
146 | # CONFIG_LBD is not set | 160 | CONFIG_LBDAF=y |
147 | # CONFIG_BLK_DEV_BSG is not set | 161 | # CONFIG_BLK_DEV_BSG is not set |
148 | # CONFIG_BLK_DEV_INTEGRITY is not set | 162 | # CONFIG_BLK_DEV_INTEGRITY is not set |
149 | 163 | ||
@@ -176,6 +190,7 @@ CONFIG_MPC85xx=y | |||
176 | # CONFIG_MPC85xx_DS is not set | 190 | # CONFIG_MPC85xx_DS is not set |
177 | # CONFIG_SOCRATES is not set | 191 | # CONFIG_SOCRATES is not set |
178 | CONFIG_KSI8560=y | 192 | CONFIG_KSI8560=y |
193 | # CONFIG_XES_MPC85xx is not set | ||
179 | # CONFIG_STX_GP3 is not set | 194 | # CONFIG_STX_GP3 is not set |
180 | # CONFIG_TQM8540 is not set | 195 | # CONFIG_TQM8540 is not set |
181 | # CONFIG_TQM8541 is not set | 196 | # CONFIG_TQM8541 is not set |
@@ -224,6 +239,7 @@ CONFIG_BINFMT_ELF=y | |||
224 | CONFIG_BINFMT_MISC=y | 239 | CONFIG_BINFMT_MISC=y |
225 | CONFIG_MATH_EMULATION=y | 240 | CONFIG_MATH_EMULATION=y |
226 | # CONFIG_IOMMU_HELPER is not set | 241 | # CONFIG_IOMMU_HELPER is not set |
242 | # CONFIG_SWIOTLB is not set | ||
227 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 243 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
228 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 244 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
229 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 245 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -242,9 +258,9 @@ CONFIG_MIGRATION=y | |||
242 | CONFIG_ZONE_DMA_FLAG=1 | 258 | CONFIG_ZONE_DMA_FLAG=1 |
243 | CONFIG_BOUNCE=y | 259 | CONFIG_BOUNCE=y |
244 | CONFIG_VIRT_TO_BUS=y | 260 | CONFIG_VIRT_TO_BUS=y |
245 | CONFIG_UNEVICTABLE_LRU=y | ||
246 | CONFIG_HAVE_MLOCK=y | 261 | CONFIG_HAVE_MLOCK=y |
247 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 262 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
263 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
248 | CONFIG_PPC_4K_PAGES=y | 264 | CONFIG_PPC_4K_PAGES=y |
249 | # CONFIG_PPC_16K_PAGES is not set | 265 | # CONFIG_PPC_16K_PAGES is not set |
250 | # CONFIG_PPC_64K_PAGES is not set | 266 | # CONFIG_PPC_64K_PAGES is not set |
@@ -346,6 +362,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
346 | # CONFIG_ECONET is not set | 362 | # CONFIG_ECONET is not set |
347 | # CONFIG_WAN_ROUTER is not set | 363 | # CONFIG_WAN_ROUTER is not set |
348 | # CONFIG_PHONET is not set | 364 | # CONFIG_PHONET is not set |
365 | # CONFIG_IEEE802154 is not set | ||
349 | # CONFIG_NET_SCHED is not set | 366 | # CONFIG_NET_SCHED is not set |
350 | # CONFIG_DCB is not set | 367 | # CONFIG_DCB is not set |
351 | 368 | ||
@@ -363,7 +380,11 @@ CONFIG_WIRELESS=y | |||
363 | CONFIG_WIRELESS_OLD_REGULATORY=y | 380 | CONFIG_WIRELESS_OLD_REGULATORY=y |
364 | # CONFIG_WIRELESS_EXT is not set | 381 | # CONFIG_WIRELESS_EXT is not set |
365 | # CONFIG_LIB80211 is not set | 382 | # CONFIG_LIB80211 is not set |
366 | # CONFIG_MAC80211 is not set | 383 | |
384 | # | ||
385 | # CFG80211 needs to be enabled for MAC80211 | ||
386 | # | ||
387 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
367 | # CONFIG_WIMAX is not set | 388 | # CONFIG_WIMAX is not set |
368 | # CONFIG_RFKILL is not set | 389 | # CONFIG_RFKILL is not set |
369 | # CONFIG_NET_9P is not set | 390 | # CONFIG_NET_9P is not set |
@@ -466,6 +487,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
466 | # CONFIG_MTD_UBI is not set | 487 | # CONFIG_MTD_UBI is not set |
467 | CONFIG_OF_DEVICE=y | 488 | CONFIG_OF_DEVICE=y |
468 | CONFIG_OF_GPIO=y | 489 | CONFIG_OF_GPIO=y |
490 | CONFIG_OF_MDIO=y | ||
469 | # CONFIG_PARPORT is not set | 491 | # CONFIG_PARPORT is not set |
470 | CONFIG_BLK_DEV=y | 492 | CONFIG_BLK_DEV=y |
471 | # CONFIG_BLK_DEV_FD is not set | 493 | # CONFIG_BLK_DEV_FD is not set |
@@ -520,7 +542,6 @@ CONFIG_IDE_PROC_FS=y | |||
520 | # CONFIG_MD is not set | 542 | # CONFIG_MD is not set |
521 | # CONFIG_MACINTOSH_DRIVERS is not set | 543 | # CONFIG_MACINTOSH_DRIVERS is not set |
522 | CONFIG_NETDEVICES=y | 544 | CONFIG_NETDEVICES=y |
523 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
524 | # CONFIG_DUMMY is not set | 545 | # CONFIG_DUMMY is not set |
525 | # CONFIG_BONDING is not set | 546 | # CONFIG_BONDING is not set |
526 | # CONFIG_MACVLAN is not set | 547 | # CONFIG_MACVLAN is not set |
@@ -560,6 +581,7 @@ CONFIG_MII=y | |||
560 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 581 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
561 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 582 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
562 | # CONFIG_B44 is not set | 583 | # CONFIG_B44 is not set |
584 | # CONFIG_KS8842 is not set | ||
563 | CONFIG_FS_ENET=y | 585 | CONFIG_FS_ENET=y |
564 | # CONFIG_FS_ENET_HAS_SCC is not set | 586 | # CONFIG_FS_ENET_HAS_SCC is not set |
565 | CONFIG_FS_ENET_HAS_FCC=y | 587 | CONFIG_FS_ENET_HAS_FCC=y |
@@ -567,6 +589,7 @@ CONFIG_FS_ENET_MDIO_FCC=y | |||
567 | CONFIG_NETDEV_1000=y | 589 | CONFIG_NETDEV_1000=y |
568 | CONFIG_FSL_PQ_MDIO=y | 590 | CONFIG_FSL_PQ_MDIO=y |
569 | CONFIG_GIANFAR=y | 591 | CONFIG_GIANFAR=y |
592 | # CONFIG_MV643XX_ETH is not set | ||
570 | CONFIG_NETDEV_10000=y | 593 | CONFIG_NETDEV_10000=y |
571 | 594 | ||
572 | # | 595 | # |
@@ -654,6 +677,11 @@ CONFIG_GEN_RTC=y | |||
654 | # CONFIG_TCG_TPM is not set | 677 | # CONFIG_TCG_TPM is not set |
655 | # CONFIG_I2C is not set | 678 | # CONFIG_I2C is not set |
656 | # CONFIG_SPI is not set | 679 | # CONFIG_SPI is not set |
680 | |||
681 | # | ||
682 | # PPS support | ||
683 | # | ||
684 | # CONFIG_PPS is not set | ||
657 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 685 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
658 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 686 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
659 | CONFIG_GPIOLIB=y | 687 | CONFIG_GPIOLIB=y |
@@ -710,22 +738,7 @@ CONFIG_SSB_POSSIBLE=y | |||
710 | # CONFIG_HTC_PASIC3 is not set | 738 | # CONFIG_HTC_PASIC3 is not set |
711 | # CONFIG_MFD_TMIO is not set | 739 | # CONFIG_MFD_TMIO is not set |
712 | # CONFIG_REGULATOR is not set | 740 | # CONFIG_REGULATOR is not set |
713 | 741 | # CONFIG_MEDIA_SUPPORT is not set | |
714 | # | ||
715 | # Multimedia devices | ||
716 | # | ||
717 | |||
718 | # | ||
719 | # Multimedia core support | ||
720 | # | ||
721 | # CONFIG_VIDEO_DEV is not set | ||
722 | # CONFIG_DVB_CORE is not set | ||
723 | # CONFIG_VIDEO_MEDIA is not set | ||
724 | |||
725 | # | ||
726 | # Multimedia drivers | ||
727 | # | ||
728 | CONFIG_DAB=y | ||
729 | 742 | ||
730 | # | 743 | # |
731 | # Graphics support | 744 | # Graphics support |
@@ -777,6 +790,10 @@ CONFIG_USB_SUPPORT=y | |||
777 | # CONFIG_DMADEVICES is not set | 790 | # CONFIG_DMADEVICES is not set |
778 | # CONFIG_AUXDISPLAY is not set | 791 | # CONFIG_AUXDISPLAY is not set |
779 | # CONFIG_UIO is not set | 792 | # CONFIG_UIO is not set |
793 | |||
794 | # | ||
795 | # TI VLYNQ | ||
796 | # | ||
780 | # CONFIG_STAGING is not set | 797 | # CONFIG_STAGING is not set |
781 | 798 | ||
782 | # | 799 | # |
@@ -797,10 +814,12 @@ CONFIG_FS_MBCACHE=y | |||
797 | # CONFIG_REISERFS_FS is not set | 814 | # CONFIG_REISERFS_FS is not set |
798 | # CONFIG_JFS_FS is not set | 815 | # CONFIG_JFS_FS is not set |
799 | # CONFIG_FS_POSIX_ACL is not set | 816 | # CONFIG_FS_POSIX_ACL is not set |
800 | CONFIG_FILE_LOCKING=y | ||
801 | # CONFIG_XFS_FS is not set | 817 | # CONFIG_XFS_FS is not set |
818 | # CONFIG_GFS2_FS is not set | ||
802 | # CONFIG_OCFS2_FS is not set | 819 | # CONFIG_OCFS2_FS is not set |
803 | # CONFIG_BTRFS_FS is not set | 820 | # CONFIG_BTRFS_FS is not set |
821 | CONFIG_FILE_LOCKING=y | ||
822 | CONFIG_FSNOTIFY=y | ||
804 | CONFIG_DNOTIFY=y | 823 | CONFIG_DNOTIFY=y |
805 | CONFIG_INOTIFY=y | 824 | CONFIG_INOTIFY=y |
806 | CONFIG_INOTIFY_USER=y | 825 | CONFIG_INOTIFY_USER=y |
@@ -916,6 +935,7 @@ CONFIG_HAS_IOPORT=y | |||
916 | CONFIG_HAS_DMA=y | 935 | CONFIG_HAS_DMA=y |
917 | CONFIG_HAVE_LMB=y | 936 | CONFIG_HAVE_LMB=y |
918 | CONFIG_NLATTR=y | 937 | CONFIG_NLATTR=y |
938 | CONFIG_GENERIC_ATOMIC64=y | ||
919 | 939 | ||
920 | # | 940 | # |
921 | # Kernel hacking | 941 | # Kernel hacking |
@@ -946,6 +966,9 @@ CONFIG_SCHED_DEBUG=y | |||
946 | # CONFIG_RT_MUTEX_TESTER is not set | 966 | # CONFIG_RT_MUTEX_TESTER is not set |
947 | # CONFIG_DEBUG_SPINLOCK is not set | 967 | # CONFIG_DEBUG_SPINLOCK is not set |
948 | CONFIG_DEBUG_MUTEXES=y | 968 | CONFIG_DEBUG_MUTEXES=y |
969 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
970 | # CONFIG_PROVE_LOCKING is not set | ||
971 | # CONFIG_LOCK_STAT is not set | ||
949 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 972 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
950 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 973 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
951 | # CONFIG_DEBUG_KOBJECT is not set | 974 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -958,7 +981,6 @@ CONFIG_DEBUG_MUTEXES=y | |||
958 | # CONFIG_DEBUG_LIST is not set | 981 | # CONFIG_DEBUG_LIST is not set |
959 | # CONFIG_DEBUG_SG is not set | 982 | # CONFIG_DEBUG_SG is not set |
960 | # CONFIG_DEBUG_NOTIFIERS is not set | 983 | # CONFIG_DEBUG_NOTIFIERS is not set |
961 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
962 | # CONFIG_RCU_TORTURE_TEST is not set | 984 | # CONFIG_RCU_TORTURE_TEST is not set |
963 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 985 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
964 | # CONFIG_BACKTRACE_SELF_TEST is not set | 986 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -972,16 +994,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
972 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 994 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
973 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 995 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
974 | CONFIG_TRACING_SUPPORT=y | 996 | CONFIG_TRACING_SUPPORT=y |
975 | 997 | CONFIG_FTRACE=y | |
976 | # | ||
977 | # Tracers | ||
978 | # | ||
979 | # CONFIG_FUNCTION_TRACER is not set | 998 | # CONFIG_FUNCTION_TRACER is not set |
999 | # CONFIG_IRQSOFF_TRACER is not set | ||
980 | # CONFIG_SCHED_TRACER is not set | 1000 | # CONFIG_SCHED_TRACER is not set |
981 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1001 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
982 | # CONFIG_EVENT_TRACER is not set | ||
983 | # CONFIG_BOOT_TRACER is not set | 1002 | # CONFIG_BOOT_TRACER is not set |
984 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1003 | CONFIG_BRANCH_PROFILE_NONE=y |
1004 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1005 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
985 | # CONFIG_STACK_TRACER is not set | 1006 | # CONFIG_STACK_TRACER is not set |
986 | # CONFIG_KMEMTRACE is not set | 1007 | # CONFIG_KMEMTRACE is not set |
987 | # CONFIG_WORKQUEUE_TRACER is not set | 1008 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -990,9 +1011,13 @@ CONFIG_TRACING_SUPPORT=y | |||
990 | # CONFIG_SAMPLES is not set | 1011 | # CONFIG_SAMPLES is not set |
991 | CONFIG_HAVE_ARCH_KGDB=y | 1012 | CONFIG_HAVE_ARCH_KGDB=y |
992 | # CONFIG_KGDB is not set | 1013 | # CONFIG_KGDB is not set |
1014 | # CONFIG_KMEMCHECK is not set | ||
1015 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1016 | CONFIG_PPC_WERROR=y | ||
993 | CONFIG_PRINT_STACK_DEPTH=64 | 1017 | CONFIG_PRINT_STACK_DEPTH=64 |
994 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1018 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
995 | # CONFIG_DEBUG_STACK_USAGE is not set | 1019 | # CONFIG_DEBUG_STACK_USAGE is not set |
1020 | # CONFIG_PPC_EMULATED_STATS is not set | ||
996 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1021 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
997 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1022 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
998 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1023 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig index 7b43be7586b6..fb10cc83702e 100644 --- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8540_ads_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:17 2009 | 4 | # Wed Jul 29 23:32:15 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
48 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -56,11 +57,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
57 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
64 | 67 | ||
65 | # | 68 | # |
66 | # General setup | 69 | # General setup |
@@ -111,7 +114,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
111 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
112 | # CONFIG_KALLSYMS_ALL is not set | 115 | # CONFIG_KALLSYMS_ALL is not set |
113 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 116 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
114 | # CONFIG_STRIP_ASM_SYMS is not set | ||
115 | CONFIG_HOTPLUG=y | 117 | CONFIG_HOTPLUG=y |
116 | CONFIG_PRINTK=y | 118 | CONFIG_PRINTK=y |
117 | CONFIG_BUG=y | 119 | CONFIG_BUG=y |
@@ -124,8 +126,15 @@ CONFIG_TIMERFD=y | |||
124 | CONFIG_EVENTFD=y | 126 | CONFIG_EVENTFD=y |
125 | CONFIG_SHMEM=y | 127 | CONFIG_SHMEM=y |
126 | CONFIG_AIO=y | 128 | CONFIG_AIO=y |
129 | CONFIG_HAVE_PERF_COUNTERS=y | ||
130 | |||
131 | # | ||
132 | # Performance Counters | ||
133 | # | ||
134 | # CONFIG_PERF_COUNTERS is not set | ||
127 | CONFIG_VM_EVENT_COUNTERS=y | 135 | CONFIG_VM_EVENT_COUNTERS=y |
128 | CONFIG_SLUB_DEBUG=y | 136 | CONFIG_SLUB_DEBUG=y |
137 | # CONFIG_STRIP_ASM_SYMS is not set | ||
129 | CONFIG_COMPAT_BRK=y | 138 | CONFIG_COMPAT_BRK=y |
130 | # CONFIG_SLAB is not set | 139 | # CONFIG_SLAB is not set |
131 | CONFIG_SLUB=y | 140 | CONFIG_SLUB=y |
@@ -138,6 +147,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
138 | CONFIG_HAVE_KPROBES=y | 147 | CONFIG_HAVE_KPROBES=y |
139 | CONFIG_HAVE_KRETPROBES=y | 148 | CONFIG_HAVE_KRETPROBES=y |
140 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 149 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
150 | |||
151 | # | ||
152 | # GCOV-based kernel profiling | ||
153 | # | ||
141 | # CONFIG_SLOW_WORK is not set | 154 | # CONFIG_SLOW_WORK is not set |
142 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 155 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
143 | CONFIG_SLABINFO=y | 156 | CONFIG_SLABINFO=y |
@@ -145,7 +158,7 @@ CONFIG_RT_MUTEXES=y | |||
145 | CONFIG_BASE_SMALL=0 | 158 | CONFIG_BASE_SMALL=0 |
146 | # CONFIG_MODULES is not set | 159 | # CONFIG_MODULES is not set |
147 | CONFIG_BLOCK=y | 160 | CONFIG_BLOCK=y |
148 | # CONFIG_LBD is not set | 161 | CONFIG_LBDAF=y |
149 | # CONFIG_BLK_DEV_BSG is not set | 162 | # CONFIG_BLK_DEV_BSG is not set |
150 | # CONFIG_BLK_DEV_INTEGRITY is not set | 163 | # CONFIG_BLK_DEV_INTEGRITY is not set |
151 | 164 | ||
@@ -178,6 +191,7 @@ CONFIG_MPC8540_ADS=y | |||
178 | # CONFIG_MPC85xx_DS is not set | 191 | # CONFIG_MPC85xx_DS is not set |
179 | # CONFIG_SOCRATES is not set | 192 | # CONFIG_SOCRATES is not set |
180 | # CONFIG_KSI8560 is not set | 193 | # CONFIG_KSI8560 is not set |
194 | # CONFIG_XES_MPC85xx is not set | ||
181 | # CONFIG_STX_GP3 is not set | 195 | # CONFIG_STX_GP3 is not set |
182 | # CONFIG_TQM8540 is not set | 196 | # CONFIG_TQM8540 is not set |
183 | # CONFIG_TQM8541 is not set | 197 | # CONFIG_TQM8541 is not set |
@@ -226,6 +240,7 @@ CONFIG_BINFMT_ELF=y | |||
226 | CONFIG_BINFMT_MISC=y | 240 | CONFIG_BINFMT_MISC=y |
227 | CONFIG_MATH_EMULATION=y | 241 | CONFIG_MATH_EMULATION=y |
228 | # CONFIG_IOMMU_HELPER is not set | 242 | # CONFIG_IOMMU_HELPER is not set |
243 | # CONFIG_SWIOTLB is not set | ||
229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 244 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
230 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 245 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 246 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -244,9 +259,9 @@ CONFIG_MIGRATION=y | |||
244 | CONFIG_ZONE_DMA_FLAG=1 | 259 | CONFIG_ZONE_DMA_FLAG=1 |
245 | CONFIG_BOUNCE=y | 260 | CONFIG_BOUNCE=y |
246 | CONFIG_VIRT_TO_BUS=y | 261 | CONFIG_VIRT_TO_BUS=y |
247 | CONFIG_UNEVICTABLE_LRU=y | ||
248 | CONFIG_HAVE_MLOCK=y | 262 | CONFIG_HAVE_MLOCK=y |
249 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 263 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
264 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
250 | CONFIG_PPC_4K_PAGES=y | 265 | CONFIG_PPC_4K_PAGES=y |
251 | # CONFIG_PPC_16K_PAGES is not set | 266 | # CONFIG_PPC_16K_PAGES is not set |
252 | # CONFIG_PPC_64K_PAGES is not set | 267 | # CONFIG_PPC_64K_PAGES is not set |
@@ -348,6 +363,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
348 | # CONFIG_ECONET is not set | 363 | # CONFIG_ECONET is not set |
349 | # CONFIG_WAN_ROUTER is not set | 364 | # CONFIG_WAN_ROUTER is not set |
350 | # CONFIG_PHONET is not set | 365 | # CONFIG_PHONET is not set |
366 | # CONFIG_IEEE802154 is not set | ||
351 | # CONFIG_NET_SCHED is not set | 367 | # CONFIG_NET_SCHED is not set |
352 | # CONFIG_DCB is not set | 368 | # CONFIG_DCB is not set |
353 | 369 | ||
@@ -365,7 +381,11 @@ CONFIG_WIRELESS=y | |||
365 | CONFIG_WIRELESS_OLD_REGULATORY=y | 381 | CONFIG_WIRELESS_OLD_REGULATORY=y |
366 | # CONFIG_WIRELESS_EXT is not set | 382 | # CONFIG_WIRELESS_EXT is not set |
367 | # CONFIG_LIB80211 is not set | 383 | # CONFIG_LIB80211 is not set |
368 | # CONFIG_MAC80211 is not set | 384 | |
385 | # | ||
386 | # CFG80211 needs to be enabled for MAC80211 | ||
387 | # | ||
388 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
369 | # CONFIG_WIMAX is not set | 389 | # CONFIG_WIMAX is not set |
370 | # CONFIG_RFKILL is not set | 390 | # CONFIG_RFKILL is not set |
371 | # CONFIG_NET_9P is not set | 391 | # CONFIG_NET_9P is not set |
@@ -387,6 +407,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
387 | # CONFIG_CONNECTOR is not set | 407 | # CONFIG_CONNECTOR is not set |
388 | # CONFIG_MTD is not set | 408 | # CONFIG_MTD is not set |
389 | CONFIG_OF_DEVICE=y | 409 | CONFIG_OF_DEVICE=y |
410 | CONFIG_OF_MDIO=y | ||
390 | # CONFIG_PARPORT is not set | 411 | # CONFIG_PARPORT is not set |
391 | CONFIG_BLK_DEV=y | 412 | CONFIG_BLK_DEV=y |
392 | # CONFIG_BLK_DEV_FD is not set | 413 | # CONFIG_BLK_DEV_FD is not set |
@@ -423,7 +444,6 @@ CONFIG_HAVE_IDE=y | |||
423 | # CONFIG_MD is not set | 444 | # CONFIG_MD is not set |
424 | # CONFIG_MACINTOSH_DRIVERS is not set | 445 | # CONFIG_MACINTOSH_DRIVERS is not set |
425 | CONFIG_NETDEVICES=y | 446 | CONFIG_NETDEVICES=y |
426 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
427 | # CONFIG_DUMMY is not set | 447 | # CONFIG_DUMMY is not set |
428 | # CONFIG_BONDING is not set | 448 | # CONFIG_BONDING is not set |
429 | # CONFIG_MACVLAN is not set | 449 | # CONFIG_MACVLAN is not set |
@@ -462,9 +482,11 @@ CONFIG_MII=y | |||
462 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 482 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
463 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 483 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
464 | # CONFIG_B44 is not set | 484 | # CONFIG_B44 is not set |
485 | # CONFIG_KS8842 is not set | ||
465 | CONFIG_NETDEV_1000=y | 486 | CONFIG_NETDEV_1000=y |
466 | CONFIG_FSL_PQ_MDIO=y | 487 | CONFIG_FSL_PQ_MDIO=y |
467 | CONFIG_GIANFAR=y | 488 | CONFIG_GIANFAR=y |
489 | # CONFIG_MV643XX_ETH is not set | ||
468 | CONFIG_NETDEV_10000=y | 490 | CONFIG_NETDEV_10000=y |
469 | 491 | ||
470 | # | 492 | # |
@@ -555,6 +577,11 @@ CONFIG_GEN_RTC=y | |||
555 | # CONFIG_TCG_TPM is not set | 577 | # CONFIG_TCG_TPM is not set |
556 | # CONFIG_I2C is not set | 578 | # CONFIG_I2C is not set |
557 | # CONFIG_SPI is not set | 579 | # CONFIG_SPI is not set |
580 | |||
581 | # | ||
582 | # PPS support | ||
583 | # | ||
584 | # CONFIG_PPS is not set | ||
558 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 585 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
559 | # CONFIG_GPIOLIB is not set | 586 | # CONFIG_GPIOLIB is not set |
560 | # CONFIG_W1 is not set | 587 | # CONFIG_W1 is not set |
@@ -590,22 +617,7 @@ CONFIG_SSB_POSSIBLE=y | |||
590 | # CONFIG_HTC_PASIC3 is not set | 617 | # CONFIG_HTC_PASIC3 is not set |
591 | # CONFIG_MFD_TMIO is not set | 618 | # CONFIG_MFD_TMIO is not set |
592 | # CONFIG_REGULATOR is not set | 619 | # CONFIG_REGULATOR is not set |
593 | 620 | # CONFIG_MEDIA_SUPPORT is not set | |
594 | # | ||
595 | # Multimedia devices | ||
596 | # | ||
597 | |||
598 | # | ||
599 | # Multimedia core support | ||
600 | # | ||
601 | # CONFIG_VIDEO_DEV is not set | ||
602 | # CONFIG_DVB_CORE is not set | ||
603 | # CONFIG_VIDEO_MEDIA is not set | ||
604 | |||
605 | # | ||
606 | # Multimedia drivers | ||
607 | # | ||
608 | CONFIG_DAB=y | ||
609 | 621 | ||
610 | # | 622 | # |
611 | # Graphics support | 623 | # Graphics support |
@@ -657,6 +669,10 @@ CONFIG_USB_SUPPORT=y | |||
657 | # CONFIG_DMADEVICES is not set | 669 | # CONFIG_DMADEVICES is not set |
658 | # CONFIG_AUXDISPLAY is not set | 670 | # CONFIG_AUXDISPLAY is not set |
659 | # CONFIG_UIO is not set | 671 | # CONFIG_UIO is not set |
672 | |||
673 | # | ||
674 | # TI VLYNQ | ||
675 | # | ||
660 | # CONFIG_STAGING is not set | 676 | # CONFIG_STAGING is not set |
661 | 677 | ||
662 | # | 678 | # |
@@ -676,10 +692,12 @@ CONFIG_FS_MBCACHE=y | |||
676 | # CONFIG_REISERFS_FS is not set | 692 | # CONFIG_REISERFS_FS is not set |
677 | # CONFIG_JFS_FS is not set | 693 | # CONFIG_JFS_FS is not set |
678 | # CONFIG_FS_POSIX_ACL is not set | 694 | # CONFIG_FS_POSIX_ACL is not set |
679 | CONFIG_FILE_LOCKING=y | ||
680 | # CONFIG_XFS_FS is not set | 695 | # CONFIG_XFS_FS is not set |
696 | # CONFIG_GFS2_FS is not set | ||
681 | # CONFIG_OCFS2_FS is not set | 697 | # CONFIG_OCFS2_FS is not set |
682 | # CONFIG_BTRFS_FS is not set | 698 | # CONFIG_BTRFS_FS is not set |
699 | CONFIG_FILE_LOCKING=y | ||
700 | CONFIG_FSNOTIFY=y | ||
683 | CONFIG_DNOTIFY=y | 701 | CONFIG_DNOTIFY=y |
684 | CONFIG_INOTIFY=y | 702 | CONFIG_INOTIFY=y |
685 | CONFIG_INOTIFY_USER=y | 703 | CONFIG_INOTIFY_USER=y |
@@ -794,6 +812,7 @@ CONFIG_HAS_IOPORT=y | |||
794 | CONFIG_HAS_DMA=y | 812 | CONFIG_HAS_DMA=y |
795 | CONFIG_HAVE_LMB=y | 813 | CONFIG_HAVE_LMB=y |
796 | CONFIG_NLATTR=y | 814 | CONFIG_NLATTR=y |
815 | CONFIG_GENERIC_ATOMIC64=y | ||
797 | 816 | ||
798 | # | 817 | # |
799 | # Kernel hacking | 818 | # Kernel hacking |
@@ -824,6 +843,9 @@ CONFIG_SCHED_DEBUG=y | |||
824 | # CONFIG_RT_MUTEX_TESTER is not set | 843 | # CONFIG_RT_MUTEX_TESTER is not set |
825 | # CONFIG_DEBUG_SPINLOCK is not set | 844 | # CONFIG_DEBUG_SPINLOCK is not set |
826 | CONFIG_DEBUG_MUTEXES=y | 845 | CONFIG_DEBUG_MUTEXES=y |
846 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
847 | # CONFIG_PROVE_LOCKING is not set | ||
848 | # CONFIG_LOCK_STAT is not set | ||
827 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 849 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
828 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 850 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
829 | # CONFIG_DEBUG_KOBJECT is not set | 851 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -835,7 +857,6 @@ CONFIG_DEBUG_MUTEXES=y | |||
835 | # CONFIG_DEBUG_LIST is not set | 857 | # CONFIG_DEBUG_LIST is not set |
836 | # CONFIG_DEBUG_SG is not set | 858 | # CONFIG_DEBUG_SG is not set |
837 | # CONFIG_DEBUG_NOTIFIERS is not set | 859 | # CONFIG_DEBUG_NOTIFIERS is not set |
838 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
839 | # CONFIG_RCU_TORTURE_TEST is not set | 860 | # CONFIG_RCU_TORTURE_TEST is not set |
840 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 861 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
841 | # CONFIG_BACKTRACE_SELF_TEST is not set | 862 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -849,16 +870,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
849 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 870 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
850 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 871 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
851 | CONFIG_TRACING_SUPPORT=y | 872 | CONFIG_TRACING_SUPPORT=y |
852 | 873 | CONFIG_FTRACE=y | |
853 | # | ||
854 | # Tracers | ||
855 | # | ||
856 | # CONFIG_FUNCTION_TRACER is not set | 874 | # CONFIG_FUNCTION_TRACER is not set |
875 | # CONFIG_IRQSOFF_TRACER is not set | ||
857 | # CONFIG_SCHED_TRACER is not set | 876 | # CONFIG_SCHED_TRACER is not set |
858 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 877 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
859 | # CONFIG_EVENT_TRACER is not set | ||
860 | # CONFIG_BOOT_TRACER is not set | 878 | # CONFIG_BOOT_TRACER is not set |
861 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 879 | CONFIG_BRANCH_PROFILE_NONE=y |
880 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
881 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
862 | # CONFIG_STACK_TRACER is not set | 882 | # CONFIG_STACK_TRACER is not set |
863 | # CONFIG_KMEMTRACE is not set | 883 | # CONFIG_KMEMTRACE is not set |
864 | # CONFIG_WORKQUEUE_TRACER is not set | 884 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -866,6 +886,9 @@ CONFIG_TRACING_SUPPORT=y | |||
866 | # CONFIG_SAMPLES is not set | 886 | # CONFIG_SAMPLES is not set |
867 | CONFIG_HAVE_ARCH_KGDB=y | 887 | CONFIG_HAVE_ARCH_KGDB=y |
868 | # CONFIG_KGDB is not set | 888 | # CONFIG_KGDB is not set |
889 | # CONFIG_KMEMCHECK is not set | ||
890 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
891 | CONFIG_PPC_WERROR=y | ||
869 | CONFIG_PRINT_STACK_DEPTH=64 | 892 | CONFIG_PRINT_STACK_DEPTH=64 |
870 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 893 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
871 | # CONFIG_DEBUG_STACK_USAGE is not set | 894 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig index 62adb71a5d4f..5c8ce6978825 100644 --- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8560_ads_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:17 2009 | 4 | # Wed Jul 29 23:32:16 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -57,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
57 | # CONFIG_GENERIC_TBSYNC is not set | 58 | # CONFIG_GENERIC_TBSYNC is not set |
58 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
59 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
60 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
61 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
62 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
65 | 68 | ||
66 | # | 69 | # |
67 | # General setup | 70 | # General setup |
@@ -112,7 +115,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
112 | CONFIG_KALLSYMS=y | 115 | CONFIG_KALLSYMS=y |
113 | # CONFIG_KALLSYMS_ALL is not set | 116 | # CONFIG_KALLSYMS_ALL is not set |
114 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 117 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
115 | # CONFIG_STRIP_ASM_SYMS is not set | ||
116 | CONFIG_HOTPLUG=y | 118 | CONFIG_HOTPLUG=y |
117 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
118 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
@@ -125,9 +127,16 @@ CONFIG_TIMERFD=y | |||
125 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
126 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
127 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_COUNTERS=y | ||
131 | |||
132 | # | ||
133 | # Performance Counters | ||
134 | # | ||
135 | # CONFIG_PERF_COUNTERS is not set | ||
128 | CONFIG_VM_EVENT_COUNTERS=y | 136 | CONFIG_VM_EVENT_COUNTERS=y |
129 | CONFIG_PCI_QUIRKS=y | 137 | CONFIG_PCI_QUIRKS=y |
130 | CONFIG_SLUB_DEBUG=y | 138 | CONFIG_SLUB_DEBUG=y |
139 | # CONFIG_STRIP_ASM_SYMS is not set | ||
131 | CONFIG_COMPAT_BRK=y | 140 | CONFIG_COMPAT_BRK=y |
132 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
133 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
@@ -141,6 +150,10 @@ CONFIG_HAVE_KPROBES=y | |||
141 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
142 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
143 | CONFIG_HAVE_CLK=y | 152 | CONFIG_HAVE_CLK=y |
153 | |||
154 | # | ||
155 | # GCOV-based kernel profiling | ||
156 | # | ||
144 | # CONFIG_SLOW_WORK is not set | 157 | # CONFIG_SLOW_WORK is not set |
145 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 158 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
146 | CONFIG_SLABINFO=y | 159 | CONFIG_SLABINFO=y |
@@ -148,7 +161,7 @@ CONFIG_RT_MUTEXES=y | |||
148 | CONFIG_BASE_SMALL=0 | 161 | CONFIG_BASE_SMALL=0 |
149 | # CONFIG_MODULES is not set | 162 | # CONFIG_MODULES is not set |
150 | CONFIG_BLOCK=y | 163 | CONFIG_BLOCK=y |
151 | # CONFIG_LBD is not set | 164 | CONFIG_LBDAF=y |
152 | # CONFIG_BLK_DEV_BSG is not set | 165 | # CONFIG_BLK_DEV_BSG is not set |
153 | # CONFIG_BLK_DEV_INTEGRITY is not set | 166 | # CONFIG_BLK_DEV_INTEGRITY is not set |
154 | 167 | ||
@@ -181,6 +194,7 @@ CONFIG_MPC8560_ADS=y | |||
181 | # CONFIG_MPC85xx_DS is not set | 194 | # CONFIG_MPC85xx_DS is not set |
182 | # CONFIG_SOCRATES is not set | 195 | # CONFIG_SOCRATES is not set |
183 | # CONFIG_KSI8560 is not set | 196 | # CONFIG_KSI8560 is not set |
197 | # CONFIG_XES_MPC85xx is not set | ||
184 | # CONFIG_STX_GP3 is not set | 198 | # CONFIG_STX_GP3 is not set |
185 | # CONFIG_TQM8540 is not set | 199 | # CONFIG_TQM8540 is not set |
186 | # CONFIG_TQM8541 is not set | 200 | # CONFIG_TQM8541 is not set |
@@ -229,6 +243,7 @@ CONFIG_BINFMT_ELF=y | |||
229 | CONFIG_BINFMT_MISC=y | 243 | CONFIG_BINFMT_MISC=y |
230 | CONFIG_MATH_EMULATION=y | 244 | CONFIG_MATH_EMULATION=y |
231 | # CONFIG_IOMMU_HELPER is not set | 245 | # CONFIG_IOMMU_HELPER is not set |
246 | # CONFIG_SWIOTLB is not set | ||
232 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 247 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
233 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 248 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
234 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 249 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -247,9 +262,9 @@ CONFIG_MIGRATION=y | |||
247 | CONFIG_ZONE_DMA_FLAG=1 | 262 | CONFIG_ZONE_DMA_FLAG=1 |
248 | CONFIG_BOUNCE=y | 263 | CONFIG_BOUNCE=y |
249 | CONFIG_VIRT_TO_BUS=y | 264 | CONFIG_VIRT_TO_BUS=y |
250 | CONFIG_UNEVICTABLE_LRU=y | ||
251 | CONFIG_HAVE_MLOCK=y | 265 | CONFIG_HAVE_MLOCK=y |
252 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 266 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
267 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
253 | CONFIG_PPC_4K_PAGES=y | 268 | CONFIG_PPC_4K_PAGES=y |
254 | # CONFIG_PPC_16K_PAGES is not set | 269 | # CONFIG_PPC_16K_PAGES is not set |
255 | # CONFIG_PPC_64K_PAGES is not set | 270 | # CONFIG_PPC_64K_PAGES is not set |
@@ -360,6 +375,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
360 | # CONFIG_ECONET is not set | 375 | # CONFIG_ECONET is not set |
361 | # CONFIG_WAN_ROUTER is not set | 376 | # CONFIG_WAN_ROUTER is not set |
362 | # CONFIG_PHONET is not set | 377 | # CONFIG_PHONET is not set |
378 | # CONFIG_IEEE802154 is not set | ||
363 | # CONFIG_NET_SCHED is not set | 379 | # CONFIG_NET_SCHED is not set |
364 | # CONFIG_DCB is not set | 380 | # CONFIG_DCB is not set |
365 | 381 | ||
@@ -377,7 +393,11 @@ CONFIG_WIRELESS=y | |||
377 | CONFIG_WIRELESS_OLD_REGULATORY=y | 393 | CONFIG_WIRELESS_OLD_REGULATORY=y |
378 | # CONFIG_WIRELESS_EXT is not set | 394 | # CONFIG_WIRELESS_EXT is not set |
379 | # CONFIG_LIB80211 is not set | 395 | # CONFIG_LIB80211 is not set |
380 | # CONFIG_MAC80211 is not set | 396 | |
397 | # | ||
398 | # CFG80211 needs to be enabled for MAC80211 | ||
399 | # | ||
400 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
381 | # CONFIG_WIMAX is not set | 401 | # CONFIG_WIMAX is not set |
382 | # CONFIG_RFKILL is not set | 402 | # CONFIG_RFKILL is not set |
383 | # CONFIG_NET_9P is not set | 403 | # CONFIG_NET_9P is not set |
@@ -400,6 +420,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
400 | # CONFIG_MTD is not set | 420 | # CONFIG_MTD is not set |
401 | CONFIG_OF_DEVICE=y | 421 | CONFIG_OF_DEVICE=y |
402 | CONFIG_OF_GPIO=y | 422 | CONFIG_OF_GPIO=y |
423 | CONFIG_OF_MDIO=y | ||
403 | # CONFIG_PARPORT is not set | 424 | # CONFIG_PARPORT is not set |
404 | CONFIG_BLK_DEV=y | 425 | CONFIG_BLK_DEV=y |
405 | # CONFIG_BLK_DEV_FD is not set | 426 | # CONFIG_BLK_DEV_FD is not set |
@@ -431,6 +452,7 @@ CONFIG_MISC_DEVICES=y | |||
431 | # EEPROM support | 452 | # EEPROM support |
432 | # | 453 | # |
433 | # CONFIG_EEPROM_93CX6 is not set | 454 | # CONFIG_EEPROM_93CX6 is not set |
455 | # CONFIG_CB710_CORE is not set | ||
434 | CONFIG_HAVE_IDE=y | 456 | CONFIG_HAVE_IDE=y |
435 | # CONFIG_IDE is not set | 457 | # CONFIG_IDE is not set |
436 | 458 | ||
@@ -450,14 +472,17 @@ CONFIG_HAVE_IDE=y | |||
450 | # | 472 | # |
451 | 473 | ||
452 | # | 474 | # |
453 | # Enable only one of the two stacks, unless you know what you are doing | 475 | # You can enable one or both FireWire driver stacks. |
476 | # | ||
477 | |||
478 | # | ||
479 | # See the help texts for more information. | ||
454 | # | 480 | # |
455 | # CONFIG_FIREWIRE is not set | 481 | # CONFIG_FIREWIRE is not set |
456 | # CONFIG_IEEE1394 is not set | 482 | # CONFIG_IEEE1394 is not set |
457 | # CONFIG_I2O is not set | 483 | # CONFIG_I2O is not set |
458 | # CONFIG_MACINTOSH_DRIVERS is not set | 484 | # CONFIG_MACINTOSH_DRIVERS is not set |
459 | CONFIG_NETDEVICES=y | 485 | CONFIG_NETDEVICES=y |
460 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
461 | # CONFIG_DUMMY is not set | 486 | # CONFIG_DUMMY is not set |
462 | # CONFIG_BONDING is not set | 487 | # CONFIG_BONDING is not set |
463 | # CONFIG_MACVLAN is not set | 488 | # CONFIG_MACVLAN is not set |
@@ -504,6 +529,7 @@ CONFIG_MII=y | |||
504 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 529 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
505 | # CONFIG_NET_PCI is not set | 530 | # CONFIG_NET_PCI is not set |
506 | # CONFIG_B44 is not set | 531 | # CONFIG_B44 is not set |
532 | # CONFIG_KS8842 is not set | ||
507 | # CONFIG_ATL2 is not set | 533 | # CONFIG_ATL2 is not set |
508 | CONFIG_FS_ENET=y | 534 | CONFIG_FS_ENET=y |
509 | # CONFIG_FS_ENET_HAS_SCC is not set | 535 | # CONFIG_FS_ENET_HAS_SCC is not set |
@@ -527,8 +553,10 @@ CONFIG_E1000=y | |||
527 | # CONFIG_VIA_VELOCITY is not set | 553 | # CONFIG_VIA_VELOCITY is not set |
528 | # CONFIG_TIGON3 is not set | 554 | # CONFIG_TIGON3 is not set |
529 | # CONFIG_BNX2 is not set | 555 | # CONFIG_BNX2 is not set |
556 | # CONFIG_CNIC is not set | ||
530 | CONFIG_FSL_PQ_MDIO=y | 557 | CONFIG_FSL_PQ_MDIO=y |
531 | CONFIG_GIANFAR=y | 558 | CONFIG_GIANFAR=y |
559 | # CONFIG_MV643XX_ETH is not set | ||
532 | # CONFIG_QLA3XXX is not set | 560 | # CONFIG_QLA3XXX is not set |
533 | # CONFIG_ATL1 is not set | 561 | # CONFIG_ATL1 is not set |
534 | # CONFIG_ATL1E is not set | 562 | # CONFIG_ATL1E is not set |
@@ -646,6 +674,11 @@ CONFIG_GEN_RTC=y | |||
646 | CONFIG_DEVPORT=y | 674 | CONFIG_DEVPORT=y |
647 | # CONFIG_I2C is not set | 675 | # CONFIG_I2C is not set |
648 | # CONFIG_SPI is not set | 676 | # CONFIG_SPI is not set |
677 | |||
678 | # | ||
679 | # PPS support | ||
680 | # | ||
681 | # CONFIG_PPS is not set | ||
649 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 682 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
650 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 683 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
651 | CONFIG_GPIOLIB=y | 684 | CONFIG_GPIOLIB=y |
@@ -707,22 +740,7 @@ CONFIG_SSB_POSSIBLE=y | |||
707 | # CONFIG_HTC_PASIC3 is not set | 740 | # CONFIG_HTC_PASIC3 is not set |
708 | # CONFIG_MFD_TMIO is not set | 741 | # CONFIG_MFD_TMIO is not set |
709 | # CONFIG_REGULATOR is not set | 742 | # CONFIG_REGULATOR is not set |
710 | 743 | # CONFIG_MEDIA_SUPPORT is not set | |
711 | # | ||
712 | # Multimedia devices | ||
713 | # | ||
714 | |||
715 | # | ||
716 | # Multimedia core support | ||
717 | # | ||
718 | # CONFIG_VIDEO_DEV is not set | ||
719 | # CONFIG_DVB_CORE is not set | ||
720 | # CONFIG_VIDEO_MEDIA is not set | ||
721 | |||
722 | # | ||
723 | # Multimedia drivers | ||
724 | # | ||
725 | CONFIG_DAB=y | ||
726 | 744 | ||
727 | # | 745 | # |
728 | # Graphics support | 746 | # Graphics support |
@@ -779,6 +797,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
779 | # CONFIG_DMADEVICES is not set | 797 | # CONFIG_DMADEVICES is not set |
780 | # CONFIG_AUXDISPLAY is not set | 798 | # CONFIG_AUXDISPLAY is not set |
781 | # CONFIG_UIO is not set | 799 | # CONFIG_UIO is not set |
800 | |||
801 | # | ||
802 | # TI VLYNQ | ||
803 | # | ||
782 | # CONFIG_STAGING is not set | 804 | # CONFIG_STAGING is not set |
783 | 805 | ||
784 | # | 806 | # |
@@ -798,10 +820,12 @@ CONFIG_FS_MBCACHE=y | |||
798 | # CONFIG_REISERFS_FS is not set | 820 | # CONFIG_REISERFS_FS is not set |
799 | # CONFIG_JFS_FS is not set | 821 | # CONFIG_JFS_FS is not set |
800 | # CONFIG_FS_POSIX_ACL is not set | 822 | # CONFIG_FS_POSIX_ACL is not set |
801 | CONFIG_FILE_LOCKING=y | ||
802 | # CONFIG_XFS_FS is not set | 823 | # CONFIG_XFS_FS is not set |
824 | # CONFIG_GFS2_FS is not set | ||
803 | # CONFIG_OCFS2_FS is not set | 825 | # CONFIG_OCFS2_FS is not set |
804 | # CONFIG_BTRFS_FS is not set | 826 | # CONFIG_BTRFS_FS is not set |
827 | CONFIG_FILE_LOCKING=y | ||
828 | CONFIG_FSNOTIFY=y | ||
805 | CONFIG_DNOTIFY=y | 829 | CONFIG_DNOTIFY=y |
806 | CONFIG_INOTIFY=y | 830 | CONFIG_INOTIFY=y |
807 | CONFIG_INOTIFY_USER=y | 831 | CONFIG_INOTIFY_USER=y |
@@ -916,6 +940,7 @@ CONFIG_HAS_IOPORT=y | |||
916 | CONFIG_HAS_DMA=y | 940 | CONFIG_HAS_DMA=y |
917 | CONFIG_HAVE_LMB=y | 941 | CONFIG_HAVE_LMB=y |
918 | CONFIG_NLATTR=y | 942 | CONFIG_NLATTR=y |
943 | CONFIG_GENERIC_ATOMIC64=y | ||
919 | 944 | ||
920 | # | 945 | # |
921 | # Kernel hacking | 946 | # Kernel hacking |
@@ -946,6 +971,9 @@ CONFIG_SCHED_DEBUG=y | |||
946 | # CONFIG_RT_MUTEX_TESTER is not set | 971 | # CONFIG_RT_MUTEX_TESTER is not set |
947 | # CONFIG_DEBUG_SPINLOCK is not set | 972 | # CONFIG_DEBUG_SPINLOCK is not set |
948 | CONFIG_DEBUG_MUTEXES=y | 973 | CONFIG_DEBUG_MUTEXES=y |
974 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
975 | # CONFIG_PROVE_LOCKING is not set | ||
976 | # CONFIG_LOCK_STAT is not set | ||
949 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 977 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
950 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 978 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
951 | # CONFIG_DEBUG_KOBJECT is not set | 979 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -957,7 +985,6 @@ CONFIG_DEBUG_MUTEXES=y | |||
957 | # CONFIG_DEBUG_LIST is not set | 985 | # CONFIG_DEBUG_LIST is not set |
958 | # CONFIG_DEBUG_SG is not set | 986 | # CONFIG_DEBUG_SG is not set |
959 | # CONFIG_DEBUG_NOTIFIERS is not set | 987 | # CONFIG_DEBUG_NOTIFIERS is not set |
960 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
961 | # CONFIG_RCU_TORTURE_TEST is not set | 988 | # CONFIG_RCU_TORTURE_TEST is not set |
962 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 989 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
963 | # CONFIG_BACKTRACE_SELF_TEST is not set | 990 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -971,16 +998,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
971 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 998 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
972 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 999 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
973 | CONFIG_TRACING_SUPPORT=y | 1000 | CONFIG_TRACING_SUPPORT=y |
974 | 1001 | CONFIG_FTRACE=y | |
975 | # | ||
976 | # Tracers | ||
977 | # | ||
978 | # CONFIG_FUNCTION_TRACER is not set | 1002 | # CONFIG_FUNCTION_TRACER is not set |
1003 | # CONFIG_IRQSOFF_TRACER is not set | ||
979 | # CONFIG_SCHED_TRACER is not set | 1004 | # CONFIG_SCHED_TRACER is not set |
980 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1005 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
981 | # CONFIG_EVENT_TRACER is not set | ||
982 | # CONFIG_BOOT_TRACER is not set | 1006 | # CONFIG_BOOT_TRACER is not set |
983 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1007 | CONFIG_BRANCH_PROFILE_NONE=y |
1008 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1009 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
984 | # CONFIG_STACK_TRACER is not set | 1010 | # CONFIG_STACK_TRACER is not set |
985 | # CONFIG_KMEMTRACE is not set | 1011 | # CONFIG_KMEMTRACE is not set |
986 | # CONFIG_WORKQUEUE_TRACER is not set | 1012 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -988,6 +1014,9 @@ CONFIG_TRACING_SUPPORT=y | |||
988 | # CONFIG_SAMPLES is not set | 1014 | # CONFIG_SAMPLES is not set |
989 | CONFIG_HAVE_ARCH_KGDB=y | 1015 | CONFIG_HAVE_ARCH_KGDB=y |
990 | # CONFIG_KGDB is not set | 1016 | # CONFIG_KGDB is not set |
1017 | # CONFIG_KMEMCHECK is not set | ||
1018 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1019 | CONFIG_PPC_WERROR=y | ||
991 | CONFIG_PRINT_STACK_DEPTH=64 | 1020 | CONFIG_PRINT_STACK_DEPTH=64 |
992 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1021 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
993 | # CONFIG_DEBUG_STACK_USAGE is not set | 1022 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig index 41209e3a6545..158e63e8607f 100644 --- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/85xx/mpc85xx_cds_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:18 2009 | 4 | # Wed Jul 29 23:32:17 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
48 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -56,11 +57,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
57 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
64 | 67 | ||
65 | # | 68 | # |
66 | # General setup | 69 | # General setup |
@@ -111,7 +114,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
111 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
112 | # CONFIG_KALLSYMS_ALL is not set | 115 | # CONFIG_KALLSYMS_ALL is not set |
113 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 116 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
114 | # CONFIG_STRIP_ASM_SYMS is not set | ||
115 | CONFIG_HOTPLUG=y | 117 | CONFIG_HOTPLUG=y |
116 | CONFIG_PRINTK=y | 118 | CONFIG_PRINTK=y |
117 | CONFIG_BUG=y | 119 | CONFIG_BUG=y |
@@ -124,9 +126,16 @@ CONFIG_TIMERFD=y | |||
124 | CONFIG_EVENTFD=y | 126 | CONFIG_EVENTFD=y |
125 | CONFIG_SHMEM=y | 127 | CONFIG_SHMEM=y |
126 | CONFIG_AIO=y | 128 | CONFIG_AIO=y |
129 | CONFIG_HAVE_PERF_COUNTERS=y | ||
130 | |||
131 | # | ||
132 | # Performance Counters | ||
133 | # | ||
134 | # CONFIG_PERF_COUNTERS is not set | ||
127 | CONFIG_VM_EVENT_COUNTERS=y | 135 | CONFIG_VM_EVENT_COUNTERS=y |
128 | CONFIG_PCI_QUIRKS=y | 136 | CONFIG_PCI_QUIRKS=y |
129 | CONFIG_SLUB_DEBUG=y | 137 | CONFIG_SLUB_DEBUG=y |
138 | # CONFIG_STRIP_ASM_SYMS is not set | ||
130 | CONFIG_COMPAT_BRK=y | 139 | CONFIG_COMPAT_BRK=y |
131 | # CONFIG_SLAB is not set | 140 | # CONFIG_SLAB is not set |
132 | CONFIG_SLUB=y | 141 | CONFIG_SLUB=y |
@@ -139,6 +148,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
139 | CONFIG_HAVE_KPROBES=y | 148 | CONFIG_HAVE_KPROBES=y |
140 | CONFIG_HAVE_KRETPROBES=y | 149 | CONFIG_HAVE_KRETPROBES=y |
141 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 150 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
151 | |||
152 | # | ||
153 | # GCOV-based kernel profiling | ||
154 | # | ||
142 | # CONFIG_SLOW_WORK is not set | 155 | # CONFIG_SLOW_WORK is not set |
143 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 156 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
144 | CONFIG_SLABINFO=y | 157 | CONFIG_SLABINFO=y |
@@ -146,7 +159,7 @@ CONFIG_RT_MUTEXES=y | |||
146 | CONFIG_BASE_SMALL=0 | 159 | CONFIG_BASE_SMALL=0 |
147 | # CONFIG_MODULES is not set | 160 | # CONFIG_MODULES is not set |
148 | CONFIG_BLOCK=y | 161 | CONFIG_BLOCK=y |
149 | # CONFIG_LBD is not set | 162 | CONFIG_LBDAF=y |
150 | # CONFIG_BLK_DEV_BSG is not set | 163 | # CONFIG_BLK_DEV_BSG is not set |
151 | # CONFIG_BLK_DEV_INTEGRITY is not set | 164 | # CONFIG_BLK_DEV_INTEGRITY is not set |
152 | 165 | ||
@@ -179,6 +192,7 @@ CONFIG_MPC85xx_CDS=y | |||
179 | # CONFIG_MPC85xx_DS is not set | 192 | # CONFIG_MPC85xx_DS is not set |
180 | # CONFIG_SOCRATES is not set | 193 | # CONFIG_SOCRATES is not set |
181 | # CONFIG_KSI8560 is not set | 194 | # CONFIG_KSI8560 is not set |
195 | # CONFIG_XES_MPC85xx is not set | ||
182 | # CONFIG_STX_GP3 is not set | 196 | # CONFIG_STX_GP3 is not set |
183 | # CONFIG_TQM8540 is not set | 197 | # CONFIG_TQM8540 is not set |
184 | # CONFIG_TQM8541 is not set | 198 | # CONFIG_TQM8541 is not set |
@@ -227,6 +241,7 @@ CONFIG_BINFMT_ELF=y | |||
227 | CONFIG_BINFMT_MISC=y | 241 | CONFIG_BINFMT_MISC=y |
228 | CONFIG_MATH_EMULATION=y | 242 | CONFIG_MATH_EMULATION=y |
229 | # CONFIG_IOMMU_HELPER is not set | 243 | # CONFIG_IOMMU_HELPER is not set |
244 | # CONFIG_SWIOTLB is not set | ||
230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 245 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
231 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 246 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 247 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -245,9 +260,9 @@ CONFIG_MIGRATION=y | |||
245 | CONFIG_ZONE_DMA_FLAG=1 | 260 | CONFIG_ZONE_DMA_FLAG=1 |
246 | CONFIG_BOUNCE=y | 261 | CONFIG_BOUNCE=y |
247 | CONFIG_VIRT_TO_BUS=y | 262 | CONFIG_VIRT_TO_BUS=y |
248 | CONFIG_UNEVICTABLE_LRU=y | ||
249 | CONFIG_HAVE_MLOCK=y | 263 | CONFIG_HAVE_MLOCK=y |
250 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 264 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
265 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
251 | CONFIG_PPC_4K_PAGES=y | 266 | CONFIG_PPC_4K_PAGES=y |
252 | # CONFIG_PPC_16K_PAGES is not set | 267 | # CONFIG_PPC_16K_PAGES is not set |
253 | # CONFIG_PPC_64K_PAGES is not set | 268 | # CONFIG_PPC_64K_PAGES is not set |
@@ -358,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
358 | # CONFIG_ECONET is not set | 373 | # CONFIG_ECONET is not set |
359 | # CONFIG_WAN_ROUTER is not set | 374 | # CONFIG_WAN_ROUTER is not set |
360 | # CONFIG_PHONET is not set | 375 | # CONFIG_PHONET is not set |
376 | # CONFIG_IEEE802154 is not set | ||
361 | # CONFIG_NET_SCHED is not set | 377 | # CONFIG_NET_SCHED is not set |
362 | # CONFIG_DCB is not set | 378 | # CONFIG_DCB is not set |
363 | 379 | ||
@@ -375,7 +391,11 @@ CONFIG_WIRELESS=y | |||
375 | CONFIG_WIRELESS_OLD_REGULATORY=y | 391 | CONFIG_WIRELESS_OLD_REGULATORY=y |
376 | # CONFIG_WIRELESS_EXT is not set | 392 | # CONFIG_WIRELESS_EXT is not set |
377 | # CONFIG_LIB80211 is not set | 393 | # CONFIG_LIB80211 is not set |
378 | # CONFIG_MAC80211 is not set | 394 | |
395 | # | ||
396 | # CFG80211 needs to be enabled for MAC80211 | ||
397 | # | ||
398 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
379 | # CONFIG_WIMAX is not set | 399 | # CONFIG_WIMAX is not set |
380 | # CONFIG_RFKILL is not set | 400 | # CONFIG_RFKILL is not set |
381 | # CONFIG_NET_9P is not set | 401 | # CONFIG_NET_9P is not set |
@@ -397,6 +417,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
397 | # CONFIG_CONNECTOR is not set | 417 | # CONFIG_CONNECTOR is not set |
398 | # CONFIG_MTD is not set | 418 | # CONFIG_MTD is not set |
399 | CONFIG_OF_DEVICE=y | 419 | CONFIG_OF_DEVICE=y |
420 | CONFIG_OF_MDIO=y | ||
400 | # CONFIG_PARPORT is not set | 421 | # CONFIG_PARPORT is not set |
401 | CONFIG_BLK_DEV=y | 422 | CONFIG_BLK_DEV=y |
402 | # CONFIG_BLK_DEV_FD is not set | 423 | # CONFIG_BLK_DEV_FD is not set |
@@ -428,6 +449,7 @@ CONFIG_MISC_DEVICES=y | |||
428 | # EEPROM support | 449 | # EEPROM support |
429 | # | 450 | # |
430 | # CONFIG_EEPROM_93CX6 is not set | 451 | # CONFIG_EEPROM_93CX6 is not set |
452 | # CONFIG_CB710_CORE is not set | ||
431 | CONFIG_HAVE_IDE=y | 453 | CONFIG_HAVE_IDE=y |
432 | CONFIG_IDE=y | 454 | CONFIG_IDE=y |
433 | 455 | ||
@@ -502,14 +524,17 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
502 | # | 524 | # |
503 | 525 | ||
504 | # | 526 | # |
505 | # Enable only one of the two stacks, unless you know what you are doing | 527 | # You can enable one or both FireWire driver stacks. |
528 | # | ||
529 | |||
530 | # | ||
531 | # See the help texts for more information. | ||
506 | # | 532 | # |
507 | # CONFIG_FIREWIRE is not set | 533 | # CONFIG_FIREWIRE is not set |
508 | # CONFIG_IEEE1394 is not set | 534 | # CONFIG_IEEE1394 is not set |
509 | # CONFIG_I2O is not set | 535 | # CONFIG_I2O is not set |
510 | # CONFIG_MACINTOSH_DRIVERS is not set | 536 | # CONFIG_MACINTOSH_DRIVERS is not set |
511 | CONFIG_NETDEVICES=y | 537 | CONFIG_NETDEVICES=y |
512 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
513 | # CONFIG_DUMMY is not set | 538 | # CONFIG_DUMMY is not set |
514 | # CONFIG_BONDING is not set | 539 | # CONFIG_BONDING is not set |
515 | # CONFIG_MACVLAN is not set | 540 | # CONFIG_MACVLAN is not set |
@@ -556,6 +581,7 @@ CONFIG_MII=y | |||
556 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 581 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
557 | # CONFIG_NET_PCI is not set | 582 | # CONFIG_NET_PCI is not set |
558 | # CONFIG_B44 is not set | 583 | # CONFIG_B44 is not set |
584 | # CONFIG_KS8842 is not set | ||
559 | # CONFIG_ATL2 is not set | 585 | # CONFIG_ATL2 is not set |
560 | CONFIG_NETDEV_1000=y | 586 | CONFIG_NETDEV_1000=y |
561 | # CONFIG_ACENIC is not set | 587 | # CONFIG_ACENIC is not set |
@@ -575,8 +601,10 @@ CONFIG_E1000=y | |||
575 | # CONFIG_VIA_VELOCITY is not set | 601 | # CONFIG_VIA_VELOCITY is not set |
576 | # CONFIG_TIGON3 is not set | 602 | # CONFIG_TIGON3 is not set |
577 | # CONFIG_BNX2 is not set | 603 | # CONFIG_BNX2 is not set |
604 | # CONFIG_CNIC is not set | ||
578 | CONFIG_FSL_PQ_MDIO=y | 605 | CONFIG_FSL_PQ_MDIO=y |
579 | CONFIG_GIANFAR=y | 606 | CONFIG_GIANFAR=y |
607 | # CONFIG_MV643XX_ETH is not set | ||
580 | # CONFIG_QLA3XXX is not set | 608 | # CONFIG_QLA3XXX is not set |
581 | # CONFIG_ATL1 is not set | 609 | # CONFIG_ATL1 is not set |
582 | # CONFIG_ATL1E is not set | 610 | # CONFIG_ATL1E is not set |
@@ -698,6 +726,11 @@ CONFIG_GEN_RTC=y | |||
698 | CONFIG_DEVPORT=y | 726 | CONFIG_DEVPORT=y |
699 | # CONFIG_I2C is not set | 727 | # CONFIG_I2C is not set |
700 | # CONFIG_SPI is not set | 728 | # CONFIG_SPI is not set |
729 | |||
730 | # | ||
731 | # PPS support | ||
732 | # | ||
733 | # CONFIG_PPS is not set | ||
701 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 734 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
702 | # CONFIG_GPIOLIB is not set | 735 | # CONFIG_GPIOLIB is not set |
703 | # CONFIG_W1 is not set | 736 | # CONFIG_W1 is not set |
@@ -737,22 +770,7 @@ CONFIG_SSB_POSSIBLE=y | |||
737 | # CONFIG_HTC_PASIC3 is not set | 770 | # CONFIG_HTC_PASIC3 is not set |
738 | # CONFIG_MFD_TMIO is not set | 771 | # CONFIG_MFD_TMIO is not set |
739 | # CONFIG_REGULATOR is not set | 772 | # CONFIG_REGULATOR is not set |
740 | 773 | # CONFIG_MEDIA_SUPPORT is not set | |
741 | # | ||
742 | # Multimedia devices | ||
743 | # | ||
744 | |||
745 | # | ||
746 | # Multimedia core support | ||
747 | # | ||
748 | # CONFIG_VIDEO_DEV is not set | ||
749 | # CONFIG_DVB_CORE is not set | ||
750 | # CONFIG_VIDEO_MEDIA is not set | ||
751 | |||
752 | # | ||
753 | # Multimedia drivers | ||
754 | # | ||
755 | CONFIG_DAB=y | ||
756 | 774 | ||
757 | # | 775 | # |
758 | # Graphics support | 776 | # Graphics support |
@@ -809,6 +827,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
809 | # CONFIG_DMADEVICES is not set | 827 | # CONFIG_DMADEVICES is not set |
810 | # CONFIG_AUXDISPLAY is not set | 828 | # CONFIG_AUXDISPLAY is not set |
811 | # CONFIG_UIO is not set | 829 | # CONFIG_UIO is not set |
830 | |||
831 | # | ||
832 | # TI VLYNQ | ||
833 | # | ||
812 | # CONFIG_STAGING is not set | 834 | # CONFIG_STAGING is not set |
813 | 835 | ||
814 | # | 836 | # |
@@ -828,10 +850,12 @@ CONFIG_FS_MBCACHE=y | |||
828 | # CONFIG_REISERFS_FS is not set | 850 | # CONFIG_REISERFS_FS is not set |
829 | # CONFIG_JFS_FS is not set | 851 | # CONFIG_JFS_FS is not set |
830 | # CONFIG_FS_POSIX_ACL is not set | 852 | # CONFIG_FS_POSIX_ACL is not set |
831 | CONFIG_FILE_LOCKING=y | ||
832 | # CONFIG_XFS_FS is not set | 853 | # CONFIG_XFS_FS is not set |
854 | # CONFIG_GFS2_FS is not set | ||
833 | # CONFIG_OCFS2_FS is not set | 855 | # CONFIG_OCFS2_FS is not set |
834 | # CONFIG_BTRFS_FS is not set | 856 | # CONFIG_BTRFS_FS is not set |
857 | CONFIG_FILE_LOCKING=y | ||
858 | CONFIG_FSNOTIFY=y | ||
835 | CONFIG_DNOTIFY=y | 859 | CONFIG_DNOTIFY=y |
836 | CONFIG_INOTIFY=y | 860 | CONFIG_INOTIFY=y |
837 | CONFIG_INOTIFY_USER=y | 861 | CONFIG_INOTIFY_USER=y |
@@ -946,6 +970,7 @@ CONFIG_HAS_IOPORT=y | |||
946 | CONFIG_HAS_DMA=y | 970 | CONFIG_HAS_DMA=y |
947 | CONFIG_HAVE_LMB=y | 971 | CONFIG_HAVE_LMB=y |
948 | CONFIG_NLATTR=y | 972 | CONFIG_NLATTR=y |
973 | CONFIG_GENERIC_ATOMIC64=y | ||
949 | 974 | ||
950 | # | 975 | # |
951 | # Kernel hacking | 976 | # Kernel hacking |
@@ -976,6 +1001,9 @@ CONFIG_SCHED_DEBUG=y | |||
976 | # CONFIG_RT_MUTEX_TESTER is not set | 1001 | # CONFIG_RT_MUTEX_TESTER is not set |
977 | # CONFIG_DEBUG_SPINLOCK is not set | 1002 | # CONFIG_DEBUG_SPINLOCK is not set |
978 | CONFIG_DEBUG_MUTEXES=y | 1003 | CONFIG_DEBUG_MUTEXES=y |
1004 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1005 | # CONFIG_PROVE_LOCKING is not set | ||
1006 | # CONFIG_LOCK_STAT is not set | ||
979 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1007 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
980 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1008 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
981 | # CONFIG_DEBUG_KOBJECT is not set | 1009 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -987,7 +1015,6 @@ CONFIG_DEBUG_MUTEXES=y | |||
987 | # CONFIG_DEBUG_LIST is not set | 1015 | # CONFIG_DEBUG_LIST is not set |
988 | # CONFIG_DEBUG_SG is not set | 1016 | # CONFIG_DEBUG_SG is not set |
989 | # CONFIG_DEBUG_NOTIFIERS is not set | 1017 | # CONFIG_DEBUG_NOTIFIERS is not set |
990 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
991 | # CONFIG_RCU_TORTURE_TEST is not set | 1018 | # CONFIG_RCU_TORTURE_TEST is not set |
992 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1019 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
993 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1020 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1001,16 +1028,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1001 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1028 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1002 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1029 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1003 | CONFIG_TRACING_SUPPORT=y | 1030 | CONFIG_TRACING_SUPPORT=y |
1004 | 1031 | CONFIG_FTRACE=y | |
1005 | # | ||
1006 | # Tracers | ||
1007 | # | ||
1008 | # CONFIG_FUNCTION_TRACER is not set | 1032 | # CONFIG_FUNCTION_TRACER is not set |
1033 | # CONFIG_IRQSOFF_TRACER is not set | ||
1009 | # CONFIG_SCHED_TRACER is not set | 1034 | # CONFIG_SCHED_TRACER is not set |
1010 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1035 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1011 | # CONFIG_EVENT_TRACER is not set | ||
1012 | # CONFIG_BOOT_TRACER is not set | 1036 | # CONFIG_BOOT_TRACER is not set |
1013 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1037 | CONFIG_BRANCH_PROFILE_NONE=y |
1038 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1039 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1014 | # CONFIG_STACK_TRACER is not set | 1040 | # CONFIG_STACK_TRACER is not set |
1015 | # CONFIG_KMEMTRACE is not set | 1041 | # CONFIG_KMEMTRACE is not set |
1016 | # CONFIG_WORKQUEUE_TRACER is not set | 1042 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1018,6 +1044,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1018 | # CONFIG_SAMPLES is not set | 1044 | # CONFIG_SAMPLES is not set |
1019 | CONFIG_HAVE_ARCH_KGDB=y | 1045 | CONFIG_HAVE_ARCH_KGDB=y |
1020 | # CONFIG_KGDB is not set | 1046 | # CONFIG_KGDB is not set |
1047 | # CONFIG_KMEMCHECK is not set | ||
1048 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1049 | CONFIG_PPC_WERROR=y | ||
1021 | CONFIG_PRINT_STACK_DEPTH=64 | 1050 | CONFIG_PRINT_STACK_DEPTH=64 |
1022 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1051 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1023 | # CONFIG_DEBUG_STACK_USAGE is not set | 1052 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig index 6c36c9c7abfd..2726fca1d694 100644 --- a/arch/powerpc/configs/85xx/sbc8548_defconfig +++ b/arch/powerpc/configs/85xx/sbc8548_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:19 2009 | 4 | # Wed Jul 29 23:32:18 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
48 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -56,11 +57,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
57 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
64 | 67 | ||
65 | # | 68 | # |
66 | # General setup | 69 | # General setup |
@@ -110,7 +113,6 @@ CONFIG_EMBEDDED=y | |||
110 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
111 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
112 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 115 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
113 | # CONFIG_STRIP_ASM_SYMS is not set | ||
114 | CONFIG_HOTPLUG=y | 116 | CONFIG_HOTPLUG=y |
115 | CONFIG_PRINTK=y | 117 | CONFIG_PRINTK=y |
116 | CONFIG_BUG=y | 118 | CONFIG_BUG=y |
@@ -123,8 +125,15 @@ CONFIG_TIMERFD=y | |||
123 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
124 | CONFIG_SHMEM=y | 126 | CONFIG_SHMEM=y |
125 | CONFIG_AIO=y | 127 | CONFIG_AIO=y |
128 | CONFIG_HAVE_PERF_COUNTERS=y | ||
129 | |||
130 | # | ||
131 | # Performance Counters | ||
132 | # | ||
133 | # CONFIG_PERF_COUNTERS is not set | ||
126 | CONFIG_VM_EVENT_COUNTERS=y | 134 | CONFIG_VM_EVENT_COUNTERS=y |
127 | CONFIG_PCI_QUIRKS=y | 135 | CONFIG_PCI_QUIRKS=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
128 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
129 | CONFIG_SLAB=y | 138 | CONFIG_SLAB=y |
130 | # CONFIG_SLUB is not set | 139 | # CONFIG_SLUB is not set |
@@ -137,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
137 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
138 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
139 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
140 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
141 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
142 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -144,7 +157,7 @@ CONFIG_RT_MUTEXES=y | |||
144 | CONFIG_BASE_SMALL=0 | 157 | CONFIG_BASE_SMALL=0 |
145 | # CONFIG_MODULES is not set | 158 | # CONFIG_MODULES is not set |
146 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
147 | # CONFIG_LBD is not set | 160 | CONFIG_LBDAF=y |
148 | # CONFIG_BLK_DEV_BSG is not set | 161 | # CONFIG_BLK_DEV_BSG is not set |
149 | # CONFIG_BLK_DEV_INTEGRITY is not set | 162 | # CONFIG_BLK_DEV_INTEGRITY is not set |
150 | 163 | ||
@@ -177,6 +190,7 @@ CONFIG_MPC85xx=y | |||
177 | # CONFIG_MPC85xx_DS is not set | 190 | # CONFIG_MPC85xx_DS is not set |
178 | # CONFIG_SOCRATES is not set | 191 | # CONFIG_SOCRATES is not set |
179 | # CONFIG_KSI8560 is not set | 192 | # CONFIG_KSI8560 is not set |
193 | # CONFIG_XES_MPC85xx is not set | ||
180 | # CONFIG_STX_GP3 is not set | 194 | # CONFIG_STX_GP3 is not set |
181 | # CONFIG_TQM8540 is not set | 195 | # CONFIG_TQM8540 is not set |
182 | # CONFIG_TQM8541 is not set | 196 | # CONFIG_TQM8541 is not set |
@@ -224,6 +238,7 @@ CONFIG_BINFMT_ELF=y | |||
224 | CONFIG_BINFMT_MISC=y | 238 | CONFIG_BINFMT_MISC=y |
225 | CONFIG_MATH_EMULATION=y | 239 | CONFIG_MATH_EMULATION=y |
226 | # CONFIG_IOMMU_HELPER is not set | 240 | # CONFIG_IOMMU_HELPER is not set |
241 | # CONFIG_SWIOTLB is not set | ||
227 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 242 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
228 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 243 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
229 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 244 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -242,9 +257,9 @@ CONFIG_MIGRATION=y | |||
242 | CONFIG_ZONE_DMA_FLAG=1 | 257 | CONFIG_ZONE_DMA_FLAG=1 |
243 | CONFIG_BOUNCE=y | 258 | CONFIG_BOUNCE=y |
244 | CONFIG_VIRT_TO_BUS=y | 259 | CONFIG_VIRT_TO_BUS=y |
245 | CONFIG_UNEVICTABLE_LRU=y | ||
246 | CONFIG_HAVE_MLOCK=y | 260 | CONFIG_HAVE_MLOCK=y |
247 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 261 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
262 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
248 | CONFIG_PPC_4K_PAGES=y | 263 | CONFIG_PPC_4K_PAGES=y |
249 | # CONFIG_PPC_16K_PAGES is not set | 264 | # CONFIG_PPC_16K_PAGES is not set |
250 | # CONFIG_PPC_64K_PAGES is not set | 265 | # CONFIG_PPC_64K_PAGES is not set |
@@ -354,6 +369,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
354 | # CONFIG_ECONET is not set | 369 | # CONFIG_ECONET is not set |
355 | # CONFIG_WAN_ROUTER is not set | 370 | # CONFIG_WAN_ROUTER is not set |
356 | # CONFIG_PHONET is not set | 371 | # CONFIG_PHONET is not set |
372 | # CONFIG_IEEE802154 is not set | ||
357 | # CONFIG_NET_SCHED is not set | 373 | # CONFIG_NET_SCHED is not set |
358 | # CONFIG_DCB is not set | 374 | # CONFIG_DCB is not set |
359 | 375 | ||
@@ -371,7 +387,11 @@ CONFIG_WIRELESS=y | |||
371 | CONFIG_WIRELESS_OLD_REGULATORY=y | 387 | CONFIG_WIRELESS_OLD_REGULATORY=y |
372 | # CONFIG_WIRELESS_EXT is not set | 388 | # CONFIG_WIRELESS_EXT is not set |
373 | # CONFIG_LIB80211 is not set | 389 | # CONFIG_LIB80211 is not set |
374 | # CONFIG_MAC80211 is not set | 390 | |
391 | # | ||
392 | # CFG80211 needs to be enabled for MAC80211 | ||
393 | # | ||
394 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
375 | # CONFIG_WIMAX is not set | 395 | # CONFIG_WIMAX is not set |
376 | # CONFIG_RFKILL is not set | 396 | # CONFIG_RFKILL is not set |
377 | # CONFIG_NET_9P is not set | 397 | # CONFIG_NET_9P is not set |
@@ -391,6 +411,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
391 | # CONFIG_CONNECTOR is not set | 411 | # CONFIG_CONNECTOR is not set |
392 | # CONFIG_MTD is not set | 412 | # CONFIG_MTD is not set |
393 | CONFIG_OF_DEVICE=y | 413 | CONFIG_OF_DEVICE=y |
414 | CONFIG_OF_MDIO=y | ||
394 | # CONFIG_PARPORT is not set | 415 | # CONFIG_PARPORT is not set |
395 | CONFIG_BLK_DEV=y | 416 | CONFIG_BLK_DEV=y |
396 | # CONFIG_BLK_DEV_FD is not set | 417 | # CONFIG_BLK_DEV_FD is not set |
@@ -422,6 +443,7 @@ CONFIG_MISC_DEVICES=y | |||
422 | # EEPROM support | 443 | # EEPROM support |
423 | # | 444 | # |
424 | # CONFIG_EEPROM_93CX6 is not set | 445 | # CONFIG_EEPROM_93CX6 is not set |
446 | # CONFIG_CB710_CORE is not set | ||
425 | CONFIG_HAVE_IDE=y | 447 | CONFIG_HAVE_IDE=y |
426 | # CONFIG_IDE is not set | 448 | # CONFIG_IDE is not set |
427 | 449 | ||
@@ -441,14 +463,17 @@ CONFIG_HAVE_IDE=y | |||
441 | # | 463 | # |
442 | 464 | ||
443 | # | 465 | # |
444 | # Enable only one of the two stacks, unless you know what you are doing | 466 | # You can enable one or both FireWire driver stacks. |
467 | # | ||
468 | |||
469 | # | ||
470 | # See the help texts for more information. | ||
445 | # | 471 | # |
446 | # CONFIG_FIREWIRE is not set | 472 | # CONFIG_FIREWIRE is not set |
447 | # CONFIG_IEEE1394 is not set | 473 | # CONFIG_IEEE1394 is not set |
448 | # CONFIG_I2O is not set | 474 | # CONFIG_I2O is not set |
449 | # CONFIG_MACINTOSH_DRIVERS is not set | 475 | # CONFIG_MACINTOSH_DRIVERS is not set |
450 | CONFIG_NETDEVICES=y | 476 | CONFIG_NETDEVICES=y |
451 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
452 | # CONFIG_DUMMY is not set | 477 | # CONFIG_DUMMY is not set |
453 | # CONFIG_BONDING is not set | 478 | # CONFIG_BONDING is not set |
454 | # CONFIG_MACVLAN is not set | 479 | # CONFIG_MACVLAN is not set |
@@ -495,6 +520,7 @@ CONFIG_MII=y | |||
495 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 520 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
496 | # CONFIG_NET_PCI is not set | 521 | # CONFIG_NET_PCI is not set |
497 | # CONFIG_B44 is not set | 522 | # CONFIG_B44 is not set |
523 | # CONFIG_KS8842 is not set | ||
498 | # CONFIG_ATL2 is not set | 524 | # CONFIG_ATL2 is not set |
499 | CONFIG_NETDEV_1000=y | 525 | CONFIG_NETDEV_1000=y |
500 | # CONFIG_ACENIC is not set | 526 | # CONFIG_ACENIC is not set |
@@ -514,8 +540,10 @@ CONFIG_NETDEV_1000=y | |||
514 | # CONFIG_VIA_VELOCITY is not set | 540 | # CONFIG_VIA_VELOCITY is not set |
515 | # CONFIG_TIGON3 is not set | 541 | # CONFIG_TIGON3 is not set |
516 | # CONFIG_BNX2 is not set | 542 | # CONFIG_BNX2 is not set |
543 | # CONFIG_CNIC is not set | ||
517 | CONFIG_FSL_PQ_MDIO=y | 544 | CONFIG_FSL_PQ_MDIO=y |
518 | CONFIG_GIANFAR=y | 545 | CONFIG_GIANFAR=y |
546 | # CONFIG_MV643XX_ETH is not set | ||
519 | # CONFIG_QLA3XXX is not set | 547 | # CONFIG_QLA3XXX is not set |
520 | # CONFIG_ATL1 is not set | 548 | # CONFIG_ATL1 is not set |
521 | # CONFIG_ATL1E is not set | 549 | # CONFIG_ATL1E is not set |
@@ -637,6 +665,11 @@ CONFIG_GEN_RTC=y | |||
637 | CONFIG_DEVPORT=y | 665 | CONFIG_DEVPORT=y |
638 | # CONFIG_I2C is not set | 666 | # CONFIG_I2C is not set |
639 | # CONFIG_SPI is not set | 667 | # CONFIG_SPI is not set |
668 | |||
669 | # | ||
670 | # PPS support | ||
671 | # | ||
672 | # CONFIG_PPS is not set | ||
640 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 673 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
641 | # CONFIG_GPIOLIB is not set | 674 | # CONFIG_GPIOLIB is not set |
642 | # CONFIG_W1 is not set | 675 | # CONFIG_W1 is not set |
@@ -676,22 +709,7 @@ CONFIG_SSB_POSSIBLE=y | |||
676 | # CONFIG_HTC_PASIC3 is not set | 709 | # CONFIG_HTC_PASIC3 is not set |
677 | # CONFIG_MFD_TMIO is not set | 710 | # CONFIG_MFD_TMIO is not set |
678 | # CONFIG_REGULATOR is not set | 711 | # CONFIG_REGULATOR is not set |
679 | 712 | # CONFIG_MEDIA_SUPPORT is not set | |
680 | # | ||
681 | # Multimedia devices | ||
682 | # | ||
683 | |||
684 | # | ||
685 | # Multimedia core support | ||
686 | # | ||
687 | # CONFIG_VIDEO_DEV is not set | ||
688 | # CONFIG_DVB_CORE is not set | ||
689 | # CONFIG_VIDEO_MEDIA is not set | ||
690 | |||
691 | # | ||
692 | # Multimedia drivers | ||
693 | # | ||
694 | CONFIG_DAB=y | ||
695 | 713 | ||
696 | # | 714 | # |
697 | # Graphics support | 715 | # Graphics support |
@@ -721,6 +739,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
721 | # CONFIG_DMADEVICES is not set | 739 | # CONFIG_DMADEVICES is not set |
722 | # CONFIG_AUXDISPLAY is not set | 740 | # CONFIG_AUXDISPLAY is not set |
723 | # CONFIG_UIO is not set | 741 | # CONFIG_UIO is not set |
742 | |||
743 | # | ||
744 | # TI VLYNQ | ||
745 | # | ||
724 | # CONFIG_STAGING is not set | 746 | # CONFIG_STAGING is not set |
725 | 747 | ||
726 | # | 748 | # |
@@ -732,10 +754,12 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
732 | # CONFIG_REISERFS_FS is not set | 754 | # CONFIG_REISERFS_FS is not set |
733 | # CONFIG_JFS_FS is not set | 755 | # CONFIG_JFS_FS is not set |
734 | # CONFIG_FS_POSIX_ACL is not set | 756 | # CONFIG_FS_POSIX_ACL is not set |
735 | CONFIG_FILE_LOCKING=y | ||
736 | # CONFIG_XFS_FS is not set | 757 | # CONFIG_XFS_FS is not set |
758 | # CONFIG_GFS2_FS is not set | ||
737 | # CONFIG_OCFS2_FS is not set | 759 | # CONFIG_OCFS2_FS is not set |
738 | # CONFIG_BTRFS_FS is not set | 760 | # CONFIG_BTRFS_FS is not set |
761 | CONFIG_FILE_LOCKING=y | ||
762 | CONFIG_FSNOTIFY=y | ||
739 | CONFIG_DNOTIFY=y | 763 | CONFIG_DNOTIFY=y |
740 | CONFIG_INOTIFY=y | 764 | CONFIG_INOTIFY=y |
741 | CONFIG_INOTIFY_USER=y | 765 | CONFIG_INOTIFY_USER=y |
@@ -838,6 +862,7 @@ CONFIG_HAS_IOPORT=y | |||
838 | CONFIG_HAS_DMA=y | 862 | CONFIG_HAS_DMA=y |
839 | CONFIG_HAVE_LMB=y | 863 | CONFIG_HAVE_LMB=y |
840 | CONFIG_NLATTR=y | 864 | CONFIG_NLATTR=y |
865 | CONFIG_GENERIC_ATOMIC64=y | ||
841 | 866 | ||
842 | # | 867 | # |
843 | # Kernel hacking | 868 | # Kernel hacking |
@@ -861,22 +886,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
861 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 886 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
862 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 887 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
863 | CONFIG_TRACING_SUPPORT=y | 888 | CONFIG_TRACING_SUPPORT=y |
864 | 889 | # CONFIG_FTRACE is not set | |
865 | # | ||
866 | # Tracers | ||
867 | # | ||
868 | # CONFIG_FUNCTION_TRACER is not set | ||
869 | # CONFIG_SCHED_TRACER is not set | ||
870 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
871 | # CONFIG_EVENT_TRACER is not set | ||
872 | # CONFIG_BOOT_TRACER is not set | ||
873 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
874 | # CONFIG_STACK_TRACER is not set | ||
875 | # CONFIG_KMEMTRACE is not set | ||
876 | # CONFIG_WORKQUEUE_TRACER is not set | ||
877 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
878 | # CONFIG_SAMPLES is not set | 890 | # CONFIG_SAMPLES is not set |
879 | CONFIG_HAVE_ARCH_KGDB=y | 891 | CONFIG_HAVE_ARCH_KGDB=y |
892 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
893 | CONFIG_PPC_WERROR=y | ||
880 | CONFIG_PRINT_STACK_DEPTH=64 | 894 | CONFIG_PRINT_STACK_DEPTH=64 |
881 | # CONFIG_IRQSTACKS is not set | 895 | # CONFIG_IRQSTACKS is not set |
882 | # CONFIG_PPC_EARLY_DEBUG is not set | 896 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index 4aaf1a6bdc7d..b0c469823b02 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:20 2009 | 4 | # Wed Jul 29 23:32:19 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
48 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -56,11 +57,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
57 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
64 | 67 | ||
65 | # | 68 | # |
66 | # General setup | 69 | # General setup |
@@ -111,7 +114,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
111 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
112 | # CONFIG_KALLSYMS_ALL is not set | 115 | # CONFIG_KALLSYMS_ALL is not set |
113 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 116 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
114 | # CONFIG_STRIP_ASM_SYMS is not set | ||
115 | CONFIG_HOTPLUG=y | 117 | CONFIG_HOTPLUG=y |
116 | CONFIG_PRINTK=y | 118 | CONFIG_PRINTK=y |
117 | CONFIG_BUG=y | 119 | CONFIG_BUG=y |
@@ -124,7 +126,14 @@ CONFIG_TIMERFD=y | |||
124 | CONFIG_EVENTFD=y | 126 | CONFIG_EVENTFD=y |
125 | CONFIG_SHMEM=y | 127 | CONFIG_SHMEM=y |
126 | CONFIG_AIO=y | 128 | CONFIG_AIO=y |
129 | CONFIG_HAVE_PERF_COUNTERS=y | ||
130 | |||
131 | # | ||
132 | # Performance Counters | ||
133 | # | ||
134 | # CONFIG_PERF_COUNTERS is not set | ||
127 | CONFIG_VM_EVENT_COUNTERS=y | 135 | CONFIG_VM_EVENT_COUNTERS=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
128 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
129 | CONFIG_SLAB=y | 138 | CONFIG_SLAB=y |
130 | # CONFIG_SLUB is not set | 139 | # CONFIG_SLUB is not set |
@@ -137,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
137 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
138 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
139 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
140 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
141 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
142 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -144,7 +157,7 @@ CONFIG_RT_MUTEXES=y | |||
144 | CONFIG_BASE_SMALL=0 | 157 | CONFIG_BASE_SMALL=0 |
145 | # CONFIG_MODULES is not set | 158 | # CONFIG_MODULES is not set |
146 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
147 | # CONFIG_LBD is not set | 160 | CONFIG_LBDAF=y |
148 | # CONFIG_BLK_DEV_BSG is not set | 161 | # CONFIG_BLK_DEV_BSG is not set |
149 | # CONFIG_BLK_DEV_INTEGRITY is not set | 162 | # CONFIG_BLK_DEV_INTEGRITY is not set |
150 | 163 | ||
@@ -177,6 +190,7 @@ CONFIG_MPC85xx=y | |||
177 | # CONFIG_MPC85xx_DS is not set | 190 | # CONFIG_MPC85xx_DS is not set |
178 | # CONFIG_SOCRATES is not set | 191 | # CONFIG_SOCRATES is not set |
179 | # CONFIG_KSI8560 is not set | 192 | # CONFIG_KSI8560 is not set |
193 | # CONFIG_XES_MPC85xx is not set | ||
180 | # CONFIG_STX_GP3 is not set | 194 | # CONFIG_STX_GP3 is not set |
181 | # CONFIG_TQM8540 is not set | 195 | # CONFIG_TQM8540 is not set |
182 | # CONFIG_TQM8541 is not set | 196 | # CONFIG_TQM8541 is not set |
@@ -224,6 +238,7 @@ CONFIG_BINFMT_ELF=y | |||
224 | CONFIG_BINFMT_MISC=y | 238 | CONFIG_BINFMT_MISC=y |
225 | # CONFIG_MATH_EMULATION is not set | 239 | # CONFIG_MATH_EMULATION is not set |
226 | # CONFIG_IOMMU_HELPER is not set | 240 | # CONFIG_IOMMU_HELPER is not set |
241 | # CONFIG_SWIOTLB is not set | ||
227 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 242 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
228 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 243 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
229 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 244 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -242,9 +257,9 @@ CONFIG_MIGRATION=y | |||
242 | CONFIG_ZONE_DMA_FLAG=1 | 257 | CONFIG_ZONE_DMA_FLAG=1 |
243 | CONFIG_BOUNCE=y | 258 | CONFIG_BOUNCE=y |
244 | CONFIG_VIRT_TO_BUS=y | 259 | CONFIG_VIRT_TO_BUS=y |
245 | CONFIG_UNEVICTABLE_LRU=y | ||
246 | CONFIG_HAVE_MLOCK=y | 260 | CONFIG_HAVE_MLOCK=y |
247 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 261 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
262 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
248 | CONFIG_PPC_4K_PAGES=y | 263 | CONFIG_PPC_4K_PAGES=y |
249 | # CONFIG_PPC_16K_PAGES is not set | 264 | # CONFIG_PPC_16K_PAGES is not set |
250 | # CONFIG_PPC_64K_PAGES is not set | 265 | # CONFIG_PPC_64K_PAGES is not set |
@@ -346,6 +361,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
346 | # CONFIG_ECONET is not set | 361 | # CONFIG_ECONET is not set |
347 | # CONFIG_WAN_ROUTER is not set | 362 | # CONFIG_WAN_ROUTER is not set |
348 | # CONFIG_PHONET is not set | 363 | # CONFIG_PHONET is not set |
364 | # CONFIG_IEEE802154 is not set | ||
349 | # CONFIG_NET_SCHED is not set | 365 | # CONFIG_NET_SCHED is not set |
350 | # CONFIG_DCB is not set | 366 | # CONFIG_DCB is not set |
351 | 367 | ||
@@ -363,7 +379,11 @@ CONFIG_WIRELESS=y | |||
363 | CONFIG_WIRELESS_OLD_REGULATORY=y | 379 | CONFIG_WIRELESS_OLD_REGULATORY=y |
364 | # CONFIG_WIRELESS_EXT is not set | 380 | # CONFIG_WIRELESS_EXT is not set |
365 | # CONFIG_LIB80211 is not set | 381 | # CONFIG_LIB80211 is not set |
366 | # CONFIG_MAC80211 is not set | 382 | |
383 | # | ||
384 | # CFG80211 needs to be enabled for MAC80211 | ||
385 | # | ||
386 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
367 | # CONFIG_WIMAX is not set | 387 | # CONFIG_WIMAX is not set |
368 | # CONFIG_RFKILL is not set | 388 | # CONFIG_RFKILL is not set |
369 | # CONFIG_NET_9P is not set | 389 | # CONFIG_NET_9P is not set |
@@ -385,6 +405,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
385 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
386 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
387 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
408 | CONFIG_OF_MDIO=y | ||
388 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
389 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
390 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
@@ -421,7 +442,6 @@ CONFIG_HAVE_IDE=y | |||
421 | # CONFIG_MD is not set | 442 | # CONFIG_MD is not set |
422 | # CONFIG_MACINTOSH_DRIVERS is not set | 443 | # CONFIG_MACINTOSH_DRIVERS is not set |
423 | CONFIG_NETDEVICES=y | 444 | CONFIG_NETDEVICES=y |
424 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
425 | # CONFIG_DUMMY is not set | 445 | # CONFIG_DUMMY is not set |
426 | # CONFIG_BONDING is not set | 446 | # CONFIG_BONDING is not set |
427 | # CONFIG_MACVLAN is not set | 447 | # CONFIG_MACVLAN is not set |
@@ -460,9 +480,11 @@ CONFIG_MII=y | |||
460 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 480 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
461 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 481 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
462 | # CONFIG_B44 is not set | 482 | # CONFIG_B44 is not set |
483 | # CONFIG_KS8842 is not set | ||
463 | CONFIG_NETDEV_1000=y | 484 | CONFIG_NETDEV_1000=y |
464 | CONFIG_FSL_PQ_MDIO=y | 485 | CONFIG_FSL_PQ_MDIO=y |
465 | CONFIG_GIANFAR=y | 486 | CONFIG_GIANFAR=y |
487 | # CONFIG_MV643XX_ETH is not set | ||
466 | CONFIG_NETDEV_10000=y | 488 | CONFIG_NETDEV_10000=y |
467 | 489 | ||
468 | # | 490 | # |
@@ -551,6 +573,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
551 | # CONFIG_TCG_TPM is not set | 573 | # CONFIG_TCG_TPM is not set |
552 | # CONFIG_I2C is not set | 574 | # CONFIG_I2C is not set |
553 | # CONFIG_SPI is not set | 575 | # CONFIG_SPI is not set |
576 | |||
577 | # | ||
578 | # PPS support | ||
579 | # | ||
580 | # CONFIG_PPS is not set | ||
554 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 581 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
555 | # CONFIG_GPIOLIB is not set | 582 | # CONFIG_GPIOLIB is not set |
556 | # CONFIG_W1 is not set | 583 | # CONFIG_W1 is not set |
@@ -586,22 +613,7 @@ CONFIG_SSB_POSSIBLE=y | |||
586 | # CONFIG_HTC_PASIC3 is not set | 613 | # CONFIG_HTC_PASIC3 is not set |
587 | # CONFIG_MFD_TMIO is not set | 614 | # CONFIG_MFD_TMIO is not set |
588 | # CONFIG_REGULATOR is not set | 615 | # CONFIG_REGULATOR is not set |
589 | 616 | # CONFIG_MEDIA_SUPPORT is not set | |
590 | # | ||
591 | # Multimedia devices | ||
592 | # | ||
593 | |||
594 | # | ||
595 | # Multimedia core support | ||
596 | # | ||
597 | # CONFIG_VIDEO_DEV is not set | ||
598 | # CONFIG_DVB_CORE is not set | ||
599 | # CONFIG_VIDEO_MEDIA is not set | ||
600 | |||
601 | # | ||
602 | # Multimedia drivers | ||
603 | # | ||
604 | CONFIG_DAB=y | ||
605 | 617 | ||
606 | # | 618 | # |
607 | # Graphics support | 619 | # Graphics support |
@@ -690,6 +702,10 @@ CONFIG_RTC_DRV_M48T59=y | |||
690 | # CONFIG_DMADEVICES is not set | 702 | # CONFIG_DMADEVICES is not set |
691 | # CONFIG_AUXDISPLAY is not set | 703 | # CONFIG_AUXDISPLAY is not set |
692 | # CONFIG_UIO is not set | 704 | # CONFIG_UIO is not set |
705 | |||
706 | # | ||
707 | # TI VLYNQ | ||
708 | # | ||
693 | # CONFIG_STAGING is not set | 709 | # CONFIG_STAGING is not set |
694 | 710 | ||
695 | # | 711 | # |
@@ -701,10 +717,12 @@ CONFIG_RTC_DRV_M48T59=y | |||
701 | # CONFIG_REISERFS_FS is not set | 717 | # CONFIG_REISERFS_FS is not set |
702 | # CONFIG_JFS_FS is not set | 718 | # CONFIG_JFS_FS is not set |
703 | # CONFIG_FS_POSIX_ACL is not set | 719 | # CONFIG_FS_POSIX_ACL is not set |
704 | CONFIG_FILE_LOCKING=y | ||
705 | # CONFIG_XFS_FS is not set | 720 | # CONFIG_XFS_FS is not set |
721 | # CONFIG_GFS2_FS is not set | ||
706 | # CONFIG_OCFS2_FS is not set | 722 | # CONFIG_OCFS2_FS is not set |
707 | # CONFIG_BTRFS_FS is not set | 723 | # CONFIG_BTRFS_FS is not set |
724 | CONFIG_FILE_LOCKING=y | ||
725 | CONFIG_FSNOTIFY=y | ||
708 | CONFIG_DNOTIFY=y | 726 | CONFIG_DNOTIFY=y |
709 | CONFIG_INOTIFY=y | 727 | CONFIG_INOTIFY=y |
710 | CONFIG_INOTIFY_USER=y | 728 | CONFIG_INOTIFY_USER=y |
@@ -819,6 +837,7 @@ CONFIG_HAS_IOPORT=y | |||
819 | CONFIG_HAS_DMA=y | 837 | CONFIG_HAS_DMA=y |
820 | CONFIG_HAVE_LMB=y | 838 | CONFIG_HAVE_LMB=y |
821 | CONFIG_NLATTR=y | 839 | CONFIG_NLATTR=y |
840 | CONFIG_GENERIC_ATOMIC64=y | ||
822 | 841 | ||
823 | # | 842 | # |
824 | # Kernel hacking | 843 | # Kernel hacking |
@@ -848,6 +867,9 @@ CONFIG_SCHED_DEBUG=y | |||
848 | # CONFIG_RT_MUTEX_TESTER is not set | 867 | # CONFIG_RT_MUTEX_TESTER is not set |
849 | # CONFIG_DEBUG_SPINLOCK is not set | 868 | # CONFIG_DEBUG_SPINLOCK is not set |
850 | CONFIG_DEBUG_MUTEXES=y | 869 | CONFIG_DEBUG_MUTEXES=y |
870 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
871 | # CONFIG_PROVE_LOCKING is not set | ||
872 | # CONFIG_LOCK_STAT is not set | ||
851 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 873 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
852 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 874 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
853 | # CONFIG_DEBUG_KOBJECT is not set | 875 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -859,7 +881,6 @@ CONFIG_DEBUG_MUTEXES=y | |||
859 | # CONFIG_DEBUG_LIST is not set | 881 | # CONFIG_DEBUG_LIST is not set |
860 | # CONFIG_DEBUG_SG is not set | 882 | # CONFIG_DEBUG_SG is not set |
861 | # CONFIG_DEBUG_NOTIFIERS is not set | 883 | # CONFIG_DEBUG_NOTIFIERS is not set |
862 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
863 | # CONFIG_RCU_TORTURE_TEST is not set | 884 | # CONFIG_RCU_TORTURE_TEST is not set |
864 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 885 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
865 | # CONFIG_BACKTRACE_SELF_TEST is not set | 886 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -873,16 +894,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
873 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 894 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
874 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 895 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
875 | CONFIG_TRACING_SUPPORT=y | 896 | CONFIG_TRACING_SUPPORT=y |
876 | 897 | CONFIG_FTRACE=y | |
877 | # | ||
878 | # Tracers | ||
879 | # | ||
880 | # CONFIG_FUNCTION_TRACER is not set | 898 | # CONFIG_FUNCTION_TRACER is not set |
899 | # CONFIG_IRQSOFF_TRACER is not set | ||
881 | # CONFIG_SCHED_TRACER is not set | 900 | # CONFIG_SCHED_TRACER is not set |
882 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 901 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
883 | # CONFIG_EVENT_TRACER is not set | ||
884 | # CONFIG_BOOT_TRACER is not set | 902 | # CONFIG_BOOT_TRACER is not set |
885 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 903 | CONFIG_BRANCH_PROFILE_NONE=y |
904 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
905 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
886 | # CONFIG_STACK_TRACER is not set | 906 | # CONFIG_STACK_TRACER is not set |
887 | # CONFIG_KMEMTRACE is not set | 907 | # CONFIG_KMEMTRACE is not set |
888 | # CONFIG_WORKQUEUE_TRACER is not set | 908 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -890,6 +910,9 @@ CONFIG_TRACING_SUPPORT=y | |||
890 | # CONFIG_SAMPLES is not set | 910 | # CONFIG_SAMPLES is not set |
891 | CONFIG_HAVE_ARCH_KGDB=y | 911 | CONFIG_HAVE_ARCH_KGDB=y |
892 | # CONFIG_KGDB is not set | 912 | # CONFIG_KGDB is not set |
913 | # CONFIG_KMEMCHECK is not set | ||
914 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
915 | CONFIG_PPC_WERROR=y | ||
893 | CONFIG_PRINT_STACK_DEPTH=64 | 916 | CONFIG_PRINT_STACK_DEPTH=64 |
894 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 917 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
895 | # CONFIG_DEBUG_STACK_USAGE is not set | 918 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/85xx/socrates_defconfig b/arch/powerpc/configs/85xx/socrates_defconfig index 79984589db69..04c85dada845 100644 --- a/arch/powerpc/configs/85xx/socrates_defconfig +++ b/arch/powerpc/configs/85xx/socrates_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:21 2009 | 4 | # Wed Jul 29 23:32:19 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
48 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -56,11 +57,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
57 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
64 | 67 | ||
65 | # | 68 | # |
66 | # General setup | 69 | # General setup |
@@ -109,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
109 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
110 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
111 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
112 | # CONFIG_STRIP_ASM_SYMS is not set | ||
113 | # CONFIG_HOTPLUG is not set | 115 | # CONFIG_HOTPLUG is not set |
114 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
115 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -122,9 +124,16 @@ CONFIG_TIMERFD=y | |||
122 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
123 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
124 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
125 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
126 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
127 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
128 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
129 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
130 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -137,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
137 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
138 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
139 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
140 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
141 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
142 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -149,7 +162,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
149 | # CONFIG_MODVERSIONS is not set | 162 | # CONFIG_MODVERSIONS is not set |
150 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 163 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
151 | CONFIG_BLOCK=y | 164 | CONFIG_BLOCK=y |
152 | # CONFIG_LBD is not set | 165 | CONFIG_LBDAF=y |
153 | # CONFIG_BLK_DEV_BSG is not set | 166 | # CONFIG_BLK_DEV_BSG is not set |
154 | # CONFIG_BLK_DEV_INTEGRITY is not set | 167 | # CONFIG_BLK_DEV_INTEGRITY is not set |
155 | 168 | ||
@@ -182,6 +195,7 @@ CONFIG_MPC85xx=y | |||
182 | # CONFIG_MPC85xx_DS is not set | 195 | # CONFIG_MPC85xx_DS is not set |
183 | CONFIG_SOCRATES=y | 196 | CONFIG_SOCRATES=y |
184 | # CONFIG_KSI8560 is not set | 197 | # CONFIG_KSI8560 is not set |
198 | # CONFIG_XES_MPC85xx is not set | ||
185 | # CONFIG_STX_GP3 is not set | 199 | # CONFIG_STX_GP3 is not set |
186 | # CONFIG_TQM8540 is not set | 200 | # CONFIG_TQM8540 is not set |
187 | # CONFIG_TQM8541 is not set | 201 | # CONFIG_TQM8541 is not set |
@@ -229,6 +243,7 @@ CONFIG_BINFMT_ELF=y | |||
229 | # CONFIG_BINFMT_MISC is not set | 243 | # CONFIG_BINFMT_MISC is not set |
230 | CONFIG_MATH_EMULATION=y | 244 | CONFIG_MATH_EMULATION=y |
231 | # CONFIG_IOMMU_HELPER is not set | 245 | # CONFIG_IOMMU_HELPER is not set |
246 | # CONFIG_SWIOTLB is not set | ||
232 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 247 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
233 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 248 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
234 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 249 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -247,9 +262,9 @@ CONFIG_MIGRATION=y | |||
247 | CONFIG_ZONE_DMA_FLAG=1 | 262 | CONFIG_ZONE_DMA_FLAG=1 |
248 | CONFIG_BOUNCE=y | 263 | CONFIG_BOUNCE=y |
249 | CONFIG_VIRT_TO_BUS=y | 264 | CONFIG_VIRT_TO_BUS=y |
250 | CONFIG_UNEVICTABLE_LRU=y | ||
251 | CONFIG_HAVE_MLOCK=y | 265 | CONFIG_HAVE_MLOCK=y |
252 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 266 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
267 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
253 | CONFIG_PPC_4K_PAGES=y | 268 | CONFIG_PPC_4K_PAGES=y |
254 | # CONFIG_PPC_16K_PAGES is not set | 269 | # CONFIG_PPC_16K_PAGES is not set |
255 | # CONFIG_PPC_64K_PAGES is not set | 270 | # CONFIG_PPC_64K_PAGES is not set |
@@ -357,6 +372,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
357 | # CONFIG_ECONET is not set | 372 | # CONFIG_ECONET is not set |
358 | # CONFIG_WAN_ROUTER is not set | 373 | # CONFIG_WAN_ROUTER is not set |
359 | # CONFIG_PHONET is not set | 374 | # CONFIG_PHONET is not set |
375 | # CONFIG_IEEE802154 is not set | ||
360 | # CONFIG_NET_SCHED is not set | 376 | # CONFIG_NET_SCHED is not set |
361 | # CONFIG_DCB is not set | 377 | # CONFIG_DCB is not set |
362 | 378 | ||
@@ -373,6 +389,7 @@ CONFIG_CAN_BCM=y | |||
373 | # CAN Device Drivers | 389 | # CAN Device Drivers |
374 | # | 390 | # |
375 | # CONFIG_CAN_VCAN is not set | 391 | # CONFIG_CAN_VCAN is not set |
392 | # CONFIG_CAN_DEV is not set | ||
376 | # CONFIG_CAN_DEBUG_DEVICES is not set | 393 | # CONFIG_CAN_DEBUG_DEVICES is not set |
377 | # CONFIG_IRDA is not set | 394 | # CONFIG_IRDA is not set |
378 | # CONFIG_BT is not set | 395 | # CONFIG_BT is not set |
@@ -382,7 +399,11 @@ CONFIG_WIRELESS=y | |||
382 | # CONFIG_WIRELESS_OLD_REGULATORY is not set | 399 | # CONFIG_WIRELESS_OLD_REGULATORY is not set |
383 | # CONFIG_WIRELESS_EXT is not set | 400 | # CONFIG_WIRELESS_EXT is not set |
384 | # CONFIG_LIB80211 is not set | 401 | # CONFIG_LIB80211 is not set |
385 | # CONFIG_MAC80211 is not set | 402 | |
403 | # | ||
404 | # CFG80211 needs to be enabled for MAC80211 | ||
405 | # | ||
406 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
386 | # CONFIG_WIMAX is not set | 407 | # CONFIG_WIMAX is not set |
387 | # CONFIG_RFKILL is not set | 408 | # CONFIG_RFKILL is not set |
388 | # CONFIG_NET_9P is not set | 409 | # CONFIG_NET_9P is not set |
@@ -499,6 +520,7 @@ CONFIG_MTD_NAND_SOCRATES=y | |||
499 | CONFIG_OF_DEVICE=y | 520 | CONFIG_OF_DEVICE=y |
500 | CONFIG_OF_I2C=y | 521 | CONFIG_OF_I2C=y |
501 | CONFIG_OF_SPI=y | 522 | CONFIG_OF_SPI=y |
523 | CONFIG_OF_MDIO=y | ||
502 | # CONFIG_PARPORT is not set | 524 | # CONFIG_PARPORT is not set |
503 | CONFIG_BLK_DEV=y | 525 | CONFIG_BLK_DEV=y |
504 | # CONFIG_BLK_DEV_FD is not set | 526 | # CONFIG_BLK_DEV_FD is not set |
@@ -535,7 +557,9 @@ CONFIG_MISC_DEVICES=y | |||
535 | # CONFIG_EEPROM_AT24 is not set | 557 | # CONFIG_EEPROM_AT24 is not set |
536 | # CONFIG_EEPROM_AT25 is not set | 558 | # CONFIG_EEPROM_AT25 is not set |
537 | # CONFIG_EEPROM_LEGACY is not set | 559 | # CONFIG_EEPROM_LEGACY is not set |
560 | # CONFIG_EEPROM_MAX6875 is not set | ||
538 | # CONFIG_EEPROM_93CX6 is not set | 561 | # CONFIG_EEPROM_93CX6 is not set |
562 | # CONFIG_CB710_CORE is not set | ||
539 | CONFIG_HAVE_IDE=y | 563 | CONFIG_HAVE_IDE=y |
540 | # CONFIG_IDE is not set | 564 | # CONFIG_IDE is not set |
541 | 565 | ||
@@ -558,10 +582,6 @@ CONFIG_BLK_DEV_SD=y | |||
558 | # CONFIG_BLK_DEV_SR is not set | 582 | # CONFIG_BLK_DEV_SR is not set |
559 | # CONFIG_CHR_DEV_SG is not set | 583 | # CONFIG_CHR_DEV_SG is not set |
560 | # CONFIG_CHR_DEV_SCH is not set | 584 | # 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 | 585 | # CONFIG_SCSI_MULTI_LUN is not set |
566 | # CONFIG_SCSI_CONSTANTS is not set | 586 | # CONFIG_SCSI_CONSTANTS is not set |
567 | # CONFIG_SCSI_LOGGING is not set | 587 | # CONFIG_SCSI_LOGGING is not set |
@@ -588,14 +608,17 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
588 | # | 608 | # |
589 | 609 | ||
590 | # | 610 | # |
591 | # Enable only one of the two stacks, unless you know what you are doing | 611 | # You can enable one or both FireWire driver stacks. |
612 | # | ||
613 | |||
614 | # | ||
615 | # See the help texts for more information. | ||
592 | # | 616 | # |
593 | # CONFIG_FIREWIRE is not set | 617 | # CONFIG_FIREWIRE is not set |
594 | # CONFIG_IEEE1394 is not set | 618 | # CONFIG_IEEE1394 is not set |
595 | # CONFIG_I2O is not set | 619 | # CONFIG_I2O is not set |
596 | # CONFIG_MACINTOSH_DRIVERS is not set | 620 | # CONFIG_MACINTOSH_DRIVERS is not set |
597 | CONFIG_NETDEVICES=y | 621 | CONFIG_NETDEVICES=y |
598 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
599 | # CONFIG_DUMMY is not set | 622 | # CONFIG_DUMMY is not set |
600 | # CONFIG_BONDING is not set | 623 | # CONFIG_BONDING is not set |
601 | # CONFIG_MACVLAN is not set | 624 | # CONFIG_MACVLAN is not set |
@@ -643,6 +666,8 @@ CONFIG_MII=y | |||
643 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 666 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
644 | # CONFIG_NET_PCI is not set | 667 | # CONFIG_NET_PCI is not set |
645 | # CONFIG_B44 is not set | 668 | # CONFIG_B44 is not set |
669 | # CONFIG_KS8842 is not set | ||
670 | # CONFIG_KS8851 is not set | ||
646 | # CONFIG_ATL2 is not set | 671 | # CONFIG_ATL2 is not set |
647 | CONFIG_NETDEV_1000=y | 672 | CONFIG_NETDEV_1000=y |
648 | # CONFIG_ACENIC is not set | 673 | # CONFIG_ACENIC is not set |
@@ -662,8 +687,10 @@ CONFIG_NETDEV_1000=y | |||
662 | # CONFIG_VIA_VELOCITY is not set | 687 | # CONFIG_VIA_VELOCITY is not set |
663 | # CONFIG_TIGON3 is not set | 688 | # CONFIG_TIGON3 is not set |
664 | # CONFIG_BNX2 is not set | 689 | # CONFIG_BNX2 is not set |
690 | # CONFIG_CNIC is not set | ||
665 | CONFIG_FSL_PQ_MDIO=y | 691 | CONFIG_FSL_PQ_MDIO=y |
666 | CONFIG_GIANFAR=y | 692 | CONFIG_GIANFAR=y |
693 | # CONFIG_MV643XX_ETH is not set | ||
667 | # CONFIG_QLA3XXX is not set | 694 | # CONFIG_QLA3XXX is not set |
668 | # CONFIG_ATL1 is not set | 695 | # CONFIG_ATL1 is not set |
669 | # CONFIG_ATL1E is not set | 696 | # CONFIG_ATL1E is not set |
@@ -733,6 +760,7 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
733 | # CONFIG_TOUCHSCREEN_AD7879_I2C is not set | 760 | # CONFIG_TOUCHSCREEN_AD7879_I2C is not set |
734 | # CONFIG_TOUCHSCREEN_AD7879_SPI is not set | 761 | # CONFIG_TOUCHSCREEN_AD7879_SPI is not set |
735 | # CONFIG_TOUCHSCREEN_AD7879 is not set | 762 | # CONFIG_TOUCHSCREEN_AD7879 is not set |
763 | # CONFIG_TOUCHSCREEN_EETI is not set | ||
736 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | 764 | # CONFIG_TOUCHSCREEN_FUJITSU is not set |
737 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 765 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
738 | # CONFIG_TOUCHSCREEN_ELO is not set | 766 | # CONFIG_TOUCHSCREEN_ELO is not set |
@@ -746,6 +774,7 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
746 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 774 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
747 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | 775 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set |
748 | # CONFIG_TOUCHSCREEN_TSC2007 is not set | 776 | # CONFIG_TOUCHSCREEN_TSC2007 is not set |
777 | # CONFIG_TOUCHSCREEN_W90X900 is not set | ||
749 | # CONFIG_INPUT_MISC is not set | 778 | # CONFIG_INPUT_MISC is not set |
750 | 779 | ||
751 | # | 780 | # |
@@ -862,7 +891,6 @@ CONFIG_I2C_MPC=y | |||
862 | # CONFIG_SENSORS_PCF8574 is not set | 891 | # CONFIG_SENSORS_PCF8574 is not set |
863 | # CONFIG_PCF8575 is not set | 892 | # CONFIG_PCF8575 is not set |
864 | # CONFIG_SENSORS_PCA9539 is not set | 893 | # CONFIG_SENSORS_PCA9539 is not set |
865 | # CONFIG_SENSORS_MAX6875 is not set | ||
866 | # CONFIG_SENSORS_TSL2550 is not set | 894 | # CONFIG_SENSORS_TSL2550 is not set |
867 | # CONFIG_I2C_DEBUG_CORE is not set | 895 | # CONFIG_I2C_DEBUG_CORE is not set |
868 | # CONFIG_I2C_DEBUG_ALGO is not set | 896 | # CONFIG_I2C_DEBUG_ALGO is not set |
@@ -875,12 +903,18 @@ CONFIG_SPI_MASTER=y | |||
875 | # SPI Master Controller Drivers | 903 | # SPI Master Controller Drivers |
876 | # | 904 | # |
877 | # CONFIG_SPI_BITBANG is not set | 905 | # CONFIG_SPI_BITBANG is not set |
906 | # CONFIG_SPI_MPC8xxx is not set | ||
878 | 907 | ||
879 | # | 908 | # |
880 | # SPI Protocol Masters | 909 | # SPI Protocol Masters |
881 | # | 910 | # |
882 | # CONFIG_SPI_SPIDEV is not set | 911 | # CONFIG_SPI_SPIDEV is not set |
883 | # CONFIG_SPI_TLE62X0 is not set | 912 | # CONFIG_SPI_TLE62X0 is not set |
913 | |||
914 | # | ||
915 | # PPS support | ||
916 | # | ||
917 | # CONFIG_PPS is not set | ||
884 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 918 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
885 | # CONFIG_GPIOLIB is not set | 919 | # CONFIG_GPIOLIB is not set |
886 | # CONFIG_W1 is not set | 920 | # CONFIG_W1 is not set |
@@ -938,6 +972,7 @@ CONFIG_SENSORS_LM75=y | |||
938 | # CONFIG_SENSORS_SMSC47B397 is not set | 972 | # CONFIG_SENSORS_SMSC47B397 is not set |
939 | # CONFIG_SENSORS_ADS7828 is not set | 973 | # CONFIG_SENSORS_ADS7828 is not set |
940 | # CONFIG_SENSORS_THMC50 is not set | 974 | # CONFIG_SENSORS_THMC50 is not set |
975 | # CONFIG_SENSORS_TMP401 is not set | ||
941 | # CONFIG_SENSORS_VIA686A is not set | 976 | # CONFIG_SENSORS_VIA686A is not set |
942 | # CONFIG_SENSORS_VT1211 is not set | 977 | # CONFIG_SENSORS_VT1211 is not set |
943 | # CONFIG_SENSORS_VT8231 is not set | 978 | # CONFIG_SENSORS_VT8231 is not set |
@@ -973,24 +1008,10 @@ CONFIG_SSB_POSSIBLE=y | |||
973 | # CONFIG_MFD_WM8400 is not set | 1008 | # CONFIG_MFD_WM8400 is not set |
974 | # CONFIG_MFD_WM8350_I2C is not set | 1009 | # CONFIG_MFD_WM8350_I2C is not set |
975 | # CONFIG_MFD_PCF50633 is not set | 1010 | # CONFIG_MFD_PCF50633 is not set |
1011 | # CONFIG_AB3100_CORE is not set | ||
1012 | # CONFIG_EZX_PCAP is not set | ||
976 | # CONFIG_REGULATOR is not set | 1013 | # CONFIG_REGULATOR is not set |
977 | 1014 | # CONFIG_MEDIA_SUPPORT is not set | |
978 | # | ||
979 | # Multimedia devices | ||
980 | # | ||
981 | |||
982 | # | ||
983 | # Multimedia core support | ||
984 | # | ||
985 | # CONFIG_VIDEO_DEV is not set | ||
986 | # CONFIG_DVB_CORE is not set | ||
987 | # CONFIG_VIDEO_MEDIA is not set | ||
988 | |||
989 | # | ||
990 | # Multimedia drivers | ||
991 | # | ||
992 | CONFIG_DAB=y | ||
993 | # CONFIG_USB_DABUSB is not set | ||
994 | 1015 | ||
995 | # | 1016 | # |
996 | # Graphics support | 1017 | # Graphics support |
@@ -1110,7 +1131,7 @@ CONFIG_USB_HID=y | |||
1110 | # CONFIG_HID_CHERRY is not set | 1131 | # CONFIG_HID_CHERRY is not set |
1111 | # CONFIG_HID_CHICONY is not set | 1132 | # CONFIG_HID_CHICONY is not set |
1112 | # CONFIG_HID_CYPRESS is not set | 1133 | # CONFIG_HID_CYPRESS is not set |
1113 | # CONFIG_DRAGONRISE_FF is not set | 1134 | # CONFIG_HID_DRAGONRISE is not set |
1114 | # CONFIG_HID_EZKEY is not set | 1135 | # CONFIG_HID_EZKEY is not set |
1115 | # CONFIG_HID_KYE is not set | 1136 | # CONFIG_HID_KYE is not set |
1116 | # CONFIG_HID_GYRATION is not set | 1137 | # CONFIG_HID_GYRATION is not set |
@@ -1124,10 +1145,11 @@ CONFIG_USB_HID=y | |||
1124 | # CONFIG_HID_SAMSUNG is not set | 1145 | # CONFIG_HID_SAMSUNG is not set |
1125 | # CONFIG_HID_SONY is not set | 1146 | # CONFIG_HID_SONY is not set |
1126 | # CONFIG_HID_SUNPLUS is not set | 1147 | # CONFIG_HID_SUNPLUS is not set |
1127 | # CONFIG_GREENASIA_FF is not set | 1148 | # CONFIG_HID_GREENASIA is not set |
1149 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1128 | # CONFIG_HID_TOPSEED is not set | 1150 | # CONFIG_HID_TOPSEED is not set |
1129 | # CONFIG_THRUSTMASTER_FF is not set | 1151 | # CONFIG_HID_THRUSTMASTER is not set |
1130 | # CONFIG_ZEROPLUS_FF is not set | 1152 | # CONFIG_HID_ZEROPLUS is not set |
1131 | CONFIG_USB_SUPPORT=y | 1153 | CONFIG_USB_SUPPORT=y |
1132 | CONFIG_USB_ARCH_HAS_HCD=y | 1154 | CONFIG_USB_ARCH_HAS_HCD=y |
1133 | CONFIG_USB_ARCH_HAS_OHCI=y | 1155 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1153,6 +1175,7 @@ CONFIG_USB_MON=y | |||
1153 | # USB Host Controller Drivers | 1175 | # USB Host Controller Drivers |
1154 | # | 1176 | # |
1155 | # CONFIG_USB_C67X00_HCD is not set | 1177 | # CONFIG_USB_C67X00_HCD is not set |
1178 | # CONFIG_USB_XHCI_HCD is not set | ||
1156 | CONFIG_USB_EHCI_HCD=y | 1179 | CONFIG_USB_EHCI_HCD=y |
1157 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1180 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1158 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1181 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1162,9 +1185,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1162 | # CONFIG_USB_ISP116X_HCD is not set | 1185 | # CONFIG_USB_ISP116X_HCD is not set |
1163 | # CONFIG_USB_ISP1760_HCD is not set | 1186 | # CONFIG_USB_ISP1760_HCD is not set |
1164 | CONFIG_USB_OHCI_HCD=y | 1187 | CONFIG_USB_OHCI_HCD=y |
1165 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1166 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1188 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1167 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 1189 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
1190 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1168 | CONFIG_USB_OHCI_HCD_PCI=y | 1191 | CONFIG_USB_OHCI_HCD_PCI=y |
1169 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1192 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1170 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1193 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1284,6 +1307,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1284 | # CONFIG_RTC_DRV_S35390A is not set | 1307 | # CONFIG_RTC_DRV_S35390A is not set |
1285 | # CONFIG_RTC_DRV_FM3130 is not set | 1308 | # CONFIG_RTC_DRV_FM3130 is not set |
1286 | # CONFIG_RTC_DRV_RX8581 is not set | 1309 | # CONFIG_RTC_DRV_RX8581 is not set |
1310 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1287 | 1311 | ||
1288 | # | 1312 | # |
1289 | # SPI RTC drivers | 1313 | # SPI RTC drivers |
@@ -1318,6 +1342,10 @@ CONFIG_RTC_INTF_DEV=y | |||
1318 | # CONFIG_DMADEVICES is not set | 1342 | # CONFIG_DMADEVICES is not set |
1319 | # CONFIG_AUXDISPLAY is not set | 1343 | # CONFIG_AUXDISPLAY is not set |
1320 | # CONFIG_UIO is not set | 1344 | # CONFIG_UIO is not set |
1345 | |||
1346 | # | ||
1347 | # TI VLYNQ | ||
1348 | # | ||
1321 | # CONFIG_STAGING is not set | 1349 | # CONFIG_STAGING is not set |
1322 | 1350 | ||
1323 | # | 1351 | # |
@@ -1337,10 +1365,12 @@ CONFIG_FS_MBCACHE=y | |||
1337 | # CONFIG_REISERFS_FS is not set | 1365 | # CONFIG_REISERFS_FS is not set |
1338 | # CONFIG_JFS_FS is not set | 1366 | # CONFIG_JFS_FS is not set |
1339 | # CONFIG_FS_POSIX_ACL is not set | 1367 | # CONFIG_FS_POSIX_ACL is not set |
1340 | CONFIG_FILE_LOCKING=y | ||
1341 | # CONFIG_XFS_FS is not set | 1368 | # CONFIG_XFS_FS is not set |
1369 | # CONFIG_GFS2_FS is not set | ||
1342 | # CONFIG_OCFS2_FS is not set | 1370 | # CONFIG_OCFS2_FS is not set |
1343 | # CONFIG_BTRFS_FS is not set | 1371 | # CONFIG_BTRFS_FS is not set |
1372 | CONFIG_FILE_LOCKING=y | ||
1373 | CONFIG_FSNOTIFY=y | ||
1344 | CONFIG_DNOTIFY=y | 1374 | CONFIG_DNOTIFY=y |
1345 | CONFIG_INOTIFY=y | 1375 | CONFIG_INOTIFY=y |
1346 | CONFIG_INOTIFY_USER=y | 1376 | CONFIG_INOTIFY_USER=y |
@@ -1449,7 +1479,46 @@ CONFIG_MSDOS_PARTITION=y | |||
1449 | # CONFIG_KARMA_PARTITION is not set | 1479 | # CONFIG_KARMA_PARTITION is not set |
1450 | # CONFIG_EFI_PARTITION is not set | 1480 | # CONFIG_EFI_PARTITION is not set |
1451 | # CONFIG_SYSV68_PARTITION is not set | 1481 | # CONFIG_SYSV68_PARTITION is not set |
1452 | # CONFIG_NLS is not set | 1482 | CONFIG_NLS=y |
1483 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1484 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1485 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1486 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1487 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1488 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1489 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1490 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1491 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1492 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1493 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1494 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1495 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1496 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1497 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1498 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1499 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1500 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1501 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1502 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1503 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1504 | # CONFIG_NLS_ISO8859_8 is not set | ||
1505 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1506 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1507 | # CONFIG_NLS_ASCII is not set | ||
1508 | # CONFIG_NLS_ISO8859_1 is not set | ||
1509 | # CONFIG_NLS_ISO8859_2 is not set | ||
1510 | # CONFIG_NLS_ISO8859_3 is not set | ||
1511 | # CONFIG_NLS_ISO8859_4 is not set | ||
1512 | # CONFIG_NLS_ISO8859_5 is not set | ||
1513 | # CONFIG_NLS_ISO8859_6 is not set | ||
1514 | # CONFIG_NLS_ISO8859_7 is not set | ||
1515 | # CONFIG_NLS_ISO8859_9 is not set | ||
1516 | # CONFIG_NLS_ISO8859_13 is not set | ||
1517 | # CONFIG_NLS_ISO8859_14 is not set | ||
1518 | # CONFIG_NLS_ISO8859_15 is not set | ||
1519 | # CONFIG_NLS_KOI8_R is not set | ||
1520 | # CONFIG_NLS_KOI8_U is not set | ||
1521 | # CONFIG_NLS_UTF8 is not set | ||
1453 | # CONFIG_DLM is not set | 1522 | # CONFIG_DLM is not set |
1454 | # CONFIG_BINARY_PRINTF is not set | 1523 | # CONFIG_BINARY_PRINTF is not set |
1455 | 1524 | ||
@@ -1473,6 +1542,7 @@ CONFIG_HAS_IOPORT=y | |||
1473 | CONFIG_HAS_DMA=y | 1542 | CONFIG_HAS_DMA=y |
1474 | CONFIG_HAVE_LMB=y | 1543 | CONFIG_HAVE_LMB=y |
1475 | CONFIG_NLATTR=y | 1544 | CONFIG_NLATTR=y |
1545 | CONFIG_GENERIC_ATOMIC64=y | ||
1476 | 1546 | ||
1477 | # | 1547 | # |
1478 | # Kernel hacking | 1548 | # Kernel hacking |
@@ -1498,22 +1568,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1498 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1568 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1499 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1569 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1500 | CONFIG_TRACING_SUPPORT=y | 1570 | CONFIG_TRACING_SUPPORT=y |
1501 | 1571 | # CONFIG_FTRACE is not set | |
1502 | # | ||
1503 | # Tracers | ||
1504 | # | ||
1505 | # CONFIG_FUNCTION_TRACER is not set | ||
1506 | # CONFIG_SCHED_TRACER is not set | ||
1507 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1508 | # CONFIG_EVENT_TRACER is not set | ||
1509 | # CONFIG_BOOT_TRACER is not set | ||
1510 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1511 | # CONFIG_STACK_TRACER is not set | ||
1512 | # CONFIG_KMEMTRACE is not set | ||
1513 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1514 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1515 | # CONFIG_SAMPLES is not set | 1572 | # CONFIG_SAMPLES is not set |
1516 | CONFIG_HAVE_ARCH_KGDB=y | 1573 | CONFIG_HAVE_ARCH_KGDB=y |
1574 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1575 | CONFIG_PPC_WERROR=y | ||
1517 | CONFIG_PRINT_STACK_DEPTH=64 | 1576 | CONFIG_PRINT_STACK_DEPTH=64 |
1518 | # CONFIG_IRQSTACKS is not set | 1577 | # CONFIG_IRQSTACKS is not set |
1519 | # CONFIG_PPC_EARLY_DEBUG is not set | 1578 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index bd1bfcddbd0c..e7e81d6769fe 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:22 2009 | 4 | # Wed Jul 29 23:32:20 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -57,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
57 | # CONFIG_GENERIC_TBSYNC is not set | 58 | # CONFIG_GENERIC_TBSYNC is not set |
58 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
59 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
60 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
61 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
62 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
65 | 68 | ||
66 | # | 69 | # |
67 | # General setup | 70 | # General setup |
@@ -112,7 +115,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
112 | CONFIG_KALLSYMS=y | 115 | CONFIG_KALLSYMS=y |
113 | # CONFIG_KALLSYMS_ALL is not set | 116 | # CONFIG_KALLSYMS_ALL is not set |
114 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 117 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
115 | # CONFIG_STRIP_ASM_SYMS is not set | ||
116 | CONFIG_HOTPLUG=y | 118 | CONFIG_HOTPLUG=y |
117 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
118 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
@@ -125,9 +127,16 @@ CONFIG_TIMERFD=y | |||
125 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
126 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
127 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_COUNTERS=y | ||
131 | |||
132 | # | ||
133 | # Performance Counters | ||
134 | # | ||
135 | # CONFIG_PERF_COUNTERS is not set | ||
128 | CONFIG_VM_EVENT_COUNTERS=y | 136 | CONFIG_VM_EVENT_COUNTERS=y |
129 | CONFIG_PCI_QUIRKS=y | 137 | CONFIG_PCI_QUIRKS=y |
130 | CONFIG_SLUB_DEBUG=y | 138 | CONFIG_SLUB_DEBUG=y |
139 | # CONFIG_STRIP_ASM_SYMS is not set | ||
131 | CONFIG_COMPAT_BRK=y | 140 | CONFIG_COMPAT_BRK=y |
132 | # CONFIG_SLAB is not set | 141 | # CONFIG_SLAB is not set |
133 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
@@ -142,6 +151,10 @@ CONFIG_HAVE_KPROBES=y | |||
142 | CONFIG_HAVE_KRETPROBES=y | 151 | CONFIG_HAVE_KRETPROBES=y |
143 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 152 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
144 | CONFIG_HAVE_CLK=y | 153 | CONFIG_HAVE_CLK=y |
154 | |||
155 | # | ||
156 | # GCOV-based kernel profiling | ||
157 | # | ||
145 | # CONFIG_SLOW_WORK is not set | 158 | # CONFIG_SLOW_WORK is not set |
146 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 159 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
147 | CONFIG_SLABINFO=y | 160 | CONFIG_SLABINFO=y |
@@ -153,7 +166,7 @@ CONFIG_MODULES=y | |||
153 | CONFIG_MODVERSIONS=y | 166 | CONFIG_MODVERSIONS=y |
154 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 167 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
155 | CONFIG_BLOCK=y | 168 | CONFIG_BLOCK=y |
156 | # CONFIG_LBD is not set | 169 | CONFIG_LBDAF=y |
157 | # CONFIG_BLK_DEV_BSG is not set | 170 | # CONFIG_BLK_DEV_BSG is not set |
158 | # CONFIG_BLK_DEV_INTEGRITY is not set | 171 | # CONFIG_BLK_DEV_INTEGRITY is not set |
159 | 172 | ||
@@ -186,6 +199,7 @@ CONFIG_MPC85xx=y | |||
186 | # CONFIG_MPC85xx_DS is not set | 199 | # CONFIG_MPC85xx_DS is not set |
187 | # CONFIG_SOCRATES is not set | 200 | # CONFIG_SOCRATES is not set |
188 | # CONFIG_KSI8560 is not set | 201 | # CONFIG_KSI8560 is not set |
202 | # CONFIG_XES_MPC85xx is not set | ||
189 | CONFIG_STX_GP3=y | 203 | CONFIG_STX_GP3=y |
190 | # CONFIG_TQM8540 is not set | 204 | # CONFIG_TQM8540 is not set |
191 | # CONFIG_TQM8541 is not set | 205 | # CONFIG_TQM8541 is not set |
@@ -234,6 +248,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | CONFIG_BINFMT_MISC=m | 248 | CONFIG_BINFMT_MISC=m |
235 | CONFIG_MATH_EMULATION=y | 249 | CONFIG_MATH_EMULATION=y |
236 | # CONFIG_IOMMU_HELPER is not set | 250 | # CONFIG_IOMMU_HELPER is not set |
251 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 252 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 253 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -252,9 +267,9 @@ CONFIG_MIGRATION=y | |||
252 | CONFIG_ZONE_DMA_FLAG=1 | 267 | CONFIG_ZONE_DMA_FLAG=1 |
253 | CONFIG_BOUNCE=y | 268 | CONFIG_BOUNCE=y |
254 | CONFIG_VIRT_TO_BUS=y | 269 | CONFIG_VIRT_TO_BUS=y |
255 | CONFIG_UNEVICTABLE_LRU=y | ||
256 | CONFIG_HAVE_MLOCK=y | 270 | CONFIG_HAVE_MLOCK=y |
257 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 271 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
272 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
258 | CONFIG_PPC_4K_PAGES=y | 273 | CONFIG_PPC_4K_PAGES=y |
259 | # CONFIG_PPC_16K_PAGES is not set | 274 | # CONFIG_PPC_16K_PAGES is not set |
260 | # CONFIG_PPC_64K_PAGES is not set | 275 | # CONFIG_PPC_64K_PAGES is not set |
@@ -425,6 +440,7 @@ CONFIG_IP_NF_FILTER=m | |||
425 | # CONFIG_ECONET is not set | 440 | # CONFIG_ECONET is not set |
426 | # CONFIG_WAN_ROUTER is not set | 441 | # CONFIG_WAN_ROUTER is not set |
427 | # CONFIG_PHONET is not set | 442 | # CONFIG_PHONET is not set |
443 | # CONFIG_IEEE802154 is not set | ||
428 | # CONFIG_NET_SCHED is not set | 444 | # CONFIG_NET_SCHED is not set |
429 | # CONFIG_DCB is not set | 445 | # CONFIG_DCB is not set |
430 | 446 | ||
@@ -442,7 +458,11 @@ CONFIG_WIRELESS=y | |||
442 | CONFIG_WIRELESS_OLD_REGULATORY=y | 458 | CONFIG_WIRELESS_OLD_REGULATORY=y |
443 | # CONFIG_WIRELESS_EXT is not set | 459 | # CONFIG_WIRELESS_EXT is not set |
444 | # CONFIG_LIB80211 is not set | 460 | # CONFIG_LIB80211 is not set |
445 | # CONFIG_MAC80211 is not set | 461 | |
462 | # | ||
463 | # CFG80211 needs to be enabled for MAC80211 | ||
464 | # | ||
465 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
446 | # CONFIG_WIMAX is not set | 466 | # CONFIG_WIMAX is not set |
447 | # CONFIG_RFKILL is not set | 467 | # CONFIG_RFKILL is not set |
448 | # CONFIG_NET_9P is not set | 468 | # CONFIG_NET_9P is not set |
@@ -466,6 +486,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
466 | CONFIG_OF_DEVICE=y | 486 | CONFIG_OF_DEVICE=y |
467 | CONFIG_OF_GPIO=y | 487 | CONFIG_OF_GPIO=y |
468 | CONFIG_OF_I2C=m | 488 | CONFIG_OF_I2C=m |
489 | CONFIG_OF_MDIO=y | ||
469 | CONFIG_PARPORT=m | 490 | CONFIG_PARPORT=m |
470 | CONFIG_PARPORT_PC=m | 491 | CONFIG_PARPORT_PC=m |
471 | # CONFIG_PARPORT_PC_FIFO is not set | 492 | # CONFIG_PARPORT_PC_FIFO is not set |
@@ -507,7 +528,9 @@ CONFIG_MISC_DEVICES=y | |||
507 | # | 528 | # |
508 | # CONFIG_EEPROM_AT24 is not set | 529 | # CONFIG_EEPROM_AT24 is not set |
509 | # CONFIG_EEPROM_LEGACY is not set | 530 | # CONFIG_EEPROM_LEGACY is not set |
531 | # CONFIG_EEPROM_MAX6875 is not set | ||
510 | # CONFIG_EEPROM_93CX6 is not set | 532 | # CONFIG_EEPROM_93CX6 is not set |
533 | # CONFIG_CB710_CORE is not set | ||
511 | CONFIG_HAVE_IDE=y | 534 | CONFIG_HAVE_IDE=y |
512 | CONFIG_IDE=y | 535 | CONFIG_IDE=y |
513 | 536 | ||
@@ -581,10 +604,6 @@ CONFIG_BLK_DEV_SR=m | |||
581 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 604 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
582 | CONFIG_CHR_DEV_SG=m | 605 | CONFIG_CHR_DEV_SG=m |
583 | # CONFIG_CHR_DEV_SCH is not set | 606 | # CONFIG_CHR_DEV_SCH is not set |
584 | |||
585 | # | ||
586 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
587 | # | ||
588 | CONFIG_SCSI_MULTI_LUN=y | 607 | CONFIG_SCSI_MULTI_LUN=y |
589 | CONFIG_SCSI_CONSTANTS=y | 608 | CONFIG_SCSI_CONSTANTS=y |
590 | # CONFIG_SCSI_LOGGING is not set | 609 | # CONFIG_SCSI_LOGGING is not set |
@@ -602,6 +621,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
602 | CONFIG_SCSI_LOWLEVEL=y | 621 | CONFIG_SCSI_LOWLEVEL=y |
603 | # CONFIG_ISCSI_TCP is not set | 622 | # CONFIG_ISCSI_TCP is not set |
604 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 623 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
624 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
605 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 625 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
606 | # CONFIG_SCSI_3W_9XXX is not set | 626 | # CONFIG_SCSI_3W_9XXX is not set |
607 | # CONFIG_SCSI_ACARD is not set | 627 | # CONFIG_SCSI_ACARD is not set |
@@ -610,6 +630,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
610 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 630 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
611 | # CONFIG_SCSI_AIC79XX is not set | 631 | # CONFIG_SCSI_AIC79XX is not set |
612 | # CONFIG_SCSI_AIC94XX is not set | 632 | # CONFIG_SCSI_AIC94XX is not set |
633 | # CONFIG_SCSI_MVSAS is not set | ||
613 | # CONFIG_SCSI_DPT_I2O is not set | 634 | # CONFIG_SCSI_DPT_I2O is not set |
614 | # CONFIG_SCSI_ADVANSYS is not set | 635 | # CONFIG_SCSI_ADVANSYS is not set |
615 | # CONFIG_SCSI_ARCMSR is not set | 636 | # CONFIG_SCSI_ARCMSR is not set |
@@ -631,7 +652,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
631 | # CONFIG_SCSI_INIA100 is not set | 652 | # CONFIG_SCSI_INIA100 is not set |
632 | # CONFIG_SCSI_PPA is not set | 653 | # CONFIG_SCSI_PPA is not set |
633 | # CONFIG_SCSI_IMM is not set | 654 | # CONFIG_SCSI_IMM is not set |
634 | # CONFIG_SCSI_MVSAS is not set | ||
635 | # CONFIG_SCSI_STEX is not set | 655 | # CONFIG_SCSI_STEX is not set |
636 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 656 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
637 | # CONFIG_SCSI_QLOGIC_1280 is not set | 657 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -654,14 +674,17 @@ CONFIG_SCSI_LOWLEVEL=y | |||
654 | # | 674 | # |
655 | 675 | ||
656 | # | 676 | # |
657 | # Enable only one of the two stacks, unless you know what you are doing | 677 | # You can enable one or both FireWire driver stacks. |
678 | # | ||
679 | |||
680 | # | ||
681 | # See the help texts for more information. | ||
658 | # | 682 | # |
659 | # CONFIG_FIREWIRE is not set | 683 | # CONFIG_FIREWIRE is not set |
660 | # CONFIG_IEEE1394 is not set | 684 | # CONFIG_IEEE1394 is not set |
661 | # CONFIG_I2O is not set | 685 | # CONFIG_I2O is not set |
662 | # CONFIG_MACINTOSH_DRIVERS is not set | 686 | # CONFIG_MACINTOSH_DRIVERS is not set |
663 | CONFIG_NETDEVICES=y | 687 | CONFIG_NETDEVICES=y |
664 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
665 | # CONFIG_DUMMY is not set | 688 | # CONFIG_DUMMY is not set |
666 | # CONFIG_BONDING is not set | 689 | # CONFIG_BONDING is not set |
667 | # CONFIG_MACVLAN is not set | 690 | # CONFIG_MACVLAN is not set |
@@ -708,6 +731,7 @@ CONFIG_NET_ETHERNET=y | |||
708 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 731 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
709 | # CONFIG_NET_PCI is not set | 732 | # CONFIG_NET_PCI is not set |
710 | # CONFIG_B44 is not set | 733 | # CONFIG_B44 is not set |
734 | # CONFIG_KS8842 is not set | ||
711 | # CONFIG_NET_POCKET is not set | 735 | # CONFIG_NET_POCKET is not set |
712 | # CONFIG_ATL2 is not set | 736 | # CONFIG_ATL2 is not set |
713 | # CONFIG_FS_ENET is not set | 737 | # CONFIG_FS_ENET is not set |
@@ -729,8 +753,10 @@ CONFIG_NETDEV_1000=y | |||
729 | # CONFIG_VIA_VELOCITY is not set | 753 | # CONFIG_VIA_VELOCITY is not set |
730 | # CONFIG_TIGON3 is not set | 754 | # CONFIG_TIGON3 is not set |
731 | # CONFIG_BNX2 is not set | 755 | # CONFIG_BNX2 is not set |
756 | # CONFIG_CNIC is not set | ||
732 | CONFIG_FSL_PQ_MDIO=y | 757 | CONFIG_FSL_PQ_MDIO=y |
733 | CONFIG_GIANFAR=y | 758 | CONFIG_GIANFAR=y |
759 | # CONFIG_MV643XX_ETH is not set | ||
734 | # CONFIG_QLA3XXX is not set | 760 | # CONFIG_QLA3XXX is not set |
735 | # CONFIG_ATL1 is not set | 761 | # CONFIG_ATL1 is not set |
736 | # CONFIG_ATL1E is not set | 762 | # CONFIG_ATL1E is not set |
@@ -802,12 +828,13 @@ CONFIG_INPUT_EVDEV=m | |||
802 | # | 828 | # |
803 | CONFIG_INPUT_KEYBOARD=y | 829 | CONFIG_INPUT_KEYBOARD=y |
804 | CONFIG_KEYBOARD_ATKBD=y | 830 | CONFIG_KEYBOARD_ATKBD=y |
805 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
806 | # CONFIG_KEYBOARD_LKKBD is not set | 831 | # CONFIG_KEYBOARD_LKKBD is not set |
807 | # CONFIG_KEYBOARD_XTKBD is not set | 832 | # CONFIG_KEYBOARD_GPIO is not set |
833 | # CONFIG_KEYBOARD_MATRIX is not set | ||
808 | # CONFIG_KEYBOARD_NEWTON is not set | 834 | # CONFIG_KEYBOARD_NEWTON is not set |
809 | # CONFIG_KEYBOARD_STOWAWAY is not set | 835 | # CONFIG_KEYBOARD_STOWAWAY is not set |
810 | # CONFIG_KEYBOARD_GPIO is not set | 836 | # CONFIG_KEYBOARD_SUNKBD is not set |
837 | # CONFIG_KEYBOARD_XTKBD is not set | ||
811 | CONFIG_INPUT_MOUSE=y | 838 | CONFIG_INPUT_MOUSE=y |
812 | CONFIG_MOUSE_PS2=y | 839 | CONFIG_MOUSE_PS2=y |
813 | CONFIG_MOUSE_PS2_ALPS=y | 840 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -821,6 +848,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
821 | # CONFIG_MOUSE_BCM5974 is not set | 848 | # CONFIG_MOUSE_BCM5974 is not set |
822 | # CONFIG_MOUSE_VSXXXAA is not set | 849 | # CONFIG_MOUSE_VSXXXAA is not set |
823 | # CONFIG_MOUSE_GPIO is not set | 850 | # CONFIG_MOUSE_GPIO is not set |
851 | # CONFIG_MOUSE_SYNAPTICS_I2C is not set | ||
824 | # CONFIG_INPUT_JOYSTICK is not set | 852 | # CONFIG_INPUT_JOYSTICK is not set |
825 | # CONFIG_INPUT_TABLET is not set | 853 | # CONFIG_INPUT_TABLET is not set |
826 | # CONFIG_INPUT_TOUCHSCREEN is not set | 854 | # CONFIG_INPUT_TOUCHSCREEN is not set |
@@ -911,6 +939,7 @@ CONFIG_I2C_ALGOBIT=m | |||
911 | # I2C system bus drivers (mostly embedded / system-on-chip) | 939 | # I2C system bus drivers (mostly embedded / system-on-chip) |
912 | # | 940 | # |
913 | # CONFIG_I2C_CPM is not set | 941 | # CONFIG_I2C_CPM is not set |
942 | # CONFIG_I2C_DESIGNWARE is not set | ||
914 | # CONFIG_I2C_GPIO is not set | 943 | # CONFIG_I2C_GPIO is not set |
915 | # CONFIG_I2C_MPC is not set | 944 | # CONFIG_I2C_MPC is not set |
916 | # CONFIG_I2C_OCORES is not set | 945 | # CONFIG_I2C_OCORES is not set |
@@ -941,13 +970,17 @@ CONFIG_I2C_ALGOBIT=m | |||
941 | # CONFIG_SENSORS_PCF8574 is not set | 970 | # CONFIG_SENSORS_PCF8574 is not set |
942 | # CONFIG_PCF8575 is not set | 971 | # CONFIG_PCF8575 is not set |
943 | # CONFIG_SENSORS_PCA9539 is not set | 972 | # CONFIG_SENSORS_PCA9539 is not set |
944 | # CONFIG_SENSORS_MAX6875 is not set | ||
945 | # CONFIG_SENSORS_TSL2550 is not set | 973 | # CONFIG_SENSORS_TSL2550 is not set |
946 | # CONFIG_I2C_DEBUG_CORE is not set | 974 | # CONFIG_I2C_DEBUG_CORE is not set |
947 | # CONFIG_I2C_DEBUG_ALGO is not set | 975 | # CONFIG_I2C_DEBUG_ALGO is not set |
948 | # CONFIG_I2C_DEBUG_BUS is not set | 976 | # CONFIG_I2C_DEBUG_BUS is not set |
949 | # CONFIG_I2C_DEBUG_CHIP is not set | 977 | # CONFIG_I2C_DEBUG_CHIP is not set |
950 | # CONFIG_SPI is not set | 978 | # CONFIG_SPI is not set |
979 | |||
980 | # | ||
981 | # PPS support | ||
982 | # | ||
983 | # CONFIG_PPS is not set | ||
951 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 984 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
952 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 985 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
953 | CONFIG_GPIOLIB=y | 986 | CONFIG_GPIOLIB=y |
@@ -1027,6 +1060,7 @@ CONFIG_HWMON=y | |||
1027 | # CONFIG_SENSORS_SMSC47B397 is not set | 1060 | # CONFIG_SENSORS_SMSC47B397 is not set |
1028 | # CONFIG_SENSORS_ADS7828 is not set | 1061 | # CONFIG_SENSORS_ADS7828 is not set |
1029 | # CONFIG_SENSORS_THMC50 is not set | 1062 | # CONFIG_SENSORS_THMC50 is not set |
1063 | # CONFIG_SENSORS_TMP401 is not set | ||
1030 | # CONFIG_SENSORS_VIA686A is not set | 1064 | # CONFIG_SENSORS_VIA686A is not set |
1031 | # CONFIG_SENSORS_VT1211 is not set | 1065 | # CONFIG_SENSORS_VT1211 is not set |
1032 | # CONFIG_SENSORS_VT8231 is not set | 1066 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1060,23 +1094,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1060 | # CONFIG_MFD_WM8400 is not set | 1094 | # CONFIG_MFD_WM8400 is not set |
1061 | # CONFIG_MFD_WM8350_I2C is not set | 1095 | # CONFIG_MFD_WM8350_I2C is not set |
1062 | # CONFIG_MFD_PCF50633 is not set | 1096 | # CONFIG_MFD_PCF50633 is not set |
1097 | # CONFIG_AB3100_CORE is not set | ||
1063 | # CONFIG_REGULATOR is not set | 1098 | # CONFIG_REGULATOR is not set |
1064 | 1099 | # CONFIG_MEDIA_SUPPORT is not set | |
1065 | # | ||
1066 | # Multimedia devices | ||
1067 | # | ||
1068 | |||
1069 | # | ||
1070 | # Multimedia core support | ||
1071 | # | ||
1072 | # CONFIG_VIDEO_DEV is not set | ||
1073 | # CONFIG_DVB_CORE is not set | ||
1074 | # CONFIG_VIDEO_MEDIA is not set | ||
1075 | |||
1076 | # | ||
1077 | # Multimedia drivers | ||
1078 | # | ||
1079 | CONFIG_DAB=y | ||
1080 | 1100 | ||
1081 | # | 1101 | # |
1082 | # Graphics support | 1102 | # Graphics support |
@@ -1143,6 +1163,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1143 | # CONFIG_DMADEVICES is not set | 1163 | # CONFIG_DMADEVICES is not set |
1144 | # CONFIG_AUXDISPLAY is not set | 1164 | # CONFIG_AUXDISPLAY is not set |
1145 | # CONFIG_UIO is not set | 1165 | # CONFIG_UIO is not set |
1166 | |||
1167 | # | ||
1168 | # TI VLYNQ | ||
1169 | # | ||
1146 | # CONFIG_STAGING is not set | 1170 | # CONFIG_STAGING is not set |
1147 | 1171 | ||
1148 | # | 1172 | # |
@@ -1162,10 +1186,12 @@ CONFIG_FS_MBCACHE=y | |||
1162 | # CONFIG_REISERFS_FS is not set | 1186 | # CONFIG_REISERFS_FS is not set |
1163 | # CONFIG_JFS_FS is not set | 1187 | # CONFIG_JFS_FS is not set |
1164 | # CONFIG_FS_POSIX_ACL is not set | 1188 | # CONFIG_FS_POSIX_ACL is not set |
1165 | CONFIG_FILE_LOCKING=y | ||
1166 | # CONFIG_XFS_FS is not set | 1189 | # CONFIG_XFS_FS is not set |
1190 | # CONFIG_GFS2_FS is not set | ||
1167 | # CONFIG_OCFS2_FS is not set | 1191 | # CONFIG_OCFS2_FS is not set |
1168 | # CONFIG_BTRFS_FS is not set | 1192 | # CONFIG_BTRFS_FS is not set |
1193 | CONFIG_FILE_LOCKING=y | ||
1194 | CONFIG_FSNOTIFY=y | ||
1169 | CONFIG_DNOTIFY=y | 1195 | CONFIG_DNOTIFY=y |
1170 | CONFIG_INOTIFY=y | 1196 | CONFIG_INOTIFY=y |
1171 | CONFIG_INOTIFY_USER=y | 1197 | CONFIG_INOTIFY_USER=y |
@@ -1316,6 +1342,7 @@ CONFIG_HAS_IOPORT=y | |||
1316 | CONFIG_HAS_DMA=y | 1342 | CONFIG_HAS_DMA=y |
1317 | CONFIG_HAVE_LMB=y | 1343 | CONFIG_HAVE_LMB=y |
1318 | CONFIG_NLATTR=y | 1344 | CONFIG_NLATTR=y |
1345 | CONFIG_GENERIC_ATOMIC64=y | ||
1319 | 1346 | ||
1320 | # | 1347 | # |
1321 | # Kernel hacking | 1348 | # Kernel hacking |
@@ -1346,6 +1373,9 @@ CONFIG_SCHED_DEBUG=y | |||
1346 | # CONFIG_RT_MUTEX_TESTER is not set | 1373 | # CONFIG_RT_MUTEX_TESTER is not set |
1347 | # CONFIG_DEBUG_SPINLOCK is not set | 1374 | # CONFIG_DEBUG_SPINLOCK is not set |
1348 | # CONFIG_DEBUG_MUTEXES is not set | 1375 | # CONFIG_DEBUG_MUTEXES is not set |
1376 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1377 | # CONFIG_PROVE_LOCKING is not set | ||
1378 | # CONFIG_LOCK_STAT is not set | ||
1349 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1379 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1350 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1380 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1351 | # CONFIG_DEBUG_KOBJECT is not set | 1381 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1358,7 +1388,6 @@ CONFIG_SCHED_DEBUG=y | |||
1358 | # CONFIG_DEBUG_LIST is not set | 1388 | # CONFIG_DEBUG_LIST is not set |
1359 | # CONFIG_DEBUG_SG is not set | 1389 | # CONFIG_DEBUG_SG is not set |
1360 | # CONFIG_DEBUG_NOTIFIERS is not set | 1390 | # CONFIG_DEBUG_NOTIFIERS is not set |
1361 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1362 | # CONFIG_RCU_TORTURE_TEST is not set | 1391 | # CONFIG_RCU_TORTURE_TEST is not set |
1363 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1392 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1364 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1393 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1372,16 +1401,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1372 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1401 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1373 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1402 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1374 | CONFIG_TRACING_SUPPORT=y | 1403 | CONFIG_TRACING_SUPPORT=y |
1375 | 1404 | CONFIG_FTRACE=y | |
1376 | # | ||
1377 | # Tracers | ||
1378 | # | ||
1379 | # CONFIG_FUNCTION_TRACER is not set | 1405 | # CONFIG_FUNCTION_TRACER is not set |
1406 | # CONFIG_IRQSOFF_TRACER is not set | ||
1380 | # CONFIG_SCHED_TRACER is not set | 1407 | # CONFIG_SCHED_TRACER is not set |
1381 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1408 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1382 | # CONFIG_EVENT_TRACER is not set | ||
1383 | # CONFIG_BOOT_TRACER is not set | 1409 | # CONFIG_BOOT_TRACER is not set |
1384 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1410 | CONFIG_BRANCH_PROFILE_NONE=y |
1411 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1412 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1385 | # CONFIG_STACK_TRACER is not set | 1413 | # CONFIG_STACK_TRACER is not set |
1386 | # CONFIG_KMEMTRACE is not set | 1414 | # CONFIG_KMEMTRACE is not set |
1387 | # CONFIG_WORKQUEUE_TRACER is not set | 1415 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1389,6 +1417,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1389 | # CONFIG_SAMPLES is not set | 1417 | # CONFIG_SAMPLES is not set |
1390 | CONFIG_HAVE_ARCH_KGDB=y | 1418 | CONFIG_HAVE_ARCH_KGDB=y |
1391 | # CONFIG_KGDB is not set | 1419 | # CONFIG_KGDB is not set |
1420 | # CONFIG_KMEMCHECK is not set | ||
1421 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1422 | CONFIG_PPC_WERROR=y | ||
1392 | CONFIG_PRINT_STACK_DEPTH=64 | 1423 | CONFIG_PRINT_STACK_DEPTH=64 |
1393 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1424 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1394 | # CONFIG_DEBUG_STACK_USAGE is not set | 1425 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index 767600145fb2..2c407523aad2 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:23 2009 | 4 | # Wed Jul 29 23:32:21 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
48 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -56,11 +57,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
57 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
64 | 67 | ||
65 | # | 68 | # |
66 | # General setup | 69 | # General setup |
@@ -109,7 +112,6 @@ CONFIG_ANON_INODES=y | |||
109 | CONFIG_EMBEDDED=y | 112 | CONFIG_EMBEDDED=y |
110 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
111 | # CONFIG_KALLSYMS is not set | 114 | # CONFIG_KALLSYMS is not set |
112 | # CONFIG_STRIP_ASM_SYMS is not set | ||
113 | # CONFIG_HOTPLUG is not set | 115 | # CONFIG_HOTPLUG is not set |
114 | CONFIG_PRINTK=y | 116 | CONFIG_PRINTK=y |
115 | CONFIG_BUG=y | 117 | CONFIG_BUG=y |
@@ -122,9 +124,16 @@ CONFIG_TIMERFD=y | |||
122 | CONFIG_EVENTFD=y | 124 | CONFIG_EVENTFD=y |
123 | CONFIG_SHMEM=y | 125 | CONFIG_SHMEM=y |
124 | CONFIG_AIO=y | 126 | CONFIG_AIO=y |
127 | CONFIG_HAVE_PERF_COUNTERS=y | ||
128 | |||
129 | # | ||
130 | # Performance Counters | ||
131 | # | ||
132 | # CONFIG_PERF_COUNTERS is not set | ||
125 | CONFIG_VM_EVENT_COUNTERS=y | 133 | CONFIG_VM_EVENT_COUNTERS=y |
126 | CONFIG_PCI_QUIRKS=y | 134 | CONFIG_PCI_QUIRKS=y |
127 | CONFIG_SLUB_DEBUG=y | 135 | CONFIG_SLUB_DEBUG=y |
136 | # CONFIG_STRIP_ASM_SYMS is not set | ||
128 | CONFIG_COMPAT_BRK=y | 137 | CONFIG_COMPAT_BRK=y |
129 | # CONFIG_SLAB is not set | 138 | # CONFIG_SLAB is not set |
130 | CONFIG_SLUB=y | 139 | CONFIG_SLUB=y |
@@ -137,6 +146,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
137 | CONFIG_HAVE_KPROBES=y | 146 | CONFIG_HAVE_KPROBES=y |
138 | CONFIG_HAVE_KRETPROBES=y | 147 | CONFIG_HAVE_KRETPROBES=y |
139 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 148 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | |||
150 | # | ||
151 | # GCOV-based kernel profiling | ||
152 | # | ||
140 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
141 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
142 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -144,7 +157,7 @@ CONFIG_RT_MUTEXES=y | |||
144 | CONFIG_BASE_SMALL=0 | 157 | CONFIG_BASE_SMALL=0 |
145 | # CONFIG_MODULES is not set | 158 | # CONFIG_MODULES is not set |
146 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
147 | # CONFIG_LBD is not set | 160 | CONFIG_LBDAF=y |
148 | # CONFIG_BLK_DEV_BSG is not set | 161 | # CONFIG_BLK_DEV_BSG is not set |
149 | # CONFIG_BLK_DEV_INTEGRITY is not set | 162 | # CONFIG_BLK_DEV_INTEGRITY is not set |
150 | 163 | ||
@@ -177,6 +190,7 @@ CONFIG_MPC85xx=y | |||
177 | # CONFIG_MPC85xx_DS is not set | 190 | # CONFIG_MPC85xx_DS is not set |
178 | # CONFIG_SOCRATES is not set | 191 | # CONFIG_SOCRATES is not set |
179 | # CONFIG_KSI8560 is not set | 192 | # CONFIG_KSI8560 is not set |
193 | # CONFIG_XES_MPC85xx is not set | ||
180 | # CONFIG_STX_GP3 is not set | 194 | # CONFIG_STX_GP3 is not set |
181 | CONFIG_TQM8540=y | 195 | CONFIG_TQM8540=y |
182 | # CONFIG_TQM8541 is not set | 196 | # CONFIG_TQM8541 is not set |
@@ -225,6 +239,7 @@ CONFIG_BINFMT_ELF=y | |||
225 | # CONFIG_BINFMT_MISC is not set | 239 | # CONFIG_BINFMT_MISC is not set |
226 | CONFIG_MATH_EMULATION=y | 240 | CONFIG_MATH_EMULATION=y |
227 | # CONFIG_IOMMU_HELPER is not set | 241 | # CONFIG_IOMMU_HELPER is not set |
242 | # CONFIG_SWIOTLB is not set | ||
228 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 243 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
229 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 244 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
230 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 245 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -243,9 +258,9 @@ CONFIG_MIGRATION=y | |||
243 | CONFIG_ZONE_DMA_FLAG=1 | 258 | CONFIG_ZONE_DMA_FLAG=1 |
244 | CONFIG_BOUNCE=y | 259 | CONFIG_BOUNCE=y |
245 | CONFIG_VIRT_TO_BUS=y | 260 | CONFIG_VIRT_TO_BUS=y |
246 | CONFIG_UNEVICTABLE_LRU=y | ||
247 | CONFIG_HAVE_MLOCK=y | 261 | CONFIG_HAVE_MLOCK=y |
248 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 262 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
263 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
249 | CONFIG_PPC_4K_PAGES=y | 264 | CONFIG_PPC_4K_PAGES=y |
250 | # CONFIG_PPC_16K_PAGES is not set | 265 | # CONFIG_PPC_16K_PAGES is not set |
251 | # CONFIG_PPC_64K_PAGES is not set | 266 | # CONFIG_PPC_64K_PAGES is not set |
@@ -353,6 +368,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
353 | # CONFIG_ECONET is not set | 368 | # CONFIG_ECONET is not set |
354 | # CONFIG_WAN_ROUTER is not set | 369 | # CONFIG_WAN_ROUTER is not set |
355 | # CONFIG_PHONET is not set | 370 | # CONFIG_PHONET is not set |
371 | # CONFIG_IEEE802154 is not set | ||
356 | # CONFIG_NET_SCHED is not set | 372 | # CONFIG_NET_SCHED is not set |
357 | # CONFIG_DCB is not set | 373 | # CONFIG_DCB is not set |
358 | 374 | ||
@@ -370,7 +386,11 @@ CONFIG_WIRELESS=y | |||
370 | CONFIG_WIRELESS_OLD_REGULATORY=y | 386 | CONFIG_WIRELESS_OLD_REGULATORY=y |
371 | # CONFIG_WIRELESS_EXT is not set | 387 | # CONFIG_WIRELESS_EXT is not set |
372 | # CONFIG_LIB80211 is not set | 388 | # CONFIG_LIB80211 is not set |
373 | # CONFIG_MAC80211 is not set | 389 | |
390 | # | ||
391 | # CFG80211 needs to be enabled for MAC80211 | ||
392 | # | ||
393 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
374 | # CONFIG_WIMAX is not set | 394 | # CONFIG_WIMAX is not set |
375 | # CONFIG_RFKILL is not set | 395 | # CONFIG_RFKILL is not set |
376 | # CONFIG_NET_9P is not set | 396 | # CONFIG_NET_9P is not set |
@@ -471,6 +491,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
471 | # CONFIG_MTD_UBI is not set | 491 | # CONFIG_MTD_UBI is not set |
472 | CONFIG_OF_DEVICE=y | 492 | CONFIG_OF_DEVICE=y |
473 | CONFIG_OF_I2C=y | 493 | CONFIG_OF_I2C=y |
494 | CONFIG_OF_MDIO=y | ||
474 | # CONFIG_PARPORT is not set | 495 | # CONFIG_PARPORT is not set |
475 | CONFIG_BLK_DEV=y | 496 | CONFIG_BLK_DEV=y |
476 | # CONFIG_BLK_DEV_FD is not set | 497 | # CONFIG_BLK_DEV_FD is not set |
@@ -505,7 +526,9 @@ CONFIG_MISC_DEVICES=y | |||
505 | # | 526 | # |
506 | # CONFIG_EEPROM_AT24 is not set | 527 | # CONFIG_EEPROM_AT24 is not set |
507 | # CONFIG_EEPROM_LEGACY is not set | 528 | # CONFIG_EEPROM_LEGACY is not set |
529 | # CONFIG_EEPROM_MAX6875 is not set | ||
508 | # CONFIG_EEPROM_93CX6 is not set | 530 | # CONFIG_EEPROM_93CX6 is not set |
531 | # CONFIG_CB710_CORE is not set | ||
509 | CONFIG_HAVE_IDE=y | 532 | CONFIG_HAVE_IDE=y |
510 | CONFIG_IDE=y | 533 | CONFIG_IDE=y |
511 | 534 | ||
@@ -580,14 +603,17 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
580 | # | 603 | # |
581 | 604 | ||
582 | # | 605 | # |
583 | # Enable only one of the two stacks, unless you know what you are doing | 606 | # You can enable one or both FireWire driver stacks. |
607 | # | ||
608 | |||
609 | # | ||
610 | # See the help texts for more information. | ||
584 | # | 611 | # |
585 | # CONFIG_FIREWIRE is not set | 612 | # CONFIG_FIREWIRE is not set |
586 | # CONFIG_IEEE1394 is not set | 613 | # CONFIG_IEEE1394 is not set |
587 | # CONFIG_I2O is not set | 614 | # CONFIG_I2O is not set |
588 | # CONFIG_MACINTOSH_DRIVERS is not set | 615 | # CONFIG_MACINTOSH_DRIVERS is not set |
589 | CONFIG_NETDEVICES=y | 616 | CONFIG_NETDEVICES=y |
590 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
591 | # CONFIG_DUMMY is not set | 617 | # CONFIG_DUMMY is not set |
592 | # CONFIG_BONDING is not set | 618 | # CONFIG_BONDING is not set |
593 | # CONFIG_MACVLAN is not set | 619 | # CONFIG_MACVLAN is not set |
@@ -650,6 +676,7 @@ CONFIG_E100=y | |||
650 | # CONFIG_SMSC9420 is not set | 676 | # CONFIG_SMSC9420 is not set |
651 | # CONFIG_SUNDANCE is not set | 677 | # CONFIG_SUNDANCE is not set |
652 | # CONFIG_TLAN is not set | 678 | # CONFIG_TLAN is not set |
679 | # CONFIG_KS8842 is not set | ||
653 | # CONFIG_VIA_RHINE is not set | 680 | # CONFIG_VIA_RHINE is not set |
654 | # CONFIG_SC92031 is not set | 681 | # CONFIG_SC92031 is not set |
655 | # CONFIG_ATL2 is not set | 682 | # CONFIG_ATL2 is not set |
@@ -671,8 +698,10 @@ CONFIG_NETDEV_1000=y | |||
671 | # CONFIG_VIA_VELOCITY is not set | 698 | # CONFIG_VIA_VELOCITY is not set |
672 | # CONFIG_TIGON3 is not set | 699 | # CONFIG_TIGON3 is not set |
673 | # CONFIG_BNX2 is not set | 700 | # CONFIG_BNX2 is not set |
701 | # CONFIG_CNIC is not set | ||
674 | CONFIG_FSL_PQ_MDIO=y | 702 | CONFIG_FSL_PQ_MDIO=y |
675 | CONFIG_GIANFAR=y | 703 | CONFIG_GIANFAR=y |
704 | # CONFIG_MV643XX_ETH is not set | ||
676 | # CONFIG_QLA3XXX is not set | 705 | # CONFIG_QLA3XXX is not set |
677 | # CONFIG_ATL1 is not set | 706 | # CONFIG_ATL1 is not set |
678 | # CONFIG_ATL1E is not set | 707 | # CONFIG_ATL1E is not set |
@@ -850,13 +879,17 @@ CONFIG_I2C_MPC=y | |||
850 | # CONFIG_SENSORS_PCF8574 is not set | 879 | # CONFIG_SENSORS_PCF8574 is not set |
851 | # CONFIG_PCF8575 is not set | 880 | # CONFIG_PCF8575 is not set |
852 | # CONFIG_SENSORS_PCA9539 is not set | 881 | # CONFIG_SENSORS_PCA9539 is not set |
853 | # CONFIG_SENSORS_MAX6875 is not set | ||
854 | # CONFIG_SENSORS_TSL2550 is not set | 882 | # CONFIG_SENSORS_TSL2550 is not set |
855 | # CONFIG_I2C_DEBUG_CORE is not set | 883 | # CONFIG_I2C_DEBUG_CORE is not set |
856 | # CONFIG_I2C_DEBUG_ALGO is not set | 884 | # CONFIG_I2C_DEBUG_ALGO is not set |
857 | # CONFIG_I2C_DEBUG_BUS is not set | 885 | # CONFIG_I2C_DEBUG_BUS is not set |
858 | # CONFIG_I2C_DEBUG_CHIP is not set | 886 | # CONFIG_I2C_DEBUG_CHIP is not set |
859 | # CONFIG_SPI is not set | 887 | # CONFIG_SPI is not set |
888 | |||
889 | # | ||
890 | # PPS support | ||
891 | # | ||
892 | # CONFIG_PPS is not set | ||
860 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 893 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
861 | # CONFIG_GPIOLIB is not set | 894 | # CONFIG_GPIOLIB is not set |
862 | # CONFIG_W1 is not set | 895 | # CONFIG_W1 is not set |
@@ -911,6 +944,7 @@ CONFIG_SENSORS_LM75=y | |||
911 | # CONFIG_SENSORS_SMSC47B397 is not set | 944 | # CONFIG_SENSORS_SMSC47B397 is not set |
912 | # CONFIG_SENSORS_ADS7828 is not set | 945 | # CONFIG_SENSORS_ADS7828 is not set |
913 | # CONFIG_SENSORS_THMC50 is not set | 946 | # CONFIG_SENSORS_THMC50 is not set |
947 | # CONFIG_SENSORS_TMP401 is not set | ||
914 | # CONFIG_SENSORS_VIA686A is not set | 948 | # CONFIG_SENSORS_VIA686A is not set |
915 | # CONFIG_SENSORS_VT1211 is not set | 949 | # CONFIG_SENSORS_VT1211 is not set |
916 | # CONFIG_SENSORS_VT8231 is not set | 950 | # CONFIG_SENSORS_VT8231 is not set |
@@ -945,23 +979,9 @@ CONFIG_SSB_POSSIBLE=y | |||
945 | # CONFIG_MFD_WM8400 is not set | 979 | # CONFIG_MFD_WM8400 is not set |
946 | # CONFIG_MFD_WM8350_I2C is not set | 980 | # CONFIG_MFD_WM8350_I2C is not set |
947 | # CONFIG_MFD_PCF50633 is not set | 981 | # CONFIG_MFD_PCF50633 is not set |
982 | # CONFIG_AB3100_CORE is not set | ||
948 | # CONFIG_REGULATOR is not set | 983 | # CONFIG_REGULATOR is not set |
949 | 984 | # CONFIG_MEDIA_SUPPORT is not set | |
950 | # | ||
951 | # Multimedia devices | ||
952 | # | ||
953 | |||
954 | # | ||
955 | # Multimedia core support | ||
956 | # | ||
957 | # CONFIG_VIDEO_DEV is not set | ||
958 | # CONFIG_DVB_CORE is not set | ||
959 | # CONFIG_VIDEO_MEDIA is not set | ||
960 | |||
961 | # | ||
962 | # Multimedia drivers | ||
963 | # | ||
964 | CONFIG_DAB=y | ||
965 | 985 | ||
966 | # | 986 | # |
967 | # Graphics support | 987 | # Graphics support |
@@ -1018,6 +1038,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1018 | # CONFIG_DMADEVICES is not set | 1038 | # CONFIG_DMADEVICES is not set |
1019 | # CONFIG_AUXDISPLAY is not set | 1039 | # CONFIG_AUXDISPLAY is not set |
1020 | # CONFIG_UIO is not set | 1040 | # CONFIG_UIO is not set |
1041 | |||
1042 | # | ||
1043 | # TI VLYNQ | ||
1044 | # | ||
1021 | # CONFIG_STAGING is not set | 1045 | # CONFIG_STAGING is not set |
1022 | 1046 | ||
1023 | # | 1047 | # |
@@ -1037,10 +1061,12 @@ CONFIG_FS_MBCACHE=y | |||
1037 | # CONFIG_REISERFS_FS is not set | 1061 | # CONFIG_REISERFS_FS is not set |
1038 | # CONFIG_JFS_FS is not set | 1062 | # CONFIG_JFS_FS is not set |
1039 | # CONFIG_FS_POSIX_ACL is not set | 1063 | # CONFIG_FS_POSIX_ACL is not set |
1040 | CONFIG_FILE_LOCKING=y | ||
1041 | # CONFIG_XFS_FS is not set | 1064 | # CONFIG_XFS_FS is not set |
1065 | # CONFIG_GFS2_FS is not set | ||
1042 | # CONFIG_OCFS2_FS is not set | 1066 | # CONFIG_OCFS2_FS is not set |
1043 | # CONFIG_BTRFS_FS is not set | 1067 | # CONFIG_BTRFS_FS is not set |
1068 | CONFIG_FILE_LOCKING=y | ||
1069 | CONFIG_FSNOTIFY=y | ||
1044 | CONFIG_DNOTIFY=y | 1070 | CONFIG_DNOTIFY=y |
1045 | CONFIG_INOTIFY=y | 1071 | CONFIG_INOTIFY=y |
1046 | CONFIG_INOTIFY_USER=y | 1072 | CONFIG_INOTIFY_USER=y |
@@ -1167,6 +1193,7 @@ CONFIG_HAS_IOPORT=y | |||
1167 | CONFIG_HAS_DMA=y | 1193 | CONFIG_HAS_DMA=y |
1168 | CONFIG_HAVE_LMB=y | 1194 | CONFIG_HAVE_LMB=y |
1169 | CONFIG_NLATTR=y | 1195 | CONFIG_NLATTR=y |
1196 | CONFIG_GENERIC_ATOMIC64=y | ||
1170 | 1197 | ||
1171 | # | 1198 | # |
1172 | # Kernel hacking | 1199 | # Kernel hacking |
@@ -1192,22 +1219,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1192 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1219 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1193 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1220 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1194 | CONFIG_TRACING_SUPPORT=y | 1221 | CONFIG_TRACING_SUPPORT=y |
1195 | 1222 | # CONFIG_FTRACE is not set | |
1196 | # | ||
1197 | # Tracers | ||
1198 | # | ||
1199 | # CONFIG_FUNCTION_TRACER is not set | ||
1200 | # CONFIG_SCHED_TRACER is not set | ||
1201 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1202 | # CONFIG_EVENT_TRACER is not set | ||
1203 | # CONFIG_BOOT_TRACER is not set | ||
1204 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1205 | # CONFIG_STACK_TRACER is not set | ||
1206 | # CONFIG_KMEMTRACE is not set | ||
1207 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1208 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1209 | # CONFIG_SAMPLES is not set | 1223 | # CONFIG_SAMPLES is not set |
1210 | CONFIG_HAVE_ARCH_KGDB=y | 1224 | CONFIG_HAVE_ARCH_KGDB=y |
1225 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1226 | CONFIG_PPC_WERROR=y | ||
1211 | CONFIG_PRINT_STACK_DEPTH=64 | 1227 | CONFIG_PRINT_STACK_DEPTH=64 |
1212 | # CONFIG_IRQSTACKS is not set | 1228 | # CONFIG_IRQSTACKS is not set |
1213 | # CONFIG_PPC_EARLY_DEBUG is not set | 1229 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index 52fafc006dd0..845731dc51c6 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:23 2009 | 4 | # Wed Jul 29 23:32:22 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -57,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
57 | # CONFIG_GENERIC_TBSYNC is not set | 58 | # CONFIG_GENERIC_TBSYNC is not set |
58 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
59 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
60 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
61 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
62 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
65 | 68 | ||
66 | # | 69 | # |
67 | # General setup | 70 | # General setup |
@@ -110,7 +113,6 @@ CONFIG_ANON_INODES=y | |||
110 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
111 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
112 | # CONFIG_KALLSYMS is not set | 115 | # CONFIG_KALLSYMS is not set |
113 | # CONFIG_STRIP_ASM_SYMS is not set | ||
114 | # CONFIG_HOTPLUG is not set | 116 | # CONFIG_HOTPLUG is not set |
115 | CONFIG_PRINTK=y | 117 | CONFIG_PRINTK=y |
116 | CONFIG_BUG=y | 118 | CONFIG_BUG=y |
@@ -123,9 +125,16 @@ CONFIG_TIMERFD=y | |||
123 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
124 | CONFIG_SHMEM=y | 126 | CONFIG_SHMEM=y |
125 | CONFIG_AIO=y | 127 | CONFIG_AIO=y |
128 | CONFIG_HAVE_PERF_COUNTERS=y | ||
129 | |||
130 | # | ||
131 | # Performance Counters | ||
132 | # | ||
133 | # CONFIG_PERF_COUNTERS is not set | ||
126 | CONFIG_VM_EVENT_COUNTERS=y | 134 | CONFIG_VM_EVENT_COUNTERS=y |
127 | CONFIG_PCI_QUIRKS=y | 135 | CONFIG_PCI_QUIRKS=y |
128 | CONFIG_SLUB_DEBUG=y | 136 | CONFIG_SLUB_DEBUG=y |
137 | # CONFIG_STRIP_ASM_SYMS is not set | ||
129 | CONFIG_COMPAT_BRK=y | 138 | CONFIG_COMPAT_BRK=y |
130 | # CONFIG_SLAB is not set | 139 | # CONFIG_SLAB is not set |
131 | CONFIG_SLUB=y | 140 | CONFIG_SLUB=y |
@@ -139,6 +148,10 @@ CONFIG_HAVE_KPROBES=y | |||
139 | CONFIG_HAVE_KRETPROBES=y | 148 | CONFIG_HAVE_KRETPROBES=y |
140 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 149 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
141 | CONFIG_HAVE_CLK=y | 150 | CONFIG_HAVE_CLK=y |
151 | |||
152 | # | ||
153 | # GCOV-based kernel profiling | ||
154 | # | ||
142 | # CONFIG_SLOW_WORK is not set | 155 | # CONFIG_SLOW_WORK is not set |
143 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 156 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
144 | CONFIG_SLABINFO=y | 157 | CONFIG_SLABINFO=y |
@@ -146,7 +159,7 @@ CONFIG_RT_MUTEXES=y | |||
146 | CONFIG_BASE_SMALL=0 | 159 | CONFIG_BASE_SMALL=0 |
147 | # CONFIG_MODULES is not set | 160 | # CONFIG_MODULES is not set |
148 | CONFIG_BLOCK=y | 161 | CONFIG_BLOCK=y |
149 | # CONFIG_LBD is not set | 162 | CONFIG_LBDAF=y |
150 | # CONFIG_BLK_DEV_BSG is not set | 163 | # CONFIG_BLK_DEV_BSG is not set |
151 | # CONFIG_BLK_DEV_INTEGRITY is not set | 164 | # CONFIG_BLK_DEV_INTEGRITY is not set |
152 | 165 | ||
@@ -179,6 +192,7 @@ CONFIG_MPC85xx=y | |||
179 | # CONFIG_MPC85xx_DS is not set | 192 | # CONFIG_MPC85xx_DS is not set |
180 | # CONFIG_SOCRATES is not set | 193 | # CONFIG_SOCRATES is not set |
181 | # CONFIG_KSI8560 is not set | 194 | # CONFIG_KSI8560 is not set |
195 | # CONFIG_XES_MPC85xx is not set | ||
182 | # CONFIG_STX_GP3 is not set | 196 | # CONFIG_STX_GP3 is not set |
183 | # CONFIG_TQM8540 is not set | 197 | # CONFIG_TQM8540 is not set |
184 | CONFIG_TQM8541=y | 198 | CONFIG_TQM8541=y |
@@ -228,6 +242,7 @@ CONFIG_BINFMT_ELF=y | |||
228 | # CONFIG_BINFMT_MISC is not set | 242 | # CONFIG_BINFMT_MISC is not set |
229 | CONFIG_MATH_EMULATION=y | 243 | CONFIG_MATH_EMULATION=y |
230 | # CONFIG_IOMMU_HELPER is not set | 244 | # CONFIG_IOMMU_HELPER is not set |
245 | # CONFIG_SWIOTLB is not set | ||
231 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 246 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
232 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 247 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
233 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 248 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -246,9 +261,9 @@ CONFIG_MIGRATION=y | |||
246 | CONFIG_ZONE_DMA_FLAG=1 | 261 | CONFIG_ZONE_DMA_FLAG=1 |
247 | CONFIG_BOUNCE=y | 262 | CONFIG_BOUNCE=y |
248 | CONFIG_VIRT_TO_BUS=y | 263 | CONFIG_VIRT_TO_BUS=y |
249 | CONFIG_UNEVICTABLE_LRU=y | ||
250 | CONFIG_HAVE_MLOCK=y | 264 | CONFIG_HAVE_MLOCK=y |
251 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 265 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
266 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
252 | CONFIG_PPC_4K_PAGES=y | 267 | CONFIG_PPC_4K_PAGES=y |
253 | # CONFIG_PPC_16K_PAGES is not set | 268 | # CONFIG_PPC_16K_PAGES is not set |
254 | # CONFIG_PPC_64K_PAGES is not set | 269 | # CONFIG_PPC_64K_PAGES is not set |
@@ -356,6 +371,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
356 | # CONFIG_ECONET is not set | 371 | # CONFIG_ECONET is not set |
357 | # CONFIG_WAN_ROUTER is not set | 372 | # CONFIG_WAN_ROUTER is not set |
358 | # CONFIG_PHONET is not set | 373 | # CONFIG_PHONET is not set |
374 | # CONFIG_IEEE802154 is not set | ||
359 | # CONFIG_NET_SCHED is not set | 375 | # CONFIG_NET_SCHED is not set |
360 | # CONFIG_DCB is not set | 376 | # CONFIG_DCB is not set |
361 | 377 | ||
@@ -373,7 +389,11 @@ CONFIG_WIRELESS=y | |||
373 | CONFIG_WIRELESS_OLD_REGULATORY=y | 389 | CONFIG_WIRELESS_OLD_REGULATORY=y |
374 | # CONFIG_WIRELESS_EXT is not set | 390 | # CONFIG_WIRELESS_EXT is not set |
375 | # CONFIG_LIB80211 is not set | 391 | # CONFIG_LIB80211 is not set |
376 | # CONFIG_MAC80211 is not set | 392 | |
393 | # | ||
394 | # CFG80211 needs to be enabled for MAC80211 | ||
395 | # | ||
396 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
377 | # CONFIG_WIMAX is not set | 397 | # CONFIG_WIMAX is not set |
378 | # CONFIG_RFKILL is not set | 398 | # CONFIG_RFKILL is not set |
379 | # CONFIG_NET_9P is not set | 399 | # CONFIG_NET_9P is not set |
@@ -475,6 +495,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
475 | CONFIG_OF_DEVICE=y | 495 | CONFIG_OF_DEVICE=y |
476 | CONFIG_OF_GPIO=y | 496 | CONFIG_OF_GPIO=y |
477 | CONFIG_OF_I2C=y | 497 | CONFIG_OF_I2C=y |
498 | CONFIG_OF_MDIO=y | ||
478 | # CONFIG_PARPORT is not set | 499 | # CONFIG_PARPORT is not set |
479 | CONFIG_BLK_DEV=y | 500 | CONFIG_BLK_DEV=y |
480 | # CONFIG_BLK_DEV_FD is not set | 501 | # CONFIG_BLK_DEV_FD is not set |
@@ -509,7 +530,9 @@ CONFIG_MISC_DEVICES=y | |||
509 | # | 530 | # |
510 | # CONFIG_EEPROM_AT24 is not set | 531 | # CONFIG_EEPROM_AT24 is not set |
511 | # CONFIG_EEPROM_LEGACY is not set | 532 | # CONFIG_EEPROM_LEGACY is not set |
533 | # CONFIG_EEPROM_MAX6875 is not set | ||
512 | # CONFIG_EEPROM_93CX6 is not set | 534 | # CONFIG_EEPROM_93CX6 is not set |
535 | # CONFIG_CB710_CORE is not set | ||
513 | CONFIG_HAVE_IDE=y | 536 | CONFIG_HAVE_IDE=y |
514 | CONFIG_IDE=y | 537 | CONFIG_IDE=y |
515 | 538 | ||
@@ -584,14 +607,17 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
584 | # | 607 | # |
585 | 608 | ||
586 | # | 609 | # |
587 | # Enable only one of the two stacks, unless you know what you are doing | 610 | # You can enable one or both FireWire driver stacks. |
611 | # | ||
612 | |||
613 | # | ||
614 | # See the help texts for more information. | ||
588 | # | 615 | # |
589 | # CONFIG_FIREWIRE is not set | 616 | # CONFIG_FIREWIRE is not set |
590 | # CONFIG_IEEE1394 is not set | 617 | # CONFIG_IEEE1394 is not set |
591 | # CONFIG_I2O is not set | 618 | # CONFIG_I2O is not set |
592 | # CONFIG_MACINTOSH_DRIVERS is not set | 619 | # CONFIG_MACINTOSH_DRIVERS is not set |
593 | CONFIG_NETDEVICES=y | 620 | CONFIG_NETDEVICES=y |
594 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
595 | # CONFIG_DUMMY is not set | 621 | # CONFIG_DUMMY is not set |
596 | # CONFIG_BONDING is not set | 622 | # CONFIG_BONDING is not set |
597 | # CONFIG_MACVLAN is not set | 623 | # CONFIG_MACVLAN is not set |
@@ -654,6 +680,7 @@ CONFIG_E100=y | |||
654 | # CONFIG_SMSC9420 is not set | 680 | # CONFIG_SMSC9420 is not set |
655 | # CONFIG_SUNDANCE is not set | 681 | # CONFIG_SUNDANCE is not set |
656 | # CONFIG_TLAN is not set | 682 | # CONFIG_TLAN is not set |
683 | # CONFIG_KS8842 is not set | ||
657 | # CONFIG_VIA_RHINE is not set | 684 | # CONFIG_VIA_RHINE is not set |
658 | # CONFIG_SC92031 is not set | 685 | # CONFIG_SC92031 is not set |
659 | # CONFIG_ATL2 is not set | 686 | # CONFIG_ATL2 is not set |
@@ -676,8 +703,10 @@ CONFIG_NETDEV_1000=y | |||
676 | # CONFIG_VIA_VELOCITY is not set | 703 | # CONFIG_VIA_VELOCITY is not set |
677 | # CONFIG_TIGON3 is not set | 704 | # CONFIG_TIGON3 is not set |
678 | # CONFIG_BNX2 is not set | 705 | # CONFIG_BNX2 is not set |
706 | # CONFIG_CNIC is not set | ||
679 | CONFIG_FSL_PQ_MDIO=y | 707 | CONFIG_FSL_PQ_MDIO=y |
680 | CONFIG_GIANFAR=y | 708 | CONFIG_GIANFAR=y |
709 | # CONFIG_MV643XX_ETH is not set | ||
681 | # CONFIG_QLA3XXX is not set | 710 | # CONFIG_QLA3XXX is not set |
682 | # CONFIG_ATL1 is not set | 711 | # CONFIG_ATL1 is not set |
683 | # CONFIG_ATL1E is not set | 712 | # CONFIG_ATL1E is not set |
@@ -831,6 +860,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
831 | # I2C system bus drivers (mostly embedded / system-on-chip) | 860 | # I2C system bus drivers (mostly embedded / system-on-chip) |
832 | # | 861 | # |
833 | # CONFIG_I2C_CPM is not set | 862 | # CONFIG_I2C_CPM is not set |
863 | # CONFIG_I2C_DESIGNWARE is not set | ||
834 | # CONFIG_I2C_GPIO is not set | 864 | # CONFIG_I2C_GPIO is not set |
835 | CONFIG_I2C_MPC=y | 865 | CONFIG_I2C_MPC=y |
836 | # CONFIG_I2C_OCORES is not set | 866 | # CONFIG_I2C_OCORES is not set |
@@ -859,13 +889,17 @@ CONFIG_I2C_MPC=y | |||
859 | # CONFIG_SENSORS_PCF8574 is not set | 889 | # CONFIG_SENSORS_PCF8574 is not set |
860 | # CONFIG_PCF8575 is not set | 890 | # CONFIG_PCF8575 is not set |
861 | # CONFIG_SENSORS_PCA9539 is not set | 891 | # CONFIG_SENSORS_PCA9539 is not set |
862 | # CONFIG_SENSORS_MAX6875 is not set | ||
863 | # CONFIG_SENSORS_TSL2550 is not set | 892 | # CONFIG_SENSORS_TSL2550 is not set |
864 | # CONFIG_I2C_DEBUG_CORE is not set | 893 | # CONFIG_I2C_DEBUG_CORE is not set |
865 | # CONFIG_I2C_DEBUG_ALGO is not set | 894 | # CONFIG_I2C_DEBUG_ALGO is not set |
866 | # CONFIG_I2C_DEBUG_BUS is not set | 895 | # CONFIG_I2C_DEBUG_BUS is not set |
867 | # CONFIG_I2C_DEBUG_CHIP is not set | 896 | # CONFIG_I2C_DEBUG_CHIP is not set |
868 | # CONFIG_SPI is not set | 897 | # CONFIG_SPI is not set |
898 | |||
899 | # | ||
900 | # PPS support | ||
901 | # | ||
902 | # CONFIG_PPS is not set | ||
869 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 903 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
870 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 904 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
871 | CONFIG_GPIOLIB=y | 905 | CONFIG_GPIOLIB=y |
@@ -944,6 +978,7 @@ CONFIG_SENSORS_LM75=y | |||
944 | # CONFIG_SENSORS_SMSC47B397 is not set | 978 | # CONFIG_SENSORS_SMSC47B397 is not set |
945 | # CONFIG_SENSORS_ADS7828 is not set | 979 | # CONFIG_SENSORS_ADS7828 is not set |
946 | # CONFIG_SENSORS_THMC50 is not set | 980 | # CONFIG_SENSORS_THMC50 is not set |
981 | # CONFIG_SENSORS_TMP401 is not set | ||
947 | # CONFIG_SENSORS_VIA686A is not set | 982 | # CONFIG_SENSORS_VIA686A is not set |
948 | # CONFIG_SENSORS_VT1211 is not set | 983 | # CONFIG_SENSORS_VT1211 is not set |
949 | # CONFIG_SENSORS_VT8231 is not set | 984 | # CONFIG_SENSORS_VT8231 is not set |
@@ -979,23 +1014,9 @@ CONFIG_SSB_POSSIBLE=y | |||
979 | # CONFIG_MFD_WM8400 is not set | 1014 | # CONFIG_MFD_WM8400 is not set |
980 | # CONFIG_MFD_WM8350_I2C is not set | 1015 | # CONFIG_MFD_WM8350_I2C is not set |
981 | # CONFIG_MFD_PCF50633 is not set | 1016 | # CONFIG_MFD_PCF50633 is not set |
1017 | # CONFIG_AB3100_CORE is not set | ||
982 | # CONFIG_REGULATOR is not set | 1018 | # CONFIG_REGULATOR is not set |
983 | 1019 | # CONFIG_MEDIA_SUPPORT is not set | |
984 | # | ||
985 | # Multimedia devices | ||
986 | # | ||
987 | |||
988 | # | ||
989 | # Multimedia core support | ||
990 | # | ||
991 | # CONFIG_VIDEO_DEV is not set | ||
992 | # CONFIG_DVB_CORE is not set | ||
993 | # CONFIG_VIDEO_MEDIA is not set | ||
994 | |||
995 | # | ||
996 | # Multimedia drivers | ||
997 | # | ||
998 | CONFIG_DAB=y | ||
999 | 1020 | ||
1000 | # | 1021 | # |
1001 | # Graphics support | 1022 | # Graphics support |
@@ -1052,6 +1073,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1052 | # CONFIG_DMADEVICES is not set | 1073 | # CONFIG_DMADEVICES is not set |
1053 | # CONFIG_AUXDISPLAY is not set | 1074 | # CONFIG_AUXDISPLAY is not set |
1054 | # CONFIG_UIO is not set | 1075 | # CONFIG_UIO is not set |
1076 | |||
1077 | # | ||
1078 | # TI VLYNQ | ||
1079 | # | ||
1055 | # CONFIG_STAGING is not set | 1080 | # CONFIG_STAGING is not set |
1056 | 1081 | ||
1057 | # | 1082 | # |
@@ -1071,10 +1096,12 @@ CONFIG_FS_MBCACHE=y | |||
1071 | # CONFIG_REISERFS_FS is not set | 1096 | # CONFIG_REISERFS_FS is not set |
1072 | # CONFIG_JFS_FS is not set | 1097 | # CONFIG_JFS_FS is not set |
1073 | # CONFIG_FS_POSIX_ACL is not set | 1098 | # CONFIG_FS_POSIX_ACL is not set |
1074 | CONFIG_FILE_LOCKING=y | ||
1075 | # CONFIG_XFS_FS is not set | 1099 | # CONFIG_XFS_FS is not set |
1100 | # CONFIG_GFS2_FS is not set | ||
1076 | # CONFIG_OCFS2_FS is not set | 1101 | # CONFIG_OCFS2_FS is not set |
1077 | # CONFIG_BTRFS_FS is not set | 1102 | # CONFIG_BTRFS_FS is not set |
1103 | CONFIG_FILE_LOCKING=y | ||
1104 | CONFIG_FSNOTIFY=y | ||
1078 | CONFIG_DNOTIFY=y | 1105 | CONFIG_DNOTIFY=y |
1079 | CONFIG_INOTIFY=y | 1106 | CONFIG_INOTIFY=y |
1080 | CONFIG_INOTIFY_USER=y | 1107 | CONFIG_INOTIFY_USER=y |
@@ -1201,6 +1228,7 @@ CONFIG_HAS_IOPORT=y | |||
1201 | CONFIG_HAS_DMA=y | 1228 | CONFIG_HAS_DMA=y |
1202 | CONFIG_HAVE_LMB=y | 1229 | CONFIG_HAVE_LMB=y |
1203 | CONFIG_NLATTR=y | 1230 | CONFIG_NLATTR=y |
1231 | CONFIG_GENERIC_ATOMIC64=y | ||
1204 | 1232 | ||
1205 | # | 1233 | # |
1206 | # Kernel hacking | 1234 | # Kernel hacking |
@@ -1226,22 +1254,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1226 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1254 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1227 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1255 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1228 | CONFIG_TRACING_SUPPORT=y | 1256 | CONFIG_TRACING_SUPPORT=y |
1229 | 1257 | # CONFIG_FTRACE is not set | |
1230 | # | ||
1231 | # Tracers | ||
1232 | # | ||
1233 | # CONFIG_FUNCTION_TRACER is not set | ||
1234 | # CONFIG_SCHED_TRACER is not set | ||
1235 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1236 | # CONFIG_EVENT_TRACER is not set | ||
1237 | # CONFIG_BOOT_TRACER is not set | ||
1238 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1239 | # CONFIG_STACK_TRACER is not set | ||
1240 | # CONFIG_KMEMTRACE is not set | ||
1241 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1242 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1243 | # CONFIG_SAMPLES is not set | 1258 | # CONFIG_SAMPLES is not set |
1244 | CONFIG_HAVE_ARCH_KGDB=y | 1259 | CONFIG_HAVE_ARCH_KGDB=y |
1260 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1261 | CONFIG_PPC_WERROR=y | ||
1245 | CONFIG_PRINT_STACK_DEPTH=64 | 1262 | CONFIG_PRINT_STACK_DEPTH=64 |
1246 | # CONFIG_IRQSTACKS is not set | 1263 | # CONFIG_IRQSTACKS is not set |
1247 | # CONFIG_PPC_EARLY_DEBUG is not set | 1264 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig index 8b4faae7a9a1..4f228a905274 100644 --- a/arch/powerpc/configs/85xx/tqm8548_defconfig +++ b/arch/powerpc/configs/85xx/tqm8548_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:24 2009 | 4 | # Wed Jul 29 23:32:23 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
48 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -56,11 +57,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
57 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
64 | 67 | ||
65 | # | 68 | # |
66 | # General setup | 69 | # General setup |
@@ -111,7 +114,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
111 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
112 | # CONFIG_KALLSYMS_ALL is not set | 115 | # CONFIG_KALLSYMS_ALL is not set |
113 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 116 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
114 | # CONFIG_STRIP_ASM_SYMS is not set | ||
115 | CONFIG_HOTPLUG=y | 117 | CONFIG_HOTPLUG=y |
116 | CONFIG_PRINTK=y | 118 | CONFIG_PRINTK=y |
117 | CONFIG_BUG=y | 119 | CONFIG_BUG=y |
@@ -124,9 +126,16 @@ CONFIG_TIMERFD=y | |||
124 | CONFIG_EVENTFD=y | 126 | CONFIG_EVENTFD=y |
125 | CONFIG_SHMEM=y | 127 | CONFIG_SHMEM=y |
126 | CONFIG_AIO=y | 128 | CONFIG_AIO=y |
129 | CONFIG_HAVE_PERF_COUNTERS=y | ||
130 | |||
131 | # | ||
132 | # Performance Counters | ||
133 | # | ||
134 | # CONFIG_PERF_COUNTERS is not set | ||
127 | CONFIG_VM_EVENT_COUNTERS=y | 135 | CONFIG_VM_EVENT_COUNTERS=y |
128 | CONFIG_PCI_QUIRKS=y | 136 | CONFIG_PCI_QUIRKS=y |
129 | CONFIG_SLUB_DEBUG=y | 137 | CONFIG_SLUB_DEBUG=y |
138 | # CONFIG_STRIP_ASM_SYMS is not set | ||
130 | CONFIG_COMPAT_BRK=y | 139 | CONFIG_COMPAT_BRK=y |
131 | # CONFIG_SLAB is not set | 140 | # CONFIG_SLAB is not set |
132 | CONFIG_SLUB=y | 141 | CONFIG_SLUB=y |
@@ -140,6 +149,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
140 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
141 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
142 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | |||
153 | # | ||
154 | # GCOV-based kernel profiling | ||
155 | # | ||
143 | # CONFIG_SLOW_WORK is not set | 156 | # CONFIG_SLOW_WORK is not set |
144 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 157 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
145 | CONFIG_SLABINFO=y | 158 | CONFIG_SLABINFO=y |
@@ -152,7 +165,7 @@ CONFIG_MODULE_UNLOAD=y | |||
152 | # CONFIG_MODVERSIONS is not set | 165 | # CONFIG_MODVERSIONS is not set |
153 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 166 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
154 | CONFIG_BLOCK=y | 167 | CONFIG_BLOCK=y |
155 | # CONFIG_LBD is not set | 168 | CONFIG_LBDAF=y |
156 | # CONFIG_BLK_DEV_BSG is not set | 169 | # CONFIG_BLK_DEV_BSG is not set |
157 | # CONFIG_BLK_DEV_INTEGRITY is not set | 170 | # CONFIG_BLK_DEV_INTEGRITY is not set |
158 | 171 | ||
@@ -185,6 +198,7 @@ CONFIG_MPC85xx=y | |||
185 | # CONFIG_MPC85xx_DS is not set | 198 | # CONFIG_MPC85xx_DS is not set |
186 | # CONFIG_SOCRATES is not set | 199 | # CONFIG_SOCRATES is not set |
187 | # CONFIG_KSI8560 is not set | 200 | # CONFIG_KSI8560 is not set |
201 | # CONFIG_XES_MPC85xx is not set | ||
188 | # CONFIG_STX_GP3 is not set | 202 | # CONFIG_STX_GP3 is not set |
189 | # CONFIG_TQM8540 is not set | 203 | # CONFIG_TQM8540 is not set |
190 | # CONFIG_TQM8541 is not set | 204 | # CONFIG_TQM8541 is not set |
@@ -234,6 +248,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | CONFIG_BINFMT_MISC=y | 248 | CONFIG_BINFMT_MISC=y |
235 | CONFIG_MATH_EMULATION=y | 249 | CONFIG_MATH_EMULATION=y |
236 | # CONFIG_IOMMU_HELPER is not set | 250 | # CONFIG_IOMMU_HELPER is not set |
251 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 252 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 253 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -252,9 +267,9 @@ CONFIG_MIGRATION=y | |||
252 | CONFIG_ZONE_DMA_FLAG=1 | 267 | CONFIG_ZONE_DMA_FLAG=1 |
253 | CONFIG_BOUNCE=y | 268 | CONFIG_BOUNCE=y |
254 | CONFIG_VIRT_TO_BUS=y | 269 | CONFIG_VIRT_TO_BUS=y |
255 | CONFIG_UNEVICTABLE_LRU=y | ||
256 | CONFIG_HAVE_MLOCK=y | 270 | CONFIG_HAVE_MLOCK=y |
257 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 271 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
272 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
258 | CONFIG_PPC_4K_PAGES=y | 273 | CONFIG_PPC_4K_PAGES=y |
259 | # CONFIG_PPC_16K_PAGES is not set | 274 | # CONFIG_PPC_16K_PAGES is not set |
260 | # CONFIG_PPC_64K_PAGES is not set | 275 | # CONFIG_PPC_64K_PAGES is not set |
@@ -281,6 +296,8 @@ CONFIG_PCI_DOMAINS=y | |||
281 | CONFIG_PCI_SYSCALL=y | 296 | CONFIG_PCI_SYSCALL=y |
282 | CONFIG_PCIEPORTBUS=y | 297 | CONFIG_PCIEPORTBUS=y |
283 | CONFIG_PCIEAER=y | 298 | CONFIG_PCIEAER=y |
299 | # CONFIG_PCIE_ECRC is not set | ||
300 | # CONFIG_PCIEAER_INJECT is not set | ||
284 | # CONFIG_PCIEASPM is not set | 301 | # CONFIG_PCIEASPM is not set |
285 | CONFIG_ARCH_SUPPORTS_MSI=y | 302 | CONFIG_ARCH_SUPPORTS_MSI=y |
286 | # CONFIG_PCI_MSI is not set | 303 | # CONFIG_PCI_MSI is not set |
@@ -368,6 +385,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
368 | # CONFIG_ECONET is not set | 385 | # CONFIG_ECONET is not set |
369 | # CONFIG_WAN_ROUTER is not set | 386 | # CONFIG_WAN_ROUTER is not set |
370 | # CONFIG_PHONET is not set | 387 | # CONFIG_PHONET is not set |
388 | # CONFIG_IEEE802154 is not set | ||
371 | # CONFIG_NET_SCHED is not set | 389 | # CONFIG_NET_SCHED is not set |
372 | # CONFIG_DCB is not set | 390 | # CONFIG_DCB is not set |
373 | 391 | ||
@@ -497,6 +515,7 @@ CONFIG_MTD_NAND_FSL_UPM=y | |||
497 | # CONFIG_MTD_UBI is not set | 515 | # CONFIG_MTD_UBI is not set |
498 | CONFIG_OF_DEVICE=y | 516 | CONFIG_OF_DEVICE=y |
499 | CONFIG_OF_I2C=y | 517 | CONFIG_OF_I2C=y |
518 | CONFIG_OF_MDIO=y | ||
500 | # CONFIG_PARPORT is not set | 519 | # CONFIG_PARPORT is not set |
501 | CONFIG_BLK_DEV=y | 520 | CONFIG_BLK_DEV=y |
502 | # CONFIG_BLK_DEV_FD is not set | 521 | # CONFIG_BLK_DEV_FD is not set |
@@ -531,7 +550,9 @@ CONFIG_MISC_DEVICES=y | |||
531 | # | 550 | # |
532 | # CONFIG_EEPROM_AT24 is not set | 551 | # CONFIG_EEPROM_AT24 is not set |
533 | # CONFIG_EEPROM_LEGACY is not set | 552 | # CONFIG_EEPROM_LEGACY is not set |
553 | # CONFIG_EEPROM_MAX6875 is not set | ||
534 | # CONFIG_EEPROM_93CX6 is not set | 554 | # CONFIG_EEPROM_93CX6 is not set |
555 | # CONFIG_CB710_CORE is not set | ||
535 | CONFIG_HAVE_IDE=y | 556 | CONFIG_HAVE_IDE=y |
536 | # CONFIG_IDE is not set | 557 | # CONFIG_IDE is not set |
537 | 558 | ||
@@ -551,14 +572,17 @@ CONFIG_HAVE_IDE=y | |||
551 | # | 572 | # |
552 | 573 | ||
553 | # | 574 | # |
554 | # Enable only one of the two stacks, unless you know what you are doing | 575 | # You can enable one or both FireWire driver stacks. |
576 | # | ||
577 | |||
578 | # | ||
579 | # See the help texts for more information. | ||
555 | # | 580 | # |
556 | # CONFIG_FIREWIRE is not set | 581 | # CONFIG_FIREWIRE is not set |
557 | # CONFIG_IEEE1394 is not set | 582 | # CONFIG_IEEE1394 is not set |
558 | # CONFIG_I2O is not set | 583 | # CONFIG_I2O is not set |
559 | # CONFIG_MACINTOSH_DRIVERS is not set | 584 | # CONFIG_MACINTOSH_DRIVERS is not set |
560 | CONFIG_NETDEVICES=y | 585 | CONFIG_NETDEVICES=y |
561 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
562 | # CONFIG_DUMMY is not set | 586 | # CONFIG_DUMMY is not set |
563 | # CONFIG_BONDING is not set | 587 | # CONFIG_BONDING is not set |
564 | # CONFIG_MACVLAN is not set | 588 | # CONFIG_MACVLAN is not set |
@@ -605,6 +629,7 @@ CONFIG_MII=y | |||
605 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 629 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
606 | # CONFIG_NET_PCI is not set | 630 | # CONFIG_NET_PCI is not set |
607 | # CONFIG_B44 is not set | 631 | # CONFIG_B44 is not set |
632 | # CONFIG_KS8842 is not set | ||
608 | # CONFIG_ATL2 is not set | 633 | # CONFIG_ATL2 is not set |
609 | CONFIG_NETDEV_1000=y | 634 | CONFIG_NETDEV_1000=y |
610 | # CONFIG_ACENIC is not set | 635 | # CONFIG_ACENIC is not set |
@@ -624,8 +649,10 @@ CONFIG_NETDEV_1000=y | |||
624 | # CONFIG_VIA_VELOCITY is not set | 649 | # CONFIG_VIA_VELOCITY is not set |
625 | # CONFIG_TIGON3 is not set | 650 | # CONFIG_TIGON3 is not set |
626 | # CONFIG_BNX2 is not set | 651 | # CONFIG_BNX2 is not set |
652 | # CONFIG_CNIC is not set | ||
627 | CONFIG_FSL_PQ_MDIO=y | 653 | CONFIG_FSL_PQ_MDIO=y |
628 | CONFIG_GIANFAR=y | 654 | CONFIG_GIANFAR=y |
655 | # CONFIG_MV643XX_ETH is not set | ||
629 | # CONFIG_QLA3XXX is not set | 656 | # CONFIG_QLA3XXX is not set |
630 | # CONFIG_ATL1 is not set | 657 | # CONFIG_ATL1 is not set |
631 | # CONFIG_ATL1E is not set | 658 | # CONFIG_ATL1E is not set |
@@ -801,13 +828,17 @@ CONFIG_I2C_MPC=y | |||
801 | # CONFIG_SENSORS_PCF8574 is not set | 828 | # CONFIG_SENSORS_PCF8574 is not set |
802 | # CONFIG_PCF8575 is not set | 829 | # CONFIG_PCF8575 is not set |
803 | # CONFIG_SENSORS_PCA9539 is not set | 830 | # CONFIG_SENSORS_PCA9539 is not set |
804 | # CONFIG_SENSORS_MAX6875 is not set | ||
805 | # CONFIG_SENSORS_TSL2550 is not set | 831 | # CONFIG_SENSORS_TSL2550 is not set |
806 | # CONFIG_I2C_DEBUG_CORE is not set | 832 | # CONFIG_I2C_DEBUG_CORE is not set |
807 | # CONFIG_I2C_DEBUG_ALGO is not set | 833 | # CONFIG_I2C_DEBUG_ALGO is not set |
808 | # CONFIG_I2C_DEBUG_BUS is not set | 834 | # CONFIG_I2C_DEBUG_BUS is not set |
809 | # CONFIG_I2C_DEBUG_CHIP is not set | 835 | # CONFIG_I2C_DEBUG_CHIP is not set |
810 | # CONFIG_SPI is not set | 836 | # CONFIG_SPI is not set |
837 | |||
838 | # | ||
839 | # PPS support | ||
840 | # | ||
841 | # CONFIG_PPS is not set | ||
811 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 842 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
812 | # CONFIG_GPIOLIB is not set | 843 | # CONFIG_GPIOLIB is not set |
813 | # CONFIG_W1 is not set | 844 | # CONFIG_W1 is not set |
@@ -862,6 +893,7 @@ CONFIG_SENSORS_LM75=y | |||
862 | # CONFIG_SENSORS_SMSC47B397 is not set | 893 | # CONFIG_SENSORS_SMSC47B397 is not set |
863 | # CONFIG_SENSORS_ADS7828 is not set | 894 | # CONFIG_SENSORS_ADS7828 is not set |
864 | # CONFIG_SENSORS_THMC50 is not set | 895 | # CONFIG_SENSORS_THMC50 is not set |
896 | # CONFIG_SENSORS_TMP401 is not set | ||
865 | # CONFIG_SENSORS_VIA686A is not set | 897 | # CONFIG_SENSORS_VIA686A is not set |
866 | # CONFIG_SENSORS_VT1211 is not set | 898 | # CONFIG_SENSORS_VT1211 is not set |
867 | # CONFIG_SENSORS_VT8231 is not set | 899 | # CONFIG_SENSORS_VT8231 is not set |
@@ -896,23 +928,9 @@ CONFIG_SSB_POSSIBLE=y | |||
896 | # CONFIG_MFD_WM8400 is not set | 928 | # CONFIG_MFD_WM8400 is not set |
897 | # CONFIG_MFD_WM8350_I2C is not set | 929 | # CONFIG_MFD_WM8350_I2C is not set |
898 | # CONFIG_MFD_PCF50633 is not set | 930 | # CONFIG_MFD_PCF50633 is not set |
931 | # CONFIG_AB3100_CORE is not set | ||
899 | # CONFIG_REGULATOR is not set | 932 | # CONFIG_REGULATOR is not set |
900 | 933 | # CONFIG_MEDIA_SUPPORT is not set | |
901 | # | ||
902 | # Multimedia devices | ||
903 | # | ||
904 | |||
905 | # | ||
906 | # Multimedia core support | ||
907 | # | ||
908 | # CONFIG_VIDEO_DEV is not set | ||
909 | # CONFIG_DVB_CORE is not set | ||
910 | # CONFIG_VIDEO_MEDIA is not set | ||
911 | |||
912 | # | ||
913 | # Multimedia drivers | ||
914 | # | ||
915 | CONFIG_DAB=y | ||
916 | 934 | ||
917 | # | 935 | # |
918 | # Graphics support | 936 | # Graphics support |
@@ -977,6 +995,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
977 | # CONFIG_RTC_DRV_S35390A is not set | 995 | # CONFIG_RTC_DRV_S35390A is not set |
978 | # CONFIG_RTC_DRV_FM3130 is not set | 996 | # CONFIG_RTC_DRV_FM3130 is not set |
979 | # CONFIG_RTC_DRV_RX8581 is not set | 997 | # CONFIG_RTC_DRV_RX8581 is not set |
998 | # CONFIG_RTC_DRV_RX8025 is not set | ||
980 | 999 | ||
981 | # | 1000 | # |
982 | # SPI RTC drivers | 1001 | # SPI RTC drivers |
@@ -1004,6 +1023,10 @@ CONFIG_RTC_DRV_DS1307=y | |||
1004 | # CONFIG_DMADEVICES is not set | 1023 | # CONFIG_DMADEVICES is not set |
1005 | # CONFIG_AUXDISPLAY is not set | 1024 | # CONFIG_AUXDISPLAY is not set |
1006 | # CONFIG_UIO is not set | 1025 | # CONFIG_UIO is not set |
1026 | |||
1027 | # | ||
1028 | # TI VLYNQ | ||
1029 | # | ||
1007 | # CONFIG_STAGING is not set | 1030 | # CONFIG_STAGING is not set |
1008 | 1031 | ||
1009 | # | 1032 | # |
@@ -1015,10 +1038,12 @@ CONFIG_RTC_DRV_DS1307=y | |||
1015 | # CONFIG_REISERFS_FS is not set | 1038 | # CONFIG_REISERFS_FS is not set |
1016 | # CONFIG_JFS_FS is not set | 1039 | # CONFIG_JFS_FS is not set |
1017 | # CONFIG_FS_POSIX_ACL is not set | 1040 | # CONFIG_FS_POSIX_ACL is not set |
1018 | CONFIG_FILE_LOCKING=y | ||
1019 | # CONFIG_XFS_FS is not set | 1041 | # CONFIG_XFS_FS is not set |
1042 | # CONFIG_GFS2_FS is not set | ||
1020 | # CONFIG_OCFS2_FS is not set | 1043 | # CONFIG_OCFS2_FS is not set |
1021 | # CONFIG_BTRFS_FS is not set | 1044 | # CONFIG_BTRFS_FS is not set |
1045 | CONFIG_FILE_LOCKING=y | ||
1046 | CONFIG_FSNOTIFY=y | ||
1022 | CONFIG_DNOTIFY=y | 1047 | CONFIG_DNOTIFY=y |
1023 | CONFIG_INOTIFY=y | 1048 | CONFIG_INOTIFY=y |
1024 | CONFIG_INOTIFY_USER=y | 1049 | CONFIG_INOTIFY_USER=y |
@@ -1145,6 +1170,7 @@ CONFIG_HAS_IOPORT=y | |||
1145 | CONFIG_HAS_DMA=y | 1170 | CONFIG_HAS_DMA=y |
1146 | CONFIG_HAVE_LMB=y | 1171 | CONFIG_HAVE_LMB=y |
1147 | CONFIG_NLATTR=y | 1172 | CONFIG_NLATTR=y |
1173 | CONFIG_GENERIC_ATOMIC64=y | ||
1148 | 1174 | ||
1149 | # | 1175 | # |
1150 | # Kernel hacking | 1176 | # Kernel hacking |
@@ -1175,6 +1201,9 @@ CONFIG_SCHED_DEBUG=y | |||
1175 | # CONFIG_RT_MUTEX_TESTER is not set | 1201 | # CONFIG_RT_MUTEX_TESTER is not set |
1176 | # CONFIG_DEBUG_SPINLOCK is not set | 1202 | # CONFIG_DEBUG_SPINLOCK is not set |
1177 | CONFIG_DEBUG_MUTEXES=y | 1203 | CONFIG_DEBUG_MUTEXES=y |
1204 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1205 | # CONFIG_PROVE_LOCKING is not set | ||
1206 | # CONFIG_LOCK_STAT is not set | ||
1178 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1207 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1179 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1208 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1180 | # CONFIG_DEBUG_KOBJECT is not set | 1209 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1187,7 +1216,6 @@ CONFIG_DEBUG_MUTEXES=y | |||
1187 | # CONFIG_DEBUG_LIST is not set | 1216 | # CONFIG_DEBUG_LIST is not set |
1188 | # CONFIG_DEBUG_SG is not set | 1217 | # CONFIG_DEBUG_SG is not set |
1189 | # CONFIG_DEBUG_NOTIFIERS is not set | 1218 | # CONFIG_DEBUG_NOTIFIERS is not set |
1190 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1191 | # CONFIG_RCU_TORTURE_TEST is not set | 1219 | # CONFIG_RCU_TORTURE_TEST is not set |
1192 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1220 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1193 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1221 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1201,16 +1229,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1201 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1229 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1202 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1230 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1203 | CONFIG_TRACING_SUPPORT=y | 1231 | CONFIG_TRACING_SUPPORT=y |
1204 | 1232 | CONFIG_FTRACE=y | |
1205 | # | ||
1206 | # Tracers | ||
1207 | # | ||
1208 | # CONFIG_FUNCTION_TRACER is not set | 1233 | # CONFIG_FUNCTION_TRACER is not set |
1234 | # CONFIG_IRQSOFF_TRACER is not set | ||
1209 | # CONFIG_SCHED_TRACER is not set | 1235 | # CONFIG_SCHED_TRACER is not set |
1210 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1236 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1211 | # CONFIG_EVENT_TRACER is not set | ||
1212 | # CONFIG_BOOT_TRACER is not set | 1237 | # CONFIG_BOOT_TRACER is not set |
1213 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1238 | CONFIG_BRANCH_PROFILE_NONE=y |
1239 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1240 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1214 | # CONFIG_STACK_TRACER is not set | 1241 | # CONFIG_STACK_TRACER is not set |
1215 | # CONFIG_KMEMTRACE is not set | 1242 | # CONFIG_KMEMTRACE is not set |
1216 | # CONFIG_WORKQUEUE_TRACER is not set | 1243 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1218,6 +1245,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1218 | # CONFIG_SAMPLES is not set | 1245 | # CONFIG_SAMPLES is not set |
1219 | CONFIG_HAVE_ARCH_KGDB=y | 1246 | CONFIG_HAVE_ARCH_KGDB=y |
1220 | # CONFIG_KGDB is not set | 1247 | # CONFIG_KGDB is not set |
1248 | # CONFIG_KMEMCHECK is not set | ||
1249 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1250 | CONFIG_PPC_WERROR=y | ||
1221 | CONFIG_PRINT_STACK_DEPTH=64 | 1251 | CONFIG_PRINT_STACK_DEPTH=64 |
1222 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1252 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1223 | # CONFIG_DEBUG_STACK_USAGE is not set | 1253 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index 170360934cec..9196724bebc7 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:25 2009 | 4 | # Wed Jul 29 23:32:24 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -57,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
57 | # CONFIG_GENERIC_TBSYNC is not set | 58 | # CONFIG_GENERIC_TBSYNC is not set |
58 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
59 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
60 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
61 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
62 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
65 | 68 | ||
66 | # | 69 | # |
67 | # General setup | 70 | # General setup |
@@ -110,7 +113,6 @@ CONFIG_ANON_INODES=y | |||
110 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
111 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
112 | # CONFIG_KALLSYMS is not set | 115 | # CONFIG_KALLSYMS is not set |
113 | # CONFIG_STRIP_ASM_SYMS is not set | ||
114 | # CONFIG_HOTPLUG is not set | 116 | # CONFIG_HOTPLUG is not set |
115 | CONFIG_PRINTK=y | 117 | CONFIG_PRINTK=y |
116 | CONFIG_BUG=y | 118 | CONFIG_BUG=y |
@@ -123,9 +125,16 @@ CONFIG_TIMERFD=y | |||
123 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
124 | CONFIG_SHMEM=y | 126 | CONFIG_SHMEM=y |
125 | CONFIG_AIO=y | 127 | CONFIG_AIO=y |
128 | CONFIG_HAVE_PERF_COUNTERS=y | ||
129 | |||
130 | # | ||
131 | # Performance Counters | ||
132 | # | ||
133 | # CONFIG_PERF_COUNTERS is not set | ||
126 | CONFIG_VM_EVENT_COUNTERS=y | 134 | CONFIG_VM_EVENT_COUNTERS=y |
127 | CONFIG_PCI_QUIRKS=y | 135 | CONFIG_PCI_QUIRKS=y |
128 | CONFIG_SLUB_DEBUG=y | 136 | CONFIG_SLUB_DEBUG=y |
137 | # CONFIG_STRIP_ASM_SYMS is not set | ||
129 | CONFIG_COMPAT_BRK=y | 138 | CONFIG_COMPAT_BRK=y |
130 | # CONFIG_SLAB is not set | 139 | # CONFIG_SLAB is not set |
131 | CONFIG_SLUB=y | 140 | CONFIG_SLUB=y |
@@ -139,6 +148,10 @@ CONFIG_HAVE_KPROBES=y | |||
139 | CONFIG_HAVE_KRETPROBES=y | 148 | CONFIG_HAVE_KRETPROBES=y |
140 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 149 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
141 | CONFIG_HAVE_CLK=y | 150 | CONFIG_HAVE_CLK=y |
151 | |||
152 | # | ||
153 | # GCOV-based kernel profiling | ||
154 | # | ||
142 | # CONFIG_SLOW_WORK is not set | 155 | # CONFIG_SLOW_WORK is not set |
143 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 156 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
144 | CONFIG_SLABINFO=y | 157 | CONFIG_SLABINFO=y |
@@ -146,7 +159,7 @@ CONFIG_RT_MUTEXES=y | |||
146 | CONFIG_BASE_SMALL=0 | 159 | CONFIG_BASE_SMALL=0 |
147 | # CONFIG_MODULES is not set | 160 | # CONFIG_MODULES is not set |
148 | CONFIG_BLOCK=y | 161 | CONFIG_BLOCK=y |
149 | # CONFIG_LBD is not set | 162 | CONFIG_LBDAF=y |
150 | # CONFIG_BLK_DEV_BSG is not set | 163 | # CONFIG_BLK_DEV_BSG is not set |
151 | # CONFIG_BLK_DEV_INTEGRITY is not set | 164 | # CONFIG_BLK_DEV_INTEGRITY is not set |
152 | 165 | ||
@@ -179,6 +192,7 @@ CONFIG_MPC85xx=y | |||
179 | # CONFIG_MPC85xx_DS is not set | 192 | # CONFIG_MPC85xx_DS is not set |
180 | # CONFIG_SOCRATES is not set | 193 | # CONFIG_SOCRATES is not set |
181 | # CONFIG_KSI8560 is not set | 194 | # CONFIG_KSI8560 is not set |
195 | # CONFIG_XES_MPC85xx is not set | ||
182 | # CONFIG_STX_GP3 is not set | 196 | # CONFIG_STX_GP3 is not set |
183 | # CONFIG_TQM8540 is not set | 197 | # CONFIG_TQM8540 is not set |
184 | # CONFIG_TQM8541 is not set | 198 | # CONFIG_TQM8541 is not set |
@@ -228,6 +242,7 @@ CONFIG_BINFMT_ELF=y | |||
228 | # CONFIG_BINFMT_MISC is not set | 242 | # CONFIG_BINFMT_MISC is not set |
229 | CONFIG_MATH_EMULATION=y | 243 | CONFIG_MATH_EMULATION=y |
230 | # CONFIG_IOMMU_HELPER is not set | 244 | # CONFIG_IOMMU_HELPER is not set |
245 | # CONFIG_SWIOTLB is not set | ||
231 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 246 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
232 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 247 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
233 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 248 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -246,9 +261,9 @@ CONFIG_MIGRATION=y | |||
246 | CONFIG_ZONE_DMA_FLAG=1 | 261 | CONFIG_ZONE_DMA_FLAG=1 |
247 | CONFIG_BOUNCE=y | 262 | CONFIG_BOUNCE=y |
248 | CONFIG_VIRT_TO_BUS=y | 263 | CONFIG_VIRT_TO_BUS=y |
249 | CONFIG_UNEVICTABLE_LRU=y | ||
250 | CONFIG_HAVE_MLOCK=y | 264 | CONFIG_HAVE_MLOCK=y |
251 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 265 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
266 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
252 | CONFIG_PPC_4K_PAGES=y | 267 | CONFIG_PPC_4K_PAGES=y |
253 | # CONFIG_PPC_16K_PAGES is not set | 268 | # CONFIG_PPC_16K_PAGES is not set |
254 | # CONFIG_PPC_64K_PAGES is not set | 269 | # CONFIG_PPC_64K_PAGES is not set |
@@ -356,6 +371,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
356 | # CONFIG_ECONET is not set | 371 | # CONFIG_ECONET is not set |
357 | # CONFIG_WAN_ROUTER is not set | 372 | # CONFIG_WAN_ROUTER is not set |
358 | # CONFIG_PHONET is not set | 373 | # CONFIG_PHONET is not set |
374 | # CONFIG_IEEE802154 is not set | ||
359 | # CONFIG_NET_SCHED is not set | 375 | # CONFIG_NET_SCHED is not set |
360 | # CONFIG_DCB is not set | 376 | # CONFIG_DCB is not set |
361 | 377 | ||
@@ -373,7 +389,11 @@ CONFIG_WIRELESS=y | |||
373 | CONFIG_WIRELESS_OLD_REGULATORY=y | 389 | CONFIG_WIRELESS_OLD_REGULATORY=y |
374 | # CONFIG_WIRELESS_EXT is not set | 390 | # CONFIG_WIRELESS_EXT is not set |
375 | # CONFIG_LIB80211 is not set | 391 | # CONFIG_LIB80211 is not set |
376 | # CONFIG_MAC80211 is not set | 392 | |
393 | # | ||
394 | # CFG80211 needs to be enabled for MAC80211 | ||
395 | # | ||
396 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
377 | # CONFIG_WIMAX is not set | 397 | # CONFIG_WIMAX is not set |
378 | # CONFIG_RFKILL is not set | 398 | # CONFIG_RFKILL is not set |
379 | # CONFIG_NET_9P is not set | 399 | # CONFIG_NET_9P is not set |
@@ -475,6 +495,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
475 | CONFIG_OF_DEVICE=y | 495 | CONFIG_OF_DEVICE=y |
476 | CONFIG_OF_GPIO=y | 496 | CONFIG_OF_GPIO=y |
477 | CONFIG_OF_I2C=y | 497 | CONFIG_OF_I2C=y |
498 | CONFIG_OF_MDIO=y | ||
478 | # CONFIG_PARPORT is not set | 499 | # CONFIG_PARPORT is not set |
479 | CONFIG_BLK_DEV=y | 500 | CONFIG_BLK_DEV=y |
480 | # CONFIG_BLK_DEV_FD is not set | 501 | # CONFIG_BLK_DEV_FD is not set |
@@ -509,7 +530,9 @@ CONFIG_MISC_DEVICES=y | |||
509 | # | 530 | # |
510 | # CONFIG_EEPROM_AT24 is not set | 531 | # CONFIG_EEPROM_AT24 is not set |
511 | # CONFIG_EEPROM_LEGACY is not set | 532 | # CONFIG_EEPROM_LEGACY is not set |
533 | # CONFIG_EEPROM_MAX6875 is not set | ||
512 | # CONFIG_EEPROM_93CX6 is not set | 534 | # CONFIG_EEPROM_93CX6 is not set |
535 | # CONFIG_CB710_CORE is not set | ||
513 | CONFIG_HAVE_IDE=y | 536 | CONFIG_HAVE_IDE=y |
514 | CONFIG_IDE=y | 537 | CONFIG_IDE=y |
515 | 538 | ||
@@ -584,14 +607,17 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
584 | # | 607 | # |
585 | 608 | ||
586 | # | 609 | # |
587 | # Enable only one of the two stacks, unless you know what you are doing | 610 | # You can enable one or both FireWire driver stacks. |
611 | # | ||
612 | |||
613 | # | ||
614 | # See the help texts for more information. | ||
588 | # | 615 | # |
589 | # CONFIG_FIREWIRE is not set | 616 | # CONFIG_FIREWIRE is not set |
590 | # CONFIG_IEEE1394 is not set | 617 | # CONFIG_IEEE1394 is not set |
591 | # CONFIG_I2O is not set | 618 | # CONFIG_I2O is not set |
592 | # CONFIG_MACINTOSH_DRIVERS is not set | 619 | # CONFIG_MACINTOSH_DRIVERS is not set |
593 | CONFIG_NETDEVICES=y | 620 | CONFIG_NETDEVICES=y |
594 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
595 | # CONFIG_DUMMY is not set | 621 | # CONFIG_DUMMY is not set |
596 | # CONFIG_BONDING is not set | 622 | # CONFIG_BONDING is not set |
597 | # CONFIG_MACVLAN is not set | 623 | # CONFIG_MACVLAN is not set |
@@ -654,6 +680,7 @@ CONFIG_E100=y | |||
654 | # CONFIG_SMSC9420 is not set | 680 | # CONFIG_SMSC9420 is not set |
655 | # CONFIG_SUNDANCE is not set | 681 | # CONFIG_SUNDANCE is not set |
656 | # CONFIG_TLAN is not set | 682 | # CONFIG_TLAN is not set |
683 | # CONFIG_KS8842 is not set | ||
657 | # CONFIG_VIA_RHINE is not set | 684 | # CONFIG_VIA_RHINE is not set |
658 | # CONFIG_SC92031 is not set | 685 | # CONFIG_SC92031 is not set |
659 | # CONFIG_ATL2 is not set | 686 | # CONFIG_ATL2 is not set |
@@ -676,8 +703,10 @@ CONFIG_NETDEV_1000=y | |||
676 | # CONFIG_VIA_VELOCITY is not set | 703 | # CONFIG_VIA_VELOCITY is not set |
677 | # CONFIG_TIGON3 is not set | 704 | # CONFIG_TIGON3 is not set |
678 | # CONFIG_BNX2 is not set | 705 | # CONFIG_BNX2 is not set |
706 | # CONFIG_CNIC is not set | ||
679 | CONFIG_FSL_PQ_MDIO=y | 707 | CONFIG_FSL_PQ_MDIO=y |
680 | CONFIG_GIANFAR=y | 708 | CONFIG_GIANFAR=y |
709 | # CONFIG_MV643XX_ETH is not set | ||
681 | # CONFIG_QLA3XXX is not set | 710 | # CONFIG_QLA3XXX is not set |
682 | # CONFIG_ATL1 is not set | 711 | # CONFIG_ATL1 is not set |
683 | # CONFIG_ATL1E is not set | 712 | # CONFIG_ATL1E is not set |
@@ -831,6 +860,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
831 | # I2C system bus drivers (mostly embedded / system-on-chip) | 860 | # I2C system bus drivers (mostly embedded / system-on-chip) |
832 | # | 861 | # |
833 | # CONFIG_I2C_CPM is not set | 862 | # CONFIG_I2C_CPM is not set |
863 | # CONFIG_I2C_DESIGNWARE is not set | ||
834 | # CONFIG_I2C_GPIO is not set | 864 | # CONFIG_I2C_GPIO is not set |
835 | CONFIG_I2C_MPC=y | 865 | CONFIG_I2C_MPC=y |
836 | # CONFIG_I2C_OCORES is not set | 866 | # CONFIG_I2C_OCORES is not set |
@@ -859,13 +889,17 @@ CONFIG_I2C_MPC=y | |||
859 | # CONFIG_SENSORS_PCF8574 is not set | 889 | # CONFIG_SENSORS_PCF8574 is not set |
860 | # CONFIG_PCF8575 is not set | 890 | # CONFIG_PCF8575 is not set |
861 | # CONFIG_SENSORS_PCA9539 is not set | 891 | # CONFIG_SENSORS_PCA9539 is not set |
862 | # CONFIG_SENSORS_MAX6875 is not set | ||
863 | # CONFIG_SENSORS_TSL2550 is not set | 892 | # CONFIG_SENSORS_TSL2550 is not set |
864 | # CONFIG_I2C_DEBUG_CORE is not set | 893 | # CONFIG_I2C_DEBUG_CORE is not set |
865 | # CONFIG_I2C_DEBUG_ALGO is not set | 894 | # CONFIG_I2C_DEBUG_ALGO is not set |
866 | # CONFIG_I2C_DEBUG_BUS is not set | 895 | # CONFIG_I2C_DEBUG_BUS is not set |
867 | # CONFIG_I2C_DEBUG_CHIP is not set | 896 | # CONFIG_I2C_DEBUG_CHIP is not set |
868 | # CONFIG_SPI is not set | 897 | # CONFIG_SPI is not set |
898 | |||
899 | # | ||
900 | # PPS support | ||
901 | # | ||
902 | # CONFIG_PPS is not set | ||
869 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 903 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
870 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 904 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
871 | CONFIG_GPIOLIB=y | 905 | CONFIG_GPIOLIB=y |
@@ -944,6 +978,7 @@ CONFIG_SENSORS_LM75=y | |||
944 | # CONFIG_SENSORS_SMSC47B397 is not set | 978 | # CONFIG_SENSORS_SMSC47B397 is not set |
945 | # CONFIG_SENSORS_ADS7828 is not set | 979 | # CONFIG_SENSORS_ADS7828 is not set |
946 | # CONFIG_SENSORS_THMC50 is not set | 980 | # CONFIG_SENSORS_THMC50 is not set |
981 | # CONFIG_SENSORS_TMP401 is not set | ||
947 | # CONFIG_SENSORS_VIA686A is not set | 982 | # CONFIG_SENSORS_VIA686A is not set |
948 | # CONFIG_SENSORS_VT1211 is not set | 983 | # CONFIG_SENSORS_VT1211 is not set |
949 | # CONFIG_SENSORS_VT8231 is not set | 984 | # CONFIG_SENSORS_VT8231 is not set |
@@ -979,23 +1014,9 @@ CONFIG_SSB_POSSIBLE=y | |||
979 | # CONFIG_MFD_WM8400 is not set | 1014 | # CONFIG_MFD_WM8400 is not set |
980 | # CONFIG_MFD_WM8350_I2C is not set | 1015 | # CONFIG_MFD_WM8350_I2C is not set |
981 | # CONFIG_MFD_PCF50633 is not set | 1016 | # CONFIG_MFD_PCF50633 is not set |
1017 | # CONFIG_AB3100_CORE is not set | ||
982 | # CONFIG_REGULATOR is not set | 1018 | # CONFIG_REGULATOR is not set |
983 | 1019 | # CONFIG_MEDIA_SUPPORT is not set | |
984 | # | ||
985 | # Multimedia devices | ||
986 | # | ||
987 | |||
988 | # | ||
989 | # Multimedia core support | ||
990 | # | ||
991 | # CONFIG_VIDEO_DEV is not set | ||
992 | # CONFIG_DVB_CORE is not set | ||
993 | # CONFIG_VIDEO_MEDIA is not set | ||
994 | |||
995 | # | ||
996 | # Multimedia drivers | ||
997 | # | ||
998 | CONFIG_DAB=y | ||
999 | 1020 | ||
1000 | # | 1021 | # |
1001 | # Graphics support | 1022 | # Graphics support |
@@ -1052,6 +1073,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1052 | # CONFIG_DMADEVICES is not set | 1073 | # CONFIG_DMADEVICES is not set |
1053 | # CONFIG_AUXDISPLAY is not set | 1074 | # CONFIG_AUXDISPLAY is not set |
1054 | # CONFIG_UIO is not set | 1075 | # CONFIG_UIO is not set |
1076 | |||
1077 | # | ||
1078 | # TI VLYNQ | ||
1079 | # | ||
1055 | # CONFIG_STAGING is not set | 1080 | # CONFIG_STAGING is not set |
1056 | 1081 | ||
1057 | # | 1082 | # |
@@ -1071,10 +1096,12 @@ CONFIG_FS_MBCACHE=y | |||
1071 | # CONFIG_REISERFS_FS is not set | 1096 | # CONFIG_REISERFS_FS is not set |
1072 | # CONFIG_JFS_FS is not set | 1097 | # CONFIG_JFS_FS is not set |
1073 | # CONFIG_FS_POSIX_ACL is not set | 1098 | # CONFIG_FS_POSIX_ACL is not set |
1074 | CONFIG_FILE_LOCKING=y | ||
1075 | # CONFIG_XFS_FS is not set | 1099 | # CONFIG_XFS_FS is not set |
1100 | # CONFIG_GFS2_FS is not set | ||
1076 | # CONFIG_OCFS2_FS is not set | 1101 | # CONFIG_OCFS2_FS is not set |
1077 | # CONFIG_BTRFS_FS is not set | 1102 | # CONFIG_BTRFS_FS is not set |
1103 | CONFIG_FILE_LOCKING=y | ||
1104 | CONFIG_FSNOTIFY=y | ||
1078 | CONFIG_DNOTIFY=y | 1105 | CONFIG_DNOTIFY=y |
1079 | CONFIG_INOTIFY=y | 1106 | CONFIG_INOTIFY=y |
1080 | CONFIG_INOTIFY_USER=y | 1107 | CONFIG_INOTIFY_USER=y |
@@ -1201,6 +1228,7 @@ CONFIG_HAS_IOPORT=y | |||
1201 | CONFIG_HAS_DMA=y | 1228 | CONFIG_HAS_DMA=y |
1202 | CONFIG_HAVE_LMB=y | 1229 | CONFIG_HAVE_LMB=y |
1203 | CONFIG_NLATTR=y | 1230 | CONFIG_NLATTR=y |
1231 | CONFIG_GENERIC_ATOMIC64=y | ||
1204 | 1232 | ||
1205 | # | 1233 | # |
1206 | # Kernel hacking | 1234 | # Kernel hacking |
@@ -1226,22 +1254,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1226 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1254 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1227 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1255 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1228 | CONFIG_TRACING_SUPPORT=y | 1256 | CONFIG_TRACING_SUPPORT=y |
1229 | 1257 | # CONFIG_FTRACE is not set | |
1230 | # | ||
1231 | # Tracers | ||
1232 | # | ||
1233 | # CONFIG_FUNCTION_TRACER is not set | ||
1234 | # CONFIG_SCHED_TRACER is not set | ||
1235 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1236 | # CONFIG_EVENT_TRACER is not set | ||
1237 | # CONFIG_BOOT_TRACER is not set | ||
1238 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1239 | # CONFIG_STACK_TRACER is not set | ||
1240 | # CONFIG_KMEMTRACE is not set | ||
1241 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1242 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1243 | # CONFIG_SAMPLES is not set | 1258 | # CONFIG_SAMPLES is not set |
1244 | CONFIG_HAVE_ARCH_KGDB=y | 1259 | CONFIG_HAVE_ARCH_KGDB=y |
1260 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1261 | CONFIG_PPC_WERROR=y | ||
1245 | CONFIG_PRINT_STACK_DEPTH=64 | 1262 | CONFIG_PRINT_STACK_DEPTH=64 |
1246 | # CONFIG_IRQSTACKS is not set | 1263 | # CONFIG_IRQSTACKS is not set |
1247 | # CONFIG_PPC_EARLY_DEBUG is not set | 1264 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index f41cc2444d48..2e49a6e9faf2 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:26 2009 | 4 | # Wed Jul 29 23:32:25 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -57,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
57 | # CONFIG_GENERIC_TBSYNC is not set | 58 | # CONFIG_GENERIC_TBSYNC is not set |
58 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
59 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
60 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
61 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
62 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
65 | 68 | ||
66 | # | 69 | # |
67 | # General setup | 70 | # General setup |
@@ -110,7 +113,6 @@ CONFIG_ANON_INODES=y | |||
110 | CONFIG_EMBEDDED=y | 113 | CONFIG_EMBEDDED=y |
111 | CONFIG_SYSCTL_SYSCALL=y | 114 | CONFIG_SYSCTL_SYSCALL=y |
112 | # CONFIG_KALLSYMS is not set | 115 | # CONFIG_KALLSYMS is not set |
113 | # CONFIG_STRIP_ASM_SYMS is not set | ||
114 | # CONFIG_HOTPLUG is not set | 116 | # CONFIG_HOTPLUG is not set |
115 | CONFIG_PRINTK=y | 117 | CONFIG_PRINTK=y |
116 | CONFIG_BUG=y | 118 | CONFIG_BUG=y |
@@ -123,9 +125,16 @@ CONFIG_TIMERFD=y | |||
123 | CONFIG_EVENTFD=y | 125 | CONFIG_EVENTFD=y |
124 | CONFIG_SHMEM=y | 126 | CONFIG_SHMEM=y |
125 | CONFIG_AIO=y | 127 | CONFIG_AIO=y |
128 | CONFIG_HAVE_PERF_COUNTERS=y | ||
129 | |||
130 | # | ||
131 | # Performance Counters | ||
132 | # | ||
133 | # CONFIG_PERF_COUNTERS is not set | ||
126 | CONFIG_VM_EVENT_COUNTERS=y | 134 | CONFIG_VM_EVENT_COUNTERS=y |
127 | CONFIG_PCI_QUIRKS=y | 135 | CONFIG_PCI_QUIRKS=y |
128 | CONFIG_SLUB_DEBUG=y | 136 | CONFIG_SLUB_DEBUG=y |
137 | # CONFIG_STRIP_ASM_SYMS is not set | ||
129 | CONFIG_COMPAT_BRK=y | 138 | CONFIG_COMPAT_BRK=y |
130 | # CONFIG_SLAB is not set | 139 | # CONFIG_SLAB is not set |
131 | CONFIG_SLUB=y | 140 | CONFIG_SLUB=y |
@@ -139,6 +148,10 @@ CONFIG_HAVE_KPROBES=y | |||
139 | CONFIG_HAVE_KRETPROBES=y | 148 | CONFIG_HAVE_KRETPROBES=y |
140 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 149 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
141 | CONFIG_HAVE_CLK=y | 150 | CONFIG_HAVE_CLK=y |
151 | |||
152 | # | ||
153 | # GCOV-based kernel profiling | ||
154 | # | ||
142 | # CONFIG_SLOW_WORK is not set | 155 | # CONFIG_SLOW_WORK is not set |
143 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 156 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
144 | CONFIG_SLABINFO=y | 157 | CONFIG_SLABINFO=y |
@@ -146,7 +159,7 @@ CONFIG_RT_MUTEXES=y | |||
146 | CONFIG_BASE_SMALL=0 | 159 | CONFIG_BASE_SMALL=0 |
147 | # CONFIG_MODULES is not set | 160 | # CONFIG_MODULES is not set |
148 | CONFIG_BLOCK=y | 161 | CONFIG_BLOCK=y |
149 | # CONFIG_LBD is not set | 162 | CONFIG_LBDAF=y |
150 | # CONFIG_BLK_DEV_BSG is not set | 163 | # CONFIG_BLK_DEV_BSG is not set |
151 | # CONFIG_BLK_DEV_INTEGRITY is not set | 164 | # CONFIG_BLK_DEV_INTEGRITY is not set |
152 | 165 | ||
@@ -179,6 +192,7 @@ CONFIG_MPC85xx=y | |||
179 | # CONFIG_MPC85xx_DS is not set | 192 | # CONFIG_MPC85xx_DS is not set |
180 | # CONFIG_SOCRATES is not set | 193 | # CONFIG_SOCRATES is not set |
181 | # CONFIG_KSI8560 is not set | 194 | # CONFIG_KSI8560 is not set |
195 | # CONFIG_XES_MPC85xx is not set | ||
182 | # CONFIG_STX_GP3 is not set | 196 | # CONFIG_STX_GP3 is not set |
183 | # CONFIG_TQM8540 is not set | 197 | # CONFIG_TQM8540 is not set |
184 | # CONFIG_TQM8541 is not set | 198 | # CONFIG_TQM8541 is not set |
@@ -228,6 +242,7 @@ CONFIG_BINFMT_ELF=y | |||
228 | # CONFIG_BINFMT_MISC is not set | 242 | # CONFIG_BINFMT_MISC is not set |
229 | CONFIG_MATH_EMULATION=y | 243 | CONFIG_MATH_EMULATION=y |
230 | # CONFIG_IOMMU_HELPER is not set | 244 | # CONFIG_IOMMU_HELPER is not set |
245 | # CONFIG_SWIOTLB is not set | ||
231 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 246 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
232 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 247 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
233 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 248 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -246,9 +261,9 @@ CONFIG_MIGRATION=y | |||
246 | CONFIG_ZONE_DMA_FLAG=1 | 261 | CONFIG_ZONE_DMA_FLAG=1 |
247 | CONFIG_BOUNCE=y | 262 | CONFIG_BOUNCE=y |
248 | CONFIG_VIRT_TO_BUS=y | 263 | CONFIG_VIRT_TO_BUS=y |
249 | CONFIG_UNEVICTABLE_LRU=y | ||
250 | CONFIG_HAVE_MLOCK=y | 264 | CONFIG_HAVE_MLOCK=y |
251 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 265 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
266 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
252 | CONFIG_PPC_4K_PAGES=y | 267 | CONFIG_PPC_4K_PAGES=y |
253 | # CONFIG_PPC_16K_PAGES is not set | 268 | # CONFIG_PPC_16K_PAGES is not set |
254 | # CONFIG_PPC_64K_PAGES is not set | 269 | # CONFIG_PPC_64K_PAGES is not set |
@@ -356,6 +371,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
356 | # CONFIG_ECONET is not set | 371 | # CONFIG_ECONET is not set |
357 | # CONFIG_WAN_ROUTER is not set | 372 | # CONFIG_WAN_ROUTER is not set |
358 | # CONFIG_PHONET is not set | 373 | # CONFIG_PHONET is not set |
374 | # CONFIG_IEEE802154 is not set | ||
359 | # CONFIG_NET_SCHED is not set | 375 | # CONFIG_NET_SCHED is not set |
360 | # CONFIG_DCB is not set | 376 | # CONFIG_DCB is not set |
361 | 377 | ||
@@ -373,7 +389,11 @@ CONFIG_WIRELESS=y | |||
373 | CONFIG_WIRELESS_OLD_REGULATORY=y | 389 | CONFIG_WIRELESS_OLD_REGULATORY=y |
374 | # CONFIG_WIRELESS_EXT is not set | 390 | # CONFIG_WIRELESS_EXT is not set |
375 | # CONFIG_LIB80211 is not set | 391 | # CONFIG_LIB80211 is not set |
376 | # CONFIG_MAC80211 is not set | 392 | |
393 | # | ||
394 | # CFG80211 needs to be enabled for MAC80211 | ||
395 | # | ||
396 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
377 | # CONFIG_WIMAX is not set | 397 | # CONFIG_WIMAX is not set |
378 | # CONFIG_RFKILL is not set | 398 | # CONFIG_RFKILL is not set |
379 | # CONFIG_NET_9P is not set | 399 | # CONFIG_NET_9P is not set |
@@ -475,6 +495,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
475 | CONFIG_OF_DEVICE=y | 495 | CONFIG_OF_DEVICE=y |
476 | CONFIG_OF_GPIO=y | 496 | CONFIG_OF_GPIO=y |
477 | CONFIG_OF_I2C=y | 497 | CONFIG_OF_I2C=y |
498 | CONFIG_OF_MDIO=y | ||
478 | # CONFIG_PARPORT is not set | 499 | # CONFIG_PARPORT is not set |
479 | CONFIG_BLK_DEV=y | 500 | CONFIG_BLK_DEV=y |
480 | # CONFIG_BLK_DEV_FD is not set | 501 | # CONFIG_BLK_DEV_FD is not set |
@@ -509,7 +530,9 @@ CONFIG_MISC_DEVICES=y | |||
509 | # | 530 | # |
510 | # CONFIG_EEPROM_AT24 is not set | 531 | # CONFIG_EEPROM_AT24 is not set |
511 | # CONFIG_EEPROM_LEGACY is not set | 532 | # CONFIG_EEPROM_LEGACY is not set |
533 | # CONFIG_EEPROM_MAX6875 is not set | ||
512 | # CONFIG_EEPROM_93CX6 is not set | 534 | # CONFIG_EEPROM_93CX6 is not set |
535 | # CONFIG_CB710_CORE is not set | ||
513 | CONFIG_HAVE_IDE=y | 536 | CONFIG_HAVE_IDE=y |
514 | CONFIG_IDE=y | 537 | CONFIG_IDE=y |
515 | 538 | ||
@@ -584,14 +607,17 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
584 | # | 607 | # |
585 | 608 | ||
586 | # | 609 | # |
587 | # Enable only one of the two stacks, unless you know what you are doing | 610 | # You can enable one or both FireWire driver stacks. |
611 | # | ||
612 | |||
613 | # | ||
614 | # See the help texts for more information. | ||
588 | # | 615 | # |
589 | # CONFIG_FIREWIRE is not set | 616 | # CONFIG_FIREWIRE is not set |
590 | # CONFIG_IEEE1394 is not set | 617 | # CONFIG_IEEE1394 is not set |
591 | # CONFIG_I2O is not set | 618 | # CONFIG_I2O is not set |
592 | # CONFIG_MACINTOSH_DRIVERS is not set | 619 | # CONFIG_MACINTOSH_DRIVERS is not set |
593 | CONFIG_NETDEVICES=y | 620 | CONFIG_NETDEVICES=y |
594 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
595 | # CONFIG_DUMMY is not set | 621 | # CONFIG_DUMMY is not set |
596 | # CONFIG_BONDING is not set | 622 | # CONFIG_BONDING is not set |
597 | # CONFIG_MACVLAN is not set | 623 | # CONFIG_MACVLAN is not set |
@@ -654,6 +680,7 @@ CONFIG_E100=y | |||
654 | # CONFIG_SMSC9420 is not set | 680 | # CONFIG_SMSC9420 is not set |
655 | # CONFIG_SUNDANCE is not set | 681 | # CONFIG_SUNDANCE is not set |
656 | # CONFIG_TLAN is not set | 682 | # CONFIG_TLAN is not set |
683 | # CONFIG_KS8842 is not set | ||
657 | # CONFIG_VIA_RHINE is not set | 684 | # CONFIG_VIA_RHINE is not set |
658 | # CONFIG_SC92031 is not set | 685 | # CONFIG_SC92031 is not set |
659 | # CONFIG_ATL2 is not set | 686 | # CONFIG_ATL2 is not set |
@@ -676,8 +703,10 @@ CONFIG_NETDEV_1000=y | |||
676 | # CONFIG_VIA_VELOCITY is not set | 703 | # CONFIG_VIA_VELOCITY is not set |
677 | # CONFIG_TIGON3 is not set | 704 | # CONFIG_TIGON3 is not set |
678 | # CONFIG_BNX2 is not set | 705 | # CONFIG_BNX2 is not set |
706 | # CONFIG_CNIC is not set | ||
679 | CONFIG_FSL_PQ_MDIO=y | 707 | CONFIG_FSL_PQ_MDIO=y |
680 | CONFIG_GIANFAR=y | 708 | CONFIG_GIANFAR=y |
709 | # CONFIG_MV643XX_ETH is not set | ||
681 | # CONFIG_QLA3XXX is not set | 710 | # CONFIG_QLA3XXX is not set |
682 | # CONFIG_ATL1 is not set | 711 | # CONFIG_ATL1 is not set |
683 | # CONFIG_ATL1E is not set | 712 | # CONFIG_ATL1E is not set |
@@ -831,6 +860,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
831 | # I2C system bus drivers (mostly embedded / system-on-chip) | 860 | # I2C system bus drivers (mostly embedded / system-on-chip) |
832 | # | 861 | # |
833 | # CONFIG_I2C_CPM is not set | 862 | # CONFIG_I2C_CPM is not set |
863 | # CONFIG_I2C_DESIGNWARE is not set | ||
834 | # CONFIG_I2C_GPIO is not set | 864 | # CONFIG_I2C_GPIO is not set |
835 | CONFIG_I2C_MPC=y | 865 | CONFIG_I2C_MPC=y |
836 | # CONFIG_I2C_OCORES is not set | 866 | # CONFIG_I2C_OCORES is not set |
@@ -859,13 +889,17 @@ CONFIG_I2C_MPC=y | |||
859 | # CONFIG_SENSORS_PCF8574 is not set | 889 | # CONFIG_SENSORS_PCF8574 is not set |
860 | # CONFIG_PCF8575 is not set | 890 | # CONFIG_PCF8575 is not set |
861 | # CONFIG_SENSORS_PCA9539 is not set | 891 | # CONFIG_SENSORS_PCA9539 is not set |
862 | # CONFIG_SENSORS_MAX6875 is not set | ||
863 | # CONFIG_SENSORS_TSL2550 is not set | 892 | # CONFIG_SENSORS_TSL2550 is not set |
864 | # CONFIG_I2C_DEBUG_CORE is not set | 893 | # CONFIG_I2C_DEBUG_CORE is not set |
865 | # CONFIG_I2C_DEBUG_ALGO is not set | 894 | # CONFIG_I2C_DEBUG_ALGO is not set |
866 | # CONFIG_I2C_DEBUG_BUS is not set | 895 | # CONFIG_I2C_DEBUG_BUS is not set |
867 | # CONFIG_I2C_DEBUG_CHIP is not set | 896 | # CONFIG_I2C_DEBUG_CHIP is not set |
868 | # CONFIG_SPI is not set | 897 | # CONFIG_SPI is not set |
898 | |||
899 | # | ||
900 | # PPS support | ||
901 | # | ||
902 | # CONFIG_PPS is not set | ||
869 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 903 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
870 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 904 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
871 | CONFIG_GPIOLIB=y | 905 | CONFIG_GPIOLIB=y |
@@ -944,6 +978,7 @@ CONFIG_SENSORS_LM75=y | |||
944 | # CONFIG_SENSORS_SMSC47B397 is not set | 978 | # CONFIG_SENSORS_SMSC47B397 is not set |
945 | # CONFIG_SENSORS_ADS7828 is not set | 979 | # CONFIG_SENSORS_ADS7828 is not set |
946 | # CONFIG_SENSORS_THMC50 is not set | 980 | # CONFIG_SENSORS_THMC50 is not set |
981 | # CONFIG_SENSORS_TMP401 is not set | ||
947 | # CONFIG_SENSORS_VIA686A is not set | 982 | # CONFIG_SENSORS_VIA686A is not set |
948 | # CONFIG_SENSORS_VT1211 is not set | 983 | # CONFIG_SENSORS_VT1211 is not set |
949 | # CONFIG_SENSORS_VT8231 is not set | 984 | # CONFIG_SENSORS_VT8231 is not set |
@@ -979,23 +1014,9 @@ CONFIG_SSB_POSSIBLE=y | |||
979 | # CONFIG_MFD_WM8400 is not set | 1014 | # CONFIG_MFD_WM8400 is not set |
980 | # CONFIG_MFD_WM8350_I2C is not set | 1015 | # CONFIG_MFD_WM8350_I2C is not set |
981 | # CONFIG_MFD_PCF50633 is not set | 1016 | # CONFIG_MFD_PCF50633 is not set |
1017 | # CONFIG_AB3100_CORE is not set | ||
982 | # CONFIG_REGULATOR is not set | 1018 | # CONFIG_REGULATOR is not set |
983 | 1019 | # CONFIG_MEDIA_SUPPORT is not set | |
984 | # | ||
985 | # Multimedia devices | ||
986 | # | ||
987 | |||
988 | # | ||
989 | # Multimedia core support | ||
990 | # | ||
991 | # CONFIG_VIDEO_DEV is not set | ||
992 | # CONFIG_DVB_CORE is not set | ||
993 | # CONFIG_VIDEO_MEDIA is not set | ||
994 | |||
995 | # | ||
996 | # Multimedia drivers | ||
997 | # | ||
998 | CONFIG_DAB=y | ||
999 | 1020 | ||
1000 | # | 1021 | # |
1001 | # Graphics support | 1022 | # Graphics support |
@@ -1052,6 +1073,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1052 | # CONFIG_DMADEVICES is not set | 1073 | # CONFIG_DMADEVICES is not set |
1053 | # CONFIG_AUXDISPLAY is not set | 1074 | # CONFIG_AUXDISPLAY is not set |
1054 | # CONFIG_UIO is not set | 1075 | # CONFIG_UIO is not set |
1076 | |||
1077 | # | ||
1078 | # TI VLYNQ | ||
1079 | # | ||
1055 | # CONFIG_STAGING is not set | 1080 | # CONFIG_STAGING is not set |
1056 | 1081 | ||
1057 | # | 1082 | # |
@@ -1071,10 +1096,12 @@ CONFIG_FS_MBCACHE=y | |||
1071 | # CONFIG_REISERFS_FS is not set | 1096 | # CONFIG_REISERFS_FS is not set |
1072 | # CONFIG_JFS_FS is not set | 1097 | # CONFIG_JFS_FS is not set |
1073 | # CONFIG_FS_POSIX_ACL is not set | 1098 | # CONFIG_FS_POSIX_ACL is not set |
1074 | CONFIG_FILE_LOCKING=y | ||
1075 | # CONFIG_XFS_FS is not set | 1099 | # CONFIG_XFS_FS is not set |
1100 | # CONFIG_GFS2_FS is not set | ||
1076 | # CONFIG_OCFS2_FS is not set | 1101 | # CONFIG_OCFS2_FS is not set |
1077 | # CONFIG_BTRFS_FS is not set | 1102 | # CONFIG_BTRFS_FS is not set |
1103 | CONFIG_FILE_LOCKING=y | ||
1104 | CONFIG_FSNOTIFY=y | ||
1078 | CONFIG_DNOTIFY=y | 1105 | CONFIG_DNOTIFY=y |
1079 | CONFIG_INOTIFY=y | 1106 | CONFIG_INOTIFY=y |
1080 | CONFIG_INOTIFY_USER=y | 1107 | CONFIG_INOTIFY_USER=y |
@@ -1201,6 +1228,7 @@ CONFIG_HAS_IOPORT=y | |||
1201 | CONFIG_HAS_DMA=y | 1228 | CONFIG_HAS_DMA=y |
1202 | CONFIG_HAVE_LMB=y | 1229 | CONFIG_HAVE_LMB=y |
1203 | CONFIG_NLATTR=y | 1230 | CONFIG_NLATTR=y |
1231 | CONFIG_GENERIC_ATOMIC64=y | ||
1204 | 1232 | ||
1205 | # | 1233 | # |
1206 | # Kernel hacking | 1234 | # Kernel hacking |
@@ -1226,22 +1254,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1226 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1254 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1227 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1255 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1228 | CONFIG_TRACING_SUPPORT=y | 1256 | CONFIG_TRACING_SUPPORT=y |
1229 | 1257 | # CONFIG_FTRACE is not set | |
1230 | # | ||
1231 | # Tracers | ||
1232 | # | ||
1233 | # CONFIG_FUNCTION_TRACER is not set | ||
1234 | # CONFIG_SCHED_TRACER is not set | ||
1235 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1236 | # CONFIG_EVENT_TRACER is not set | ||
1237 | # CONFIG_BOOT_TRACER is not set | ||
1238 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1239 | # CONFIG_STACK_TRACER is not set | ||
1240 | # CONFIG_KMEMTRACE is not set | ||
1241 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1242 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1243 | # CONFIG_SAMPLES is not set | 1258 | # CONFIG_SAMPLES is not set |
1244 | CONFIG_HAVE_ARCH_KGDB=y | 1259 | CONFIG_HAVE_ARCH_KGDB=y |
1260 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1261 | CONFIG_PPC_WERROR=y | ||
1245 | CONFIG_PRINT_STACK_DEPTH=64 | 1262 | CONFIG_PRINT_STACK_DEPTH=64 |
1246 | # CONFIG_IRQSTACKS is not set | 1263 | # CONFIG_IRQSTACKS is not set |
1247 | # CONFIG_PPC_EARLY_DEBUG is not set | 1264 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig index 2552cbefba6b..1025da2bf069 100644 --- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig +++ b/arch/powerpc/configs/85xx/xes_mpc85xx_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-rc6 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Thu Jun 11 11:25:17 2009 | 4 | # Wed Jul 29 23:32:25 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -35,15 +35,16 @@ CONFIG_GENERIC_TIME=y | |||
35 | CONFIG_GENERIC_TIME_VSYSCALL=y | 35 | CONFIG_GENERIC_TIME_VSYSCALL=y |
36 | CONFIG_GENERIC_CLOCKEVENTS=y | 36 | CONFIG_GENERIC_CLOCKEVENTS=y |
37 | CONFIG_GENERIC_HARDIRQS=y | 37 | CONFIG_GENERIC_HARDIRQS=y |
38 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 39 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
39 | CONFIG_IRQ_PER_CPU=y | 40 | CONFIG_IRQ_PER_CPU=y |
40 | CONFIG_STACKTRACE_SUPPORT=y | 41 | CONFIG_STACKTRACE_SUPPORT=y |
41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 42 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
43 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
42 | CONFIG_LOCKDEP_SUPPORT=y | 44 | CONFIG_LOCKDEP_SUPPORT=y |
43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 45 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
44 | CONFIG_ARCH_HAS_ILOG2_U32=y | 46 | CONFIG_ARCH_HAS_ILOG2_U32=y |
45 | CONFIG_GENERIC_HWEIGHT=y | 47 | CONFIG_GENERIC_HWEIGHT=y |
46 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
47 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 48 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
48 | CONFIG_GENERIC_GPIO=y | 49 | CONFIG_GENERIC_GPIO=y |
49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 50 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -64,6 +65,7 @@ CONFIG_DEFAULT_UIMAGE=y | |||
64 | # CONFIG_PPC_DCR_MMIO is not set | 65 | # CONFIG_PPC_DCR_MMIO is not set |
65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
67 | 69 | ||
68 | # | 70 | # |
69 | # General setup | 71 | # General setup |
@@ -114,7 +116,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
114 | CONFIG_KALLSYMS=y | 116 | CONFIG_KALLSYMS=y |
115 | CONFIG_KALLSYMS_ALL=y | 117 | CONFIG_KALLSYMS_ALL=y |
116 | CONFIG_KALLSYMS_EXTRA_PASS=y | 118 | CONFIG_KALLSYMS_EXTRA_PASS=y |
117 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_HOTPLUG=y | 119 | CONFIG_HOTPLUG=y |
119 | CONFIG_PRINTK=y | 120 | CONFIG_PRINTK=y |
120 | CONFIG_BUG=y | 121 | CONFIG_BUG=y |
@@ -127,9 +128,16 @@ CONFIG_TIMERFD=y | |||
127 | CONFIG_EVENTFD=y | 128 | CONFIG_EVENTFD=y |
128 | CONFIG_SHMEM=y | 129 | CONFIG_SHMEM=y |
129 | CONFIG_AIO=y | 130 | CONFIG_AIO=y |
131 | CONFIG_HAVE_PERF_COUNTERS=y | ||
132 | |||
133 | # | ||
134 | # Performance Counters | ||
135 | # | ||
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 |
140 | # CONFIG_STRIP_ASM_SYMS is not set | ||
133 | CONFIG_COMPAT_BRK=y | 141 | CONFIG_COMPAT_BRK=y |
134 | # CONFIG_SLAB is not set | 142 | # CONFIG_SLAB is not set |
135 | CONFIG_SLUB=y | 143 | CONFIG_SLUB=y |
@@ -144,6 +152,10 @@ CONFIG_HAVE_KPROBES=y | |||
144 | CONFIG_HAVE_KRETPROBES=y | 152 | CONFIG_HAVE_KRETPROBES=y |
145 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 153 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
146 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 154 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
155 | |||
156 | # | ||
157 | # GCOV-based kernel profiling | ||
158 | # | ||
147 | # CONFIG_SLOW_WORK is not set | 159 | # CONFIG_SLOW_WORK is not set |
148 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 160 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
149 | CONFIG_SLABINFO=y | 161 | CONFIG_SLABINFO=y |
@@ -157,7 +169,7 @@ CONFIG_MODVERSIONS=y | |||
157 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 169 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
158 | CONFIG_STOP_MACHINE=y | 170 | CONFIG_STOP_MACHINE=y |
159 | CONFIG_BLOCK=y | 171 | CONFIG_BLOCK=y |
160 | CONFIG_LBD=y | 172 | CONFIG_LBDAF=y |
161 | # CONFIG_BLK_DEV_BSG is not set | 173 | # CONFIG_BLK_DEV_BSG is not set |
162 | # CONFIG_BLK_DEV_INTEGRITY is not set | 174 | # CONFIG_BLK_DEV_INTEGRITY is not set |
163 | 175 | ||
@@ -239,6 +251,7 @@ CONFIG_BINFMT_ELF=y | |||
239 | # CONFIG_BINFMT_MISC is not set | 251 | # CONFIG_BINFMT_MISC is not set |
240 | CONFIG_MATH_EMULATION=y | 252 | CONFIG_MATH_EMULATION=y |
241 | # CONFIG_IOMMU_HELPER is not set | 253 | # CONFIG_IOMMU_HELPER is not set |
254 | # CONFIG_SWIOTLB is not set | ||
242 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
243 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 256 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
244 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 257 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -258,9 +271,9 @@ CONFIG_MIGRATION=y | |||
258 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
259 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
260 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
261 | CONFIG_UNEVICTABLE_LRU=y | ||
262 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
263 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
264 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
265 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
266 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -287,6 +300,8 @@ CONFIG_PCI_DOMAINS=y | |||
287 | CONFIG_PCI_SYSCALL=y | 300 | CONFIG_PCI_SYSCALL=y |
288 | CONFIG_PCIEPORTBUS=y | 301 | CONFIG_PCIEPORTBUS=y |
289 | CONFIG_PCIEAER=y | 302 | CONFIG_PCIEAER=y |
303 | # CONFIG_PCIE_ECRC is not set | ||
304 | # CONFIG_PCIEAER_INJECT is not set | ||
290 | # CONFIG_PCIEASPM is not set | 305 | # CONFIG_PCIEASPM is not set |
291 | CONFIG_ARCH_SUPPORTS_MSI=y | 306 | CONFIG_ARCH_SUPPORTS_MSI=y |
292 | CONFIG_PCI_MSI=y | 307 | CONFIG_PCI_MSI=y |
@@ -404,6 +419,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
404 | # CONFIG_ECONET is not set | 419 | # CONFIG_ECONET is not set |
405 | # CONFIG_WAN_ROUTER is not set | 420 | # CONFIG_WAN_ROUTER is not set |
406 | # CONFIG_PHONET is not set | 421 | # CONFIG_PHONET is not set |
422 | # CONFIG_IEEE802154 is not set | ||
407 | # CONFIG_NET_SCHED is not set | 423 | # CONFIG_NET_SCHED is not set |
408 | # CONFIG_DCB is not set | 424 | # CONFIG_DCB is not set |
409 | 425 | ||
@@ -540,6 +556,7 @@ CONFIG_MTD_NAND_FSL_UPM=y | |||
540 | CONFIG_OF_DEVICE=y | 556 | CONFIG_OF_DEVICE=y |
541 | CONFIG_OF_GPIO=y | 557 | CONFIG_OF_GPIO=y |
542 | CONFIG_OF_I2C=y | 558 | CONFIG_OF_I2C=y |
559 | CONFIG_OF_MDIO=y | ||
543 | # CONFIG_PARPORT is not set | 560 | # CONFIG_PARPORT is not set |
544 | CONFIG_BLK_DEV=y | 561 | CONFIG_BLK_DEV=y |
545 | # CONFIG_BLK_DEV_FD is not set | 562 | # CONFIG_BLK_DEV_FD is not set |
@@ -575,7 +592,9 @@ CONFIG_MISC_DEVICES=y | |||
575 | # | 592 | # |
576 | # CONFIG_EEPROM_AT24 is not set | 593 | # CONFIG_EEPROM_AT24 is not set |
577 | # CONFIG_EEPROM_LEGACY is not set | 594 | # CONFIG_EEPROM_LEGACY is not set |
595 | # CONFIG_EEPROM_MAX6875 is not set | ||
578 | # CONFIG_EEPROM_93CX6 is not set | 596 | # CONFIG_EEPROM_93CX6 is not set |
597 | # CONFIG_CB710_CORE is not set | ||
579 | CONFIG_HAVE_IDE=y | 598 | CONFIG_HAVE_IDE=y |
580 | # CONFIG_IDE is not set | 599 | # CONFIG_IDE is not set |
581 | 600 | ||
@@ -599,10 +618,6 @@ CONFIG_BLK_DEV_SR=y | |||
599 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 618 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
600 | CONFIG_CHR_DEV_SG=y | 619 | CONFIG_CHR_DEV_SG=y |
601 | # CONFIG_CHR_DEV_SCH is not set | 620 | # CONFIG_CHR_DEV_SCH is not set |
602 | |||
603 | # | ||
604 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
605 | # | ||
606 | CONFIG_SCSI_MULTI_LUN=y | 621 | CONFIG_SCSI_MULTI_LUN=y |
607 | # CONFIG_SCSI_CONSTANTS is not set | 622 | # CONFIG_SCSI_CONSTANTS is not set |
608 | CONFIG_SCSI_LOGGING=y | 623 | CONFIG_SCSI_LOGGING=y |
@@ -619,6 +634,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
619 | # CONFIG_SCSI_SRP_ATTRS is not set | 634 | # CONFIG_SCSI_SRP_ATTRS is not set |
620 | CONFIG_SCSI_LOWLEVEL=y | 635 | CONFIG_SCSI_LOWLEVEL=y |
621 | # CONFIG_ISCSI_TCP is not set | 636 | # CONFIG_ISCSI_TCP is not set |
637 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
622 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 638 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
623 | # CONFIG_SCSI_3W_9XXX is not set | 639 | # CONFIG_SCSI_3W_9XXX is not set |
624 | # CONFIG_SCSI_ACARD is not set | 640 | # CONFIG_SCSI_ACARD is not set |
@@ -627,6 +643,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
627 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 643 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
628 | # CONFIG_SCSI_AIC79XX is not set | 644 | # CONFIG_SCSI_AIC79XX is not set |
629 | # CONFIG_SCSI_AIC94XX is not set | 645 | # CONFIG_SCSI_AIC94XX is not set |
646 | # CONFIG_SCSI_MVSAS is not set | ||
630 | # CONFIG_SCSI_DPT_I2O is not set | 647 | # CONFIG_SCSI_DPT_I2O is not set |
631 | # CONFIG_SCSI_ADVANSYS is not set | 648 | # CONFIG_SCSI_ADVANSYS is not set |
632 | # CONFIG_SCSI_ARCMSR is not set | 649 | # CONFIG_SCSI_ARCMSR is not set |
@@ -646,7 +663,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
646 | # CONFIG_SCSI_IPS is not set | 663 | # CONFIG_SCSI_IPS is not set |
647 | # CONFIG_SCSI_INITIO is not set | 664 | # CONFIG_SCSI_INITIO is not set |
648 | # CONFIG_SCSI_INIA100 is not set | 665 | # CONFIG_SCSI_INIA100 is not set |
649 | # CONFIG_SCSI_MVSAS is not set | ||
650 | # CONFIG_SCSI_STEX is not set | 666 | # CONFIG_SCSI_STEX is not set |
651 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 667 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
652 | # CONFIG_SCSI_IPR is not set | 668 | # CONFIG_SCSI_IPR is not set |
@@ -730,14 +746,17 @@ CONFIG_PATA_ALI=y | |||
730 | # | 746 | # |
731 | 747 | ||
732 | # | 748 | # |
733 | # Enable only one of the two stacks, unless you know what you are doing | 749 | # You can enable one or both FireWire driver stacks. |
750 | # | ||
751 | |||
752 | # | ||
753 | # See the help texts for more information. | ||
734 | # | 754 | # |
735 | # CONFIG_FIREWIRE is not set | 755 | # CONFIG_FIREWIRE is not set |
736 | # CONFIG_IEEE1394 is not set | 756 | # CONFIG_IEEE1394 is not set |
737 | # CONFIG_I2O is not set | 757 | # CONFIG_I2O is not set |
738 | # CONFIG_MACINTOSH_DRIVERS is not set | 758 | # CONFIG_MACINTOSH_DRIVERS is not set |
739 | CONFIG_NETDEVICES=y | 759 | CONFIG_NETDEVICES=y |
740 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
741 | CONFIG_DUMMY=y | 760 | CONFIG_DUMMY=y |
742 | # CONFIG_BONDING is not set | 761 | # CONFIG_BONDING is not set |
743 | # CONFIG_MACVLAN is not set | 762 | # CONFIG_MACVLAN is not set |
@@ -784,6 +803,7 @@ CONFIG_MII=y | |||
784 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 803 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
785 | # CONFIG_NET_PCI is not set | 804 | # CONFIG_NET_PCI is not set |
786 | # CONFIG_B44 is not set | 805 | # CONFIG_B44 is not set |
806 | # CONFIG_KS8842 is not set | ||
787 | # CONFIG_ATL2 is not set | 807 | # CONFIG_ATL2 is not set |
788 | CONFIG_NETDEV_1000=y | 808 | CONFIG_NETDEV_1000=y |
789 | # CONFIG_ACENIC is not set | 809 | # CONFIG_ACENIC is not set |
@@ -803,8 +823,10 @@ CONFIG_E1000=y | |||
803 | # CONFIG_VIA_VELOCITY is not set | 823 | # CONFIG_VIA_VELOCITY is not set |
804 | # CONFIG_TIGON3 is not set | 824 | # CONFIG_TIGON3 is not set |
805 | # CONFIG_BNX2 is not set | 825 | # CONFIG_BNX2 is not set |
826 | # CONFIG_CNIC is not set | ||
806 | CONFIG_FSL_PQ_MDIO=y | 827 | CONFIG_FSL_PQ_MDIO=y |
807 | CONFIG_GIANFAR=y | 828 | CONFIG_GIANFAR=y |
829 | # CONFIG_MV643XX_ETH is not set | ||
808 | # CONFIG_QLA3XXX is not set | 830 | # CONFIG_QLA3XXX is not set |
809 | # CONFIG_ATL1 is not set | 831 | # CONFIG_ATL1 is not set |
810 | # CONFIG_ATL1E is not set | 832 | # CONFIG_ATL1E is not set |
@@ -986,13 +1008,17 @@ CONFIG_I2C_MPC=y | |||
986 | # CONFIG_DS1682 is not set | 1008 | # CONFIG_DS1682 is not set |
987 | # CONFIG_SENSORS_PCF8574 is not set | 1009 | # CONFIG_SENSORS_PCF8574 is not set |
988 | # CONFIG_PCF8575 is not set | 1010 | # CONFIG_PCF8575 is not set |
989 | # CONFIG_SENSORS_MAX6875 is not set | ||
990 | # CONFIG_SENSORS_TSL2550 is not set | 1011 | # CONFIG_SENSORS_TSL2550 is not set |
991 | # CONFIG_I2C_DEBUG_CORE is not set | 1012 | # CONFIG_I2C_DEBUG_CORE is not set |
992 | # CONFIG_I2C_DEBUG_ALGO is not set | 1013 | # CONFIG_I2C_DEBUG_ALGO is not set |
993 | # CONFIG_I2C_DEBUG_BUS is not set | 1014 | # CONFIG_I2C_DEBUG_BUS is not set |
994 | # CONFIG_I2C_DEBUG_CHIP is not set | 1015 | # CONFIG_I2C_DEBUG_CHIP is not set |
995 | # CONFIG_SPI is not set | 1016 | # CONFIG_SPI is not set |
1017 | |||
1018 | # | ||
1019 | # PPS support | ||
1020 | # | ||
1021 | # CONFIG_PPS is not set | ||
996 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1022 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
997 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 1023 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
998 | CONFIG_GPIOLIB=y | 1024 | CONFIG_GPIOLIB=y |
@@ -1072,6 +1098,7 @@ CONFIG_SENSORS_LM90=y | |||
1072 | # CONFIG_SENSORS_SMSC47B397 is not set | 1098 | # CONFIG_SENSORS_SMSC47B397 is not set |
1073 | # CONFIG_SENSORS_ADS7828 is not set | 1099 | # CONFIG_SENSORS_ADS7828 is not set |
1074 | # CONFIG_SENSORS_THMC50 is not set | 1100 | # CONFIG_SENSORS_THMC50 is not set |
1101 | # CONFIG_SENSORS_TMP401 is not set | ||
1075 | # CONFIG_SENSORS_VIA686A is not set | 1102 | # CONFIG_SENSORS_VIA686A is not set |
1076 | # CONFIG_SENSORS_VT1211 is not set | 1103 | # CONFIG_SENSORS_VT1211 is not set |
1077 | # CONFIG_SENSORS_VT8231 is not set | 1104 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1126,23 +1153,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1126 | # CONFIG_MFD_WM8400 is not set | 1153 | # CONFIG_MFD_WM8400 is not set |
1127 | # CONFIG_MFD_WM8350_I2C is not set | 1154 | # CONFIG_MFD_WM8350_I2C is not set |
1128 | # CONFIG_MFD_PCF50633 is not set | 1155 | # CONFIG_MFD_PCF50633 is not set |
1156 | # CONFIG_AB3100_CORE is not set | ||
1129 | # CONFIG_REGULATOR is not set | 1157 | # CONFIG_REGULATOR is not set |
1130 | 1158 | # CONFIG_MEDIA_SUPPORT is not set | |
1131 | # | ||
1132 | # Multimedia devices | ||
1133 | # | ||
1134 | |||
1135 | # | ||
1136 | # Multimedia core support | ||
1137 | # | ||
1138 | # CONFIG_VIDEO_DEV is not set | ||
1139 | # CONFIG_DVB_CORE is not set | ||
1140 | # CONFIG_VIDEO_MEDIA is not set | ||
1141 | |||
1142 | # | ||
1143 | # Multimedia drivers | ||
1144 | # | ||
1145 | # CONFIG_DAB is not set | ||
1146 | 1159 | ||
1147 | # | 1160 | # |
1148 | # Graphics support | 1161 | # Graphics support |
@@ -1187,7 +1200,7 @@ CONFIG_USB_HID=y | |||
1187 | # CONFIG_HID_CHERRY is not set | 1200 | # CONFIG_HID_CHERRY is not set |
1188 | # CONFIG_HID_CHICONY is not set | 1201 | # CONFIG_HID_CHICONY is not set |
1189 | # CONFIG_HID_CYPRESS is not set | 1202 | # CONFIG_HID_CYPRESS is not set |
1190 | # CONFIG_DRAGONRISE_FF is not set | 1203 | # CONFIG_HID_DRAGONRISE is not set |
1191 | # CONFIG_HID_EZKEY is not set | 1204 | # CONFIG_HID_EZKEY is not set |
1192 | # CONFIG_HID_KYE is not set | 1205 | # CONFIG_HID_KYE is not set |
1193 | # CONFIG_HID_GYRATION is not set | 1206 | # CONFIG_HID_GYRATION is not set |
@@ -1201,10 +1214,11 @@ CONFIG_USB_HID=y | |||
1201 | # CONFIG_HID_SAMSUNG is not set | 1214 | # CONFIG_HID_SAMSUNG is not set |
1202 | # CONFIG_HID_SONY is not set | 1215 | # CONFIG_HID_SONY is not set |
1203 | # CONFIG_HID_SUNPLUS is not set | 1216 | # CONFIG_HID_SUNPLUS is not set |
1204 | # CONFIG_GREENASIA_FF is not set | 1217 | # CONFIG_HID_GREENASIA is not set |
1218 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1205 | # CONFIG_HID_TOPSEED is not set | 1219 | # CONFIG_HID_TOPSEED is not set |
1206 | # CONFIG_THRUSTMASTER_FF is not set | 1220 | # CONFIG_HID_THRUSTMASTER is not set |
1207 | # CONFIG_ZEROPLUS_FF is not set | 1221 | # CONFIG_HID_ZEROPLUS is not set |
1208 | CONFIG_USB_SUPPORT=y | 1222 | CONFIG_USB_SUPPORT=y |
1209 | CONFIG_USB_ARCH_HAS_HCD=y | 1223 | CONFIG_USB_ARCH_HAS_HCD=y |
1210 | CONFIG_USB_ARCH_HAS_OHCI=y | 1224 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1230,6 +1244,7 @@ CONFIG_USB_MON=y | |||
1230 | # USB Host Controller Drivers | 1244 | # USB Host Controller Drivers |
1231 | # | 1245 | # |
1232 | # CONFIG_USB_C67X00_HCD is not set | 1246 | # CONFIG_USB_C67X00_HCD is not set |
1247 | # CONFIG_USB_XHCI_HCD is not set | ||
1233 | # CONFIG_USB_EHCI_HCD is not set | 1248 | # CONFIG_USB_EHCI_HCD is not set |
1234 | # CONFIG_USB_OXU210HP_HCD is not set | 1249 | # CONFIG_USB_OXU210HP_HCD is not set |
1235 | # CONFIG_USB_ISP116X_HCD is not set | 1250 | # CONFIG_USB_ISP116X_HCD is not set |
@@ -1325,7 +1340,7 @@ CONFIG_LEDS_CLASS=y | |||
1325 | CONFIG_LEDS_GPIO=y | 1340 | CONFIG_LEDS_GPIO=y |
1326 | CONFIG_LEDS_GPIO_PLATFORM=y | 1341 | CONFIG_LEDS_GPIO_PLATFORM=y |
1327 | CONFIG_LEDS_GPIO_OF=y | 1342 | CONFIG_LEDS_GPIO_OF=y |
1328 | # CONFIG_LEDS_LP5521 is not set | 1343 | # CONFIG_LEDS_LP3944 is not set |
1329 | CONFIG_LEDS_PCA955X=y | 1344 | CONFIG_LEDS_PCA955X=y |
1330 | # CONFIG_LEDS_BD2802 is not set | 1345 | # CONFIG_LEDS_BD2802 is not set |
1331 | 1346 | ||
@@ -1352,8 +1367,6 @@ CONFIG_EDAC=y | |||
1352 | # CONFIG_EDAC_DEBUG is not set | 1367 | # CONFIG_EDAC_DEBUG is not set |
1353 | CONFIG_EDAC_MM_EDAC=y | 1368 | CONFIG_EDAC_MM_EDAC=y |
1354 | CONFIG_EDAC_MPC85XX=y | 1369 | CONFIG_EDAC_MPC85XX=y |
1355 | # CONFIG_EDAC_AMD8131 is not set | ||
1356 | # CONFIG_EDAC_AMD8111 is not set | ||
1357 | CONFIG_RTC_LIB=y | 1370 | CONFIG_RTC_LIB=y |
1358 | CONFIG_RTC_CLASS=y | 1371 | CONFIG_RTC_CLASS=y |
1359 | CONFIG_RTC_HCTOSYS=y | 1372 | CONFIG_RTC_HCTOSYS=y |
@@ -1385,6 +1398,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1385 | # CONFIG_RTC_DRV_S35390A is not set | 1398 | # CONFIG_RTC_DRV_S35390A is not set |
1386 | # CONFIG_RTC_DRV_FM3130 is not set | 1399 | # CONFIG_RTC_DRV_FM3130 is not set |
1387 | # CONFIG_RTC_DRV_RX8581 is not set | 1400 | # CONFIG_RTC_DRV_RX8581 is not set |
1401 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1388 | 1402 | ||
1389 | # | 1403 | # |
1390 | # SPI RTC drivers | 1404 | # SPI RTC drivers |
@@ -1425,6 +1439,10 @@ CONFIG_NET_DMA=y | |||
1425 | # CONFIG_DMATEST is not set | 1439 | # CONFIG_DMATEST is not set |
1426 | # CONFIG_AUXDISPLAY is not set | 1440 | # CONFIG_AUXDISPLAY is not set |
1427 | # CONFIG_UIO is not set | 1441 | # CONFIG_UIO is not set |
1442 | |||
1443 | # | ||
1444 | # TI VLYNQ | ||
1445 | # | ||
1428 | # CONFIG_STAGING is not set | 1446 | # CONFIG_STAGING is not set |
1429 | 1447 | ||
1430 | # | 1448 | # |
@@ -1444,11 +1462,12 @@ CONFIG_FS_MBCACHE=y | |||
1444 | # CONFIG_REISERFS_FS is not set | 1462 | # CONFIG_REISERFS_FS is not set |
1445 | # CONFIG_JFS_FS is not set | 1463 | # CONFIG_JFS_FS is not set |
1446 | # CONFIG_FS_POSIX_ACL is not set | 1464 | # CONFIG_FS_POSIX_ACL is not set |
1447 | CONFIG_FILE_LOCKING=y | ||
1448 | # CONFIG_XFS_FS is not set | 1465 | # CONFIG_XFS_FS is not set |
1449 | # CONFIG_GFS2_FS is not set | 1466 | # CONFIG_GFS2_FS is not set |
1450 | # CONFIG_OCFS2_FS is not set | 1467 | # CONFIG_OCFS2_FS is not set |
1451 | # CONFIG_BTRFS_FS is not set | 1468 | # CONFIG_BTRFS_FS is not set |
1469 | CONFIG_FILE_LOCKING=y | ||
1470 | CONFIG_FSNOTIFY=y | ||
1452 | CONFIG_DNOTIFY=y | 1471 | CONFIG_DNOTIFY=y |
1453 | CONFIG_INOTIFY=y | 1472 | CONFIG_INOTIFY=y |
1454 | CONFIG_INOTIFY_USER=y | 1473 | CONFIG_INOTIFY_USER=y |
@@ -1629,6 +1648,7 @@ CONFIG_HAS_IOPORT=y | |||
1629 | CONFIG_HAS_DMA=y | 1648 | CONFIG_HAS_DMA=y |
1630 | CONFIG_HAVE_LMB=y | 1649 | CONFIG_HAVE_LMB=y |
1631 | CONFIG_NLATTR=y | 1650 | CONFIG_NLATTR=y |
1651 | CONFIG_GENERIC_ATOMIC64=y | ||
1632 | 1652 | ||
1633 | # | 1653 | # |
1634 | # Kernel hacking | 1654 | # Kernel hacking |
@@ -1659,6 +1679,9 @@ CONFIG_SCHED_DEBUG=y | |||
1659 | # CONFIG_RT_MUTEX_TESTER is not set | 1679 | # CONFIG_RT_MUTEX_TESTER is not set |
1660 | # CONFIG_DEBUG_SPINLOCK is not set | 1680 | # CONFIG_DEBUG_SPINLOCK is not set |
1661 | # CONFIG_DEBUG_MUTEXES is not set | 1681 | # CONFIG_DEBUG_MUTEXES is not set |
1682 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1683 | # CONFIG_PROVE_LOCKING is not set | ||
1684 | # CONFIG_LOCK_STAT is not set | ||
1662 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1685 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1663 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1686 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1664 | # CONFIG_DEBUG_KOBJECT is not set | 1687 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1671,7 +1694,6 @@ CONFIG_SCHED_DEBUG=y | |||
1671 | # CONFIG_DEBUG_LIST is not set | 1694 | # CONFIG_DEBUG_LIST is not set |
1672 | # CONFIG_DEBUG_SG is not set | 1695 | # CONFIG_DEBUG_SG is not set |
1673 | # CONFIG_DEBUG_NOTIFIERS is not set | 1696 | # CONFIG_DEBUG_NOTIFIERS is not set |
1674 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1675 | # CONFIG_RCU_TORTURE_TEST is not set | 1697 | # CONFIG_RCU_TORTURE_TEST is not set |
1676 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1698 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1677 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1699 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1685,16 +1707,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1685 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1707 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1686 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1708 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1687 | CONFIG_TRACING_SUPPORT=y | 1709 | CONFIG_TRACING_SUPPORT=y |
1688 | 1710 | CONFIG_FTRACE=y | |
1689 | # | ||
1690 | # Tracers | ||
1691 | # | ||
1692 | # CONFIG_FUNCTION_TRACER is not set | 1711 | # CONFIG_FUNCTION_TRACER is not set |
1712 | # CONFIG_IRQSOFF_TRACER is not set | ||
1693 | # CONFIG_SCHED_TRACER is not set | 1713 | # CONFIG_SCHED_TRACER is not set |
1694 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1714 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1695 | # CONFIG_EVENT_TRACER is not set | ||
1696 | # CONFIG_BOOT_TRACER is not set | 1715 | # CONFIG_BOOT_TRACER is not set |
1697 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1716 | CONFIG_BRANCH_PROFILE_NONE=y |
1717 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1718 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1698 | # CONFIG_STACK_TRACER is not set | 1719 | # CONFIG_STACK_TRACER is not set |
1699 | # CONFIG_KMEMTRACE is not set | 1720 | # CONFIG_KMEMTRACE is not set |
1700 | # CONFIG_WORKQUEUE_TRACER is not set | 1721 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1702,6 +1723,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1702 | # CONFIG_SAMPLES is not set | 1723 | # CONFIG_SAMPLES is not set |
1703 | CONFIG_HAVE_ARCH_KGDB=y | 1724 | CONFIG_HAVE_ARCH_KGDB=y |
1704 | # CONFIG_KGDB is not set | 1725 | # CONFIG_KGDB is not set |
1726 | # CONFIG_KMEMCHECK is not set | ||
1727 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1728 | CONFIG_PPC_WERROR=y | ||
1705 | CONFIG_PRINT_STACK_DEPTH=64 | 1729 | CONFIG_PRINT_STACK_DEPTH=64 |
1706 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1730 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1707 | # CONFIG_DEBUG_STACK_USAGE is not set | 1731 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig index b6a23af57f46..527ad1a5e802 100644 --- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig +++ b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:31 2009 | 4 | # Wed Jul 29 23:32:31 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_PHYS_64BIT is not set | 20 | # CONFIG_PHYS_64BIT is not set |
20 | CONFIG_ALTIVEC=y | 21 | CONFIG_ALTIVEC=y |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | CONFIG_SMP=y | 26 | CONFIG_SMP=y |
25 | CONFIG_NR_CPUS=2 | 27 | CONFIG_NR_CPUS=2 |
26 | CONFIG_PPC32=y | 28 | CONFIG_PPC32=y |
@@ -32,16 +34,17 @@ CONFIG_GENERIC_TIME=y | |||
32 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
33 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
34 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
39 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
41 | CONFIG_GENERIC_LOCKBREAK=y | 45 | CONFIG_GENERIC_LOCKBREAK=y |
42 | CONFIG_ARCH_HAS_ILOG2_U32=y | 46 | CONFIG_ARCH_HAS_ILOG2_U32=y |
43 | CONFIG_GENERIC_HWEIGHT=y | 47 | CONFIG_GENERIC_HWEIGHT=y |
44 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 48 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
46 | CONFIG_GENERIC_GPIO=y | 49 | CONFIG_GENERIC_GPIO=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 50 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -56,11 +59,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | CONFIG_GENERIC_TBSYNC=y | 59 | CONFIG_GENERIC_TBSYNC=y |
57 | CONFIG_AUDIT_ARCH=y | 60 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 61 | CONFIG_GENERIC_BUG=y |
62 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 63 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 64 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 65 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
64 | 69 | ||
65 | # | 70 | # |
66 | # General setup | 71 | # General setup |
@@ -112,9 +117,7 @@ CONFIG_ANON_INODES=y | |||
112 | CONFIG_EMBEDDED=y | 117 | CONFIG_EMBEDDED=y |
113 | CONFIG_SYSCTL_SYSCALL=y | 118 | CONFIG_SYSCTL_SYSCALL=y |
114 | CONFIG_KALLSYMS=y | 119 | CONFIG_KALLSYMS=y |
115 | # CONFIG_KALLSYMS_ALL is not set | ||
116 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 120 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
117 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_HOTPLUG=y | 121 | CONFIG_HOTPLUG=y |
119 | CONFIG_PRINTK=y | 122 | CONFIG_PRINTK=y |
120 | CONFIG_BUG=y | 123 | CONFIG_BUG=y |
@@ -127,8 +130,15 @@ CONFIG_TIMERFD=y | |||
127 | CONFIG_EVENTFD=y | 130 | CONFIG_EVENTFD=y |
128 | CONFIG_SHMEM=y | 131 | CONFIG_SHMEM=y |
129 | CONFIG_AIO=y | 132 | CONFIG_AIO=y |
133 | CONFIG_HAVE_PERF_COUNTERS=y | ||
134 | |||
135 | # | ||
136 | # Performance Counters | ||
137 | # | ||
138 | # CONFIG_PERF_COUNTERS is not set | ||
130 | CONFIG_VM_EVENT_COUNTERS=y | 139 | CONFIG_VM_EVENT_COUNTERS=y |
131 | CONFIG_PCI_QUIRKS=y | 140 | CONFIG_PCI_QUIRKS=y |
141 | # CONFIG_STRIP_ASM_SYMS is not set | ||
132 | CONFIG_COMPAT_BRK=y | 142 | CONFIG_COMPAT_BRK=y |
133 | CONFIG_SLAB=y | 143 | CONFIG_SLAB=y |
134 | # CONFIG_SLUB is not set | 144 | # CONFIG_SLUB is not set |
@@ -143,6 +153,10 @@ CONFIG_HAVE_KPROBES=y | |||
143 | CONFIG_HAVE_KRETPROBES=y | 153 | CONFIG_HAVE_KRETPROBES=y |
144 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
145 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 155 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
156 | |||
157 | # | ||
158 | # GCOV-based kernel profiling | ||
159 | # | ||
146 | # CONFIG_SLOW_WORK is not set | 160 | # CONFIG_SLOW_WORK is not set |
147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 161 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
148 | CONFIG_SLABINFO=y | 162 | CONFIG_SLABINFO=y |
@@ -156,7 +170,7 @@ CONFIG_MODULE_UNLOAD=y | |||
156 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 170 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
157 | CONFIG_STOP_MACHINE=y | 171 | CONFIG_STOP_MACHINE=y |
158 | CONFIG_BLOCK=y | 172 | CONFIG_BLOCK=y |
159 | # CONFIG_LBD is not set | 173 | CONFIG_LBDAF=y |
160 | # CONFIG_BLK_DEV_BSG is not set | 174 | # CONFIG_BLK_DEV_BSG is not set |
161 | # CONFIG_BLK_DEV_INTEGRITY is not set | 175 | # CONFIG_BLK_DEV_INTEGRITY is not set |
162 | 176 | ||
@@ -216,7 +230,7 @@ CONFIG_MPIC=y | |||
216 | # | 230 | # |
217 | # Kernel options | 231 | # Kernel options |
218 | # | 232 | # |
219 | # CONFIG_HIGHMEM is not set | 233 | CONFIG_HIGHMEM=y |
220 | CONFIG_TICK_ONESHOT=y | 234 | CONFIG_TICK_ONESHOT=y |
221 | # CONFIG_NO_HZ is not set | 235 | # CONFIG_NO_HZ is not set |
222 | CONFIG_HIGH_RES_TIMERS=y | 236 | CONFIG_HIGH_RES_TIMERS=y |
@@ -235,6 +249,7 @@ CONFIG_BINFMT_ELF=y | |||
235 | # CONFIG_HAVE_AOUT is not set | 249 | # CONFIG_HAVE_AOUT is not set |
236 | CONFIG_BINFMT_MISC=m | 250 | CONFIG_BINFMT_MISC=m |
237 | # CONFIG_IOMMU_HELPER is not set | 251 | # CONFIG_IOMMU_HELPER is not set |
252 | # CONFIG_SWIOTLB is not set | ||
238 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 253 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
239 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 254 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
240 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -256,9 +271,9 @@ CONFIG_MIGRATION=y | |||
256 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
257 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
258 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
259 | CONFIG_UNEVICTABLE_LRU=y | ||
260 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
261 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
262 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
263 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
264 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -285,14 +300,32 @@ CONFIG_PCI_DOMAINS=y | |||
285 | CONFIG_PCI_SYSCALL=y | 300 | CONFIG_PCI_SYSCALL=y |
286 | CONFIG_PCIEPORTBUS=y | 301 | CONFIG_PCIEPORTBUS=y |
287 | CONFIG_PCIEAER=y | 302 | CONFIG_PCIEAER=y |
303 | # CONFIG_PCIE_ECRC is not set | ||
304 | # CONFIG_PCIEAER_INJECT is not set | ||
288 | # CONFIG_PCIEASPM is not set | 305 | # CONFIG_PCIEASPM is not set |
289 | CONFIG_ARCH_SUPPORTS_MSI=y | 306 | CONFIG_ARCH_SUPPORTS_MSI=y |
290 | # CONFIG_PCI_MSI is not set | 307 | # CONFIG_PCI_MSI is not set |
291 | # CONFIG_PCI_LEGACY is not set | 308 | # CONFIG_PCI_LEGACY is not set |
292 | CONFIG_PCI_DEBUG=y | ||
293 | # CONFIG_PCI_STUB is not set | 309 | # CONFIG_PCI_STUB is not set |
294 | # CONFIG_PCI_IOV is not set | 310 | # CONFIG_PCI_IOV is not set |
295 | # CONFIG_PCCARD is not set | 311 | CONFIG_PCCARD=y |
312 | # CONFIG_PCMCIA_DEBUG is not set | ||
313 | CONFIG_PCMCIA=y | ||
314 | # CONFIG_PCMCIA_LOAD_CIS is not set | ||
315 | # CONFIG_PCMCIA_IOCTL is not set | ||
316 | # CONFIG_CARDBUS is not set | ||
317 | |||
318 | # | ||
319 | # PC-card bridges | ||
320 | # | ||
321 | CONFIG_YENTA=y | ||
322 | # CONFIG_YENTA_O2 is not set | ||
323 | # CONFIG_YENTA_RICOH is not set | ||
324 | CONFIG_YENTA_TI=y | ||
325 | # CONFIG_YENTA_TOSHIBA is not set | ||
326 | # CONFIG_PD6729 is not set | ||
327 | # CONFIG_I82092 is not set | ||
328 | CONFIG_PCCARD_NONSTATIC=y | ||
296 | # CONFIG_HOTPLUG_PCI is not set | 329 | # CONFIG_HOTPLUG_PCI is not set |
297 | # CONFIG_HAS_RAPIDIO is not set | 330 | # CONFIG_HAS_RAPIDIO is not set |
298 | 331 | ||
@@ -353,8 +386,8 @@ CONFIG_INET_XFRM_TUNNEL=m | |||
353 | CONFIG_INET_TUNNEL=m | 386 | CONFIG_INET_TUNNEL=m |
354 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 387 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
355 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 388 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
356 | CONFIG_INET_XFRM_MODE_BEET=y | 389 | # CONFIG_INET_XFRM_MODE_BEET is not set |
357 | # CONFIG_INET_LRO is not set | 390 | CONFIG_INET_LRO=y |
358 | CONFIG_INET_DIAG=y | 391 | CONFIG_INET_DIAG=y |
359 | CONFIG_INET_TCP_DIAG=y | 392 | CONFIG_INET_TCP_DIAG=y |
360 | # CONFIG_TCP_CONG_ADVANCED is not set | 393 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -380,174 +413,26 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
380 | CONFIG_IPV6_TUNNEL=m | 413 | CONFIG_IPV6_TUNNEL=m |
381 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 414 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
382 | # CONFIG_IPV6_MROUTE is not set | 415 | # CONFIG_IPV6_MROUTE is not set |
383 | # CONFIG_NETLABEL is not set | ||
384 | # CONFIG_NETWORK_SECMARK is not set | 416 | # CONFIG_NETWORK_SECMARK is not set |
385 | CONFIG_NETFILTER=y | 417 | # CONFIG_NETFILTER is not set |
386 | # CONFIG_NETFILTER_DEBUG is not set | ||
387 | CONFIG_NETFILTER_ADVANCED=y | ||
388 | CONFIG_BRIDGE_NETFILTER=y | ||
389 | |||
390 | # | ||
391 | # Core Netfilter Configuration | ||
392 | # | ||
393 | # CONFIG_NETFILTER_NETLINK_QUEUE is not set | ||
394 | # CONFIG_NETFILTER_NETLINK_LOG is not set | ||
395 | # CONFIG_NF_CONNTRACK is not set | ||
396 | # CONFIG_NETFILTER_TPROXY is not set | ||
397 | CONFIG_NETFILTER_XTABLES=m | ||
398 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set | ||
399 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | ||
400 | # CONFIG_NETFILTER_XT_TARGET_HL is not set | ||
401 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set | ||
402 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | ||
403 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | ||
404 | # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set | ||
405 | # CONFIG_NETFILTER_XT_TARGET_TRACE is not set | ||
406 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | ||
407 | # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set | ||
408 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set | ||
409 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | ||
410 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | ||
411 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set | ||
412 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
413 | CONFIG_NETFILTER_XT_MATCH_HL=m | ||
414 | # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set | ||
415 | # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set | ||
416 | # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set | ||
417 | # CONFIG_NETFILTER_XT_MATCH_MAC is not set | ||
418 | # CONFIG_NETFILTER_XT_MATCH_MARK is not set | ||
419 | # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set | ||
420 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set | ||
421 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
422 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | ||
423 | # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set | ||
424 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set | ||
425 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set | ||
426 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set | ||
427 | # CONFIG_NETFILTER_XT_MATCH_RECENT is not set | ||
428 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set | ||
429 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | ||
430 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set | ||
431 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set | ||
432 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set | ||
433 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
434 | # CONFIG_IP_VS is not set | ||
435 | |||
436 | # | ||
437 | # IP: Netfilter Configuration | ||
438 | # | ||
439 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
440 | CONFIG_IP_NF_QUEUE=m | ||
441 | CONFIG_IP_NF_IPTABLES=m | ||
442 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
443 | # CONFIG_IP_NF_MATCH_AH is not set | ||
444 | CONFIG_IP_NF_MATCH_ECN=m | ||
445 | CONFIG_IP_NF_MATCH_TTL=m | ||
446 | CONFIG_IP_NF_FILTER=m | ||
447 | CONFIG_IP_NF_TARGET_REJECT=m | ||
448 | CONFIG_IP_NF_TARGET_LOG=m | ||
449 | CONFIG_IP_NF_TARGET_ULOG=m | ||
450 | CONFIG_IP_NF_MANGLE=m | ||
451 | CONFIG_IP_NF_TARGET_ECN=m | ||
452 | # CONFIG_IP_NF_TARGET_TTL is not set | ||
453 | CONFIG_IP_NF_RAW=m | ||
454 | # CONFIG_IP_NF_SECURITY is not set | ||
455 | CONFIG_IP_NF_ARPTABLES=m | ||
456 | CONFIG_IP_NF_ARPFILTER=m | ||
457 | CONFIG_IP_NF_ARP_MANGLE=m | ||
458 | |||
459 | # | ||
460 | # IPv6: Netfilter Configuration | ||
461 | # | ||
462 | CONFIG_IP6_NF_QUEUE=m | ||
463 | CONFIG_IP6_NF_IPTABLES=m | ||
464 | # CONFIG_IP6_NF_MATCH_AH is not set | ||
465 | CONFIG_IP6_NF_MATCH_EUI64=m | ||
466 | CONFIG_IP6_NF_MATCH_FRAG=m | ||
467 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
468 | CONFIG_IP6_NF_MATCH_HL=m | ||
469 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | ||
470 | # CONFIG_IP6_NF_MATCH_MH is not set | ||
471 | CONFIG_IP6_NF_MATCH_RT=m | ||
472 | # CONFIG_IP6_NF_TARGET_HL is not set | ||
473 | CONFIG_IP6_NF_TARGET_LOG=m | ||
474 | CONFIG_IP6_NF_FILTER=m | ||
475 | # CONFIG_IP6_NF_TARGET_REJECT is not set | ||
476 | CONFIG_IP6_NF_MANGLE=m | ||
477 | CONFIG_IP6_NF_RAW=m | ||
478 | # CONFIG_IP6_NF_SECURITY is not set | ||
479 | # CONFIG_BRIDGE_NF_EBTABLES is not set | ||
480 | # CONFIG_IP_DCCP is not set | 418 | # CONFIG_IP_DCCP is not set |
481 | CONFIG_IP_SCTP=m | 419 | # CONFIG_IP_SCTP is not set |
482 | # CONFIG_SCTP_DBG_MSG is not set | 420 | # CONFIG_TIPC is not set |
483 | # CONFIG_SCTP_DBG_OBJCNT is not set | 421 | # CONFIG_ATM is not set |
484 | # CONFIG_SCTP_HMAC_NONE is not set | 422 | # CONFIG_BRIDGE is not set |
485 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
486 | CONFIG_SCTP_HMAC_MD5=y | ||
487 | CONFIG_TIPC=m | ||
488 | # CONFIG_TIPC_ADVANCED is not set | ||
489 | # CONFIG_TIPC_DEBUG is not set | ||
490 | CONFIG_ATM=m | ||
491 | CONFIG_ATM_CLIP=m | ||
492 | # CONFIG_ATM_CLIP_NO_ICMP is not set | ||
493 | CONFIG_ATM_LANE=m | ||
494 | CONFIG_ATM_MPOA=m | ||
495 | CONFIG_ATM_BR2684=m | ||
496 | # CONFIG_ATM_BR2684_IPFILTER is not set | ||
497 | CONFIG_STP=m | ||
498 | CONFIG_BRIDGE=m | ||
499 | # CONFIG_NET_DSA is not set | 423 | # CONFIG_NET_DSA is not set |
500 | CONFIG_VLAN_8021Q=m | 424 | # CONFIG_VLAN_8021Q is not set |
501 | # CONFIG_VLAN_8021Q_GVRP is not set | ||
502 | # CONFIG_DECNET is not set | 425 | # CONFIG_DECNET is not set |
503 | CONFIG_LLC=m | ||
504 | # CONFIG_LLC2 is not set | 426 | # CONFIG_LLC2 is not set |
505 | # CONFIG_IPX is not set | 427 | # CONFIG_IPX is not set |
506 | # CONFIG_ATALK is not set | 428 | # CONFIG_ATALK is not set |
507 | # CONFIG_X25 is not set | 429 | # CONFIG_X25 is not set |
508 | # CONFIG_LAPB is not set | 430 | # CONFIG_LAPB is not set |
509 | # CONFIG_ECONET is not set | 431 | # CONFIG_ECONET is not set |
510 | CONFIG_WAN_ROUTER=m | 432 | # CONFIG_WAN_ROUTER is not set |
511 | # CONFIG_PHONET is not set | 433 | # CONFIG_PHONET is not set |
512 | CONFIG_NET_SCHED=y | 434 | # CONFIG_IEEE802154 is not set |
513 | 435 | # CONFIG_NET_SCHED is not set | |
514 | # | ||
515 | # Queueing/Scheduling | ||
516 | # | ||
517 | CONFIG_NET_SCH_CBQ=m | ||
518 | CONFIG_NET_SCH_HTB=m | ||
519 | CONFIG_NET_SCH_HFSC=m | ||
520 | CONFIG_NET_SCH_ATM=m | ||
521 | CONFIG_NET_SCH_PRIO=m | ||
522 | # CONFIG_NET_SCH_MULTIQ is not set | ||
523 | CONFIG_NET_SCH_RED=m | ||
524 | CONFIG_NET_SCH_SFQ=m | ||
525 | CONFIG_NET_SCH_TEQL=m | ||
526 | CONFIG_NET_SCH_TBF=m | ||
527 | CONFIG_NET_SCH_GRED=m | ||
528 | CONFIG_NET_SCH_DSMARK=m | ||
529 | CONFIG_NET_SCH_NETEM=m | ||
530 | # CONFIG_NET_SCH_DRR is not set | ||
531 | |||
532 | # | ||
533 | # Classification | ||
534 | # | ||
535 | CONFIG_NET_CLS=y | ||
536 | # CONFIG_NET_CLS_BASIC is not set | ||
537 | CONFIG_NET_CLS_TCINDEX=m | ||
538 | CONFIG_NET_CLS_ROUTE4=m | ||
539 | CONFIG_NET_CLS_ROUTE=y | ||
540 | CONFIG_NET_CLS_FW=m | ||
541 | CONFIG_NET_CLS_U32=m | ||
542 | # CONFIG_CLS_U32_PERF is not set | ||
543 | # CONFIG_CLS_U32_MARK is not set | ||
544 | CONFIG_NET_CLS_RSVP=m | ||
545 | CONFIG_NET_CLS_RSVP6=m | ||
546 | # CONFIG_NET_CLS_FLOW is not set | ||
547 | # CONFIG_NET_EMATCH is not set | ||
548 | # CONFIG_NET_CLS_ACT is not set | ||
549 | # CONFIG_NET_CLS_IND is not set | ||
550 | CONFIG_NET_SCH_FIFO=y | ||
551 | # CONFIG_DCB is not set | 436 | # CONFIG_DCB is not set |
552 | 437 | ||
553 | # | 438 | # |
@@ -560,12 +445,7 @@ CONFIG_NET_PKTGEN=m | |||
560 | # CONFIG_BT is not set | 445 | # CONFIG_BT is not set |
561 | # CONFIG_AF_RXRPC is not set | 446 | # CONFIG_AF_RXRPC is not set |
562 | CONFIG_FIB_RULES=y | 447 | CONFIG_FIB_RULES=y |
563 | CONFIG_WIRELESS=y | 448 | # CONFIG_WIRELESS is not set |
564 | # CONFIG_CFG80211 is not set | ||
565 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
566 | # CONFIG_WIRELESS_EXT is not set | ||
567 | # CONFIG_LIB80211 is not set | ||
568 | # CONFIG_MAC80211 is not set | ||
569 | # CONFIG_WIMAX is not set | 449 | # CONFIG_WIMAX is not set |
570 | # CONFIG_RFKILL is not set | 450 | # CONFIG_RFKILL is not set |
571 | # CONFIG_NET_9P is not set | 451 | # CONFIG_NET_9P is not set |
@@ -580,9 +460,9 @@ CONFIG_WIRELESS_OLD_REGULATORY=y | |||
580 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 460 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
581 | CONFIG_STANDALONE=y | 461 | CONFIG_STANDALONE=y |
582 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 462 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
583 | # CONFIG_FW_LOADER is not set | 463 | CONFIG_FW_LOADER=y |
584 | # CONFIG_DEBUG_DRIVER is not set | 464 | CONFIG_FIRMWARE_IN_KERNEL=y |
585 | # CONFIG_DEBUG_DEVRES is not set | 465 | CONFIG_EXTRA_FIRMWARE="" |
586 | # CONFIG_SYS_HYPERVISOR is not set | 466 | # CONFIG_SYS_HYPERVISOR is not set |
587 | # CONFIG_CONNECTOR is not set | 467 | # CONFIG_CONNECTOR is not set |
588 | CONFIG_MTD=y | 468 | CONFIG_MTD=y |
@@ -672,6 +552,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
672 | CONFIG_OF_DEVICE=y | 552 | CONFIG_OF_DEVICE=y |
673 | CONFIG_OF_GPIO=y | 553 | CONFIG_OF_GPIO=y |
674 | CONFIG_OF_I2C=y | 554 | CONFIG_OF_I2C=y |
555 | CONFIG_OF_MDIO=y | ||
675 | # CONFIG_PARPORT is not set | 556 | # CONFIG_PARPORT is not set |
676 | CONFIG_BLK_DEV=y | 557 | CONFIG_BLK_DEV=y |
677 | # CONFIG_BLK_DEV_FD is not set | 558 | # CONFIG_BLK_DEV_FD is not set |
@@ -707,9 +588,60 @@ CONFIG_MISC_DEVICES=y | |||
707 | # | 588 | # |
708 | # CONFIG_EEPROM_AT24 is not set | 589 | # CONFIG_EEPROM_AT24 is not set |
709 | # CONFIG_EEPROM_LEGACY is not set | 590 | # CONFIG_EEPROM_LEGACY is not set |
591 | # CONFIG_EEPROM_MAX6875 is not set | ||
710 | # CONFIG_EEPROM_93CX6 is not set | 592 | # CONFIG_EEPROM_93CX6 is not set |
593 | # CONFIG_CB710_CORE is not set | ||
711 | CONFIG_HAVE_IDE=y | 594 | CONFIG_HAVE_IDE=y |
712 | # CONFIG_IDE is not set | 595 | CONFIG_IDE=y |
596 | |||
597 | # | ||
598 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | ||
599 | # | ||
600 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
601 | CONFIG_IDE_GD=y | ||
602 | CONFIG_IDE_GD_ATA=y | ||
603 | # CONFIG_IDE_GD_ATAPI is not set | ||
604 | CONFIG_BLK_DEV_IDECS=y | ||
605 | # CONFIG_BLK_DEV_IDECD is not set | ||
606 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
607 | # CONFIG_IDE_TASK_IOCTL is not set | ||
608 | CONFIG_IDE_PROC_FS=y | ||
609 | |||
610 | # | ||
611 | # IDE chipset support/bugfixes | ||
612 | # | ||
613 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
614 | |||
615 | # | ||
616 | # PCI IDE chipsets support | ||
617 | # | ||
618 | # CONFIG_BLK_DEV_GENERIC is not set | ||
619 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
620 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
621 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
622 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
623 | # CONFIG_BLK_DEV_CMD64X is not set | ||
624 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
625 | # CONFIG_BLK_DEV_CS5520 is not set | ||
626 | # CONFIG_BLK_DEV_CS5530 is not set | ||
627 | # CONFIG_BLK_DEV_HPT366 is not set | ||
628 | # CONFIG_BLK_DEV_JMICRON is not set | ||
629 | # CONFIG_BLK_DEV_SC1200 is not set | ||
630 | # CONFIG_BLK_DEV_PIIX is not set | ||
631 | # CONFIG_BLK_DEV_IT8172 is not set | ||
632 | # CONFIG_BLK_DEV_IT8213 is not set | ||
633 | # CONFIG_BLK_DEV_IT821X is not set | ||
634 | # CONFIG_BLK_DEV_NS87415 is not set | ||
635 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
636 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
637 | # CONFIG_BLK_DEV_SVWKS is not set | ||
638 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
639 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
640 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
641 | # CONFIG_BLK_DEV_TRM290 is not set | ||
642 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
643 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
644 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
713 | 645 | ||
714 | # | 646 | # |
715 | # SCSI device support | 647 | # SCSI device support |
@@ -731,10 +663,6 @@ CONFIG_BLK_DEV_SR=y | |||
731 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 663 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
732 | # CONFIG_CHR_DEV_SG is not set | 664 | # CONFIG_CHR_DEV_SG is not set |
733 | # CONFIG_CHR_DEV_SCH is not set | 665 | # CONFIG_CHR_DEV_SCH is not set |
734 | |||
735 | # | ||
736 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
737 | # | ||
738 | # CONFIG_SCSI_MULTI_LUN is not set | 666 | # CONFIG_SCSI_MULTI_LUN is not set |
739 | # CONFIG_SCSI_CONSTANTS is not set | 667 | # CONFIG_SCSI_CONSTANTS is not set |
740 | # CONFIG_SCSI_LOGGING is not set | 668 | # CONFIG_SCSI_LOGGING is not set |
@@ -751,6 +679,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
751 | # CONFIG_SCSI_SRP_ATTRS is not set | 679 | # CONFIG_SCSI_SRP_ATTRS is not set |
752 | CONFIG_SCSI_LOWLEVEL=y | 680 | CONFIG_SCSI_LOWLEVEL=y |
753 | # CONFIG_ISCSI_TCP is not set | 681 | # CONFIG_ISCSI_TCP is not set |
682 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
754 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 683 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
755 | # CONFIG_SCSI_3W_9XXX is not set | 684 | # CONFIG_SCSI_3W_9XXX is not set |
756 | # CONFIG_SCSI_ACARD is not set | 685 | # CONFIG_SCSI_ACARD is not set |
@@ -759,6 +688,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
759 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 688 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
760 | # CONFIG_SCSI_AIC79XX is not set | 689 | # CONFIG_SCSI_AIC79XX is not set |
761 | # CONFIG_SCSI_AIC94XX is not set | 690 | # CONFIG_SCSI_AIC94XX is not set |
691 | # CONFIG_SCSI_MVSAS is not set | ||
762 | # CONFIG_SCSI_DPT_I2O is not set | 692 | # CONFIG_SCSI_DPT_I2O is not set |
763 | # CONFIG_SCSI_ADVANSYS is not set | 693 | # CONFIG_SCSI_ADVANSYS is not set |
764 | # CONFIG_SCSI_ARCMSR is not set | 694 | # CONFIG_SCSI_ARCMSR is not set |
@@ -778,7 +708,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
778 | # CONFIG_SCSI_IPS is not set | 708 | # CONFIG_SCSI_IPS is not set |
779 | # CONFIG_SCSI_INITIO is not set | 709 | # CONFIG_SCSI_INITIO is not set |
780 | # CONFIG_SCSI_INIA100 is not set | 710 | # CONFIG_SCSI_INIA100 is not set |
781 | # CONFIG_SCSI_MVSAS is not set | ||
782 | # CONFIG_SCSI_STEX is not set | 711 | # CONFIG_SCSI_STEX is not set |
783 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 712 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
784 | # CONFIG_SCSI_IPR is not set | 713 | # CONFIG_SCSI_IPR is not set |
@@ -791,6 +720,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
791 | # CONFIG_SCSI_NSP32 is not set | 720 | # CONFIG_SCSI_NSP32 is not set |
792 | # CONFIG_SCSI_DEBUG is not set | 721 | # CONFIG_SCSI_DEBUG is not set |
793 | # CONFIG_SCSI_SRP is not set | 722 | # CONFIG_SCSI_SRP is not set |
723 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | ||
794 | # CONFIG_SCSI_DH is not set | 724 | # CONFIG_SCSI_DH is not set |
795 | # CONFIG_SCSI_OSD_INITIATOR is not set | 725 | # CONFIG_SCSI_OSD_INITIATOR is not set |
796 | CONFIG_ATA=y | 726 | CONFIG_ATA=y |
@@ -842,6 +772,7 @@ CONFIG_SATA_SIL=y | |||
842 | # CONFIG_PATA_NS87415 is not set | 772 | # CONFIG_PATA_NS87415 is not set |
843 | # CONFIG_PATA_OPTI is not set | 773 | # CONFIG_PATA_OPTI is not set |
844 | # CONFIG_PATA_OPTIDMA is not set | 774 | # CONFIG_PATA_OPTIDMA is not set |
775 | # CONFIG_PATA_PCMCIA is not set | ||
845 | # CONFIG_PATA_PDC_OLD is not set | 776 | # CONFIG_PATA_PDC_OLD is not set |
846 | # CONFIG_PATA_RADISYS is not set | 777 | # CONFIG_PATA_RADISYS is not set |
847 | # CONFIG_PATA_RZ1000 is not set | 778 | # CONFIG_PATA_RZ1000 is not set |
@@ -862,14 +793,17 @@ CONFIG_SATA_SIL=y | |||
862 | # | 793 | # |
863 | 794 | ||
864 | # | 795 | # |
865 | # Enable only one of the two stacks, unless you know what you are doing | 796 | # You can enable one or both FireWire driver stacks. |
797 | # | ||
798 | |||
799 | # | ||
800 | # See the help texts for more information. | ||
866 | # | 801 | # |
867 | # CONFIG_FIREWIRE is not set | 802 | # CONFIG_FIREWIRE is not set |
868 | # CONFIG_IEEE1394 is not set | 803 | # CONFIG_IEEE1394 is not set |
869 | # CONFIG_I2O is not set | 804 | # CONFIG_I2O is not set |
870 | # CONFIG_MACINTOSH_DRIVERS is not set | 805 | # CONFIG_MACINTOSH_DRIVERS is not set |
871 | CONFIG_NETDEVICES=y | 806 | CONFIG_NETDEVICES=y |
872 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
873 | CONFIG_DUMMY=m | 807 | CONFIG_DUMMY=m |
874 | CONFIG_BONDING=m | 808 | CONFIG_BONDING=m |
875 | # CONFIG_MACVLAN is not set | 809 | # CONFIG_MACVLAN is not set |
@@ -916,6 +850,7 @@ CONFIG_MII=y | |||
916 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 850 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
917 | # CONFIG_NET_PCI is not set | 851 | # CONFIG_NET_PCI is not set |
918 | # CONFIG_B44 is not set | 852 | # CONFIG_B44 is not set |
853 | # CONFIG_KS8842 is not set | ||
919 | # CONFIG_ATL2 is not set | 854 | # CONFIG_ATL2 is not set |
920 | CONFIG_NETDEV_1000=y | 855 | CONFIG_NETDEV_1000=y |
921 | # CONFIG_ACENIC is not set | 856 | # CONFIG_ACENIC is not set |
@@ -935,8 +870,10 @@ CONFIG_NETDEV_1000=y | |||
935 | # CONFIG_VIA_VELOCITY is not set | 870 | # CONFIG_VIA_VELOCITY is not set |
936 | # CONFIG_TIGON3 is not set | 871 | # CONFIG_TIGON3 is not set |
937 | # CONFIG_BNX2 is not set | 872 | # CONFIG_BNX2 is not set |
873 | # CONFIG_CNIC is not set | ||
938 | CONFIG_FSL_PQ_MDIO=y | 874 | CONFIG_FSL_PQ_MDIO=y |
939 | CONFIG_GIANFAR=y | 875 | CONFIG_GIANFAR=y |
876 | # CONFIG_MV643XX_ETH is not set | ||
940 | # CONFIG_QLA3XXX is not set | 877 | # CONFIG_QLA3XXX is not set |
941 | # CONFIG_ATL1 is not set | 878 | # CONFIG_ATL1 is not set |
942 | # CONFIG_ATL1E is not set | 879 | # CONFIG_ATL1E is not set |
@@ -963,22 +900,8 @@ CONFIG_GIANFAR=y | |||
963 | # CONFIG_USB_PEGASUS is not set | 900 | # CONFIG_USB_PEGASUS is not set |
964 | # CONFIG_USB_RTL8150 is not set | 901 | # CONFIG_USB_RTL8150 is not set |
965 | # CONFIG_USB_USBNET is not set | 902 | # CONFIG_USB_USBNET is not set |
903 | # CONFIG_NET_PCMCIA is not set | ||
966 | # CONFIG_WAN is not set | 904 | # CONFIG_WAN is not set |
967 | CONFIG_ATM_DRIVERS=y | ||
968 | # CONFIG_ATM_DUMMY is not set | ||
969 | # CONFIG_ATM_TCP is not set | ||
970 | # CONFIG_ATM_LANAI is not set | ||
971 | # CONFIG_ATM_ENI is not set | ||
972 | # CONFIG_ATM_FIRESTREAM is not set | ||
973 | # CONFIG_ATM_ZATM is not set | ||
974 | # CONFIG_ATM_NICSTAR is not set | ||
975 | # CONFIG_ATM_IDT77252 is not set | ||
976 | # CONFIG_ATM_AMBASSADOR is not set | ||
977 | # CONFIG_ATM_HORIZON is not set | ||
978 | # CONFIG_ATM_IA is not set | ||
979 | # CONFIG_ATM_FORE200E is not set | ||
980 | # CONFIG_ATM_HE is not set | ||
981 | # CONFIG_ATM_SOLOS is not set | ||
982 | # CONFIG_FDDI is not set | 905 | # CONFIG_FDDI is not set |
983 | # CONFIG_HIPPI is not set | 906 | # CONFIG_HIPPI is not set |
984 | CONFIG_PPP=m | 907 | CONFIG_PPP=m |
@@ -990,7 +913,6 @@ CONFIG_PPP_DEFLATE=m | |||
990 | CONFIG_PPP_BSDCOMP=m | 913 | CONFIG_PPP_BSDCOMP=m |
991 | # CONFIG_PPP_MPPE is not set | 914 | # CONFIG_PPP_MPPE is not set |
992 | CONFIG_PPPOE=m | 915 | CONFIG_PPPOE=m |
993 | CONFIG_PPPOATM=m | ||
994 | # CONFIG_PPPOL2TP is not set | 916 | # CONFIG_PPPOL2TP is not set |
995 | CONFIG_SLIP=m | 917 | CONFIG_SLIP=m |
996 | CONFIG_SLIP_COMPRESSED=y | 918 | CONFIG_SLIP_COMPRESSED=y |
@@ -1010,7 +932,7 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
1010 | # Input device support | 932 | # Input device support |
1011 | # | 933 | # |
1012 | CONFIG_INPUT=y | 934 | CONFIG_INPUT=y |
1013 | CONFIG_INPUT_FF_MEMLESS=m | 935 | # CONFIG_INPUT_FF_MEMLESS is not set |
1014 | # CONFIG_INPUT_POLLDEV is not set | 936 | # CONFIG_INPUT_POLLDEV is not set |
1015 | 937 | ||
1016 | # | 938 | # |
@@ -1058,6 +980,7 @@ CONFIG_DEVKMEM=y | |||
1058 | CONFIG_SERIAL_8250=y | 980 | CONFIG_SERIAL_8250=y |
1059 | CONFIG_SERIAL_8250_CONSOLE=y | 981 | CONFIG_SERIAL_8250_CONSOLE=y |
1060 | # CONFIG_SERIAL_8250_PCI is not set | 982 | # CONFIG_SERIAL_8250_PCI is not set |
983 | # CONFIG_SERIAL_8250_CS is not set | ||
1061 | CONFIG_SERIAL_8250_NR_UARTS=2 | 984 | CONFIG_SERIAL_8250_NR_UARTS=2 |
1062 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | 985 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 |
1063 | # CONFIG_SERIAL_8250_EXTENDED is not set | 986 | # CONFIG_SERIAL_8250_EXTENDED is not set |
@@ -1080,6 +1003,14 @@ CONFIG_HW_RANDOM=y | |||
1080 | CONFIG_NVRAM=y | 1003 | CONFIG_NVRAM=y |
1081 | # CONFIG_R3964 is not set | 1004 | # CONFIG_R3964 is not set |
1082 | # CONFIG_APPLICOM is not set | 1005 | # CONFIG_APPLICOM is not set |
1006 | |||
1007 | # | ||
1008 | # PCMCIA character devices | ||
1009 | # | ||
1010 | # CONFIG_SYNCLINK_CS is not set | ||
1011 | # CONFIG_CARDMAN_4000 is not set | ||
1012 | # CONFIG_CARDMAN_4040 is not set | ||
1013 | # CONFIG_IPWIRELESS is not set | ||
1083 | # CONFIG_RAW_DRIVER is not set | 1014 | # CONFIG_RAW_DRIVER is not set |
1084 | # CONFIG_TCG_TPM is not set | 1015 | # CONFIG_TCG_TPM is not set |
1085 | CONFIG_DEVPORT=y | 1016 | CONFIG_DEVPORT=y |
@@ -1143,18 +1074,21 @@ CONFIG_DS1682=y | |||
1143 | # CONFIG_SENSORS_PCF8574 is not set | 1074 | # CONFIG_SENSORS_PCF8574 is not set |
1144 | # CONFIG_PCF8575 is not set | 1075 | # CONFIG_PCF8575 is not set |
1145 | # CONFIG_SENSORS_PCA9539 is not set | 1076 | # CONFIG_SENSORS_PCA9539 is not set |
1146 | # CONFIG_SENSORS_MAX6875 is not set | ||
1147 | # CONFIG_SENSORS_TSL2550 is not set | 1077 | # CONFIG_SENSORS_TSL2550 is not set |
1148 | # CONFIG_I2C_DEBUG_CORE is not set | 1078 | # CONFIG_I2C_DEBUG_CORE is not set |
1149 | # CONFIG_I2C_DEBUG_ALGO is not set | 1079 | # CONFIG_I2C_DEBUG_ALGO is not set |
1150 | # CONFIG_I2C_DEBUG_BUS is not set | 1080 | # CONFIG_I2C_DEBUG_BUS is not set |
1151 | # CONFIG_I2C_DEBUG_CHIP is not set | 1081 | # CONFIG_I2C_DEBUG_CHIP is not set |
1152 | # CONFIG_SPI is not set | 1082 | # CONFIG_SPI is not set |
1083 | |||
1084 | # | ||
1085 | # PPS support | ||
1086 | # | ||
1087 | # CONFIG_PPS is not set | ||
1153 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1088 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
1154 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 1089 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
1155 | CONFIG_GPIOLIB=y | 1090 | CONFIG_GPIOLIB=y |
1156 | # CONFIG_DEBUG_GPIO is not set | 1091 | CONFIG_GPIO_SYSFS=y |
1157 | # CONFIG_GPIO_SYSFS is not set | ||
1158 | 1092 | ||
1159 | # | 1093 | # |
1160 | # Memory mapped GPIO expanders: | 1094 | # Memory mapped GPIO expanders: |
@@ -1229,6 +1163,7 @@ CONFIG_SENSORS_LM92=y | |||
1229 | # CONFIG_SENSORS_SMSC47B397 is not set | 1163 | # CONFIG_SENSORS_SMSC47B397 is not set |
1230 | # CONFIG_SENSORS_ADS7828 is not set | 1164 | # CONFIG_SENSORS_ADS7828 is not set |
1231 | # CONFIG_SENSORS_THMC50 is not set | 1165 | # CONFIG_SENSORS_THMC50 is not set |
1166 | # CONFIG_SENSORS_TMP401 is not set | ||
1232 | # CONFIG_SENSORS_VIA686A is not set | 1167 | # CONFIG_SENSORS_VIA686A is not set |
1233 | # CONFIG_SENSORS_VT1211 is not set | 1168 | # CONFIG_SENSORS_VT1211 is not set |
1234 | # CONFIG_SENSORS_VT8231 is not set | 1169 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1284,24 +1219,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1284 | # CONFIG_MFD_WM8400 is not set | 1219 | # CONFIG_MFD_WM8400 is not set |
1285 | # CONFIG_MFD_WM8350_I2C is not set | 1220 | # CONFIG_MFD_WM8350_I2C is not set |
1286 | # CONFIG_MFD_PCF50633 is not set | 1221 | # CONFIG_MFD_PCF50633 is not set |
1222 | # CONFIG_AB3100_CORE is not set | ||
1287 | # CONFIG_REGULATOR is not set | 1223 | # CONFIG_REGULATOR is not set |
1288 | 1224 | # CONFIG_MEDIA_SUPPORT is not set | |
1289 | # | ||
1290 | # Multimedia devices | ||
1291 | # | ||
1292 | |||
1293 | # | ||
1294 | # Multimedia core support | ||
1295 | # | ||
1296 | # CONFIG_VIDEO_DEV is not set | ||
1297 | # CONFIG_DVB_CORE is not set | ||
1298 | # CONFIG_VIDEO_MEDIA is not set | ||
1299 | |||
1300 | # | ||
1301 | # Multimedia drivers | ||
1302 | # | ||
1303 | CONFIG_DAB=y | ||
1304 | # CONFIG_USB_DABUSB is not set | ||
1305 | 1225 | ||
1306 | # | 1226 | # |
1307 | # Graphics support | 1227 | # Graphics support |
@@ -1346,7 +1266,7 @@ CONFIG_HID_BELKIN=y | |||
1346 | CONFIG_HID_CHERRY=y | 1266 | CONFIG_HID_CHERRY=y |
1347 | CONFIG_HID_CHICONY=y | 1267 | CONFIG_HID_CHICONY=y |
1348 | CONFIG_HID_CYPRESS=y | 1268 | CONFIG_HID_CYPRESS=y |
1349 | # CONFIG_DRAGONRISE_FF is not set | 1269 | # CONFIG_HID_DRAGONRISE is not set |
1350 | CONFIG_HID_EZKEY=y | 1270 | CONFIG_HID_EZKEY=y |
1351 | # CONFIG_HID_KYE is not set | 1271 | # CONFIG_HID_KYE is not set |
1352 | CONFIG_HID_GYRATION=y | 1272 | CONFIG_HID_GYRATION=y |
@@ -1363,10 +1283,11 @@ CONFIG_HID_PETALYNX=y | |||
1363 | CONFIG_HID_SAMSUNG=y | 1283 | CONFIG_HID_SAMSUNG=y |
1364 | CONFIG_HID_SONY=y | 1284 | CONFIG_HID_SONY=y |
1365 | CONFIG_HID_SUNPLUS=y | 1285 | CONFIG_HID_SUNPLUS=y |
1366 | # CONFIG_GREENASIA_FF is not set | 1286 | # CONFIG_HID_GREENASIA is not set |
1287 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1367 | # CONFIG_HID_TOPSEED is not set | 1288 | # CONFIG_HID_TOPSEED is not set |
1368 | CONFIG_THRUSTMASTER_FF=m | 1289 | # CONFIG_HID_THRUSTMASTER is not set |
1369 | CONFIG_ZEROPLUS_FF=m | 1290 | # CONFIG_HID_ZEROPLUS is not set |
1370 | CONFIG_USB_SUPPORT=y | 1291 | CONFIG_USB_SUPPORT=y |
1371 | CONFIG_USB_ARCH_HAS_HCD=y | 1292 | CONFIG_USB_ARCH_HAS_HCD=y |
1372 | CONFIG_USB_ARCH_HAS_OHCI=y | 1293 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1392,6 +1313,7 @@ CONFIG_USB=y | |||
1392 | # USB Host Controller Drivers | 1313 | # USB Host Controller Drivers |
1393 | # | 1314 | # |
1394 | # CONFIG_USB_C67X00_HCD is not set | 1315 | # CONFIG_USB_C67X00_HCD is not set |
1316 | # CONFIG_USB_XHCI_HCD is not set | ||
1395 | CONFIG_USB_EHCI_HCD=y | 1317 | CONFIG_USB_EHCI_HCD=y |
1396 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1318 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1397 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1319 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1401,6 +1323,8 @@ CONFIG_USB_EHCI_HCD=y | |||
1401 | # CONFIG_USB_ISP116X_HCD is not set | 1323 | # CONFIG_USB_ISP116X_HCD is not set |
1402 | # CONFIG_USB_ISP1760_HCD is not set | 1324 | # CONFIG_USB_ISP1760_HCD is not set |
1403 | CONFIG_USB_OHCI_HCD=y | 1325 | CONFIG_USB_OHCI_HCD=y |
1326 | # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set | ||
1327 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | ||
1404 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1328 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1405 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1329 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
1406 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1330 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -1475,7 +1399,6 @@ CONFIG_USB_STORAGE=y | |||
1475 | # CONFIG_USB_IOWARRIOR is not set | 1399 | # CONFIG_USB_IOWARRIOR is not set |
1476 | # CONFIG_USB_ISIGHTFW is not set | 1400 | # CONFIG_USB_ISIGHTFW is not set |
1477 | # CONFIG_USB_VST is not set | 1401 | # CONFIG_USB_VST is not set |
1478 | # CONFIG_USB_ATM is not set | ||
1479 | # CONFIG_USB_GADGET is not set | 1402 | # CONFIG_USB_GADGET is not set |
1480 | 1403 | ||
1481 | # | 1404 | # |
@@ -1521,6 +1444,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1521 | # CONFIG_RTC_DRV_S35390A is not set | 1444 | # CONFIG_RTC_DRV_S35390A is not set |
1522 | # CONFIG_RTC_DRV_FM3130 is not set | 1445 | # CONFIG_RTC_DRV_FM3130 is not set |
1523 | CONFIG_RTC_DRV_RX8581=y | 1446 | CONFIG_RTC_DRV_RX8581=y |
1447 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1524 | 1448 | ||
1525 | # | 1449 | # |
1526 | # SPI RTC drivers | 1450 | # SPI RTC drivers |
@@ -1548,6 +1472,10 @@ CONFIG_RTC_DRV_RX8581=y | |||
1548 | # CONFIG_DMADEVICES is not set | 1472 | # CONFIG_DMADEVICES is not set |
1549 | # CONFIG_AUXDISPLAY is not set | 1473 | # CONFIG_AUXDISPLAY is not set |
1550 | # CONFIG_UIO is not set | 1474 | # CONFIG_UIO is not set |
1475 | |||
1476 | # | ||
1477 | # TI VLYNQ | ||
1478 | # | ||
1551 | # CONFIG_STAGING is not set | 1479 | # CONFIG_STAGING is not set |
1552 | 1480 | ||
1553 | # | 1481 | # |
@@ -1569,10 +1497,12 @@ CONFIG_FS_MBCACHE=y | |||
1569 | # CONFIG_REISERFS_FS is not set | 1497 | # CONFIG_REISERFS_FS is not set |
1570 | # CONFIG_JFS_FS is not set | 1498 | # CONFIG_JFS_FS is not set |
1571 | CONFIG_FS_POSIX_ACL=y | 1499 | CONFIG_FS_POSIX_ACL=y |
1572 | CONFIG_FILE_LOCKING=y | ||
1573 | # CONFIG_XFS_FS is not set | 1500 | # CONFIG_XFS_FS is not set |
1501 | # CONFIG_GFS2_FS is not set | ||
1574 | # CONFIG_OCFS2_FS is not set | 1502 | # CONFIG_OCFS2_FS is not set |
1575 | # CONFIG_BTRFS_FS is not set | 1503 | # CONFIG_BTRFS_FS is not set |
1504 | CONFIG_FILE_LOCKING=y | ||
1505 | CONFIG_FSNOTIFY=y | ||
1576 | CONFIG_DNOTIFY=y | 1506 | CONFIG_DNOTIFY=y |
1577 | CONFIG_INOTIFY=y | 1507 | CONFIG_INOTIFY=y |
1578 | CONFIG_INOTIFY_USER=y | 1508 | CONFIG_INOTIFY_USER=y |
@@ -1589,8 +1519,11 @@ CONFIG_INOTIFY_USER=y | |||
1589 | # | 1519 | # |
1590 | # CD-ROM/DVD Filesystems | 1520 | # CD-ROM/DVD Filesystems |
1591 | # | 1521 | # |
1592 | # CONFIG_ISO9660_FS is not set | 1522 | CONFIG_ISO9660_FS=y |
1593 | # CONFIG_UDF_FS is not set | 1523 | CONFIG_JOLIET=y |
1524 | CONFIG_ZISOFS=y | ||
1525 | CONFIG_UDF_FS=y | ||
1526 | CONFIG_UDF_NLS=y | ||
1594 | 1527 | ||
1595 | # | 1528 | # |
1596 | # DOS/FAT/NT Filesystems | 1529 | # DOS/FAT/NT Filesystems |
@@ -1598,8 +1531,8 @@ CONFIG_INOTIFY_USER=y | |||
1598 | CONFIG_FAT_FS=y | 1531 | CONFIG_FAT_FS=y |
1599 | CONFIG_MSDOS_FS=y | 1532 | CONFIG_MSDOS_FS=y |
1600 | CONFIG_VFAT_FS=y | 1533 | CONFIG_VFAT_FS=y |
1601 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | 1534 | CONFIG_FAT_DEFAULT_CODEPAGE=850 |
1602 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | 1535 | CONFIG_FAT_DEFAULT_IOCHARSET="ascii" |
1603 | # CONFIG_NTFS_FS is not set | 1536 | # CONFIG_NTFS_FS is not set |
1604 | 1537 | ||
1605 | # | 1538 | # |
@@ -1649,6 +1582,7 @@ CONFIG_NFS_FS=y | |||
1649 | CONFIG_NFS_V3=y | 1582 | CONFIG_NFS_V3=y |
1650 | # CONFIG_NFS_V3_ACL is not set | 1583 | # CONFIG_NFS_V3_ACL is not set |
1651 | CONFIG_NFS_V4=y | 1584 | CONFIG_NFS_V4=y |
1585 | # CONFIG_NFS_V4_1 is not set | ||
1652 | CONFIG_ROOT_NFS=y | 1586 | CONFIG_ROOT_NFS=y |
1653 | # CONFIG_NFSD is not set | 1587 | # CONFIG_NFSD is not set |
1654 | CONFIG_LOCKD=y | 1588 | CONFIG_LOCKD=y |
@@ -1723,13 +1657,13 @@ CONFIG_NLS_UTF8=m | |||
1723 | # | 1657 | # |
1724 | CONFIG_BITREVERSE=y | 1658 | CONFIG_BITREVERSE=y |
1725 | CONFIG_GENERIC_FIND_LAST_BIT=y | 1659 | CONFIG_GENERIC_FIND_LAST_BIT=y |
1726 | CONFIG_CRC_CCITT=m | 1660 | CONFIG_CRC_CCITT=y |
1727 | # CONFIG_CRC16 is not set | 1661 | # CONFIG_CRC16 is not set |
1728 | # CONFIG_CRC_T10DIF is not set | 1662 | CONFIG_CRC_T10DIF=y |
1729 | # CONFIG_CRC_ITU_T is not set | 1663 | CONFIG_CRC_ITU_T=y |
1730 | CONFIG_CRC32=y | 1664 | CONFIG_CRC32=y |
1731 | # CONFIG_CRC7 is not set | 1665 | # CONFIG_CRC7 is not set |
1732 | CONFIG_LIBCRC32C=m | 1666 | CONFIG_LIBCRC32C=y |
1733 | CONFIG_ZLIB_INFLATE=y | 1667 | CONFIG_ZLIB_INFLATE=y |
1734 | CONFIG_ZLIB_DEFLATE=y | 1668 | CONFIG_ZLIB_DEFLATE=y |
1735 | CONFIG_DECOMPRESS_GZIP=y | 1669 | CONFIG_DECOMPRESS_GZIP=y |
@@ -1738,6 +1672,7 @@ CONFIG_HAS_IOPORT=y | |||
1738 | CONFIG_HAS_DMA=y | 1672 | CONFIG_HAS_DMA=y |
1739 | CONFIG_HAVE_LMB=y | 1673 | CONFIG_HAVE_LMB=y |
1740 | CONFIG_NLATTR=y | 1674 | CONFIG_NLATTR=y |
1675 | CONFIG_GENERIC_ATOMIC64=y | ||
1741 | 1676 | ||
1742 | # | 1677 | # |
1743 | # Kernel hacking | 1678 | # Kernel hacking |
@@ -1750,75 +1685,24 @@ CONFIG_MAGIC_SYSRQ=y | |||
1750 | # CONFIG_UNUSED_SYMBOLS is not set | 1685 | # CONFIG_UNUSED_SYMBOLS is not set |
1751 | # CONFIG_DEBUG_FS is not set | 1686 | # CONFIG_DEBUG_FS is not set |
1752 | # CONFIG_HEADERS_CHECK is not set | 1687 | # CONFIG_HEADERS_CHECK is not set |
1753 | CONFIG_DEBUG_KERNEL=y | 1688 | # CONFIG_DEBUG_KERNEL is not set |
1754 | # CONFIG_DEBUG_SHIRQ is not set | ||
1755 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1756 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1757 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1758 | CONFIG_DETECT_HUNG_TASK=y | ||
1759 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
1760 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
1761 | CONFIG_SCHED_DEBUG=y | ||
1762 | # CONFIG_SCHEDSTATS is not set | ||
1763 | # CONFIG_TIMER_STATS is not set | ||
1764 | # CONFIG_DEBUG_OBJECTS is not set | ||
1765 | # CONFIG_DEBUG_SLAB is not set | ||
1766 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1767 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1768 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1769 | # CONFIG_DEBUG_MUTEXES is not set | ||
1770 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1771 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1772 | # CONFIG_DEBUG_KOBJECT is not set | ||
1773 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1689 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1774 | CONFIG_DEBUG_INFO=y | ||
1775 | # CONFIG_DEBUG_VM is not set | ||
1776 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1777 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1690 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1778 | # CONFIG_DEBUG_LIST is not set | ||
1779 | # CONFIG_DEBUG_SG is not set | ||
1780 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1781 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1782 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1783 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1691 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1784 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1785 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1786 | # CONFIG_FAULT_INJECTION is not set | ||
1787 | # CONFIG_LATENCYTOP is not set | 1692 | # CONFIG_LATENCYTOP is not set |
1788 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1693 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1789 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
1790 | CONFIG_HAVE_FUNCTION_TRACER=y | 1694 | CONFIG_HAVE_FUNCTION_TRACER=y |
1791 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | 1695 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
1792 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1696 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1793 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1697 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1794 | CONFIG_TRACING_SUPPORT=y | 1698 | CONFIG_TRACING_SUPPORT=y |
1795 | 1699 | # CONFIG_FTRACE is not set | |
1796 | # | ||
1797 | # Tracers | ||
1798 | # | ||
1799 | # CONFIG_FUNCTION_TRACER is not set | ||
1800 | # CONFIG_PREEMPT_TRACER is not set | ||
1801 | # CONFIG_SCHED_TRACER is not set | ||
1802 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1803 | # CONFIG_EVENT_TRACER is not set | ||
1804 | # CONFIG_BOOT_TRACER is not set | ||
1805 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1806 | # CONFIG_STACK_TRACER is not set | ||
1807 | # CONFIG_KMEMTRACE is not set | ||
1808 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1809 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1810 | # CONFIG_SAMPLES is not set | 1700 | # CONFIG_SAMPLES is not set |
1811 | CONFIG_HAVE_ARCH_KGDB=y | 1701 | CONFIG_HAVE_ARCH_KGDB=y |
1812 | # CONFIG_KGDB is not set | 1702 | # CONFIG_PPC_DISABLE_WERROR is not set |
1703 | CONFIG_PPC_WERROR=y | ||
1813 | CONFIG_PRINT_STACK_DEPTH=64 | 1704 | CONFIG_PRINT_STACK_DEPTH=64 |
1814 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
1815 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1816 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
1817 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1818 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1819 | # CONFIG_XMON is not set | ||
1820 | # CONFIG_IRQSTACKS is not set | 1705 | # CONFIG_IRQSTACKS is not set |
1821 | # CONFIG_BDI_SWITCH is not set | ||
1822 | # CONFIG_BOOTX_TEXT is not set | 1706 | # CONFIG_BOOTX_TEXT is not set |
1823 | # CONFIG_PPC_EARLY_DEBUG is not set | 1707 | # CONFIG_PPC_EARLY_DEBUG is not set |
1824 | 1708 | ||
@@ -1826,15 +1710,9 @@ CONFIG_PRINT_STACK_DEPTH=64 | |||
1826 | # Security options | 1710 | # Security options |
1827 | # | 1711 | # |
1828 | # CONFIG_KEYS is not set | 1712 | # CONFIG_KEYS is not set |
1829 | CONFIG_SECURITY=y | 1713 | # CONFIG_SECURITY is not set |
1830 | # CONFIG_SECURITYFS is not set | 1714 | # CONFIG_SECURITYFS is not set |
1831 | CONFIG_SECURITY_NETWORK=y | ||
1832 | # CONFIG_SECURITY_NETWORK_XFRM is not set | ||
1833 | # CONFIG_SECURITY_PATH is not set | ||
1834 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1715 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1835 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
1836 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | ||
1837 | # CONFIG_SECURITY_TOMOYO is not set | ||
1838 | CONFIG_CRYPTO=y | 1716 | CONFIG_CRYPTO=y |
1839 | 1717 | ||
1840 | # | 1718 | # |
@@ -1854,11 +1732,11 @@ CONFIG_CRYPTO_PCOMP=y | |||
1854 | CONFIG_CRYPTO_MANAGER=y | 1732 | CONFIG_CRYPTO_MANAGER=y |
1855 | CONFIG_CRYPTO_MANAGER2=y | 1733 | CONFIG_CRYPTO_MANAGER2=y |
1856 | # CONFIG_CRYPTO_GF128MUL is not set | 1734 | # CONFIG_CRYPTO_GF128MUL is not set |
1857 | CONFIG_CRYPTO_NULL=m | 1735 | # CONFIG_CRYPTO_NULL is not set |
1858 | CONFIG_CRYPTO_WORKQUEUE=y | 1736 | CONFIG_CRYPTO_WORKQUEUE=y |
1859 | # CONFIG_CRYPTO_CRYPTD is not set | 1737 | # CONFIG_CRYPTO_CRYPTD is not set |
1860 | CONFIG_CRYPTO_AUTHENC=m | 1738 | CONFIG_CRYPTO_AUTHENC=m |
1861 | CONFIG_CRYPTO_TEST=m | 1739 | # CONFIG_CRYPTO_TEST is not set |
1862 | 1740 | ||
1863 | # | 1741 | # |
1864 | # Authenticated Encryption with Associated Data | 1742 | # Authenticated Encryption with Associated Data |
@@ -1873,53 +1751,52 @@ CONFIG_CRYPTO_TEST=m | |||
1873 | CONFIG_CRYPTO_CBC=y | 1751 | CONFIG_CRYPTO_CBC=y |
1874 | # CONFIG_CRYPTO_CTR is not set | 1752 | # CONFIG_CRYPTO_CTR is not set |
1875 | # CONFIG_CRYPTO_CTS is not set | 1753 | # CONFIG_CRYPTO_CTS is not set |
1876 | CONFIG_CRYPTO_ECB=m | 1754 | # CONFIG_CRYPTO_ECB is not set |
1877 | # CONFIG_CRYPTO_LRW is not set | 1755 | # CONFIG_CRYPTO_LRW is not set |
1878 | CONFIG_CRYPTO_PCBC=m | 1756 | # CONFIG_CRYPTO_PCBC is not set |
1879 | # CONFIG_CRYPTO_XTS is not set | 1757 | # CONFIG_CRYPTO_XTS is not set |
1880 | 1758 | ||
1881 | # | 1759 | # |
1882 | # Hash modes | 1760 | # Hash modes |
1883 | # | 1761 | # |
1884 | CONFIG_CRYPTO_HMAC=y | 1762 | CONFIG_CRYPTO_HMAC=m |
1885 | # CONFIG_CRYPTO_XCBC is not set | 1763 | # CONFIG_CRYPTO_XCBC is not set |
1886 | 1764 | ||
1887 | # | 1765 | # |
1888 | # Digest | 1766 | # Digest |
1889 | # | 1767 | # |
1890 | CONFIG_CRYPTO_CRC32C=m | 1768 | CONFIG_CRYPTO_CRC32C=y |
1891 | CONFIG_CRYPTO_MD4=m | 1769 | # CONFIG_CRYPTO_MD4 is not set |
1892 | CONFIG_CRYPTO_MD5=y | 1770 | CONFIG_CRYPTO_MD5=y |
1893 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1771 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1894 | # CONFIG_CRYPTO_RMD128 is not set | 1772 | # CONFIG_CRYPTO_RMD128 is not set |
1895 | # CONFIG_CRYPTO_RMD160 is not set | 1773 | # CONFIG_CRYPTO_RMD160 is not set |
1896 | # CONFIG_CRYPTO_RMD256 is not set | 1774 | # CONFIG_CRYPTO_RMD256 is not set |
1897 | # CONFIG_CRYPTO_RMD320 is not set | 1775 | # CONFIG_CRYPTO_RMD320 is not set |
1898 | CONFIG_CRYPTO_SHA1=m | 1776 | CONFIG_CRYPTO_SHA1=m |
1899 | CONFIG_CRYPTO_SHA256=m | 1777 | # CONFIG_CRYPTO_SHA256 is not set |
1900 | CONFIG_CRYPTO_SHA512=m | 1778 | # CONFIG_CRYPTO_SHA512 is not set |
1901 | # CONFIG_CRYPTO_TGR192 is not set | 1779 | # CONFIG_CRYPTO_TGR192 is not set |
1902 | CONFIG_CRYPTO_WP512=m | 1780 | # CONFIG_CRYPTO_WP512 is not set |
1903 | 1781 | ||
1904 | # | 1782 | # |
1905 | # Ciphers | 1783 | # Ciphers |
1906 | # | 1784 | # |
1907 | CONFIG_CRYPTO_AES=m | 1785 | # CONFIG_CRYPTO_AES is not set |
1908 | CONFIG_CRYPTO_ANUBIS=m | 1786 | # CONFIG_CRYPTO_ANUBIS is not set |
1909 | CONFIG_CRYPTO_ARC4=m | 1787 | # CONFIG_CRYPTO_ARC4 is not set |
1910 | CONFIG_CRYPTO_BLOWFISH=m | 1788 | # CONFIG_CRYPTO_BLOWFISH is not set |
1911 | # CONFIG_CRYPTO_CAMELLIA is not set | 1789 | # CONFIG_CRYPTO_CAMELLIA is not set |
1912 | CONFIG_CRYPTO_CAST5=m | 1790 | # CONFIG_CRYPTO_CAST5 is not set |
1913 | CONFIG_CRYPTO_CAST6=m | 1791 | # CONFIG_CRYPTO_CAST6 is not set |
1914 | CONFIG_CRYPTO_DES=y | 1792 | CONFIG_CRYPTO_DES=y |
1915 | # CONFIG_CRYPTO_FCRYPT is not set | 1793 | # CONFIG_CRYPTO_FCRYPT is not set |
1916 | CONFIG_CRYPTO_KHAZAD=m | 1794 | # CONFIG_CRYPTO_KHAZAD is not set |
1917 | # CONFIG_CRYPTO_SALSA20 is not set | 1795 | # CONFIG_CRYPTO_SALSA20 is not set |
1918 | # CONFIG_CRYPTO_SEED is not set | 1796 | # CONFIG_CRYPTO_SEED is not set |
1919 | CONFIG_CRYPTO_SERPENT=m | 1797 | # CONFIG_CRYPTO_SERPENT is not set |
1920 | CONFIG_CRYPTO_TEA=m | 1798 | # CONFIG_CRYPTO_TEA is not set |
1921 | CONFIG_CRYPTO_TWOFISH=m | 1799 | # CONFIG_CRYPTO_TWOFISH is not set |
1922 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1923 | 1800 | ||
1924 | # | 1801 | # |
1925 | # Compression | 1802 | # Compression |
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig index a66910e63345..cd338d493bed 100644 --- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc310_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:29 2009 | 4 | # Wed Jul 29 23:32:29 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_PHYS_64BIT is not set | 20 | # CONFIG_PHYS_64BIT is not set |
20 | CONFIG_ALTIVEC=y | 21 | CONFIG_ALTIVEC=y |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | CONFIG_SMP=y | 26 | CONFIG_SMP=y |
25 | CONFIG_NR_CPUS=2 | 27 | CONFIG_NR_CPUS=2 |
26 | CONFIG_PPC32=y | 28 | CONFIG_PPC32=y |
@@ -32,16 +34,17 @@ CONFIG_GENERIC_TIME=y | |||
32 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
33 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
34 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
39 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
41 | CONFIG_GENERIC_LOCKBREAK=y | 45 | CONFIG_GENERIC_LOCKBREAK=y |
42 | CONFIG_ARCH_HAS_ILOG2_U32=y | 46 | CONFIG_ARCH_HAS_ILOG2_U32=y |
43 | CONFIG_GENERIC_HWEIGHT=y | 47 | CONFIG_GENERIC_HWEIGHT=y |
44 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 48 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
46 | CONFIG_GENERIC_GPIO=y | 49 | CONFIG_GENERIC_GPIO=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 50 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -56,11 +59,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | CONFIG_GENERIC_TBSYNC=y | 59 | CONFIG_GENERIC_TBSYNC=y |
57 | CONFIG_AUDIT_ARCH=y | 60 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 61 | CONFIG_GENERIC_BUG=y |
62 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 63 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 64 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 65 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
64 | 69 | ||
65 | # | 70 | # |
66 | # General setup | 71 | # General setup |
@@ -91,7 +96,11 @@ CONFIG_CLASSIC_RCU=y | |||
91 | CONFIG_IKCONFIG=y | 96 | CONFIG_IKCONFIG=y |
92 | CONFIG_IKCONFIG_PROC=y | 97 | CONFIG_IKCONFIG_PROC=y |
93 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
94 | # CONFIG_GROUP_SCHED is not set | 99 | CONFIG_GROUP_SCHED=y |
100 | CONFIG_FAIR_GROUP_SCHED=y | ||
101 | # CONFIG_RT_GROUP_SCHED is not set | ||
102 | CONFIG_USER_SCHED=y | ||
103 | # CONFIG_CGROUP_SCHED is not set | ||
95 | # CONFIG_CGROUPS is not set | 104 | # CONFIG_CGROUPS is not set |
96 | CONFIG_SYSFS_DEPRECATED=y | 105 | CONFIG_SYSFS_DEPRECATED=y |
97 | CONFIG_SYSFS_DEPRECATED_V2=y | 106 | CONFIG_SYSFS_DEPRECATED_V2=y |
@@ -109,7 +118,6 @@ CONFIG_EMBEDDED=y | |||
109 | CONFIG_SYSCTL_SYSCALL=y | 118 | CONFIG_SYSCTL_SYSCALL=y |
110 | CONFIG_KALLSYMS=y | 119 | CONFIG_KALLSYMS=y |
111 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 120 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
112 | # CONFIG_STRIP_ASM_SYMS is not set | ||
113 | CONFIG_HOTPLUG=y | 121 | CONFIG_HOTPLUG=y |
114 | CONFIG_PRINTK=y | 122 | CONFIG_PRINTK=y |
115 | CONFIG_BUG=y | 123 | CONFIG_BUG=y |
@@ -122,8 +130,15 @@ CONFIG_TIMERFD=y | |||
122 | CONFIG_EVENTFD=y | 130 | CONFIG_EVENTFD=y |
123 | CONFIG_SHMEM=y | 131 | CONFIG_SHMEM=y |
124 | CONFIG_AIO=y | 132 | CONFIG_AIO=y |
133 | CONFIG_HAVE_PERF_COUNTERS=y | ||
134 | |||
135 | # | ||
136 | # Performance Counters | ||
137 | # | ||
138 | # CONFIG_PERF_COUNTERS is not set | ||
125 | CONFIG_VM_EVENT_COUNTERS=y | 139 | CONFIG_VM_EVENT_COUNTERS=y |
126 | CONFIG_PCI_QUIRKS=y | 140 | CONFIG_PCI_QUIRKS=y |
141 | # CONFIG_STRIP_ASM_SYMS is not set | ||
127 | CONFIG_COMPAT_BRK=y | 142 | CONFIG_COMPAT_BRK=y |
128 | CONFIG_SLAB=y | 143 | CONFIG_SLAB=y |
129 | # CONFIG_SLUB is not set | 144 | # CONFIG_SLUB is not set |
@@ -138,6 +153,10 @@ CONFIG_HAVE_KPROBES=y | |||
138 | CONFIG_HAVE_KRETPROBES=y | 153 | CONFIG_HAVE_KRETPROBES=y |
139 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
140 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 155 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
156 | |||
157 | # | ||
158 | # GCOV-based kernel profiling | ||
159 | # | ||
141 | # CONFIG_SLOW_WORK is not set | 160 | # CONFIG_SLOW_WORK is not set |
142 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 161 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
143 | CONFIG_SLABINFO=y | 162 | CONFIG_SLABINFO=y |
@@ -151,7 +170,7 @@ CONFIG_MODULE_UNLOAD=y | |||
151 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 170 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
152 | CONFIG_STOP_MACHINE=y | 171 | CONFIG_STOP_MACHINE=y |
153 | CONFIG_BLOCK=y | 172 | CONFIG_BLOCK=y |
154 | # CONFIG_LBD is not set | 173 | CONFIG_LBDAF=y |
155 | # CONFIG_BLK_DEV_BSG is not set | 174 | # CONFIG_BLK_DEV_BSG is not set |
156 | # CONFIG_BLK_DEV_INTEGRITY is not set | 175 | # CONFIG_BLK_DEV_INTEGRITY is not set |
157 | 176 | ||
@@ -168,7 +187,6 @@ CONFIG_DEFAULT_CFQ=y | |||
168 | # CONFIG_DEFAULT_NOOP is not set | 187 | # CONFIG_DEFAULT_NOOP is not set |
169 | CONFIG_DEFAULT_IOSCHED="cfq" | 188 | CONFIG_DEFAULT_IOSCHED="cfq" |
170 | # CONFIG_FREEZER is not set | 189 | # CONFIG_FREEZER is not set |
171 | CONFIG_PPC_MSI_BITMAP=y | ||
172 | 190 | ||
173 | # | 191 | # |
174 | # Platform support | 192 | # Platform support |
@@ -212,7 +230,7 @@ CONFIG_MPIC=y | |||
212 | # | 230 | # |
213 | # Kernel options | 231 | # Kernel options |
214 | # | 232 | # |
215 | # CONFIG_HIGHMEM is not set | 233 | CONFIG_HIGHMEM=y |
216 | CONFIG_TICK_ONESHOT=y | 234 | CONFIG_TICK_ONESHOT=y |
217 | # CONFIG_NO_HZ is not set | 235 | # CONFIG_NO_HZ is not set |
218 | CONFIG_HIGH_RES_TIMERS=y | 236 | CONFIG_HIGH_RES_TIMERS=y |
@@ -231,6 +249,7 @@ CONFIG_BINFMT_ELF=y | |||
231 | # CONFIG_HAVE_AOUT is not set | 249 | # CONFIG_HAVE_AOUT is not set |
232 | CONFIG_BINFMT_MISC=y | 250 | CONFIG_BINFMT_MISC=y |
233 | # CONFIG_IOMMU_HELPER is not set | 251 | # CONFIG_IOMMU_HELPER is not set |
252 | # CONFIG_SWIOTLB is not set | ||
234 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 253 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
235 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 254 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
236 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -252,9 +271,9 @@ CONFIG_MIGRATION=y | |||
252 | CONFIG_ZONE_DMA_FLAG=1 | 271 | CONFIG_ZONE_DMA_FLAG=1 |
253 | CONFIG_BOUNCE=y | 272 | CONFIG_BOUNCE=y |
254 | CONFIG_VIRT_TO_BUS=y | 273 | CONFIG_VIRT_TO_BUS=y |
255 | CONFIG_UNEVICTABLE_LRU=y | ||
256 | CONFIG_HAVE_MLOCK=y | 274 | CONFIG_HAVE_MLOCK=y |
257 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 275 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
276 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
258 | CONFIG_PPC_4K_PAGES=y | 277 | CONFIG_PPC_4K_PAGES=y |
259 | # CONFIG_PPC_16K_PAGES is not set | 278 | # CONFIG_PPC_16K_PAGES is not set |
260 | # CONFIG_PPC_64K_PAGES is not set | 279 | # CONFIG_PPC_64K_PAGES is not set |
@@ -281,13 +300,32 @@ CONFIG_PCI_DOMAINS=y | |||
281 | CONFIG_PCI_SYSCALL=y | 300 | CONFIG_PCI_SYSCALL=y |
282 | CONFIG_PCIEPORTBUS=y | 301 | CONFIG_PCIEPORTBUS=y |
283 | CONFIG_PCIEAER=y | 302 | CONFIG_PCIEAER=y |
303 | # CONFIG_PCIE_ECRC is not set | ||
304 | # CONFIG_PCIEAER_INJECT is not set | ||
284 | # CONFIG_PCIEASPM is not set | 305 | # CONFIG_PCIEASPM is not set |
285 | CONFIG_ARCH_SUPPORTS_MSI=y | 306 | CONFIG_ARCH_SUPPORTS_MSI=y |
286 | CONFIG_PCI_MSI=y | 307 | # CONFIG_PCI_MSI is not set |
287 | # CONFIG_PCI_LEGACY is not set | 308 | # CONFIG_PCI_LEGACY is not set |
288 | # CONFIG_PCI_STUB is not set | 309 | # CONFIG_PCI_STUB is not set |
289 | # CONFIG_PCI_IOV is not set | 310 | # CONFIG_PCI_IOV is not set |
290 | # CONFIG_PCCARD is not set | 311 | CONFIG_PCCARD=y |
312 | # CONFIG_PCMCIA_DEBUG is not set | ||
313 | CONFIG_PCMCIA=y | ||
314 | # CONFIG_PCMCIA_LOAD_CIS is not set | ||
315 | # CONFIG_PCMCIA_IOCTL is not set | ||
316 | # CONFIG_CARDBUS is not set | ||
317 | |||
318 | # | ||
319 | # PC-card bridges | ||
320 | # | ||
321 | CONFIG_YENTA=y | ||
322 | # CONFIG_YENTA_O2 is not set | ||
323 | # CONFIG_YENTA_RICOH is not set | ||
324 | CONFIG_YENTA_TI=y | ||
325 | # CONFIG_YENTA_TOSHIBA is not set | ||
326 | # CONFIG_PD6729 is not set | ||
327 | # CONFIG_I82092 is not set | ||
328 | CONFIG_PCCARD_NONSTATIC=y | ||
291 | # CONFIG_HOTPLUG_PCI is not set | 329 | # CONFIG_HOTPLUG_PCI is not set |
292 | # CONFIG_HAS_RAPIDIO is not set | 330 | # CONFIG_HAS_RAPIDIO is not set |
293 | 331 | ||
@@ -393,6 +431,7 @@ CONFIG_IPV6_TUNNEL=m | |||
393 | # CONFIG_ECONET is not set | 431 | # CONFIG_ECONET is not set |
394 | # CONFIG_WAN_ROUTER is not set | 432 | # CONFIG_WAN_ROUTER is not set |
395 | # CONFIG_PHONET is not set | 433 | # CONFIG_PHONET is not set |
434 | # CONFIG_IEEE802154 is not set | ||
396 | # CONFIG_NET_SCHED is not set | 435 | # CONFIG_NET_SCHED is not set |
397 | # CONFIG_DCB is not set | 436 | # CONFIG_DCB is not set |
398 | 437 | ||
@@ -421,7 +460,9 @@ CONFIG_FIB_RULES=y | |||
421 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 460 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
422 | CONFIG_STANDALONE=y | 461 | CONFIG_STANDALONE=y |
423 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 462 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
424 | # CONFIG_FW_LOADER is not set | 463 | CONFIG_FW_LOADER=y |
464 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
465 | CONFIG_EXTRA_FIRMWARE="" | ||
425 | # CONFIG_SYS_HYPERVISOR is not set | 466 | # CONFIG_SYS_HYPERVISOR is not set |
426 | # CONFIG_CONNECTOR is not set | 467 | # CONFIG_CONNECTOR is not set |
427 | CONFIG_MTD=y | 468 | CONFIG_MTD=y |
@@ -511,6 +552,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
511 | CONFIG_OF_DEVICE=y | 552 | CONFIG_OF_DEVICE=y |
512 | CONFIG_OF_GPIO=y | 553 | CONFIG_OF_GPIO=y |
513 | CONFIG_OF_I2C=y | 554 | CONFIG_OF_I2C=y |
555 | CONFIG_OF_MDIO=y | ||
514 | # CONFIG_PARPORT is not set | 556 | # CONFIG_PARPORT is not set |
515 | CONFIG_BLK_DEV=y | 557 | CONFIG_BLK_DEV=y |
516 | # CONFIG_BLK_DEV_FD is not set | 558 | # CONFIG_BLK_DEV_FD is not set |
@@ -546,9 +588,60 @@ CONFIG_MISC_DEVICES=y | |||
546 | # | 588 | # |
547 | # CONFIG_EEPROM_AT24 is not set | 589 | # CONFIG_EEPROM_AT24 is not set |
548 | # CONFIG_EEPROM_LEGACY is not set | 590 | # CONFIG_EEPROM_LEGACY is not set |
591 | # CONFIG_EEPROM_MAX6875 is not set | ||
549 | # CONFIG_EEPROM_93CX6 is not set | 592 | # CONFIG_EEPROM_93CX6 is not set |
593 | # CONFIG_CB710_CORE is not set | ||
550 | CONFIG_HAVE_IDE=y | 594 | CONFIG_HAVE_IDE=y |
551 | # CONFIG_IDE is not set | 595 | CONFIG_IDE=y |
596 | |||
597 | # | ||
598 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | ||
599 | # | ||
600 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
601 | CONFIG_IDE_GD=y | ||
602 | CONFIG_IDE_GD_ATA=y | ||
603 | # CONFIG_IDE_GD_ATAPI is not set | ||
604 | CONFIG_BLK_DEV_IDECS=y | ||
605 | # CONFIG_BLK_DEV_IDECD is not set | ||
606 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
607 | # CONFIG_IDE_TASK_IOCTL is not set | ||
608 | CONFIG_IDE_PROC_FS=y | ||
609 | |||
610 | # | ||
611 | # IDE chipset support/bugfixes | ||
612 | # | ||
613 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
614 | |||
615 | # | ||
616 | # PCI IDE chipsets support | ||
617 | # | ||
618 | # CONFIG_BLK_DEV_GENERIC is not set | ||
619 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
620 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
621 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
622 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
623 | # CONFIG_BLK_DEV_CMD64X is not set | ||
624 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
625 | # CONFIG_BLK_DEV_CS5520 is not set | ||
626 | # CONFIG_BLK_DEV_CS5530 is not set | ||
627 | # CONFIG_BLK_DEV_HPT366 is not set | ||
628 | # CONFIG_BLK_DEV_JMICRON is not set | ||
629 | # CONFIG_BLK_DEV_SC1200 is not set | ||
630 | # CONFIG_BLK_DEV_PIIX is not set | ||
631 | # CONFIG_BLK_DEV_IT8172 is not set | ||
632 | # CONFIG_BLK_DEV_IT8213 is not set | ||
633 | # CONFIG_BLK_DEV_IT821X is not set | ||
634 | # CONFIG_BLK_DEV_NS87415 is not set | ||
635 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
636 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
637 | # CONFIG_BLK_DEV_SVWKS is not set | ||
638 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
639 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
640 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
641 | # CONFIG_BLK_DEV_TRM290 is not set | ||
642 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
643 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
644 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
552 | 645 | ||
553 | # | 646 | # |
554 | # SCSI device support | 647 | # SCSI device support |
@@ -570,10 +663,6 @@ CONFIG_BLK_DEV_SR=y | |||
570 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 663 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
571 | # CONFIG_CHR_DEV_SG is not set | 664 | # CONFIG_CHR_DEV_SG is not set |
572 | # CONFIG_CHR_DEV_SCH is not set | 665 | # CONFIG_CHR_DEV_SCH is not set |
573 | |||
574 | # | ||
575 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
576 | # | ||
577 | # CONFIG_SCSI_MULTI_LUN is not set | 666 | # CONFIG_SCSI_MULTI_LUN is not set |
578 | # CONFIG_SCSI_CONSTANTS is not set | 667 | # CONFIG_SCSI_CONSTANTS is not set |
579 | # CONFIG_SCSI_LOGGING is not set | 668 | # CONFIG_SCSI_LOGGING is not set |
@@ -590,6 +679,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
590 | # CONFIG_SCSI_SRP_ATTRS is not set | 679 | # CONFIG_SCSI_SRP_ATTRS is not set |
591 | CONFIG_SCSI_LOWLEVEL=y | 680 | CONFIG_SCSI_LOWLEVEL=y |
592 | # CONFIG_ISCSI_TCP is not set | 681 | # CONFIG_ISCSI_TCP is not set |
682 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
593 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 683 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
594 | # CONFIG_SCSI_3W_9XXX is not set | 684 | # CONFIG_SCSI_3W_9XXX is not set |
595 | # CONFIG_SCSI_ACARD is not set | 685 | # CONFIG_SCSI_ACARD is not set |
@@ -598,6 +688,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
598 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 688 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
599 | # CONFIG_SCSI_AIC79XX is not set | 689 | # CONFIG_SCSI_AIC79XX is not set |
600 | # CONFIG_SCSI_AIC94XX is not set | 690 | # CONFIG_SCSI_AIC94XX is not set |
691 | # CONFIG_SCSI_MVSAS is not set | ||
601 | # CONFIG_SCSI_DPT_I2O is not set | 692 | # CONFIG_SCSI_DPT_I2O is not set |
602 | # CONFIG_SCSI_ADVANSYS is not set | 693 | # CONFIG_SCSI_ADVANSYS is not set |
603 | # CONFIG_SCSI_ARCMSR is not set | 694 | # CONFIG_SCSI_ARCMSR is not set |
@@ -617,7 +708,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
617 | # CONFIG_SCSI_IPS is not set | 708 | # CONFIG_SCSI_IPS is not set |
618 | # CONFIG_SCSI_INITIO is not set | 709 | # CONFIG_SCSI_INITIO is not set |
619 | # CONFIG_SCSI_INIA100 is not set | 710 | # CONFIG_SCSI_INIA100 is not set |
620 | # CONFIG_SCSI_MVSAS is not set | ||
621 | # CONFIG_SCSI_STEX is not set | 711 | # CONFIG_SCSI_STEX is not set |
622 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 712 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
623 | # CONFIG_SCSI_IPR is not set | 713 | # CONFIG_SCSI_IPR is not set |
@@ -630,6 +720,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
630 | # CONFIG_SCSI_NSP32 is not set | 720 | # CONFIG_SCSI_NSP32 is not set |
631 | # CONFIG_SCSI_DEBUG is not set | 721 | # CONFIG_SCSI_DEBUG is not set |
632 | # CONFIG_SCSI_SRP is not set | 722 | # CONFIG_SCSI_SRP is not set |
723 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | ||
633 | # CONFIG_SCSI_DH is not set | 724 | # CONFIG_SCSI_DH is not set |
634 | # CONFIG_SCSI_OSD_INITIATOR is not set | 725 | # CONFIG_SCSI_OSD_INITIATOR is not set |
635 | CONFIG_ATA=y | 726 | CONFIG_ATA=y |
@@ -647,14 +738,17 @@ CONFIG_SATA_SIL24=y | |||
647 | # | 738 | # |
648 | 739 | ||
649 | # | 740 | # |
650 | # Enable only one of the two stacks, unless you know what you are doing | 741 | # You can enable one or both FireWire driver stacks. |
742 | # | ||
743 | |||
744 | # | ||
745 | # See the help texts for more information. | ||
651 | # | 746 | # |
652 | # CONFIG_FIREWIRE is not set | 747 | # CONFIG_FIREWIRE is not set |
653 | # CONFIG_IEEE1394 is not set | 748 | # CONFIG_IEEE1394 is not set |
654 | # CONFIG_I2O is not set | 749 | # CONFIG_I2O is not set |
655 | # CONFIG_MACINTOSH_DRIVERS is not set | 750 | # CONFIG_MACINTOSH_DRIVERS is not set |
656 | CONFIG_NETDEVICES=y | 751 | CONFIG_NETDEVICES=y |
657 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
658 | CONFIG_DUMMY=m | 752 | CONFIG_DUMMY=m |
659 | CONFIG_BONDING=m | 753 | CONFIG_BONDING=m |
660 | # CONFIG_MACVLAN is not set | 754 | # CONFIG_MACVLAN is not set |
@@ -701,6 +795,7 @@ CONFIG_MII=y | |||
701 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 795 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
702 | # CONFIG_NET_PCI is not set | 796 | # CONFIG_NET_PCI is not set |
703 | # CONFIG_B44 is not set | 797 | # CONFIG_B44 is not set |
798 | # CONFIG_KS8842 is not set | ||
704 | # CONFIG_ATL2 is not set | 799 | # CONFIG_ATL2 is not set |
705 | CONFIG_NETDEV_1000=y | 800 | CONFIG_NETDEV_1000=y |
706 | # CONFIG_ACENIC is not set | 801 | # CONFIG_ACENIC is not set |
@@ -720,8 +815,10 @@ CONFIG_NETDEV_1000=y | |||
720 | # CONFIG_VIA_VELOCITY is not set | 815 | # CONFIG_VIA_VELOCITY is not set |
721 | # CONFIG_TIGON3 is not set | 816 | # CONFIG_TIGON3 is not set |
722 | # CONFIG_BNX2 is not set | 817 | # CONFIG_BNX2 is not set |
818 | # CONFIG_CNIC is not set | ||
723 | CONFIG_FSL_PQ_MDIO=y | 819 | CONFIG_FSL_PQ_MDIO=y |
724 | CONFIG_GIANFAR=y | 820 | CONFIG_GIANFAR=y |
821 | # CONFIG_MV643XX_ETH is not set | ||
725 | # CONFIG_QLA3XXX is not set | 822 | # CONFIG_QLA3XXX is not set |
726 | # CONFIG_ATL1 is not set | 823 | # CONFIG_ATL1 is not set |
727 | # CONFIG_ATL1E is not set | 824 | # CONFIG_ATL1E is not set |
@@ -748,6 +845,7 @@ CONFIG_GIANFAR=y | |||
748 | # CONFIG_USB_PEGASUS is not set | 845 | # CONFIG_USB_PEGASUS is not set |
749 | # CONFIG_USB_RTL8150 is not set | 846 | # CONFIG_USB_RTL8150 is not set |
750 | # CONFIG_USB_USBNET is not set | 847 | # CONFIG_USB_USBNET is not set |
848 | # CONFIG_NET_PCMCIA is not set | ||
751 | # CONFIG_WAN is not set | 849 | # CONFIG_WAN is not set |
752 | # CONFIG_FDDI is not set | 850 | # CONFIG_FDDI is not set |
753 | # CONFIG_HIPPI is not set | 851 | # CONFIG_HIPPI is not set |
@@ -827,6 +925,7 @@ CONFIG_DEVKMEM=y | |||
827 | CONFIG_SERIAL_8250=y | 925 | CONFIG_SERIAL_8250=y |
828 | CONFIG_SERIAL_8250_CONSOLE=y | 926 | CONFIG_SERIAL_8250_CONSOLE=y |
829 | # CONFIG_SERIAL_8250_PCI is not set | 927 | # CONFIG_SERIAL_8250_PCI is not set |
928 | # CONFIG_SERIAL_8250_CS is not set | ||
830 | CONFIG_SERIAL_8250_NR_UARTS=2 | 929 | CONFIG_SERIAL_8250_NR_UARTS=2 |
831 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | 930 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 |
832 | # CONFIG_SERIAL_8250_EXTENDED is not set | 931 | # CONFIG_SERIAL_8250_EXTENDED is not set |
@@ -849,6 +948,14 @@ CONFIG_HW_RANDOM=y | |||
849 | CONFIG_NVRAM=y | 948 | CONFIG_NVRAM=y |
850 | # CONFIG_R3964 is not set | 949 | # CONFIG_R3964 is not set |
851 | # CONFIG_APPLICOM is not set | 950 | # CONFIG_APPLICOM is not set |
951 | |||
952 | # | ||
953 | # PCMCIA character devices | ||
954 | # | ||
955 | # CONFIG_SYNCLINK_CS is not set | ||
956 | # CONFIG_CARDMAN_4000 is not set | ||
957 | # CONFIG_CARDMAN_4040 is not set | ||
958 | # CONFIG_IPWIRELESS is not set | ||
852 | # CONFIG_RAW_DRIVER is not set | 959 | # CONFIG_RAW_DRIVER is not set |
853 | # CONFIG_TCG_TPM is not set | 960 | # CONFIG_TCG_TPM is not set |
854 | CONFIG_DEVPORT=y | 961 | CONFIG_DEVPORT=y |
@@ -912,13 +1019,17 @@ CONFIG_DS1682=y | |||
912 | # CONFIG_SENSORS_PCF8574 is not set | 1019 | # CONFIG_SENSORS_PCF8574 is not set |
913 | # CONFIG_PCF8575 is not set | 1020 | # CONFIG_PCF8575 is not set |
914 | # CONFIG_SENSORS_PCA9539 is not set | 1021 | # CONFIG_SENSORS_PCA9539 is not set |
915 | # CONFIG_SENSORS_MAX6875 is not set | ||
916 | # CONFIG_SENSORS_TSL2550 is not set | 1022 | # CONFIG_SENSORS_TSL2550 is not set |
917 | # CONFIG_I2C_DEBUG_CORE is not set | 1023 | # CONFIG_I2C_DEBUG_CORE is not set |
918 | # CONFIG_I2C_DEBUG_ALGO is not set | 1024 | # CONFIG_I2C_DEBUG_ALGO is not set |
919 | # CONFIG_I2C_DEBUG_BUS is not set | 1025 | # CONFIG_I2C_DEBUG_BUS is not set |
920 | # CONFIG_I2C_DEBUG_CHIP is not set | 1026 | # CONFIG_I2C_DEBUG_CHIP is not set |
921 | # CONFIG_SPI is not set | 1027 | # CONFIG_SPI is not set |
1028 | |||
1029 | # | ||
1030 | # PPS support | ||
1031 | # | ||
1032 | # CONFIG_PPS is not set | ||
922 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1033 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
923 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 1034 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
924 | CONFIG_GPIOLIB=y | 1035 | CONFIG_GPIOLIB=y |
@@ -997,6 +1108,7 @@ CONFIG_SENSORS_LM92=y | |||
997 | # CONFIG_SENSORS_SMSC47B397 is not set | 1108 | # CONFIG_SENSORS_SMSC47B397 is not set |
998 | # CONFIG_SENSORS_ADS7828 is not set | 1109 | # CONFIG_SENSORS_ADS7828 is not set |
999 | # CONFIG_SENSORS_THMC50 is not set | 1110 | # CONFIG_SENSORS_THMC50 is not set |
1111 | # CONFIG_SENSORS_TMP401 is not set | ||
1000 | # CONFIG_SENSORS_VIA686A is not set | 1112 | # CONFIG_SENSORS_VIA686A is not set |
1001 | # CONFIG_SENSORS_VT1211 is not set | 1113 | # CONFIG_SENSORS_VT1211 is not set |
1002 | # CONFIG_SENSORS_VT8231 is not set | 1114 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1052,24 +1164,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1052 | # CONFIG_MFD_WM8400 is not set | 1164 | # CONFIG_MFD_WM8400 is not set |
1053 | # CONFIG_MFD_WM8350_I2C is not set | 1165 | # CONFIG_MFD_WM8350_I2C is not set |
1054 | # CONFIG_MFD_PCF50633 is not set | 1166 | # CONFIG_MFD_PCF50633 is not set |
1167 | # CONFIG_AB3100_CORE is not set | ||
1055 | # CONFIG_REGULATOR is not set | 1168 | # CONFIG_REGULATOR is not set |
1056 | 1169 | # CONFIG_MEDIA_SUPPORT is not set | |
1057 | # | ||
1058 | # Multimedia devices | ||
1059 | # | ||
1060 | |||
1061 | # | ||
1062 | # Multimedia core support | ||
1063 | # | ||
1064 | # CONFIG_VIDEO_DEV is not set | ||
1065 | # CONFIG_DVB_CORE is not set | ||
1066 | # CONFIG_VIDEO_MEDIA is not set | ||
1067 | |||
1068 | # | ||
1069 | # Multimedia drivers | ||
1070 | # | ||
1071 | CONFIG_DAB=y | ||
1072 | # CONFIG_USB_DABUSB is not set | ||
1073 | 1170 | ||
1074 | # | 1171 | # |
1075 | # Graphics support | 1172 | # Graphics support |
@@ -1114,7 +1211,7 @@ CONFIG_HID_BELKIN=y | |||
1114 | CONFIG_HID_CHERRY=y | 1211 | CONFIG_HID_CHERRY=y |
1115 | CONFIG_HID_CHICONY=y | 1212 | CONFIG_HID_CHICONY=y |
1116 | CONFIG_HID_CYPRESS=y | 1213 | CONFIG_HID_CYPRESS=y |
1117 | # CONFIG_DRAGONRISE_FF is not set | 1214 | # CONFIG_HID_DRAGONRISE is not set |
1118 | CONFIG_HID_EZKEY=y | 1215 | CONFIG_HID_EZKEY=y |
1119 | # CONFIG_HID_KYE is not set | 1216 | # CONFIG_HID_KYE is not set |
1120 | CONFIG_HID_GYRATION=y | 1217 | CONFIG_HID_GYRATION=y |
@@ -1131,10 +1228,11 @@ CONFIG_HID_PETALYNX=y | |||
1131 | CONFIG_HID_SAMSUNG=y | 1228 | CONFIG_HID_SAMSUNG=y |
1132 | CONFIG_HID_SONY=y | 1229 | CONFIG_HID_SONY=y |
1133 | CONFIG_HID_SUNPLUS=y | 1230 | CONFIG_HID_SUNPLUS=y |
1134 | # CONFIG_GREENASIA_FF is not set | 1231 | # CONFIG_HID_GREENASIA is not set |
1232 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1135 | # CONFIG_HID_TOPSEED is not set | 1233 | # CONFIG_HID_TOPSEED is not set |
1136 | # CONFIG_THRUSTMASTER_FF is not set | 1234 | # CONFIG_HID_THRUSTMASTER is not set |
1137 | # CONFIG_ZEROPLUS_FF is not set | 1235 | # CONFIG_HID_ZEROPLUS is not set |
1138 | CONFIG_USB_SUPPORT=y | 1236 | CONFIG_USB_SUPPORT=y |
1139 | CONFIG_USB_ARCH_HAS_HCD=y | 1237 | CONFIG_USB_ARCH_HAS_HCD=y |
1140 | CONFIG_USB_ARCH_HAS_OHCI=y | 1238 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1160,6 +1258,7 @@ CONFIG_USB=y | |||
1160 | # USB Host Controller Drivers | 1258 | # USB Host Controller Drivers |
1161 | # | 1259 | # |
1162 | # CONFIG_USB_C67X00_HCD is not set | 1260 | # CONFIG_USB_C67X00_HCD is not set |
1261 | # CONFIG_USB_XHCI_HCD is not set | ||
1163 | CONFIG_USB_EHCI_HCD=y | 1262 | CONFIG_USB_EHCI_HCD=y |
1164 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1263 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1165 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1264 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1169,6 +1268,8 @@ CONFIG_USB_EHCI_HCD=y | |||
1169 | # CONFIG_USB_ISP116X_HCD is not set | 1268 | # CONFIG_USB_ISP116X_HCD is not set |
1170 | # CONFIG_USB_ISP1760_HCD is not set | 1269 | # CONFIG_USB_ISP1760_HCD is not set |
1171 | CONFIG_USB_OHCI_HCD=y | 1270 | CONFIG_USB_OHCI_HCD=y |
1271 | # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set | ||
1272 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | ||
1172 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1273 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1173 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1274 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
1174 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1275 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -1288,6 +1389,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1288 | # CONFIG_RTC_DRV_S35390A is not set | 1389 | # CONFIG_RTC_DRV_S35390A is not set |
1289 | # CONFIG_RTC_DRV_FM3130 is not set | 1390 | # CONFIG_RTC_DRV_FM3130 is not set |
1290 | CONFIG_RTC_DRV_RX8581=y | 1391 | CONFIG_RTC_DRV_RX8581=y |
1392 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1291 | 1393 | ||
1292 | # | 1394 | # |
1293 | # SPI RTC drivers | 1395 | # SPI RTC drivers |
@@ -1315,6 +1417,10 @@ CONFIG_RTC_DRV_RX8581=y | |||
1315 | # CONFIG_DMADEVICES is not set | 1417 | # CONFIG_DMADEVICES is not set |
1316 | # CONFIG_AUXDISPLAY is not set | 1418 | # CONFIG_AUXDISPLAY is not set |
1317 | # CONFIG_UIO is not set | 1419 | # CONFIG_UIO is not set |
1420 | |||
1421 | # | ||
1422 | # TI VLYNQ | ||
1423 | # | ||
1318 | # CONFIG_STAGING is not set | 1424 | # CONFIG_STAGING is not set |
1319 | 1425 | ||
1320 | # | 1426 | # |
@@ -1336,10 +1442,12 @@ CONFIG_FS_MBCACHE=y | |||
1336 | # CONFIG_REISERFS_FS is not set | 1442 | # CONFIG_REISERFS_FS is not set |
1337 | # CONFIG_JFS_FS is not set | 1443 | # CONFIG_JFS_FS is not set |
1338 | CONFIG_FS_POSIX_ACL=y | 1444 | CONFIG_FS_POSIX_ACL=y |
1339 | CONFIG_FILE_LOCKING=y | ||
1340 | # CONFIG_XFS_FS is not set | 1445 | # CONFIG_XFS_FS is not set |
1446 | # CONFIG_GFS2_FS is not set | ||
1341 | # CONFIG_OCFS2_FS is not set | 1447 | # CONFIG_OCFS2_FS is not set |
1342 | # CONFIG_BTRFS_FS is not set | 1448 | # CONFIG_BTRFS_FS is not set |
1449 | CONFIG_FILE_LOCKING=y | ||
1450 | CONFIG_FSNOTIFY=y | ||
1343 | CONFIG_DNOTIFY=y | 1451 | CONFIG_DNOTIFY=y |
1344 | CONFIG_INOTIFY=y | 1452 | CONFIG_INOTIFY=y |
1345 | CONFIG_INOTIFY_USER=y | 1453 | CONFIG_INOTIFY_USER=y |
@@ -1419,6 +1527,7 @@ CONFIG_NFS_FS=y | |||
1419 | CONFIG_NFS_V3=y | 1527 | CONFIG_NFS_V3=y |
1420 | # CONFIG_NFS_V3_ACL is not set | 1528 | # CONFIG_NFS_V3_ACL is not set |
1421 | CONFIG_NFS_V4=y | 1529 | CONFIG_NFS_V4=y |
1530 | # CONFIG_NFS_V4_1 is not set | ||
1422 | CONFIG_ROOT_NFS=y | 1531 | CONFIG_ROOT_NFS=y |
1423 | # CONFIG_NFSD is not set | 1532 | # CONFIG_NFSD is not set |
1424 | CONFIG_LOCKD=y | 1533 | CONFIG_LOCKD=y |
@@ -1508,6 +1617,7 @@ CONFIG_HAS_IOPORT=y | |||
1508 | CONFIG_HAS_DMA=y | 1617 | CONFIG_HAS_DMA=y |
1509 | CONFIG_HAVE_LMB=y | 1618 | CONFIG_HAVE_LMB=y |
1510 | CONFIG_NLATTR=y | 1619 | CONFIG_NLATTR=y |
1620 | CONFIG_GENERIC_ATOMIC64=y | ||
1511 | 1621 | ||
1512 | # | 1622 | # |
1513 | # Kernel hacking | 1623 | # Kernel hacking |
@@ -1531,23 +1641,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1531 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1641 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1532 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1642 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1533 | CONFIG_TRACING_SUPPORT=y | 1643 | CONFIG_TRACING_SUPPORT=y |
1534 | 1644 | # CONFIG_FTRACE is not set | |
1535 | # | ||
1536 | # Tracers | ||
1537 | # | ||
1538 | # CONFIG_FUNCTION_TRACER is not set | ||
1539 | # CONFIG_PREEMPT_TRACER is not set | ||
1540 | # CONFIG_SCHED_TRACER is not set | ||
1541 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1542 | # CONFIG_EVENT_TRACER is not set | ||
1543 | # CONFIG_BOOT_TRACER is not set | ||
1544 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1545 | # CONFIG_STACK_TRACER is not set | ||
1546 | # CONFIG_KMEMTRACE is not set | ||
1547 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1548 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1549 | # CONFIG_SAMPLES is not set | 1645 | # CONFIG_SAMPLES is not set |
1550 | CONFIG_HAVE_ARCH_KGDB=y | 1646 | CONFIG_HAVE_ARCH_KGDB=y |
1647 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1648 | CONFIG_PPC_WERROR=y | ||
1551 | CONFIG_PRINT_STACK_DEPTH=64 | 1649 | CONFIG_PRINT_STACK_DEPTH=64 |
1552 | # CONFIG_IRQSTACKS is not set | 1650 | # CONFIG_IRQSTACKS is not set |
1553 | # CONFIG_BOOTX_TEXT is not set | 1651 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig index c6a7fc82b69a..ba47883f4aa0 100644 --- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:30 2009 | 4 | # Wed Jul 29 23:32:30 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_PHYS_64BIT is not set | 20 | # CONFIG_PHYS_64BIT is not set |
20 | CONFIG_ALTIVEC=y | 21 | CONFIG_ALTIVEC=y |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | CONFIG_SMP=y | 26 | CONFIG_SMP=y |
25 | CONFIG_NR_CPUS=2 | 27 | CONFIG_NR_CPUS=2 |
26 | CONFIG_PPC32=y | 28 | CONFIG_PPC32=y |
@@ -32,16 +34,17 @@ CONFIG_GENERIC_TIME=y | |||
32 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
33 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
34 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
39 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
41 | CONFIG_GENERIC_LOCKBREAK=y | 45 | CONFIG_GENERIC_LOCKBREAK=y |
42 | CONFIG_ARCH_HAS_ILOG2_U32=y | 46 | CONFIG_ARCH_HAS_ILOG2_U32=y |
43 | CONFIG_GENERIC_HWEIGHT=y | 47 | CONFIG_GENERIC_HWEIGHT=y |
44 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 48 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
46 | CONFIG_GENERIC_GPIO=y | 49 | CONFIG_GENERIC_GPIO=y |
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 50 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -56,11 +59,13 @@ CONFIG_PPC_UDBG_16550=y | |||
56 | CONFIG_GENERIC_TBSYNC=y | 59 | CONFIG_GENERIC_TBSYNC=y |
57 | CONFIG_AUDIT_ARCH=y | 60 | CONFIG_AUDIT_ARCH=y |
58 | CONFIG_GENERIC_BUG=y | 61 | CONFIG_GENERIC_BUG=y |
62 | CONFIG_DTC=y | ||
59 | CONFIG_DEFAULT_UIMAGE=y | 63 | CONFIG_DEFAULT_UIMAGE=y |
60 | # CONFIG_PPC_DCR_NATIVE is not set | 64 | # CONFIG_PPC_DCR_NATIVE is not set |
61 | # CONFIG_PPC_DCR_MMIO is not set | 65 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
64 | 69 | ||
65 | # | 70 | # |
66 | # General setup | 71 | # General setup |
@@ -114,7 +119,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
114 | CONFIG_KALLSYMS=y | 119 | CONFIG_KALLSYMS=y |
115 | # CONFIG_KALLSYMS_ALL is not set | 120 | # CONFIG_KALLSYMS_ALL is not set |
116 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 121 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
117 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_HOTPLUG=y | 122 | CONFIG_HOTPLUG=y |
119 | CONFIG_PRINTK=y | 123 | CONFIG_PRINTK=y |
120 | CONFIG_BUG=y | 124 | CONFIG_BUG=y |
@@ -127,8 +131,15 @@ CONFIG_TIMERFD=y | |||
127 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
128 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
129 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_COUNTERS=y | ||
135 | |||
136 | # | ||
137 | # Performance Counters | ||
138 | # | ||
139 | # CONFIG_PERF_COUNTERS is not set | ||
130 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
131 | CONFIG_PCI_QUIRKS=y | 141 | CONFIG_PCI_QUIRKS=y |
142 | # CONFIG_STRIP_ASM_SYMS is not set | ||
132 | CONFIG_COMPAT_BRK=y | 143 | CONFIG_COMPAT_BRK=y |
133 | CONFIG_SLAB=y | 144 | CONFIG_SLAB=y |
134 | # CONFIG_SLUB is not set | 145 | # CONFIG_SLUB is not set |
@@ -143,6 +154,10 @@ CONFIG_HAVE_KPROBES=y | |||
143 | CONFIG_HAVE_KRETPROBES=y | 154 | CONFIG_HAVE_KRETPROBES=y |
144 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 155 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
145 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 156 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
157 | |||
158 | # | ||
159 | # GCOV-based kernel profiling | ||
160 | # | ||
146 | # CONFIG_SLOW_WORK is not set | 161 | # CONFIG_SLOW_WORK is not set |
147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 162 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
148 | CONFIG_SLABINFO=y | 163 | CONFIG_SLABINFO=y |
@@ -156,7 +171,7 @@ CONFIG_MODULE_UNLOAD=y | |||
156 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 171 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
157 | CONFIG_STOP_MACHINE=y | 172 | CONFIG_STOP_MACHINE=y |
158 | CONFIG_BLOCK=y | 173 | CONFIG_BLOCK=y |
159 | # CONFIG_LBD is not set | 174 | CONFIG_LBDAF=y |
160 | # CONFIG_BLK_DEV_BSG is not set | 175 | # CONFIG_BLK_DEV_BSG is not set |
161 | # CONFIG_BLK_DEV_INTEGRITY is not set | 176 | # CONFIG_BLK_DEV_INTEGRITY is not set |
162 | 177 | ||
@@ -235,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
235 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
236 | CONFIG_BINFMT_MISC=m | 251 | CONFIG_BINFMT_MISC=m |
237 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
238 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
239 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
240 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -256,9 +272,9 @@ CONFIG_MIGRATION=y | |||
256 | CONFIG_ZONE_DMA_FLAG=1 | 272 | CONFIG_ZONE_DMA_FLAG=1 |
257 | CONFIG_BOUNCE=y | 273 | CONFIG_BOUNCE=y |
258 | CONFIG_VIRT_TO_BUS=y | 274 | CONFIG_VIRT_TO_BUS=y |
259 | CONFIG_UNEVICTABLE_LRU=y | ||
260 | CONFIG_HAVE_MLOCK=y | 275 | CONFIG_HAVE_MLOCK=y |
261 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 276 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
277 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
262 | CONFIG_PPC_4K_PAGES=y | 278 | CONFIG_PPC_4K_PAGES=y |
263 | # CONFIG_PPC_16K_PAGES is not set | 279 | # CONFIG_PPC_16K_PAGES is not set |
264 | # CONFIG_PPC_64K_PAGES is not set | 280 | # CONFIG_PPC_64K_PAGES is not set |
@@ -285,6 +301,8 @@ CONFIG_PCI_DOMAINS=y | |||
285 | CONFIG_PCI_SYSCALL=y | 301 | CONFIG_PCI_SYSCALL=y |
286 | CONFIG_PCIEPORTBUS=y | 302 | CONFIG_PCIEPORTBUS=y |
287 | CONFIG_PCIEAER=y | 303 | CONFIG_PCIEAER=y |
304 | # CONFIG_PCIE_ECRC is not set | ||
305 | # CONFIG_PCIEAER_INJECT is not set | ||
288 | # CONFIG_PCIEASPM is not set | 306 | # CONFIG_PCIEASPM is not set |
289 | CONFIG_ARCH_SUPPORTS_MSI=y | 307 | CONFIG_ARCH_SUPPORTS_MSI=y |
290 | # CONFIG_PCI_MSI is not set | 308 | # CONFIG_PCI_MSI is not set |
@@ -510,6 +528,7 @@ CONFIG_LLC=m | |||
510 | # CONFIG_ECONET is not set | 528 | # CONFIG_ECONET is not set |
511 | CONFIG_WAN_ROUTER=m | 529 | CONFIG_WAN_ROUTER=m |
512 | # CONFIG_PHONET is not set | 530 | # CONFIG_PHONET is not set |
531 | # CONFIG_IEEE802154 is not set | ||
513 | CONFIG_NET_SCHED=y | 532 | CONFIG_NET_SCHED=y |
514 | 533 | ||
515 | # | 534 | # |
@@ -566,7 +585,11 @@ CONFIG_WIRELESS=y | |||
566 | CONFIG_WIRELESS_OLD_REGULATORY=y | 585 | CONFIG_WIRELESS_OLD_REGULATORY=y |
567 | # CONFIG_WIRELESS_EXT is not set | 586 | # CONFIG_WIRELESS_EXT is not set |
568 | # CONFIG_LIB80211 is not set | 587 | # CONFIG_LIB80211 is not set |
569 | # CONFIG_MAC80211 is not set | 588 | |
589 | # | ||
590 | # CFG80211 needs to be enabled for MAC80211 | ||
591 | # | ||
592 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
570 | # CONFIG_WIMAX is not set | 593 | # CONFIG_WIMAX is not set |
571 | # CONFIG_RFKILL is not set | 594 | # CONFIG_RFKILL is not set |
572 | # CONFIG_NET_9P is not set | 595 | # CONFIG_NET_9P is not set |
@@ -678,6 +701,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
678 | CONFIG_OF_DEVICE=y | 701 | CONFIG_OF_DEVICE=y |
679 | CONFIG_OF_GPIO=y | 702 | CONFIG_OF_GPIO=y |
680 | CONFIG_OF_I2C=y | 703 | CONFIG_OF_I2C=y |
704 | CONFIG_OF_MDIO=y | ||
681 | # CONFIG_PARPORT is not set | 705 | # CONFIG_PARPORT is not set |
682 | CONFIG_BLK_DEV=y | 706 | CONFIG_BLK_DEV=y |
683 | # CONFIG_BLK_DEV_FD is not set | 707 | # CONFIG_BLK_DEV_FD is not set |
@@ -713,7 +737,9 @@ CONFIG_MISC_DEVICES=y | |||
713 | # | 737 | # |
714 | # CONFIG_EEPROM_AT24 is not set | 738 | # CONFIG_EEPROM_AT24 is not set |
715 | # CONFIG_EEPROM_LEGACY is not set | 739 | # CONFIG_EEPROM_LEGACY is not set |
740 | # CONFIG_EEPROM_MAX6875 is not set | ||
716 | # CONFIG_EEPROM_93CX6 is not set | 741 | # CONFIG_EEPROM_93CX6 is not set |
742 | # CONFIG_CB710_CORE is not set | ||
717 | CONFIG_HAVE_IDE=y | 743 | CONFIG_HAVE_IDE=y |
718 | # CONFIG_IDE is not set | 744 | # CONFIG_IDE is not set |
719 | 745 | ||
@@ -737,10 +763,6 @@ CONFIG_BLK_DEV_SR=y | |||
737 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 763 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
738 | # CONFIG_CHR_DEV_SG is not set | 764 | # CONFIG_CHR_DEV_SG is not set |
739 | # CONFIG_CHR_DEV_SCH is not set | 765 | # CONFIG_CHR_DEV_SCH is not set |
740 | |||
741 | # | ||
742 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
743 | # | ||
744 | # CONFIG_SCSI_MULTI_LUN is not set | 766 | # CONFIG_SCSI_MULTI_LUN is not set |
745 | # CONFIG_SCSI_CONSTANTS is not set | 767 | # CONFIG_SCSI_CONSTANTS is not set |
746 | # CONFIG_SCSI_LOGGING is not set | 768 | # CONFIG_SCSI_LOGGING is not set |
@@ -757,6 +779,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
757 | # CONFIG_SCSI_SRP_ATTRS is not set | 779 | # CONFIG_SCSI_SRP_ATTRS is not set |
758 | CONFIG_SCSI_LOWLEVEL=y | 780 | CONFIG_SCSI_LOWLEVEL=y |
759 | # CONFIG_ISCSI_TCP is not set | 781 | # CONFIG_ISCSI_TCP is not set |
782 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
760 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 783 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
761 | # CONFIG_SCSI_3W_9XXX is not set | 784 | # CONFIG_SCSI_3W_9XXX is not set |
762 | # CONFIG_SCSI_ACARD is not set | 785 | # CONFIG_SCSI_ACARD is not set |
@@ -765,6 +788,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
765 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 788 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
766 | # CONFIG_SCSI_AIC79XX is not set | 789 | # CONFIG_SCSI_AIC79XX is not set |
767 | # CONFIG_SCSI_AIC94XX is not set | 790 | # CONFIG_SCSI_AIC94XX is not set |
791 | # CONFIG_SCSI_MVSAS is not set | ||
768 | # CONFIG_SCSI_DPT_I2O is not set | 792 | # CONFIG_SCSI_DPT_I2O is not set |
769 | # CONFIG_SCSI_ADVANSYS is not set | 793 | # CONFIG_SCSI_ADVANSYS is not set |
770 | # CONFIG_SCSI_ARCMSR is not set | 794 | # CONFIG_SCSI_ARCMSR is not set |
@@ -784,7 +808,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
784 | # CONFIG_SCSI_IPS is not set | 808 | # CONFIG_SCSI_IPS is not set |
785 | # CONFIG_SCSI_INITIO is not set | 809 | # CONFIG_SCSI_INITIO is not set |
786 | # CONFIG_SCSI_INIA100 is not set | 810 | # CONFIG_SCSI_INIA100 is not set |
787 | # CONFIG_SCSI_MVSAS is not set | ||
788 | # CONFIG_SCSI_STEX is not set | 811 | # CONFIG_SCSI_STEX is not set |
789 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 812 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
790 | # CONFIG_SCSI_IPR is not set | 813 | # CONFIG_SCSI_IPR is not set |
@@ -868,14 +891,17 @@ CONFIG_SATA_SIL=y | |||
868 | # | 891 | # |
869 | 892 | ||
870 | # | 893 | # |
871 | # Enable only one of the two stacks, unless you know what you are doing | 894 | # You can enable one or both FireWire driver stacks. |
895 | # | ||
896 | |||
897 | # | ||
898 | # See the help texts for more information. | ||
872 | # | 899 | # |
873 | # CONFIG_FIREWIRE is not set | 900 | # CONFIG_FIREWIRE is not set |
874 | # CONFIG_IEEE1394 is not set | 901 | # CONFIG_IEEE1394 is not set |
875 | # CONFIG_I2O is not set | 902 | # CONFIG_I2O is not set |
876 | # CONFIG_MACINTOSH_DRIVERS is not set | 903 | # CONFIG_MACINTOSH_DRIVERS is not set |
877 | CONFIG_NETDEVICES=y | 904 | CONFIG_NETDEVICES=y |
878 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
879 | CONFIG_DUMMY=m | 905 | CONFIG_DUMMY=m |
880 | CONFIG_BONDING=m | 906 | CONFIG_BONDING=m |
881 | # CONFIG_MACVLAN is not set | 907 | # CONFIG_MACVLAN is not set |
@@ -922,6 +948,7 @@ CONFIG_MII=y | |||
922 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 948 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
923 | # CONFIG_NET_PCI is not set | 949 | # CONFIG_NET_PCI is not set |
924 | # CONFIG_B44 is not set | 950 | # CONFIG_B44 is not set |
951 | # CONFIG_KS8842 is not set | ||
925 | # CONFIG_ATL2 is not set | 952 | # CONFIG_ATL2 is not set |
926 | CONFIG_NETDEV_1000=y | 953 | CONFIG_NETDEV_1000=y |
927 | # CONFIG_ACENIC is not set | 954 | # CONFIG_ACENIC is not set |
@@ -941,8 +968,10 @@ CONFIG_NETDEV_1000=y | |||
941 | # CONFIG_VIA_VELOCITY is not set | 968 | # CONFIG_VIA_VELOCITY is not set |
942 | # CONFIG_TIGON3 is not set | 969 | # CONFIG_TIGON3 is not set |
943 | # CONFIG_BNX2 is not set | 970 | # CONFIG_BNX2 is not set |
971 | # CONFIG_CNIC is not set | ||
944 | CONFIG_FSL_PQ_MDIO=y | 972 | CONFIG_FSL_PQ_MDIO=y |
945 | CONFIG_GIANFAR=y | 973 | CONFIG_GIANFAR=y |
974 | # CONFIG_MV643XX_ETH is not set | ||
946 | # CONFIG_QLA3XXX is not set | 975 | # CONFIG_QLA3XXX is not set |
947 | # CONFIG_ATL1 is not set | 976 | # CONFIG_ATL1 is not set |
948 | # CONFIG_ATL1E is not set | 977 | # CONFIG_ATL1E is not set |
@@ -1149,13 +1178,17 @@ CONFIG_DS1682=y | |||
1149 | # CONFIG_SENSORS_PCF8574 is not set | 1178 | # CONFIG_SENSORS_PCF8574 is not set |
1150 | # CONFIG_PCF8575 is not set | 1179 | # CONFIG_PCF8575 is not set |
1151 | # CONFIG_SENSORS_PCA9539 is not set | 1180 | # CONFIG_SENSORS_PCA9539 is not set |
1152 | # CONFIG_SENSORS_MAX6875 is not set | ||
1153 | # CONFIG_SENSORS_TSL2550 is not set | 1181 | # CONFIG_SENSORS_TSL2550 is not set |
1154 | # CONFIG_I2C_DEBUG_CORE is not set | 1182 | # CONFIG_I2C_DEBUG_CORE is not set |
1155 | # CONFIG_I2C_DEBUG_ALGO is not set | 1183 | # CONFIG_I2C_DEBUG_ALGO is not set |
1156 | # CONFIG_I2C_DEBUG_BUS is not set | 1184 | # CONFIG_I2C_DEBUG_BUS is not set |
1157 | # CONFIG_I2C_DEBUG_CHIP is not set | 1185 | # CONFIG_I2C_DEBUG_CHIP is not set |
1158 | # CONFIG_SPI is not set | 1186 | # CONFIG_SPI is not set |
1187 | |||
1188 | # | ||
1189 | # PPS support | ||
1190 | # | ||
1191 | # CONFIG_PPS is not set | ||
1159 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1192 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
1160 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 1193 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
1161 | CONFIG_GPIOLIB=y | 1194 | CONFIG_GPIOLIB=y |
@@ -1235,6 +1268,7 @@ CONFIG_SENSORS_LM92=y | |||
1235 | # CONFIG_SENSORS_SMSC47B397 is not set | 1268 | # CONFIG_SENSORS_SMSC47B397 is not set |
1236 | # CONFIG_SENSORS_ADS7828 is not set | 1269 | # CONFIG_SENSORS_ADS7828 is not set |
1237 | # CONFIG_SENSORS_THMC50 is not set | 1270 | # CONFIG_SENSORS_THMC50 is not set |
1271 | # CONFIG_SENSORS_TMP401 is not set | ||
1238 | # CONFIG_SENSORS_VIA686A is not set | 1272 | # CONFIG_SENSORS_VIA686A is not set |
1239 | # CONFIG_SENSORS_VT1211 is not set | 1273 | # CONFIG_SENSORS_VT1211 is not set |
1240 | # CONFIG_SENSORS_VT8231 is not set | 1274 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1290,24 +1324,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1290 | # CONFIG_MFD_WM8400 is not set | 1324 | # CONFIG_MFD_WM8400 is not set |
1291 | # CONFIG_MFD_WM8350_I2C is not set | 1325 | # CONFIG_MFD_WM8350_I2C is not set |
1292 | # CONFIG_MFD_PCF50633 is not set | 1326 | # CONFIG_MFD_PCF50633 is not set |
1327 | # CONFIG_AB3100_CORE is not set | ||
1293 | # CONFIG_REGULATOR is not set | 1328 | # CONFIG_REGULATOR is not set |
1294 | 1329 | # CONFIG_MEDIA_SUPPORT is not set | |
1295 | # | ||
1296 | # Multimedia devices | ||
1297 | # | ||
1298 | |||
1299 | # | ||
1300 | # Multimedia core support | ||
1301 | # | ||
1302 | # CONFIG_VIDEO_DEV is not set | ||
1303 | # CONFIG_DVB_CORE is not set | ||
1304 | # CONFIG_VIDEO_MEDIA is not set | ||
1305 | |||
1306 | # | ||
1307 | # Multimedia drivers | ||
1308 | # | ||
1309 | CONFIG_DAB=y | ||
1310 | # CONFIG_USB_DABUSB is not set | ||
1311 | 1330 | ||
1312 | # | 1331 | # |
1313 | # Graphics support | 1332 | # Graphics support |
@@ -1352,7 +1371,7 @@ CONFIG_HID_BELKIN=y | |||
1352 | CONFIG_HID_CHERRY=y | 1371 | CONFIG_HID_CHERRY=y |
1353 | CONFIG_HID_CHICONY=y | 1372 | CONFIG_HID_CHICONY=y |
1354 | CONFIG_HID_CYPRESS=y | 1373 | CONFIG_HID_CYPRESS=y |
1355 | # CONFIG_DRAGONRISE_FF is not set | 1374 | # CONFIG_HID_DRAGONRISE is not set |
1356 | CONFIG_HID_EZKEY=y | 1375 | CONFIG_HID_EZKEY=y |
1357 | # CONFIG_HID_KYE is not set | 1376 | # CONFIG_HID_KYE is not set |
1358 | CONFIG_HID_GYRATION=y | 1377 | CONFIG_HID_GYRATION=y |
@@ -1369,10 +1388,11 @@ CONFIG_HID_PETALYNX=y | |||
1369 | CONFIG_HID_SAMSUNG=y | 1388 | CONFIG_HID_SAMSUNG=y |
1370 | CONFIG_HID_SONY=y | 1389 | CONFIG_HID_SONY=y |
1371 | CONFIG_HID_SUNPLUS=y | 1390 | CONFIG_HID_SUNPLUS=y |
1372 | # CONFIG_GREENASIA_FF is not set | 1391 | # CONFIG_HID_GREENASIA is not set |
1392 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1373 | # CONFIG_HID_TOPSEED is not set | 1393 | # CONFIG_HID_TOPSEED is not set |
1374 | CONFIG_THRUSTMASTER_FF=m | 1394 | # CONFIG_HID_THRUSTMASTER is not set |
1375 | CONFIG_ZEROPLUS_FF=m | 1395 | # CONFIG_HID_ZEROPLUS is not set |
1376 | CONFIG_USB_SUPPORT=y | 1396 | CONFIG_USB_SUPPORT=y |
1377 | CONFIG_USB_ARCH_HAS_HCD=y | 1397 | CONFIG_USB_ARCH_HAS_HCD=y |
1378 | CONFIG_USB_ARCH_HAS_OHCI=y | 1398 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1398,6 +1418,7 @@ CONFIG_USB=y | |||
1398 | # USB Host Controller Drivers | 1418 | # USB Host Controller Drivers |
1399 | # | 1419 | # |
1400 | # CONFIG_USB_C67X00_HCD is not set | 1420 | # CONFIG_USB_C67X00_HCD is not set |
1421 | # CONFIG_USB_XHCI_HCD is not set | ||
1401 | CONFIG_USB_EHCI_HCD=y | 1422 | CONFIG_USB_EHCI_HCD=y |
1402 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1423 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1403 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1424 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1407,6 +1428,8 @@ CONFIG_USB_EHCI_HCD=y | |||
1407 | # CONFIG_USB_ISP116X_HCD is not set | 1428 | # CONFIG_USB_ISP116X_HCD is not set |
1408 | # CONFIG_USB_ISP1760_HCD is not set | 1429 | # CONFIG_USB_ISP1760_HCD is not set |
1409 | CONFIG_USB_OHCI_HCD=y | 1430 | CONFIG_USB_OHCI_HCD=y |
1431 | # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set | ||
1432 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | ||
1410 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1433 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1411 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1434 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
1412 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1435 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -1527,6 +1550,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1527 | # CONFIG_RTC_DRV_S35390A is not set | 1550 | # CONFIG_RTC_DRV_S35390A is not set |
1528 | # CONFIG_RTC_DRV_FM3130 is not set | 1551 | # CONFIG_RTC_DRV_FM3130 is not set |
1529 | CONFIG_RTC_DRV_RX8581=y | 1552 | CONFIG_RTC_DRV_RX8581=y |
1553 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1530 | 1554 | ||
1531 | # | 1555 | # |
1532 | # SPI RTC drivers | 1556 | # SPI RTC drivers |
@@ -1554,6 +1578,10 @@ CONFIG_RTC_DRV_RX8581=y | |||
1554 | # CONFIG_DMADEVICES is not set | 1578 | # CONFIG_DMADEVICES is not set |
1555 | # CONFIG_AUXDISPLAY is not set | 1579 | # CONFIG_AUXDISPLAY is not set |
1556 | # CONFIG_UIO is not set | 1580 | # CONFIG_UIO is not set |
1581 | |||
1582 | # | ||
1583 | # TI VLYNQ | ||
1584 | # | ||
1557 | # CONFIG_STAGING is not set | 1585 | # CONFIG_STAGING is not set |
1558 | 1586 | ||
1559 | # | 1587 | # |
@@ -1575,10 +1603,12 @@ CONFIG_FS_MBCACHE=y | |||
1575 | # CONFIG_REISERFS_FS is not set | 1603 | # CONFIG_REISERFS_FS is not set |
1576 | # CONFIG_JFS_FS is not set | 1604 | # CONFIG_JFS_FS is not set |
1577 | CONFIG_FS_POSIX_ACL=y | 1605 | CONFIG_FS_POSIX_ACL=y |
1578 | CONFIG_FILE_LOCKING=y | ||
1579 | # CONFIG_XFS_FS is not set | 1606 | # CONFIG_XFS_FS is not set |
1607 | # CONFIG_GFS2_FS is not set | ||
1580 | # CONFIG_OCFS2_FS is not set | 1608 | # CONFIG_OCFS2_FS is not set |
1581 | # CONFIG_BTRFS_FS is not set | 1609 | # CONFIG_BTRFS_FS is not set |
1610 | CONFIG_FILE_LOCKING=y | ||
1611 | CONFIG_FSNOTIFY=y | ||
1582 | CONFIG_DNOTIFY=y | 1612 | CONFIG_DNOTIFY=y |
1583 | CONFIG_INOTIFY=y | 1613 | CONFIG_INOTIFY=y |
1584 | CONFIG_INOTIFY_USER=y | 1614 | CONFIG_INOTIFY_USER=y |
@@ -1645,6 +1675,7 @@ CONFIG_NFS_FS=y | |||
1645 | CONFIG_NFS_V3=y | 1675 | CONFIG_NFS_V3=y |
1646 | # CONFIG_NFS_V3_ACL is not set | 1676 | # CONFIG_NFS_V3_ACL is not set |
1647 | CONFIG_NFS_V4=y | 1677 | CONFIG_NFS_V4=y |
1678 | # CONFIG_NFS_V4_1 is not set | ||
1648 | CONFIG_ROOT_NFS=y | 1679 | CONFIG_ROOT_NFS=y |
1649 | # CONFIG_NFSD is not set | 1680 | # CONFIG_NFSD is not set |
1650 | CONFIG_LOCKD=y | 1681 | CONFIG_LOCKD=y |
@@ -1734,6 +1765,7 @@ CONFIG_HAS_IOPORT=y | |||
1734 | CONFIG_HAS_DMA=y | 1765 | CONFIG_HAS_DMA=y |
1735 | CONFIG_HAVE_LMB=y | 1766 | CONFIG_HAVE_LMB=y |
1736 | CONFIG_NLATTR=y | 1767 | CONFIG_NLATTR=y |
1768 | CONFIG_GENERIC_ATOMIC64=y | ||
1737 | 1769 | ||
1738 | # | 1770 | # |
1739 | # Kernel hacking | 1771 | # Kernel hacking |
@@ -1759,10 +1791,14 @@ CONFIG_SCHED_DEBUG=y | |||
1759 | # CONFIG_TIMER_STATS is not set | 1791 | # CONFIG_TIMER_STATS is not set |
1760 | # CONFIG_DEBUG_OBJECTS is not set | 1792 | # CONFIG_DEBUG_OBJECTS is not set |
1761 | # CONFIG_DEBUG_SLAB is not set | 1793 | # CONFIG_DEBUG_SLAB is not set |
1794 | CONFIG_DEBUG_PREEMPT=y | ||
1762 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1795 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1763 | # CONFIG_RT_MUTEX_TESTER is not set | 1796 | # CONFIG_RT_MUTEX_TESTER is not set |
1764 | # CONFIG_DEBUG_SPINLOCK is not set | 1797 | # CONFIG_DEBUG_SPINLOCK is not set |
1765 | # CONFIG_DEBUG_MUTEXES is not set | 1798 | # CONFIG_DEBUG_MUTEXES is not set |
1799 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1800 | # CONFIG_PROVE_LOCKING is not set | ||
1801 | # CONFIG_LOCK_STAT is not set | ||
1766 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1802 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1767 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1803 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1768 | # CONFIG_DEBUG_KOBJECT is not set | 1804 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1774,7 +1810,6 @@ CONFIG_DEBUG_INFO=y | |||
1774 | # CONFIG_DEBUG_LIST is not set | 1810 | # CONFIG_DEBUG_LIST is not set |
1775 | # CONFIG_DEBUG_SG is not set | 1811 | # CONFIG_DEBUG_SG is not set |
1776 | # CONFIG_DEBUG_NOTIFIERS is not set | 1812 | # CONFIG_DEBUG_NOTIFIERS is not set |
1777 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1778 | # CONFIG_RCU_TORTURE_TEST is not set | 1813 | # CONFIG_RCU_TORTURE_TEST is not set |
1779 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1814 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1780 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1815 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1788,17 +1823,16 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1788 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1823 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1789 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1824 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1790 | CONFIG_TRACING_SUPPORT=y | 1825 | CONFIG_TRACING_SUPPORT=y |
1791 | 1826 | CONFIG_FTRACE=y | |
1792 | # | ||
1793 | # Tracers | ||
1794 | # | ||
1795 | # CONFIG_FUNCTION_TRACER is not set | 1827 | # CONFIG_FUNCTION_TRACER is not set |
1828 | # CONFIG_IRQSOFF_TRACER is not set | ||
1796 | # CONFIG_PREEMPT_TRACER is not set | 1829 | # CONFIG_PREEMPT_TRACER is not set |
1797 | # CONFIG_SCHED_TRACER is not set | 1830 | # CONFIG_SCHED_TRACER is not set |
1798 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1831 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1799 | # CONFIG_EVENT_TRACER is not set | ||
1800 | # CONFIG_BOOT_TRACER is not set | 1832 | # CONFIG_BOOT_TRACER is not set |
1801 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1833 | CONFIG_BRANCH_PROFILE_NONE=y |
1834 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1835 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1802 | # CONFIG_STACK_TRACER is not set | 1836 | # CONFIG_STACK_TRACER is not set |
1803 | # CONFIG_KMEMTRACE is not set | 1837 | # CONFIG_KMEMTRACE is not set |
1804 | # CONFIG_WORKQUEUE_TRACER is not set | 1838 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1806,6 +1840,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1806 | # CONFIG_SAMPLES is not set | 1840 | # CONFIG_SAMPLES is not set |
1807 | CONFIG_HAVE_ARCH_KGDB=y | 1841 | CONFIG_HAVE_ARCH_KGDB=y |
1808 | # CONFIG_KGDB is not set | 1842 | # CONFIG_KGDB is not set |
1843 | # CONFIG_KMEMCHECK is not set | ||
1844 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1845 | CONFIG_PPC_WERROR=y | ||
1809 | CONFIG_PRINT_STACK_DEPTH=64 | 1846 | CONFIG_PRINT_STACK_DEPTH=64 |
1810 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1847 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1811 | # CONFIG_DEBUG_STACK_USAGE is not set | 1848 | # CONFIG_DEBUG_STACK_USAGE is not set |
@@ -1829,7 +1866,6 @@ CONFIG_SECURITY_NETWORK=y | |||
1829 | # CONFIG_SECURITY_PATH is not set | 1866 | # CONFIG_SECURITY_PATH is not set |
1830 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1867 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1831 | # CONFIG_SECURITY_ROOTPLUG is not set | 1868 | # CONFIG_SECURITY_ROOTPLUG is not set |
1832 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | ||
1833 | # CONFIG_SECURITY_TOMOYO is not set | 1869 | # CONFIG_SECURITY_TOMOYO is not set |
1834 | CONFIG_CRYPTO=y | 1870 | CONFIG_CRYPTO=y |
1835 | 1871 | ||
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig index cfd2efcc6bce..a61f183f7186 100644 --- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:28 2009 | 4 | # Wed Jul 29 23:32:27 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_PHYS_64BIT is not set | 20 | # CONFIG_PHYS_64BIT is not set |
20 | CONFIG_ALTIVEC=y | 21 | CONFIG_ALTIVEC=y |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
45 | CONFIG_PPC=y | 48 | CONFIG_PPC=y |
@@ -53,11 +56,13 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | # CONFIG_PPC_DCR_NATIVE is not set | 61 | # CONFIG_PPC_DCR_NATIVE is not set |
58 | # CONFIG_PPC_DCR_MMIO is not set | 62 | # CONFIG_PPC_DCR_MMIO is not set |
59 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
65 | CONFIG_CONSTRUCTORS=y | ||
61 | 66 | ||
62 | # | 67 | # |
63 | # General setup | 68 | # General setup |
@@ -109,7 +114,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
109 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
110 | # CONFIG_KALLSYMS_ALL is not set | 115 | # CONFIG_KALLSYMS_ALL is not set |
111 | CONFIG_KALLSYMS_EXTRA_PASS=y | 116 | CONFIG_KALLSYMS_EXTRA_PASS=y |
112 | # CONFIG_STRIP_ASM_SYMS is not set | ||
113 | CONFIG_HOTPLUG=y | 117 | CONFIG_HOTPLUG=y |
114 | CONFIG_PRINTK=y | 118 | CONFIG_PRINTK=y |
115 | CONFIG_BUG=y | 119 | CONFIG_BUG=y |
@@ -122,9 +126,16 @@ CONFIG_TIMERFD=y | |||
122 | CONFIG_EVENTFD=y | 126 | CONFIG_EVENTFD=y |
123 | CONFIG_SHMEM=y | 127 | CONFIG_SHMEM=y |
124 | CONFIG_AIO=y | 128 | CONFIG_AIO=y |
129 | CONFIG_HAVE_PERF_COUNTERS=y | ||
130 | |||
131 | # | ||
132 | # Performance Counters | ||
133 | # | ||
134 | # CONFIG_PERF_COUNTERS is not set | ||
125 | CONFIG_VM_EVENT_COUNTERS=y | 135 | CONFIG_VM_EVENT_COUNTERS=y |
126 | CONFIG_PCI_QUIRKS=y | 136 | CONFIG_PCI_QUIRKS=y |
127 | CONFIG_SLUB_DEBUG=y | 137 | CONFIG_SLUB_DEBUG=y |
138 | # CONFIG_STRIP_ASM_SYMS is not set | ||
128 | CONFIG_COMPAT_BRK=y | 139 | CONFIG_COMPAT_BRK=y |
129 | # CONFIG_SLAB is not set | 140 | # CONFIG_SLAB is not set |
130 | CONFIG_SLUB=y | 141 | CONFIG_SLUB=y |
@@ -138,6 +149,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
138 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
139 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
140 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | |||
153 | # | ||
154 | # GCOV-based kernel profiling | ||
155 | # | ||
141 | # CONFIG_SLOW_WORK is not set | 156 | # CONFIG_SLOW_WORK is not set |
142 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 157 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
143 | CONFIG_SLABINFO=y | 158 | CONFIG_SLABINFO=y |
@@ -150,7 +165,7 @@ CONFIG_MODULE_UNLOAD=y | |||
150 | # CONFIG_MODVERSIONS is not set | 165 | # CONFIG_MODVERSIONS is not set |
151 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 166 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
152 | CONFIG_BLOCK=y | 167 | CONFIG_BLOCK=y |
153 | # CONFIG_LBD is not set | 168 | CONFIG_LBDAF=y |
154 | # CONFIG_BLK_DEV_BSG is not set | 169 | # CONFIG_BLK_DEV_BSG is not set |
155 | # CONFIG_BLK_DEV_INTEGRITY is not set | 170 | # CONFIG_BLK_DEV_INTEGRITY is not set |
156 | 171 | ||
@@ -230,6 +245,7 @@ CONFIG_BINFMT_ELF=y | |||
230 | # CONFIG_HAVE_AOUT is not set | 245 | # CONFIG_HAVE_AOUT is not set |
231 | # CONFIG_BINFMT_MISC is not set | 246 | # CONFIG_BINFMT_MISC is not set |
232 | # CONFIG_IOMMU_HELPER is not set | 247 | # CONFIG_IOMMU_HELPER is not set |
248 | # CONFIG_SWIOTLB is not set | ||
233 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 249 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
234 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 250 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
235 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 251 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -250,9 +266,9 @@ CONFIG_MIGRATION=y | |||
250 | CONFIG_ZONE_DMA_FLAG=1 | 266 | CONFIG_ZONE_DMA_FLAG=1 |
251 | CONFIG_BOUNCE=y | 267 | CONFIG_BOUNCE=y |
252 | CONFIG_VIRT_TO_BUS=y | 268 | CONFIG_VIRT_TO_BUS=y |
253 | CONFIG_UNEVICTABLE_LRU=y | ||
254 | CONFIG_HAVE_MLOCK=y | 269 | CONFIG_HAVE_MLOCK=y |
255 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 270 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
271 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
256 | CONFIG_PPC_4K_PAGES=y | 272 | CONFIG_PPC_4K_PAGES=y |
257 | # CONFIG_PPC_16K_PAGES is not set | 273 | # CONFIG_PPC_16K_PAGES is not set |
258 | # CONFIG_PPC_64K_PAGES is not set | 274 | # CONFIG_PPC_64K_PAGES is not set |
@@ -279,6 +295,8 @@ CONFIG_PCI_DOMAINS=y | |||
279 | CONFIG_PCI_SYSCALL=y | 295 | CONFIG_PCI_SYSCALL=y |
280 | CONFIG_PCIEPORTBUS=y | 296 | CONFIG_PCIEPORTBUS=y |
281 | CONFIG_PCIEAER=y | 297 | CONFIG_PCIEAER=y |
298 | # CONFIG_PCIE_ECRC is not set | ||
299 | # CONFIG_PCIEAER_INJECT is not set | ||
282 | # CONFIG_PCIEASPM is not set | 300 | # CONFIG_PCIEASPM is not set |
283 | CONFIG_ARCH_SUPPORTS_MSI=y | 301 | CONFIG_ARCH_SUPPORTS_MSI=y |
284 | # CONFIG_PCI_MSI is not set | 302 | # CONFIG_PCI_MSI is not set |
@@ -381,6 +399,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
381 | # CONFIG_ECONET is not set | 399 | # CONFIG_ECONET is not set |
382 | # CONFIG_WAN_ROUTER is not set | 400 | # CONFIG_WAN_ROUTER is not set |
383 | # CONFIG_PHONET is not set | 401 | # CONFIG_PHONET is not set |
402 | # CONFIG_IEEE802154 is not set | ||
384 | # CONFIG_NET_SCHED is not set | 403 | # CONFIG_NET_SCHED is not set |
385 | # CONFIG_DCB is not set | 404 | # CONFIG_DCB is not set |
386 | 405 | ||
@@ -398,7 +417,11 @@ CONFIG_WIRELESS=y | |||
398 | CONFIG_WIRELESS_OLD_REGULATORY=y | 417 | CONFIG_WIRELESS_OLD_REGULATORY=y |
399 | # CONFIG_WIRELESS_EXT is not set | 418 | # CONFIG_WIRELESS_EXT is not set |
400 | # CONFIG_LIB80211 is not set | 419 | # CONFIG_LIB80211 is not set |
401 | # CONFIG_MAC80211 is not set | 420 | |
421 | # | ||
422 | # CFG80211 needs to be enabled for MAC80211 | ||
423 | # | ||
424 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
402 | # CONFIG_WIMAX is not set | 425 | # CONFIG_WIMAX is not set |
403 | # CONFIG_RFKILL is not set | 426 | # CONFIG_RFKILL is not set |
404 | # CONFIG_NET_9P is not set | 427 | # CONFIG_NET_9P is not set |
@@ -549,7 +572,9 @@ CONFIG_MISC_DEVICES=y | |||
549 | # | 572 | # |
550 | # CONFIG_EEPROM_AT24 is not set | 573 | # CONFIG_EEPROM_AT24 is not set |
551 | # CONFIG_EEPROM_LEGACY is not set | 574 | # CONFIG_EEPROM_LEGACY is not set |
575 | # CONFIG_EEPROM_MAX6875 is not set | ||
552 | # CONFIG_EEPROM_93CX6 is not set | 576 | # CONFIG_EEPROM_93CX6 is not set |
577 | # CONFIG_CB710_CORE is not set | ||
553 | CONFIG_HAVE_IDE=y | 578 | CONFIG_HAVE_IDE=y |
554 | CONFIG_IDE=y | 579 | CONFIG_IDE=y |
555 | 580 | ||
@@ -620,10 +645,6 @@ CONFIG_BLK_DEV_SD=y | |||
620 | # CONFIG_BLK_DEV_SR is not set | 645 | # CONFIG_BLK_DEV_SR is not set |
621 | CONFIG_CHR_DEV_SG=y | 646 | CONFIG_CHR_DEV_SG=y |
622 | # CONFIG_CHR_DEV_SCH is not set | 647 | # CONFIG_CHR_DEV_SCH is not set |
623 | |||
624 | # | ||
625 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
626 | # | ||
627 | # CONFIG_SCSI_MULTI_LUN is not set | 648 | # CONFIG_SCSI_MULTI_LUN is not set |
628 | # CONFIG_SCSI_CONSTANTS is not set | 649 | # CONFIG_SCSI_CONSTANTS is not set |
629 | # CONFIG_SCSI_LOGGING is not set | 650 | # CONFIG_SCSI_LOGGING is not set |
@@ -640,6 +661,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
640 | # CONFIG_SCSI_SRP_ATTRS is not set | 661 | # CONFIG_SCSI_SRP_ATTRS is not set |
641 | CONFIG_SCSI_LOWLEVEL=y | 662 | CONFIG_SCSI_LOWLEVEL=y |
642 | # CONFIG_ISCSI_TCP is not set | 663 | # CONFIG_ISCSI_TCP is not set |
664 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
643 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 665 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
644 | # CONFIG_SCSI_3W_9XXX is not set | 666 | # CONFIG_SCSI_3W_9XXX is not set |
645 | # CONFIG_SCSI_ACARD is not set | 667 | # CONFIG_SCSI_ACARD is not set |
@@ -648,6 +670,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
648 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 670 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
649 | # CONFIG_SCSI_AIC79XX is not set | 671 | # CONFIG_SCSI_AIC79XX is not set |
650 | # CONFIG_SCSI_AIC94XX is not set | 672 | # CONFIG_SCSI_AIC94XX is not set |
673 | # CONFIG_SCSI_MVSAS is not set | ||
651 | # CONFIG_SCSI_DPT_I2O is not set | 674 | # CONFIG_SCSI_DPT_I2O is not set |
652 | # CONFIG_SCSI_ADVANSYS is not set | 675 | # CONFIG_SCSI_ADVANSYS is not set |
653 | # CONFIG_SCSI_ARCMSR is not set | 676 | # CONFIG_SCSI_ARCMSR is not set |
@@ -667,7 +690,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
667 | # CONFIG_SCSI_IPS is not set | 690 | # CONFIG_SCSI_IPS is not set |
668 | # CONFIG_SCSI_INITIO is not set | 691 | # CONFIG_SCSI_INITIO is not set |
669 | # CONFIG_SCSI_INIA100 is not set | 692 | # CONFIG_SCSI_INIA100 is not set |
670 | # CONFIG_SCSI_MVSAS is not set | ||
671 | # CONFIG_SCSI_STEX is not set | 693 | # CONFIG_SCSI_STEX is not set |
672 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 694 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
673 | # CONFIG_SCSI_IPR is not set | 695 | # CONFIG_SCSI_IPR is not set |
@@ -751,14 +773,17 @@ CONFIG_PATA_ALI=y | |||
751 | # | 773 | # |
752 | 774 | ||
753 | # | 775 | # |
754 | # Enable only one of the two stacks, unless you know what you are doing | 776 | # You can enable one or both FireWire driver stacks. |
777 | # | ||
778 | |||
779 | # | ||
780 | # See the help texts for more information. | ||
755 | # | 781 | # |
756 | # CONFIG_FIREWIRE is not set | 782 | # CONFIG_FIREWIRE is not set |
757 | # CONFIG_IEEE1394 is not set | 783 | # CONFIG_IEEE1394 is not set |
758 | # CONFIG_I2O is not set | 784 | # CONFIG_I2O is not set |
759 | # CONFIG_MACINTOSH_DRIVERS is not set | 785 | # CONFIG_MACINTOSH_DRIVERS is not set |
760 | CONFIG_NETDEVICES=y | 786 | CONFIG_NETDEVICES=y |
761 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
762 | CONFIG_DUMMY=y | 787 | CONFIG_DUMMY=y |
763 | # CONFIG_BONDING is not set | 788 | # CONFIG_BONDING is not set |
764 | # CONFIG_MACVLAN is not set | 789 | # CONFIG_MACVLAN is not set |
@@ -792,6 +817,7 @@ CONFIG_ULI526X=y | |||
792 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 817 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
793 | # CONFIG_NET_PCI is not set | 818 | # CONFIG_NET_PCI is not set |
794 | # CONFIG_B44 is not set | 819 | # CONFIG_B44 is not set |
820 | # CONFIG_KS8842 is not set | ||
795 | # CONFIG_ATL2 is not set | 821 | # CONFIG_ATL2 is not set |
796 | # CONFIG_NETDEV_1000 is not set | 822 | # CONFIG_NETDEV_1000 is not set |
797 | # CONFIG_NETDEV_10000 is not set | 823 | # CONFIG_NETDEV_10000 is not set |
@@ -959,13 +985,17 @@ CONFIG_I2C_MPC=y | |||
959 | # CONFIG_SENSORS_PCF8574 is not set | 985 | # CONFIG_SENSORS_PCF8574 is not set |
960 | # CONFIG_PCF8575 is not set | 986 | # CONFIG_PCF8575 is not set |
961 | # CONFIG_SENSORS_PCA9539 is not set | 987 | # CONFIG_SENSORS_PCA9539 is not set |
962 | # CONFIG_SENSORS_MAX6875 is not set | ||
963 | # CONFIG_SENSORS_TSL2550 is not set | 988 | # CONFIG_SENSORS_TSL2550 is not set |
964 | # CONFIG_I2C_DEBUG_CORE is not set | 989 | # CONFIG_I2C_DEBUG_CORE is not set |
965 | # CONFIG_I2C_DEBUG_ALGO is not set | 990 | # CONFIG_I2C_DEBUG_ALGO is not set |
966 | # CONFIG_I2C_DEBUG_BUS is not set | 991 | # CONFIG_I2C_DEBUG_BUS is not set |
967 | # CONFIG_I2C_DEBUG_CHIP is not set | 992 | # CONFIG_I2C_DEBUG_CHIP is not set |
968 | # CONFIG_SPI is not set | 993 | # CONFIG_SPI is not set |
994 | |||
995 | # | ||
996 | # PPS support | ||
997 | # | ||
998 | # CONFIG_PPS is not set | ||
969 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 999 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
970 | # CONFIG_GPIOLIB is not set | 1000 | # CONFIG_GPIOLIB is not set |
971 | # CONFIG_W1 is not set | 1001 | # CONFIG_W1 is not set |
@@ -993,23 +1023,9 @@ CONFIG_SSB_POSSIBLE=y | |||
993 | # CONFIG_MFD_WM8400 is not set | 1023 | # CONFIG_MFD_WM8400 is not set |
994 | # CONFIG_MFD_WM8350_I2C is not set | 1024 | # CONFIG_MFD_WM8350_I2C is not set |
995 | # CONFIG_MFD_PCF50633 is not set | 1025 | # CONFIG_MFD_PCF50633 is not set |
1026 | # CONFIG_AB3100_CORE is not set | ||
996 | # CONFIG_REGULATOR is not set | 1027 | # CONFIG_REGULATOR is not set |
997 | 1028 | # CONFIG_MEDIA_SUPPORT is not set | |
998 | # | ||
999 | # Multimedia devices | ||
1000 | # | ||
1001 | |||
1002 | # | ||
1003 | # Multimedia core support | ||
1004 | # | ||
1005 | # CONFIG_VIDEO_DEV is not set | ||
1006 | # CONFIG_DVB_CORE is not set | ||
1007 | # CONFIG_VIDEO_MEDIA is not set | ||
1008 | |||
1009 | # | ||
1010 | # Multimedia drivers | ||
1011 | # | ||
1012 | CONFIG_DAB=y | ||
1013 | 1029 | ||
1014 | # | 1030 | # |
1015 | # Graphics support | 1031 | # Graphics support |
@@ -1106,6 +1122,11 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
1106 | CONFIG_SND_VERBOSE_PROCFS=y | 1122 | CONFIG_SND_VERBOSE_PROCFS=y |
1107 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1123 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1108 | # CONFIG_SND_DEBUG is not set | 1124 | # CONFIG_SND_DEBUG is not set |
1125 | # CONFIG_SND_RAWMIDI_SEQ is not set | ||
1126 | # CONFIG_SND_OPL3_LIB_SEQ is not set | ||
1127 | # CONFIG_SND_OPL4_LIB_SEQ is not set | ||
1128 | # CONFIG_SND_SBAWE_SEQ is not set | ||
1129 | # CONFIG_SND_EMU10K1_SEQ is not set | ||
1109 | CONFIG_SND_DRIVERS=y | 1130 | CONFIG_SND_DRIVERS=y |
1110 | # CONFIG_SND_DUMMY is not set | 1131 | # CONFIG_SND_DUMMY is not set |
1111 | # CONFIG_SND_MTPAV is not set | 1132 | # CONFIG_SND_MTPAV is not set |
@@ -1130,6 +1151,7 @@ CONFIG_SND_PCI=y | |||
1130 | # CONFIG_SND_CS4281 is not set | 1151 | # CONFIG_SND_CS4281 is not set |
1131 | # CONFIG_SND_CS46XX is not set | 1152 | # CONFIG_SND_CS46XX is not set |
1132 | # CONFIG_SND_CS5530 is not set | 1153 | # CONFIG_SND_CS5530 is not set |
1154 | # CONFIG_SND_CTXFI is not set | ||
1133 | # CONFIG_SND_DARLA20 is not set | 1155 | # CONFIG_SND_DARLA20 is not set |
1134 | # CONFIG_SND_GINA20 is not set | 1156 | # CONFIG_SND_GINA20 is not set |
1135 | # CONFIG_SND_LAYLA20 is not set | 1157 | # CONFIG_SND_LAYLA20 is not set |
@@ -1160,6 +1182,7 @@ CONFIG_SND_PCI=y | |||
1160 | # CONFIG_SND_INTEL8X0 is not set | 1182 | # CONFIG_SND_INTEL8X0 is not set |
1161 | # CONFIG_SND_INTEL8X0M is not set | 1183 | # CONFIG_SND_INTEL8X0M is not set |
1162 | # CONFIG_SND_KORG1212 is not set | 1184 | # CONFIG_SND_KORG1212 is not set |
1185 | # CONFIG_SND_LX6464ES is not set | ||
1163 | # CONFIG_SND_MAESTRO3 is not set | 1186 | # CONFIG_SND_MAESTRO3 is not set |
1164 | # CONFIG_SND_MIXART is not set | 1187 | # CONFIG_SND_MIXART is not set |
1165 | # CONFIG_SND_NM256 is not set | 1188 | # CONFIG_SND_NM256 is not set |
@@ -1251,6 +1274,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1251 | # CONFIG_RTC_DRV_S35390A is not set | 1274 | # CONFIG_RTC_DRV_S35390A is not set |
1252 | # CONFIG_RTC_DRV_FM3130 is not set | 1275 | # CONFIG_RTC_DRV_FM3130 is not set |
1253 | # CONFIG_RTC_DRV_RX8581 is not set | 1276 | # CONFIG_RTC_DRV_RX8581 is not set |
1277 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1254 | 1278 | ||
1255 | # | 1279 | # |
1256 | # SPI RTC drivers | 1280 | # SPI RTC drivers |
@@ -1278,6 +1302,10 @@ CONFIG_RTC_DRV_CMOS=y | |||
1278 | # CONFIG_DMADEVICES is not set | 1302 | # CONFIG_DMADEVICES is not set |
1279 | # CONFIG_AUXDISPLAY is not set | 1303 | # CONFIG_AUXDISPLAY is not set |
1280 | # CONFIG_UIO is not set | 1304 | # CONFIG_UIO is not set |
1305 | |||
1306 | # | ||
1307 | # TI VLYNQ | ||
1308 | # | ||
1281 | # CONFIG_STAGING is not set | 1309 | # CONFIG_STAGING is not set |
1282 | 1310 | ||
1283 | # | 1311 | # |
@@ -1297,12 +1325,15 @@ CONFIG_FS_MBCACHE=y | |||
1297 | # CONFIG_REISERFS_FS is not set | 1325 | # CONFIG_REISERFS_FS is not set |
1298 | # CONFIG_JFS_FS is not set | 1326 | # CONFIG_JFS_FS is not set |
1299 | # CONFIG_FS_POSIX_ACL is not set | 1327 | # CONFIG_FS_POSIX_ACL is not set |
1300 | CONFIG_FILE_LOCKING=y | ||
1301 | # CONFIG_XFS_FS is not set | 1328 | # CONFIG_XFS_FS is not set |
1329 | # CONFIG_GFS2_FS is not set | ||
1302 | # CONFIG_OCFS2_FS is not set | 1330 | # CONFIG_OCFS2_FS is not set |
1303 | # CONFIG_BTRFS_FS is not set | 1331 | # CONFIG_BTRFS_FS is not set |
1332 | CONFIG_FILE_LOCKING=y | ||
1333 | CONFIG_FSNOTIFY=y | ||
1304 | # CONFIG_DNOTIFY is not set | 1334 | # CONFIG_DNOTIFY is not set |
1305 | # CONFIG_INOTIFY is not set | 1335 | # CONFIG_INOTIFY is not set |
1336 | CONFIG_INOTIFY_USER=y | ||
1306 | # CONFIG_QUOTA is not set | 1337 | # CONFIG_QUOTA is not set |
1307 | # CONFIG_AUTOFS_FS is not set | 1338 | # CONFIG_AUTOFS_FS is not set |
1308 | # CONFIG_AUTOFS4_FS is not set | 1339 | # CONFIG_AUTOFS4_FS is not set |
@@ -1464,6 +1495,7 @@ CONFIG_HAS_IOPORT=y | |||
1464 | CONFIG_HAS_DMA=y | 1495 | CONFIG_HAS_DMA=y |
1465 | CONFIG_HAVE_LMB=y | 1496 | CONFIG_HAVE_LMB=y |
1466 | CONFIG_NLATTR=y | 1497 | CONFIG_NLATTR=y |
1498 | CONFIG_GENERIC_ATOMIC64=y | ||
1467 | 1499 | ||
1468 | # | 1500 | # |
1469 | # Kernel hacking | 1501 | # Kernel hacking |
@@ -1494,6 +1526,9 @@ CONFIG_SCHED_DEBUG=y | |||
1494 | # CONFIG_RT_MUTEX_TESTER is not set | 1526 | # CONFIG_RT_MUTEX_TESTER is not set |
1495 | # CONFIG_DEBUG_SPINLOCK is not set | 1527 | # CONFIG_DEBUG_SPINLOCK is not set |
1496 | # CONFIG_DEBUG_MUTEXES is not set | 1528 | # CONFIG_DEBUG_MUTEXES is not set |
1529 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1530 | # CONFIG_PROVE_LOCKING is not set | ||
1531 | # CONFIG_LOCK_STAT is not set | ||
1497 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1532 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1498 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1533 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1499 | # CONFIG_DEBUG_KOBJECT is not set | 1534 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1506,7 +1541,6 @@ CONFIG_DEBUG_INFO=y | |||
1506 | # CONFIG_DEBUG_LIST is not set | 1541 | # CONFIG_DEBUG_LIST is not set |
1507 | # CONFIG_DEBUG_SG is not set | 1542 | # CONFIG_DEBUG_SG is not set |
1508 | # CONFIG_DEBUG_NOTIFIERS is not set | 1543 | # CONFIG_DEBUG_NOTIFIERS is not set |
1509 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1510 | # CONFIG_RCU_TORTURE_TEST is not set | 1544 | # CONFIG_RCU_TORTURE_TEST is not set |
1511 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1545 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1512 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1546 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1520,16 +1554,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1520 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1554 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1521 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1555 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1522 | CONFIG_TRACING_SUPPORT=y | 1556 | CONFIG_TRACING_SUPPORT=y |
1523 | 1557 | CONFIG_FTRACE=y | |
1524 | # | ||
1525 | # Tracers | ||
1526 | # | ||
1527 | # CONFIG_FUNCTION_TRACER is not set | 1558 | # CONFIG_FUNCTION_TRACER is not set |
1559 | # CONFIG_IRQSOFF_TRACER is not set | ||
1528 | # CONFIG_SCHED_TRACER is not set | 1560 | # CONFIG_SCHED_TRACER is not set |
1529 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1561 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1530 | # CONFIG_EVENT_TRACER is not set | ||
1531 | # CONFIG_BOOT_TRACER is not set | 1562 | # CONFIG_BOOT_TRACER is not set |
1532 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1563 | CONFIG_BRANCH_PROFILE_NONE=y |
1564 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1565 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1533 | # CONFIG_STACK_TRACER is not set | 1566 | # CONFIG_STACK_TRACER is not set |
1534 | # CONFIG_KMEMTRACE is not set | 1567 | # CONFIG_KMEMTRACE is not set |
1535 | # CONFIG_WORKQUEUE_TRACER is not set | 1568 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1537,6 +1570,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1537 | # CONFIG_SAMPLES is not set | 1570 | # CONFIG_SAMPLES is not set |
1538 | CONFIG_HAVE_ARCH_KGDB=y | 1571 | CONFIG_HAVE_ARCH_KGDB=y |
1539 | # CONFIG_KGDB is not set | 1572 | # CONFIG_KGDB is not set |
1573 | # CONFIG_KMEMCHECK is not set | ||
1574 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1575 | CONFIG_PPC_WERROR=y | ||
1540 | CONFIG_PRINT_STACK_DEPTH=64 | 1576 | CONFIG_PRINT_STACK_DEPTH=64 |
1541 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1577 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1542 | # CONFIG_DEBUG_STACK_USAGE is not set | 1578 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig index 0bee3e303942..7016ce732605 100644 --- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:28 2009 | 4 | # Wed Jul 29 23:32:28 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_PHYS_64BIT is not set | 20 | # CONFIG_PHYS_64BIT is not set |
20 | CONFIG_ALTIVEC=y | 21 | CONFIG_ALTIVEC=y |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | CONFIG_SMP=y | 26 | CONFIG_SMP=y |
25 | CONFIG_NR_CPUS=2 | 27 | CONFIG_NR_CPUS=2 |
26 | CONFIG_PPC32=y | 28 | CONFIG_PPC32=y |
@@ -32,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
32 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
33 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
34 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
39 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
41 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
42 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
43 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
44 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
46 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -54,11 +57,13 @@ CONFIG_PPC_UDBG_16550=y | |||
54 | CONFIG_GENERIC_TBSYNC=y | 57 | CONFIG_GENERIC_TBSYNC=y |
55 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
56 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
57 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -113,7 +118,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
113 | CONFIG_KALLSYMS=y | 118 | CONFIG_KALLSYMS=y |
114 | CONFIG_KALLSYMS_ALL=y | 119 | CONFIG_KALLSYMS_ALL=y |
115 | CONFIG_KALLSYMS_EXTRA_PASS=y | 120 | CONFIG_KALLSYMS_EXTRA_PASS=y |
116 | # CONFIG_STRIP_ASM_SYMS is not set | ||
117 | CONFIG_HOTPLUG=y | 121 | CONFIG_HOTPLUG=y |
118 | CONFIG_PRINTK=y | 122 | CONFIG_PRINTK=y |
119 | CONFIG_BUG=y | 123 | CONFIG_BUG=y |
@@ -126,9 +130,16 @@ CONFIG_TIMERFD=y | |||
126 | CONFIG_EVENTFD=y | 130 | CONFIG_EVENTFD=y |
127 | CONFIG_SHMEM=y | 131 | CONFIG_SHMEM=y |
128 | CONFIG_AIO=y | 132 | CONFIG_AIO=y |
133 | CONFIG_HAVE_PERF_COUNTERS=y | ||
134 | |||
135 | # | ||
136 | # Performance Counters | ||
137 | # | ||
138 | # CONFIG_PERF_COUNTERS is not set | ||
129 | CONFIG_VM_EVENT_COUNTERS=y | 139 | CONFIG_VM_EVENT_COUNTERS=y |
130 | CONFIG_PCI_QUIRKS=y | 140 | CONFIG_PCI_QUIRKS=y |
131 | CONFIG_SLUB_DEBUG=y | 141 | CONFIG_SLUB_DEBUG=y |
142 | # CONFIG_STRIP_ASM_SYMS is not set | ||
132 | CONFIG_COMPAT_BRK=y | 143 | CONFIG_COMPAT_BRK=y |
133 | # CONFIG_SLAB is not set | 144 | # CONFIG_SLAB is not set |
134 | CONFIG_SLUB=y | 145 | CONFIG_SLUB=y |
@@ -143,6 +154,10 @@ CONFIG_HAVE_KPROBES=y | |||
143 | CONFIG_HAVE_KRETPROBES=y | 154 | CONFIG_HAVE_KRETPROBES=y |
144 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 155 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
145 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 156 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
157 | |||
158 | # | ||
159 | # GCOV-based kernel profiling | ||
160 | # | ||
146 | # CONFIG_SLOW_WORK is not set | 161 | # CONFIG_SLOW_WORK is not set |
147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 162 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
148 | CONFIG_SLABINFO=y | 163 | CONFIG_SLABINFO=y |
@@ -156,7 +171,7 @@ CONFIG_MODVERSIONS=y | |||
156 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 171 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
157 | CONFIG_STOP_MACHINE=y | 172 | CONFIG_STOP_MACHINE=y |
158 | CONFIG_BLOCK=y | 173 | CONFIG_BLOCK=y |
159 | CONFIG_LBD=y | 174 | CONFIG_LBDAF=y |
160 | # CONFIG_BLK_DEV_BSG is not set | 175 | # CONFIG_BLK_DEV_BSG is not set |
161 | # CONFIG_BLK_DEV_INTEGRITY is not set | 176 | # CONFIG_BLK_DEV_INTEGRITY is not set |
162 | 177 | ||
@@ -234,7 +249,9 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 249 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
235 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
236 | CONFIG_BINFMT_MISC=m | 251 | CONFIG_BINFMT_MISC=m |
237 | # CONFIG_IOMMU_HELPER is not set | 252 | CONFIG_IOMMU_HELPER=y |
253 | CONFIG_SWIOTLB=y | ||
254 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | ||
238 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 255 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
239 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 256 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
240 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 257 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -256,9 +273,9 @@ CONFIG_MIGRATION=y | |||
256 | CONFIG_ZONE_DMA_FLAG=1 | 273 | CONFIG_ZONE_DMA_FLAG=1 |
257 | CONFIG_BOUNCE=y | 274 | CONFIG_BOUNCE=y |
258 | CONFIG_VIRT_TO_BUS=y | 275 | CONFIG_VIRT_TO_BUS=y |
259 | CONFIG_UNEVICTABLE_LRU=y | ||
260 | CONFIG_HAVE_MLOCK=y | 276 | CONFIG_HAVE_MLOCK=y |
261 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 277 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
278 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
262 | CONFIG_PPC_4K_PAGES=y | 279 | CONFIG_PPC_4K_PAGES=y |
263 | # CONFIG_PPC_16K_PAGES is not set | 280 | # CONFIG_PPC_16K_PAGES is not set |
264 | # CONFIG_PPC_64K_PAGES is not set | 281 | # CONFIG_PPC_64K_PAGES is not set |
@@ -401,6 +418,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
401 | # CONFIG_ECONET is not set | 418 | # CONFIG_ECONET is not set |
402 | # CONFIG_WAN_ROUTER is not set | 419 | # CONFIG_WAN_ROUTER is not set |
403 | # CONFIG_PHONET is not set | 420 | # CONFIG_PHONET is not set |
421 | # CONFIG_IEEE802154 is not set | ||
404 | # CONFIG_NET_SCHED is not set | 422 | # CONFIG_NET_SCHED is not set |
405 | # CONFIG_DCB is not set | 423 | # CONFIG_DCB is not set |
406 | 424 | ||
@@ -419,7 +437,11 @@ CONFIG_WIRELESS=y | |||
419 | CONFIG_WIRELESS_OLD_REGULATORY=y | 437 | CONFIG_WIRELESS_OLD_REGULATORY=y |
420 | # CONFIG_WIRELESS_EXT is not set | 438 | # CONFIG_WIRELESS_EXT is not set |
421 | # CONFIG_LIB80211 is not set | 439 | # CONFIG_LIB80211 is not set |
422 | # CONFIG_MAC80211 is not set | 440 | |
441 | # | ||
442 | # CFG80211 needs to be enabled for MAC80211 | ||
443 | # | ||
444 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
423 | # CONFIG_WIMAX is not set | 445 | # CONFIG_WIMAX is not set |
424 | # CONFIG_RFKILL is not set | 446 | # CONFIG_RFKILL is not set |
425 | # CONFIG_NET_9P is not set | 447 | # CONFIG_NET_9P is not set |
@@ -444,6 +466,7 @@ CONFIG_EXTRA_FIRMWARE="" | |||
444 | # CONFIG_MTD is not set | 466 | # CONFIG_MTD is not set |
445 | CONFIG_OF_DEVICE=y | 467 | CONFIG_OF_DEVICE=y |
446 | CONFIG_OF_I2C=y | 468 | CONFIG_OF_I2C=y |
469 | CONFIG_OF_MDIO=y | ||
447 | # CONFIG_PARPORT is not set | 470 | # CONFIG_PARPORT is not set |
448 | CONFIG_BLK_DEV=y | 471 | CONFIG_BLK_DEV=y |
449 | # CONFIG_BLK_DEV_FD is not set | 472 | # CONFIG_BLK_DEV_FD is not set |
@@ -479,7 +502,9 @@ CONFIG_MISC_DEVICES=y | |||
479 | # | 502 | # |
480 | # CONFIG_EEPROM_AT24 is not set | 503 | # CONFIG_EEPROM_AT24 is not set |
481 | CONFIG_EEPROM_LEGACY=y | 504 | CONFIG_EEPROM_LEGACY=y |
505 | # CONFIG_EEPROM_MAX6875 is not set | ||
482 | # CONFIG_EEPROM_93CX6 is not set | 506 | # CONFIG_EEPROM_93CX6 is not set |
507 | # CONFIG_CB710_CORE is not set | ||
483 | CONFIG_HAVE_IDE=y | 508 | CONFIG_HAVE_IDE=y |
484 | # CONFIG_IDE is not set | 509 | # CONFIG_IDE is not set |
485 | 510 | ||
@@ -503,10 +528,6 @@ CONFIG_BLK_DEV_SR=y | |||
503 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 528 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
504 | CONFIG_CHR_DEV_SG=y | 529 | CONFIG_CHR_DEV_SG=y |
505 | # CONFIG_CHR_DEV_SCH is not set | 530 | # CONFIG_CHR_DEV_SCH is not set |
506 | |||
507 | # | ||
508 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
509 | # | ||
510 | CONFIG_SCSI_MULTI_LUN=y | 531 | CONFIG_SCSI_MULTI_LUN=y |
511 | # CONFIG_SCSI_CONSTANTS is not set | 532 | # CONFIG_SCSI_CONSTANTS is not set |
512 | CONFIG_SCSI_LOGGING=y | 533 | CONFIG_SCSI_LOGGING=y |
@@ -524,6 +545,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
524 | CONFIG_SCSI_LOWLEVEL=y | 545 | CONFIG_SCSI_LOWLEVEL=y |
525 | # CONFIG_ISCSI_TCP is not set | 546 | # CONFIG_ISCSI_TCP is not set |
526 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 547 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
548 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
527 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 549 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
528 | # CONFIG_SCSI_3W_9XXX is not set | 550 | # CONFIG_SCSI_3W_9XXX is not set |
529 | # CONFIG_SCSI_ACARD is not set | 551 | # CONFIG_SCSI_ACARD is not set |
@@ -532,6 +554,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
532 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 554 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
533 | # CONFIG_SCSI_AIC79XX is not set | 555 | # CONFIG_SCSI_AIC79XX is not set |
534 | # CONFIG_SCSI_AIC94XX is not set | 556 | # CONFIG_SCSI_AIC94XX is not set |
557 | # CONFIG_SCSI_MVSAS is not set | ||
535 | # CONFIG_SCSI_DPT_I2O is not set | 558 | # CONFIG_SCSI_DPT_I2O is not set |
536 | # CONFIG_SCSI_ADVANSYS is not set | 559 | # CONFIG_SCSI_ADVANSYS is not set |
537 | # CONFIG_SCSI_ARCMSR is not set | 560 | # CONFIG_SCSI_ARCMSR is not set |
@@ -551,7 +574,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
551 | # CONFIG_SCSI_IPS is not set | 574 | # CONFIG_SCSI_IPS is not set |
552 | # CONFIG_SCSI_INITIO is not set | 575 | # CONFIG_SCSI_INITIO is not set |
553 | # CONFIG_SCSI_INIA100 is not set | 576 | # CONFIG_SCSI_INIA100 is not set |
554 | # CONFIG_SCSI_MVSAS is not set | ||
555 | # CONFIG_SCSI_STEX is not set | 577 | # CONFIG_SCSI_STEX is not set |
556 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 578 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
557 | # CONFIG_SCSI_IPR is not set | 579 | # CONFIG_SCSI_IPR is not set |
@@ -635,14 +657,17 @@ CONFIG_PATA_ALI=y | |||
635 | # | 657 | # |
636 | 658 | ||
637 | # | 659 | # |
638 | # Enable only one of the two stacks, unless you know what you are doing | 660 | # You can enable one or both FireWire driver stacks. |
661 | # | ||
662 | |||
663 | # | ||
664 | # See the help texts for more information. | ||
639 | # | 665 | # |
640 | # CONFIG_FIREWIRE is not set | 666 | # CONFIG_FIREWIRE is not set |
641 | # CONFIG_IEEE1394 is not set | 667 | # CONFIG_IEEE1394 is not set |
642 | # CONFIG_I2O is not set | 668 | # CONFIG_I2O is not set |
643 | # CONFIG_MACINTOSH_DRIVERS is not set | 669 | # CONFIG_MACINTOSH_DRIVERS is not set |
644 | CONFIG_NETDEVICES=y | 670 | CONFIG_NETDEVICES=y |
645 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
646 | CONFIG_DUMMY=y | 671 | CONFIG_DUMMY=y |
647 | # CONFIG_BONDING is not set | 672 | # CONFIG_BONDING is not set |
648 | # CONFIG_MACVLAN is not set | 673 | # CONFIG_MACVLAN is not set |
@@ -689,6 +714,7 @@ CONFIG_MII=y | |||
689 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 714 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
690 | # CONFIG_NET_PCI is not set | 715 | # CONFIG_NET_PCI is not set |
691 | # CONFIG_B44 is not set | 716 | # CONFIG_B44 is not set |
717 | # CONFIG_KS8842 is not set | ||
692 | # CONFIG_ATL2 is not set | 718 | # CONFIG_ATL2 is not set |
693 | CONFIG_NETDEV_1000=y | 719 | CONFIG_NETDEV_1000=y |
694 | # CONFIG_ACENIC is not set | 720 | # CONFIG_ACENIC is not set |
@@ -708,8 +734,10 @@ CONFIG_NETDEV_1000=y | |||
708 | # CONFIG_VIA_VELOCITY is not set | 734 | # CONFIG_VIA_VELOCITY is not set |
709 | # CONFIG_TIGON3 is not set | 735 | # CONFIG_TIGON3 is not set |
710 | # CONFIG_BNX2 is not set | 736 | # CONFIG_BNX2 is not set |
737 | # CONFIG_CNIC is not set | ||
711 | CONFIG_FSL_PQ_MDIO=y | 738 | CONFIG_FSL_PQ_MDIO=y |
712 | CONFIG_GIANFAR=y | 739 | CONFIG_GIANFAR=y |
740 | # CONFIG_MV643XX_ETH is not set | ||
713 | # CONFIG_QLA3XXX is not set | 741 | # CONFIG_QLA3XXX is not set |
714 | # CONFIG_ATL1 is not set | 742 | # CONFIG_ATL1 is not set |
715 | # CONFIG_ATL1E is not set | 743 | # CONFIG_ATL1E is not set |
@@ -909,13 +937,17 @@ CONFIG_I2C_MPC=y | |||
909 | # CONFIG_SENSORS_PCF8574 is not set | 937 | # CONFIG_SENSORS_PCF8574 is not set |
910 | # CONFIG_PCF8575 is not set | 938 | # CONFIG_PCF8575 is not set |
911 | # CONFIG_SENSORS_PCA9539 is not set | 939 | # CONFIG_SENSORS_PCA9539 is not set |
912 | # CONFIG_SENSORS_MAX6875 is not set | ||
913 | # CONFIG_SENSORS_TSL2550 is not set | 940 | # CONFIG_SENSORS_TSL2550 is not set |
914 | # CONFIG_I2C_DEBUG_CORE is not set | 941 | # CONFIG_I2C_DEBUG_CORE is not set |
915 | # CONFIG_I2C_DEBUG_ALGO is not set | 942 | # CONFIG_I2C_DEBUG_ALGO is not set |
916 | # CONFIG_I2C_DEBUG_BUS is not set | 943 | # CONFIG_I2C_DEBUG_BUS is not set |
917 | # CONFIG_I2C_DEBUG_CHIP is not set | 944 | # CONFIG_I2C_DEBUG_CHIP is not set |
918 | # CONFIG_SPI is not set | 945 | # CONFIG_SPI is not set |
946 | |||
947 | # | ||
948 | # PPS support | ||
949 | # | ||
950 | # CONFIG_PPS is not set | ||
919 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 951 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
920 | # CONFIG_GPIOLIB is not set | 952 | # CONFIG_GPIOLIB is not set |
921 | # CONFIG_W1 is not set | 953 | # CONFIG_W1 is not set |
@@ -943,76 +975,9 @@ CONFIG_SSB_POSSIBLE=y | |||
943 | # CONFIG_MFD_WM8400 is not set | 975 | # CONFIG_MFD_WM8400 is not set |
944 | # CONFIG_MFD_WM8350_I2C is not set | 976 | # CONFIG_MFD_WM8350_I2C is not set |
945 | # CONFIG_MFD_PCF50633 is not set | 977 | # CONFIG_MFD_PCF50633 is not set |
978 | # CONFIG_AB3100_CORE is not set | ||
946 | # CONFIG_REGULATOR is not set | 979 | # CONFIG_REGULATOR is not set |
947 | 980 | # CONFIG_MEDIA_SUPPORT is not set | |
948 | # | ||
949 | # Multimedia devices | ||
950 | # | ||
951 | |||
952 | # | ||
953 | # Multimedia core support | ||
954 | # | ||
955 | # CONFIG_VIDEO_DEV is not set | ||
956 | CONFIG_DVB_CORE=m | ||
957 | CONFIG_VIDEO_MEDIA=m | ||
958 | |||
959 | # | ||
960 | # Multimedia drivers | ||
961 | # | ||
962 | # CONFIG_MEDIA_ATTACH is not set | ||
963 | CONFIG_MEDIA_TUNER=m | ||
964 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
965 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
966 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
967 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
968 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
969 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
970 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
971 | CONFIG_MEDIA_TUNER_XC2028=m | ||
972 | CONFIG_MEDIA_TUNER_XC5000=m | ||
973 | CONFIG_MEDIA_TUNER_MC44S803=m | ||
974 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
975 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
976 | |||
977 | # | ||
978 | # Supported SAA7146 based PCI Adapters | ||
979 | # | ||
980 | # CONFIG_TTPCI_EEPROM is not set | ||
981 | # CONFIG_DVB_BUDGET_CORE is not set | ||
982 | |||
983 | # | ||
984 | # Supported USB Adapters | ||
985 | # | ||
986 | # CONFIG_DVB_USB is not set | ||
987 | # CONFIG_DVB_TTUSB_BUDGET is not set | ||
988 | # CONFIG_DVB_TTUSB_DEC is not set | ||
989 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
990 | |||
991 | # | ||
992 | # Supported FlexCopII (B2C2) Adapters | ||
993 | # | ||
994 | # CONFIG_DVB_B2C2_FLEXCOP is not set | ||
995 | |||
996 | # | ||
997 | # Supported BT878 Adapters | ||
998 | # | ||
999 | |||
1000 | # | ||
1001 | # Supported Pluto2 Adapters | ||
1002 | # | ||
1003 | # CONFIG_DVB_PLUTO2 is not set | ||
1004 | |||
1005 | # | ||
1006 | # Supported SDMC DM1105 Adapters | ||
1007 | # | ||
1008 | # CONFIG_DVB_DM1105 is not set | ||
1009 | |||
1010 | # | ||
1011 | # Supported DVB Frontends | ||
1012 | # | ||
1013 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
1014 | CONFIG_DAB=y | ||
1015 | # CONFIG_USB_DABUSB is not set | ||
1016 | 981 | ||
1017 | # | 982 | # |
1018 | # Graphics support | 983 | # Graphics support |
@@ -1052,6 +1017,11 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1052 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1017 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1053 | # CONFIG_SND_DEBUG is not set | 1018 | # CONFIG_SND_DEBUG is not set |
1054 | CONFIG_SND_VMASTER=y | 1019 | CONFIG_SND_VMASTER=y |
1020 | # CONFIG_SND_RAWMIDI_SEQ is not set | ||
1021 | # CONFIG_SND_OPL3_LIB_SEQ is not set | ||
1022 | # CONFIG_SND_OPL4_LIB_SEQ is not set | ||
1023 | # CONFIG_SND_SBAWE_SEQ is not set | ||
1024 | # CONFIG_SND_EMU10K1_SEQ is not set | ||
1055 | CONFIG_SND_AC97_CODEC=y | 1025 | CONFIG_SND_AC97_CODEC=y |
1056 | CONFIG_SND_DRIVERS=y | 1026 | CONFIG_SND_DRIVERS=y |
1057 | # CONFIG_SND_DUMMY is not set | 1027 | # CONFIG_SND_DUMMY is not set |
@@ -1078,6 +1048,7 @@ CONFIG_SND_PCI=y | |||
1078 | # CONFIG_SND_CS4281 is not set | 1048 | # CONFIG_SND_CS4281 is not set |
1079 | # CONFIG_SND_CS46XX is not set | 1049 | # CONFIG_SND_CS46XX is not set |
1080 | # CONFIG_SND_CS5530 is not set | 1050 | # CONFIG_SND_CS5530 is not set |
1051 | # CONFIG_SND_CTXFI is not set | ||
1081 | # CONFIG_SND_DARLA20 is not set | 1052 | # CONFIG_SND_DARLA20 is not set |
1082 | # CONFIG_SND_GINA20 is not set | 1053 | # CONFIG_SND_GINA20 is not set |
1083 | # CONFIG_SND_LAYLA20 is not set | 1054 | # CONFIG_SND_LAYLA20 is not set |
@@ -1108,6 +1079,7 @@ CONFIG_SND_PCI=y | |||
1108 | CONFIG_SND_INTEL8X0=y | 1079 | CONFIG_SND_INTEL8X0=y |
1109 | # CONFIG_SND_INTEL8X0M is not set | 1080 | # CONFIG_SND_INTEL8X0M is not set |
1110 | # CONFIG_SND_KORG1212 is not set | 1081 | # CONFIG_SND_KORG1212 is not set |
1082 | # CONFIG_SND_LX6464ES is not set | ||
1111 | # CONFIG_SND_MAESTRO3 is not set | 1083 | # CONFIG_SND_MAESTRO3 is not set |
1112 | # CONFIG_SND_MIXART is not set | 1084 | # CONFIG_SND_MIXART is not set |
1113 | # CONFIG_SND_NM256 is not set | 1085 | # CONFIG_SND_NM256 is not set |
@@ -1152,7 +1124,7 @@ CONFIG_HID_BELKIN=y | |||
1152 | CONFIG_HID_CHERRY=y | 1124 | CONFIG_HID_CHERRY=y |
1153 | CONFIG_HID_CHICONY=y | 1125 | CONFIG_HID_CHICONY=y |
1154 | CONFIG_HID_CYPRESS=y | 1126 | CONFIG_HID_CYPRESS=y |
1155 | # CONFIG_DRAGONRISE_FF is not set | 1127 | # CONFIG_HID_DRAGONRISE is not set |
1156 | CONFIG_HID_EZKEY=y | 1128 | CONFIG_HID_EZKEY=y |
1157 | # CONFIG_HID_KYE is not set | 1129 | # CONFIG_HID_KYE is not set |
1158 | CONFIG_HID_GYRATION=y | 1130 | CONFIG_HID_GYRATION=y |
@@ -1169,10 +1141,11 @@ CONFIG_HID_PETALYNX=y | |||
1169 | CONFIG_HID_SAMSUNG=y | 1141 | CONFIG_HID_SAMSUNG=y |
1170 | CONFIG_HID_SONY=y | 1142 | CONFIG_HID_SONY=y |
1171 | CONFIG_HID_SUNPLUS=y | 1143 | CONFIG_HID_SUNPLUS=y |
1172 | # CONFIG_GREENASIA_FF is not set | 1144 | # CONFIG_HID_GREENASIA is not set |
1145 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1173 | # CONFIG_HID_TOPSEED is not set | 1146 | # CONFIG_HID_TOPSEED is not set |
1174 | CONFIG_THRUSTMASTER_FF=m | 1147 | # CONFIG_HID_THRUSTMASTER is not set |
1175 | CONFIG_ZEROPLUS_FF=m | 1148 | # CONFIG_HID_ZEROPLUS is not set |
1176 | CONFIG_USB_SUPPORT=y | 1149 | CONFIG_USB_SUPPORT=y |
1177 | CONFIG_USB_ARCH_HAS_HCD=y | 1150 | CONFIG_USB_ARCH_HAS_HCD=y |
1178 | CONFIG_USB_ARCH_HAS_OHCI=y | 1151 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1198,6 +1171,7 @@ CONFIG_USB_MON=y | |||
1198 | # USB Host Controller Drivers | 1171 | # USB Host Controller Drivers |
1199 | # | 1172 | # |
1200 | # CONFIG_USB_C67X00_HCD is not set | 1173 | # CONFIG_USB_C67X00_HCD is not set |
1174 | # CONFIG_USB_XHCI_HCD is not set | ||
1201 | CONFIG_USB_EHCI_HCD=y | 1175 | CONFIG_USB_EHCI_HCD=y |
1202 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1176 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1203 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1177 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1207,9 +1181,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1207 | # CONFIG_USB_ISP116X_HCD is not set | 1181 | # CONFIG_USB_ISP116X_HCD is not set |
1208 | # CONFIG_USB_ISP1760_HCD is not set | 1182 | # CONFIG_USB_ISP1760_HCD is not set |
1209 | CONFIG_USB_OHCI_HCD=y | 1183 | CONFIG_USB_OHCI_HCD=y |
1210 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1211 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1184 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1212 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 1185 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
1186 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1213 | CONFIG_USB_OHCI_HCD_PCI=y | 1187 | CONFIG_USB_OHCI_HCD_PCI=y |
1214 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1188 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1215 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1189 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1329,6 +1303,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1329 | # CONFIG_RTC_DRV_S35390A is not set | 1303 | # CONFIG_RTC_DRV_S35390A is not set |
1330 | # CONFIG_RTC_DRV_FM3130 is not set | 1304 | # CONFIG_RTC_DRV_FM3130 is not set |
1331 | # CONFIG_RTC_DRV_RX8581 is not set | 1305 | # CONFIG_RTC_DRV_RX8581 is not set |
1306 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1332 | 1307 | ||
1333 | # | 1308 | # |
1334 | # SPI RTC drivers | 1309 | # SPI RTC drivers |
@@ -1356,6 +1331,10 @@ CONFIG_RTC_DRV_CMOS=y | |||
1356 | # CONFIG_DMADEVICES is not set | 1331 | # CONFIG_DMADEVICES is not set |
1357 | # CONFIG_AUXDISPLAY is not set | 1332 | # CONFIG_AUXDISPLAY is not set |
1358 | # CONFIG_UIO is not set | 1333 | # CONFIG_UIO is not set |
1334 | |||
1335 | # | ||
1336 | # TI VLYNQ | ||
1337 | # | ||
1359 | # CONFIG_STAGING is not set | 1338 | # CONFIG_STAGING is not set |
1360 | 1339 | ||
1361 | # | 1340 | # |
@@ -1375,11 +1354,12 @@ CONFIG_FS_MBCACHE=y | |||
1375 | # CONFIG_REISERFS_FS is not set | 1354 | # CONFIG_REISERFS_FS is not set |
1376 | # CONFIG_JFS_FS is not set | 1355 | # CONFIG_JFS_FS is not set |
1377 | # CONFIG_FS_POSIX_ACL is not set | 1356 | # CONFIG_FS_POSIX_ACL is not set |
1378 | CONFIG_FILE_LOCKING=y | ||
1379 | # CONFIG_XFS_FS is not set | 1357 | # CONFIG_XFS_FS is not set |
1380 | # CONFIG_GFS2_FS is not set | 1358 | # CONFIG_GFS2_FS is not set |
1381 | # CONFIG_OCFS2_FS is not set | 1359 | # CONFIG_OCFS2_FS is not set |
1382 | # CONFIG_BTRFS_FS is not set | 1360 | # CONFIG_BTRFS_FS is not set |
1361 | CONFIG_FILE_LOCKING=y | ||
1362 | CONFIG_FSNOTIFY=y | ||
1383 | CONFIG_DNOTIFY=y | 1363 | CONFIG_DNOTIFY=y |
1384 | CONFIG_INOTIFY=y | 1364 | CONFIG_INOTIFY=y |
1385 | CONFIG_INOTIFY_USER=y | 1365 | CONFIG_INOTIFY_USER=y |
@@ -1454,6 +1434,7 @@ CONFIG_NFS_FS=y | |||
1454 | CONFIG_NFS_V3=y | 1434 | CONFIG_NFS_V3=y |
1455 | # CONFIG_NFS_V3_ACL is not set | 1435 | # CONFIG_NFS_V3_ACL is not set |
1456 | CONFIG_NFS_V4=y | 1436 | CONFIG_NFS_V4=y |
1437 | # CONFIG_NFS_V4_1 is not set | ||
1457 | CONFIG_ROOT_NFS=y | 1438 | CONFIG_ROOT_NFS=y |
1458 | CONFIG_NFSD=y | 1439 | CONFIG_NFSD=y |
1459 | # CONFIG_NFSD_V3 is not set | 1440 | # CONFIG_NFSD_V3 is not set |
@@ -1555,6 +1536,7 @@ CONFIG_HAS_IOPORT=y | |||
1555 | CONFIG_HAS_DMA=y | 1536 | CONFIG_HAS_DMA=y |
1556 | CONFIG_HAVE_LMB=y | 1537 | CONFIG_HAVE_LMB=y |
1557 | CONFIG_NLATTR=y | 1538 | CONFIG_NLATTR=y |
1539 | CONFIG_GENERIC_ATOMIC64=y | ||
1558 | 1540 | ||
1559 | # | 1541 | # |
1560 | # Kernel hacking | 1542 | # Kernel hacking |
@@ -1585,6 +1567,9 @@ CONFIG_SCHED_DEBUG=y | |||
1585 | # CONFIG_RT_MUTEX_TESTER is not set | 1567 | # CONFIG_RT_MUTEX_TESTER is not set |
1586 | # CONFIG_DEBUG_SPINLOCK is not set | 1568 | # CONFIG_DEBUG_SPINLOCK is not set |
1587 | # CONFIG_DEBUG_MUTEXES is not set | 1569 | # CONFIG_DEBUG_MUTEXES is not set |
1570 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1571 | # CONFIG_PROVE_LOCKING is not set | ||
1572 | # CONFIG_LOCK_STAT is not set | ||
1588 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1573 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1589 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1574 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1590 | # CONFIG_DEBUG_KOBJECT is not set | 1575 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1597,7 +1582,6 @@ CONFIG_DEBUG_INFO=y | |||
1597 | # CONFIG_DEBUG_LIST is not set | 1582 | # CONFIG_DEBUG_LIST is not set |
1598 | # CONFIG_DEBUG_SG is not set | 1583 | # CONFIG_DEBUG_SG is not set |
1599 | # CONFIG_DEBUG_NOTIFIERS is not set | 1584 | # CONFIG_DEBUG_NOTIFIERS is not set |
1600 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1601 | # CONFIG_RCU_TORTURE_TEST is not set | 1585 | # CONFIG_RCU_TORTURE_TEST is not set |
1602 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1586 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1603 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1587 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1611,16 +1595,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1611 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1595 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1612 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1596 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1613 | CONFIG_TRACING_SUPPORT=y | 1597 | CONFIG_TRACING_SUPPORT=y |
1614 | 1598 | CONFIG_FTRACE=y | |
1615 | # | ||
1616 | # Tracers | ||
1617 | # | ||
1618 | # CONFIG_FUNCTION_TRACER is not set | 1599 | # CONFIG_FUNCTION_TRACER is not set |
1600 | # CONFIG_IRQSOFF_TRACER is not set | ||
1619 | # CONFIG_SCHED_TRACER is not set | 1601 | # CONFIG_SCHED_TRACER is not set |
1620 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1602 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1621 | # CONFIG_EVENT_TRACER is not set | ||
1622 | # CONFIG_BOOT_TRACER is not set | 1603 | # CONFIG_BOOT_TRACER is not set |
1623 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1604 | CONFIG_BRANCH_PROFILE_NONE=y |
1605 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1606 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1624 | # CONFIG_STACK_TRACER is not set | 1607 | # CONFIG_STACK_TRACER is not set |
1625 | # CONFIG_KMEMTRACE is not set | 1608 | # CONFIG_KMEMTRACE is not set |
1626 | # CONFIG_WORKQUEUE_TRACER is not set | 1609 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1628,6 +1611,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1628 | # CONFIG_SAMPLES is not set | 1611 | # CONFIG_SAMPLES is not set |
1629 | CONFIG_HAVE_ARCH_KGDB=y | 1612 | CONFIG_HAVE_ARCH_KGDB=y |
1630 | # CONFIG_KGDB is not set | 1613 | # CONFIG_KGDB is not set |
1614 | # CONFIG_KMEMCHECK is not set | ||
1615 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1616 | CONFIG_PPC_WERROR=y | ||
1631 | CONFIG_PRINT_STACK_DEPTH=64 | 1617 | CONFIG_PRINT_STACK_DEPTH=64 |
1632 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1618 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1633 | # CONFIG_DEBUG_STACK_USAGE is not set | 1619 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig index c30a0c715873..f5ca2e0cd402 100644 --- a/arch/powerpc/configs/86xx/sbc8641d_defconfig +++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:27 2009 | 4 | # Wed Jul 29 23:32:26 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_PHYS_64BIT is not set | 20 | # CONFIG_PHYS_64BIT is not set |
20 | CONFIG_ALTIVEC=y | 21 | CONFIG_ALTIVEC=y |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | CONFIG_SMP=y | 26 | CONFIG_SMP=y |
25 | CONFIG_NR_CPUS=2 | 27 | CONFIG_NR_CPUS=2 |
26 | CONFIG_PPC32=y | 28 | CONFIG_PPC32=y |
@@ -32,16 +34,17 @@ CONFIG_GENERIC_TIME=y | |||
32 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
33 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
34 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
39 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
41 | CONFIG_GENERIC_LOCKBREAK=y | 45 | CONFIG_GENERIC_LOCKBREAK=y |
42 | CONFIG_ARCH_HAS_ILOG2_U32=y | 46 | CONFIG_ARCH_HAS_ILOG2_U32=y |
43 | CONFIG_GENERIC_HWEIGHT=y | 47 | CONFIG_GENERIC_HWEIGHT=y |
44 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 48 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
46 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
47 | CONFIG_PPC=y | 50 | CONFIG_PPC=y |
@@ -55,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
55 | CONFIG_GENERIC_TBSYNC=y | 58 | CONFIG_GENERIC_TBSYNC=y |
56 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
57 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
58 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
59 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
60 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
61 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
63 | 68 | ||
64 | # | 69 | # |
65 | # General setup | 70 | # General setup |
@@ -113,7 +118,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
113 | CONFIG_KALLSYMS=y | 118 | CONFIG_KALLSYMS=y |
114 | # CONFIG_KALLSYMS_ALL is not set | 119 | # CONFIG_KALLSYMS_ALL is not set |
115 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 120 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
116 | # CONFIG_STRIP_ASM_SYMS is not set | ||
117 | CONFIG_HOTPLUG=y | 121 | CONFIG_HOTPLUG=y |
118 | CONFIG_PRINTK=y | 122 | CONFIG_PRINTK=y |
119 | CONFIG_BUG=y | 123 | CONFIG_BUG=y |
@@ -126,8 +130,15 @@ CONFIG_TIMERFD=y | |||
126 | CONFIG_EVENTFD=y | 130 | CONFIG_EVENTFD=y |
127 | CONFIG_SHMEM=y | 131 | CONFIG_SHMEM=y |
128 | CONFIG_AIO=y | 132 | CONFIG_AIO=y |
133 | CONFIG_HAVE_PERF_COUNTERS=y | ||
134 | |||
135 | # | ||
136 | # Performance Counters | ||
137 | # | ||
138 | # CONFIG_PERF_COUNTERS is not set | ||
129 | CONFIG_VM_EVENT_COUNTERS=y | 139 | CONFIG_VM_EVENT_COUNTERS=y |
130 | CONFIG_PCI_QUIRKS=y | 140 | CONFIG_PCI_QUIRKS=y |
141 | # CONFIG_STRIP_ASM_SYMS is not set | ||
131 | CONFIG_COMPAT_BRK=y | 142 | CONFIG_COMPAT_BRK=y |
132 | CONFIG_SLAB=y | 143 | CONFIG_SLAB=y |
133 | # CONFIG_SLUB is not set | 144 | # CONFIG_SLUB is not set |
@@ -142,6 +153,11 @@ CONFIG_HAVE_KPROBES=y | |||
142 | CONFIG_HAVE_KRETPROBES=y | 153 | CONFIG_HAVE_KRETPROBES=y |
143 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
144 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 155 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
156 | |||
157 | # | ||
158 | # GCOV-based kernel profiling | ||
159 | # | ||
160 | # CONFIG_GCOV_KERNEL is not set | ||
145 | # CONFIG_SLOW_WORK is not set | 161 | # CONFIG_SLOW_WORK is not set |
146 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 162 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
147 | CONFIG_SLABINFO=y | 163 | CONFIG_SLABINFO=y |
@@ -155,7 +171,7 @@ CONFIG_MODULE_UNLOAD=y | |||
155 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 171 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
156 | CONFIG_STOP_MACHINE=y | 172 | CONFIG_STOP_MACHINE=y |
157 | CONFIG_BLOCK=y | 173 | CONFIG_BLOCK=y |
158 | # CONFIG_LBD is not set | 174 | CONFIG_LBDAF=y |
159 | # CONFIG_BLK_DEV_BSG is not set | 175 | # CONFIG_BLK_DEV_BSG is not set |
160 | # CONFIG_BLK_DEV_INTEGRITY is not set | 176 | # CONFIG_BLK_DEV_INTEGRITY is not set |
161 | 177 | ||
@@ -234,6 +250,7 @@ CONFIG_BINFMT_ELF=y | |||
234 | # CONFIG_HAVE_AOUT is not set | 250 | # CONFIG_HAVE_AOUT is not set |
235 | CONFIG_BINFMT_MISC=m | 251 | CONFIG_BINFMT_MISC=m |
236 | # CONFIG_IOMMU_HELPER is not set | 252 | # CONFIG_IOMMU_HELPER is not set |
253 | # CONFIG_SWIOTLB is not set | ||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 254 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
238 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 255 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -255,9 +272,9 @@ CONFIG_MIGRATION=y | |||
255 | CONFIG_ZONE_DMA_FLAG=1 | 272 | CONFIG_ZONE_DMA_FLAG=1 |
256 | CONFIG_BOUNCE=y | 273 | CONFIG_BOUNCE=y |
257 | CONFIG_VIRT_TO_BUS=y | 274 | CONFIG_VIRT_TO_BUS=y |
258 | CONFIG_UNEVICTABLE_LRU=y | ||
259 | CONFIG_HAVE_MLOCK=y | 275 | CONFIG_HAVE_MLOCK=y |
260 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 276 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
277 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
261 | CONFIG_PPC_4K_PAGES=y | 278 | CONFIG_PPC_4K_PAGES=y |
262 | # CONFIG_PPC_16K_PAGES is not set | 279 | # CONFIG_PPC_16K_PAGES is not set |
263 | # CONFIG_PPC_64K_PAGES is not set | 280 | # CONFIG_PPC_64K_PAGES is not set |
@@ -284,6 +301,8 @@ CONFIG_PCI_DOMAINS=y | |||
284 | CONFIG_PCI_SYSCALL=y | 301 | CONFIG_PCI_SYSCALL=y |
285 | CONFIG_PCIEPORTBUS=y | 302 | CONFIG_PCIEPORTBUS=y |
286 | CONFIG_PCIEAER=y | 303 | CONFIG_PCIEAER=y |
304 | # CONFIG_PCIE_ECRC is not set | ||
305 | # CONFIG_PCIEAER_INJECT is not set | ||
287 | # CONFIG_PCIEASPM is not set | 306 | # CONFIG_PCIEASPM is not set |
288 | CONFIG_ARCH_SUPPORTS_MSI=y | 307 | CONFIG_ARCH_SUPPORTS_MSI=y |
289 | # CONFIG_PCI_MSI is not set | 308 | # CONFIG_PCI_MSI is not set |
@@ -508,6 +527,7 @@ CONFIG_LLC=m | |||
508 | # CONFIG_ECONET is not set | 527 | # CONFIG_ECONET is not set |
509 | CONFIG_WAN_ROUTER=m | 528 | CONFIG_WAN_ROUTER=m |
510 | # CONFIG_PHONET is not set | 529 | # CONFIG_PHONET is not set |
530 | # CONFIG_IEEE802154 is not set | ||
511 | CONFIG_NET_SCHED=y | 531 | CONFIG_NET_SCHED=y |
512 | 532 | ||
513 | # | 533 | # |
@@ -564,7 +584,11 @@ CONFIG_WIRELESS=y | |||
564 | CONFIG_WIRELESS_OLD_REGULATORY=y | 584 | CONFIG_WIRELESS_OLD_REGULATORY=y |
565 | # CONFIG_WIRELESS_EXT is not set | 585 | # CONFIG_WIRELESS_EXT is not set |
566 | # CONFIG_LIB80211 is not set | 586 | # CONFIG_LIB80211 is not set |
567 | # CONFIG_MAC80211 is not set | 587 | |
588 | # | ||
589 | # CFG80211 needs to be enabled for MAC80211 | ||
590 | # | ||
591 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
568 | # CONFIG_WIMAX is not set | 592 | # CONFIG_WIMAX is not set |
569 | # CONFIG_RFKILL is not set | 593 | # CONFIG_RFKILL is not set |
570 | # CONFIG_NET_9P is not set | 594 | # CONFIG_NET_9P is not set |
@@ -675,6 +699,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
675 | # CONFIG_MTD_UBI is not set | 699 | # CONFIG_MTD_UBI is not set |
676 | CONFIG_OF_DEVICE=y | 700 | CONFIG_OF_DEVICE=y |
677 | CONFIG_OF_I2C=y | 701 | CONFIG_OF_I2C=y |
702 | CONFIG_OF_MDIO=y | ||
678 | # CONFIG_PARPORT is not set | 703 | # CONFIG_PARPORT is not set |
679 | CONFIG_BLK_DEV=y | 704 | CONFIG_BLK_DEV=y |
680 | # CONFIG_BLK_DEV_FD is not set | 705 | # CONFIG_BLK_DEV_FD is not set |
@@ -709,7 +734,9 @@ CONFIG_MISC_DEVICES=y | |||
709 | # | 734 | # |
710 | # CONFIG_EEPROM_AT24 is not set | 735 | # CONFIG_EEPROM_AT24 is not set |
711 | # CONFIG_EEPROM_LEGACY is not set | 736 | # CONFIG_EEPROM_LEGACY is not set |
737 | # CONFIG_EEPROM_MAX6875 is not set | ||
712 | # CONFIG_EEPROM_93CX6 is not set | 738 | # CONFIG_EEPROM_93CX6 is not set |
739 | # CONFIG_CB710_CORE is not set | ||
713 | CONFIG_HAVE_IDE=y | 740 | CONFIG_HAVE_IDE=y |
714 | # CONFIG_IDE is not set | 741 | # CONFIG_IDE is not set |
715 | 742 | ||
@@ -736,6 +763,7 @@ CONFIG_BLK_DEV_DM=y | |||
736 | CONFIG_DM_CRYPT=y | 763 | CONFIG_DM_CRYPT=y |
737 | CONFIG_DM_SNAPSHOT=y | 764 | CONFIG_DM_SNAPSHOT=y |
738 | CONFIG_DM_MIRROR=y | 765 | CONFIG_DM_MIRROR=y |
766 | # CONFIG_DM_LOG_USERSPACE is not set | ||
739 | CONFIG_DM_ZERO=y | 767 | CONFIG_DM_ZERO=y |
740 | # CONFIG_DM_MULTIPATH is not set | 768 | # CONFIG_DM_MULTIPATH is not set |
741 | # CONFIG_DM_DELAY is not set | 769 | # CONFIG_DM_DELAY is not set |
@@ -747,14 +775,17 @@ CONFIG_DM_ZERO=y | |||
747 | # | 775 | # |
748 | 776 | ||
749 | # | 777 | # |
750 | # Enable only one of the two stacks, unless you know what you are doing | 778 | # You can enable one or both FireWire driver stacks. |
779 | # | ||
780 | |||
781 | # | ||
782 | # See the help texts for more information. | ||
751 | # | 783 | # |
752 | # CONFIG_FIREWIRE is not set | 784 | # CONFIG_FIREWIRE is not set |
753 | # CONFIG_IEEE1394 is not set | 785 | # CONFIG_IEEE1394 is not set |
754 | # CONFIG_I2O is not set | 786 | # CONFIG_I2O is not set |
755 | # CONFIG_MACINTOSH_DRIVERS is not set | 787 | # CONFIG_MACINTOSH_DRIVERS is not set |
756 | CONFIG_NETDEVICES=y | 788 | CONFIG_NETDEVICES=y |
757 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
758 | CONFIG_DUMMY=m | 789 | CONFIG_DUMMY=m |
759 | CONFIG_BONDING=m | 790 | CONFIG_BONDING=m |
760 | # CONFIG_MACVLAN is not set | 791 | # CONFIG_MACVLAN is not set |
@@ -801,6 +832,7 @@ CONFIG_MII=y | |||
801 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 832 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
802 | # CONFIG_NET_PCI is not set | 833 | # CONFIG_NET_PCI is not set |
803 | # CONFIG_B44 is not set | 834 | # CONFIG_B44 is not set |
835 | # CONFIG_KS8842 is not set | ||
804 | # CONFIG_ATL2 is not set | 836 | # CONFIG_ATL2 is not set |
805 | CONFIG_NETDEV_1000=y | 837 | CONFIG_NETDEV_1000=y |
806 | # CONFIG_ACENIC is not set | 838 | # CONFIG_ACENIC is not set |
@@ -820,8 +852,10 @@ CONFIG_NETDEV_1000=y | |||
820 | # CONFIG_VIA_VELOCITY is not set | 852 | # CONFIG_VIA_VELOCITY is not set |
821 | # CONFIG_TIGON3 is not set | 853 | # CONFIG_TIGON3 is not set |
822 | # CONFIG_BNX2 is not set | 854 | # CONFIG_BNX2 is not set |
855 | # CONFIG_CNIC is not set | ||
823 | CONFIG_FSL_PQ_MDIO=y | 856 | CONFIG_FSL_PQ_MDIO=y |
824 | CONFIG_GIANFAR=y | 857 | CONFIG_GIANFAR=y |
858 | # CONFIG_MV643XX_ETH is not set | ||
825 | # CONFIG_QLA3XXX is not set | 859 | # CONFIG_QLA3XXX is not set |
826 | # CONFIG_ATL1 is not set | 860 | # CONFIG_ATL1 is not set |
827 | # CONFIG_ATL1E is not set | 861 | # CONFIG_ATL1E is not set |
@@ -1018,13 +1052,17 @@ CONFIG_I2C_MPC=y | |||
1018 | # CONFIG_SENSORS_PCF8574 is not set | 1052 | # CONFIG_SENSORS_PCF8574 is not set |
1019 | # CONFIG_PCF8575 is not set | 1053 | # CONFIG_PCF8575 is not set |
1020 | # CONFIG_SENSORS_PCA9539 is not set | 1054 | # CONFIG_SENSORS_PCA9539 is not set |
1021 | # CONFIG_SENSORS_MAX6875 is not set | ||
1022 | # CONFIG_SENSORS_TSL2550 is not set | 1055 | # CONFIG_SENSORS_TSL2550 is not set |
1023 | # CONFIG_I2C_DEBUG_CORE is not set | 1056 | # CONFIG_I2C_DEBUG_CORE is not set |
1024 | # CONFIG_I2C_DEBUG_ALGO is not set | 1057 | # CONFIG_I2C_DEBUG_ALGO is not set |
1025 | # CONFIG_I2C_DEBUG_BUS is not set | 1058 | # CONFIG_I2C_DEBUG_BUS is not set |
1026 | # CONFIG_I2C_DEBUG_CHIP is not set | 1059 | # CONFIG_I2C_DEBUG_CHIP is not set |
1027 | # CONFIG_SPI is not set | 1060 | # CONFIG_SPI is not set |
1061 | |||
1062 | # | ||
1063 | # PPS support | ||
1064 | # | ||
1065 | # CONFIG_PPS is not set | ||
1028 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1066 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
1029 | # CONFIG_GPIOLIB is not set | 1067 | # CONFIG_GPIOLIB is not set |
1030 | # CONFIG_W1 is not set | 1068 | # CONFIG_W1 is not set |
@@ -1079,6 +1117,7 @@ CONFIG_HWMON=y | |||
1079 | # CONFIG_SENSORS_SMSC47B397 is not set | 1117 | # CONFIG_SENSORS_SMSC47B397 is not set |
1080 | # CONFIG_SENSORS_ADS7828 is not set | 1118 | # CONFIG_SENSORS_ADS7828 is not set |
1081 | # CONFIG_SENSORS_THMC50 is not set | 1119 | # CONFIG_SENSORS_THMC50 is not set |
1120 | # CONFIG_SENSORS_TMP401 is not set | ||
1082 | # CONFIG_SENSORS_VIA686A is not set | 1121 | # CONFIG_SENSORS_VIA686A is not set |
1083 | # CONFIG_SENSORS_VT1211 is not set | 1122 | # CONFIG_SENSORS_VT1211 is not set |
1084 | # CONFIG_SENSORS_VT8231 is not set | 1123 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1127,23 +1166,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1127 | # CONFIG_MFD_WM8400 is not set | 1166 | # CONFIG_MFD_WM8400 is not set |
1128 | # CONFIG_MFD_WM8350_I2C is not set | 1167 | # CONFIG_MFD_WM8350_I2C is not set |
1129 | # CONFIG_MFD_PCF50633 is not set | 1168 | # CONFIG_MFD_PCF50633 is not set |
1169 | # CONFIG_AB3100_CORE is not set | ||
1130 | # CONFIG_REGULATOR is not set | 1170 | # CONFIG_REGULATOR is not set |
1131 | 1171 | # CONFIG_MEDIA_SUPPORT is not set | |
1132 | # | ||
1133 | # Multimedia devices | ||
1134 | # | ||
1135 | |||
1136 | # | ||
1137 | # Multimedia core support | ||
1138 | # | ||
1139 | # CONFIG_VIDEO_DEV is not set | ||
1140 | # CONFIG_DVB_CORE is not set | ||
1141 | # CONFIG_VIDEO_MEDIA is not set | ||
1142 | |||
1143 | # | ||
1144 | # Multimedia drivers | ||
1145 | # | ||
1146 | CONFIG_DAB=y | ||
1147 | 1172 | ||
1148 | # | 1173 | # |
1149 | # Graphics support | 1174 | # Graphics support |
@@ -1207,6 +1232,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1207 | # CONFIG_DMADEVICES is not set | 1232 | # CONFIG_DMADEVICES is not set |
1208 | # CONFIG_AUXDISPLAY is not set | 1233 | # CONFIG_AUXDISPLAY is not set |
1209 | # CONFIG_UIO is not set | 1234 | # CONFIG_UIO is not set |
1235 | |||
1236 | # | ||
1237 | # TI VLYNQ | ||
1238 | # | ||
1210 | # CONFIG_STAGING is not set | 1239 | # CONFIG_STAGING is not set |
1211 | 1240 | ||
1212 | # | 1241 | # |
@@ -1236,8 +1265,8 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
1236 | # CONFIG_REISERFS_FS_SECURITY is not set | 1265 | # CONFIG_REISERFS_FS_SECURITY is not set |
1237 | # CONFIG_JFS_FS is not set | 1266 | # CONFIG_JFS_FS is not set |
1238 | CONFIG_FS_POSIX_ACL=y | 1267 | CONFIG_FS_POSIX_ACL=y |
1239 | CONFIG_FILE_LOCKING=y | ||
1240 | # CONFIG_XFS_FS is not set | 1268 | # CONFIG_XFS_FS is not set |
1269 | # CONFIG_GFS2_FS is not set | ||
1241 | CONFIG_OCFS2_FS=m | 1270 | CONFIG_OCFS2_FS=m |
1242 | CONFIG_OCFS2_FS_O2CB=m | 1271 | CONFIG_OCFS2_FS_O2CB=m |
1243 | CONFIG_OCFS2_FS_STATS=y | 1272 | CONFIG_OCFS2_FS_STATS=y |
@@ -1245,6 +1274,8 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y | |||
1245 | # CONFIG_OCFS2_DEBUG_FS is not set | 1274 | # CONFIG_OCFS2_DEBUG_FS is not set |
1246 | # CONFIG_OCFS2_FS_POSIX_ACL is not set | 1275 | # CONFIG_OCFS2_FS_POSIX_ACL is not set |
1247 | # CONFIG_BTRFS_FS is not set | 1276 | # CONFIG_BTRFS_FS is not set |
1277 | CONFIG_FILE_LOCKING=y | ||
1278 | CONFIG_FSNOTIFY=y | ||
1248 | CONFIG_DNOTIFY=y | 1279 | CONFIG_DNOTIFY=y |
1249 | CONFIG_INOTIFY=y | 1280 | CONFIG_INOTIFY=y |
1250 | CONFIG_INOTIFY_USER=y | 1281 | CONFIG_INOTIFY_USER=y |
@@ -1318,6 +1349,7 @@ CONFIG_NFS_FS=y | |||
1318 | CONFIG_NFS_V3=y | 1349 | CONFIG_NFS_V3=y |
1319 | # CONFIG_NFS_V3_ACL is not set | 1350 | # CONFIG_NFS_V3_ACL is not set |
1320 | CONFIG_NFS_V4=y | 1351 | CONFIG_NFS_V4=y |
1352 | # CONFIG_NFS_V4_1 is not set | ||
1321 | CONFIG_ROOT_NFS=y | 1353 | CONFIG_ROOT_NFS=y |
1322 | # CONFIG_NFSD is not set | 1354 | # CONFIG_NFSD is not set |
1323 | CONFIG_LOCKD=y | 1355 | CONFIG_LOCKD=y |
@@ -1409,6 +1441,7 @@ CONFIG_HAS_IOPORT=y | |||
1409 | CONFIG_HAS_DMA=y | 1441 | CONFIG_HAS_DMA=y |
1410 | CONFIG_HAVE_LMB=y | 1442 | CONFIG_HAVE_LMB=y |
1411 | CONFIG_NLATTR=y | 1443 | CONFIG_NLATTR=y |
1444 | CONFIG_GENERIC_ATOMIC64=y | ||
1412 | 1445 | ||
1413 | # | 1446 | # |
1414 | # Kernel hacking | 1447 | # Kernel hacking |
@@ -1434,10 +1467,14 @@ CONFIG_SCHED_DEBUG=y | |||
1434 | # CONFIG_TIMER_STATS is not set | 1467 | # CONFIG_TIMER_STATS is not set |
1435 | # CONFIG_DEBUG_OBJECTS is not set | 1468 | # CONFIG_DEBUG_OBJECTS is not set |
1436 | # CONFIG_DEBUG_SLAB is not set | 1469 | # CONFIG_DEBUG_SLAB is not set |
1470 | CONFIG_DEBUG_PREEMPT=y | ||
1437 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1471 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1438 | # CONFIG_RT_MUTEX_TESTER is not set | 1472 | # CONFIG_RT_MUTEX_TESTER is not set |
1439 | # CONFIG_DEBUG_SPINLOCK is not set | 1473 | # CONFIG_DEBUG_SPINLOCK is not set |
1440 | # CONFIG_DEBUG_MUTEXES is not set | 1474 | # CONFIG_DEBUG_MUTEXES is not set |
1475 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1476 | # CONFIG_PROVE_LOCKING is not set | ||
1477 | # CONFIG_LOCK_STAT is not set | ||
1441 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1478 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1442 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1479 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1443 | # CONFIG_DEBUG_KOBJECT is not set | 1480 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1449,7 +1486,6 @@ CONFIG_DEBUG_INFO=y | |||
1449 | # CONFIG_DEBUG_LIST is not set | 1486 | # CONFIG_DEBUG_LIST is not set |
1450 | # CONFIG_DEBUG_SG is not set | 1487 | # CONFIG_DEBUG_SG is not set |
1451 | # CONFIG_DEBUG_NOTIFIERS is not set | 1488 | # CONFIG_DEBUG_NOTIFIERS is not set |
1452 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1453 | # CONFIG_RCU_TORTURE_TEST is not set | 1489 | # CONFIG_RCU_TORTURE_TEST is not set |
1454 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1490 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1455 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1491 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1463,17 +1499,16 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1463 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1499 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1464 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1500 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1465 | CONFIG_TRACING_SUPPORT=y | 1501 | CONFIG_TRACING_SUPPORT=y |
1466 | 1502 | CONFIG_FTRACE=y | |
1467 | # | ||
1468 | # Tracers | ||
1469 | # | ||
1470 | # CONFIG_FUNCTION_TRACER is not set | 1503 | # CONFIG_FUNCTION_TRACER is not set |
1504 | # CONFIG_IRQSOFF_TRACER is not set | ||
1471 | # CONFIG_PREEMPT_TRACER is not set | 1505 | # CONFIG_PREEMPT_TRACER is not set |
1472 | # CONFIG_SCHED_TRACER is not set | 1506 | # CONFIG_SCHED_TRACER is not set |
1473 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1507 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1474 | # CONFIG_EVENT_TRACER is not set | ||
1475 | # CONFIG_BOOT_TRACER is not set | 1508 | # CONFIG_BOOT_TRACER is not set |
1476 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1509 | CONFIG_BRANCH_PROFILE_NONE=y |
1510 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1511 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1477 | # CONFIG_STACK_TRACER is not set | 1512 | # CONFIG_STACK_TRACER is not set |
1478 | # CONFIG_KMEMTRACE is not set | 1513 | # CONFIG_KMEMTRACE is not set |
1479 | # CONFIG_WORKQUEUE_TRACER is not set | 1514 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1482,9 +1517,13 @@ CONFIG_TRACING_SUPPORT=y | |||
1482 | # CONFIG_SAMPLES is not set | 1517 | # CONFIG_SAMPLES is not set |
1483 | CONFIG_HAVE_ARCH_KGDB=y | 1518 | CONFIG_HAVE_ARCH_KGDB=y |
1484 | # CONFIG_KGDB is not set | 1519 | # CONFIG_KGDB is not set |
1520 | # CONFIG_KMEMCHECK is not set | ||
1521 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1522 | CONFIG_PPC_WERROR=y | ||
1485 | CONFIG_PRINT_STACK_DEPTH=64 | 1523 | CONFIG_PRINT_STACK_DEPTH=64 |
1486 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1524 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1487 | # CONFIG_DEBUG_STACK_USAGE is not set | 1525 | # CONFIG_DEBUG_STACK_USAGE is not set |
1526 | # CONFIG_PPC_EMULATED_STATS is not set | ||
1488 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1527 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1489 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1528 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1490 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1529 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -1505,7 +1544,6 @@ CONFIG_SECURITY_NETWORK=y | |||
1505 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 1544 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
1506 | # CONFIG_SECURITY_PATH is not set | 1545 | # CONFIG_SECURITY_PATH is not set |
1507 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1546 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1508 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | ||
1509 | # CONFIG_SECURITY_TOMOYO is not set | 1547 | # CONFIG_SECURITY_TOMOYO is not set |
1510 | CONFIG_CRYPTO=y | 1548 | CONFIG_CRYPTO=y |
1511 | 1549 | ||
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index 74f7f7c6fdc4..aece6bb5f733 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:50 2009 | 4 | # Wed Jul 29 23:31:47 2009 |
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=y | 13 | CONFIG_PPC_8xx=y |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -27,15 +27,16 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 27 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 28 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
31 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 40 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 42 | CONFIG_PPC=y |
@@ -49,12 +50,14 @@ CONFIG_OF=y | |||
49 | # CONFIG_GENERIC_TBSYNC is not set | 50 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 51 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 52 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DTC=y | ||
52 | # CONFIG_DEFAULT_UIMAGE is not set | 54 | # CONFIG_DEFAULT_UIMAGE is not set |
53 | CONFIG_REDBOOT=y | 55 | CONFIG_REDBOOT=y |
54 | # CONFIG_PPC_DCR_NATIVE is not set | 56 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 57 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 58 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 59 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
60 | CONFIG_CONSTRUCTORS=y | ||
58 | 61 | ||
59 | # | 62 | # |
60 | # General setup | 63 | # General setup |
@@ -101,7 +104,6 @@ CONFIG_EMBEDDED=y | |||
101 | CONFIG_KALLSYMS=y | 104 | CONFIG_KALLSYMS=y |
102 | # CONFIG_KALLSYMS_ALL is not set | 105 | # CONFIG_KALLSYMS_ALL is not set |
103 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 106 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
104 | # CONFIG_STRIP_ASM_SYMS is not set | ||
105 | CONFIG_HOTPLUG=y | 107 | CONFIG_HOTPLUG=y |
106 | CONFIG_PRINTK=y | 108 | CONFIG_PRINTK=y |
107 | CONFIG_BUG=y | 109 | CONFIG_BUG=y |
@@ -114,8 +116,15 @@ CONFIG_TIMERFD=y | |||
114 | CONFIG_EVENTFD=y | 116 | CONFIG_EVENTFD=y |
115 | CONFIG_SHMEM=y | 117 | CONFIG_SHMEM=y |
116 | CONFIG_AIO=y | 118 | CONFIG_AIO=y |
119 | CONFIG_HAVE_PERF_COUNTERS=y | ||
120 | |||
121 | # | ||
122 | # Performance Counters | ||
123 | # | ||
124 | # CONFIG_PERF_COUNTERS is not set | ||
117 | # CONFIG_VM_EVENT_COUNTERS is not set | 125 | # CONFIG_VM_EVENT_COUNTERS is not set |
118 | CONFIG_SLUB_DEBUG=y | 126 | CONFIG_SLUB_DEBUG=y |
127 | # CONFIG_STRIP_ASM_SYMS is not set | ||
119 | CONFIG_COMPAT_BRK=y | 128 | CONFIG_COMPAT_BRK=y |
120 | # CONFIG_SLAB is not set | 129 | # CONFIG_SLAB is not set |
121 | CONFIG_SLUB=y | 130 | CONFIG_SLUB=y |
@@ -129,13 +138,18 @@ CONFIG_HAVE_KPROBES=y | |||
129 | CONFIG_HAVE_KRETPROBES=y | 138 | CONFIG_HAVE_KRETPROBES=y |
130 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 139 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
131 | CONFIG_HAVE_CLK=y | 140 | CONFIG_HAVE_CLK=y |
141 | |||
142 | # | ||
143 | # GCOV-based kernel profiling | ||
144 | # | ||
145 | # CONFIG_GCOV_KERNEL is not set | ||
132 | # CONFIG_SLOW_WORK is not set | 146 | # CONFIG_SLOW_WORK is not set |
133 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
134 | CONFIG_SLABINFO=y | 148 | CONFIG_SLABINFO=y |
135 | CONFIG_BASE_SMALL=1 | 149 | CONFIG_BASE_SMALL=1 |
136 | # CONFIG_MODULES is not set | 150 | # CONFIG_MODULES is not set |
137 | CONFIG_BLOCK=y | 151 | CONFIG_BLOCK=y |
138 | # CONFIG_LBD is not set | 152 | CONFIG_LBDAF=y |
139 | # CONFIG_BLK_DEV_BSG is not set | 153 | # CONFIG_BLK_DEV_BSG is not set |
140 | # CONFIG_BLK_DEV_INTEGRITY is not set | 154 | # CONFIG_BLK_DEV_INTEGRITY is not set |
141 | 155 | ||
@@ -220,6 +234,7 @@ CONFIG_BINFMT_ELF=y | |||
220 | # CONFIG_MATH_EMULATION is not set | 234 | # CONFIG_MATH_EMULATION is not set |
221 | # CONFIG_8XX_MINIMAL_FPEMU is not set | 235 | # CONFIG_8XX_MINIMAL_FPEMU is not set |
222 | # CONFIG_IOMMU_HELPER is not set | 236 | # CONFIG_IOMMU_HELPER is not set |
237 | # CONFIG_SWIOTLB is not set | ||
223 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 238 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y |
224 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 239 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
225 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 240 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -239,9 +254,9 @@ CONFIG_MIGRATION=y | |||
239 | CONFIG_ZONE_DMA_FLAG=1 | 254 | CONFIG_ZONE_DMA_FLAG=1 |
240 | CONFIG_BOUNCE=y | 255 | CONFIG_BOUNCE=y |
241 | CONFIG_VIRT_TO_BUS=y | 256 | CONFIG_VIRT_TO_BUS=y |
242 | CONFIG_UNEVICTABLE_LRU=y | ||
243 | CONFIG_HAVE_MLOCK=y | 257 | CONFIG_HAVE_MLOCK=y |
244 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 258 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
259 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
245 | CONFIG_PPC_4K_PAGES=y | 260 | CONFIG_PPC_4K_PAGES=y |
246 | # CONFIG_PPC_16K_PAGES is not set | 261 | # CONFIG_PPC_16K_PAGES is not set |
247 | # CONFIG_PPC_64K_PAGES is not set | 262 | # CONFIG_PPC_64K_PAGES is not set |
@@ -280,6 +295,7 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
280 | CONFIG_KERNEL_START=0xc0000000 | 295 | CONFIG_KERNEL_START=0xc0000000 |
281 | CONFIG_PHYSICAL_START=0x00000000 | 296 | CONFIG_PHYSICAL_START=0x00000000 |
282 | CONFIG_TASK_SIZE=0x80000000 | 297 | CONFIG_TASK_SIZE=0x80000000 |
298 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
283 | CONFIG_NET=y | 299 | CONFIG_NET=y |
284 | 300 | ||
285 | # | 301 | # |
@@ -336,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
336 | # CONFIG_ECONET is not set | 352 | # CONFIG_ECONET is not set |
337 | # CONFIG_WAN_ROUTER is not set | 353 | # CONFIG_WAN_ROUTER is not set |
338 | # CONFIG_PHONET is not set | 354 | # CONFIG_PHONET is not set |
355 | # CONFIG_IEEE802154 is not set | ||
339 | # CONFIG_NET_SCHED is not set | 356 | # CONFIG_NET_SCHED is not set |
340 | # CONFIG_DCB is not set | 357 | # CONFIG_DCB is not set |
341 | 358 | ||
@@ -353,7 +370,11 @@ CONFIG_WIRELESS=y | |||
353 | CONFIG_WIRELESS_OLD_REGULATORY=y | 370 | CONFIG_WIRELESS_OLD_REGULATORY=y |
354 | # CONFIG_WIRELESS_EXT is not set | 371 | # CONFIG_WIRELESS_EXT is not set |
355 | # CONFIG_LIB80211 is not set | 372 | # CONFIG_LIB80211 is not set |
356 | # CONFIG_MAC80211 is not set | 373 | |
374 | # | ||
375 | # CFG80211 needs to be enabled for MAC80211 | ||
376 | # | ||
377 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
357 | # CONFIG_WIMAX is not set | 378 | # CONFIG_WIMAX is not set |
358 | # CONFIG_RFKILL is not set | 379 | # CONFIG_RFKILL is not set |
359 | # CONFIG_NET_9P is not set | 380 | # CONFIG_NET_9P is not set |
@@ -452,6 +473,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
452 | # | 473 | # |
453 | # CONFIG_MTD_UBI is not set | 474 | # CONFIG_MTD_UBI is not set |
454 | CONFIG_OF_DEVICE=y | 475 | CONFIG_OF_DEVICE=y |
476 | CONFIG_OF_MDIO=y | ||
455 | # CONFIG_PARPORT is not set | 477 | # CONFIG_PARPORT is not set |
456 | # CONFIG_BLK_DEV is not set | 478 | # CONFIG_BLK_DEV is not set |
457 | # CONFIG_MISC_DEVICES is not set | 479 | # CONFIG_MISC_DEVICES is not set |
@@ -469,7 +491,6 @@ CONFIG_HAVE_IDE=y | |||
469 | # CONFIG_MD is not set | 491 | # CONFIG_MD is not set |
470 | # CONFIG_MACINTOSH_DRIVERS is not set | 492 | # CONFIG_MACINTOSH_DRIVERS is not set |
471 | CONFIG_NETDEVICES=y | 493 | CONFIG_NETDEVICES=y |
472 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
473 | # CONFIG_DUMMY is not set | 494 | # CONFIG_DUMMY is not set |
474 | # CONFIG_BONDING is not set | 495 | # CONFIG_BONDING is not set |
475 | # CONFIG_MACVLAN is not set | 496 | # CONFIG_MACVLAN is not set |
@@ -508,6 +529,7 @@ CONFIG_MII=y | |||
508 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 529 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
509 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 530 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
510 | # CONFIG_B44 is not set | 531 | # CONFIG_B44 is not set |
532 | # CONFIG_KS8842 is not set | ||
511 | CONFIG_FS_ENET=y | 533 | CONFIG_FS_ENET=y |
512 | # CONFIG_FS_ENET_HAS_SCC is not set | 534 | # CONFIG_FS_ENET_HAS_SCC is not set |
513 | CONFIG_FS_ENET_HAS_FEC=y | 535 | CONFIG_FS_ENET_HAS_FEC=y |
@@ -556,11 +578,11 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
556 | # | 578 | # |
557 | CONFIG_INPUT_KEYBOARD=y | 579 | CONFIG_INPUT_KEYBOARD=y |
558 | CONFIG_KEYBOARD_ATKBD=y | 580 | CONFIG_KEYBOARD_ATKBD=y |
559 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
560 | # CONFIG_KEYBOARD_LKKBD is not set | 581 | # CONFIG_KEYBOARD_LKKBD is not set |
561 | # CONFIG_KEYBOARD_XTKBD is not set | ||
562 | # CONFIG_KEYBOARD_NEWTON is not set | 582 | # CONFIG_KEYBOARD_NEWTON is not set |
563 | # CONFIG_KEYBOARD_STOWAWAY is not set | 583 | # CONFIG_KEYBOARD_STOWAWAY is not set |
584 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
585 | # CONFIG_KEYBOARD_XTKBD is not set | ||
564 | CONFIG_INPUT_MOUSE=y | 586 | CONFIG_INPUT_MOUSE=y |
565 | CONFIG_MOUSE_PS2=y | 587 | CONFIG_MOUSE_PS2=y |
566 | CONFIG_MOUSE_PS2_ALPS=y | 588 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -622,6 +644,11 @@ CONFIG_GEN_RTC=y | |||
622 | # CONFIG_TCG_TPM is not set | 644 | # CONFIG_TCG_TPM is not set |
623 | # CONFIG_I2C is not set | 645 | # CONFIG_I2C is not set |
624 | # CONFIG_SPI is not set | 646 | # CONFIG_SPI is not set |
647 | |||
648 | # | ||
649 | # PPS support | ||
650 | # | ||
651 | # CONFIG_PPS is not set | ||
625 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 652 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
626 | # CONFIG_GPIOLIB is not set | 653 | # CONFIG_GPIOLIB is not set |
627 | # CONFIG_W1 is not set | 654 | # CONFIG_W1 is not set |
@@ -644,22 +671,7 @@ CONFIG_SSB_POSSIBLE=y | |||
644 | # CONFIG_HTC_PASIC3 is not set | 671 | # CONFIG_HTC_PASIC3 is not set |
645 | # CONFIG_MFD_TMIO is not set | 672 | # CONFIG_MFD_TMIO is not set |
646 | # CONFIG_REGULATOR is not set | 673 | # CONFIG_REGULATOR is not set |
647 | 674 | # CONFIG_MEDIA_SUPPORT is not set | |
648 | # | ||
649 | # Multimedia devices | ||
650 | # | ||
651 | |||
652 | # | ||
653 | # Multimedia core support | ||
654 | # | ||
655 | # CONFIG_VIDEO_DEV is not set | ||
656 | # CONFIG_DVB_CORE is not set | ||
657 | # CONFIG_VIDEO_MEDIA is not set | ||
658 | |||
659 | # | ||
660 | # Multimedia drivers | ||
661 | # | ||
662 | CONFIG_DAB=y | ||
663 | 675 | ||
664 | # | 676 | # |
665 | # Graphics support | 677 | # Graphics support |
@@ -685,6 +697,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
685 | # CONFIG_DMADEVICES is not set | 697 | # CONFIG_DMADEVICES is not set |
686 | # CONFIG_AUXDISPLAY is not set | 698 | # CONFIG_AUXDISPLAY is not set |
687 | # CONFIG_UIO is not set | 699 | # CONFIG_UIO is not set |
700 | |||
701 | # | ||
702 | # TI VLYNQ | ||
703 | # | ||
688 | # CONFIG_STAGING is not set | 704 | # CONFIG_STAGING is not set |
689 | 705 | ||
690 | # | 706 | # |
@@ -696,12 +712,15 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
696 | # CONFIG_REISERFS_FS is not set | 712 | # CONFIG_REISERFS_FS is not set |
697 | # CONFIG_JFS_FS is not set | 713 | # CONFIG_JFS_FS is not set |
698 | # CONFIG_FS_POSIX_ACL is not set | 714 | # CONFIG_FS_POSIX_ACL is not set |
699 | CONFIG_FILE_LOCKING=y | ||
700 | # CONFIG_XFS_FS is not set | 715 | # CONFIG_XFS_FS is not set |
716 | # CONFIG_GFS2_FS is not set | ||
701 | # CONFIG_OCFS2_FS is not set | 717 | # CONFIG_OCFS2_FS is not set |
702 | # CONFIG_BTRFS_FS is not set | 718 | # CONFIG_BTRFS_FS is not set |
719 | CONFIG_FILE_LOCKING=y | ||
720 | CONFIG_FSNOTIFY=y | ||
703 | # CONFIG_DNOTIFY is not set | 721 | # CONFIG_DNOTIFY is not set |
704 | # CONFIG_INOTIFY is not set | 722 | # CONFIG_INOTIFY is not set |
723 | CONFIG_INOTIFY_USER=y | ||
705 | # CONFIG_QUOTA is not set | 724 | # CONFIG_QUOTA is not set |
706 | # CONFIG_AUTOFS_FS is not set | 725 | # CONFIG_AUTOFS_FS is not set |
707 | # CONFIG_AUTOFS4_FS is not set | 726 | # CONFIG_AUTOFS4_FS is not set |
@@ -818,6 +837,7 @@ CONFIG_HAS_IOPORT=y | |||
818 | CONFIG_HAS_DMA=y | 837 | CONFIG_HAS_DMA=y |
819 | CONFIG_HAVE_LMB=y | 838 | CONFIG_HAVE_LMB=y |
820 | CONFIG_NLATTR=y | 839 | CONFIG_NLATTR=y |
840 | CONFIG_GENERIC_ATOMIC64=y | ||
821 | 841 | ||
822 | # | 842 | # |
823 | # Kernel hacking | 843 | # Kernel hacking |
@@ -846,6 +866,9 @@ CONFIG_SCHED_DEBUG=y | |||
846 | # CONFIG_SLUB_STATS is not set | 866 | # CONFIG_SLUB_STATS is not set |
847 | # CONFIG_DEBUG_SPINLOCK is not set | 867 | # CONFIG_DEBUG_SPINLOCK is not set |
848 | # CONFIG_DEBUG_MUTEXES is not set | 868 | # CONFIG_DEBUG_MUTEXES is not set |
869 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
870 | # CONFIG_PROVE_LOCKING is not set | ||
871 | # CONFIG_LOCK_STAT is not set | ||
849 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 872 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
850 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 873 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
851 | # CONFIG_DEBUG_KOBJECT is not set | 874 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -857,7 +880,6 @@ CONFIG_DEBUG_INFO=y | |||
857 | # CONFIG_DEBUG_LIST is not set | 880 | # CONFIG_DEBUG_LIST is not set |
858 | # CONFIG_DEBUG_SG is not set | 881 | # CONFIG_DEBUG_SG is not set |
859 | # CONFIG_DEBUG_NOTIFIERS is not set | 882 | # CONFIG_DEBUG_NOTIFIERS is not set |
860 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
861 | # CONFIG_RCU_TORTURE_TEST is not set | 883 | # CONFIG_RCU_TORTURE_TEST is not set |
862 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 884 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
863 | # CONFIG_BACKTRACE_SELF_TEST is not set | 885 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -870,16 +892,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
870 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 892 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
871 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 893 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
872 | CONFIG_TRACING_SUPPORT=y | 894 | CONFIG_TRACING_SUPPORT=y |
873 | 895 | CONFIG_FTRACE=y | |
874 | # | ||
875 | # Tracers | ||
876 | # | ||
877 | # CONFIG_FUNCTION_TRACER is not set | 896 | # CONFIG_FUNCTION_TRACER is not set |
897 | # CONFIG_IRQSOFF_TRACER is not set | ||
878 | # CONFIG_SCHED_TRACER is not set | 898 | # CONFIG_SCHED_TRACER is not set |
879 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 899 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
880 | # CONFIG_EVENT_TRACER is not set | ||
881 | # CONFIG_BOOT_TRACER is not set | 900 | # CONFIG_BOOT_TRACER is not set |
882 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 901 | CONFIG_BRANCH_PROFILE_NONE=y |
902 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
903 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
883 | # CONFIG_STACK_TRACER is not set | 904 | # CONFIG_STACK_TRACER is not set |
884 | # CONFIG_KMEMTRACE is not set | 905 | # CONFIG_KMEMTRACE is not set |
885 | # CONFIG_WORKQUEUE_TRACER is not set | 906 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -888,9 +909,13 @@ CONFIG_TRACING_SUPPORT=y | |||
888 | # CONFIG_SAMPLES is not set | 909 | # CONFIG_SAMPLES is not set |
889 | CONFIG_HAVE_ARCH_KGDB=y | 910 | CONFIG_HAVE_ARCH_KGDB=y |
890 | # CONFIG_KGDB is not set | 911 | # CONFIG_KGDB is not set |
912 | # CONFIG_KMEMCHECK is not set | ||
913 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
914 | CONFIG_PPC_WERROR=y | ||
891 | CONFIG_PRINT_STACK_DEPTH=64 | 915 | CONFIG_PRINT_STACK_DEPTH=64 |
892 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 916 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
893 | # CONFIG_DEBUG_STACK_USAGE is not set | 917 | # CONFIG_DEBUG_STACK_USAGE is not set |
918 | # CONFIG_PPC_EMULATED_STATS is not set | ||
894 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 919 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
895 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 920 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
896 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 921 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig index 9ffa8de92803..8105360d53f4 100644 --- a/arch/powerpc/configs/c2k_defconfig +++ b/arch/powerpc/configs/c2k_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:51 2009 | 4 | # Wed Jul 29 23:31:48 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_ALTIVEC is not set | 20 | # CONFIG_ALTIVEC is not set |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 26 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_CHECK_CACHE_COHERENCY=y | 27 | CONFIG_CHECK_CACHE_COHERENCY=y |
@@ -32,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
32 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
33 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
34 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
39 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
41 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
42 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
43 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
44 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
46 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -54,11 +57,13 @@ CONFIG_OF=y | |||
54 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
55 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
56 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
57 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -118,7 +123,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
118 | CONFIG_KALLSYMS=y | 123 | CONFIG_KALLSYMS=y |
119 | # CONFIG_KALLSYMS_ALL is not set | 124 | # CONFIG_KALLSYMS_ALL is not set |
120 | CONFIG_KALLSYMS_EXTRA_PASS=y | 125 | CONFIG_KALLSYMS_EXTRA_PASS=y |
121 | # CONFIG_STRIP_ASM_SYMS is not set | ||
122 | CONFIG_HOTPLUG=y | 126 | CONFIG_HOTPLUG=y |
123 | CONFIG_PRINTK=y | 127 | CONFIG_PRINTK=y |
124 | CONFIG_BUG=y | 128 | CONFIG_BUG=y |
@@ -131,16 +135,23 @@ CONFIG_TIMERFD=y | |||
131 | CONFIG_EVENTFD=y | 135 | CONFIG_EVENTFD=y |
132 | CONFIG_SHMEM=y | 136 | CONFIG_SHMEM=y |
133 | CONFIG_AIO=y | 137 | CONFIG_AIO=y |
138 | CONFIG_HAVE_PERF_COUNTERS=y | ||
139 | |||
140 | # | ||
141 | # Performance Counters | ||
142 | # | ||
143 | # CONFIG_PERF_COUNTERS is not set | ||
134 | CONFIG_VM_EVENT_COUNTERS=y | 144 | CONFIG_VM_EVENT_COUNTERS=y |
135 | CONFIG_PCI_QUIRKS=y | 145 | CONFIG_PCI_QUIRKS=y |
136 | CONFIG_SLUB_DEBUG=y | 146 | CONFIG_SLUB_DEBUG=y |
147 | # CONFIG_STRIP_ASM_SYMS is not set | ||
137 | CONFIG_COMPAT_BRK=y | 148 | CONFIG_COMPAT_BRK=y |
138 | # CONFIG_SLAB is not set | 149 | # CONFIG_SLAB is not set |
139 | CONFIG_SLUB=y | 150 | CONFIG_SLUB=y |
140 | # CONFIG_SLOB is not set | 151 | # CONFIG_SLOB is not set |
141 | CONFIG_PROFILING=y | 152 | CONFIG_PROFILING=y |
142 | CONFIG_TRACEPOINTS=y | 153 | CONFIG_TRACEPOINTS=y |
143 | # CONFIG_MARKERS is not set | 154 | CONFIG_MARKERS=y |
144 | CONFIG_OPROFILE=m | 155 | CONFIG_OPROFILE=m |
145 | CONFIG_HAVE_OPROFILE=y | 156 | CONFIG_HAVE_OPROFILE=y |
146 | CONFIG_KPROBES=y | 157 | CONFIG_KPROBES=y |
@@ -150,6 +161,11 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
150 | CONFIG_HAVE_KPROBES=y | 161 | CONFIG_HAVE_KPROBES=y |
151 | CONFIG_HAVE_KRETPROBES=y | 162 | CONFIG_HAVE_KRETPROBES=y |
152 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 163 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
164 | |||
165 | # | ||
166 | # GCOV-based kernel profiling | ||
167 | # | ||
168 | # CONFIG_GCOV_KERNEL is not set | ||
153 | # CONFIG_SLOW_WORK is not set | 169 | # CONFIG_SLOW_WORK is not set |
154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 170 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
155 | CONFIG_SLABINFO=y | 171 | CONFIG_SLABINFO=y |
@@ -162,7 +178,7 @@ CONFIG_MODULE_UNLOAD=y | |||
162 | CONFIG_MODVERSIONS=y | 178 | CONFIG_MODVERSIONS=y |
163 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 179 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
164 | CONFIG_BLOCK=y | 180 | CONFIG_BLOCK=y |
165 | CONFIG_LBD=y | 181 | CONFIG_LBDAF=y |
166 | # CONFIG_BLK_DEV_BSG is not set | 182 | # CONFIG_BLK_DEV_BSG is not set |
167 | # CONFIG_BLK_DEV_INTEGRITY is not set | 183 | # CONFIG_BLK_DEV_INTEGRITY is not set |
168 | 184 | ||
@@ -258,6 +274,7 @@ CONFIG_BINFMT_ELF=y | |||
258 | # CONFIG_HAVE_AOUT is not set | 274 | # CONFIG_HAVE_AOUT is not set |
259 | CONFIG_BINFMT_MISC=y | 275 | CONFIG_BINFMT_MISC=y |
260 | # CONFIG_IOMMU_HELPER is not set | 276 | # CONFIG_IOMMU_HELPER is not set |
277 | # CONFIG_SWIOTLB is not set | ||
261 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 278 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y |
262 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 279 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
263 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 280 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -279,9 +296,9 @@ CONFIG_MIGRATION=y | |||
279 | CONFIG_ZONE_DMA_FLAG=1 | 296 | CONFIG_ZONE_DMA_FLAG=1 |
280 | CONFIG_BOUNCE=y | 297 | CONFIG_BOUNCE=y |
281 | CONFIG_VIRT_TO_BUS=y | 298 | CONFIG_VIRT_TO_BUS=y |
282 | CONFIG_UNEVICTABLE_LRU=y | ||
283 | CONFIG_HAVE_MLOCK=y | 299 | CONFIG_HAVE_MLOCK=y |
284 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 300 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
301 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
285 | CONFIG_PPC_4K_PAGES=y | 302 | CONFIG_PPC_4K_PAGES=y |
286 | # CONFIG_PPC_16K_PAGES is not set | 303 | # CONFIG_PPC_16K_PAGES is not set |
287 | # CONFIG_PPC_64K_PAGES is not set | 304 | # CONFIG_PPC_64K_PAGES is not set |
@@ -331,6 +348,7 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
331 | CONFIG_KERNEL_START=0xc0000000 | 348 | CONFIG_KERNEL_START=0xc0000000 |
332 | CONFIG_PHYSICAL_START=0x00000000 | 349 | CONFIG_PHYSICAL_START=0x00000000 |
333 | CONFIG_TASK_SIZE=0xc0000000 | 350 | CONFIG_TASK_SIZE=0xc0000000 |
351 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
334 | CONFIG_NET=y | 352 | CONFIG_NET=y |
335 | 353 | ||
336 | # | 354 | # |
@@ -583,6 +601,7 @@ CONFIG_LLC=m | |||
583 | # CONFIG_ECONET is not set | 601 | # CONFIG_ECONET is not set |
584 | # CONFIG_WAN_ROUTER is not set | 602 | # CONFIG_WAN_ROUTER is not set |
585 | # CONFIG_PHONET is not set | 603 | # CONFIG_PHONET is not set |
604 | # CONFIG_IEEE802154 is not set | ||
586 | CONFIG_NET_SCHED=y | 605 | CONFIG_NET_SCHED=y |
587 | 606 | ||
588 | # | 607 | # |
@@ -663,7 +682,11 @@ CONFIG_WIRELESS_OLD_REGULATORY=y | |||
663 | CONFIG_WIRELESS_EXT=y | 682 | CONFIG_WIRELESS_EXT=y |
664 | CONFIG_WIRELESS_EXT_SYSFS=y | 683 | CONFIG_WIRELESS_EXT_SYSFS=y |
665 | # CONFIG_LIB80211 is not set | 684 | # CONFIG_LIB80211 is not set |
666 | # CONFIG_MAC80211 is not set | 685 | |
686 | # | ||
687 | # CFG80211 needs to be enabled for MAC80211 | ||
688 | # | ||
689 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
667 | # CONFIG_WIMAX is not set | 690 | # CONFIG_WIMAX is not set |
668 | # CONFIG_RFKILL is not set | 691 | # CONFIG_RFKILL is not set |
669 | # CONFIG_NET_9P is not set | 692 | # CONFIG_NET_9P is not set |
@@ -772,6 +795,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
772 | # CONFIG_MTD_UBI is not set | 795 | # CONFIG_MTD_UBI is not set |
773 | CONFIG_OF_DEVICE=y | 796 | CONFIG_OF_DEVICE=y |
774 | CONFIG_OF_I2C=m | 797 | CONFIG_OF_I2C=m |
798 | CONFIG_OF_MDIO=y | ||
775 | # CONFIG_PARPORT is not set | 799 | # CONFIG_PARPORT is not set |
776 | CONFIG_BLK_DEV=y | 800 | CONFIG_BLK_DEV=y |
777 | # CONFIG_BLK_DEV_FD is not set | 801 | # CONFIG_BLK_DEV_FD is not set |
@@ -816,10 +840,6 @@ CONFIG_BLK_DEV_SR=m | |||
816 | CONFIG_BLK_DEV_SR_VENDOR=y | 840 | CONFIG_BLK_DEV_SR_VENDOR=y |
817 | CONFIG_CHR_DEV_SG=m | 841 | CONFIG_CHR_DEV_SG=m |
818 | # CONFIG_CHR_DEV_SCH is not set | 842 | # CONFIG_CHR_DEV_SCH is not set |
819 | |||
820 | # | ||
821 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
822 | # | ||
823 | # CONFIG_SCSI_MULTI_LUN is not set | 843 | # CONFIG_SCSI_MULTI_LUN is not set |
824 | CONFIG_SCSI_CONSTANTS=y | 844 | CONFIG_SCSI_CONSTANTS=y |
825 | CONFIG_SCSI_LOGGING=y | 845 | CONFIG_SCSI_LOGGING=y |
@@ -836,6 +856,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m | |||
836 | CONFIG_SCSI_SRP_ATTRS=m | 856 | CONFIG_SCSI_SRP_ATTRS=m |
837 | CONFIG_SCSI_LOWLEVEL=y | 857 | CONFIG_SCSI_LOWLEVEL=y |
838 | # CONFIG_ISCSI_TCP is not set | 858 | # CONFIG_ISCSI_TCP is not set |
859 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
839 | CONFIG_BLK_DEV_3W_XXXX_RAID=m | 860 | CONFIG_BLK_DEV_3W_XXXX_RAID=m |
840 | CONFIG_SCSI_3W_9XXX=m | 861 | CONFIG_SCSI_3W_9XXX=m |
841 | CONFIG_SCSI_ACARD=m | 862 | CONFIG_SCSI_ACARD=m |
@@ -854,6 +875,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 | |||
854 | CONFIG_AIC79XX_DEBUG_MASK=0 | 875 | CONFIG_AIC79XX_DEBUG_MASK=0 |
855 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set | 876 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set |
856 | # CONFIG_SCSI_AIC94XX is not set | 877 | # CONFIG_SCSI_AIC94XX is not set |
878 | # CONFIG_SCSI_MVSAS is not set | ||
857 | # CONFIG_SCSI_DPT_I2O is not set | 879 | # CONFIG_SCSI_DPT_I2O is not set |
858 | # CONFIG_SCSI_ADVANSYS is not set | 880 | # CONFIG_SCSI_ADVANSYS is not set |
859 | CONFIG_SCSI_ARCMSR=m | 881 | CONFIG_SCSI_ARCMSR=m |
@@ -875,7 +897,6 @@ CONFIG_SCSI_GDTH=m | |||
875 | CONFIG_SCSI_IPS=m | 897 | CONFIG_SCSI_IPS=m |
876 | CONFIG_SCSI_INITIO=m | 898 | CONFIG_SCSI_INITIO=m |
877 | # CONFIG_SCSI_INIA100 is not set | 899 | # CONFIG_SCSI_INIA100 is not set |
878 | # CONFIG_SCSI_MVSAS is not set | ||
879 | # CONFIG_SCSI_STEX is not set | 900 | # CONFIG_SCSI_STEX is not set |
880 | CONFIG_SCSI_SYM53C8XX_2=m | 901 | CONFIG_SCSI_SYM53C8XX_2=m |
881 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 | 902 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 |
@@ -903,14 +924,17 @@ CONFIG_SCSI_LPFC=m | |||
903 | # | 924 | # |
904 | 925 | ||
905 | # | 926 | # |
906 | # Enable only one of the two stacks, unless you know what you are doing | 927 | # You can enable one or both FireWire driver stacks. |
928 | # | ||
929 | |||
930 | # | ||
931 | # See the help texts for more information. | ||
907 | # | 932 | # |
908 | # CONFIG_FIREWIRE is not set | 933 | # CONFIG_FIREWIRE is not set |
909 | # CONFIG_IEEE1394 is not set | 934 | # CONFIG_IEEE1394 is not set |
910 | # CONFIG_I2O is not set | 935 | # CONFIG_I2O is not set |
911 | # CONFIG_MACINTOSH_DRIVERS is not set | 936 | # CONFIG_MACINTOSH_DRIVERS is not set |
912 | CONFIG_NETDEVICES=y | 937 | CONFIG_NETDEVICES=y |
913 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
914 | CONFIG_DUMMY=m | 938 | CONFIG_DUMMY=m |
915 | CONFIG_BONDING=m | 939 | CONFIG_BONDING=m |
916 | # CONFIG_MACVLAN is not set | 940 | # CONFIG_MACVLAN is not set |
@@ -957,6 +981,7 @@ CONFIG_MII=y | |||
957 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 981 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
958 | # CONFIG_NET_PCI is not set | 982 | # CONFIG_NET_PCI is not set |
959 | # CONFIG_B44 is not set | 983 | # CONFIG_B44 is not set |
984 | # CONFIG_KS8842 is not set | ||
960 | # CONFIG_ATL2 is not set | 985 | # CONFIG_ATL2 is not set |
961 | CONFIG_NETDEV_1000=y | 986 | CONFIG_NETDEV_1000=y |
962 | # CONFIG_ACENIC is not set | 987 | # CONFIG_ACENIC is not set |
@@ -976,6 +1001,7 @@ CONFIG_NETDEV_1000=y | |||
976 | # CONFIG_VIA_VELOCITY is not set | 1001 | # CONFIG_VIA_VELOCITY is not set |
977 | # CONFIG_TIGON3 is not set | 1002 | # CONFIG_TIGON3 is not set |
978 | # CONFIG_BNX2 is not set | 1003 | # CONFIG_BNX2 is not set |
1004 | # CONFIG_CNIC is not set | ||
979 | CONFIG_MV643XX_ETH=y | 1005 | CONFIG_MV643XX_ETH=y |
980 | # CONFIG_QLA3XXX is not set | 1006 | # CONFIG_QLA3XXX is not set |
981 | # CONFIG_ATL1 is not set | 1007 | # CONFIG_ATL1 is not set |
@@ -1177,13 +1203,17 @@ CONFIG_I2C_MV64XXX=m | |||
1177 | CONFIG_SENSORS_PCF8574=m | 1203 | CONFIG_SENSORS_PCF8574=m |
1178 | # CONFIG_PCF8575 is not set | 1204 | # CONFIG_PCF8575 is not set |
1179 | # CONFIG_SENSORS_PCA9539 is not set | 1205 | # CONFIG_SENSORS_PCA9539 is not set |
1180 | # CONFIG_SENSORS_MAX6875 is not set | ||
1181 | # CONFIG_SENSORS_TSL2550 is not set | 1206 | # CONFIG_SENSORS_TSL2550 is not set |
1182 | # CONFIG_I2C_DEBUG_CORE is not set | 1207 | # CONFIG_I2C_DEBUG_CORE is not set |
1183 | # CONFIG_I2C_DEBUG_ALGO is not set | 1208 | # CONFIG_I2C_DEBUG_ALGO is not set |
1184 | # CONFIG_I2C_DEBUG_BUS is not set | 1209 | # CONFIG_I2C_DEBUG_BUS is not set |
1185 | # CONFIG_I2C_DEBUG_CHIP is not set | 1210 | # CONFIG_I2C_DEBUG_CHIP is not set |
1186 | # CONFIG_SPI is not set | 1211 | # CONFIG_SPI is not set |
1212 | |||
1213 | # | ||
1214 | # PPS support | ||
1215 | # | ||
1216 | # CONFIG_PPS is not set | ||
1187 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1217 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
1188 | # CONFIG_GPIOLIB is not set | 1218 | # CONFIG_GPIOLIB is not set |
1189 | # CONFIG_W1 is not set | 1219 | # CONFIG_W1 is not set |
@@ -1238,6 +1268,7 @@ CONFIG_SENSORS_SMSC47M1=m | |||
1238 | CONFIG_SENSORS_SMSC47B397=m | 1268 | CONFIG_SENSORS_SMSC47B397=m |
1239 | # CONFIG_SENSORS_ADS7828 is not set | 1269 | # CONFIG_SENSORS_ADS7828 is not set |
1240 | # CONFIG_SENSORS_THMC50 is not set | 1270 | # CONFIG_SENSORS_THMC50 is not set |
1271 | # CONFIG_SENSORS_TMP401 is not set | ||
1241 | CONFIG_SENSORS_VIA686A=m | 1272 | CONFIG_SENSORS_VIA686A=m |
1242 | # CONFIG_SENSORS_VT1211 is not set | 1273 | # CONFIG_SENSORS_VT1211 is not set |
1243 | # CONFIG_SENSORS_VT8231 is not set | 1274 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1266,7 +1297,6 @@ CONFIG_SOFT_WATCHDOG=m | |||
1266 | # | 1297 | # |
1267 | CONFIG_PCIPCWATCHDOG=m | 1298 | CONFIG_PCIPCWATCHDOG=m |
1268 | CONFIG_WDTPCI=m | 1299 | CONFIG_WDTPCI=m |
1269 | CONFIG_WDT_501_PCI=y | ||
1270 | 1300 | ||
1271 | # | 1301 | # |
1272 | # USB-based Watchdog Cards | 1302 | # USB-based Watchdog Cards |
@@ -1289,23 +1319,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1289 | # CONFIG_MFD_WM8400 is not set | 1319 | # CONFIG_MFD_WM8400 is not set |
1290 | # CONFIG_MFD_WM8350_I2C is not set | 1320 | # CONFIG_MFD_WM8350_I2C is not set |
1291 | # CONFIG_MFD_PCF50633 is not set | 1321 | # CONFIG_MFD_PCF50633 is not set |
1322 | # CONFIG_AB3100_CORE is not set | ||
1292 | # CONFIG_REGULATOR is not set | 1323 | # CONFIG_REGULATOR is not set |
1293 | 1324 | # CONFIG_MEDIA_SUPPORT is not set | |
1294 | # | ||
1295 | # Multimedia devices | ||
1296 | # | ||
1297 | |||
1298 | # | ||
1299 | # Multimedia core support | ||
1300 | # | ||
1301 | # CONFIG_VIDEO_DEV is not set | ||
1302 | # CONFIG_DVB_CORE is not set | ||
1303 | # CONFIG_VIDEO_MEDIA is not set | ||
1304 | |||
1305 | # | ||
1306 | # Multimedia drivers | ||
1307 | # | ||
1308 | # CONFIG_DAB is not set | ||
1309 | 1325 | ||
1310 | # | 1326 | # |
1311 | # Graphics support | 1327 | # Graphics support |
@@ -1354,6 +1370,7 @@ CONFIG_USB_MON=m | |||
1354 | # USB Host Controller Drivers | 1370 | # USB Host Controller Drivers |
1355 | # | 1371 | # |
1356 | # CONFIG_USB_C67X00_HCD is not set | 1372 | # CONFIG_USB_C67X00_HCD is not set |
1373 | # CONFIG_USB_XHCI_HCD is not set | ||
1357 | CONFIG_USB_EHCI_HCD=m | 1374 | CONFIG_USB_EHCI_HCD=m |
1358 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1375 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1359 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1376 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1362,9 +1379,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1362 | # CONFIG_USB_ISP116X_HCD is not set | 1379 | # CONFIG_USB_ISP116X_HCD is not set |
1363 | # CONFIG_USB_ISP1760_HCD is not set | 1380 | # CONFIG_USB_ISP1760_HCD is not set |
1364 | CONFIG_USB_OHCI_HCD=m | 1381 | CONFIG_USB_OHCI_HCD=m |
1365 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1366 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1382 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1367 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 1383 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
1384 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1368 | CONFIG_USB_OHCI_HCD_PCI=y | 1385 | CONFIG_USB_OHCI_HCD_PCI=y |
1369 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1386 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1370 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1387 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1545,6 +1562,10 @@ CONFIG_DMADEVICES=y | |||
1545 | # | 1562 | # |
1546 | # CONFIG_AUXDISPLAY is not set | 1563 | # CONFIG_AUXDISPLAY is not set |
1547 | # CONFIG_UIO is not set | 1564 | # CONFIG_UIO is not set |
1565 | |||
1566 | # | ||
1567 | # TI VLYNQ | ||
1568 | # | ||
1548 | # CONFIG_STAGING is not set | 1569 | # CONFIG_STAGING is not set |
1549 | 1570 | ||
1550 | # | 1571 | # |
@@ -1563,11 +1584,12 @@ CONFIG_FS_MBCACHE=m | |||
1563 | # CONFIG_REISERFS_FS is not set | 1584 | # CONFIG_REISERFS_FS is not set |
1564 | # CONFIG_JFS_FS is not set | 1585 | # CONFIG_JFS_FS is not set |
1565 | CONFIG_FS_POSIX_ACL=y | 1586 | CONFIG_FS_POSIX_ACL=y |
1566 | CONFIG_FILE_LOCKING=y | ||
1567 | # CONFIG_XFS_FS is not set | 1587 | # CONFIG_XFS_FS is not set |
1568 | # CONFIG_GFS2_FS is not set | 1588 | # CONFIG_GFS2_FS is not set |
1569 | # CONFIG_OCFS2_FS is not set | 1589 | # CONFIG_OCFS2_FS is not set |
1570 | # CONFIG_BTRFS_FS is not set | 1590 | # CONFIG_BTRFS_FS is not set |
1591 | CONFIG_FILE_LOCKING=y | ||
1592 | CONFIG_FSNOTIFY=y | ||
1571 | CONFIG_DNOTIFY=y | 1593 | CONFIG_DNOTIFY=y |
1572 | CONFIG_INOTIFY=y | 1594 | CONFIG_INOTIFY=y |
1573 | CONFIG_INOTIFY_USER=y | 1595 | CONFIG_INOTIFY_USER=y |
@@ -1652,6 +1674,7 @@ CONFIG_NFS_FS=y | |||
1652 | CONFIG_NFS_V3=y | 1674 | CONFIG_NFS_V3=y |
1653 | CONFIG_NFS_V3_ACL=y | 1675 | CONFIG_NFS_V3_ACL=y |
1654 | CONFIG_NFS_V4=y | 1676 | CONFIG_NFS_V4=y |
1677 | # CONFIG_NFS_V4_1 is not set | ||
1655 | CONFIG_ROOT_NFS=y | 1678 | CONFIG_ROOT_NFS=y |
1656 | # CONFIG_NFSD is not set | 1679 | # CONFIG_NFSD is not set |
1657 | CONFIG_LOCKD=y | 1680 | CONFIG_LOCKD=y |
@@ -1764,6 +1787,7 @@ CONFIG_HAS_DMA=y | |||
1764 | CONFIG_CHECK_SIGNATURE=y | 1787 | CONFIG_CHECK_SIGNATURE=y |
1765 | CONFIG_HAVE_LMB=y | 1788 | CONFIG_HAVE_LMB=y |
1766 | CONFIG_NLATTR=y | 1789 | CONFIG_NLATTR=y |
1790 | CONFIG_GENERIC_ATOMIC64=y | ||
1767 | 1791 | ||
1768 | # | 1792 | # |
1769 | # Kernel hacking | 1793 | # Kernel hacking |
@@ -1794,6 +1818,9 @@ CONFIG_SCHED_DEBUG=y | |||
1794 | # CONFIG_RT_MUTEX_TESTER is not set | 1818 | # CONFIG_RT_MUTEX_TESTER is not set |
1795 | CONFIG_DEBUG_SPINLOCK=y | 1819 | CONFIG_DEBUG_SPINLOCK=y |
1796 | # CONFIG_DEBUG_MUTEXES is not set | 1820 | # CONFIG_DEBUG_MUTEXES is not set |
1821 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1822 | # CONFIG_PROVE_LOCKING is not set | ||
1823 | # CONFIG_LOCK_STAT is not set | ||
1797 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | 1824 | CONFIG_DEBUG_SPINLOCK_SLEEP=y |
1798 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1825 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1799 | CONFIG_STACKTRACE=y | 1826 | CONFIG_STACKTRACE=y |
@@ -1807,7 +1834,6 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
1807 | # CONFIG_DEBUG_LIST is not set | 1834 | # CONFIG_DEBUG_LIST is not set |
1808 | # CONFIG_DEBUG_SG is not set | 1835 | # CONFIG_DEBUG_SG is not set |
1809 | # CONFIG_DEBUG_NOTIFIERS is not set | 1836 | # CONFIG_DEBUG_NOTIFIERS is not set |
1810 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1811 | # CONFIG_RCU_TORTURE_TEST is not set | 1837 | # CONFIG_RCU_TORTURE_TEST is not set |
1812 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1838 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1813 | # CONFIG_KPROBES_SANITY_TEST is not set | 1839 | # CONFIG_KPROBES_SANITY_TEST is not set |
@@ -1824,30 +1850,34 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1824 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1850 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1825 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1851 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1826 | CONFIG_RING_BUFFER=y | 1852 | CONFIG_RING_BUFFER=y |
1853 | CONFIG_EVENT_TRACING=y | ||
1854 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
1827 | CONFIG_TRACING=y | 1855 | CONFIG_TRACING=y |
1828 | CONFIG_TRACING_SUPPORT=y | 1856 | CONFIG_TRACING_SUPPORT=y |
1829 | 1857 | CONFIG_FTRACE=y | |
1830 | # | ||
1831 | # Tracers | ||
1832 | # | ||
1833 | # CONFIG_FUNCTION_TRACER is not set | 1858 | # CONFIG_FUNCTION_TRACER is not set |
1859 | # CONFIG_IRQSOFF_TRACER is not set | ||
1834 | # CONFIG_SCHED_TRACER is not set | 1860 | # CONFIG_SCHED_TRACER is not set |
1835 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1861 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1836 | # CONFIG_EVENT_TRACER is not set | ||
1837 | # CONFIG_BOOT_TRACER is not set | 1862 | # CONFIG_BOOT_TRACER is not set |
1838 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1863 | CONFIG_BRANCH_PROFILE_NONE=y |
1864 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1865 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1839 | # CONFIG_STACK_TRACER is not set | 1866 | # CONFIG_STACK_TRACER is not set |
1840 | # CONFIG_KMEMTRACE is not set | 1867 | # CONFIG_KMEMTRACE is not set |
1841 | # CONFIG_WORKQUEUE_TRACER is not set | 1868 | # CONFIG_WORKQUEUE_TRACER is not set |
1842 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1869 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1843 | # CONFIG_FTRACE_STARTUP_TEST is not set | 1870 | # CONFIG_RING_BUFFER_BENCHMARK is not set |
1844 | # CONFIG_DYNAMIC_DEBUG is not set | 1871 | # CONFIG_DYNAMIC_DEBUG is not set |
1845 | # CONFIG_SAMPLES is not set | 1872 | # CONFIG_SAMPLES is not set |
1846 | CONFIG_HAVE_ARCH_KGDB=y | 1873 | CONFIG_HAVE_ARCH_KGDB=y |
1847 | # CONFIG_KGDB is not set | 1874 | # CONFIG_KGDB is not set |
1875 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1876 | CONFIG_PPC_WERROR=y | ||
1848 | CONFIG_PRINT_STACK_DEPTH=64 | 1877 | CONFIG_PRINT_STACK_DEPTH=64 |
1849 | CONFIG_DEBUG_STACKOVERFLOW=y | 1878 | CONFIG_DEBUG_STACKOVERFLOW=y |
1850 | CONFIG_DEBUG_STACK_USAGE=y | 1879 | CONFIG_DEBUG_STACK_USAGE=y |
1880 | # CONFIG_PPC_EMULATED_STATS is not set | ||
1851 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1881 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1852 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1882 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1853 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1883 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
@@ -1869,7 +1899,6 @@ CONFIG_SECURITY_NETWORK=y | |||
1869 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 1899 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
1870 | # CONFIG_SECURITY_PATH is not set | 1900 | # CONFIG_SECURITY_PATH is not set |
1871 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1901 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1872 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | ||
1873 | CONFIG_SECURITY_SELINUX=y | 1902 | CONFIG_SECURITY_SELINUX=y |
1874 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | 1903 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y |
1875 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | 1904 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 |
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index 04915c3a43f6..0aa5b43ffeb2 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:52 2009 | 4 | # Wed Jul 29 23:31:49 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_ALTIVEC is not set | 20 | # CONFIG_ALTIVEC is not set |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
25 | CONFIG_WORD_SIZE=32 | 27 | CONFIG_WORD_SIZE=32 |
@@ -30,15 +32,16 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 38 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
40 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 41 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 43 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 44 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | CONFIG_GENERIC_GPIO=y | 46 | CONFIG_GENERIC_GPIO=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -53,11 +56,13 @@ CONFIG_OF=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | # CONFIG_DEFAULT_UIMAGE is not set | 60 | # CONFIG_DEFAULT_UIMAGE is not set |
57 | # CONFIG_PPC_DCR_NATIVE is not set | 61 | # CONFIG_PPC_DCR_NATIVE is not set |
58 | # CONFIG_PPC_DCR_MMIO is not set | 62 | # CONFIG_PPC_DCR_MMIO is not set |
59 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
65 | CONFIG_CONSTRUCTORS=y | ||
61 | 66 | ||
62 | # | 67 | # |
63 | # General setup | 68 | # General setup |
@@ -99,7 +104,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
99 | CONFIG_KALLSYMS=y | 104 | CONFIG_KALLSYMS=y |
100 | CONFIG_KALLSYMS_ALL=y | 105 | CONFIG_KALLSYMS_ALL=y |
101 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 106 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
102 | # CONFIG_STRIP_ASM_SYMS is not set | ||
103 | CONFIG_HOTPLUG=y | 107 | CONFIG_HOTPLUG=y |
104 | CONFIG_PRINTK=y | 108 | CONFIG_PRINTK=y |
105 | CONFIG_BUG=y | 109 | CONFIG_BUG=y |
@@ -112,8 +116,15 @@ CONFIG_TIMERFD=y | |||
112 | CONFIG_EVENTFD=y | 116 | CONFIG_EVENTFD=y |
113 | CONFIG_SHMEM=y | 117 | CONFIG_SHMEM=y |
114 | CONFIG_AIO=y | 118 | CONFIG_AIO=y |
119 | CONFIG_HAVE_PERF_COUNTERS=y | ||
120 | |||
121 | # | ||
122 | # Performance Counters | ||
123 | # | ||
124 | # CONFIG_PERF_COUNTERS is not set | ||
115 | CONFIG_VM_EVENT_COUNTERS=y | 125 | CONFIG_VM_EVENT_COUNTERS=y |
116 | CONFIG_PCI_QUIRKS=y | 126 | CONFIG_PCI_QUIRKS=y |
127 | # CONFIG_STRIP_ASM_SYMS is not set | ||
117 | CONFIG_COMPAT_BRK=y | 128 | CONFIG_COMPAT_BRK=y |
118 | CONFIG_SLAB=y | 129 | CONFIG_SLAB=y |
119 | # CONFIG_SLUB is not set | 130 | # CONFIG_SLUB is not set |
@@ -127,6 +138,10 @@ CONFIG_HAVE_KPROBES=y | |||
127 | CONFIG_HAVE_KRETPROBES=y | 138 | CONFIG_HAVE_KRETPROBES=y |
128 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 139 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
129 | CONFIG_HAVE_CLK=y | 140 | CONFIG_HAVE_CLK=y |
141 | |||
142 | # | ||
143 | # GCOV-based kernel profiling | ||
144 | # | ||
130 | # CONFIG_SLOW_WORK is not set | 145 | # CONFIG_SLOW_WORK is not set |
131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 146 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
132 | CONFIG_SLABINFO=y | 147 | CONFIG_SLABINFO=y |
@@ -134,7 +149,7 @@ CONFIG_RT_MUTEXES=y | |||
134 | CONFIG_BASE_SMALL=0 | 149 | CONFIG_BASE_SMALL=0 |
135 | # CONFIG_MODULES is not set | 150 | # CONFIG_MODULES is not set |
136 | CONFIG_BLOCK=y | 151 | CONFIG_BLOCK=y |
137 | # CONFIG_LBD is not set | 152 | CONFIG_LBDAF=y |
138 | # CONFIG_BLK_DEV_INTEGRITY is not set | 153 | # CONFIG_BLK_DEV_INTEGRITY is not set |
139 | 154 | ||
140 | # | 155 | # |
@@ -213,6 +228,7 @@ CONFIG_BINFMT_ELF=y | |||
213 | # CONFIG_HAVE_AOUT is not set | 228 | # CONFIG_HAVE_AOUT is not set |
214 | CONFIG_BINFMT_MISC=y | 229 | CONFIG_BINFMT_MISC=y |
215 | # CONFIG_IOMMU_HELPER is not set | 230 | # CONFIG_IOMMU_HELPER is not set |
231 | # CONFIG_SWIOTLB is not set | ||
216 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
217 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 233 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
218 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 234 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -228,9 +244,9 @@ CONFIG_MIGRATION=y | |||
228 | CONFIG_ZONE_DMA_FLAG=1 | 244 | CONFIG_ZONE_DMA_FLAG=1 |
229 | CONFIG_BOUNCE=y | 245 | CONFIG_BOUNCE=y |
230 | CONFIG_VIRT_TO_BUS=y | 246 | CONFIG_VIRT_TO_BUS=y |
231 | CONFIG_UNEVICTABLE_LRU=y | ||
232 | CONFIG_HAVE_MLOCK=y | 247 | CONFIG_HAVE_MLOCK=y |
233 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 248 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
249 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
234 | CONFIG_PPC_4K_PAGES=y | 250 | CONFIG_PPC_4K_PAGES=y |
235 | # CONFIG_PPC_16K_PAGES is not set | 251 | # CONFIG_PPC_16K_PAGES is not set |
236 | # CONFIG_PPC_64K_PAGES is not set | 252 | # CONFIG_PPC_64K_PAGES is not set |
@@ -300,6 +316,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
300 | # CONFIG_NET_IPIP is not set | 316 | # CONFIG_NET_IPIP is not set |
301 | # CONFIG_NET_IPGRE is not set | 317 | # CONFIG_NET_IPGRE is not set |
302 | # CONFIG_IP_MROUTE is not set | 318 | # CONFIG_IP_MROUTE is not set |
319 | # CONFIG_ARPD is not set | ||
303 | CONFIG_SYN_COOKIES=y | 320 | CONFIG_SYN_COOKIES=y |
304 | # CONFIG_INET_AH is not set | 321 | # CONFIG_INET_AH is not set |
305 | # CONFIG_INET_ESP is not set | 322 | # CONFIG_INET_ESP is not set |
@@ -380,7 +397,11 @@ CONFIG_WIRELESS=y | |||
380 | CONFIG_WIRELESS_OLD_REGULATORY=y | 397 | CONFIG_WIRELESS_OLD_REGULATORY=y |
381 | # CONFIG_WIRELESS_EXT is not set | 398 | # CONFIG_WIRELESS_EXT is not set |
382 | # CONFIG_LIB80211 is not set | 399 | # CONFIG_LIB80211 is not set |
383 | # CONFIG_MAC80211 is not set | 400 | |
401 | # | ||
402 | # CFG80211 needs to be enabled for MAC80211 | ||
403 | # | ||
404 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
384 | # CONFIG_WIMAX is not set | 405 | # CONFIG_WIMAX is not set |
385 | # CONFIG_RFKILL is not set | 406 | # CONFIG_RFKILL is not set |
386 | 407 | ||
@@ -485,6 +506,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
485 | # CONFIG_MTD_UBI is not set | 506 | # CONFIG_MTD_UBI is not set |
486 | CONFIG_OF_DEVICE=y | 507 | CONFIG_OF_DEVICE=y |
487 | CONFIG_OF_GPIO=y | 508 | CONFIG_OF_GPIO=y |
509 | CONFIG_OF_MDIO=y | ||
488 | # CONFIG_PARPORT is not set | 510 | # CONFIG_PARPORT is not set |
489 | CONFIG_BLK_DEV=y | 511 | CONFIG_BLK_DEV=y |
490 | # CONFIG_BLK_DEV_FD is not set | 512 | # CONFIG_BLK_DEV_FD is not set |
@@ -520,13 +542,17 @@ CONFIG_HAVE_IDE=y | |||
520 | # | 542 | # |
521 | 543 | ||
522 | # | 544 | # |
523 | # A new alternative FireWire stack is available with EXPERIMENTAL=y | 545 | # You can enable one or both FireWire driver stacks. |
524 | # | 546 | # |
547 | |||
548 | # | ||
549 | # See the help texts for more information. | ||
550 | # | ||
551 | # CONFIG_FIREWIRE is not set | ||
525 | # CONFIG_IEEE1394 is not set | 552 | # CONFIG_IEEE1394 is not set |
526 | # CONFIG_I2O is not set | 553 | # CONFIG_I2O is not set |
527 | # CONFIG_MACINTOSH_DRIVERS is not set | 554 | # CONFIG_MACINTOSH_DRIVERS is not set |
528 | CONFIG_NETDEVICES=y | 555 | CONFIG_NETDEVICES=y |
529 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
530 | # CONFIG_DUMMY is not set | 556 | # CONFIG_DUMMY is not set |
531 | # CONFIG_BONDING is not set | 557 | # CONFIG_BONDING is not set |
532 | # CONFIG_EQUALIZER is not set | 558 | # CONFIG_EQUALIZER is not set |
@@ -573,6 +599,7 @@ CONFIG_MII=y | |||
573 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 599 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
574 | # CONFIG_NET_PCI is not set | 600 | # CONFIG_NET_PCI is not set |
575 | # CONFIG_B44 is not set | 601 | # CONFIG_B44 is not set |
602 | # CONFIG_KS8842 is not set | ||
576 | # CONFIG_ATL2 is not set | 603 | # CONFIG_ATL2 is not set |
577 | CONFIG_FS_ENET=y | 604 | CONFIG_FS_ENET=y |
578 | # CONFIG_FS_ENET_HAS_SCC is not set | 605 | # CONFIG_FS_ENET_HAS_SCC is not set |
@@ -594,8 +621,10 @@ CONFIG_NETDEV_1000=y | |||
594 | # CONFIG_VIA_VELOCITY is not set | 621 | # CONFIG_VIA_VELOCITY is not set |
595 | # CONFIG_TIGON3 is not set | 622 | # CONFIG_TIGON3 is not set |
596 | # CONFIG_BNX2 is not set | 623 | # CONFIG_BNX2 is not set |
624 | # CONFIG_CNIC is not set | ||
597 | # CONFIG_FSL_PQ_MDIO is not set | 625 | # CONFIG_FSL_PQ_MDIO is not set |
598 | # CONFIG_GIANFAR is not set | 626 | # CONFIG_GIANFAR is not set |
627 | # CONFIG_MV643XX_ETH is not set | ||
599 | # CONFIG_QLA3XXX is not set | 628 | # CONFIG_QLA3XXX is not set |
600 | # CONFIG_ATL1 is not set | 629 | # CONFIG_ATL1 is not set |
601 | # CONFIG_JME is not set | 630 | # CONFIG_JME is not set |
@@ -685,6 +714,10 @@ CONFIG_HW_RANDOM=y | |||
685 | CONFIG_DEVPORT=y | 714 | CONFIG_DEVPORT=y |
686 | # CONFIG_I2C is not set | 715 | # CONFIG_I2C is not set |
687 | # CONFIG_SPI is not set | 716 | # CONFIG_SPI is not set |
717 | |||
718 | # | ||
719 | # PPS support | ||
720 | # | ||
688 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 721 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
689 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 722 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
690 | CONFIG_GPIOLIB=y | 723 | CONFIG_GPIOLIB=y |
@@ -728,22 +761,7 @@ CONFIG_SSB_POSSIBLE=y | |||
728 | # CONFIG_HTC_PASIC3 is not set | 761 | # CONFIG_HTC_PASIC3 is not set |
729 | # CONFIG_MFD_TMIO is not set | 762 | # CONFIG_MFD_TMIO is not set |
730 | # CONFIG_REGULATOR is not set | 763 | # CONFIG_REGULATOR is not set |
731 | 764 | # CONFIG_MEDIA_SUPPORT is not set | |
732 | # | ||
733 | # Multimedia devices | ||
734 | # | ||
735 | |||
736 | # | ||
737 | # Multimedia core support | ||
738 | # | ||
739 | # CONFIG_VIDEO_DEV is not set | ||
740 | # CONFIG_DVB_CORE is not set | ||
741 | # CONFIG_VIDEO_MEDIA is not set | ||
742 | |||
743 | # | ||
744 | # Multimedia drivers | ||
745 | # | ||
746 | CONFIG_DAB=y | ||
747 | 765 | ||
748 | # | 766 | # |
749 | # Graphics support | 767 | # Graphics support |
@@ -771,6 +789,10 @@ CONFIG_DAB=y | |||
771 | # CONFIG_DMADEVICES is not set | 789 | # CONFIG_DMADEVICES is not set |
772 | # CONFIG_AUXDISPLAY is not set | 790 | # CONFIG_AUXDISPLAY is not set |
773 | # CONFIG_UIO is not set | 791 | # CONFIG_UIO is not set |
792 | |||
793 | # | ||
794 | # TI VLYNQ | ||
795 | # | ||
774 | # CONFIG_STAGING is not set | 796 | # CONFIG_STAGING is not set |
775 | 797 | ||
776 | # | 798 | # |
@@ -787,9 +809,10 @@ CONFIG_JBD=y | |||
787 | # CONFIG_REISERFS_FS is not set | 809 | # CONFIG_REISERFS_FS is not set |
788 | # CONFIG_JFS_FS is not set | 810 | # CONFIG_JFS_FS is not set |
789 | # CONFIG_FS_POSIX_ACL is not set | 811 | # CONFIG_FS_POSIX_ACL is not set |
790 | CONFIG_FILE_LOCKING=y | ||
791 | # CONFIG_XFS_FS is not set | 812 | # CONFIG_XFS_FS is not set |
792 | # CONFIG_OCFS2_FS is not set | 813 | # CONFIG_OCFS2_FS is not set |
814 | CONFIG_FILE_LOCKING=y | ||
815 | CONFIG_FSNOTIFY=y | ||
793 | CONFIG_DNOTIFY=y | 816 | CONFIG_DNOTIFY=y |
794 | CONFIG_INOTIFY=y | 817 | CONFIG_INOTIFY=y |
795 | CONFIG_INOTIFY_USER=y | 818 | CONFIG_INOTIFY_USER=y |
@@ -935,6 +958,7 @@ CONFIG_HAS_IOPORT=y | |||
935 | CONFIG_HAS_DMA=y | 958 | CONFIG_HAS_DMA=y |
936 | CONFIG_HAVE_LMB=y | 959 | CONFIG_HAVE_LMB=y |
937 | CONFIG_NLATTR=y | 960 | CONFIG_NLATTR=y |
961 | CONFIG_GENERIC_ATOMIC64=y | ||
938 | 962 | ||
939 | # | 963 | # |
940 | # Kernel hacking | 964 | # Kernel hacking |
@@ -960,6 +984,9 @@ CONFIG_DEBUG_KERNEL=y | |||
960 | # CONFIG_RT_MUTEX_TESTER is not set | 984 | # CONFIG_RT_MUTEX_TESTER is not set |
961 | # CONFIG_DEBUG_SPINLOCK is not set | 985 | # CONFIG_DEBUG_SPINLOCK is not set |
962 | # 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 | ||
963 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 990 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
964 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 991 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
965 | # CONFIG_DEBUG_KOBJECT is not set | 992 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -971,7 +998,6 @@ CONFIG_DEBUG_INFO=y | |||
971 | # CONFIG_DEBUG_LIST is not set | 998 | # CONFIG_DEBUG_LIST is not set |
972 | # CONFIG_DEBUG_SG is not set | 999 | # CONFIG_DEBUG_SG is not set |
973 | # CONFIG_DEBUG_NOTIFIERS is not set | 1000 | # CONFIG_DEBUG_NOTIFIERS is not set |
974 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
975 | # CONFIG_RCU_TORTURE_TEST is not set | 1001 | # CONFIG_RCU_TORTURE_TEST is not set |
976 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1002 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
977 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1003 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -985,22 +1011,23 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
985 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1011 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
986 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1012 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
987 | CONFIG_TRACING_SUPPORT=y | 1013 | CONFIG_TRACING_SUPPORT=y |
988 | 1014 | CONFIG_FTRACE=y | |
989 | # | ||
990 | # Tracers | ||
991 | # | ||
992 | # CONFIG_FUNCTION_TRACER is not set | 1015 | # CONFIG_FUNCTION_TRACER is not set |
1016 | # CONFIG_IRQSOFF_TRACER is not set | ||
993 | # CONFIG_SCHED_TRACER is not set | 1017 | # CONFIG_SCHED_TRACER is not set |
994 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1018 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
995 | # CONFIG_EVENT_TRACER is not set | ||
996 | # CONFIG_BOOT_TRACER is not set | 1019 | # CONFIG_BOOT_TRACER is not set |
997 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1020 | CONFIG_BRANCH_PROFILE_NONE=y |
1021 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1022 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
998 | # CONFIG_STACK_TRACER is not set | 1023 | # CONFIG_STACK_TRACER is not set |
999 | # CONFIG_KMEMTRACE is not set | 1024 | # CONFIG_KMEMTRACE is not set |
1000 | # CONFIG_WORKQUEUE_TRACER is not set | 1025 | # CONFIG_WORKQUEUE_TRACER is not set |
1001 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1026 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1002 | # CONFIG_SAMPLES is not set | 1027 | # CONFIG_SAMPLES is not set |
1003 | CONFIG_HAVE_ARCH_KGDB=y | 1028 | CONFIG_HAVE_ARCH_KGDB=y |
1029 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1030 | CONFIG_PPC_WERROR=y | ||
1004 | CONFIG_PRINT_STACK_DEPTH=64 | 1031 | CONFIG_PRINT_STACK_DEPTH=64 |
1005 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1032 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1006 | # CONFIG_DEBUG_STACK_USAGE is not set | 1033 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index c2a439595f4d..2c292e25cc01 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:53 2009 | 4 | # Wed Jul 29 23:31:49 2009 |
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=y | 13 | CONFIG_PPC_8xx=y |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -27,15 +27,16 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 27 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 28 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
31 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 40 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 42 | CONFIG_PPC=y |
@@ -49,11 +50,13 @@ CONFIG_OF=y | |||
49 | # CONFIG_GENERIC_TBSYNC is not set | 50 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 51 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 52 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DTC=y | ||
52 | # CONFIG_DEFAULT_UIMAGE is not set | 54 | # CONFIG_DEFAULT_UIMAGE is not set |
53 | # CONFIG_PPC_DCR_NATIVE is not set | 55 | # CONFIG_PPC_DCR_NATIVE is not set |
54 | # CONFIG_PPC_DCR_MMIO is not set | 56 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 57 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 58 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
59 | CONFIG_CONSTRUCTORS=y | ||
57 | 60 | ||
58 | # | 61 | # |
59 | # General setup | 62 | # General setup |
@@ -100,7 +103,6 @@ CONFIG_EMBEDDED=y | |||
100 | CONFIG_KALLSYMS=y | 103 | CONFIG_KALLSYMS=y |
101 | # CONFIG_KALLSYMS_ALL is not set | 104 | # CONFIG_KALLSYMS_ALL is not set |
102 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 105 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
103 | # CONFIG_STRIP_ASM_SYMS is not set | ||
104 | CONFIG_HOTPLUG=y | 106 | CONFIG_HOTPLUG=y |
105 | CONFIG_PRINTK=y | 107 | CONFIG_PRINTK=y |
106 | CONFIG_BUG=y | 108 | CONFIG_BUG=y |
@@ -113,8 +115,15 @@ CONFIG_TIMERFD=y | |||
113 | CONFIG_EVENTFD=y | 115 | CONFIG_EVENTFD=y |
114 | CONFIG_SHMEM=y | 116 | CONFIG_SHMEM=y |
115 | CONFIG_AIO=y | 117 | CONFIG_AIO=y |
118 | CONFIG_HAVE_PERF_COUNTERS=y | ||
119 | |||
120 | # | ||
121 | # Performance Counters | ||
122 | # | ||
123 | # CONFIG_PERF_COUNTERS is not set | ||
116 | # CONFIG_VM_EVENT_COUNTERS is not set | 124 | # CONFIG_VM_EVENT_COUNTERS is not set |
117 | CONFIG_SLUB_DEBUG=y | 125 | CONFIG_SLUB_DEBUG=y |
126 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_COMPAT_BRK=y | 127 | CONFIG_COMPAT_BRK=y |
119 | # CONFIG_SLAB is not set | 128 | # CONFIG_SLAB is not set |
120 | CONFIG_SLUB=y | 129 | CONFIG_SLUB=y |
@@ -128,13 +137,17 @@ CONFIG_HAVE_KPROBES=y | |||
128 | CONFIG_HAVE_KRETPROBES=y | 137 | CONFIG_HAVE_KRETPROBES=y |
129 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 138 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
130 | CONFIG_HAVE_CLK=y | 139 | CONFIG_HAVE_CLK=y |
140 | |||
141 | # | ||
142 | # GCOV-based kernel profiling | ||
143 | # | ||
131 | # CONFIG_SLOW_WORK is not set | 144 | # CONFIG_SLOW_WORK is not set |
132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 145 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
133 | CONFIG_SLABINFO=y | 146 | CONFIG_SLABINFO=y |
134 | CONFIG_BASE_SMALL=1 | 147 | CONFIG_BASE_SMALL=1 |
135 | # CONFIG_MODULES is not set | 148 | # CONFIG_MODULES is not set |
136 | CONFIG_BLOCK=y | 149 | CONFIG_BLOCK=y |
137 | # CONFIG_LBD is not set | 150 | CONFIG_LBDAF=y |
138 | # CONFIG_BLK_DEV_BSG is not set | 151 | # CONFIG_BLK_DEV_BSG is not set |
139 | # CONFIG_BLK_DEV_INTEGRITY is not set | 152 | # CONFIG_BLK_DEV_INTEGRITY is not set |
140 | 153 | ||
@@ -220,6 +233,7 @@ CONFIG_BINFMT_ELF=y | |||
220 | # CONFIG_MATH_EMULATION is not set | 233 | # CONFIG_MATH_EMULATION is not set |
221 | CONFIG_8XX_MINIMAL_FPEMU=y | 234 | CONFIG_8XX_MINIMAL_FPEMU=y |
222 | # CONFIG_IOMMU_HELPER is not set | 235 | # CONFIG_IOMMU_HELPER is not set |
236 | # CONFIG_SWIOTLB is not set | ||
223 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 237 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y |
224 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 238 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
225 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 239 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -239,9 +253,9 @@ CONFIG_MIGRATION=y | |||
239 | CONFIG_ZONE_DMA_FLAG=1 | 253 | CONFIG_ZONE_DMA_FLAG=1 |
240 | CONFIG_BOUNCE=y | 254 | CONFIG_BOUNCE=y |
241 | CONFIG_VIRT_TO_BUS=y | 255 | CONFIG_VIRT_TO_BUS=y |
242 | CONFIG_UNEVICTABLE_LRU=y | ||
243 | CONFIG_HAVE_MLOCK=y | 256 | CONFIG_HAVE_MLOCK=y |
244 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 257 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
258 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
245 | CONFIG_PPC_4K_PAGES=y | 259 | CONFIG_PPC_4K_PAGES=y |
246 | # CONFIG_PPC_16K_PAGES is not set | 260 | # CONFIG_PPC_16K_PAGES is not set |
247 | # CONFIG_PPC_64K_PAGES is not set | 261 | # CONFIG_PPC_64K_PAGES is not set |
@@ -280,6 +294,7 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
280 | CONFIG_KERNEL_START=0xc0000000 | 294 | CONFIG_KERNEL_START=0xc0000000 |
281 | CONFIG_PHYSICAL_START=0x00000000 | 295 | CONFIG_PHYSICAL_START=0x00000000 |
282 | CONFIG_TASK_SIZE=0x80000000 | 296 | CONFIG_TASK_SIZE=0x80000000 |
297 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
283 | CONFIG_NET=y | 298 | CONFIG_NET=y |
284 | 299 | ||
285 | # | 300 | # |
@@ -336,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
336 | # CONFIG_ECONET is not set | 351 | # CONFIG_ECONET is not set |
337 | # CONFIG_WAN_ROUTER is not set | 352 | # CONFIG_WAN_ROUTER is not set |
338 | # CONFIG_PHONET is not set | 353 | # CONFIG_PHONET is not set |
354 | # CONFIG_IEEE802154 is not set | ||
339 | # CONFIG_NET_SCHED is not set | 355 | # CONFIG_NET_SCHED is not set |
340 | # CONFIG_DCB is not set | 356 | # CONFIG_DCB is not set |
341 | 357 | ||
@@ -353,7 +369,11 @@ CONFIG_WIRELESS=y | |||
353 | CONFIG_WIRELESS_OLD_REGULATORY=y | 369 | CONFIG_WIRELESS_OLD_REGULATORY=y |
354 | # CONFIG_WIRELESS_EXT is not set | 370 | # CONFIG_WIRELESS_EXT is not set |
355 | # CONFIG_LIB80211 is not set | 371 | # CONFIG_LIB80211 is not set |
356 | # CONFIG_MAC80211 is not set | 372 | |
373 | # | ||
374 | # CFG80211 needs to be enabled for MAC80211 | ||
375 | # | ||
376 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
357 | # CONFIG_WIMAX is not set | 377 | # CONFIG_WIMAX is not set |
358 | # CONFIG_RFKILL is not set | 378 | # CONFIG_RFKILL is not set |
359 | # CONFIG_NET_9P is not set | 379 | # CONFIG_NET_9P is not set |
@@ -452,6 +472,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
452 | # | 472 | # |
453 | # CONFIG_MTD_UBI is not set | 473 | # CONFIG_MTD_UBI is not set |
454 | CONFIG_OF_DEVICE=y | 474 | CONFIG_OF_DEVICE=y |
475 | CONFIG_OF_MDIO=y | ||
455 | # CONFIG_PARPORT is not set | 476 | # CONFIG_PARPORT is not set |
456 | # CONFIG_BLK_DEV is not set | 477 | # CONFIG_BLK_DEV is not set |
457 | # CONFIG_MISC_DEVICES is not set | 478 | # CONFIG_MISC_DEVICES is not set |
@@ -469,7 +490,6 @@ CONFIG_HAVE_IDE=y | |||
469 | # CONFIG_MD is not set | 490 | # CONFIG_MD is not set |
470 | # CONFIG_MACINTOSH_DRIVERS is not set | 491 | # CONFIG_MACINTOSH_DRIVERS is not set |
471 | CONFIG_NETDEVICES=y | 492 | CONFIG_NETDEVICES=y |
472 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
473 | # CONFIG_DUMMY is not set | 493 | # CONFIG_DUMMY is not set |
474 | # CONFIG_BONDING is not set | 494 | # CONFIG_BONDING is not set |
475 | # CONFIG_MACVLAN is not set | 495 | # CONFIG_MACVLAN is not set |
@@ -508,6 +528,7 @@ CONFIG_MII=y | |||
508 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 528 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
509 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 529 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
510 | # CONFIG_B44 is not set | 530 | # CONFIG_B44 is not set |
531 | # CONFIG_KS8842 is not set | ||
511 | CONFIG_FS_ENET=y | 532 | CONFIG_FS_ENET=y |
512 | # CONFIG_FS_ENET_HAS_SCC is not set | 533 | # CONFIG_FS_ENET_HAS_SCC is not set |
513 | CONFIG_FS_ENET_HAS_FEC=y | 534 | CONFIG_FS_ENET_HAS_FEC=y |
@@ -579,6 +600,11 @@ CONFIG_GEN_RTC=y | |||
579 | # CONFIG_TCG_TPM is not set | 600 | # CONFIG_TCG_TPM is not set |
580 | # CONFIG_I2C is not set | 601 | # CONFIG_I2C is not set |
581 | # CONFIG_SPI is not set | 602 | # CONFIG_SPI is not set |
603 | |||
604 | # | ||
605 | # PPS support | ||
606 | # | ||
607 | # CONFIG_PPS is not set | ||
582 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 608 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
583 | # CONFIG_GPIOLIB is not set | 609 | # CONFIG_GPIOLIB is not set |
584 | # CONFIG_W1 is not set | 610 | # CONFIG_W1 is not set |
@@ -602,22 +628,7 @@ CONFIG_SSB_POSSIBLE=y | |||
602 | # CONFIG_HTC_PASIC3 is not set | 628 | # CONFIG_HTC_PASIC3 is not set |
603 | # CONFIG_MFD_TMIO is not set | 629 | # CONFIG_MFD_TMIO is not set |
604 | # CONFIG_REGULATOR is not set | 630 | # CONFIG_REGULATOR is not set |
605 | 631 | # CONFIG_MEDIA_SUPPORT is not set | |
606 | # | ||
607 | # Multimedia devices | ||
608 | # | ||
609 | |||
610 | # | ||
611 | # Multimedia core support | ||
612 | # | ||
613 | # CONFIG_VIDEO_DEV is not set | ||
614 | # CONFIG_DVB_CORE is not set | ||
615 | # CONFIG_VIDEO_MEDIA is not set | ||
616 | |||
617 | # | ||
618 | # Multimedia drivers | ||
619 | # | ||
620 | CONFIG_DAB=y | ||
621 | 632 | ||
622 | # | 633 | # |
623 | # Graphics support | 634 | # Graphics support |
@@ -642,6 +653,10 @@ CONFIG_DAB=y | |||
642 | # CONFIG_DMADEVICES is not set | 653 | # CONFIG_DMADEVICES is not set |
643 | # CONFIG_AUXDISPLAY is not set | 654 | # CONFIG_AUXDISPLAY is not set |
644 | # CONFIG_UIO is not set | 655 | # CONFIG_UIO is not set |
656 | |||
657 | # | ||
658 | # TI VLYNQ | ||
659 | # | ||
645 | # CONFIG_STAGING is not set | 660 | # CONFIG_STAGING is not set |
646 | 661 | ||
647 | # | 662 | # |
@@ -653,12 +668,15 @@ CONFIG_DAB=y | |||
653 | # CONFIG_REISERFS_FS is not set | 668 | # CONFIG_REISERFS_FS is not set |
654 | # CONFIG_JFS_FS is not set | 669 | # CONFIG_JFS_FS is not set |
655 | # CONFIG_FS_POSIX_ACL is not set | 670 | # CONFIG_FS_POSIX_ACL is not set |
656 | CONFIG_FILE_LOCKING=y | ||
657 | # CONFIG_XFS_FS is not set | 671 | # CONFIG_XFS_FS is not set |
672 | # CONFIG_GFS2_FS is not set | ||
658 | # CONFIG_OCFS2_FS is not set | 673 | # CONFIG_OCFS2_FS is not set |
659 | # CONFIG_BTRFS_FS is not set | 674 | # CONFIG_BTRFS_FS is not set |
675 | CONFIG_FILE_LOCKING=y | ||
676 | CONFIG_FSNOTIFY=y | ||
660 | # CONFIG_DNOTIFY is not set | 677 | # CONFIG_DNOTIFY is not set |
661 | # CONFIG_INOTIFY is not set | 678 | # CONFIG_INOTIFY is not set |
679 | CONFIG_INOTIFY_USER=y | ||
662 | # CONFIG_QUOTA is not set | 680 | # CONFIG_QUOTA is not set |
663 | # CONFIG_AUTOFS_FS is not set | 681 | # CONFIG_AUTOFS_FS is not set |
664 | # CONFIG_AUTOFS4_FS is not set | 682 | # CONFIG_AUTOFS4_FS is not set |
@@ -775,6 +793,7 @@ CONFIG_HAS_IOPORT=y | |||
775 | CONFIG_HAS_DMA=y | 793 | CONFIG_HAS_DMA=y |
776 | CONFIG_HAVE_LMB=y | 794 | CONFIG_HAVE_LMB=y |
777 | CONFIG_NLATTR=y | 795 | CONFIG_NLATTR=y |
796 | CONFIG_GENERIC_ATOMIC64=y | ||
778 | 797 | ||
779 | # | 798 | # |
780 | # Kernel hacking | 799 | # Kernel hacking |
@@ -803,6 +822,9 @@ CONFIG_SCHED_DEBUG=y | |||
803 | # CONFIG_SLUB_STATS is not set | 822 | # CONFIG_SLUB_STATS is not set |
804 | # CONFIG_DEBUG_SPINLOCK is not set | 823 | # CONFIG_DEBUG_SPINLOCK is not set |
805 | # CONFIG_DEBUG_MUTEXES is not set | 824 | # CONFIG_DEBUG_MUTEXES is not set |
825 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
826 | # CONFIG_PROVE_LOCKING is not set | ||
827 | # CONFIG_LOCK_STAT is not set | ||
806 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 828 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
807 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 829 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
808 | # CONFIG_DEBUG_KOBJECT is not set | 830 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -814,7 +836,6 @@ CONFIG_DEBUG_INFO=y | |||
814 | # CONFIG_DEBUG_LIST is not set | 836 | # CONFIG_DEBUG_LIST is not set |
815 | # CONFIG_DEBUG_SG is not set | 837 | # CONFIG_DEBUG_SG is not set |
816 | # CONFIG_DEBUG_NOTIFIERS is not set | 838 | # CONFIG_DEBUG_NOTIFIERS is not set |
817 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
818 | # CONFIG_RCU_TORTURE_TEST is not set | 839 | # CONFIG_RCU_TORTURE_TEST is not set |
819 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 840 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
820 | # CONFIG_BACKTRACE_SELF_TEST is not set | 841 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -827,16 +848,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
827 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 848 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
828 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 849 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
829 | CONFIG_TRACING_SUPPORT=y | 850 | CONFIG_TRACING_SUPPORT=y |
830 | 851 | CONFIG_FTRACE=y | |
831 | # | ||
832 | # Tracers | ||
833 | # | ||
834 | # CONFIG_FUNCTION_TRACER is not set | 852 | # CONFIG_FUNCTION_TRACER is not set |
853 | # CONFIG_IRQSOFF_TRACER is not set | ||
835 | # CONFIG_SCHED_TRACER is not set | 854 | # CONFIG_SCHED_TRACER is not set |
836 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 855 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
837 | # CONFIG_EVENT_TRACER is not set | ||
838 | # CONFIG_BOOT_TRACER is not set | 856 | # CONFIG_BOOT_TRACER is not set |
839 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 857 | CONFIG_BRANCH_PROFILE_NONE=y |
858 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
859 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
840 | # CONFIG_STACK_TRACER is not set | 860 | # CONFIG_STACK_TRACER is not set |
841 | # CONFIG_KMEMTRACE is not set | 861 | # CONFIG_KMEMTRACE is not set |
842 | # CONFIG_WORKQUEUE_TRACER is not set | 862 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -844,6 +864,9 @@ CONFIG_TRACING_SUPPORT=y | |||
844 | # CONFIG_SAMPLES is not set | 864 | # CONFIG_SAMPLES is not set |
845 | CONFIG_HAVE_ARCH_KGDB=y | 865 | CONFIG_HAVE_ARCH_KGDB=y |
846 | # CONFIG_KGDB is not set | 866 | # CONFIG_KGDB is not set |
867 | # CONFIG_KMEMCHECK is not set | ||
868 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
869 | CONFIG_PPC_WERROR=y | ||
847 | CONFIG_PRINT_STACK_DEPTH=64 | 870 | CONFIG_PRINT_STACK_DEPTH=64 |
848 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 871 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
849 | # CONFIG_DEBUG_STACK_USAGE is not set | 872 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index a4053ab9e244..45671e7dd2c7 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:54 2009 | 4 | # Wed Jul 29 23:31:50 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_ALTIVEC is not set | 20 | # CONFIG_ALTIVEC is not set |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
25 | CONFIG_WORD_SIZE=32 | 27 | CONFIG_WORD_SIZE=32 |
@@ -30,15 +32,16 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 38 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
40 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 41 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 43 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 44 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 46 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
44 | CONFIG_PPC=y | 47 | CONFIG_PPC=y |
@@ -52,11 +55,13 @@ CONFIG_PPC_UDBG_16550=y | |||
52 | # CONFIG_GENERIC_TBSYNC is not set | 55 | # CONFIG_GENERIC_TBSYNC is not set |
53 | CONFIG_AUDIT_ARCH=y | 56 | CONFIG_AUDIT_ARCH=y |
54 | CONFIG_GENERIC_BUG=y | 57 | CONFIG_GENERIC_BUG=y |
58 | CONFIG_DTC=y | ||
55 | CONFIG_DEFAULT_UIMAGE=y | 59 | CONFIG_DEFAULT_UIMAGE=y |
56 | # CONFIG_PPC_DCR_NATIVE is not set | 60 | # CONFIG_PPC_DCR_NATIVE is not set |
57 | # CONFIG_PPC_DCR_MMIO is not set | 61 | # CONFIG_PPC_DCR_MMIO is not set |
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 |
@@ -114,7 +119,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
114 | CONFIG_KALLSYMS=y | 119 | CONFIG_KALLSYMS=y |
115 | # CONFIG_KALLSYMS_ALL is not set | 120 | # CONFIG_KALLSYMS_ALL is not set |
116 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 121 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
117 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_HOTPLUG=y | 122 | CONFIG_HOTPLUG=y |
119 | CONFIG_PRINTK=y | 123 | CONFIG_PRINTK=y |
120 | CONFIG_BUG=y | 124 | CONFIG_BUG=y |
@@ -127,9 +131,16 @@ CONFIG_TIMERFD=y | |||
127 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
128 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
129 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_COUNTERS=y | ||
135 | |||
136 | # | ||
137 | # Performance Counters | ||
138 | # | ||
139 | # CONFIG_PERF_COUNTERS is not set | ||
130 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
131 | CONFIG_PCI_QUIRKS=y | 141 | CONFIG_PCI_QUIRKS=y |
132 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
143 | # CONFIG_STRIP_ASM_SYMS is not set | ||
133 | # CONFIG_COMPAT_BRK is not set | 144 | # CONFIG_COMPAT_BRK is not set |
134 | # CONFIG_SLAB is not set | 145 | # CONFIG_SLAB is not set |
135 | CONFIG_SLUB=y | 146 | CONFIG_SLUB=y |
@@ -143,6 +154,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
143 | CONFIG_HAVE_KPROBES=y | 154 | CONFIG_HAVE_KPROBES=y |
144 | CONFIG_HAVE_KRETPROBES=y | 155 | CONFIG_HAVE_KRETPROBES=y |
145 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 156 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
157 | |||
158 | # | ||
159 | # GCOV-based kernel profiling | ||
160 | # | ||
146 | # CONFIG_SLOW_WORK is not set | 161 | # CONFIG_SLOW_WORK is not set |
147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 162 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
148 | CONFIG_SLABINFO=y | 163 | CONFIG_SLABINFO=y |
@@ -155,7 +170,7 @@ CONFIG_MODULE_UNLOAD=y | |||
155 | # CONFIG_MODVERSIONS is not set | 170 | # CONFIG_MODVERSIONS is not set |
156 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 171 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
157 | CONFIG_BLOCK=y | 172 | CONFIG_BLOCK=y |
158 | # CONFIG_LBD is not set | 173 | CONFIG_LBDAF=y |
159 | # CONFIG_BLK_DEV_BSG is not set | 174 | # CONFIG_BLK_DEV_BSG is not set |
160 | # CONFIG_BLK_DEV_INTEGRITY is not set | 175 | # CONFIG_BLK_DEV_INTEGRITY is not set |
161 | 176 | ||
@@ -237,6 +252,7 @@ CONFIG_BINFMT_ELF=y | |||
237 | # CONFIG_HAVE_AOUT is not set | 252 | # CONFIG_HAVE_AOUT is not set |
238 | # CONFIG_BINFMT_MISC is not set | 253 | # CONFIG_BINFMT_MISC is not set |
239 | # CONFIG_IOMMU_HELPER is not set | 254 | # CONFIG_IOMMU_HELPER is not set |
255 | # CONFIG_SWIOTLB is not set | ||
240 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 256 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
241 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 257 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
242 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 258 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -257,9 +273,9 @@ CONFIG_MIGRATION=y | |||
257 | CONFIG_ZONE_DMA_FLAG=1 | 273 | CONFIG_ZONE_DMA_FLAG=1 |
258 | CONFIG_BOUNCE=y | 274 | CONFIG_BOUNCE=y |
259 | CONFIG_VIRT_TO_BUS=y | 275 | CONFIG_VIRT_TO_BUS=y |
260 | CONFIG_UNEVICTABLE_LRU=y | ||
261 | CONFIG_HAVE_MLOCK=y | 276 | CONFIG_HAVE_MLOCK=y |
262 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 277 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
278 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
263 | CONFIG_PPC_4K_PAGES=y | 279 | CONFIG_PPC_4K_PAGES=y |
264 | # CONFIG_PPC_16K_PAGES is not set | 280 | # CONFIG_PPC_16K_PAGES is not set |
265 | # CONFIG_PPC_64K_PAGES is not set | 281 | # CONFIG_PPC_64K_PAGES is not set |
@@ -480,6 +496,7 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
480 | # CONFIG_ECONET is not set | 496 | # CONFIG_ECONET is not set |
481 | # CONFIG_WAN_ROUTER is not set | 497 | # CONFIG_WAN_ROUTER is not set |
482 | # CONFIG_PHONET is not set | 498 | # CONFIG_PHONET is not set |
499 | # CONFIG_IEEE802154 is not set | ||
483 | # CONFIG_NET_SCHED is not set | 500 | # CONFIG_NET_SCHED is not set |
484 | # CONFIG_DCB is not set | 501 | # CONFIG_DCB is not set |
485 | 502 | ||
@@ -498,7 +515,11 @@ CONFIG_WIRELESS_OLD_REGULATORY=y | |||
498 | CONFIG_WIRELESS_EXT=y | 515 | CONFIG_WIRELESS_EXT=y |
499 | CONFIG_WIRELESS_EXT_SYSFS=y | 516 | CONFIG_WIRELESS_EXT_SYSFS=y |
500 | # CONFIG_LIB80211 is not set | 517 | # CONFIG_LIB80211 is not set |
501 | # CONFIG_MAC80211 is not set | 518 | |
519 | # | ||
520 | # CFG80211 needs to be enabled for MAC80211 | ||
521 | # | ||
522 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
502 | # CONFIG_WIMAX is not set | 523 | # CONFIG_WIMAX is not set |
503 | # CONFIG_RFKILL is not set | 524 | # CONFIG_RFKILL is not set |
504 | # CONFIG_NET_9P is not set | 525 | # CONFIG_NET_9P is not set |
@@ -647,7 +668,9 @@ CONFIG_MISC_DEVICES=y | |||
647 | # | 668 | # |
648 | # CONFIG_EEPROM_AT24 is not set | 669 | # CONFIG_EEPROM_AT24 is not set |
649 | CONFIG_EEPROM_LEGACY=m | 670 | CONFIG_EEPROM_LEGACY=m |
671 | # CONFIG_EEPROM_MAX6875 is not set | ||
650 | # CONFIG_EEPROM_93CX6 is not set | 672 | # CONFIG_EEPROM_93CX6 is not set |
673 | # CONFIG_CB710_CORE is not set | ||
651 | CONFIG_HAVE_IDE=y | 674 | CONFIG_HAVE_IDE=y |
652 | # CONFIG_IDE is not set | 675 | # CONFIG_IDE is not set |
653 | 676 | ||
@@ -670,10 +693,6 @@ CONFIG_BLK_DEV_SD=y | |||
670 | # CONFIG_BLK_DEV_SR is not set | 693 | # CONFIG_BLK_DEV_SR is not set |
671 | CONFIG_CHR_DEV_SG=y | 694 | CONFIG_CHR_DEV_SG=y |
672 | # CONFIG_CHR_DEV_SCH is not set | 695 | # CONFIG_CHR_DEV_SCH is not set |
673 | |||
674 | # | ||
675 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
676 | # | ||
677 | CONFIG_SCSI_MULTI_LUN=y | 696 | CONFIG_SCSI_MULTI_LUN=y |
678 | # CONFIG_SCSI_CONSTANTS is not set | 697 | # CONFIG_SCSI_CONSTANTS is not set |
679 | # CONFIG_SCSI_LOGGING is not set | 698 | # CONFIG_SCSI_LOGGING is not set |
@@ -691,6 +710,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
691 | CONFIG_SCSI_LOWLEVEL=y | 710 | CONFIG_SCSI_LOWLEVEL=y |
692 | # CONFIG_ISCSI_TCP is not set | 711 | # CONFIG_ISCSI_TCP is not set |
693 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 712 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
713 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
694 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 714 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
695 | # CONFIG_SCSI_3W_9XXX is not set | 715 | # CONFIG_SCSI_3W_9XXX is not set |
696 | # CONFIG_SCSI_ACARD is not set | 716 | # CONFIG_SCSI_ACARD is not set |
@@ -699,6 +719,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
699 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 719 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
700 | # CONFIG_SCSI_AIC79XX is not set | 720 | # CONFIG_SCSI_AIC79XX is not set |
701 | # CONFIG_SCSI_AIC94XX is not set | 721 | # CONFIG_SCSI_AIC94XX is not set |
722 | # CONFIG_SCSI_MVSAS is not set | ||
702 | # CONFIG_SCSI_DPT_I2O is not set | 723 | # CONFIG_SCSI_DPT_I2O is not set |
703 | # CONFIG_SCSI_ADVANSYS is not set | 724 | # CONFIG_SCSI_ADVANSYS is not set |
704 | # CONFIG_SCSI_ARCMSR is not set | 725 | # CONFIG_SCSI_ARCMSR is not set |
@@ -718,7 +739,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
718 | # CONFIG_SCSI_IPS is not set | 739 | # CONFIG_SCSI_IPS is not set |
719 | # CONFIG_SCSI_INITIO is not set | 740 | # CONFIG_SCSI_INITIO is not set |
720 | # CONFIG_SCSI_INIA100 is not set | 741 | # CONFIG_SCSI_INIA100 is not set |
721 | # CONFIG_SCSI_MVSAS is not set | ||
722 | # CONFIG_SCSI_STEX is not set | 742 | # CONFIG_SCSI_STEX is not set |
723 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 743 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
724 | # CONFIG_SCSI_IPR is not set | 744 | # CONFIG_SCSI_IPR is not set |
@@ -802,14 +822,17 @@ CONFIG_PATA_SIL680=y | |||
802 | # | 822 | # |
803 | 823 | ||
804 | # | 824 | # |
805 | # Enable only one of the two stacks, unless you know what you are doing | 825 | # You can enable one or both FireWire driver stacks. |
826 | # | ||
827 | |||
828 | # | ||
829 | # See the help texts for more information. | ||
806 | # | 830 | # |
807 | # CONFIG_FIREWIRE is not set | 831 | # CONFIG_FIREWIRE is not set |
808 | # CONFIG_IEEE1394 is not set | 832 | # CONFIG_IEEE1394 is not set |
809 | # CONFIG_I2O is not set | 833 | # CONFIG_I2O is not set |
810 | # CONFIG_MACINTOSH_DRIVERS is not set | 834 | # CONFIG_MACINTOSH_DRIVERS is not set |
811 | CONFIG_NETDEVICES=y | 835 | CONFIG_NETDEVICES=y |
812 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
813 | # CONFIG_DUMMY is not set | 836 | # CONFIG_DUMMY is not set |
814 | # CONFIG_BONDING is not set | 837 | # CONFIG_BONDING is not set |
815 | # CONFIG_MACVLAN is not set | 838 | # CONFIG_MACVLAN is not set |
@@ -846,6 +869,7 @@ CONFIG_TULIP_MMIO=y | |||
846 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 869 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
847 | # CONFIG_NET_PCI is not set | 870 | # CONFIG_NET_PCI is not set |
848 | # CONFIG_B44 is not set | 871 | # CONFIG_B44 is not set |
872 | # CONFIG_KS8842 is not set | ||
849 | # CONFIG_ATL2 is not set | 873 | # CONFIG_ATL2 is not set |
850 | CONFIG_NETDEV_1000=y | 874 | CONFIG_NETDEV_1000=y |
851 | # CONFIG_ACENIC is not set | 875 | # CONFIG_ACENIC is not set |
@@ -865,8 +889,10 @@ CONFIG_R8169=y | |||
865 | # CONFIG_VIA_VELOCITY is not set | 889 | # CONFIG_VIA_VELOCITY is not set |
866 | # CONFIG_TIGON3 is not set | 890 | # CONFIG_TIGON3 is not set |
867 | # CONFIG_BNX2 is not set | 891 | # CONFIG_BNX2 is not set |
892 | # CONFIG_CNIC is not set | ||
868 | # CONFIG_FSL_PQ_MDIO is not set | 893 | # CONFIG_FSL_PQ_MDIO is not set |
869 | # CONFIG_GIANFAR is not set | 894 | # CONFIG_GIANFAR is not set |
895 | # CONFIG_MV643XX_ETH is not set | ||
870 | # CONFIG_QLA3XXX is not set | 896 | # CONFIG_QLA3XXX is not set |
871 | # CONFIG_ATL1 is not set | 897 | # CONFIG_ATL1 is not set |
872 | # CONFIG_ATL1E is not set | 898 | # CONFIG_ATL1E is not set |
@@ -1074,13 +1100,17 @@ CONFIG_I2C_MPC=y | |||
1074 | # CONFIG_SENSORS_PCF8574 is not set | 1100 | # CONFIG_SENSORS_PCF8574 is not set |
1075 | # CONFIG_PCF8575 is not set | 1101 | # CONFIG_PCF8575 is not set |
1076 | # CONFIG_SENSORS_PCA9539 is not set | 1102 | # CONFIG_SENSORS_PCA9539 is not set |
1077 | # CONFIG_SENSORS_MAX6875 is not set | ||
1078 | # CONFIG_SENSORS_TSL2550 is not set | 1103 | # CONFIG_SENSORS_TSL2550 is not set |
1079 | # CONFIG_I2C_DEBUG_CORE is not set | 1104 | # CONFIG_I2C_DEBUG_CORE is not set |
1080 | # CONFIG_I2C_DEBUG_ALGO is not set | 1105 | # CONFIG_I2C_DEBUG_ALGO is not set |
1081 | # CONFIG_I2C_DEBUG_BUS is not set | 1106 | # CONFIG_I2C_DEBUG_BUS is not set |
1082 | # CONFIG_I2C_DEBUG_CHIP is not set | 1107 | # CONFIG_I2C_DEBUG_CHIP is not set |
1083 | # CONFIG_SPI is not set | 1108 | # CONFIG_SPI is not set |
1109 | |||
1110 | # | ||
1111 | # PPS support | ||
1112 | # | ||
1113 | # CONFIG_PPS is not set | ||
1084 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1114 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
1085 | # CONFIG_GPIOLIB is not set | 1115 | # CONFIG_GPIOLIB is not set |
1086 | # CONFIG_W1 is not set | 1116 | # CONFIG_W1 is not set |
@@ -1135,6 +1165,7 @@ CONFIG_HWMON=y | |||
1135 | # CONFIG_SENSORS_SMSC47B397 is not set | 1165 | # CONFIG_SENSORS_SMSC47B397 is not set |
1136 | # CONFIG_SENSORS_ADS7828 is not set | 1166 | # CONFIG_SENSORS_ADS7828 is not set |
1137 | # CONFIG_SENSORS_THMC50 is not set | 1167 | # CONFIG_SENSORS_THMC50 is not set |
1168 | # CONFIG_SENSORS_TMP401 is not set | ||
1138 | # CONFIG_SENSORS_VIA686A is not set | 1169 | # CONFIG_SENSORS_VIA686A is not set |
1139 | # CONFIG_SENSORS_VT1211 is not set | 1170 | # CONFIG_SENSORS_VT1211 is not set |
1140 | # CONFIG_SENSORS_VT8231 is not set | 1171 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1169,23 +1200,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1169 | # CONFIG_MFD_WM8400 is not set | 1200 | # CONFIG_MFD_WM8400 is not set |
1170 | # CONFIG_MFD_WM8350_I2C is not set | 1201 | # CONFIG_MFD_WM8350_I2C is not set |
1171 | # CONFIG_MFD_PCF50633 is not set | 1202 | # CONFIG_MFD_PCF50633 is not set |
1203 | # CONFIG_AB3100_CORE is not set | ||
1172 | # CONFIG_REGULATOR is not set | 1204 | # CONFIG_REGULATOR is not set |
1173 | 1205 | # CONFIG_MEDIA_SUPPORT is not set | |
1174 | # | ||
1175 | # Multimedia devices | ||
1176 | # | ||
1177 | |||
1178 | # | ||
1179 | # Multimedia core support | ||
1180 | # | ||
1181 | # CONFIG_VIDEO_DEV is not set | ||
1182 | # CONFIG_DVB_CORE is not set | ||
1183 | # CONFIG_VIDEO_MEDIA is not set | ||
1184 | |||
1185 | # | ||
1186 | # Multimedia drivers | ||
1187 | # | ||
1188 | # CONFIG_DAB is not set | ||
1189 | 1206 | ||
1190 | # | 1207 | # |
1191 | # Graphics support | 1208 | # Graphics support |
@@ -1245,6 +1262,7 @@ CONFIG_USB_MON=y | |||
1245 | # USB Host Controller Drivers | 1262 | # USB Host Controller Drivers |
1246 | # | 1263 | # |
1247 | # CONFIG_USB_C67X00_HCD is not set | 1264 | # CONFIG_USB_C67X00_HCD is not set |
1265 | # CONFIG_USB_XHCI_HCD is not set | ||
1248 | CONFIG_USB_EHCI_HCD=y | 1266 | CONFIG_USB_EHCI_HCD=y |
1249 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1267 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1250 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1268 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1254,9 +1272,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1254 | # CONFIG_USB_ISP116X_HCD is not set | 1272 | # CONFIG_USB_ISP116X_HCD is not set |
1255 | # CONFIG_USB_ISP1760_HCD is not set | 1273 | # CONFIG_USB_ISP1760_HCD is not set |
1256 | CONFIG_USB_OHCI_HCD=y | 1274 | CONFIG_USB_OHCI_HCD=y |
1257 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1258 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1275 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1259 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | 1276 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set |
1277 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1260 | CONFIG_USB_OHCI_HCD_PCI=y | 1278 | CONFIG_USB_OHCI_HCD_PCI=y |
1261 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1279 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1262 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1280 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1423,6 +1441,7 @@ CONFIG_RTC_DRV_RS5C372=y | |||
1423 | # CONFIG_RTC_DRV_S35390A is not set | 1441 | # CONFIG_RTC_DRV_S35390A is not set |
1424 | # CONFIG_RTC_DRV_FM3130 is not set | 1442 | # CONFIG_RTC_DRV_FM3130 is not set |
1425 | # CONFIG_RTC_DRV_RX8581 is not set | 1443 | # CONFIG_RTC_DRV_RX8581 is not set |
1444 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1426 | 1445 | ||
1427 | # | 1446 | # |
1428 | # SPI RTC drivers | 1447 | # SPI RTC drivers |
@@ -1450,6 +1469,10 @@ CONFIG_RTC_DRV_RS5C372=y | |||
1450 | # CONFIG_DMADEVICES is not set | 1469 | # CONFIG_DMADEVICES is not set |
1451 | # CONFIG_AUXDISPLAY is not set | 1470 | # CONFIG_AUXDISPLAY is not set |
1452 | # CONFIG_UIO is not set | 1471 | # CONFIG_UIO is not set |
1472 | |||
1473 | # | ||
1474 | # TI VLYNQ | ||
1475 | # | ||
1453 | # CONFIG_STAGING is not set | 1476 | # CONFIG_STAGING is not set |
1454 | 1477 | ||
1455 | # | 1478 | # |
@@ -1469,14 +1492,16 @@ CONFIG_FS_MBCACHE=y | |||
1469 | # CONFIG_REISERFS_FS is not set | 1492 | # CONFIG_REISERFS_FS is not set |
1470 | # CONFIG_JFS_FS is not set | 1493 | # CONFIG_JFS_FS is not set |
1471 | CONFIG_FS_POSIX_ACL=y | 1494 | CONFIG_FS_POSIX_ACL=y |
1472 | CONFIG_FILE_LOCKING=y | ||
1473 | CONFIG_XFS_FS=m | 1495 | CONFIG_XFS_FS=m |
1474 | # CONFIG_XFS_QUOTA is not set | 1496 | # CONFIG_XFS_QUOTA is not set |
1475 | # CONFIG_XFS_POSIX_ACL is not set | 1497 | # CONFIG_XFS_POSIX_ACL is not set |
1476 | # CONFIG_XFS_RT is not set | 1498 | # CONFIG_XFS_RT is not set |
1477 | # CONFIG_XFS_DEBUG is not set | 1499 | # CONFIG_XFS_DEBUG is not set |
1500 | # CONFIG_GFS2_FS is not set | ||
1478 | # CONFIG_OCFS2_FS is not set | 1501 | # CONFIG_OCFS2_FS is not set |
1479 | # CONFIG_BTRFS_FS is not set | 1502 | # CONFIG_BTRFS_FS is not set |
1503 | CONFIG_FILE_LOCKING=y | ||
1504 | CONFIG_FSNOTIFY=y | ||
1480 | CONFIG_DNOTIFY=y | 1505 | CONFIG_DNOTIFY=y |
1481 | CONFIG_INOTIFY=y | 1506 | CONFIG_INOTIFY=y |
1482 | CONFIG_INOTIFY_USER=y | 1507 | CONFIG_INOTIFY_USER=y |
@@ -1548,6 +1573,7 @@ CONFIG_NFS_FS=y | |||
1548 | CONFIG_NFS_V3=y | 1573 | CONFIG_NFS_V3=y |
1549 | CONFIG_NFS_V3_ACL=y | 1574 | CONFIG_NFS_V3_ACL=y |
1550 | CONFIG_NFS_V4=y | 1575 | CONFIG_NFS_V4=y |
1576 | # CONFIG_NFS_V4_1 is not set | ||
1551 | CONFIG_ROOT_NFS=y | 1577 | CONFIG_ROOT_NFS=y |
1552 | CONFIG_NFSD=m | 1578 | CONFIG_NFSD=m |
1553 | CONFIG_NFSD_V3=y | 1579 | CONFIG_NFSD_V3=y |
@@ -1578,7 +1604,7 @@ CONFIG_CIFS=m | |||
1578 | # | 1604 | # |
1579 | # CONFIG_PARTITION_ADVANCED is not set | 1605 | # CONFIG_PARTITION_ADVANCED is not set |
1580 | CONFIG_MSDOS_PARTITION=y | 1606 | CONFIG_MSDOS_PARTITION=y |
1581 | CONFIG_NLS=m | 1607 | CONFIG_NLS=y |
1582 | CONFIG_NLS_DEFAULT="iso8859-1" | 1608 | CONFIG_NLS_DEFAULT="iso8859-1" |
1583 | CONFIG_NLS_CODEPAGE_437=m | 1609 | CONFIG_NLS_CODEPAGE_437=m |
1584 | # CONFIG_NLS_CODEPAGE_737 is not set | 1610 | # CONFIG_NLS_CODEPAGE_737 is not set |
@@ -1645,6 +1671,7 @@ CONFIG_HAS_IOPORT=y | |||
1645 | CONFIG_HAS_DMA=y | 1671 | CONFIG_HAS_DMA=y |
1646 | CONFIG_HAVE_LMB=y | 1672 | CONFIG_HAVE_LMB=y |
1647 | CONFIG_NLATTR=y | 1673 | CONFIG_NLATTR=y |
1674 | CONFIG_GENERIC_ATOMIC64=y | ||
1648 | 1675 | ||
1649 | # | 1676 | # |
1650 | # Kernel hacking | 1677 | # Kernel hacking |
@@ -1675,6 +1702,9 @@ CONFIG_SCHED_DEBUG=y | |||
1675 | # CONFIG_RT_MUTEX_TESTER is not set | 1702 | # CONFIG_RT_MUTEX_TESTER is not set |
1676 | # CONFIG_DEBUG_SPINLOCK is not set | 1703 | # CONFIG_DEBUG_SPINLOCK is not set |
1677 | # CONFIG_DEBUG_MUTEXES is not set | 1704 | # CONFIG_DEBUG_MUTEXES is not set |
1705 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1706 | # CONFIG_PROVE_LOCKING is not set | ||
1707 | # CONFIG_LOCK_STAT is not set | ||
1678 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1708 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1679 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1709 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1680 | # CONFIG_DEBUG_KOBJECT is not set | 1710 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1686,7 +1716,6 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
1686 | # CONFIG_DEBUG_LIST is not set | 1716 | # CONFIG_DEBUG_LIST is not set |
1687 | # CONFIG_DEBUG_SG is not set | 1717 | # CONFIG_DEBUG_SG is not set |
1688 | # CONFIG_DEBUG_NOTIFIERS is not set | 1718 | # CONFIG_DEBUG_NOTIFIERS is not set |
1689 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1690 | # CONFIG_RCU_TORTURE_TEST is not set | 1719 | # CONFIG_RCU_TORTURE_TEST is not set |
1691 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1720 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1692 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1721 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1700,16 +1729,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1700 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1729 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1701 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1730 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1702 | CONFIG_TRACING_SUPPORT=y | 1731 | CONFIG_TRACING_SUPPORT=y |
1703 | 1732 | CONFIG_FTRACE=y | |
1704 | # | ||
1705 | # Tracers | ||
1706 | # | ||
1707 | # CONFIG_FUNCTION_TRACER is not set | 1733 | # CONFIG_FUNCTION_TRACER is not set |
1734 | # CONFIG_IRQSOFF_TRACER is not set | ||
1708 | # CONFIG_SCHED_TRACER is not set | 1735 | # CONFIG_SCHED_TRACER is not set |
1709 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1736 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1710 | # CONFIG_EVENT_TRACER is not set | ||
1711 | # CONFIG_BOOT_TRACER is not set | 1737 | # CONFIG_BOOT_TRACER is not set |
1712 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1738 | CONFIG_BRANCH_PROFILE_NONE=y |
1739 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1740 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1713 | # CONFIG_STACK_TRACER is not set | 1741 | # CONFIG_STACK_TRACER is not set |
1714 | # CONFIG_KMEMTRACE is not set | 1742 | # CONFIG_KMEMTRACE is not set |
1715 | # CONFIG_WORKQUEUE_TRACER is not set | 1743 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1717,6 +1745,8 @@ CONFIG_TRACING_SUPPORT=y | |||
1717 | # CONFIG_SAMPLES is not set | 1745 | # CONFIG_SAMPLES is not set |
1718 | CONFIG_HAVE_ARCH_KGDB=y | 1746 | CONFIG_HAVE_ARCH_KGDB=y |
1719 | # CONFIG_KGDB is not set | 1747 | # CONFIG_KGDB is not set |
1748 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1749 | CONFIG_PPC_WERROR=y | ||
1720 | CONFIG_PRINT_STACK_DEPTH=64 | 1750 | CONFIG_PRINT_STACK_DEPTH=64 |
1721 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1751 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1722 | # CONFIG_DEBUG_STACK_USAGE is not set | 1752 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig index 31e1df665157..e9491c1c3f31 100644 --- a/arch/powerpc/configs/mgcoge_defconfig +++ b/arch/powerpc/configs/mgcoge_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:55 2009 | 4 | # Wed Jul 29 23:31:51 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_ALTIVEC is not set | 20 | # CONFIG_ALTIVEC is not set |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
25 | CONFIG_WORD_SIZE=32 | 27 | CONFIG_WORD_SIZE=32 |
@@ -30,15 +32,16 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 38 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
40 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 41 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 43 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 44 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | CONFIG_GENERIC_GPIO=y | 46 | CONFIG_GENERIC_GPIO=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -53,6 +56,7 @@ CONFIG_PPC_UDBG_16550=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | # CONFIG_DEFAULT_UIMAGE is not set | 60 | # CONFIG_DEFAULT_UIMAGE is not set |
57 | CONFIG_HIBERNATE_32=y | 61 | CONFIG_HIBERNATE_32=y |
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | 62 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y |
@@ -60,6 +64,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y | |||
60 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
61 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
63 | 68 | ||
64 | # | 69 | # |
65 | # General setup | 70 | # General setup |
@@ -105,7 +110,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
105 | CONFIG_KALLSYMS=y | 110 | CONFIG_KALLSYMS=y |
106 | CONFIG_KALLSYMS_ALL=y | 111 | CONFIG_KALLSYMS_ALL=y |
107 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 112 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
108 | # CONFIG_STRIP_ASM_SYMS is not set | ||
109 | CONFIG_HOTPLUG=y | 113 | CONFIG_HOTPLUG=y |
110 | CONFIG_PRINTK=y | 114 | CONFIG_PRINTK=y |
111 | CONFIG_BUG=y | 115 | CONFIG_BUG=y |
@@ -119,8 +123,15 @@ CONFIG_TIMERFD=y | |||
119 | CONFIG_EVENTFD=y | 123 | CONFIG_EVENTFD=y |
120 | CONFIG_SHMEM=y | 124 | CONFIG_SHMEM=y |
121 | CONFIG_AIO=y | 125 | CONFIG_AIO=y |
126 | CONFIG_HAVE_PERF_COUNTERS=y | ||
127 | |||
128 | # | ||
129 | # Performance Counters | ||
130 | # | ||
131 | # CONFIG_PERF_COUNTERS is not set | ||
122 | CONFIG_VM_EVENT_COUNTERS=y | 132 | CONFIG_VM_EVENT_COUNTERS=y |
123 | CONFIG_PCI_QUIRKS=y | 133 | CONFIG_PCI_QUIRKS=y |
134 | # CONFIG_STRIP_ASM_SYMS is not set | ||
124 | CONFIG_COMPAT_BRK=y | 135 | CONFIG_COMPAT_BRK=y |
125 | CONFIG_SLAB=y | 136 | CONFIG_SLAB=y |
126 | # CONFIG_SLUB is not set | 137 | # CONFIG_SLUB is not set |
@@ -134,6 +145,11 @@ CONFIG_HAVE_KPROBES=y | |||
134 | CONFIG_HAVE_KRETPROBES=y | 145 | CONFIG_HAVE_KRETPROBES=y |
135 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 146 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
136 | CONFIG_HAVE_CLK=y | 147 | CONFIG_HAVE_CLK=y |
148 | |||
149 | # | ||
150 | # GCOV-based kernel profiling | ||
151 | # | ||
152 | # CONFIG_GCOV_KERNEL is not set | ||
137 | # CONFIG_SLOW_WORK is not set | 153 | # CONFIG_SLOW_WORK is not set |
138 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 154 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
139 | CONFIG_SLABINFO=y | 155 | CONFIG_SLABINFO=y |
@@ -141,7 +157,7 @@ CONFIG_RT_MUTEXES=y | |||
141 | CONFIG_BASE_SMALL=0 | 157 | CONFIG_BASE_SMALL=0 |
142 | # CONFIG_MODULES is not set | 158 | # CONFIG_MODULES is not set |
143 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
144 | # CONFIG_LBD is not set | 160 | CONFIG_LBDAF=y |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | 161 | # CONFIG_BLK_DEV_INTEGRITY is not set |
146 | 162 | ||
147 | # | 163 | # |
@@ -225,6 +241,7 @@ CONFIG_BINFMT_ELF=y | |||
225 | # CONFIG_HAVE_AOUT is not set | 241 | # CONFIG_HAVE_AOUT is not set |
226 | CONFIG_BINFMT_MISC=y | 242 | CONFIG_BINFMT_MISC=y |
227 | # CONFIG_IOMMU_HELPER is not set | 243 | # CONFIG_IOMMU_HELPER is not set |
244 | # CONFIG_SWIOTLB is not set | ||
228 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 245 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
229 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 246 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
230 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 247 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -240,9 +257,9 @@ CONFIG_MIGRATION=y | |||
240 | CONFIG_ZONE_DMA_FLAG=1 | 257 | CONFIG_ZONE_DMA_FLAG=1 |
241 | CONFIG_BOUNCE=y | 258 | CONFIG_BOUNCE=y |
242 | CONFIG_VIRT_TO_BUS=y | 259 | CONFIG_VIRT_TO_BUS=y |
243 | CONFIG_UNEVICTABLE_LRU=y | ||
244 | CONFIG_HAVE_MLOCK=y | 260 | CONFIG_HAVE_MLOCK=y |
245 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 261 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
262 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
246 | CONFIG_PPC_4K_PAGES=y | 263 | CONFIG_PPC_4K_PAGES=y |
247 | # CONFIG_PPC_16K_PAGES is not set | 264 | # CONFIG_PPC_16K_PAGES is not set |
248 | # CONFIG_PPC_64K_PAGES is not set | 265 | # CONFIG_PPC_64K_PAGES is not set |
@@ -313,6 +330,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
313 | # CONFIG_NET_IPIP is not set | 330 | # CONFIG_NET_IPIP is not set |
314 | # CONFIG_NET_IPGRE is not set | 331 | # CONFIG_NET_IPGRE is not set |
315 | # CONFIG_IP_MROUTE is not set | 332 | # CONFIG_IP_MROUTE is not set |
333 | # CONFIG_ARPD is not set | ||
316 | CONFIG_SYN_COOKIES=y | 334 | CONFIG_SYN_COOKIES=y |
317 | # CONFIG_INET_AH is not set | 335 | # CONFIG_INET_AH is not set |
318 | # CONFIG_INET_ESP is not set | 336 | # CONFIG_INET_ESP is not set |
@@ -374,7 +392,11 @@ CONFIG_WIRELESS=y | |||
374 | CONFIG_WIRELESS_OLD_REGULATORY=y | 392 | CONFIG_WIRELESS_OLD_REGULATORY=y |
375 | # CONFIG_WIRELESS_EXT is not set | 393 | # CONFIG_WIRELESS_EXT is not set |
376 | # CONFIG_LIB80211 is not set | 394 | # CONFIG_LIB80211 is not set |
377 | # CONFIG_MAC80211 is not set | 395 | |
396 | # | ||
397 | # CFG80211 needs to be enabled for MAC80211 | ||
398 | # | ||
399 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
378 | # CONFIG_WIMAX is not set | 400 | # CONFIG_WIMAX is not set |
379 | # CONFIG_RFKILL is not set | 401 | # CONFIG_RFKILL is not set |
380 | 402 | ||
@@ -484,6 +506,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
484 | # CONFIG_MTD_UBI is not set | 506 | # CONFIG_MTD_UBI is not set |
485 | CONFIG_OF_DEVICE=y | 507 | CONFIG_OF_DEVICE=y |
486 | CONFIG_OF_GPIO=y | 508 | CONFIG_OF_GPIO=y |
509 | CONFIG_OF_MDIO=y | ||
487 | # CONFIG_PARPORT is not set | 510 | # CONFIG_PARPORT is not set |
488 | CONFIG_BLK_DEV=y | 511 | CONFIG_BLK_DEV=y |
489 | # CONFIG_BLK_DEV_FD is not set | 512 | # CONFIG_BLK_DEV_FD is not set |
@@ -523,13 +546,17 @@ CONFIG_HAVE_IDE=y | |||
523 | # | 546 | # |
524 | 547 | ||
525 | # | 548 | # |
526 | # A new alternative FireWire stack is available with EXPERIMENTAL=y | 549 | # You can enable one or both FireWire driver stacks. |
527 | # | 550 | # |
551 | |||
552 | # | ||
553 | # See the help texts for more information. | ||
554 | # | ||
555 | # CONFIG_FIREWIRE is not set | ||
528 | # CONFIG_IEEE1394 is not set | 556 | # CONFIG_IEEE1394 is not set |
529 | # CONFIG_I2O is not set | 557 | # CONFIG_I2O is not set |
530 | # CONFIG_MACINTOSH_DRIVERS is not set | 558 | # CONFIG_MACINTOSH_DRIVERS is not set |
531 | CONFIG_NETDEVICES=y | 559 | CONFIG_NETDEVICES=y |
532 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
533 | # CONFIG_DUMMY is not set | 560 | # CONFIG_DUMMY is not set |
534 | # CONFIG_BONDING is not set | 561 | # CONFIG_BONDING is not set |
535 | # CONFIG_EQUALIZER is not set | 562 | # CONFIG_EQUALIZER is not set |
@@ -577,6 +604,7 @@ CONFIG_MII=y | |||
577 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 604 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
578 | # CONFIG_NET_PCI is not set | 605 | # CONFIG_NET_PCI is not set |
579 | # CONFIG_B44 is not set | 606 | # CONFIG_B44 is not set |
607 | # CONFIG_KS8842 is not set | ||
580 | # CONFIG_ATL2 is not set | 608 | # CONFIG_ATL2 is not set |
581 | CONFIG_FS_ENET=y | 609 | CONFIG_FS_ENET=y |
582 | CONFIG_FS_ENET_HAS_SCC=y | 610 | CONFIG_FS_ENET_HAS_SCC=y |
@@ -654,6 +682,10 @@ CONFIG_HW_RANDOM=y | |||
654 | CONFIG_DEVPORT=y | 682 | CONFIG_DEVPORT=y |
655 | # CONFIG_I2C is not set | 683 | # CONFIG_I2C is not set |
656 | # CONFIG_SPI is not set | 684 | # CONFIG_SPI is not set |
685 | |||
686 | # | ||
687 | # PPS support | ||
688 | # | ||
657 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 689 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
658 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 690 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
659 | CONFIG_GPIOLIB=y | 691 | CONFIG_GPIOLIB=y |
@@ -697,22 +729,7 @@ CONFIG_SSB_POSSIBLE=y | |||
697 | # CONFIG_HTC_PASIC3 is not set | 729 | # CONFIG_HTC_PASIC3 is not set |
698 | # CONFIG_MFD_TMIO is not set | 730 | # CONFIG_MFD_TMIO is not set |
699 | # CONFIG_REGULATOR is not set | 731 | # CONFIG_REGULATOR is not set |
700 | 732 | # CONFIG_MEDIA_SUPPORT is not set | |
701 | # | ||
702 | # Multimedia devices | ||
703 | # | ||
704 | |||
705 | # | ||
706 | # Multimedia core support | ||
707 | # | ||
708 | # CONFIG_VIDEO_DEV is not set | ||
709 | # CONFIG_DVB_CORE is not set | ||
710 | # CONFIG_VIDEO_MEDIA is not set | ||
711 | |||
712 | # | ||
713 | # Multimedia drivers | ||
714 | # | ||
715 | # CONFIG_DAB is not set | ||
716 | 733 | ||
717 | # | 734 | # |
718 | # Graphics support | 735 | # Graphics support |
@@ -740,6 +757,10 @@ CONFIG_SSB_POSSIBLE=y | |||
740 | # CONFIG_DMADEVICES is not set | 757 | # CONFIG_DMADEVICES is not set |
741 | # CONFIG_AUXDISPLAY is not set | 758 | # CONFIG_AUXDISPLAY is not set |
742 | # CONFIG_UIO is not set | 759 | # CONFIG_UIO is not set |
760 | |||
761 | # | ||
762 | # TI VLYNQ | ||
763 | # | ||
743 | # CONFIG_STAGING is not set | 764 | # CONFIG_STAGING is not set |
744 | 765 | ||
745 | # | 766 | # |
@@ -757,9 +778,10 @@ CONFIG_JBD=y | |||
757 | # CONFIG_REISERFS_FS is not set | 778 | # CONFIG_REISERFS_FS is not set |
758 | # CONFIG_JFS_FS is not set | 779 | # CONFIG_JFS_FS is not set |
759 | # CONFIG_FS_POSIX_ACL is not set | 780 | # CONFIG_FS_POSIX_ACL is not set |
760 | CONFIG_FILE_LOCKING=y | ||
761 | # CONFIG_XFS_FS is not set | 781 | # CONFIG_XFS_FS is not set |
762 | # CONFIG_OCFS2_FS is not set | 782 | # CONFIG_OCFS2_FS is not set |
783 | CONFIG_FILE_LOCKING=y | ||
784 | CONFIG_FSNOTIFY=y | ||
763 | CONFIG_DNOTIFY=y | 785 | CONFIG_DNOTIFY=y |
764 | CONFIG_INOTIFY=y | 786 | CONFIG_INOTIFY=y |
765 | CONFIG_INOTIFY_USER=y | 787 | CONFIG_INOTIFY_USER=y |
@@ -916,6 +938,7 @@ CONFIG_HAS_IOPORT=y | |||
916 | CONFIG_HAS_DMA=y | 938 | CONFIG_HAS_DMA=y |
917 | CONFIG_HAVE_LMB=y | 939 | CONFIG_HAVE_LMB=y |
918 | CONFIG_NLATTR=y | 940 | CONFIG_NLATTR=y |
941 | CONFIG_GENERIC_ATOMIC64=y | ||
919 | 942 | ||
920 | # | 943 | # |
921 | # Kernel hacking | 944 | # Kernel hacking |
@@ -941,6 +964,9 @@ CONFIG_DEBUG_KERNEL=y | |||
941 | # CONFIG_RT_MUTEX_TESTER is not set | 964 | # CONFIG_RT_MUTEX_TESTER is not set |
942 | # CONFIG_DEBUG_SPINLOCK is not set | 965 | # CONFIG_DEBUG_SPINLOCK is not set |
943 | # CONFIG_DEBUG_MUTEXES is not set | 966 | # CONFIG_DEBUG_MUTEXES is not set |
967 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
968 | # CONFIG_PROVE_LOCKING is not set | ||
969 | # CONFIG_LOCK_STAT is not set | ||
944 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 970 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
945 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 971 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
946 | # CONFIG_DEBUG_KOBJECT is not set | 972 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -952,7 +978,6 @@ CONFIG_DEBUG_INFO=y | |||
952 | # CONFIG_DEBUG_LIST is not set | 978 | # CONFIG_DEBUG_LIST is not set |
953 | # CONFIG_DEBUG_SG is not set | 979 | # CONFIG_DEBUG_SG is not set |
954 | # CONFIG_DEBUG_NOTIFIERS is not set | 980 | # CONFIG_DEBUG_NOTIFIERS is not set |
955 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
956 | # CONFIG_RCU_TORTURE_TEST is not set | 981 | # CONFIG_RCU_TORTURE_TEST is not set |
957 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 982 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
958 | # CONFIG_BACKTRACE_SELF_TEST is not set | 983 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -966,16 +991,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
966 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 991 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
967 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 992 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
968 | CONFIG_TRACING_SUPPORT=y | 993 | CONFIG_TRACING_SUPPORT=y |
969 | 994 | CONFIG_FTRACE=y | |
970 | # | ||
971 | # Tracers | ||
972 | # | ||
973 | # CONFIG_FUNCTION_TRACER is not set | 995 | # CONFIG_FUNCTION_TRACER is not set |
996 | # CONFIG_IRQSOFF_TRACER is not set | ||
974 | # CONFIG_SCHED_TRACER is not set | 997 | # CONFIG_SCHED_TRACER is not set |
975 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 998 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
976 | # CONFIG_EVENT_TRACER is not set | ||
977 | # CONFIG_BOOT_TRACER is not set | 999 | # CONFIG_BOOT_TRACER is not set |
978 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1000 | CONFIG_BRANCH_PROFILE_NONE=y |
1001 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1002 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
979 | # CONFIG_STACK_TRACER is not set | 1003 | # CONFIG_STACK_TRACER is not set |
980 | # CONFIG_KMEMTRACE is not set | 1004 | # CONFIG_KMEMTRACE is not set |
981 | # CONFIG_WORKQUEUE_TRACER is not set | 1005 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -983,9 +1007,12 @@ CONFIG_TRACING_SUPPORT=y | |||
983 | # CONFIG_DYNAMIC_DEBUG is not set | 1007 | # CONFIG_DYNAMIC_DEBUG is not set |
984 | # CONFIG_SAMPLES is not set | 1008 | # CONFIG_SAMPLES is not set |
985 | CONFIG_HAVE_ARCH_KGDB=y | 1009 | CONFIG_HAVE_ARCH_KGDB=y |
1010 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1011 | CONFIG_PPC_WERROR=y | ||
986 | CONFIG_PRINT_STACK_DEPTH=64 | 1012 | CONFIG_PRINT_STACK_DEPTH=64 |
987 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1013 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
988 | # CONFIG_DEBUG_STACK_USAGE is not set | 1014 | # CONFIG_DEBUG_STACK_USAGE is not set |
1015 | # CONFIG_PPC_EMULATED_STATS is not set | ||
989 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1016 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
990 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1017 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
991 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1018 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig index 24fa90792c54..1ae85a3b2942 100644 --- a/arch/powerpc/configs/mgsuvd_defconfig +++ b/arch/powerpc/configs/mgsuvd_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:55 2009 | 4 | # Wed Jul 29 23:31:52 2009 |
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=y | 13 | CONFIG_PPC_8xx=y |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -27,15 +27,16 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 27 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 28 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
31 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 40 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 42 | CONFIG_PPC=y |
@@ -48,11 +49,13 @@ CONFIG_OF=y | |||
48 | # CONFIG_PPC_UDBG_16550 is not set | 49 | # CONFIG_PPC_UDBG_16550 is not set |
49 | # CONFIG_GENERIC_TBSYNC is not set | 50 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 51 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_DTC=y | ||
51 | # CONFIG_DEFAULT_UIMAGE is not set | 53 | # CONFIG_DEFAULT_UIMAGE is not set |
52 | # CONFIG_PPC_DCR_NATIVE is not set | 54 | # CONFIG_PPC_DCR_NATIVE is not set |
53 | # CONFIG_PPC_DCR_MMIO is not set | 55 | # CONFIG_PPC_DCR_MMIO is not set |
54 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 56 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
58 | CONFIG_CONSTRUCTORS=y | ||
56 | 59 | ||
57 | # | 60 | # |
58 | # General setup | 61 | # General setup |
@@ -102,7 +105,6 @@ CONFIG_EMBEDDED=y | |||
102 | # CONFIG_SYSCTL_SYSCALL is not set | 105 | # CONFIG_SYSCTL_SYSCALL is not set |
103 | CONFIG_KALLSYMS=y | 106 | CONFIG_KALLSYMS=y |
104 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 107 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
105 | # CONFIG_STRIP_ASM_SYMS is not set | ||
106 | # CONFIG_HOTPLUG is not set | 108 | # CONFIG_HOTPLUG is not set |
107 | CONFIG_PRINTK=y | 109 | CONFIG_PRINTK=y |
108 | # CONFIG_BUG is not set | 110 | # CONFIG_BUG is not set |
@@ -115,7 +117,14 @@ CONFIG_TIMERFD=y | |||
115 | CONFIG_EVENTFD=y | 117 | CONFIG_EVENTFD=y |
116 | CONFIG_SHMEM=y | 118 | CONFIG_SHMEM=y |
117 | CONFIG_AIO=y | 119 | CONFIG_AIO=y |
120 | CONFIG_HAVE_PERF_COUNTERS=y | ||
121 | |||
122 | # | ||
123 | # Performance Counters | ||
124 | # | ||
125 | # CONFIG_PERF_COUNTERS is not set | ||
118 | # CONFIG_VM_EVENT_COUNTERS is not set | 126 | # CONFIG_VM_EVENT_COUNTERS is not set |
127 | # CONFIG_STRIP_ASM_SYMS is not set | ||
119 | CONFIG_COMPAT_BRK=y | 128 | CONFIG_COMPAT_BRK=y |
120 | CONFIG_SLAB=y | 129 | CONFIG_SLAB=y |
121 | # CONFIG_SLUB is not set | 130 | # CONFIG_SLUB is not set |
@@ -129,6 +138,11 @@ CONFIG_HAVE_KPROBES=y | |||
129 | CONFIG_HAVE_KRETPROBES=y | 138 | CONFIG_HAVE_KRETPROBES=y |
130 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 139 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
131 | CONFIG_HAVE_CLK=y | 140 | CONFIG_HAVE_CLK=y |
141 | |||
142 | # | ||
143 | # GCOV-based kernel profiling | ||
144 | # | ||
145 | # CONFIG_GCOV_KERNEL is not set | ||
132 | # CONFIG_SLOW_WORK is not set | 146 | # CONFIG_SLOW_WORK is not set |
133 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
134 | CONFIG_SLABINFO=y | 148 | CONFIG_SLABINFO=y |
@@ -136,7 +150,7 @@ CONFIG_RT_MUTEXES=y | |||
136 | CONFIG_BASE_SMALL=1 | 150 | CONFIG_BASE_SMALL=1 |
137 | # CONFIG_MODULES is not set | 151 | # CONFIG_MODULES is not set |
138 | CONFIG_BLOCK=y | 152 | CONFIG_BLOCK=y |
139 | # CONFIG_LBD is not set | 153 | CONFIG_LBDAF=y |
140 | # CONFIG_BLK_DEV_BSG is not set | 154 | # CONFIG_BLK_DEV_BSG is not set |
141 | # CONFIG_BLK_DEV_INTEGRITY is not set | 155 | # CONFIG_BLK_DEV_INTEGRITY is not set |
142 | 156 | ||
@@ -222,6 +236,7 @@ CONFIG_BINFMT_ELF=y | |||
222 | # CONFIG_BINFMT_MISC is not set | 236 | # CONFIG_BINFMT_MISC is not set |
223 | CONFIG_MATH_EMULATION=y | 237 | CONFIG_MATH_EMULATION=y |
224 | # CONFIG_IOMMU_HELPER is not set | 238 | # CONFIG_IOMMU_HELPER is not set |
239 | # CONFIG_SWIOTLB is not set | ||
225 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 240 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y |
226 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 241 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
227 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 242 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -241,9 +256,9 @@ CONFIG_MIGRATION=y | |||
241 | CONFIG_ZONE_DMA_FLAG=1 | 256 | CONFIG_ZONE_DMA_FLAG=1 |
242 | CONFIG_BOUNCE=y | 257 | CONFIG_BOUNCE=y |
243 | CONFIG_VIRT_TO_BUS=y | 258 | CONFIG_VIRT_TO_BUS=y |
244 | CONFIG_UNEVICTABLE_LRU=y | ||
245 | CONFIG_HAVE_MLOCK=y | 259 | CONFIG_HAVE_MLOCK=y |
246 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 260 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
261 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
247 | CONFIG_PPC_4K_PAGES=y | 262 | CONFIG_PPC_4K_PAGES=y |
248 | # CONFIG_PPC_16K_PAGES is not set | 263 | # CONFIG_PPC_16K_PAGES is not set |
249 | # CONFIG_PPC_64K_PAGES is not set | 264 | # CONFIG_PPC_64K_PAGES is not set |
@@ -281,6 +296,7 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
281 | CONFIG_KERNEL_START=0xc0000000 | 296 | CONFIG_KERNEL_START=0xc0000000 |
282 | CONFIG_PHYSICAL_START=0x00000000 | 297 | CONFIG_PHYSICAL_START=0x00000000 |
283 | CONFIG_TASK_SIZE=0x80000000 | 298 | CONFIG_TASK_SIZE=0x80000000 |
299 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
284 | CONFIG_NET=y | 300 | CONFIG_NET=y |
285 | 301 | ||
286 | # | 302 | # |
@@ -342,6 +358,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
342 | # CONFIG_ECONET is not set | 358 | # CONFIG_ECONET is not set |
343 | # CONFIG_WAN_ROUTER is not set | 359 | # CONFIG_WAN_ROUTER is not set |
344 | # CONFIG_PHONET is not set | 360 | # CONFIG_PHONET is not set |
361 | # CONFIG_IEEE802154 is not set | ||
345 | # CONFIG_NET_SCHED is not set | 362 | # CONFIG_NET_SCHED is not set |
346 | # CONFIG_DCB is not set | 363 | # CONFIG_DCB is not set |
347 | 364 | ||
@@ -359,7 +376,11 @@ CONFIG_WIRELESS=y | |||
359 | CONFIG_WIRELESS_OLD_REGULATORY=y | 376 | CONFIG_WIRELESS_OLD_REGULATORY=y |
360 | # CONFIG_WIRELESS_EXT is not set | 377 | # CONFIG_WIRELESS_EXT is not set |
361 | # CONFIG_LIB80211 is not set | 378 | # CONFIG_LIB80211 is not set |
362 | # CONFIG_MAC80211 is not set | 379 | |
380 | # | ||
381 | # CFG80211 needs to be enabled for MAC80211 | ||
382 | # | ||
383 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
363 | # CONFIG_WIMAX is not set | 384 | # CONFIG_WIMAX is not set |
364 | # CONFIG_RFKILL is not set | 385 | # CONFIG_RFKILL is not set |
365 | # CONFIG_NET_9P is not set | 386 | # CONFIG_NET_9P is not set |
@@ -463,6 +484,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
463 | # | 484 | # |
464 | # CONFIG_MTD_UBI is not set | 485 | # CONFIG_MTD_UBI is not set |
465 | CONFIG_OF_DEVICE=y | 486 | CONFIG_OF_DEVICE=y |
487 | CONFIG_OF_MDIO=y | ||
466 | # CONFIG_PARPORT is not set | 488 | # CONFIG_PARPORT is not set |
467 | CONFIG_BLK_DEV=y | 489 | CONFIG_BLK_DEV=y |
468 | # CONFIG_BLK_DEV_FD is not set | 490 | # CONFIG_BLK_DEV_FD is not set |
@@ -492,7 +514,6 @@ CONFIG_HAVE_IDE=y | |||
492 | # CONFIG_MD is not set | 514 | # CONFIG_MD is not set |
493 | # CONFIG_MACINTOSH_DRIVERS is not set | 515 | # CONFIG_MACINTOSH_DRIVERS is not set |
494 | CONFIG_NETDEVICES=y | 516 | CONFIG_NETDEVICES=y |
495 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
496 | # CONFIG_DUMMY is not set | 517 | # CONFIG_DUMMY is not set |
497 | # CONFIG_BONDING is not set | 518 | # CONFIG_BONDING is not set |
498 | # CONFIG_MACVLAN is not set | 519 | # CONFIG_MACVLAN is not set |
@@ -531,6 +552,7 @@ CONFIG_MII=y | |||
531 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 552 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
532 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 553 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
533 | # CONFIG_B44 is not set | 554 | # CONFIG_B44 is not set |
555 | # CONFIG_KS8842 is not set | ||
534 | CONFIG_FS_ENET=y | 556 | CONFIG_FS_ENET=y |
535 | CONFIG_FS_ENET_HAS_SCC=y | 557 | CONFIG_FS_ENET_HAS_SCC=y |
536 | # CONFIG_FS_ENET_HAS_FEC is not set | 558 | # CONFIG_FS_ENET_HAS_FEC is not set |
@@ -602,6 +624,11 @@ CONFIG_GEN_RTC=y | |||
602 | # CONFIG_TCG_TPM is not set | 624 | # CONFIG_TCG_TPM is not set |
603 | # CONFIG_I2C is not set | 625 | # CONFIG_I2C is not set |
604 | # CONFIG_SPI is not set | 626 | # CONFIG_SPI is not set |
627 | |||
628 | # | ||
629 | # PPS support | ||
630 | # | ||
631 | # CONFIG_PPS is not set | ||
605 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 632 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
606 | # CONFIG_GPIOLIB is not set | 633 | # CONFIG_GPIOLIB is not set |
607 | # CONFIG_W1 is not set | 634 | # CONFIG_W1 is not set |
@@ -625,22 +652,7 @@ CONFIG_SSB_POSSIBLE=y | |||
625 | # CONFIG_HTC_PASIC3 is not set | 652 | # CONFIG_HTC_PASIC3 is not set |
626 | # CONFIG_MFD_TMIO is not set | 653 | # CONFIG_MFD_TMIO is not set |
627 | # CONFIG_REGULATOR is not set | 654 | # CONFIG_REGULATOR is not set |
628 | 655 | # CONFIG_MEDIA_SUPPORT is not set | |
629 | # | ||
630 | # Multimedia devices | ||
631 | # | ||
632 | |||
633 | # | ||
634 | # Multimedia core support | ||
635 | # | ||
636 | # CONFIG_VIDEO_DEV is not set | ||
637 | # CONFIG_DVB_CORE is not set | ||
638 | # CONFIG_VIDEO_MEDIA is not set | ||
639 | |||
640 | # | ||
641 | # Multimedia drivers | ||
642 | # | ||
643 | # CONFIG_DAB is not set | ||
644 | 656 | ||
645 | # | 657 | # |
646 | # Graphics support | 658 | # Graphics support |
@@ -665,6 +677,10 @@ CONFIG_SSB_POSSIBLE=y | |||
665 | # CONFIG_DMADEVICES is not set | 677 | # CONFIG_DMADEVICES is not set |
666 | # CONFIG_AUXDISPLAY is not set | 678 | # CONFIG_AUXDISPLAY is not set |
667 | # CONFIG_UIO is not set | 679 | # CONFIG_UIO is not set |
680 | |||
681 | # | ||
682 | # TI VLYNQ | ||
683 | # | ||
668 | # CONFIG_STAGING is not set | 684 | # CONFIG_STAGING is not set |
669 | 685 | ||
670 | # | 686 | # |
@@ -687,10 +703,12 @@ CONFIG_FS_MBCACHE=y | |||
687 | # CONFIG_REISERFS_FS is not set | 703 | # CONFIG_REISERFS_FS is not set |
688 | # CONFIG_JFS_FS is not set | 704 | # CONFIG_JFS_FS is not set |
689 | # CONFIG_FS_POSIX_ACL is not set | 705 | # CONFIG_FS_POSIX_ACL is not set |
690 | CONFIG_FILE_LOCKING=y | ||
691 | # CONFIG_XFS_FS is not set | 706 | # CONFIG_XFS_FS is not set |
707 | # CONFIG_GFS2_FS is not set | ||
692 | # CONFIG_OCFS2_FS is not set | 708 | # CONFIG_OCFS2_FS is not set |
693 | # CONFIG_BTRFS_FS is not set | 709 | # CONFIG_BTRFS_FS is not set |
710 | CONFIG_FILE_LOCKING=y | ||
711 | CONFIG_FSNOTIFY=y | ||
694 | CONFIG_DNOTIFY=y | 712 | CONFIG_DNOTIFY=y |
695 | CONFIG_INOTIFY=y | 713 | CONFIG_INOTIFY=y |
696 | CONFIG_INOTIFY_USER=y | 714 | CONFIG_INOTIFY_USER=y |
@@ -823,6 +841,7 @@ CONFIG_HAS_IOPORT=y | |||
823 | CONFIG_HAS_DMA=y | 841 | CONFIG_HAS_DMA=y |
824 | CONFIG_HAVE_LMB=y | 842 | CONFIG_HAVE_LMB=y |
825 | CONFIG_NLATTR=y | 843 | CONFIG_NLATTR=y |
844 | CONFIG_GENERIC_ATOMIC64=y | ||
826 | 845 | ||
827 | # | 846 | # |
828 | # Kernel hacking | 847 | # Kernel hacking |
@@ -844,24 +863,14 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
844 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 863 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
845 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 864 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
846 | CONFIG_TRACING_SUPPORT=y | 865 | CONFIG_TRACING_SUPPORT=y |
847 | 866 | # CONFIG_FTRACE is not set | |
848 | # | ||
849 | # Tracers | ||
850 | # | ||
851 | # CONFIG_FUNCTION_TRACER is not set | ||
852 | # CONFIG_SCHED_TRACER is not set | ||
853 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
854 | # CONFIG_EVENT_TRACER is not set | ||
855 | # CONFIG_BOOT_TRACER is not set | ||
856 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
857 | # CONFIG_STACK_TRACER is not set | ||
858 | # CONFIG_KMEMTRACE is not set | ||
859 | # CONFIG_WORKQUEUE_TRACER is not set | ||
860 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
861 | # CONFIG_DYNAMIC_DEBUG is not set | 867 | # CONFIG_DYNAMIC_DEBUG is not set |
862 | # CONFIG_SAMPLES is not set | 868 | # CONFIG_SAMPLES is not set |
863 | CONFIG_HAVE_ARCH_KGDB=y | 869 | CONFIG_HAVE_ARCH_KGDB=y |
870 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
871 | CONFIG_PPC_WERROR=y | ||
864 | CONFIG_PRINT_STACK_DEPTH=64 | 872 | CONFIG_PRINT_STACK_DEPTH=64 |
873 | # CONFIG_PPC_EMULATED_STATS is not set | ||
865 | # CONFIG_IRQSTACKS is not set | 874 | # CONFIG_IRQSTACKS is not set |
866 | # CONFIG_VIRQ_DEBUG is not set | 875 | # CONFIG_VIRQ_DEBUG is not set |
867 | # CONFIG_PPC_EARLY_DEBUG is not set | 876 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index 642ab67c8431..f23428c3b34e 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:56 2009 | 4 | # Wed Jul 29 23:31:53 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | CONFIG_ALTIVEC=y | 20 | CONFIG_ALTIVEC=y |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
25 | CONFIG_WORD_SIZE=32 | 27 | CONFIG_WORD_SIZE=32 |
@@ -30,15 +32,16 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 38 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
40 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 41 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 43 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 44 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 46 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
44 | CONFIG_PPC=y | 47 | CONFIG_PPC=y |
@@ -52,11 +55,13 @@ CONFIG_PPC_UDBG_16550=y | |||
52 | # CONFIG_GENERIC_TBSYNC is not set | 55 | # CONFIG_GENERIC_TBSYNC is not set |
53 | CONFIG_AUDIT_ARCH=y | 56 | CONFIG_AUDIT_ARCH=y |
54 | CONFIG_GENERIC_BUG=y | 57 | CONFIG_GENERIC_BUG=y |
58 | CONFIG_DTC=y | ||
55 | CONFIG_DEFAULT_UIMAGE=y | 59 | CONFIG_DEFAULT_UIMAGE=y |
56 | # CONFIG_PPC_DCR_NATIVE is not set | 60 | # CONFIG_PPC_DCR_NATIVE is not set |
57 | # CONFIG_PPC_DCR_MMIO is not set | 61 | # CONFIG_PPC_DCR_MMIO is not set |
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 |
@@ -106,7 +111,6 @@ CONFIG_EMBEDDED=y | |||
106 | CONFIG_SYSCTL_SYSCALL=y | 111 | CONFIG_SYSCTL_SYSCALL=y |
107 | CONFIG_KALLSYMS=y | 112 | CONFIG_KALLSYMS=y |
108 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 113 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
109 | # CONFIG_STRIP_ASM_SYMS is not set | ||
110 | CONFIG_HOTPLUG=y | 114 | CONFIG_HOTPLUG=y |
111 | CONFIG_PRINTK=y | 115 | CONFIG_PRINTK=y |
112 | CONFIG_BUG=y | 116 | CONFIG_BUG=y |
@@ -119,9 +123,16 @@ CONFIG_TIMERFD=y | |||
119 | CONFIG_EVENTFD=y | 123 | CONFIG_EVENTFD=y |
120 | CONFIG_SHMEM=y | 124 | CONFIG_SHMEM=y |
121 | CONFIG_AIO=y | 125 | CONFIG_AIO=y |
126 | CONFIG_HAVE_PERF_COUNTERS=y | ||
127 | |||
128 | # | ||
129 | # Performance Counters | ||
130 | # | ||
131 | # CONFIG_PERF_COUNTERS is not set | ||
122 | CONFIG_VM_EVENT_COUNTERS=y | 132 | CONFIG_VM_EVENT_COUNTERS=y |
123 | CONFIG_PCI_QUIRKS=y | 133 | CONFIG_PCI_QUIRKS=y |
124 | CONFIG_SLUB_DEBUG=y | 134 | CONFIG_SLUB_DEBUG=y |
135 | # CONFIG_STRIP_ASM_SYMS is not set | ||
125 | CONFIG_COMPAT_BRK=y | 136 | CONFIG_COMPAT_BRK=y |
126 | # CONFIG_SLAB is not set | 137 | # CONFIG_SLAB is not set |
127 | CONFIG_SLUB=y | 138 | CONFIG_SLUB=y |
@@ -134,6 +145,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
134 | CONFIG_HAVE_KPROBES=y | 145 | CONFIG_HAVE_KPROBES=y |
135 | CONFIG_HAVE_KRETPROBES=y | 146 | CONFIG_HAVE_KRETPROBES=y |
136 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 147 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
148 | |||
149 | # | ||
150 | # GCOV-based kernel profiling | ||
151 | # | ||
137 | # CONFIG_SLOW_WORK is not set | 152 | # CONFIG_SLOW_WORK is not set |
138 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 153 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
139 | CONFIG_SLABINFO=y | 154 | CONFIG_SLABINFO=y |
@@ -141,7 +156,7 @@ CONFIG_RT_MUTEXES=y | |||
141 | CONFIG_BASE_SMALL=0 | 156 | CONFIG_BASE_SMALL=0 |
142 | # CONFIG_MODULES is not set | 157 | # CONFIG_MODULES is not set |
143 | CONFIG_BLOCK=y | 158 | CONFIG_BLOCK=y |
144 | CONFIG_LBD=y | 159 | CONFIG_LBDAF=y |
145 | # CONFIG_BLK_DEV_BSG is not set | 160 | # CONFIG_BLK_DEV_BSG is not set |
146 | # CONFIG_BLK_DEV_INTEGRITY is not set | 161 | # CONFIG_BLK_DEV_INTEGRITY is not set |
147 | 162 | ||
@@ -220,6 +235,7 @@ CONFIG_BINFMT_ELF=y | |||
220 | # CONFIG_HAVE_AOUT is not set | 235 | # CONFIG_HAVE_AOUT is not set |
221 | CONFIG_BINFMT_MISC=y | 236 | CONFIG_BINFMT_MISC=y |
222 | # CONFIG_IOMMU_HELPER is not set | 237 | # CONFIG_IOMMU_HELPER is not set |
238 | # CONFIG_SWIOTLB is not set | ||
223 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 239 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
224 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 240 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
225 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 241 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -240,9 +256,9 @@ CONFIG_MIGRATION=y | |||
240 | CONFIG_ZONE_DMA_FLAG=1 | 256 | CONFIG_ZONE_DMA_FLAG=1 |
241 | CONFIG_BOUNCE=y | 257 | CONFIG_BOUNCE=y |
242 | CONFIG_VIRT_TO_BUS=y | 258 | CONFIG_VIRT_TO_BUS=y |
243 | CONFIG_UNEVICTABLE_LRU=y | ||
244 | CONFIG_HAVE_MLOCK=y | 259 | CONFIG_HAVE_MLOCK=y |
245 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 260 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
261 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
246 | CONFIG_PPC_4K_PAGES=y | 262 | CONFIG_PPC_4K_PAGES=y |
247 | # CONFIG_PPC_16K_PAGES is not set | 263 | # CONFIG_PPC_16K_PAGES is not set |
248 | # CONFIG_PPC_64K_PAGES is not set | 264 | # CONFIG_PPC_64K_PAGES is not set |
@@ -348,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
348 | # CONFIG_ECONET is not set | 364 | # CONFIG_ECONET is not set |
349 | # CONFIG_WAN_ROUTER is not set | 365 | # CONFIG_WAN_ROUTER is not set |
350 | # CONFIG_PHONET is not set | 366 | # CONFIG_PHONET is not set |
367 | # CONFIG_IEEE802154 is not set | ||
351 | # CONFIG_NET_SCHED is not set | 368 | # CONFIG_NET_SCHED is not set |
352 | # CONFIG_DCB is not set | 369 | # CONFIG_DCB is not set |
353 | 370 | ||
@@ -365,7 +382,11 @@ CONFIG_WIRELESS=y | |||
365 | CONFIG_WIRELESS_OLD_REGULATORY=y | 382 | CONFIG_WIRELESS_OLD_REGULATORY=y |
366 | # CONFIG_WIRELESS_EXT is not set | 383 | # CONFIG_WIRELESS_EXT is not set |
367 | # CONFIG_LIB80211 is not set | 384 | # CONFIG_LIB80211 is not set |
368 | # CONFIG_MAC80211 is not set | 385 | |
386 | # | ||
387 | # CFG80211 needs to be enabled for MAC80211 | ||
388 | # | ||
389 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
369 | # CONFIG_WIMAX is not set | 390 | # CONFIG_WIMAX is not set |
370 | # CONFIG_RFKILL is not set | 391 | # CONFIG_RFKILL is not set |
371 | # CONFIG_NET_9P is not set | 392 | # CONFIG_NET_9P is not set |
@@ -385,6 +406,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
385 | # CONFIG_CONNECTOR is not set | 406 | # CONFIG_CONNECTOR is not set |
386 | # CONFIG_MTD is not set | 407 | # CONFIG_MTD is not set |
387 | CONFIG_OF_DEVICE=y | 408 | CONFIG_OF_DEVICE=y |
409 | CONFIG_OF_MDIO=y | ||
388 | # CONFIG_PARPORT is not set | 410 | # CONFIG_PARPORT is not set |
389 | CONFIG_BLK_DEV=y | 411 | CONFIG_BLK_DEV=y |
390 | # CONFIG_BLK_DEV_FD is not set | 412 | # CONFIG_BLK_DEV_FD is not set |
@@ -416,6 +438,7 @@ CONFIG_MISC_DEVICES=y | |||
416 | # EEPROM support | 438 | # EEPROM support |
417 | # | 439 | # |
418 | # CONFIG_EEPROM_93CX6 is not set | 440 | # CONFIG_EEPROM_93CX6 is not set |
441 | # CONFIG_CB710_CORE is not set | ||
419 | CONFIG_HAVE_IDE=y | 442 | CONFIG_HAVE_IDE=y |
420 | # CONFIG_IDE is not set | 443 | # CONFIG_IDE is not set |
421 | 444 | ||
@@ -438,10 +461,6 @@ CONFIG_BLK_DEV_SD=y | |||
438 | # CONFIG_BLK_DEV_SR is not set | 461 | # CONFIG_BLK_DEV_SR is not set |
439 | # CONFIG_CHR_DEV_SG is not set | 462 | # CONFIG_CHR_DEV_SG is not set |
440 | # CONFIG_CHR_DEV_SCH is not set | 463 | # CONFIG_CHR_DEV_SCH is not set |
441 | |||
442 | # | ||
443 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
444 | # | ||
445 | # CONFIG_SCSI_MULTI_LUN is not set | 464 | # CONFIG_SCSI_MULTI_LUN is not set |
446 | # CONFIG_SCSI_CONSTANTS is not set | 465 | # CONFIG_SCSI_CONSTANTS is not set |
447 | # CONFIG_SCSI_LOGGING is not set | 466 | # CONFIG_SCSI_LOGGING is not set |
@@ -458,6 +477,7 @@ CONFIG_BLK_DEV_SD=y | |||
458 | CONFIG_SCSI_LOWLEVEL=y | 477 | CONFIG_SCSI_LOWLEVEL=y |
459 | # CONFIG_ISCSI_TCP is not set | 478 | # CONFIG_ISCSI_TCP is not set |
460 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 479 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
480 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
461 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 481 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
462 | # CONFIG_SCSI_3W_9XXX is not set | 482 | # CONFIG_SCSI_3W_9XXX is not set |
463 | # CONFIG_SCSI_ACARD is not set | 483 | # CONFIG_SCSI_ACARD is not set |
@@ -466,6 +486,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
466 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 486 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
467 | # CONFIG_SCSI_AIC79XX is not set | 487 | # CONFIG_SCSI_AIC79XX is not set |
468 | # CONFIG_SCSI_AIC94XX is not set | 488 | # CONFIG_SCSI_AIC94XX is not set |
489 | # CONFIG_SCSI_MVSAS is not set | ||
469 | # CONFIG_SCSI_DPT_I2O is not set | 490 | # CONFIG_SCSI_DPT_I2O is not set |
470 | # CONFIG_SCSI_ADVANSYS is not set | 491 | # CONFIG_SCSI_ADVANSYS is not set |
471 | # CONFIG_SCSI_ARCMSR is not set | 492 | # CONFIG_SCSI_ARCMSR is not set |
@@ -485,7 +506,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
485 | # CONFIG_SCSI_IPS is not set | 506 | # CONFIG_SCSI_IPS is not set |
486 | # CONFIG_SCSI_INITIO is not set | 507 | # CONFIG_SCSI_INITIO is not set |
487 | # CONFIG_SCSI_INIA100 is not set | 508 | # CONFIG_SCSI_INIA100 is not set |
488 | # CONFIG_SCSI_MVSAS is not set | ||
489 | # CONFIG_SCSI_STEX is not set | 509 | # CONFIG_SCSI_STEX is not set |
490 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 510 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
491 | # CONFIG_SCSI_IPR is not set | 511 | # CONFIG_SCSI_IPR is not set |
@@ -568,14 +588,17 @@ CONFIG_SATA_MV=y | |||
568 | # | 588 | # |
569 | 589 | ||
570 | # | 590 | # |
571 | # Enable only one of the two stacks, unless you know what you are doing | 591 | # You can enable one or both FireWire driver stacks. |
592 | # | ||
593 | |||
594 | # | ||
595 | # See the help texts for more information. | ||
572 | # | 596 | # |
573 | # CONFIG_FIREWIRE is not set | 597 | # CONFIG_FIREWIRE is not set |
574 | # CONFIG_IEEE1394 is not set | 598 | # CONFIG_IEEE1394 is not set |
575 | # CONFIG_I2O is not set | 599 | # CONFIG_I2O is not set |
576 | # CONFIG_MACINTOSH_DRIVERS is not set | 600 | # CONFIG_MACINTOSH_DRIVERS is not set |
577 | CONFIG_NETDEVICES=y | 601 | CONFIG_NETDEVICES=y |
578 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
579 | # CONFIG_DUMMY is not set | 602 | # CONFIG_DUMMY is not set |
580 | # CONFIG_BONDING is not set | 603 | # CONFIG_BONDING is not set |
581 | # CONFIG_MACVLAN is not set | 604 | # CONFIG_MACVLAN is not set |
@@ -642,6 +665,7 @@ CONFIG_8139TOO=y | |||
642 | # CONFIG_SMSC9420 is not set | 665 | # CONFIG_SMSC9420 is not set |
643 | # CONFIG_SUNDANCE is not set | 666 | # CONFIG_SUNDANCE is not set |
644 | # CONFIG_TLAN is not set | 667 | # CONFIG_TLAN is not set |
668 | # CONFIG_KS8842 is not set | ||
645 | # CONFIG_VIA_RHINE is not set | 669 | # CONFIG_VIA_RHINE is not set |
646 | # CONFIG_SC92031 is not set | 670 | # CONFIG_SC92031 is not set |
647 | # CONFIG_ATL2 is not set | 671 | # CONFIG_ATL2 is not set |
@@ -663,7 +687,9 @@ CONFIG_NETDEV_1000=y | |||
663 | # CONFIG_VIA_VELOCITY is not set | 687 | # CONFIG_VIA_VELOCITY is not set |
664 | # CONFIG_TIGON3 is not set | 688 | # CONFIG_TIGON3 is not set |
665 | # CONFIG_BNX2 is not set | 689 | # CONFIG_BNX2 is not set |
690 | # CONFIG_CNIC is not set | ||
666 | CONFIG_TSI108_ETH=y | 691 | CONFIG_TSI108_ETH=y |
692 | # CONFIG_MV643XX_ETH is not set | ||
667 | # CONFIG_QLA3XXX is not set | 693 | # CONFIG_QLA3XXX is not set |
668 | # CONFIG_ATL1 is not set | 694 | # CONFIG_ATL1 is not set |
669 | # CONFIG_ATL1E is not set | 695 | # CONFIG_ATL1E is not set |
@@ -785,6 +811,11 @@ CONFIG_GEN_RTC=y | |||
785 | CONFIG_DEVPORT=y | 811 | CONFIG_DEVPORT=y |
786 | # CONFIG_I2C is not set | 812 | # CONFIG_I2C is not set |
787 | # CONFIG_SPI is not set | 813 | # CONFIG_SPI is not set |
814 | |||
815 | # | ||
816 | # PPS support | ||
817 | # | ||
818 | # CONFIG_PPS is not set | ||
788 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 819 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
789 | # CONFIG_GPIOLIB is not set | 820 | # CONFIG_GPIOLIB is not set |
790 | # CONFIG_W1 is not set | 821 | # CONFIG_W1 is not set |
@@ -824,22 +855,7 @@ CONFIG_SSB_POSSIBLE=y | |||
824 | # CONFIG_HTC_PASIC3 is not set | 855 | # CONFIG_HTC_PASIC3 is not set |
825 | # CONFIG_MFD_TMIO is not set | 856 | # CONFIG_MFD_TMIO is not set |
826 | # CONFIG_REGULATOR is not set | 857 | # CONFIG_REGULATOR is not set |
827 | 858 | # CONFIG_MEDIA_SUPPORT is not set | |
828 | # | ||
829 | # Multimedia devices | ||
830 | # | ||
831 | |||
832 | # | ||
833 | # Multimedia core support | ||
834 | # | ||
835 | # CONFIG_VIDEO_DEV is not set | ||
836 | # CONFIG_DVB_CORE is not set | ||
837 | # CONFIG_VIDEO_MEDIA is not set | ||
838 | |||
839 | # | ||
840 | # Multimedia drivers | ||
841 | # | ||
842 | CONFIG_DAB=y | ||
843 | 859 | ||
844 | # | 860 | # |
845 | # Graphics support | 861 | # Graphics support |
@@ -896,6 +912,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
896 | # CONFIG_DMADEVICES is not set | 912 | # CONFIG_DMADEVICES is not set |
897 | # CONFIG_AUXDISPLAY is not set | 913 | # CONFIG_AUXDISPLAY is not set |
898 | # CONFIG_UIO is not set | 914 | # CONFIG_UIO is not set |
915 | |||
916 | # | ||
917 | # TI VLYNQ | ||
918 | # | ||
899 | # CONFIG_STAGING is not set | 919 | # CONFIG_STAGING is not set |
900 | 920 | ||
901 | # | 921 | # |
@@ -915,11 +935,12 @@ CONFIG_FS_MBCACHE=y | |||
915 | # CONFIG_REISERFS_FS is not set | 935 | # CONFIG_REISERFS_FS is not set |
916 | # CONFIG_JFS_FS is not set | 936 | # CONFIG_JFS_FS is not set |
917 | # CONFIG_FS_POSIX_ACL is not set | 937 | # CONFIG_FS_POSIX_ACL is not set |
918 | CONFIG_FILE_LOCKING=y | ||
919 | # CONFIG_XFS_FS is not set | 938 | # CONFIG_XFS_FS is not set |
920 | # CONFIG_GFS2_FS is not set | 939 | # CONFIG_GFS2_FS is not set |
921 | # CONFIG_OCFS2_FS is not set | 940 | # CONFIG_OCFS2_FS is not set |
922 | # CONFIG_BTRFS_FS is not set | 941 | # CONFIG_BTRFS_FS is not set |
942 | CONFIG_FILE_LOCKING=y | ||
943 | CONFIG_FSNOTIFY=y | ||
923 | CONFIG_DNOTIFY=y | 944 | CONFIG_DNOTIFY=y |
924 | CONFIG_INOTIFY=y | 945 | CONFIG_INOTIFY=y |
925 | CONFIG_INOTIFY_USER=y | 946 | CONFIG_INOTIFY_USER=y |
@@ -1038,6 +1059,7 @@ CONFIG_HAS_IOPORT=y | |||
1038 | CONFIG_HAS_DMA=y | 1059 | CONFIG_HAS_DMA=y |
1039 | CONFIG_HAVE_LMB=y | 1060 | CONFIG_HAVE_LMB=y |
1040 | CONFIG_NLATTR=y | 1061 | CONFIG_NLATTR=y |
1062 | CONFIG_GENERIC_ATOMIC64=y | ||
1041 | 1063 | ||
1042 | # | 1064 | # |
1043 | # Kernel hacking | 1065 | # Kernel hacking |
@@ -1063,22 +1085,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1063 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1085 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1064 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1086 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1065 | CONFIG_TRACING_SUPPORT=y | 1087 | CONFIG_TRACING_SUPPORT=y |
1066 | 1088 | # CONFIG_FTRACE is not set | |
1067 | # | ||
1068 | # Tracers | ||
1069 | # | ||
1070 | # CONFIG_FUNCTION_TRACER is not set | ||
1071 | # CONFIG_SCHED_TRACER is not set | ||
1072 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1073 | # CONFIG_EVENT_TRACER is not set | ||
1074 | # CONFIG_BOOT_TRACER is not set | ||
1075 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1076 | # CONFIG_STACK_TRACER is not set | ||
1077 | # CONFIG_KMEMTRACE is not set | ||
1078 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1079 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1080 | # CONFIG_SAMPLES is not set | 1089 | # CONFIG_SAMPLES is not set |
1081 | CONFIG_HAVE_ARCH_KGDB=y | 1090 | CONFIG_HAVE_ARCH_KGDB=y |
1091 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1092 | CONFIG_PPC_WERROR=y | ||
1082 | CONFIG_PRINT_STACK_DEPTH=64 | 1093 | CONFIG_PRINT_STACK_DEPTH=64 |
1083 | # CONFIG_IRQSTACKS is not set | 1094 | # CONFIG_IRQSTACKS is not set |
1084 | # CONFIG_BOOTX_TEXT is not set | 1095 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index cb966ca2ce89..02716f72db6f 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:57 2009 | 4 | # Wed Jul 29 23:31:54 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_ALTIVEC is not set | 20 | # CONFIG_ALTIVEC is not set |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
25 | CONFIG_WORD_SIZE=32 | 27 | CONFIG_WORD_SIZE=32 |
@@ -30,15 +32,16 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 38 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
40 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 41 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 43 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 44 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | CONFIG_GENERIC_GPIO=y | 46 | CONFIG_GENERIC_GPIO=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -53,11 +56,13 @@ CONFIG_OF=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | # CONFIG_PPC_DCR_NATIVE is not set | 61 | # CONFIG_PPC_DCR_NATIVE is not set |
58 | # CONFIG_PPC_DCR_MMIO is not set | 62 | # CONFIG_PPC_DCR_MMIO is not set |
59 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
65 | CONFIG_CONSTRUCTORS=y | ||
61 | 66 | ||
62 | # | 67 | # |
63 | # General setup | 68 | # General setup |
@@ -99,7 +104,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
99 | CONFIG_KALLSYMS=y | 104 | CONFIG_KALLSYMS=y |
100 | CONFIG_KALLSYMS_ALL=y | 105 | CONFIG_KALLSYMS_ALL=y |
101 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 106 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
102 | # CONFIG_STRIP_ASM_SYMS is not set | ||
103 | CONFIG_HOTPLUG=y | 107 | CONFIG_HOTPLUG=y |
104 | CONFIG_PRINTK=y | 108 | CONFIG_PRINTK=y |
105 | CONFIG_BUG=y | 109 | CONFIG_BUG=y |
@@ -112,9 +116,16 @@ CONFIG_TIMERFD=y | |||
112 | CONFIG_EVENTFD=y | 116 | CONFIG_EVENTFD=y |
113 | CONFIG_SHMEM=y | 117 | CONFIG_SHMEM=y |
114 | CONFIG_AIO=y | 118 | CONFIG_AIO=y |
119 | CONFIG_HAVE_PERF_COUNTERS=y | ||
120 | |||
121 | # | ||
122 | # Performance Counters | ||
123 | # | ||
124 | # CONFIG_PERF_COUNTERS is not set | ||
115 | CONFIG_VM_EVENT_COUNTERS=y | 125 | CONFIG_VM_EVENT_COUNTERS=y |
116 | CONFIG_PCI_QUIRKS=y | 126 | CONFIG_PCI_QUIRKS=y |
117 | CONFIG_SLUB_DEBUG=y | 127 | CONFIG_SLUB_DEBUG=y |
128 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_COMPAT_BRK=y | 129 | CONFIG_COMPAT_BRK=y |
119 | # CONFIG_SLAB is not set | 130 | # CONFIG_SLAB is not set |
120 | CONFIG_SLUB=y | 131 | CONFIG_SLUB=y |
@@ -128,6 +139,10 @@ CONFIG_HAVE_KPROBES=y | |||
128 | CONFIG_HAVE_KRETPROBES=y | 139 | CONFIG_HAVE_KRETPROBES=y |
129 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 140 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
130 | CONFIG_HAVE_CLK=y | 141 | CONFIG_HAVE_CLK=y |
142 | |||
143 | # | ||
144 | # GCOV-based kernel profiling | ||
145 | # | ||
131 | # CONFIG_SLOW_WORK is not set | 146 | # CONFIG_SLOW_WORK is not set |
132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
133 | CONFIG_SLABINFO=y | 148 | CONFIG_SLABINFO=y |
@@ -135,7 +150,7 @@ CONFIG_RT_MUTEXES=y | |||
135 | CONFIG_BASE_SMALL=0 | 150 | CONFIG_BASE_SMALL=0 |
136 | # CONFIG_MODULES is not set | 151 | # CONFIG_MODULES is not set |
137 | CONFIG_BLOCK=y | 152 | CONFIG_BLOCK=y |
138 | # CONFIG_LBD is not set | 153 | CONFIG_LBDAF=y |
139 | # CONFIG_BLK_DEV_INTEGRITY is not set | 154 | # CONFIG_BLK_DEV_INTEGRITY is not set |
140 | 155 | ||
141 | # | 156 | # |
@@ -216,6 +231,7 @@ CONFIG_BINFMT_ELF=y | |||
216 | # CONFIG_HAVE_AOUT is not set | 231 | # CONFIG_HAVE_AOUT is not set |
217 | CONFIG_BINFMT_MISC=y | 232 | CONFIG_BINFMT_MISC=y |
218 | # CONFIG_IOMMU_HELPER is not set | 233 | # CONFIG_IOMMU_HELPER is not set |
234 | # CONFIG_SWIOTLB is not set | ||
219 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 235 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
220 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 236 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
221 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 237 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -231,9 +247,9 @@ CONFIG_MIGRATION=y | |||
231 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
232 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
233 | CONFIG_VIRT_TO_BUS=y | 249 | CONFIG_VIRT_TO_BUS=y |
234 | CONFIG_UNEVICTABLE_LRU=y | ||
235 | CONFIG_HAVE_MLOCK=y | 250 | CONFIG_HAVE_MLOCK=y |
236 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 251 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
252 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
237 | CONFIG_PPC_4K_PAGES=y | 253 | CONFIG_PPC_4K_PAGES=y |
238 | # CONFIG_PPC_16K_PAGES is not set | 254 | # CONFIG_PPC_16K_PAGES is not set |
239 | # CONFIG_PPC_64K_PAGES is not set | 255 | # CONFIG_PPC_64K_PAGES is not set |
@@ -303,6 +319,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
303 | # CONFIG_NET_IPIP is not set | 319 | # CONFIG_NET_IPIP is not set |
304 | # CONFIG_NET_IPGRE is not set | 320 | # CONFIG_NET_IPGRE is not set |
305 | # CONFIG_IP_MROUTE is not set | 321 | # CONFIG_IP_MROUTE is not set |
322 | # CONFIG_ARPD is not set | ||
306 | CONFIG_SYN_COOKIES=y | 323 | CONFIG_SYN_COOKIES=y |
307 | # CONFIG_INET_AH is not set | 324 | # CONFIG_INET_AH is not set |
308 | # CONFIG_INET_ESP is not set | 325 | # CONFIG_INET_ESP is not set |
@@ -383,7 +400,11 @@ CONFIG_WIRELESS=y | |||
383 | CONFIG_WIRELESS_OLD_REGULATORY=y | 400 | CONFIG_WIRELESS_OLD_REGULATORY=y |
384 | # CONFIG_WIRELESS_EXT is not set | 401 | # CONFIG_WIRELESS_EXT is not set |
385 | # CONFIG_LIB80211 is not set | 402 | # CONFIG_LIB80211 is not set |
386 | # CONFIG_MAC80211 is not set | 403 | |
404 | # | ||
405 | # CFG80211 needs to be enabled for MAC80211 | ||
406 | # | ||
407 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
387 | # CONFIG_WIMAX is not set | 408 | # CONFIG_WIMAX is not set |
388 | # CONFIG_RFKILL is not set | 409 | # CONFIG_RFKILL is not set |
389 | 410 | ||
@@ -489,6 +510,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
489 | # CONFIG_MTD_UBI is not set | 510 | # CONFIG_MTD_UBI is not set |
490 | CONFIG_OF_DEVICE=y | 511 | CONFIG_OF_DEVICE=y |
491 | CONFIG_OF_GPIO=y | 512 | CONFIG_OF_GPIO=y |
513 | CONFIG_OF_MDIO=y | ||
492 | # CONFIG_PARPORT is not set | 514 | # CONFIG_PARPORT is not set |
493 | CONFIG_BLK_DEV=y | 515 | CONFIG_BLK_DEV=y |
494 | # CONFIG_BLK_DEV_FD is not set | 516 | # CONFIG_BLK_DEV_FD is not set |
@@ -524,13 +546,17 @@ CONFIG_HAVE_IDE=y | |||
524 | # | 546 | # |
525 | 547 | ||
526 | # | 548 | # |
527 | # A new alternative FireWire stack is available with EXPERIMENTAL=y | 549 | # You can enable one or both FireWire driver stacks. |
550 | # | ||
551 | |||
552 | # | ||
553 | # See the help texts for more information. | ||
528 | # | 554 | # |
555 | # CONFIG_FIREWIRE is not set | ||
529 | # CONFIG_IEEE1394 is not set | 556 | # CONFIG_IEEE1394 is not set |
530 | # CONFIG_I2O is not set | 557 | # CONFIG_I2O is not set |
531 | # CONFIG_MACINTOSH_DRIVERS is not set | 558 | # CONFIG_MACINTOSH_DRIVERS is not set |
532 | CONFIG_NETDEVICES=y | 559 | CONFIG_NETDEVICES=y |
533 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
534 | # CONFIG_DUMMY is not set | 560 | # CONFIG_DUMMY is not set |
535 | # CONFIG_BONDING is not set | 561 | # CONFIG_BONDING is not set |
536 | # CONFIG_EQUALIZER is not set | 562 | # CONFIG_EQUALIZER is not set |
@@ -577,6 +603,7 @@ CONFIG_MII=y | |||
577 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 603 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
578 | # CONFIG_NET_PCI is not set | 604 | # CONFIG_NET_PCI is not set |
579 | # CONFIG_B44 is not set | 605 | # CONFIG_B44 is not set |
606 | # CONFIG_KS8842 is not set | ||
580 | # CONFIG_ATL2 is not set | 607 | # CONFIG_ATL2 is not set |
581 | CONFIG_FS_ENET=y | 608 | CONFIG_FS_ENET=y |
582 | # CONFIG_FS_ENET_HAS_SCC is not set | 609 | # CONFIG_FS_ENET_HAS_SCC is not set |
@@ -598,8 +625,10 @@ CONFIG_NETDEV_1000=y | |||
598 | # CONFIG_VIA_VELOCITY is not set | 625 | # CONFIG_VIA_VELOCITY is not set |
599 | # CONFIG_TIGON3 is not set | 626 | # CONFIG_TIGON3 is not set |
600 | # CONFIG_BNX2 is not set | 627 | # CONFIG_BNX2 is not set |
628 | # CONFIG_CNIC is not set | ||
601 | # CONFIG_FSL_PQ_MDIO is not set | 629 | # CONFIG_FSL_PQ_MDIO is not set |
602 | # CONFIG_GIANFAR is not set | 630 | # CONFIG_GIANFAR is not set |
631 | # CONFIG_MV643XX_ETH is not set | ||
603 | # CONFIG_QLA3XXX is not set | 632 | # CONFIG_QLA3XXX is not set |
604 | # CONFIG_ATL1 is not set | 633 | # CONFIG_ATL1 is not set |
605 | # CONFIG_JME is not set | 634 | # CONFIG_JME is not set |
@@ -671,12 +700,13 @@ CONFIG_INPUT_EVDEV=y | |||
671 | # | 700 | # |
672 | CONFIG_INPUT_KEYBOARD=y | 701 | CONFIG_INPUT_KEYBOARD=y |
673 | CONFIG_KEYBOARD_ATKBD=y | 702 | CONFIG_KEYBOARD_ATKBD=y |
674 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
675 | # CONFIG_KEYBOARD_LKKBD is not set | 703 | # CONFIG_KEYBOARD_LKKBD is not set |
676 | # CONFIG_KEYBOARD_XTKBD is not set | 704 | # CONFIG_KEYBOARD_GPIO is not set |
705 | # CONFIG_KEYBOARD_MATRIX is not set | ||
677 | # CONFIG_KEYBOARD_NEWTON is not set | 706 | # CONFIG_KEYBOARD_NEWTON is not set |
678 | # CONFIG_KEYBOARD_STOWAWAY is not set | 707 | # CONFIG_KEYBOARD_STOWAWAY is not set |
679 | # CONFIG_KEYBOARD_GPIO is not set | 708 | # CONFIG_KEYBOARD_SUNKBD is not set |
709 | # CONFIG_KEYBOARD_XTKBD is not set | ||
680 | CONFIG_INPUT_MOUSE=y | 710 | CONFIG_INPUT_MOUSE=y |
681 | CONFIG_MOUSE_PS2=y | 711 | CONFIG_MOUSE_PS2=y |
682 | CONFIG_MOUSE_PS2_ALPS=y | 712 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -741,6 +771,10 @@ CONFIG_HW_RANDOM=y | |||
741 | CONFIG_DEVPORT=y | 771 | CONFIG_DEVPORT=y |
742 | # CONFIG_I2C is not set | 772 | # CONFIG_I2C is not set |
743 | # CONFIG_SPI is not set | 773 | # CONFIG_SPI is not set |
774 | |||
775 | # | ||
776 | # PPS support | ||
777 | # | ||
744 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 778 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
745 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 779 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
746 | CONFIG_GPIOLIB=y | 780 | CONFIG_GPIOLIB=y |
@@ -784,22 +818,7 @@ CONFIG_SSB_POSSIBLE=y | |||
784 | # CONFIG_HTC_PASIC3 is not set | 818 | # CONFIG_HTC_PASIC3 is not set |
785 | # CONFIG_MFD_TMIO is not set | 819 | # CONFIG_MFD_TMIO is not set |
786 | # CONFIG_REGULATOR is not set | 820 | # CONFIG_REGULATOR is not set |
787 | 821 | # CONFIG_MEDIA_SUPPORT is not set | |
788 | # | ||
789 | # Multimedia devices | ||
790 | # | ||
791 | |||
792 | # | ||
793 | # Multimedia core support | ||
794 | # | ||
795 | # CONFIG_VIDEO_DEV is not set | ||
796 | # CONFIG_DVB_CORE is not set | ||
797 | # CONFIG_VIDEO_MEDIA is not set | ||
798 | |||
799 | # | ||
800 | # Multimedia drivers | ||
801 | # | ||
802 | CONFIG_DAB=y | ||
803 | 822 | ||
804 | # | 823 | # |
805 | # Graphics support | 824 | # Graphics support |
@@ -828,6 +847,10 @@ CONFIG_DAB=y | |||
828 | # CONFIG_DMADEVICES is not set | 847 | # CONFIG_DMADEVICES is not set |
829 | # CONFIG_AUXDISPLAY is not set | 848 | # CONFIG_AUXDISPLAY is not set |
830 | # CONFIG_UIO is not set | 849 | # CONFIG_UIO is not set |
850 | |||
851 | # | ||
852 | # TI VLYNQ | ||
853 | # | ||
831 | # CONFIG_STAGING is not set | 854 | # CONFIG_STAGING is not set |
832 | 855 | ||
833 | # | 856 | # |
@@ -847,9 +870,10 @@ CONFIG_FS_MBCACHE=y | |||
847 | # CONFIG_REISERFS_FS is not set | 870 | # CONFIG_REISERFS_FS is not set |
848 | # CONFIG_JFS_FS is not set | 871 | # CONFIG_JFS_FS is not set |
849 | CONFIG_FS_POSIX_ACL=y | 872 | CONFIG_FS_POSIX_ACL=y |
850 | CONFIG_FILE_LOCKING=y | ||
851 | # CONFIG_XFS_FS is not set | 873 | # CONFIG_XFS_FS is not set |
852 | # CONFIG_OCFS2_FS is not set | 874 | # CONFIG_OCFS2_FS is not set |
875 | CONFIG_FILE_LOCKING=y | ||
876 | CONFIG_FSNOTIFY=y | ||
853 | CONFIG_DNOTIFY=y | 877 | CONFIG_DNOTIFY=y |
854 | CONFIG_INOTIFY=y | 878 | CONFIG_INOTIFY=y |
855 | CONFIG_INOTIFY_USER=y | 879 | CONFIG_INOTIFY_USER=y |
@@ -998,6 +1022,7 @@ CONFIG_HAS_IOPORT=y | |||
998 | CONFIG_HAS_DMA=y | 1022 | CONFIG_HAS_DMA=y |
999 | CONFIG_HAVE_LMB=y | 1023 | CONFIG_HAVE_LMB=y |
1000 | CONFIG_NLATTR=y | 1024 | CONFIG_NLATTR=y |
1025 | CONFIG_GENERIC_ATOMIC64=y | ||
1001 | 1026 | ||
1002 | # | 1027 | # |
1003 | # Kernel hacking | 1028 | # Kernel hacking |
@@ -1028,6 +1053,9 @@ CONFIG_SCHED_DEBUG=y | |||
1028 | # CONFIG_RT_MUTEX_TESTER is not set | 1053 | # CONFIG_RT_MUTEX_TESTER is not set |
1029 | # CONFIG_DEBUG_SPINLOCK is not set | 1054 | # CONFIG_DEBUG_SPINLOCK is not set |
1030 | # CONFIG_DEBUG_MUTEXES is not set | 1055 | # CONFIG_DEBUG_MUTEXES is not set |
1056 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1057 | # CONFIG_PROVE_LOCKING is not set | ||
1058 | # CONFIG_LOCK_STAT is not set | ||
1031 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1059 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1032 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1060 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1033 | # CONFIG_DEBUG_KOBJECT is not set | 1061 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1039,7 +1067,6 @@ CONFIG_DEBUG_INFO=y | |||
1039 | # CONFIG_DEBUG_LIST is not set | 1067 | # CONFIG_DEBUG_LIST is not set |
1040 | # CONFIG_DEBUG_SG is not set | 1068 | # CONFIG_DEBUG_SG is not set |
1041 | # CONFIG_DEBUG_NOTIFIERS is not set | 1069 | # CONFIG_DEBUG_NOTIFIERS is not set |
1042 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1043 | # CONFIG_RCU_TORTURE_TEST is not set | 1070 | # CONFIG_RCU_TORTURE_TEST is not set |
1044 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1071 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1045 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1072 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1053,22 +1080,23 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1053 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1080 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1054 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1081 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1055 | CONFIG_TRACING_SUPPORT=y | 1082 | CONFIG_TRACING_SUPPORT=y |
1056 | 1083 | CONFIG_FTRACE=y | |
1057 | # | ||
1058 | # Tracers | ||
1059 | # | ||
1060 | # CONFIG_FUNCTION_TRACER is not set | 1084 | # CONFIG_FUNCTION_TRACER is not set |
1085 | # CONFIG_IRQSOFF_TRACER is not set | ||
1061 | # CONFIG_SCHED_TRACER is not set | 1086 | # CONFIG_SCHED_TRACER is not set |
1062 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1087 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1063 | # CONFIG_EVENT_TRACER is not set | ||
1064 | # CONFIG_BOOT_TRACER is not set | 1088 | # CONFIG_BOOT_TRACER is not set |
1065 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1089 | CONFIG_BRANCH_PROFILE_NONE=y |
1090 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1091 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1066 | # CONFIG_STACK_TRACER is not set | 1092 | # CONFIG_STACK_TRACER is not set |
1067 | # CONFIG_KMEMTRACE is not set | 1093 | # CONFIG_KMEMTRACE is not set |
1068 | # CONFIG_WORKQUEUE_TRACER is not set | 1094 | # CONFIG_WORKQUEUE_TRACER is not set |
1069 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1095 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1070 | # CONFIG_SAMPLES is not set | 1096 | # CONFIG_SAMPLES is not set |
1071 | CONFIG_HAVE_ARCH_KGDB=y | 1097 | CONFIG_HAVE_ARCH_KGDB=y |
1098 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1099 | CONFIG_PPC_WERROR=y | ||
1072 | CONFIG_PRINT_STACK_DEPTH=64 | 1100 | CONFIG_PRINT_STACK_DEPTH=64 |
1073 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1101 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1074 | # CONFIG_DEBUG_STACK_USAGE is not set | 1102 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 433c303eb82b..4a96cb6925b4 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:21:58 2009 | 4 | # Wed Jul 29 23:31:55 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_FSL_EMB_PERFMON is not set | 20 | # CONFIG_FSL_EMB_PERFMON is not set |
20 | # CONFIG_ALTIVEC is not set | 21 | # CONFIG_ALTIVEC is not set |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | # CONFIG_SMP is not set | 26 | # CONFIG_SMP is not set |
25 | CONFIG_PPC32=y | 27 | CONFIG_PPC32=y |
26 | CONFIG_WORD_SIZE=32 | 28 | CONFIG_WORD_SIZE=32 |
@@ -31,15 +33,16 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
38 | CONFIG_LOCKDEP_SUPPORT=y | 42 | CONFIG_LOCKDEP_SUPPORT=y |
39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
40 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
41 | CONFIG_GENERIC_HWEIGHT=y | 45 | CONFIG_GENERIC_HWEIGHT=y |
42 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
43 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 46 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | 47 | CONFIG_GENERIC_GPIO=y |
45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -54,6 +57,7 @@ CONFIG_PPC_UDBG_16550=y | |||
54 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
55 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
56 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
57 | CONFIG_DEFAULT_UIMAGE=y | 61 | CONFIG_DEFAULT_UIMAGE=y |
58 | CONFIG_REDBOOT=y | 62 | CONFIG_REDBOOT=y |
59 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 63 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
@@ -61,6 +65,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
61 | # CONFIG_PPC_DCR_MMIO is not set | 65 | # CONFIG_PPC_DCR_MMIO is not set |
62 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
64 | 69 | ||
65 | # | 70 | # |
66 | # General setup | 71 | # General setup |
@@ -110,7 +115,6 @@ CONFIG_EMBEDDED=y | |||
110 | CONFIG_SYSCTL_SYSCALL=y | 115 | CONFIG_SYSCTL_SYSCALL=y |
111 | CONFIG_KALLSYMS=y | 116 | CONFIG_KALLSYMS=y |
112 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 117 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
113 | # CONFIG_STRIP_ASM_SYMS is not set | ||
114 | CONFIG_HOTPLUG=y | 118 | CONFIG_HOTPLUG=y |
115 | CONFIG_PRINTK=y | 119 | CONFIG_PRINTK=y |
116 | CONFIG_BUG=y | 120 | CONFIG_BUG=y |
@@ -123,8 +127,15 @@ CONFIG_TIMERFD=y | |||
123 | CONFIG_EVENTFD=y | 127 | CONFIG_EVENTFD=y |
124 | CONFIG_SHMEM=y | 128 | CONFIG_SHMEM=y |
125 | CONFIG_AIO=y | 129 | CONFIG_AIO=y |
130 | CONFIG_HAVE_PERF_COUNTERS=y | ||
131 | |||
132 | # | ||
133 | # Performance Counters | ||
134 | # | ||
135 | # CONFIG_PERF_COUNTERS is not set | ||
126 | CONFIG_VM_EVENT_COUNTERS=y | 136 | CONFIG_VM_EVENT_COUNTERS=y |
127 | CONFIG_PCI_QUIRKS=y | 137 | CONFIG_PCI_QUIRKS=y |
138 | # CONFIG_STRIP_ASM_SYMS is not set | ||
128 | CONFIG_COMPAT_BRK=y | 139 | CONFIG_COMPAT_BRK=y |
129 | CONFIG_SLAB=y | 140 | CONFIG_SLAB=y |
130 | # CONFIG_SLUB is not set | 141 | # CONFIG_SLUB is not set |
@@ -138,6 +149,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
138 | CONFIG_HAVE_KPROBES=y | 149 | CONFIG_HAVE_KPROBES=y |
139 | CONFIG_HAVE_KRETPROBES=y | 150 | CONFIG_HAVE_KRETPROBES=y |
140 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 151 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
152 | |||
153 | # | ||
154 | # GCOV-based kernel profiling | ||
155 | # | ||
141 | # CONFIG_SLOW_WORK is not set | 156 | # CONFIG_SLOW_WORK is not set |
142 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 157 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
143 | CONFIG_SLABINFO=y | 158 | CONFIG_SLABINFO=y |
@@ -150,7 +165,7 @@ CONFIG_MODULE_UNLOAD=y | |||
150 | # CONFIG_MODVERSIONS is not set | 165 | # CONFIG_MODVERSIONS is not set |
151 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 166 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
152 | CONFIG_BLOCK=y | 167 | CONFIG_BLOCK=y |
153 | # CONFIG_LBD is not set | 168 | CONFIG_LBDAF=y |
154 | # CONFIG_BLK_DEV_BSG is not set | 169 | # CONFIG_BLK_DEV_BSG is not set |
155 | # CONFIG_BLK_DEV_INTEGRITY is not set | 170 | # CONFIG_BLK_DEV_INTEGRITY is not set |
156 | 171 | ||
@@ -192,6 +207,7 @@ CONFIG_MPC837x_MDS=y | |||
192 | CONFIG_MPC837x_RDB=y | 207 | CONFIG_MPC837x_RDB=y |
193 | CONFIG_SBC834x=y | 208 | CONFIG_SBC834x=y |
194 | CONFIG_ASP834x=y | 209 | CONFIG_ASP834x=y |
210 | # CONFIG_KMETER1 is not set | ||
195 | CONFIG_PPC_MPC831x=y | 211 | CONFIG_PPC_MPC831x=y |
196 | CONFIG_PPC_MPC832x=y | 212 | CONFIG_PPC_MPC832x=y |
197 | CONFIG_PPC_MPC834x=y | 213 | CONFIG_PPC_MPC834x=y |
@@ -241,6 +257,7 @@ CONFIG_BINFMT_ELF=y | |||
241 | # CONFIG_BINFMT_MISC is not set | 257 | # CONFIG_BINFMT_MISC is not set |
242 | CONFIG_MATH_EMULATION=y | 258 | CONFIG_MATH_EMULATION=y |
243 | # CONFIG_IOMMU_HELPER is not set | 259 | # CONFIG_IOMMU_HELPER is not set |
260 | # CONFIG_SWIOTLB is not set | ||
244 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 261 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
245 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 262 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
246 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 263 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -261,9 +278,9 @@ CONFIG_MIGRATION=y | |||
261 | CONFIG_ZONE_DMA_FLAG=1 | 278 | CONFIG_ZONE_DMA_FLAG=1 |
262 | CONFIG_BOUNCE=y | 279 | CONFIG_BOUNCE=y |
263 | CONFIG_VIRT_TO_BUS=y | 280 | CONFIG_VIRT_TO_BUS=y |
264 | CONFIG_UNEVICTABLE_LRU=y | ||
265 | CONFIG_HAVE_MLOCK=y | 281 | CONFIG_HAVE_MLOCK=y |
266 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 282 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
283 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
267 | CONFIG_PPC_4K_PAGES=y | 284 | CONFIG_PPC_4K_PAGES=y |
268 | # CONFIG_PPC_16K_PAGES is not set | 285 | # CONFIG_PPC_16K_PAGES is not set |
269 | # CONFIG_PPC_64K_PAGES is not set | 286 | # CONFIG_PPC_64K_PAGES is not set |
@@ -374,6 +391,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
374 | # CONFIG_ECONET is not set | 391 | # CONFIG_ECONET is not set |
375 | # CONFIG_WAN_ROUTER is not set | 392 | # CONFIG_WAN_ROUTER is not set |
376 | # CONFIG_PHONET is not set | 393 | # CONFIG_PHONET is not set |
394 | # CONFIG_IEEE802154 is not set | ||
377 | # CONFIG_NET_SCHED is not set | 395 | # CONFIG_NET_SCHED is not set |
378 | # CONFIG_DCB is not set | 396 | # CONFIG_DCB is not set |
379 | 397 | ||
@@ -391,7 +409,11 @@ CONFIG_WIRELESS=y | |||
391 | CONFIG_WIRELESS_OLD_REGULATORY=y | 409 | CONFIG_WIRELESS_OLD_REGULATORY=y |
392 | # CONFIG_WIRELESS_EXT is not set | 410 | # CONFIG_WIRELESS_EXT is not set |
393 | # CONFIG_LIB80211 is not set | 411 | # CONFIG_LIB80211 is not set |
394 | # CONFIG_MAC80211 is not set | 412 | |
413 | # | ||
414 | # CFG80211 needs to be enabled for MAC80211 | ||
415 | # | ||
416 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
395 | # CONFIG_WIMAX is not set | 417 | # CONFIG_WIMAX is not set |
396 | # CONFIG_RFKILL is not set | 418 | # CONFIG_RFKILL is not set |
397 | # CONFIG_NET_9P is not set | 419 | # CONFIG_NET_9P is not set |
@@ -507,6 +529,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
507 | CONFIG_OF_DEVICE=y | 529 | CONFIG_OF_DEVICE=y |
508 | CONFIG_OF_GPIO=y | 530 | CONFIG_OF_GPIO=y |
509 | CONFIG_OF_I2C=y | 531 | CONFIG_OF_I2C=y |
532 | CONFIG_OF_MDIO=y | ||
510 | # CONFIG_PARPORT is not set | 533 | # CONFIG_PARPORT is not set |
511 | CONFIG_BLK_DEV=y | 534 | CONFIG_BLK_DEV=y |
512 | # CONFIG_BLK_DEV_FD is not set | 535 | # CONFIG_BLK_DEV_FD is not set |
@@ -542,7 +565,9 @@ CONFIG_MISC_DEVICES=y | |||
542 | # | 565 | # |
543 | # CONFIG_EEPROM_AT24 is not set | 566 | # CONFIG_EEPROM_AT24 is not set |
544 | # CONFIG_EEPROM_LEGACY is not set | 567 | # CONFIG_EEPROM_LEGACY is not set |
568 | # CONFIG_EEPROM_MAX6875 is not set | ||
545 | # CONFIG_EEPROM_93CX6 is not set | 569 | # CONFIG_EEPROM_93CX6 is not set |
570 | # CONFIG_CB710_CORE is not set | ||
546 | CONFIG_HAVE_IDE=y | 571 | CONFIG_HAVE_IDE=y |
547 | # CONFIG_IDE is not set | 572 | # CONFIG_IDE is not set |
548 | 573 | ||
@@ -565,10 +590,6 @@ CONFIG_BLK_DEV_SD=y | |||
565 | # CONFIG_BLK_DEV_SR is not set | 590 | # CONFIG_BLK_DEV_SR is not set |
566 | CONFIG_CHR_DEV_SG=y | 591 | CONFIG_CHR_DEV_SG=y |
567 | # CONFIG_CHR_DEV_SCH is not set | 592 | # CONFIG_CHR_DEV_SCH is not set |
568 | |||
569 | # | ||
570 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
571 | # | ||
572 | # CONFIG_SCSI_MULTI_LUN is not set | 593 | # CONFIG_SCSI_MULTI_LUN is not set |
573 | # CONFIG_SCSI_CONSTANTS is not set | 594 | # CONFIG_SCSI_CONSTANTS is not set |
574 | # CONFIG_SCSI_LOGGING is not set | 595 | # CONFIG_SCSI_LOGGING is not set |
@@ -586,6 +607,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
586 | CONFIG_SCSI_LOWLEVEL=y | 607 | CONFIG_SCSI_LOWLEVEL=y |
587 | # CONFIG_ISCSI_TCP is not set | 608 | # CONFIG_ISCSI_TCP is not set |
588 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 609 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
610 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
589 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 611 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
590 | # CONFIG_SCSI_3W_9XXX is not set | 612 | # CONFIG_SCSI_3W_9XXX is not set |
591 | # CONFIG_SCSI_ACARD is not set | 613 | # CONFIG_SCSI_ACARD is not set |
@@ -594,6 +616,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
594 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 616 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
595 | # CONFIG_SCSI_AIC79XX is not set | 617 | # CONFIG_SCSI_AIC79XX is not set |
596 | # CONFIG_SCSI_AIC94XX is not set | 618 | # CONFIG_SCSI_AIC94XX is not set |
619 | # CONFIG_SCSI_MVSAS is not set | ||
597 | # CONFIG_SCSI_DPT_I2O is not set | 620 | # CONFIG_SCSI_DPT_I2O is not set |
598 | # CONFIG_SCSI_ADVANSYS is not set | 621 | # CONFIG_SCSI_ADVANSYS is not set |
599 | # CONFIG_SCSI_ARCMSR is not set | 622 | # CONFIG_SCSI_ARCMSR is not set |
@@ -613,7 +636,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
613 | # CONFIG_SCSI_IPS is not set | 636 | # CONFIG_SCSI_IPS is not set |
614 | # CONFIG_SCSI_INITIO is not set | 637 | # CONFIG_SCSI_INITIO is not set |
615 | # CONFIG_SCSI_INIA100 is not set | 638 | # CONFIG_SCSI_INIA100 is not set |
616 | # CONFIG_SCSI_MVSAS is not set | ||
617 | # CONFIG_SCSI_STEX is not set | 639 | # CONFIG_SCSI_STEX is not set |
618 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 640 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
619 | # CONFIG_SCSI_IPR is not set | 641 | # CONFIG_SCSI_IPR is not set |
@@ -697,14 +719,17 @@ CONFIG_ATA_SFF=y | |||
697 | # | 719 | # |
698 | 720 | ||
699 | # | 721 | # |
700 | # Enable only one of the two stacks, unless you know what you are doing | 722 | # You can enable one or both FireWire driver stacks. |
723 | # | ||
724 | |||
725 | # | ||
726 | # See the help texts for more information. | ||
701 | # | 727 | # |
702 | # CONFIG_FIREWIRE is not set | 728 | # CONFIG_FIREWIRE is not set |
703 | # CONFIG_IEEE1394 is not set | 729 | # CONFIG_IEEE1394 is not set |
704 | # CONFIG_I2O is not set | 730 | # CONFIG_I2O is not set |
705 | # CONFIG_MACINTOSH_DRIVERS is not set | 731 | # CONFIG_MACINTOSH_DRIVERS is not set |
706 | CONFIG_NETDEVICES=y | 732 | CONFIG_NETDEVICES=y |
707 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
708 | # CONFIG_DUMMY is not set | 733 | # CONFIG_DUMMY is not set |
709 | # CONFIG_BONDING is not set | 734 | # CONFIG_BONDING is not set |
710 | # CONFIG_MACVLAN is not set | 735 | # CONFIG_MACVLAN is not set |
@@ -751,6 +776,7 @@ CONFIG_MII=y | |||
751 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 776 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
752 | # CONFIG_NET_PCI is not set | 777 | # CONFIG_NET_PCI is not set |
753 | # CONFIG_B44 is not set | 778 | # CONFIG_B44 is not set |
779 | # CONFIG_KS8842 is not set | ||
754 | # CONFIG_ATL2 is not set | 780 | # CONFIG_ATL2 is not set |
755 | CONFIG_NETDEV_1000=y | 781 | CONFIG_NETDEV_1000=y |
756 | # CONFIG_ACENIC is not set | 782 | # CONFIG_ACENIC is not set |
@@ -770,11 +796,13 @@ CONFIG_NETDEV_1000=y | |||
770 | # CONFIG_VIA_VELOCITY is not set | 796 | # CONFIG_VIA_VELOCITY is not set |
771 | # CONFIG_TIGON3 is not set | 797 | # CONFIG_TIGON3 is not set |
772 | # CONFIG_BNX2 is not set | 798 | # CONFIG_BNX2 is not set |
799 | # CONFIG_CNIC is not set | ||
773 | CONFIG_FSL_PQ_MDIO=y | 800 | CONFIG_FSL_PQ_MDIO=y |
774 | CONFIG_GIANFAR=y | 801 | CONFIG_GIANFAR=y |
775 | CONFIG_UCC_GETH=y | 802 | CONFIG_UCC_GETH=y |
776 | # CONFIG_UGETH_MAGIC_PACKET is not set | 803 | # CONFIG_UGETH_MAGIC_PACKET is not set |
777 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 804 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
805 | # CONFIG_MV643XX_ETH is not set | ||
778 | # CONFIG_QLA3XXX is not set | 806 | # CONFIG_QLA3XXX is not set |
779 | # CONFIG_ATL1 is not set | 807 | # CONFIG_ATL1 is not set |
780 | # CONFIG_ATL1E is not set | 808 | # CONFIG_ATL1E is not set |
@@ -965,13 +993,17 @@ CONFIG_I2C_MPC=y | |||
965 | # CONFIG_SENSORS_PCF8574 is not set | 993 | # CONFIG_SENSORS_PCF8574 is not set |
966 | # CONFIG_PCF8575 is not set | 994 | # CONFIG_PCF8575 is not set |
967 | # CONFIG_SENSORS_PCA9539 is not set | 995 | # CONFIG_SENSORS_PCA9539 is not set |
968 | # CONFIG_SENSORS_MAX6875 is not set | ||
969 | # CONFIG_SENSORS_TSL2550 is not set | 996 | # CONFIG_SENSORS_TSL2550 is not set |
970 | # CONFIG_I2C_DEBUG_CORE is not set | 997 | # CONFIG_I2C_DEBUG_CORE is not set |
971 | # CONFIG_I2C_DEBUG_ALGO is not set | 998 | # CONFIG_I2C_DEBUG_ALGO is not set |
972 | # CONFIG_I2C_DEBUG_BUS is not set | 999 | # CONFIG_I2C_DEBUG_BUS is not set |
973 | # CONFIG_I2C_DEBUG_CHIP is not set | 1000 | # CONFIG_I2C_DEBUG_CHIP is not set |
974 | # CONFIG_SPI is not set | 1001 | # CONFIG_SPI is not set |
1002 | |||
1003 | # | ||
1004 | # PPS support | ||
1005 | # | ||
1006 | # CONFIG_PPS is not set | ||
975 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1007 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
976 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 1008 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
977 | CONFIG_GPIOLIB=y | 1009 | CONFIG_GPIOLIB=y |
@@ -1050,6 +1082,7 @@ CONFIG_HWMON=y | |||
1050 | # CONFIG_SENSORS_SMSC47B397 is not set | 1082 | # CONFIG_SENSORS_SMSC47B397 is not set |
1051 | # CONFIG_SENSORS_ADS7828 is not set | 1083 | # CONFIG_SENSORS_ADS7828 is not set |
1052 | # CONFIG_SENSORS_THMC50 is not set | 1084 | # CONFIG_SENSORS_THMC50 is not set |
1085 | # CONFIG_SENSORS_TMP401 is not set | ||
1053 | # CONFIG_SENSORS_VIA686A is not set | 1086 | # CONFIG_SENSORS_VIA686A is not set |
1054 | # CONFIG_SENSORS_VT1211 is not set | 1087 | # CONFIG_SENSORS_VT1211 is not set |
1055 | # CONFIG_SENSORS_VT8231 is not set | 1088 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1104,24 +1137,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1104 | # CONFIG_MFD_WM8400 is not set | 1137 | # CONFIG_MFD_WM8400 is not set |
1105 | # CONFIG_MFD_WM8350_I2C is not set | 1138 | # CONFIG_MFD_WM8350_I2C is not set |
1106 | # CONFIG_MFD_PCF50633 is not set | 1139 | # CONFIG_MFD_PCF50633 is not set |
1140 | # CONFIG_AB3100_CORE is not set | ||
1107 | # CONFIG_REGULATOR is not set | 1141 | # CONFIG_REGULATOR is not set |
1108 | 1142 | # CONFIG_MEDIA_SUPPORT is not set | |
1109 | # | ||
1110 | # Multimedia devices | ||
1111 | # | ||
1112 | |||
1113 | # | ||
1114 | # Multimedia core support | ||
1115 | # | ||
1116 | # CONFIG_VIDEO_DEV is not set | ||
1117 | # CONFIG_DVB_CORE is not set | ||
1118 | # CONFIG_VIDEO_MEDIA is not set | ||
1119 | |||
1120 | # | ||
1121 | # Multimedia drivers | ||
1122 | # | ||
1123 | CONFIG_DAB=y | ||
1124 | # CONFIG_USB_DABUSB is not set | ||
1125 | 1143 | ||
1126 | # | 1144 | # |
1127 | # Graphics support | 1145 | # Graphics support |
@@ -1159,7 +1177,7 @@ CONFIG_HID_BELKIN=y | |||
1159 | CONFIG_HID_CHERRY=y | 1177 | CONFIG_HID_CHERRY=y |
1160 | CONFIG_HID_CHICONY=y | 1178 | CONFIG_HID_CHICONY=y |
1161 | CONFIG_HID_CYPRESS=y | 1179 | CONFIG_HID_CYPRESS=y |
1162 | # CONFIG_DRAGONRISE_FF is not set | 1180 | # CONFIG_HID_DRAGONRISE is not set |
1163 | CONFIG_HID_EZKEY=y | 1181 | CONFIG_HID_EZKEY=y |
1164 | # CONFIG_HID_KYE is not set | 1182 | # CONFIG_HID_KYE is not set |
1165 | CONFIG_HID_GYRATION=y | 1183 | CONFIG_HID_GYRATION=y |
@@ -1176,10 +1194,11 @@ CONFIG_HID_PETALYNX=y | |||
1176 | CONFIG_HID_SAMSUNG=y | 1194 | CONFIG_HID_SAMSUNG=y |
1177 | CONFIG_HID_SONY=y | 1195 | CONFIG_HID_SONY=y |
1178 | CONFIG_HID_SUNPLUS=y | 1196 | CONFIG_HID_SUNPLUS=y |
1179 | # CONFIG_GREENASIA_FF is not set | 1197 | # CONFIG_HID_GREENASIA is not set |
1198 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1180 | # CONFIG_HID_TOPSEED is not set | 1199 | # CONFIG_HID_TOPSEED is not set |
1181 | CONFIG_THRUSTMASTER_FF=m | 1200 | # CONFIG_HID_THRUSTMASTER is not set |
1182 | CONFIG_ZEROPLUS_FF=m | 1201 | # CONFIG_HID_ZEROPLUS is not set |
1183 | CONFIG_USB_SUPPORT=y | 1202 | CONFIG_USB_SUPPORT=y |
1184 | CONFIG_USB_ARCH_HAS_HCD=y | 1203 | CONFIG_USB_ARCH_HAS_HCD=y |
1185 | CONFIG_USB_ARCH_HAS_OHCI=y | 1204 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1205,6 +1224,7 @@ CONFIG_USB_MON=y | |||
1205 | # USB Host Controller Drivers | 1224 | # USB Host Controller Drivers |
1206 | # | 1225 | # |
1207 | # CONFIG_USB_C67X00_HCD is not set | 1226 | # CONFIG_USB_C67X00_HCD is not set |
1227 | # CONFIG_USB_XHCI_HCD is not set | ||
1208 | CONFIG_USB_EHCI_HCD=y | 1228 | CONFIG_USB_EHCI_HCD=y |
1209 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1229 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1210 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1230 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1291,6 +1311,10 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1291 | # CONFIG_DMADEVICES is not set | 1311 | # CONFIG_DMADEVICES is not set |
1292 | # CONFIG_AUXDISPLAY is not set | 1312 | # CONFIG_AUXDISPLAY is not set |
1293 | # CONFIG_UIO is not set | 1313 | # CONFIG_UIO is not set |
1314 | |||
1315 | # | ||
1316 | # TI VLYNQ | ||
1317 | # | ||
1294 | # CONFIG_STAGING is not set | 1318 | # CONFIG_STAGING is not set |
1295 | 1319 | ||
1296 | # | 1320 | # |
@@ -1310,10 +1334,12 @@ CONFIG_FS_MBCACHE=y | |||
1310 | # CONFIG_REISERFS_FS is not set | 1334 | # CONFIG_REISERFS_FS is not set |
1311 | # CONFIG_JFS_FS is not set | 1335 | # CONFIG_JFS_FS is not set |
1312 | # CONFIG_FS_POSIX_ACL is not set | 1336 | # CONFIG_FS_POSIX_ACL is not set |
1313 | CONFIG_FILE_LOCKING=y | ||
1314 | # CONFIG_XFS_FS is not set | 1337 | # CONFIG_XFS_FS is not set |
1338 | # CONFIG_GFS2_FS is not set | ||
1315 | # CONFIG_OCFS2_FS is not set | 1339 | # CONFIG_OCFS2_FS is not set |
1316 | # CONFIG_BTRFS_FS is not set | 1340 | # CONFIG_BTRFS_FS is not set |
1341 | CONFIG_FILE_LOCKING=y | ||
1342 | CONFIG_FSNOTIFY=y | ||
1317 | CONFIG_DNOTIFY=y | 1343 | CONFIG_DNOTIFY=y |
1318 | CONFIG_INOTIFY=y | 1344 | CONFIG_INOTIFY=y |
1319 | CONFIG_INOTIFY_USER=y | 1345 | CONFIG_INOTIFY_USER=y |
@@ -1377,6 +1403,7 @@ CONFIG_NFS_FS=y | |||
1377 | CONFIG_NFS_V3=y | 1403 | CONFIG_NFS_V3=y |
1378 | # CONFIG_NFS_V3_ACL is not set | 1404 | # CONFIG_NFS_V3_ACL is not set |
1379 | CONFIG_NFS_V4=y | 1405 | CONFIG_NFS_V4=y |
1406 | # CONFIG_NFS_V4_1 is not set | ||
1380 | CONFIG_ROOT_NFS=y | 1407 | CONFIG_ROOT_NFS=y |
1381 | # CONFIG_NFSD is not set | 1408 | # CONFIG_NFSD is not set |
1382 | CONFIG_LOCKD=y | 1409 | CONFIG_LOCKD=y |
@@ -1413,7 +1440,46 @@ CONFIG_MSDOS_PARTITION=y | |||
1413 | # CONFIG_KARMA_PARTITION is not set | 1440 | # CONFIG_KARMA_PARTITION is not set |
1414 | # CONFIG_EFI_PARTITION is not set | 1441 | # CONFIG_EFI_PARTITION is not set |
1415 | # CONFIG_SYSV68_PARTITION is not set | 1442 | # CONFIG_SYSV68_PARTITION is not set |
1416 | # CONFIG_NLS is not set | 1443 | CONFIG_NLS=y |
1444 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1445 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1446 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1447 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1448 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1449 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1450 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1451 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1452 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1453 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1454 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1455 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1456 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1457 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1458 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1459 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1460 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1461 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1462 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1463 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1464 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1465 | # CONFIG_NLS_ISO8859_8 is not set | ||
1466 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1467 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1468 | # CONFIG_NLS_ASCII is not set | ||
1469 | # CONFIG_NLS_ISO8859_1 is not set | ||
1470 | # CONFIG_NLS_ISO8859_2 is not set | ||
1471 | # CONFIG_NLS_ISO8859_3 is not set | ||
1472 | # CONFIG_NLS_ISO8859_4 is not set | ||
1473 | # CONFIG_NLS_ISO8859_5 is not set | ||
1474 | # CONFIG_NLS_ISO8859_6 is not set | ||
1475 | # CONFIG_NLS_ISO8859_7 is not set | ||
1476 | # CONFIG_NLS_ISO8859_9 is not set | ||
1477 | # CONFIG_NLS_ISO8859_13 is not set | ||
1478 | # CONFIG_NLS_ISO8859_14 is not set | ||
1479 | # CONFIG_NLS_ISO8859_15 is not set | ||
1480 | # CONFIG_NLS_KOI8_R is not set | ||
1481 | # CONFIG_NLS_KOI8_U is not set | ||
1482 | # CONFIG_NLS_UTF8 is not set | ||
1417 | # CONFIG_DLM is not set | 1483 | # CONFIG_DLM is not set |
1418 | CONFIG_UCC_FAST=y | 1484 | CONFIG_UCC_FAST=y |
1419 | CONFIG_UCC=y | 1485 | CONFIG_UCC=y |
@@ -1438,6 +1504,7 @@ CONFIG_HAS_IOPORT=y | |||
1438 | CONFIG_HAS_DMA=y | 1504 | CONFIG_HAS_DMA=y |
1439 | CONFIG_HAVE_LMB=y | 1505 | CONFIG_HAVE_LMB=y |
1440 | CONFIG_NLATTR=y | 1506 | CONFIG_NLATTR=y |
1507 | CONFIG_GENERIC_ATOMIC64=y | ||
1441 | 1508 | ||
1442 | # | 1509 | # |
1443 | # Kernel hacking | 1510 | # Kernel hacking |
@@ -1461,22 +1528,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1461 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1528 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1462 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1529 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1463 | CONFIG_TRACING_SUPPORT=y | 1530 | CONFIG_TRACING_SUPPORT=y |
1464 | 1531 | # CONFIG_FTRACE is not set | |
1465 | # | ||
1466 | # Tracers | ||
1467 | # | ||
1468 | # CONFIG_FUNCTION_TRACER is not set | ||
1469 | # CONFIG_SCHED_TRACER is not set | ||
1470 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1471 | # CONFIG_EVENT_TRACER is not set | ||
1472 | # CONFIG_BOOT_TRACER is not set | ||
1473 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1474 | # CONFIG_STACK_TRACER is not set | ||
1475 | # CONFIG_KMEMTRACE is not set | ||
1476 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1477 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1478 | # CONFIG_SAMPLES is not set | 1532 | # CONFIG_SAMPLES is not set |
1479 | CONFIG_HAVE_ARCH_KGDB=y | 1533 | CONFIG_HAVE_ARCH_KGDB=y |
1534 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1535 | CONFIG_PPC_WERROR=y | ||
1480 | CONFIG_PRINT_STACK_DEPTH=64 | 1536 | CONFIG_PRINT_STACK_DEPTH=64 |
1481 | # CONFIG_IRQSTACKS is not set | 1537 | # CONFIG_IRQSTACKS is not set |
1482 | # CONFIG_BOOTX_TEXT is not set | 1538 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index c162724fed4f..ada595898af1 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_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-rc2 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Tue Apr 21 15:40:23 2009 | 4 | # Wed Jul 29 23:31:55 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -34,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
34 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
35 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
36 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
37 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
38 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
39 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
41 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
43 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
44 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
45 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
47 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -57,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
57 | # CONFIG_GENERIC_TBSYNC is not set | 58 | # CONFIG_GENERIC_TBSYNC is not set |
58 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
59 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
60 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
61 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
62 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
65 | 68 | ||
66 | # | 69 | # |
67 | # General setup | 70 | # General setup |
@@ -116,7 +119,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
116 | CONFIG_KALLSYMS=y | 119 | CONFIG_KALLSYMS=y |
117 | CONFIG_KALLSYMS_ALL=y | 120 | CONFIG_KALLSYMS_ALL=y |
118 | CONFIG_KALLSYMS_EXTRA_PASS=y | 121 | CONFIG_KALLSYMS_EXTRA_PASS=y |
119 | # CONFIG_STRIP_ASM_SYMS is not set | ||
120 | CONFIG_HOTPLUG=y | 122 | CONFIG_HOTPLUG=y |
121 | CONFIG_PRINTK=y | 123 | CONFIG_PRINTK=y |
122 | CONFIG_BUG=y | 124 | CONFIG_BUG=y |
@@ -129,9 +131,16 @@ CONFIG_TIMERFD=y | |||
129 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
130 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
131 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_COUNTERS=y | ||
135 | |||
136 | # | ||
137 | # Performance Counters | ||
138 | # | ||
139 | # CONFIG_PERF_COUNTERS is not set | ||
132 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
133 | CONFIG_PCI_QUIRKS=y | 141 | CONFIG_PCI_QUIRKS=y |
134 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
143 | # CONFIG_STRIP_ASM_SYMS is not set | ||
135 | CONFIG_COMPAT_BRK=y | 144 | CONFIG_COMPAT_BRK=y |
136 | # CONFIG_SLAB is not set | 145 | # CONFIG_SLAB is not set |
137 | CONFIG_SLUB=y | 146 | CONFIG_SLUB=y |
@@ -146,6 +155,11 @@ CONFIG_HAVE_KPROBES=y | |||
146 | CONFIG_HAVE_KRETPROBES=y | 155 | CONFIG_HAVE_KRETPROBES=y |
147 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 156 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
148 | CONFIG_HAVE_CLK=y | 157 | CONFIG_HAVE_CLK=y |
158 | |||
159 | # | ||
160 | # GCOV-based kernel profiling | ||
161 | # | ||
162 | # CONFIG_GCOV_KERNEL is not set | ||
149 | # CONFIG_SLOW_WORK is not set | 163 | # CONFIG_SLOW_WORK is not set |
150 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 164 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
151 | CONFIG_SLABINFO=y | 165 | CONFIG_SLABINFO=y |
@@ -158,7 +172,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
158 | CONFIG_MODVERSIONS=y | 172 | CONFIG_MODVERSIONS=y |
159 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 173 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
160 | CONFIG_BLOCK=y | 174 | CONFIG_BLOCK=y |
161 | CONFIG_LBD=y | 175 | CONFIG_LBDAF=y |
162 | # CONFIG_BLK_DEV_BSG is not set | 176 | # CONFIG_BLK_DEV_BSG is not set |
163 | # CONFIG_BLK_DEV_INTEGRITY is not set | 177 | # CONFIG_BLK_DEV_INTEGRITY is not set |
164 | 178 | ||
@@ -191,6 +205,7 @@ CONFIG_MPC8536_DS=y | |||
191 | CONFIG_MPC85xx_DS=y | 205 | CONFIG_MPC85xx_DS=y |
192 | CONFIG_SOCRATES=y | 206 | CONFIG_SOCRATES=y |
193 | CONFIG_KSI8560=y | 207 | CONFIG_KSI8560=y |
208 | # CONFIG_XES_MPC85xx is not set | ||
194 | CONFIG_STX_GP3=y | 209 | CONFIG_STX_GP3=y |
195 | CONFIG_TQM8540=y | 210 | CONFIG_TQM8540=y |
196 | CONFIG_TQM8541=y | 211 | CONFIG_TQM8541=y |
@@ -241,7 +256,9 @@ CONFIG_BINFMT_ELF=y | |||
241 | # CONFIG_HAVE_AOUT is not set | 256 | # CONFIG_HAVE_AOUT is not set |
242 | CONFIG_BINFMT_MISC=m | 257 | CONFIG_BINFMT_MISC=m |
243 | CONFIG_MATH_EMULATION=y | 258 | CONFIG_MATH_EMULATION=y |
244 | # CONFIG_IOMMU_HELPER is not set | 259 | CONFIG_IOMMU_HELPER=y |
260 | CONFIG_SWIOTLB=y | ||
261 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | ||
245 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 262 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
246 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 263 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
247 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 264 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -260,9 +277,9 @@ CONFIG_MIGRATION=y | |||
260 | CONFIG_ZONE_DMA_FLAG=1 | 277 | CONFIG_ZONE_DMA_FLAG=1 |
261 | CONFIG_BOUNCE=y | 278 | CONFIG_BOUNCE=y |
262 | CONFIG_VIRT_TO_BUS=y | 279 | CONFIG_VIRT_TO_BUS=y |
263 | CONFIG_UNEVICTABLE_LRU=y | ||
264 | CONFIG_HAVE_MLOCK=y | 280 | CONFIG_HAVE_MLOCK=y |
265 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 281 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
282 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
266 | CONFIG_PPC_4K_PAGES=y | 283 | CONFIG_PPC_4K_PAGES=y |
267 | # CONFIG_PPC_16K_PAGES is not set | 284 | # CONFIG_PPC_16K_PAGES is not set |
268 | # CONFIG_PPC_64K_PAGES is not set | 285 | # CONFIG_PPC_64K_PAGES is not set |
@@ -296,7 +313,8 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
296 | # CONFIG_PCI_IOV is not set | 313 | # CONFIG_PCI_IOV is not set |
297 | # CONFIG_PCCARD is not set | 314 | # CONFIG_PCCARD is not set |
298 | # CONFIG_HOTPLUG_PCI is not set | 315 | # CONFIG_HOTPLUG_PCI is not set |
299 | # CONFIG_HAS_RAPIDIO is not set | 316 | CONFIG_HAS_RAPIDIO=y |
317 | # CONFIG_RAPIDIO is not set | ||
300 | 318 | ||
301 | # | 319 | # |
302 | # Advanced setup | 320 | # Advanced setup |
@@ -406,6 +424,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
406 | # CONFIG_ECONET is not set | 424 | # CONFIG_ECONET is not set |
407 | # CONFIG_WAN_ROUTER is not set | 425 | # CONFIG_WAN_ROUTER is not set |
408 | # CONFIG_PHONET is not set | 426 | # CONFIG_PHONET is not set |
427 | # CONFIG_IEEE802154 is not set | ||
409 | # CONFIG_NET_SCHED is not set | 428 | # CONFIG_NET_SCHED is not set |
410 | # CONFIG_DCB is not set | 429 | # CONFIG_DCB is not set |
411 | 430 | ||
@@ -424,7 +443,11 @@ CONFIG_WIRELESS=y | |||
424 | CONFIG_WIRELESS_OLD_REGULATORY=y | 443 | CONFIG_WIRELESS_OLD_REGULATORY=y |
425 | # CONFIG_WIRELESS_EXT is not set | 444 | # CONFIG_WIRELESS_EXT is not set |
426 | # CONFIG_LIB80211 is not set | 445 | # CONFIG_LIB80211 is not set |
427 | # CONFIG_MAC80211 is not set | 446 | |
447 | # | ||
448 | # CFG80211 needs to be enabled for MAC80211 | ||
449 | # | ||
450 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
428 | # CONFIG_WIMAX is not set | 451 | # CONFIG_WIMAX is not set |
429 | # CONFIG_RFKILL is not set | 452 | # CONFIG_RFKILL is not set |
430 | # CONFIG_NET_9P is not set | 453 | # CONFIG_NET_9P is not set |
@@ -450,6 +473,7 @@ CONFIG_EXTRA_FIRMWARE="" | |||
450 | CONFIG_OF_DEVICE=y | 473 | CONFIG_OF_DEVICE=y |
451 | CONFIG_OF_GPIO=y | 474 | CONFIG_OF_GPIO=y |
452 | CONFIG_OF_I2C=y | 475 | CONFIG_OF_I2C=y |
476 | CONFIG_OF_MDIO=y | ||
453 | # CONFIG_PARPORT is not set | 477 | # CONFIG_PARPORT is not set |
454 | CONFIG_BLK_DEV=y | 478 | CONFIG_BLK_DEV=y |
455 | # CONFIG_BLK_DEV_FD is not set | 479 | # CONFIG_BLK_DEV_FD is not set |
@@ -485,7 +509,9 @@ CONFIG_MISC_DEVICES=y | |||
485 | # | 509 | # |
486 | # CONFIG_EEPROM_AT24 is not set | 510 | # CONFIG_EEPROM_AT24 is not set |
487 | CONFIG_EEPROM_LEGACY=y | 511 | CONFIG_EEPROM_LEGACY=y |
512 | # CONFIG_EEPROM_MAX6875 is not set | ||
488 | # CONFIG_EEPROM_93CX6 is not set | 513 | # CONFIG_EEPROM_93CX6 is not set |
514 | # CONFIG_CB710_CORE is not set | ||
489 | CONFIG_HAVE_IDE=y | 515 | CONFIG_HAVE_IDE=y |
490 | # CONFIG_IDE is not set | 516 | # CONFIG_IDE is not set |
491 | 517 | ||
@@ -509,10 +535,6 @@ CONFIG_BLK_DEV_SR=y | |||
509 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 535 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
510 | CONFIG_CHR_DEV_SG=y | 536 | CONFIG_CHR_DEV_SG=y |
511 | # CONFIG_CHR_DEV_SCH is not set | 537 | # CONFIG_CHR_DEV_SCH is not set |
512 | |||
513 | # | ||
514 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
515 | # | ||
516 | CONFIG_SCSI_MULTI_LUN=y | 538 | CONFIG_SCSI_MULTI_LUN=y |
517 | # CONFIG_SCSI_CONSTANTS is not set | 539 | # CONFIG_SCSI_CONSTANTS is not set |
518 | CONFIG_SCSI_LOGGING=y | 540 | CONFIG_SCSI_LOGGING=y |
@@ -530,6 +552,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
530 | CONFIG_SCSI_LOWLEVEL=y | 552 | CONFIG_SCSI_LOWLEVEL=y |
531 | # CONFIG_ISCSI_TCP is not set | 553 | # CONFIG_ISCSI_TCP is not set |
532 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 554 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
555 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
533 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 556 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
534 | # CONFIG_SCSI_3W_9XXX is not set | 557 | # CONFIG_SCSI_3W_9XXX is not set |
535 | # CONFIG_SCSI_ACARD is not set | 558 | # CONFIG_SCSI_ACARD is not set |
@@ -538,6 +561,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
538 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 561 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
539 | # CONFIG_SCSI_AIC79XX is not set | 562 | # CONFIG_SCSI_AIC79XX is not set |
540 | # CONFIG_SCSI_AIC94XX is not set | 563 | # CONFIG_SCSI_AIC94XX is not set |
564 | # CONFIG_SCSI_MVSAS is not set | ||
541 | # CONFIG_SCSI_DPT_I2O is not set | 565 | # CONFIG_SCSI_DPT_I2O is not set |
542 | # CONFIG_SCSI_ADVANSYS is not set | 566 | # CONFIG_SCSI_ADVANSYS is not set |
543 | # CONFIG_SCSI_ARCMSR is not set | 567 | # CONFIG_SCSI_ARCMSR is not set |
@@ -557,7 +581,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
557 | # CONFIG_SCSI_IPS is not set | 581 | # CONFIG_SCSI_IPS is not set |
558 | # CONFIG_SCSI_INITIO is not set | 582 | # CONFIG_SCSI_INITIO is not set |
559 | # CONFIG_SCSI_INIA100 is not set | 583 | # CONFIG_SCSI_INIA100 is not set |
560 | # CONFIG_SCSI_MVSAS is not set | ||
561 | # CONFIG_SCSI_STEX is not set | 584 | # CONFIG_SCSI_STEX is not set |
562 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 585 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
563 | # CONFIG_SCSI_IPR is not set | 586 | # CONFIG_SCSI_IPR is not set |
@@ -641,14 +664,17 @@ CONFIG_PATA_ALI=y | |||
641 | # | 664 | # |
642 | 665 | ||
643 | # | 666 | # |
644 | # Enable only one of the two stacks, unless you know what you are doing | 667 | # You can enable one or both FireWire driver stacks. |
668 | # | ||
669 | |||
670 | # | ||
671 | # See the help texts for more information. | ||
645 | # | 672 | # |
646 | # CONFIG_FIREWIRE is not set | 673 | # CONFIG_FIREWIRE is not set |
647 | # CONFIG_IEEE1394 is not set | 674 | # CONFIG_IEEE1394 is not set |
648 | # CONFIG_I2O is not set | 675 | # CONFIG_I2O is not set |
649 | # CONFIG_MACINTOSH_DRIVERS is not set | 676 | # CONFIG_MACINTOSH_DRIVERS is not set |
650 | CONFIG_NETDEVICES=y | 677 | CONFIG_NETDEVICES=y |
651 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
652 | CONFIG_DUMMY=y | 678 | CONFIG_DUMMY=y |
653 | # CONFIG_BONDING is not set | 679 | # CONFIG_BONDING is not set |
654 | # CONFIG_MACVLAN is not set | 680 | # CONFIG_MACVLAN is not set |
@@ -695,6 +721,7 @@ CONFIG_MII=y | |||
695 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 721 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
696 | # CONFIG_NET_PCI is not set | 722 | # CONFIG_NET_PCI is not set |
697 | # CONFIG_B44 is not set | 723 | # CONFIG_B44 is not set |
724 | # CONFIG_KS8842 is not set | ||
698 | # CONFIG_ATL2 is not set | 725 | # CONFIG_ATL2 is not set |
699 | CONFIG_FS_ENET=y | 726 | CONFIG_FS_ENET=y |
700 | CONFIG_FS_ENET_HAS_SCC=y | 727 | CONFIG_FS_ENET_HAS_SCC=y |
@@ -718,11 +745,13 @@ CONFIG_NETDEV_1000=y | |||
718 | # CONFIG_VIA_VELOCITY is not set | 745 | # CONFIG_VIA_VELOCITY is not set |
719 | # CONFIG_TIGON3 is not set | 746 | # CONFIG_TIGON3 is not set |
720 | # CONFIG_BNX2 is not set | 747 | # CONFIG_BNX2 is not set |
748 | # CONFIG_CNIC is not set | ||
721 | CONFIG_FSL_PQ_MDIO=y | 749 | CONFIG_FSL_PQ_MDIO=y |
722 | CONFIG_GIANFAR=y | 750 | CONFIG_GIANFAR=y |
723 | CONFIG_UCC_GETH=y | 751 | CONFIG_UCC_GETH=y |
724 | # CONFIG_UGETH_MAGIC_PACKET is not set | 752 | # CONFIG_UGETH_MAGIC_PACKET is not set |
725 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 753 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
754 | # CONFIG_MV643XX_ETH is not set | ||
726 | # CONFIG_QLA3XXX is not set | 755 | # CONFIG_QLA3XXX is not set |
727 | # CONFIG_ATL1 is not set | 756 | # CONFIG_ATL1 is not set |
728 | # CONFIG_ATL1E is not set | 757 | # CONFIG_ATL1E is not set |
@@ -897,6 +926,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
897 | # I2C system bus drivers (mostly embedded / system-on-chip) | 926 | # I2C system bus drivers (mostly embedded / system-on-chip) |
898 | # | 927 | # |
899 | CONFIG_I2C_CPM=m | 928 | CONFIG_I2C_CPM=m |
929 | # CONFIG_I2C_DESIGNWARE is not set | ||
900 | # CONFIG_I2C_GPIO is not set | 930 | # CONFIG_I2C_GPIO is not set |
901 | CONFIG_I2C_MPC=y | 931 | CONFIG_I2C_MPC=y |
902 | # CONFIG_I2C_OCORES is not set | 932 | # CONFIG_I2C_OCORES is not set |
@@ -927,13 +957,17 @@ CONFIG_I2C_MPC=y | |||
927 | # CONFIG_SENSORS_PCF8574 is not set | 957 | # CONFIG_SENSORS_PCF8574 is not set |
928 | # CONFIG_PCF8575 is not set | 958 | # CONFIG_PCF8575 is not set |
929 | # CONFIG_SENSORS_PCA9539 is not set | 959 | # CONFIG_SENSORS_PCA9539 is not set |
930 | # CONFIG_SENSORS_MAX6875 is not set | ||
931 | # CONFIG_SENSORS_TSL2550 is not set | 960 | # CONFIG_SENSORS_TSL2550 is not set |
932 | # CONFIG_I2C_DEBUG_CORE is not set | 961 | # CONFIG_I2C_DEBUG_CORE is not set |
933 | # CONFIG_I2C_DEBUG_ALGO is not set | 962 | # CONFIG_I2C_DEBUG_ALGO is not set |
934 | # CONFIG_I2C_DEBUG_BUS is not set | 963 | # CONFIG_I2C_DEBUG_BUS is not set |
935 | # CONFIG_I2C_DEBUG_CHIP is not set | 964 | # CONFIG_I2C_DEBUG_CHIP is not set |
936 | # CONFIG_SPI is not set | 965 | # CONFIG_SPI is not set |
966 | |||
967 | # | ||
968 | # PPS support | ||
969 | # | ||
970 | # CONFIG_PPS is not set | ||
937 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 971 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
938 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 972 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
939 | CONFIG_GPIOLIB=y | 973 | CONFIG_GPIOLIB=y |
@@ -987,76 +1021,9 @@ CONFIG_SSB_POSSIBLE=y | |||
987 | # CONFIG_MFD_WM8400 is not set | 1021 | # CONFIG_MFD_WM8400 is not set |
988 | # CONFIG_MFD_WM8350_I2C is not set | 1022 | # CONFIG_MFD_WM8350_I2C is not set |
989 | # CONFIG_MFD_PCF50633 is not set | 1023 | # CONFIG_MFD_PCF50633 is not set |
1024 | # CONFIG_AB3100_CORE is not set | ||
990 | # CONFIG_REGULATOR is not set | 1025 | # CONFIG_REGULATOR is not set |
991 | 1026 | # CONFIG_MEDIA_SUPPORT is not set | |
992 | # | ||
993 | # Multimedia devices | ||
994 | # | ||
995 | |||
996 | # | ||
997 | # Multimedia core support | ||
998 | # | ||
999 | # CONFIG_VIDEO_DEV is not set | ||
1000 | CONFIG_DVB_CORE=m | ||
1001 | CONFIG_VIDEO_MEDIA=m | ||
1002 | |||
1003 | # | ||
1004 | # Multimedia drivers | ||
1005 | # | ||
1006 | # CONFIG_MEDIA_ATTACH is not set | ||
1007 | CONFIG_MEDIA_TUNER=m | ||
1008 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
1009 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
1010 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
1011 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
1012 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
1013 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
1014 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
1015 | CONFIG_MEDIA_TUNER_XC2028=m | ||
1016 | CONFIG_MEDIA_TUNER_XC5000=m | ||
1017 | CONFIG_MEDIA_TUNER_MC44S803=m | ||
1018 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
1019 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
1020 | |||
1021 | # | ||
1022 | # Supported SAA7146 based PCI Adapters | ||
1023 | # | ||
1024 | # CONFIG_TTPCI_EEPROM is not set | ||
1025 | # CONFIG_DVB_BUDGET_CORE is not set | ||
1026 | |||
1027 | # | ||
1028 | # Supported USB Adapters | ||
1029 | # | ||
1030 | # CONFIG_DVB_USB is not set | ||
1031 | # CONFIG_DVB_TTUSB_BUDGET is not set | ||
1032 | # CONFIG_DVB_TTUSB_DEC is not set | ||
1033 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
1034 | |||
1035 | # | ||
1036 | # Supported FlexCopII (B2C2) Adapters | ||
1037 | # | ||
1038 | # CONFIG_DVB_B2C2_FLEXCOP is not set | ||
1039 | |||
1040 | # | ||
1041 | # Supported BT878 Adapters | ||
1042 | # | ||
1043 | |||
1044 | # | ||
1045 | # Supported Pluto2 Adapters | ||
1046 | # | ||
1047 | # CONFIG_DVB_PLUTO2 is not set | ||
1048 | |||
1049 | # | ||
1050 | # Supported SDMC DM1105 Adapters | ||
1051 | # | ||
1052 | # CONFIG_DVB_DM1105 is not set | ||
1053 | |||
1054 | # | ||
1055 | # Supported DVB Frontends | ||
1056 | # | ||
1057 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
1058 | CONFIG_DAB=y | ||
1059 | # CONFIG_USB_DABUSB is not set | ||
1060 | 1027 | ||
1061 | # | 1028 | # |
1062 | # Graphics support | 1029 | # Graphics support |
@@ -1096,6 +1063,11 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1096 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1063 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1097 | # CONFIG_SND_DEBUG is not set | 1064 | # CONFIG_SND_DEBUG is not set |
1098 | CONFIG_SND_VMASTER=y | 1065 | CONFIG_SND_VMASTER=y |
1066 | # CONFIG_SND_RAWMIDI_SEQ is not set | ||
1067 | # CONFIG_SND_OPL3_LIB_SEQ is not set | ||
1068 | # CONFIG_SND_OPL4_LIB_SEQ is not set | ||
1069 | # CONFIG_SND_SBAWE_SEQ is not set | ||
1070 | # CONFIG_SND_EMU10K1_SEQ is not set | ||
1099 | CONFIG_SND_AC97_CODEC=y | 1071 | CONFIG_SND_AC97_CODEC=y |
1100 | CONFIG_SND_DRIVERS=y | 1072 | CONFIG_SND_DRIVERS=y |
1101 | # CONFIG_SND_DUMMY is not set | 1073 | # CONFIG_SND_DUMMY is not set |
@@ -1122,6 +1094,7 @@ CONFIG_SND_PCI=y | |||
1122 | # CONFIG_SND_CS4281 is not set | 1094 | # CONFIG_SND_CS4281 is not set |
1123 | # CONFIG_SND_CS46XX is not set | 1095 | # CONFIG_SND_CS46XX is not set |
1124 | # CONFIG_SND_CS5530 is not set | 1096 | # CONFIG_SND_CS5530 is not set |
1097 | # CONFIG_SND_CTXFI is not set | ||
1125 | # CONFIG_SND_DARLA20 is not set | 1098 | # CONFIG_SND_DARLA20 is not set |
1126 | # CONFIG_SND_GINA20 is not set | 1099 | # CONFIG_SND_GINA20 is not set |
1127 | # CONFIG_SND_LAYLA20 is not set | 1100 | # CONFIG_SND_LAYLA20 is not set |
@@ -1152,6 +1125,7 @@ CONFIG_SND_PCI=y | |||
1152 | CONFIG_SND_INTEL8X0=y | 1125 | CONFIG_SND_INTEL8X0=y |
1153 | # CONFIG_SND_INTEL8X0M is not set | 1126 | # CONFIG_SND_INTEL8X0M is not set |
1154 | # CONFIG_SND_KORG1212 is not set | 1127 | # CONFIG_SND_KORG1212 is not set |
1128 | # CONFIG_SND_LX6464ES is not set | ||
1155 | # CONFIG_SND_MAESTRO3 is not set | 1129 | # CONFIG_SND_MAESTRO3 is not set |
1156 | # CONFIG_SND_MIXART is not set | 1130 | # CONFIG_SND_MIXART is not set |
1157 | # CONFIG_SND_NM256 is not set | 1131 | # CONFIG_SND_NM256 is not set |
@@ -1196,7 +1170,7 @@ CONFIG_HID_BELKIN=y | |||
1196 | CONFIG_HID_CHERRY=y | 1170 | CONFIG_HID_CHERRY=y |
1197 | CONFIG_HID_CHICONY=y | 1171 | CONFIG_HID_CHICONY=y |
1198 | CONFIG_HID_CYPRESS=y | 1172 | CONFIG_HID_CYPRESS=y |
1199 | # CONFIG_DRAGONRISE_FF is not set | 1173 | # CONFIG_HID_DRAGONRISE is not set |
1200 | CONFIG_HID_EZKEY=y | 1174 | CONFIG_HID_EZKEY=y |
1201 | # CONFIG_HID_KYE is not set | 1175 | # CONFIG_HID_KYE is not set |
1202 | CONFIG_HID_GYRATION=y | 1176 | CONFIG_HID_GYRATION=y |
@@ -1213,10 +1187,11 @@ CONFIG_HID_PETALYNX=y | |||
1213 | CONFIG_HID_SAMSUNG=y | 1187 | CONFIG_HID_SAMSUNG=y |
1214 | CONFIG_HID_SONY=y | 1188 | CONFIG_HID_SONY=y |
1215 | CONFIG_HID_SUNPLUS=y | 1189 | CONFIG_HID_SUNPLUS=y |
1216 | # CONFIG_GREENASIA_FF is not set | 1190 | # CONFIG_HID_GREENASIA is not set |
1191 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1217 | # CONFIG_HID_TOPSEED is not set | 1192 | # CONFIG_HID_TOPSEED is not set |
1218 | CONFIG_THRUSTMASTER_FF=m | 1193 | # CONFIG_HID_THRUSTMASTER is not set |
1219 | CONFIG_ZEROPLUS_FF=m | 1194 | # CONFIG_HID_ZEROPLUS is not set |
1220 | CONFIG_USB_SUPPORT=y | 1195 | CONFIG_USB_SUPPORT=y |
1221 | CONFIG_USB_ARCH_HAS_HCD=y | 1196 | CONFIG_USB_ARCH_HAS_HCD=y |
1222 | CONFIG_USB_ARCH_HAS_OHCI=y | 1197 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1242,6 +1217,7 @@ CONFIG_USB_MON=y | |||
1242 | # USB Host Controller Drivers | 1217 | # USB Host Controller Drivers |
1243 | # | 1218 | # |
1244 | # CONFIG_USB_C67X00_HCD is not set | 1219 | # CONFIG_USB_C67X00_HCD is not set |
1220 | # CONFIG_USB_XHCI_HCD is not set | ||
1245 | CONFIG_USB_EHCI_HCD=y | 1221 | CONFIG_USB_EHCI_HCD=y |
1246 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1222 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1247 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1223 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1251,9 +1227,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1251 | # CONFIG_USB_ISP116X_HCD is not set | 1227 | # CONFIG_USB_ISP116X_HCD is not set |
1252 | # CONFIG_USB_ISP1760_HCD is not set | 1228 | # CONFIG_USB_ISP1760_HCD is not set |
1253 | CONFIG_USB_OHCI_HCD=y | 1229 | CONFIG_USB_OHCI_HCD=y |
1254 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1255 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1230 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1256 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 1231 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
1232 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1257 | CONFIG_USB_OHCI_HCD_PCI=y | 1233 | CONFIG_USB_OHCI_HCD_PCI=y |
1258 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1234 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1259 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1235 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1352,8 +1328,6 @@ CONFIG_EDAC=y | |||
1352 | # CONFIG_EDAC_DEBUG is not set | 1328 | # CONFIG_EDAC_DEBUG is not set |
1353 | CONFIG_EDAC_MM_EDAC=y | 1329 | CONFIG_EDAC_MM_EDAC=y |
1354 | CONFIG_EDAC_MPC85XX=y | 1330 | CONFIG_EDAC_MPC85XX=y |
1355 | # CONFIG_EDAC_AMD8131 is not set | ||
1356 | # CONFIG_EDAC_AMD8111 is not set | ||
1357 | CONFIG_RTC_LIB=y | 1331 | CONFIG_RTC_LIB=y |
1358 | CONFIG_RTC_CLASS=y | 1332 | CONFIG_RTC_CLASS=y |
1359 | CONFIG_RTC_HCTOSYS=y | 1333 | CONFIG_RTC_HCTOSYS=y |
@@ -1385,6 +1359,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1385 | # CONFIG_RTC_DRV_S35390A is not set | 1359 | # CONFIG_RTC_DRV_S35390A is not set |
1386 | # CONFIG_RTC_DRV_FM3130 is not set | 1360 | # CONFIG_RTC_DRV_FM3130 is not set |
1387 | # CONFIG_RTC_DRV_RX8581 is not set | 1361 | # CONFIG_RTC_DRV_RX8581 is not set |
1362 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1388 | 1363 | ||
1389 | # | 1364 | # |
1390 | # SPI RTC drivers | 1365 | # SPI RTC drivers |
@@ -1425,6 +1400,10 @@ CONFIG_DMA_ENGINE=y | |||
1425 | # CONFIG_DMATEST is not set | 1400 | # CONFIG_DMATEST is not set |
1426 | # CONFIG_AUXDISPLAY is not set | 1401 | # CONFIG_AUXDISPLAY is not set |
1427 | # CONFIG_UIO is not set | 1402 | # CONFIG_UIO is not set |
1403 | |||
1404 | # | ||
1405 | # TI VLYNQ | ||
1406 | # | ||
1428 | # CONFIG_STAGING is not set | 1407 | # CONFIG_STAGING is not set |
1429 | 1408 | ||
1430 | # | 1409 | # |
@@ -1445,11 +1424,12 @@ CONFIG_FS_MBCACHE=y | |||
1445 | # CONFIG_REISERFS_FS is not set | 1424 | # CONFIG_REISERFS_FS is not set |
1446 | # CONFIG_JFS_FS is not set | 1425 | # CONFIG_JFS_FS is not set |
1447 | # CONFIG_FS_POSIX_ACL is not set | 1426 | # CONFIG_FS_POSIX_ACL is not set |
1448 | CONFIG_FILE_LOCKING=y | ||
1449 | # CONFIG_XFS_FS is not set | 1427 | # CONFIG_XFS_FS is not set |
1450 | # CONFIG_GFS2_FS is not set | 1428 | # CONFIG_GFS2_FS is not set |
1451 | # CONFIG_OCFS2_FS is not set | 1429 | # CONFIG_OCFS2_FS is not set |
1452 | # CONFIG_BTRFS_FS is not set | 1430 | # CONFIG_BTRFS_FS is not set |
1431 | CONFIG_FILE_LOCKING=y | ||
1432 | CONFIG_FSNOTIFY=y | ||
1453 | CONFIG_DNOTIFY=y | 1433 | CONFIG_DNOTIFY=y |
1454 | CONFIG_INOTIFY=y | 1434 | CONFIG_INOTIFY=y |
1455 | CONFIG_INOTIFY_USER=y | 1435 | CONFIG_INOTIFY_USER=y |
@@ -1524,6 +1504,7 @@ CONFIG_NFS_FS=y | |||
1524 | CONFIG_NFS_V3=y | 1504 | CONFIG_NFS_V3=y |
1525 | # CONFIG_NFS_V3_ACL is not set | 1505 | # CONFIG_NFS_V3_ACL is not set |
1526 | CONFIG_NFS_V4=y | 1506 | CONFIG_NFS_V4=y |
1507 | # CONFIG_NFS_V4_1 is not set | ||
1527 | CONFIG_ROOT_NFS=y | 1508 | CONFIG_ROOT_NFS=y |
1528 | CONFIG_NFSD=y | 1509 | CONFIG_NFSD=y |
1529 | # CONFIG_NFSD_V3 is not set | 1510 | # CONFIG_NFSD_V3 is not set |
@@ -1628,6 +1609,7 @@ CONFIG_HAS_IOPORT=y | |||
1628 | CONFIG_HAS_DMA=y | 1609 | CONFIG_HAS_DMA=y |
1629 | CONFIG_HAVE_LMB=y | 1610 | CONFIG_HAVE_LMB=y |
1630 | CONFIG_NLATTR=y | 1611 | CONFIG_NLATTR=y |
1612 | CONFIG_GENERIC_ATOMIC64=y | ||
1631 | 1613 | ||
1632 | # | 1614 | # |
1633 | # Kernel hacking | 1615 | # Kernel hacking |
@@ -1658,6 +1640,9 @@ CONFIG_SCHED_DEBUG=y | |||
1658 | # CONFIG_RT_MUTEX_TESTER is not set | 1640 | # CONFIG_RT_MUTEX_TESTER is not set |
1659 | # CONFIG_DEBUG_SPINLOCK is not set | 1641 | # CONFIG_DEBUG_SPINLOCK is not set |
1660 | # CONFIG_DEBUG_MUTEXES is not set | 1642 | # CONFIG_DEBUG_MUTEXES is not set |
1643 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1644 | # CONFIG_PROVE_LOCKING is not set | ||
1645 | # CONFIG_LOCK_STAT is not set | ||
1661 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1646 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1662 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1647 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1663 | # CONFIG_DEBUG_KOBJECT is not set | 1648 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1670,7 +1655,6 @@ CONFIG_DEBUG_INFO=y | |||
1670 | # CONFIG_DEBUG_LIST is not set | 1655 | # CONFIG_DEBUG_LIST is not set |
1671 | # CONFIG_DEBUG_SG is not set | 1656 | # CONFIG_DEBUG_SG is not set |
1672 | # CONFIG_DEBUG_NOTIFIERS is not set | 1657 | # CONFIG_DEBUG_NOTIFIERS is not set |
1673 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1674 | # CONFIG_RCU_TORTURE_TEST is not set | 1658 | # CONFIG_RCU_TORTURE_TEST is not set |
1675 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1659 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1676 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1660 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1684,16 +1668,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1684 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1668 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1685 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1669 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1686 | CONFIG_TRACING_SUPPORT=y | 1670 | CONFIG_TRACING_SUPPORT=y |
1687 | 1671 | CONFIG_FTRACE=y | |
1688 | # | ||
1689 | # Tracers | ||
1690 | # | ||
1691 | # CONFIG_FUNCTION_TRACER is not set | 1672 | # CONFIG_FUNCTION_TRACER is not set |
1673 | # CONFIG_IRQSOFF_TRACER is not set | ||
1692 | # CONFIG_SCHED_TRACER is not set | 1674 | # CONFIG_SCHED_TRACER is not set |
1693 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1675 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1694 | # CONFIG_EVENT_TRACER is not set | ||
1695 | # CONFIG_BOOT_TRACER is not set | 1676 | # CONFIG_BOOT_TRACER is not set |
1696 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1677 | CONFIG_BRANCH_PROFILE_NONE=y |
1678 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1679 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1697 | # CONFIG_STACK_TRACER is not set | 1680 | # CONFIG_STACK_TRACER is not set |
1698 | # CONFIG_KMEMTRACE is not set | 1681 | # CONFIG_KMEMTRACE is not set |
1699 | # CONFIG_WORKQUEUE_TRACER is not set | 1682 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1702,9 +1685,13 @@ CONFIG_TRACING_SUPPORT=y | |||
1702 | # CONFIG_SAMPLES is not set | 1685 | # CONFIG_SAMPLES is not set |
1703 | CONFIG_HAVE_ARCH_KGDB=y | 1686 | CONFIG_HAVE_ARCH_KGDB=y |
1704 | # CONFIG_KGDB is not set | 1687 | # CONFIG_KGDB is not set |
1688 | # CONFIG_KMEMCHECK is not set | ||
1689 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1690 | CONFIG_PPC_WERROR=y | ||
1705 | CONFIG_PRINT_STACK_DEPTH=64 | 1691 | CONFIG_PRINT_STACK_DEPTH=64 |
1706 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1692 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1707 | # CONFIG_DEBUG_STACK_USAGE is not set | 1693 | # CONFIG_DEBUG_STACK_USAGE is not set |
1694 | # CONFIG_PPC_EMULATED_STATS is not set | ||
1708 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1695 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1709 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1696 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1710 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1697 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 1aa1c508d600..db082ce5a1c5 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_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-rc2 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Tue Apr 21 15:41:18 2009 | 4 | # Wed Jul 29 23:31:56 2009 |
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=y | 12 | CONFIG_PPC_85xx=y |
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 |
@@ -35,15 +35,16 @@ CONFIG_GENERIC_TIME=y | |||
35 | CONFIG_GENERIC_TIME_VSYSCALL=y | 35 | CONFIG_GENERIC_TIME_VSYSCALL=y |
36 | CONFIG_GENERIC_CLOCKEVENTS=y | 36 | CONFIG_GENERIC_CLOCKEVENTS=y |
37 | CONFIG_GENERIC_HARDIRQS=y | 37 | CONFIG_GENERIC_HARDIRQS=y |
38 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 39 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
39 | CONFIG_IRQ_PER_CPU=y | 40 | CONFIG_IRQ_PER_CPU=y |
40 | CONFIG_STACKTRACE_SUPPORT=y | 41 | CONFIG_STACKTRACE_SUPPORT=y |
41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 42 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
43 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
42 | CONFIG_LOCKDEP_SUPPORT=y | 44 | CONFIG_LOCKDEP_SUPPORT=y |
43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 45 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
44 | CONFIG_ARCH_HAS_ILOG2_U32=y | 46 | CONFIG_ARCH_HAS_ILOG2_U32=y |
45 | CONFIG_GENERIC_HWEIGHT=y | 47 | CONFIG_GENERIC_HWEIGHT=y |
46 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
47 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 48 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
48 | CONFIG_GENERIC_GPIO=y | 49 | CONFIG_GENERIC_GPIO=y |
49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 50 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -58,11 +59,13 @@ CONFIG_PPC_UDBG_16550=y | |||
58 | CONFIG_GENERIC_TBSYNC=y | 59 | CONFIG_GENERIC_TBSYNC=y |
59 | CONFIG_AUDIT_ARCH=y | 60 | CONFIG_AUDIT_ARCH=y |
60 | CONFIG_GENERIC_BUG=y | 61 | CONFIG_GENERIC_BUG=y |
62 | CONFIG_DTC=y | ||
61 | CONFIG_DEFAULT_UIMAGE=y | 63 | CONFIG_DEFAULT_UIMAGE=y |
62 | # CONFIG_PPC_DCR_NATIVE is not set | 64 | # CONFIG_PPC_DCR_NATIVE is not set |
63 | # CONFIG_PPC_DCR_MMIO is not set | 65 | # CONFIG_PPC_DCR_MMIO is not set |
64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 66 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 67 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
68 | CONFIG_CONSTRUCTORS=y | ||
66 | 69 | ||
67 | # | 70 | # |
68 | # General setup | 71 | # General setup |
@@ -117,7 +120,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
117 | CONFIG_KALLSYMS=y | 120 | CONFIG_KALLSYMS=y |
118 | CONFIG_KALLSYMS_ALL=y | 121 | CONFIG_KALLSYMS_ALL=y |
119 | CONFIG_KALLSYMS_EXTRA_PASS=y | 122 | CONFIG_KALLSYMS_EXTRA_PASS=y |
120 | # CONFIG_STRIP_ASM_SYMS is not set | ||
121 | CONFIG_HOTPLUG=y | 123 | CONFIG_HOTPLUG=y |
122 | CONFIG_PRINTK=y | 124 | CONFIG_PRINTK=y |
123 | CONFIG_BUG=y | 125 | CONFIG_BUG=y |
@@ -130,9 +132,16 @@ CONFIG_TIMERFD=y | |||
130 | CONFIG_EVENTFD=y | 132 | CONFIG_EVENTFD=y |
131 | CONFIG_SHMEM=y | 133 | CONFIG_SHMEM=y |
132 | CONFIG_AIO=y | 134 | CONFIG_AIO=y |
135 | CONFIG_HAVE_PERF_COUNTERS=y | ||
136 | |||
137 | # | ||
138 | # Performance Counters | ||
139 | # | ||
140 | # CONFIG_PERF_COUNTERS is not set | ||
133 | CONFIG_VM_EVENT_COUNTERS=y | 141 | CONFIG_VM_EVENT_COUNTERS=y |
134 | CONFIG_PCI_QUIRKS=y | 142 | CONFIG_PCI_QUIRKS=y |
135 | CONFIG_SLUB_DEBUG=y | 143 | CONFIG_SLUB_DEBUG=y |
144 | # CONFIG_STRIP_ASM_SYMS is not set | ||
136 | CONFIG_COMPAT_BRK=y | 145 | CONFIG_COMPAT_BRK=y |
137 | # CONFIG_SLAB is not set | 146 | # CONFIG_SLAB is not set |
138 | CONFIG_SLUB=y | 147 | CONFIG_SLUB=y |
@@ -148,6 +157,11 @@ CONFIG_HAVE_KRETPROBES=y | |||
148 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 157 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
149 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 158 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
150 | CONFIG_HAVE_CLK=y | 159 | CONFIG_HAVE_CLK=y |
160 | |||
161 | # | ||
162 | # GCOV-based kernel profiling | ||
163 | # | ||
164 | # CONFIG_GCOV_KERNEL is not set | ||
151 | # CONFIG_SLOW_WORK is not set | 165 | # CONFIG_SLOW_WORK is not set |
152 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 166 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
153 | CONFIG_SLABINFO=y | 167 | CONFIG_SLABINFO=y |
@@ -161,7 +175,7 @@ CONFIG_MODVERSIONS=y | |||
161 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 175 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
162 | CONFIG_STOP_MACHINE=y | 176 | CONFIG_STOP_MACHINE=y |
163 | CONFIG_BLOCK=y | 177 | CONFIG_BLOCK=y |
164 | CONFIG_LBD=y | 178 | CONFIG_LBDAF=y |
165 | # CONFIG_BLK_DEV_BSG is not set | 179 | # CONFIG_BLK_DEV_BSG is not set |
166 | # CONFIG_BLK_DEV_INTEGRITY is not set | 180 | # CONFIG_BLK_DEV_INTEGRITY is not set |
167 | 181 | ||
@@ -194,6 +208,7 @@ CONFIG_MPC8536_DS=y | |||
194 | CONFIG_MPC85xx_DS=y | 208 | CONFIG_MPC85xx_DS=y |
195 | CONFIG_SOCRATES=y | 209 | CONFIG_SOCRATES=y |
196 | CONFIG_KSI8560=y | 210 | CONFIG_KSI8560=y |
211 | # CONFIG_XES_MPC85xx is not set | ||
197 | CONFIG_STX_GP3=y | 212 | CONFIG_STX_GP3=y |
198 | CONFIG_TQM8540=y | 213 | CONFIG_TQM8540=y |
199 | CONFIG_TQM8541=y | 214 | CONFIG_TQM8541=y |
@@ -244,7 +259,9 @@ CONFIG_BINFMT_ELF=y | |||
244 | # CONFIG_HAVE_AOUT is not set | 259 | # CONFIG_HAVE_AOUT is not set |
245 | CONFIG_BINFMT_MISC=m | 260 | CONFIG_BINFMT_MISC=m |
246 | CONFIG_MATH_EMULATION=y | 261 | CONFIG_MATH_EMULATION=y |
247 | # CONFIG_IOMMU_HELPER is not set | 262 | CONFIG_IOMMU_HELPER=y |
263 | CONFIG_SWIOTLB=y | ||
264 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | ||
248 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 265 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
249 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 266 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
250 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 267 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -264,9 +281,9 @@ CONFIG_MIGRATION=y | |||
264 | CONFIG_ZONE_DMA_FLAG=1 | 281 | CONFIG_ZONE_DMA_FLAG=1 |
265 | CONFIG_BOUNCE=y | 282 | CONFIG_BOUNCE=y |
266 | CONFIG_VIRT_TO_BUS=y | 283 | CONFIG_VIRT_TO_BUS=y |
267 | CONFIG_UNEVICTABLE_LRU=y | ||
268 | CONFIG_HAVE_MLOCK=y | 284 | CONFIG_HAVE_MLOCK=y |
269 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 285 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
286 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
270 | CONFIG_PPC_4K_PAGES=y | 287 | CONFIG_PPC_4K_PAGES=y |
271 | # CONFIG_PPC_16K_PAGES is not set | 288 | # CONFIG_PPC_16K_PAGES is not set |
272 | # CONFIG_PPC_64K_PAGES is not set | 289 | # CONFIG_PPC_64K_PAGES is not set |
@@ -300,7 +317,8 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
300 | # CONFIG_PCI_IOV is not set | 317 | # CONFIG_PCI_IOV is not set |
301 | # CONFIG_PCCARD is not set | 318 | # CONFIG_PCCARD is not set |
302 | # CONFIG_HOTPLUG_PCI is not set | 319 | # CONFIG_HOTPLUG_PCI is not set |
303 | # CONFIG_HAS_RAPIDIO is not set | 320 | CONFIG_HAS_RAPIDIO=y |
321 | # CONFIG_RAPIDIO is not set | ||
304 | 322 | ||
305 | # | 323 | # |
306 | # Advanced setup | 324 | # Advanced setup |
@@ -410,6 +428,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
410 | # CONFIG_ECONET is not set | 428 | # CONFIG_ECONET is not set |
411 | # CONFIG_WAN_ROUTER is not set | 429 | # CONFIG_WAN_ROUTER is not set |
412 | # CONFIG_PHONET is not set | 430 | # CONFIG_PHONET is not set |
431 | # CONFIG_IEEE802154 is not set | ||
413 | # CONFIG_NET_SCHED is not set | 432 | # CONFIG_NET_SCHED is not set |
414 | # CONFIG_DCB is not set | 433 | # CONFIG_DCB is not set |
415 | 434 | ||
@@ -428,7 +447,11 @@ CONFIG_WIRELESS=y | |||
428 | CONFIG_WIRELESS_OLD_REGULATORY=y | 447 | CONFIG_WIRELESS_OLD_REGULATORY=y |
429 | # CONFIG_WIRELESS_EXT is not set | 448 | # CONFIG_WIRELESS_EXT is not set |
430 | # CONFIG_LIB80211 is not set | 449 | # CONFIG_LIB80211 is not set |
431 | # CONFIG_MAC80211 is not set | 450 | |
451 | # | ||
452 | # CFG80211 needs to be enabled for MAC80211 | ||
453 | # | ||
454 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
432 | # CONFIG_WIMAX is not set | 455 | # CONFIG_WIMAX is not set |
433 | # CONFIG_RFKILL is not set | 456 | # CONFIG_RFKILL is not set |
434 | # CONFIG_NET_9P is not set | 457 | # CONFIG_NET_9P is not set |
@@ -454,6 +477,7 @@ CONFIG_EXTRA_FIRMWARE="" | |||
454 | CONFIG_OF_DEVICE=y | 477 | CONFIG_OF_DEVICE=y |
455 | CONFIG_OF_GPIO=y | 478 | CONFIG_OF_GPIO=y |
456 | CONFIG_OF_I2C=y | 479 | CONFIG_OF_I2C=y |
480 | CONFIG_OF_MDIO=y | ||
457 | # CONFIG_PARPORT is not set | 481 | # CONFIG_PARPORT is not set |
458 | CONFIG_BLK_DEV=y | 482 | CONFIG_BLK_DEV=y |
459 | # CONFIG_BLK_DEV_FD is not set | 483 | # CONFIG_BLK_DEV_FD is not set |
@@ -489,7 +513,9 @@ CONFIG_MISC_DEVICES=y | |||
489 | # | 513 | # |
490 | # CONFIG_EEPROM_AT24 is not set | 514 | # CONFIG_EEPROM_AT24 is not set |
491 | CONFIG_EEPROM_LEGACY=y | 515 | CONFIG_EEPROM_LEGACY=y |
516 | # CONFIG_EEPROM_MAX6875 is not set | ||
492 | # CONFIG_EEPROM_93CX6 is not set | 517 | # CONFIG_EEPROM_93CX6 is not set |
518 | # CONFIG_CB710_CORE is not set | ||
493 | CONFIG_HAVE_IDE=y | 519 | CONFIG_HAVE_IDE=y |
494 | # CONFIG_IDE is not set | 520 | # CONFIG_IDE is not set |
495 | 521 | ||
@@ -513,10 +539,6 @@ CONFIG_BLK_DEV_SR=y | |||
513 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 539 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
514 | CONFIG_CHR_DEV_SG=y | 540 | CONFIG_CHR_DEV_SG=y |
515 | # CONFIG_CHR_DEV_SCH is not set | 541 | # CONFIG_CHR_DEV_SCH is not set |
516 | |||
517 | # | ||
518 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
519 | # | ||
520 | CONFIG_SCSI_MULTI_LUN=y | 542 | CONFIG_SCSI_MULTI_LUN=y |
521 | # CONFIG_SCSI_CONSTANTS is not set | 543 | # CONFIG_SCSI_CONSTANTS is not set |
522 | CONFIG_SCSI_LOGGING=y | 544 | CONFIG_SCSI_LOGGING=y |
@@ -534,6 +556,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
534 | CONFIG_SCSI_LOWLEVEL=y | 556 | CONFIG_SCSI_LOWLEVEL=y |
535 | # CONFIG_ISCSI_TCP is not set | 557 | # CONFIG_ISCSI_TCP is not set |
536 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 558 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
559 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
537 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 560 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
538 | # CONFIG_SCSI_3W_9XXX is not set | 561 | # CONFIG_SCSI_3W_9XXX is not set |
539 | # CONFIG_SCSI_ACARD is not set | 562 | # CONFIG_SCSI_ACARD is not set |
@@ -542,6 +565,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
542 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 565 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
543 | # CONFIG_SCSI_AIC79XX is not set | 566 | # CONFIG_SCSI_AIC79XX is not set |
544 | # CONFIG_SCSI_AIC94XX is not set | 567 | # CONFIG_SCSI_AIC94XX is not set |
568 | # CONFIG_SCSI_MVSAS is not set | ||
545 | # CONFIG_SCSI_DPT_I2O is not set | 569 | # CONFIG_SCSI_DPT_I2O is not set |
546 | # CONFIG_SCSI_ADVANSYS is not set | 570 | # CONFIG_SCSI_ADVANSYS is not set |
547 | # CONFIG_SCSI_ARCMSR is not set | 571 | # CONFIG_SCSI_ARCMSR is not set |
@@ -561,7 +585,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
561 | # CONFIG_SCSI_IPS is not set | 585 | # CONFIG_SCSI_IPS is not set |
562 | # CONFIG_SCSI_INITIO is not set | 586 | # CONFIG_SCSI_INITIO is not set |
563 | # CONFIG_SCSI_INIA100 is not set | 587 | # CONFIG_SCSI_INIA100 is not set |
564 | # CONFIG_SCSI_MVSAS is not set | ||
565 | # CONFIG_SCSI_STEX is not set | 588 | # CONFIG_SCSI_STEX is not set |
566 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 589 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
567 | # CONFIG_SCSI_IPR is not set | 590 | # CONFIG_SCSI_IPR is not set |
@@ -645,14 +668,17 @@ CONFIG_PATA_ALI=y | |||
645 | # | 668 | # |
646 | 669 | ||
647 | # | 670 | # |
648 | # Enable only one of the two stacks, unless you know what you are doing | 671 | # You can enable one or both FireWire driver stacks. |
672 | # | ||
673 | |||
674 | # | ||
675 | # See the help texts for more information. | ||
649 | # | 676 | # |
650 | # CONFIG_FIREWIRE is not set | 677 | # CONFIG_FIREWIRE is not set |
651 | # CONFIG_IEEE1394 is not set | 678 | # CONFIG_IEEE1394 is not set |
652 | # CONFIG_I2O is not set | 679 | # CONFIG_I2O is not set |
653 | # CONFIG_MACINTOSH_DRIVERS is not set | 680 | # CONFIG_MACINTOSH_DRIVERS is not set |
654 | CONFIG_NETDEVICES=y | 681 | CONFIG_NETDEVICES=y |
655 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
656 | CONFIG_DUMMY=y | 682 | CONFIG_DUMMY=y |
657 | # CONFIG_BONDING is not set | 683 | # CONFIG_BONDING is not set |
658 | # CONFIG_MACVLAN is not set | 684 | # CONFIG_MACVLAN is not set |
@@ -699,6 +725,7 @@ CONFIG_MII=y | |||
699 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 725 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
700 | # CONFIG_NET_PCI is not set | 726 | # CONFIG_NET_PCI is not set |
701 | # CONFIG_B44 is not set | 727 | # CONFIG_B44 is not set |
728 | # CONFIG_KS8842 is not set | ||
702 | # CONFIG_ATL2 is not set | 729 | # CONFIG_ATL2 is not set |
703 | CONFIG_FS_ENET=y | 730 | CONFIG_FS_ENET=y |
704 | CONFIG_FS_ENET_HAS_SCC=y | 731 | CONFIG_FS_ENET_HAS_SCC=y |
@@ -722,11 +749,13 @@ CONFIG_NETDEV_1000=y | |||
722 | # CONFIG_VIA_VELOCITY is not set | 749 | # CONFIG_VIA_VELOCITY is not set |
723 | # CONFIG_TIGON3 is not set | 750 | # CONFIG_TIGON3 is not set |
724 | # CONFIG_BNX2 is not set | 751 | # CONFIG_BNX2 is not set |
752 | # CONFIG_CNIC is not set | ||
725 | CONFIG_FSL_PQ_MDIO=y | 753 | CONFIG_FSL_PQ_MDIO=y |
726 | CONFIG_GIANFAR=y | 754 | CONFIG_GIANFAR=y |
727 | CONFIG_UCC_GETH=y | 755 | CONFIG_UCC_GETH=y |
728 | # CONFIG_UGETH_MAGIC_PACKET is not set | 756 | # CONFIG_UGETH_MAGIC_PACKET is not set |
729 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 757 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
758 | # CONFIG_MV643XX_ETH is not set | ||
730 | # CONFIG_QLA3XXX is not set | 759 | # CONFIG_QLA3XXX is not set |
731 | # CONFIG_ATL1 is not set | 760 | # CONFIG_ATL1 is not set |
732 | # CONFIG_ATL1E is not set | 761 | # CONFIG_ATL1E is not set |
@@ -901,6 +930,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
901 | # I2C system bus drivers (mostly embedded / system-on-chip) | 930 | # I2C system bus drivers (mostly embedded / system-on-chip) |
902 | # | 931 | # |
903 | CONFIG_I2C_CPM=m | 932 | CONFIG_I2C_CPM=m |
933 | # CONFIG_I2C_DESIGNWARE is not set | ||
904 | # CONFIG_I2C_GPIO is not set | 934 | # CONFIG_I2C_GPIO is not set |
905 | CONFIG_I2C_MPC=y | 935 | CONFIG_I2C_MPC=y |
906 | # CONFIG_I2C_OCORES is not set | 936 | # CONFIG_I2C_OCORES is not set |
@@ -931,13 +961,17 @@ CONFIG_I2C_MPC=y | |||
931 | # CONFIG_SENSORS_PCF8574 is not set | 961 | # CONFIG_SENSORS_PCF8574 is not set |
932 | # CONFIG_PCF8575 is not set | 962 | # CONFIG_PCF8575 is not set |
933 | # CONFIG_SENSORS_PCA9539 is not set | 963 | # CONFIG_SENSORS_PCA9539 is not set |
934 | # CONFIG_SENSORS_MAX6875 is not set | ||
935 | # CONFIG_SENSORS_TSL2550 is not set | 964 | # CONFIG_SENSORS_TSL2550 is not set |
936 | # CONFIG_I2C_DEBUG_CORE is not set | 965 | # CONFIG_I2C_DEBUG_CORE is not set |
937 | # CONFIG_I2C_DEBUG_ALGO is not set | 966 | # CONFIG_I2C_DEBUG_ALGO is not set |
938 | # CONFIG_I2C_DEBUG_BUS is not set | 967 | # CONFIG_I2C_DEBUG_BUS is not set |
939 | # CONFIG_I2C_DEBUG_CHIP is not set | 968 | # CONFIG_I2C_DEBUG_CHIP is not set |
940 | # CONFIG_SPI is not set | 969 | # CONFIG_SPI is not set |
970 | |||
971 | # | ||
972 | # PPS support | ||
973 | # | ||
974 | # CONFIG_PPS is not set | ||
941 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 975 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
942 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 976 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
943 | CONFIG_GPIOLIB=y | 977 | CONFIG_GPIOLIB=y |
@@ -991,76 +1025,9 @@ CONFIG_SSB_POSSIBLE=y | |||
991 | # CONFIG_MFD_WM8400 is not set | 1025 | # CONFIG_MFD_WM8400 is not set |
992 | # CONFIG_MFD_WM8350_I2C is not set | 1026 | # CONFIG_MFD_WM8350_I2C is not set |
993 | # CONFIG_MFD_PCF50633 is not set | 1027 | # CONFIG_MFD_PCF50633 is not set |
1028 | # CONFIG_AB3100_CORE is not set | ||
994 | # CONFIG_REGULATOR is not set | 1029 | # CONFIG_REGULATOR is not set |
995 | 1030 | # CONFIG_MEDIA_SUPPORT is not set | |
996 | # | ||
997 | # Multimedia devices | ||
998 | # | ||
999 | |||
1000 | # | ||
1001 | # Multimedia core support | ||
1002 | # | ||
1003 | # CONFIG_VIDEO_DEV is not set | ||
1004 | CONFIG_DVB_CORE=m | ||
1005 | CONFIG_VIDEO_MEDIA=m | ||
1006 | |||
1007 | # | ||
1008 | # Multimedia drivers | ||
1009 | # | ||
1010 | # CONFIG_MEDIA_ATTACH is not set | ||
1011 | CONFIG_MEDIA_TUNER=m | ||
1012 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
1013 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
1014 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
1015 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
1016 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
1017 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
1018 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
1019 | CONFIG_MEDIA_TUNER_XC2028=m | ||
1020 | CONFIG_MEDIA_TUNER_XC5000=m | ||
1021 | CONFIG_MEDIA_TUNER_MC44S803=m | ||
1022 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
1023 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
1024 | |||
1025 | # | ||
1026 | # Supported SAA7146 based PCI Adapters | ||
1027 | # | ||
1028 | # CONFIG_TTPCI_EEPROM is not set | ||
1029 | # CONFIG_DVB_BUDGET_CORE is not set | ||
1030 | |||
1031 | # | ||
1032 | # Supported USB Adapters | ||
1033 | # | ||
1034 | # CONFIG_DVB_USB is not set | ||
1035 | # CONFIG_DVB_TTUSB_BUDGET is not set | ||
1036 | # CONFIG_DVB_TTUSB_DEC is not set | ||
1037 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
1038 | |||
1039 | # | ||
1040 | # Supported FlexCopII (B2C2) Adapters | ||
1041 | # | ||
1042 | # CONFIG_DVB_B2C2_FLEXCOP is not set | ||
1043 | |||
1044 | # | ||
1045 | # Supported BT878 Adapters | ||
1046 | # | ||
1047 | |||
1048 | # | ||
1049 | # Supported Pluto2 Adapters | ||
1050 | # | ||
1051 | # CONFIG_DVB_PLUTO2 is not set | ||
1052 | |||
1053 | # | ||
1054 | # Supported SDMC DM1105 Adapters | ||
1055 | # | ||
1056 | # CONFIG_DVB_DM1105 is not set | ||
1057 | |||
1058 | # | ||
1059 | # Supported DVB Frontends | ||
1060 | # | ||
1061 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
1062 | CONFIG_DAB=y | ||
1063 | # CONFIG_USB_DABUSB is not set | ||
1064 | 1031 | ||
1065 | # | 1032 | # |
1066 | # Graphics support | 1033 | # Graphics support |
@@ -1100,6 +1067,11 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1100 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1067 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1101 | # CONFIG_SND_DEBUG is not set | 1068 | # CONFIG_SND_DEBUG is not set |
1102 | CONFIG_SND_VMASTER=y | 1069 | CONFIG_SND_VMASTER=y |
1070 | # CONFIG_SND_RAWMIDI_SEQ is not set | ||
1071 | # CONFIG_SND_OPL3_LIB_SEQ is not set | ||
1072 | # CONFIG_SND_OPL4_LIB_SEQ is not set | ||
1073 | # CONFIG_SND_SBAWE_SEQ is not set | ||
1074 | # CONFIG_SND_EMU10K1_SEQ is not set | ||
1103 | CONFIG_SND_AC97_CODEC=y | 1075 | CONFIG_SND_AC97_CODEC=y |
1104 | CONFIG_SND_DRIVERS=y | 1076 | CONFIG_SND_DRIVERS=y |
1105 | # CONFIG_SND_DUMMY is not set | 1077 | # CONFIG_SND_DUMMY is not set |
@@ -1126,6 +1098,7 @@ CONFIG_SND_PCI=y | |||
1126 | # CONFIG_SND_CS4281 is not set | 1098 | # CONFIG_SND_CS4281 is not set |
1127 | # CONFIG_SND_CS46XX is not set | 1099 | # CONFIG_SND_CS46XX is not set |
1128 | # CONFIG_SND_CS5530 is not set | 1100 | # CONFIG_SND_CS5530 is not set |
1101 | # CONFIG_SND_CTXFI is not set | ||
1129 | # CONFIG_SND_DARLA20 is not set | 1102 | # CONFIG_SND_DARLA20 is not set |
1130 | # CONFIG_SND_GINA20 is not set | 1103 | # CONFIG_SND_GINA20 is not set |
1131 | # CONFIG_SND_LAYLA20 is not set | 1104 | # CONFIG_SND_LAYLA20 is not set |
@@ -1156,6 +1129,7 @@ CONFIG_SND_PCI=y | |||
1156 | CONFIG_SND_INTEL8X0=y | 1129 | CONFIG_SND_INTEL8X0=y |
1157 | # CONFIG_SND_INTEL8X0M is not set | 1130 | # CONFIG_SND_INTEL8X0M is not set |
1158 | # CONFIG_SND_KORG1212 is not set | 1131 | # CONFIG_SND_KORG1212 is not set |
1132 | # CONFIG_SND_LX6464ES is not set | ||
1159 | # CONFIG_SND_MAESTRO3 is not set | 1133 | # CONFIG_SND_MAESTRO3 is not set |
1160 | # CONFIG_SND_MIXART is not set | 1134 | # CONFIG_SND_MIXART is not set |
1161 | # CONFIG_SND_NM256 is not set | 1135 | # CONFIG_SND_NM256 is not set |
@@ -1200,7 +1174,7 @@ CONFIG_HID_BELKIN=y | |||
1200 | CONFIG_HID_CHERRY=y | 1174 | CONFIG_HID_CHERRY=y |
1201 | CONFIG_HID_CHICONY=y | 1175 | CONFIG_HID_CHICONY=y |
1202 | CONFIG_HID_CYPRESS=y | 1176 | CONFIG_HID_CYPRESS=y |
1203 | # CONFIG_DRAGONRISE_FF is not set | 1177 | # CONFIG_HID_DRAGONRISE is not set |
1204 | CONFIG_HID_EZKEY=y | 1178 | CONFIG_HID_EZKEY=y |
1205 | # CONFIG_HID_KYE is not set | 1179 | # CONFIG_HID_KYE is not set |
1206 | CONFIG_HID_GYRATION=y | 1180 | CONFIG_HID_GYRATION=y |
@@ -1217,10 +1191,11 @@ CONFIG_HID_PETALYNX=y | |||
1217 | CONFIG_HID_SAMSUNG=y | 1191 | CONFIG_HID_SAMSUNG=y |
1218 | CONFIG_HID_SONY=y | 1192 | CONFIG_HID_SONY=y |
1219 | CONFIG_HID_SUNPLUS=y | 1193 | CONFIG_HID_SUNPLUS=y |
1220 | # CONFIG_GREENASIA_FF is not set | 1194 | # CONFIG_HID_GREENASIA is not set |
1195 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1221 | # CONFIG_HID_TOPSEED is not set | 1196 | # CONFIG_HID_TOPSEED is not set |
1222 | CONFIG_THRUSTMASTER_FF=m | 1197 | # CONFIG_HID_THRUSTMASTER is not set |
1223 | CONFIG_ZEROPLUS_FF=m | 1198 | # CONFIG_HID_ZEROPLUS is not set |
1224 | CONFIG_USB_SUPPORT=y | 1199 | CONFIG_USB_SUPPORT=y |
1225 | CONFIG_USB_ARCH_HAS_HCD=y | 1200 | CONFIG_USB_ARCH_HAS_HCD=y |
1226 | CONFIG_USB_ARCH_HAS_OHCI=y | 1201 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1246,6 +1221,7 @@ CONFIG_USB_MON=y | |||
1246 | # USB Host Controller Drivers | 1221 | # USB Host Controller Drivers |
1247 | # | 1222 | # |
1248 | # CONFIG_USB_C67X00_HCD is not set | 1223 | # CONFIG_USB_C67X00_HCD is not set |
1224 | # CONFIG_USB_XHCI_HCD is not set | ||
1249 | CONFIG_USB_EHCI_HCD=y | 1225 | CONFIG_USB_EHCI_HCD=y |
1250 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1226 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1251 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1227 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1255,9 +1231,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1255 | # CONFIG_USB_ISP116X_HCD is not set | 1231 | # CONFIG_USB_ISP116X_HCD is not set |
1256 | # CONFIG_USB_ISP1760_HCD is not set | 1232 | # CONFIG_USB_ISP1760_HCD is not set |
1257 | CONFIG_USB_OHCI_HCD=y | 1233 | CONFIG_USB_OHCI_HCD=y |
1258 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1259 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1234 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1260 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 1235 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
1236 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1261 | CONFIG_USB_OHCI_HCD_PCI=y | 1237 | CONFIG_USB_OHCI_HCD_PCI=y |
1262 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1238 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1263 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1239 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1356,8 +1332,6 @@ CONFIG_EDAC=y | |||
1356 | # CONFIG_EDAC_DEBUG is not set | 1332 | # CONFIG_EDAC_DEBUG is not set |
1357 | CONFIG_EDAC_MM_EDAC=y | 1333 | CONFIG_EDAC_MM_EDAC=y |
1358 | CONFIG_EDAC_MPC85XX=y | 1334 | CONFIG_EDAC_MPC85XX=y |
1359 | # CONFIG_EDAC_AMD8131 is not set | ||
1360 | # CONFIG_EDAC_AMD8111 is not set | ||
1361 | CONFIG_RTC_LIB=y | 1335 | CONFIG_RTC_LIB=y |
1362 | CONFIG_RTC_CLASS=y | 1336 | CONFIG_RTC_CLASS=y |
1363 | CONFIG_RTC_HCTOSYS=y | 1337 | CONFIG_RTC_HCTOSYS=y |
@@ -1389,6 +1363,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1389 | # CONFIG_RTC_DRV_S35390A is not set | 1363 | # CONFIG_RTC_DRV_S35390A is not set |
1390 | # CONFIG_RTC_DRV_FM3130 is not set | 1364 | # CONFIG_RTC_DRV_FM3130 is not set |
1391 | # CONFIG_RTC_DRV_RX8581 is not set | 1365 | # CONFIG_RTC_DRV_RX8581 is not set |
1366 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1392 | 1367 | ||
1393 | # | 1368 | # |
1394 | # SPI RTC drivers | 1369 | # SPI RTC drivers |
@@ -1429,6 +1404,10 @@ CONFIG_DMA_ENGINE=y | |||
1429 | # CONFIG_DMATEST is not set | 1404 | # CONFIG_DMATEST is not set |
1430 | # CONFIG_AUXDISPLAY is not set | 1405 | # CONFIG_AUXDISPLAY is not set |
1431 | # CONFIG_UIO is not set | 1406 | # CONFIG_UIO is not set |
1407 | |||
1408 | # | ||
1409 | # TI VLYNQ | ||
1410 | # | ||
1432 | # CONFIG_STAGING is not set | 1411 | # CONFIG_STAGING is not set |
1433 | 1412 | ||
1434 | # | 1413 | # |
@@ -1449,11 +1428,12 @@ CONFIG_FS_MBCACHE=y | |||
1449 | # CONFIG_REISERFS_FS is not set | 1428 | # CONFIG_REISERFS_FS is not set |
1450 | # CONFIG_JFS_FS is not set | 1429 | # CONFIG_JFS_FS is not set |
1451 | # CONFIG_FS_POSIX_ACL is not set | 1430 | # CONFIG_FS_POSIX_ACL is not set |
1452 | CONFIG_FILE_LOCKING=y | ||
1453 | # CONFIG_XFS_FS is not set | 1431 | # CONFIG_XFS_FS is not set |
1454 | # CONFIG_GFS2_FS is not set | 1432 | # CONFIG_GFS2_FS is not set |
1455 | # CONFIG_OCFS2_FS is not set | 1433 | # CONFIG_OCFS2_FS is not set |
1456 | # CONFIG_BTRFS_FS is not set | 1434 | # CONFIG_BTRFS_FS is not set |
1435 | CONFIG_FILE_LOCKING=y | ||
1436 | CONFIG_FSNOTIFY=y | ||
1457 | CONFIG_DNOTIFY=y | 1437 | CONFIG_DNOTIFY=y |
1458 | CONFIG_INOTIFY=y | 1438 | CONFIG_INOTIFY=y |
1459 | CONFIG_INOTIFY_USER=y | 1439 | CONFIG_INOTIFY_USER=y |
@@ -1528,6 +1508,7 @@ CONFIG_NFS_FS=y | |||
1528 | CONFIG_NFS_V3=y | 1508 | CONFIG_NFS_V3=y |
1529 | # CONFIG_NFS_V3_ACL is not set | 1509 | # CONFIG_NFS_V3_ACL is not set |
1530 | CONFIG_NFS_V4=y | 1510 | CONFIG_NFS_V4=y |
1511 | # CONFIG_NFS_V4_1 is not set | ||
1531 | CONFIG_ROOT_NFS=y | 1512 | CONFIG_ROOT_NFS=y |
1532 | CONFIG_NFSD=y | 1513 | CONFIG_NFSD=y |
1533 | # CONFIG_NFSD_V3 is not set | 1514 | # CONFIG_NFSD_V3 is not set |
@@ -1632,6 +1613,7 @@ CONFIG_HAS_IOPORT=y | |||
1632 | CONFIG_HAS_DMA=y | 1613 | CONFIG_HAS_DMA=y |
1633 | CONFIG_HAVE_LMB=y | 1614 | CONFIG_HAVE_LMB=y |
1634 | CONFIG_NLATTR=y | 1615 | CONFIG_NLATTR=y |
1616 | CONFIG_GENERIC_ATOMIC64=y | ||
1635 | 1617 | ||
1636 | # | 1618 | # |
1637 | # Kernel hacking | 1619 | # Kernel hacking |
@@ -1662,6 +1644,9 @@ CONFIG_SCHED_DEBUG=y | |||
1662 | # CONFIG_RT_MUTEX_TESTER is not set | 1644 | # CONFIG_RT_MUTEX_TESTER is not set |
1663 | # CONFIG_DEBUG_SPINLOCK is not set | 1645 | # CONFIG_DEBUG_SPINLOCK is not set |
1664 | # CONFIG_DEBUG_MUTEXES is not set | 1646 | # CONFIG_DEBUG_MUTEXES is not set |
1647 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1648 | # CONFIG_PROVE_LOCKING is not set | ||
1649 | # CONFIG_LOCK_STAT is not set | ||
1665 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1650 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1666 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1651 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1667 | # CONFIG_DEBUG_KOBJECT is not set | 1652 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1674,7 +1659,6 @@ CONFIG_DEBUG_INFO=y | |||
1674 | # CONFIG_DEBUG_LIST is not set | 1659 | # CONFIG_DEBUG_LIST is not set |
1675 | # CONFIG_DEBUG_SG is not set | 1660 | # CONFIG_DEBUG_SG is not set |
1676 | # CONFIG_DEBUG_NOTIFIERS is not set | 1661 | # CONFIG_DEBUG_NOTIFIERS is not set |
1677 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1678 | # CONFIG_RCU_TORTURE_TEST is not set | 1662 | # CONFIG_RCU_TORTURE_TEST is not set |
1679 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1663 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1680 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1664 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1688,16 +1672,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1688 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1672 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1689 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1673 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1690 | CONFIG_TRACING_SUPPORT=y | 1674 | CONFIG_TRACING_SUPPORT=y |
1691 | 1675 | CONFIG_FTRACE=y | |
1692 | # | ||
1693 | # Tracers | ||
1694 | # | ||
1695 | # CONFIG_FUNCTION_TRACER is not set | 1676 | # CONFIG_FUNCTION_TRACER is not set |
1677 | # CONFIG_IRQSOFF_TRACER is not set | ||
1696 | # CONFIG_SCHED_TRACER is not set | 1678 | # CONFIG_SCHED_TRACER is not set |
1697 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1679 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1698 | # CONFIG_EVENT_TRACER is not set | ||
1699 | # CONFIG_BOOT_TRACER is not set | 1680 | # CONFIG_BOOT_TRACER is not set |
1700 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1681 | CONFIG_BRANCH_PROFILE_NONE=y |
1682 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1683 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1701 | # CONFIG_STACK_TRACER is not set | 1684 | # CONFIG_STACK_TRACER is not set |
1702 | # CONFIG_KMEMTRACE is not set | 1685 | # CONFIG_KMEMTRACE is not set |
1703 | # CONFIG_WORKQUEUE_TRACER is not set | 1686 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1706,9 +1689,13 @@ CONFIG_TRACING_SUPPORT=y | |||
1706 | # CONFIG_SAMPLES is not set | 1689 | # CONFIG_SAMPLES is not set |
1707 | CONFIG_HAVE_ARCH_KGDB=y | 1690 | CONFIG_HAVE_ARCH_KGDB=y |
1708 | # CONFIG_KGDB is not set | 1691 | # CONFIG_KGDB is not set |
1692 | # CONFIG_KMEMCHECK is not set | ||
1693 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1694 | CONFIG_PPC_WERROR=y | ||
1709 | CONFIG_PRINT_STACK_DEPTH=64 | 1695 | CONFIG_PRINT_STACK_DEPTH=64 |
1710 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1696 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1711 | # CONFIG_DEBUG_STACK_USAGE is not set | 1697 | # CONFIG_DEBUG_STACK_USAGE is not set |
1698 | # CONFIG_PPC_EMULATED_STATS is not set | ||
1712 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1699 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1713 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1700 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1714 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1701 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 3add6f62b21e..6809b61ed3de 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:00 2009 | 4 | # Wed Jul 29 23:31:57 2009 |
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=y | 13 | CONFIG_PPC_8xx=y |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -27,15 +27,16 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 27 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 28 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
31 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 40 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 42 | CONFIG_PPC=y |
@@ -48,11 +49,13 @@ CONFIG_OF=y | |||
48 | # CONFIG_PPC_UDBG_16550 is not set | 49 | # CONFIG_PPC_UDBG_16550 is not set |
49 | # CONFIG_GENERIC_TBSYNC is not set | 50 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 51 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_DTC=y | ||
51 | # CONFIG_DEFAULT_UIMAGE is not set | 53 | # CONFIG_DEFAULT_UIMAGE is not set |
52 | # CONFIG_PPC_DCR_NATIVE is not set | 54 | # CONFIG_PPC_DCR_NATIVE is not set |
53 | # CONFIG_PPC_DCR_MMIO is not set | 55 | # CONFIG_PPC_DCR_MMIO is not set |
54 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 56 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
58 | CONFIG_CONSTRUCTORS=y | ||
56 | 59 | ||
57 | # | 60 | # |
58 | # General setup | 61 | # General setup |
@@ -98,7 +101,6 @@ CONFIG_EMBEDDED=y | |||
98 | # CONFIG_SYSCTL_SYSCALL is not set | 101 | # CONFIG_SYSCTL_SYSCALL is not set |
99 | CONFIG_KALLSYMS=y | 102 | CONFIG_KALLSYMS=y |
100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 103 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
101 | # CONFIG_STRIP_ASM_SYMS is not set | ||
102 | # CONFIG_HOTPLUG is not set | 104 | # CONFIG_HOTPLUG is not set |
103 | CONFIG_PRINTK=y | 105 | CONFIG_PRINTK=y |
104 | # CONFIG_BUG is not set | 106 | # CONFIG_BUG is not set |
@@ -111,8 +113,15 @@ CONFIG_TIMERFD=y | |||
111 | CONFIG_EVENTFD=y | 113 | CONFIG_EVENTFD=y |
112 | CONFIG_SHMEM=y | 114 | CONFIG_SHMEM=y |
113 | CONFIG_AIO=y | 115 | CONFIG_AIO=y |
116 | CONFIG_HAVE_PERF_COUNTERS=y | ||
117 | |||
118 | # | ||
119 | # Performance Counters | ||
120 | # | ||
121 | # CONFIG_PERF_COUNTERS is not set | ||
114 | # CONFIG_VM_EVENT_COUNTERS is not set | 122 | # CONFIG_VM_EVENT_COUNTERS is not set |
115 | CONFIG_SLUB_DEBUG=y | 123 | CONFIG_SLUB_DEBUG=y |
124 | # CONFIG_STRIP_ASM_SYMS is not set | ||
116 | CONFIG_COMPAT_BRK=y | 125 | CONFIG_COMPAT_BRK=y |
117 | # CONFIG_SLAB is not set | 126 | # CONFIG_SLAB is not set |
118 | CONFIG_SLUB=y | 127 | CONFIG_SLUB=y |
@@ -126,6 +135,10 @@ CONFIG_HAVE_KPROBES=y | |||
126 | CONFIG_HAVE_KRETPROBES=y | 135 | CONFIG_HAVE_KRETPROBES=y |
127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 136 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
128 | CONFIG_HAVE_CLK=y | 137 | CONFIG_HAVE_CLK=y |
138 | |||
139 | # | ||
140 | # GCOV-based kernel profiling | ||
141 | # | ||
129 | # CONFIG_SLOW_WORK is not set | 142 | # CONFIG_SLOW_WORK is not set |
130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 143 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
131 | CONFIG_SLABINFO=y | 144 | CONFIG_SLABINFO=y |
@@ -133,7 +146,7 @@ CONFIG_RT_MUTEXES=y | |||
133 | CONFIG_BASE_SMALL=1 | 146 | CONFIG_BASE_SMALL=1 |
134 | # CONFIG_MODULES is not set | 147 | # CONFIG_MODULES is not set |
135 | CONFIG_BLOCK=y | 148 | CONFIG_BLOCK=y |
136 | # CONFIG_LBD is not set | 149 | CONFIG_LBDAF=y |
137 | # CONFIG_BLK_DEV_BSG is not set | 150 | # CONFIG_BLK_DEV_BSG is not set |
138 | # CONFIG_BLK_DEV_INTEGRITY is not set | 151 | # CONFIG_BLK_DEV_INTEGRITY is not set |
139 | 152 | ||
@@ -219,6 +232,7 @@ CONFIG_BINFMT_ELF=y | |||
219 | # CONFIG_BINFMT_MISC is not set | 232 | # CONFIG_BINFMT_MISC is not set |
220 | CONFIG_MATH_EMULATION=y | 233 | CONFIG_MATH_EMULATION=y |
221 | # CONFIG_IOMMU_HELPER is not set | 234 | # CONFIG_IOMMU_HELPER is not set |
235 | # CONFIG_SWIOTLB is not set | ||
222 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 236 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y |
223 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
224 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 238 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -238,9 +252,9 @@ CONFIG_MIGRATION=y | |||
238 | CONFIG_ZONE_DMA_FLAG=1 | 252 | CONFIG_ZONE_DMA_FLAG=1 |
239 | CONFIG_BOUNCE=y | 253 | CONFIG_BOUNCE=y |
240 | CONFIG_VIRT_TO_BUS=y | 254 | CONFIG_VIRT_TO_BUS=y |
241 | CONFIG_UNEVICTABLE_LRU=y | ||
242 | CONFIG_HAVE_MLOCK=y | 255 | CONFIG_HAVE_MLOCK=y |
243 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 256 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
257 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
244 | CONFIG_PPC_4K_PAGES=y | 258 | CONFIG_PPC_4K_PAGES=y |
245 | # CONFIG_PPC_16K_PAGES is not set | 259 | # CONFIG_PPC_16K_PAGES is not set |
246 | # CONFIG_PPC_64K_PAGES is not set | 260 | # CONFIG_PPC_64K_PAGES is not set |
@@ -278,6 +292,7 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
278 | CONFIG_KERNEL_START=0xc0000000 | 292 | CONFIG_KERNEL_START=0xc0000000 |
279 | CONFIG_PHYSICAL_START=0x00000000 | 293 | CONFIG_PHYSICAL_START=0x00000000 |
280 | CONFIG_TASK_SIZE=0x80000000 | 294 | CONFIG_TASK_SIZE=0x80000000 |
295 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
281 | CONFIG_NET=y | 296 | CONFIG_NET=y |
282 | 297 | ||
283 | # | 298 | # |
@@ -339,6 +354,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
339 | # CONFIG_ECONET is not set | 354 | # CONFIG_ECONET is not set |
340 | # CONFIG_WAN_ROUTER is not set | 355 | # CONFIG_WAN_ROUTER is not set |
341 | # CONFIG_PHONET is not set | 356 | # CONFIG_PHONET is not set |
357 | # CONFIG_IEEE802154 is not set | ||
342 | # CONFIG_NET_SCHED is not set | 358 | # CONFIG_NET_SCHED is not set |
343 | # CONFIG_DCB is not set | 359 | # CONFIG_DCB is not set |
344 | 360 | ||
@@ -356,7 +372,11 @@ CONFIG_WIRELESS=y | |||
356 | CONFIG_WIRELESS_OLD_REGULATORY=y | 372 | CONFIG_WIRELESS_OLD_REGULATORY=y |
357 | # CONFIG_WIRELESS_EXT is not set | 373 | # CONFIG_WIRELESS_EXT is not set |
358 | # CONFIG_LIB80211 is not set | 374 | # CONFIG_LIB80211 is not set |
359 | # CONFIG_MAC80211 is not set | 375 | |
376 | # | ||
377 | # CFG80211 needs to be enabled for MAC80211 | ||
378 | # | ||
379 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
360 | # CONFIG_WIMAX is not set | 380 | # CONFIG_WIMAX is not set |
361 | # CONFIG_RFKILL is not set | 381 | # CONFIG_RFKILL is not set |
362 | # CONFIG_NET_9P is not set | 382 | # CONFIG_NET_9P is not set |
@@ -374,6 +394,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
374 | # CONFIG_CONNECTOR is not set | 394 | # CONFIG_CONNECTOR is not set |
375 | # CONFIG_MTD is not set | 395 | # CONFIG_MTD is not set |
376 | CONFIG_OF_DEVICE=y | 396 | CONFIG_OF_DEVICE=y |
397 | CONFIG_OF_MDIO=y | ||
377 | # CONFIG_PARPORT is not set | 398 | # CONFIG_PARPORT is not set |
378 | CONFIG_BLK_DEV=y | 399 | CONFIG_BLK_DEV=y |
379 | # CONFIG_BLK_DEV_FD is not set | 400 | # CONFIG_BLK_DEV_FD is not set |
@@ -407,7 +428,6 @@ CONFIG_HAVE_IDE=y | |||
407 | # CONFIG_MD is not set | 428 | # CONFIG_MD is not set |
408 | # CONFIG_MACINTOSH_DRIVERS is not set | 429 | # CONFIG_MACINTOSH_DRIVERS is not set |
409 | CONFIG_NETDEVICES=y | 430 | CONFIG_NETDEVICES=y |
410 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
411 | # CONFIG_DUMMY is not set | 431 | # CONFIG_DUMMY is not set |
412 | # CONFIG_BONDING is not set | 432 | # CONFIG_BONDING is not set |
413 | # CONFIG_MACVLAN is not set | 433 | # CONFIG_MACVLAN is not set |
@@ -446,6 +466,7 @@ CONFIG_MII=y | |||
446 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 466 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
447 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 467 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
448 | # CONFIG_B44 is not set | 468 | # CONFIG_B44 is not set |
469 | # CONFIG_KS8842 is not set | ||
449 | CONFIG_FS_ENET=y | 470 | CONFIG_FS_ENET=y |
450 | CONFIG_FS_ENET_HAS_SCC=y | 471 | CONFIG_FS_ENET_HAS_SCC=y |
451 | CONFIG_FS_ENET_HAS_FEC=y | 472 | CONFIG_FS_ENET_HAS_FEC=y |
@@ -453,6 +474,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
453 | CONFIG_NETDEV_1000=y | 474 | CONFIG_NETDEV_1000=y |
454 | # CONFIG_FSL_PQ_MDIO is not set | 475 | # CONFIG_FSL_PQ_MDIO is not set |
455 | # CONFIG_GIANFAR is not set | 476 | # CONFIG_GIANFAR is not set |
477 | # CONFIG_MV643XX_ETH is not set | ||
456 | CONFIG_NETDEV_10000=y | 478 | CONFIG_NETDEV_10000=y |
457 | 479 | ||
458 | # | 480 | # |
@@ -496,11 +518,11 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
496 | # | 518 | # |
497 | CONFIG_INPUT_KEYBOARD=y | 519 | CONFIG_INPUT_KEYBOARD=y |
498 | CONFIG_KEYBOARD_ATKBD=y | 520 | CONFIG_KEYBOARD_ATKBD=y |
499 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
500 | # CONFIG_KEYBOARD_LKKBD is not set | 521 | # CONFIG_KEYBOARD_LKKBD is not set |
501 | # CONFIG_KEYBOARD_XTKBD is not set | ||
502 | # CONFIG_KEYBOARD_NEWTON is not set | 522 | # CONFIG_KEYBOARD_NEWTON is not set |
503 | # CONFIG_KEYBOARD_STOWAWAY is not set | 523 | # CONFIG_KEYBOARD_STOWAWAY is not set |
524 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
525 | # CONFIG_KEYBOARD_XTKBD is not set | ||
504 | CONFIG_INPUT_MOUSE=y | 526 | CONFIG_INPUT_MOUSE=y |
505 | CONFIG_MOUSE_PS2=y | 527 | CONFIG_MOUSE_PS2=y |
506 | CONFIG_MOUSE_PS2_ALPS=y | 528 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -562,6 +584,11 @@ CONFIG_GEN_RTC=y | |||
562 | # CONFIG_TCG_TPM is not set | 584 | # CONFIG_TCG_TPM is not set |
563 | # CONFIG_I2C is not set | 585 | # CONFIG_I2C is not set |
564 | # CONFIG_SPI is not set | 586 | # CONFIG_SPI is not set |
587 | |||
588 | # | ||
589 | # PPS support | ||
590 | # | ||
591 | # CONFIG_PPS is not set | ||
565 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 592 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
566 | # CONFIG_GPIOLIB is not set | 593 | # CONFIG_GPIOLIB is not set |
567 | # CONFIG_W1 is not set | 594 | # CONFIG_W1 is not set |
@@ -597,22 +624,7 @@ CONFIG_SSB_POSSIBLE=y | |||
597 | # CONFIG_HTC_PASIC3 is not set | 624 | # CONFIG_HTC_PASIC3 is not set |
598 | # CONFIG_MFD_TMIO is not set | 625 | # CONFIG_MFD_TMIO is not set |
599 | # CONFIG_REGULATOR is not set | 626 | # CONFIG_REGULATOR is not set |
600 | 627 | # CONFIG_MEDIA_SUPPORT is not set | |
601 | # | ||
602 | # Multimedia devices | ||
603 | # | ||
604 | |||
605 | # | ||
606 | # Multimedia core support | ||
607 | # | ||
608 | # CONFIG_VIDEO_DEV is not set | ||
609 | # CONFIG_DVB_CORE is not set | ||
610 | # CONFIG_VIDEO_MEDIA is not set | ||
611 | |||
612 | # | ||
613 | # Multimedia drivers | ||
614 | # | ||
615 | CONFIG_DAB=y | ||
616 | 628 | ||
617 | # | 629 | # |
618 | # Graphics support | 630 | # Graphics support |
@@ -664,6 +676,10 @@ CONFIG_USB_SUPPORT=y | |||
664 | # CONFIG_DMADEVICES is not set | 676 | # CONFIG_DMADEVICES is not set |
665 | # CONFIG_AUXDISPLAY is not set | 677 | # CONFIG_AUXDISPLAY is not set |
666 | # CONFIG_UIO is not set | 678 | # CONFIG_UIO is not set |
679 | |||
680 | # | ||
681 | # TI VLYNQ | ||
682 | # | ||
667 | # CONFIG_STAGING is not set | 683 | # CONFIG_STAGING is not set |
668 | 684 | ||
669 | # | 685 | # |
@@ -685,10 +701,12 @@ CONFIG_FS_MBCACHE=y | |||
685 | # CONFIG_REISERFS_FS is not set | 701 | # CONFIG_REISERFS_FS is not set |
686 | # CONFIG_JFS_FS is not set | 702 | # CONFIG_JFS_FS is not set |
687 | # CONFIG_FS_POSIX_ACL is not set | 703 | # CONFIG_FS_POSIX_ACL is not set |
688 | CONFIG_FILE_LOCKING=y | ||
689 | # CONFIG_XFS_FS is not set | 704 | # CONFIG_XFS_FS is not set |
705 | # CONFIG_GFS2_FS is not set | ||
690 | # CONFIG_OCFS2_FS is not set | 706 | # CONFIG_OCFS2_FS is not set |
691 | # CONFIG_BTRFS_FS is not set | 707 | # CONFIG_BTRFS_FS is not set |
708 | CONFIG_FILE_LOCKING=y | ||
709 | CONFIG_FSNOTIFY=y | ||
692 | CONFIG_DNOTIFY=y | 710 | CONFIG_DNOTIFY=y |
693 | CONFIG_INOTIFY=y | 711 | CONFIG_INOTIFY=y |
694 | CONFIG_INOTIFY_USER=y | 712 | CONFIG_INOTIFY_USER=y |
@@ -808,6 +826,7 @@ CONFIG_HAS_IOPORT=y | |||
808 | CONFIG_HAS_DMA=y | 826 | CONFIG_HAS_DMA=y |
809 | CONFIG_HAVE_LMB=y | 827 | CONFIG_HAVE_LMB=y |
810 | CONFIG_NLATTR=y | 828 | CONFIG_NLATTR=y |
829 | CONFIG_GENERIC_ATOMIC64=y | ||
811 | 830 | ||
812 | # | 831 | # |
813 | # Kernel hacking | 832 | # Kernel hacking |
@@ -831,22 +850,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
831 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 850 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
832 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 851 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
833 | CONFIG_TRACING_SUPPORT=y | 852 | CONFIG_TRACING_SUPPORT=y |
834 | 853 | # CONFIG_FTRACE is not set | |
835 | # | ||
836 | # Tracers | ||
837 | # | ||
838 | # CONFIG_FUNCTION_TRACER is not set | ||
839 | # CONFIG_SCHED_TRACER is not set | ||
840 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
841 | # CONFIG_EVENT_TRACER is not set | ||
842 | # CONFIG_BOOT_TRACER is not set | ||
843 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
844 | # CONFIG_STACK_TRACER is not set | ||
845 | # CONFIG_KMEMTRACE is not set | ||
846 | # CONFIG_WORKQUEUE_TRACER is not set | ||
847 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
848 | # CONFIG_SAMPLES is not set | 854 | # CONFIG_SAMPLES is not set |
849 | CONFIG_HAVE_ARCH_KGDB=y | 855 | CONFIG_HAVE_ARCH_KGDB=y |
856 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
857 | CONFIG_PPC_WERROR=y | ||
850 | CONFIG_PRINT_STACK_DEPTH=64 | 858 | CONFIG_PRINT_STACK_DEPTH=64 |
851 | # CONFIG_IRQSTACKS is not set | 859 | # CONFIG_IRQSTACKS is not set |
852 | # CONFIG_PPC_EARLY_DEBUG is not set | 860 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig index 5bb1b8eb0b49..0e8684a3138d 100644 --- a/arch/powerpc/configs/mpc86xx_defconfig +++ b/arch/powerpc/configs/mpc86xx_defconfig | |||
@@ -1,26 +1,28 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:00 2009 | 4 | # Wed Jul 29 23:31:58 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_PHYS_64BIT is not set | 20 | # CONFIG_PHYS_64BIT is not set |
20 | CONFIG_ALTIVEC=y | 21 | CONFIG_ALTIVEC=y |
21 | CONFIG_PPC_STD_MMU=y | 22 | CONFIG_PPC_STD_MMU=y |
22 | CONFIG_PPC_STD_MMU_32=y | 23 | CONFIG_PPC_STD_MMU_32=y |
23 | # CONFIG_PPC_MM_SLICES is not set | 24 | # CONFIG_PPC_MM_SLICES is not set |
25 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
24 | CONFIG_SMP=y | 26 | CONFIG_SMP=y |
25 | CONFIG_NR_CPUS=2 | 27 | CONFIG_NR_CPUS=2 |
26 | CONFIG_PPC32=y | 28 | CONFIG_PPC32=y |
@@ -32,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
32 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
33 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
34 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
39 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
41 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
42 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
43 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
44 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
45 | CONFIG_GENERIC_GPIO=y | 48 | CONFIG_GENERIC_GPIO=y |
46 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 49 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -55,11 +58,13 @@ CONFIG_PPC_UDBG_16550=y | |||
55 | CONFIG_GENERIC_TBSYNC=y | 58 | CONFIG_GENERIC_TBSYNC=y |
56 | CONFIG_AUDIT_ARCH=y | 59 | CONFIG_AUDIT_ARCH=y |
57 | CONFIG_GENERIC_BUG=y | 60 | CONFIG_GENERIC_BUG=y |
61 | CONFIG_DTC=y | ||
58 | CONFIG_DEFAULT_UIMAGE=y | 62 | CONFIG_DEFAULT_UIMAGE=y |
59 | # CONFIG_PPC_DCR_NATIVE is not set | 63 | # CONFIG_PPC_DCR_NATIVE is not set |
60 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
61 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
63 | 68 | ||
64 | # | 69 | # |
65 | # General setup | 70 | # General setup |
@@ -114,7 +119,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
114 | CONFIG_KALLSYMS=y | 119 | CONFIG_KALLSYMS=y |
115 | CONFIG_KALLSYMS_ALL=y | 120 | CONFIG_KALLSYMS_ALL=y |
116 | CONFIG_KALLSYMS_EXTRA_PASS=y | 121 | CONFIG_KALLSYMS_EXTRA_PASS=y |
117 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_HOTPLUG=y | 122 | CONFIG_HOTPLUG=y |
119 | CONFIG_PRINTK=y | 123 | CONFIG_PRINTK=y |
120 | CONFIG_BUG=y | 124 | CONFIG_BUG=y |
@@ -127,9 +131,16 @@ CONFIG_TIMERFD=y | |||
127 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
128 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
129 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_COUNTERS=y | ||
135 | |||
136 | # | ||
137 | # Performance Counters | ||
138 | # | ||
139 | # CONFIG_PERF_COUNTERS is not set | ||
130 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
131 | CONFIG_PCI_QUIRKS=y | 141 | CONFIG_PCI_QUIRKS=y |
132 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
143 | # CONFIG_STRIP_ASM_SYMS is not set | ||
133 | CONFIG_COMPAT_BRK=y | 144 | CONFIG_COMPAT_BRK=y |
134 | # CONFIG_SLAB is not set | 145 | # CONFIG_SLAB is not set |
135 | CONFIG_SLUB=y | 146 | CONFIG_SLUB=y |
@@ -144,6 +155,10 @@ CONFIG_HAVE_KPROBES=y | |||
144 | CONFIG_HAVE_KRETPROBES=y | 155 | CONFIG_HAVE_KRETPROBES=y |
145 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 156 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
146 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 157 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
158 | |||
159 | # | ||
160 | # GCOV-based kernel profiling | ||
161 | # | ||
147 | # CONFIG_SLOW_WORK is not set | 162 | # CONFIG_SLOW_WORK is not set |
148 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 163 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
149 | CONFIG_SLABINFO=y | 164 | CONFIG_SLABINFO=y |
@@ -157,7 +172,7 @@ CONFIG_MODVERSIONS=y | |||
157 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 172 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
158 | CONFIG_STOP_MACHINE=y | 173 | CONFIG_STOP_MACHINE=y |
159 | CONFIG_BLOCK=y | 174 | CONFIG_BLOCK=y |
160 | CONFIG_LBD=y | 175 | CONFIG_LBDAF=y |
161 | # CONFIG_BLK_DEV_BSG is not set | 176 | # CONFIG_BLK_DEV_BSG is not set |
162 | # CONFIG_BLK_DEV_INTEGRITY is not set | 177 | # CONFIG_BLK_DEV_INTEGRITY is not set |
163 | 178 | ||
@@ -236,7 +251,9 @@ CONFIG_BINFMT_ELF=y | |||
236 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 251 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
237 | # CONFIG_HAVE_AOUT is not set | 252 | # CONFIG_HAVE_AOUT is not set |
238 | CONFIG_BINFMT_MISC=m | 253 | CONFIG_BINFMT_MISC=m |
239 | # CONFIG_IOMMU_HELPER is not set | 254 | CONFIG_IOMMU_HELPER=y |
255 | CONFIG_SWIOTLB=y | ||
256 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | ||
240 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 257 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
241 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 258 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
242 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 259 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -258,9 +275,9 @@ CONFIG_MIGRATION=y | |||
258 | CONFIG_ZONE_DMA_FLAG=1 | 275 | CONFIG_ZONE_DMA_FLAG=1 |
259 | CONFIG_BOUNCE=y | 276 | CONFIG_BOUNCE=y |
260 | CONFIG_VIRT_TO_BUS=y | 277 | CONFIG_VIRT_TO_BUS=y |
261 | CONFIG_UNEVICTABLE_LRU=y | ||
262 | CONFIG_HAVE_MLOCK=y | 278 | CONFIG_HAVE_MLOCK=y |
263 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 279 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
280 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
264 | CONFIG_PPC_4K_PAGES=y | 281 | CONFIG_PPC_4K_PAGES=y |
265 | # CONFIG_PPC_16K_PAGES is not set | 282 | # CONFIG_PPC_16K_PAGES is not set |
266 | # CONFIG_PPC_64K_PAGES is not set | 283 | # CONFIG_PPC_64K_PAGES is not set |
@@ -403,6 +420,7 @@ CONFIG_SCTP_HMAC_MD5=y | |||
403 | # CONFIG_ECONET is not set | 420 | # CONFIG_ECONET is not set |
404 | # CONFIG_WAN_ROUTER is not set | 421 | # CONFIG_WAN_ROUTER is not set |
405 | # CONFIG_PHONET is not set | 422 | # CONFIG_PHONET is not set |
423 | # CONFIG_IEEE802154 is not set | ||
406 | # CONFIG_NET_SCHED is not set | 424 | # CONFIG_NET_SCHED is not set |
407 | # CONFIG_DCB is not set | 425 | # CONFIG_DCB is not set |
408 | 426 | ||
@@ -421,7 +439,11 @@ CONFIG_WIRELESS=y | |||
421 | CONFIG_WIRELESS_OLD_REGULATORY=y | 439 | CONFIG_WIRELESS_OLD_REGULATORY=y |
422 | # CONFIG_WIRELESS_EXT is not set | 440 | # CONFIG_WIRELESS_EXT is not set |
423 | # CONFIG_LIB80211 is not set | 441 | # CONFIG_LIB80211 is not set |
424 | # CONFIG_MAC80211 is not set | 442 | |
443 | # | ||
444 | # CFG80211 needs to be enabled for MAC80211 | ||
445 | # | ||
446 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
425 | # CONFIG_WIMAX is not set | 447 | # CONFIG_WIMAX is not set |
426 | # CONFIG_RFKILL is not set | 448 | # CONFIG_RFKILL is not set |
427 | # CONFIG_NET_9P is not set | 449 | # CONFIG_NET_9P is not set |
@@ -447,6 +469,7 @@ CONFIG_EXTRA_FIRMWARE="" | |||
447 | CONFIG_OF_DEVICE=y | 469 | CONFIG_OF_DEVICE=y |
448 | CONFIG_OF_GPIO=y | 470 | CONFIG_OF_GPIO=y |
449 | CONFIG_OF_I2C=y | 471 | CONFIG_OF_I2C=y |
472 | CONFIG_OF_MDIO=y | ||
450 | # CONFIG_PARPORT is not set | 473 | # CONFIG_PARPORT is not set |
451 | CONFIG_BLK_DEV=y | 474 | CONFIG_BLK_DEV=y |
452 | # CONFIG_BLK_DEV_FD is not set | 475 | # CONFIG_BLK_DEV_FD is not set |
@@ -482,7 +505,9 @@ CONFIG_MISC_DEVICES=y | |||
482 | # | 505 | # |
483 | # CONFIG_EEPROM_AT24 is not set | 506 | # CONFIG_EEPROM_AT24 is not set |
484 | CONFIG_EEPROM_LEGACY=y | 507 | CONFIG_EEPROM_LEGACY=y |
508 | # CONFIG_EEPROM_MAX6875 is not set | ||
485 | # CONFIG_EEPROM_93CX6 is not set | 509 | # CONFIG_EEPROM_93CX6 is not set |
510 | # CONFIG_CB710_CORE is not set | ||
486 | CONFIG_HAVE_IDE=y | 511 | CONFIG_HAVE_IDE=y |
487 | # CONFIG_IDE is not set | 512 | # CONFIG_IDE is not set |
488 | 513 | ||
@@ -506,10 +531,6 @@ CONFIG_BLK_DEV_SR=y | |||
506 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 531 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
507 | CONFIG_CHR_DEV_SG=y | 532 | CONFIG_CHR_DEV_SG=y |
508 | # CONFIG_CHR_DEV_SCH is not set | 533 | # CONFIG_CHR_DEV_SCH is not set |
509 | |||
510 | # | ||
511 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
512 | # | ||
513 | CONFIG_SCSI_MULTI_LUN=y | 534 | CONFIG_SCSI_MULTI_LUN=y |
514 | # CONFIG_SCSI_CONSTANTS is not set | 535 | # CONFIG_SCSI_CONSTANTS is not set |
515 | CONFIG_SCSI_LOGGING=y | 536 | CONFIG_SCSI_LOGGING=y |
@@ -527,6 +548,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
527 | CONFIG_SCSI_LOWLEVEL=y | 548 | CONFIG_SCSI_LOWLEVEL=y |
528 | # CONFIG_ISCSI_TCP is not set | 549 | # CONFIG_ISCSI_TCP is not set |
529 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 550 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
551 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
530 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 552 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
531 | # CONFIG_SCSI_3W_9XXX is not set | 553 | # CONFIG_SCSI_3W_9XXX is not set |
532 | # CONFIG_SCSI_ACARD is not set | 554 | # CONFIG_SCSI_ACARD is not set |
@@ -535,6 +557,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
535 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 557 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
536 | # CONFIG_SCSI_AIC79XX is not set | 558 | # CONFIG_SCSI_AIC79XX is not set |
537 | # CONFIG_SCSI_AIC94XX is not set | 559 | # CONFIG_SCSI_AIC94XX is not set |
560 | # CONFIG_SCSI_MVSAS is not set | ||
538 | # CONFIG_SCSI_DPT_I2O is not set | 561 | # CONFIG_SCSI_DPT_I2O is not set |
539 | # CONFIG_SCSI_ADVANSYS is not set | 562 | # CONFIG_SCSI_ADVANSYS is not set |
540 | # CONFIG_SCSI_ARCMSR is not set | 563 | # CONFIG_SCSI_ARCMSR is not set |
@@ -554,7 +577,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
554 | # CONFIG_SCSI_IPS is not set | 577 | # CONFIG_SCSI_IPS is not set |
555 | # CONFIG_SCSI_INITIO is not set | 578 | # CONFIG_SCSI_INITIO is not set |
556 | # CONFIG_SCSI_INIA100 is not set | 579 | # CONFIG_SCSI_INIA100 is not set |
557 | # CONFIG_SCSI_MVSAS is not set | ||
558 | # CONFIG_SCSI_STEX is not set | 580 | # CONFIG_SCSI_STEX is not set |
559 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 581 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
560 | # CONFIG_SCSI_IPR is not set | 582 | # CONFIG_SCSI_IPR is not set |
@@ -638,14 +660,17 @@ CONFIG_PATA_ALI=y | |||
638 | # | 660 | # |
639 | 661 | ||
640 | # | 662 | # |
641 | # Enable only one of the two stacks, unless you know what you are doing | 663 | # You can enable one or both FireWire driver stacks. |
664 | # | ||
665 | |||
666 | # | ||
667 | # See the help texts for more information. | ||
642 | # | 668 | # |
643 | # CONFIG_FIREWIRE is not set | 669 | # CONFIG_FIREWIRE is not set |
644 | # CONFIG_IEEE1394 is not set | 670 | # CONFIG_IEEE1394 is not set |
645 | # CONFIG_I2O is not set | 671 | # CONFIG_I2O is not set |
646 | # CONFIG_MACINTOSH_DRIVERS is not set | 672 | # CONFIG_MACINTOSH_DRIVERS is not set |
647 | CONFIG_NETDEVICES=y | 673 | CONFIG_NETDEVICES=y |
648 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
649 | CONFIG_DUMMY=y | 674 | CONFIG_DUMMY=y |
650 | # CONFIG_BONDING is not set | 675 | # CONFIG_BONDING is not set |
651 | # CONFIG_MACVLAN is not set | 676 | # CONFIG_MACVLAN is not set |
@@ -692,6 +717,7 @@ CONFIG_MII=y | |||
692 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 717 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
693 | # CONFIG_NET_PCI is not set | 718 | # CONFIG_NET_PCI is not set |
694 | # CONFIG_B44 is not set | 719 | # CONFIG_B44 is not set |
720 | # CONFIG_KS8842 is not set | ||
695 | # CONFIG_ATL2 is not set | 721 | # CONFIG_ATL2 is not set |
696 | CONFIG_NETDEV_1000=y | 722 | CONFIG_NETDEV_1000=y |
697 | # CONFIG_ACENIC is not set | 723 | # CONFIG_ACENIC is not set |
@@ -711,8 +737,10 @@ CONFIG_NETDEV_1000=y | |||
711 | # CONFIG_VIA_VELOCITY is not set | 737 | # CONFIG_VIA_VELOCITY is not set |
712 | # CONFIG_TIGON3 is not set | 738 | # CONFIG_TIGON3 is not set |
713 | # CONFIG_BNX2 is not set | 739 | # CONFIG_BNX2 is not set |
740 | # CONFIG_CNIC is not set | ||
714 | CONFIG_FSL_PQ_MDIO=y | 741 | CONFIG_FSL_PQ_MDIO=y |
715 | CONFIG_GIANFAR=y | 742 | CONFIG_GIANFAR=y |
743 | # CONFIG_MV643XX_ETH is not set | ||
716 | # CONFIG_QLA3XXX is not set | 744 | # CONFIG_QLA3XXX is not set |
717 | # CONFIG_ATL1 is not set | 745 | # CONFIG_ATL1 is not set |
718 | # CONFIG_ATL1E is not set | 746 | # CONFIG_ATL1E is not set |
@@ -913,13 +941,17 @@ CONFIG_I2C_MPC=y | |||
913 | # CONFIG_SENSORS_PCF8574 is not set | 941 | # CONFIG_SENSORS_PCF8574 is not set |
914 | # CONFIG_PCF8575 is not set | 942 | # CONFIG_PCF8575 is not set |
915 | # CONFIG_SENSORS_PCA9539 is not set | 943 | # CONFIG_SENSORS_PCA9539 is not set |
916 | # CONFIG_SENSORS_MAX6875 is not set | ||
917 | # CONFIG_SENSORS_TSL2550 is not set | 944 | # CONFIG_SENSORS_TSL2550 is not set |
918 | # CONFIG_I2C_DEBUG_CORE is not set | 945 | # CONFIG_I2C_DEBUG_CORE is not set |
919 | # CONFIG_I2C_DEBUG_ALGO is not set | 946 | # CONFIG_I2C_DEBUG_ALGO is not set |
920 | # CONFIG_I2C_DEBUG_BUS is not set | 947 | # CONFIG_I2C_DEBUG_BUS is not set |
921 | # CONFIG_I2C_DEBUG_CHIP is not set | 948 | # CONFIG_I2C_DEBUG_CHIP is not set |
922 | # CONFIG_SPI is not set | 949 | # CONFIG_SPI is not set |
950 | |||
951 | # | ||
952 | # PPS support | ||
953 | # | ||
954 | # CONFIG_PPS is not set | ||
923 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 955 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
924 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 956 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
925 | CONFIG_GPIOLIB=y | 957 | CONFIG_GPIOLIB=y |
@@ -973,76 +1005,9 @@ CONFIG_SSB_POSSIBLE=y | |||
973 | # CONFIG_MFD_WM8400 is not set | 1005 | # CONFIG_MFD_WM8400 is not set |
974 | # CONFIG_MFD_WM8350_I2C is not set | 1006 | # CONFIG_MFD_WM8350_I2C is not set |
975 | # CONFIG_MFD_PCF50633 is not set | 1007 | # CONFIG_MFD_PCF50633 is not set |
1008 | # CONFIG_AB3100_CORE is not set | ||
976 | # CONFIG_REGULATOR is not set | 1009 | # CONFIG_REGULATOR is not set |
977 | 1010 | # CONFIG_MEDIA_SUPPORT is not set | |
978 | # | ||
979 | # Multimedia devices | ||
980 | # | ||
981 | |||
982 | # | ||
983 | # Multimedia core support | ||
984 | # | ||
985 | # CONFIG_VIDEO_DEV is not set | ||
986 | CONFIG_DVB_CORE=m | ||
987 | CONFIG_VIDEO_MEDIA=m | ||
988 | |||
989 | # | ||
990 | # Multimedia drivers | ||
991 | # | ||
992 | # CONFIG_MEDIA_ATTACH is not set | ||
993 | CONFIG_MEDIA_TUNER=m | ||
994 | # CONFIG_MEDIA_TUNER_CUSTOMISE is not set | ||
995 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
996 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
997 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
998 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
999 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
1000 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
1001 | CONFIG_MEDIA_TUNER_XC2028=m | ||
1002 | CONFIG_MEDIA_TUNER_XC5000=m | ||
1003 | CONFIG_MEDIA_TUNER_MC44S803=m | ||
1004 | # CONFIG_DVB_DYNAMIC_MINORS is not set | ||
1005 | CONFIG_DVB_CAPTURE_DRIVERS=y | ||
1006 | |||
1007 | # | ||
1008 | # Supported SAA7146 based PCI Adapters | ||
1009 | # | ||
1010 | # CONFIG_TTPCI_EEPROM is not set | ||
1011 | # CONFIG_DVB_BUDGET_CORE is not set | ||
1012 | |||
1013 | # | ||
1014 | # Supported USB Adapters | ||
1015 | # | ||
1016 | # CONFIG_DVB_USB is not set | ||
1017 | # CONFIG_DVB_TTUSB_BUDGET is not set | ||
1018 | # CONFIG_DVB_TTUSB_DEC is not set | ||
1019 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
1020 | |||
1021 | # | ||
1022 | # Supported FlexCopII (B2C2) Adapters | ||
1023 | # | ||
1024 | # CONFIG_DVB_B2C2_FLEXCOP is not set | ||
1025 | |||
1026 | # | ||
1027 | # Supported BT878 Adapters | ||
1028 | # | ||
1029 | |||
1030 | # | ||
1031 | # Supported Pluto2 Adapters | ||
1032 | # | ||
1033 | # CONFIG_DVB_PLUTO2 is not set | ||
1034 | |||
1035 | # | ||
1036 | # Supported SDMC DM1105 Adapters | ||
1037 | # | ||
1038 | # CONFIG_DVB_DM1105 is not set | ||
1039 | |||
1040 | # | ||
1041 | # Supported DVB Frontends | ||
1042 | # | ||
1043 | # CONFIG_DVB_FE_CUSTOMISE is not set | ||
1044 | CONFIG_DAB=y | ||
1045 | # CONFIG_USB_DABUSB is not set | ||
1046 | 1011 | ||
1047 | # | 1012 | # |
1048 | # Graphics support | 1013 | # Graphics support |
@@ -1082,6 +1047,11 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1082 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1047 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1083 | # CONFIG_SND_DEBUG is not set | 1048 | # CONFIG_SND_DEBUG is not set |
1084 | CONFIG_SND_VMASTER=y | 1049 | CONFIG_SND_VMASTER=y |
1050 | # CONFIG_SND_RAWMIDI_SEQ is not set | ||
1051 | # CONFIG_SND_OPL3_LIB_SEQ is not set | ||
1052 | # CONFIG_SND_OPL4_LIB_SEQ is not set | ||
1053 | # CONFIG_SND_SBAWE_SEQ is not set | ||
1054 | # CONFIG_SND_EMU10K1_SEQ is not set | ||
1085 | CONFIG_SND_AC97_CODEC=y | 1055 | CONFIG_SND_AC97_CODEC=y |
1086 | CONFIG_SND_DRIVERS=y | 1056 | CONFIG_SND_DRIVERS=y |
1087 | # CONFIG_SND_DUMMY is not set | 1057 | # CONFIG_SND_DUMMY is not set |
@@ -1108,6 +1078,7 @@ CONFIG_SND_PCI=y | |||
1108 | # CONFIG_SND_CS4281 is not set | 1078 | # CONFIG_SND_CS4281 is not set |
1109 | # CONFIG_SND_CS46XX is not set | 1079 | # CONFIG_SND_CS46XX is not set |
1110 | # CONFIG_SND_CS5530 is not set | 1080 | # CONFIG_SND_CS5530 is not set |
1081 | # CONFIG_SND_CTXFI is not set | ||
1111 | # CONFIG_SND_DARLA20 is not set | 1082 | # CONFIG_SND_DARLA20 is not set |
1112 | # CONFIG_SND_GINA20 is not set | 1083 | # CONFIG_SND_GINA20 is not set |
1113 | # CONFIG_SND_LAYLA20 is not set | 1084 | # CONFIG_SND_LAYLA20 is not set |
@@ -1138,6 +1109,7 @@ CONFIG_SND_PCI=y | |||
1138 | CONFIG_SND_INTEL8X0=y | 1109 | CONFIG_SND_INTEL8X0=y |
1139 | # CONFIG_SND_INTEL8X0M is not set | 1110 | # CONFIG_SND_INTEL8X0M is not set |
1140 | # CONFIG_SND_KORG1212 is not set | 1111 | # CONFIG_SND_KORG1212 is not set |
1112 | # CONFIG_SND_LX6464ES is not set | ||
1141 | # CONFIG_SND_MAESTRO3 is not set | 1113 | # CONFIG_SND_MAESTRO3 is not set |
1142 | # CONFIG_SND_MIXART is not set | 1114 | # CONFIG_SND_MIXART is not set |
1143 | # CONFIG_SND_NM256 is not set | 1115 | # CONFIG_SND_NM256 is not set |
@@ -1182,7 +1154,7 @@ CONFIG_HID_BELKIN=y | |||
1182 | CONFIG_HID_CHERRY=y | 1154 | CONFIG_HID_CHERRY=y |
1183 | CONFIG_HID_CHICONY=y | 1155 | CONFIG_HID_CHICONY=y |
1184 | CONFIG_HID_CYPRESS=y | 1156 | CONFIG_HID_CYPRESS=y |
1185 | # CONFIG_DRAGONRISE_FF is not set | 1157 | # CONFIG_HID_DRAGONRISE is not set |
1186 | CONFIG_HID_EZKEY=y | 1158 | CONFIG_HID_EZKEY=y |
1187 | # CONFIG_HID_KYE is not set | 1159 | # CONFIG_HID_KYE is not set |
1188 | CONFIG_HID_GYRATION=y | 1160 | CONFIG_HID_GYRATION=y |
@@ -1199,10 +1171,11 @@ CONFIG_HID_PETALYNX=y | |||
1199 | CONFIG_HID_SAMSUNG=y | 1171 | CONFIG_HID_SAMSUNG=y |
1200 | CONFIG_HID_SONY=y | 1172 | CONFIG_HID_SONY=y |
1201 | CONFIG_HID_SUNPLUS=y | 1173 | CONFIG_HID_SUNPLUS=y |
1202 | # CONFIG_GREENASIA_FF is not set | 1174 | # CONFIG_HID_GREENASIA is not set |
1175 | # CONFIG_HID_SMARTJOYPLUS is not set | ||
1203 | # CONFIG_HID_TOPSEED is not set | 1176 | # CONFIG_HID_TOPSEED is not set |
1204 | CONFIG_THRUSTMASTER_FF=m | 1177 | # CONFIG_HID_THRUSTMASTER is not set |
1205 | CONFIG_ZEROPLUS_FF=m | 1178 | # CONFIG_HID_ZEROPLUS is not set |
1206 | CONFIG_USB_SUPPORT=y | 1179 | CONFIG_USB_SUPPORT=y |
1207 | CONFIG_USB_ARCH_HAS_HCD=y | 1180 | CONFIG_USB_ARCH_HAS_HCD=y |
1208 | CONFIG_USB_ARCH_HAS_OHCI=y | 1181 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1228,6 +1201,7 @@ CONFIG_USB_MON=y | |||
1228 | # USB Host Controller Drivers | 1201 | # USB Host Controller Drivers |
1229 | # | 1202 | # |
1230 | # CONFIG_USB_C67X00_HCD is not set | 1203 | # CONFIG_USB_C67X00_HCD is not set |
1204 | # CONFIG_USB_XHCI_HCD is not set | ||
1231 | CONFIG_USB_EHCI_HCD=y | 1205 | CONFIG_USB_EHCI_HCD=y |
1232 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1206 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1233 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1207 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1237,9 +1211,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1237 | # CONFIG_USB_ISP116X_HCD is not set | 1211 | # CONFIG_USB_ISP116X_HCD is not set |
1238 | # CONFIG_USB_ISP1760_HCD is not set | 1212 | # CONFIG_USB_ISP1760_HCD is not set |
1239 | CONFIG_USB_OHCI_HCD=y | 1213 | CONFIG_USB_OHCI_HCD=y |
1240 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1241 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1214 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
1242 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 1215 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
1216 | CONFIG_USB_OHCI_HCD_PPC_OF=y | ||
1243 | CONFIG_USB_OHCI_HCD_PCI=y | 1217 | CONFIG_USB_OHCI_HCD_PCI=y |
1244 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y | 1218 | CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y |
1245 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 1219 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1360,6 +1334,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1360 | # CONFIG_RTC_DRV_S35390A is not set | 1334 | # CONFIG_RTC_DRV_S35390A is not set |
1361 | # CONFIG_RTC_DRV_FM3130 is not set | 1335 | # CONFIG_RTC_DRV_FM3130 is not set |
1362 | # CONFIG_RTC_DRV_RX8581 is not set | 1336 | # CONFIG_RTC_DRV_RX8581 is not set |
1337 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1363 | 1338 | ||
1364 | # | 1339 | # |
1365 | # SPI RTC drivers | 1340 | # SPI RTC drivers |
@@ -1387,6 +1362,10 @@ CONFIG_RTC_DRV_CMOS=y | |||
1387 | # CONFIG_DMADEVICES is not set | 1362 | # CONFIG_DMADEVICES is not set |
1388 | # CONFIG_AUXDISPLAY is not set | 1363 | # CONFIG_AUXDISPLAY is not set |
1389 | # CONFIG_UIO is not set | 1364 | # CONFIG_UIO is not set |
1365 | |||
1366 | # | ||
1367 | # TI VLYNQ | ||
1368 | # | ||
1390 | # CONFIG_STAGING is not set | 1369 | # CONFIG_STAGING is not set |
1391 | 1370 | ||
1392 | # | 1371 | # |
@@ -1406,11 +1385,12 @@ CONFIG_FS_MBCACHE=y | |||
1406 | # CONFIG_REISERFS_FS is not set | 1385 | # CONFIG_REISERFS_FS is not set |
1407 | # CONFIG_JFS_FS is not set | 1386 | # CONFIG_JFS_FS is not set |
1408 | # CONFIG_FS_POSIX_ACL is not set | 1387 | # CONFIG_FS_POSIX_ACL is not set |
1409 | CONFIG_FILE_LOCKING=y | ||
1410 | # CONFIG_XFS_FS is not set | 1388 | # CONFIG_XFS_FS is not set |
1411 | # CONFIG_GFS2_FS is not set | 1389 | # CONFIG_GFS2_FS is not set |
1412 | # CONFIG_OCFS2_FS is not set | 1390 | # CONFIG_OCFS2_FS is not set |
1413 | # CONFIG_BTRFS_FS is not set | 1391 | # CONFIG_BTRFS_FS is not set |
1392 | CONFIG_FILE_LOCKING=y | ||
1393 | CONFIG_FSNOTIFY=y | ||
1414 | CONFIG_DNOTIFY=y | 1394 | CONFIG_DNOTIFY=y |
1415 | CONFIG_INOTIFY=y | 1395 | CONFIG_INOTIFY=y |
1416 | CONFIG_INOTIFY_USER=y | 1396 | CONFIG_INOTIFY_USER=y |
@@ -1485,6 +1465,7 @@ CONFIG_NFS_FS=y | |||
1485 | CONFIG_NFS_V3=y | 1465 | CONFIG_NFS_V3=y |
1486 | # CONFIG_NFS_V3_ACL is not set | 1466 | # CONFIG_NFS_V3_ACL is not set |
1487 | CONFIG_NFS_V4=y | 1467 | CONFIG_NFS_V4=y |
1468 | # CONFIG_NFS_V4_1 is not set | ||
1488 | CONFIG_ROOT_NFS=y | 1469 | CONFIG_ROOT_NFS=y |
1489 | CONFIG_NFSD=y | 1470 | CONFIG_NFSD=y |
1490 | # CONFIG_NFSD_V3 is not set | 1471 | # CONFIG_NFSD_V3 is not set |
@@ -1586,6 +1567,7 @@ CONFIG_HAS_IOPORT=y | |||
1586 | CONFIG_HAS_DMA=y | 1567 | CONFIG_HAS_DMA=y |
1587 | CONFIG_HAVE_LMB=y | 1568 | CONFIG_HAVE_LMB=y |
1588 | CONFIG_NLATTR=y | 1569 | CONFIG_NLATTR=y |
1570 | CONFIG_GENERIC_ATOMIC64=y | ||
1589 | 1571 | ||
1590 | # | 1572 | # |
1591 | # Kernel hacking | 1573 | # Kernel hacking |
@@ -1616,6 +1598,9 @@ CONFIG_SCHED_DEBUG=y | |||
1616 | # CONFIG_RT_MUTEX_TESTER is not set | 1598 | # CONFIG_RT_MUTEX_TESTER is not set |
1617 | # CONFIG_DEBUG_SPINLOCK is not set | 1599 | # CONFIG_DEBUG_SPINLOCK is not set |
1618 | # CONFIG_DEBUG_MUTEXES is not set | 1600 | # CONFIG_DEBUG_MUTEXES is not set |
1601 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1602 | # CONFIG_PROVE_LOCKING is not set | ||
1603 | # CONFIG_LOCK_STAT is not set | ||
1619 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1604 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1620 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1605 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1621 | # CONFIG_DEBUG_KOBJECT is not set | 1606 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1628,7 +1613,6 @@ CONFIG_DEBUG_INFO=y | |||
1628 | # CONFIG_DEBUG_LIST is not set | 1613 | # CONFIG_DEBUG_LIST is not set |
1629 | # CONFIG_DEBUG_SG is not set | 1614 | # CONFIG_DEBUG_SG is not set |
1630 | # CONFIG_DEBUG_NOTIFIERS is not set | 1615 | # CONFIG_DEBUG_NOTIFIERS is not set |
1631 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1632 | # CONFIG_RCU_TORTURE_TEST is not set | 1616 | # CONFIG_RCU_TORTURE_TEST is not set |
1633 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1617 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1634 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1618 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1642,16 +1626,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1642 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1626 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1643 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1627 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1644 | CONFIG_TRACING_SUPPORT=y | 1628 | CONFIG_TRACING_SUPPORT=y |
1645 | 1629 | CONFIG_FTRACE=y | |
1646 | # | ||
1647 | # Tracers | ||
1648 | # | ||
1649 | # CONFIG_FUNCTION_TRACER is not set | 1630 | # CONFIG_FUNCTION_TRACER is not set |
1631 | # CONFIG_IRQSOFF_TRACER is not set | ||
1650 | # CONFIG_SCHED_TRACER is not set | 1632 | # CONFIG_SCHED_TRACER is not set |
1651 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1633 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1652 | # CONFIG_EVENT_TRACER is not set | ||
1653 | # CONFIG_BOOT_TRACER is not set | 1634 | # CONFIG_BOOT_TRACER is not set |
1654 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1635 | CONFIG_BRANCH_PROFILE_NONE=y |
1636 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1637 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1655 | # CONFIG_STACK_TRACER is not set | 1638 | # CONFIG_STACK_TRACER is not set |
1656 | # CONFIG_KMEMTRACE is not set | 1639 | # CONFIG_KMEMTRACE is not set |
1657 | # CONFIG_WORKQUEUE_TRACER is not set | 1640 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -1659,6 +1642,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1659 | # CONFIG_SAMPLES is not set | 1642 | # CONFIG_SAMPLES is not set |
1660 | CONFIG_HAVE_ARCH_KGDB=y | 1643 | CONFIG_HAVE_ARCH_KGDB=y |
1661 | # CONFIG_KGDB is not set | 1644 | # CONFIG_KGDB is not set |
1645 | # CONFIG_KMEMCHECK is not set | ||
1646 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1647 | CONFIG_PPC_WERROR=y | ||
1662 | CONFIG_PRINT_STACK_DEPTH=64 | 1648 | CONFIG_PRINT_STACK_DEPTH=64 |
1663 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1649 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1664 | # CONFIG_DEBUG_STACK_USAGE is not set | 1650 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 42e64ebc279d..dbe8e869a827 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:01 2009 | 4 | # Wed Jul 29 23:31:59 2009 |
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=y | 13 | CONFIG_PPC_8xx=y |
14 | # CONFIG_40x is not set | 14 | # CONFIG_40x is not set |
@@ -27,15 +27,16 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 27 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 28 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
30 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
31 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 40 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 42 | CONFIG_PPC=y |
@@ -49,11 +50,13 @@ CONFIG_OF=y | |||
49 | # CONFIG_GENERIC_TBSYNC is not set | 50 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 51 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 52 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DTC=y | ||
52 | # CONFIG_DEFAULT_UIMAGE is not set | 54 | # CONFIG_DEFAULT_UIMAGE is not set |
53 | # CONFIG_PPC_DCR_NATIVE is not set | 55 | # CONFIG_PPC_DCR_NATIVE is not set |
54 | # CONFIG_PPC_DCR_MMIO is not set | 56 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 57 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 58 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
59 | CONFIG_CONSTRUCTORS=y | ||
57 | 60 | ||
58 | # | 61 | # |
59 | # General setup | 62 | # General setup |
@@ -100,7 +103,6 @@ CONFIG_EMBEDDED=y | |||
100 | CONFIG_KALLSYMS=y | 103 | CONFIG_KALLSYMS=y |
101 | # CONFIG_KALLSYMS_ALL is not set | 104 | # CONFIG_KALLSYMS_ALL is not set |
102 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 105 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
103 | # CONFIG_STRIP_ASM_SYMS is not set | ||
104 | CONFIG_HOTPLUG=y | 106 | CONFIG_HOTPLUG=y |
105 | CONFIG_PRINTK=y | 107 | CONFIG_PRINTK=y |
106 | CONFIG_BUG=y | 108 | CONFIG_BUG=y |
@@ -113,8 +115,15 @@ CONFIG_TIMERFD=y | |||
113 | CONFIG_EVENTFD=y | 115 | CONFIG_EVENTFD=y |
114 | CONFIG_SHMEM=y | 116 | CONFIG_SHMEM=y |
115 | CONFIG_AIO=y | 117 | CONFIG_AIO=y |
118 | CONFIG_HAVE_PERF_COUNTERS=y | ||
119 | |||
120 | # | ||
121 | # Performance Counters | ||
122 | # | ||
123 | # CONFIG_PERF_COUNTERS is not set | ||
116 | # CONFIG_VM_EVENT_COUNTERS is not set | 124 | # CONFIG_VM_EVENT_COUNTERS is not set |
117 | CONFIG_SLUB_DEBUG=y | 125 | CONFIG_SLUB_DEBUG=y |
126 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_COMPAT_BRK=y | 127 | CONFIG_COMPAT_BRK=y |
119 | # CONFIG_SLAB is not set | 128 | # CONFIG_SLAB is not set |
120 | CONFIG_SLUB=y | 129 | CONFIG_SLUB=y |
@@ -128,13 +137,17 @@ CONFIG_HAVE_KPROBES=y | |||
128 | CONFIG_HAVE_KRETPROBES=y | 137 | CONFIG_HAVE_KRETPROBES=y |
129 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 138 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
130 | CONFIG_HAVE_CLK=y | 139 | CONFIG_HAVE_CLK=y |
140 | |||
141 | # | ||
142 | # GCOV-based kernel profiling | ||
143 | # | ||
131 | # CONFIG_SLOW_WORK is not set | 144 | # CONFIG_SLOW_WORK is not set |
132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 145 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
133 | CONFIG_SLABINFO=y | 146 | CONFIG_SLABINFO=y |
134 | CONFIG_BASE_SMALL=1 | 147 | CONFIG_BASE_SMALL=1 |
135 | # CONFIG_MODULES is not set | 148 | # CONFIG_MODULES is not set |
136 | CONFIG_BLOCK=y | 149 | CONFIG_BLOCK=y |
137 | # CONFIG_LBD is not set | 150 | CONFIG_LBDAF=y |
138 | # CONFIG_BLK_DEV_BSG is not set | 151 | # CONFIG_BLK_DEV_BSG is not set |
139 | # CONFIG_BLK_DEV_INTEGRITY is not set | 152 | # CONFIG_BLK_DEV_INTEGRITY is not set |
140 | 153 | ||
@@ -227,6 +240,7 @@ CONFIG_BINFMT_ELF=y | |||
227 | # CONFIG_MATH_EMULATION is not set | 240 | # CONFIG_MATH_EMULATION is not set |
228 | CONFIG_8XX_MINIMAL_FPEMU=y | 241 | CONFIG_8XX_MINIMAL_FPEMU=y |
229 | # CONFIG_IOMMU_HELPER is not set | 242 | # CONFIG_IOMMU_HELPER is not set |
243 | # CONFIG_SWIOTLB is not set | ||
230 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 244 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y |
231 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 245 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
232 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 246 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -246,9 +260,9 @@ CONFIG_MIGRATION=y | |||
246 | CONFIG_ZONE_DMA_FLAG=1 | 260 | CONFIG_ZONE_DMA_FLAG=1 |
247 | CONFIG_BOUNCE=y | 261 | CONFIG_BOUNCE=y |
248 | CONFIG_VIRT_TO_BUS=y | 262 | CONFIG_VIRT_TO_BUS=y |
249 | CONFIG_UNEVICTABLE_LRU=y | ||
250 | CONFIG_HAVE_MLOCK=y | 263 | CONFIG_HAVE_MLOCK=y |
251 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 264 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
265 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
252 | CONFIG_PPC_4K_PAGES=y | 266 | CONFIG_PPC_4K_PAGES=y |
253 | # CONFIG_PPC_16K_PAGES is not set | 267 | # CONFIG_PPC_16K_PAGES is not set |
254 | # CONFIG_PPC_64K_PAGES is not set | 268 | # CONFIG_PPC_64K_PAGES is not set |
@@ -287,6 +301,7 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
287 | CONFIG_KERNEL_START=0xc0000000 | 301 | CONFIG_KERNEL_START=0xc0000000 |
288 | CONFIG_PHYSICAL_START=0x00000000 | 302 | CONFIG_PHYSICAL_START=0x00000000 |
289 | CONFIG_TASK_SIZE=0x80000000 | 303 | CONFIG_TASK_SIZE=0x80000000 |
304 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
290 | CONFIG_NET=y | 305 | CONFIG_NET=y |
291 | 306 | ||
292 | # | 307 | # |
@@ -343,6 +358,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
343 | # CONFIG_ECONET is not set | 358 | # CONFIG_ECONET is not set |
344 | # CONFIG_WAN_ROUTER is not set | 359 | # CONFIG_WAN_ROUTER is not set |
345 | # CONFIG_PHONET is not set | 360 | # CONFIG_PHONET is not set |
361 | # CONFIG_IEEE802154 is not set | ||
346 | # CONFIG_NET_SCHED is not set | 362 | # CONFIG_NET_SCHED is not set |
347 | # CONFIG_DCB is not set | 363 | # CONFIG_DCB is not set |
348 | 364 | ||
@@ -360,7 +376,11 @@ CONFIG_WIRELESS=y | |||
360 | CONFIG_WIRELESS_OLD_REGULATORY=y | 376 | CONFIG_WIRELESS_OLD_REGULATORY=y |
361 | # CONFIG_WIRELESS_EXT is not set | 377 | # CONFIG_WIRELESS_EXT is not set |
362 | # CONFIG_LIB80211 is not set | 378 | # CONFIG_LIB80211 is not set |
363 | # CONFIG_MAC80211 is not set | 379 | |
380 | # | ||
381 | # CFG80211 needs to be enabled for MAC80211 | ||
382 | # | ||
383 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
364 | # CONFIG_WIMAX is not set | 384 | # CONFIG_WIMAX is not set |
365 | # CONFIG_RFKILL is not set | 385 | # CONFIG_RFKILL is not set |
366 | # CONFIG_NET_9P is not set | 386 | # CONFIG_NET_9P is not set |
@@ -463,6 +483,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
463 | # | 483 | # |
464 | # CONFIG_MTD_UBI is not set | 484 | # CONFIG_MTD_UBI is not set |
465 | CONFIG_OF_DEVICE=y | 485 | CONFIG_OF_DEVICE=y |
486 | CONFIG_OF_MDIO=y | ||
466 | # CONFIG_PARPORT is not set | 487 | # CONFIG_PARPORT is not set |
467 | # CONFIG_BLK_DEV is not set | 488 | # CONFIG_BLK_DEV is not set |
468 | # CONFIG_MISC_DEVICES is not set | 489 | # CONFIG_MISC_DEVICES is not set |
@@ -480,7 +501,6 @@ CONFIG_HAVE_IDE=y | |||
480 | # CONFIG_MD is not set | 501 | # CONFIG_MD is not set |
481 | # CONFIG_MACINTOSH_DRIVERS is not set | 502 | # CONFIG_MACINTOSH_DRIVERS is not set |
482 | CONFIG_NETDEVICES=y | 503 | CONFIG_NETDEVICES=y |
483 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
484 | # CONFIG_DUMMY is not set | 504 | # CONFIG_DUMMY is not set |
485 | # CONFIG_BONDING is not set | 505 | # CONFIG_BONDING is not set |
486 | # CONFIG_MACVLAN is not set | 506 | # CONFIG_MACVLAN is not set |
@@ -519,6 +539,7 @@ CONFIG_MII=y | |||
519 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 539 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
520 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 540 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
521 | # CONFIG_B44 is not set | 541 | # CONFIG_B44 is not set |
542 | # CONFIG_KS8842 is not set | ||
522 | CONFIG_FS_ENET=y | 543 | CONFIG_FS_ENET=y |
523 | # CONFIG_FS_ENET_HAS_SCC is not set | 544 | # CONFIG_FS_ENET_HAS_SCC is not set |
524 | CONFIG_FS_ENET_HAS_FEC=y | 545 | CONFIG_FS_ENET_HAS_FEC=y |
@@ -590,6 +611,11 @@ CONFIG_GEN_RTC=y | |||
590 | # CONFIG_TCG_TPM is not set | 611 | # CONFIG_TCG_TPM is not set |
591 | # CONFIG_I2C is not set | 612 | # CONFIG_I2C is not set |
592 | # CONFIG_SPI is not set | 613 | # CONFIG_SPI is not set |
614 | |||
615 | # | ||
616 | # PPS support | ||
617 | # | ||
618 | # CONFIG_PPS is not set | ||
593 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 619 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
594 | # CONFIG_GPIOLIB is not set | 620 | # CONFIG_GPIOLIB is not set |
595 | # CONFIG_W1 is not set | 621 | # CONFIG_W1 is not set |
@@ -613,22 +639,7 @@ CONFIG_SSB_POSSIBLE=y | |||
613 | # CONFIG_HTC_PASIC3 is not set | 639 | # CONFIG_HTC_PASIC3 is not set |
614 | # CONFIG_MFD_TMIO is not set | 640 | # CONFIG_MFD_TMIO is not set |
615 | # CONFIG_REGULATOR is not set | 641 | # CONFIG_REGULATOR is not set |
616 | 642 | # CONFIG_MEDIA_SUPPORT is not set | |
617 | # | ||
618 | # Multimedia devices | ||
619 | # | ||
620 | |||
621 | # | ||
622 | # Multimedia core support | ||
623 | # | ||
624 | # CONFIG_VIDEO_DEV is not set | ||
625 | # CONFIG_DVB_CORE is not set | ||
626 | # CONFIG_VIDEO_MEDIA is not set | ||
627 | |||
628 | # | ||
629 | # Multimedia drivers | ||
630 | # | ||
631 | CONFIG_DAB=y | ||
632 | 643 | ||
633 | # | 644 | # |
634 | # Graphics support | 645 | # Graphics support |
@@ -653,6 +664,10 @@ CONFIG_DAB=y | |||
653 | # CONFIG_DMADEVICES is not set | 664 | # CONFIG_DMADEVICES is not set |
654 | # CONFIG_AUXDISPLAY is not set | 665 | # CONFIG_AUXDISPLAY is not set |
655 | # CONFIG_UIO is not set | 666 | # CONFIG_UIO is not set |
667 | |||
668 | # | ||
669 | # TI VLYNQ | ||
670 | # | ||
656 | # CONFIG_STAGING is not set | 671 | # CONFIG_STAGING is not set |
657 | 672 | ||
658 | # | 673 | # |
@@ -664,12 +679,15 @@ CONFIG_DAB=y | |||
664 | # CONFIG_REISERFS_FS is not set | 679 | # CONFIG_REISERFS_FS is not set |
665 | # CONFIG_JFS_FS is not set | 680 | # CONFIG_JFS_FS is not set |
666 | # CONFIG_FS_POSIX_ACL is not set | 681 | # CONFIG_FS_POSIX_ACL is not set |
667 | CONFIG_FILE_LOCKING=y | ||
668 | # CONFIG_XFS_FS is not set | 682 | # CONFIG_XFS_FS is not set |
683 | # CONFIG_GFS2_FS is not set | ||
669 | # CONFIG_OCFS2_FS is not set | 684 | # CONFIG_OCFS2_FS is not set |
670 | # CONFIG_BTRFS_FS is not set | 685 | # CONFIG_BTRFS_FS is not set |
686 | CONFIG_FILE_LOCKING=y | ||
687 | CONFIG_FSNOTIFY=y | ||
671 | # CONFIG_DNOTIFY is not set | 688 | # CONFIG_DNOTIFY is not set |
672 | # CONFIG_INOTIFY is not set | 689 | # CONFIG_INOTIFY is not set |
690 | CONFIG_INOTIFY_USER=y | ||
673 | # CONFIG_QUOTA is not set | 691 | # CONFIG_QUOTA is not set |
674 | # CONFIG_AUTOFS_FS is not set | 692 | # CONFIG_AUTOFS_FS is not set |
675 | # CONFIG_AUTOFS4_FS is not set | 693 | # CONFIG_AUTOFS4_FS is not set |
@@ -786,6 +804,7 @@ CONFIG_HAS_IOPORT=y | |||
786 | CONFIG_HAS_DMA=y | 804 | CONFIG_HAS_DMA=y |
787 | CONFIG_HAVE_LMB=y | 805 | CONFIG_HAVE_LMB=y |
788 | CONFIG_NLATTR=y | 806 | CONFIG_NLATTR=y |
807 | CONFIG_GENERIC_ATOMIC64=y | ||
789 | 808 | ||
790 | # | 809 | # |
791 | # Kernel hacking | 810 | # Kernel hacking |
@@ -814,6 +833,9 @@ CONFIG_SCHED_DEBUG=y | |||
814 | # CONFIG_SLUB_STATS is not set | 833 | # CONFIG_SLUB_STATS is not set |
815 | # CONFIG_DEBUG_SPINLOCK is not set | 834 | # CONFIG_DEBUG_SPINLOCK is not set |
816 | # CONFIG_DEBUG_MUTEXES is not set | 835 | # CONFIG_DEBUG_MUTEXES is not set |
836 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
837 | # CONFIG_PROVE_LOCKING is not set | ||
838 | # CONFIG_LOCK_STAT is not set | ||
817 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 839 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
818 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 840 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
819 | # CONFIG_DEBUG_KOBJECT is not set | 841 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -825,7 +847,6 @@ CONFIG_DEBUG_INFO=y | |||
825 | # CONFIG_DEBUG_LIST is not set | 847 | # CONFIG_DEBUG_LIST is not set |
826 | # CONFIG_DEBUG_SG is not set | 848 | # CONFIG_DEBUG_SG is not set |
827 | # CONFIG_DEBUG_NOTIFIERS is not set | 849 | # CONFIG_DEBUG_NOTIFIERS is not set |
828 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
829 | # CONFIG_RCU_TORTURE_TEST is not set | 850 | # CONFIG_RCU_TORTURE_TEST is not set |
830 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 851 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
831 | # CONFIG_BACKTRACE_SELF_TEST is not set | 852 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -838,16 +859,15 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
838 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 859 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
839 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 860 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
840 | CONFIG_TRACING_SUPPORT=y | 861 | CONFIG_TRACING_SUPPORT=y |
841 | 862 | CONFIG_FTRACE=y | |
842 | # | ||
843 | # Tracers | ||
844 | # | ||
845 | # CONFIG_FUNCTION_TRACER is not set | 863 | # CONFIG_FUNCTION_TRACER is not set |
864 | # CONFIG_IRQSOFF_TRACER is not set | ||
846 | # CONFIG_SCHED_TRACER is not set | 865 | # CONFIG_SCHED_TRACER is not set |
847 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 866 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
848 | # CONFIG_EVENT_TRACER is not set | ||
849 | # CONFIG_BOOT_TRACER is not set | 867 | # CONFIG_BOOT_TRACER is not set |
850 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 868 | CONFIG_BRANCH_PROFILE_NONE=y |
869 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
870 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
851 | # CONFIG_STACK_TRACER is not set | 871 | # CONFIG_STACK_TRACER is not set |
852 | # CONFIG_KMEMTRACE is not set | 872 | # CONFIG_KMEMTRACE is not set |
853 | # CONFIG_WORKQUEUE_TRACER is not set | 873 | # CONFIG_WORKQUEUE_TRACER is not set |
@@ -855,6 +875,9 @@ CONFIG_TRACING_SUPPORT=y | |||
855 | # CONFIG_SAMPLES is not set | 875 | # CONFIG_SAMPLES is not set |
856 | CONFIG_HAVE_ARCH_KGDB=y | 876 | CONFIG_HAVE_ARCH_KGDB=y |
857 | # CONFIG_KGDB is not set | 877 | # CONFIG_KGDB is not set |
878 | # CONFIG_KMEMCHECK is not set | ||
879 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
880 | CONFIG_PPC_WERROR=y | ||
858 | CONFIG_PRINT_STACK_DEPTH=64 | 881 | CONFIG_PRINT_STACK_DEPTH=64 |
859 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 882 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
860 | # CONFIG_DEBUG_STACK_USAGE is not set | 883 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 129d80860f2a..ff96bb43c32d 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:02 2009 | 4 | # Wed Jul 29 23:32:00 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_ALTIVEC is not set | 20 | # CONFIG_ALTIVEC is not set |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
25 | CONFIG_WORD_SIZE=32 | 27 | CONFIG_WORD_SIZE=32 |
@@ -30,15 +32,16 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 38 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
40 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 41 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 43 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 44 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | CONFIG_GENERIC_GPIO=y | 46 | CONFIG_GENERIC_GPIO=y |
44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
@@ -53,11 +56,13 @@ CONFIG_OF=y | |||
53 | # CONFIG_GENERIC_TBSYNC is not set | 56 | # CONFIG_GENERIC_TBSYNC is not set |
54 | CONFIG_AUDIT_ARCH=y | 57 | CONFIG_AUDIT_ARCH=y |
55 | CONFIG_GENERIC_BUG=y | 58 | CONFIG_GENERIC_BUG=y |
59 | CONFIG_DTC=y | ||
56 | CONFIG_DEFAULT_UIMAGE=y | 60 | CONFIG_DEFAULT_UIMAGE=y |
57 | # CONFIG_PPC_DCR_NATIVE is not set | 61 | # CONFIG_PPC_DCR_NATIVE is not set |
58 | # CONFIG_PPC_DCR_MMIO is not set | 62 | # CONFIG_PPC_DCR_MMIO is not set |
59 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
65 | CONFIG_CONSTRUCTORS=y | ||
61 | 66 | ||
62 | # | 67 | # |
63 | # General setup | 68 | # General setup |
@@ -103,7 +108,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
103 | CONFIG_KALLSYMS=y | 108 | CONFIG_KALLSYMS=y |
104 | CONFIG_KALLSYMS_ALL=y | 109 | CONFIG_KALLSYMS_ALL=y |
105 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
106 | # CONFIG_STRIP_ASM_SYMS is not set | ||
107 | CONFIG_HOTPLUG=y | 111 | CONFIG_HOTPLUG=y |
108 | CONFIG_PRINTK=y | 112 | CONFIG_PRINTK=y |
109 | CONFIG_BUG=y | 113 | CONFIG_BUG=y |
@@ -116,9 +120,16 @@ CONFIG_TIMERFD=y | |||
116 | CONFIG_EVENTFD=y | 120 | CONFIG_EVENTFD=y |
117 | CONFIG_SHMEM=y | 121 | CONFIG_SHMEM=y |
118 | CONFIG_AIO=y | 122 | CONFIG_AIO=y |
123 | CONFIG_HAVE_PERF_COUNTERS=y | ||
124 | |||
125 | # | ||
126 | # Performance Counters | ||
127 | # | ||
128 | # CONFIG_PERF_COUNTERS is not set | ||
119 | CONFIG_VM_EVENT_COUNTERS=y | 129 | CONFIG_VM_EVENT_COUNTERS=y |
120 | CONFIG_PCI_QUIRKS=y | 130 | CONFIG_PCI_QUIRKS=y |
121 | CONFIG_SLUB_DEBUG=y | 131 | CONFIG_SLUB_DEBUG=y |
132 | # CONFIG_STRIP_ASM_SYMS is not set | ||
122 | CONFIG_COMPAT_BRK=y | 133 | CONFIG_COMPAT_BRK=y |
123 | # CONFIG_SLAB is not set | 134 | # CONFIG_SLAB is not set |
124 | CONFIG_SLUB=y | 135 | CONFIG_SLUB=y |
@@ -132,6 +143,10 @@ CONFIG_HAVE_KPROBES=y | |||
132 | CONFIG_HAVE_KRETPROBES=y | 143 | CONFIG_HAVE_KRETPROBES=y |
133 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 144 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
134 | CONFIG_HAVE_CLK=y | 145 | CONFIG_HAVE_CLK=y |
146 | |||
147 | # | ||
148 | # GCOV-based kernel profiling | ||
149 | # | ||
135 | # CONFIG_SLOW_WORK is not set | 150 | # CONFIG_SLOW_WORK is not set |
136 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 151 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
137 | CONFIG_SLABINFO=y | 152 | CONFIG_SLABINFO=y |
@@ -139,7 +154,7 @@ CONFIG_RT_MUTEXES=y | |||
139 | CONFIG_BASE_SMALL=0 | 154 | CONFIG_BASE_SMALL=0 |
140 | # CONFIG_MODULES is not set | 155 | # CONFIG_MODULES is not set |
141 | CONFIG_BLOCK=y | 156 | CONFIG_BLOCK=y |
142 | # CONFIG_LBD is not set | 157 | CONFIG_LBDAF=y |
143 | # CONFIG_BLK_DEV_INTEGRITY is not set | 158 | # CONFIG_BLK_DEV_INTEGRITY is not set |
144 | 159 | ||
145 | # | 160 | # |
@@ -219,6 +234,7 @@ CONFIG_BINFMT_ELF=y | |||
219 | # CONFIG_HAVE_AOUT is not set | 234 | # CONFIG_HAVE_AOUT is not set |
220 | CONFIG_BINFMT_MISC=y | 235 | CONFIG_BINFMT_MISC=y |
221 | # CONFIG_IOMMU_HELPER is not set | 236 | # CONFIG_IOMMU_HELPER is not set |
237 | # CONFIG_SWIOTLB is not set | ||
222 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 238 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
223 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 239 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
224 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 240 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -234,9 +250,9 @@ CONFIG_MIGRATION=y | |||
234 | CONFIG_ZONE_DMA_FLAG=1 | 250 | CONFIG_ZONE_DMA_FLAG=1 |
235 | CONFIG_BOUNCE=y | 251 | CONFIG_BOUNCE=y |
236 | CONFIG_VIRT_TO_BUS=y | 252 | CONFIG_VIRT_TO_BUS=y |
237 | CONFIG_UNEVICTABLE_LRU=y | ||
238 | CONFIG_HAVE_MLOCK=y | 253 | CONFIG_HAVE_MLOCK=y |
239 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 254 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
255 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
240 | CONFIG_PPC_4K_PAGES=y | 256 | CONFIG_PPC_4K_PAGES=y |
241 | # CONFIG_PPC_16K_PAGES is not set | 257 | # CONFIG_PPC_16K_PAGES is not set |
242 | # CONFIG_PPC_64K_PAGES is not set | 258 | # CONFIG_PPC_64K_PAGES is not set |
@@ -307,6 +323,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
307 | # CONFIG_NET_IPIP is not set | 323 | # CONFIG_NET_IPIP is not set |
308 | # CONFIG_NET_IPGRE is not set | 324 | # CONFIG_NET_IPGRE is not set |
309 | # CONFIG_IP_MROUTE is not set | 325 | # CONFIG_IP_MROUTE is not set |
326 | # CONFIG_ARPD is not set | ||
310 | CONFIG_SYN_COOKIES=y | 327 | CONFIG_SYN_COOKIES=y |
311 | # CONFIG_INET_AH is not set | 328 | # CONFIG_INET_AH is not set |
312 | # CONFIG_INET_ESP is not set | 329 | # CONFIG_INET_ESP is not set |
@@ -387,7 +404,11 @@ CONFIG_WIRELESS=y | |||
387 | CONFIG_WIRELESS_OLD_REGULATORY=y | 404 | CONFIG_WIRELESS_OLD_REGULATORY=y |
388 | # CONFIG_WIRELESS_EXT is not set | 405 | # CONFIG_WIRELESS_EXT is not set |
389 | # CONFIG_LIB80211 is not set | 406 | # CONFIG_LIB80211 is not set |
390 | # CONFIG_MAC80211 is not set | 407 | |
408 | # | ||
409 | # CFG80211 needs to be enabled for MAC80211 | ||
410 | # | ||
411 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
391 | # CONFIG_WIMAX is not set | 412 | # CONFIG_WIMAX is not set |
392 | # CONFIG_RFKILL is not set | 413 | # CONFIG_RFKILL is not set |
393 | 414 | ||
@@ -493,6 +514,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
493 | # CONFIG_MTD_UBI is not set | 514 | # CONFIG_MTD_UBI is not set |
494 | CONFIG_OF_DEVICE=y | 515 | CONFIG_OF_DEVICE=y |
495 | CONFIG_OF_GPIO=y | 516 | CONFIG_OF_GPIO=y |
517 | CONFIG_OF_MDIO=y | ||
496 | # CONFIG_PARPORT is not set | 518 | # CONFIG_PARPORT is not set |
497 | CONFIG_BLK_DEV=y | 519 | CONFIG_BLK_DEV=y |
498 | # CONFIG_BLK_DEV_FD is not set | 520 | # CONFIG_BLK_DEV_FD is not set |
@@ -518,6 +540,7 @@ CONFIG_MISC_DEVICES=y | |||
518 | # EEPROM support | 540 | # EEPROM support |
519 | # | 541 | # |
520 | # CONFIG_EEPROM_93CX6 is not set | 542 | # CONFIG_EEPROM_93CX6 is not set |
543 | # CONFIG_CB710_CORE is not set | ||
521 | CONFIG_HAVE_IDE=y | 544 | CONFIG_HAVE_IDE=y |
522 | CONFIG_IDE=y | 545 | CONFIG_IDE=y |
523 | 546 | ||
@@ -583,13 +606,17 @@ CONFIG_IDE_PROC_FS=y | |||
583 | # | 606 | # |
584 | 607 | ||
585 | # | 608 | # |
586 | # A new alternative FireWire stack is available with EXPERIMENTAL=y | 609 | # You can enable one or both FireWire driver stacks. |
610 | # | ||
611 | |||
612 | # | ||
613 | # See the help texts for more information. | ||
587 | # | 614 | # |
615 | # CONFIG_FIREWIRE is not set | ||
588 | # CONFIG_IEEE1394 is not set | 616 | # CONFIG_IEEE1394 is not set |
589 | # CONFIG_I2O is not set | 617 | # CONFIG_I2O is not set |
590 | # CONFIG_MACINTOSH_DRIVERS is not set | 618 | # CONFIG_MACINTOSH_DRIVERS is not set |
591 | CONFIG_NETDEVICES=y | 619 | CONFIG_NETDEVICES=y |
592 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
593 | # CONFIG_DUMMY is not set | 620 | # CONFIG_DUMMY is not set |
594 | # CONFIG_BONDING is not set | 621 | # CONFIG_BONDING is not set |
595 | # CONFIG_EQUALIZER is not set | 622 | # CONFIG_EQUALIZER is not set |
@@ -636,6 +663,7 @@ CONFIG_MII=y | |||
636 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 663 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
637 | # CONFIG_NET_PCI is not set | 664 | # CONFIG_NET_PCI is not set |
638 | # CONFIG_B44 is not set | 665 | # CONFIG_B44 is not set |
666 | # CONFIG_KS8842 is not set | ||
639 | # CONFIG_ATL2 is not set | 667 | # CONFIG_ATL2 is not set |
640 | CONFIG_FS_ENET=y | 668 | CONFIG_FS_ENET=y |
641 | # CONFIG_FS_ENET_HAS_SCC is not set | 669 | # CONFIG_FS_ENET_HAS_SCC is not set |
@@ -657,8 +685,10 @@ CONFIG_NETDEV_1000=y | |||
657 | # CONFIG_VIA_VELOCITY is not set | 685 | # CONFIG_VIA_VELOCITY is not set |
658 | # CONFIG_TIGON3 is not set | 686 | # CONFIG_TIGON3 is not set |
659 | # CONFIG_BNX2 is not set | 687 | # CONFIG_BNX2 is not set |
688 | # CONFIG_CNIC is not set | ||
660 | # CONFIG_FSL_PQ_MDIO is not set | 689 | # CONFIG_FSL_PQ_MDIO is not set |
661 | # CONFIG_GIANFAR is not set | 690 | # CONFIG_GIANFAR is not set |
691 | # CONFIG_MV643XX_ETH is not set | ||
662 | # CONFIG_QLA3XXX is not set | 692 | # CONFIG_QLA3XXX is not set |
663 | # CONFIG_ATL1 is not set | 693 | # CONFIG_ATL1 is not set |
664 | # CONFIG_JME is not set | 694 | # CONFIG_JME is not set |
@@ -730,12 +760,13 @@ CONFIG_INPUT_EVDEV=y | |||
730 | # | 760 | # |
731 | CONFIG_INPUT_KEYBOARD=y | 761 | CONFIG_INPUT_KEYBOARD=y |
732 | CONFIG_KEYBOARD_ATKBD=y | 762 | CONFIG_KEYBOARD_ATKBD=y |
733 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
734 | # CONFIG_KEYBOARD_LKKBD is not set | 763 | # CONFIG_KEYBOARD_LKKBD is not set |
735 | # CONFIG_KEYBOARD_XTKBD is not set | 764 | # CONFIG_KEYBOARD_GPIO is not set |
765 | # CONFIG_KEYBOARD_MATRIX is not set | ||
736 | # CONFIG_KEYBOARD_NEWTON is not set | 766 | # CONFIG_KEYBOARD_NEWTON is not set |
737 | # CONFIG_KEYBOARD_STOWAWAY is not set | 767 | # CONFIG_KEYBOARD_STOWAWAY is not set |
738 | # CONFIG_KEYBOARD_GPIO is not set | 768 | # CONFIG_KEYBOARD_SUNKBD is not set |
769 | # CONFIG_KEYBOARD_XTKBD is not set | ||
739 | CONFIG_INPUT_MOUSE=y | 770 | CONFIG_INPUT_MOUSE=y |
740 | CONFIG_MOUSE_PS2=y | 771 | CONFIG_MOUSE_PS2=y |
741 | CONFIG_MOUSE_PS2_ALPS=y | 772 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -802,6 +833,10 @@ CONFIG_HW_RANDOM=y | |||
802 | CONFIG_DEVPORT=y | 833 | CONFIG_DEVPORT=y |
803 | # CONFIG_I2C is not set | 834 | # CONFIG_I2C is not set |
804 | # CONFIG_SPI is not set | 835 | # CONFIG_SPI is not set |
836 | |||
837 | # | ||
838 | # PPS support | ||
839 | # | ||
805 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 840 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
806 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 841 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
807 | CONFIG_GPIOLIB=y | 842 | CONFIG_GPIOLIB=y |
@@ -845,22 +880,7 @@ CONFIG_SSB_POSSIBLE=y | |||
845 | # CONFIG_HTC_PASIC3 is not set | 880 | # CONFIG_HTC_PASIC3 is not set |
846 | # CONFIG_MFD_TMIO is not set | 881 | # CONFIG_MFD_TMIO is not set |
847 | # CONFIG_REGULATOR is not set | 882 | # CONFIG_REGULATOR is not set |
848 | 883 | # CONFIG_MEDIA_SUPPORT is not set | |
849 | # | ||
850 | # Multimedia devices | ||
851 | # | ||
852 | |||
853 | # | ||
854 | # Multimedia core support | ||
855 | # | ||
856 | # CONFIG_VIDEO_DEV is not set | ||
857 | # CONFIG_DVB_CORE is not set | ||
858 | # CONFIG_VIDEO_MEDIA is not set | ||
859 | |||
860 | # | ||
861 | # Multimedia drivers | ||
862 | # | ||
863 | CONFIG_DAB=y | ||
864 | 884 | ||
865 | # | 885 | # |
866 | # Graphics support | 886 | # Graphics support |
@@ -903,8 +923,9 @@ CONFIG_USB_GADGET_SELECTED=y | |||
903 | # CONFIG_USB_GADGET_OMAP is not set | 923 | # CONFIG_USB_GADGET_OMAP is not set |
904 | # CONFIG_USB_GADGET_PXA25X is not set | 924 | # CONFIG_USB_GADGET_PXA25X is not set |
905 | # CONFIG_USB_GADGET_PXA27X is not set | 925 | # CONFIG_USB_GADGET_PXA27X is not set |
906 | # CONFIG_USB_GADGET_S3C2410 is not set | 926 | # CONFIG_USB_GADGET_S3C_HSOTG is not set |
907 | # CONFIG_USB_GADGET_IMX is not set | 927 | # CONFIG_USB_GADGET_IMX is not set |
928 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
908 | CONFIG_USB_GADGET_M66592=y | 929 | CONFIG_USB_GADGET_M66592=y |
909 | CONFIG_USB_M66592=y | 930 | CONFIG_USB_M66592=y |
910 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 931 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
@@ -912,9 +933,11 @@ CONFIG_USB_M66592=y | |||
912 | # CONFIG_USB_GADGET_CI13XXX is not set | 933 | # CONFIG_USB_GADGET_CI13XXX is not set |
913 | # CONFIG_USB_GADGET_NET2280 is not set | 934 | # CONFIG_USB_GADGET_NET2280 is not set |
914 | # CONFIG_USB_GADGET_GOKU is not set | 935 | # CONFIG_USB_GADGET_GOKU is not set |
936 | # CONFIG_USB_GADGET_LANGWELL is not set | ||
915 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 937 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
916 | CONFIG_USB_GADGET_DUALSPEED=y | 938 | CONFIG_USB_GADGET_DUALSPEED=y |
917 | # CONFIG_USB_ZERO is not set | 939 | # CONFIG_USB_ZERO is not set |
940 | # CONFIG_USB_AUDIO is not set | ||
918 | CONFIG_USB_ETH=y | 941 | CONFIG_USB_ETH=y |
919 | CONFIG_USB_ETH_RNDIS=y | 942 | CONFIG_USB_ETH_RNDIS=y |
920 | # CONFIG_USB_GADGETFS is not set | 943 | # CONFIG_USB_GADGETFS is not set |
@@ -939,6 +962,10 @@ CONFIG_USB_ETH_RNDIS=y | |||
939 | # CONFIG_DMADEVICES is not set | 962 | # CONFIG_DMADEVICES is not set |
940 | # CONFIG_AUXDISPLAY is not set | 963 | # CONFIG_AUXDISPLAY is not set |
941 | # CONFIG_UIO is not set | 964 | # CONFIG_UIO is not set |
965 | |||
966 | # | ||
967 | # TI VLYNQ | ||
968 | # | ||
942 | # CONFIG_STAGING is not set | 969 | # CONFIG_STAGING is not set |
943 | 970 | ||
944 | # | 971 | # |
@@ -958,9 +985,10 @@ CONFIG_FS_MBCACHE=y | |||
958 | # CONFIG_REISERFS_FS is not set | 985 | # CONFIG_REISERFS_FS is not set |
959 | # CONFIG_JFS_FS is not set | 986 | # CONFIG_JFS_FS is not set |
960 | CONFIG_FS_POSIX_ACL=y | 987 | CONFIG_FS_POSIX_ACL=y |
961 | CONFIG_FILE_LOCKING=y | ||
962 | # CONFIG_XFS_FS is not set | 988 | # CONFIG_XFS_FS is not set |
963 | # CONFIG_OCFS2_FS is not set | 989 | # CONFIG_OCFS2_FS is not set |
990 | CONFIG_FILE_LOCKING=y | ||
991 | CONFIG_FSNOTIFY=y | ||
964 | CONFIG_DNOTIFY=y | 992 | CONFIG_DNOTIFY=y |
965 | CONFIG_INOTIFY=y | 993 | CONFIG_INOTIFY=y |
966 | CONFIG_INOTIFY_USER=y | 994 | CONFIG_INOTIFY_USER=y |
@@ -1110,6 +1138,7 @@ CONFIG_HAS_IOPORT=y | |||
1110 | CONFIG_HAS_DMA=y | 1138 | CONFIG_HAS_DMA=y |
1111 | CONFIG_HAVE_LMB=y | 1139 | CONFIG_HAVE_LMB=y |
1112 | CONFIG_NLATTR=y | 1140 | CONFIG_NLATTR=y |
1141 | CONFIG_GENERIC_ATOMIC64=y | ||
1113 | 1142 | ||
1114 | # | 1143 | # |
1115 | # Kernel hacking | 1144 | # Kernel hacking |
@@ -1140,6 +1169,9 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | |||
1140 | # CONFIG_RT_MUTEX_TESTER is not set | 1169 | # CONFIG_RT_MUTEX_TESTER is not set |
1141 | # CONFIG_DEBUG_SPINLOCK is not set | 1170 | # CONFIG_DEBUG_SPINLOCK is not set |
1142 | # CONFIG_DEBUG_MUTEXES is not set | 1171 | # CONFIG_DEBUG_MUTEXES is not set |
1172 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1173 | # CONFIG_PROVE_LOCKING is not set | ||
1174 | # CONFIG_LOCK_STAT is not set | ||
1143 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1175 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1144 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1176 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1145 | # CONFIG_DEBUG_KOBJECT is not set | 1177 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1151,7 +1183,6 @@ CONFIG_DEBUG_INFO=y | |||
1151 | # CONFIG_DEBUG_LIST is not set | 1183 | # CONFIG_DEBUG_LIST is not set |
1152 | # CONFIG_DEBUG_SG is not set | 1184 | # CONFIG_DEBUG_SG is not set |
1153 | # CONFIG_DEBUG_NOTIFIERS is not set | 1185 | # CONFIG_DEBUG_NOTIFIERS is not set |
1154 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1155 | # CONFIG_RCU_TORTURE_TEST is not set | 1186 | # CONFIG_RCU_TORTURE_TEST is not set |
1156 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1187 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1157 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1188 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1165,22 +1196,23 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1165 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1196 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1166 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1197 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1167 | CONFIG_TRACING_SUPPORT=y | 1198 | CONFIG_TRACING_SUPPORT=y |
1168 | 1199 | CONFIG_FTRACE=y | |
1169 | # | ||
1170 | # Tracers | ||
1171 | # | ||
1172 | # CONFIG_FUNCTION_TRACER is not set | 1200 | # CONFIG_FUNCTION_TRACER is not set |
1201 | # CONFIG_IRQSOFF_TRACER is not set | ||
1173 | # CONFIG_SCHED_TRACER is not set | 1202 | # CONFIG_SCHED_TRACER is not set |
1174 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1203 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
1175 | # CONFIG_EVENT_TRACER is not set | ||
1176 | # CONFIG_BOOT_TRACER is not set | 1204 | # CONFIG_BOOT_TRACER is not set |
1177 | # CONFIG_TRACE_BRANCH_PROFILING is not set | 1205 | CONFIG_BRANCH_PROFILE_NONE=y |
1206 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1207 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1178 | # CONFIG_STACK_TRACER is not set | 1208 | # CONFIG_STACK_TRACER is not set |
1179 | # CONFIG_KMEMTRACE is not set | 1209 | # CONFIG_KMEMTRACE is not set |
1180 | # CONFIG_WORKQUEUE_TRACER is not set | 1210 | # CONFIG_WORKQUEUE_TRACER is not set |
1181 | # CONFIG_BLK_DEV_IO_TRACE is not set | 1211 | # CONFIG_BLK_DEV_IO_TRACE is not set |
1182 | # CONFIG_SAMPLES is not set | 1212 | # CONFIG_SAMPLES is not set |
1183 | CONFIG_HAVE_ARCH_KGDB=y | 1213 | CONFIG_HAVE_ARCH_KGDB=y |
1214 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1215 | CONFIG_PPC_WERROR=y | ||
1184 | CONFIG_PRINT_STACK_DEPTH=64 | 1216 | CONFIG_PRINT_STACK_DEPTH=64 |
1185 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1217 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1186 | # CONFIG_DEBUG_STACK_USAGE is not set | 1218 | # CONFIG_DEBUG_STACK_USAGE is not set |
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index e9f287f313fa..1293c465d7fa 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:03 2009 | 4 | # Wed Jul 29 23:32:01 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | CONFIG_ALTIVEC=y | 20 | CONFIG_ALTIVEC=y |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_NOT_COHERENT_CACHE=y | 26 | CONFIG_NOT_COHERENT_CACHE=y |
25 | CONFIG_CHECK_CACHE_COHERENCY=y | 27 | CONFIG_CHECK_CACHE_COHERENCY=y |
@@ -32,15 +34,16 @@ CONFIG_GENERIC_TIME=y | |||
32 | CONFIG_GENERIC_TIME_VSYSCALL=y | 34 | CONFIG_GENERIC_TIME_VSYSCALL=y |
33 | CONFIG_GENERIC_CLOCKEVENTS=y | 35 | CONFIG_GENERIC_CLOCKEVENTS=y |
34 | CONFIG_GENERIC_HARDIRQS=y | 36 | CONFIG_GENERIC_HARDIRQS=y |
37 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 38 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
36 | CONFIG_IRQ_PER_CPU=y | 39 | CONFIG_IRQ_PER_CPU=y |
37 | CONFIG_STACKTRACE_SUPPORT=y | 40 | CONFIG_STACKTRACE_SUPPORT=y |
38 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 41 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
42 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
39 | CONFIG_LOCKDEP_SUPPORT=y | 43 | CONFIG_LOCKDEP_SUPPORT=y |
40 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 44 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
41 | CONFIG_ARCH_HAS_ILOG2_U32=y | 45 | CONFIG_ARCH_HAS_ILOG2_U32=y |
42 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
43 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
44 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 48 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
46 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -54,11 +57,13 @@ CONFIG_OF=y | |||
54 | # CONFIG_GENERIC_TBSYNC is not set | 57 | # CONFIG_GENERIC_TBSYNC is not set |
55 | CONFIG_AUDIT_ARCH=y | 58 | CONFIG_AUDIT_ARCH=y |
56 | CONFIG_GENERIC_BUG=y | 59 | CONFIG_GENERIC_BUG=y |
60 | CONFIG_DTC=y | ||
57 | # CONFIG_DEFAULT_UIMAGE is not set | 61 | # CONFIG_DEFAULT_UIMAGE is not set |
58 | # CONFIG_PPC_DCR_NATIVE is not set | 62 | # CONFIG_PPC_DCR_NATIVE is not set |
59 | # CONFIG_PPC_DCR_MMIO is not set | 63 | # CONFIG_PPC_DCR_MMIO is not set |
60 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 64 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 65 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
66 | CONFIG_CONSTRUCTORS=y | ||
62 | 67 | ||
63 | # | 68 | # |
64 | # General setup | 69 | # General setup |
@@ -114,7 +119,6 @@ CONFIG_ANON_INODES=y | |||
114 | CONFIG_SYSCTL_SYSCALL=y | 119 | CONFIG_SYSCTL_SYSCALL=y |
115 | CONFIG_KALLSYMS=y | 120 | CONFIG_KALLSYMS=y |
116 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 121 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
117 | # CONFIG_STRIP_ASM_SYMS is not set | ||
118 | CONFIG_HOTPLUG=y | 122 | CONFIG_HOTPLUG=y |
119 | CONFIG_PRINTK=y | 123 | CONFIG_PRINTK=y |
120 | CONFIG_BUG=y | 124 | CONFIG_BUG=y |
@@ -127,9 +131,16 @@ CONFIG_TIMERFD=y | |||
127 | CONFIG_EVENTFD=y | 131 | CONFIG_EVENTFD=y |
128 | CONFIG_SHMEM=y | 132 | CONFIG_SHMEM=y |
129 | CONFIG_AIO=y | 133 | CONFIG_AIO=y |
134 | CONFIG_HAVE_PERF_COUNTERS=y | ||
135 | |||
136 | # | ||
137 | # Performance Counters | ||
138 | # | ||
139 | # CONFIG_PERF_COUNTERS is not set | ||
130 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
131 | CONFIG_PCI_QUIRKS=y | 141 | CONFIG_PCI_QUIRKS=y |
132 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
143 | # CONFIG_STRIP_ASM_SYMS is not set | ||
133 | CONFIG_COMPAT_BRK=y | 144 | CONFIG_COMPAT_BRK=y |
134 | # CONFIG_SLAB is not set | 145 | # CONFIG_SLAB is not set |
135 | CONFIG_SLUB=y | 146 | CONFIG_SLUB=y |
@@ -142,6 +153,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
142 | CONFIG_HAVE_KPROBES=y | 153 | CONFIG_HAVE_KPROBES=y |
143 | CONFIG_HAVE_KRETPROBES=y | 154 | CONFIG_HAVE_KRETPROBES=y |
144 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 155 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
156 | |||
157 | # | ||
158 | # GCOV-based kernel profiling | ||
159 | # | ||
145 | # CONFIG_SLOW_WORK is not set | 160 | # CONFIG_SLOW_WORK is not set |
146 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 161 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
147 | CONFIG_SLABINFO=y | 162 | CONFIG_SLABINFO=y |
@@ -149,7 +164,7 @@ CONFIG_RT_MUTEXES=y | |||
149 | CONFIG_BASE_SMALL=0 | 164 | CONFIG_BASE_SMALL=0 |
150 | # CONFIG_MODULES is not set | 165 | # CONFIG_MODULES is not set |
151 | CONFIG_BLOCK=y | 166 | CONFIG_BLOCK=y |
152 | CONFIG_LBD=y | 167 | CONFIG_LBDAF=y |
153 | # CONFIG_BLK_DEV_BSG is not set | 168 | # CONFIG_BLK_DEV_BSG is not set |
154 | # CONFIG_BLK_DEV_INTEGRITY is not set | 169 | # CONFIG_BLK_DEV_INTEGRITY is not set |
155 | 170 | ||
@@ -228,6 +243,7 @@ CONFIG_BINFMT_ELF=y | |||
228 | # CONFIG_HAVE_AOUT is not set | 243 | # CONFIG_HAVE_AOUT is not set |
229 | CONFIG_BINFMT_MISC=y | 244 | CONFIG_BINFMT_MISC=y |
230 | # CONFIG_IOMMU_HELPER is not set | 245 | # CONFIG_IOMMU_HELPER is not set |
246 | # CONFIG_SWIOTLB is not set | ||
231 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y | 247 | CONFIG_PPC_NEED_DMA_SYNC_OPS=y |
232 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 248 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
233 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 249 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -249,9 +265,9 @@ CONFIG_MIGRATION=y | |||
249 | CONFIG_ZONE_DMA_FLAG=1 | 265 | CONFIG_ZONE_DMA_FLAG=1 |
250 | CONFIG_BOUNCE=y | 266 | CONFIG_BOUNCE=y |
251 | CONFIG_VIRT_TO_BUS=y | 267 | CONFIG_VIRT_TO_BUS=y |
252 | CONFIG_UNEVICTABLE_LRU=y | ||
253 | CONFIG_HAVE_MLOCK=y | 268 | CONFIG_HAVE_MLOCK=y |
254 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 269 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
270 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
255 | CONFIG_PPC_4K_PAGES=y | 271 | CONFIG_PPC_4K_PAGES=y |
256 | # CONFIG_PPC_16K_PAGES is not set | 272 | # CONFIG_PPC_16K_PAGES is not set |
257 | # CONFIG_PPC_64K_PAGES is not set | 273 | # CONFIG_PPC_64K_PAGES is not set |
@@ -296,6 +312,7 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
296 | CONFIG_KERNEL_START=0xc0000000 | 312 | CONFIG_KERNEL_START=0xc0000000 |
297 | CONFIG_PHYSICAL_START=0x00000000 | 313 | CONFIG_PHYSICAL_START=0x00000000 |
298 | CONFIG_TASK_SIZE=0xc0000000 | 314 | CONFIG_TASK_SIZE=0xc0000000 |
315 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
299 | CONFIG_NET=y | 316 | CONFIG_NET=y |
300 | 317 | ||
301 | # | 318 | # |
@@ -357,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
357 | # CONFIG_ECONET is not set | 374 | # CONFIG_ECONET is not set |
358 | # CONFIG_WAN_ROUTER is not set | 375 | # CONFIG_WAN_ROUTER is not set |
359 | # CONFIG_PHONET is not set | 376 | # CONFIG_PHONET is not set |
377 | # CONFIG_IEEE802154 is not set | ||
360 | # CONFIG_NET_SCHED is not set | 378 | # CONFIG_NET_SCHED is not set |
361 | # CONFIG_DCB is not set | 379 | # CONFIG_DCB is not set |
362 | 380 | ||
@@ -374,7 +392,11 @@ CONFIG_WIRELESS=y | |||
374 | CONFIG_WIRELESS_OLD_REGULATORY=y | 392 | CONFIG_WIRELESS_OLD_REGULATORY=y |
375 | # CONFIG_WIRELESS_EXT is not set | 393 | # CONFIG_WIRELESS_EXT is not set |
376 | # CONFIG_LIB80211 is not set | 394 | # CONFIG_LIB80211 is not set |
377 | # CONFIG_MAC80211 is not set | 395 | |
396 | # | ||
397 | # CFG80211 needs to be enabled for MAC80211 | ||
398 | # | ||
399 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
378 | # CONFIG_WIMAX is not set | 400 | # CONFIG_WIMAX is not set |
379 | # CONFIG_RFKILL is not set | 401 | # CONFIG_RFKILL is not set |
380 | # CONFIG_NET_9P is not set | 402 | # CONFIG_NET_9P is not set |
@@ -479,6 +501,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
479 | # CONFIG_MTD_UBI is not set | 501 | # CONFIG_MTD_UBI is not set |
480 | CONFIG_OF_DEVICE=y | 502 | CONFIG_OF_DEVICE=y |
481 | CONFIG_OF_I2C=y | 503 | CONFIG_OF_I2C=y |
504 | CONFIG_OF_MDIO=y | ||
482 | # CONFIG_PARPORT is not set | 505 | # CONFIG_PARPORT is not set |
483 | CONFIG_BLK_DEV=y | 506 | CONFIG_BLK_DEV=y |
484 | # CONFIG_BLK_DEV_FD is not set | 507 | # CONFIG_BLK_DEV_FD is not set |
@@ -514,7 +537,9 @@ CONFIG_MISC_DEVICES=y | |||
514 | # | 537 | # |
515 | # CONFIG_EEPROM_AT24 is not set | 538 | # CONFIG_EEPROM_AT24 is not set |
516 | # CONFIG_EEPROM_LEGACY is not set | 539 | # CONFIG_EEPROM_LEGACY is not set |
540 | # CONFIG_EEPROM_MAX6875 is not set | ||
517 | # CONFIG_EEPROM_93CX6 is not set | 541 | # CONFIG_EEPROM_93CX6 is not set |
542 | # CONFIG_CB710_CORE is not set | ||
518 | CONFIG_HAVE_IDE=y | 543 | CONFIG_HAVE_IDE=y |
519 | CONFIG_IDE=y | 544 | CONFIG_IDE=y |
520 | 545 | ||
@@ -591,10 +616,6 @@ CONFIG_BLK_DEV_SD=y | |||
591 | # CONFIG_BLK_DEV_SR is not set | 616 | # CONFIG_BLK_DEV_SR is not set |
592 | # CONFIG_CHR_DEV_SG is not set | 617 | # CONFIG_CHR_DEV_SG is not set |
593 | # CONFIG_CHR_DEV_SCH is not set | 618 | # CONFIG_CHR_DEV_SCH is not set |
594 | |||
595 | # | ||
596 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
597 | # | ||
598 | # CONFIG_SCSI_MULTI_LUN is not set | 619 | # CONFIG_SCSI_MULTI_LUN is not set |
599 | # CONFIG_SCSI_CONSTANTS is not set | 620 | # CONFIG_SCSI_CONSTANTS is not set |
600 | # CONFIG_SCSI_LOGGING is not set | 621 | # CONFIG_SCSI_LOGGING is not set |
@@ -611,6 +632,7 @@ CONFIG_BLK_DEV_SD=y | |||
611 | CONFIG_SCSI_LOWLEVEL=y | 632 | CONFIG_SCSI_LOWLEVEL=y |
612 | # CONFIG_ISCSI_TCP is not set | 633 | # CONFIG_ISCSI_TCP is not set |
613 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 634 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
635 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
614 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 636 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
615 | # CONFIG_SCSI_3W_9XXX is not set | 637 | # CONFIG_SCSI_3W_9XXX is not set |
616 | # CONFIG_SCSI_ACARD is not set | 638 | # CONFIG_SCSI_ACARD is not set |
@@ -619,6 +641,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
619 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 641 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
620 | # CONFIG_SCSI_AIC79XX is not set | 642 | # CONFIG_SCSI_AIC79XX is not set |
621 | # CONFIG_SCSI_AIC94XX is not set | 643 | # CONFIG_SCSI_AIC94XX is not set |
644 | # CONFIG_SCSI_MVSAS is not set | ||
622 | # CONFIG_SCSI_DPT_I2O is not set | 645 | # CONFIG_SCSI_DPT_I2O is not set |
623 | # CONFIG_SCSI_ADVANSYS is not set | 646 | # CONFIG_SCSI_ADVANSYS is not set |
624 | # CONFIG_SCSI_ARCMSR is not set | 647 | # CONFIG_SCSI_ARCMSR is not set |
@@ -638,7 +661,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
638 | # CONFIG_SCSI_IPS is not set | 661 | # CONFIG_SCSI_IPS is not set |
639 | # CONFIG_SCSI_INITIO is not set | 662 | # CONFIG_SCSI_INITIO is not set |
640 | # CONFIG_SCSI_INIA100 is not set | 663 | # CONFIG_SCSI_INIA100 is not set |
641 | # CONFIG_SCSI_MVSAS is not set | ||
642 | # CONFIG_SCSI_STEX is not set | 664 | # CONFIG_SCSI_STEX is not set |
643 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 665 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
644 | # CONFIG_SCSI_IPR is not set | 666 | # CONFIG_SCSI_IPR is not set |
@@ -721,7 +743,11 @@ CONFIG_SATA_MV=y | |||
721 | # | 743 | # |
722 | 744 | ||
723 | # | 745 | # |
724 | # Enable only one of the two stacks, unless you know what you are doing | 746 | # You can enable one or both FireWire driver stacks. |
747 | # | ||
748 | |||
749 | # | ||
750 | # See the help texts for more information. | ||
725 | # | 751 | # |
726 | # CONFIG_FIREWIRE is not set | 752 | # CONFIG_FIREWIRE is not set |
727 | # CONFIG_IEEE1394 is not set | 753 | # CONFIG_IEEE1394 is not set |
@@ -730,7 +756,6 @@ CONFIG_MACINTOSH_DRIVERS=y | |||
730 | # CONFIG_MAC_EMUMOUSEBTN is not set | 756 | # CONFIG_MAC_EMUMOUSEBTN is not set |
731 | # CONFIG_WINDFARM is not set | 757 | # CONFIG_WINDFARM is not set |
732 | CONFIG_NETDEVICES=y | 758 | CONFIG_NETDEVICES=y |
733 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
734 | # CONFIG_DUMMY is not set | 759 | # CONFIG_DUMMY is not set |
735 | # CONFIG_BONDING is not set | 760 | # CONFIG_BONDING is not set |
736 | # CONFIG_MACVLAN is not set | 761 | # CONFIG_MACVLAN is not set |
@@ -797,6 +822,7 @@ CONFIG_8139TOO=y | |||
797 | # CONFIG_SMSC9420 is not set | 822 | # CONFIG_SMSC9420 is not set |
798 | # CONFIG_SUNDANCE is not set | 823 | # CONFIG_SUNDANCE is not set |
799 | # CONFIG_TLAN is not set | 824 | # CONFIG_TLAN is not set |
825 | # CONFIG_KS8842 is not set | ||
800 | # CONFIG_VIA_RHINE is not set | 826 | # CONFIG_VIA_RHINE is not set |
801 | # CONFIG_SC92031 is not set | 827 | # CONFIG_SC92031 is not set |
802 | # CONFIG_ATL2 is not set | 828 | # CONFIG_ATL2 is not set |
@@ -818,6 +844,7 @@ CONFIG_E1000=y | |||
818 | # CONFIG_VIA_VELOCITY is not set | 844 | # CONFIG_VIA_VELOCITY is not set |
819 | # CONFIG_TIGON3 is not set | 845 | # CONFIG_TIGON3 is not set |
820 | # CONFIG_BNX2 is not set | 846 | # CONFIG_BNX2 is not set |
847 | # CONFIG_CNIC is not set | ||
821 | CONFIG_MV643XX_ETH=y | 848 | CONFIG_MV643XX_ETH=y |
822 | # CONFIG_QLA3XXX is not set | 849 | # CONFIG_QLA3XXX is not set |
823 | # CONFIG_ATL1 is not set | 850 | # CONFIG_ATL1 is not set |
@@ -1007,13 +1034,17 @@ CONFIG_I2C_MV64XXX=y | |||
1007 | # CONFIG_SENSORS_PCF8574 is not set | 1034 | # CONFIG_SENSORS_PCF8574 is not set |
1008 | # CONFIG_PCF8575 is not set | 1035 | # CONFIG_PCF8575 is not set |
1009 | # CONFIG_SENSORS_PCA9539 is not set | 1036 | # CONFIG_SENSORS_PCA9539 is not set |
1010 | # CONFIG_SENSORS_MAX6875 is not set | ||
1011 | # CONFIG_SENSORS_TSL2550 is not set | 1037 | # CONFIG_SENSORS_TSL2550 is not set |
1012 | # CONFIG_I2C_DEBUG_CORE is not set | 1038 | # CONFIG_I2C_DEBUG_CORE is not set |
1013 | # CONFIG_I2C_DEBUG_ALGO is not set | 1039 | # CONFIG_I2C_DEBUG_ALGO is not set |
1014 | # CONFIG_I2C_DEBUG_BUS is not set | 1040 | # CONFIG_I2C_DEBUG_BUS is not set |
1015 | # CONFIG_I2C_DEBUG_CHIP is not set | 1041 | # CONFIG_I2C_DEBUG_CHIP is not set |
1016 | # CONFIG_SPI is not set | 1042 | # CONFIG_SPI is not set |
1043 | |||
1044 | # | ||
1045 | # PPS support | ||
1046 | # | ||
1047 | # CONFIG_PPS is not set | ||
1017 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 1048 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
1018 | # CONFIG_GPIOLIB is not set | 1049 | # CONFIG_GPIOLIB is not set |
1019 | # CONFIG_W1 is not set | 1050 | # CONFIG_W1 is not set |
@@ -1068,6 +1099,7 @@ CONFIG_HWMON=y | |||
1068 | # CONFIG_SENSORS_SMSC47B397 is not set | 1099 | # CONFIG_SENSORS_SMSC47B397 is not set |
1069 | # CONFIG_SENSORS_ADS7828 is not set | 1100 | # CONFIG_SENSORS_ADS7828 is not set |
1070 | # CONFIG_SENSORS_THMC50 is not set | 1101 | # CONFIG_SENSORS_THMC50 is not set |
1102 | # CONFIG_SENSORS_TMP401 is not set | ||
1071 | # CONFIG_SENSORS_VIA686A is not set | 1103 | # CONFIG_SENSORS_VIA686A is not set |
1072 | # CONFIG_SENSORS_VT1211 is not set | 1104 | # CONFIG_SENSORS_VT1211 is not set |
1073 | # CONFIG_SENSORS_VT8231 is not set | 1105 | # CONFIG_SENSORS_VT8231 is not set |
@@ -1102,23 +1134,9 @@ CONFIG_SSB_POSSIBLE=y | |||
1102 | # CONFIG_MFD_WM8400 is not set | 1134 | # CONFIG_MFD_WM8400 is not set |
1103 | # CONFIG_MFD_WM8350_I2C is not set | 1135 | # CONFIG_MFD_WM8350_I2C is not set |
1104 | # CONFIG_MFD_PCF50633 is not set | 1136 | # CONFIG_MFD_PCF50633 is not set |
1137 | # CONFIG_AB3100_CORE is not set | ||
1105 | # CONFIG_REGULATOR is not set | 1138 | # CONFIG_REGULATOR is not set |
1106 | 1139 | # CONFIG_MEDIA_SUPPORT is not set | |
1107 | # | ||
1108 | # Multimedia devices | ||
1109 | # | ||
1110 | |||
1111 | # | ||
1112 | # Multimedia core support | ||
1113 | # | ||
1114 | # CONFIG_VIDEO_DEV is not set | ||
1115 | # CONFIG_DVB_CORE is not set | ||
1116 | # CONFIG_VIDEO_MEDIA is not set | ||
1117 | |||
1118 | # | ||
1119 | # Multimedia drivers | ||
1120 | # | ||
1121 | # CONFIG_DAB is not set | ||
1122 | 1140 | ||
1123 | # | 1141 | # |
1124 | # Graphics support | 1142 | # Graphics support |
@@ -1163,6 +1181,7 @@ CONFIG_HID_BELKIN=y | |||
1163 | CONFIG_HID_CHERRY=y | 1181 | CONFIG_HID_CHERRY=y |
1164 | CONFIG_HID_CHICONY=y | 1182 | CONFIG_HID_CHICONY=y |
1165 | CONFIG_HID_CYPRESS=y | 1183 | CONFIG_HID_CYPRESS=y |
1184 | CONFIG_HID_DRAGONRISE=y | ||
1166 | # CONFIG_DRAGONRISE_FF is not set | 1185 | # CONFIG_DRAGONRISE_FF is not set |
1167 | CONFIG_HID_EZKEY=y | 1186 | CONFIG_HID_EZKEY=y |
1168 | CONFIG_HID_KYE=y | 1187 | CONFIG_HID_KYE=y |
@@ -1180,9 +1199,14 @@ CONFIG_HID_PETALYNX=y | |||
1180 | CONFIG_HID_SAMSUNG=y | 1199 | CONFIG_HID_SAMSUNG=y |
1181 | CONFIG_HID_SONY=y | 1200 | CONFIG_HID_SONY=y |
1182 | CONFIG_HID_SUNPLUS=y | 1201 | CONFIG_HID_SUNPLUS=y |
1202 | CONFIG_HID_GREENASIA=y | ||
1183 | # CONFIG_GREENASIA_FF is not set | 1203 | # CONFIG_GREENASIA_FF is not set |
1204 | CONFIG_HID_SMARTJOYPLUS=y | ||
1205 | # CONFIG_SMARTJOYPLUS_FF is not set | ||
1184 | CONFIG_HID_TOPSEED=y | 1206 | CONFIG_HID_TOPSEED=y |
1207 | CONFIG_HID_THRUSTMASTER=y | ||
1185 | CONFIG_THRUSTMASTER_FF=y | 1208 | CONFIG_THRUSTMASTER_FF=y |
1209 | CONFIG_HID_ZEROPLUS=y | ||
1186 | CONFIG_ZEROPLUS_FF=y | 1210 | CONFIG_ZEROPLUS_FF=y |
1187 | CONFIG_USB_SUPPORT=y | 1211 | CONFIG_USB_SUPPORT=y |
1188 | CONFIG_USB_ARCH_HAS_HCD=y | 1212 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -1207,6 +1231,7 @@ CONFIG_USB_MON=y | |||
1207 | # USB Host Controller Drivers | 1231 | # USB Host Controller Drivers |
1208 | # | 1232 | # |
1209 | # CONFIG_USB_C67X00_HCD is not set | 1233 | # CONFIG_USB_C67X00_HCD is not set |
1234 | # CONFIG_USB_XHCI_HCD is not set | ||
1210 | CONFIG_USB_EHCI_HCD=y | 1235 | CONFIG_USB_EHCI_HCD=y |
1211 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1236 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1212 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1237 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1215,6 +1240,8 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
1215 | # CONFIG_USB_ISP116X_HCD is not set | 1240 | # CONFIG_USB_ISP116X_HCD is not set |
1216 | # CONFIG_USB_ISP1760_HCD is not set | 1241 | # CONFIG_USB_ISP1760_HCD is not set |
1217 | CONFIG_USB_OHCI_HCD=y | 1242 | CONFIG_USB_OHCI_HCD=y |
1243 | # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set | ||
1244 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | ||
1218 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1245 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1219 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1246 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
1220 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1247 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -1322,6 +1349,7 @@ CONFIG_RTC_DRV_MAX6900=y | |||
1322 | # CONFIG_RTC_DRV_S35390A is not set | 1349 | # CONFIG_RTC_DRV_S35390A is not set |
1323 | # CONFIG_RTC_DRV_FM3130 is not set | 1350 | # CONFIG_RTC_DRV_FM3130 is not set |
1324 | # CONFIG_RTC_DRV_RX8581 is not set | 1351 | # CONFIG_RTC_DRV_RX8581 is not set |
1352 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1325 | 1353 | ||
1326 | # | 1354 | # |
1327 | # SPI RTC drivers | 1355 | # SPI RTC drivers |
@@ -1349,6 +1377,10 @@ CONFIG_RTC_DRV_MAX6900=y | |||
1349 | # CONFIG_DMADEVICES is not set | 1377 | # CONFIG_DMADEVICES is not set |
1350 | # CONFIG_AUXDISPLAY is not set | 1378 | # CONFIG_AUXDISPLAY is not set |
1351 | # CONFIG_UIO is not set | 1379 | # CONFIG_UIO is not set |
1380 | |||
1381 | # | ||
1382 | # TI VLYNQ | ||
1383 | # | ||
1352 | # CONFIG_STAGING is not set | 1384 | # CONFIG_STAGING is not set |
1353 | 1385 | ||
1354 | # | 1386 | # |
@@ -1368,11 +1400,12 @@ CONFIG_FS_MBCACHE=y | |||
1368 | # CONFIG_REISERFS_FS is not set | 1400 | # CONFIG_REISERFS_FS is not set |
1369 | # CONFIG_JFS_FS is not set | 1401 | # CONFIG_JFS_FS is not set |
1370 | # CONFIG_FS_POSIX_ACL is not set | 1402 | # CONFIG_FS_POSIX_ACL is not set |
1371 | CONFIG_FILE_LOCKING=y | ||
1372 | # CONFIG_XFS_FS is not set | 1403 | # CONFIG_XFS_FS is not set |
1373 | # CONFIG_GFS2_FS is not set | 1404 | # CONFIG_GFS2_FS is not set |
1374 | # CONFIG_OCFS2_FS is not set | 1405 | # CONFIG_OCFS2_FS is not set |
1375 | # CONFIG_BTRFS_FS is not set | 1406 | # CONFIG_BTRFS_FS is not set |
1407 | CONFIG_FILE_LOCKING=y | ||
1408 | CONFIG_FSNOTIFY=y | ||
1376 | CONFIG_DNOTIFY=y | 1409 | CONFIG_DNOTIFY=y |
1377 | CONFIG_INOTIFY=y | 1410 | CONFIG_INOTIFY=y |
1378 | CONFIG_INOTIFY_USER=y | 1411 | CONFIG_INOTIFY_USER=y |
@@ -1469,7 +1502,46 @@ CONFIG_MSDOS_PARTITION=y | |||
1469 | # CONFIG_KARMA_PARTITION is not set | 1502 | # CONFIG_KARMA_PARTITION is not set |
1470 | # CONFIG_EFI_PARTITION is not set | 1503 | # CONFIG_EFI_PARTITION is not set |
1471 | # CONFIG_SYSV68_PARTITION is not set | 1504 | # CONFIG_SYSV68_PARTITION is not set |
1472 | # CONFIG_NLS is not set | 1505 | CONFIG_NLS=y |
1506 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1507 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1508 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1509 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1510 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1511 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1512 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1513 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1514 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1515 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1516 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1517 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1518 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1519 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1520 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1521 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1522 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1523 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1524 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1525 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1526 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1527 | # CONFIG_NLS_ISO8859_8 is not set | ||
1528 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1529 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1530 | # CONFIG_NLS_ASCII is not set | ||
1531 | # CONFIG_NLS_ISO8859_1 is not set | ||
1532 | # CONFIG_NLS_ISO8859_2 is not set | ||
1533 | # CONFIG_NLS_ISO8859_3 is not set | ||
1534 | # CONFIG_NLS_ISO8859_4 is not set | ||
1535 | # CONFIG_NLS_ISO8859_5 is not set | ||
1536 | # CONFIG_NLS_ISO8859_6 is not set | ||
1537 | # CONFIG_NLS_ISO8859_7 is not set | ||
1538 | # CONFIG_NLS_ISO8859_9 is not set | ||
1539 | # CONFIG_NLS_ISO8859_13 is not set | ||
1540 | # CONFIG_NLS_ISO8859_14 is not set | ||
1541 | # CONFIG_NLS_ISO8859_15 is not set | ||
1542 | # CONFIG_NLS_KOI8_R is not set | ||
1543 | # CONFIG_NLS_KOI8_U is not set | ||
1544 | # CONFIG_NLS_UTF8 is not set | ||
1473 | # CONFIG_DLM is not set | 1545 | # CONFIG_DLM is not set |
1474 | # CONFIG_BINARY_PRINTF is not set | 1546 | # CONFIG_BINARY_PRINTF is not set |
1475 | 1547 | ||
@@ -1494,6 +1566,7 @@ CONFIG_HAS_IOPORT=y | |||
1494 | CONFIG_HAS_DMA=y | 1566 | CONFIG_HAS_DMA=y |
1495 | CONFIG_HAVE_LMB=y | 1567 | CONFIG_HAVE_LMB=y |
1496 | CONFIG_NLATTR=y | 1568 | CONFIG_NLATTR=y |
1569 | CONFIG_GENERIC_ATOMIC64=y | ||
1497 | 1570 | ||
1498 | # | 1571 | # |
1499 | # Kernel hacking | 1572 | # Kernel hacking |
@@ -1519,22 +1592,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1519 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1592 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1520 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1593 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1521 | CONFIG_TRACING_SUPPORT=y | 1594 | CONFIG_TRACING_SUPPORT=y |
1522 | 1595 | # CONFIG_FTRACE is not set | |
1523 | # | ||
1524 | # Tracers | ||
1525 | # | ||
1526 | # CONFIG_FUNCTION_TRACER is not set | ||
1527 | # CONFIG_SCHED_TRACER is not set | ||
1528 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1529 | # CONFIG_EVENT_TRACER is not set | ||
1530 | # CONFIG_BOOT_TRACER is not set | ||
1531 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1532 | # CONFIG_STACK_TRACER is not set | ||
1533 | # CONFIG_KMEMTRACE is not set | ||
1534 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1535 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1536 | # CONFIG_SAMPLES is not set | 1596 | # CONFIG_SAMPLES is not set |
1537 | CONFIG_HAVE_ARCH_KGDB=y | 1597 | CONFIG_HAVE_ARCH_KGDB=y |
1598 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1599 | CONFIG_PPC_WERROR=y | ||
1538 | CONFIG_PRINT_STACK_DEPTH=64 | 1600 | CONFIG_PRINT_STACK_DEPTH=64 |
1539 | # CONFIG_IRQSTACKS is not set | 1601 | # CONFIG_IRQSTACKS is not set |
1540 | # CONFIG_BOOTX_TEXT is not set | 1602 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index e28e65e7a0e1..7de127e4ceef 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
@@ -1,13 +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-rc5 | 3 | # Linux kernel version: 2.6.31-rc7 |
4 | # Fri May 15 10:37:00 2009 | 4 | # Mon Aug 24 17:38:50 2009 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Processor support | 9 | # Processor support |
10 | # | 10 | # |
11 | CONFIG_PPC_BOOK3S_64=y | ||
11 | CONFIG_PPC_BOOK3S=y | 12 | CONFIG_PPC_BOOK3S=y |
12 | # CONFIG_POWER4_ONLY is not set | 13 | # CONFIG_POWER4_ONLY is not set |
13 | CONFIG_POWER3=y | 14 | CONFIG_POWER3=y |
@@ -20,6 +21,7 @@ CONFIG_PPC_STD_MMU=y | |||
20 | CONFIG_PPC_STD_MMU_64=y | 21 | CONFIG_PPC_STD_MMU_64=y |
21 | CONFIG_PPC_MM_SLICES=y | 22 | CONFIG_PPC_MM_SLICES=y |
22 | CONFIG_VIRT_CPU_ACCOUNTING=y | 23 | CONFIG_VIRT_CPU_ACCOUNTING=y |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | CONFIG_SMP=y | 25 | CONFIG_SMP=y |
24 | CONFIG_NR_CPUS=2 | 26 | CONFIG_NR_CPUS=2 |
25 | CONFIG_64BIT=y | 27 | CONFIG_64BIT=y |
@@ -31,6 +33,7 @@ CONFIG_GENERIC_TIME=y | |||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | 33 | CONFIG_GENERIC_TIME_VSYSCALL=y |
32 | CONFIG_GENERIC_CLOCKEVENTS=y | 34 | CONFIG_GENERIC_CLOCKEVENTS=y |
33 | CONFIG_GENERIC_HARDIRQS=y | 35 | CONFIG_GENERIC_HARDIRQS=y |
36 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
34 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 37 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
35 | CONFIG_IRQ_PER_CPU=y | 38 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 39 | CONFIG_STACKTRACE_SUPPORT=y |
@@ -41,7 +44,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y | |||
41 | CONFIG_ARCH_HAS_ILOG2_U32=y | 44 | CONFIG_ARCH_HAS_ILOG2_U32=y |
42 | CONFIG_ARCH_HAS_ILOG2_U64=y | 45 | CONFIG_ARCH_HAS_ILOG2_U64=y |
43 | CONFIG_GENERIC_HWEIGHT=y | 46 | CONFIG_GENERIC_HWEIGHT=y |
44 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
45 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 47 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
46 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 48 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
47 | CONFIG_PPC=y | 49 | CONFIG_PPC=y |
@@ -62,6 +64,7 @@ CONFIG_DTC=y | |||
62 | # CONFIG_PPC_DCR_MMIO is not set | 64 | # CONFIG_PPC_DCR_MMIO is not set |
63 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
64 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 66 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
67 | CONFIG_CONSTRUCTORS=y | ||
65 | 68 | ||
66 | # | 69 | # |
67 | # General setup | 70 | # General setup |
@@ -113,7 +116,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
113 | CONFIG_KALLSYMS=y | 116 | CONFIG_KALLSYMS=y |
114 | CONFIG_KALLSYMS_ALL=y | 117 | CONFIG_KALLSYMS_ALL=y |
115 | CONFIG_KALLSYMS_EXTRA_PASS=y | 118 | CONFIG_KALLSYMS_EXTRA_PASS=y |
116 | # CONFIG_STRIP_ASM_SYMS is not set | ||
117 | CONFIG_HOTPLUG=y | 119 | CONFIG_HOTPLUG=y |
118 | CONFIG_PRINTK=y | 120 | CONFIG_PRINTK=y |
119 | CONFIG_BUG=y | 121 | CONFIG_BUG=y |
@@ -126,7 +128,14 @@ CONFIG_TIMERFD=y | |||
126 | CONFIG_EVENTFD=y | 128 | CONFIG_EVENTFD=y |
127 | CONFIG_SHMEM=y | 129 | CONFIG_SHMEM=y |
128 | CONFIG_AIO=y | 130 | CONFIG_AIO=y |
131 | CONFIG_HAVE_PERF_COUNTERS=y | ||
132 | |||
133 | # | ||
134 | # Performance Counters | ||
135 | # | ||
136 | # CONFIG_PERF_COUNTERS is not set | ||
129 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
138 | # CONFIG_STRIP_ASM_SYMS is not set | ||
130 | # CONFIG_COMPAT_BRK is not set | 139 | # CONFIG_COMPAT_BRK is not set |
131 | CONFIG_SLAB=y | 140 | CONFIG_SLAB=y |
132 | # CONFIG_SLUB is not set | 141 | # CONFIG_SLUB is not set |
@@ -145,6 +154,11 @@ CONFIG_HAVE_KRETPROBES=y | |||
145 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 154 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
146 | CONFIG_HAVE_DMA_ATTRS=y | 155 | CONFIG_HAVE_DMA_ATTRS=y |
147 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 156 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
157 | |||
158 | # | ||
159 | # GCOV-based kernel profiling | ||
160 | # | ||
161 | # CONFIG_GCOV_KERNEL is not set | ||
148 | # CONFIG_SLOW_WORK is not set | 162 | # CONFIG_SLOW_WORK is not set |
149 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 163 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
150 | CONFIG_SLABINFO=y | 164 | CONFIG_SLABINFO=y |
@@ -210,7 +224,7 @@ CONFIG_PPC_CELL=y | |||
210 | # | 224 | # |
211 | # Cell Broadband Engine options | 225 | # Cell Broadband Engine options |
212 | # | 226 | # |
213 | CONFIG_SPU_FS=y | 227 | CONFIG_SPU_FS=m |
214 | CONFIG_SPU_FS_64K_LS=y | 228 | CONFIG_SPU_FS_64K_LS=y |
215 | # CONFIG_SPU_TRACE is not set | 229 | # CONFIG_SPU_TRACE is not set |
216 | CONFIG_SPU_BASE=y | 230 | CONFIG_SPU_BASE=y |
@@ -255,6 +269,7 @@ CONFIG_BINFMT_MISC=y | |||
255 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 269 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
256 | # CONFIG_IOMMU_VMERGE is not set | 270 | # CONFIG_IOMMU_VMERGE is not set |
257 | CONFIG_IOMMU_HELPER=y | 271 | CONFIG_IOMMU_HELPER=y |
272 | # CONFIG_SWIOTLB is not set | ||
258 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 273 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
259 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 274 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
260 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 275 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -285,9 +300,9 @@ CONFIG_MIGRATION=y | |||
285 | CONFIG_PHYS_ADDR_T_64BIT=y | 300 | CONFIG_PHYS_ADDR_T_64BIT=y |
286 | CONFIG_ZONE_DMA_FLAG=1 | 301 | CONFIG_ZONE_DMA_FLAG=1 |
287 | CONFIG_BOUNCE=y | 302 | CONFIG_BOUNCE=y |
288 | CONFIG_UNEVICTABLE_LRU=y | ||
289 | CONFIG_HAVE_MLOCK=y | 303 | CONFIG_HAVE_MLOCK=y |
290 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 304 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
305 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
291 | CONFIG_ARCH_MEMORY_PROBE=y | 306 | CONFIG_ARCH_MEMORY_PROBE=y |
292 | CONFIG_PPC_HAS_HASH_64K=y | 307 | CONFIG_PPC_HAS_HASH_64K=y |
293 | CONFIG_PPC_4K_PAGES=y | 308 | CONFIG_PPC_4K_PAGES=y |
@@ -399,6 +414,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y | |||
399 | # CONFIG_ECONET is not set | 414 | # CONFIG_ECONET is not set |
400 | # CONFIG_WAN_ROUTER is not set | 415 | # CONFIG_WAN_ROUTER is not set |
401 | # CONFIG_PHONET is not set | 416 | # CONFIG_PHONET is not set |
417 | # CONFIG_IEEE802154 is not set | ||
402 | # CONFIG_NET_SCHED is not set | 418 | # CONFIG_NET_SCHED is not set |
403 | # CONFIG_DCB is not set | 419 | # CONFIG_DCB is not set |
404 | 420 | ||
@@ -433,11 +449,14 @@ CONFIG_BT_HCIBTUSB=m | |||
433 | CONFIG_WIRELESS=y | 449 | CONFIG_WIRELESS=y |
434 | CONFIG_CFG80211=m | 450 | CONFIG_CFG80211=m |
435 | # CONFIG_CFG80211_REG_DEBUG is not set | 451 | # CONFIG_CFG80211_REG_DEBUG is not set |
452 | # CONFIG_CFG80211_DEBUGFS is not set | ||
436 | # CONFIG_WIRELESS_OLD_REGULATORY is not set | 453 | # CONFIG_WIRELESS_OLD_REGULATORY is not set |
437 | CONFIG_WIRELESS_EXT=y | 454 | CONFIG_WIRELESS_EXT=y |
438 | # CONFIG_WIRELESS_EXT_SYSFS is not set | 455 | # CONFIG_WIRELESS_EXT_SYSFS is not set |
439 | # CONFIG_LIB80211 is not set | 456 | # CONFIG_LIB80211 is not set |
440 | CONFIG_MAC80211=m | 457 | CONFIG_MAC80211=m |
458 | CONFIG_MAC80211_DEFAULT_PS=y | ||
459 | CONFIG_MAC80211_DEFAULT_PS_VALUE=1 | ||
441 | 460 | ||
442 | # | 461 | # |
443 | # Rate control algorithm selection | 462 | # Rate control algorithm selection |
@@ -447,7 +466,6 @@ CONFIG_MAC80211_RC_PID=y | |||
447 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 466 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
448 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | 467 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set |
449 | CONFIG_MAC80211_RC_DEFAULT="pid" | 468 | CONFIG_MAC80211_RC_DEFAULT="pid" |
450 | # CONFIG_MAC80211_MESH is not set | ||
451 | # CONFIG_MAC80211_LEDS is not set | 469 | # CONFIG_MAC80211_LEDS is not set |
452 | # CONFIG_MAC80211_DEBUGFS is not set | 470 | # CONFIG_MAC80211_DEBUGFS is not set |
453 | # CONFIG_MAC80211_DEBUG_MENU is not set | 471 | # CONFIG_MAC80211_DEBUG_MENU is not set |
@@ -472,77 +490,7 @@ CONFIG_EXTRA_FIRMWARE="" | |||
472 | # CONFIG_DEBUG_DEVRES is not set | 490 | # CONFIG_DEBUG_DEVRES is not set |
473 | # CONFIG_SYS_HYPERVISOR is not set | 491 | # CONFIG_SYS_HYPERVISOR is not set |
474 | # CONFIG_CONNECTOR is not set | 492 | # CONFIG_CONNECTOR is not set |
475 | CONFIG_MTD=y | 493 | # CONFIG_MTD is not set |
476 | CONFIG_MTD_DEBUG=y | ||
477 | CONFIG_MTD_DEBUG_VERBOSE=0 | ||
478 | # CONFIG_MTD_CONCAT is not set | ||
479 | # CONFIG_MTD_PARTITIONS is not set | ||
480 | # CONFIG_MTD_TESTS is not set | ||
481 | |||
482 | # | ||
483 | # User Modules And Translation Layers | ||
484 | # | ||
485 | # CONFIG_MTD_CHAR is not set | ||
486 | CONFIG_MTD_BLKDEVS=y | ||
487 | CONFIG_MTD_BLOCK=y | ||
488 | # CONFIG_FTL is not set | ||
489 | # CONFIG_NFTL is not set | ||
490 | # CONFIG_INFTL is not set | ||
491 | # CONFIG_RFD_FTL is not set | ||
492 | # CONFIG_SSFDC is not set | ||
493 | # CONFIG_MTD_OOPS is not set | ||
494 | |||
495 | # | ||
496 | # RAM/ROM/Flash chip drivers | ||
497 | # | ||
498 | # CONFIG_MTD_CFI is not set | ||
499 | # CONFIG_MTD_JEDECPROBE is not set | ||
500 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
501 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
502 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
503 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
504 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
505 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
506 | CONFIG_MTD_CFI_I1=y | ||
507 | CONFIG_MTD_CFI_I2=y | ||
508 | # CONFIG_MTD_CFI_I4 is not set | ||
509 | # CONFIG_MTD_CFI_I8 is not set | ||
510 | # CONFIG_MTD_RAM is not set | ||
511 | # CONFIG_MTD_ROM is not set | ||
512 | # CONFIG_MTD_ABSENT is not set | ||
513 | |||
514 | # | ||
515 | # Mapping drivers for chip access | ||
516 | # | ||
517 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
518 | # CONFIG_MTD_PLATRAM is not set | ||
519 | |||
520 | # | ||
521 | # Self-contained MTD device drivers | ||
522 | # | ||
523 | # CONFIG_MTD_SLRAM is not set | ||
524 | # CONFIG_MTD_PHRAM is not set | ||
525 | # CONFIG_MTD_MTDRAM is not set | ||
526 | # CONFIG_MTD_BLOCK2MTD is not set | ||
527 | |||
528 | # | ||
529 | # Disk-On-Chip Device Drivers | ||
530 | # | ||
531 | # CONFIG_MTD_DOC2000 is not set | ||
532 | # CONFIG_MTD_DOC2001 is not set | ||
533 | # CONFIG_MTD_DOC2001PLUS is not set | ||
534 | # CONFIG_MTD_NAND is not set | ||
535 | # CONFIG_MTD_ONENAND is not set | ||
536 | |||
537 | # | ||
538 | # LPDDR flash memory drivers | ||
539 | # | ||
540 | # CONFIG_MTD_LPDDR is not set | ||
541 | |||
542 | # | ||
543 | # UBI - Unsorted block images | ||
544 | # | ||
545 | # CONFIG_MTD_UBI is not set | ||
546 | CONFIG_OF_DEVICE=y | 494 | CONFIG_OF_DEVICE=y |
547 | # CONFIG_PARPORT is not set | 495 | # CONFIG_PARPORT is not set |
548 | CONFIG_BLK_DEV=y | 496 | CONFIG_BLK_DEV=y |
@@ -590,10 +538,6 @@ CONFIG_BLK_DEV_SR=y | |||
590 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 538 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
591 | CONFIG_CHR_DEV_SG=m | 539 | CONFIG_CHR_DEV_SG=m |
592 | # CONFIG_CHR_DEV_SCH is not set | 540 | # CONFIG_CHR_DEV_SCH is not set |
593 | |||
594 | # | ||
595 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
596 | # | ||
597 | CONFIG_SCSI_MULTI_LUN=y | 541 | CONFIG_SCSI_MULTI_LUN=y |
598 | # CONFIG_SCSI_CONSTANTS is not set | 542 | # CONFIG_SCSI_CONSTANTS is not set |
599 | # CONFIG_SCSI_LOGGING is not set | 543 | # CONFIG_SCSI_LOGGING is not set |
@@ -626,7 +570,6 @@ CONFIG_BLK_DEV_DM=m | |||
626 | # CONFIG_DM_UEVENT is not set | 570 | # CONFIG_DM_UEVENT is not set |
627 | # CONFIG_MACINTOSH_DRIVERS is not set | 571 | # CONFIG_MACINTOSH_DRIVERS is not set |
628 | CONFIG_NETDEVICES=y | 572 | CONFIG_NETDEVICES=y |
629 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
630 | # CONFIG_DUMMY is not set | 573 | # CONFIG_DUMMY is not set |
631 | # CONFIG_BONDING is not set | 574 | # CONFIG_BONDING is not set |
632 | # CONFIG_MACVLAN is not set | 575 | # CONFIG_MACVLAN is not set |
@@ -646,10 +589,11 @@ CONFIG_MII=m | |||
646 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | 589 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
647 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 590 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
648 | # CONFIG_B44 is not set | 591 | # CONFIG_B44 is not set |
592 | # CONFIG_KS8842 is not set | ||
649 | CONFIG_NETDEV_1000=y | 593 | CONFIG_NETDEV_1000=y |
650 | CONFIG_GELIC_NET=y | 594 | CONFIG_GELIC_NET=y |
651 | CONFIG_GELIC_WIRELESS=y | 595 | CONFIG_GELIC_WIRELESS=y |
652 | CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y | 596 | # CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE is not set |
653 | # CONFIG_NETDEV_10000 is not set | 597 | # CONFIG_NETDEV_10000 is not set |
654 | 598 | ||
655 | # | 599 | # |
@@ -669,8 +613,7 @@ CONFIG_WLAN_80211=y | |||
669 | # CONFIG_HOSTAP is not set | 613 | # CONFIG_HOSTAP is not set |
670 | # CONFIG_B43 is not set | 614 | # CONFIG_B43 is not set |
671 | # CONFIG_B43LEGACY is not set | 615 | # CONFIG_B43LEGACY is not set |
672 | CONFIG_ZD1211RW=m | 616 | # CONFIG_ZD1211RW is not set |
673 | # CONFIG_ZD1211RW_DEBUG is not set | ||
674 | # CONFIG_RT2X00 is not set | 617 | # CONFIG_RT2X00 is not set |
675 | 618 | ||
676 | # | 619 | # |
@@ -682,7 +625,7 @@ CONFIG_ZD1211RW=m | |||
682 | # | 625 | # |
683 | # CONFIG_USB_CATC is not set | 626 | # CONFIG_USB_CATC is not set |
684 | # CONFIG_USB_KAWETH is not set | 627 | # CONFIG_USB_KAWETH is not set |
685 | CONFIG_USB_PEGASUS=m | 628 | # CONFIG_USB_PEGASUS is not set |
686 | # CONFIG_USB_RTL8150 is not set | 629 | # CONFIG_USB_RTL8150 is not set |
687 | CONFIG_USB_USBNET=m | 630 | CONFIG_USB_USBNET=m |
688 | CONFIG_USB_NET_AX8817X=m | 631 | CONFIG_USB_NET_AX8817X=m |
@@ -693,10 +636,11 @@ CONFIG_USB_NET_AX8817X=m | |||
693 | # CONFIG_USB_NET_GL620A is not set | 636 | # CONFIG_USB_NET_GL620A is not set |
694 | # CONFIG_USB_NET_NET1080 is not set | 637 | # CONFIG_USB_NET_NET1080 is not set |
695 | # CONFIG_USB_NET_PLUSB is not set | 638 | # CONFIG_USB_NET_PLUSB is not set |
696 | CONFIG_USB_NET_MCS7830=m | 639 | # CONFIG_USB_NET_MCS7830 is not set |
697 | # CONFIG_USB_NET_RNDIS_HOST is not set | 640 | # CONFIG_USB_NET_RNDIS_HOST is not set |
698 | # CONFIG_USB_NET_CDC_SUBSET is not set | 641 | # CONFIG_USB_NET_CDC_SUBSET is not set |
699 | # CONFIG_USB_NET_ZAURUS is not set | 642 | # CONFIG_USB_NET_ZAURUS is not set |
643 | # CONFIG_USB_NET_INT51X1 is not set | ||
700 | # CONFIG_WAN is not set | 644 | # CONFIG_WAN is not set |
701 | CONFIG_PPP=m | 645 | CONFIG_PPP=m |
702 | CONFIG_PPP_MULTILINK=y | 646 | CONFIG_PPP_MULTILINK=y |
@@ -771,8 +715,7 @@ CONFIG_DEVKMEM=y | |||
771 | # | 715 | # |
772 | CONFIG_UNIX98_PTYS=y | 716 | CONFIG_UNIX98_PTYS=y |
773 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 717 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
774 | CONFIG_LEGACY_PTYS=y | 718 | # CONFIG_LEGACY_PTYS is not set |
775 | CONFIG_LEGACY_PTY_COUNT=16 | ||
776 | # CONFIG_HVC_UDBG is not set | 719 | # CONFIG_HVC_UDBG is not set |
777 | # CONFIG_IPMI_HANDLER is not set | 720 | # CONFIG_IPMI_HANDLER is not set |
778 | # CONFIG_HW_RANDOM is not set | 721 | # CONFIG_HW_RANDOM is not set |
@@ -782,6 +725,11 @@ CONFIG_LEGACY_PTY_COUNT=16 | |||
782 | # CONFIG_TCG_TPM is not set | 725 | # CONFIG_TCG_TPM is not set |
783 | # CONFIG_I2C is not set | 726 | # CONFIG_I2C is not set |
784 | # CONFIG_SPI is not set | 727 | # CONFIG_SPI is not set |
728 | |||
729 | # | ||
730 | # PPS support | ||
731 | # | ||
732 | # CONFIG_PPS is not set | ||
785 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 733 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
786 | # CONFIG_GPIOLIB is not set | 734 | # CONFIG_GPIOLIB is not set |
787 | # CONFIG_W1 is not set | 735 | # CONFIG_W1 is not set |
@@ -805,22 +753,7 @@ CONFIG_SSB_POSSIBLE=y | |||
805 | # CONFIG_HTC_PASIC3 is not set | 753 | # CONFIG_HTC_PASIC3 is not set |
806 | # CONFIG_MFD_TMIO is not set | 754 | # CONFIG_MFD_TMIO is not set |
807 | # CONFIG_REGULATOR is not set | 755 | # CONFIG_REGULATOR is not set |
808 | 756 | # CONFIG_MEDIA_SUPPORT is not set | |
809 | # | ||
810 | # Multimedia devices | ||
811 | # | ||
812 | |||
813 | # | ||
814 | # Multimedia core support | ||
815 | # | ||
816 | # CONFIG_VIDEO_DEV is not set | ||
817 | # CONFIG_DVB_CORE is not set | ||
818 | # CONFIG_VIDEO_MEDIA is not set | ||
819 | |||
820 | # | ||
821 | # Multimedia drivers | ||
822 | # | ||
823 | # CONFIG_DAB is not set | ||
824 | 757 | ||
825 | # | 758 | # |
826 | # Graphics support | 759 | # Graphics support |
@@ -898,6 +831,11 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
898 | CONFIG_SND_VERBOSE_PROCFS=y | 831 | CONFIG_SND_VERBOSE_PROCFS=y |
899 | # CONFIG_SND_VERBOSE_PRINTK is not set | 832 | # CONFIG_SND_VERBOSE_PRINTK is not set |
900 | # CONFIG_SND_DEBUG is not set | 833 | # CONFIG_SND_DEBUG is not set |
834 | # CONFIG_SND_RAWMIDI_SEQ is not set | ||
835 | # CONFIG_SND_OPL3_LIB_SEQ is not set | ||
836 | # CONFIG_SND_OPL4_LIB_SEQ is not set | ||
837 | # CONFIG_SND_SBAWE_SEQ is not set | ||
838 | # CONFIG_SND_EMU10K1_SEQ is not set | ||
901 | # CONFIG_SND_DRIVERS is not set | 839 | # CONFIG_SND_DRIVERS is not set |
902 | CONFIG_SND_PPC=y | 840 | CONFIG_SND_PPC=y |
903 | CONFIG_SND_PS3=m | 841 | CONFIG_SND_PS3=m |
@@ -930,29 +868,34 @@ CONFIG_USB_HIDDEV=y | |||
930 | # Special HID drivers | 868 | # Special HID drivers |
931 | # | 869 | # |
932 | # CONFIG_HID_A4TECH is not set | 870 | # CONFIG_HID_A4TECH is not set |
933 | # CONFIG_HID_APPLE is not set | 871 | CONFIG_HID_APPLE=m |
934 | # CONFIG_HID_BELKIN is not set | 872 | CONFIG_HID_BELKIN=m |
935 | # CONFIG_HID_CHERRY is not set | 873 | CONFIG_HID_CHERRY=m |
936 | # CONFIG_HID_CHICONY is not set | 874 | # CONFIG_HID_CHICONY is not set |
937 | # CONFIG_HID_CYPRESS is not set | 875 | # CONFIG_HID_CYPRESS is not set |
938 | # CONFIG_DRAGONRISE_FF is not set | 876 | # CONFIG_HID_DRAGONRISE is not set |
939 | # CONFIG_HID_EZKEY is not set | 877 | CONFIG_HID_EZKEY=m |
940 | # CONFIG_HID_KYE is not set | 878 | # CONFIG_HID_KYE is not set |
941 | # CONFIG_HID_GYRATION is not set | 879 | # CONFIG_HID_GYRATION is not set |
942 | # CONFIG_HID_KENSINGTON is not set | 880 | # CONFIG_HID_KENSINGTON is not set |
943 | # CONFIG_HID_LOGITECH is not set | 881 | CONFIG_HID_LOGITECH=m |
944 | # CONFIG_HID_MICROSOFT is not set | 882 | # CONFIG_LOGITECH_FF is not set |
883 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
884 | CONFIG_HID_MICROSOFT=m | ||
945 | # CONFIG_HID_MONTEREY is not set | 885 | # CONFIG_HID_MONTEREY is not set |
946 | # CONFIG_HID_NTRIG is not set | 886 | # CONFIG_HID_NTRIG is not set |
947 | # CONFIG_HID_PANTHERLORD is not set | 887 | # CONFIG_HID_PANTHERLORD is not set |
948 | # CONFIG_HID_PETALYNX is not set | 888 | # CONFIG_HID_PETALYNX is not set |
949 | # CONFIG_HID_SAMSUNG is not set | 889 | # CONFIG_HID_SAMSUNG is not set |
950 | CONFIG_HID_SONY=m | 890 | CONFIG_HID_SONY=m |
951 | # CONFIG_HID_SUNPLUS is not set | 891 | CONFIG_HID_SUNPLUS=m |
952 | # CONFIG_GREENASIA_FF is not set | 892 | # CONFIG_HID_GREENASIA is not set |
893 | CONFIG_HID_SMARTJOYPLUS=m | ||
894 | # CONFIG_SMARTJOYPLUS_FF is not set | ||
953 | # CONFIG_HID_TOPSEED is not set | 895 | # CONFIG_HID_TOPSEED is not set |
954 | # CONFIG_THRUSTMASTER_FF is not set | 896 | # CONFIG_HID_THRUSTMASTER is not set |
955 | # CONFIG_ZEROPLUS_FF is not set | 897 | # CONFIG_HID_WACOM is not set |
898 | # CONFIG_HID_ZEROPLUS is not set | ||
956 | CONFIG_USB_SUPPORT=y | 899 | CONFIG_USB_SUPPORT=y |
957 | CONFIG_USB_ARCH_HAS_HCD=y | 900 | CONFIG_USB_ARCH_HAS_HCD=y |
958 | CONFIG_USB_ARCH_HAS_OHCI=y | 901 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -988,6 +931,8 @@ CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | |||
988 | # CONFIG_USB_ISP116X_HCD is not set | 931 | # CONFIG_USB_ISP116X_HCD is not set |
989 | # CONFIG_USB_ISP1760_HCD is not set | 932 | # CONFIG_USB_ISP1760_HCD is not set |
990 | CONFIG_USB_OHCI_HCD=m | 933 | CONFIG_USB_OHCI_HCD=m |
934 | # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set | ||
935 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | ||
991 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 936 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
992 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 937 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
993 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | 938 | CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y |
@@ -1115,6 +1060,10 @@ CONFIG_RTC_DRV_PS3=m | |||
1115 | # CONFIG_DMADEVICES is not set | 1060 | # CONFIG_DMADEVICES is not set |
1116 | # CONFIG_AUXDISPLAY is not set | 1061 | # CONFIG_AUXDISPLAY is not set |
1117 | # CONFIG_UIO is not set | 1062 | # CONFIG_UIO is not set |
1063 | |||
1064 | # | ||
1065 | # TI VLYNQ | ||
1066 | # | ||
1118 | # CONFIG_STAGING is not set | 1067 | # CONFIG_STAGING is not set |
1119 | 1068 | ||
1120 | # | 1069 | # |
@@ -1141,11 +1090,12 @@ CONFIG_FS_MBCACHE=y | |||
1141 | # CONFIG_REISERFS_FS is not set | 1090 | # CONFIG_REISERFS_FS is not set |
1142 | # CONFIG_JFS_FS is not set | 1091 | # CONFIG_JFS_FS is not set |
1143 | # CONFIG_FS_POSIX_ACL is not set | 1092 | # CONFIG_FS_POSIX_ACL is not set |
1144 | CONFIG_FILE_LOCKING=y | ||
1145 | # CONFIG_XFS_FS is not set | 1093 | # CONFIG_XFS_FS is not set |
1146 | # CONFIG_GFS2_FS is not set | 1094 | # CONFIG_GFS2_FS is not set |
1147 | # CONFIG_OCFS2_FS is not set | 1095 | # CONFIG_OCFS2_FS is not set |
1148 | # CONFIG_BTRFS_FS is not set | 1096 | # CONFIG_BTRFS_FS is not set |
1097 | CONFIG_FILE_LOCKING=y | ||
1098 | CONFIG_FSNOTIFY=y | ||
1149 | CONFIG_DNOTIFY=y | 1099 | CONFIG_DNOTIFY=y |
1150 | CONFIG_INOTIFY=y | 1100 | CONFIG_INOTIFY=y |
1151 | CONFIG_INOTIFY_USER=y | 1101 | CONFIG_INOTIFY_USER=y |
@@ -1205,7 +1155,6 @@ CONFIG_MISC_FILESYSTEMS=y | |||
1205 | # CONFIG_BEFS_FS is not set | 1155 | # CONFIG_BEFS_FS is not set |
1206 | # CONFIG_BFS_FS is not set | 1156 | # CONFIG_BFS_FS is not set |
1207 | # CONFIG_EFS_FS is not set | 1157 | # CONFIG_EFS_FS is not set |
1208 | # CONFIG_JFFS2_FS is not set | ||
1209 | # CONFIG_CRAMFS is not set | 1158 | # CONFIG_CRAMFS is not set |
1210 | # CONFIG_SQUASHFS is not set | 1159 | # CONFIG_SQUASHFS is not set |
1211 | # CONFIG_VXFS_FS is not set | 1160 | # CONFIG_VXFS_FS is not set |
@@ -1222,6 +1171,7 @@ CONFIG_NFS_FS=y | |||
1222 | CONFIG_NFS_V3=y | 1171 | CONFIG_NFS_V3=y |
1223 | # CONFIG_NFS_V3_ACL is not set | 1172 | # CONFIG_NFS_V3_ACL is not set |
1224 | CONFIG_NFS_V4=y | 1173 | CONFIG_NFS_V4=y |
1174 | # CONFIG_NFS_V4_1 is not set | ||
1225 | CONFIG_ROOT_NFS=y | 1175 | CONFIG_ROOT_NFS=y |
1226 | # CONFIG_NFSD is not set | 1176 | # CONFIG_NFSD is not set |
1227 | CONFIG_LOCKD=y | 1177 | CONFIG_LOCKD=y |
@@ -1359,7 +1309,6 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
1359 | CONFIG_DEBUG_LIST=y | 1309 | CONFIG_DEBUG_LIST=y |
1360 | # CONFIG_DEBUG_SG is not set | 1310 | # CONFIG_DEBUG_SG is not set |
1361 | # CONFIG_DEBUG_NOTIFIERS is not set | 1311 | # CONFIG_DEBUG_NOTIFIERS is not set |
1362 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1363 | # CONFIG_RCU_TORTURE_TEST is not set | 1312 | # CONFIG_RCU_TORTURE_TEST is not set |
1364 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1313 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1365 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1314 | # CONFIG_BACKTRACE_SELF_TEST is not set |
@@ -1374,31 +1323,21 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1374 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1323 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1375 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1324 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1376 | CONFIG_RING_BUFFER=y | 1325 | CONFIG_RING_BUFFER=y |
1326 | CONFIG_EVENT_TRACING=y | ||
1327 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
1377 | CONFIG_TRACING=y | 1328 | CONFIG_TRACING=y |
1378 | CONFIG_TRACING_SUPPORT=y | 1329 | CONFIG_TRACING_SUPPORT=y |
1379 | 1330 | # CONFIG_FTRACE is not set | |
1380 | # | ||
1381 | # Tracers | ||
1382 | # | ||
1383 | # CONFIG_FUNCTION_TRACER is not set | ||
1384 | # CONFIG_IRQSOFF_TRACER is not set | ||
1385 | # CONFIG_SCHED_TRACER is not set | ||
1386 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1387 | # CONFIG_EVENT_TRACER is not set | ||
1388 | # CONFIG_BOOT_TRACER is not set | ||
1389 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1390 | # CONFIG_STACK_TRACER is not set | ||
1391 | # CONFIG_KMEMTRACE is not set | ||
1392 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1393 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1394 | # CONFIG_FTRACE_STARTUP_TEST is not set | ||
1395 | # CONFIG_DYNAMIC_DEBUG is not set | 1331 | # CONFIG_DYNAMIC_DEBUG is not set |
1396 | # CONFIG_SAMPLES is not set | 1332 | # CONFIG_SAMPLES is not set |
1397 | CONFIG_HAVE_ARCH_KGDB=y | 1333 | CONFIG_HAVE_ARCH_KGDB=y |
1398 | # CONFIG_KGDB is not set | 1334 | # CONFIG_KGDB is not set |
1335 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1336 | CONFIG_PPC_WERROR=y | ||
1399 | CONFIG_PRINT_STACK_DEPTH=64 | 1337 | CONFIG_PRINT_STACK_DEPTH=64 |
1400 | CONFIG_DEBUG_STACKOVERFLOW=y | 1338 | CONFIG_DEBUG_STACKOVERFLOW=y |
1401 | # CONFIG_DEBUG_STACK_USAGE is not set | 1339 | # CONFIG_DEBUG_STACK_USAGE is not set |
1340 | # CONFIG_PPC_EMULATED_STATS is not set | ||
1402 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1341 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1403 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1342 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1404 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1343 | # CONFIG_MSI_BITMAP_SELFTEST is not set |
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index bd4a8d435c50..28384dc01003 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_defconfig | |||
@@ -1,25 +1,27 @@ | |||
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-rc3 | 3 | # Linux kernel version: 2.6.31-rc4 |
4 | # Wed May 13 17:22:04 2009 | 4 | # Wed Jul 29 23:32:01 2009 |
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=y | 11 | CONFIG_PPC_BOOK3S_32=y |
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 |
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_BOOK3S=y | 17 | CONFIG_PPC_BOOK3S=y |
18 | CONFIG_6xx=y | ||
18 | CONFIG_PPC_FPU=y | 19 | CONFIG_PPC_FPU=y |
19 | # CONFIG_ALTIVEC is not set | 20 | # CONFIG_ALTIVEC is not set |
20 | CONFIG_PPC_STD_MMU=y | 21 | CONFIG_PPC_STD_MMU=y |
21 | CONFIG_PPC_STD_MMU_32=y | 22 | CONFIG_PPC_STD_MMU_32=y |
22 | # CONFIG_PPC_MM_SLICES is not set | 23 | # CONFIG_PPC_MM_SLICES is not set |
24 | CONFIG_PPC_HAVE_PMU_SUPPORT=y | ||
23 | # CONFIG_SMP is not set | 25 | # CONFIG_SMP is not set |
24 | CONFIG_PPC32=y | 26 | CONFIG_PPC32=y |
25 | CONFIG_WORD_SIZE=32 | 27 | CONFIG_WORD_SIZE=32 |
@@ -30,15 +32,16 @@ CONFIG_GENERIC_TIME=y | |||
30 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
31 | CONFIG_GENERIC_CLOCKEVENTS=y | 33 | CONFIG_GENERIC_CLOCKEVENTS=y |
32 | CONFIG_GENERIC_HARDIRQS=y | 34 | CONFIG_GENERIC_HARDIRQS=y |
35 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 36 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 37 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 38 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | 39 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
40 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 41 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 42 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 43 | CONFIG_ARCH_HAS_ILOG2_U32=y |
40 | CONFIG_GENERIC_HWEIGHT=y | 44 | CONFIG_GENERIC_HWEIGHT=y |
41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 45 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 46 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
44 | CONFIG_PPC=y | 47 | CONFIG_PPC=y |
@@ -52,11 +55,13 @@ CONFIG_PPC_UDBG_16550=y | |||
52 | # CONFIG_GENERIC_TBSYNC is not set | 55 | # CONFIG_GENERIC_TBSYNC is not set |
53 | CONFIG_AUDIT_ARCH=y | 56 | CONFIG_AUDIT_ARCH=y |
54 | CONFIG_GENERIC_BUG=y | 57 | CONFIG_GENERIC_BUG=y |
58 | CONFIG_DTC=y | ||
55 | # CONFIG_DEFAULT_UIMAGE is not set | 59 | # CONFIG_DEFAULT_UIMAGE is not set |
56 | # CONFIG_PPC_DCR_NATIVE is not set | 60 | # CONFIG_PPC_DCR_NATIVE is not set |
57 | # CONFIG_PPC_DCR_MMIO is not set | 61 | # CONFIG_PPC_DCR_MMIO is not set |
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 |
@@ -101,7 +106,6 @@ CONFIG_ANON_INODES=y | |||
101 | CONFIG_EMBEDDED=y | 106 | CONFIG_EMBEDDED=y |
102 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
103 | # CONFIG_KALLSYMS is not set | 108 | # CONFIG_KALLSYMS is not set |
104 | # CONFIG_STRIP_ASM_SYMS is not set | ||
105 | CONFIG_HOTPLUG=y | 109 | CONFIG_HOTPLUG=y |
106 | CONFIG_PRINTK=y | 110 | CONFIG_PRINTK=y |
107 | CONFIG_BUG=y | 111 | CONFIG_BUG=y |
@@ -114,9 +118,16 @@ CONFIG_TIMERFD=y | |||
114 | CONFIG_EVENTFD=y | 118 | CONFIG_EVENTFD=y |
115 | CONFIG_SHMEM=y | 119 | CONFIG_SHMEM=y |
116 | CONFIG_AIO=y | 120 | CONFIG_AIO=y |
121 | CONFIG_HAVE_PERF_COUNTERS=y | ||
122 | |||
123 | # | ||
124 | # Performance Counters | ||
125 | # | ||
126 | # CONFIG_PERF_COUNTERS is not set | ||
117 | CONFIG_VM_EVENT_COUNTERS=y | 127 | CONFIG_VM_EVENT_COUNTERS=y |
118 | CONFIG_PCI_QUIRKS=y | 128 | CONFIG_PCI_QUIRKS=y |
119 | CONFIG_SLUB_DEBUG=y | 129 | CONFIG_SLUB_DEBUG=y |
130 | # CONFIG_STRIP_ASM_SYMS is not set | ||
120 | CONFIG_COMPAT_BRK=y | 131 | CONFIG_COMPAT_BRK=y |
121 | # CONFIG_SLAB is not set | 132 | # CONFIG_SLAB is not set |
122 | CONFIG_SLUB=y | 133 | CONFIG_SLUB=y |
@@ -129,6 +140,10 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
129 | CONFIG_HAVE_KPROBES=y | 140 | CONFIG_HAVE_KPROBES=y |
130 | CONFIG_HAVE_KRETPROBES=y | 141 | CONFIG_HAVE_KRETPROBES=y |
131 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 142 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
143 | |||
144 | # | ||
145 | # GCOV-based kernel profiling | ||
146 | # | ||
132 | # CONFIG_SLOW_WORK is not set | 147 | # CONFIG_SLOW_WORK is not set |
133 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 148 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
134 | CONFIG_SLABINFO=y | 149 | CONFIG_SLABINFO=y |
@@ -141,7 +156,7 @@ CONFIG_MODULE_UNLOAD=y | |||
141 | # CONFIG_MODVERSIONS is not set | 156 | # CONFIG_MODVERSIONS is not set |
142 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 157 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
143 | CONFIG_BLOCK=y | 158 | CONFIG_BLOCK=y |
144 | CONFIG_LBD=y | 159 | CONFIG_LBDAF=y |
145 | # CONFIG_BLK_DEV_BSG is not set | 160 | # CONFIG_BLK_DEV_BSG is not set |
146 | # CONFIG_BLK_DEV_INTEGRITY is not set | 161 | # CONFIG_BLK_DEV_INTEGRITY is not set |
147 | 162 | ||
@@ -222,6 +237,7 @@ CONFIG_BINFMT_ELF=y | |||
222 | # CONFIG_HAVE_AOUT is not set | 237 | # CONFIG_HAVE_AOUT is not set |
223 | CONFIG_BINFMT_MISC=y | 238 | CONFIG_BINFMT_MISC=y |
224 | # CONFIG_IOMMU_HELPER is not set | 239 | # CONFIG_IOMMU_HELPER is not set |
240 | # CONFIG_SWIOTLB is not set | ||
225 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 241 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
226 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 242 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
227 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 243 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -242,9 +258,9 @@ CONFIG_MIGRATION=y | |||
242 | CONFIG_ZONE_DMA_FLAG=1 | 258 | CONFIG_ZONE_DMA_FLAG=1 |
243 | CONFIG_BOUNCE=y | 259 | CONFIG_BOUNCE=y |
244 | CONFIG_VIRT_TO_BUS=y | 260 | CONFIG_VIRT_TO_BUS=y |
245 | CONFIG_UNEVICTABLE_LRU=y | ||
246 | CONFIG_HAVE_MLOCK=y | 261 | CONFIG_HAVE_MLOCK=y |
247 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 262 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
263 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
248 | CONFIG_PPC_4K_PAGES=y | 264 | CONFIG_PPC_4K_PAGES=y |
249 | # CONFIG_PPC_16K_PAGES is not set | 265 | # CONFIG_PPC_16K_PAGES is not set |
250 | # CONFIG_PPC_64K_PAGES is not set | 266 | # CONFIG_PPC_64K_PAGES is not set |
@@ -347,6 +363,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
347 | # CONFIG_ECONET is not set | 363 | # CONFIG_ECONET is not set |
348 | # CONFIG_WAN_ROUTER is not set | 364 | # CONFIG_WAN_ROUTER is not set |
349 | # CONFIG_PHONET is not set | 365 | # CONFIG_PHONET is not set |
366 | # CONFIG_IEEE802154 is not set | ||
350 | # CONFIG_NET_SCHED is not set | 367 | # CONFIG_NET_SCHED is not set |
351 | # CONFIG_DCB is not set | 368 | # CONFIG_DCB is not set |
352 | 369 | ||
@@ -364,7 +381,11 @@ CONFIG_WIRELESS=y | |||
364 | CONFIG_WIRELESS_OLD_REGULATORY=y | 381 | CONFIG_WIRELESS_OLD_REGULATORY=y |
365 | # CONFIG_WIRELESS_EXT is not set | 382 | # CONFIG_WIRELESS_EXT is not set |
366 | # CONFIG_LIB80211 is not set | 383 | # CONFIG_LIB80211 is not set |
367 | # CONFIG_MAC80211 is not set | 384 | |
385 | # | ||
386 | # CFG80211 needs to be enabled for MAC80211 | ||
387 | # | ||
388 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
368 | # CONFIG_WIMAX is not set | 389 | # CONFIG_WIMAX is not set |
369 | # CONFIG_RFKILL is not set | 390 | # CONFIG_RFKILL is not set |
370 | # CONFIG_NET_9P is not set | 391 | # CONFIG_NET_9P is not set |
@@ -501,7 +522,9 @@ CONFIG_MISC_DEVICES=y | |||
501 | # | 522 | # |
502 | # CONFIG_EEPROM_AT24 is not set | 523 | # CONFIG_EEPROM_AT24 is not set |
503 | # CONFIG_EEPROM_LEGACY is not set | 524 | # CONFIG_EEPROM_LEGACY is not set |
525 | # CONFIG_EEPROM_MAX6875 is not set | ||
504 | # CONFIG_EEPROM_93CX6 is not set | 526 | # CONFIG_EEPROM_93CX6 is not set |
527 | # CONFIG_CB710_CORE is not set | ||
505 | CONFIG_HAVE_IDE=y | 528 | CONFIG_HAVE_IDE=y |
506 | CONFIG_IDE=y | 529 | CONFIG_IDE=y |
507 | 530 | ||
@@ -579,10 +602,6 @@ CONFIG_BLK_DEV_SR=y | |||
579 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 602 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
580 | # CONFIG_CHR_DEV_SG is not set | 603 | # CONFIG_CHR_DEV_SG is not set |
581 | # CONFIG_CHR_DEV_SCH is not set | 604 | # CONFIG_CHR_DEV_SCH is not set |
582 | |||
583 | # | ||
584 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
585 | # | ||
586 | # CONFIG_SCSI_MULTI_LUN is not set | 605 | # CONFIG_SCSI_MULTI_LUN is not set |
587 | # CONFIG_SCSI_CONSTANTS is not set | 606 | # CONFIG_SCSI_CONSTANTS is not set |
588 | # CONFIG_SCSI_LOGGING is not set | 607 | # CONFIG_SCSI_LOGGING is not set |
@@ -599,6 +618,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
599 | # CONFIG_SCSI_SRP_ATTRS is not set | 618 | # CONFIG_SCSI_SRP_ATTRS is not set |
600 | CONFIG_SCSI_LOWLEVEL=y | 619 | CONFIG_SCSI_LOWLEVEL=y |
601 | # CONFIG_ISCSI_TCP is not set | 620 | # CONFIG_ISCSI_TCP is not set |
621 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
602 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 622 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
603 | # CONFIG_SCSI_3W_9XXX is not set | 623 | # CONFIG_SCSI_3W_9XXX is not set |
604 | # CONFIG_SCSI_ACARD is not set | 624 | # CONFIG_SCSI_ACARD is not set |
@@ -607,6 +627,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
607 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 627 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
608 | # CONFIG_SCSI_AIC79XX is not set | 628 | # CONFIG_SCSI_AIC79XX is not set |
609 | # CONFIG_SCSI_AIC94XX is not set | 629 | # CONFIG_SCSI_AIC94XX is not set |
630 | # CONFIG_SCSI_MVSAS is not set | ||
610 | # CONFIG_SCSI_DPT_I2O is not set | 631 | # CONFIG_SCSI_DPT_I2O is not set |
611 | # CONFIG_SCSI_ADVANSYS is not set | 632 | # CONFIG_SCSI_ADVANSYS is not set |
612 | # CONFIG_SCSI_ARCMSR is not set | 633 | # CONFIG_SCSI_ARCMSR is not set |
@@ -626,7 +647,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
626 | # CONFIG_SCSI_IPS is not set | 647 | # CONFIG_SCSI_IPS is not set |
627 | # CONFIG_SCSI_INITIO is not set | 648 | # CONFIG_SCSI_INITIO is not set |
628 | # CONFIG_SCSI_INIA100 is not set | 649 | # CONFIG_SCSI_INIA100 is not set |
629 | # CONFIG_SCSI_MVSAS is not set | ||
630 | # CONFIG_SCSI_STEX is not set | 650 | # CONFIG_SCSI_STEX is not set |
631 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 651 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
632 | # CONFIG_SCSI_QLOGIC_1280 is not set | 652 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -660,14 +680,17 @@ CONFIG_MD_RAID6_PQ=y | |||
660 | # | 680 | # |
661 | 681 | ||
662 | # | 682 | # |
663 | # Enable only one of the two stacks, unless you know what you are doing | 683 | # You can enable one or both FireWire driver stacks. |
684 | # | ||
685 | |||
686 | # | ||
687 | # See the help texts for more information. | ||
664 | # | 688 | # |
665 | # CONFIG_FIREWIRE is not set | 689 | # CONFIG_FIREWIRE is not set |
666 | # CONFIG_IEEE1394 is not set | 690 | # CONFIG_IEEE1394 is not set |
667 | # CONFIG_I2O is not set | 691 | # CONFIG_I2O is not set |
668 | # CONFIG_MACINTOSH_DRIVERS is not set | 692 | # CONFIG_MACINTOSH_DRIVERS is not set |
669 | CONFIG_NETDEVICES=y | 693 | CONFIG_NETDEVICES=y |
670 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
671 | CONFIG_DUMMY=m | 694 | CONFIG_DUMMY=m |
672 | # CONFIG_BONDING is not set | 695 | # CONFIG_BONDING is not set |
673 | # CONFIG_MACVLAN is not set | 696 | # CONFIG_MACVLAN is not set |
@@ -695,8 +718,10 @@ CONFIG_R8169=y | |||
695 | # CONFIG_VIA_VELOCITY is not set | 718 | # CONFIG_VIA_VELOCITY is not set |
696 | # CONFIG_TIGON3 is not set | 719 | # CONFIG_TIGON3 is not set |
697 | # CONFIG_BNX2 is not set | 720 | # CONFIG_BNX2 is not set |
721 | # CONFIG_CNIC is not set | ||
698 | # CONFIG_FSL_PQ_MDIO is not set | 722 | # CONFIG_FSL_PQ_MDIO is not set |
699 | # CONFIG_GIANFAR is not set | 723 | # CONFIG_GIANFAR is not set |
724 | # CONFIG_MV643XX_ETH is not set | ||
700 | # CONFIG_QLA3XXX is not set | 725 | # CONFIG_QLA3XXX is not set |
701 | # CONFIG_ATL1 is not set | 726 | # CONFIG_ATL1 is not set |
702 | # CONFIG_ATL1E is not set | 727 | # CONFIG_ATL1E is not set |
@@ -845,13 +870,17 @@ CONFIG_I2C_MPC=y | |||
845 | # CONFIG_SENSORS_PCF8574 is not set | 870 | # CONFIG_SENSORS_PCF8574 is not set |
846 | # CONFIG_PCF8575 is not set | 871 | # CONFIG_PCF8575 is not set |
847 | # CONFIG_SENSORS_PCA9539 is not set | 872 | # CONFIG_SENSORS_PCA9539 is not set |
848 | # CONFIG_SENSORS_MAX6875 is not set | ||
849 | # CONFIG_SENSORS_TSL2550 is not set | 873 | # CONFIG_SENSORS_TSL2550 is not set |
850 | # CONFIG_I2C_DEBUG_CORE is not set | 874 | # CONFIG_I2C_DEBUG_CORE is not set |
851 | # CONFIG_I2C_DEBUG_ALGO is not set | 875 | # CONFIG_I2C_DEBUG_ALGO is not set |
852 | # CONFIG_I2C_DEBUG_BUS is not set | 876 | # CONFIG_I2C_DEBUG_BUS is not set |
853 | # CONFIG_I2C_DEBUG_CHIP is not set | 877 | # CONFIG_I2C_DEBUG_CHIP is not set |
854 | # CONFIG_SPI is not set | 878 | # CONFIG_SPI is not set |
879 | |||
880 | # | ||
881 | # PPS support | ||
882 | # | ||
883 | # CONFIG_PPS is not set | ||
855 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 884 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
856 | # CONFIG_GPIOLIB is not set | 885 | # CONFIG_GPIOLIB is not set |
857 | # CONFIG_W1 is not set | 886 | # CONFIG_W1 is not set |
@@ -879,23 +908,9 @@ CONFIG_SSB_POSSIBLE=y | |||
879 | # CONFIG_MFD_WM8400 is not set | 908 | # CONFIG_MFD_WM8400 is not set |
880 | # CONFIG_MFD_WM8350_I2C is not set | 909 | # CONFIG_MFD_WM8350_I2C is not set |
881 | # CONFIG_MFD_PCF50633 is not set | 910 | # CONFIG_MFD_PCF50633 is not set |
911 | # CONFIG_AB3100_CORE is not set | ||
882 | # CONFIG_REGULATOR is not set | 912 | # CONFIG_REGULATOR is not set |
883 | 913 | # CONFIG_MEDIA_SUPPORT is not set | |
884 | # | ||
885 | # Multimedia devices | ||
886 | # | ||
887 | |||
888 | # | ||
889 | # Multimedia core support | ||
890 | # | ||
891 | # CONFIG_VIDEO_DEV is not set | ||
892 | # CONFIG_DVB_CORE is not set | ||
893 | # CONFIG_VIDEO_MEDIA is not set | ||
894 | |||
895 | # | ||
896 | # Multimedia drivers | ||
897 | # | ||
898 | # CONFIG_DAB is not set | ||
899 | 914 | ||
900 | # | 915 | # |
901 | # Graphics support | 916 | # Graphics support |
@@ -937,6 +952,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
937 | # USB Host Controller Drivers | 952 | # USB Host Controller Drivers |
938 | # | 953 | # |
939 | # CONFIG_USB_C67X00_HCD is not set | 954 | # CONFIG_USB_C67X00_HCD is not set |
955 | # CONFIG_USB_XHCI_HCD is not set | ||
940 | CONFIG_USB_EHCI_HCD=y | 956 | CONFIG_USB_EHCI_HCD=y |
941 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 957 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
942 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 958 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -946,6 +962,8 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
946 | # CONFIG_USB_ISP116X_HCD is not set | 962 | # CONFIG_USB_ISP116X_HCD is not set |
947 | # CONFIG_USB_ISP1760_HCD is not set | 963 | # CONFIG_USB_ISP1760_HCD is not set |
948 | CONFIG_USB_OHCI_HCD=y | 964 | CONFIG_USB_OHCI_HCD=y |
965 | # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set | ||
966 | # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set | ||
949 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 967 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
950 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 968 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
951 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 969 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -1064,6 +1082,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1064 | # CONFIG_RTC_DRV_S35390A is not set | 1082 | # CONFIG_RTC_DRV_S35390A is not set |
1065 | # CONFIG_RTC_DRV_FM3130 is not set | 1083 | # CONFIG_RTC_DRV_FM3130 is not set |
1066 | # CONFIG_RTC_DRV_RX8581 is not set | 1084 | # CONFIG_RTC_DRV_RX8581 is not set |
1085 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1067 | 1086 | ||
1068 | # | 1087 | # |
1069 | # SPI RTC drivers | 1088 | # SPI RTC drivers |
@@ -1091,6 +1110,10 @@ CONFIG_RTC_DRV_DS1307=y | |||
1091 | # CONFIG_DMADEVICES is not set | 1110 | # CONFIG_DMADEVICES is not set |
1092 | # CONFIG_AUXDISPLAY is not set | 1111 | # CONFIG_AUXDISPLAY is not set |
1093 | # CONFIG_UIO is not set | 1112 | # CONFIG_UIO is not set |
1113 | |||
1114 | # | ||
1115 | # TI VLYNQ | ||
1116 | # | ||
1094 | # CONFIG_STAGING is not set | 1117 | # CONFIG_STAGING is not set |
1095 | 1118 | ||
1096 | # | 1119 | # |
@@ -1110,7 +1133,6 @@ CONFIG_FS_MBCACHE=y | |||
1110 | # CONFIG_REISERFS_FS is not set | 1133 | # CONFIG_REISERFS_FS is not set |
1111 | # CONFIG_JFS_FS is not set | 1134 | # CONFIG_JFS_FS is not set |
1112 | # CONFIG_FS_POSIX_ACL is not set | 1135 | # CONFIG_FS_POSIX_ACL is not set |
1113 | CONFIG_FILE_LOCKING=y | ||
1114 | CONFIG_XFS_FS=m | 1136 | CONFIG_XFS_FS=m |
1115 | # CONFIG_XFS_QUOTA is not set | 1137 | # CONFIG_XFS_QUOTA is not set |
1116 | # CONFIG_XFS_POSIX_ACL is not set | 1138 | # CONFIG_XFS_POSIX_ACL is not set |
@@ -1119,6 +1141,8 @@ CONFIG_XFS_FS=m | |||
1119 | # CONFIG_GFS2_FS is not set | 1141 | # CONFIG_GFS2_FS is not set |
1120 | # CONFIG_OCFS2_FS is not set | 1142 | # CONFIG_OCFS2_FS is not set |
1121 | # CONFIG_BTRFS_FS is not set | 1143 | # CONFIG_BTRFS_FS is not set |
1144 | CONFIG_FILE_LOCKING=y | ||
1145 | CONFIG_FSNOTIFY=y | ||
1122 | CONFIG_DNOTIFY=y | 1146 | CONFIG_DNOTIFY=y |
1123 | CONFIG_INOTIFY=y | 1147 | CONFIG_INOTIFY=y |
1124 | CONFIG_INOTIFY_USER=y | 1148 | CONFIG_INOTIFY_USER=y |
@@ -1273,6 +1297,7 @@ CONFIG_HAS_IOPORT=y | |||
1273 | CONFIG_HAS_DMA=y | 1297 | CONFIG_HAS_DMA=y |
1274 | CONFIG_HAVE_LMB=y | 1298 | CONFIG_HAVE_LMB=y |
1275 | CONFIG_NLATTR=y | 1299 | CONFIG_NLATTR=y |
1300 | CONFIG_GENERIC_ATOMIC64=y | ||
1276 | 1301 | ||
1277 | # | 1302 | # |
1278 | # Kernel hacking | 1303 | # Kernel hacking |
@@ -1298,22 +1323,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | |||
1298 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1323 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1299 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 1324 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
1300 | CONFIG_TRACING_SUPPORT=y | 1325 | CONFIG_TRACING_SUPPORT=y |
1301 | 1326 | # CONFIG_FTRACE is not set | |
1302 | # | ||
1303 | # Tracers | ||
1304 | # | ||
1305 | # CONFIG_FUNCTION_TRACER is not set | ||
1306 | # CONFIG_SCHED_TRACER is not set | ||
1307 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1308 | # CONFIG_EVENT_TRACER is not set | ||
1309 | # CONFIG_BOOT_TRACER is not set | ||
1310 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1311 | # CONFIG_STACK_TRACER is not set | ||
1312 | # CONFIG_KMEMTRACE is not set | ||
1313 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1314 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1315 | # CONFIG_SAMPLES is not set | 1327 | # CONFIG_SAMPLES is not set |
1316 | CONFIG_HAVE_ARCH_KGDB=y | 1328 | CONFIG_HAVE_ARCH_KGDB=y |
1329 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1330 | CONFIG_PPC_WERROR=y | ||
1317 | CONFIG_PRINT_STACK_DEPTH=64 | 1331 | CONFIG_PRINT_STACK_DEPTH=64 |
1318 | # CONFIG_IRQSTACKS is not set | 1332 | # CONFIG_IRQSTACKS is not set |
1319 | # CONFIG_BOOTX_TEXT is not set | 1333 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h index dfdf13c9fefd..fddc3ed715fa 100644 --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h | |||
@@ -34,7 +34,7 @@ | |||
34 | #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 | 34 | #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 |
35 | 35 | ||
36 | /* We don't currently support large pages. */ | 36 | /* We don't currently support large pages. */ |
37 | #define KVM_PAGES_PER_HPAGE (1<<31) | 37 | #define KVM_PAGES_PER_HPAGE (1UL << 31) |
38 | 38 | ||
39 | struct kvm; | 39 | struct kvm; |
40 | struct kvm_run; | 40 | struct kvm_run; |
diff --git a/arch/powerpc/include/asm/pgalloc-32.h b/arch/powerpc/include/asm/pgalloc-32.h index 0815eb40acae..c9500d666a1d 100644 --- a/arch/powerpc/include/asm/pgalloc-32.h +++ b/arch/powerpc/include/asm/pgalloc-32.h | |||
@@ -16,7 +16,7 @@ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); | |||
16 | */ | 16 | */ |
17 | /* #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) */ | 17 | /* #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) */ |
18 | #define pmd_free(mm, x) do { } while (0) | 18 | #define pmd_free(mm, x) do { } while (0) |
19 | #define __pmd_free_tlb(tlb,x) do { } while (0) | 19 | #define __pmd_free_tlb(tlb,x,a) do { } while (0) |
20 | /* #define pgd_populate(mm, pmd, pte) BUG() */ | 20 | /* #define pgd_populate(mm, pmd, pte) BUG() */ |
21 | 21 | ||
22 | #ifndef CONFIG_BOOKE | 22 | #ifndef CONFIG_BOOKE |
diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h index afda2bdd860f..e6f069c4f713 100644 --- a/arch/powerpc/include/asm/pgalloc-64.h +++ b/arch/powerpc/include/asm/pgalloc-64.h | |||
@@ -118,11 +118,11 @@ static inline void pgtable_free(pgtable_free_t pgf) | |||
118 | kmem_cache_free(pgtable_cache[cachenum], p); | 118 | kmem_cache_free(pgtable_cache[cachenum], p); |
119 | } | 119 | } |
120 | 120 | ||
121 | #define __pmd_free_tlb(tlb, pmd) \ | 121 | #define __pmd_free_tlb(tlb, pmd,addr) \ |
122 | pgtable_free_tlb(tlb, pgtable_free_cache(pmd, \ | 122 | pgtable_free_tlb(tlb, pgtable_free_cache(pmd, \ |
123 | PMD_CACHE_NUM, PMD_TABLE_SIZE-1)) | 123 | PMD_CACHE_NUM, PMD_TABLE_SIZE-1)) |
124 | #ifndef CONFIG_PPC_64K_PAGES | 124 | #ifndef CONFIG_PPC_64K_PAGES |
125 | #define __pud_free_tlb(tlb, pud) \ | 125 | #define __pud_free_tlb(tlb, pud, addr) \ |
126 | pgtable_free_tlb(tlb, pgtable_free_cache(pud, \ | 126 | pgtable_free_tlb(tlb, pgtable_free_cache(pud, \ |
127 | PUD_CACHE_NUM, PUD_TABLE_SIZE-1)) | 127 | PUD_CACHE_NUM, PUD_TABLE_SIZE-1)) |
128 | #endif /* CONFIG_PPC_64K_PAGES */ | 128 | #endif /* CONFIG_PPC_64K_PAGES */ |
diff --git a/arch/powerpc/include/asm/pgalloc.h b/arch/powerpc/include/asm/pgalloc.h index 5d8480265a77..1730e5e298d6 100644 --- a/arch/powerpc/include/asm/pgalloc.h +++ b/arch/powerpc/include/asm/pgalloc.h | |||
@@ -38,14 +38,14 @@ static inline pgtable_free_t pgtable_free_cache(void *p, int cachenum, | |||
38 | extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf); | 38 | extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf); |
39 | 39 | ||
40 | #ifdef CONFIG_SMP | 40 | #ifdef CONFIG_SMP |
41 | #define __pte_free_tlb(tlb,ptepage) \ | 41 | #define __pte_free_tlb(tlb,ptepage,address) \ |
42 | do { \ | 42 | do { \ |
43 | pgtable_page_dtor(ptepage); \ | 43 | pgtable_page_dtor(ptepage); \ |
44 | pgtable_free_tlb(tlb, pgtable_free_cache(page_address(ptepage), \ | 44 | pgtable_free_tlb(tlb, pgtable_free_cache(page_address(ptepage), \ |
45 | PTE_NONCACHE_NUM, PTE_TABLE_SIZE-1)); \ | 45 | PTE_NONCACHE_NUM, PTE_TABLE_SIZE-1)); \ |
46 | } while (0) | 46 | } while (0) |
47 | #else | 47 | #else |
48 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte)) | 48 | #define __pte_free_tlb(tlb, pte, address) pte_free((tlb)->mm, (pte)) |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | 51 | ||
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 20a60d661ba8..ccf129d47d84 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
@@ -7,6 +7,7 @@ | |||
7 | 7 | ||
8 | #include <linux/device.h> | 8 | #include <linux/device.h> |
9 | #include <linux/dma-mapping.h> | 9 | #include <linux/dma-mapping.h> |
10 | #include <linux/lmb.h> | ||
10 | #include <asm/bug.h> | 11 | #include <asm/bug.h> |
11 | #include <asm/abs_addr.h> | 12 | #include <asm/abs_addr.h> |
12 | 13 | ||
@@ -90,11 +91,10 @@ static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg, | |||
90 | static int dma_direct_dma_supported(struct device *dev, u64 mask) | 91 | static int dma_direct_dma_supported(struct device *dev, u64 mask) |
91 | { | 92 | { |
92 | #ifdef CONFIG_PPC64 | 93 | #ifdef CONFIG_PPC64 |
93 | /* Could be improved to check for memory though it better be | 94 | /* Could be improved so platforms can set the limit in case |
94 | * done via some global so platforms can set the limit in case | ||
95 | * they have limited DMA windows | 95 | * they have limited DMA windows |
96 | */ | 96 | */ |
97 | return mask >= DMA_BIT_MASK(32); | 97 | return mask >= (lmb_end_of_DRAM() - 1); |
98 | #else | 98 | #else |
99 | return 1; | 99 | return 1; |
100 | #endif | 100 | #endif |
diff --git a/arch/powerpc/kernel/mpc7450-pmu.c b/arch/powerpc/kernel/mpc7450-pmu.c index c244133c67a6..cc466d039af6 100644 --- a/arch/powerpc/kernel/mpc7450-pmu.c +++ b/arch/powerpc/kernel/mpc7450-pmu.c | |||
@@ -407,7 +407,8 @@ struct power_pmu mpc7450_pmu = { | |||
407 | 407 | ||
408 | static int init_mpc7450_pmu(void) | 408 | static int init_mpc7450_pmu(void) |
409 | { | 409 | { |
410 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450")) | 410 | if (!cur_cpu_spec->oprofile_cpu_type || |
411 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450")) | ||
411 | return -ENODEV; | 412 | return -ENODEV; |
412 | 413 | ||
413 | return register_power_pmu(&mpc7450_pmu); | 414 | return register_power_pmu(&mpc7450_pmu); |
diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c index 809fdf94b95f..70e1f57f7dd8 100644 --- a/arch/powerpc/kernel/perf_counter.c +++ b/arch/powerpc/kernel/perf_counter.c | |||
@@ -518,6 +518,8 @@ void hw_perf_disable(void) | |||
518 | struct cpu_hw_counters *cpuhw; | 518 | struct cpu_hw_counters *cpuhw; |
519 | unsigned long flags; | 519 | unsigned long flags; |
520 | 520 | ||
521 | if (!ppmu) | ||
522 | return; | ||
521 | local_irq_save(flags); | 523 | local_irq_save(flags); |
522 | cpuhw = &__get_cpu_var(cpu_hw_counters); | 524 | cpuhw = &__get_cpu_var(cpu_hw_counters); |
523 | 525 | ||
@@ -572,6 +574,8 @@ void hw_perf_enable(void) | |||
572 | int n_lim; | 574 | int n_lim; |
573 | int idx; | 575 | int idx; |
574 | 576 | ||
577 | if (!ppmu) | ||
578 | return; | ||
575 | local_irq_save(flags); | 579 | local_irq_save(flags); |
576 | cpuhw = &__get_cpu_var(cpu_hw_counters); | 580 | cpuhw = &__get_cpu_var(cpu_hw_counters); |
577 | if (!cpuhw->disabled) { | 581 | if (!cpuhw->disabled) { |
@@ -737,6 +741,8 @@ int hw_perf_group_sched_in(struct perf_counter *group_leader, | |||
737 | long i, n, n0; | 741 | long i, n, n0; |
738 | struct perf_counter *sub; | 742 | struct perf_counter *sub; |
739 | 743 | ||
744 | if (!ppmu) | ||
745 | return 0; | ||
740 | cpuhw = &__get_cpu_var(cpu_hw_counters); | 746 | cpuhw = &__get_cpu_var(cpu_hw_counters); |
741 | n0 = cpuhw->n_counters; | 747 | n0 = cpuhw->n_counters; |
742 | n = collect_events(group_leader, ppmu->n_counter - n0, | 748 | n = collect_events(group_leader, ppmu->n_counter - n0, |
@@ -1281,6 +1287,8 @@ void hw_perf_counter_setup(int cpu) | |||
1281 | { | 1287 | { |
1282 | struct cpu_hw_counters *cpuhw = &per_cpu(cpu_hw_counters, cpu); | 1288 | struct cpu_hw_counters *cpuhw = &per_cpu(cpu_hw_counters, cpu); |
1283 | 1289 | ||
1290 | if (!ppmu) | ||
1291 | return; | ||
1284 | memset(cpuhw, 0, sizeof(*cpuhw)); | 1292 | memset(cpuhw, 0, sizeof(*cpuhw)); |
1285 | cpuhw->mmcr[0] = MMCR0_FC; | 1293 | cpuhw->mmcr[0] = MMCR0_FC; |
1286 | } | 1294 | } |
diff --git a/arch/powerpc/kernel/power4-pmu.c b/arch/powerpc/kernel/power4-pmu.c index db90b0c5c27b..3c90a3d9173e 100644 --- a/arch/powerpc/kernel/power4-pmu.c +++ b/arch/powerpc/kernel/power4-pmu.c | |||
@@ -606,7 +606,8 @@ static struct power_pmu power4_pmu = { | |||
606 | 606 | ||
607 | static int init_power4_pmu(void) | 607 | static int init_power4_pmu(void) |
608 | { | 608 | { |
609 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4")) | 609 | if (!cur_cpu_spec->oprofile_cpu_type || |
610 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4")) | ||
610 | return -ENODEV; | 611 | return -ENODEV; |
611 | 612 | ||
612 | return register_power_pmu(&power4_pmu); | 613 | return register_power_pmu(&power4_pmu); |
diff --git a/arch/powerpc/kernel/power5+-pmu.c b/arch/powerpc/kernel/power5+-pmu.c index f4adca8e98a4..31918af3e355 100644 --- a/arch/powerpc/kernel/power5+-pmu.c +++ b/arch/powerpc/kernel/power5+-pmu.c | |||
@@ -678,8 +678,9 @@ static struct power_pmu power5p_pmu = { | |||
678 | 678 | ||
679 | static int init_power5p_pmu(void) | 679 | static int init_power5p_pmu(void) |
680 | { | 680 | { |
681 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+") | 681 | if (!cur_cpu_spec->oprofile_cpu_type || |
682 | && strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5++")) | 682 | (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+") |
683 | && strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5++"))) | ||
683 | return -ENODEV; | 684 | return -ENODEV; |
684 | 685 | ||
685 | return register_power_pmu(&power5p_pmu); | 686 | return register_power_pmu(&power5p_pmu); |
diff --git a/arch/powerpc/kernel/power5-pmu.c b/arch/powerpc/kernel/power5-pmu.c index 29b2c6c0e83a..867f6f663963 100644 --- a/arch/powerpc/kernel/power5-pmu.c +++ b/arch/powerpc/kernel/power5-pmu.c | |||
@@ -618,7 +618,8 @@ static struct power_pmu power5_pmu = { | |||
618 | 618 | ||
619 | static int init_power5_pmu(void) | 619 | static int init_power5_pmu(void) |
620 | { | 620 | { |
621 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5")) | 621 | if (!cur_cpu_spec->oprofile_cpu_type || |
622 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5")) | ||
622 | return -ENODEV; | 623 | return -ENODEV; |
623 | 624 | ||
624 | return register_power_pmu(&power5_pmu); | 625 | return register_power_pmu(&power5_pmu); |
diff --git a/arch/powerpc/kernel/power6-pmu.c b/arch/powerpc/kernel/power6-pmu.c index 09ae5bf5bda7..fa21890531da 100644 --- a/arch/powerpc/kernel/power6-pmu.c +++ b/arch/powerpc/kernel/power6-pmu.c | |||
@@ -537,7 +537,8 @@ static struct power_pmu power6_pmu = { | |||
537 | 537 | ||
538 | static int init_power6_pmu(void) | 538 | static int init_power6_pmu(void) |
539 | { | 539 | { |
540 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6")) | 540 | if (!cur_cpu_spec->oprofile_cpu_type || |
541 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6")) | ||
541 | return -ENODEV; | 542 | return -ENODEV; |
542 | 543 | ||
543 | return register_power_pmu(&power6_pmu); | 544 | return register_power_pmu(&power6_pmu); |
diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c index 5a9f5cbd40a4..388cf57ad827 100644 --- a/arch/powerpc/kernel/power7-pmu.c +++ b/arch/powerpc/kernel/power7-pmu.c | |||
@@ -366,7 +366,8 @@ static struct power_pmu power7_pmu = { | |||
366 | 366 | ||
367 | static int init_power7_pmu(void) | 367 | static int init_power7_pmu(void) |
368 | { | 368 | { |
369 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7")) | 369 | if (!cur_cpu_spec->oprofile_cpu_type || |
370 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7")) | ||
370 | return -ENODEV; | 371 | return -ENODEV; |
371 | 372 | ||
372 | return register_power_pmu(&power7_pmu); | 373 | return register_power_pmu(&power7_pmu); |
diff --git a/arch/powerpc/kernel/ppc970-pmu.c b/arch/powerpc/kernel/ppc970-pmu.c index 833097ac45dc..75dccb71a043 100644 --- a/arch/powerpc/kernel/ppc970-pmu.c +++ b/arch/powerpc/kernel/ppc970-pmu.c | |||
@@ -488,8 +488,9 @@ static struct power_pmu ppc970_pmu = { | |||
488 | 488 | ||
489 | static int init_ppc970_pmu(void) | 489 | static int init_ppc970_pmu(void) |
490 | { | 490 | { |
491 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970") | 491 | if (!cur_cpu_spec->oprofile_cpu_type || |
492 | && strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970MP")) | 492 | (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970") |
493 | && strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970MP"))) | ||
493 | return -ENODEV; | 494 | return -ENODEV; |
494 | 495 | ||
495 | return register_power_pmu(&ppc970_pmu); | 496 | return register_power_pmu(&ppc970_pmu); |
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 9920d6a7cf29..c46ef2ffa3d9 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
@@ -305,7 +305,7 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud, | |||
305 | 305 | ||
306 | pmd = pmd_offset(pud, start); | 306 | pmd = pmd_offset(pud, start); |
307 | pud_clear(pud); | 307 | pud_clear(pud); |
308 | pmd_free_tlb(tlb, pmd); | 308 | pmd_free_tlb(tlb, pmd, start); |
309 | } | 309 | } |
310 | 310 | ||
311 | static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, | 311 | static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, |
@@ -348,7 +348,7 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, | |||
348 | 348 | ||
349 | pud = pud_offset(pgd, start); | 349 | pud = pud_offset(pgd, start); |
350 | pgd_clear(pgd); | 350 | pgd_clear(pgd); |
351 | pud_free_tlb(tlb, pud); | 351 | pud_free_tlb(tlb, pud, start); |
352 | } | 352 | } |
353 | 353 | ||
354 | /* | 354 | /* |
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c index 92a197117d5b..b1a727def15b 100644 --- a/arch/powerpc/mm/mmu_context_nohash.c +++ b/arch/powerpc/mm/mmu_context_nohash.c | |||
@@ -217,6 +217,7 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next) | |||
217 | id = steal_context_smp(id); | 217 | id = steal_context_smp(id); |
218 | if (id == MMU_NO_CONTEXT) | 218 | if (id == MMU_NO_CONTEXT) |
219 | goto again; | 219 | goto again; |
220 | goto stolen; | ||
220 | } | 221 | } |
221 | #endif /* CONFIG_SMP */ | 222 | #endif /* CONFIG_SMP */ |
222 | id = steal_context_up(id); | 223 | id = steal_context_up(id); |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 60ed9c067b1d..bfb32834ab0c 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c | |||
@@ -233,6 +233,19 @@ static void __init mpc85xx_mds_setup_arch(void) | |||
233 | /* Turn UCC1 & UCC2 on */ | 233 | /* Turn UCC1 & UCC2 on */ |
234 | setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN); | 234 | setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN); |
235 | setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN); | 235 | setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN); |
236 | } else if (machine_is(mpc8569_mds)) { | ||
237 | #define BCSR7_UCC12_GETHnRST (0x1 << 2) | ||
238 | #define BCSR8_UEM_MARVELL_RST (0x1 << 1) | ||
239 | /* | ||
240 | * U-Boot mangles interrupt polarity for Marvell PHYs, | ||
241 | * so reset built-in and UEM Marvell PHYs, this puts | ||
242 | * the PHYs into their normal state. | ||
243 | */ | ||
244 | clrbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST); | ||
245 | setbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST); | ||
246 | |||
247 | setbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST); | ||
248 | clrbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST); | ||
236 | } | 249 | } |
237 | iounmap(bcsr_regs); | 250 | iounmap(bcsr_regs); |
238 | } | 251 | } |
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c index b178a1e66c91..40b5cb433005 100644 --- a/arch/powerpc/platforms/ps3/time.c +++ b/arch/powerpc/platforms/ps3/time.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
23 | 23 | ||
24 | #include <asm/firmware.h> | ||
24 | #include <asm/rtc.h> | 25 | #include <asm/rtc.h> |
25 | #include <asm/lv1call.h> | 26 | #include <asm/lv1call.h> |
26 | #include <asm/ps3.h> | 27 | #include <asm/ps3.h> |
@@ -84,6 +85,9 @@ static int __init ps3_rtc_init(void) | |||
84 | { | 85 | { |
85 | struct platform_device *pdev; | 86 | struct platform_device *pdev; |
86 | 87 | ||
88 | if (!firmware_has_feature(FW_FEATURE_PS3_LV1)) | ||
89 | return -ENODEV; | ||
90 | |||
87 | pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0); | 91 | pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0); |
88 | if (IS_ERR(pdev)) | 92 | if (IS_ERR(pdev)) |
89 | return PTR_ERR(pdev); | 93 | return PTR_ERR(pdev); |
diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h index 3d8a96d39d9d..81150b053689 100644 --- a/arch/s390/include/asm/tlb.h +++ b/arch/s390/include/asm/tlb.h | |||
@@ -96,7 +96,8 @@ static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page) | |||
96 | * pte_free_tlb frees a pte table and clears the CRSTE for the | 96 | * pte_free_tlb frees a pte table and clears the CRSTE for the |
97 | * page table from the tlb. | 97 | * page table from the tlb. |
98 | */ | 98 | */ |
99 | static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte) | 99 | static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, |
100 | unsigned long address) | ||
100 | { | 101 | { |
101 | if (!tlb->fullmm) { | 102 | if (!tlb->fullmm) { |
102 | tlb->array[tlb->nr_ptes++] = pte; | 103 | tlb->array[tlb->nr_ptes++] = pte; |
@@ -113,7 +114,8 @@ static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte) | |||
113 | * as the pgd. pmd_free_tlb checks the asce_limit against 2GB | 114 | * as the pgd. pmd_free_tlb checks the asce_limit against 2GB |
114 | * to avoid the double free of the pmd in this case. | 115 | * to avoid the double free of the pmd in this case. |
115 | */ | 116 | */ |
116 | static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) | 117 | static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, |
118 | unsigned long address) | ||
117 | { | 119 | { |
118 | #ifdef __s390x__ | 120 | #ifdef __s390x__ |
119 | if (tlb->mm->context.asce_limit <= (1UL << 31)) | 121 | if (tlb->mm->context.asce_limit <= (1UL << 31)) |
@@ -134,7 +136,8 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) | |||
134 | * as the pgd. pud_free_tlb checks the asce_limit against 4TB | 136 | * as the pgd. pud_free_tlb checks the asce_limit against 4TB |
135 | * to avoid the double free of the pud in this case. | 137 | * to avoid the double free of the pud in this case. |
136 | */ | 138 | */ |
137 | static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) | 139 | static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, |
140 | unsigned long address) | ||
138 | { | 141 | { |
139 | #ifdef __s390x__ | 142 | #ifdef __s390x__ |
140 | if (tlb->mm->context.asce_limit <= (1UL << 42)) | 143 | if (tlb->mm->context.asce_limit <= (1UL << 42)) |
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index f9b144049dc9..cae14c499511 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c | |||
@@ -208,9 +208,12 @@ static noinline __init void detect_machine_type(void) | |||
208 | machine_flags |= MACHINE_FLAG_KVM; | 208 | machine_flags |= MACHINE_FLAG_KVM; |
209 | else | 209 | else |
210 | machine_flags |= MACHINE_FLAG_VM; | 210 | machine_flags |= MACHINE_FLAG_VM; |
211 | |||
212 | /* Store machine flags for setting up lowcore early */ | ||
213 | S390_lowcore.machine_flags = machine_flags; | ||
211 | } | 214 | } |
212 | 215 | ||
213 | static void early_pgm_check_handler(void) | 216 | static __init void early_pgm_check_handler(void) |
214 | { | 217 | { |
215 | unsigned long addr; | 218 | unsigned long addr; |
216 | const struct exception_table_entry *fixup; | 219 | const struct exception_table_entry *fixup; |
@@ -222,7 +225,7 @@ static void early_pgm_check_handler(void) | |||
222 | S390_lowcore.program_old_psw.addr = fixup->fixup | PSW_ADDR_AMODE; | 225 | S390_lowcore.program_old_psw.addr = fixup->fixup | PSW_ADDR_AMODE; |
223 | } | 226 | } |
224 | 227 | ||
225 | void setup_lowcore_early(void) | 228 | static noinline __init void setup_lowcore_early(void) |
226 | { | 229 | { |
227 | psw_t psw; | 230 | psw_t psw; |
228 | 231 | ||
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 9717717c6fea..cbb897bc50bd 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -154,6 +154,20 @@ static int __init condev_setup(char *str) | |||
154 | 154 | ||
155 | __setup("condev=", condev_setup); | 155 | __setup("condev=", condev_setup); |
156 | 156 | ||
157 | static void __init set_preferred_console(void) | ||
158 | { | ||
159 | if (MACHINE_IS_KVM) { | ||
160 | add_preferred_console("hvc", 0, NULL); | ||
161 | s390_virtio_console_init(); | ||
162 | return; | ||
163 | } | ||
164 | |||
165 | if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP) | ||
166 | add_preferred_console("ttyS", 0, NULL); | ||
167 | if (CONSOLE_IS_3270) | ||
168 | add_preferred_console("tty3270", 0, NULL); | ||
169 | } | ||
170 | |||
157 | static int __init conmode_setup(char *str) | 171 | static int __init conmode_setup(char *str) |
158 | { | 172 | { |
159 | #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) | 173 | #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) |
@@ -168,6 +182,7 @@ static int __init conmode_setup(char *str) | |||
168 | if (strncmp(str, "3270", 5) == 0) | 182 | if (strncmp(str, "3270", 5) == 0) |
169 | SET_CONSOLE_3270; | 183 | SET_CONSOLE_3270; |
170 | #endif | 184 | #endif |
185 | set_preferred_console(); | ||
171 | return 1; | 186 | return 1; |
172 | } | 187 | } |
173 | 188 | ||
@@ -780,9 +795,6 @@ static void __init setup_hwcaps(void) | |||
780 | void __init | 795 | void __init |
781 | setup_arch(char **cmdline_p) | 796 | setup_arch(char **cmdline_p) |
782 | { | 797 | { |
783 | /* set up preferred console */ | ||
784 | add_preferred_console("ttyS", 0, NULL); | ||
785 | |||
786 | /* | 798 | /* |
787 | * print what head.S has found out about the machine | 799 | * print what head.S has found out about the machine |
788 | */ | 800 | */ |
@@ -802,11 +814,9 @@ setup_arch(char **cmdline_p) | |||
802 | if (MACHINE_IS_VM) | 814 | if (MACHINE_IS_VM) |
803 | pr_info("Linux is running as a z/VM " | 815 | pr_info("Linux is running as a z/VM " |
804 | "guest operating system in 64-bit mode\n"); | 816 | "guest operating system in 64-bit mode\n"); |
805 | else if (MACHINE_IS_KVM) { | 817 | else if (MACHINE_IS_KVM) |
806 | pr_info("Linux is running under KVM in 64-bit mode\n"); | 818 | pr_info("Linux is running under KVM in 64-bit mode\n"); |
807 | add_preferred_console("hvc", 0, NULL); | 819 | else |
808 | s390_virtio_console_init(); | ||
809 | } else | ||
810 | pr_info("Linux is running natively in 64-bit mode\n"); | 820 | pr_info("Linux is running natively in 64-bit mode\n"); |
811 | #endif /* CONFIG_64BIT */ | 821 | #endif /* CONFIG_64BIT */ |
812 | 822 | ||
@@ -851,6 +861,7 @@ setup_arch(char **cmdline_p) | |||
851 | 861 | ||
852 | /* Setup default console */ | 862 | /* Setup default console */ |
853 | conmode_default(); | 863 | conmode_default(); |
864 | set_preferred_console(); | ||
854 | 865 | ||
855 | /* Setup zfcpdump support */ | 866 | /* Setup zfcpdump support */ |
856 | setup_zfcpdump(console_devno); | 867 | setup_zfcpdump(console_devno); |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 2270730f5354..be2cae083406 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -687,13 +687,14 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
687 | #ifndef CONFIG_64BIT | 687 | #ifndef CONFIG_64BIT |
688 | if (MACHINE_HAS_IEEE) | 688 | if (MACHINE_HAS_IEEE) |
689 | lowcore->extended_save_area_addr = (u32) save_area; | 689 | lowcore->extended_save_area_addr = (u32) save_area; |
690 | #else | ||
691 | if (vdso_alloc_per_cpu(smp_processor_id(), lowcore)) | ||
692 | BUG(); | ||
693 | #endif | 690 | #endif |
694 | set_prefix((u32)(unsigned long) lowcore); | 691 | set_prefix((u32)(unsigned long) lowcore); |
695 | local_mcck_enable(); | 692 | local_mcck_enable(); |
696 | local_irq_enable(); | 693 | local_irq_enable(); |
694 | #ifdef CONFIG_64BIT | ||
695 | if (vdso_alloc_per_cpu(smp_processor_id(), &S390_lowcore)) | ||
696 | BUG(); | ||
697 | #endif | ||
697 | for_each_possible_cpu(cpu) | 698 | for_each_possible_cpu(cpu) |
698 | if (cpu != smp_processor_id()) | 699 | if (cpu != smp_processor_id()) |
699 | smp_create_idle(cpu); | 700 | smp_create_idle(cpu); |
diff --git a/arch/s390/kernel/vdso64/clock_gettime.S b/arch/s390/kernel/vdso64/clock_gettime.S index 79dbfee831ec..49106c6e6f88 100644 --- a/arch/s390/kernel/vdso64/clock_gettime.S +++ b/arch/s390/kernel/vdso64/clock_gettime.S | |||
@@ -88,10 +88,17 @@ __kernel_clock_gettime: | |||
88 | llilh %r4,0x0100 | 88 | llilh %r4,0x0100 |
89 | sar %a4,%r4 | 89 | sar %a4,%r4 |
90 | lghi %r4,0 | 90 | lghi %r4,0 |
91 | epsw %r5,0 | ||
91 | sacf 512 /* Magic ectg instruction */ | 92 | sacf 512 /* Magic ectg instruction */ |
92 | .insn ssf,0xc80100000000,__VDSO_ECTG_BASE(4),__VDSO_ECTG_USER(4),4 | 93 | .insn ssf,0xc80100000000,__VDSO_ECTG_BASE(4),__VDSO_ECTG_USER(4),4 |
93 | sacf 0 | 94 | tml %r5,0x4000 |
94 | sar %a4,%r2 | 95 | jo 11f |
96 | tml %r5,0x8000 | ||
97 | jno 10f | ||
98 | sacf 256 | ||
99 | j 11f | ||
100 | 10: sacf 0 | ||
101 | 11: sar %a4,%r2 | ||
95 | algr %r1,%r0 /* r1 = cputime as TOD value */ | 102 | algr %r1,%r0 /* r1 = cputime as TOD value */ |
96 | mghi %r1,1000 /* convert to nanoseconds */ | 103 | mghi %r1,1000 /* convert to nanoseconds */ |
97 | srlg %r1,%r1,12 /* r1 = cputime in nanosec */ | 104 | srlg %r1,%r1,12 /* r1 = cputime in nanosec */ |
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index f04f5301b1b4..4d613415c435 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
@@ -386,7 +386,7 @@ no_timer: | |||
386 | } | 386 | } |
387 | __unset_cpu_idle(vcpu); | 387 | __unset_cpu_idle(vcpu); |
388 | __set_current_state(TASK_RUNNING); | 388 | __set_current_state(TASK_RUNNING); |
389 | remove_wait_queue(&vcpu->wq, &wait); | 389 | remove_wait_queue(&vcpu->arch.local_int.wq, &wait); |
390 | spin_unlock_bh(&vcpu->arch.local_int.lock); | 390 | spin_unlock_bh(&vcpu->arch.local_int.lock); |
391 | spin_unlock(&vcpu->arch.local_int.float_int->lock); | 391 | spin_unlock(&vcpu->arch.local_int.float_int->lock); |
392 | hrtimer_try_to_cancel(&vcpu->arch.ckc_timer); | 392 | hrtimer_try_to_cancel(&vcpu->arch.ckc_timer); |
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c index 36678835034d..0ef81d6776e9 100644 --- a/arch/s390/kvm/sigp.c +++ b/arch/s390/kvm/sigp.c | |||
@@ -169,7 +169,7 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address, | |||
169 | unsigned long *reg) | 169 | unsigned long *reg) |
170 | { | 170 | { |
171 | struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int; | 171 | struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int; |
172 | struct kvm_s390_local_interrupt *li; | 172 | struct kvm_s390_local_interrupt *li = NULL; |
173 | struct kvm_s390_interrupt_info *inti; | 173 | struct kvm_s390_interrupt_info *inti; |
174 | int rc; | 174 | int rc; |
175 | u8 tmp; | 175 | u8 tmp; |
@@ -189,9 +189,10 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address, | |||
189 | return 2; /* busy */ | 189 | return 2; /* busy */ |
190 | 190 | ||
191 | spin_lock(&fi->lock); | 191 | spin_lock(&fi->lock); |
192 | li = fi->local_int[cpu_addr]; | 192 | if (cpu_addr < KVM_MAX_VCPUS) |
193 | li = fi->local_int[cpu_addr]; | ||
193 | 194 | ||
194 | if ((cpu_addr >= KVM_MAX_VCPUS) || (li == NULL)) { | 195 | if (li == NULL) { |
195 | rc = 1; /* incorrect state */ | 196 | rc = 1; /* incorrect state */ |
196 | *reg &= SIGP_STAT_INCORRECT_STATE; | 197 | *reg &= SIGP_STAT_INCORRECT_STATE; |
197 | kfree(inti); | 198 | kfree(inti); |
diff --git a/arch/s390/power/swsusp.c b/arch/s390/power/swsusp.c index e6a4fe9f5f24..bd1f5c6b0b8c 100644 --- a/arch/s390/power/swsusp.c +++ b/arch/s390/power/swsusp.c | |||
@@ -7,24 +7,36 @@ | |||
7 | * | 7 | * |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <asm/system.h> | ||
10 | 11 | ||
11 | /* | ||
12 | * save CPU registers before creating a hibernation image and before | ||
13 | * restoring the memory state from it | ||
14 | */ | ||
15 | void save_processor_state(void) | 12 | void save_processor_state(void) |
16 | { | 13 | { |
17 | /* implentation contained in the | 14 | /* swsusp_arch_suspend() actually saves all cpu register contents. |
18 | * swsusp_arch_suspend function | 15 | * Machine checks must be disabled since swsusp_arch_suspend() stores |
16 | * register contents to their lowcore save areas. That's the same | ||
17 | * place where register contents on machine checks would be saved. | ||
18 | * To avoid register corruption disable machine checks. | ||
19 | * We must also disable machine checks in the new psw mask for | ||
20 | * program checks, since swsusp_arch_suspend() may generate program | ||
21 | * checks. Disabling machine checks for all other new psw masks is | ||
22 | * just paranoia. | ||
19 | */ | 23 | */ |
24 | local_mcck_disable(); | ||
25 | /* Disable lowcore protection */ | ||
26 | __ctl_clear_bit(0,28); | ||
27 | S390_lowcore.external_new_psw.mask &= ~PSW_MASK_MCHECK; | ||
28 | S390_lowcore.svc_new_psw.mask &= ~PSW_MASK_MCHECK; | ||
29 | S390_lowcore.io_new_psw.mask &= ~PSW_MASK_MCHECK; | ||
30 | S390_lowcore.program_new_psw.mask &= ~PSW_MASK_MCHECK; | ||
20 | } | 31 | } |
21 | 32 | ||
22 | /* | ||
23 | * restore the contents of CPU registers | ||
24 | */ | ||
25 | void restore_processor_state(void) | 33 | void restore_processor_state(void) |
26 | { | 34 | { |
27 | /* implentation contained in the | 35 | S390_lowcore.external_new_psw.mask |= PSW_MASK_MCHECK; |
28 | * swsusp_arch_resume function | 36 | S390_lowcore.svc_new_psw.mask |= PSW_MASK_MCHECK; |
29 | */ | 37 | S390_lowcore.io_new_psw.mask |= PSW_MASK_MCHECK; |
38 | S390_lowcore.program_new_psw.mask |= PSW_MASK_MCHECK; | ||
39 | /* Enable lowcore protection */ | ||
40 | __ctl_set_bit(0,28); | ||
41 | local_mcck_enable(); | ||
30 | } | 42 | } |
diff --git a/arch/s390/power/swsusp_asm64.S b/arch/s390/power/swsusp_asm64.S index 76d688da32fa..b26df5c5933e 100644 --- a/arch/s390/power/swsusp_asm64.S +++ b/arch/s390/power/swsusp_asm64.S | |||
@@ -32,19 +32,14 @@ swsusp_arch_suspend: | |||
32 | /* Deactivate DAT */ | 32 | /* Deactivate DAT */ |
33 | stnsm __SF_EMPTY(%r15),0xfb | 33 | stnsm __SF_EMPTY(%r15),0xfb |
34 | 34 | ||
35 | /* Switch off lowcore protection */ | ||
36 | stctg %c0,%c0,__SF_EMPTY(%r15) | ||
37 | ni __SF_EMPTY+4(%r15),0xef | ||
38 | lctlg %c0,%c0,__SF_EMPTY(%r15) | ||
39 | |||
40 | /* Store prefix register on stack */ | 35 | /* Store prefix register on stack */ |
41 | stpx __SF_EMPTY(%r15) | 36 | stpx __SF_EMPTY(%r15) |
42 | 37 | ||
43 | /* Setup base register for lowcore (absolute 0) */ | 38 | /* Save prefix register contents for lowcore */ |
44 | llgf %r1,__SF_EMPTY(%r15) | 39 | llgf %r4,__SF_EMPTY(%r15) |
45 | 40 | ||
46 | /* Get pointer to save area */ | 41 | /* Get pointer to save area */ |
47 | aghi %r1,0x1000 | 42 | lghi %r1,0x1000 |
48 | 43 | ||
49 | /* Store registers */ | 44 | /* Store registers */ |
50 | mvc 0x318(4,%r1),__SF_EMPTY(%r15) /* move prefix to lowcore */ | 45 | mvc 0x318(4,%r1),__SF_EMPTY(%r15) /* move prefix to lowcore */ |
@@ -79,17 +74,15 @@ swsusp_arch_suspend: | |||
79 | xc __SF_EMPTY(4,%r15),__SF_EMPTY(%r15) | 74 | xc __SF_EMPTY(4,%r15),__SF_EMPTY(%r15) |
80 | spx __SF_EMPTY(%r15) | 75 | spx __SF_EMPTY(%r15) |
81 | 76 | ||
82 | /* Setup lowcore */ | 77 | lghi %r2,0 |
83 | brasl %r14,setup_lowcore_early | 78 | lghi %r3,2*PAGE_SIZE |
79 | lghi %r5,2*PAGE_SIZE | ||
80 | 1: mvcle %r2,%r4,0 | ||
81 | jo 1b | ||
84 | 82 | ||
85 | /* Save image */ | 83 | /* Save image */ |
86 | brasl %r14,swsusp_save | 84 | brasl %r14,swsusp_save |
87 | 85 | ||
88 | /* Switch on lowcore protection */ | ||
89 | stctg %c0,%c0,__SF_EMPTY(%r15) | ||
90 | oi __SF_EMPTY+4(%r15),0x10 | ||
91 | lctlg %c0,%c0,__SF_EMPTY(%r15) | ||
92 | |||
93 | /* Restore prefix register and return */ | 86 | /* Restore prefix register and return */ |
94 | lghi %r1,0x1000 | 87 | lghi %r1,0x1000 |
95 | spx 0x318(%r1) | 88 | spx 0x318(%r1) |
@@ -117,11 +110,6 @@ swsusp_arch_resume: | |||
117 | /* Deactivate DAT */ | 110 | /* Deactivate DAT */ |
118 | stnsm __SF_EMPTY(%r15),0xfb | 111 | stnsm __SF_EMPTY(%r15),0xfb |
119 | 112 | ||
120 | /* Switch off lowcore protection */ | ||
121 | stctg %c0,%c0,__SF_EMPTY(%r15) | ||
122 | ni __SF_EMPTY+4(%r15),0xef | ||
123 | lctlg %c0,%c0,__SF_EMPTY(%r15) | ||
124 | |||
125 | /* Set prefix page to zero */ | 113 | /* Set prefix page to zero */ |
126 | xc __SF_EMPTY(4,%r15),__SF_EMPTY(%r15) | 114 | xc __SF_EMPTY(4,%r15),__SF_EMPTY(%r15) |
127 | spx __SF_EMPTY(%r15) | 115 | spx __SF_EMPTY(%r15) |
@@ -175,7 +163,7 @@ swsusp_arch_resume: | |||
175 | /* Load old stack */ | 163 | /* Load old stack */ |
176 | lg %r15,0x2f8(%r13) | 164 | lg %r15,0x2f8(%r13) |
177 | 165 | ||
178 | /* Pointer to save arae */ | 166 | /* Pointer to save area */ |
179 | lghi %r13,0x1000 | 167 | lghi %r13,0x1000 |
180 | 168 | ||
181 | #ifdef CONFIG_SMP | 169 | #ifdef CONFIG_SMP |
@@ -187,11 +175,6 @@ swsusp_arch_resume: | |||
187 | /* Restore prefix register */ | 175 | /* Restore prefix register */ |
188 | spx 0x318(%r13) | 176 | spx 0x318(%r13) |
189 | 177 | ||
190 | /* Switch on lowcore protection */ | ||
191 | stctg %c0,%c0,__SF_EMPTY(%r15) | ||
192 | oi __SF_EMPTY+4(%r15),0x10 | ||
193 | lctlg %c0,%c0,__SF_EMPTY(%r15) | ||
194 | |||
195 | /* Activate DAT */ | 178 | /* Activate DAT */ |
196 | stosm __SF_EMPTY(%r15),0x04 | 179 | stosm __SF_EMPTY(%r15),0x04 |
197 | 180 | ||
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index 7ffd1b4315bd..b9c88cc519e2 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c | |||
@@ -547,7 +547,7 @@ static int __init ap325rxa_devices_setup(void) | |||
547 | return platform_add_devices(ap325rxa_devices, | 547 | return platform_add_devices(ap325rxa_devices, |
548 | ARRAY_SIZE(ap325rxa_devices)); | 548 | ARRAY_SIZE(ap325rxa_devices)); |
549 | } | 549 | } |
550 | device_initcall(ap325rxa_devices_setup); | 550 | arch_initcall(ap325rxa_devices_setup); |
551 | 551 | ||
552 | /* Return the board specific boot mode pin configuration */ | 552 | /* Return the board specific boot mode pin configuration */ |
553 | static int ap325rxa_mode_pins(void) | 553 | static int ap325rxa_mode_pins(void) |
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index f70f4644deb4..f9b2e4df35b9 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c | |||
@@ -608,7 +608,7 @@ static int __init migor_devices_setup(void) | |||
608 | 608 | ||
609 | return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices)); | 609 | return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices)); |
610 | } | 610 | } |
611 | __initcall(migor_devices_setup); | 611 | arch_initcall(migor_devices_setup); |
612 | 612 | ||
613 | /* Return the board specific boot mode pin configuration */ | 613 | /* Return the board specific boot mode pin configuration */ |
614 | static int migor_mode_pins(void) | 614 | static int migor_mode_pins(void) |
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 8fed45a2fb85..15456a0773bf 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -238,7 +238,7 @@ static struct platform_device ceu1_device = { | |||
238 | }, | 238 | }, |
239 | }; | 239 | }; |
240 | 240 | ||
241 | /* KEYSC */ | 241 | /* KEYSC in SoC (Needs SW33-2 set to ON) */ |
242 | static struct sh_keysc_info keysc_info = { | 242 | static struct sh_keysc_info keysc_info = { |
243 | .mode = SH_KEYSC_MODE_1, | 243 | .mode = SH_KEYSC_MODE_1, |
244 | .scan_timing = 10, | 244 | .scan_timing = 10, |
@@ -255,12 +255,13 @@ static struct sh_keysc_info keysc_info = { | |||
255 | 255 | ||
256 | static struct resource keysc_resources[] = { | 256 | static struct resource keysc_resources[] = { |
257 | [0] = { | 257 | [0] = { |
258 | .start = 0x1a204000, | 258 | .name = "KEYSC", |
259 | .end = 0x1a20400f, | 259 | .start = 0x044b0000, |
260 | .end = 0x044b000f, | ||
260 | .flags = IORESOURCE_MEM, | 261 | .flags = IORESOURCE_MEM, |
261 | }, | 262 | }, |
262 | [1] = { | 263 | [1] = { |
263 | .start = IRQ0_KEY, | 264 | .start = 79, |
264 | .flags = IORESOURCE_IRQ, | 265 | .flags = IORESOURCE_IRQ, |
265 | }, | 266 | }, |
266 | }; | 267 | }; |
diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h index 84dd2db7104c..63ca37bd9a95 100644 --- a/arch/sh/include/asm/pgalloc.h +++ b/arch/sh/include/asm/pgalloc.h | |||
@@ -73,20 +73,12 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | |||
73 | quicklist_free_page(QUICK_PT, NULL, pte); | 73 | quicklist_free_page(QUICK_PT, NULL, pte); |
74 | } | 74 | } |
75 | 75 | ||
76 | #define __pte_free_tlb(tlb,pte) \ | 76 | #define __pte_free_tlb(tlb,pte,addr) \ |
77 | do { \ | 77 | do { \ |
78 | pgtable_page_dtor(pte); \ | 78 | pgtable_page_dtor(pte); \ |
79 | tlb_remove_page((tlb), (pte)); \ | 79 | tlb_remove_page((tlb), (pte)); \ |
80 | } while (0) | 80 | } while (0) |
81 | 81 | ||
82 | /* | ||
83 | * allocating and freeing a pmd is trivial: the 1-entry pmd is | ||
84 | * inside the pgd, so has no extra memory associated with it. | ||
85 | */ | ||
86 | |||
87 | #define pmd_free(mm, x) do { } while (0) | ||
88 | #define __pmd_free_tlb(tlb,x) do { } while (0) | ||
89 | |||
90 | static inline void check_pgt_cache(void) | 82 | static inline void check_pgt_cache(void) |
91 | { | 83 | { |
92 | quicklist_trim(QUICK_PGD, NULL, 25, 16); | 84 | quicklist_trim(QUICK_PGD, NULL, 25, 16); |
diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h index 9c16f737074a..da8fe7ab8728 100644 --- a/arch/sh/include/asm/tlb.h +++ b/arch/sh/include/asm/tlb.h | |||
@@ -91,9 +91,9 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | #define tlb_remove_page(tlb,page) free_page_and_swap_cache(page) | 93 | #define tlb_remove_page(tlb,page) free_page_and_swap_cache(page) |
94 | #define pte_free_tlb(tlb, ptep) pte_free((tlb)->mm, ptep) | 94 | #define pte_free_tlb(tlb, ptep, addr) pte_free((tlb)->mm, ptep) |
95 | #define pmd_free_tlb(tlb, pmdp) pmd_free((tlb)->mm, pmdp) | 95 | #define pmd_free_tlb(tlb, pmdp, addr) pmd_free((tlb)->mm, pmdp) |
96 | #define pud_free_tlb(tlb, pudp) pud_free((tlb)->mm, pudp) | 96 | #define pud_free_tlb(tlb, pudp, addr) pud_free((tlb)->mm, pudp) |
97 | 97 | ||
98 | #define tlb_migrate_finish(mm) do { } while (0) | 98 | #define tlb_migrate_finish(mm) do { } while (0) |
99 | 99 | ||
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c index 13798733f2db..8555c05e8667 100644 --- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c | |||
@@ -187,7 +187,7 @@ static int __init sh7619_devices_setup(void) | |||
187 | return platform_add_devices(sh7619_devices, | 187 | return platform_add_devices(sh7619_devices, |
188 | ARRAY_SIZE(sh7619_devices)); | 188 | ARRAY_SIZE(sh7619_devices)); |
189 | } | 189 | } |
190 | __initcall(sh7619_devices_setup); | 190 | arch_initcall(sh7619_devices_setup); |
191 | 191 | ||
192 | void __init plat_irq_setup(void) | 192 | void __init plat_irq_setup(void) |
193 | { | 193 | { |
diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c index 869c2da4820b..b67376445315 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c +++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c | |||
@@ -238,7 +238,7 @@ static int __init mxg_devices_setup(void) | |||
238 | return platform_add_devices(mxg_devices, | 238 | return platform_add_devices(mxg_devices, |
239 | ARRAY_SIZE(mxg_devices)); | 239 | ARRAY_SIZE(mxg_devices)); |
240 | } | 240 | } |
241 | __initcall(mxg_devices_setup); | 241 | arch_initcall(mxg_devices_setup); |
242 | 242 | ||
243 | void __init plat_irq_setup(void) | 243 | void __init plat_irq_setup(void) |
244 | { | 244 | { |
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c index d8febe128066..fbde5b75deb9 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c | |||
@@ -357,7 +357,7 @@ static int __init sh7201_devices_setup(void) | |||
357 | return platform_add_devices(sh7201_devices, | 357 | return platform_add_devices(sh7201_devices, |
358 | ARRAY_SIZE(sh7201_devices)); | 358 | ARRAY_SIZE(sh7201_devices)); |
359 | } | 359 | } |
360 | __initcall(sh7201_devices_setup); | 360 | arch_initcall(sh7201_devices_setup); |
361 | 361 | ||
362 | void __init plat_irq_setup(void) | 362 | void __init plat_irq_setup(void) |
363 | { | 363 | { |
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c index 62e3039d2398..d3fd536c9a84 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c | |||
@@ -367,7 +367,7 @@ static int __init sh7203_devices_setup(void) | |||
367 | return platform_add_devices(sh7203_devices, | 367 | return platform_add_devices(sh7203_devices, |
368 | ARRAY_SIZE(sh7203_devices)); | 368 | ARRAY_SIZE(sh7203_devices)); |
369 | } | 369 | } |
370 | __initcall(sh7203_devices_setup); | 370 | arch_initcall(sh7203_devices_setup); |
371 | 371 | ||
372 | void __init plat_irq_setup(void) | 372 | void __init plat_irq_setup(void) |
373 | { | 373 | { |
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c index 3e6f3d7a58be..a9ccc5e8d9e9 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c | |||
@@ -338,7 +338,7 @@ static int __init sh7206_devices_setup(void) | |||
338 | return platform_add_devices(sh7206_devices, | 338 | return platform_add_devices(sh7206_devices, |
339 | ARRAY_SIZE(sh7206_devices)); | 339 | ARRAY_SIZE(sh7206_devices)); |
340 | } | 340 | } |
341 | __initcall(sh7206_devices_setup); | 341 | arch_initcall(sh7206_devices_setup); |
342 | 342 | ||
343 | void __init plat_irq_setup(void) | 343 | void __init plat_irq_setup(void) |
344 | { | 344 | { |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c index 88f742fed9ed..c23105983878 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c | |||
@@ -222,7 +222,7 @@ static int __init sh7705_devices_setup(void) | |||
222 | return platform_add_devices(sh7705_devices, | 222 | return platform_add_devices(sh7705_devices, |
223 | ARRAY_SIZE(sh7705_devices)); | 223 | ARRAY_SIZE(sh7705_devices)); |
224 | } | 224 | } |
225 | __initcall(sh7705_devices_setup); | 225 | arch_initcall(sh7705_devices_setup); |
226 | 226 | ||
227 | static struct platform_device *sh7705_early_devices[] __initdata = { | 227 | static struct platform_device *sh7705_early_devices[] __initdata = { |
228 | &tmu0_device, | 228 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c index c56306798584..347ab35d0697 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c | |||
@@ -250,7 +250,7 @@ static int __init sh770x_devices_setup(void) | |||
250 | return platform_add_devices(sh770x_devices, | 250 | return platform_add_devices(sh770x_devices, |
251 | ARRAY_SIZE(sh770x_devices)); | 251 | ARRAY_SIZE(sh770x_devices)); |
252 | } | 252 | } |
253 | __initcall(sh770x_devices_setup); | 253 | arch_initcall(sh770x_devices_setup); |
254 | 254 | ||
255 | static struct platform_device *sh770x_early_devices[] __initdata = { | 255 | static struct platform_device *sh770x_early_devices[] __initdata = { |
256 | &tmu0_device, | 256 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c index efa76c8148f4..717e90ae1097 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c | |||
@@ -226,7 +226,7 @@ static int __init sh7710_devices_setup(void) | |||
226 | return platform_add_devices(sh7710_devices, | 226 | return platform_add_devices(sh7710_devices, |
227 | ARRAY_SIZE(sh7710_devices)); | 227 | ARRAY_SIZE(sh7710_devices)); |
228 | } | 228 | } |
229 | __initcall(sh7710_devices_setup); | 229 | arch_initcall(sh7710_devices_setup); |
230 | 230 | ||
231 | static struct platform_device *sh7710_early_devices[] __initdata = { | 231 | static struct platform_device *sh7710_early_devices[] __initdata = { |
232 | &tmu0_device, | 232 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c index 5b2107798edb..74d8baaf8e96 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c | |||
@@ -388,7 +388,7 @@ static int __init sh7720_devices_setup(void) | |||
388 | return platform_add_devices(sh7720_devices, | 388 | return platform_add_devices(sh7720_devices, |
389 | ARRAY_SIZE(sh7720_devices)); | 389 | ARRAY_SIZE(sh7720_devices)); |
390 | } | 390 | } |
391 | __initcall(sh7720_devices_setup); | 391 | arch_initcall(sh7720_devices_setup); |
392 | 392 | ||
393 | static struct platform_device *sh7720_early_devices[] __initdata = { | 393 | static struct platform_device *sh7720_early_devices[] __initdata = { |
394 | &cmt0_device, | 394 | &cmt0_device, |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c index 6d088d123591..de4827df19aa 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c | |||
@@ -138,7 +138,7 @@ static int __init sh4202_devices_setup(void) | |||
138 | return platform_add_devices(sh4202_devices, | 138 | return platform_add_devices(sh4202_devices, |
139 | ARRAY_SIZE(sh4202_devices)); | 139 | ARRAY_SIZE(sh4202_devices)); |
140 | } | 140 | } |
141 | __initcall(sh4202_devices_setup); | 141 | arch_initcall(sh4202_devices_setup); |
142 | 142 | ||
143 | static struct platform_device *sh4202_early_devices[] __initdata = { | 143 | static struct platform_device *sh4202_early_devices[] __initdata = { |
144 | &tmu0_device, | 144 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index 851672d15cf4..1b8b122e8f3d 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c | |||
@@ -239,7 +239,7 @@ static int __init sh7750_devices_setup(void) | |||
239 | return platform_add_devices(sh7750_devices, | 239 | return platform_add_devices(sh7750_devices, |
240 | ARRAY_SIZE(sh7750_devices)); | 240 | ARRAY_SIZE(sh7750_devices)); |
241 | } | 241 | } |
242 | __initcall(sh7750_devices_setup); | 242 | arch_initcall(sh7750_devices_setup); |
243 | 243 | ||
244 | static struct platform_device *sh7750_early_devices[] __initdata = { | 244 | static struct platform_device *sh7750_early_devices[] __initdata = { |
245 | &tmu0_device, | 245 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c index 5b822519bd90..7fbb7be9284c 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c | |||
@@ -265,7 +265,7 @@ static int __init sh7760_devices_setup(void) | |||
265 | return platform_add_devices(sh7760_devices, | 265 | return platform_add_devices(sh7760_devices, |
266 | ARRAY_SIZE(sh7760_devices)); | 266 | ARRAY_SIZE(sh7760_devices)); |
267 | } | 267 | } |
268 | __initcall(sh7760_devices_setup); | 268 | arch_initcall(sh7760_devices_setup); |
269 | 269 | ||
270 | static struct platform_device *sh7760_early_devices[] __initdata = { | 270 | static struct platform_device *sh7760_early_devices[] __initdata = { |
271 | &tmu0_device, | 271 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c index 6307e087c864..ac4d5672ec1a 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | |||
@@ -325,7 +325,7 @@ static int __init sh7343_devices_setup(void) | |||
325 | return platform_add_devices(sh7343_devices, | 325 | return platform_add_devices(sh7343_devices, |
326 | ARRAY_SIZE(sh7343_devices)); | 326 | ARRAY_SIZE(sh7343_devices)); |
327 | } | 327 | } |
328 | __initcall(sh7343_devices_setup); | 328 | arch_initcall(sh7343_devices_setup); |
329 | 329 | ||
330 | static struct platform_device *sh7343_early_devices[] __initdata = { | 330 | static struct platform_device *sh7343_early_devices[] __initdata = { |
331 | &cmt_device, | 331 | &cmt_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c index c18f7d09281b..1a956b1beccc 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c | |||
@@ -318,7 +318,7 @@ static int __init sh7366_devices_setup(void) | |||
318 | return platform_add_devices(sh7366_devices, | 318 | return platform_add_devices(sh7366_devices, |
319 | ARRAY_SIZE(sh7366_devices)); | 319 | ARRAY_SIZE(sh7366_devices)); |
320 | } | 320 | } |
321 | __initcall(sh7366_devices_setup); | 321 | arch_initcall(sh7366_devices_setup); |
322 | 322 | ||
323 | static struct platform_device *sh7366_early_devices[] __initdata = { | 323 | static struct platform_device *sh7366_early_devices[] __initdata = { |
324 | &cmt_device, | 324 | &cmt_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index ea524a2da3e4..cda76ebf87c3 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
@@ -359,7 +359,7 @@ static int __init sh7722_devices_setup(void) | |||
359 | return platform_add_devices(sh7722_devices, | 359 | return platform_add_devices(sh7722_devices, |
360 | ARRAY_SIZE(sh7722_devices)); | 360 | ARRAY_SIZE(sh7722_devices)); |
361 | } | 361 | } |
362 | __initcall(sh7722_devices_setup); | 362 | arch_initcall(sh7722_devices_setup); |
363 | 363 | ||
364 | static struct platform_device *sh7722_early_devices[] __initdata = { | 364 | static struct platform_device *sh7722_early_devices[] __initdata = { |
365 | &cmt_device, | 365 | &cmt_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index e1bb80b2a27b..b45dace9539f 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
@@ -473,7 +473,7 @@ static int __init sh7723_devices_setup(void) | |||
473 | return platform_add_devices(sh7723_devices, | 473 | return platform_add_devices(sh7723_devices, |
474 | ARRAY_SIZE(sh7723_devices)); | 474 | ARRAY_SIZE(sh7723_devices)); |
475 | } | 475 | } |
476 | __initcall(sh7723_devices_setup); | 476 | arch_initcall(sh7723_devices_setup); |
477 | 477 | ||
478 | static struct platform_device *sh7723_early_devices[] __initdata = { | 478 | static struct platform_device *sh7723_early_devices[] __initdata = { |
479 | &cmt_device, | 479 | &cmt_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c index e5ac9eb11c63..a04edaab9a29 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c | |||
@@ -508,7 +508,7 @@ static int __init sh7724_devices_setup(void) | |||
508 | return platform_add_devices(sh7724_devices, | 508 | return platform_add_devices(sh7724_devices, |
509 | ARRAY_SIZE(sh7724_devices)); | 509 | ARRAY_SIZE(sh7724_devices)); |
510 | } | 510 | } |
511 | device_initcall(sh7724_devices_setup); | 511 | arch_initcall(sh7724_devices_setup); |
512 | 512 | ||
513 | static struct platform_device *sh7724_early_devices[] __initdata = { | 513 | static struct platform_device *sh7724_early_devices[] __initdata = { |
514 | &cmt_device, | 514 | &cmt_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c index f1e0c0d36da7..4659fff6b842 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c | |||
@@ -314,7 +314,7 @@ static int __init sh7763_devices_setup(void) | |||
314 | return platform_add_devices(sh7763_devices, | 314 | return platform_add_devices(sh7763_devices, |
315 | ARRAY_SIZE(sh7763_devices)); | 315 | ARRAY_SIZE(sh7763_devices)); |
316 | } | 316 | } |
317 | __initcall(sh7763_devices_setup); | 317 | arch_initcall(sh7763_devices_setup); |
318 | 318 | ||
319 | static struct platform_device *sh7763_early_devices[] __initdata = { | 319 | static struct platform_device *sh7763_early_devices[] __initdata = { |
320 | &tmu0_device, | 320 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c index 1e86209db284..eead08d89d32 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c | |||
@@ -368,7 +368,7 @@ static int __init sh7770_devices_setup(void) | |||
368 | return platform_add_devices(sh7770_devices, | 368 | return platform_add_devices(sh7770_devices, |
369 | ARRAY_SIZE(sh7770_devices)); | 369 | ARRAY_SIZE(sh7770_devices)); |
370 | } | 370 | } |
371 | __initcall(sh7770_devices_setup); | 371 | arch_initcall(sh7770_devices_setup); |
372 | 372 | ||
373 | static struct platform_device *sh7770_early_devices[] __initdata = { | 373 | static struct platform_device *sh7770_early_devices[] __initdata = { |
374 | &tmu0_device, | 374 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c index 715e05b431e5..2c901f446959 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c | |||
@@ -256,7 +256,7 @@ static int __init sh7780_devices_setup(void) | |||
256 | return platform_add_devices(sh7780_devices, | 256 | return platform_add_devices(sh7780_devices, |
257 | ARRAY_SIZE(sh7780_devices)); | 257 | ARRAY_SIZE(sh7780_devices)); |
258 | } | 258 | } |
259 | __initcall(sh7780_devices_setup); | 259 | arch_initcall(sh7780_devices_setup); |
260 | 260 | ||
261 | static struct platform_device *sh7780_early_devices[] __initdata = { | 261 | static struct platform_device *sh7780_early_devices[] __initdata = { |
262 | &tmu0_device, | 262 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c index af561402570b..7f6c718b6c36 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c | |||
@@ -263,7 +263,7 @@ static int __init sh7785_devices_setup(void) | |||
263 | return platform_add_devices(sh7785_devices, | 263 | return platform_add_devices(sh7785_devices, |
264 | ARRAY_SIZE(sh7785_devices)); | 264 | ARRAY_SIZE(sh7785_devices)); |
265 | } | 265 | } |
266 | __initcall(sh7785_devices_setup); | 266 | arch_initcall(sh7785_devices_setup); |
267 | 267 | ||
268 | static struct platform_device *sh7785_early_devices[] __initdata = { | 268 | static struct platform_device *sh7785_early_devices[] __initdata = { |
269 | &tmu0_device, | 269 | &tmu0_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c index b70049470a0b..0104a8ec5369 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c | |||
@@ -547,7 +547,7 @@ static int __init sh7786_devices_setup(void) | |||
547 | return platform_add_devices(sh7786_devices, | 547 | return platform_add_devices(sh7786_devices, |
548 | ARRAY_SIZE(sh7786_devices)); | 548 | ARRAY_SIZE(sh7786_devices)); |
549 | } | 549 | } |
550 | device_initcall(sh7786_devices_setup); | 550 | arch_initcall(sh7786_devices_setup); |
551 | 551 | ||
552 | void __init plat_early_device_setup(void) | 552 | void __init plat_early_device_setup(void) |
553 | { | 553 | { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c index 53c65fd9ccef..07f078961c71 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c +++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c | |||
@@ -256,7 +256,7 @@ static int __init shx3_devices_setup(void) | |||
256 | return platform_add_devices(shx3_devices, | 256 | return platform_add_devices(shx3_devices, |
257 | ARRAY_SIZE(shx3_devices)); | 257 | ARRAY_SIZE(shx3_devices)); |
258 | } | 258 | } |
259 | __initcall(shx3_devices_setup); | 259 | arch_initcall(shx3_devices_setup); |
260 | 260 | ||
261 | void __init plat_early_device_setup(void) | 261 | void __init plat_early_device_setup(void) |
262 | { | 262 | { |
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c index f5ff1ac57fc2..6a0f82f70032 100644 --- a/arch/sh/kernel/cpu/sh5/setup-sh5.c +++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c | |||
@@ -186,7 +186,7 @@ static int __init sh5_devices_setup(void) | |||
186 | return platform_add_devices(sh5_devices, | 186 | return platform_add_devices(sh5_devices, |
187 | ARRAY_SIZE(sh5_devices)); | 187 | ARRAY_SIZE(sh5_devices)); |
188 | } | 188 | } |
189 | __initcall(sh5_devices_setup); | 189 | arch_initcall(sh5_devices_setup); |
190 | 190 | ||
191 | void __init plat_early_device_setup(void) | 191 | void __init plat_early_device_setup(void) |
192 | { | 192 | { |
diff --git a/arch/sh/kernel/cpu/shmobile/sleep.S b/arch/sh/kernel/cpu/shmobile/sleep.S index 5d888ef53d82..baf2d7d46b05 100644 --- a/arch/sh/kernel/cpu/shmobile/sleep.S +++ b/arch/sh/kernel/cpu/shmobile/sleep.S | |||
@@ -26,8 +26,30 @@ ENTRY(sh_mobile_standby) | |||
26 | 26 | ||
27 | tst #SUSP_SH_SF, r0 | 27 | tst #SUSP_SH_SF, r0 |
28 | bt skip_set_sf | 28 | bt skip_set_sf |
29 | #ifdef CONFIG_CPU_SUBTYPE_SH7724 | ||
30 | /* DBSC: put memory in self-refresh mode */ | ||
29 | 31 | ||
30 | /* SDRAM: disable power down and put in self-refresh mode */ | 32 | mov.l dben_reg, r4 |
33 | mov.l dben_data0, r1 | ||
34 | mov.l r1, @r4 | ||
35 | |||
36 | mov.l dbrfpdn0_reg, r4 | ||
37 | mov.l dbrfpdn0_data0, r1 | ||
38 | mov.l r1, @r4 | ||
39 | |||
40 | mov.l dbcmdcnt_reg, r4 | ||
41 | mov.l dbcmdcnt_data0, r1 | ||
42 | mov.l r1, @r4 | ||
43 | |||
44 | mov.l dbcmdcnt_reg, r4 | ||
45 | mov.l dbcmdcnt_data1, r1 | ||
46 | mov.l r1, @r4 | ||
47 | |||
48 | mov.l dbrfpdn0_reg, r4 | ||
49 | mov.l dbrfpdn0_data1, r1 | ||
50 | mov.l r1, @r4 | ||
51 | #else | ||
52 | /* SBSC: disable power down and put in self-refresh mode */ | ||
31 | mov.l 1f, r4 | 53 | mov.l 1f, r4 |
32 | mov.l 2f, r1 | 54 | mov.l 2f, r1 |
33 | mov.l @r4, r2 | 55 | mov.l @r4, r2 |
@@ -35,6 +57,7 @@ ENTRY(sh_mobile_standby) | |||
35 | mov.l 3f, r3 | 57 | mov.l 3f, r3 |
36 | and r3, r2 | 58 | and r3, r2 |
37 | mov.l r2, @r4 | 59 | mov.l r2, @r4 |
60 | #endif | ||
38 | 61 | ||
39 | skip_set_sf: | 62 | skip_set_sf: |
40 | tst #SUSP_SH_SLEEP, r0 | 63 | tst #SUSP_SH_SLEEP, r0 |
@@ -84,7 +107,36 @@ done_sleep: | |||
84 | tst #SUSP_SH_SF, r0 | 107 | tst #SUSP_SH_SF, r0 |
85 | bt skip_restore_sf | 108 | bt skip_restore_sf |
86 | 109 | ||
87 | /* SDRAM: set auto-refresh mode */ | 110 | #ifdef CONFIG_CPU_SUBTYPE_SH7724 |
111 | /* DBSC: put memory in auto-refresh mode */ | ||
112 | |||
113 | mov.l dbrfpdn0_reg, r4 | ||
114 | mov.l dbrfpdn0_data0, r1 | ||
115 | mov.l r1, @r4 | ||
116 | |||
117 | /* sleep 140 ns */ | ||
118 | nop | ||
119 | nop | ||
120 | nop | ||
121 | nop | ||
122 | |||
123 | mov.l dbcmdcnt_reg, r4 | ||
124 | mov.l dbcmdcnt_data0, r1 | ||
125 | mov.l r1, @r4 | ||
126 | |||
127 | mov.l dbcmdcnt_reg, r4 | ||
128 | mov.l dbcmdcnt_data1, r1 | ||
129 | mov.l r1, @r4 | ||
130 | |||
131 | mov.l dben_reg, r4 | ||
132 | mov.l dben_data1, r1 | ||
133 | mov.l r1, @r4 | ||
134 | |||
135 | mov.l dbrfpdn0_reg, r4 | ||
136 | mov.l dbrfpdn0_data2, r1 | ||
137 | mov.l r1, @r4 | ||
138 | #else | ||
139 | /* SBSC: set auto-refresh mode */ | ||
88 | mov.l 1f, r4 | 140 | mov.l 1f, r4 |
89 | mov.l @r4, r2 | 141 | mov.l @r4, r2 |
90 | mov.l 4f, r3 | 142 | mov.l 4f, r3 |
@@ -98,15 +150,29 @@ done_sleep: | |||
98 | add r4, r3 | 150 | add r4, r3 |
99 | or r2, r3 | 151 | or r2, r3 |
100 | mov.l r3, @r1 | 152 | mov.l r3, @r1 |
153 | #endif | ||
101 | skip_restore_sf: | 154 | skip_restore_sf: |
102 | rts | 155 | rts |
103 | nop | 156 | nop |
104 | 157 | ||
105 | .balign 4 | 158 | .balign 4 |
159 | #ifdef CONFIG_CPU_SUBTYPE_SH7724 | ||
160 | dben_reg: .long 0xfd000010 /* DBEN */ | ||
161 | dben_data0: .long 0 | ||
162 | dben_data1: .long 1 | ||
163 | dbrfpdn0_reg: .long 0xfd000040 /* DBRFPDN0 */ | ||
164 | dbrfpdn0_data0: .long 0 | ||
165 | dbrfpdn0_data1: .long 1 | ||
166 | dbrfpdn0_data2: .long 0x00010000 | ||
167 | dbcmdcnt_reg: .long 0xfd000014 /* DBCMDCNT */ | ||
168 | dbcmdcnt_data0: .long 2 | ||
169 | dbcmdcnt_data1: .long 4 | ||
170 | #else | ||
106 | 1: .long 0xfe400008 /* SDCR0 */ | 171 | 1: .long 0xfe400008 /* SDCR0 */ |
107 | 2: .long 0x00000400 | 172 | 2: .long 0x00000400 |
108 | 3: .long 0xffff7fff | 173 | 3: .long 0xffff7fff |
109 | 4: .long 0xfffffbff | 174 | 4: .long 0xfffffbff |
175 | #endif | ||
110 | 5: .long 0xa4150020 /* STBCR */ | 176 | 5: .long 0xa4150020 /* STBCR */ |
111 | 6: .long 0xfe40001c /* RTCOR */ | 177 | 6: .long 0xfe40001c /* RTCOR */ |
112 | 7: .long 0xfe400018 /* RTCNT */ | 178 | 7: .long 0xfe400018 /* RTCNT */ |
diff --git a/arch/sparc/configs/sparc32_defconfig b/arch/sparc/configs/sparc32_defconfig index 8bcd27af724b..a0f62a808edb 100644 --- a/arch/sparc/configs/sparc32_defconfig +++ b/arch/sparc/configs/sparc32_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.30-rc2 | 3 | # Linux kernel version: 2.6.31-rc1 |
4 | # Fri Apr 17 04:04:46 2009 | 4 | # Tue Aug 18 23:45:52 2009 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_SPARC=y | 7 | CONFIG_SPARC=y |
@@ -17,6 +17,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
17 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 17 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
18 | CONFIG_OF=y | 18 | CONFIG_OF=y |
19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
20 | CONFIG_CONSTRUCTORS=y | ||
20 | 21 | ||
21 | # | 22 | # |
22 | # General setup | 23 | # General setup |
@@ -74,7 +75,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
74 | CONFIG_KALLSYMS=y | 75 | CONFIG_KALLSYMS=y |
75 | # CONFIG_KALLSYMS_ALL is not set | 76 | # CONFIG_KALLSYMS_ALL is not set |
76 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 77 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
77 | # CONFIG_STRIP_ASM_SYMS is not set | ||
78 | CONFIG_HOTPLUG=y | 78 | CONFIG_HOTPLUG=y |
79 | CONFIG_PRINTK=y | 79 | CONFIG_PRINTK=y |
80 | CONFIG_BUG=y | 80 | CONFIG_BUG=y |
@@ -87,8 +87,13 @@ CONFIG_TIMERFD=y | |||
87 | CONFIG_EVENTFD=y | 87 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 88 | CONFIG_SHMEM=y |
89 | CONFIG_AIO=y | 89 | CONFIG_AIO=y |
90 | |||
91 | # | ||
92 | # Performance Counters | ||
93 | # | ||
90 | CONFIG_VM_EVENT_COUNTERS=y | 94 | CONFIG_VM_EVENT_COUNTERS=y |
91 | CONFIG_PCI_QUIRKS=y | 95 | CONFIG_PCI_QUIRKS=y |
96 | # CONFIG_STRIP_ASM_SYMS is not set | ||
92 | CONFIG_COMPAT_BRK=y | 97 | CONFIG_COMPAT_BRK=y |
93 | CONFIG_SLAB=y | 98 | CONFIG_SLAB=y |
94 | # CONFIG_SLUB is not set | 99 | # CONFIG_SLUB is not set |
@@ -97,6 +102,10 @@ CONFIG_SLAB=y | |||
97 | # CONFIG_MARKERS is not set | 102 | # CONFIG_MARKERS is not set |
98 | CONFIG_HAVE_OPROFILE=y | 103 | CONFIG_HAVE_OPROFILE=y |
99 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 104 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
105 | |||
106 | # | ||
107 | # GCOV-based kernel profiling | ||
108 | # | ||
100 | # CONFIG_SLOW_WORK is not set | 109 | # CONFIG_SLOW_WORK is not set |
101 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 110 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
102 | CONFIG_SLABINFO=y | 111 | CONFIG_SLABINFO=y |
@@ -109,7 +118,7 @@ CONFIG_MODULE_UNLOAD=y | |||
109 | # CONFIG_MODVERSIONS is not set | 118 | # CONFIG_MODVERSIONS is not set |
110 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 119 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
111 | CONFIG_BLOCK=y | 120 | CONFIG_BLOCK=y |
112 | # CONFIG_LBD is not set | 121 | CONFIG_LBDAF=y |
113 | # CONFIG_BLK_DEV_BSG is not set | 122 | # CONFIG_BLK_DEV_BSG is not set |
114 | # CONFIG_BLK_DEV_INTEGRITY is not set | 123 | # CONFIG_BLK_DEV_INTEGRITY is not set |
115 | 124 | ||
@@ -154,9 +163,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
154 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 163 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
155 | CONFIG_ZONE_DMA_FLAG=1 | 164 | CONFIG_ZONE_DMA_FLAG=1 |
156 | CONFIG_BOUNCE=y | 165 | CONFIG_BOUNCE=y |
157 | CONFIG_UNEVICTABLE_LRU=y | ||
158 | CONFIG_HAVE_MLOCK=y | 166 | CONFIG_HAVE_MLOCK=y |
159 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 167 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
168 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
160 | CONFIG_SUN_PM=y | 169 | CONFIG_SUN_PM=y |
161 | # CONFIG_SPARC_LED is not set | 170 | # CONFIG_SPARC_LED is not set |
162 | CONFIG_SERIAL_CONSOLE=y | 171 | CONFIG_SERIAL_CONSOLE=y |
@@ -264,6 +273,7 @@ CONFIG_IPV6_TUNNEL=m | |||
264 | # CONFIG_ECONET is not set | 273 | # CONFIG_ECONET is not set |
265 | # CONFIG_WAN_ROUTER is not set | 274 | # CONFIG_WAN_ROUTER is not set |
266 | # CONFIG_PHONET is not set | 275 | # CONFIG_PHONET is not set |
276 | # CONFIG_IEEE802154 is not set | ||
267 | # CONFIG_NET_SCHED is not set | 277 | # CONFIG_NET_SCHED is not set |
268 | # CONFIG_DCB is not set | 278 | # CONFIG_DCB is not set |
269 | 279 | ||
@@ -281,7 +291,11 @@ CONFIG_WIRELESS=y | |||
281 | CONFIG_WIRELESS_OLD_REGULATORY=y | 291 | CONFIG_WIRELESS_OLD_REGULATORY=y |
282 | # CONFIG_WIRELESS_EXT is not set | 292 | # CONFIG_WIRELESS_EXT is not set |
283 | # CONFIG_LIB80211 is not set | 293 | # CONFIG_LIB80211 is not set |
284 | # CONFIG_MAC80211 is not set | 294 | |
295 | # | ||
296 | # CFG80211 needs to be enabled for MAC80211 | ||
297 | # | ||
298 | CONFIG_MAC80211_DEFAULT_PS_VALUE=0 | ||
285 | # CONFIG_WIMAX is not set | 299 | # CONFIG_WIMAX is not set |
286 | # CONFIG_RFKILL is not set | 300 | # CONFIG_RFKILL is not set |
287 | # CONFIG_NET_9P is not set | 301 | # CONFIG_NET_9P is not set |
@@ -335,6 +349,7 @@ CONFIG_MISC_DEVICES=y | |||
335 | # EEPROM support | 349 | # EEPROM support |
336 | # | 350 | # |
337 | # CONFIG_EEPROM_93CX6 is not set | 351 | # CONFIG_EEPROM_93CX6 is not set |
352 | # CONFIG_CB710_CORE is not set | ||
338 | CONFIG_HAVE_IDE=y | 353 | CONFIG_HAVE_IDE=y |
339 | # CONFIG_IDE is not set | 354 | # CONFIG_IDE is not set |
340 | 355 | ||
@@ -358,10 +373,6 @@ CONFIG_BLK_DEV_SR=m | |||
358 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 373 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
359 | CONFIG_CHR_DEV_SG=m | 374 | CONFIG_CHR_DEV_SG=m |
360 | # CONFIG_CHR_DEV_SCH is not set | 375 | # CONFIG_CHR_DEV_SCH is not set |
361 | |||
362 | # | ||
363 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
364 | # | ||
365 | # CONFIG_SCSI_MULTI_LUN is not set | 376 | # CONFIG_SCSI_MULTI_LUN is not set |
366 | # CONFIG_SCSI_CONSTANTS is not set | 377 | # CONFIG_SCSI_CONSTANTS is not set |
367 | # CONFIG_SCSI_LOGGING is not set | 378 | # CONFIG_SCSI_LOGGING is not set |
@@ -379,6 +390,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
379 | CONFIG_SCSI_LOWLEVEL=y | 390 | CONFIG_SCSI_LOWLEVEL=y |
380 | # CONFIG_ISCSI_TCP is not set | 391 | # CONFIG_ISCSI_TCP is not set |
381 | # CONFIG_SCSI_CXGB3_ISCSI is not set | 392 | # CONFIG_SCSI_CXGB3_ISCSI is not set |
393 | # CONFIG_SCSI_BNX2_ISCSI is not set | ||
382 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 394 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
383 | # CONFIG_SCSI_3W_9XXX is not set | 395 | # CONFIG_SCSI_3W_9XXX is not set |
384 | # CONFIG_SCSI_ACARD is not set | 396 | # CONFIG_SCSI_ACARD is not set |
@@ -387,6 +399,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
387 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 399 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
388 | # CONFIG_SCSI_AIC79XX is not set | 400 | # CONFIG_SCSI_AIC79XX is not set |
389 | # CONFIG_SCSI_AIC94XX is not set | 401 | # CONFIG_SCSI_AIC94XX is not set |
402 | # CONFIG_SCSI_MVSAS is not set | ||
390 | # CONFIG_SCSI_ARCMSR is not set | 403 | # CONFIG_SCSI_ARCMSR is not set |
391 | # CONFIG_MEGARAID_NEWGEN is not set | 404 | # CONFIG_MEGARAID_NEWGEN is not set |
392 | # CONFIG_MEGARAID_LEGACY is not set | 405 | # CONFIG_MEGARAID_LEGACY is not set |
@@ -401,7 +414,6 @@ CONFIG_SCSI_LOWLEVEL=y | |||
401 | # CONFIG_SCSI_IPS is not set | 414 | # CONFIG_SCSI_IPS is not set |
402 | # CONFIG_SCSI_INITIO is not set | 415 | # CONFIG_SCSI_INITIO is not set |
403 | # CONFIG_SCSI_INIA100 is not set | 416 | # CONFIG_SCSI_INIA100 is not set |
404 | # CONFIG_SCSI_MVSAS is not set | ||
405 | # CONFIG_SCSI_STEX is not set | 417 | # CONFIG_SCSI_STEX is not set |
406 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 418 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
407 | # CONFIG_SCSI_QLOGIC_1280 is not set | 419 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -426,13 +438,16 @@ CONFIG_SCSI_SUNESP=y | |||
426 | # | 438 | # |
427 | 439 | ||
428 | # | 440 | # |
429 | # Enable only one of the two stacks, unless you know what you are doing | 441 | # You can enable one or both FireWire driver stacks. |
442 | # | ||
443 | |||
444 | # | ||
445 | # See the help texts for more information. | ||
430 | # | 446 | # |
431 | # CONFIG_FIREWIRE is not set | 447 | # CONFIG_FIREWIRE is not set |
432 | # CONFIG_IEEE1394 is not set | 448 | # CONFIG_IEEE1394 is not set |
433 | # CONFIG_I2O is not set | 449 | # CONFIG_I2O is not set |
434 | CONFIG_NETDEVICES=y | 450 | CONFIG_NETDEVICES=y |
435 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
436 | CONFIG_DUMMY=m | 451 | CONFIG_DUMMY=m |
437 | # CONFIG_BONDING is not set | 452 | # CONFIG_BONDING is not set |
438 | # CONFIG_MACVLAN is not set | 453 | # CONFIG_MACVLAN is not set |
@@ -463,6 +478,7 @@ CONFIG_SUNQE=m | |||
463 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | 478 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
464 | # CONFIG_NET_PCI is not set | 479 | # CONFIG_NET_PCI is not set |
465 | # CONFIG_B44 is not set | 480 | # CONFIG_B44 is not set |
481 | # CONFIG_KS8842 is not set | ||
466 | # CONFIG_ATL2 is not set | 482 | # CONFIG_ATL2 is not set |
467 | CONFIG_NETDEV_1000=y | 483 | CONFIG_NETDEV_1000=y |
468 | # CONFIG_ACENIC is not set | 484 | # CONFIG_ACENIC is not set |
@@ -482,6 +498,7 @@ CONFIG_NETDEV_1000=y | |||
482 | # CONFIG_VIA_VELOCITY is not set | 498 | # CONFIG_VIA_VELOCITY is not set |
483 | # CONFIG_TIGON3 is not set | 499 | # CONFIG_TIGON3 is not set |
484 | # CONFIG_BNX2 is not set | 500 | # CONFIG_BNX2 is not set |
501 | # CONFIG_CNIC is not set | ||
485 | # CONFIG_QLA3XXX is not set | 502 | # CONFIG_QLA3XXX is not set |
486 | # CONFIG_ATL1 is not set | 503 | # CONFIG_ATL1 is not set |
487 | # CONFIG_ATL1E is not set | 504 | # CONFIG_ATL1E is not set |
@@ -629,6 +646,11 @@ CONFIG_HW_RANDOM=m | |||
629 | CONFIG_DEVPORT=y | 646 | CONFIG_DEVPORT=y |
630 | # CONFIG_I2C is not set | 647 | # CONFIG_I2C is not set |
631 | # CONFIG_SPI is not set | 648 | # CONFIG_SPI is not set |
649 | |||
650 | # | ||
651 | # PPS support | ||
652 | # | ||
653 | # CONFIG_PPS is not set | ||
632 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 654 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
633 | # CONFIG_GPIOLIB is not set | 655 | # CONFIG_GPIOLIB is not set |
634 | # CONFIG_W1 is not set | 656 | # CONFIG_W1 is not set |
@@ -668,22 +690,7 @@ CONFIG_SSB_POSSIBLE=y | |||
668 | # CONFIG_HTC_PASIC3 is not set | 690 | # CONFIG_HTC_PASIC3 is not set |
669 | # CONFIG_MFD_TMIO is not set | 691 | # CONFIG_MFD_TMIO is not set |
670 | # CONFIG_REGULATOR is not set | 692 | # CONFIG_REGULATOR is not set |
671 | 693 | # CONFIG_MEDIA_SUPPORT is not set | |
672 | # | ||
673 | # Multimedia devices | ||
674 | # | ||
675 | |||
676 | # | ||
677 | # Multimedia core support | ||
678 | # | ||
679 | # CONFIG_VIDEO_DEV is not set | ||
680 | # CONFIG_DVB_CORE is not set | ||
681 | # CONFIG_VIDEO_MEDIA is not set | ||
682 | |||
683 | # | ||
684 | # Multimedia drivers | ||
685 | # | ||
686 | # CONFIG_DAB is not set | ||
687 | 694 | ||
688 | # | 695 | # |
689 | # Graphics support | 696 | # Graphics support |
@@ -776,6 +783,10 @@ CONFIG_RTC_DRV_M48T59=y | |||
776 | # CONFIG_DMADEVICES is not set | 783 | # CONFIG_DMADEVICES is not set |
777 | # CONFIG_AUXDISPLAY is not set | 784 | # CONFIG_AUXDISPLAY is not set |
778 | # CONFIG_UIO is not set | 785 | # CONFIG_UIO is not set |
786 | |||
787 | # | ||
788 | # TI VLYNQ | ||
789 | # | ||
779 | # CONFIG_STAGING is not set | 790 | # CONFIG_STAGING is not set |
780 | 791 | ||
781 | # | 792 | # |
@@ -799,10 +810,12 @@ CONFIG_FS_MBCACHE=y | |||
799 | # CONFIG_REISERFS_FS is not set | 810 | # CONFIG_REISERFS_FS is not set |
800 | # CONFIG_JFS_FS is not set | 811 | # CONFIG_JFS_FS is not set |
801 | CONFIG_FS_POSIX_ACL=y | 812 | CONFIG_FS_POSIX_ACL=y |
802 | CONFIG_FILE_LOCKING=y | ||
803 | # CONFIG_XFS_FS is not set | 813 | # CONFIG_XFS_FS is not set |
814 | # CONFIG_GFS2_FS is not set | ||
804 | # CONFIG_OCFS2_FS is not set | 815 | # CONFIG_OCFS2_FS is not set |
805 | # CONFIG_BTRFS_FS is not set | 816 | # CONFIG_BTRFS_FS is not set |
817 | CONFIG_FILE_LOCKING=y | ||
818 | CONFIG_FSNOTIFY=y | ||
806 | CONFIG_DNOTIFY=y | 819 | CONFIG_DNOTIFY=y |
807 | CONFIG_INOTIFY=y | 820 | CONFIG_INOTIFY=y |
808 | CONFIG_INOTIFY_USER=y | 821 | CONFIG_INOTIFY_USER=y |
@@ -985,6 +998,7 @@ CONFIG_KGDB=y | |||
985 | CONFIG_KGDB_SERIAL_CONSOLE=y | 998 | CONFIG_KGDB_SERIAL_CONSOLE=y |
986 | CONFIG_KGDB_TESTS=y | 999 | CONFIG_KGDB_TESTS=y |
987 | # CONFIG_KGDB_TESTS_ON_BOOT is not set | 1000 | # CONFIG_KGDB_TESTS_ON_BOOT is not set |
1001 | # CONFIG_KMEMCHECK is not set | ||
988 | # CONFIG_DEBUG_STACK_USAGE is not set | 1002 | # CONFIG_DEBUG_STACK_USAGE is not set |
989 | # CONFIG_STACK_DEBUG is not set | 1003 | # CONFIG_STACK_DEBUG is not set |
990 | 1004 | ||
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index 0123a4c596ce..fdddf7a6f725 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_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.30 | 3 | # Linux kernel version: 2.6.31-rc1 |
4 | # Tue Jun 16 04:59:36 2009 | 4 | # Tue Aug 18 23:56:02 2009 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_SPARC=y | 7 | CONFIG_SPARC=y |
@@ -26,6 +26,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y | |||
26 | CONFIG_OF=y | 26 | CONFIG_OF=y |
27 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | 27 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y |
28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
29 | CONFIG_CONSTRUCTORS=y | ||
29 | 30 | ||
30 | # | 31 | # |
31 | # General setup | 32 | # General setup |
@@ -119,6 +120,11 @@ CONFIG_HAVE_KPROBES=y | |||
119 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
121 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 122 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
123 | |||
124 | # | ||
125 | # GCOV-based kernel profiling | ||
126 | # | ||
127 | # CONFIG_GCOV_KERNEL is not set | ||
122 | # CONFIG_SLOW_WORK is not set | 128 | # CONFIG_SLOW_WORK is not set |
123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
124 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
@@ -204,7 +210,6 @@ CONFIG_MIGRATION=y | |||
204 | CONFIG_PHYS_ADDR_T_64BIT=y | 210 | CONFIG_PHYS_ADDR_T_64BIT=y |
205 | CONFIG_ZONE_DMA_FLAG=0 | 211 | CONFIG_ZONE_DMA_FLAG=0 |
206 | CONFIG_NR_QUICK=1 | 212 | CONFIG_NR_QUICK=1 |
207 | CONFIG_UNEVICTABLE_LRU=y | ||
208 | CONFIG_HAVE_MLOCK=y | 213 | CONFIG_HAVE_MLOCK=y |
209 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y | 214 | CONFIG_HAVE_MLOCKED_PAGE_BIT=y |
210 | CONFIG_DEFAULT_MMAP_MIN_ADDR=8192 | 215 | CONFIG_DEFAULT_MMAP_MIN_ADDR=8192 |
@@ -410,6 +415,7 @@ CONFIG_MISC_DEVICES=y | |||
410 | # | 415 | # |
411 | # CONFIG_EEPROM_AT24 is not set | 416 | # CONFIG_EEPROM_AT24 is not set |
412 | # CONFIG_EEPROM_LEGACY is not set | 417 | # CONFIG_EEPROM_LEGACY is not set |
418 | # CONFIG_EEPROM_MAX6875 is not set | ||
413 | # CONFIG_EEPROM_93CX6 is not set | 419 | # CONFIG_EEPROM_93CX6 is not set |
414 | # CONFIG_CB710_CORE is not set | 420 | # CONFIG_CB710_CORE is not set |
415 | CONFIG_HAVE_IDE=y | 421 | CONFIG_HAVE_IDE=y |
@@ -562,6 +568,7 @@ CONFIG_BLK_DEV_DM=m | |||
562 | CONFIG_DM_CRYPT=m | 568 | CONFIG_DM_CRYPT=m |
563 | CONFIG_DM_SNAPSHOT=m | 569 | CONFIG_DM_SNAPSHOT=m |
564 | CONFIG_DM_MIRROR=m | 570 | CONFIG_DM_MIRROR=m |
571 | # CONFIG_DM_LOG_USERSPACE is not set | ||
565 | CONFIG_DM_ZERO=m | 572 | CONFIG_DM_ZERO=m |
566 | # CONFIG_DM_MULTIPATH is not set | 573 | # CONFIG_DM_MULTIPATH is not set |
567 | # CONFIG_DM_DELAY is not set | 574 | # CONFIG_DM_DELAY is not set |
@@ -573,7 +580,11 @@ CONFIG_DM_ZERO=m | |||
573 | # | 580 | # |
574 | 581 | ||
575 | # | 582 | # |
576 | # Enable only one of the two stacks, unless you know what you are doing | 583 | # You can enable one or both FireWire driver stacks. |
584 | # | ||
585 | |||
586 | # | ||
587 | # See the help texts for more information. | ||
577 | # | 588 | # |
578 | # CONFIG_FIREWIRE is not set | 589 | # CONFIG_FIREWIRE is not set |
579 | # CONFIG_IEEE1394 is not set | 590 | # CONFIG_IEEE1394 is not set |
@@ -667,6 +678,7 @@ CONFIG_E1000E=m | |||
667 | # CONFIG_VIA_VELOCITY is not set | 678 | # CONFIG_VIA_VELOCITY is not set |
668 | CONFIG_TIGON3=m | 679 | CONFIG_TIGON3=m |
669 | CONFIG_BNX2=m | 680 | CONFIG_BNX2=m |
681 | # CONFIG_CNIC is not set | ||
670 | # CONFIG_QLA3XXX is not set | 682 | # CONFIG_QLA3XXX is not set |
671 | # CONFIG_ATL1 is not set | 683 | # CONFIG_ATL1 is not set |
672 | # CONFIG_ATL1E is not set | 684 | # CONFIG_ATL1E is not set |
@@ -773,6 +785,7 @@ CONFIG_MOUSE_SERIAL=y | |||
773 | # CONFIG_MOUSE_APPLETOUCH is not set | 785 | # CONFIG_MOUSE_APPLETOUCH is not set |
774 | # CONFIG_MOUSE_BCM5974 is not set | 786 | # CONFIG_MOUSE_BCM5974 is not set |
775 | # CONFIG_MOUSE_VSXXXAA is not set | 787 | # CONFIG_MOUSE_VSXXXAA is not set |
788 | # CONFIG_MOUSE_SYNAPTICS_I2C is not set | ||
776 | # CONFIG_INPUT_JOYSTICK is not set | 789 | # CONFIG_INPUT_JOYSTICK is not set |
777 | # CONFIG_INPUT_TABLET is not set | 790 | # CONFIG_INPUT_TABLET is not set |
778 | # CONFIG_INPUT_TOUCHSCREEN is not set | 791 | # CONFIG_INPUT_TOUCHSCREEN is not set |
@@ -870,6 +883,7 @@ CONFIG_I2C_ALGOBIT=y | |||
870 | # | 883 | # |
871 | # I2C system bus drivers (mostly embedded / system-on-chip) | 884 | # I2C system bus drivers (mostly embedded / system-on-chip) |
872 | # | 885 | # |
886 | # CONFIG_I2C_DESIGNWARE is not set | ||
873 | # CONFIG_I2C_OCORES is not set | 887 | # CONFIG_I2C_OCORES is not set |
874 | # CONFIG_I2C_SIMTEC is not set | 888 | # CONFIG_I2C_SIMTEC is not set |
875 | 889 | ||
@@ -898,13 +912,17 @@ CONFIG_I2C_ALGOBIT=y | |||
898 | # CONFIG_SENSORS_PCF8574 is not set | 912 | # CONFIG_SENSORS_PCF8574 is not set |
899 | # CONFIG_PCF8575 is not set | 913 | # CONFIG_PCF8575 is not set |
900 | # CONFIG_SENSORS_PCA9539 is not set | 914 | # CONFIG_SENSORS_PCA9539 is not set |
901 | # CONFIG_SENSORS_MAX6875 is not set | ||
902 | # CONFIG_SENSORS_TSL2550 is not set | 915 | # CONFIG_SENSORS_TSL2550 is not set |
903 | # CONFIG_I2C_DEBUG_CORE is not set | 916 | # CONFIG_I2C_DEBUG_CORE is not set |
904 | # CONFIG_I2C_DEBUG_ALGO is not set | 917 | # CONFIG_I2C_DEBUG_ALGO is not set |
905 | # CONFIG_I2C_DEBUG_BUS is not set | 918 | # CONFIG_I2C_DEBUG_BUS is not set |
906 | # CONFIG_I2C_DEBUG_CHIP is not set | 919 | # CONFIG_I2C_DEBUG_CHIP is not set |
907 | # CONFIG_SPI is not set | 920 | # CONFIG_SPI is not set |
921 | |||
922 | # | ||
923 | # PPS support | ||
924 | # | ||
925 | # CONFIG_PPS is not set | ||
908 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 926 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
909 | # CONFIG_GPIOLIB is not set | 927 | # CONFIG_GPIOLIB is not set |
910 | # CONFIG_W1 is not set | 928 | # CONFIG_W1 is not set |
@@ -959,6 +977,7 @@ CONFIG_HWMON=y | |||
959 | # CONFIG_SENSORS_SMSC47B397 is not set | 977 | # CONFIG_SENSORS_SMSC47B397 is not set |
960 | # CONFIG_SENSORS_ADS7828 is not set | 978 | # CONFIG_SENSORS_ADS7828 is not set |
961 | # CONFIG_SENSORS_THMC50 is not set | 979 | # CONFIG_SENSORS_THMC50 is not set |
980 | # CONFIG_SENSORS_TMP401 is not set | ||
962 | # CONFIG_SENSORS_VIA686A is not set | 981 | # CONFIG_SENSORS_VIA686A is not set |
963 | # CONFIG_SENSORS_VT1211 is not set | 982 | # CONFIG_SENSORS_VT1211 is not set |
964 | # CONFIG_SENSORS_VT8231 is not set | 983 | # CONFIG_SENSORS_VT8231 is not set |
@@ -994,23 +1013,9 @@ CONFIG_SSB_POSSIBLE=y | |||
994 | # CONFIG_MFD_WM8400 is not set | 1013 | # CONFIG_MFD_WM8400 is not set |
995 | # CONFIG_MFD_WM8350_I2C is not set | 1014 | # CONFIG_MFD_WM8350_I2C is not set |
996 | # CONFIG_MFD_PCF50633 is not set | 1015 | # CONFIG_MFD_PCF50633 is not set |
1016 | # CONFIG_AB3100_CORE is not set | ||
997 | # CONFIG_REGULATOR is not set | 1017 | # CONFIG_REGULATOR is not set |
998 | 1018 | # CONFIG_MEDIA_SUPPORT is not set | |
999 | # | ||
1000 | # Multimedia devices | ||
1001 | # | ||
1002 | |||
1003 | # | ||
1004 | # Multimedia core support | ||
1005 | # | ||
1006 | # CONFIG_VIDEO_DEV is not set | ||
1007 | # CONFIG_DVB_CORE is not set | ||
1008 | # CONFIG_VIDEO_MEDIA is not set | ||
1009 | |||
1010 | # | ||
1011 | # Multimedia drivers | ||
1012 | # | ||
1013 | # CONFIG_DAB is not set | ||
1014 | 1019 | ||
1015 | # | 1020 | # |
1016 | # Graphics support | 1021 | # Graphics support |
@@ -1284,7 +1289,6 @@ CONFIG_USB=y | |||
1284 | # | 1289 | # |
1285 | # Miscellaneous USB options | 1290 | # Miscellaneous USB options |
1286 | # | 1291 | # |
1287 | CONFIG_USB_DEVICEFS=y | ||
1288 | # CONFIG_USB_DEVICE_CLASS is not set | 1292 | # CONFIG_USB_DEVICE_CLASS is not set |
1289 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1293 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1290 | # CONFIG_USB_OTG is not set | 1294 | # CONFIG_USB_OTG is not set |
@@ -1296,6 +1300,7 @@ CONFIG_USB_DEVICEFS=y | |||
1296 | # USB Host Controller Drivers | 1300 | # USB Host Controller Drivers |
1297 | # | 1301 | # |
1298 | # CONFIG_USB_C67X00_HCD is not set | 1302 | # CONFIG_USB_C67X00_HCD is not set |
1303 | # CONFIG_USB_XHCI_HCD is not set | ||
1299 | CONFIG_USB_EHCI_HCD=m | 1304 | CONFIG_USB_EHCI_HCD=m |
1300 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1305 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1301 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1306 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
@@ -1374,7 +1379,6 @@ CONFIG_USB_STORAGE=m | |||
1374 | # CONFIG_USB_LD is not set | 1379 | # CONFIG_USB_LD is not set |
1375 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1380 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1376 | # CONFIG_USB_IOWARRIOR is not set | 1381 | # CONFIG_USB_IOWARRIOR is not set |
1377 | # CONFIG_USB_TEST is not set | ||
1378 | # CONFIG_USB_ISIGHTFW is not set | 1382 | # CONFIG_USB_ISIGHTFW is not set |
1379 | # CONFIG_USB_VST is not set | 1383 | # CONFIG_USB_VST is not set |
1380 | # CONFIG_USB_GADGET is not set | 1384 | # CONFIG_USB_GADGET is not set |
@@ -1420,6 +1424,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1420 | # CONFIG_RTC_DRV_S35390A is not set | 1424 | # CONFIG_RTC_DRV_S35390A is not set |
1421 | # CONFIG_RTC_DRV_FM3130 is not set | 1425 | # CONFIG_RTC_DRV_FM3130 is not set |
1422 | # CONFIG_RTC_DRV_RX8581 is not set | 1426 | # CONFIG_RTC_DRV_RX8581 is not set |
1427 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1423 | 1428 | ||
1424 | # | 1429 | # |
1425 | # SPI RTC drivers | 1430 | # SPI RTC drivers |
@@ -1448,6 +1453,10 @@ CONFIG_RTC_DRV_STARFIRE=y | |||
1448 | # CONFIG_DMADEVICES is not set | 1453 | # CONFIG_DMADEVICES is not set |
1449 | # CONFIG_AUXDISPLAY is not set | 1454 | # CONFIG_AUXDISPLAY is not set |
1450 | # CONFIG_UIO is not set | 1455 | # CONFIG_UIO is not set |
1456 | |||
1457 | # | ||
1458 | # TI VLYNQ | ||
1459 | # | ||
1451 | # CONFIG_STAGING is not set | 1460 | # CONFIG_STAGING is not set |
1452 | 1461 | ||
1453 | # | 1462 | # |
@@ -1480,11 +1489,11 @@ CONFIG_FS_MBCACHE=y | |||
1480 | # CONFIG_REISERFS_FS is not set | 1489 | # CONFIG_REISERFS_FS is not set |
1481 | # CONFIG_JFS_FS is not set | 1490 | # CONFIG_JFS_FS is not set |
1482 | CONFIG_FS_POSIX_ACL=y | 1491 | CONFIG_FS_POSIX_ACL=y |
1483 | CONFIG_FILE_LOCKING=y | ||
1484 | # CONFIG_XFS_FS is not set | 1492 | # CONFIG_XFS_FS is not set |
1485 | # CONFIG_GFS2_FS is not set | 1493 | # CONFIG_GFS2_FS is not set |
1486 | # CONFIG_OCFS2_FS is not set | 1494 | # CONFIG_OCFS2_FS is not set |
1487 | # CONFIG_BTRFS_FS is not set | 1495 | # CONFIG_BTRFS_FS is not set |
1496 | CONFIG_FILE_LOCKING=y | ||
1488 | CONFIG_FSNOTIFY=y | 1497 | CONFIG_FSNOTIFY=y |
1489 | CONFIG_DNOTIFY=y | 1498 | CONFIG_DNOTIFY=y |
1490 | CONFIG_INOTIFY=y | 1499 | CONFIG_INOTIFY=y |
@@ -1560,7 +1569,7 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
1560 | # CONFIG_PARTITION_ADVANCED is not set | 1569 | # CONFIG_PARTITION_ADVANCED is not set |
1561 | CONFIG_MSDOS_PARTITION=y | 1570 | CONFIG_MSDOS_PARTITION=y |
1562 | CONFIG_SUN_PARTITION=y | 1571 | CONFIG_SUN_PARTITION=y |
1563 | CONFIG_NLS=m | 1572 | CONFIG_NLS=y |
1564 | CONFIG_NLS_DEFAULT="iso8859-1" | 1573 | CONFIG_NLS_DEFAULT="iso8859-1" |
1565 | # CONFIG_NLS_CODEPAGE_437 is not set | 1574 | # CONFIG_NLS_CODEPAGE_437 is not set |
1566 | # CONFIG_NLS_CODEPAGE_737 is not set | 1575 | # CONFIG_NLS_CODEPAGE_737 is not set |
diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h index 681582d26969..ca2b34456c4b 100644 --- a/arch/sparc/include/asm/pgalloc_32.h +++ b/arch/sparc/include/asm/pgalloc_32.h | |||
@@ -44,8 +44,8 @@ BTFIXUPDEF_CALL(pmd_t *, pmd_alloc_one, struct mm_struct *, unsigned long) | |||
44 | BTFIXUPDEF_CALL(void, free_pmd_fast, pmd_t *) | 44 | BTFIXUPDEF_CALL(void, free_pmd_fast, pmd_t *) |
45 | #define free_pmd_fast(pmd) BTFIXUP_CALL(free_pmd_fast)(pmd) | 45 | #define free_pmd_fast(pmd) BTFIXUP_CALL(free_pmd_fast)(pmd) |
46 | 46 | ||
47 | #define pmd_free(mm, pmd) free_pmd_fast(pmd) | 47 | #define pmd_free(mm, pmd) free_pmd_fast(pmd) |
48 | #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd) | 48 | #define __pmd_free_tlb(tlb, pmd, addr) pmd_free((tlb)->mm, pmd) |
49 | 49 | ||
50 | BTFIXUPDEF_CALL(void, pmd_populate, pmd_t *, struct page *) | 50 | BTFIXUPDEF_CALL(void, pmd_populate, pmd_t *, struct page *) |
51 | #define pmd_populate(MM, PMD, PTE) BTFIXUP_CALL(pmd_populate)(PMD, PTE) | 51 | #define pmd_populate(MM, PMD, PTE) BTFIXUP_CALL(pmd_populate)(PMD, PTE) |
@@ -62,7 +62,7 @@ BTFIXUPDEF_CALL(void, free_pte_fast, pte_t *) | |||
62 | #define pte_free_kernel(mm, pte) BTFIXUP_CALL(free_pte_fast)(pte) | 62 | #define pte_free_kernel(mm, pte) BTFIXUP_CALL(free_pte_fast)(pte) |
63 | 63 | ||
64 | BTFIXUPDEF_CALL(void, pte_free, pgtable_t ) | 64 | BTFIXUPDEF_CALL(void, pte_free, pgtable_t ) |
65 | #define pte_free(mm, pte) BTFIXUP_CALL(pte_free)(pte) | 65 | #define pte_free(mm, pte) BTFIXUP_CALL(pte_free)(pte) |
66 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) | 66 | #define __pte_free_tlb(tlb, pte, addr) pte_free((tlb)->mm, pte) |
67 | 67 | ||
68 | #endif /* _SPARC_PGALLOC_H */ | 68 | #endif /* _SPARC_PGALLOC_H */ |
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index b049abf9902f..0ff92fa22064 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h | |||
@@ -726,11 +726,17 @@ extern unsigned long pte_file(pte_t); | |||
726 | extern pte_t pgoff_to_pte(unsigned long); | 726 | extern pte_t pgoff_to_pte(unsigned long); |
727 | #define PTE_FILE_MAX_BITS (64UL - PAGE_SHIFT - 1UL) | 727 | #define PTE_FILE_MAX_BITS (64UL - PAGE_SHIFT - 1UL) |
728 | 728 | ||
729 | extern unsigned long *sparc64_valid_addr_bitmap; | 729 | extern unsigned long sparc64_valid_addr_bitmap[]; |
730 | 730 | ||
731 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ | 731 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ |
732 | #define kern_addr_valid(addr) \ | 732 | static inline bool kern_addr_valid(unsigned long addr) |
733 | (test_bit(__pa((unsigned long)(addr))>>22, sparc64_valid_addr_bitmap)) | 733 | { |
734 | unsigned long paddr = __pa(addr); | ||
735 | |||
736 | if ((paddr >> 41UL) != 0UL) | ||
737 | return false; | ||
738 | return test_bit(paddr >> 22, sparc64_valid_addr_bitmap); | ||
739 | } | ||
734 | 740 | ||
735 | extern int page_in_phys_avail(unsigned long paddr); | 741 | extern int page_in_phys_avail(unsigned long paddr); |
736 | 742 | ||
diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h index ee38e731bfa6..dca406b9b6fc 100644 --- a/arch/sparc/include/asm/tlb_64.h +++ b/arch/sparc/include/asm/tlb_64.h | |||
@@ -100,9 +100,9 @@ static inline void tlb_remove_page(struct mmu_gather *mp, struct page *page) | |||
100 | } | 100 | } |
101 | 101 | ||
102 | #define tlb_remove_tlb_entry(mp,ptep,addr) do { } while (0) | 102 | #define tlb_remove_tlb_entry(mp,ptep,addr) do { } while (0) |
103 | #define pte_free_tlb(mp, ptepage) pte_free((mp)->mm, ptepage) | 103 | #define pte_free_tlb(mp, ptepage, addr) pte_free((mp)->mm, ptepage) |
104 | #define pmd_free_tlb(mp, pmdp) pmd_free((mp)->mm, pmdp) | 104 | #define pmd_free_tlb(mp, pmdp, addr) pmd_free((mp)->mm, pmdp) |
105 | #define pud_free_tlb(tlb,pudp) __pud_free_tlb(tlb,pudp) | 105 | #define pud_free_tlb(tlb,pudp, addr) __pud_free_tlb(tlb,pudp,addr) |
106 | 106 | ||
107 | #define tlb_migrate_finish(mm) do { } while (0) | 107 | #define tlb_migrate_finish(mm) do { } while (0) |
108 | #define tlb_start_vma(tlb, vma) do { } while (0) | 108 | #define tlb_start_vma(tlb, vma) do { } while (0) |
diff --git a/arch/sparc/kernel/ktlb.S b/arch/sparc/kernel/ktlb.S index cef8defcd7a9..3ea6e8cde8c5 100644 --- a/arch/sparc/kernel/ktlb.S +++ b/arch/sparc/kernel/ktlb.S | |||
@@ -151,12 +151,46 @@ kvmap_dtlb_4v: | |||
151 | * Must preserve %g1 and %g6 (TAG). | 151 | * Must preserve %g1 and %g6 (TAG). |
152 | */ | 152 | */ |
153 | kvmap_dtlb_tsb4m_miss: | 153 | kvmap_dtlb_tsb4m_miss: |
154 | sethi %hi(kpte_linear_bitmap), %g2 | 154 | /* Clear the PAGE_OFFSET top virtual bits, shift |
155 | or %g2, %lo(kpte_linear_bitmap), %g2 | 155 | * down to get PFN, and make sure PFN is in range. |
156 | */ | ||
157 | sllx %g4, 21, %g5 | ||
156 | 158 | ||
157 | /* Clear the PAGE_OFFSET top virtual bits, then shift | 159 | /* Check to see if we know about valid memory at the 4MB |
158 | * down to get a 256MB physical address index. | 160 | * chunk this physical address will reside within. |
159 | */ | 161 | */ |
162 | srlx %g5, 21 + 41, %g2 | ||
163 | brnz,pn %g2, kvmap_dtlb_longpath | ||
164 | nop | ||
165 | |||
166 | /* This unconditional branch and delay-slot nop gets patched | ||
167 | * by the sethi sequence once the bitmap is properly setup. | ||
168 | */ | ||
169 | .globl valid_addr_bitmap_insn | ||
170 | valid_addr_bitmap_insn: | ||
171 | ba,pt %xcc, 2f | ||
172 | nop | ||
173 | .subsection 2 | ||
174 | .globl valid_addr_bitmap_patch | ||
175 | valid_addr_bitmap_patch: | ||
176 | sethi %hi(sparc64_valid_addr_bitmap), %g7 | ||
177 | or %g7, %lo(sparc64_valid_addr_bitmap), %g7 | ||
178 | .previous | ||
179 | |||
180 | srlx %g5, 21 + 22, %g2 | ||
181 | srlx %g2, 6, %g5 | ||
182 | and %g2, 63, %g2 | ||
183 | sllx %g5, 3, %g5 | ||
184 | ldx [%g7 + %g5], %g5 | ||
185 | mov 1, %g7 | ||
186 | sllx %g7, %g2, %g7 | ||
187 | andcc %g5, %g7, %g0 | ||
188 | be,pn %xcc, kvmap_dtlb_longpath | ||
189 | |||
190 | 2: sethi %hi(kpte_linear_bitmap), %g2 | ||
191 | or %g2, %lo(kpte_linear_bitmap), %g2 | ||
192 | |||
193 | /* Get the 256MB physical address index. */ | ||
160 | sllx %g4, 21, %g5 | 194 | sllx %g4, 21, %g5 |
161 | mov 1, %g7 | 195 | mov 1, %g7 |
162 | srlx %g5, 21 + 28, %g5 | 196 | srlx %g5, 21 + 28, %g5 |
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index fa44eaf8d897..3691907a43b4 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c | |||
@@ -1499,7 +1499,7 @@ void __init setup_per_cpu_areas(void) | |||
1499 | dyn_size = pcpur_size - static_size - PERCPU_MODULE_RESERVE; | 1499 | dyn_size = pcpur_size - static_size - PERCPU_MODULE_RESERVE; |
1500 | 1500 | ||
1501 | 1501 | ||
1502 | ptrs_size = PFN_ALIGN(num_possible_cpus() * sizeof(pcpur_ptrs[0])); | 1502 | ptrs_size = PFN_ALIGN(nr_cpu_ids * sizeof(pcpur_ptrs[0])); |
1503 | pcpur_ptrs = alloc_bootmem(ptrs_size); | 1503 | pcpur_ptrs = alloc_bootmem(ptrs_size); |
1504 | 1504 | ||
1505 | for_each_possible_cpu(cpu) { | 1505 | for_each_possible_cpu(cpu) { |
@@ -1514,7 +1514,7 @@ void __init setup_per_cpu_areas(void) | |||
1514 | 1514 | ||
1515 | /* allocate address and map */ | 1515 | /* allocate address and map */ |
1516 | vm.flags = VM_ALLOC; | 1516 | vm.flags = VM_ALLOC; |
1517 | vm.size = num_possible_cpus() * PCPU_CHUNK_SIZE; | 1517 | vm.size = nr_cpu_ids * PCPU_CHUNK_SIZE; |
1518 | vm_area_register_early(&vm, PCPU_CHUNK_SIZE); | 1518 | vm_area_register_early(&vm, PCPU_CHUNK_SIZE); |
1519 | 1519 | ||
1520 | for_each_possible_cpu(cpu) { | 1520 | for_each_possible_cpu(cpu) { |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index 54fb02468f0d..68791cad7b74 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
@@ -162,9 +162,6 @@ extern void cpu_panic(void); | |||
162 | */ | 162 | */ |
163 | 163 | ||
164 | extern struct linux_prom_registers smp_penguin_ctable; | 164 | extern struct linux_prom_registers smp_penguin_ctable; |
165 | extern unsigned long trapbase_cpu1[]; | ||
166 | extern unsigned long trapbase_cpu2[]; | ||
167 | extern unsigned long trapbase_cpu3[]; | ||
168 | 165 | ||
169 | void __init smp4d_boot_cpus(void) | 166 | void __init smp4d_boot_cpus(void) |
170 | { | 167 | { |
@@ -235,25 +232,6 @@ void __init smp4d_smp_done(void) | |||
235 | *prev = first; | 232 | *prev = first; |
236 | local_flush_cache_all(); | 233 | local_flush_cache_all(); |
237 | 234 | ||
238 | /* Free unneeded trap tables */ | ||
239 | ClearPageReserved(virt_to_page(trapbase_cpu1)); | ||
240 | init_page_count(virt_to_page(trapbase_cpu1)); | ||
241 | free_page((unsigned long)trapbase_cpu1); | ||
242 | totalram_pages++; | ||
243 | num_physpages++; | ||
244 | |||
245 | ClearPageReserved(virt_to_page(trapbase_cpu2)); | ||
246 | init_page_count(virt_to_page(trapbase_cpu2)); | ||
247 | free_page((unsigned long)trapbase_cpu2); | ||
248 | totalram_pages++; | ||
249 | num_physpages++; | ||
250 | |||
251 | ClearPageReserved(virt_to_page(trapbase_cpu3)); | ||
252 | init_page_count(virt_to_page(trapbase_cpu3)); | ||
253 | free_page((unsigned long)trapbase_cpu3); | ||
254 | totalram_pages++; | ||
255 | num_physpages++; | ||
256 | |||
257 | /* Ok, they are spinning and ready to go. */ | 235 | /* Ok, they are spinning and ready to go. */ |
258 | smp_processors_ready = 1; | 236 | smp_processors_ready = 1; |
259 | sun4d_distribute_irqs(); | 237 | sun4d_distribute_irqs(); |
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 960b113d0006..762d6eedd944 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -121,9 +121,6 @@ void __cpuinit smp4m_callin(void) | |||
121 | */ | 121 | */ |
122 | 122 | ||
123 | extern struct linux_prom_registers smp_penguin_ctable; | 123 | extern struct linux_prom_registers smp_penguin_ctable; |
124 | extern unsigned long trapbase_cpu1[]; | ||
125 | extern unsigned long trapbase_cpu2[]; | ||
126 | extern unsigned long trapbase_cpu3[]; | ||
127 | 124 | ||
128 | void __init smp4m_boot_cpus(void) | 125 | void __init smp4m_boot_cpus(void) |
129 | { | 126 | { |
@@ -193,29 +190,6 @@ void __init smp4m_smp_done(void) | |||
193 | *prev = first; | 190 | *prev = first; |
194 | local_flush_cache_all(); | 191 | local_flush_cache_all(); |
195 | 192 | ||
196 | /* Free unneeded trap tables */ | ||
197 | if (!cpu_isset(1, cpu_present_map)) { | ||
198 | ClearPageReserved(virt_to_page(trapbase_cpu1)); | ||
199 | init_page_count(virt_to_page(trapbase_cpu1)); | ||
200 | free_page((unsigned long)trapbase_cpu1); | ||
201 | totalram_pages++; | ||
202 | num_physpages++; | ||
203 | } | ||
204 | if (!cpu_isset(2, cpu_present_map)) { | ||
205 | ClearPageReserved(virt_to_page(trapbase_cpu2)); | ||
206 | init_page_count(virt_to_page(trapbase_cpu2)); | ||
207 | free_page((unsigned long)trapbase_cpu2); | ||
208 | totalram_pages++; | ||
209 | num_physpages++; | ||
210 | } | ||
211 | if (!cpu_isset(3, cpu_present_map)) { | ||
212 | ClearPageReserved(virt_to_page(trapbase_cpu3)); | ||
213 | init_page_count(virt_to_page(trapbase_cpu3)); | ||
214 | free_page((unsigned long)trapbase_cpu3); | ||
215 | totalram_pages++; | ||
216 | num_physpages++; | ||
217 | } | ||
218 | |||
219 | /* Ok, they are spinning and ready to go. */ | 193 | /* Ok, they are spinning and ready to go. */ |
220 | } | 194 | } |
221 | 195 | ||
diff --git a/arch/sparc/kernel/sys32.S b/arch/sparc/kernel/sys32.S index f061c4dda9ef..aed94869ad6a 100644 --- a/arch/sparc/kernel/sys32.S +++ b/arch/sparc/kernel/sys32.S | |||
@@ -134,10 +134,12 @@ SIGN1(sys32_getpeername, sys_getpeername, %o0) | |||
134 | SIGN1(sys32_getsockname, sys_getsockname, %o0) | 134 | SIGN1(sys32_getsockname, sys_getsockname, %o0) |
135 | SIGN2(sys32_ioprio_get, sys_ioprio_get, %o0, %o1) | 135 | SIGN2(sys32_ioprio_get, sys_ioprio_get, %o0, %o1) |
136 | SIGN3(sys32_ioprio_set, sys_ioprio_set, %o0, %o1, %o2) | 136 | SIGN3(sys32_ioprio_set, sys_ioprio_set, %o0, %o1, %o2) |
137 | SIGN2(sys32_splice, sys_splice, %o0, %o1) | 137 | SIGN2(sys32_splice, sys_splice, %o0, %o2) |
138 | SIGN2(sys32_sync_file_range, compat_sync_file_range, %o0, %o5) | 138 | SIGN2(sys32_sync_file_range, compat_sync_file_range, %o0, %o5) |
139 | SIGN2(sys32_tee, sys_tee, %o0, %o1) | 139 | SIGN2(sys32_tee, sys_tee, %o0, %o1) |
140 | SIGN1(sys32_vmsplice, compat_sys_vmsplice, %o0) | 140 | SIGN1(sys32_vmsplice, compat_sys_vmsplice, %o0) |
141 | SIGN1(sys32_truncate, sys_truncate, %o1) | ||
142 | SIGN1(sys32_ftruncate, sys_ftruncate, %o1) | ||
141 | 143 | ||
142 | .globl sys32_mmap2 | 144 | .globl sys32_mmap2 |
143 | sys32_mmap2: | 145 | sys32_mmap2: |
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S index 6b3ee88e253c..2ee7250ba7ae 100644 --- a/arch/sparc/kernel/systbls_64.S +++ b/arch/sparc/kernel/systbls_64.S | |||
@@ -43,8 +43,8 @@ sys_call_table32: | |||
43 | /*110*/ .word sys_setresgid, sys_getresgid, sys_setregid, sys_nis_syscall, sys_nis_syscall | 43 | /*110*/ .word sys_setresgid, sys_getresgid, sys_setregid, sys_nis_syscall, sys_nis_syscall |
44 | .word sys32_getgroups, compat_sys_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd | 44 | .word sys32_getgroups, compat_sys_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd |
45 | /*120*/ .word compat_sys_readv, compat_sys_writev, compat_sys_settimeofday, sys_fchown16, sys_fchmod | 45 | /*120*/ .word compat_sys_readv, compat_sys_writev, compat_sys_settimeofday, sys_fchown16, sys_fchmod |
46 | .word sys_nis_syscall, sys_setreuid16, sys_setregid16, sys_rename, sys_truncate | 46 | .word sys_nis_syscall, sys_setreuid16, sys_setregid16, sys_rename, sys32_truncate |
47 | /*130*/ .word sys_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall | 47 | /*130*/ .word sys32_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall |
48 | .word sys_nis_syscall, sys32_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64 | 48 | .word sys_nis_syscall, sys32_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64 |
49 | /*140*/ .word sys32_sendfile64, sys_nis_syscall, sys32_futex, sys_gettid, compat_sys_getrlimit | 49 | /*140*/ .word sys32_sendfile64, sys_nis_syscall, sys32_futex, sys_gettid, compat_sys_getrlimit |
50 | .word compat_sys_setrlimit, sys_pivot_root, sys32_prctl, sys_pciconfig_read, sys_pciconfig_write | 50 | .word compat_sys_setrlimit, sys_pivot_root, sys32_prctl, sys_pciconfig_read, sys_pciconfig_write |
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c index a5e30c642ee3..b99f81c4906f 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c | |||
@@ -319,9 +319,10 @@ no_context: | |||
319 | */ | 319 | */ |
320 | out_of_memory: | 320 | out_of_memory: |
321 | up_read(&mm->mmap_sem); | 321 | up_read(&mm->mmap_sem); |
322 | printk("VM: killing process %s\n", tsk->comm); | 322 | if (from_user) { |
323 | if (from_user) | 323 | pagefault_out_of_memory(); |
324 | do_group_exit(SIGKILL); | 324 | return; |
325 | } | ||
325 | goto no_context; | 326 | goto no_context; |
326 | 327 | ||
327 | do_sigbus: | 328 | do_sigbus: |
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index e5620b27c8bf..43b0da96a4fb 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c | |||
@@ -447,9 +447,10 @@ handle_kernel_fault: | |||
447 | out_of_memory: | 447 | out_of_memory: |
448 | insn = get_fault_insn(regs, insn); | 448 | insn = get_fault_insn(regs, insn); |
449 | up_read(&mm->mmap_sem); | 449 | up_read(&mm->mmap_sem); |
450 | printk("VM: killing process %s\n", current->comm); | 450 | if (!(regs->tstate & TSTATE_PRIV)) { |
451 | if (!(regs->tstate & TSTATE_PRIV)) | 451 | pagefault_out_of_memory(); |
452 | do_group_exit(SIGKILL); | 452 | return; |
453 | } | ||
453 | goto handle_kernel_fault; | 454 | goto handle_kernel_fault; |
454 | 455 | ||
455 | intr_or_no_mm: | 456 | intr_or_no_mm: |
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index ed6be6ba2f4e..a70a5e1904d9 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -145,7 +145,8 @@ static void __init read_obp_memory(const char *property, | |||
145 | cmp_p64, NULL); | 145 | cmp_p64, NULL); |
146 | } | 146 | } |
147 | 147 | ||
148 | unsigned long *sparc64_valid_addr_bitmap __read_mostly; | 148 | unsigned long sparc64_valid_addr_bitmap[VALID_ADDR_BITMAP_BYTES / |
149 | sizeof(unsigned long)]; | ||
149 | EXPORT_SYMBOL(sparc64_valid_addr_bitmap); | 150 | EXPORT_SYMBOL(sparc64_valid_addr_bitmap); |
150 | 151 | ||
151 | /* Kernel physical address base and size in bytes. */ | 152 | /* Kernel physical address base and size in bytes. */ |
@@ -1874,7 +1875,7 @@ static int pavail_rescan_ents __initdata; | |||
1874 | * memory list again, and make sure it provides at least as much | 1875 | * memory list again, and make sure it provides at least as much |
1875 | * memory as 'pavail' does. | 1876 | * memory as 'pavail' does. |
1876 | */ | 1877 | */ |
1877 | static void __init setup_valid_addr_bitmap_from_pavail(void) | 1878 | static void __init setup_valid_addr_bitmap_from_pavail(unsigned long *bitmap) |
1878 | { | 1879 | { |
1879 | int i; | 1880 | int i; |
1880 | 1881 | ||
@@ -1897,8 +1898,7 @@ static void __init setup_valid_addr_bitmap_from_pavail(void) | |||
1897 | 1898 | ||
1898 | if (new_start <= old_start && | 1899 | if (new_start <= old_start && |
1899 | new_end >= (old_start + PAGE_SIZE)) { | 1900 | new_end >= (old_start + PAGE_SIZE)) { |
1900 | set_bit(old_start >> 22, | 1901 | set_bit(old_start >> 22, bitmap); |
1901 | sparc64_valid_addr_bitmap); | ||
1902 | goto do_next_page; | 1902 | goto do_next_page; |
1903 | } | 1903 | } |
1904 | } | 1904 | } |
@@ -1919,20 +1919,21 @@ static void __init setup_valid_addr_bitmap_from_pavail(void) | |||
1919 | } | 1919 | } |
1920 | } | 1920 | } |
1921 | 1921 | ||
1922 | static void __init patch_tlb_miss_handler_bitmap(void) | ||
1923 | { | ||
1924 | extern unsigned int valid_addr_bitmap_insn[]; | ||
1925 | extern unsigned int valid_addr_bitmap_patch[]; | ||
1926 | |||
1927 | valid_addr_bitmap_insn[1] = valid_addr_bitmap_patch[1]; | ||
1928 | mb(); | ||
1929 | valid_addr_bitmap_insn[0] = valid_addr_bitmap_patch[0]; | ||
1930 | flushi(&valid_addr_bitmap_insn[0]); | ||
1931 | } | ||
1932 | |||
1922 | void __init mem_init(void) | 1933 | void __init mem_init(void) |
1923 | { | 1934 | { |
1924 | unsigned long codepages, datapages, initpages; | 1935 | unsigned long codepages, datapages, initpages; |
1925 | unsigned long addr, last; | 1936 | unsigned long addr, last; |
1926 | int i; | ||
1927 | |||
1928 | i = last_valid_pfn >> ((22 - PAGE_SHIFT) + 6); | ||
1929 | i += 1; | ||
1930 | sparc64_valid_addr_bitmap = (unsigned long *) alloc_bootmem(i << 3); | ||
1931 | if (sparc64_valid_addr_bitmap == NULL) { | ||
1932 | prom_printf("mem_init: Cannot alloc valid_addr_bitmap.\n"); | ||
1933 | prom_halt(); | ||
1934 | } | ||
1935 | memset(sparc64_valid_addr_bitmap, 0, i << 3); | ||
1936 | 1937 | ||
1937 | addr = PAGE_OFFSET + kern_base; | 1938 | addr = PAGE_OFFSET + kern_base; |
1938 | last = PAGE_ALIGN(kern_size) + addr; | 1939 | last = PAGE_ALIGN(kern_size) + addr; |
@@ -1941,15 +1942,19 @@ void __init mem_init(void) | |||
1941 | addr += PAGE_SIZE; | 1942 | addr += PAGE_SIZE; |
1942 | } | 1943 | } |
1943 | 1944 | ||
1944 | setup_valid_addr_bitmap_from_pavail(); | 1945 | setup_valid_addr_bitmap_from_pavail(sparc64_valid_addr_bitmap); |
1946 | patch_tlb_miss_handler_bitmap(); | ||
1945 | 1947 | ||
1946 | high_memory = __va(last_valid_pfn << PAGE_SHIFT); | 1948 | high_memory = __va(last_valid_pfn << PAGE_SHIFT); |
1947 | 1949 | ||
1948 | #ifdef CONFIG_NEED_MULTIPLE_NODES | 1950 | #ifdef CONFIG_NEED_MULTIPLE_NODES |
1949 | for_each_online_node(i) { | 1951 | { |
1950 | if (NODE_DATA(i)->node_spanned_pages != 0) { | 1952 | int i; |
1951 | totalram_pages += | 1953 | for_each_online_node(i) { |
1952 | free_all_bootmem_node(NODE_DATA(i)); | 1954 | if (NODE_DATA(i)->node_spanned_pages != 0) { |
1955 | totalram_pages += | ||
1956 | free_all_bootmem_node(NODE_DATA(i)); | ||
1957 | } | ||
1953 | } | 1958 | } |
1954 | } | 1959 | } |
1955 | #else | 1960 | #else |
diff --git a/arch/sparc/mm/init_64.h b/arch/sparc/mm/init_64.h index 16063870a489..c2f772dbd556 100644 --- a/arch/sparc/mm/init_64.h +++ b/arch/sparc/mm/init_64.h | |||
@@ -5,10 +5,13 @@ | |||
5 | * marked non-static so that assembler code can get at them. | 5 | * marked non-static so that assembler code can get at them. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #define MAX_PHYS_ADDRESS (1UL << 42UL) | 8 | #define MAX_PHYS_ADDRESS (1UL << 41UL) |
9 | #define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL) | 9 | #define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL) |
10 | #define KPTE_BITMAP_BYTES \ | 10 | #define KPTE_BITMAP_BYTES \ |
11 | ((MAX_PHYS_ADDRESS / KPTE_BITMAP_CHUNK_SZ) / 8) | 11 | ((MAX_PHYS_ADDRESS / KPTE_BITMAP_CHUNK_SZ) / 8) |
12 | #define VALID_ADDR_BITMAP_CHUNK_SZ (4UL * 1024UL * 1024UL) | ||
13 | #define VALID_ADDR_BITMAP_BYTES \ | ||
14 | ((MAX_PHYS_ADDRESS / VALID_ADDR_BITMAP_CHUNK_SZ) / 8) | ||
12 | 15 | ||
13 | extern unsigned long kern_linear_pte_xor[2]; | 16 | extern unsigned long kern_linear_pte_xor[2]; |
14 | extern unsigned long kpte_linear_bitmap[KPTE_BITMAP_BYTES / sizeof(unsigned long)]; | 17 | extern unsigned long kpte_linear_bitmap[KPTE_BITMAP_BYTES / sizeof(unsigned long)]; |
diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h index 718984359f8c..32c8ce4e1515 100644 --- a/arch/um/include/asm/pgalloc.h +++ b/arch/um/include/asm/pgalloc.h | |||
@@ -40,7 +40,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | |||
40 | __free_page(pte); | 40 | __free_page(pte); |
41 | } | 41 | } |
42 | 42 | ||
43 | #define __pte_free_tlb(tlb,pte) \ | 43 | #define __pte_free_tlb(tlb,pte, address) \ |
44 | do { \ | 44 | do { \ |
45 | pgtable_page_dtor(pte); \ | 45 | pgtable_page_dtor(pte); \ |
46 | tlb_remove_page((tlb),(pte)); \ | 46 | tlb_remove_page((tlb),(pte)); \ |
@@ -53,7 +53,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) | |||
53 | free_page((unsigned long)pmd); | 53 | free_page((unsigned long)pmd); |
54 | } | 54 | } |
55 | 55 | ||
56 | #define __pmd_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x)) | 56 | #define __pmd_free_tlb(tlb,x, address) tlb_remove_page((tlb),virt_to_page(x)) |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | #define check_pgt_cache() do { } while (0) | 59 | #define check_pgt_cache() do { } while (0) |
diff --git a/arch/um/include/asm/tlb.h b/arch/um/include/asm/tlb.h index 5240fa1c5e08..660caedac9eb 100644 --- a/arch/um/include/asm/tlb.h +++ b/arch/um/include/asm/tlb.h | |||
@@ -116,11 +116,11 @@ static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page) | |||
116 | __tlb_remove_tlb_entry(tlb, ptep, address); \ | 116 | __tlb_remove_tlb_entry(tlb, ptep, address); \ |
117 | } while (0) | 117 | } while (0) |
118 | 118 | ||
119 | #define pte_free_tlb(tlb, ptep) __pte_free_tlb(tlb, ptep) | 119 | #define pte_free_tlb(tlb, ptep, addr) __pte_free_tlb(tlb, ptep, addr) |
120 | 120 | ||
121 | #define pud_free_tlb(tlb, pudp) __pud_free_tlb(tlb, pudp) | 121 | #define pud_free_tlb(tlb, pudp, addr) __pud_free_tlb(tlb, pudp, addr) |
122 | 122 | ||
123 | #define pmd_free_tlb(tlb, pmdp) __pmd_free_tlb(tlb, pmdp) | 123 | #define pmd_free_tlb(tlb, pmdp, addr) __pmd_free_tlb(tlb, pmdp, addr) |
124 | 124 | ||
125 | #define tlb_migrate_finish(mm) do {} while (0) | 125 | #define tlb_migrate_finish(mm) do {} while (0) |
126 | 126 | ||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 738bdc6b0f8b..13ffa5df37d7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -24,6 +24,7 @@ config X86 | |||
24 | select HAVE_UNSTABLE_SCHED_CLOCK | 24 | select HAVE_UNSTABLE_SCHED_CLOCK |
25 | select HAVE_IDE | 25 | select HAVE_IDE |
26 | select HAVE_OPROFILE | 26 | select HAVE_OPROFILE |
27 | select HAVE_PERF_COUNTERS if (!M386 && !M486) | ||
27 | select HAVE_IOREMAP_PROT | 28 | select HAVE_IOREMAP_PROT |
28 | select HAVE_KPROBES | 29 | select HAVE_KPROBES |
29 | select ARCH_WANT_OPTIONAL_GPIOLIB | 30 | select ARCH_WANT_OPTIONAL_GPIOLIB |
@@ -742,7 +743,6 @@ config X86_UP_IOAPIC | |||
742 | config X86_LOCAL_APIC | 743 | config X86_LOCAL_APIC |
743 | def_bool y | 744 | def_bool y |
744 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC | 745 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC |
745 | select HAVE_PERF_COUNTERS if (!M386 && !M486) | ||
746 | 746 | ||
747 | config X86_IO_APIC | 747 | config X86_IO_APIC |
748 | def_bool y | 748 | def_bool y |
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index e2ff504b4ddc..f8ed0658404c 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | # create a compressed vmlinux image from the original vmlinux | 4 | # create a compressed vmlinux image from the original vmlinux |
5 | # | 5 | # |
6 | 6 | ||
7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o | 7 | targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o |
8 | 8 | ||
9 | KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 | 9 | KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 |
10 | KBUILD_CFLAGS += -fno-strict-aliasing -fPIC | 10 | KBUILD_CFLAGS += -fno-strict-aliasing -fPIC |
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index edc90f23e708..8406ed7f9926 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h | |||
@@ -33,7 +33,7 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); | |||
33 | #define efi_call_virt6(f, a1, a2, a3, a4, a5, a6) \ | 33 | #define efi_call_virt6(f, a1, a2, a3, a4, a5, a6) \ |
34 | efi_call_virt(f, a1, a2, a3, a4, a5, a6) | 34 | efi_call_virt(f, a1, a2, a3, a4, a5, a6) |
35 | 35 | ||
36 | #define efi_ioremap(addr, size) ioremap_cache(addr, size) | 36 | #define efi_ioremap(addr, size, type) ioremap_cache(addr, size) |
37 | 37 | ||
38 | #else /* !CONFIG_X86_32 */ | 38 | #else /* !CONFIG_X86_32 */ |
39 | 39 | ||
@@ -84,7 +84,8 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3, | |||
84 | efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \ | 84 | efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \ |
85 | (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6)) | 85 | (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6)) |
86 | 86 | ||
87 | extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size); | 87 | extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size, |
88 | u32 type); | ||
88 | 89 | ||
89 | #endif /* CONFIG_X86_32 */ | 90 | #endif /* CONFIG_X86_32 */ |
90 | 91 | ||
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h index 2bdab21f0898..c6ccbe7e81ad 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h | |||
@@ -12,9 +12,15 @@ static inline unsigned long native_save_fl(void) | |||
12 | { | 12 | { |
13 | unsigned long flags; | 13 | unsigned long flags; |
14 | 14 | ||
15 | /* | ||
16 | * Note: this needs to be "=r" not "=rm", because we have the | ||
17 | * stack offset from what gcc expects at the time the "pop" is | ||
18 | * executed, and so a memory reference with respect to the stack | ||
19 | * would end up using the wrong address. | ||
20 | */ | ||
15 | asm volatile("# __raw_save_flags\n\t" | 21 | asm volatile("# __raw_save_flags\n\t" |
16 | "pushf ; pop %0" | 22 | "pushf ; pop %0" |
17 | : "=g" (flags) | 23 | : "=r" (flags) |
18 | : /* no input */ | 24 | : /* no input */ |
19 | : "memory"); | 25 | : "memory"); |
20 | 26 | ||
diff --git a/arch/x86/include/asm/lguest.h b/arch/x86/include/asm/lguest.h index 313389cd50d2..5136dad57cbb 100644 --- a/arch/x86/include/asm/lguest.h +++ b/arch/x86/include/asm/lguest.h | |||
@@ -17,8 +17,7 @@ | |||
17 | /* Pages for switcher itself, then two pages per cpu */ | 17 | /* Pages for switcher itself, then two pages per cpu */ |
18 | #define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * nr_cpu_ids) | 18 | #define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * nr_cpu_ids) |
19 | 19 | ||
20 | /* We map at -4M (-2M when PAE is activated) for ease of mapping | 20 | /* We map at -4M (-2M for PAE) for ease of mapping (one PTE page). */ |
21 | * into the guest (one PTE page). */ | ||
22 | #ifdef CONFIG_X86_PAE | 21 | #ifdef CONFIG_X86_PAE |
23 | #define SWITCHER_ADDR 0xFFE00000 | 22 | #define SWITCHER_ADDR 0xFFE00000 |
24 | #else | 23 | #else |
diff --git a/arch/x86/include/asm/lguest_hcall.h b/arch/x86/include/asm/lguest_hcall.h index 33600a66755f..ba0eed8aa1a6 100644 --- a/arch/x86/include/asm/lguest_hcall.h +++ b/arch/x86/include/asm/lguest_hcall.h | |||
@@ -30,27 +30,27 @@ | |||
30 | #include <asm/hw_irq.h> | 30 | #include <asm/hw_irq.h> |
31 | #include <asm/kvm_para.h> | 31 | #include <asm/kvm_para.h> |
32 | 32 | ||
33 | /*G:030 But first, how does our Guest contact the Host to ask for privileged | 33 | /*G:030 |
34 | * But first, how does our Guest contact the Host to ask for privileged | ||
34 | * operations? There are two ways: the direct way is to make a "hypercall", | 35 | * operations? There are two ways: the direct way is to make a "hypercall", |
35 | * to make requests of the Host Itself. | 36 | * to make requests of the Host Itself. |
36 | * | 37 | * |
37 | * We use the KVM hypercall mechanism. Seventeen hypercalls are | 38 | * We use the KVM hypercall mechanism, though completely different hypercall |
38 | * available: the hypercall number is put in the %eax register, and the | 39 | * numbers. Seventeen hypercalls are available: the hypercall number is put in |
39 | * arguments (when required) are placed in %ebx, %ecx, %edx and %esi. | 40 | * the %eax register, and the arguments (when required) are placed in %ebx, |
40 | * If a return value makes sense, it's returned in %eax. | 41 | * %ecx, %edx and %esi. If a return value makes sense, it's returned in %eax. |
41 | * | 42 | * |
42 | * Grossly invalid calls result in Sudden Death at the hands of the vengeful | 43 | * Grossly invalid calls result in Sudden Death at the hands of the vengeful |
43 | * Host, rather than returning failure. This reflects Winston Churchill's | 44 | * Host, rather than returning failure. This reflects Winston Churchill's |
44 | * definition of a gentleman: "someone who is only rude intentionally". */ | 45 | * definition of a gentleman: "someone who is only rude intentionally". |
45 | /*:*/ | 46 | :*/ |
46 | 47 | ||
47 | /* Can't use our min() macro here: needs to be a constant */ | 48 | /* Can't use our min() macro here: needs to be a constant */ |
48 | #define LGUEST_IRQS (NR_IRQS < 32 ? NR_IRQS: 32) | 49 | #define LGUEST_IRQS (NR_IRQS < 32 ? NR_IRQS: 32) |
49 | 50 | ||
50 | #define LHCALL_RING_SIZE 64 | 51 | #define LHCALL_RING_SIZE 64 |
51 | struct hcall_args { | 52 | struct hcall_args { |
52 | /* These map directly onto eax, ebx, ecx, edx and esi | 53 | /* These map directly onto eax/ebx/ecx/edx/esi in struct lguest_regs */ |
53 | * in struct lguest_regs */ | ||
54 | unsigned long arg0, arg1, arg2, arg3, arg4; | 54 | unsigned long arg0, arg1, arg2, arg3, arg4; |
55 | }; | 55 | }; |
56 | 56 | ||
diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h index dd14c54ac718..0e8c2a0fd922 100644 --- a/arch/x86/include/asm/pgalloc.h +++ b/arch/x86/include/asm/pgalloc.h | |||
@@ -46,7 +46,13 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte) | |||
46 | __free_page(pte); | 46 | __free_page(pte); |
47 | } | 47 | } |
48 | 48 | ||
49 | extern void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte); | 49 | extern void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte); |
50 | |||
51 | static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte, | ||
52 | unsigned long address) | ||
53 | { | ||
54 | ___pte_free_tlb(tlb, pte); | ||
55 | } | ||
50 | 56 | ||
51 | static inline void pmd_populate_kernel(struct mm_struct *mm, | 57 | static inline void pmd_populate_kernel(struct mm_struct *mm, |
52 | pmd_t *pmd, pte_t *pte) | 58 | pmd_t *pmd, pte_t *pte) |
@@ -78,7 +84,13 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) | |||
78 | free_page((unsigned long)pmd); | 84 | free_page((unsigned long)pmd); |
79 | } | 85 | } |
80 | 86 | ||
81 | extern void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd); | 87 | extern void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd); |
88 | |||
89 | static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, | ||
90 | unsigned long adddress) | ||
91 | { | ||
92 | ___pmd_free_tlb(tlb, pmd); | ||
93 | } | ||
82 | 94 | ||
83 | #ifdef CONFIG_X86_PAE | 95 | #ifdef CONFIG_X86_PAE |
84 | extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd); | 96 | extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd); |
@@ -108,7 +120,14 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud) | |||
108 | free_page((unsigned long)pud); | 120 | free_page((unsigned long)pud); |
109 | } | 121 | } |
110 | 122 | ||
111 | extern void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud); | 123 | extern void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud); |
124 | |||
125 | static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, | ||
126 | unsigned long address) | ||
127 | { | ||
128 | ___pud_free_tlb(tlb, pud); | ||
129 | } | ||
130 | |||
112 | #endif /* PAGETABLE_LEVELS > 3 */ | 131 | #endif /* PAGETABLE_LEVELS > 3 */ |
113 | #endif /* PAGETABLE_LEVELS > 2 */ | 132 | #endif /* PAGETABLE_LEVELS > 2 */ |
114 | 133 | ||
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 3cc06e3fceb8..16748077559a 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _ASM_X86_PGTABLE_H | 2 | #define _ASM_X86_PGTABLE_H |
3 | 3 | ||
4 | #include <asm/page.h> | 4 | #include <asm/page.h> |
5 | #include <asm/e820.h> | ||
5 | 6 | ||
6 | #include <asm/pgtable_types.h> | 7 | #include <asm/pgtable_types.h> |
7 | 8 | ||
@@ -269,10 +270,17 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot) | |||
269 | 270 | ||
270 | #define canon_pgprot(p) __pgprot(massage_pgprot(p)) | 271 | #define canon_pgprot(p) __pgprot(massage_pgprot(p)) |
271 | 272 | ||
272 | static inline int is_new_memtype_allowed(unsigned long flags, | 273 | static inline int is_new_memtype_allowed(u64 paddr, unsigned long size, |
273 | unsigned long new_flags) | 274 | unsigned long flags, |
275 | unsigned long new_flags) | ||
274 | { | 276 | { |
275 | /* | 277 | /* |
278 | * PAT type is always WB for ISA. So no need to check. | ||
279 | */ | ||
280 | if (is_ISA_range(paddr, paddr + size - 1)) | ||
281 | return 1; | ||
282 | |||
283 | /* | ||
276 | * Certain new memtypes are not allowed with certain | 284 | * Certain new memtypes are not allowed with certain |
277 | * requested memtype: | 285 | * requested memtype: |
278 | * - request is uncached, return cannot be write-back | 286 | * - request is uncached, return cannot be write-back |
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 20e6a795e160..d2c6c930b491 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h | |||
@@ -212,9 +212,9 @@ extern int __get_user_bad(void); | |||
212 | : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") | 212 | : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") |
213 | #else | 213 | #else |
214 | #define __put_user_asm_u64(x, ptr, retval, errret) \ | 214 | #define __put_user_asm_u64(x, ptr, retval, errret) \ |
215 | __put_user_asm(x, ptr, retval, "q", "", "Zr", errret) | 215 | __put_user_asm(x, ptr, retval, "q", "", "er", errret) |
216 | #define __put_user_asm_ex_u64(x, addr) \ | 216 | #define __put_user_asm_ex_u64(x, addr) \ |
217 | __put_user_asm_ex(x, addr, "q", "", "Zr") | 217 | __put_user_asm_ex(x, addr, "q", "", "er") |
218 | #define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu) | 218 | #define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu) |
219 | #endif | 219 | #endif |
220 | 220 | ||
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index 8cc687326eb8..db24b215fc50 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h | |||
@@ -88,11 +88,11 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size) | |||
88 | ret, "l", "k", "ir", 4); | 88 | ret, "l", "k", "ir", 4); |
89 | return ret; | 89 | return ret; |
90 | case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst, | 90 | case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst, |
91 | ret, "q", "", "ir", 8); | 91 | ret, "q", "", "er", 8); |
92 | return ret; | 92 | return ret; |
93 | case 10: | 93 | case 10: |
94 | __put_user_asm(*(u64 *)src, (u64 __user *)dst, | 94 | __put_user_asm(*(u64 *)src, (u64 __user *)dst, |
95 | ret, "q", "", "ir", 10); | 95 | ret, "q", "", "er", 10); |
96 | if (unlikely(ret)) | 96 | if (unlikely(ret)) |
97 | return ret; | 97 | return ret; |
98 | asm("":::"memory"); | 98 | asm("":::"memory"); |
@@ -101,12 +101,12 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size) | |||
101 | return ret; | 101 | return ret; |
102 | case 16: | 102 | case 16: |
103 | __put_user_asm(*(u64 *)src, (u64 __user *)dst, | 103 | __put_user_asm(*(u64 *)src, (u64 __user *)dst, |
104 | ret, "q", "", "ir", 16); | 104 | ret, "q", "", "er", 16); |
105 | if (unlikely(ret)) | 105 | if (unlikely(ret)) |
106 | return ret; | 106 | return ret; |
107 | asm("":::"memory"); | 107 | asm("":::"memory"); |
108 | __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst, | 108 | __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst, |
109 | ret, "q", "", "ir", 8); | 109 | ret, "q", "", "er", 8); |
110 | return ret; | 110 | return ret; |
111 | default: | 111 | default: |
112 | return copy_user_generic((__force void *)dst, src, size); | 112 | return copy_user_generic((__force void *)dst, src, size); |
@@ -157,7 +157,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) | |||
157 | ret, "q", "", "=r", 8); | 157 | ret, "q", "", "=r", 8); |
158 | if (likely(!ret)) | 158 | if (likely(!ret)) |
159 | __put_user_asm(tmp, (u64 __user *)dst, | 159 | __put_user_asm(tmp, (u64 __user *)dst, |
160 | ret, "q", "", "ir", 8); | 160 | ret, "q", "", "er", 8); |
161 | return ret; | 161 | return ret; |
162 | } | 162 | } |
163 | default: | 163 | default: |
diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h index bddd44f2f0ab..80e2984f521c 100644 --- a/arch/x86/include/asm/uv/uv_bau.h +++ b/arch/x86/include/asm/uv/uv_bau.h | |||
@@ -133,7 +133,7 @@ struct bau_msg_payload { | |||
133 | * see table 4.2.3.0.1 in broacast_assist spec. | 133 | * see table 4.2.3.0.1 in broacast_assist spec. |
134 | */ | 134 | */ |
135 | struct bau_msg_header { | 135 | struct bau_msg_header { |
136 | unsigned int dest_subnodeid:6; /* must be zero */ | 136 | unsigned int dest_subnodeid:6; /* must be 0x10, for the LB */ |
137 | /* bits 5:0 */ | 137 | /* bits 5:0 */ |
138 | unsigned int base_dest_nodeid:15; /* nasid>>1 (pnode) of */ | 138 | unsigned int base_dest_nodeid:15; /* nasid>>1 (pnode) of */ |
139 | /* bits 20:6 */ /* first bit in node_map */ | 139 | /* bits 20:6 */ /* first bit in node_map */ |
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h index 341070f7ad5c..77a68505419a 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h | |||
@@ -175,7 +175,7 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); | |||
175 | #define UV_GLOBAL_MMR32_PNODE_BITS(p) ((p) << (UV_GLOBAL_MMR32_PNODE_SHIFT)) | 175 | #define UV_GLOBAL_MMR32_PNODE_BITS(p) ((p) << (UV_GLOBAL_MMR32_PNODE_SHIFT)) |
176 | 176 | ||
177 | #define UV_GLOBAL_MMR64_PNODE_BITS(p) \ | 177 | #define UV_GLOBAL_MMR64_PNODE_BITS(p) \ |
178 | ((unsigned long)(UV_PNODE_TO_GNODE(p)) << UV_GLOBAL_MMR64_PNODE_SHIFT) | 178 | (((unsigned long)(p)) << UV_GLOBAL_MMR64_PNODE_SHIFT) |
179 | 179 | ||
180 | #define UV_APIC_PNODE_SHIFT 6 | 180 | #define UV_APIC_PNODE_SHIFT 6 |
181 | 181 | ||
@@ -327,6 +327,7 @@ struct uv_blade_info { | |||
327 | unsigned short nr_possible_cpus; | 327 | unsigned short nr_possible_cpus; |
328 | unsigned short nr_online_cpus; | 328 | unsigned short nr_online_cpus; |
329 | unsigned short pnode; | 329 | unsigned short pnode; |
330 | short memory_nid; | ||
330 | }; | 331 | }; |
331 | extern struct uv_blade_info *uv_blade_info; | 332 | extern struct uv_blade_info *uv_blade_info; |
332 | extern short *uv_node_to_blade; | 333 | extern short *uv_node_to_blade; |
@@ -363,6 +364,12 @@ static inline int uv_blade_to_pnode(int bid) | |||
363 | return uv_blade_info[bid].pnode; | 364 | return uv_blade_info[bid].pnode; |
364 | } | 365 | } |
365 | 366 | ||
367 | /* Nid of memory node on blade. -1 if no blade-local memory */ | ||
368 | static inline int uv_blade_to_memory_nid(int bid) | ||
369 | { | ||
370 | return uv_blade_info[bid].memory_nid; | ||
371 | } | ||
372 | |||
366 | /* Determine the number of possible cpus on a blade */ | 373 | /* Determine the number of possible cpus on a blade */ |
367 | static inline int uv_blade_nr_possible_cpus(int bid) | 374 | static inline int uv_blade_nr_possible_cpus(int bid) |
368 | { | 375 | { |
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 2284a4812b68..d2ed6c5ddc80 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -3793,6 +3793,9 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, | |||
3793 | mmr_pnode = uv_blade_to_pnode(mmr_blade); | 3793 | mmr_pnode = uv_blade_to_pnode(mmr_blade); |
3794 | uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); | 3794 | uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); |
3795 | 3795 | ||
3796 | if (cfg->move_in_progress) | ||
3797 | send_cleanup_vector(cfg); | ||
3798 | |||
3796 | return irq; | 3799 | return irq; |
3797 | } | 3800 | } |
3798 | 3801 | ||
diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c index dbf5445727a9..6ef00ba4c886 100644 --- a/arch/x86/kernel/apic/ipi.c +++ b/arch/x86/kernel/apic/ipi.c | |||
@@ -106,6 +106,9 @@ void default_send_IPI_mask_logical(const struct cpumask *cpumask, int vector) | |||
106 | unsigned long mask = cpumask_bits(cpumask)[0]; | 106 | unsigned long mask = cpumask_bits(cpumask)[0]; |
107 | unsigned long flags; | 107 | unsigned long flags; |
108 | 108 | ||
109 | if (WARN_ONCE(!mask, "empty IPI mask")) | ||
110 | return; | ||
111 | |||
109 | local_irq_save(flags); | 112 | local_irq_save(flags); |
110 | WARN_ON(mask & ~cpumask_bits(cpu_online_mask)[0]); | 113 | WARN_ON(mask & ~cpumask_bits(cpu_online_mask)[0]); |
111 | __default_send_IPI_dest_field(mask, vector, apic->dest_logical); | 114 | __default_send_IPI_dest_field(mask, vector, apic->dest_logical); |
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c index 8e4cbb255c38..a5371ec36776 100644 --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c | |||
@@ -17,11 +17,13 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
17 | return x2apic_enabled(); | 17 | return x2apic_enabled(); |
18 | } | 18 | } |
19 | 19 | ||
20 | /* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */ | 20 | /* |
21 | 21 | * need to use more than cpu 0, because we need more vectors when | |
22 | * MSI-X are used. | ||
23 | */ | ||
22 | static const struct cpumask *x2apic_target_cpus(void) | 24 | static const struct cpumask *x2apic_target_cpus(void) |
23 | { | 25 | { |
24 | return cpumask_of(0); | 26 | return cpu_online_mask; |
25 | } | 27 | } |
26 | 28 | ||
27 | /* | 29 | /* |
@@ -170,7 +172,7 @@ static unsigned long set_apic_id(unsigned int id) | |||
170 | 172 | ||
171 | static int x2apic_cluster_phys_pkg_id(int initial_apicid, int index_msb) | 173 | static int x2apic_cluster_phys_pkg_id(int initial_apicid, int index_msb) |
172 | { | 174 | { |
173 | return current_cpu_data.initial_apicid >> index_msb; | 175 | return initial_apicid >> index_msb; |
174 | } | 176 | } |
175 | 177 | ||
176 | static void x2apic_send_IPI_self(int vector) | 178 | static void x2apic_send_IPI_self(int vector) |
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c index a284359627e7..a8989aadc99a 100644 --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c | |||
@@ -27,11 +27,13 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
27 | return 0; | 27 | return 0; |
28 | } | 28 | } |
29 | 29 | ||
30 | /* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */ | 30 | /* |
31 | 31 | * need to use more than cpu 0, because we need more vectors when | |
32 | * MSI-X are used. | ||
33 | */ | ||
32 | static const struct cpumask *x2apic_target_cpus(void) | 34 | static const struct cpumask *x2apic_target_cpus(void) |
33 | { | 35 | { |
34 | return cpumask_of(0); | 36 | return cpu_online_mask; |
35 | } | 37 | } |
36 | 38 | ||
37 | static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask) | 39 | static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask) |
@@ -162,7 +164,7 @@ static unsigned long set_apic_id(unsigned int id) | |||
162 | 164 | ||
163 | static int x2apic_phys_pkg_id(int initial_apicid, int index_msb) | 165 | static int x2apic_phys_pkg_id(int initial_apicid, int index_msb) |
164 | { | 166 | { |
165 | return current_cpu_data.initial_apicid >> index_msb; | 167 | return initial_apicid >> index_msb; |
166 | } | 168 | } |
167 | 169 | ||
168 | static void x2apic_send_IPI_self(int vector) | 170 | static void x2apic_send_IPI_self(int vector) |
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 096d19aea2f7..601159374e87 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c | |||
@@ -46,7 +46,7 @@ static int early_get_nodeid(void) | |||
46 | return node_id.s.node_id; | 46 | return node_id.s.node_id; |
47 | } | 47 | } |
48 | 48 | ||
49 | static int uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | 49 | static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) |
50 | { | 50 | { |
51 | if (!strcmp(oem_id, "SGI")) { | 51 | if (!strcmp(oem_id, "SGI")) { |
52 | if (!strcmp(oem_table_id, "UVL")) | 52 | if (!strcmp(oem_table_id, "UVL")) |
@@ -253,7 +253,7 @@ static void uv_send_IPI_self(int vector) | |||
253 | apic_write(APIC_SELF_IPI, vector); | 253 | apic_write(APIC_SELF_IPI, vector); |
254 | } | 254 | } |
255 | 255 | ||
256 | struct apic apic_x2apic_uv_x = { | 256 | struct apic __refdata apic_x2apic_uv_x = { |
257 | 257 | ||
258 | .name = "UV large system", | 258 | .name = "UV large system", |
259 | .probe = NULL, | 259 | .probe = NULL, |
@@ -261,7 +261,7 @@ struct apic apic_x2apic_uv_x = { | |||
261 | .apic_id_registered = uv_apic_id_registered, | 261 | .apic_id_registered = uv_apic_id_registered, |
262 | 262 | ||
263 | .irq_delivery_mode = dest_Fixed, | 263 | .irq_delivery_mode = dest_Fixed, |
264 | .irq_dest_mode = 1, /* logical */ | 264 | .irq_dest_mode = 0, /* physical */ |
265 | 265 | ||
266 | .target_cpus = uv_target_cpus, | 266 | .target_cpus = uv_target_cpus, |
267 | .disable_esr = 0, | 267 | .disable_esr = 0, |
@@ -362,12 +362,6 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size) | |||
362 | BUG(); | 362 | BUG(); |
363 | } | 363 | } |
364 | 364 | ||
365 | static __init void map_low_mmrs(void) | ||
366 | { | ||
367 | init_extra_mapping_uc(UV_GLOBAL_MMR32_BASE, UV_GLOBAL_MMR32_SIZE); | ||
368 | init_extra_mapping_uc(UV_LOCAL_MMR_BASE, UV_LOCAL_MMR_SIZE); | ||
369 | } | ||
370 | |||
371 | enum map_type {map_wb, map_uc}; | 365 | enum map_type {map_wb, map_uc}; |
372 | 366 | ||
373 | static __init void map_high(char *id, unsigned long base, int shift, | 367 | static __init void map_high(char *id, unsigned long base, int shift, |
@@ -395,26 +389,6 @@ static __init void map_gru_high(int max_pnode) | |||
395 | map_high("GRU", gru.s.base, shift, max_pnode, map_wb); | 389 | map_high("GRU", gru.s.base, shift, max_pnode, map_wb); |
396 | } | 390 | } |
397 | 391 | ||
398 | static __init void map_config_high(int max_pnode) | ||
399 | { | ||
400 | union uvh_rh_gam_cfg_overlay_config_mmr_u cfg; | ||
401 | int shift = UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR_BASE_SHFT; | ||
402 | |||
403 | cfg.v = uv_read_local_mmr(UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR); | ||
404 | if (cfg.s.enable) | ||
405 | map_high("CONFIG", cfg.s.base, shift, max_pnode, map_uc); | ||
406 | } | ||
407 | |||
408 | static __init void map_mmr_high(int max_pnode) | ||
409 | { | ||
410 | union uvh_rh_gam_mmr_overlay_config_mmr_u mmr; | ||
411 | int shift = UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT; | ||
412 | |||
413 | mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR); | ||
414 | if (mmr.s.enable) | ||
415 | map_high("MMR", mmr.s.base, shift, max_pnode, map_uc); | ||
416 | } | ||
417 | |||
418 | static __init void map_mmioh_high(int max_pnode) | 392 | static __init void map_mmioh_high(int max_pnode) |
419 | { | 393 | { |
420 | union uvh_rh_gam_mmioh_overlay_config_mmr_u mmioh; | 394 | union uvh_rh_gam_mmioh_overlay_config_mmr_u mmioh; |
@@ -566,8 +540,6 @@ void __init uv_system_init(void) | |||
566 | unsigned long mmr_base, present, paddr; | 540 | unsigned long mmr_base, present, paddr; |
567 | unsigned short pnode_mask; | 541 | unsigned short pnode_mask; |
568 | 542 | ||
569 | map_low_mmrs(); | ||
570 | |||
571 | m_n_config.v = uv_read_local_mmr(UVH_SI_ADDR_MAP_CONFIG); | 543 | m_n_config.v = uv_read_local_mmr(UVH_SI_ADDR_MAP_CONFIG); |
572 | m_val = m_n_config.s.m_skt; | 544 | m_val = m_n_config.s.m_skt; |
573 | n_val = m_n_config.s.n_skt; | 545 | n_val = m_n_config.s.n_skt; |
@@ -591,6 +563,8 @@ void __init uv_system_init(void) | |||
591 | bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades(); | 563 | bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades(); |
592 | uv_blade_info = kmalloc(bytes, GFP_KERNEL); | 564 | uv_blade_info = kmalloc(bytes, GFP_KERNEL); |
593 | BUG_ON(!uv_blade_info); | 565 | BUG_ON(!uv_blade_info); |
566 | for (blade = 0; blade < uv_num_possible_blades(); blade++) | ||
567 | uv_blade_info[blade].memory_nid = -1; | ||
594 | 568 | ||
595 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); | 569 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); |
596 | 570 | ||
@@ -629,6 +603,9 @@ void __init uv_system_init(void) | |||
629 | lcpu = uv_blade_info[blade].nr_possible_cpus; | 603 | lcpu = uv_blade_info[blade].nr_possible_cpus; |
630 | uv_blade_info[blade].nr_possible_cpus++; | 604 | uv_blade_info[blade].nr_possible_cpus++; |
631 | 605 | ||
606 | /* Any node on the blade, else will contain -1. */ | ||
607 | uv_blade_info[blade].memory_nid = nid; | ||
608 | |||
632 | uv_cpu_hub_info(cpu)->lowmem_remap_base = lowmem_redir_base; | 609 | uv_cpu_hub_info(cpu)->lowmem_remap_base = lowmem_redir_base; |
633 | uv_cpu_hub_info(cpu)->lowmem_remap_top = lowmem_redir_size; | 610 | uv_cpu_hub_info(cpu)->lowmem_remap_top = lowmem_redir_size; |
634 | uv_cpu_hub_info(cpu)->m_val = m_val; | 611 | uv_cpu_hub_info(cpu)->m_val = m_val; |
@@ -662,11 +639,10 @@ void __init uv_system_init(void) | |||
662 | pnode = (paddr >> m_val) & pnode_mask; | 639 | pnode = (paddr >> m_val) & pnode_mask; |
663 | blade = boot_pnode_to_blade(pnode); | 640 | blade = boot_pnode_to_blade(pnode); |
664 | uv_node_to_blade[nid] = blade; | 641 | uv_node_to_blade[nid] = blade; |
642 | max_pnode = max(pnode, max_pnode); | ||
665 | } | 643 | } |
666 | 644 | ||
667 | map_gru_high(max_pnode); | 645 | map_gru_high(max_pnode); |
668 | map_mmr_high(max_pnode); | ||
669 | map_config_high(max_pnode); | ||
670 | map_mmioh_high(max_pnode); | 646 | map_mmioh_high(max_pnode); |
671 | 647 | ||
672 | uv_cpu_init(); | 648 | uv_cpu_init(); |
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 79302e9a33a4..442b5508893f 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -811,7 +811,7 @@ static int apm_do_idle(void) | |||
811 | u8 ret = 0; | 811 | u8 ret = 0; |
812 | int idled = 0; | 812 | int idled = 0; |
813 | int polling; | 813 | int polling; |
814 | int err; | 814 | int err = 0; |
815 | 815 | ||
816 | polling = !!(current_thread_info()->status & TS_POLLING); | 816 | polling = !!(current_thread_info()->status & TS_POLLING); |
817 | if (polling) { | 817 | if (polling) { |
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 3efcb2b96a15..c1f253dac155 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile | |||
@@ -7,6 +7,10 @@ ifdef CONFIG_FUNCTION_TRACER | |||
7 | CFLAGS_REMOVE_common.o = -pg | 7 | CFLAGS_REMOVE_common.o = -pg |
8 | endif | 8 | endif |
9 | 9 | ||
10 | # Make sure load_percpu_segment has no stackprotector | ||
11 | nostackp := $(call cc-option, -fno-stack-protector) | ||
12 | CFLAGS_common.o := $(nostackp) | ||
13 | |||
10 | obj-y := intel_cacheinfo.o addon_cpuid_features.o | 14 | obj-y := intel_cacheinfo.o addon_cpuid_features.o |
11 | obj-y += proc.o capflags.o powerflags.o common.o | 15 | obj-y += proc.o capflags.o powerflags.o common.o |
12 | obj-y += vmware.o hypervisor.o | 16 | obj-y += vmware.o hypervisor.o |
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 28e5f5956042..63fddcd082cd 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -356,7 +356,7 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) | |||
356 | #endif | 356 | #endif |
357 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI) | 357 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI) |
358 | /* check CPU config space for extended APIC ID */ | 358 | /* check CPU config space for extended APIC ID */ |
359 | if (c->x86 >= 0xf) { | 359 | if (cpu_has_apic && c->x86 >= 0xf) { |
360 | unsigned int val; | 360 | unsigned int val; |
361 | val = read_pci_config(0, 24, 0, 0x68); | 361 | val = read_pci_config(0, 24, 0, 0x68); |
362 | if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18))) | 362 | if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18))) |
@@ -400,6 +400,13 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
400 | level = cpuid_eax(1); | 400 | level = cpuid_eax(1); |
401 | if((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58) | 401 | if((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58) |
402 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | 402 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); |
403 | |||
404 | /* | ||
405 | * Some BIOSes incorrectly force this feature, but only K8 | ||
406 | * revision D (model = 0x14) and later actually support it. | ||
407 | */ | ||
408 | if (c->x86_model < 0x14) | ||
409 | clear_cpu_cap(c, X86_FEATURE_LAHF_LM); | ||
403 | } | 410 | } |
404 | if (c->x86 == 0x10 || c->x86 == 0x11) | 411 | if (c->x86 == 0x10 || c->x86 == 0x11) |
405 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | 412 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index f1961c07af9a..5ce60a88027b 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -59,7 +59,30 @@ void __init setup_cpu_local_masks(void) | |||
59 | alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask); | 59 | alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask); |
60 | } | 60 | } |
61 | 61 | ||
62 | static const struct cpu_dev *this_cpu __cpuinitdata; | 62 | static void __cpuinit default_init(struct cpuinfo_x86 *c) |
63 | { | ||
64 | #ifdef CONFIG_X86_64 | ||
65 | display_cacheinfo(c); | ||
66 | #else | ||
67 | /* Not much we can do here... */ | ||
68 | /* Check if at least it has cpuid */ | ||
69 | if (c->cpuid_level == -1) { | ||
70 | /* No cpuid. It must be an ancient CPU */ | ||
71 | if (c->x86 == 4) | ||
72 | strcpy(c->x86_model_id, "486"); | ||
73 | else if (c->x86 == 3) | ||
74 | strcpy(c->x86_model_id, "386"); | ||
75 | } | ||
76 | #endif | ||
77 | } | ||
78 | |||
79 | static const struct cpu_dev __cpuinitconst default_cpu = { | ||
80 | .c_init = default_init, | ||
81 | .c_vendor = "Unknown", | ||
82 | .c_x86_vendor = X86_VENDOR_UNKNOWN, | ||
83 | }; | ||
84 | |||
85 | static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; | ||
63 | 86 | ||
64 | DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { | 87 | DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { |
65 | #ifdef CONFIG_X86_64 | 88 | #ifdef CONFIG_X86_64 |
@@ -332,29 +355,6 @@ void switch_to_new_gdt(int cpu) | |||
332 | 355 | ||
333 | static const struct cpu_dev *__cpuinitdata cpu_devs[X86_VENDOR_NUM] = {}; | 356 | static const struct cpu_dev *__cpuinitdata cpu_devs[X86_VENDOR_NUM] = {}; |
334 | 357 | ||
335 | static void __cpuinit default_init(struct cpuinfo_x86 *c) | ||
336 | { | ||
337 | #ifdef CONFIG_X86_64 | ||
338 | display_cacheinfo(c); | ||
339 | #else | ||
340 | /* Not much we can do here... */ | ||
341 | /* Check if at least it has cpuid */ | ||
342 | if (c->cpuid_level == -1) { | ||
343 | /* No cpuid. It must be an ancient CPU */ | ||
344 | if (c->x86 == 4) | ||
345 | strcpy(c->x86_model_id, "486"); | ||
346 | else if (c->x86 == 3) | ||
347 | strcpy(c->x86_model_id, "386"); | ||
348 | } | ||
349 | #endif | ||
350 | } | ||
351 | |||
352 | static const struct cpu_dev __cpuinitconst default_cpu = { | ||
353 | .c_init = default_init, | ||
354 | .c_vendor = "Unknown", | ||
355 | .c_x86_vendor = X86_VENDOR_UNKNOWN, | ||
356 | }; | ||
357 | |||
358 | static void __cpuinit get_model_name(struct cpuinfo_x86 *c) | 358 | static void __cpuinit get_model_name(struct cpuinfo_x86 *c) |
359 | { | 359 | { |
360 | unsigned int *v; | 360 | unsigned int *v; |
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 484c1e5f658e..01213048f62f 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -1226,8 +1226,13 @@ static void mce_init(void) | |||
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | /* Add per CPU specific workarounds here */ | 1228 | /* Add per CPU specific workarounds here */ |
1229 | static void mce_cpu_quirks(struct cpuinfo_x86 *c) | 1229 | static int mce_cpu_quirks(struct cpuinfo_x86 *c) |
1230 | { | 1230 | { |
1231 | if (c->x86_vendor == X86_VENDOR_UNKNOWN) { | ||
1232 | pr_info("MCE: unknown CPU type - not enabling MCE support.\n"); | ||
1233 | return -EOPNOTSUPP; | ||
1234 | } | ||
1235 | |||
1231 | /* This should be disabled by the BIOS, but isn't always */ | 1236 | /* This should be disabled by the BIOS, but isn't always */ |
1232 | if (c->x86_vendor == X86_VENDOR_AMD) { | 1237 | if (c->x86_vendor == X86_VENDOR_AMD) { |
1233 | if (c->x86 == 15 && banks > 4) { | 1238 | if (c->x86 == 15 && banks > 4) { |
@@ -1273,11 +1278,20 @@ static void mce_cpu_quirks(struct cpuinfo_x86 *c) | |||
1273 | if ((c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xe)) && | 1278 | if ((c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xe)) && |
1274 | monarch_timeout < 0) | 1279 | monarch_timeout < 0) |
1275 | monarch_timeout = USEC_PER_SEC; | 1280 | monarch_timeout = USEC_PER_SEC; |
1281 | |||
1282 | /* | ||
1283 | * There are also broken BIOSes on some Pentium M and | ||
1284 | * earlier systems: | ||
1285 | */ | ||
1286 | if (c->x86 == 6 && c->x86_model <= 13 && mce_bootlog < 0) | ||
1287 | mce_bootlog = 0; | ||
1276 | } | 1288 | } |
1277 | if (monarch_timeout < 0) | 1289 | if (monarch_timeout < 0) |
1278 | monarch_timeout = 0; | 1290 | monarch_timeout = 0; |
1279 | if (mce_bootlog != 0) | 1291 | if (mce_bootlog != 0) |
1280 | mce_panic_timeout = 30; | 1292 | mce_panic_timeout = 30; |
1293 | |||
1294 | return 0; | ||
1281 | } | 1295 | } |
1282 | 1296 | ||
1283 | static void __cpuinit mce_ancient_init(struct cpuinfo_x86 *c) | 1297 | static void __cpuinit mce_ancient_init(struct cpuinfo_x86 *c) |
@@ -1338,11 +1352,10 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c) | |||
1338 | if (!mce_available(c)) | 1352 | if (!mce_available(c)) |
1339 | return; | 1353 | return; |
1340 | 1354 | ||
1341 | if (mce_cap_init() < 0) { | 1355 | if (mce_cap_init() < 0 || mce_cpu_quirks(c) < 0) { |
1342 | mce_disabled = 1; | 1356 | mce_disabled = 1; |
1343 | return; | 1357 | return; |
1344 | } | 1358 | } |
1345 | mce_cpu_quirks(c); | ||
1346 | 1359 | ||
1347 | machine_check_vector = do_machine_check; | 1360 | machine_check_vector = do_machine_check; |
1348 | 1361 | ||
@@ -1692,17 +1705,15 @@ static ssize_t set_trigger(struct sys_device *s, struct sysdev_attribute *attr, | |||
1692 | const char *buf, size_t siz) | 1705 | const char *buf, size_t siz) |
1693 | { | 1706 | { |
1694 | char *p; | 1707 | char *p; |
1695 | int len; | ||
1696 | 1708 | ||
1697 | strncpy(mce_helper, buf, sizeof(mce_helper)); | 1709 | strncpy(mce_helper, buf, sizeof(mce_helper)); |
1698 | mce_helper[sizeof(mce_helper)-1] = 0; | 1710 | mce_helper[sizeof(mce_helper)-1] = 0; |
1699 | len = strlen(mce_helper); | ||
1700 | p = strchr(mce_helper, '\n'); | 1711 | p = strchr(mce_helper, '\n'); |
1701 | 1712 | ||
1702 | if (*p) | 1713 | if (p) |
1703 | *p = 0; | 1714 | *p = 0; |
1704 | 1715 | ||
1705 | return len; | 1716 | return strlen(mce_helper) + !!p; |
1706 | } | 1717 | } |
1707 | 1718 | ||
1708 | static ssize_t set_ignore_ce(struct sys_device *s, | 1719 | static ssize_t set_ignore_ce(struct sys_device *s, |
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index bff8dd191dd5..5957a93e5173 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | static DEFINE_PER_CPU(__u64, next_check) = INITIAL_JIFFIES; | 37 | static DEFINE_PER_CPU(__u64, next_check) = INITIAL_JIFFIES; |
38 | static DEFINE_PER_CPU(unsigned long, thermal_throttle_count); | 38 | static DEFINE_PER_CPU(unsigned long, thermal_throttle_count); |
39 | static DEFINE_PER_CPU(bool, thermal_throttle_active); | ||
39 | 40 | ||
40 | static atomic_t therm_throt_en = ATOMIC_INIT(0); | 41 | static atomic_t therm_throt_en = ATOMIC_INIT(0); |
41 | 42 | ||
@@ -96,27 +97,33 @@ static int therm_throt_process(int curr) | |||
96 | { | 97 | { |
97 | unsigned int cpu = smp_processor_id(); | 98 | unsigned int cpu = smp_processor_id(); |
98 | __u64 tmp_jiffs = get_jiffies_64(); | 99 | __u64 tmp_jiffs = get_jiffies_64(); |
100 | bool was_throttled = __get_cpu_var(thermal_throttle_active); | ||
101 | bool is_throttled = __get_cpu_var(thermal_throttle_active) = curr; | ||
99 | 102 | ||
100 | if (curr) | 103 | if (is_throttled) |
101 | __get_cpu_var(thermal_throttle_count)++; | 104 | __get_cpu_var(thermal_throttle_count)++; |
102 | 105 | ||
103 | if (time_before64(tmp_jiffs, __get_cpu_var(next_check))) | 106 | if (!(was_throttled ^ is_throttled) && |
107 | time_before64(tmp_jiffs, __get_cpu_var(next_check))) | ||
104 | return 0; | 108 | return 0; |
105 | 109 | ||
106 | __get_cpu_var(next_check) = tmp_jiffs + CHECK_INTERVAL; | 110 | __get_cpu_var(next_check) = tmp_jiffs + CHECK_INTERVAL; |
107 | 111 | ||
108 | /* if we just entered the thermal event */ | 112 | /* if we just entered the thermal event */ |
109 | if (curr) { | 113 | if (is_throttled) { |
110 | printk(KERN_CRIT "CPU%d: Temperature above threshold, " | 114 | printk(KERN_CRIT "CPU%d: Temperature above threshold, " |
111 | "cpu clock throttled (total events = %lu)\n", cpu, | 115 | "cpu clock throttled (total events = %lu)\n", |
112 | __get_cpu_var(thermal_throttle_count)); | 116 | cpu, __get_cpu_var(thermal_throttle_count)); |
113 | 117 | ||
114 | add_taint(TAINT_MACHINE_CHECK); | 118 | add_taint(TAINT_MACHINE_CHECK); |
115 | } else { | 119 | return 1; |
116 | printk(KERN_CRIT "CPU%d: Temperature/speed normal\n", cpu); | 120 | } |
121 | if (was_throttled) { | ||
122 | printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu); | ||
123 | return 1; | ||
117 | } | 124 | } |
118 | 125 | ||
119 | return 1; | 126 | return 0; |
120 | } | 127 | } |
121 | 128 | ||
122 | #ifdef CONFIG_SYSFS | 129 | #ifdef CONFIG_SYSFS |
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c index a7aa8f900954..900332b800f8 100644 --- a/arch/x86/kernel/cpu/perf_counter.c +++ b/arch/x86/kernel/cpu/perf_counter.c | |||
@@ -55,6 +55,7 @@ struct x86_pmu { | |||
55 | int num_counters_fixed; | 55 | int num_counters_fixed; |
56 | int counter_bits; | 56 | int counter_bits; |
57 | u64 counter_mask; | 57 | u64 counter_mask; |
58 | int apic; | ||
58 | u64 max_period; | 59 | u64 max_period; |
59 | u64 intel_ctrl; | 60 | u64 intel_ctrl; |
60 | }; | 61 | }; |
@@ -72,8 +73,8 @@ static const u64 p6_perfmon_event_map[] = | |||
72 | { | 73 | { |
73 | [PERF_COUNT_HW_CPU_CYCLES] = 0x0079, | 74 | [PERF_COUNT_HW_CPU_CYCLES] = 0x0079, |
74 | [PERF_COUNT_HW_INSTRUCTIONS] = 0x00c0, | 75 | [PERF_COUNT_HW_INSTRUCTIONS] = 0x00c0, |
75 | [PERF_COUNT_HW_CACHE_REFERENCES] = 0x0000, | 76 | [PERF_COUNT_HW_CACHE_REFERENCES] = 0x0f2e, |
76 | [PERF_COUNT_HW_CACHE_MISSES] = 0x0000, | 77 | [PERF_COUNT_HW_CACHE_MISSES] = 0x012e, |
77 | [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x00c4, | 78 | [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x00c4, |
78 | [PERF_COUNT_HW_BRANCH_MISSES] = 0x00c5, | 79 | [PERF_COUNT_HW_BRANCH_MISSES] = 0x00c5, |
79 | [PERF_COUNT_HW_BUS_CYCLES] = 0x0062, | 80 | [PERF_COUNT_HW_BUS_CYCLES] = 0x0062, |
@@ -613,6 +614,7 @@ static DEFINE_MUTEX(pmc_reserve_mutex); | |||
613 | 614 | ||
614 | static bool reserve_pmc_hardware(void) | 615 | static bool reserve_pmc_hardware(void) |
615 | { | 616 | { |
617 | #ifdef CONFIG_X86_LOCAL_APIC | ||
616 | int i; | 618 | int i; |
617 | 619 | ||
618 | if (nmi_watchdog == NMI_LOCAL_APIC) | 620 | if (nmi_watchdog == NMI_LOCAL_APIC) |
@@ -627,9 +629,11 @@ static bool reserve_pmc_hardware(void) | |||
627 | if (!reserve_evntsel_nmi(x86_pmu.eventsel + i)) | 629 | if (!reserve_evntsel_nmi(x86_pmu.eventsel + i)) |
628 | goto eventsel_fail; | 630 | goto eventsel_fail; |
629 | } | 631 | } |
632 | #endif | ||
630 | 633 | ||
631 | return true; | 634 | return true; |
632 | 635 | ||
636 | #ifdef CONFIG_X86_LOCAL_APIC | ||
633 | eventsel_fail: | 637 | eventsel_fail: |
634 | for (i--; i >= 0; i--) | 638 | for (i--; i >= 0; i--) |
635 | release_evntsel_nmi(x86_pmu.eventsel + i); | 639 | release_evntsel_nmi(x86_pmu.eventsel + i); |
@@ -644,10 +648,12 @@ perfctr_fail: | |||
644 | enable_lapic_nmi_watchdog(); | 648 | enable_lapic_nmi_watchdog(); |
645 | 649 | ||
646 | return false; | 650 | return false; |
651 | #endif | ||
647 | } | 652 | } |
648 | 653 | ||
649 | static void release_pmc_hardware(void) | 654 | static void release_pmc_hardware(void) |
650 | { | 655 | { |
656 | #ifdef CONFIG_X86_LOCAL_APIC | ||
651 | int i; | 657 | int i; |
652 | 658 | ||
653 | for (i = 0; i < x86_pmu.num_counters; i++) { | 659 | for (i = 0; i < x86_pmu.num_counters; i++) { |
@@ -657,6 +663,7 @@ static void release_pmc_hardware(void) | |||
657 | 663 | ||
658 | if (nmi_watchdog == NMI_LOCAL_APIC) | 664 | if (nmi_watchdog == NMI_LOCAL_APIC) |
659 | enable_lapic_nmi_watchdog(); | 665 | enable_lapic_nmi_watchdog(); |
666 | #endif | ||
660 | } | 667 | } |
661 | 668 | ||
662 | static void hw_perf_counter_destroy(struct perf_counter *counter) | 669 | static void hw_perf_counter_destroy(struct perf_counter *counter) |
@@ -748,6 +755,15 @@ static int __hw_perf_counter_init(struct perf_counter *counter) | |||
748 | hwc->sample_period = x86_pmu.max_period; | 755 | hwc->sample_period = x86_pmu.max_period; |
749 | hwc->last_period = hwc->sample_period; | 756 | hwc->last_period = hwc->sample_period; |
750 | atomic64_set(&hwc->period_left, hwc->sample_period); | 757 | atomic64_set(&hwc->period_left, hwc->sample_period); |
758 | } else { | ||
759 | /* | ||
760 | * If we have a PMU initialized but no APIC | ||
761 | * interrupts, we cannot sample hardware | ||
762 | * counters (user-space has to fall back and | ||
763 | * sample via a hrtimer based software counter): | ||
764 | */ | ||
765 | if (!x86_pmu.apic) | ||
766 | return -EOPNOTSUPP; | ||
751 | } | 767 | } |
752 | 768 | ||
753 | counter->destroy = hw_perf_counter_destroy; | 769 | counter->destroy = hw_perf_counter_destroy; |
@@ -1449,18 +1465,22 @@ void smp_perf_pending_interrupt(struct pt_regs *regs) | |||
1449 | 1465 | ||
1450 | void set_perf_counter_pending(void) | 1466 | void set_perf_counter_pending(void) |
1451 | { | 1467 | { |
1468 | #ifdef CONFIG_X86_LOCAL_APIC | ||
1452 | apic->send_IPI_self(LOCAL_PENDING_VECTOR); | 1469 | apic->send_IPI_self(LOCAL_PENDING_VECTOR); |
1470 | #endif | ||
1453 | } | 1471 | } |
1454 | 1472 | ||
1455 | void perf_counters_lapic_init(void) | 1473 | void perf_counters_lapic_init(void) |
1456 | { | 1474 | { |
1457 | if (!x86_pmu_initialized()) | 1475 | #ifdef CONFIG_X86_LOCAL_APIC |
1476 | if (!x86_pmu.apic || !x86_pmu_initialized()) | ||
1458 | return; | 1477 | return; |
1459 | 1478 | ||
1460 | /* | 1479 | /* |
1461 | * Always use NMI for PMU | 1480 | * Always use NMI for PMU |
1462 | */ | 1481 | */ |
1463 | apic_write(APIC_LVTPC, APIC_DM_NMI); | 1482 | apic_write(APIC_LVTPC, APIC_DM_NMI); |
1483 | #endif | ||
1464 | } | 1484 | } |
1465 | 1485 | ||
1466 | static int __kprobes | 1486 | static int __kprobes |
@@ -1484,7 +1504,9 @@ perf_counter_nmi_handler(struct notifier_block *self, | |||
1484 | 1504 | ||
1485 | regs = args->regs; | 1505 | regs = args->regs; |
1486 | 1506 | ||
1507 | #ifdef CONFIG_X86_LOCAL_APIC | ||
1487 | apic_write(APIC_LVTPC, APIC_DM_NMI); | 1508 | apic_write(APIC_LVTPC, APIC_DM_NMI); |
1509 | #endif | ||
1488 | /* | 1510 | /* |
1489 | * Can't rely on the handled return value to say it was our NMI, two | 1511 | * Can't rely on the handled return value to say it was our NMI, two |
1490 | * counters could trigger 'simultaneously' raising two back-to-back NMIs. | 1512 | * counters could trigger 'simultaneously' raising two back-to-back NMIs. |
@@ -1515,6 +1537,7 @@ static struct x86_pmu p6_pmu = { | |||
1515 | .event_map = p6_pmu_event_map, | 1537 | .event_map = p6_pmu_event_map, |
1516 | .raw_event = p6_pmu_raw_event, | 1538 | .raw_event = p6_pmu_raw_event, |
1517 | .max_events = ARRAY_SIZE(p6_perfmon_event_map), | 1539 | .max_events = ARRAY_SIZE(p6_perfmon_event_map), |
1540 | .apic = 1, | ||
1518 | .max_period = (1ULL << 31) - 1, | 1541 | .max_period = (1ULL << 31) - 1, |
1519 | .version = 0, | 1542 | .version = 0, |
1520 | .num_counters = 2, | 1543 | .num_counters = 2, |
@@ -1541,6 +1564,7 @@ static struct x86_pmu intel_pmu = { | |||
1541 | .event_map = intel_pmu_event_map, | 1564 | .event_map = intel_pmu_event_map, |
1542 | .raw_event = intel_pmu_raw_event, | 1565 | .raw_event = intel_pmu_raw_event, |
1543 | .max_events = ARRAY_SIZE(intel_perfmon_event_map), | 1566 | .max_events = ARRAY_SIZE(intel_perfmon_event_map), |
1567 | .apic = 1, | ||
1544 | /* | 1568 | /* |
1545 | * Intel PMCs cannot be accessed sanely above 32 bit width, | 1569 | * Intel PMCs cannot be accessed sanely above 32 bit width, |
1546 | * so we install an artificial 1<<31 period regardless of | 1570 | * so we install an artificial 1<<31 period regardless of |
@@ -1564,6 +1588,7 @@ static struct x86_pmu amd_pmu = { | |||
1564 | .num_counters = 4, | 1588 | .num_counters = 4, |
1565 | .counter_bits = 48, | 1589 | .counter_bits = 48, |
1566 | .counter_mask = (1ULL << 48) - 1, | 1590 | .counter_mask = (1ULL << 48) - 1, |
1591 | .apic = 1, | ||
1567 | /* use highest bit to detect overflow */ | 1592 | /* use highest bit to detect overflow */ |
1568 | .max_period = (1ULL << 47) - 1, | 1593 | .max_period = (1ULL << 47) - 1, |
1569 | }; | 1594 | }; |
@@ -1589,13 +1614,14 @@ static int p6_pmu_init(void) | |||
1589 | return -ENODEV; | 1614 | return -ENODEV; |
1590 | } | 1615 | } |
1591 | 1616 | ||
1617 | x86_pmu = p6_pmu; | ||
1618 | |||
1592 | if (!cpu_has_apic) { | 1619 | if (!cpu_has_apic) { |
1593 | pr_info("no Local APIC, try rebooting with lapic"); | 1620 | pr_info("no APIC, boot with the \"lapic\" boot parameter to force-enable it.\n"); |
1594 | return -ENODEV; | 1621 | pr_info("no hardware sampling interrupt available.\n"); |
1622 | x86_pmu.apic = 0; | ||
1595 | } | 1623 | } |
1596 | 1624 | ||
1597 | x86_pmu = p6_pmu; | ||
1598 | |||
1599 | return 0; | 1625 | return 0; |
1600 | } | 1626 | } |
1601 | 1627 | ||
diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c index 96f7ac0bbf01..fe26ba3e3451 100644 --- a/arch/x86/kernel/efi.c +++ b/arch/x86/kernel/efi.c | |||
@@ -354,7 +354,7 @@ void __init efi_init(void) | |||
354 | */ | 354 | */ |
355 | c16 = tmp = early_ioremap(efi.systab->fw_vendor, 2); | 355 | c16 = tmp = early_ioremap(efi.systab->fw_vendor, 2); |
356 | if (c16) { | 356 | if (c16) { |
357 | for (i = 0; i < sizeof(vendor) && *c16; ++i) | 357 | for (i = 0; i < sizeof(vendor) - 1 && *c16; ++i) |
358 | vendor[i] = *c16++; | 358 | vendor[i] = *c16++; |
359 | vendor[i] = '\0'; | 359 | vendor[i] = '\0'; |
360 | } else | 360 | } else |
@@ -512,7 +512,7 @@ void __init efi_enter_virtual_mode(void) | |||
512 | && end_pfn <= max_pfn_mapped)) | 512 | && end_pfn <= max_pfn_mapped)) |
513 | va = __va(md->phys_addr); | 513 | va = __va(md->phys_addr); |
514 | else | 514 | else |
515 | va = efi_ioremap(md->phys_addr, size); | 515 | va = efi_ioremap(md->phys_addr, size, md->type); |
516 | 516 | ||
517 | md->virt_addr = (u64) (unsigned long) va; | 517 | md->virt_addr = (u64) (unsigned long) va; |
518 | 518 | ||
diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/kernel/efi_64.c index 22c3b7828c50..ac0621a7ac3d 100644 --- a/arch/x86/kernel/efi_64.c +++ b/arch/x86/kernel/efi_64.c | |||
@@ -98,10 +98,14 @@ void __init efi_call_phys_epilog(void) | |||
98 | early_runtime_code_mapping_set_exec(0); | 98 | early_runtime_code_mapping_set_exec(0); |
99 | } | 99 | } |
100 | 100 | ||
101 | void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size) | 101 | void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size, |
102 | u32 type) | ||
102 | { | 103 | { |
103 | unsigned long last_map_pfn; | 104 | unsigned long last_map_pfn; |
104 | 105 | ||
106 | if (type == EFI_MEMORY_MAPPED_IO) | ||
107 | return ioremap(phys_addr, size); | ||
108 | |||
105 | last_map_pfn = init_memory_mapping(phys_addr, phys_addr + size); | 109 | last_map_pfn = init_memory_mapping(phys_addr, phys_addr + size); |
106 | if ((last_map_pfn << PAGE_SHIFT) < phys_addr + size) | 110 | if ((last_map_pfn << PAGE_SHIFT) < phys_addr + size) |
107 | return NULL; | 111 | return NULL; |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 8663afb56535..cc827ac9e8d3 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -261,9 +261,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20); | |||
261 | * which will be freed later | 261 | * which will be freed later |
262 | */ | 262 | */ |
263 | 263 | ||
264 | #ifndef CONFIG_HOTPLUG_CPU | 264 | __CPUINIT |
265 | .section .init.text,"ax",@progbits | ||
266 | #endif | ||
267 | 265 | ||
268 | #ifdef CONFIG_SMP | 266 | #ifdef CONFIG_SMP |
269 | ENTRY(startup_32_smp) | 267 | ENTRY(startup_32_smp) |
@@ -602,7 +600,7 @@ ignore_int: | |||
602 | #endif | 600 | #endif |
603 | iret | 601 | iret |
604 | 602 | ||
605 | .section .cpuinit.data,"wa" | 603 | __REFDATA |
606 | .align 4 | 604 | .align 4 |
607 | ENTRY(initial_code) | 605 | ENTRY(initial_code) |
608 | .long i386_start_kernel | 606 | .long i386_start_kernel |
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 696f0e475c2d..92b7703d3d58 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c | |||
@@ -187,7 +187,7 @@ static void __init apic_intr_init(void) | |||
187 | #ifdef CONFIG_X86_THERMAL_VECTOR | 187 | #ifdef CONFIG_X86_THERMAL_VECTOR |
188 | alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | 188 | alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); |
189 | #endif | 189 | #endif |
190 | #ifdef CONFIG_X86_THRESHOLD | 190 | #ifdef CONFIG_X86_MCE_THRESHOLD |
191 | alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); | 191 | alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); |
192 | #endif | 192 | #endif |
193 | #if defined(CONFIG_X86_NEW_MCE) && defined(CONFIG_X86_LOCAL_APIC) | 193 | #if defined(CONFIG_X86_NEW_MCE) && defined(CONFIG_X86_LOCAL_APIC) |
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 846510b78a09..2a62d843f015 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
@@ -347,7 +347,7 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id) | |||
347 | 347 | ||
348 | static struct irqaction mfgptirq = { | 348 | static struct irqaction mfgptirq = { |
349 | .handler = mfgpt_tick, | 349 | .handler = mfgpt_tick, |
350 | .flags = IRQF_DISABLED | IRQF_NOBALANCING, | 350 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TIMER, |
351 | .name = "mfgpt-timer" | 351 | .name = "mfgpt-timer" |
352 | }; | 352 | }; |
353 | 353 | ||
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 994dd6a4a2a0..071166a4ba83 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -519,16 +519,12 @@ static void c1e_idle(void) | |||
519 | if (!cpumask_test_cpu(cpu, c1e_mask)) { | 519 | if (!cpumask_test_cpu(cpu, c1e_mask)) { |
520 | cpumask_set_cpu(cpu, c1e_mask); | 520 | cpumask_set_cpu(cpu, c1e_mask); |
521 | /* | 521 | /* |
522 | * Force broadcast so ACPI can not interfere. Needs | 522 | * Force broadcast so ACPI can not interfere. |
523 | * to run with interrupts enabled as it uses | ||
524 | * smp_function_call. | ||
525 | */ | 523 | */ |
526 | local_irq_enable(); | ||
527 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, | 524 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, |
528 | &cpu); | 525 | &cpu); |
529 | printk(KERN_INFO "Switch to broadcast mode on CPU%d\n", | 526 | printk(KERN_INFO "Switch to broadcast mode on CPU%d\n", |
530 | cpu); | 527 | cpu); |
531 | local_irq_disable(); | ||
532 | } | 528 | } |
533 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu); | 529 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu); |
534 | 530 | ||
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index d2d1ce8170f0..a06e8d101844 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -3,6 +3,7 @@ | |||
3 | #include <linux/init.h> | 3 | #include <linux/init.h> |
4 | #include <linux/pm.h> | 4 | #include <linux/pm.h> |
5 | #include <linux/efi.h> | 5 | #include <linux/efi.h> |
6 | #include <linux/dmi.h> | ||
6 | #include <acpi/reboot.h> | 7 | #include <acpi/reboot.h> |
7 | #include <asm/io.h> | 8 | #include <asm/io.h> |
8 | #include <asm/apic.h> | 9 | #include <asm/apic.h> |
@@ -17,7 +18,6 @@ | |||
17 | #include <asm/cpu.h> | 18 | #include <asm/cpu.h> |
18 | 19 | ||
19 | #ifdef CONFIG_X86_32 | 20 | #ifdef CONFIG_X86_32 |
20 | # include <linux/dmi.h> | ||
21 | # include <linux/ctype.h> | 21 | # include <linux/ctype.h> |
22 | # include <linux/mc146818rtc.h> | 22 | # include <linux/mc146818rtc.h> |
23 | #else | 23 | #else |
@@ -249,6 +249,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
249 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"), | 249 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"), |
250 | }, | 250 | }, |
251 | }, | 251 | }, |
252 | { /* Handle problems with rebooting on CompuLab SBC-FITPC2 */ | ||
253 | .callback = set_bios_reboot, | ||
254 | .ident = "CompuLab SBC-FITPC2", | ||
255 | .matches = { | ||
256 | DMI_MATCH(DMI_SYS_VENDOR, "CompuLab"), | ||
257 | DMI_MATCH(DMI_PRODUCT_NAME, "SBC-FITPC2"), | ||
258 | }, | ||
259 | }, | ||
252 | { } | 260 | { } |
253 | }; | 261 | }; |
254 | 262 | ||
@@ -396,6 +404,46 @@ EXPORT_SYMBOL(machine_real_restart); | |||
396 | 404 | ||
397 | #endif /* CONFIG_X86_32 */ | 405 | #endif /* CONFIG_X86_32 */ |
398 | 406 | ||
407 | /* | ||
408 | * Some Apple MacBook and MacBookPro's needs reboot=p to be able to reboot | ||
409 | */ | ||
410 | static int __init set_pci_reboot(const struct dmi_system_id *d) | ||
411 | { | ||
412 | if (reboot_type != BOOT_CF9) { | ||
413 | reboot_type = BOOT_CF9; | ||
414 | printk(KERN_INFO "%s series board detected. " | ||
415 | "Selecting PCI-method for reboots.\n", d->ident); | ||
416 | } | ||
417 | return 0; | ||
418 | } | ||
419 | |||
420 | static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { | ||
421 | { /* Handle problems with rebooting on Apple MacBook5 */ | ||
422 | .callback = set_pci_reboot, | ||
423 | .ident = "Apple MacBook5", | ||
424 | .matches = { | ||
425 | DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), | ||
426 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"), | ||
427 | }, | ||
428 | }, | ||
429 | { /* Handle problems with rebooting on Apple MacBookPro5 */ | ||
430 | .callback = set_pci_reboot, | ||
431 | .ident = "Apple MacBookPro5", | ||
432 | .matches = { | ||
433 | DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), | ||
434 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5"), | ||
435 | }, | ||
436 | }, | ||
437 | { } | ||
438 | }; | ||
439 | |||
440 | static int __init pci_reboot_init(void) | ||
441 | { | ||
442 | dmi_check_system(pci_reboot_dmi_table); | ||
443 | return 0; | ||
444 | } | ||
445 | core_initcall(pci_reboot_init); | ||
446 | |||
399 | static inline void kb_wait(void) | 447 | static inline void kb_wait(void) |
400 | { | 448 | { |
401 | int i; | 449 | int i; |
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index de2cab132844..63f32d220ef2 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -672,6 +672,19 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { | |||
672 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies"), | 672 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies"), |
673 | }, | 673 | }, |
674 | }, | 674 | }, |
675 | { | ||
676 | /* | ||
677 | * AMI BIOS with low memory corruption was found on Intel DG45ID board. | ||
678 | * It hase different DMI_BIOS_VENDOR = "Intel Corp.", for now we will | ||
679 | * match only DMI_BOARD_NAME and see if there is more bad products | ||
680 | * with this vendor. | ||
681 | */ | ||
682 | .callback = dmi_low_memory_corruption, | ||
683 | .ident = "AMI BIOS", | ||
684 | .matches = { | ||
685 | DMI_MATCH(DMI_BOARD_NAME, "DG45ID"), | ||
686 | }, | ||
687 | }, | ||
675 | #endif | 688 | #endif |
676 | {} | 689 | {} |
677 | }; | 690 | }; |
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 29a3eef7cf4a..07d81916f212 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
@@ -165,7 +165,7 @@ static ssize_t __init setup_pcpu_lpage(size_t static_size, bool chosen) | |||
165 | 165 | ||
166 | if (!chosen) { | 166 | if (!chosen) { |
167 | size_t vm_size = VMALLOC_END - VMALLOC_START; | 167 | size_t vm_size = VMALLOC_END - VMALLOC_START; |
168 | size_t tot_size = num_possible_cpus() * PMD_SIZE; | 168 | size_t tot_size = nr_cpu_ids * PMD_SIZE; |
169 | 169 | ||
170 | /* on non-NUMA, embedding is better */ | 170 | /* on non-NUMA, embedding is better */ |
171 | if (!pcpu_need_numa()) | 171 | if (!pcpu_need_numa()) |
@@ -199,7 +199,7 @@ static ssize_t __init setup_pcpu_lpage(size_t static_size, bool chosen) | |||
199 | dyn_size = pcpul_size - static_size - PERCPU_FIRST_CHUNK_RESERVE; | 199 | dyn_size = pcpul_size - static_size - PERCPU_FIRST_CHUNK_RESERVE; |
200 | 200 | ||
201 | /* allocate pointer array and alloc large pages */ | 201 | /* allocate pointer array and alloc large pages */ |
202 | map_size = PFN_ALIGN(num_possible_cpus() * sizeof(pcpul_map[0])); | 202 | map_size = PFN_ALIGN(nr_cpu_ids * sizeof(pcpul_map[0])); |
203 | pcpul_map = alloc_bootmem(map_size); | 203 | pcpul_map = alloc_bootmem(map_size); |
204 | 204 | ||
205 | for_each_possible_cpu(cpu) { | 205 | for_each_possible_cpu(cpu) { |
@@ -228,7 +228,7 @@ static ssize_t __init setup_pcpu_lpage(size_t static_size, bool chosen) | |||
228 | 228 | ||
229 | /* allocate address and map */ | 229 | /* allocate address and map */ |
230 | pcpul_vm.flags = VM_ALLOC; | 230 | pcpul_vm.flags = VM_ALLOC; |
231 | pcpul_vm.size = num_possible_cpus() * PMD_SIZE; | 231 | pcpul_vm.size = nr_cpu_ids * PMD_SIZE; |
232 | vm_area_register_early(&pcpul_vm, PMD_SIZE); | 232 | vm_area_register_early(&pcpul_vm, PMD_SIZE); |
233 | 233 | ||
234 | for_each_possible_cpu(cpu) { | 234 | for_each_possible_cpu(cpu) { |
@@ -250,8 +250,8 @@ static ssize_t __init setup_pcpu_lpage(size_t static_size, bool chosen) | |||
250 | PMD_SIZE, pcpul_vm.addr, NULL); | 250 | PMD_SIZE, pcpul_vm.addr, NULL); |
251 | 251 | ||
252 | /* sort pcpul_map array for pcpu_lpage_remapped() */ | 252 | /* sort pcpul_map array for pcpu_lpage_remapped() */ |
253 | for (i = 0; i < num_possible_cpus() - 1; i++) | 253 | for (i = 0; i < nr_cpu_ids - 1; i++) |
254 | for (j = i + 1; j < num_possible_cpus(); j++) | 254 | for (j = i + 1; j < nr_cpu_ids; j++) |
255 | if (pcpul_map[i].ptr > pcpul_map[j].ptr) { | 255 | if (pcpul_map[i].ptr > pcpul_map[j].ptr) { |
256 | struct pcpul_ent tmp = pcpul_map[i]; | 256 | struct pcpul_ent tmp = pcpul_map[i]; |
257 | pcpul_map[i] = pcpul_map[j]; | 257 | pcpul_map[i] = pcpul_map[j]; |
@@ -288,7 +288,7 @@ void *pcpu_lpage_remapped(void *kaddr) | |||
288 | { | 288 | { |
289 | void *pmd_addr = (void *)((unsigned long)kaddr & PMD_MASK); | 289 | void *pmd_addr = (void *)((unsigned long)kaddr & PMD_MASK); |
290 | unsigned long offset = (unsigned long)kaddr & ~PMD_MASK; | 290 | unsigned long offset = (unsigned long)kaddr & ~PMD_MASK; |
291 | int left = 0, right = num_possible_cpus() - 1; | 291 | int left = 0, right = nr_cpu_ids - 1; |
292 | int pos; | 292 | int pos; |
293 | 293 | ||
294 | /* pcpul in use at all? */ | 294 | /* pcpul in use at all? */ |
@@ -377,7 +377,7 @@ static ssize_t __init setup_pcpu_4k(size_t static_size) | |||
377 | pcpu4k_nr_static_pages = PFN_UP(static_size); | 377 | pcpu4k_nr_static_pages = PFN_UP(static_size); |
378 | 378 | ||
379 | /* unaligned allocations can't be freed, round up to page size */ | 379 | /* unaligned allocations can't be freed, round up to page size */ |
380 | pages_size = PFN_ALIGN(pcpu4k_nr_static_pages * num_possible_cpus() | 380 | pages_size = PFN_ALIGN(pcpu4k_nr_static_pages * nr_cpu_ids |
381 | * sizeof(pcpu4k_pages[0])); | 381 | * sizeof(pcpu4k_pages[0])); |
382 | pcpu4k_pages = alloc_bootmem(pages_size); | 382 | pcpu4k_pages = alloc_bootmem(pages_size); |
383 | 383 | ||
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c index 8ccabb8a2f6a..77b9689f8edb 100644 --- a/arch/x86/kernel/tlb_uv.c +++ b/arch/x86/kernel/tlb_uv.c | |||
@@ -744,6 +744,7 @@ uv_activation_descriptor_init(int node, int pnode) | |||
744 | * note that base_dest_nodeid is actually a nasid. | 744 | * note that base_dest_nodeid is actually a nasid. |
745 | */ | 745 | */ |
746 | ad2->header.base_dest_nodeid = uv_partition_base_pnode << 1; | 746 | ad2->header.base_dest_nodeid = uv_partition_base_pnode << 1; |
747 | ad2->header.dest_subnodeid = 0x10; /* the LB */ | ||
747 | ad2->header.command = UV_NET_ENDPOINT_INTD; | 748 | ad2->header.command = UV_NET_ENDPOINT_INTD; |
748 | ad2->header.int_both = 1; | 749 | ad2->header.int_both = 1; |
749 | /* | 750 | /* |
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 6e1a368d21d4..71f4368b357e 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
@@ -275,15 +275,20 @@ static unsigned long pit_calibrate_tsc(u32 latch, unsigned long ms, int loopmin) | |||
275 | * use the TSC value at the transitions to calculate a pretty | 275 | * use the TSC value at the transitions to calculate a pretty |
276 | * good value for the TSC frequencty. | 276 | * good value for the TSC frequencty. |
277 | */ | 277 | */ |
278 | static inline int pit_verify_msb(unsigned char val) | ||
279 | { | ||
280 | /* Ignore LSB */ | ||
281 | inb(0x42); | ||
282 | return inb(0x42) == val; | ||
283 | } | ||
284 | |||
278 | static inline int pit_expect_msb(unsigned char val, u64 *tscp, unsigned long *deltap) | 285 | static inline int pit_expect_msb(unsigned char val, u64 *tscp, unsigned long *deltap) |
279 | { | 286 | { |
280 | int count; | 287 | int count; |
281 | u64 tsc = 0; | 288 | u64 tsc = 0; |
282 | 289 | ||
283 | for (count = 0; count < 50000; count++) { | 290 | for (count = 0; count < 50000; count++) { |
284 | /* Ignore LSB */ | 291 | if (!pit_verify_msb(val)) |
285 | inb(0x42); | ||
286 | if (inb(0x42) != val) | ||
287 | break; | 292 | break; |
288 | tsc = get_cycles(); | 293 | tsc = get_cycles(); |
289 | } | 294 | } |
@@ -336,8 +341,7 @@ static unsigned long quick_pit_calibrate(void) | |||
336 | * to do that is to just read back the 16-bit counter | 341 | * to do that is to just read back the 16-bit counter |
337 | * once from the PIT. | 342 | * once from the PIT. |
338 | */ | 343 | */ |
339 | inb(0x42); | 344 | pit_verify_msb(0); |
340 | inb(0x42); | ||
341 | 345 | ||
342 | if (pit_expect_msb(0xff, &tsc, &d1)) { | 346 | if (pit_expect_msb(0xff, &tsc, &d1)) { |
343 | for (i = 1; i <= MAX_QUICK_PIT_ITERATIONS; i++) { | 347 | for (i = 1; i <= MAX_QUICK_PIT_ITERATIONS; i++) { |
@@ -348,8 +352,19 @@ static unsigned long quick_pit_calibrate(void) | |||
348 | * Iterate until the error is less than 500 ppm | 352 | * Iterate until the error is less than 500 ppm |
349 | */ | 353 | */ |
350 | delta -= tsc; | 354 | delta -= tsc; |
351 | if (d1+d2 < delta >> 11) | 355 | if (d1+d2 >= delta >> 11) |
352 | goto success; | 356 | continue; |
357 | |||
358 | /* | ||
359 | * Check the PIT one more time to verify that | ||
360 | * all TSC reads were stable wrt the PIT. | ||
361 | * | ||
362 | * This also guarantees serialization of the | ||
363 | * last cycle read ('d2') in pit_expect_msb. | ||
364 | */ | ||
365 | if (!pit_verify_msb(0xfe - i)) | ||
366 | break; | ||
367 | goto success; | ||
353 | } | 368 | } |
354 | } | 369 | } |
355 | printk("Fast TSC calibration failed\n"); | 370 | printk("Fast TSC calibration failed\n"); |
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index b263423fbe2a..95a7289e4b0c 100644 --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c | |||
@@ -441,7 +441,7 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip, | |||
441 | ap.ds = __USER_DS; | 441 | ap.ds = __USER_DS; |
442 | ap.es = __USER_DS; | 442 | ap.es = __USER_DS; |
443 | ap.fs = __KERNEL_PERCPU; | 443 | ap.fs = __KERNEL_PERCPU; |
444 | ap.gs = 0; | 444 | ap.gs = __KERNEL_STACK_CANARY; |
445 | 445 | ||
446 | ap.eflags = 0; | 446 | ap.eflags = 0; |
447 | 447 | ||
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 367e87882041..9fc178255c04 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S | |||
@@ -46,11 +46,10 @@ PHDRS { | |||
46 | data PT_LOAD FLAGS(7); /* RWE */ | 46 | data PT_LOAD FLAGS(7); /* RWE */ |
47 | #ifdef CONFIG_X86_64 | 47 | #ifdef CONFIG_X86_64 |
48 | user PT_LOAD FLAGS(7); /* RWE */ | 48 | user PT_LOAD FLAGS(7); /* RWE */ |
49 | data.init PT_LOAD FLAGS(7); /* RWE */ | ||
50 | #ifdef CONFIG_SMP | 49 | #ifdef CONFIG_SMP |
51 | percpu PT_LOAD FLAGS(7); /* RWE */ | 50 | percpu PT_LOAD FLAGS(7); /* RWE */ |
52 | #endif | 51 | #endif |
53 | data.init2 PT_LOAD FLAGS(7); /* RWE */ | 52 | init PT_LOAD FLAGS(7); /* RWE */ |
54 | #endif | 53 | #endif |
55 | note PT_NOTE FLAGS(0); /* ___ */ | 54 | note PT_NOTE FLAGS(0); /* ___ */ |
56 | } | 55 | } |
@@ -103,72 +102,43 @@ SECTIONS | |||
103 | __stop___ex_table = .; | 102 | __stop___ex_table = .; |
104 | } :text = 0x9090 | 103 | } :text = 0x9090 |
105 | 104 | ||
106 | RODATA | 105 | RO_DATA(PAGE_SIZE) |
107 | 106 | ||
108 | /* Data */ | 107 | /* Data */ |
109 | . = ALIGN(PAGE_SIZE); | ||
110 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 108 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
111 | /* Start of data section */ | 109 | /* Start of data section */ |
112 | _sdata = .; | 110 | _sdata = .; |
113 | DATA_DATA | ||
114 | CONSTRUCTORS | ||
115 | 111 | ||
116 | #ifdef CONFIG_X86_64 | 112 | /* init_task */ |
117 | /* End of data section */ | 113 | INIT_TASK_DATA(THREAD_SIZE) |
118 | _edata = .; | ||
119 | #endif | ||
120 | } :data | ||
121 | 114 | ||
122 | #ifdef CONFIG_X86_32 | 115 | #ifdef CONFIG_X86_32 |
123 | /* 32 bit has nosave before _edata */ | 116 | /* 32 bit has nosave before _edata */ |
124 | . = ALIGN(PAGE_SIZE); | 117 | NOSAVE_DATA |
125 | .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { | ||
126 | __nosave_begin = .; | ||
127 | *(.data.nosave) | ||
128 | . = ALIGN(PAGE_SIZE); | ||
129 | __nosave_end = .; | ||
130 | } | ||
131 | #endif | 118 | #endif |
132 | 119 | ||
133 | . = ALIGN(PAGE_SIZE); | 120 | PAGE_ALIGNED_DATA(PAGE_SIZE) |
134 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { | ||
135 | *(.data.page_aligned) | ||
136 | *(.data.idt) | 121 | *(.data.idt) |
137 | } | ||
138 | 122 | ||
139 | #ifdef CONFIG_X86_32 | 123 | CACHELINE_ALIGNED_DATA(CONFIG_X86_L1_CACHE_BYTES) |
140 | . = ALIGN(32); | ||
141 | #else | ||
142 | . = ALIGN(PAGE_SIZE); | ||
143 | . = ALIGN(CONFIG_X86_L1_CACHE_BYTES); | ||
144 | #endif | ||
145 | .data.cacheline_aligned : | ||
146 | AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { | ||
147 | *(.data.cacheline_aligned) | ||
148 | } | ||
149 | 124 | ||
150 | /* rarely changed data like cpu maps */ | 125 | DATA_DATA |
151 | #ifdef CONFIG_X86_32 | 126 | CONSTRUCTORS |
152 | . = ALIGN(32); | 127 | |
153 | #else | 128 | /* rarely changed data like cpu maps */ |
154 | . = ALIGN(CONFIG_X86_INTERNODE_CACHE_BYTES); | 129 | READ_MOSTLY_DATA(CONFIG_X86_INTERNODE_CACHE_BYTES) |
155 | #endif | ||
156 | .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { | ||
157 | *(.data.read_mostly) | ||
158 | 130 | ||
159 | #ifdef CONFIG_X86_32 | ||
160 | /* End of data section */ | 131 | /* End of data section */ |
161 | _edata = .; | 132 | _edata = .; |
162 | #endif | 133 | } :data |
163 | } | ||
164 | 134 | ||
165 | #ifdef CONFIG_X86_64 | 135 | #ifdef CONFIG_X86_64 |
166 | 136 | ||
167 | #define VSYSCALL_ADDR (-10*1024*1024) | 137 | #define VSYSCALL_ADDR (-10*1024*1024) |
168 | #define VSYSCALL_PHYS_ADDR ((LOADADDR(.data.read_mostly) + \ | 138 | #define VSYSCALL_PHYS_ADDR ((LOADADDR(.data) + SIZEOF(.data) + \ |
169 | SIZEOF(.data.read_mostly) + 4095) & ~(4095)) | 139 | PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) |
170 | #define VSYSCALL_VIRT_ADDR ((ADDR(.data.read_mostly) + \ | 140 | #define VSYSCALL_VIRT_ADDR ((ADDR(.data) + SIZEOF(.data) + \ |
171 | SIZEOF(.data.read_mostly) + 4095) & ~(4095)) | 141 | PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) |
172 | 142 | ||
173 | #define VLOAD_OFFSET (VSYSCALL_ADDR - VSYSCALL_PHYS_ADDR) | 143 | #define VLOAD_OFFSET (VSYSCALL_ADDR - VSYSCALL_PHYS_ADDR) |
174 | #define VLOAD(x) (ADDR(x) - VLOAD_OFFSET) | 144 | #define VLOAD(x) (ADDR(x) - VLOAD_OFFSET) |
@@ -234,35 +204,29 @@ SECTIONS | |||
234 | 204 | ||
235 | #endif /* CONFIG_X86_64 */ | 205 | #endif /* CONFIG_X86_64 */ |
236 | 206 | ||
237 | /* init_task */ | 207 | /* Init code and data - will be freed after init */ |
238 | . = ALIGN(THREAD_SIZE); | 208 | . = ALIGN(PAGE_SIZE); |
239 | .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { | 209 | .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) { |
240 | *(.data.init_task) | 210 | __init_begin = .; /* paired with __init_end */ |
241 | } | 211 | } |
242 | #ifdef CONFIG_X86_64 | ||
243 | :data.init | ||
244 | #endif | ||
245 | 212 | ||
213 | #if defined(CONFIG_X86_64) && defined(CONFIG_SMP) | ||
246 | /* | 214 | /* |
247 | * smp_locks might be freed after init | 215 | * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the |
248 | * start/end must be page aligned | 216 | * output PHDR, so the next output section - .init.text - should |
217 | * start another segment - init. | ||
249 | */ | 218 | */ |
250 | . = ALIGN(PAGE_SIZE); | 219 | PERCPU_VADDR(0, :percpu) |
251 | .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { | 220 | #endif |
252 | __smp_locks = .; | ||
253 | *(.smp_locks) | ||
254 | __smp_locks_end = .; | ||
255 | . = ALIGN(PAGE_SIZE); | ||
256 | } | ||
257 | 221 | ||
258 | /* Init code and data - will be freed after init */ | ||
259 | . = ALIGN(PAGE_SIZE); | ||
260 | .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { | 222 | .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { |
261 | __init_begin = .; /* paired with __init_end */ | ||
262 | _sinittext = .; | 223 | _sinittext = .; |
263 | INIT_TEXT | 224 | INIT_TEXT |
264 | _einittext = .; | 225 | _einittext = .; |
265 | } | 226 | } |
227 | #ifdef CONFIG_X86_64 | ||
228 | :init | ||
229 | #endif | ||
266 | 230 | ||
267 | .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { | 231 | .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { |
268 | INIT_DATA | 232 | INIT_DATA |
@@ -333,17 +297,7 @@ SECTIONS | |||
333 | } | 297 | } |
334 | #endif | 298 | #endif |
335 | 299 | ||
336 | #if defined(CONFIG_X86_64) && defined(CONFIG_SMP) | 300 | #if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP) |
337 | /* | ||
338 | * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the | ||
339 | * output PHDR, so the next output section - __data_nosave - should | ||
340 | * start another section data.init2. Also, pda should be at the head of | ||
341 | * percpu area. Preallocate it and define the percpu offset symbol | ||
342 | * so that it can be accessed as a percpu variable. | ||
343 | */ | ||
344 | . = ALIGN(PAGE_SIZE); | ||
345 | PERCPU_VADDR(0, :percpu) | ||
346 | #else | ||
347 | PERCPU(PAGE_SIZE) | 301 | PERCPU(PAGE_SIZE) |
348 | #endif | 302 | #endif |
349 | 303 | ||
@@ -354,15 +308,22 @@ SECTIONS | |||
354 | __init_end = .; | 308 | __init_end = .; |
355 | } | 309 | } |
356 | 310 | ||
311 | /* | ||
312 | * smp_locks might be freed after init | ||
313 | * start/end must be page aligned | ||
314 | */ | ||
315 | . = ALIGN(PAGE_SIZE); | ||
316 | .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { | ||
317 | __smp_locks = .; | ||
318 | *(.smp_locks) | ||
319 | __smp_locks_end = .; | ||
320 | . = ALIGN(PAGE_SIZE); | ||
321 | } | ||
322 | |||
357 | #ifdef CONFIG_X86_64 | 323 | #ifdef CONFIG_X86_64 |
358 | .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { | 324 | .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { |
359 | . = ALIGN(PAGE_SIZE); | 325 | NOSAVE_DATA |
360 | __nosave_begin = .; | 326 | } |
361 | *(.data.nosave) | ||
362 | . = ALIGN(PAGE_SIZE); | ||
363 | __nosave_end = .; | ||
364 | } :data.init2 | ||
365 | /* use another section data.init2, see PERCPU_VADDR() above */ | ||
366 | #endif | 327 | #endif |
367 | 328 | ||
368 | /* BSS */ | 329 | /* BSS */ |
@@ -400,8 +361,8 @@ SECTIONS | |||
400 | 361 | ||
401 | 362 | ||
402 | #ifdef CONFIG_X86_32 | 363 | #ifdef CONFIG_X86_32 |
403 | ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), | 364 | . = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), |
404 | "kernel image bigger than KERNEL_IMAGE_SIZE") | 365 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
405 | #else | 366 | #else |
406 | /* | 367 | /* |
407 | * Per-cpu symbols which need to be offset from __per_cpu_load | 368 | * Per-cpu symbols which need to be offset from __per_cpu_load |
@@ -414,12 +375,12 @@ INIT_PER_CPU(irq_stack_union); | |||
414 | /* | 375 | /* |
415 | * Build-time check on the image size: | 376 | * Build-time check on the image size: |
416 | */ | 377 | */ |
417 | ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), | 378 | . = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE), |
418 | "kernel image bigger than KERNEL_IMAGE_SIZE") | 379 | "kernel image bigger than KERNEL_IMAGE_SIZE"); |
419 | 380 | ||
420 | #ifdef CONFIG_SMP | 381 | #ifdef CONFIG_SMP |
421 | ASSERT((per_cpu__irq_stack_union == 0), | 382 | . = ASSERT((per_cpu__irq_stack_union == 0), |
422 | "irq_stack_union is not at start of per-cpu area"); | 383 | "irq_stack_union is not at start of per-cpu area"); |
423 | #endif | 384 | #endif |
424 | 385 | ||
425 | #endif /* CONFIG_X86_32 */ | 386 | #endif /* CONFIG_X86_32 */ |
@@ -427,7 +388,7 @@ ASSERT((per_cpu__irq_stack_union == 0), | |||
427 | #ifdef CONFIG_KEXEC | 388 | #ifdef CONFIG_KEXEC |
428 | #include <asm/kexec.h> | 389 | #include <asm/kexec.h> |
429 | 390 | ||
430 | ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, | 391 | . = ASSERT(kexec_control_code_size <= KEXEC_CONTROL_CODE_MAX_SIZE, |
431 | "kexec control code size is too big") | 392 | "kexec control code size is too big"); |
432 | #endif | 393 | #endif |
433 | 394 | ||
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 4d6f0d293ee2..21f68e00524f 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
@@ -104,6 +104,9 @@ static s64 __kpit_elapsed(struct kvm *kvm) | |||
104 | ktime_t remaining; | 104 | ktime_t remaining; |
105 | struct kvm_kpit_state *ps = &kvm->arch.vpit->pit_state; | 105 | struct kvm_kpit_state *ps = &kvm->arch.vpit->pit_state; |
106 | 106 | ||
107 | if (!ps->pit_timer.period) | ||
108 | return 0; | ||
109 | |||
107 | /* | 110 | /* |
108 | * The Counter does not stop when it reaches zero. In | 111 | * The Counter does not stop when it reaches zero. In |
109 | * Modes 0, 1, 4, and 5 the Counter ``wraps around'' to | 112 | * Modes 0, 1, 4, and 5 the Counter ``wraps around'' to |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 7030b5f911bf..0ef5bb2b4043 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -489,16 +489,20 @@ static unsigned long *gfn_to_rmap(struct kvm *kvm, gfn_t gfn, int lpage) | |||
489 | * | 489 | * |
490 | * If rmapp bit zero is one, (then rmap & ~1) points to a struct kvm_rmap_desc | 490 | * If rmapp bit zero is one, (then rmap & ~1) points to a struct kvm_rmap_desc |
491 | * containing more mappings. | 491 | * containing more mappings. |
492 | * | ||
493 | * Returns the number of rmap entries before the spte was added or zero if | ||
494 | * the spte was not added. | ||
495 | * | ||
492 | */ | 496 | */ |
493 | static void rmap_add(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn, int lpage) | 497 | static int rmap_add(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn, int lpage) |
494 | { | 498 | { |
495 | struct kvm_mmu_page *sp; | 499 | struct kvm_mmu_page *sp; |
496 | struct kvm_rmap_desc *desc; | 500 | struct kvm_rmap_desc *desc; |
497 | unsigned long *rmapp; | 501 | unsigned long *rmapp; |
498 | int i; | 502 | int i, count = 0; |
499 | 503 | ||
500 | if (!is_rmap_pte(*spte)) | 504 | if (!is_rmap_pte(*spte)) |
501 | return; | 505 | return count; |
502 | gfn = unalias_gfn(vcpu->kvm, gfn); | 506 | gfn = unalias_gfn(vcpu->kvm, gfn); |
503 | sp = page_header(__pa(spte)); | 507 | sp = page_header(__pa(spte)); |
504 | sp->gfns[spte - sp->spt] = gfn; | 508 | sp->gfns[spte - sp->spt] = gfn; |
@@ -515,8 +519,10 @@ static void rmap_add(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn, int lpage) | |||
515 | } else { | 519 | } else { |
516 | rmap_printk("rmap_add: %p %llx many->many\n", spte, *spte); | 520 | rmap_printk("rmap_add: %p %llx many->many\n", spte, *spte); |
517 | desc = (struct kvm_rmap_desc *)(*rmapp & ~1ul); | 521 | desc = (struct kvm_rmap_desc *)(*rmapp & ~1ul); |
518 | while (desc->shadow_ptes[RMAP_EXT-1] && desc->more) | 522 | while (desc->shadow_ptes[RMAP_EXT-1] && desc->more) { |
519 | desc = desc->more; | 523 | desc = desc->more; |
524 | count += RMAP_EXT; | ||
525 | } | ||
520 | if (desc->shadow_ptes[RMAP_EXT-1]) { | 526 | if (desc->shadow_ptes[RMAP_EXT-1]) { |
521 | desc->more = mmu_alloc_rmap_desc(vcpu); | 527 | desc->more = mmu_alloc_rmap_desc(vcpu); |
522 | desc = desc->more; | 528 | desc = desc->more; |
@@ -525,6 +531,7 @@ static void rmap_add(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn, int lpage) | |||
525 | ; | 531 | ; |
526 | desc->shadow_ptes[i] = spte; | 532 | desc->shadow_ptes[i] = spte; |
527 | } | 533 | } |
534 | return count; | ||
528 | } | 535 | } |
529 | 536 | ||
530 | static void rmap_desc_remove_entry(unsigned long *rmapp, | 537 | static void rmap_desc_remove_entry(unsigned long *rmapp, |
@@ -754,6 +761,19 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp) | |||
754 | return young; | 761 | return young; |
755 | } | 762 | } |
756 | 763 | ||
764 | #define RMAP_RECYCLE_THRESHOLD 1000 | ||
765 | |||
766 | static void rmap_recycle(struct kvm_vcpu *vcpu, gfn_t gfn, int lpage) | ||
767 | { | ||
768 | unsigned long *rmapp; | ||
769 | |||
770 | gfn = unalias_gfn(vcpu->kvm, gfn); | ||
771 | rmapp = gfn_to_rmap(vcpu->kvm, gfn, lpage); | ||
772 | |||
773 | kvm_unmap_rmapp(vcpu->kvm, rmapp); | ||
774 | kvm_flush_remote_tlbs(vcpu->kvm); | ||
775 | } | ||
776 | |||
757 | int kvm_age_hva(struct kvm *kvm, unsigned long hva) | 777 | int kvm_age_hva(struct kvm *kvm, unsigned long hva) |
758 | { | 778 | { |
759 | return kvm_handle_hva(kvm, hva, kvm_age_rmapp); | 779 | return kvm_handle_hva(kvm, hva, kvm_age_rmapp); |
@@ -1407,24 +1427,25 @@ static int kvm_mmu_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp) | |||
1407 | */ | 1427 | */ |
1408 | void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages) | 1428 | void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages) |
1409 | { | 1429 | { |
1430 | int used_pages; | ||
1431 | |||
1432 | used_pages = kvm->arch.n_alloc_mmu_pages - kvm->arch.n_free_mmu_pages; | ||
1433 | used_pages = max(0, used_pages); | ||
1434 | |||
1410 | /* | 1435 | /* |
1411 | * If we set the number of mmu pages to be smaller be than the | 1436 | * If we set the number of mmu pages to be smaller be than the |
1412 | * number of actived pages , we must to free some mmu pages before we | 1437 | * number of actived pages , we must to free some mmu pages before we |
1413 | * change the value | 1438 | * change the value |
1414 | */ | 1439 | */ |
1415 | 1440 | ||
1416 | if ((kvm->arch.n_alloc_mmu_pages - kvm->arch.n_free_mmu_pages) > | 1441 | if (used_pages > kvm_nr_mmu_pages) { |
1417 | kvm_nr_mmu_pages) { | 1442 | while (used_pages > kvm_nr_mmu_pages) { |
1418 | int n_used_mmu_pages = kvm->arch.n_alloc_mmu_pages | ||
1419 | - kvm->arch.n_free_mmu_pages; | ||
1420 | |||
1421 | while (n_used_mmu_pages > kvm_nr_mmu_pages) { | ||
1422 | struct kvm_mmu_page *page; | 1443 | struct kvm_mmu_page *page; |
1423 | 1444 | ||
1424 | page = container_of(kvm->arch.active_mmu_pages.prev, | 1445 | page = container_of(kvm->arch.active_mmu_pages.prev, |
1425 | struct kvm_mmu_page, link); | 1446 | struct kvm_mmu_page, link); |
1426 | kvm_mmu_zap_page(kvm, page); | 1447 | kvm_mmu_zap_page(kvm, page); |
1427 | n_used_mmu_pages--; | 1448 | used_pages--; |
1428 | } | 1449 | } |
1429 | kvm->arch.n_free_mmu_pages = 0; | 1450 | kvm->arch.n_free_mmu_pages = 0; |
1430 | } | 1451 | } |
@@ -1740,6 +1761,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, | |||
1740 | { | 1761 | { |
1741 | int was_rmapped = 0; | 1762 | int was_rmapped = 0; |
1742 | int was_writeble = is_writeble_pte(*shadow_pte); | 1763 | int was_writeble = is_writeble_pte(*shadow_pte); |
1764 | int rmap_count; | ||
1743 | 1765 | ||
1744 | pgprintk("%s: spte %llx access %x write_fault %d" | 1766 | pgprintk("%s: spte %llx access %x write_fault %d" |
1745 | " user_fault %d gfn %lx\n", | 1767 | " user_fault %d gfn %lx\n", |
@@ -1781,9 +1803,11 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, | |||
1781 | 1803 | ||
1782 | page_header_update_slot(vcpu->kvm, shadow_pte, gfn); | 1804 | page_header_update_slot(vcpu->kvm, shadow_pte, gfn); |
1783 | if (!was_rmapped) { | 1805 | if (!was_rmapped) { |
1784 | rmap_add(vcpu, shadow_pte, gfn, largepage); | 1806 | rmap_count = rmap_add(vcpu, shadow_pte, gfn, largepage); |
1785 | if (!is_rmap_pte(*shadow_pte)) | 1807 | if (!is_rmap_pte(*shadow_pte)) |
1786 | kvm_release_pfn_clean(pfn); | 1808 | kvm_release_pfn_clean(pfn); |
1809 | if (rmap_count > RMAP_RECYCLE_THRESHOLD) | ||
1810 | rmap_recycle(vcpu, gfn, largepage); | ||
1787 | } else { | 1811 | } else { |
1788 | if (was_writeble) | 1812 | if (was_writeble) |
1789 | kvm_release_pfn_dirty(pfn); | 1813 | kvm_release_pfn_dirty(pfn); |
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 71510e07e69e..b1f658ad2f06 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
@@ -711,6 +711,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
711 | svm->vmcb->control.tsc_offset += delta; | 711 | svm->vmcb->control.tsc_offset += delta; |
712 | vcpu->cpu = cpu; | 712 | vcpu->cpu = cpu; |
713 | kvm_migrate_timers(vcpu); | 713 | kvm_migrate_timers(vcpu); |
714 | svm->asid_generation = 0; | ||
714 | } | 715 | } |
715 | 716 | ||
716 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) | 717 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) |
@@ -1031,7 +1032,6 @@ static void new_asid(struct vcpu_svm *svm, struct svm_cpu_data *svm_data) | |||
1031 | svm->vmcb->control.tlb_ctl = TLB_CONTROL_FLUSH_ALL_ASID; | 1032 | svm->vmcb->control.tlb_ctl = TLB_CONTROL_FLUSH_ALL_ASID; |
1032 | } | 1033 | } |
1033 | 1034 | ||
1034 | svm->vcpu.cpu = svm_data->cpu; | ||
1035 | svm->asid_generation = svm_data->asid_generation; | 1035 | svm->asid_generation = svm_data->asid_generation; |
1036 | svm->vmcb->control.asid = svm_data->next_asid++; | 1036 | svm->vmcb->control.asid = svm_data->next_asid++; |
1037 | } | 1037 | } |
@@ -2300,8 +2300,8 @@ static void pre_svm_run(struct vcpu_svm *svm) | |||
2300 | struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu); | 2300 | struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu); |
2301 | 2301 | ||
2302 | svm->vmcb->control.tlb_ctl = TLB_CONTROL_DO_NOTHING; | 2302 | svm->vmcb->control.tlb_ctl = TLB_CONTROL_DO_NOTHING; |
2303 | if (svm->vcpu.cpu != cpu || | 2303 | /* FIXME: handle wraparound of asid_generation */ |
2304 | svm->asid_generation != svm_data->asid_generation) | 2304 | if (svm->asid_generation != svm_data->asid_generation) |
2305 | new_asid(svm, svm_data); | 2305 | new_asid(svm, svm_data); |
2306 | } | 2306 | } |
2307 | 2307 | ||
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 356a0ce85c68..29f912927a58 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -3157,8 +3157,8 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu, | |||
3157 | struct vcpu_vmx *vmx = to_vmx(vcpu); | 3157 | struct vcpu_vmx *vmx = to_vmx(vcpu); |
3158 | enum emulation_result err = EMULATE_DONE; | 3158 | enum emulation_result err = EMULATE_DONE; |
3159 | 3159 | ||
3160 | preempt_enable(); | ||
3161 | local_irq_enable(); | 3160 | local_irq_enable(); |
3161 | preempt_enable(); | ||
3162 | 3162 | ||
3163 | while (!guest_state_valid(vcpu)) { | 3163 | while (!guest_state_valid(vcpu)) { |
3164 | err = emulate_instruction(vcpu, kvm_run, 0, 0, 0); | 3164 | err = emulate_instruction(vcpu, kvm_run, 0, 0, 0); |
@@ -3168,7 +3168,7 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu, | |||
3168 | 3168 | ||
3169 | if (err != EMULATE_DONE) { | 3169 | if (err != EMULATE_DONE) { |
3170 | kvm_report_emulation_failure(vcpu, "emulation failure"); | 3170 | kvm_report_emulation_failure(vcpu, "emulation failure"); |
3171 | return; | 3171 | break; |
3172 | } | 3172 | } |
3173 | 3173 | ||
3174 | if (signal_pending(current)) | 3174 | if (signal_pending(current)) |
@@ -3177,8 +3177,8 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu, | |||
3177 | schedule(); | 3177 | schedule(); |
3178 | } | 3178 | } |
3179 | 3179 | ||
3180 | local_irq_disable(); | ||
3181 | preempt_disable(); | 3180 | preempt_disable(); |
3181 | local_irq_disable(); | ||
3182 | 3182 | ||
3183 | vmx->invalid_state_emulation_result = err; | 3183 | vmx->invalid_state_emulation_result = err; |
3184 | } | 3184 | } |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index fe5474aec41a..3d4529011828 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -704,11 +704,48 @@ static bool msr_mtrr_valid(unsigned msr) | |||
704 | return false; | 704 | return false; |
705 | } | 705 | } |
706 | 706 | ||
707 | static bool valid_pat_type(unsigned t) | ||
708 | { | ||
709 | return t < 8 && (1 << t) & 0xf3; /* 0, 1, 4, 5, 6, 7 */ | ||
710 | } | ||
711 | |||
712 | static bool valid_mtrr_type(unsigned t) | ||
713 | { | ||
714 | return t < 8 && (1 << t) & 0x73; /* 0, 1, 4, 5, 6 */ | ||
715 | } | ||
716 | |||
717 | static bool mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data) | ||
718 | { | ||
719 | int i; | ||
720 | |||
721 | if (!msr_mtrr_valid(msr)) | ||
722 | return false; | ||
723 | |||
724 | if (msr == MSR_IA32_CR_PAT) { | ||
725 | for (i = 0; i < 8; i++) | ||
726 | if (!valid_pat_type((data >> (i * 8)) & 0xff)) | ||
727 | return false; | ||
728 | return true; | ||
729 | } else if (msr == MSR_MTRRdefType) { | ||
730 | if (data & ~0xcff) | ||
731 | return false; | ||
732 | return valid_mtrr_type(data & 0xff); | ||
733 | } else if (msr >= MSR_MTRRfix64K_00000 && msr <= MSR_MTRRfix4K_F8000) { | ||
734 | for (i = 0; i < 8 ; i++) | ||
735 | if (!valid_mtrr_type((data >> (i * 8)) & 0xff)) | ||
736 | return false; | ||
737 | return true; | ||
738 | } | ||
739 | |||
740 | /* variable MTRRs */ | ||
741 | return valid_mtrr_type(data & 0xff); | ||
742 | } | ||
743 | |||
707 | static int set_msr_mtrr(struct kvm_vcpu *vcpu, u32 msr, u64 data) | 744 | static int set_msr_mtrr(struct kvm_vcpu *vcpu, u32 msr, u64 data) |
708 | { | 745 | { |
709 | u64 *p = (u64 *)&vcpu->arch.mtrr_state.fixed_ranges; | 746 | u64 *p = (u64 *)&vcpu->arch.mtrr_state.fixed_ranges; |
710 | 747 | ||
711 | if (!msr_mtrr_valid(msr)) | 748 | if (!mtrr_valid(vcpu, msr, data)) |
712 | return 1; | 749 | return 1; |
713 | 750 | ||
714 | if (msr == MSR_MTRRdefType) { | 751 | if (msr == MSR_MTRRdefType) { |
@@ -1079,14 +1116,13 @@ long kvm_arch_dev_ioctl(struct file *filp, | |||
1079 | if (copy_to_user(user_msr_list, &msr_list, sizeof msr_list)) | 1116 | if (copy_to_user(user_msr_list, &msr_list, sizeof msr_list)) |
1080 | goto out; | 1117 | goto out; |
1081 | r = -E2BIG; | 1118 | r = -E2BIG; |
1082 | if (n < num_msrs_to_save) | 1119 | if (n < msr_list.nmsrs) |
1083 | goto out; | 1120 | goto out; |
1084 | r = -EFAULT; | 1121 | r = -EFAULT; |
1085 | if (copy_to_user(user_msr_list->indices, &msrs_to_save, | 1122 | if (copy_to_user(user_msr_list->indices, &msrs_to_save, |
1086 | num_msrs_to_save * sizeof(u32))) | 1123 | num_msrs_to_save * sizeof(u32))) |
1087 | goto out; | 1124 | goto out; |
1088 | if (copy_to_user(user_msr_list->indices | 1125 | if (copy_to_user(user_msr_list->indices + num_msrs_to_save, |
1089 | + num_msrs_to_save * sizeof(u32), | ||
1090 | &emulated_msrs, | 1126 | &emulated_msrs, |
1091 | ARRAY_SIZE(emulated_msrs) * sizeof(u32))) | 1127 | ARRAY_SIZE(emulated_msrs) * sizeof(u32))) |
1092 | goto out; | 1128 | goto out; |
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index f2bf1f73d468..d677fa9ca650 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -22,7 +22,8 @@ | |||
22 | * | 22 | * |
23 | * So how does the kernel know it's a Guest? We'll see that later, but let's | 23 | * So how does the kernel know it's a Guest? We'll see that later, but let's |
24 | * just say that we end up here where we replace the native functions various | 24 | * just say that we end up here where we replace the native functions various |
25 | * "paravirt" structures with our Guest versions, then boot like normal. :*/ | 25 | * "paravirt" structures with our Guest versions, then boot like normal. |
26 | :*/ | ||
26 | 27 | ||
27 | /* | 28 | /* |
28 | * Copyright (C) 2006, Rusty Russell <rusty@rustcorp.com.au> IBM Corporation. | 29 | * Copyright (C) 2006, Rusty Russell <rusty@rustcorp.com.au> IBM Corporation. |
@@ -74,7 +75,8 @@ | |||
74 | * | 75 | * |
75 | * The Guest in our tale is a simple creature: identical to the Host but | 76 | * The Guest in our tale is a simple creature: identical to the Host but |
76 | * behaving in simplified but equivalent ways. In particular, the Guest is the | 77 | * behaving in simplified but equivalent ways. In particular, the Guest is the |
77 | * same kernel as the Host (or at least, built from the same source code). :*/ | 78 | * same kernel as the Host (or at least, built from the same source code). |
79 | :*/ | ||
78 | 80 | ||
79 | struct lguest_data lguest_data = { | 81 | struct lguest_data lguest_data = { |
80 | .hcall_status = { [0 ... LHCALL_RING_SIZE-1] = 0xFF }, | 82 | .hcall_status = { [0 ... LHCALL_RING_SIZE-1] = 0xFF }, |
@@ -85,7 +87,8 @@ struct lguest_data lguest_data = { | |||
85 | .syscall_vec = SYSCALL_VECTOR, | 87 | .syscall_vec = SYSCALL_VECTOR, |
86 | }; | 88 | }; |
87 | 89 | ||
88 | /*G:037 async_hcall() is pretty simple: I'm quite proud of it really. We have a | 90 | /*G:037 |
91 | * async_hcall() is pretty simple: I'm quite proud of it really. We have a | ||
89 | * ring buffer of stored hypercalls which the Host will run though next time we | 92 | * ring buffer of stored hypercalls which the Host will run though next time we |
90 | * do a normal hypercall. Each entry in the ring has 5 slots for the hypercall | 93 | * do a normal hypercall. Each entry in the ring has 5 slots for the hypercall |
91 | * arguments, and a "hcall_status" word which is 0 if the call is ready to go, | 94 | * arguments, and a "hcall_status" word which is 0 if the call is ready to go, |
@@ -94,7 +97,8 @@ struct lguest_data lguest_data = { | |||
94 | * If we come around to a slot which hasn't been finished, then the table is | 97 | * If we come around to a slot which hasn't been finished, then the table is |
95 | * full and we just make the hypercall directly. This has the nice side | 98 | * full and we just make the hypercall directly. This has the nice side |
96 | * effect of causing the Host to run all the stored calls in the ring buffer | 99 | * effect of causing the Host to run all the stored calls in the ring buffer |
97 | * which empties it for next time! */ | 100 | * which empties it for next time! |
101 | */ | ||
98 | static void async_hcall(unsigned long call, unsigned long arg1, | 102 | static void async_hcall(unsigned long call, unsigned long arg1, |
99 | unsigned long arg2, unsigned long arg3, | 103 | unsigned long arg2, unsigned long arg3, |
100 | unsigned long arg4) | 104 | unsigned long arg4) |
@@ -103,9 +107,11 @@ static void async_hcall(unsigned long call, unsigned long arg1, | |||
103 | static unsigned int next_call; | 107 | static unsigned int next_call; |
104 | unsigned long flags; | 108 | unsigned long flags; |
105 | 109 | ||
106 | /* Disable interrupts if not already disabled: we don't want an | 110 | /* |
111 | * Disable interrupts if not already disabled: we don't want an | ||
107 | * interrupt handler making a hypercall while we're already doing | 112 | * interrupt handler making a hypercall while we're already doing |
108 | * one! */ | 113 | * one! |
114 | */ | ||
109 | local_irq_save(flags); | 115 | local_irq_save(flags); |
110 | if (lguest_data.hcall_status[next_call] != 0xFF) { | 116 | if (lguest_data.hcall_status[next_call] != 0xFF) { |
111 | /* Table full, so do normal hcall which will flush table. */ | 117 | /* Table full, so do normal hcall which will flush table. */ |
@@ -125,8 +131,9 @@ static void async_hcall(unsigned long call, unsigned long arg1, | |||
125 | local_irq_restore(flags); | 131 | local_irq_restore(flags); |
126 | } | 132 | } |
127 | 133 | ||
128 | /*G:035 Notice the lazy_hcall() above, rather than hcall(). This is our first | 134 | /*G:035 |
129 | * real optimization trick! | 135 | * Notice the lazy_hcall() above, rather than hcall(). This is our first real |
136 | * optimization trick! | ||
130 | * | 137 | * |
131 | * When lazy_mode is set, it means we're allowed to defer all hypercalls and do | 138 | * When lazy_mode is set, it means we're allowed to defer all hypercalls and do |
132 | * them as a batch when lazy_mode is eventually turned off. Because hypercalls | 139 | * them as a batch when lazy_mode is eventually turned off. Because hypercalls |
@@ -136,7 +143,8 @@ static void async_hcall(unsigned long call, unsigned long arg1, | |||
136 | * lguest_leave_lazy_mode(). | 143 | * lguest_leave_lazy_mode(). |
137 | * | 144 | * |
138 | * So, when we're in lazy mode, we call async_hcall() to store the call for | 145 | * So, when we're in lazy mode, we call async_hcall() to store the call for |
139 | * future processing: */ | 146 | * future processing: |
147 | */ | ||
140 | static void lazy_hcall1(unsigned long call, | 148 | static void lazy_hcall1(unsigned long call, |
141 | unsigned long arg1) | 149 | unsigned long arg1) |
142 | { | 150 | { |
@@ -146,6 +154,7 @@ static void lazy_hcall1(unsigned long call, | |||
146 | async_hcall(call, arg1, 0, 0, 0); | 154 | async_hcall(call, arg1, 0, 0, 0); |
147 | } | 155 | } |
148 | 156 | ||
157 | /* You can imagine what lazy_hcall2, 3 and 4 look like. :*/ | ||
149 | static void lazy_hcall2(unsigned long call, | 158 | static void lazy_hcall2(unsigned long call, |
150 | unsigned long arg1, | 159 | unsigned long arg1, |
151 | unsigned long arg2) | 160 | unsigned long arg2) |
@@ -181,8 +190,10 @@ static void lazy_hcall4(unsigned long call, | |||
181 | } | 190 | } |
182 | #endif | 191 | #endif |
183 | 192 | ||
184 | /* When lazy mode is turned off reset the per-cpu lazy mode variable and then | 193 | /*G:036 |
185 | * issue the do-nothing hypercall to flush any stored calls. */ | 194 | * When lazy mode is turned off reset the per-cpu lazy mode variable and then |
195 | * issue the do-nothing hypercall to flush any stored calls. | ||
196 | :*/ | ||
186 | static void lguest_leave_lazy_mmu_mode(void) | 197 | static void lguest_leave_lazy_mmu_mode(void) |
187 | { | 198 | { |
188 | kvm_hypercall0(LHCALL_FLUSH_ASYNC); | 199 | kvm_hypercall0(LHCALL_FLUSH_ASYNC); |
@@ -208,9 +219,11 @@ static void lguest_end_context_switch(struct task_struct *next) | |||
208 | * check there before it tries to deliver an interrupt. | 219 | * check there before it tries to deliver an interrupt. |
209 | */ | 220 | */ |
210 | 221 | ||
211 | /* save_flags() is expected to return the processor state (ie. "flags"). The | 222 | /* |
223 | * save_flags() is expected to return the processor state (ie. "flags"). The | ||
212 | * flags word contains all kind of stuff, but in practice Linux only cares | 224 | * flags word contains all kind of stuff, but in practice Linux only cares |
213 | * about the interrupt flag. Our "save_flags()" just returns that. */ | 225 | * about the interrupt flag. Our "save_flags()" just returns that. |
226 | */ | ||
214 | static unsigned long save_fl(void) | 227 | static unsigned long save_fl(void) |
215 | { | 228 | { |
216 | return lguest_data.irq_enabled; | 229 | return lguest_data.irq_enabled; |
@@ -222,13 +235,15 @@ static void irq_disable(void) | |||
222 | lguest_data.irq_enabled = 0; | 235 | lguest_data.irq_enabled = 0; |
223 | } | 236 | } |
224 | 237 | ||
225 | /* Let's pause a moment. Remember how I said these are called so often? | 238 | /* |
239 | * Let's pause a moment. Remember how I said these are called so often? | ||
226 | * Jeremy Fitzhardinge optimized them so hard early in 2009 that he had to | 240 | * Jeremy Fitzhardinge optimized them so hard early in 2009 that he had to |
227 | * break some rules. In particular, these functions are assumed to save their | 241 | * break some rules. In particular, these functions are assumed to save their |
228 | * own registers if they need to: normal C functions assume they can trash the | 242 | * own registers if they need to: normal C functions assume they can trash the |
229 | * eax register. To use normal C functions, we use | 243 | * eax register. To use normal C functions, we use |
230 | * PV_CALLEE_SAVE_REGS_THUNK(), which pushes %eax onto the stack, calls the | 244 | * PV_CALLEE_SAVE_REGS_THUNK(), which pushes %eax onto the stack, calls the |
231 | * C function, then restores it. */ | 245 | * C function, then restores it. |
246 | */ | ||
232 | PV_CALLEE_SAVE_REGS_THUNK(save_fl); | 247 | PV_CALLEE_SAVE_REGS_THUNK(save_fl); |
233 | PV_CALLEE_SAVE_REGS_THUNK(irq_disable); | 248 | PV_CALLEE_SAVE_REGS_THUNK(irq_disable); |
234 | /*:*/ | 249 | /*:*/ |
@@ -237,18 +252,18 @@ PV_CALLEE_SAVE_REGS_THUNK(irq_disable); | |||
237 | extern void lg_irq_enable(void); | 252 | extern void lg_irq_enable(void); |
238 | extern void lg_restore_fl(unsigned long flags); | 253 | extern void lg_restore_fl(unsigned long flags); |
239 | 254 | ||
240 | /*M:003 Note that we don't check for outstanding interrupts when we re-enable | 255 | /*M:003 |
241 | * them (or when we unmask an interrupt). This seems to work for the moment, | 256 | * We could be more efficient in our checking of outstanding interrupts, rather |
242 | * since interrupts are rare and we'll just get the interrupt on the next timer | 257 | * than using a branch. One way would be to put the "irq_enabled" field in a |
243 | * tick, but now we can run with CONFIG_NO_HZ, we should revisit this. One way | 258 | * page by itself, and have the Host write-protect it when an interrupt comes |
244 | * would be to put the "irq_enabled" field in a page by itself, and have the | 259 | * in when irqs are disabled. There will then be a page fault as soon as |
245 | * Host write-protect it when an interrupt comes in when irqs are disabled. | 260 | * interrupts are re-enabled. |
246 | * There will then be a page fault as soon as interrupts are re-enabled. | ||
247 | * | 261 | * |
248 | * A better method is to implement soft interrupt disable generally for x86: | 262 | * A better method is to implement soft interrupt disable generally for x86: |
249 | * instead of disabling interrupts, we set a flag. If an interrupt does come | 263 | * instead of disabling interrupts, we set a flag. If an interrupt does come |
250 | * in, we then disable them for real. This is uncommon, so we could simply use | 264 | * in, we then disable them for real. This is uncommon, so we could simply use |
251 | * a hypercall for interrupt control and not worry about efficiency. :*/ | 265 | * a hypercall for interrupt control and not worry about efficiency. |
266 | :*/ | ||
252 | 267 | ||
253 | /*G:034 | 268 | /*G:034 |
254 | * The Interrupt Descriptor Table (IDT). | 269 | * The Interrupt Descriptor Table (IDT). |
@@ -261,10 +276,12 @@ extern void lg_restore_fl(unsigned long flags); | |||
261 | static void lguest_write_idt_entry(gate_desc *dt, | 276 | static void lguest_write_idt_entry(gate_desc *dt, |
262 | int entrynum, const gate_desc *g) | 277 | int entrynum, const gate_desc *g) |
263 | { | 278 | { |
264 | /* The gate_desc structure is 8 bytes long: we hand it to the Host in | 279 | /* |
280 | * The gate_desc structure is 8 bytes long: we hand it to the Host in | ||
265 | * two 32-bit chunks. The whole 32-bit kernel used to hand descriptors | 281 | * two 32-bit chunks. The whole 32-bit kernel used to hand descriptors |
266 | * around like this; typesafety wasn't a big concern in Linux's early | 282 | * around like this; typesafety wasn't a big concern in Linux's early |
267 | * years. */ | 283 | * years. |
284 | */ | ||
268 | u32 *desc = (u32 *)g; | 285 | u32 *desc = (u32 *)g; |
269 | /* Keep the local copy up to date. */ | 286 | /* Keep the local copy up to date. */ |
270 | native_write_idt_entry(dt, entrynum, g); | 287 | native_write_idt_entry(dt, entrynum, g); |
@@ -272,9 +289,11 @@ static void lguest_write_idt_entry(gate_desc *dt, | |||
272 | kvm_hypercall3(LHCALL_LOAD_IDT_ENTRY, entrynum, desc[0], desc[1]); | 289 | kvm_hypercall3(LHCALL_LOAD_IDT_ENTRY, entrynum, desc[0], desc[1]); |
273 | } | 290 | } |
274 | 291 | ||
275 | /* Changing to a different IDT is very rare: we keep the IDT up-to-date every | 292 | /* |
293 | * Changing to a different IDT is very rare: we keep the IDT up-to-date every | ||
276 | * time it is written, so we can simply loop through all entries and tell the | 294 | * time it is written, so we can simply loop through all entries and tell the |
277 | * Host about them. */ | 295 | * Host about them. |
296 | */ | ||
278 | static void lguest_load_idt(const struct desc_ptr *desc) | 297 | static void lguest_load_idt(const struct desc_ptr *desc) |
279 | { | 298 | { |
280 | unsigned int i; | 299 | unsigned int i; |
@@ -305,9 +324,11 @@ static void lguest_load_gdt(const struct desc_ptr *desc) | |||
305 | kvm_hypercall3(LHCALL_LOAD_GDT_ENTRY, i, gdt[i].a, gdt[i].b); | 324 | kvm_hypercall3(LHCALL_LOAD_GDT_ENTRY, i, gdt[i].a, gdt[i].b); |
306 | } | 325 | } |
307 | 326 | ||
308 | /* For a single GDT entry which changes, we do the lazy thing: alter our GDT, | 327 | /* |
328 | * For a single GDT entry which changes, we do the lazy thing: alter our GDT, | ||
309 | * then tell the Host to reload the entire thing. This operation is so rare | 329 | * then tell the Host to reload the entire thing. This operation is so rare |
310 | * that this naive implementation is reasonable. */ | 330 | * that this naive implementation is reasonable. |
331 | */ | ||
311 | static void lguest_write_gdt_entry(struct desc_struct *dt, int entrynum, | 332 | static void lguest_write_gdt_entry(struct desc_struct *dt, int entrynum, |
312 | const void *desc, int type) | 333 | const void *desc, int type) |
313 | { | 334 | { |
@@ -317,29 +338,36 @@ static void lguest_write_gdt_entry(struct desc_struct *dt, int entrynum, | |||
317 | dt[entrynum].a, dt[entrynum].b); | 338 | dt[entrynum].a, dt[entrynum].b); |
318 | } | 339 | } |
319 | 340 | ||
320 | /* OK, I lied. There are three "thread local storage" GDT entries which change | 341 | /* |
342 | * OK, I lied. There are three "thread local storage" GDT entries which change | ||
321 | * on every context switch (these three entries are how glibc implements | 343 | * on every context switch (these three entries are how glibc implements |
322 | * __thread variables). So we have a hypercall specifically for this case. */ | 344 | * __thread variables). So we have a hypercall specifically for this case. |
345 | */ | ||
323 | static void lguest_load_tls(struct thread_struct *t, unsigned int cpu) | 346 | static void lguest_load_tls(struct thread_struct *t, unsigned int cpu) |
324 | { | 347 | { |
325 | /* There's one problem which normal hardware doesn't have: the Host | 348 | /* |
349 | * There's one problem which normal hardware doesn't have: the Host | ||
326 | * can't handle us removing entries we're currently using. So we clear | 350 | * can't handle us removing entries we're currently using. So we clear |
327 | * the GS register here: if it's needed it'll be reloaded anyway. */ | 351 | * the GS register here: if it's needed it'll be reloaded anyway. |
352 | */ | ||
328 | lazy_load_gs(0); | 353 | lazy_load_gs(0); |
329 | lazy_hcall2(LHCALL_LOAD_TLS, __pa(&t->tls_array), cpu); | 354 | lazy_hcall2(LHCALL_LOAD_TLS, __pa(&t->tls_array), cpu); |
330 | } | 355 | } |
331 | 356 | ||
332 | /*G:038 That's enough excitement for now, back to ploughing through each of | 357 | /*G:038 |
333 | * the different pv_ops structures (we're about 1/3 of the way through). | 358 | * That's enough excitement for now, back to ploughing through each of the |
359 | * different pv_ops structures (we're about 1/3 of the way through). | ||
334 | * | 360 | * |
335 | * This is the Local Descriptor Table, another weird Intel thingy. Linux only | 361 | * This is the Local Descriptor Table, another weird Intel thingy. Linux only |
336 | * uses this for some strange applications like Wine. We don't do anything | 362 | * uses this for some strange applications like Wine. We don't do anything |
337 | * here, so they'll get an informative and friendly Segmentation Fault. */ | 363 | * here, so they'll get an informative and friendly Segmentation Fault. |
364 | */ | ||
338 | static void lguest_set_ldt(const void *addr, unsigned entries) | 365 | static void lguest_set_ldt(const void *addr, unsigned entries) |
339 | { | 366 | { |
340 | } | 367 | } |
341 | 368 | ||
342 | /* This loads a GDT entry into the "Task Register": that entry points to a | 369 | /* |
370 | * This loads a GDT entry into the "Task Register": that entry points to a | ||
343 | * structure called the Task State Segment. Some comments scattered though the | 371 | * structure called the Task State Segment. Some comments scattered though the |
344 | * kernel code indicate that this used for task switching in ages past, along | 372 | * kernel code indicate that this used for task switching in ages past, along |
345 | * with blood sacrifice and astrology. | 373 | * with blood sacrifice and astrology. |
@@ -347,19 +375,21 @@ static void lguest_set_ldt(const void *addr, unsigned entries) | |||
347 | * Now there's nothing interesting in here that we don't get told elsewhere. | 375 | * Now there's nothing interesting in here that we don't get told elsewhere. |
348 | * But the native version uses the "ltr" instruction, which makes the Host | 376 | * But the native version uses the "ltr" instruction, which makes the Host |
349 | * complain to the Guest about a Segmentation Fault and it'll oops. So we | 377 | * complain to the Guest about a Segmentation Fault and it'll oops. So we |
350 | * override the native version with a do-nothing version. */ | 378 | * override the native version with a do-nothing version. |
379 | */ | ||
351 | static void lguest_load_tr_desc(void) | 380 | static void lguest_load_tr_desc(void) |
352 | { | 381 | { |
353 | } | 382 | } |
354 | 383 | ||
355 | /* The "cpuid" instruction is a way of querying both the CPU identity | 384 | /* |
385 | * The "cpuid" instruction is a way of querying both the CPU identity | ||
356 | * (manufacturer, model, etc) and its features. It was introduced before the | 386 | * (manufacturer, model, etc) and its features. It was introduced before the |
357 | * Pentium in 1993 and keeps getting extended by both Intel, AMD and others. | 387 | * Pentium in 1993 and keeps getting extended by both Intel, AMD and others. |
358 | * As you might imagine, after a decade and a half this treatment, it is now a | 388 | * As you might imagine, after a decade and a half this treatment, it is now a |
359 | * giant ball of hair. Its entry in the current Intel manual runs to 28 pages. | 389 | * giant ball of hair. Its entry in the current Intel manual runs to 28 pages. |
360 | * | 390 | * |
361 | * This instruction even it has its own Wikipedia entry. The Wikipedia entry | 391 | * This instruction even it has its own Wikipedia entry. The Wikipedia entry |
362 | * has been translated into 4 languages. I am not making this up! | 392 | * has been translated into 5 languages. I am not making this up! |
363 | * | 393 | * |
364 | * We could get funky here and identify ourselves as "GenuineLguest", but | 394 | * We could get funky here and identify ourselves as "GenuineLguest", but |
365 | * instead we just use the real "cpuid" instruction. Then I pretty much turned | 395 | * instead we just use the real "cpuid" instruction. Then I pretty much turned |
@@ -371,7 +401,8 @@ static void lguest_load_tr_desc(void) | |||
371 | * Replacing the cpuid so we can turn features off is great for the kernel, but | 401 | * Replacing the cpuid so we can turn features off is great for the kernel, but |
372 | * anyone (including userspace) can just use the raw "cpuid" instruction and | 402 | * anyone (including userspace) can just use the raw "cpuid" instruction and |
373 | * the Host won't even notice since it isn't privileged. So we try not to get | 403 | * the Host won't even notice since it isn't privileged. So we try not to get |
374 | * too worked up about it. */ | 404 | * too worked up about it. |
405 | */ | ||
375 | static void lguest_cpuid(unsigned int *ax, unsigned int *bx, | 406 | static void lguest_cpuid(unsigned int *ax, unsigned int *bx, |
376 | unsigned int *cx, unsigned int *dx) | 407 | unsigned int *cx, unsigned int *dx) |
377 | { | 408 | { |
@@ -379,43 +410,63 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx, | |||
379 | 410 | ||
380 | native_cpuid(ax, bx, cx, dx); | 411 | native_cpuid(ax, bx, cx, dx); |
381 | switch (function) { | 412 | switch (function) { |
382 | case 0: /* ID and highest CPUID. Futureproof a little by sticking to | 413 | /* |
383 | * older ones. */ | 414 | * CPUID 0 gives the highest legal CPUID number (and the ID string). |
415 | * We futureproof our code a little by sticking to known CPUID values. | ||
416 | */ | ||
417 | case 0: | ||
384 | if (*ax > 5) | 418 | if (*ax > 5) |
385 | *ax = 5; | 419 | *ax = 5; |
386 | break; | 420 | break; |
387 | case 1: /* Basic feature request. */ | 421 | |
388 | /* We only allow kernel to see SSE3, CMPXCHG16B and SSSE3 */ | 422 | /* |
423 | * CPUID 1 is a basic feature request. | ||
424 | * | ||
425 | * CX: we only allow kernel to see SSE3, CMPXCHG16B and SSSE3 | ||
426 | * DX: SSE, SSE2, FXSR, MMX, CMOV, CMPXCHG8B, TSC, FPU and PAE. | ||
427 | */ | ||
428 | case 1: | ||
389 | *cx &= 0x00002201; | 429 | *cx &= 0x00002201; |
390 | /* SSE, SSE2, FXSR, MMX, CMOV, CMPXCHG8B, TSC, FPU, PAE. */ | ||
391 | *dx &= 0x07808151; | 430 | *dx &= 0x07808151; |
392 | /* The Host can do a nice optimization if it knows that the | 431 | /* |
432 | * The Host can do a nice optimization if it knows that the | ||
393 | * kernel mappings (addresses above 0xC0000000 or whatever | 433 | * kernel mappings (addresses above 0xC0000000 or whatever |
394 | * PAGE_OFFSET is set to) haven't changed. But Linux calls | 434 | * PAGE_OFFSET is set to) haven't changed. But Linux calls |
395 | * flush_tlb_user() for both user and kernel mappings unless | 435 | * flush_tlb_user() for both user and kernel mappings unless |
396 | * the Page Global Enable (PGE) feature bit is set. */ | 436 | * the Page Global Enable (PGE) feature bit is set. |
437 | */ | ||
397 | *dx |= 0x00002000; | 438 | *dx |= 0x00002000; |
398 | /* We also lie, and say we're family id 5. 6 or greater | 439 | /* |
440 | * We also lie, and say we're family id 5. 6 or greater | ||
399 | * leads to a rdmsr in early_init_intel which we can't handle. | 441 | * leads to a rdmsr in early_init_intel which we can't handle. |
400 | * Family ID is returned as bits 8-12 in ax. */ | 442 | * Family ID is returned as bits 8-12 in ax. |
443 | */ | ||
401 | *ax &= 0xFFFFF0FF; | 444 | *ax &= 0xFFFFF0FF; |
402 | *ax |= 0x00000500; | 445 | *ax |= 0x00000500; |
403 | break; | 446 | break; |
447 | /* | ||
448 | * 0x80000000 returns the highest Extended Function, so we futureproof | ||
449 | * like we do above by limiting it to known fields. | ||
450 | */ | ||
404 | case 0x80000000: | 451 | case 0x80000000: |
405 | /* Futureproof this a little: if they ask how much extended | ||
406 | * processor information there is, limit it to known fields. */ | ||
407 | if (*ax > 0x80000008) | 452 | if (*ax > 0x80000008) |
408 | *ax = 0x80000008; | 453 | *ax = 0x80000008; |
409 | break; | 454 | break; |
455 | |||
456 | /* | ||
457 | * PAE systems can mark pages as non-executable. Linux calls this the | ||
458 | * NX bit. Intel calls it XD (eXecute Disable), AMD EVP (Enhanced | ||
459 | * Virus Protection). We just switch turn if off here, since we don't | ||
460 | * support it. | ||
461 | */ | ||
410 | case 0x80000001: | 462 | case 0x80000001: |
411 | /* Here we should fix nx cap depending on host. */ | ||
412 | /* For this version of PAE, we just clear NX bit. */ | ||
413 | *dx &= ~(1 << 20); | 463 | *dx &= ~(1 << 20); |
414 | break; | 464 | break; |
415 | } | 465 | } |
416 | } | 466 | } |
417 | 467 | ||
418 | /* Intel has four control registers, imaginatively named cr0, cr2, cr3 and cr4. | 468 | /* |
469 | * Intel has four control registers, imaginatively named cr0, cr2, cr3 and cr4. | ||
419 | * I assume there's a cr1, but it hasn't bothered us yet, so we'll not bother | 470 | * I assume there's a cr1, but it hasn't bothered us yet, so we'll not bother |
420 | * it. The Host needs to know when the Guest wants to change them, so we have | 471 | * it. The Host needs to know when the Guest wants to change them, so we have |
421 | * a whole series of functions like read_cr0() and write_cr0(). | 472 | * a whole series of functions like read_cr0() and write_cr0(). |
@@ -430,7 +481,8 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx, | |||
430 | * name like "FPUTRAP bit" be a little less cryptic? | 481 | * name like "FPUTRAP bit" be a little less cryptic? |
431 | * | 482 | * |
432 | * We store cr0 locally because the Host never changes it. The Guest sometimes | 483 | * We store cr0 locally because the Host never changes it. The Guest sometimes |
433 | * wants to read it and we'd prefer not to bother the Host unnecessarily. */ | 484 | * wants to read it and we'd prefer not to bother the Host unnecessarily. |
485 | */ | ||
434 | static unsigned long current_cr0; | 486 | static unsigned long current_cr0; |
435 | static void lguest_write_cr0(unsigned long val) | 487 | static void lguest_write_cr0(unsigned long val) |
436 | { | 488 | { |
@@ -443,18 +495,22 @@ static unsigned long lguest_read_cr0(void) | |||
443 | return current_cr0; | 495 | return current_cr0; |
444 | } | 496 | } |
445 | 497 | ||
446 | /* Intel provided a special instruction to clear the TS bit for people too cool | 498 | /* |
499 | * Intel provided a special instruction to clear the TS bit for people too cool | ||
447 | * to use write_cr0() to do it. This "clts" instruction is faster, because all | 500 | * to use write_cr0() to do it. This "clts" instruction is faster, because all |
448 | * the vowels have been optimized out. */ | 501 | * the vowels have been optimized out. |
502 | */ | ||
449 | static void lguest_clts(void) | 503 | static void lguest_clts(void) |
450 | { | 504 | { |
451 | lazy_hcall1(LHCALL_TS, 0); | 505 | lazy_hcall1(LHCALL_TS, 0); |
452 | current_cr0 &= ~X86_CR0_TS; | 506 | current_cr0 &= ~X86_CR0_TS; |
453 | } | 507 | } |
454 | 508 | ||
455 | /* cr2 is the virtual address of the last page fault, which the Guest only ever | 509 | /* |
510 | * cr2 is the virtual address of the last page fault, which the Guest only ever | ||
456 | * reads. The Host kindly writes this into our "struct lguest_data", so we | 511 | * reads. The Host kindly writes this into our "struct lguest_data", so we |
457 | * just read it out of there. */ | 512 | * just read it out of there. |
513 | */ | ||
458 | static unsigned long lguest_read_cr2(void) | 514 | static unsigned long lguest_read_cr2(void) |
459 | { | 515 | { |
460 | return lguest_data.cr2; | 516 | return lguest_data.cr2; |
@@ -463,10 +519,12 @@ static unsigned long lguest_read_cr2(void) | |||
463 | /* See lguest_set_pte() below. */ | 519 | /* See lguest_set_pte() below. */ |
464 | static bool cr3_changed = false; | 520 | static bool cr3_changed = false; |
465 | 521 | ||
466 | /* cr3 is the current toplevel pagetable page: the principle is the same as | 522 | /* |
523 | * cr3 is the current toplevel pagetable page: the principle is the same as | ||
467 | * cr0. Keep a local copy, and tell the Host when it changes. The only | 524 | * cr0. Keep a local copy, and tell the Host when it changes. The only |
468 | * difference is that our local copy is in lguest_data because the Host needs | 525 | * difference is that our local copy is in lguest_data because the Host needs |
469 | * to set it upon our initial hypercall. */ | 526 | * to set it upon our initial hypercall. |
527 | */ | ||
470 | static void lguest_write_cr3(unsigned long cr3) | 528 | static void lguest_write_cr3(unsigned long cr3) |
471 | { | 529 | { |
472 | lguest_data.pgdir = cr3; | 530 | lguest_data.pgdir = cr3; |
@@ -511,7 +569,7 @@ static void lguest_write_cr4(unsigned long val) | |||
511 | * cr3 ---> +---------+ | 569 | * cr3 ---> +---------+ |
512 | * | --------->+---------+ | 570 | * | --------->+---------+ |
513 | * | | | PADDR1 | | 571 | * | | | PADDR1 | |
514 | * Top-level | | PADDR2 | | 572 | * Mid-level | | PADDR2 | |
515 | * (PMD) page | | | | 573 | * (PMD) page | | | |
516 | * | | Lower-level | | 574 | * | | Lower-level | |
517 | * | | (PTE) page | | 575 | * | | (PTE) page | |
@@ -531,21 +589,62 @@ static void lguest_write_cr4(unsigned long val) | |||
531 | * Index into top Index into second Offset within page | 589 | * Index into top Index into second Offset within page |
532 | * page directory page pagetable page | 590 | * page directory page pagetable page |
533 | * | 591 | * |
534 | * The kernel spends a lot of time changing both the top-level page directory | 592 | * Now, unfortunately, this isn't the whole story: Intel added Physical Address |
535 | * and lower-level pagetable pages. The Guest doesn't know physical addresses, | 593 | * Extension (PAE) to allow 32 bit systems to use 64GB of memory (ie. 36 bits). |
536 | * so while it maintains these page tables exactly like normal, it also needs | 594 | * These are held in 64-bit page table entries, so we can now only fit 512 |
537 | * to keep the Host informed whenever it makes a change: the Host will create | 595 | * entries in a page, and the neat three-level tree breaks down. |
538 | * the real page tables based on the Guests'. | 596 | * |
597 | * The result is a four level page table: | ||
598 | * | ||
599 | * cr3 --> [ 4 Upper ] | ||
600 | * [ Level ] | ||
601 | * [ Entries ] | ||
602 | * [(PUD Page)]---> +---------+ | ||
603 | * | --------->+---------+ | ||
604 | * | | | PADDR1 | | ||
605 | * Mid-level | | PADDR2 | | ||
606 | * (PMD) page | | | | ||
607 | * | | Lower-level | | ||
608 | * | | (PTE) page | | ||
609 | * | | | | | ||
610 | * .... .... | ||
611 | * | ||
612 | * | ||
613 | * And the virtual address is decoded as: | ||
614 | * | ||
615 | * 1 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 | ||
616 | * |<-2->|<--- 9 bits ---->|<---- 9 bits --->|<------ 12 bits ------>| | ||
617 | * Index into Index into mid Index into lower Offset within page | ||
618 | * top entries directory page pagetable page | ||
619 | * | ||
620 | * It's too hard to switch between these two formats at runtime, so Linux only | ||
621 | * supports one or the other depending on whether CONFIG_X86_PAE is set. Many | ||
622 | * distributions turn it on, and not just for people with silly amounts of | ||
623 | * memory: the larger PTE entries allow room for the NX bit, which lets the | ||
624 | * kernel disable execution of pages and increase security. | ||
625 | * | ||
626 | * This was a problem for lguest, which couldn't run on these distributions; | ||
627 | * then Matias Zabaljauregui figured it all out and implemented it, and only a | ||
628 | * handful of puppies were crushed in the process! | ||
629 | * | ||
630 | * Back to our point: the kernel spends a lot of time changing both the | ||
631 | * top-level page directory and lower-level pagetable pages. The Guest doesn't | ||
632 | * know physical addresses, so while it maintains these page tables exactly | ||
633 | * like normal, it also needs to keep the Host informed whenever it makes a | ||
634 | * change: the Host will create the real page tables based on the Guests'. | ||
539 | */ | 635 | */ |
540 | 636 | ||
541 | /* The Guest calls this to set a second-level entry (pte), ie. to map a page | 637 | /* |
542 | * into a process' address space. We set the entry then tell the Host the | 638 | * The Guest calls this after it has set a second-level entry (pte), ie. to map |
543 | * toplevel and address this corresponds to. The Guest uses one pagetable per | 639 | * a page into a process' address space. Wetell the Host the toplevel and |
544 | * process, so we need to tell the Host which one we're changing (mm->pgd). */ | 640 | * address this corresponds to. The Guest uses one pagetable per process, so |
641 | * we need to tell the Host which one we're changing (mm->pgd). | ||
642 | */ | ||
545 | static void lguest_pte_update(struct mm_struct *mm, unsigned long addr, | 643 | static void lguest_pte_update(struct mm_struct *mm, unsigned long addr, |
546 | pte_t *ptep) | 644 | pte_t *ptep) |
547 | { | 645 | { |
548 | #ifdef CONFIG_X86_PAE | 646 | #ifdef CONFIG_X86_PAE |
647 | /* PAE needs to hand a 64 bit page table entry, so it uses two args. */ | ||
549 | lazy_hcall4(LHCALL_SET_PTE, __pa(mm->pgd), addr, | 648 | lazy_hcall4(LHCALL_SET_PTE, __pa(mm->pgd), addr, |
550 | ptep->pte_low, ptep->pte_high); | 649 | ptep->pte_low, ptep->pte_high); |
551 | #else | 650 | #else |
@@ -553,6 +652,7 @@ static void lguest_pte_update(struct mm_struct *mm, unsigned long addr, | |||
553 | #endif | 652 | #endif |
554 | } | 653 | } |
555 | 654 | ||
655 | /* This is the "set and update" combo-meal-deal version. */ | ||
556 | static void lguest_set_pte_at(struct mm_struct *mm, unsigned long addr, | 656 | static void lguest_set_pte_at(struct mm_struct *mm, unsigned long addr, |
557 | pte_t *ptep, pte_t pteval) | 657 | pte_t *ptep, pte_t pteval) |
558 | { | 658 | { |
@@ -560,10 +660,13 @@ static void lguest_set_pte_at(struct mm_struct *mm, unsigned long addr, | |||
560 | lguest_pte_update(mm, addr, ptep); | 660 | lguest_pte_update(mm, addr, ptep); |
561 | } | 661 | } |
562 | 662 | ||
563 | /* The Guest calls lguest_set_pud to set a top-level entry and lguest_set_pmd | 663 | /* |
664 | * The Guest calls lguest_set_pud to set a top-level entry and lguest_set_pmd | ||
564 | * to set a middle-level entry when PAE is activated. | 665 | * to set a middle-level entry when PAE is activated. |
666 | * | ||
565 | * Again, we set the entry then tell the Host which page we changed, | 667 | * Again, we set the entry then tell the Host which page we changed, |
566 | * and the index of the entry we changed. */ | 668 | * and the index of the entry we changed. |
669 | */ | ||
567 | #ifdef CONFIG_X86_PAE | 670 | #ifdef CONFIG_X86_PAE |
568 | static void lguest_set_pud(pud_t *pudp, pud_t pudval) | 671 | static void lguest_set_pud(pud_t *pudp, pud_t pudval) |
569 | { | 672 | { |
@@ -582,8 +685,7 @@ static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval) | |||
582 | } | 685 | } |
583 | #else | 686 | #else |
584 | 687 | ||
585 | /* The Guest calls lguest_set_pmd to set a top-level entry when PAE is not | 688 | /* The Guest calls lguest_set_pmd to set a top-level entry when !PAE. */ |
586 | * activated. */ | ||
587 | static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval) | 689 | static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval) |
588 | { | 690 | { |
589 | native_set_pmd(pmdp, pmdval); | 691 | native_set_pmd(pmdp, pmdval); |
@@ -592,7 +694,8 @@ static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval) | |||
592 | } | 694 | } |
593 | #endif | 695 | #endif |
594 | 696 | ||
595 | /* There are a couple of legacy places where the kernel sets a PTE, but we | 697 | /* |
698 | * There are a couple of legacy places where the kernel sets a PTE, but we | ||
596 | * don't know the top level any more. This is useless for us, since we don't | 699 | * don't know the top level any more. This is useless for us, since we don't |
597 | * know which pagetable is changing or what address, so we just tell the Host | 700 | * know which pagetable is changing or what address, so we just tell the Host |
598 | * to forget all of them. Fortunately, this is very rare. | 701 | * to forget all of them. Fortunately, this is very rare. |
@@ -600,7 +703,8 @@ static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval) | |||
600 | * ... except in early boot when the kernel sets up the initial pagetables, | 703 | * ... except in early boot when the kernel sets up the initial pagetables, |
601 | * which makes booting astonishingly slow: 1.83 seconds! So we don't even tell | 704 | * which makes booting astonishingly slow: 1.83 seconds! So we don't even tell |
602 | * the Host anything changed until we've done the first page table switch, | 705 | * the Host anything changed until we've done the first page table switch, |
603 | * which brings boot back to 0.25 seconds. */ | 706 | * which brings boot back to 0.25 seconds. |
707 | */ | ||
604 | static void lguest_set_pte(pte_t *ptep, pte_t pteval) | 708 | static void lguest_set_pte(pte_t *ptep, pte_t pteval) |
605 | { | 709 | { |
606 | native_set_pte(ptep, pteval); | 710 | native_set_pte(ptep, pteval); |
@@ -609,6 +713,11 @@ static void lguest_set_pte(pte_t *ptep, pte_t pteval) | |||
609 | } | 713 | } |
610 | 714 | ||
611 | #ifdef CONFIG_X86_PAE | 715 | #ifdef CONFIG_X86_PAE |
716 | /* | ||
717 | * With 64-bit PTE values, we need to be careful setting them: if we set 32 | ||
718 | * bits at a time, the hardware could see a weird half-set entry. These | ||
719 | * versions ensure we update all 64 bits at once. | ||
720 | */ | ||
612 | static void lguest_set_pte_atomic(pte_t *ptep, pte_t pte) | 721 | static void lguest_set_pte_atomic(pte_t *ptep, pte_t pte) |
613 | { | 722 | { |
614 | native_set_pte_atomic(ptep, pte); | 723 | native_set_pte_atomic(ptep, pte); |
@@ -616,19 +725,21 @@ static void lguest_set_pte_atomic(pte_t *ptep, pte_t pte) | |||
616 | lazy_hcall1(LHCALL_FLUSH_TLB, 1); | 725 | lazy_hcall1(LHCALL_FLUSH_TLB, 1); |
617 | } | 726 | } |
618 | 727 | ||
619 | void lguest_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | 728 | static void lguest_pte_clear(struct mm_struct *mm, unsigned long addr, |
729 | pte_t *ptep) | ||
620 | { | 730 | { |
621 | native_pte_clear(mm, addr, ptep); | 731 | native_pte_clear(mm, addr, ptep); |
622 | lguest_pte_update(mm, addr, ptep); | 732 | lguest_pte_update(mm, addr, ptep); |
623 | } | 733 | } |
624 | 734 | ||
625 | void lguest_pmd_clear(pmd_t *pmdp) | 735 | static void lguest_pmd_clear(pmd_t *pmdp) |
626 | { | 736 | { |
627 | lguest_set_pmd(pmdp, __pmd(0)); | 737 | lguest_set_pmd(pmdp, __pmd(0)); |
628 | } | 738 | } |
629 | #endif | 739 | #endif |
630 | 740 | ||
631 | /* Unfortunately for Lguest, the pv_mmu_ops for page tables were based on | 741 | /* |
742 | * Unfortunately for Lguest, the pv_mmu_ops for page tables were based on | ||
632 | * native page table operations. On native hardware you can set a new page | 743 | * native page table operations. On native hardware you can set a new page |
633 | * table entry whenever you want, but if you want to remove one you have to do | 744 | * table entry whenever you want, but if you want to remove one you have to do |
634 | * a TLB flush (a TLB is a little cache of page table entries kept by the CPU). | 745 | * a TLB flush (a TLB is a little cache of page table entries kept by the CPU). |
@@ -637,24 +748,29 @@ void lguest_pmd_clear(pmd_t *pmdp) | |||
637 | * called when a valid entry is written, not when it's removed (ie. marked not | 748 | * called when a valid entry is written, not when it's removed (ie. marked not |
638 | * present). Instead, this is where we come when the Guest wants to remove a | 749 | * present). Instead, this is where we come when the Guest wants to remove a |
639 | * page table entry: we tell the Host to set that entry to 0 (ie. the present | 750 | * page table entry: we tell the Host to set that entry to 0 (ie. the present |
640 | * bit is zero). */ | 751 | * bit is zero). |
752 | */ | ||
641 | static void lguest_flush_tlb_single(unsigned long addr) | 753 | static void lguest_flush_tlb_single(unsigned long addr) |
642 | { | 754 | { |
643 | /* Simply set it to zero: if it was not, it will fault back in. */ | 755 | /* Simply set it to zero: if it was not, it will fault back in. */ |
644 | lazy_hcall3(LHCALL_SET_PTE, lguest_data.pgdir, addr, 0); | 756 | lazy_hcall3(LHCALL_SET_PTE, lguest_data.pgdir, addr, 0); |
645 | } | 757 | } |
646 | 758 | ||
647 | /* This is what happens after the Guest has removed a large number of entries. | 759 | /* |
760 | * This is what happens after the Guest has removed a large number of entries. | ||
648 | * This tells the Host that any of the page table entries for userspace might | 761 | * This tells the Host that any of the page table entries for userspace might |
649 | * have changed, ie. virtual addresses below PAGE_OFFSET. */ | 762 | * have changed, ie. virtual addresses below PAGE_OFFSET. |
763 | */ | ||
650 | static void lguest_flush_tlb_user(void) | 764 | static void lguest_flush_tlb_user(void) |
651 | { | 765 | { |
652 | lazy_hcall1(LHCALL_FLUSH_TLB, 0); | 766 | lazy_hcall1(LHCALL_FLUSH_TLB, 0); |
653 | } | 767 | } |
654 | 768 | ||
655 | /* This is called when the kernel page tables have changed. That's not very | 769 | /* |
770 | * This is called when the kernel page tables have changed. That's not very | ||
656 | * common (unless the Guest is using highmem, which makes the Guest extremely | 771 | * common (unless the Guest is using highmem, which makes the Guest extremely |
657 | * slow), so it's worth separating this from the user flushing above. */ | 772 | * slow), so it's worth separating this from the user flushing above. |
773 | */ | ||
658 | static void lguest_flush_tlb_kernel(void) | 774 | static void lguest_flush_tlb_kernel(void) |
659 | { | 775 | { |
660 | lazy_hcall1(LHCALL_FLUSH_TLB, 1); | 776 | lazy_hcall1(LHCALL_FLUSH_TLB, 1); |
@@ -691,26 +807,38 @@ static struct irq_chip lguest_irq_controller = { | |||
691 | .unmask = enable_lguest_irq, | 807 | .unmask = enable_lguest_irq, |
692 | }; | 808 | }; |
693 | 809 | ||
694 | /* This sets up the Interrupt Descriptor Table (IDT) entry for each hardware | 810 | /* |
811 | * This sets up the Interrupt Descriptor Table (IDT) entry for each hardware | ||
695 | * interrupt (except 128, which is used for system calls), and then tells the | 812 | * interrupt (except 128, which is used for system calls), and then tells the |
696 | * Linux infrastructure that each interrupt is controlled by our level-based | 813 | * Linux infrastructure that each interrupt is controlled by our level-based |
697 | * lguest interrupt controller. */ | 814 | * lguest interrupt controller. |
815 | */ | ||
698 | static void __init lguest_init_IRQ(void) | 816 | static void __init lguest_init_IRQ(void) |
699 | { | 817 | { |
700 | unsigned int i; | 818 | unsigned int i; |
701 | 819 | ||
702 | for (i = FIRST_EXTERNAL_VECTOR; i < NR_VECTORS; i++) { | 820 | for (i = FIRST_EXTERNAL_VECTOR; i < NR_VECTORS; i++) { |
703 | /* Some systems map "vectors" to interrupts weirdly. Lguest has | 821 | /* Some systems map "vectors" to interrupts weirdly. Not us! */ |
704 | * a straightforward 1 to 1 mapping, so force that here. */ | ||
705 | __get_cpu_var(vector_irq)[i] = i - FIRST_EXTERNAL_VECTOR; | 822 | __get_cpu_var(vector_irq)[i] = i - FIRST_EXTERNAL_VECTOR; |
706 | if (i != SYSCALL_VECTOR) | 823 | if (i != SYSCALL_VECTOR) |
707 | set_intr_gate(i, interrupt[i - FIRST_EXTERNAL_VECTOR]); | 824 | set_intr_gate(i, interrupt[i - FIRST_EXTERNAL_VECTOR]); |
708 | } | 825 | } |
709 | /* This call is required to set up for 4k stacks, where we have | 826 | |
710 | * separate stacks for hard and soft interrupts. */ | 827 | /* |
828 | * This call is required to set up for 4k stacks, where we have | ||
829 | * separate stacks for hard and soft interrupts. | ||
830 | */ | ||
711 | irq_ctx_init(smp_processor_id()); | 831 | irq_ctx_init(smp_processor_id()); |
712 | } | 832 | } |
713 | 833 | ||
834 | /* | ||
835 | * With CONFIG_SPARSE_IRQ, interrupt descriptors are allocated as-needed, so | ||
836 | * rather than set them in lguest_init_IRQ we are called here every time an | ||
837 | * lguest device needs an interrupt. | ||
838 | * | ||
839 | * FIXME: irq_to_desc_alloc_node() can fail due to lack of memory, we should | ||
840 | * pass that up! | ||
841 | */ | ||
714 | void lguest_setup_irq(unsigned int irq) | 842 | void lguest_setup_irq(unsigned int irq) |
715 | { | 843 | { |
716 | irq_to_desc_alloc_node(irq, 0); | 844 | irq_to_desc_alloc_node(irq, 0); |
@@ -729,31 +857,39 @@ static unsigned long lguest_get_wallclock(void) | |||
729 | return lguest_data.time.tv_sec; | 857 | return lguest_data.time.tv_sec; |
730 | } | 858 | } |
731 | 859 | ||
732 | /* The TSC is an Intel thing called the Time Stamp Counter. The Host tells us | 860 | /* |
861 | * The TSC is an Intel thing called the Time Stamp Counter. The Host tells us | ||
733 | * what speed it runs at, or 0 if it's unusable as a reliable clock source. | 862 | * what speed it runs at, or 0 if it's unusable as a reliable clock source. |
734 | * This matches what we want here: if we return 0 from this function, the x86 | 863 | * This matches what we want here: if we return 0 from this function, the x86 |
735 | * TSC clock will give up and not register itself. */ | 864 | * TSC clock will give up and not register itself. |
865 | */ | ||
736 | static unsigned long lguest_tsc_khz(void) | 866 | static unsigned long lguest_tsc_khz(void) |
737 | { | 867 | { |
738 | return lguest_data.tsc_khz; | 868 | return lguest_data.tsc_khz; |
739 | } | 869 | } |
740 | 870 | ||
741 | /* If we can't use the TSC, the kernel falls back to our lower-priority | 871 | /* |
742 | * "lguest_clock", where we read the time value given to us by the Host. */ | 872 | * If we can't use the TSC, the kernel falls back to our lower-priority |
873 | * "lguest_clock", where we read the time value given to us by the Host. | ||
874 | */ | ||
743 | static cycle_t lguest_clock_read(struct clocksource *cs) | 875 | static cycle_t lguest_clock_read(struct clocksource *cs) |
744 | { | 876 | { |
745 | unsigned long sec, nsec; | 877 | unsigned long sec, nsec; |
746 | 878 | ||
747 | /* Since the time is in two parts (seconds and nanoseconds), we risk | 879 | /* |
880 | * Since the time is in two parts (seconds and nanoseconds), we risk | ||
748 | * reading it just as it's changing from 99 & 0.999999999 to 100 and 0, | 881 | * reading it just as it's changing from 99 & 0.999999999 to 100 and 0, |
749 | * and getting 99 and 0. As Linux tends to come apart under the stress | 882 | * and getting 99 and 0. As Linux tends to come apart under the stress |
750 | * of time travel, we must be careful: */ | 883 | * of time travel, we must be careful: |
884 | */ | ||
751 | do { | 885 | do { |
752 | /* First we read the seconds part. */ | 886 | /* First we read the seconds part. */ |
753 | sec = lguest_data.time.tv_sec; | 887 | sec = lguest_data.time.tv_sec; |
754 | /* This read memory barrier tells the compiler and the CPU that | 888 | /* |
889 | * This read memory barrier tells the compiler and the CPU that | ||
755 | * this can't be reordered: we have to complete the above | 890 | * this can't be reordered: we have to complete the above |
756 | * before going on. */ | 891 | * before going on. |
892 | */ | ||
757 | rmb(); | 893 | rmb(); |
758 | /* Now we read the nanoseconds part. */ | 894 | /* Now we read the nanoseconds part. */ |
759 | nsec = lguest_data.time.tv_nsec; | 895 | nsec = lguest_data.time.tv_nsec; |
@@ -777,9 +913,11 @@ static struct clocksource lguest_clock = { | |||
777 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 913 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
778 | }; | 914 | }; |
779 | 915 | ||
780 | /* We also need a "struct clock_event_device": Linux asks us to set it to go | 916 | /* |
917 | * We also need a "struct clock_event_device": Linux asks us to set it to go | ||
781 | * off some time in the future. Actually, James Morris figured all this out, I | 918 | * off some time in the future. Actually, James Morris figured all this out, I |
782 | * just applied the patch. */ | 919 | * just applied the patch. |
920 | */ | ||
783 | static int lguest_clockevent_set_next_event(unsigned long delta, | 921 | static int lguest_clockevent_set_next_event(unsigned long delta, |
784 | struct clock_event_device *evt) | 922 | struct clock_event_device *evt) |
785 | { | 923 | { |
@@ -829,8 +967,10 @@ static struct clock_event_device lguest_clockevent = { | |||
829 | .max_delta_ns = LG_CLOCK_MAX_DELTA, | 967 | .max_delta_ns = LG_CLOCK_MAX_DELTA, |
830 | }; | 968 | }; |
831 | 969 | ||
832 | /* This is the Guest timer interrupt handler (hardware interrupt 0). We just | 970 | /* |
833 | * call the clockevent infrastructure and it does whatever needs doing. */ | 971 | * This is the Guest timer interrupt handler (hardware interrupt 0). We just |
972 | * call the clockevent infrastructure and it does whatever needs doing. | ||
973 | */ | ||
834 | static void lguest_time_irq(unsigned int irq, struct irq_desc *desc) | 974 | static void lguest_time_irq(unsigned int irq, struct irq_desc *desc) |
835 | { | 975 | { |
836 | unsigned long flags; | 976 | unsigned long flags; |
@@ -841,10 +981,12 @@ static void lguest_time_irq(unsigned int irq, struct irq_desc *desc) | |||
841 | local_irq_restore(flags); | 981 | local_irq_restore(flags); |
842 | } | 982 | } |
843 | 983 | ||
844 | /* At some point in the boot process, we get asked to set up our timing | 984 | /* |
985 | * At some point in the boot process, we get asked to set up our timing | ||
845 | * infrastructure. The kernel doesn't expect timer interrupts before this, but | 986 | * infrastructure. The kernel doesn't expect timer interrupts before this, but |
846 | * we cleverly initialized the "blocked_interrupts" field of "struct | 987 | * we cleverly initialized the "blocked_interrupts" field of "struct |
847 | * lguest_data" so that timer interrupts were blocked until now. */ | 988 | * lguest_data" so that timer interrupts were blocked until now. |
989 | */ | ||
848 | static void lguest_time_init(void) | 990 | static void lguest_time_init(void) |
849 | { | 991 | { |
850 | /* Set up the timer interrupt (0) to go to our simple timer routine */ | 992 | /* Set up the timer interrupt (0) to go to our simple timer routine */ |
@@ -868,14 +1010,16 @@ static void lguest_time_init(void) | |||
868 | * to work. They're pretty simple. | 1010 | * to work. They're pretty simple. |
869 | */ | 1011 | */ |
870 | 1012 | ||
871 | /* The Guest needs to tell the Host what stack it expects traps to use. For | 1013 | /* |
1014 | * The Guest needs to tell the Host what stack it expects traps to use. For | ||
872 | * native hardware, this is part of the Task State Segment mentioned above in | 1015 | * native hardware, this is part of the Task State Segment mentioned above in |
873 | * lguest_load_tr_desc(), but to help hypervisors there's this special call. | 1016 | * lguest_load_tr_desc(), but to help hypervisors there's this special call. |
874 | * | 1017 | * |
875 | * We tell the Host the segment we want to use (__KERNEL_DS is the kernel data | 1018 | * We tell the Host the segment we want to use (__KERNEL_DS is the kernel data |
876 | * segment), the privilege level (we're privilege level 1, the Host is 0 and | 1019 | * segment), the privilege level (we're privilege level 1, the Host is 0 and |
877 | * will not tolerate us trying to use that), the stack pointer, and the number | 1020 | * will not tolerate us trying to use that), the stack pointer, and the number |
878 | * of pages in the stack. */ | 1021 | * of pages in the stack. |
1022 | */ | ||
879 | static void lguest_load_sp0(struct tss_struct *tss, | 1023 | static void lguest_load_sp0(struct tss_struct *tss, |
880 | struct thread_struct *thread) | 1024 | struct thread_struct *thread) |
881 | { | 1025 | { |
@@ -889,7 +1033,8 @@ static void lguest_set_debugreg(int regno, unsigned long value) | |||
889 | /* FIXME: Implement */ | 1033 | /* FIXME: Implement */ |
890 | } | 1034 | } |
891 | 1035 | ||
892 | /* There are times when the kernel wants to make sure that no memory writes are | 1036 | /* |
1037 | * There are times when the kernel wants to make sure that no memory writes are | ||
893 | * caught in the cache (that they've all reached real hardware devices). This | 1038 | * caught in the cache (that they've all reached real hardware devices). This |
894 | * doesn't matter for the Guest which has virtual hardware. | 1039 | * doesn't matter for the Guest which has virtual hardware. |
895 | * | 1040 | * |
@@ -903,11 +1048,13 @@ static void lguest_wbinvd(void) | |||
903 | { | 1048 | { |
904 | } | 1049 | } |
905 | 1050 | ||
906 | /* If the Guest expects to have an Advanced Programmable Interrupt Controller, | 1051 | /* |
1052 | * If the Guest expects to have an Advanced Programmable Interrupt Controller, | ||
907 | * we play dumb by ignoring writes and returning 0 for reads. So it's no | 1053 | * we play dumb by ignoring writes and returning 0 for reads. So it's no |
908 | * longer Programmable nor Controlling anything, and I don't think 8 lines of | 1054 | * longer Programmable nor Controlling anything, and I don't think 8 lines of |
909 | * code qualifies for Advanced. It will also never interrupt anything. It | 1055 | * code qualifies for Advanced. It will also never interrupt anything. It |
910 | * does, however, allow us to get through the Linux boot code. */ | 1056 | * does, however, allow us to get through the Linux boot code. |
1057 | */ | ||
911 | #ifdef CONFIG_X86_LOCAL_APIC | 1058 | #ifdef CONFIG_X86_LOCAL_APIC |
912 | static void lguest_apic_write(u32 reg, u32 v) | 1059 | static void lguest_apic_write(u32 reg, u32 v) |
913 | { | 1060 | { |
@@ -956,11 +1103,13 @@ static void lguest_safe_halt(void) | |||
956 | kvm_hypercall0(LHCALL_HALT); | 1103 | kvm_hypercall0(LHCALL_HALT); |
957 | } | 1104 | } |
958 | 1105 | ||
959 | /* The SHUTDOWN hypercall takes a string to describe what's happening, and | 1106 | /* |
1107 | * The SHUTDOWN hypercall takes a string to describe what's happening, and | ||
960 | * an argument which says whether this to restart (reboot) the Guest or not. | 1108 | * an argument which says whether this to restart (reboot) the Guest or not. |
961 | * | 1109 | * |
962 | * Note that the Host always prefers that the Guest speak in physical addresses | 1110 | * Note that the Host always prefers that the Guest speak in physical addresses |
963 | * rather than virtual addresses, so we use __pa() here. */ | 1111 | * rather than virtual addresses, so we use __pa() here. |
1112 | */ | ||
964 | static void lguest_power_off(void) | 1113 | static void lguest_power_off(void) |
965 | { | 1114 | { |
966 | kvm_hypercall2(LHCALL_SHUTDOWN, __pa("Power down"), | 1115 | kvm_hypercall2(LHCALL_SHUTDOWN, __pa("Power down"), |
@@ -991,8 +1140,10 @@ static __init char *lguest_memory_setup(void) | |||
991 | * nice to move it back to lguest_init. Patch welcome... */ | 1140 | * nice to move it back to lguest_init. Patch welcome... */ |
992 | atomic_notifier_chain_register(&panic_notifier_list, &paniced); | 1141 | atomic_notifier_chain_register(&panic_notifier_list, &paniced); |
993 | 1142 | ||
994 | /* The Linux bootloader header contains an "e820" memory map: the | 1143 | /* |
995 | * Launcher populated the first entry with our memory limit. */ | 1144 | *The Linux bootloader header contains an "e820" memory map: the |
1145 | * Launcher populated the first entry with our memory limit. | ||
1146 | */ | ||
996 | e820_add_region(boot_params.e820_map[0].addr, | 1147 | e820_add_region(boot_params.e820_map[0].addr, |
997 | boot_params.e820_map[0].size, | 1148 | boot_params.e820_map[0].size, |
998 | boot_params.e820_map[0].type); | 1149 | boot_params.e820_map[0].type); |
@@ -1001,16 +1152,17 @@ static __init char *lguest_memory_setup(void) | |||
1001 | return "LGUEST"; | 1152 | return "LGUEST"; |
1002 | } | 1153 | } |
1003 | 1154 | ||
1004 | /* We will eventually use the virtio console device to produce console output, | 1155 | /* |
1156 | * We will eventually use the virtio console device to produce console output, | ||
1005 | * but before that is set up we use LHCALL_NOTIFY on normal memory to produce | 1157 | * but before that is set up we use LHCALL_NOTIFY on normal memory to produce |
1006 | * console output. */ | 1158 | * console output. |
1159 | */ | ||
1007 | static __init int early_put_chars(u32 vtermno, const char *buf, int count) | 1160 | static __init int early_put_chars(u32 vtermno, const char *buf, int count) |
1008 | { | 1161 | { |
1009 | char scratch[17]; | 1162 | char scratch[17]; |
1010 | unsigned int len = count; | 1163 | unsigned int len = count; |
1011 | 1164 | ||
1012 | /* We use a nul-terminated string, so we have to make a copy. Icky, | 1165 | /* We use a nul-terminated string, so we make a copy. Icky, huh? */ |
1013 | * huh? */ | ||
1014 | if (len > sizeof(scratch) - 1) | 1166 | if (len > sizeof(scratch) - 1) |
1015 | len = sizeof(scratch) - 1; | 1167 | len = sizeof(scratch) - 1; |
1016 | scratch[len] = '\0'; | 1168 | scratch[len] = '\0'; |
@@ -1021,8 +1173,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count) | |||
1021 | return len; | 1173 | return len; |
1022 | } | 1174 | } |
1023 | 1175 | ||
1024 | /* Rebooting also tells the Host we're finished, but the RESTART flag tells the | 1176 | /* |
1025 | * Launcher to reboot us. */ | 1177 | * Rebooting also tells the Host we're finished, but the RESTART flag tells the |
1178 | * Launcher to reboot us. | ||
1179 | */ | ||
1026 | static void lguest_restart(char *reason) | 1180 | static void lguest_restart(char *reason) |
1027 | { | 1181 | { |
1028 | kvm_hypercall2(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART); | 1182 | kvm_hypercall2(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART); |
@@ -1049,7 +1203,8 @@ static void lguest_restart(char *reason) | |||
1049 | * fit comfortably. | 1203 | * fit comfortably. |
1050 | * | 1204 | * |
1051 | * First we need assembly templates of each of the patchable Guest operations, | 1205 | * First we need assembly templates of each of the patchable Guest operations, |
1052 | * and these are in i386_head.S. */ | 1206 | * and these are in i386_head.S. |
1207 | */ | ||
1053 | 1208 | ||
1054 | /*G:060 We construct a table from the assembler templates: */ | 1209 | /*G:060 We construct a table from the assembler templates: */ |
1055 | static const struct lguest_insns | 1210 | static const struct lguest_insns |
@@ -1060,9 +1215,11 @@ static const struct lguest_insns | |||
1060 | [PARAVIRT_PATCH(pv_irq_ops.save_fl)] = { lgstart_pushf, lgend_pushf }, | 1215 | [PARAVIRT_PATCH(pv_irq_ops.save_fl)] = { lgstart_pushf, lgend_pushf }, |
1061 | }; | 1216 | }; |
1062 | 1217 | ||
1063 | /* Now our patch routine is fairly simple (based on the native one in | 1218 | /* |
1219 | * Now our patch routine is fairly simple (based on the native one in | ||
1064 | * paravirt.c). If we have a replacement, we copy it in and return how much of | 1220 | * paravirt.c). If we have a replacement, we copy it in and return how much of |
1065 | * the available space we used. */ | 1221 | * the available space we used. |
1222 | */ | ||
1066 | static unsigned lguest_patch(u8 type, u16 clobber, void *ibuf, | 1223 | static unsigned lguest_patch(u8 type, u16 clobber, void *ibuf, |
1067 | unsigned long addr, unsigned len) | 1224 | unsigned long addr, unsigned len) |
1068 | { | 1225 | { |
@@ -1074,8 +1231,7 @@ static unsigned lguest_patch(u8 type, u16 clobber, void *ibuf, | |||
1074 | 1231 | ||
1075 | insn_len = lguest_insns[type].end - lguest_insns[type].start; | 1232 | insn_len = lguest_insns[type].end - lguest_insns[type].start; |
1076 | 1233 | ||
1077 | /* Similarly if we can't fit replacement (shouldn't happen, but let's | 1234 | /* Similarly if it can't fit (doesn't happen, but let's be thorough). */ |
1078 | * be thorough). */ | ||
1079 | if (len < insn_len) | 1235 | if (len < insn_len) |
1080 | return paravirt_patch_default(type, clobber, ibuf, addr, len); | 1236 | return paravirt_patch_default(type, clobber, ibuf, addr, len); |
1081 | 1237 | ||
@@ -1084,22 +1240,28 @@ static unsigned lguest_patch(u8 type, u16 clobber, void *ibuf, | |||
1084 | return insn_len; | 1240 | return insn_len; |
1085 | } | 1241 | } |
1086 | 1242 | ||
1087 | /*G:029 Once we get to lguest_init(), we know we're a Guest. The various | 1243 | /*G:029 |
1244 | * Once we get to lguest_init(), we know we're a Guest. The various | ||
1088 | * pv_ops structures in the kernel provide points for (almost) every routine we | 1245 | * pv_ops structures in the kernel provide points for (almost) every routine we |
1089 | * have to override to avoid privileged instructions. */ | 1246 | * have to override to avoid privileged instructions. |
1247 | */ | ||
1090 | __init void lguest_init(void) | 1248 | __init void lguest_init(void) |
1091 | { | 1249 | { |
1092 | /* We're under lguest, paravirt is enabled, and we're running at | 1250 | /* We're under lguest. */ |
1093 | * privilege level 1, not 0 as normal. */ | ||
1094 | pv_info.name = "lguest"; | 1251 | pv_info.name = "lguest"; |
1252 | /* Paravirt is enabled. */ | ||
1095 | pv_info.paravirt_enabled = 1; | 1253 | pv_info.paravirt_enabled = 1; |
1254 | /* We're running at privilege level 1, not 0 as normal. */ | ||
1096 | pv_info.kernel_rpl = 1; | 1255 | pv_info.kernel_rpl = 1; |
1256 | /* Everyone except Xen runs with this set. */ | ||
1097 | pv_info.shared_kernel_pmd = 1; | 1257 | pv_info.shared_kernel_pmd = 1; |
1098 | 1258 | ||
1099 | /* We set up all the lguest overrides for sensitive operations. These | 1259 | /* |
1100 | * are detailed with the operations themselves. */ | 1260 | * We set up all the lguest overrides for sensitive operations. These |
1261 | * are detailed with the operations themselves. | ||
1262 | */ | ||
1101 | 1263 | ||
1102 | /* interrupt-related operations */ | 1264 | /* Interrupt-related operations */ |
1103 | pv_irq_ops.init_IRQ = lguest_init_IRQ; | 1265 | pv_irq_ops.init_IRQ = lguest_init_IRQ; |
1104 | pv_irq_ops.save_fl = PV_CALLEE_SAVE(save_fl); | 1266 | pv_irq_ops.save_fl = PV_CALLEE_SAVE(save_fl); |
1105 | pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(lg_restore_fl); | 1267 | pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(lg_restore_fl); |
@@ -1107,11 +1269,11 @@ __init void lguest_init(void) | |||
1107 | pv_irq_ops.irq_enable = __PV_IS_CALLEE_SAVE(lg_irq_enable); | 1269 | pv_irq_ops.irq_enable = __PV_IS_CALLEE_SAVE(lg_irq_enable); |
1108 | pv_irq_ops.safe_halt = lguest_safe_halt; | 1270 | pv_irq_ops.safe_halt = lguest_safe_halt; |
1109 | 1271 | ||
1110 | /* init-time operations */ | 1272 | /* Setup operations */ |
1111 | pv_init_ops.memory_setup = lguest_memory_setup; | 1273 | pv_init_ops.memory_setup = lguest_memory_setup; |
1112 | pv_init_ops.patch = lguest_patch; | 1274 | pv_init_ops.patch = lguest_patch; |
1113 | 1275 | ||
1114 | /* Intercepts of various cpu instructions */ | 1276 | /* Intercepts of various CPU instructions */ |
1115 | pv_cpu_ops.load_gdt = lguest_load_gdt; | 1277 | pv_cpu_ops.load_gdt = lguest_load_gdt; |
1116 | pv_cpu_ops.cpuid = lguest_cpuid; | 1278 | pv_cpu_ops.cpuid = lguest_cpuid; |
1117 | pv_cpu_ops.load_idt = lguest_load_idt; | 1279 | pv_cpu_ops.load_idt = lguest_load_idt; |
@@ -1132,7 +1294,7 @@ __init void lguest_init(void) | |||
1132 | pv_cpu_ops.start_context_switch = paravirt_start_context_switch; | 1294 | pv_cpu_ops.start_context_switch = paravirt_start_context_switch; |
1133 | pv_cpu_ops.end_context_switch = lguest_end_context_switch; | 1295 | pv_cpu_ops.end_context_switch = lguest_end_context_switch; |
1134 | 1296 | ||
1135 | /* pagetable management */ | 1297 | /* Pagetable management */ |
1136 | pv_mmu_ops.write_cr3 = lguest_write_cr3; | 1298 | pv_mmu_ops.write_cr3 = lguest_write_cr3; |
1137 | pv_mmu_ops.flush_tlb_user = lguest_flush_tlb_user; | 1299 | pv_mmu_ops.flush_tlb_user = lguest_flush_tlb_user; |
1138 | pv_mmu_ops.flush_tlb_single = lguest_flush_tlb_single; | 1300 | pv_mmu_ops.flush_tlb_single = lguest_flush_tlb_single; |
@@ -1154,54 +1316,71 @@ __init void lguest_init(void) | |||
1154 | pv_mmu_ops.pte_update_defer = lguest_pte_update; | 1316 | pv_mmu_ops.pte_update_defer = lguest_pte_update; |
1155 | 1317 | ||
1156 | #ifdef CONFIG_X86_LOCAL_APIC | 1318 | #ifdef CONFIG_X86_LOCAL_APIC |
1157 | /* apic read/write intercepts */ | 1319 | /* APIC read/write intercepts */ |
1158 | set_lguest_basic_apic_ops(); | 1320 | set_lguest_basic_apic_ops(); |
1159 | #endif | 1321 | #endif |
1160 | 1322 | ||
1161 | /* time operations */ | 1323 | /* Time operations */ |
1162 | pv_time_ops.get_wallclock = lguest_get_wallclock; | 1324 | pv_time_ops.get_wallclock = lguest_get_wallclock; |
1163 | pv_time_ops.time_init = lguest_time_init; | 1325 | pv_time_ops.time_init = lguest_time_init; |
1164 | pv_time_ops.get_tsc_khz = lguest_tsc_khz; | 1326 | pv_time_ops.get_tsc_khz = lguest_tsc_khz; |
1165 | 1327 | ||
1166 | /* Now is a good time to look at the implementations of these functions | 1328 | /* |
1167 | * before returning to the rest of lguest_init(). */ | 1329 | * Now is a good time to look at the implementations of these functions |
1330 | * before returning to the rest of lguest_init(). | ||
1331 | */ | ||
1168 | 1332 | ||
1169 | /*G:070 Now we've seen all the paravirt_ops, we return to | 1333 | /*G:070 |
1334 | * Now we've seen all the paravirt_ops, we return to | ||
1170 | * lguest_init() where the rest of the fairly chaotic boot setup | 1335 | * lguest_init() where the rest of the fairly chaotic boot setup |
1171 | * occurs. */ | 1336 | * occurs. |
1337 | */ | ||
1172 | 1338 | ||
1173 | /* The stack protector is a weird thing where gcc places a canary | 1339 | /* |
1340 | * The stack protector is a weird thing where gcc places a canary | ||
1174 | * value on the stack and then checks it on return. This file is | 1341 | * value on the stack and then checks it on return. This file is |
1175 | * compiled with -fno-stack-protector it, so we got this far without | 1342 | * compiled with -fno-stack-protector it, so we got this far without |
1176 | * problems. The value of the canary is kept at offset 20 from the | 1343 | * problems. The value of the canary is kept at offset 20 from the |
1177 | * %gs register, so we need to set that up before calling C functions | 1344 | * %gs register, so we need to set that up before calling C functions |
1178 | * in other files. */ | 1345 | * in other files. |
1346 | */ | ||
1179 | setup_stack_canary_segment(0); | 1347 | setup_stack_canary_segment(0); |
1180 | /* We could just call load_stack_canary_segment(), but we might as | 1348 | |
1181 | * call switch_to_new_gdt() which loads the whole table and sets up | 1349 | /* |
1182 | * the per-cpu segment descriptor register %fs as well. */ | 1350 | * We could just call load_stack_canary_segment(), but we might as well |
1351 | * call switch_to_new_gdt() which loads the whole table and sets up the | ||
1352 | * per-cpu segment descriptor register %fs as well. | ||
1353 | */ | ||
1183 | switch_to_new_gdt(0); | 1354 | switch_to_new_gdt(0); |
1184 | 1355 | ||
1185 | /* As described in head_32.S, we map the first 128M of memory. */ | 1356 | /* We actually boot with all memory mapped, but let's say 128MB. */ |
1186 | max_pfn_mapped = (128*1024*1024) >> PAGE_SHIFT; | 1357 | max_pfn_mapped = (128*1024*1024) >> PAGE_SHIFT; |
1187 | 1358 | ||
1188 | /* The Host<->Guest Switcher lives at the top of our address space, and | 1359 | /* |
1360 | * The Host<->Guest Switcher lives at the top of our address space, and | ||
1189 | * the Host told us how big it is when we made LGUEST_INIT hypercall: | 1361 | * the Host told us how big it is when we made LGUEST_INIT hypercall: |
1190 | * it put the answer in lguest_data.reserve_mem */ | 1362 | * it put the answer in lguest_data.reserve_mem |
1363 | */ | ||
1191 | reserve_top_address(lguest_data.reserve_mem); | 1364 | reserve_top_address(lguest_data.reserve_mem); |
1192 | 1365 | ||
1193 | /* If we don't initialize the lock dependency checker now, it crashes | 1366 | /* |
1194 | * paravirt_disable_iospace. */ | 1367 | * If we don't initialize the lock dependency checker now, it crashes |
1368 | * paravirt_disable_iospace. | ||
1369 | */ | ||
1195 | lockdep_init(); | 1370 | lockdep_init(); |
1196 | 1371 | ||
1197 | /* The IDE code spends about 3 seconds probing for disks: if we reserve | 1372 | /* |
1373 | * The IDE code spends about 3 seconds probing for disks: if we reserve | ||
1198 | * all the I/O ports up front it can't get them and so doesn't probe. | 1374 | * all the I/O ports up front it can't get them and so doesn't probe. |
1199 | * Other device drivers are similar (but less severe). This cuts the | 1375 | * Other device drivers are similar (but less severe). This cuts the |
1200 | * kernel boot time on my machine from 4.1 seconds to 0.45 seconds. */ | 1376 | * kernel boot time on my machine from 4.1 seconds to 0.45 seconds. |
1377 | */ | ||
1201 | paravirt_disable_iospace(); | 1378 | paravirt_disable_iospace(); |
1202 | 1379 | ||
1203 | /* This is messy CPU setup stuff which the native boot code does before | 1380 | /* |
1204 | * start_kernel, so we have to do, too: */ | 1381 | * This is messy CPU setup stuff which the native boot code does before |
1382 | * start_kernel, so we have to do, too: | ||
1383 | */ | ||
1205 | cpu_detect(&new_cpu_data); | 1384 | cpu_detect(&new_cpu_data); |
1206 | /* head.S usually sets up the first capability word, so do it here. */ | 1385 | /* head.S usually sets up the first capability word, so do it here. */ |
1207 | new_cpu_data.x86_capability[0] = cpuid_edx(1); | 1386 | new_cpu_data.x86_capability[0] = cpuid_edx(1); |
@@ -1218,22 +1397,28 @@ __init void lguest_init(void) | |||
1218 | acpi_ht = 0; | 1397 | acpi_ht = 0; |
1219 | #endif | 1398 | #endif |
1220 | 1399 | ||
1221 | /* We set the preferred console to "hvc". This is the "hypervisor | 1400 | /* |
1401 | * We set the preferred console to "hvc". This is the "hypervisor | ||
1222 | * virtual console" driver written by the PowerPC people, which we also | 1402 | * virtual console" driver written by the PowerPC people, which we also |
1223 | * adapted for lguest's use. */ | 1403 | * adapted for lguest's use. |
1404 | */ | ||
1224 | add_preferred_console("hvc", 0, NULL); | 1405 | add_preferred_console("hvc", 0, NULL); |
1225 | 1406 | ||
1226 | /* Register our very early console. */ | 1407 | /* Register our very early console. */ |
1227 | virtio_cons_early_init(early_put_chars); | 1408 | virtio_cons_early_init(early_put_chars); |
1228 | 1409 | ||
1229 | /* Last of all, we set the power management poweroff hook to point to | 1410 | /* |
1411 | * Last of all, we set the power management poweroff hook to point to | ||
1230 | * the Guest routine to power off, and the reboot hook to our restart | 1412 | * the Guest routine to power off, and the reboot hook to our restart |
1231 | * routine. */ | 1413 | * routine. |
1414 | */ | ||
1232 | pm_power_off = lguest_power_off; | 1415 | pm_power_off = lguest_power_off; |
1233 | machine_ops.restart = lguest_restart; | 1416 | machine_ops.restart = lguest_restart; |
1234 | 1417 | ||
1235 | /* Now we're set up, call i386_start_kernel() in head32.c and we proceed | 1418 | /* |
1236 | * to boot as normal. It never returns. */ | 1419 | * Now we're set up, call i386_start_kernel() in head32.c and we proceed |
1420 | * to boot as normal. It never returns. | ||
1421 | */ | ||
1237 | i386_start_kernel(); | 1422 | i386_start_kernel(); |
1238 | } | 1423 | } |
1239 | /* | 1424 | /* |
diff --git a/arch/x86/lguest/i386_head.S b/arch/x86/lguest/i386_head.S index a9c8cfe61cd4..27eac0faee48 100644 --- a/arch/x86/lguest/i386_head.S +++ b/arch/x86/lguest/i386_head.S | |||
@@ -5,7 +5,8 @@ | |||
5 | #include <asm/thread_info.h> | 5 | #include <asm/thread_info.h> |
6 | #include <asm/processor-flags.h> | 6 | #include <asm/processor-flags.h> |
7 | 7 | ||
8 | /*G:020 Our story starts with the kernel booting into startup_32 in | 8 | /*G:020 |
9 | * Our story starts with the kernel booting into startup_32 in | ||
9 | * arch/x86/kernel/head_32.S. It expects a boot header, which is created by | 10 | * arch/x86/kernel/head_32.S. It expects a boot header, which is created by |
10 | * the bootloader (the Launcher in our case). | 11 | * the bootloader (the Launcher in our case). |
11 | * | 12 | * |
@@ -21,11 +22,14 @@ | |||
21 | * data without remembering to subtract __PAGE_OFFSET! | 22 | * data without remembering to subtract __PAGE_OFFSET! |
22 | * | 23 | * |
23 | * The .section line puts this code in .init.text so it will be discarded after | 24 | * The .section line puts this code in .init.text so it will be discarded after |
24 | * boot. */ | 25 | * boot. |
26 | */ | ||
25 | .section .init.text, "ax", @progbits | 27 | .section .init.text, "ax", @progbits |
26 | ENTRY(lguest_entry) | 28 | ENTRY(lguest_entry) |
27 | /* We make the "initialization" hypercall now to tell the Host about | 29 | /* |
28 | * us, and also find out where it put our page tables. */ | 30 | * We make the "initialization" hypercall now to tell the Host about |
31 | * us, and also find out where it put our page tables. | ||
32 | */ | ||
29 | movl $LHCALL_LGUEST_INIT, %eax | 33 | movl $LHCALL_LGUEST_INIT, %eax |
30 | movl $lguest_data - __PAGE_OFFSET, %ebx | 34 | movl $lguest_data - __PAGE_OFFSET, %ebx |
31 | .byte 0x0f,0x01,0xc1 /* KVM_HYPERCALL */ | 35 | .byte 0x0f,0x01,0xc1 /* KVM_HYPERCALL */ |
@@ -33,13 +37,14 @@ ENTRY(lguest_entry) | |||
33 | /* Set up the initial stack so we can run C code. */ | 37 | /* Set up the initial stack so we can run C code. */ |
34 | movl $(init_thread_union+THREAD_SIZE),%esp | 38 | movl $(init_thread_union+THREAD_SIZE),%esp |
35 | 39 | ||
36 | /* Jumps are relative, and we're running __PAGE_OFFSET too low at the | 40 | /* Jumps are relative: we're running __PAGE_OFFSET too low. */ |
37 | * moment. */ | ||
38 | jmp lguest_init+__PAGE_OFFSET | 41 | jmp lguest_init+__PAGE_OFFSET |
39 | 42 | ||
40 | /*G:055 We create a macro which puts the assembler code between lgstart_ and | 43 | /*G:055 |
41 | * lgend_ markers. These templates are put in the .text section: they can't be | 44 | * We create a macro which puts the assembler code between lgstart_ and lgend_ |
42 | * discarded after boot as we may need to patch modules, too. */ | 45 | * markers. These templates are put in the .text section: they can't be |
46 | * discarded after boot as we may need to patch modules, too. | ||
47 | */ | ||
43 | .text | 48 | .text |
44 | #define LGUEST_PATCH(name, insns...) \ | 49 | #define LGUEST_PATCH(name, insns...) \ |
45 | lgstart_##name: insns; lgend_##name:; \ | 50 | lgstart_##name: insns; lgend_##name:; \ |
@@ -48,83 +53,103 @@ ENTRY(lguest_entry) | |||
48 | LGUEST_PATCH(cli, movl $0, lguest_data+LGUEST_DATA_irq_enabled) | 53 | LGUEST_PATCH(cli, movl $0, lguest_data+LGUEST_DATA_irq_enabled) |
49 | LGUEST_PATCH(pushf, movl lguest_data+LGUEST_DATA_irq_enabled, %eax) | 54 | LGUEST_PATCH(pushf, movl lguest_data+LGUEST_DATA_irq_enabled, %eax) |
50 | 55 | ||
51 | /*G:033 But using those wrappers is inefficient (we'll see why that doesn't | 56 | /*G:033 |
52 | * matter for save_fl and irq_disable later). If we write our routines | 57 | * But using those wrappers is inefficient (we'll see why that doesn't matter |
53 | * carefully in assembler, we can avoid clobbering any registers and avoid | 58 | * for save_fl and irq_disable later). If we write our routines carefully in |
54 | * jumping through the wrapper functions. | 59 | * assembler, we can avoid clobbering any registers and avoid jumping through |
60 | * the wrapper functions. | ||
55 | * | 61 | * |
56 | * I skipped over our first piece of assembler, but this one is worth studying | 62 | * I skipped over our first piece of assembler, but this one is worth studying |
57 | * in a bit more detail so I'll describe in easy stages. First, the routine | 63 | * in a bit more detail so I'll describe in easy stages. First, the routine to |
58 | * to enable interrupts: */ | 64 | * enable interrupts: |
65 | */ | ||
59 | ENTRY(lg_irq_enable) | 66 | ENTRY(lg_irq_enable) |
60 | /* The reverse of irq_disable, this sets lguest_data.irq_enabled to | 67 | /* |
61 | * X86_EFLAGS_IF (ie. "Interrupts enabled"). */ | 68 | * The reverse of irq_disable, this sets lguest_data.irq_enabled to |
69 | * X86_EFLAGS_IF (ie. "Interrupts enabled"). | ||
70 | */ | ||
62 | movl $X86_EFLAGS_IF, lguest_data+LGUEST_DATA_irq_enabled | 71 | movl $X86_EFLAGS_IF, lguest_data+LGUEST_DATA_irq_enabled |
63 | /* But now we need to check if the Host wants to know: there might have | 72 | /* |
73 | * But now we need to check if the Host wants to know: there might have | ||
64 | * been interrupts waiting to be delivered, in which case it will have | 74 | * been interrupts waiting to be delivered, in which case it will have |
65 | * set lguest_data.irq_pending to X86_EFLAGS_IF. If it's not zero, we | 75 | * set lguest_data.irq_pending to X86_EFLAGS_IF. If it's not zero, we |
66 | * jump to send_interrupts, otherwise we're done. */ | 76 | * jump to send_interrupts, otherwise we're done. |
77 | */ | ||
67 | testl $0, lguest_data+LGUEST_DATA_irq_pending | 78 | testl $0, lguest_data+LGUEST_DATA_irq_pending |
68 | jnz send_interrupts | 79 | jnz send_interrupts |
69 | /* One cool thing about x86 is that you can do many things without using | 80 | /* |
81 | * One cool thing about x86 is that you can do many things without using | ||
70 | * a register. In this case, the normal path hasn't needed to save or | 82 | * a register. In this case, the normal path hasn't needed to save or |
71 | * restore any registers at all! */ | 83 | * restore any registers at all! |
84 | */ | ||
72 | ret | 85 | ret |
73 | send_interrupts: | 86 | send_interrupts: |
74 | /* OK, now we need a register: eax is used for the hypercall number, | 87 | /* |
88 | * OK, now we need a register: eax is used for the hypercall number, | ||
75 | * which is LHCALL_SEND_INTERRUPTS. | 89 | * which is LHCALL_SEND_INTERRUPTS. |
76 | * | 90 | * |
77 | * We used not to bother with this pending detection at all, which was | 91 | * We used not to bother with this pending detection at all, which was |
78 | * much simpler. Sooner or later the Host would realize it had to | 92 | * much simpler. Sooner or later the Host would realize it had to |
79 | * send us an interrupt. But that turns out to make performance 7 | 93 | * send us an interrupt. But that turns out to make performance 7 |
80 | * times worse on a simple tcp benchmark. So now we do this the hard | 94 | * times worse on a simple tcp benchmark. So now we do this the hard |
81 | * way. */ | 95 | * way. |
96 | */ | ||
82 | pushl %eax | 97 | pushl %eax |
83 | movl $LHCALL_SEND_INTERRUPTS, %eax | 98 | movl $LHCALL_SEND_INTERRUPTS, %eax |
84 | /* This is a vmcall instruction (same thing that KVM uses). Older | 99 | /* |
100 | * This is a vmcall instruction (same thing that KVM uses). Older | ||
85 | * assembler versions might not know the "vmcall" instruction, so we | 101 | * assembler versions might not know the "vmcall" instruction, so we |
86 | * create one manually here. */ | 102 | * create one manually here. |
103 | */ | ||
87 | .byte 0x0f,0x01,0xc1 /* KVM_HYPERCALL */ | 104 | .byte 0x0f,0x01,0xc1 /* KVM_HYPERCALL */ |
105 | /* Put eax back the way we found it. */ | ||
88 | popl %eax | 106 | popl %eax |
89 | ret | 107 | ret |
90 | 108 | ||
91 | /* Finally, the "popf" or "restore flags" routine. The %eax register holds the | 109 | /* |
110 | * Finally, the "popf" or "restore flags" routine. The %eax register holds the | ||
92 | * flags (in practice, either X86_EFLAGS_IF or 0): if it's X86_EFLAGS_IF we're | 111 | * flags (in practice, either X86_EFLAGS_IF or 0): if it's X86_EFLAGS_IF we're |
93 | * enabling interrupts again, if it's 0 we're leaving them off. */ | 112 | * enabling interrupts again, if it's 0 we're leaving them off. |
113 | */ | ||
94 | ENTRY(lg_restore_fl) | 114 | ENTRY(lg_restore_fl) |
95 | /* This is just "lguest_data.irq_enabled = flags;" */ | 115 | /* This is just "lguest_data.irq_enabled = flags;" */ |
96 | movl %eax, lguest_data+LGUEST_DATA_irq_enabled | 116 | movl %eax, lguest_data+LGUEST_DATA_irq_enabled |
97 | /* Now, if the %eax value has enabled interrupts and | 117 | /* |
118 | * Now, if the %eax value has enabled interrupts and | ||
98 | * lguest_data.irq_pending is set, we want to tell the Host so it can | 119 | * lguest_data.irq_pending is set, we want to tell the Host so it can |
99 | * deliver any outstanding interrupts. Fortunately, both values will | 120 | * deliver any outstanding interrupts. Fortunately, both values will |
100 | * be X86_EFLAGS_IF (ie. 512) in that case, and the "testl" | 121 | * be X86_EFLAGS_IF (ie. 512) in that case, and the "testl" |
101 | * instruction will AND them together for us. If both are set, we | 122 | * instruction will AND them together for us. If both are set, we |
102 | * jump to send_interrupts. */ | 123 | * jump to send_interrupts. |
124 | */ | ||
103 | testl lguest_data+LGUEST_DATA_irq_pending, %eax | 125 | testl lguest_data+LGUEST_DATA_irq_pending, %eax |
104 | jnz send_interrupts | 126 | jnz send_interrupts |
105 | /* Again, the normal path has used no extra registers. Clever, huh? */ | 127 | /* Again, the normal path has used no extra registers. Clever, huh? */ |
106 | ret | 128 | ret |
129 | /*:*/ | ||
107 | 130 | ||
108 | /* These demark the EIP range where host should never deliver interrupts. */ | 131 | /* These demark the EIP range where host should never deliver interrupts. */ |
109 | .global lguest_noirq_start | 132 | .global lguest_noirq_start |
110 | .global lguest_noirq_end | 133 | .global lguest_noirq_end |
111 | 134 | ||
112 | /*M:004 When the Host reflects a trap or injects an interrupt into the Guest, | 135 | /*M:004 |
113 | * it sets the eflags interrupt bit on the stack based on | 136 | * When the Host reflects a trap or injects an interrupt into the Guest, it |
114 | * lguest_data.irq_enabled, so the Guest iret logic does the right thing when | 137 | * sets the eflags interrupt bit on the stack based on lguest_data.irq_enabled, |
115 | * restoring it. However, when the Host sets the Guest up for direct traps, | 138 | * so the Guest iret logic does the right thing when restoring it. However, |
116 | * such as system calls, the processor is the one to push eflags onto the | 139 | * when the Host sets the Guest up for direct traps, such as system calls, the |
117 | * stack, and the interrupt bit will be 1 (in reality, interrupts are always | 140 | * processor is the one to push eflags onto the stack, and the interrupt bit |
118 | * enabled in the Guest). | 141 | * will be 1 (in reality, interrupts are always enabled in the Guest). |
119 | * | 142 | * |
120 | * This turns out to be harmless: the only trap which should happen under Linux | 143 | * This turns out to be harmless: the only trap which should happen under Linux |
121 | * with interrupts disabled is Page Fault (due to our lazy mapping of vmalloc | 144 | * with interrupts disabled is Page Fault (due to our lazy mapping of vmalloc |
122 | * regions), which has to be reflected through the Host anyway. If another | 145 | * regions), which has to be reflected through the Host anyway. If another |
123 | * trap *does* go off when interrupts are disabled, the Guest will panic, and | 146 | * trap *does* go off when interrupts are disabled, the Guest will panic, and |
124 | * we'll never get to this iret! :*/ | 147 | * we'll never get to this iret! |
148 | :*/ | ||
125 | 149 | ||
126 | /*G:045 There is one final paravirt_op that the Guest implements, and glancing | 150 | /*G:045 |
127 | * at it you can see why I left it to last. It's *cool*! It's in *assembler*! | 151 | * There is one final paravirt_op that the Guest implements, and glancing at it |
152 | * you can see why I left it to last. It's *cool*! It's in *assembler*! | ||
128 | * | 153 | * |
129 | * The "iret" instruction is used to return from an interrupt or trap. The | 154 | * The "iret" instruction is used to return from an interrupt or trap. The |
130 | * stack looks like this: | 155 | * stack looks like this: |
@@ -148,15 +173,18 @@ ENTRY(lg_restore_fl) | |||
148 | * return to userspace or wherever. Our solution to this is to surround the | 173 | * return to userspace or wherever. Our solution to this is to surround the |
149 | * code with lguest_noirq_start: and lguest_noirq_end: labels. We tell the | 174 | * code with lguest_noirq_start: and lguest_noirq_end: labels. We tell the |
150 | * Host that it is *never* to interrupt us there, even if interrupts seem to be | 175 | * Host that it is *never* to interrupt us there, even if interrupts seem to be |
151 | * enabled. */ | 176 | * enabled. |
177 | */ | ||
152 | ENTRY(lguest_iret) | 178 | ENTRY(lguest_iret) |
153 | pushl %eax | 179 | pushl %eax |
154 | movl 12(%esp), %eax | 180 | movl 12(%esp), %eax |
155 | lguest_noirq_start: | 181 | lguest_noirq_start: |
156 | /* Note the %ss: segment prefix here. Normal data accesses use the | 182 | /* |
183 | * Note the %ss: segment prefix here. Normal data accesses use the | ||
157 | * "ds" segment, but that will have already been restored for whatever | 184 | * "ds" segment, but that will have already been restored for whatever |
158 | * we're returning to (such as userspace): we can't trust it. The %ss: | 185 | * we're returning to (such as userspace): we can't trust it. The %ss: |
159 | * prefix makes sure we use the stack segment, which is still valid. */ | 186 | * prefix makes sure we use the stack segment, which is still valid. |
187 | */ | ||
160 | movl %eax,%ss:lguest_data+LGUEST_DATA_irq_enabled | 188 | movl %eax,%ss:lguest_data+LGUEST_DATA_irq_enabled |
161 | popl %eax | 189 | popl %eax |
162 | iret | 190 | iret |
diff --git a/arch/x86/lib/msr.c b/arch/x86/lib/msr.c index 1440b9c0547e..caa24aca8115 100644 --- a/arch/x86/lib/msr.c +++ b/arch/x86/lib/msr.c | |||
@@ -89,16 +89,13 @@ void rdmsr_on_cpus(const cpumask_t *mask, u32 msr_no, struct msr *msrs) | |||
89 | rv.msrs = msrs; | 89 | rv.msrs = msrs; |
90 | rv.msr_no = msr_no; | 90 | rv.msr_no = msr_no; |
91 | 91 | ||
92 | preempt_disable(); | 92 | this_cpu = get_cpu(); |
93 | /* | 93 | |
94 | * FIXME: handle the CPU we're executing on separately for now until | 94 | if (cpumask_test_cpu(this_cpu, mask)) |
95 | * smp_call_function_many has been fixed to not skip it. | 95 | __rdmsr_on_cpu(&rv); |
96 | */ | ||
97 | this_cpu = raw_smp_processor_id(); | ||
98 | smp_call_function_single(this_cpu, __rdmsr_on_cpu, &rv, 1); | ||
99 | 96 | ||
100 | smp_call_function_many(mask, __rdmsr_on_cpu, &rv, 1); | 97 | smp_call_function_many(mask, __rdmsr_on_cpu, &rv, 1); |
101 | preempt_enable(); | 98 | put_cpu(); |
102 | } | 99 | } |
103 | EXPORT_SYMBOL(rdmsr_on_cpus); | 100 | EXPORT_SYMBOL(rdmsr_on_cpus); |
104 | 101 | ||
@@ -121,16 +118,13 @@ void wrmsr_on_cpus(const cpumask_t *mask, u32 msr_no, struct msr *msrs) | |||
121 | rv.msrs = msrs; | 118 | rv.msrs = msrs; |
122 | rv.msr_no = msr_no; | 119 | rv.msr_no = msr_no; |
123 | 120 | ||
124 | preempt_disable(); | 121 | this_cpu = get_cpu(); |
125 | /* | 122 | |
126 | * FIXME: handle the CPU we're executing on separately for now until | 123 | if (cpumask_test_cpu(this_cpu, mask)) |
127 | * smp_call_function_many has been fixed to not skip it. | 124 | __wrmsr_on_cpu(&rv); |
128 | */ | ||
129 | this_cpu = raw_smp_processor_id(); | ||
130 | smp_call_function_single(this_cpu, __wrmsr_on_cpu, &rv, 1); | ||
131 | 125 | ||
132 | smp_call_function_many(mask, __wrmsr_on_cpu, &rv, 1); | 126 | smp_call_function_many(mask, __wrmsr_on_cpu, &rv, 1); |
133 | preempt_enable(); | 127 | put_cpu(); |
134 | } | 128 | } |
135 | EXPORT_SYMBOL(wrmsr_on_cpus); | 129 | EXPORT_SYMBOL(wrmsr_on_cpus); |
136 | 130 | ||
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index 58f621e81919..2112ed55e7ea 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c | |||
@@ -103,6 +103,7 @@ EXPORT_SYMBOL(kmap); | |||
103 | EXPORT_SYMBOL(kunmap); | 103 | EXPORT_SYMBOL(kunmap); |
104 | EXPORT_SYMBOL(kmap_atomic); | 104 | EXPORT_SYMBOL(kmap_atomic); |
105 | EXPORT_SYMBOL(kunmap_atomic); | 105 | EXPORT_SYMBOL(kunmap_atomic); |
106 | EXPORT_SYMBOL(kmap_atomic_prot); | ||
106 | 107 | ||
107 | void __init set_highmem_pages_init(void) | 108 | void __init set_highmem_pages_init(void) |
108 | { | 109 | { |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 6176fe8f29e0..ea56b8cbb6a6 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -796,7 +796,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, | |||
796 | return ret; | 796 | return ret; |
797 | 797 | ||
798 | #else | 798 | #else |
799 | reserve_bootmem(phys, len, BOOTMEM_DEFAULT); | 799 | reserve_bootmem(phys, len, flags); |
800 | #endif | 800 | #endif |
801 | 801 | ||
802 | if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) { | 802 | if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) { |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 1b734d7a8966..7e600c1962db 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
@@ -591,9 +591,12 @@ static int __change_page_attr(struct cpa_data *cpa, int primary) | |||
591 | unsigned int level; | 591 | unsigned int level; |
592 | pte_t *kpte, old_pte; | 592 | pte_t *kpte, old_pte; |
593 | 593 | ||
594 | if (cpa->flags & CPA_PAGES_ARRAY) | 594 | if (cpa->flags & CPA_PAGES_ARRAY) { |
595 | address = (unsigned long)page_address(cpa->pages[cpa->curpage]); | 595 | struct page *page = cpa->pages[cpa->curpage]; |
596 | else if (cpa->flags & CPA_ARRAY) | 596 | if (unlikely(PageHighMem(page))) |
597 | return 0; | ||
598 | address = (unsigned long)page_address(page); | ||
599 | } else if (cpa->flags & CPA_ARRAY) | ||
597 | address = cpa->vaddr[cpa->curpage]; | 600 | address = cpa->vaddr[cpa->curpage]; |
598 | else | 601 | else |
599 | address = *cpa->vaddr; | 602 | address = *cpa->vaddr; |
@@ -697,9 +700,12 @@ static int cpa_process_alias(struct cpa_data *cpa) | |||
697 | * No need to redo, when the primary call touched the direct | 700 | * No need to redo, when the primary call touched the direct |
698 | * mapping already: | 701 | * mapping already: |
699 | */ | 702 | */ |
700 | if (cpa->flags & CPA_PAGES_ARRAY) | 703 | if (cpa->flags & CPA_PAGES_ARRAY) { |
701 | vaddr = (unsigned long)page_address(cpa->pages[cpa->curpage]); | 704 | struct page *page = cpa->pages[cpa->curpage]; |
702 | else if (cpa->flags & CPA_ARRAY) | 705 | if (unlikely(PageHighMem(page))) |
706 | return 0; | ||
707 | vaddr = (unsigned long)page_address(page); | ||
708 | } else if (cpa->flags & CPA_ARRAY) | ||
703 | vaddr = cpa->vaddr[cpa->curpage]; | 709 | vaddr = cpa->vaddr[cpa->curpage]; |
704 | else | 710 | else |
705 | vaddr = *cpa->vaddr; | 711 | vaddr = *cpa->vaddr; |
@@ -997,12 +1003,15 @@ EXPORT_SYMBOL(set_memory_array_uc); | |||
997 | int _set_memory_wc(unsigned long addr, int numpages) | 1003 | int _set_memory_wc(unsigned long addr, int numpages) |
998 | { | 1004 | { |
999 | int ret; | 1005 | int ret; |
1006 | unsigned long addr_copy = addr; | ||
1007 | |||
1000 | ret = change_page_attr_set(&addr, numpages, | 1008 | ret = change_page_attr_set(&addr, numpages, |
1001 | __pgprot(_PAGE_CACHE_UC_MINUS), 0); | 1009 | __pgprot(_PAGE_CACHE_UC_MINUS), 0); |
1002 | |||
1003 | if (!ret) { | 1010 | if (!ret) { |
1004 | ret = change_page_attr_set(&addr, numpages, | 1011 | ret = change_page_attr_set_clr(&addr_copy, numpages, |
1005 | __pgprot(_PAGE_CACHE_WC), 0); | 1012 | __pgprot(_PAGE_CACHE_WC), |
1013 | __pgprot(_PAGE_CACHE_MASK), | ||
1014 | 0, 0, NULL); | ||
1006 | } | 1015 | } |
1007 | return ret; | 1016 | return ret; |
1008 | } | 1017 | } |
@@ -1119,7 +1128,9 @@ int set_pages_array_uc(struct page **pages, int addrinarray) | |||
1119 | int free_idx; | 1128 | int free_idx; |
1120 | 1129 | ||
1121 | for (i = 0; i < addrinarray; i++) { | 1130 | for (i = 0; i < addrinarray; i++) { |
1122 | start = (unsigned long)page_address(pages[i]); | 1131 | if (PageHighMem(pages[i])) |
1132 | continue; | ||
1133 | start = page_to_pfn(pages[i]) << PAGE_SHIFT; | ||
1123 | end = start + PAGE_SIZE; | 1134 | end = start + PAGE_SIZE; |
1124 | if (reserve_memtype(start, end, _PAGE_CACHE_UC_MINUS, NULL)) | 1135 | if (reserve_memtype(start, end, _PAGE_CACHE_UC_MINUS, NULL)) |
1125 | goto err_out; | 1136 | goto err_out; |
@@ -1132,7 +1143,9 @@ int set_pages_array_uc(struct page **pages, int addrinarray) | |||
1132 | err_out: | 1143 | err_out: |
1133 | free_idx = i; | 1144 | free_idx = i; |
1134 | for (i = 0; i < free_idx; i++) { | 1145 | for (i = 0; i < free_idx; i++) { |
1135 | start = (unsigned long)page_address(pages[i]); | 1146 | if (PageHighMem(pages[i])) |
1147 | continue; | ||
1148 | start = page_to_pfn(pages[i]) << PAGE_SHIFT; | ||
1136 | end = start + PAGE_SIZE; | 1149 | end = start + PAGE_SIZE; |
1137 | free_memtype(start, end); | 1150 | free_memtype(start, end); |
1138 | } | 1151 | } |
@@ -1161,7 +1174,9 @@ int set_pages_array_wb(struct page **pages, int addrinarray) | |||
1161 | return retval; | 1174 | return retval; |
1162 | 1175 | ||
1163 | for (i = 0; i < addrinarray; i++) { | 1176 | for (i = 0; i < addrinarray; i++) { |
1164 | start = (unsigned long)page_address(pages[i]); | 1177 | if (PageHighMem(pages[i])) |
1178 | continue; | ||
1179 | start = page_to_pfn(pages[i]) << PAGE_SHIFT; | ||
1165 | end = start + PAGE_SIZE; | 1180 | end = start + PAGE_SIZE; |
1166 | free_memtype(start, end); | 1181 | free_memtype(start, end); |
1167 | } | 1182 | } |
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index e6718bb28065..352aa9e927e2 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
@@ -623,7 +623,8 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, | |||
623 | return ret; | 623 | return ret; |
624 | 624 | ||
625 | if (flags != want_flags) { | 625 | if (flags != want_flags) { |
626 | if (strict_prot || !is_new_memtype_allowed(want_flags, flags)) { | 626 | if (strict_prot || |
627 | !is_new_memtype_allowed(paddr, size, want_flags, flags)) { | ||
627 | free_memtype(paddr, paddr + size); | 628 | free_memtype(paddr, paddr + size); |
628 | printk(KERN_ERR "%s:%d map pfn expected mapping type %s" | 629 | printk(KERN_ERR "%s:%d map pfn expected mapping type %s" |
629 | " for %Lx-%Lx, got %s\n", | 630 | " for %Lx-%Lx, got %s\n", |
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 8e43bdd45456..ed34f5e35999 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c | |||
@@ -25,7 +25,7 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) | |||
25 | return pte; | 25 | return pte; |
26 | } | 26 | } |
27 | 27 | ||
28 | void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte) | 28 | void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte) |
29 | { | 29 | { |
30 | pgtable_page_dtor(pte); | 30 | pgtable_page_dtor(pte); |
31 | paravirt_release_pte(page_to_pfn(pte)); | 31 | paravirt_release_pte(page_to_pfn(pte)); |
@@ -33,14 +33,14 @@ void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte) | |||
33 | } | 33 | } |
34 | 34 | ||
35 | #if PAGETABLE_LEVELS > 2 | 35 | #if PAGETABLE_LEVELS > 2 |
36 | void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) | 36 | void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) |
37 | { | 37 | { |
38 | paravirt_release_pmd(__pa(pmd) >> PAGE_SHIFT); | 38 | paravirt_release_pmd(__pa(pmd) >> PAGE_SHIFT); |
39 | tlb_remove_page(tlb, virt_to_page(pmd)); | 39 | tlb_remove_page(tlb, virt_to_page(pmd)); |
40 | } | 40 | } |
41 | 41 | ||
42 | #if PAGETABLE_LEVELS > 3 | 42 | #if PAGETABLE_LEVELS > 3 |
43 | void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) | 43 | void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) |
44 | { | 44 | { |
45 | paravirt_release_pud(__pa(pud) >> PAGE_SHIFT); | 45 | paravirt_release_pud(__pa(pud) >> PAGE_SHIFT); |
46 | tlb_remove_page(tlb, virt_to_page(pud)); | 46 | tlb_remove_page(tlb, virt_to_page(pud)); |
@@ -329,7 +329,6 @@ void __init reserve_top_address(unsigned long reserve) | |||
329 | printk(KERN_INFO "Reserving virtual address space above 0x%08x\n", | 329 | printk(KERN_INFO "Reserving virtual address space above 0x%08x\n", |
330 | (int)-reserve); | 330 | (int)-reserve); |
331 | __FIXADDR_TOP = -reserve - PAGE_SIZE; | 331 | __FIXADDR_TOP = -reserve - PAGE_SIZE; |
332 | __VMALLOC_RESERVE += reserve; | ||
333 | #endif | 332 | #endif |
334 | } | 333 | } |
335 | 334 | ||
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 2dfcbf9df2ae..dbb5381f7b3b 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
@@ -79,8 +79,10 @@ static __init void bad_srat(void) | |||
79 | acpi_numa = -1; | 79 | acpi_numa = -1; |
80 | for (i = 0; i < MAX_LOCAL_APIC; i++) | 80 | for (i = 0; i < MAX_LOCAL_APIC; i++) |
81 | apicid_to_node[i] = NUMA_NO_NODE; | 81 | apicid_to_node[i] = NUMA_NO_NODE; |
82 | for (i = 0; i < MAX_NUMNODES; i++) | 82 | for (i = 0; i < MAX_NUMNODES; i++) { |
83 | nodes_add[i].start = nodes[i].end = 0; | 83 | nodes[i].start = nodes[i].end = 0; |
84 | nodes_add[i].start = nodes_add[i].end = 0; | ||
85 | } | ||
84 | remove_all_active_ranges(); | 86 | remove_all_active_ranges(); |
85 | } | 87 | } |
86 | 88 | ||
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 821e97017e95..c814e144a3f0 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c | |||
@@ -183,18 +183,17 @@ static void flush_tlb_others_ipi(const struct cpumask *cpumask, | |||
183 | 183 | ||
184 | f->flush_mm = mm; | 184 | f->flush_mm = mm; |
185 | f->flush_va = va; | 185 | f->flush_va = va; |
186 | cpumask_andnot(to_cpumask(f->flush_cpumask), | 186 | if (cpumask_andnot(to_cpumask(f->flush_cpumask), cpumask, cpumask_of(smp_processor_id()))) { |
187 | cpumask, cpumask_of(smp_processor_id())); | 187 | /* |
188 | 188 | * We have to send the IPI only to | |
189 | /* | 189 | * CPUs affected. |
190 | * We have to send the IPI only to | 190 | */ |
191 | * CPUs affected. | 191 | apic->send_IPI_mask(to_cpumask(f->flush_cpumask), |
192 | */ | 192 | INVALIDATE_TLB_VECTOR_START + sender); |
193 | apic->send_IPI_mask(to_cpumask(f->flush_cpumask), | ||
194 | INVALIDATE_TLB_VECTOR_START + sender); | ||
195 | 193 | ||
196 | while (!cpumask_empty(to_cpumask(f->flush_cpumask))) | 194 | while (!cpumask_empty(to_cpumask(f->flush_cpumask))) |
197 | cpu_relax(); | 195 | cpu_relax(); |
196 | } | ||
198 | 197 | ||
199 | f->flush_mm = NULL; | 198 | f->flush_mm = NULL; |
200 | f->flush_va = 0; | 199 | f->flush_va = 0; |
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 172438f86a02..7410640db173 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile | |||
@@ -5,6 +5,10 @@ CFLAGS_REMOVE_time.o = -pg | |||
5 | CFLAGS_REMOVE_irq.o = -pg | 5 | CFLAGS_REMOVE_irq.o = -pg |
6 | endif | 6 | endif |
7 | 7 | ||
8 | # Make sure early boot has no stackprotector | ||
9 | nostackp := $(call cc-option, -fno-stack-protector) | ||
10 | CFLAGS_enlighten.o := $(nostackp) | ||
11 | |||
8 | obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ | 12 | obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ |
9 | time.o xen-asm.o xen-asm_$(BITS).o \ | 13 | time.o xen-asm.o xen-asm_$(BITS).o \ |
10 | grant-table.o suspend.o | 14 | grant-table.o suspend.o |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 0a1700a2be9c..e90540a46a0b 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -974,10 +974,6 @@ asmlinkage void __init xen_start_kernel(void) | |||
974 | 974 | ||
975 | xen_domain_type = XEN_PV_DOMAIN; | 975 | xen_domain_type = XEN_PV_DOMAIN; |
976 | 976 | ||
977 | BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0); | ||
978 | |||
979 | xen_setup_features(); | ||
980 | |||
981 | /* Install Xen paravirt ops */ | 977 | /* Install Xen paravirt ops */ |
982 | pv_info = xen_info; | 978 | pv_info = xen_info; |
983 | pv_init_ops = xen_init_ops; | 979 | pv_init_ops = xen_init_ops; |
@@ -986,8 +982,15 @@ asmlinkage void __init xen_start_kernel(void) | |||
986 | pv_apic_ops = xen_apic_ops; | 982 | pv_apic_ops = xen_apic_ops; |
987 | pv_mmu_ops = xen_mmu_ops; | 983 | pv_mmu_ops = xen_mmu_ops; |
988 | 984 | ||
989 | xen_init_irq_ops(); | 985 | #ifdef CONFIG_X86_64 |
986 | /* | ||
987 | * Setup percpu state. We only need to do this for 64-bit | ||
988 | * because 32-bit already has %fs set properly. | ||
989 | */ | ||
990 | load_percpu_segment(0); | ||
991 | #endif | ||
990 | 992 | ||
993 | xen_init_irq_ops(); | ||
991 | xen_init_cpuid_mask(); | 994 | xen_init_cpuid_mask(); |
992 | 995 | ||
993 | #ifdef CONFIG_X86_LOCAL_APIC | 996 | #ifdef CONFIG_X86_LOCAL_APIC |
@@ -997,6 +1000,8 @@ asmlinkage void __init xen_start_kernel(void) | |||
997 | set_xen_basic_apic_ops(); | 1000 | set_xen_basic_apic_ops(); |
998 | #endif | 1001 | #endif |
999 | 1002 | ||
1003 | xen_setup_features(); | ||
1004 | |||
1000 | if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) { | 1005 | if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) { |
1001 | pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start; | 1006 | pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start; |
1002 | pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit; | 1007 | pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit; |
@@ -1004,13 +1009,6 @@ asmlinkage void __init xen_start_kernel(void) | |||
1004 | 1009 | ||
1005 | machine_ops = xen_machine_ops; | 1010 | machine_ops = xen_machine_ops; |
1006 | 1011 | ||
1007 | #ifdef CONFIG_X86_64 | ||
1008 | /* | ||
1009 | * Setup percpu state. We only need to do this for 64-bit | ||
1010 | * because 32-bit already has %fs set properly. | ||
1011 | */ | ||
1012 | load_percpu_segment(0); | ||
1013 | #endif | ||
1014 | /* | 1012 | /* |
1015 | * The only reliable way to retain the initial address of the | 1013 | * The only reliable way to retain the initial address of the |
1016 | * percpu gdt_page is to remember it here, so we can go and | 1014 | * percpu gdt_page is to remember it here, so we can go and |
diff --git a/arch/xtensa/include/asm/tlb.h b/arch/xtensa/include/asm/tlb.h index 31c220faca02..0d766f9c1083 100644 --- a/arch/xtensa/include/asm/tlb.h +++ b/arch/xtensa/include/asm/tlb.h | |||
@@ -42,6 +42,6 @@ | |||
42 | 42 | ||
43 | #include <asm-generic/tlb.h> | 43 | #include <asm-generic/tlb.h> |
44 | 44 | ||
45 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) | 45 | #define __pte_free_tlb(tlb, pte, address) pte_free((tlb)->mm, pte) |
46 | 46 | ||
47 | #endif /* _XTENSA_TLB_H */ | 47 | #endif /* _XTENSA_TLB_H */ |