diff options
335 files changed, 8167 insertions, 4896 deletions
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt index e65736c6b8bc..63e59b8847c5 100644 --- a/Documentation/cciss.txt +++ b/Documentation/cciss.txt | |||
| @@ -21,6 +21,11 @@ This driver is known to work with the following cards: | |||
| 21 | * SA E200 | 21 | * SA E200 |
| 22 | * SA E200i | 22 | * SA E200i |
| 23 | * SA E500 | 23 | * SA E500 |
| 24 | * SA P212 | ||
| 25 | * SA P410 | ||
| 26 | * SA P410i | ||
| 27 | * SA P411 | ||
| 28 | * SA P812 | ||
| 24 | 29 | ||
| 25 | Detecting drive failures: | 30 | Detecting drive failures: |
| 26 | ------------------------- | 31 | ------------------------- |
diff --git a/Documentation/filesystems/sysfs-pci.txt b/Documentation/filesystems/sysfs-pci.txt index 5daa2aaec2c5..68ef48839c04 100644 --- a/Documentation/filesystems/sysfs-pci.txt +++ b/Documentation/filesystems/sysfs-pci.txt | |||
| @@ -36,6 +36,7 @@ files, each with their own function. | |||
| 36 | local_cpus nearby CPU mask (cpumask, ro) | 36 | local_cpus nearby CPU mask (cpumask, ro) |
| 37 | resource PCI resource host addresses (ascii, ro) | 37 | resource PCI resource host addresses (ascii, ro) |
| 38 | resource0..N PCI resource N, if present (binary, mmap) | 38 | resource0..N PCI resource N, if present (binary, mmap) |
| 39 | resource0_wc..N_wc PCI WC map resource N, if prefetchable (binary, mmap) | ||
| 39 | rom PCI ROM resource, if present (binary, ro) | 40 | rom PCI ROM resource, if present (binary, ro) |
| 40 | subsystem_device PCI subsystem device (ascii, ro) | 41 | subsystem_device PCI subsystem device (ascii, ro) |
| 41 | subsystem_vendor PCI subsystem vendor (ascii, ro) | 42 | subsystem_vendor PCI subsystem vendor (ascii, ro) |
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index bf3256e04027..51a8021ee532 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt | |||
| @@ -305,7 +305,7 @@ should not be manipulated by any other user. | |||
| 305 | 305 | ||
| 306 | A kset keeps its children in a standard kernel linked list. Kobjects point | 306 | A kset keeps its children in a standard kernel linked list. Kobjects point |
| 307 | back to their containing kset via their kset field. In almost all cases, | 307 | back to their containing kset via their kset field. In almost all cases, |
| 308 | the kobjects belonging to a ket have that kset (or, strictly, its embedded | 308 | the kobjects belonging to a kset have that kset (or, strictly, its embedded |
| 309 | kobject) in their parent. | 309 | kobject) in their parent. |
| 310 | 310 | ||
| 311 | As a kset contains a kobject within it, it should always be dynamically | 311 | As a kset contains a kobject within it, it should always be dynamically |
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index 01c6c3d8a7e3..64b3f146e4b0 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt | |||
| @@ -503,7 +503,7 @@ generate input device EV_KEY events. | |||
| 503 | In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW | 503 | In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW |
| 504 | events for switches: | 504 | events for switches: |
| 505 | 505 | ||
| 506 | SW_RADIO T60 and later hardare rfkill rocker switch | 506 | SW_RFKILL_ALL T60 and later hardare rfkill rocker switch |
| 507 | SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A | 507 | SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A |
| 508 | 508 | ||
| 509 | Non hot-key ACPI HKEY event map: | 509 | Non hot-key ACPI HKEY event map: |
diff --git a/MAINTAINERS b/MAINTAINERS index e3560df4608e..cd587eec9fa7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -228,21 +228,21 @@ ACPI BATTERY DRIVERS | |||
| 228 | P: Alexey Starikovskiy | 228 | P: Alexey Starikovskiy |
| 229 | M: astarikovskiy@suse.de | 229 | M: astarikovskiy@suse.de |
| 230 | L: linux-acpi@vger.kernel.org | 230 | L: linux-acpi@vger.kernel.org |
| 231 | W: http://acpi.sourceforge.net/ | 231 | W: http://www.lesswatts.org/projects/acpi/ |
| 232 | S: Supported | 232 | S: Supported |
| 233 | 233 | ||
| 234 | ACPI EC DRIVER | 234 | ACPI EC DRIVER |
| 235 | P: Alexey Starikovskiy | 235 | P: Alexey Starikovskiy |
| 236 | M: astarikovskiy@suse.de | 236 | M: astarikovskiy@suse.de |
| 237 | L: linux-acpi@vger.kernel.org | 237 | L: linux-acpi@vger.kernel.org |
| 238 | W: http://acpi.sourceforge.net/ | 238 | W: http://www.lesswatts.org/projects/acpi/ |
| 239 | S: Supported | 239 | S: Supported |
| 240 | 240 | ||
| 241 | ACPI FAN DRIVER | 241 | ACPI FAN DRIVER |
| 242 | P: Len Brown | 242 | P: Len Brown |
| 243 | M: len.brown@intel.com | 243 | M: len.brown@intel.com |
| 244 | L: linux-acpi@vger.kernel.org | 244 | L: linux-acpi@vger.kernel.org |
| 245 | W: http://acpi.sourceforge.net/ | 245 | W: http://www.lesswatts.org/projects/acpi/ |
| 246 | S: Supported | 246 | S: Supported |
| 247 | 247 | ||
| 248 | ACPI PCI HOTPLUG DRIVER | 248 | ACPI PCI HOTPLUG DRIVER |
| @@ -255,14 +255,14 @@ ACPI THERMAL DRIVER | |||
| 255 | P: Len Brown | 255 | P: Len Brown |
| 256 | M: len.brown@intel.com | 256 | M: len.brown@intel.com |
| 257 | L: linux-acpi@vger.kernel.org | 257 | L: linux-acpi@vger.kernel.org |
| 258 | W: http://acpi.sourceforge.net/ | 258 | W: http://www.lesswatts.org/projects/acpi/ |
| 259 | S: Supported | 259 | S: Supported |
| 260 | 260 | ||
| 261 | ACPI VIDEO DRIVER | 261 | ACPI VIDEO DRIVER |
| 262 | P: Rui Zhang | 262 | P: Rui Zhang |
| 263 | M: rui.zhang@intel.com | 263 | M: rui.zhang@intel.com |
| 264 | L: linux-acpi@vger.kernel.org | 264 | L: linux-acpi@vger.kernel.org |
| 265 | W: http://acpi.sourceforge.net/ | 265 | W: http://www.lesswatts.org/projects/acpi/ |
| 266 | S: Supported | 266 | S: Supported |
| 267 | 267 | ||
| 268 | ACPI WMI DRIVER | 268 | ACPI WMI DRIVER |
| @@ -274,7 +274,7 @@ S: Maintained | |||
| 274 | 274 | ||
| 275 | AD1889 ALSA SOUND DRIVER | 275 | AD1889 ALSA SOUND DRIVER |
| 276 | P: Kyle McMartin | 276 | P: Kyle McMartin |
| 277 | M: kyle@parisc-linux.org | 277 | M: kyle@mcmartin.ca |
| 278 | P: Thibaut Varene | 278 | P: Thibaut Varene |
| 279 | M: T-Bone@parisc-linux.org | 279 | M: T-Bone@parisc-linux.org |
| 280 | W: http://wiki.parisc-linux.org/AD1889 | 280 | W: http://wiki.parisc-linux.org/AD1889 |
| @@ -995,8 +995,8 @@ L: netdev@vger.kernel.org | |||
| 995 | S: Supported | 995 | S: Supported |
| 996 | 996 | ||
| 997 | BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER | 997 | BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER |
| 998 | P: Eliezer Tamir | 998 | P: Eilon Greenstein |
| 999 | M: eliezert@broadcom.com | 999 | M: eilong@broadcom.com |
| 1000 | L: netdev@vger.kernel.org | 1000 | L: netdev@vger.kernel.org |
| 1001 | S: Supported | 1001 | S: Supported |
| 1002 | 1002 | ||
| @@ -1202,6 +1202,7 @@ M: pj@sgi.com | |||
| 1202 | M: menage@google.com | 1202 | M: menage@google.com |
| 1203 | L: linux-kernel@vger.kernel.org | 1203 | L: linux-kernel@vger.kernel.org |
| 1204 | W: http://www.bullopensource.org/cpuset/ | 1204 | W: http://www.bullopensource.org/cpuset/ |
| 1205 | W: http://oss.sgi.com/projects/cpusets/ | ||
| 1205 | S: Supported | 1206 | S: Supported |
| 1206 | 1207 | ||
| 1207 | CRAMFS FILESYSTEM | 1208 | CRAMFS FILESYSTEM |
| @@ -1827,7 +1828,7 @@ S: Maintained | |||
| 1827 | 1828 | ||
| 1828 | HARMONY SOUND DRIVER | 1829 | HARMONY SOUND DRIVER |
| 1829 | P: Kyle McMartin | 1830 | P: Kyle McMartin |
| 1830 | M: kyle@parisc-linux.org | 1831 | M: kyle@mcmartin.ca |
| 1831 | L: linux-parisc@vger.kernel.org | 1832 | L: linux-parisc@vger.kernel.org |
| 1832 | S: Maintained | 1833 | S: Maintained |
| 1833 | 1834 | ||
| @@ -3120,7 +3121,7 @@ S: Maintained | |||
| 3120 | 3121 | ||
| 3121 | PARISC ARCHITECTURE | 3122 | PARISC ARCHITECTURE |
| 3122 | P: Kyle McMartin | 3123 | P: Kyle McMartin |
| 3123 | M: kyle@parisc-linux.org | 3124 | M: kyle@mcmartin.ca |
| 3124 | P: Matthew Wilcox | 3125 | P: Matthew Wilcox |
| 3125 | M: matthew@wil.cx | 3126 | M: matthew@wil.cx |
| 3126 | P: Grant Grundler | 3127 | P: Grant Grundler |
| @@ -3329,9 +3330,11 @@ L: video4linux-list@redhat.com | |||
| 3329 | W: http://www.isely.net/pvrusb2/ | 3330 | W: http://www.isely.net/pvrusb2/ |
| 3330 | S: Maintained | 3331 | S: Maintained |
| 3331 | 3332 | ||
| 3332 | PXA2xx SUPPORT | 3333 | PXA2xx/PXA3xx SUPPORT |
| 3333 | P: Nicolas Pitre | 3334 | P: Eric Miao |
| 3334 | M: nico@cam.org | 3335 | M: eric.miao@marvell.com |
| 3336 | P: Russell King | ||
| 3337 | M: linux@arm.linux.org.uk | ||
| 3335 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | 3338 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) |
| 3336 | S: Maintained | 3339 | S: Maintained |
| 3337 | 3340 | ||
| @@ -4023,7 +4026,7 @@ TULIP NETWORK DRIVERS | |||
| 4023 | P: Grant Grundler | 4026 | P: Grant Grundler |
| 4024 | M: grundler@parisc-linux.org | 4027 | M: grundler@parisc-linux.org |
| 4025 | P: Kyle McMartin | 4028 | P: Kyle McMartin |
| 4026 | M: kyle@parisc-linux.org | 4029 | M: kyle@mcmartin.ca |
| 4027 | L: netdev@vger.kernel.org | 4030 | L: netdev@vger.kernel.org |
| 4028 | S: Maintained | 4031 | S: Maintained |
| 4029 | 4032 | ||
| @@ -1,8 +1,8 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 26 | 3 | SUBLEVEL = 26 |
| 4 | EXTRAVERSION = -rc5 | 4 | EXTRAVERSION = -rc6 |
| 5 | NAME = Funky Weasel is Jiggy wit it | 5 | NAME = Rotary Wombat |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| 8 | # To see a list of typical targets execute "make help" | 8 | # To see a list of typical targets execute "make help" |
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c index 00af7f2fed66..0bb31982fb6f 100644 --- a/arch/arm/mach-pxa/ssp.c +++ b/arch/arm/mach-pxa/ssp.c | |||
| @@ -330,7 +330,7 @@ struct ssp_device *ssp_request(int port, const char *label) | |||
| 330 | 330 | ||
| 331 | mutex_unlock(&ssp_lock); | 331 | mutex_unlock(&ssp_lock); |
| 332 | 332 | ||
| 333 | if (ssp->port_id != port) | 333 | if (&ssp->node == &ssp_list) |
| 334 | return NULL; | 334 | return NULL; |
| 335 | 335 | ||
| 336 | return ssp; | 336 | return ssp; |
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 853d1f11be00..43687cc60dfb 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -465,7 +465,6 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | |||
| 465 | printk(KERN_ERR | 465 | printk(KERN_ERR |
| 466 | "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n", | 466 | "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n", |
| 467 | len, slit->header.length); | 467 | len, slit->header.length); |
| 468 | memset(numa_slit, 10, sizeof(numa_slit)); | ||
| 469 | return; | 468 | return; |
| 470 | } | 469 | } |
| 471 | slit_table = slit; | 470 | slit_table = slit; |
| @@ -574,8 +573,14 @@ void __init acpi_numa_arch_fixup(void) | |||
| 574 | printk(KERN_INFO "Number of memory chunks in system = %d\n", | 573 | printk(KERN_INFO "Number of memory chunks in system = %d\n", |
| 575 | num_node_memblks); | 574 | num_node_memblks); |
| 576 | 575 | ||
| 577 | if (!slit_table) | 576 | if (!slit_table) { |
| 577 | for (i = 0; i < MAX_NUMNODES; i++) | ||
| 578 | for (j = 0; j < MAX_NUMNODES; j++) | ||
| 579 | node_distance(i, j) = i == j ? LOCAL_DISTANCE : | ||
| 580 | REMOTE_DISTANCE; | ||
| 578 | return; | 581 | return; |
| 582 | } | ||
| 583 | |||
| 579 | memset(numa_slit, -1, sizeof(numa_slit)); | 584 | memset(numa_slit, -1, sizeof(numa_slit)); |
| 580 | for (i = 0; i < slit_table->locality_count; i++) { | 585 | for (i = 0; i < slit_table->locality_count; i++) { |
| 581 | if (!pxm_bit_test(i)) | 586 | if (!pxm_bit_test(i)) |
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c index 351bf70da463..7f1a858bc69f 100644 --- a/arch/ia64/kvm/mmio.c +++ b/arch/ia64/kvm/mmio.c | |||
| @@ -159,7 +159,8 @@ static void mmio_access(struct kvm_vcpu *vcpu, u64 src_pa, u64 *dest, | |||
| 159 | 159 | ||
| 160 | if (p->u.ioreq.state == STATE_IORESP_READY) { | 160 | if (p->u.ioreq.state == STATE_IORESP_READY) { |
| 161 | if (dir == IOREQ_READ) | 161 | if (dir == IOREQ_READ) |
| 162 | *dest = p->u.ioreq.data; | 162 | /* it's necessary to ensure zero extending */ |
| 163 | *dest = p->u.ioreq.data & (~0UL >> (64-(s*8))); | ||
| 163 | } else | 164 | } else |
| 164 | panic_vm(vcpu); | 165 | panic_vm(vcpu); |
| 165 | out: | 166 | out: |
diff --git a/arch/m68knommu/platform/coldfire/timers.c b/arch/m68knommu/platform/coldfire/timers.c index ba5a9f32ebd4..454f25493491 100644 --- a/arch/m68knommu/platform/coldfire/timers.c +++ b/arch/m68knommu/platform/coldfire/timers.c | |||
| @@ -111,7 +111,13 @@ void hw_timer_init(void) | |||
| 111 | 111 | ||
| 112 | __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); | 112 | __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); |
| 113 | mcftmr_cycles_per_jiffy = FREQ / HZ; | 113 | mcftmr_cycles_per_jiffy = FREQ / HZ; |
| 114 | __raw_writetrr(mcftmr_cycles_per_jiffy, TA(MCFTIMER_TRR)); | 114 | /* |
| 115 | * The coldfire timer runs from 0 to TRR included, then 0 | ||
| 116 | * again and so on. It counts thus actually TRR + 1 steps | ||
| 117 | * for 1 tick, not TRR. So if you want n cycles, | ||
| 118 | * initialize TRR with n - 1. | ||
| 119 | */ | ||
| 120 | __raw_writetrr(mcftmr_cycles_per_jiffy - 1, TA(MCFTIMER_TRR)); | ||
| 115 | __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | | 121 | __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | |
| 116 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); | 122 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); |
| 117 | 123 | ||
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 69648d01acc0..ad36c946ff96 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -538,19 +538,19 @@ cflags-$(CONFIG_SIBYTE_BCM1x80) += -Iinclude/asm-mips/mach-sibyte \ | |||
| 538 | # Sibyte SWARM board | 538 | # Sibyte SWARM board |
| 539 | # Sibyte BCM91x80 (BigSur) board | 539 | # Sibyte BCM91x80 (BigSur) board |
| 540 | # | 540 | # |
| 541 | libs-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/ | 541 | core-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/ |
| 542 | load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000 | 542 | load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000 |
| 543 | libs-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/ | 543 | core-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/ |
| 544 | load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000 | 544 | load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000 |
| 545 | libs-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/ | 545 | core-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/ |
| 546 | load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000 | 546 | load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000 |
| 547 | libs-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/ | 547 | core-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/ |
| 548 | load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000 | 548 | load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000 |
| 549 | libs-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ | 549 | core-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ |
| 550 | load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000 | 550 | load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000 |
| 551 | libs-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/ | 551 | core-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/ |
| 552 | load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000 | 552 | load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000 |
| 553 | libs-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ | 553 | core-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ |
| 554 | load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 | 554 | load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 |
| 555 | 555 | ||
| 556 | # | 556 | # |
| @@ -565,7 +565,11 @@ load-$(CONFIG_BCM47XX) := 0xffffffff80001000 | |||
| 565 | # | 565 | # |
| 566 | core-$(CONFIG_SNI_RM) += arch/mips/sni/ | 566 | core-$(CONFIG_SNI_RM) += arch/mips/sni/ |
| 567 | cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm | 567 | cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm |
| 568 | ifdef CONFIG_CPU_LITTLE_ENDIAN | ||
| 568 | load-$(CONFIG_SNI_RM) += 0xffffffff80600000 | 569 | load-$(CONFIG_SNI_RM) += 0xffffffff80600000 |
| 570 | else | ||
| 571 | load-$(CONFIG_SNI_RM) += 0xffffffff80030000 | ||
| 572 | endif | ||
| 569 | all-$(CONFIG_SNI_RM) := vmlinux.ecoff | 573 | all-$(CONFIG_SNI_RM) := vmlinux.ecoff |
| 570 | 574 | ||
| 571 | # | 575 | # |
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 8cae7753ef79..74d6d4a593be 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
| @@ -165,12 +165,12 @@ static struct resource au1xxx_usb_gdt_resources[] = { | |||
| 165 | static struct resource au1xxx_mmc_resources[] = { | 165 | static struct resource au1xxx_mmc_resources[] = { |
| 166 | [0] = { | 166 | [0] = { |
| 167 | .start = SD0_PHYS_ADDR, | 167 | .start = SD0_PHYS_ADDR, |
| 168 | .end = SD0_PHYS_ADDR + 0x40, | 168 | .end = SD0_PHYS_ADDR + 0x7ffff, |
| 169 | .flags = IORESOURCE_MEM, | 169 | .flags = IORESOURCE_MEM, |
| 170 | }, | 170 | }, |
| 171 | [1] = { | 171 | [1] = { |
| 172 | .start = SD1_PHYS_ADDR, | 172 | .start = SD1_PHYS_ADDR, |
| 173 | .end = SD1_PHYS_ADDR + 0x40, | 173 | .end = SD1_PHYS_ADDR + 0x7ffff, |
| 174 | .flags = IORESOURCE_MEM, | 174 | .flags = IORESOURCE_MEM, |
| 175 | }, | 175 | }, |
| 176 | [2] = { | 176 | [2] = { |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 117470b60e34..4b8799802788 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
| @@ -1,67 +1,58 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.25 |
| 4 | # Tue Feb 20 21:47:40 2007 | 4 | # Sat May 3 00:38:11 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| 8 | # | 8 | # |
| 9 | # Machine selection | 9 | # Machine selection |
| 10 | # | 10 | # |
| 11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_MIPS_MTX1 is not set | ||
| 13 | # CONFIG_MIPS_BOSPORUS is not set | ||
| 14 | # CONFIG_MIPS_PB1000 is not set | ||
| 15 | # CONFIG_MIPS_PB1100 is not set | ||
| 16 | # CONFIG_MIPS_PB1500 is not set | ||
| 17 | # CONFIG_MIPS_PB1550 is not set | ||
| 18 | # CONFIG_MIPS_PB1200 is not set | ||
| 19 | # CONFIG_MIPS_DB1000 is not set | ||
| 20 | # CONFIG_MIPS_DB1100 is not set | ||
| 21 | # CONFIG_MIPS_DB1500 is not set | ||
| 22 | # CONFIG_MIPS_DB1550 is not set | ||
| 23 | # CONFIG_MIPS_DB1200 is not set | ||
| 24 | # CONFIG_MIPS_MIRAGE is not set | ||
| 25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 18 | # CONFIG_LEMOTE_FULONG is not set | ||
| 29 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 30 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| 31 | # CONFIG_MIPS_SEAD is not set | 21 | # CONFIG_MIPS_SEAD is not set |
| 32 | # CONFIG_WR_PPMC is not set | ||
| 33 | # CONFIG_MIPS_SIM is not set | 22 | # CONFIG_MIPS_SIM is not set |
| 34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 23 | # CONFIG_MARKEINS is not set |
| 35 | # CONFIG_MIPS_XXS1500 is not set | 24 | # CONFIG_MACH_VR41XX is not set |
| 36 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
| 37 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
| 38 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
| 39 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 40 | # CONFIG_MARKEINS is not set | ||
| 41 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 42 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 43 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 44 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 45 | CONFIG_SIBYTE_SWARM=y | ||
| 46 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 47 | # CONFIG_SIBYTE_RHONE is not set | ||
| 48 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 49 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 50 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 34 | # CONFIG_SIBYTE_CARMEL is not set | ||
| 51 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
| 36 | # CONFIG_SIBYTE_RHONE is not set | ||
| 37 | CONFIG_SIBYTE_SWARM=y | ||
| 38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 52 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
| 53 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
| 54 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_TOSHIBA_RBTX4927 is not set |
| 55 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_TOSHIBA_RBTX4938 is not set |
| 45 | # CONFIG_WR_PPMC is not set | ||
| 56 | CONFIG_SIBYTE_SB1250=y | 46 | CONFIG_SIBYTE_SB1250=y |
| 57 | CONFIG_SIBYTE_SB1xxx_SOC=y | 47 | CONFIG_SIBYTE_SB1xxx_SOC=y |
| 58 | CONFIG_CPU_SB1_PASS_1=y | 48 | # CONFIG_CPU_SB1_PASS_1 is not set |
| 59 | # CONFIG_CPU_SB1_PASS_2_1250 is not set | 49 | # CONFIG_CPU_SB1_PASS_2_1250 is not set |
| 60 | # CONFIG_CPU_SB1_PASS_2_2 is not set | 50 | CONFIG_CPU_SB1_PASS_2_2=y |
| 61 | # CONFIG_CPU_SB1_PASS_4 is not set | 51 | # CONFIG_CPU_SB1_PASS_4 is not set |
| 62 | # CONFIG_CPU_SB1_PASS_2_112x is not set | 52 | # CONFIG_CPU_SB1_PASS_2_112x is not set |
| 63 | # CONFIG_CPU_SB1_PASS_3 is not set | 53 | # CONFIG_CPU_SB1_PASS_3 is not set |
| 64 | CONFIG_SIBYTE_HAS_LDT=y | 54 | CONFIG_SIBYTE_HAS_LDT=y |
| 55 | CONFIG_SIBYTE_ENABLE_LDT_IF_PCI=y | ||
| 65 | # CONFIG_SIMULATION is not set | 56 | # CONFIG_SIMULATION is not set |
| 66 | # CONFIG_SB1_CEX_ALWAYS_FATAL is not set | 57 | # CONFIG_SB1_CEX_ALWAYS_FATAL is not set |
| 67 | # CONFIG_SB1_CERR_STALL is not set | 58 | # CONFIG_SB1_CERR_STALL is not set |
| @@ -69,20 +60,32 @@ CONFIG_SIBYTE_CFE=y | |||
| 69 | # CONFIG_SIBYTE_CFE_CONSOLE is not set | 60 | # CONFIG_SIBYTE_CFE_CONSOLE is not set |
| 70 | # CONFIG_SIBYTE_BUS_WATCHER is not set | 61 | # CONFIG_SIBYTE_BUS_WATCHER is not set |
| 71 | # CONFIG_SIBYTE_TBPROF is not set | 62 | # CONFIG_SIBYTE_TBPROF is not set |
| 63 | CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y | ||
| 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 64 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 73 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 65 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 74 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 66 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 67 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 75 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 76 | CONFIG_GENERIC_HWEIGHT=y | 69 | CONFIG_GENERIC_HWEIGHT=y |
| 77 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 71 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 78 | CONFIG_GENERIC_TIME=y | 72 | CONFIG_GENERIC_TIME=y |
| 73 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 79 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 74 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 80 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 75 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 76 | CONFIG_CEVT_SB1250=y | ||
| 77 | CONFIG_CSRC_SB1250=y | ||
| 78 | CONFIG_CFE=y | ||
| 81 | CONFIG_DMA_COHERENT=y | 79 | CONFIG_DMA_COHERENT=y |
| 80 | CONFIG_EARLY_PRINTK=y | ||
| 81 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
| 82 | # CONFIG_HOTPLUG_CPU is not set | ||
| 83 | # CONFIG_NO_IOPORT is not set | ||
| 82 | CONFIG_CPU_BIG_ENDIAN=y | 84 | CONFIG_CPU_BIG_ENDIAN=y |
| 83 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 85 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 84 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 86 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 85 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 87 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 88 | CONFIG_IRQ_CPU=y | ||
| 86 | CONFIG_SWAP_IO_SPACE=y | 89 | CONFIG_SWAP_IO_SPACE=y |
| 87 | CONFIG_BOOT_ELF32=y | 90 | CONFIG_BOOT_ELF32=y |
| 88 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 91 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| @@ -90,6 +93,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 90 | # | 93 | # |
| 91 | # CPU selection | 94 | # CPU selection |
| 92 | # | 95 | # |
| 96 | # CONFIG_CPU_LOONGSON2 is not set | ||
| 93 | # CONFIG_CPU_MIPS32_R1 is not set | 97 | # CONFIG_CPU_MIPS32_R1 is not set |
| 94 | # CONFIG_CPU_MIPS32_R2 is not set | 98 | # CONFIG_CPU_MIPS32_R2 is not set |
| 95 | # CONFIG_CPU_MIPS64_R1 is not set | 99 | # CONFIG_CPU_MIPS64_R1 is not set |
| @@ -130,8 +134,7 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
| 130 | CONFIG_MIPS_MT_DISABLED=y | 134 | CONFIG_MIPS_MT_DISABLED=y |
| 131 | # CONFIG_MIPS_MT_SMP is not set | 135 | # CONFIG_MIPS_MT_SMP is not set |
| 132 | # CONFIG_MIPS_MT_SMTC is not set | 136 | # CONFIG_MIPS_MT_SMTC is not set |
| 133 | # CONFIG_MIPS_VPE_LOADER is not set | 137 | CONFIG_SB1_PASS_2_WORKAROUNDS=y |
| 134 | CONFIG_SB1_PASS_1_WORKAROUNDS=y | ||
| 135 | CONFIG_CPU_HAS_LLSC=y | 138 | CONFIG_CPU_HAS_LLSC=y |
| 136 | CONFIG_CPU_HAS_SYNC=y | 139 | CONFIG_CPU_HAS_SYNC=y |
| 137 | CONFIG_GENERIC_HARDIRQS=y | 140 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -140,6 +143,7 @@ CONFIG_IRQ_PER_CPU=y | |||
| 140 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 143 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 141 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | 144 | CONFIG_SYS_SUPPORTS_HIGHMEM=y |
| 142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 145 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 146 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | 147 | CONFIG_SELECT_MEMORY_MODEL=y |
| 144 | CONFIG_FLATMEM_MANUAL=y | 148 | CONFIG_FLATMEM_MANUAL=y |
| 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 149 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -147,13 +151,19 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 147 | CONFIG_FLATMEM=y | 151 | CONFIG_FLATMEM=y |
| 148 | CONFIG_FLAT_NODE_MEM_MAP=y | 152 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 149 | # CONFIG_SPARSEMEM_STATIC is not set | 153 | # CONFIG_SPARSEMEM_STATIC is not set |
| 154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 151 | CONFIG_RESOURCES_64BIT=y | 156 | CONFIG_RESOURCES_64BIT=y |
| 152 | CONFIG_ZONE_DMA_FLAG=1 | 157 | CONFIG_ZONE_DMA_FLAG=0 |
| 158 | CONFIG_VIRT_TO_BUS=y | ||
| 153 | CONFIG_SMP=y | 159 | CONFIG_SMP=y |
| 154 | CONFIG_SYS_SUPPORTS_SMP=y | 160 | CONFIG_SYS_SUPPORTS_SMP=y |
| 155 | CONFIG_NR_CPUS_DEFAULT_2=y | 161 | CONFIG_NR_CPUS_DEFAULT_2=y |
| 156 | CONFIG_NR_CPUS=2 | 162 | CONFIG_NR_CPUS=2 |
| 163 | CONFIG_TICK_ONESHOT=y | ||
| 164 | # CONFIG_NO_HZ is not set | ||
| 165 | CONFIG_HIGH_RES_TIMERS=y | ||
| 166 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 157 | # CONFIG_HZ_48 is not set | 167 | # CONFIG_HZ_48 is not set |
| 158 | # CONFIG_HZ_100 is not set | 168 | # CONFIG_HZ_100 is not set |
| 159 | # CONFIG_HZ_128 is not set | 169 | # CONFIG_HZ_128 is not set |
| @@ -166,38 +176,49 @@ CONFIG_HZ=1000 | |||
| 166 | CONFIG_PREEMPT_NONE=y | 176 | CONFIG_PREEMPT_NONE=y |
| 167 | # CONFIG_PREEMPT_VOLUNTARY is not set | 177 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 168 | # CONFIG_PREEMPT is not set | 178 | # CONFIG_PREEMPT is not set |
| 169 | CONFIG_PREEMPT_BKL=y | ||
| 170 | # CONFIG_KEXEC is not set | 179 | # CONFIG_KEXEC is not set |
| 180 | CONFIG_SECCOMP=y | ||
| 171 | CONFIG_LOCKDEP_SUPPORT=y | 181 | CONFIG_LOCKDEP_SUPPORT=y |
| 172 | CONFIG_STACKTRACE_SUPPORT=y | 182 | CONFIG_STACKTRACE_SUPPORT=y |
| 173 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 183 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 174 | 184 | ||
| 175 | # | 185 | # |
| 176 | # Code maturity level options | 186 | # General setup |
| 177 | # | 187 | # |
| 178 | CONFIG_EXPERIMENTAL=y | 188 | CONFIG_EXPERIMENTAL=y |
| 179 | CONFIG_LOCK_KERNEL=y | 189 | CONFIG_LOCK_KERNEL=y |
| 180 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 190 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 181 | |||
| 182 | # | ||
| 183 | # General setup | ||
| 184 | # | ||
| 185 | CONFIG_LOCALVERSION="" | 191 | CONFIG_LOCALVERSION="" |
| 186 | CONFIG_LOCALVERSION_AUTO=y | 192 | CONFIG_LOCALVERSION_AUTO=y |
| 187 | CONFIG_SWAP=y | 193 | CONFIG_SWAP=y |
| 188 | CONFIG_SYSVIPC=y | 194 | CONFIG_SYSVIPC=y |
| 189 | # CONFIG_IPC_NS is not set | ||
| 190 | CONFIG_SYSVIPC_SYSCTL=y | 195 | CONFIG_SYSVIPC_SYSCTL=y |
| 191 | # CONFIG_POSIX_MQUEUE is not set | 196 | # CONFIG_POSIX_MQUEUE is not set |
| 192 | # CONFIG_BSD_PROCESS_ACCT is not set | 197 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 193 | # CONFIG_TASKSTATS is not set | 198 | # CONFIG_TASKSTATS is not set |
| 194 | # CONFIG_UTS_NS is not set | ||
| 195 | # CONFIG_AUDIT is not set | 199 | # CONFIG_AUDIT is not set |
| 196 | # CONFIG_IKCONFIG is not set | 200 | # CONFIG_IKCONFIG is not set |
| 201 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 197 | CONFIG_CGROUPS=y | 202 | CONFIG_CGROUPS=y |
| 203 | # CONFIG_CGROUP_DEBUG is not set | ||
| 204 | # CONFIG_CGROUP_NS is not set | ||
| 198 | CONFIG_CPUSETS=y | 205 | CONFIG_CPUSETS=y |
| 199 | CONFIG_SYSFS_DEPRECATED=y | 206 | CONFIG_GROUP_SCHED=y |
| 207 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 208 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 209 | CONFIG_USER_SCHED=y | ||
| 210 | # CONFIG_CGROUP_SCHED is not set | ||
| 211 | CONFIG_CGROUP_CPUACCT=y | ||
| 212 | # CONFIG_RESOURCE_COUNTERS is not set | ||
| 213 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 214 | # CONFIG_PROC_PID_CPUSET is not set | ||
| 200 | CONFIG_RELAY=y | 215 | CONFIG_RELAY=y |
| 216 | CONFIG_NAMESPACES=y | ||
| 217 | # CONFIG_UTS_NS is not set | ||
| 218 | # CONFIG_IPC_NS is not set | ||
| 219 | # CONFIG_USER_NS is not set | ||
| 220 | # CONFIG_PID_NS is not set | ||
| 221 | CONFIG_BLK_DEV_INITRD=y | ||
| 201 | CONFIG_INITRAMFS_SOURCE="" | 222 | CONFIG_INITRAMFS_SOURCE="" |
| 202 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 223 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 203 | CONFIG_SYSCTL=y | 224 | CONFIG_SYSCTL=y |
| @@ -209,20 +230,29 @@ CONFIG_HOTPLUG=y | |||
| 209 | CONFIG_PRINTK=y | 230 | CONFIG_PRINTK=y |
| 210 | CONFIG_BUG=y | 231 | CONFIG_BUG=y |
| 211 | CONFIG_ELF_CORE=y | 232 | CONFIG_ELF_CORE=y |
| 233 | # CONFIG_COMPAT_BRK is not set | ||
| 212 | CONFIG_BASE_FULL=y | 234 | CONFIG_BASE_FULL=y |
| 213 | CONFIG_FUTEX=y | 235 | CONFIG_FUTEX=y |
| 236 | CONFIG_ANON_INODES=y | ||
| 214 | CONFIG_EPOLL=y | 237 | CONFIG_EPOLL=y |
| 238 | CONFIG_SIGNALFD=y | ||
| 239 | CONFIG_TIMERFD=y | ||
| 240 | CONFIG_EVENTFD=y | ||
| 215 | CONFIG_SHMEM=y | 241 | CONFIG_SHMEM=y |
| 216 | CONFIG_SLAB=y | ||
| 217 | CONFIG_VM_EVENT_COUNTERS=y | 242 | CONFIG_VM_EVENT_COUNTERS=y |
| 243 | CONFIG_SLAB=y | ||
| 244 | # CONFIG_SLUB is not set | ||
| 245 | # CONFIG_SLOB is not set | ||
| 246 | # CONFIG_PROFILING is not set | ||
| 247 | # CONFIG_MARKERS is not set | ||
| 248 | CONFIG_HAVE_OPROFILE=y | ||
| 249 | # CONFIG_HAVE_KPROBES is not set | ||
| 250 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 251 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 252 | CONFIG_SLABINFO=y | ||
| 218 | CONFIG_RT_MUTEXES=y | 253 | CONFIG_RT_MUTEXES=y |
| 219 | # CONFIG_TINY_SHMEM is not set | 254 | # CONFIG_TINY_SHMEM is not set |
| 220 | CONFIG_BASE_SMALL=0 | 255 | CONFIG_BASE_SMALL=0 |
| 221 | # CONFIG_SLOB is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # Loadable module support | ||
| 225 | # | ||
| 226 | CONFIG_MODULES=y | 256 | CONFIG_MODULES=y |
| 227 | CONFIG_MODULE_UNLOAD=y | 257 | CONFIG_MODULE_UNLOAD=y |
| 228 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 258 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -230,12 +260,10 @@ CONFIG_MODVERSIONS=y | |||
| 230 | CONFIG_MODULE_SRCVERSION_ALL=y | 260 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 231 | CONFIG_KMOD=y | 261 | CONFIG_KMOD=y |
| 232 | CONFIG_STOP_MACHINE=y | 262 | CONFIG_STOP_MACHINE=y |
| 233 | |||
| 234 | # | ||
| 235 | # Block layer | ||
| 236 | # | ||
| 237 | CONFIG_BLOCK=y | 263 | CONFIG_BLOCK=y |
| 238 | # CONFIG_BLK_DEV_IO_TRACE is not set | 264 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 265 | CONFIG_BLK_DEV_BSG=y | ||
| 266 | CONFIG_BLOCK_COMPAT=y | ||
| 239 | 267 | ||
| 240 | # | 268 | # |
| 241 | # IO Schedulers | 269 | # IO Schedulers |
| @@ -249,22 +277,19 @@ CONFIG_DEFAULT_AS=y | |||
| 249 | # CONFIG_DEFAULT_CFQ is not set | 277 | # CONFIG_DEFAULT_CFQ is not set |
| 250 | # CONFIG_DEFAULT_NOOP is not set | 278 | # CONFIG_DEFAULT_NOOP is not set |
| 251 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 279 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 280 | CONFIG_CLASSIC_RCU=y | ||
| 252 | 281 | ||
| 253 | # | 282 | # |
| 254 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 283 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 255 | # | 284 | # |
| 256 | CONFIG_HW_HAS_PCI=y | 285 | CONFIG_HW_HAS_PCI=y |
| 257 | CONFIG_PCI=y | 286 | CONFIG_PCI=y |
| 287 | CONFIG_PCI_DOMAINS=y | ||
| 288 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 289 | # CONFIG_PCI_LEGACY is not set | ||
| 258 | CONFIG_MMU=y | 290 | CONFIG_MMU=y |
| 259 | 291 | CONFIG_ZONE_DMA32=y | |
| 260 | # | ||
| 261 | # PCCARD (PCMCIA/CardBus) support | ||
| 262 | # | ||
| 263 | # CONFIG_PCCARD is not set | 292 | # CONFIG_PCCARD is not set |
| 264 | |||
| 265 | # | ||
| 266 | # PCI Hotplug Support | ||
| 267 | # | ||
| 268 | # CONFIG_HOTPLUG_PCI is not set | 293 | # CONFIG_HOTPLUG_PCI is not set |
| 269 | 294 | ||
| 270 | # | 295 | # |
| @@ -272,7 +297,6 @@ CONFIG_MMU=y | |||
| 272 | # | 297 | # |
| 273 | CONFIG_BINFMT_ELF=y | 298 | CONFIG_BINFMT_ELF=y |
| 274 | # CONFIG_BINFMT_MISC is not set | 299 | # CONFIG_BINFMT_MISC is not set |
| 275 | # CONFIG_BUILD_ELF64 is not set | ||
| 276 | CONFIG_MIPS32_COMPAT=y | 300 | CONFIG_MIPS32_COMPAT=y |
| 277 | CONFIG_COMPAT=y | 301 | CONFIG_COMPAT=y |
| 278 | CONFIG_SYSVIPC_COMPAT=y | 302 | CONFIG_SYSVIPC_COMPAT=y |
| @@ -286,7 +310,6 @@ CONFIG_BINFMT_ELF32=y | |||
| 286 | CONFIG_PM=y | 310 | CONFIG_PM=y |
| 287 | # CONFIG_PM_LEGACY is not set | 311 | # CONFIG_PM_LEGACY is not set |
| 288 | # CONFIG_PM_DEBUG is not set | 312 | # CONFIG_PM_DEBUG is not set |
| 289 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
| 290 | 313 | ||
| 291 | # | 314 | # |
| 292 | # Networking | 315 | # Networking |
| @@ -296,7 +319,6 @@ CONFIG_NET=y | |||
| 296 | # | 319 | # |
| 297 | # Networking options | 320 | # Networking options |
| 298 | # | 321 | # |
| 299 | # CONFIG_NETDEBUG is not set | ||
| 300 | CONFIG_PACKET=y | 322 | CONFIG_PACKET=y |
| 301 | CONFIG_PACKET_MMAP=y | 323 | CONFIG_PACKET_MMAP=y |
| 302 | CONFIG_UNIX=y | 324 | CONFIG_UNIX=y |
| @@ -304,6 +326,7 @@ CONFIG_XFRM=y | |||
| 304 | CONFIG_XFRM_USER=m | 326 | CONFIG_XFRM_USER=m |
| 305 | # CONFIG_XFRM_SUB_POLICY is not set | 327 | # CONFIG_XFRM_SUB_POLICY is not set |
| 306 | CONFIG_XFRM_MIGRATE=y | 328 | CONFIG_XFRM_MIGRATE=y |
| 329 | # CONFIG_XFRM_STATISTICS is not set | ||
| 307 | CONFIG_NET_KEY=y | 330 | CONFIG_NET_KEY=y |
| 308 | CONFIG_NET_KEY_MIGRATE=y | 331 | CONFIG_NET_KEY_MIGRATE=y |
| 309 | CONFIG_INET=y | 332 | CONFIG_INET=y |
| @@ -326,6 +349,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 326 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 349 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 327 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 350 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 328 | CONFIG_INET_XFRM_MODE_BEET=m | 351 | CONFIG_INET_XFRM_MODE_BEET=m |
| 352 | CONFIG_INET_LRO=m | ||
| 329 | CONFIG_INET_DIAG=y | 353 | CONFIG_INET_DIAG=y |
| 330 | CONFIG_INET_TCP_DIAG=y | 354 | CONFIG_INET_TCP_DIAG=y |
| 331 | # CONFIG_TCP_CONG_ADVANCED is not set | 355 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -333,24 +357,15 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 333 | CONFIG_DEFAULT_TCP_CONG="cubic" | 357 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 334 | CONFIG_TCP_MD5SIG=y | 358 | CONFIG_TCP_MD5SIG=y |
| 335 | # CONFIG_IPV6 is not set | 359 | # CONFIG_IPV6 is not set |
| 336 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 337 | # CONFIG_INET6_TUNNEL is not set | ||
| 338 | CONFIG_NETWORK_SECMARK=y | 360 | CONFIG_NETWORK_SECMARK=y |
| 339 | # CONFIG_NETFILTER is not set | 361 | # CONFIG_NETFILTER is not set |
| 340 | |||
| 341 | # | ||
| 342 | # DCCP Configuration (EXPERIMENTAL) | ||
| 343 | # | ||
| 344 | # CONFIG_IP_DCCP is not set | 362 | # CONFIG_IP_DCCP is not set |
| 345 | 363 | CONFIG_IP_SCTP=m | |
| 346 | # | 364 | # CONFIG_SCTP_DBG_MSG is not set |
| 347 | # SCTP Configuration (EXPERIMENTAL) | 365 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| 348 | # | 366 | # CONFIG_SCTP_HMAC_NONE is not set |
| 349 | # CONFIG_IP_SCTP is not set | 367 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 350 | 368 | CONFIG_SCTP_HMAC_MD5=y | |
| 351 | # | ||
| 352 | # TIPC Configuration (EXPERIMENTAL) | ||
| 353 | # | ||
| 354 | # CONFIG_TIPC is not set | 369 | # CONFIG_TIPC is not set |
| 355 | # CONFIG_ATM is not set | 370 | # CONFIG_ATM is not set |
| 356 | # CONFIG_BRIDGE is not set | 371 | # CONFIG_BRIDGE is not set |
| @@ -363,26 +378,52 @@ CONFIG_NETWORK_SECMARK=y | |||
| 363 | # CONFIG_LAPB is not set | 378 | # CONFIG_LAPB is not set |
| 364 | # CONFIG_ECONET is not set | 379 | # CONFIG_ECONET is not set |
| 365 | # CONFIG_WAN_ROUTER is not set | 380 | # CONFIG_WAN_ROUTER is not set |
| 366 | |||
| 367 | # | ||
| 368 | # QoS and/or fair queueing | ||
| 369 | # | ||
| 370 | # CONFIG_NET_SCHED is not set | 381 | # CONFIG_NET_SCHED is not set |
| 382 | CONFIG_NET_SCH_FIFO=y | ||
| 371 | 383 | ||
| 372 | # | 384 | # |
| 373 | # Network testing | 385 | # Network testing |
| 374 | # | 386 | # |
| 375 | # CONFIG_NET_PKTGEN is not set | 387 | # CONFIG_NET_PKTGEN is not set |
| 376 | # CONFIG_HAMRADIO is not set | 388 | # CONFIG_HAMRADIO is not set |
| 389 | # CONFIG_CAN is not set | ||
| 377 | # CONFIG_IRDA is not set | 390 | # CONFIG_IRDA is not set |
| 378 | # CONFIG_BT is not set | 391 | # CONFIG_BT is not set |
| 392 | # CONFIG_AF_RXRPC is not set | ||
| 393 | |||
| 394 | # | ||
| 395 | # Wireless | ||
| 396 | # | ||
| 397 | CONFIG_CFG80211=m | ||
| 398 | CONFIG_NL80211=y | ||
| 399 | CONFIG_WIRELESS_EXT=y | ||
| 400 | CONFIG_MAC80211=m | ||
| 401 | |||
| 402 | # | ||
| 403 | # Rate control algorithm selection | ||
| 404 | # | ||
| 405 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 406 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 407 | |||
| 408 | # | ||
| 409 | # Selecting 'y' for an algorithm will | ||
| 410 | # | ||
| 411 | |||
| 412 | # | ||
| 413 | # build the algorithm into mac80211. | ||
| 414 | # | ||
| 415 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 416 | CONFIG_MAC80211_RC_PID=y | ||
| 417 | # CONFIG_MAC80211_MESH is not set | ||
| 418 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
| 419 | # CONFIG_MAC80211_DEBUG is not set | ||
| 379 | CONFIG_IEEE80211=m | 420 | CONFIG_IEEE80211=m |
| 380 | # CONFIG_IEEE80211_DEBUG is not set | 421 | # CONFIG_IEEE80211_DEBUG is not set |
| 381 | CONFIG_IEEE80211_CRYPT_WEP=m | 422 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 382 | CONFIG_IEEE80211_CRYPT_CCMP=m | 423 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 383 | CONFIG_IEEE80211_SOFTMAC=m | 424 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 384 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 425 | CONFIG_RFKILL=m |
| 385 | CONFIG_WIRELESS_EXT=y | 426 | # CONFIG_NET_9P is not set |
| 386 | 427 | ||
| 387 | # | 428 | # |
| 388 | # Device Drivers | 429 | # Device Drivers |
| @@ -391,34 +432,15 @@ CONFIG_WIRELESS_EXT=y | |||
| 391 | # | 432 | # |
| 392 | # Generic Driver Options | 433 | # Generic Driver Options |
| 393 | # | 434 | # |
| 435 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 394 | CONFIG_STANDALONE=y | 436 | CONFIG_STANDALONE=y |
| 395 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 437 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 396 | CONFIG_FW_LOADER=m | 438 | CONFIG_FW_LOADER=m |
| 397 | # CONFIG_SYS_HYPERVISOR is not set | 439 | # CONFIG_SYS_HYPERVISOR is not set |
| 398 | |||
| 399 | # | ||
| 400 | # Connector - unified userspace <-> kernelspace linker | ||
| 401 | # | ||
| 402 | CONFIG_CONNECTOR=m | 440 | CONFIG_CONNECTOR=m |
| 403 | |||
| 404 | # | ||
| 405 | # Memory Technology Devices (MTD) | ||
| 406 | # | ||
| 407 | # CONFIG_MTD is not set | 441 | # CONFIG_MTD is not set |
| 408 | |||
| 409 | # | ||
| 410 | # Parallel port support | ||
| 411 | # | ||
| 412 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 413 | 443 | CONFIG_BLK_DEV=y | |
| 414 | # | ||
| 415 | # Plug and Play support | ||
| 416 | # | ||
| 417 | # CONFIG_PNPACPI is not set | ||
| 418 | |||
| 419 | # | ||
| 420 | # Block devices | ||
| 421 | # | ||
| 422 | # CONFIG_BLK_CPQ_DA is not set | 444 | # CONFIG_BLK_CPQ_DA is not set |
| 423 | # CONFIG_BLK_CPQ_CISS_DA is not set | 445 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 424 | # CONFIG_BLK_DEV_DAC960 is not set | 446 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -427,49 +449,77 @@ CONFIG_CONNECTOR=m | |||
| 427 | # CONFIG_BLK_DEV_LOOP is not set | 449 | # CONFIG_BLK_DEV_LOOP is not set |
| 428 | # CONFIG_BLK_DEV_NBD is not set | 450 | # CONFIG_BLK_DEV_NBD is not set |
| 429 | # CONFIG_BLK_DEV_SX8 is not set | 451 | # CONFIG_BLK_DEV_SX8 is not set |
| 452 | # CONFIG_BLK_DEV_UB is not set | ||
| 430 | CONFIG_BLK_DEV_RAM=y | 453 | CONFIG_BLK_DEV_RAM=y |
| 431 | CONFIG_BLK_DEV_RAM_COUNT=16 | 454 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 432 | CONFIG_BLK_DEV_RAM_SIZE=9220 | 455 | CONFIG_BLK_DEV_RAM_SIZE=9220 |
| 433 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 456 | # CONFIG_BLK_DEV_XIP is not set |
| 434 | CONFIG_BLK_DEV_INITRD=y | ||
| 435 | CONFIG_CDROM_PKTCDVD=m | 457 | CONFIG_CDROM_PKTCDVD=m |
| 436 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 458 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 437 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 459 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 438 | CONFIG_ATA_OVER_ETH=m | 460 | CONFIG_ATA_OVER_ETH=m |
| 439 | 461 | CONFIG_MISC_DEVICES=y | |
| 440 | # | 462 | # CONFIG_PHANTOM is not set |
| 441 | # Misc devices | 463 | # CONFIG_EEPROM_93CX6 is not set |
| 442 | # | ||
| 443 | CONFIG_SGI_IOC4=m | 464 | CONFIG_SGI_IOC4=m |
| 444 | # CONFIG_TIFM_CORE is not set | 465 | # CONFIG_TIFM_CORE is not set |
| 445 | 466 | # CONFIG_ENCLOSURE_SERVICES is not set | |
| 446 | # | 467 | CONFIG_HAVE_IDE=y |
| 447 | # ATA/ATAPI/MFM/RLL support | ||
| 448 | # | ||
| 449 | CONFIG_IDE=y | 468 | CONFIG_IDE=y |
| 450 | CONFIG_IDE_MAX_HWIFS=4 | 469 | CONFIG_IDE_MAX_HWIFS=4 |
| 451 | CONFIG_BLK_DEV_IDE=y | 470 | CONFIG_BLK_DEV_IDE=y |
| 452 | 471 | ||
| 453 | # | 472 | # |
| 454 | # Please see Documentation/ide.txt for help/info on IDE drives | 473 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 455 | # | 474 | # |
| 456 | # CONFIG_BLK_DEV_IDE_SATA is not set | 475 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 457 | CONFIG_BLK_DEV_IDEDISK=y | 476 | CONFIG_BLK_DEV_IDEDISK=y |
| 458 | # CONFIG_IDEDISK_MULTI_MODE is not set | 477 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| 459 | CONFIG_BLK_DEV_IDECD=y | 478 | CONFIG_BLK_DEV_IDECD=y |
| 479 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 460 | CONFIG_BLK_DEV_IDETAPE=y | 480 | CONFIG_BLK_DEV_IDETAPE=y |
| 461 | CONFIG_BLK_DEV_IDEFLOPPY=y | 481 | CONFIG_BLK_DEV_IDEFLOPPY=y |
| 462 | # CONFIG_IDE_TASK_IOCTL is not set | 482 | # CONFIG_IDE_TASK_IOCTL is not set |
| 483 | CONFIG_IDE_PROC_FS=y | ||
| 463 | 484 | ||
| 464 | # | 485 | # |
| 465 | # IDE chipset support/bugfixes | 486 | # IDE chipset support/bugfixes |
| 466 | # | 487 | # |
| 467 | CONFIG_IDE_GENERIC=y | 488 | # CONFIG_IDE_GENERIC is not set |
| 468 | # CONFIG_BLK_DEV_IDEPCI is not set | 489 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 490 | |||
| 491 | # | ||
| 492 | # PCI IDE chipsets support | ||
| 493 | # | ||
| 494 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 495 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 496 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 497 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 498 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
| 499 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 500 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 501 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 502 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 503 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 504 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 505 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 506 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 507 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 508 | # CONFIG_BLK_DEV_PIIX is not set | ||
| 509 | # CONFIG_BLK_DEV_IT8213 is not set | ||
| 510 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 511 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 512 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 513 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 514 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 515 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 516 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 517 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 518 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 519 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
| 469 | CONFIG_BLK_DEV_IDE_SWARM=y | 520 | CONFIG_BLK_DEV_IDE_SWARM=y |
| 470 | # CONFIG_IDE_ARM is not set | ||
| 471 | # CONFIG_BLK_DEV_IDEDMA is not set | 521 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 472 | # CONFIG_IDEDMA_AUTO is not set | 522 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 473 | # CONFIG_BLK_DEV_HD is not set | 523 | # CONFIG_BLK_DEV_HD is not set |
| 474 | 524 | ||
| 475 | # | 525 | # |
| @@ -477,89 +527,68 @@ CONFIG_BLK_DEV_IDE_SWARM=y | |||
| 477 | # | 527 | # |
| 478 | CONFIG_RAID_ATTRS=m | 528 | CONFIG_RAID_ATTRS=m |
| 479 | # CONFIG_SCSI is not set | 529 | # CONFIG_SCSI is not set |
| 530 | # CONFIG_SCSI_DMA is not set | ||
| 480 | # CONFIG_SCSI_NETLINK is not set | 531 | # CONFIG_SCSI_NETLINK is not set |
| 481 | |||
| 482 | # | ||
| 483 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 484 | # | ||
| 485 | # CONFIG_ATA is not set | 532 | # CONFIG_ATA is not set |
| 486 | |||
| 487 | # | ||
| 488 | # Multi-device support (RAID and LVM) | ||
| 489 | # | ||
| 490 | # CONFIG_MD is not set | 533 | # CONFIG_MD is not set |
| 491 | |||
| 492 | # | ||
| 493 | # Fusion MPT device support | ||
| 494 | # | ||
| 495 | # CONFIG_FUSION is not set | 534 | # CONFIG_FUSION is not set |
| 496 | 535 | ||
| 497 | # | 536 | # |
| 498 | # IEEE 1394 (FireWire) support | 537 | # IEEE 1394 (FireWire) support |
| 499 | # | 538 | # |
| 539 | # CONFIG_FIREWIRE is not set | ||
| 500 | # CONFIG_IEEE1394 is not set | 540 | # CONFIG_IEEE1394 is not set |
| 501 | |||
| 502 | # | ||
| 503 | # I2O device support | ||
| 504 | # | ||
| 505 | # CONFIG_I2O is not set | 541 | # CONFIG_I2O is not set |
| 506 | |||
| 507 | # | ||
| 508 | # Network device support | ||
| 509 | # | ||
| 510 | CONFIG_NETDEVICES=y | 542 | CONFIG_NETDEVICES=y |
| 543 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
| 511 | # CONFIG_DUMMY is not set | 544 | # CONFIG_DUMMY is not set |
| 512 | # CONFIG_BONDING is not set | 545 | # CONFIG_BONDING is not set |
| 546 | CONFIG_MACVLAN=m | ||
| 513 | # CONFIG_EQUALIZER is not set | 547 | # CONFIG_EQUALIZER is not set |
| 514 | # CONFIG_TUN is not set | 548 | # CONFIG_TUN is not set |
| 515 | 549 | # CONFIG_VETH is not set | |
| 516 | # | ||
| 517 | # ARCnet devices | ||
| 518 | # | ||
| 519 | # CONFIG_ARCNET is not set | 550 | # CONFIG_ARCNET is not set |
| 520 | 551 | CONFIG_PHYLIB=y | |
| 521 | # | ||
| 522 | # PHY device support | ||
| 523 | # | ||
| 524 | CONFIG_PHYLIB=m | ||
| 525 | 552 | ||
| 526 | # | 553 | # |
| 527 | # MII PHY device drivers | 554 | # MII PHY device drivers |
| 528 | # | 555 | # |
| 529 | CONFIG_MARVELL_PHY=m | 556 | # CONFIG_MARVELL_PHY is not set |
| 530 | CONFIG_DAVICOM_PHY=m | 557 | # CONFIG_DAVICOM_PHY is not set |
| 531 | CONFIG_QSEMI_PHY=m | 558 | # CONFIG_QSEMI_PHY is not set |
| 532 | CONFIG_LXT_PHY=m | 559 | # CONFIG_LXT_PHY is not set |
| 533 | CONFIG_CICADA_PHY=m | 560 | # CONFIG_CICADA_PHY is not set |
| 534 | CONFIG_VITESSE_PHY=m | 561 | # CONFIG_VITESSE_PHY is not set |
| 535 | CONFIG_SMSC_PHY=m | 562 | # CONFIG_SMSC_PHY is not set |
| 536 | # CONFIG_BROADCOM_PHY is not set | 563 | CONFIG_BROADCOM_PHY=y |
| 564 | # CONFIG_ICPLUS_PHY is not set | ||
| 565 | # CONFIG_REALTEK_PHY is not set | ||
| 537 | # CONFIG_FIXED_PHY is not set | 566 | # CONFIG_FIXED_PHY is not set |
| 538 | 567 | # CONFIG_MDIO_BITBANG is not set | |
| 539 | # | ||
| 540 | # Ethernet (10 or 100Mbit) | ||
| 541 | # | ||
| 542 | CONFIG_NET_ETHERNET=y | 568 | CONFIG_NET_ETHERNET=y |
| 543 | CONFIG_MII=y | 569 | CONFIG_MII=y |
| 570 | # CONFIG_AX88796 is not set | ||
| 544 | # CONFIG_HAPPYMEAL is not set | 571 | # CONFIG_HAPPYMEAL is not set |
| 545 | # CONFIG_SUNGEM is not set | 572 | # CONFIG_SUNGEM is not set |
| 546 | # CONFIG_CASSINI is not set | 573 | # CONFIG_CASSINI is not set |
| 547 | # CONFIG_NET_VENDOR_3COM is not set | 574 | # CONFIG_NET_VENDOR_3COM is not set |
| 548 | # CONFIG_DM9000 is not set | 575 | # CONFIG_DM9000 is not set |
| 549 | |||
| 550 | # | ||
| 551 | # Tulip family network device support | ||
| 552 | # | ||
| 553 | # CONFIG_NET_TULIP is not set | 576 | # CONFIG_NET_TULIP is not set |
| 554 | # CONFIG_HP100 is not set | 577 | # CONFIG_HP100 is not set |
| 578 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 579 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 580 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 581 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 555 | # CONFIG_NET_PCI is not set | 582 | # CONFIG_NET_PCI is not set |
| 556 | 583 | # CONFIG_B44 is not set | |
| 557 | # | 584 | CONFIG_NETDEV_1000=y |
| 558 | # Ethernet (1000 Mbit) | ||
| 559 | # | ||
| 560 | # CONFIG_ACENIC is not set | 585 | # CONFIG_ACENIC is not set |
| 561 | # CONFIG_DL2K is not set | 586 | # CONFIG_DL2K is not set |
| 562 | # CONFIG_E1000 is not set | 587 | # CONFIG_E1000 is not set |
| 588 | # CONFIG_E1000E is not set | ||
| 589 | # CONFIG_E1000E_ENABLED is not set | ||
| 590 | # CONFIG_IP1000 is not set | ||
| 591 | # CONFIG_IGB is not set | ||
| 563 | # CONFIG_NS83820 is not set | 592 | # CONFIG_NS83820 is not set |
| 564 | # CONFIG_HAMACHI is not set | 593 | # CONFIG_HAMACHI is not set |
| 565 | # CONFIG_YELLOWFIN is not set | 594 | # CONFIG_YELLOWFIN is not set |
| @@ -568,53 +597,70 @@ CONFIG_SB1250_MAC=y | |||
| 568 | # CONFIG_SIS190 is not set | 597 | # CONFIG_SIS190 is not set |
| 569 | # CONFIG_SKGE is not set | 598 | # CONFIG_SKGE is not set |
| 570 | # CONFIG_SKY2 is not set | 599 | # CONFIG_SKY2 is not set |
| 571 | # CONFIG_SK98LIN is not set | 600 | # CONFIG_VIA_VELOCITY is not set |
| 572 | # CONFIG_TIGON3 is not set | 601 | # CONFIG_TIGON3 is not set |
| 573 | # CONFIG_BNX2 is not set | 602 | # CONFIG_BNX2 is not set |
| 574 | CONFIG_QLA3XXX=m | 603 | # CONFIG_QLA3XXX is not set |
| 575 | # CONFIG_ATL1 is not set | 604 | # CONFIG_ATL1 is not set |
| 576 | 605 | CONFIG_NETDEV_10000=y | |
| 577 | # | ||
| 578 | # Ethernet (10000 Mbit) | ||
| 579 | # | ||
| 580 | # CONFIG_CHELSIO_T1 is not set | 606 | # CONFIG_CHELSIO_T1 is not set |
| 581 | CONFIG_CHELSIO_T3=m | 607 | # CONFIG_CHELSIO_T3 is not set |
| 608 | # CONFIG_IXGBE is not set | ||
| 582 | # CONFIG_IXGB is not set | 609 | # CONFIG_IXGB is not set |
| 583 | # CONFIG_S2IO is not set | 610 | # CONFIG_S2IO is not set |
| 584 | # CONFIG_MYRI10GE is not set | 611 | # CONFIG_MYRI10GE is not set |
| 585 | CONFIG_NETXEN_NIC=m | 612 | # CONFIG_NETXEN_NIC is not set |
| 586 | 613 | # CONFIG_NIU is not set | |
| 587 | # | 614 | # CONFIG_MLX4_CORE is not set |
| 588 | # Token Ring devices | 615 | # CONFIG_TEHUTI is not set |
| 589 | # | 616 | # CONFIG_BNX2X is not set |
| 590 | # CONFIG_TR is not set | 617 | # CONFIG_TR is not set |
| 591 | 618 | ||
| 592 | # | 619 | # |
| 593 | # Wireless LAN (non-hamradio) | 620 | # Wireless LAN |
| 594 | # | 621 | # |
| 595 | # CONFIG_NET_RADIO is not set | 622 | # CONFIG_WLAN_PRE80211 is not set |
| 596 | 623 | CONFIG_WLAN_80211=y | |
| 597 | # | 624 | # CONFIG_IPW2100 is not set |
| 598 | # Wan interfaces | 625 | # CONFIG_IPW2200 is not set |
| 599 | # | 626 | # CONFIG_LIBERTAS is not set |
| 627 | # CONFIG_HERMES is not set | ||
| 628 | # CONFIG_ATMEL is not set | ||
| 629 | # CONFIG_PRISM54 is not set | ||
| 630 | # CONFIG_USB_ZD1201 is not set | ||
| 631 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 632 | # CONFIG_RTL8180 is not set | ||
| 633 | # CONFIG_RTL8187 is not set | ||
| 634 | # CONFIG_ADM8211 is not set | ||
| 635 | # CONFIG_P54_COMMON is not set | ||
| 636 | # CONFIG_ATH5K is not set | ||
| 637 | # CONFIG_IWLCORE is not set | ||
| 638 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 639 | # CONFIG_IWL4965 is not set | ||
| 640 | # CONFIG_IWL3945 is not set | ||
| 641 | # CONFIG_HOSTAP is not set | ||
| 642 | # CONFIG_B43 is not set | ||
| 643 | # CONFIG_B43LEGACY is not set | ||
| 644 | # CONFIG_ZD1211RW is not set | ||
| 645 | # CONFIG_RT2X00 is not set | ||
| 646 | |||
| 647 | # | ||
| 648 | # USB Network Adapters | ||
| 649 | # | ||
| 650 | # CONFIG_USB_CATC is not set | ||
| 651 | # CONFIG_USB_KAWETH is not set | ||
| 652 | # CONFIG_USB_PEGASUS is not set | ||
| 653 | # CONFIG_USB_RTL8150 is not set | ||
| 654 | # CONFIG_USB_USBNET is not set | ||
| 600 | # CONFIG_WAN is not set | 655 | # CONFIG_WAN is not set |
| 601 | # CONFIG_FDDI is not set | 656 | # CONFIG_FDDI is not set |
| 602 | # CONFIG_HIPPI is not set | 657 | # CONFIG_HIPPI is not set |
| 603 | # CONFIG_PPP is not set | 658 | # CONFIG_PPP is not set |
| 604 | # CONFIG_SLIP is not set | 659 | # CONFIG_SLIP is not set |
| 605 | # CONFIG_SHAPER is not set | ||
| 606 | # CONFIG_NETCONSOLE is not set | 660 | # CONFIG_NETCONSOLE is not set |
| 607 | # CONFIG_NETPOLL is not set | 661 | # CONFIG_NETPOLL is not set |
| 608 | # CONFIG_NET_POLL_CONTROLLER is not set | 662 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 609 | |||
| 610 | # | ||
| 611 | # ISDN subsystem | ||
| 612 | # | ||
| 613 | # CONFIG_ISDN is not set | 663 | # CONFIG_ISDN is not set |
| 614 | |||
| 615 | # | ||
| 616 | # Telephony Support | ||
| 617 | # | ||
| 618 | # CONFIG_PHONE is not set | 664 | # CONFIG_PHONE is not set |
| 619 | 665 | ||
| 620 | # | 666 | # |
| @@ -637,24 +683,8 @@ CONFIG_SERIO_RAW=m | |||
| 637 | # Character devices | 683 | # Character devices |
| 638 | # | 684 | # |
| 639 | # CONFIG_VT is not set | 685 | # CONFIG_VT is not set |
| 640 | CONFIG_SERIAL_NONSTANDARD=y | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 641 | # CONFIG_COMPUTONE is not set | 687 | # CONFIG_NOZOMI is not set |
| 642 | # CONFIG_ROCKETPORT is not set | ||
| 643 | # CONFIG_CYCLADES is not set | ||
| 644 | # CONFIG_DIGIEPCA is not set | ||
| 645 | # CONFIG_MOXA_INTELLIO is not set | ||
| 646 | # CONFIG_MOXA_SMARTIO is not set | ||
| 647 | CONFIG_MOXA_SMARTIO_NEW=m | ||
| 648 | # CONFIG_ISI is not set | ||
| 649 | # CONFIG_SYNCLINKMP is not set | ||
| 650 | # CONFIG_SYNCLINK_GT is not set | ||
| 651 | # CONFIG_N_HDLC is not set | ||
| 652 | # CONFIG_SPECIALIX is not set | ||
| 653 | # CONFIG_SX is not set | ||
| 654 | # CONFIG_RIO is not set | ||
| 655 | # CONFIG_STALDRV is not set | ||
| 656 | CONFIG_SERIAL_SB1250_DUART=y | ||
| 657 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
| 658 | 688 | ||
| 659 | # | 689 | # |
| 660 | # Serial drivers | 690 | # Serial drivers |
| @@ -664,37 +694,22 @@ CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | |||
| 664 | # | 694 | # |
| 665 | # Non-8250 serial port support | 695 | # Non-8250 serial port support |
| 666 | # | 696 | # |
| 697 | CONFIG_SERIAL_SB1250_DUART=y | ||
| 698 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
| 699 | CONFIG_SERIAL_CORE=y | ||
| 700 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 667 | # CONFIG_SERIAL_JSM is not set | 701 | # CONFIG_SERIAL_JSM is not set |
| 668 | CONFIG_UNIX98_PTYS=y | 702 | CONFIG_UNIX98_PTYS=y |
| 669 | CONFIG_LEGACY_PTYS=y | 703 | CONFIG_LEGACY_PTYS=y |
| 670 | CONFIG_LEGACY_PTY_COUNT=256 | 704 | CONFIG_LEGACY_PTY_COUNT=256 |
| 671 | |||
| 672 | # | ||
| 673 | # IPMI | ||
| 674 | # | ||
| 675 | # CONFIG_IPMI_HANDLER is not set | 705 | # CONFIG_IPMI_HANDLER is not set |
| 676 | |||
| 677 | # | ||
| 678 | # Watchdog Cards | ||
| 679 | # | ||
| 680 | # CONFIG_WATCHDOG is not set | ||
| 681 | # CONFIG_HW_RANDOM is not set | 706 | # CONFIG_HW_RANDOM is not set |
| 682 | # CONFIG_RTC is not set | 707 | # CONFIG_RTC is not set |
| 683 | # CONFIG_GEN_RTC is not set | ||
| 684 | # CONFIG_DTLK is not set | ||
| 685 | # CONFIG_R3964 is not set | 708 | # CONFIG_R3964 is not set |
| 686 | # CONFIG_APPLICOM is not set | 709 | # CONFIG_APPLICOM is not set |
| 687 | # CONFIG_DRM is not set | ||
| 688 | # CONFIG_RAW_DRIVER is not set | 710 | # CONFIG_RAW_DRIVER is not set |
| 689 | |||
| 690 | # | ||
| 691 | # TPM devices | ||
| 692 | # | ||
| 693 | # CONFIG_TCG_TPM is not set | 711 | # CONFIG_TCG_TPM is not set |
| 694 | 712 | CONFIG_DEVPORT=y | |
| 695 | # | ||
| 696 | # I2C support | ||
| 697 | # | ||
| 698 | # CONFIG_I2C is not set | 713 | # CONFIG_I2C is not set |
| 699 | 714 | ||
| 700 | # | 715 | # |
| @@ -702,109 +717,139 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 702 | # | 717 | # |
| 703 | # CONFIG_SPI is not set | 718 | # CONFIG_SPI is not set |
| 704 | # CONFIG_SPI_MASTER is not set | 719 | # CONFIG_SPI_MASTER is not set |
| 720 | # CONFIG_W1 is not set | ||
| 721 | # CONFIG_POWER_SUPPLY is not set | ||
| 722 | # CONFIG_HWMON is not set | ||
| 723 | # CONFIG_THERMAL is not set | ||
| 724 | # CONFIG_WATCHDOG is not set | ||
| 705 | 725 | ||
| 706 | # | 726 | # |
| 707 | # Dallas's 1-wire bus | 727 | # Sonics Silicon Backplane |
| 708 | # | 728 | # |
| 709 | # CONFIG_W1 is not set | 729 | CONFIG_SSB_POSSIBLE=y |
| 730 | # CONFIG_SSB is not set | ||
| 710 | 731 | ||
| 711 | # | 732 | # |
| 712 | # Hardware Monitoring support | 733 | # Multifunction device drivers |
| 713 | # | 734 | # |
| 714 | # CONFIG_HWMON is not set | 735 | # CONFIG_MFD_SM501 is not set |
| 715 | # CONFIG_HWMON_VID is not set | ||
| 716 | 736 | ||
| 717 | # | 737 | # |
| 718 | # Multimedia devices | 738 | # Multimedia devices |
| 719 | # | 739 | # |
| 720 | # CONFIG_VIDEO_DEV is not set | 740 | # CONFIG_VIDEO_DEV is not set |
| 721 | 741 | # CONFIG_DVB_CORE is not set | |
| 722 | # | 742 | # CONFIG_DAB is not set |
| 723 | # Digital Video Broadcasting Devices | ||
| 724 | # | ||
| 725 | # CONFIG_DVB is not set | ||
| 726 | 743 | ||
| 727 | # | 744 | # |
| 728 | # Graphics support | 745 | # Graphics support |
| 729 | # | 746 | # |
| 730 | # CONFIG_FIRMWARE_EDID is not set | 747 | # CONFIG_DRM is not set |
| 748 | # CONFIG_VGASTATE is not set | ||
| 749 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 731 | # CONFIG_FB is not set | 750 | # CONFIG_FB is not set |
| 732 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 751 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 733 | 752 | ||
| 734 | # | 753 | # |
| 735 | # Sound | 754 | # Display device support |
| 736 | # | 755 | # |
| 737 | # CONFIG_SOUND is not set | 756 | # CONFIG_DISPLAY_SUPPORT is not set |
| 738 | 757 | ||
| 739 | # | 758 | # |
| 740 | # USB support | 759 | # Sound |
| 741 | # | 760 | # |
| 761 | # CONFIG_SOUND is not set | ||
| 762 | CONFIG_USB_SUPPORT=y | ||
| 742 | CONFIG_USB_ARCH_HAS_HCD=y | 763 | CONFIG_USB_ARCH_HAS_HCD=y |
| 743 | CONFIG_USB_ARCH_HAS_OHCI=y | 764 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 744 | CONFIG_USB_ARCH_HAS_EHCI=y | 765 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 745 | # CONFIG_USB is not set | 766 | CONFIG_USB=y |
| 746 | 767 | # CONFIG_USB_DEBUG is not set | |
| 747 | # | 768 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set |
| 748 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 749 | # | ||
| 750 | 769 | ||
| 751 | # | 770 | # |
| 752 | # USB Gadget Support | 771 | # Miscellaneous USB options |
| 753 | # | 772 | # |
| 754 | # CONFIG_USB_GADGET is not set | 773 | CONFIG_USB_DEVICEFS=y |
| 774 | CONFIG_USB_DEVICE_CLASS=y | ||
| 775 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 776 | # CONFIG_USB_SUSPEND is not set | ||
| 777 | # CONFIG_USB_PERSIST is not set | ||
| 778 | # CONFIG_USB_OTG is not set | ||
| 755 | 779 | ||
| 756 | # | 780 | # |
| 757 | # MMC/SD Card support | 781 | # USB Host Controller Drivers |
| 758 | # | 782 | # |
| 759 | # CONFIG_MMC is not set | 783 | # CONFIG_USB_EHCI_HCD is not set |
| 784 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 785 | CONFIG_USB_OHCI_HCD=y | ||
| 786 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 787 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 788 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 789 | # CONFIG_USB_UHCI_HCD is not set | ||
| 790 | # CONFIG_USB_SL811_HCD is not set | ||
| 791 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 760 | 792 | ||
| 761 | # | 793 | # |
| 762 | # LED devices | 794 | # USB Device Class drivers |
| 763 | # | 795 | # |
| 764 | # CONFIG_NEW_LEDS is not set | 796 | # CONFIG_USB_ACM is not set |
| 797 | # CONFIG_USB_PRINTER is not set | ||
| 765 | 798 | ||
| 766 | # | 799 | # |
| 767 | # LED drivers | 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 768 | # | 801 | # |
| 769 | 802 | ||
| 770 | # | 803 | # |
| 771 | # LED Triggers | 804 | # may also be needed; see USB_STORAGE Help for more information |
| 772 | # | 805 | # |
| 806 | # CONFIG_USB_LIBUSUAL is not set | ||
| 773 | 807 | ||
| 774 | # | 808 | # |
| 775 | # InfiniBand support | 809 | # USB Imaging devices |
| 776 | # | 810 | # |
| 777 | # CONFIG_INFINIBAND is not set | 811 | # CONFIG_USB_MDC800 is not set |
| 812 | CONFIG_USB_MON=y | ||
| 778 | 813 | ||
| 779 | # | 814 | # |
| 780 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 815 | # USB port drivers |
| 781 | # | 816 | # |
| 817 | # CONFIG_USB_SERIAL is not set | ||
| 782 | 818 | ||
| 783 | # | 819 | # |
| 784 | # Real Time Clock | 820 | # USB Miscellaneous drivers |
| 785 | # | 821 | # |
| 822 | # CONFIG_USB_EMI62 is not set | ||
| 823 | # CONFIG_USB_EMI26 is not set | ||
| 824 | # CONFIG_USB_ADUTUX is not set | ||
| 825 | # CONFIG_USB_AUERSWALD is not set | ||
| 826 | # CONFIG_USB_RIO500 is not set | ||
| 827 | # CONFIG_USB_LEGOTOWER is not set | ||
| 828 | # CONFIG_USB_LCD is not set | ||
| 829 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 830 | # CONFIG_USB_LED is not set | ||
| 831 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 832 | # CONFIG_USB_CYTHERM is not set | ||
| 833 | # CONFIG_USB_PHIDGET is not set | ||
| 834 | # CONFIG_USB_IDMOUSE is not set | ||
| 835 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 836 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 837 | # CONFIG_USB_LD is not set | ||
| 838 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 839 | # CONFIG_USB_IOWARRIOR is not set | ||
| 840 | # CONFIG_USB_TEST is not set | ||
| 841 | # CONFIG_USB_GADGET is not set | ||
| 842 | # CONFIG_MMC is not set | ||
| 843 | # CONFIG_MEMSTICK is not set | ||
| 844 | # CONFIG_NEW_LEDS is not set | ||
| 845 | # CONFIG_INFINIBAND is not set | ||
| 846 | CONFIG_RTC_LIB=y | ||
| 786 | # CONFIG_RTC_CLASS is not set | 847 | # CONFIG_RTC_CLASS is not set |
| 787 | 848 | ||
| 788 | # | 849 | # |
| 789 | # DMA Engine support | 850 | # Userspace I/O |
| 790 | # | ||
| 791 | # CONFIG_DMA_ENGINE is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # DMA Clients | ||
| 795 | # | ||
| 796 | |||
| 797 | # | ||
| 798 | # DMA Devices | ||
| 799 | # | ||
| 800 | |||
| 801 | # | ||
| 802 | # Auxiliary Display support | ||
| 803 | # | ||
| 804 | |||
| 805 | # | ||
| 806 | # Virtualization | ||
| 807 | # | 851 | # |
| 852 | # CONFIG_UIO is not set | ||
| 808 | 853 | ||
| 809 | # | 854 | # |
| 810 | # File systems | 855 | # File systems |
| @@ -823,15 +868,14 @@ CONFIG_FS_POSIX_ACL=y | |||
| 823 | # CONFIG_XFS_FS is not set | 868 | # CONFIG_XFS_FS is not set |
| 824 | # CONFIG_GFS2_FS is not set | 869 | # CONFIG_GFS2_FS is not set |
| 825 | # CONFIG_OCFS2_FS is not set | 870 | # CONFIG_OCFS2_FS is not set |
| 826 | # CONFIG_MINIX_FS is not set | 871 | CONFIG_DNOTIFY=y |
| 827 | # CONFIG_ROMFS_FS is not set | ||
| 828 | CONFIG_INOTIFY=y | 872 | CONFIG_INOTIFY=y |
| 829 | CONFIG_INOTIFY_USER=y | 873 | CONFIG_INOTIFY_USER=y |
| 830 | # CONFIG_QUOTA is not set | 874 | # CONFIG_QUOTA is not set |
| 831 | CONFIG_DNOTIFY=y | ||
| 832 | # CONFIG_AUTOFS_FS is not set | 875 | # CONFIG_AUTOFS_FS is not set |
| 833 | # CONFIG_AUTOFS4_FS is not set | 876 | # CONFIG_AUTOFS4_FS is not set |
| 834 | CONFIG_FUSE_FS=m | 877 | CONFIG_FUSE_FS=m |
| 878 | CONFIG_GENERIC_ACL=y | ||
| 835 | 879 | ||
| 836 | # | 880 | # |
| 837 | # CD-ROM/DVD Filesystems | 881 | # CD-ROM/DVD Filesystems |
| @@ -853,9 +897,9 @@ CONFIG_PROC_FS=y | |||
| 853 | CONFIG_PROC_KCORE=y | 897 | CONFIG_PROC_KCORE=y |
| 854 | CONFIG_PROC_SYSCTL=y | 898 | CONFIG_PROC_SYSCTL=y |
| 855 | CONFIG_SYSFS=y | 899 | CONFIG_SYSFS=y |
| 856 | # CONFIG_TMPFS is not set | 900 | CONFIG_TMPFS=y |
| 901 | CONFIG_TMPFS_POSIX_ACL=y | ||
| 857 | # CONFIG_HUGETLB_PAGE is not set | 902 | # CONFIG_HUGETLB_PAGE is not set |
| 858 | CONFIG_RAMFS=y | ||
| 859 | CONFIG_CONFIGFS_FS=m | 903 | CONFIG_CONFIGFS_FS=m |
| 860 | 904 | ||
| 861 | # | 905 | # |
| @@ -871,14 +915,13 @@ CONFIG_CONFIGFS_FS=m | |||
| 871 | # CONFIG_EFS_FS is not set | 915 | # CONFIG_EFS_FS is not set |
| 872 | # CONFIG_CRAMFS is not set | 916 | # CONFIG_CRAMFS is not set |
| 873 | # CONFIG_VXFS_FS is not set | 917 | # CONFIG_VXFS_FS is not set |
| 918 | # CONFIG_MINIX_FS is not set | ||
| 874 | # CONFIG_HPFS_FS is not set | 919 | # CONFIG_HPFS_FS is not set |
| 875 | # CONFIG_QNX4FS_FS is not set | 920 | # CONFIG_QNX4FS_FS is not set |
| 921 | # CONFIG_ROMFS_FS is not set | ||
| 876 | # CONFIG_SYSV_FS is not set | 922 | # CONFIG_SYSV_FS is not set |
| 877 | # CONFIG_UFS_FS is not set | 923 | # CONFIG_UFS_FS is not set |
| 878 | 924 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 879 | # | ||
| 880 | # Network File Systems | ||
| 881 | # | ||
| 882 | CONFIG_NFS_FS=y | 925 | CONFIG_NFS_FS=y |
| 883 | CONFIG_NFS_V3=y | 926 | CONFIG_NFS_V3=y |
| 884 | # CONFIG_NFS_V3_ACL is not set | 927 | # CONFIG_NFS_V3_ACL is not set |
| @@ -890,6 +933,7 @@ CONFIG_LOCKD=y | |||
| 890 | CONFIG_LOCKD_V4=y | 933 | CONFIG_LOCKD_V4=y |
| 891 | CONFIG_NFS_COMMON=y | 934 | CONFIG_NFS_COMMON=y |
| 892 | CONFIG_SUNRPC=y | 935 | CONFIG_SUNRPC=y |
| 936 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 893 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 937 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 894 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 938 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 895 | # CONFIG_SMB_FS is not set | 939 | # CONFIG_SMB_FS is not set |
| @@ -897,45 +941,29 @@ CONFIG_SUNRPC=y | |||
| 897 | # CONFIG_NCP_FS is not set | 941 | # CONFIG_NCP_FS is not set |
| 898 | # CONFIG_CODA_FS is not set | 942 | # CONFIG_CODA_FS is not set |
| 899 | # CONFIG_AFS_FS is not set | 943 | # CONFIG_AFS_FS is not set |
| 900 | # CONFIG_9P_FS is not set | ||
| 901 | 944 | ||
| 902 | # | 945 | # |
| 903 | # Partition Types | 946 | # Partition Types |
| 904 | # | 947 | # |
| 905 | # CONFIG_PARTITION_ADVANCED is not set | 948 | # CONFIG_PARTITION_ADVANCED is not set |
| 906 | CONFIG_MSDOS_PARTITION=y | 949 | CONFIG_MSDOS_PARTITION=y |
| 907 | |||
| 908 | # | ||
| 909 | # Native Language Support | ||
| 910 | # | ||
| 911 | # CONFIG_NLS is not set | 950 | # CONFIG_NLS is not set |
| 912 | |||
| 913 | # | ||
| 914 | # Distributed Lock Manager | ||
| 915 | # | ||
| 916 | CONFIG_DLM=m | 951 | CONFIG_DLM=m |
| 917 | CONFIG_DLM_TCP=y | ||
| 918 | # CONFIG_DLM_SCTP is not set | ||
| 919 | # CONFIG_DLM_DEBUG is not set | 952 | # CONFIG_DLM_DEBUG is not set |
| 920 | 953 | ||
| 921 | # | 954 | # |
| 922 | # Profiling support | ||
| 923 | # | ||
| 924 | # CONFIG_PROFILING is not set | ||
| 925 | |||
| 926 | # | ||
| 927 | # Kernel hacking | 955 | # Kernel hacking |
| 928 | # | 956 | # |
| 929 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 957 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 930 | # CONFIG_PRINTK_TIME is not set | 958 | # CONFIG_PRINTK_TIME is not set |
| 959 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 931 | CONFIG_ENABLE_MUST_CHECK=y | 960 | CONFIG_ENABLE_MUST_CHECK=y |
| 932 | # CONFIG_MAGIC_SYSRQ is not set | 961 | # CONFIG_MAGIC_SYSRQ is not set |
| 933 | # CONFIG_UNUSED_SYMBOLS is not set | 962 | # CONFIG_UNUSED_SYMBOLS is not set |
| 934 | # CONFIG_DEBUG_FS is not set | 963 | # CONFIG_DEBUG_FS is not set |
| 935 | # CONFIG_HEADERS_CHECK is not set | 964 | # CONFIG_HEADERS_CHECK is not set |
| 936 | # CONFIG_DEBUG_KERNEL is not set | 965 | # CONFIG_DEBUG_KERNEL is not set |
| 937 | CONFIG_LOG_BUF_SHIFT=15 | 966 | # CONFIG_SAMPLES is not set |
| 938 | CONFIG_CROSSCOMPILE=y | ||
| 939 | CONFIG_CMDLINE="" | 967 | CONFIG_CMDLINE="" |
| 940 | CONFIG_SYS_SUPPORTS_KGDB=y | 968 | CONFIG_SYS_SUPPORTS_KGDB=y |
| 941 | # CONFIG_SB1XXX_CORELIS is not set | 969 | # CONFIG_SB1XXX_CORELIS is not set |
| @@ -946,13 +974,12 @@ CONFIG_SYS_SUPPORTS_KGDB=y | |||
| 946 | CONFIG_KEYS=y | 974 | CONFIG_KEYS=y |
| 947 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 975 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 948 | # CONFIG_SECURITY is not set | 976 | # CONFIG_SECURITY is not set |
| 949 | 977 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
| 950 | # | ||
| 951 | # Cryptographic options | ||
| 952 | # | ||
| 953 | CONFIG_CRYPTO=y | 978 | CONFIG_CRYPTO=y |
| 954 | CONFIG_CRYPTO_ALGAPI=y | 979 | CONFIG_CRYPTO_ALGAPI=y |
| 980 | CONFIG_CRYPTO_AEAD=m | ||
| 955 | CONFIG_CRYPTO_BLKCIPHER=m | 981 | CONFIG_CRYPTO_BLKCIPHER=m |
| 982 | CONFIG_CRYPTO_SEQIV=m | ||
| 956 | CONFIG_CRYPTO_HASH=y | 983 | CONFIG_CRYPTO_HASH=y |
| 957 | CONFIG_CRYPTO_MANAGER=y | 984 | CONFIG_CRYPTO_MANAGER=y |
| 958 | CONFIG_CRYPTO_HMAC=y | 985 | CONFIG_CRYPTO_HMAC=y |
| @@ -970,6 +997,11 @@ CONFIG_CRYPTO_ECB=m | |||
| 970 | CONFIG_CRYPTO_CBC=m | 997 | CONFIG_CRYPTO_CBC=m |
| 971 | CONFIG_CRYPTO_PCBC=m | 998 | CONFIG_CRYPTO_PCBC=m |
| 972 | CONFIG_CRYPTO_LRW=m | 999 | CONFIG_CRYPTO_LRW=m |
| 1000 | CONFIG_CRYPTO_XTS=m | ||
| 1001 | CONFIG_CRYPTO_CTR=m | ||
| 1002 | CONFIG_CRYPTO_GCM=m | ||
| 1003 | CONFIG_CRYPTO_CCM=m | ||
| 1004 | CONFIG_CRYPTO_CRYPTD=m | ||
| 973 | CONFIG_CRYPTO_DES=m | 1005 | CONFIG_CRYPTO_DES=m |
| 974 | CONFIG_CRYPTO_FCRYPT=m | 1006 | CONFIG_CRYPTO_FCRYPT=m |
| 975 | CONFIG_CRYPTO_BLOWFISH=m | 1007 | CONFIG_CRYPTO_BLOWFISH=m |
| @@ -983,15 +1015,16 @@ CONFIG_CRYPTO_TEA=m | |||
| 983 | CONFIG_CRYPTO_ARC4=m | 1015 | CONFIG_CRYPTO_ARC4=m |
| 984 | CONFIG_CRYPTO_KHAZAD=m | 1016 | CONFIG_CRYPTO_KHAZAD=m |
| 985 | CONFIG_CRYPTO_ANUBIS=m | 1017 | CONFIG_CRYPTO_ANUBIS=m |
| 1018 | CONFIG_CRYPTO_SEED=m | ||
| 1019 | CONFIG_CRYPTO_SALSA20=m | ||
| 986 | CONFIG_CRYPTO_DEFLATE=m | 1020 | CONFIG_CRYPTO_DEFLATE=m |
| 987 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1021 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 988 | CONFIG_CRYPTO_CRC32C=m | 1022 | CONFIG_CRYPTO_CRC32C=m |
| 989 | CONFIG_CRYPTO_CAMELLIA=m | 1023 | CONFIG_CRYPTO_CAMELLIA=m |
| 990 | # CONFIG_CRYPTO_TEST is not set | 1024 | # CONFIG_CRYPTO_TEST is not set |
| 991 | 1025 | CONFIG_CRYPTO_AUTHENC=m | |
| 992 | # | 1026 | CONFIG_CRYPTO_LZO=m |
| 993 | # Hardware crypto devices | 1027 | # CONFIG_CRYPTO_HW is not set |
| 994 | # | ||
| 995 | 1028 | ||
| 996 | # | 1029 | # |
| 997 | # Library routines | 1030 | # Library routines |
| @@ -999,10 +1032,15 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
| 999 | CONFIG_BITREVERSE=y | 1032 | CONFIG_BITREVERSE=y |
| 1000 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1001 | CONFIG_CRC16=m | 1034 | CONFIG_CRC16=m |
| 1035 | # CONFIG_CRC_ITU_T is not set | ||
| 1002 | CONFIG_CRC32=y | 1036 | CONFIG_CRC32=y |
| 1037 | # CONFIG_CRC7 is not set | ||
| 1003 | CONFIG_LIBCRC32C=m | 1038 | CONFIG_LIBCRC32C=m |
| 1004 | CONFIG_ZLIB_INFLATE=m | 1039 | CONFIG_ZLIB_INFLATE=m |
| 1005 | CONFIG_ZLIB_DEFLATE=m | 1040 | CONFIG_ZLIB_DEFLATE=m |
| 1041 | CONFIG_LZO_COMPRESS=m | ||
| 1042 | CONFIG_LZO_DECOMPRESS=m | ||
| 1006 | CONFIG_PLIST=y | 1043 | CONFIG_PLIST=y |
| 1007 | CONFIG_HAS_IOMEM=y | 1044 | CONFIG_HAS_IOMEM=y |
| 1008 | CONFIG_HAS_IOPORT=y | 1045 | CONFIG_HAS_IOPORT=y |
| 1046 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig index af82e1a1823c..8dd3ae39bcad 100644 --- a/arch/mips/configs/tb0219_defconfig +++ b/arch/mips/configs/tb0219_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Wed Aug 8 16:11:47 2007 | 4 | # Mon May 12 11:54:51 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,23 +171,29 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| 168 | CONFIG_EMBEDDED=y | 186 | CONFIG_EMBEDDED=y |
| 169 | CONFIG_SYSCTL_SYSCALL=y | 187 | CONFIG_SYSCTL_SYSCALL=y |
| 188 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 170 | CONFIG_KALLSYMS=y | 189 | CONFIG_KALLSYMS=y |
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 190 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 172 | CONFIG_HOTPLUG=y | 191 | CONFIG_HOTPLUG=y |
| 173 | CONFIG_PRINTK=y | 192 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 193 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 194 | CONFIG_ELF_CORE=y |
| 195 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 196 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 197 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 198 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 199 | CONFIG_ANON_INODES=y |
| @@ -185,10 +206,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 206 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 207 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 208 | # CONFIG_SLOB is not set |
| 209 | # CONFIG_PROFILING is not set | ||
| 210 | # CONFIG_MARKERS is not set | ||
| 211 | CONFIG_HAVE_OPROFILE=y | ||
| 212 | # CONFIG_HAVE_KPROBES is not set | ||
| 213 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 214 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 215 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 216 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 217 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 218 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 219 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 220 | CONFIG_MODULES=y |
| 221 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 222 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 223 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 224 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +242,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 242 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 243 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 244 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 245 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 246 | ||
| 216 | # | 247 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 248 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 249 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 250 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 251 | CONFIG_PCI=y |
| 252 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 253 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 254 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 256 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 257 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 258 | ||
| @@ -237,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 266 | # |
| 238 | # Power management options | 267 | # Power management options |
| 239 | # | 268 | # |
| 269 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 270 | # CONFIG_PM is not set |
| 241 | 271 | ||
| 242 | # | 272 | # |
| @@ -278,6 +308,7 @@ CONFIG_INET_TUNNEL=m | |||
| 278 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 308 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 279 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 309 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 280 | # CONFIG_INET_XFRM_MODE_BEET is not set | 310 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 311 | # CONFIG_INET_LRO is not set | ||
| 281 | CONFIG_INET_DIAG=y | 312 | CONFIG_INET_DIAG=y |
| 282 | CONFIG_INET_TCP_DIAG=y | 313 | CONFIG_INET_TCP_DIAG=y |
| 283 | # CONFIG_TCP_CONG_ADVANCED is not set | 314 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -285,15 +316,10 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 285 | CONFIG_DEFAULT_TCP_CONG="cubic" | 316 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 286 | # CONFIG_TCP_MD5SIG is not set | 317 | # CONFIG_TCP_MD5SIG is not set |
| 287 | # CONFIG_IPV6 is not set | 318 | # CONFIG_IPV6 is not set |
| 288 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 289 | # CONFIG_INET6_TUNNEL is not set | ||
| 290 | CONFIG_NETWORK_SECMARK=y | 319 | CONFIG_NETWORK_SECMARK=y |
| 291 | # CONFIG_NETFILTER is not set | 320 | # CONFIG_NETFILTER is not set |
| 292 | # CONFIG_IP_DCCP is not set | 321 | # CONFIG_IP_DCCP is not set |
| 293 | # CONFIG_IP_SCTP is not set | 322 | # CONFIG_IP_SCTP is not set |
| 294 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 295 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 296 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
| 297 | # CONFIG_TIPC is not set | 323 | # CONFIG_TIPC is not set |
| 298 | # CONFIG_ATM is not set | 324 | # CONFIG_ATM is not set |
| 299 | # CONFIG_BRIDGE is not set | 325 | # CONFIG_BRIDGE is not set |
| @@ -306,10 +332,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 306 | # CONFIG_LAPB is not set | 332 | # CONFIG_LAPB is not set |
| 307 | # CONFIG_ECONET is not set | 333 | # CONFIG_ECONET is not set |
| 308 | # CONFIG_WAN_ROUTER is not set | 334 | # CONFIG_WAN_ROUTER is not set |
| 309 | |||
| 310 | # | ||
| 311 | # QoS and/or fair queueing | ||
| 312 | # | ||
| 313 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
| 314 | 336 | ||
| 315 | # | 337 | # |
| @@ -317,6 +339,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 317 | # | 339 | # |
| 318 | # CONFIG_NET_PKTGEN is not set | 340 | # CONFIG_NET_PKTGEN is not set |
| 319 | # CONFIG_HAMRADIO is not set | 341 | # CONFIG_HAMRADIO is not set |
| 342 | # CONFIG_CAN is not set | ||
| 320 | # CONFIG_IRDA is not set | 343 | # CONFIG_IRDA is not set |
| 321 | # CONFIG_BT is not set | 344 | # CONFIG_BT is not set |
| 322 | # CONFIG_AF_RXRPC is not set | 345 | # CONFIG_AF_RXRPC is not set |
| @@ -339,6 +362,7 @@ CONFIG_FIB_RULES=y | |||
| 339 | # | 362 | # |
| 340 | # Generic Driver Options | 363 | # Generic Driver Options |
| 341 | # | 364 | # |
| 365 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 342 | CONFIG_STANDALONE=y | 366 | CONFIG_STANDALONE=y |
| 343 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 367 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 344 | CONFIG_FW_LOADER=m | 368 | CONFIG_FW_LOADER=m |
| @@ -360,10 +384,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 360 | CONFIG_BLK_DEV_RAM=y | 384 | CONFIG_BLK_DEV_RAM=y |
| 361 | CONFIG_BLK_DEV_RAM_COUNT=16 | 385 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 362 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 386 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 363 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 387 | CONFIG_BLK_DEV_XIP=y |
| 364 | # CONFIG_CDROM_PKTCDVD is not set | 388 | # CONFIG_CDROM_PKTCDVD is not set |
| 365 | # CONFIG_ATA_OVER_ETH is not set | 389 | # CONFIG_ATA_OVER_ETH is not set |
| 366 | # CONFIG_MISC_DEVICES is not set | 390 | # CONFIG_MISC_DEVICES is not set |
| 391 | CONFIG_HAVE_IDE=y | ||
| 367 | # CONFIG_IDE is not set | 392 | # CONFIG_IDE is not set |
| 368 | 393 | ||
| 369 | # | 394 | # |
| @@ -375,10 +400,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 375 | # CONFIG_SCSI_NETLINK is not set | 400 | # CONFIG_SCSI_NETLINK is not set |
| 376 | # CONFIG_ATA is not set | 401 | # CONFIG_ATA is not set |
| 377 | # CONFIG_MD is not set | 402 | # CONFIG_MD is not set |
| 378 | |||
| 379 | # | ||
| 380 | # Fusion MPT device support | ||
| 381 | # | ||
| 382 | # CONFIG_FUSION is not set | 403 | # CONFIG_FUSION is not set |
| 383 | 404 | ||
| 384 | # | 405 | # |
| @@ -394,6 +415,7 @@ CONFIG_NETDEVICES=y | |||
| 394 | # CONFIG_MACVLAN is not set | 415 | # CONFIG_MACVLAN is not set |
| 395 | # CONFIG_EQUALIZER is not set | 416 | # CONFIG_EQUALIZER is not set |
| 396 | # CONFIG_TUN is not set | 417 | # CONFIG_TUN is not set |
| 418 | # CONFIG_VETH is not set | ||
| 397 | # CONFIG_ARCNET is not set | 419 | # CONFIG_ARCNET is not set |
| 398 | CONFIG_PHYLIB=m | 420 | CONFIG_PHYLIB=m |
| 399 | 421 | ||
| @@ -409,7 +431,8 @@ CONFIG_VITESSE_PHY=m | |||
| 409 | CONFIG_SMSC_PHY=m | 431 | CONFIG_SMSC_PHY=m |
| 410 | # CONFIG_BROADCOM_PHY is not set | 432 | # CONFIG_BROADCOM_PHY is not set |
| 411 | # CONFIG_ICPLUS_PHY is not set | 433 | # CONFIG_ICPLUS_PHY is not set |
| 412 | # CONFIG_FIXED_PHY is not set | 434 | # CONFIG_REALTEK_PHY is not set |
| 435 | # CONFIG_MDIO_BITBANG is not set | ||
| 413 | CONFIG_NET_ETHERNET=y | 436 | CONFIG_NET_ETHERNET=y |
| 414 | CONFIG_MII=y | 437 | CONFIG_MII=y |
| 415 | # CONFIG_AX88796 is not set | 438 | # CONFIG_AX88796 is not set |
| @@ -420,6 +443,10 @@ CONFIG_MII=y | |||
| 420 | # CONFIG_DM9000 is not set | 443 | # CONFIG_DM9000 is not set |
| 421 | # CONFIG_NET_TULIP is not set | 444 | # CONFIG_NET_TULIP is not set |
| 422 | # CONFIG_HP100 is not set | 445 | # CONFIG_HP100 is not set |
| 446 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 447 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 448 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 449 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 423 | CONFIG_NET_PCI=y | 450 | CONFIG_NET_PCI=y |
| 424 | # CONFIG_PCNET32 is not set | 451 | # CONFIG_PCNET32 is not set |
| 425 | # CONFIG_AMD8111_ETH is not set | 452 | # CONFIG_AMD8111_ETH is not set |
| @@ -427,7 +454,6 @@ CONFIG_NET_PCI=y | |||
| 427 | # CONFIG_B44 is not set | 454 | # CONFIG_B44 is not set |
| 428 | # CONFIG_FORCEDETH is not set | 455 | # CONFIG_FORCEDETH is not set |
| 429 | # CONFIG_TC35815 is not set | 456 | # CONFIG_TC35815 is not set |
| 430 | # CONFIG_DGRS is not set | ||
| 431 | # CONFIG_EEPRO100 is not set | 457 | # CONFIG_EEPRO100 is not set |
| 432 | # CONFIG_E100 is not set | 458 | # CONFIG_E100 is not set |
| 433 | # CONFIG_FEALNX is not set | 459 | # CONFIG_FEALNX is not set |
| @@ -439,6 +465,7 @@ CONFIG_8139TOO_PIO=y | |||
| 439 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 465 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 440 | # CONFIG_8139TOO_8129 is not set | 466 | # CONFIG_8139TOO_8129 is not set |
| 441 | # CONFIG_8139_OLD_RX_RESET is not set | 467 | # CONFIG_8139_OLD_RX_RESET is not set |
| 468 | # CONFIG_R6040 is not set | ||
| 442 | # CONFIG_SIS900 is not set | 469 | # CONFIG_SIS900 is not set |
| 443 | # CONFIG_EPIC100 is not set | 470 | # CONFIG_EPIC100 is not set |
| 444 | # CONFIG_SUNDANCE is not set | 471 | # CONFIG_SUNDANCE is not set |
| @@ -451,6 +478,10 @@ CONFIG_NETDEV_1000=y | |||
| 451 | # CONFIG_ACENIC is not set | 478 | # CONFIG_ACENIC is not set |
| 452 | # CONFIG_DL2K is not set | 479 | # CONFIG_DL2K is not set |
| 453 | # CONFIG_E1000 is not set | 480 | # CONFIG_E1000 is not set |
| 481 | # CONFIG_E1000E is not set | ||
| 482 | # CONFIG_E1000E_ENABLED is not set | ||
| 483 | # CONFIG_IP1000 is not set | ||
| 484 | # CONFIG_IGB is not set | ||
| 454 | # CONFIG_NS83820 is not set | 485 | # CONFIG_NS83820 is not set |
| 455 | # CONFIG_HAMACHI is not set | 486 | # CONFIG_HAMACHI is not set |
| 456 | # CONFIG_YELLOWFIN is not set | 487 | # CONFIG_YELLOWFIN is not set |
| @@ -472,6 +503,7 @@ CONFIG_VIA_VELOCITY=y | |||
| 472 | # | 503 | # |
| 473 | # CONFIG_WLAN_PRE80211 is not set | 504 | # CONFIG_WLAN_PRE80211 is not set |
| 474 | # CONFIG_WLAN_80211 is not set | 505 | # CONFIG_WLAN_80211 is not set |
| 506 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 475 | 507 | ||
| 476 | # | 508 | # |
| 477 | # USB Network Adapters | 509 | # USB Network Adapters |
| @@ -480,14 +512,12 @@ CONFIG_VIA_VELOCITY=y | |||
| 480 | # CONFIG_USB_KAWETH is not set | 512 | # CONFIG_USB_KAWETH is not set |
| 481 | # CONFIG_USB_PEGASUS is not set | 513 | # CONFIG_USB_PEGASUS is not set |
| 482 | # CONFIG_USB_RTL8150 is not set | 514 | # CONFIG_USB_RTL8150 is not set |
| 483 | # CONFIG_USB_USBNET_MII is not set | ||
| 484 | # CONFIG_USB_USBNET is not set | 515 | # CONFIG_USB_USBNET is not set |
| 485 | # CONFIG_WAN is not set | 516 | # CONFIG_WAN is not set |
| 486 | # CONFIG_FDDI is not set | 517 | # CONFIG_FDDI is not set |
| 487 | # CONFIG_HIPPI is not set | 518 | # CONFIG_HIPPI is not set |
| 488 | # CONFIG_PPP is not set | 519 | # CONFIG_PPP is not set |
| 489 | # CONFIG_SLIP is not set | 520 | # CONFIG_SLIP is not set |
| 490 | # CONFIG_SHAPER is not set | ||
| 491 | # CONFIG_NETCONSOLE is not set | 521 | # CONFIG_NETCONSOLE is not set |
| 492 | # CONFIG_NETPOLL is not set | 522 | # CONFIG_NETPOLL is not set |
| 493 | # CONFIG_NET_POLL_CONTROLLER is not set | 523 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -506,7 +536,6 @@ CONFIG_INPUT=y | |||
| 506 | # | 536 | # |
| 507 | # CONFIG_INPUT_MOUSEDEV is not set | 537 | # CONFIG_INPUT_MOUSEDEV is not set |
| 508 | # CONFIG_INPUT_JOYDEV is not set | 538 | # CONFIG_INPUT_JOYDEV is not set |
| 509 | # CONFIG_INPUT_TSDEV is not set | ||
| 510 | # CONFIG_INPUT_EVDEV is not set | 539 | # CONFIG_INPUT_EVDEV is not set |
| 511 | # CONFIG_INPUT_EVBUG is not set | 540 | # CONFIG_INPUT_EVBUG is not set |
| 512 | 541 | ||
| @@ -533,7 +562,9 @@ CONFIG_VT=y | |||
| 533 | CONFIG_VT_CONSOLE=y | 562 | CONFIG_VT_CONSOLE=y |
| 534 | CONFIG_HW_CONSOLE=y | 563 | CONFIG_HW_CONSOLE=y |
| 535 | CONFIG_VT_HW_CONSOLE_BINDING=y | 564 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 565 | # CONFIG_DEVKMEM is not set | ||
| 536 | # CONFIG_SERIAL_NONSTANDARD is not set | 566 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 567 | # CONFIG_NOZOMI is not set | ||
| 537 | 568 | ||
| 538 | # | 569 | # |
| 539 | # Serial drivers | 570 | # Serial drivers |
| @@ -552,52 +583,62 @@ CONFIG_UNIX98_PTYS=y | |||
| 552 | CONFIG_LEGACY_PTYS=y | 583 | CONFIG_LEGACY_PTYS=y |
| 553 | CONFIG_LEGACY_PTY_COUNT=256 | 584 | CONFIG_LEGACY_PTY_COUNT=256 |
| 554 | # CONFIG_IPMI_HANDLER is not set | 585 | # CONFIG_IPMI_HANDLER is not set |
| 555 | # CONFIG_WATCHDOG is not set | ||
| 556 | # CONFIG_HW_RANDOM is not set | 586 | # CONFIG_HW_RANDOM is not set |
| 557 | # CONFIG_RTC is not set | ||
| 558 | # CONFIG_R3964 is not set | 587 | # CONFIG_R3964 is not set |
| 559 | # CONFIG_APPLICOM is not set | 588 | # CONFIG_APPLICOM is not set |
| 560 | CONFIG_GPIO_TB0219=y | 589 | CONFIG_GPIO_TB0219=y |
| 561 | # CONFIG_DRM is not set | ||
| 562 | CONFIG_GPIO_VR41XX=y | 590 | CONFIG_GPIO_VR41XX=y |
| 563 | # CONFIG_RAW_DRIVER is not set | 591 | # CONFIG_RAW_DRIVER is not set |
| 564 | # CONFIG_TCG_TPM is not set | 592 | # CONFIG_TCG_TPM is not set |
| 565 | CONFIG_DEVPORT=y | 593 | CONFIG_DEVPORT=y |
| 566 | # CONFIG_I2C is not set | 594 | # CONFIG_I2C is not set |
| 567 | |||
| 568 | # | ||
| 569 | # SPI support | ||
| 570 | # | ||
| 571 | # CONFIG_SPI is not set | 595 | # CONFIG_SPI is not set |
| 572 | # CONFIG_SPI_MASTER is not set | ||
| 573 | # CONFIG_W1 is not set | 596 | # CONFIG_W1 is not set |
| 574 | # CONFIG_POWER_SUPPLY is not set | 597 | # CONFIG_POWER_SUPPLY is not set |
| 575 | # CONFIG_HWMON is not set | 598 | # CONFIG_HWMON is not set |
| 599 | # CONFIG_THERMAL is not set | ||
| 600 | # CONFIG_WATCHDOG is not set | ||
| 601 | |||
| 602 | # | ||
| 603 | # Sonics Silicon Backplane | ||
| 604 | # | ||
| 605 | CONFIG_SSB_POSSIBLE=y | ||
| 606 | # CONFIG_SSB is not set | ||
| 576 | 607 | ||
| 577 | # | 608 | # |
| 578 | # Multifunction device drivers | 609 | # Multifunction device drivers |
| 579 | # | 610 | # |
| 580 | # CONFIG_MFD_SM501 is not set | 611 | # CONFIG_MFD_SM501 is not set |
| 612 | # CONFIG_HTC_PASIC3 is not set | ||
| 581 | 613 | ||
| 582 | # | 614 | # |
| 583 | # Multimedia devices | 615 | # Multimedia devices |
| 584 | # | 616 | # |
| 617 | |||
| 618 | # | ||
| 619 | # Multimedia core support | ||
| 620 | # | ||
| 585 | # CONFIG_VIDEO_DEV is not set | 621 | # CONFIG_VIDEO_DEV is not set |
| 586 | # CONFIG_DVB_CORE is not set | 622 | # CONFIG_DVB_CORE is not set |
| 623 | |||
| 624 | # | ||
| 625 | # Multimedia drivers | ||
| 626 | # | ||
| 587 | # CONFIG_DAB is not set | 627 | # CONFIG_DAB is not set |
| 588 | 628 | ||
| 589 | # | 629 | # |
| 590 | # Graphics support | 630 | # Graphics support |
| 591 | # | 631 | # |
| 632 | # CONFIG_DRM is not set | ||
| 633 | # CONFIG_VGASTATE is not set | ||
| 634 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 635 | # CONFIG_FB is not set | ||
| 592 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 636 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 593 | 637 | ||
| 594 | # | 638 | # |
| 595 | # Display device support | 639 | # Display device support |
| 596 | # | 640 | # |
| 597 | # CONFIG_DISPLAY_SUPPORT is not set | 641 | # CONFIG_DISPLAY_SUPPORT is not set |
| 598 | # CONFIG_VGASTATE is not set | ||
| 599 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 600 | # CONFIG_FB is not set | ||
| 601 | 642 | ||
| 602 | # | 643 | # |
| 603 | # Console display driver support | 644 | # Console display driver support |
| @@ -616,6 +657,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 616 | CONFIG_USB_ARCH_HAS_EHCI=y | 657 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 617 | CONFIG_USB=m | 658 | CONFIG_USB=m |
| 618 | # CONFIG_USB_DEBUG is not set | 659 | # CONFIG_USB_DEBUG is not set |
| 660 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 619 | 661 | ||
| 620 | # | 662 | # |
| 621 | # Miscellaneous USB options | 663 | # Miscellaneous USB options |
| @@ -624,15 +666,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 624 | CONFIG_USB_DEVICE_CLASS=y | 666 | CONFIG_USB_DEVICE_CLASS=y |
| 625 | # CONFIG_USB_DYNAMIC_MINORS is not set | 667 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 626 | # CONFIG_USB_OTG is not set | 668 | # CONFIG_USB_OTG is not set |
| 669 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 670 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 627 | 671 | ||
| 628 | # | 672 | # |
| 629 | # USB Host Controller Drivers | 673 | # USB Host Controller Drivers |
| 630 | # | 674 | # |
| 675 | # CONFIG_USB_C67X00_HCD is not set | ||
| 631 | CONFIG_USB_EHCI_HCD=m | 676 | CONFIG_USB_EHCI_HCD=m |
| 632 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 633 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 677 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 634 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 678 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 635 | # CONFIG_USB_ISP116X_HCD is not set | 679 | # CONFIG_USB_ISP116X_HCD is not set |
| 680 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 636 | CONFIG_USB_OHCI_HCD=m | 681 | CONFIG_USB_OHCI_HCD=m |
| 637 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 682 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 638 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 683 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -665,10 +710,6 @@ CONFIG_USB_MON=y | |||
| 665 | # | 710 | # |
| 666 | # USB port drivers | 711 | # USB port drivers |
| 667 | # | 712 | # |
| 668 | |||
| 669 | # | ||
| 670 | # USB Serial Converter support | ||
| 671 | # | ||
| 672 | # CONFIG_USB_SERIAL is not set | 713 | # CONFIG_USB_SERIAL is not set |
| 673 | 714 | ||
| 674 | # | 715 | # |
| @@ -694,17 +735,11 @@ CONFIG_USB_MON=y | |||
| 694 | # CONFIG_USB_TRANCEVIBRATOR is not set | 735 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 695 | # CONFIG_USB_IOWARRIOR is not set | 736 | # CONFIG_USB_IOWARRIOR is not set |
| 696 | # CONFIG_USB_TEST is not set | 737 | # CONFIG_USB_TEST is not set |
| 697 | |||
| 698 | # | ||
| 699 | # USB DSL modem support | ||
| 700 | # | ||
| 701 | |||
| 702 | # | ||
| 703 | # USB Gadget Support | ||
| 704 | # | ||
| 705 | # CONFIG_USB_GADGET is not set | 738 | # CONFIG_USB_GADGET is not set |
| 706 | # CONFIG_MMC is not set | 739 | # CONFIG_MMC is not set |
| 740 | # CONFIG_MEMSTICK is not set | ||
| 707 | # CONFIG_NEW_LEDS is not set | 741 | # CONFIG_NEW_LEDS is not set |
| 742 | # CONFIG_ACCESSIBILITY is not set | ||
| 708 | # CONFIG_INFINIBAND is not set | 743 | # CONFIG_INFINIBAND is not set |
| 709 | CONFIG_RTC_LIB=y | 744 | CONFIG_RTC_LIB=y |
| 710 | CONFIG_RTC_CLASS=y | 745 | CONFIG_RTC_CLASS=y |
| @@ -729,9 +764,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 729 | # Platform RTC drivers | 764 | # Platform RTC drivers |
| 730 | # | 765 | # |
| 731 | # CONFIG_RTC_DRV_CMOS is not set | 766 | # CONFIG_RTC_DRV_CMOS is not set |
| 767 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 732 | # CONFIG_RTC_DRV_DS1553 is not set | 768 | # CONFIG_RTC_DRV_DS1553 is not set |
| 733 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 734 | # CONFIG_RTC_DRV_DS1742 is not set | 769 | # CONFIG_RTC_DRV_DS1742 is not set |
| 770 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 735 | # CONFIG_RTC_DRV_M48T86 is not set | 771 | # CONFIG_RTC_DRV_M48T86 is not set |
| 736 | # CONFIG_RTC_DRV_M48T59 is not set | 772 | # CONFIG_RTC_DRV_M48T59 is not set |
| 737 | # CONFIG_RTC_DRV_V3020 is not set | 773 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -740,23 +776,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 740 | # on-CPU RTC drivers | 776 | # on-CPU RTC drivers |
| 741 | # | 777 | # |
| 742 | CONFIG_RTC_DRV_VR41XX=y | 778 | CONFIG_RTC_DRV_VR41XX=y |
| 743 | |||
| 744 | # | ||
| 745 | # DMA Engine support | ||
| 746 | # | ||
| 747 | # CONFIG_DMA_ENGINE is not set | ||
| 748 | |||
| 749 | # | ||
| 750 | # DMA Clients | ||
| 751 | # | ||
| 752 | |||
| 753 | # | ||
| 754 | # DMA Devices | ||
| 755 | # | ||
| 756 | |||
| 757 | # | ||
| 758 | # Userspace I/O | ||
| 759 | # | ||
| 760 | # CONFIG_UIO is not set | 779 | # CONFIG_UIO is not set |
| 761 | 780 | ||
| 762 | # | 781 | # |
| @@ -771,20 +790,16 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 771 | # CONFIG_EXT3_FS_SECURITY is not set | 790 | # CONFIG_EXT3_FS_SECURITY is not set |
| 772 | # CONFIG_EXT4DEV_FS is not set | 791 | # CONFIG_EXT4DEV_FS is not set |
| 773 | CONFIG_JBD=y | 792 | CONFIG_JBD=y |
| 774 | # CONFIG_JBD_DEBUG is not set | ||
| 775 | CONFIG_FS_MBCACHE=y | 793 | CONFIG_FS_MBCACHE=y |
| 776 | # CONFIG_REISERFS_FS is not set | 794 | # CONFIG_REISERFS_FS is not set |
| 777 | # CONFIG_JFS_FS is not set | 795 | # CONFIG_JFS_FS is not set |
| 778 | CONFIG_FS_POSIX_ACL=y | 796 | CONFIG_FS_POSIX_ACL=y |
| 779 | # CONFIG_XFS_FS is not set | 797 | # CONFIG_XFS_FS is not set |
| 780 | # CONFIG_GFS2_FS is not set | ||
| 781 | # CONFIG_OCFS2_FS is not set | 798 | # CONFIG_OCFS2_FS is not set |
| 782 | # CONFIG_MINIX_FS is not set | 799 | CONFIG_DNOTIFY=y |
| 783 | CONFIG_ROMFS_FS=m | ||
| 784 | CONFIG_INOTIFY=y | 800 | CONFIG_INOTIFY=y |
| 785 | CONFIG_INOTIFY_USER=y | 801 | CONFIG_INOTIFY_USER=y |
| 786 | # CONFIG_QUOTA is not set | 802 | # CONFIG_QUOTA is not set |
| 787 | CONFIG_DNOTIFY=y | ||
| 788 | # CONFIG_AUTOFS_FS is not set | 803 | # CONFIG_AUTOFS_FS is not set |
| 789 | CONFIG_AUTOFS4_FS=y | 804 | CONFIG_AUTOFS4_FS=y |
| 790 | # CONFIG_FUSE_FS is not set | 805 | # CONFIG_FUSE_FS is not set |
| @@ -813,7 +828,6 @@ CONFIG_SYSFS=y | |||
| 813 | CONFIG_TMPFS=y | 828 | CONFIG_TMPFS=y |
| 814 | CONFIG_TMPFS_POSIX_ACL=y | 829 | CONFIG_TMPFS_POSIX_ACL=y |
| 815 | # CONFIG_HUGETLB_PAGE is not set | 830 | # CONFIG_HUGETLB_PAGE is not set |
| 816 | CONFIG_RAMFS=y | ||
| 817 | # CONFIG_CONFIGFS_FS is not set | 831 | # CONFIG_CONFIGFS_FS is not set |
| 818 | 832 | ||
| 819 | # | 833 | # |
| @@ -828,24 +842,21 @@ CONFIG_RAMFS=y | |||
| 828 | # CONFIG_EFS_FS is not set | 842 | # CONFIG_EFS_FS is not set |
| 829 | CONFIG_CRAMFS=m | 843 | CONFIG_CRAMFS=m |
| 830 | # CONFIG_VXFS_FS is not set | 844 | # CONFIG_VXFS_FS is not set |
| 845 | # CONFIG_MINIX_FS is not set | ||
| 831 | # CONFIG_HPFS_FS is not set | 846 | # CONFIG_HPFS_FS is not set |
| 832 | # CONFIG_QNX4FS_FS is not set | 847 | # CONFIG_QNX4FS_FS is not set |
| 848 | CONFIG_ROMFS_FS=m | ||
| 833 | # CONFIG_SYSV_FS is not set | 849 | # CONFIG_SYSV_FS is not set |
| 834 | # CONFIG_UFS_FS is not set | 850 | # CONFIG_UFS_FS is not set |
| 835 | 851 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 836 | # | ||
| 837 | # Network File Systems | ||
| 838 | # | ||
| 839 | CONFIG_NFS_FS=y | 852 | CONFIG_NFS_FS=y |
| 840 | CONFIG_NFS_V3=y | 853 | CONFIG_NFS_V3=y |
| 841 | # CONFIG_NFS_V3_ACL is not set | 854 | # CONFIG_NFS_V3_ACL is not set |
| 842 | # CONFIG_NFS_V4 is not set | 855 | # CONFIG_NFS_V4 is not set |
| 843 | # CONFIG_NFS_DIRECTIO is not set | ||
| 844 | CONFIG_NFSD=y | 856 | CONFIG_NFSD=y |
| 845 | CONFIG_NFSD_V3=y | 857 | CONFIG_NFSD_V3=y |
| 846 | # CONFIG_NFSD_V3_ACL is not set | 858 | # CONFIG_NFSD_V3_ACL is not set |
| 847 | # CONFIG_NFSD_V4 is not set | 859 | # CONFIG_NFSD_V4 is not set |
| 848 | CONFIG_NFSD_TCP=y | ||
| 849 | CONFIG_ROOT_NFS=y | 860 | CONFIG_ROOT_NFS=y |
| 850 | CONFIG_LOCKD=y | 861 | CONFIG_LOCKD=y |
| 851 | CONFIG_LOCKD_V4=y | 862 | CONFIG_LOCKD_V4=y |
| @@ -866,47 +877,38 @@ CONFIG_SUNRPC=y | |||
| 866 | # | 877 | # |
| 867 | # CONFIG_PARTITION_ADVANCED is not set | 878 | # CONFIG_PARTITION_ADVANCED is not set |
| 868 | CONFIG_MSDOS_PARTITION=y | 879 | CONFIG_MSDOS_PARTITION=y |
| 869 | |||
| 870 | # | ||
| 871 | # Native Language Support | ||
| 872 | # | ||
| 873 | # CONFIG_NLS is not set | 880 | # CONFIG_NLS is not set |
| 874 | |||
| 875 | # | ||
| 876 | # Distributed Lock Manager | ||
| 877 | # | ||
| 878 | # CONFIG_DLM is not set | 881 | # CONFIG_DLM is not set |
| 879 | 882 | ||
| 880 | # | 883 | # |
| 881 | # Profiling support | ||
| 882 | # | ||
| 883 | # CONFIG_PROFILING is not set | ||
| 884 | |||
| 885 | # | ||
| 886 | # Kernel hacking | 884 | # Kernel hacking |
| 887 | # | 885 | # |
| 888 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 886 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 889 | # CONFIG_PRINTK_TIME is not set | 887 | # CONFIG_PRINTK_TIME is not set |
| 888 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 890 | CONFIG_ENABLE_MUST_CHECK=y | 889 | CONFIG_ENABLE_MUST_CHECK=y |
| 890 | CONFIG_FRAME_WARN=1024 | ||
| 891 | # CONFIG_MAGIC_SYSRQ is not set | 891 | # CONFIG_MAGIC_SYSRQ is not set |
| 892 | # CONFIG_UNUSED_SYMBOLS is not set | 892 | # CONFIG_UNUSED_SYMBOLS is not set |
| 893 | # CONFIG_DEBUG_FS is not set | 893 | # CONFIG_DEBUG_FS is not set |
| 894 | # CONFIG_HEADERS_CHECK is not set | 894 | # CONFIG_HEADERS_CHECK is not set |
| 895 | # CONFIG_DEBUG_KERNEL is not set | 895 | # CONFIG_DEBUG_KERNEL is not set |
| 896 | CONFIG_CROSSCOMPILE=y | 896 | # CONFIG_SAMPLES is not set |
| 897 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 897 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 898 | 898 | ||
| 899 | # | 899 | # |
| 900 | # Security options | 900 | # Security options |
| 901 | # | 901 | # |
| 902 | # CONFIG_KEYS is not set | 902 | # CONFIG_KEYS is not set |
| 903 | # CONFIG_SECURITY is not set | 903 | # CONFIG_SECURITY is not set |
| 904 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 904 | # CONFIG_CRYPTO is not set | 905 | # CONFIG_CRYPTO is not set |
| 905 | 906 | ||
| 906 | # | 907 | # |
| 907 | # Library routines | 908 | # Library routines |
| 908 | # | 909 | # |
| 909 | CONFIG_BITREVERSE=y | 910 | CONFIG_BITREVERSE=y |
| 911 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 910 | CONFIG_CRC_CCITT=y | 912 | CONFIG_CRC_CCITT=y |
| 911 | # CONFIG_CRC16 is not set | 913 | # CONFIG_CRC16 is not set |
| 912 | # CONFIG_CRC_ITU_T is not set | 914 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index a95385b24546..2ba240e897c6 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Thu Aug 9 11:16:55 2007 | 4 | # Mon May 12 11:53:54 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,23 +171,29 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| 168 | CONFIG_EMBEDDED=y | 186 | CONFIG_EMBEDDED=y |
| 169 | CONFIG_SYSCTL_SYSCALL=y | 187 | CONFIG_SYSCTL_SYSCALL=y |
| 188 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 170 | CONFIG_KALLSYMS=y | 189 | CONFIG_KALLSYMS=y |
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 190 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 172 | CONFIG_HOTPLUG=y | 191 | CONFIG_HOTPLUG=y |
| 173 | CONFIG_PRINTK=y | 192 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 193 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 194 | CONFIG_ELF_CORE=y |
| 195 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 196 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 197 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 198 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 199 | CONFIG_ANON_INODES=y |
| @@ -185,10 +206,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 206 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 207 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 208 | # CONFIG_SLOB is not set |
| 209 | # CONFIG_PROFILING is not set | ||
| 210 | # CONFIG_MARKERS is not set | ||
| 211 | CONFIG_HAVE_OPROFILE=y | ||
| 212 | # CONFIG_HAVE_KPROBES is not set | ||
| 213 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 214 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 215 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 216 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 217 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 218 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 219 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 220 | CONFIG_MODULES=y |
| 221 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 222 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 223 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 224 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +242,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 242 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 243 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 244 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 245 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 246 | ||
| 216 | # | 247 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 248 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 249 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 250 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 251 | CONFIG_PCI=y |
| 252 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 253 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 254 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 256 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 257 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 258 | ||
| @@ -237,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 266 | # |
| 238 | # Power management options | 267 | # Power management options |
| 239 | # | 268 | # |
| 269 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 270 | # CONFIG_PM is not set |
| 241 | 271 | ||
| 242 | # | 272 | # |
| @@ -277,6 +307,7 @@ CONFIG_SYN_COOKIES=y | |||
| 277 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 307 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 278 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 308 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 279 | # CONFIG_INET_XFRM_MODE_BEET is not set | 309 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 310 | # CONFIG_INET_LRO is not set | ||
| 280 | CONFIG_INET_DIAG=y | 311 | CONFIG_INET_DIAG=y |
| 281 | CONFIG_INET_TCP_DIAG=y | 312 | CONFIG_INET_TCP_DIAG=y |
| 282 | # CONFIG_TCP_CONG_ADVANCED is not set | 313 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -284,15 +315,10 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 284 | CONFIG_DEFAULT_TCP_CONG="cubic" | 315 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 285 | # CONFIG_TCP_MD5SIG is not set | 316 | # CONFIG_TCP_MD5SIG is not set |
| 286 | # CONFIG_IPV6 is not set | 317 | # CONFIG_IPV6 is not set |
| 287 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 288 | # CONFIG_INET6_TUNNEL is not set | ||
| 289 | CONFIG_NETWORK_SECMARK=y | 318 | CONFIG_NETWORK_SECMARK=y |
| 290 | # CONFIG_NETFILTER is not set | 319 | # CONFIG_NETFILTER is not set |
| 291 | # CONFIG_IP_DCCP is not set | 320 | # CONFIG_IP_DCCP is not set |
| 292 | # CONFIG_IP_SCTP is not set | 321 | # CONFIG_IP_SCTP is not set |
| 293 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 294 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 295 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
| 296 | # CONFIG_TIPC is not set | 322 | # CONFIG_TIPC is not set |
| 297 | # CONFIG_ATM is not set | 323 | # CONFIG_ATM is not set |
| 298 | # CONFIG_BRIDGE is not set | 324 | # CONFIG_BRIDGE is not set |
| @@ -305,10 +331,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 305 | # CONFIG_LAPB is not set | 331 | # CONFIG_LAPB is not set |
| 306 | # CONFIG_ECONET is not set | 332 | # CONFIG_ECONET is not set |
| 307 | # CONFIG_WAN_ROUTER is not set | 333 | # CONFIG_WAN_ROUTER is not set |
| 308 | |||
| 309 | # | ||
| 310 | # QoS and/or fair queueing | ||
| 311 | # | ||
| 312 | # CONFIG_NET_SCHED is not set | 334 | # CONFIG_NET_SCHED is not set |
| 313 | 335 | ||
| 314 | # | 336 | # |
| @@ -316,6 +338,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 316 | # | 338 | # |
| 317 | # CONFIG_NET_PKTGEN is not set | 339 | # CONFIG_NET_PKTGEN is not set |
| 318 | # CONFIG_HAMRADIO is not set | 340 | # CONFIG_HAMRADIO is not set |
| 341 | # CONFIG_CAN is not set | ||
| 319 | # CONFIG_IRDA is not set | 342 | # CONFIG_IRDA is not set |
| 320 | # CONFIG_BT is not set | 343 | # CONFIG_BT is not set |
| 321 | # CONFIG_AF_RXRPC is not set | 344 | # CONFIG_AF_RXRPC is not set |
| @@ -338,6 +361,7 @@ CONFIG_FIB_RULES=y | |||
| 338 | # | 361 | # |
| 339 | # Generic Driver Options | 362 | # Generic Driver Options |
| 340 | # | 363 | # |
| 364 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 341 | CONFIG_STANDALONE=y | 365 | CONFIG_STANDALONE=y |
| 342 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 366 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 343 | CONFIG_FW_LOADER=y | 367 | CONFIG_FW_LOADER=y |
| @@ -359,10 +383,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 359 | CONFIG_BLK_DEV_RAM=y | 383 | CONFIG_BLK_DEV_RAM=y |
| 360 | CONFIG_BLK_DEV_RAM_COUNT=16 | 384 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 361 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 385 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 362 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 386 | CONFIG_BLK_DEV_XIP=y |
| 363 | # CONFIG_CDROM_PKTCDVD is not set | 387 | # CONFIG_CDROM_PKTCDVD is not set |
| 364 | # CONFIG_ATA_OVER_ETH is not set | 388 | # CONFIG_ATA_OVER_ETH is not set |
| 365 | # CONFIG_MISC_DEVICES is not set | 389 | # CONFIG_MISC_DEVICES is not set |
| 390 | CONFIG_HAVE_IDE=y | ||
| 366 | # CONFIG_IDE is not set | 391 | # CONFIG_IDE is not set |
| 367 | 392 | ||
| 368 | # | 393 | # |
| @@ -402,18 +427,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 402 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 427 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 403 | CONFIG_SCSI_SAS_ATTRS=m | 428 | CONFIG_SCSI_SAS_ATTRS=m |
| 404 | CONFIG_SCSI_SAS_LIBSAS=m | 429 | CONFIG_SCSI_SAS_LIBSAS=m |
| 430 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
| 405 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 431 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
| 432 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 406 | # CONFIG_SCSI_LOWLEVEL is not set | 433 | # CONFIG_SCSI_LOWLEVEL is not set |
| 407 | # CONFIG_ATA is not set | 434 | # CONFIG_ATA is not set |
| 408 | # CONFIG_MD is not set | 435 | # CONFIG_MD is not set |
| 409 | |||
| 410 | # | ||
| 411 | # Fusion MPT device support | ||
| 412 | # | ||
| 413 | # CONFIG_FUSION is not set | 436 | # CONFIG_FUSION is not set |
| 414 | # CONFIG_FUSION_SPI is not set | ||
| 415 | # CONFIG_FUSION_FC is not set | ||
| 416 | # CONFIG_FUSION_SAS is not set | ||
| 417 | 437 | ||
| 418 | # | 438 | # |
| 419 | # IEEE 1394 (FireWire) support | 439 | # IEEE 1394 (FireWire) support |
| @@ -428,6 +448,7 @@ CONFIG_NETDEVICES=y | |||
| 428 | # CONFIG_MACVLAN is not set | 448 | # CONFIG_MACVLAN is not set |
| 429 | # CONFIG_EQUALIZER is not set | 449 | # CONFIG_EQUALIZER is not set |
| 430 | # CONFIG_TUN is not set | 450 | # CONFIG_TUN is not set |
| 451 | # CONFIG_VETH is not set | ||
| 431 | # CONFIG_ARCNET is not set | 452 | # CONFIG_ARCNET is not set |
| 432 | # CONFIG_PHYLIB is not set | 453 | # CONFIG_PHYLIB is not set |
| 433 | CONFIG_NET_ETHERNET=y | 454 | CONFIG_NET_ETHERNET=y |
| @@ -440,6 +461,10 @@ CONFIG_MII=y | |||
| 440 | # CONFIG_DM9000 is not set | 461 | # CONFIG_DM9000 is not set |
| 441 | # CONFIG_NET_TULIP is not set | 462 | # CONFIG_NET_TULIP is not set |
| 442 | # CONFIG_HP100 is not set | 463 | # CONFIG_HP100 is not set |
| 464 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 465 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 466 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 467 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 443 | CONFIG_NET_PCI=y | 468 | CONFIG_NET_PCI=y |
| 444 | # CONFIG_PCNET32 is not set | 469 | # CONFIG_PCNET32 is not set |
| 445 | # CONFIG_AMD8111_ETH is not set | 470 | # CONFIG_AMD8111_ETH is not set |
| @@ -447,7 +472,6 @@ CONFIG_NET_PCI=y | |||
| 447 | # CONFIG_B44 is not set | 472 | # CONFIG_B44 is not set |
| 448 | # CONFIG_FORCEDETH is not set | 473 | # CONFIG_FORCEDETH is not set |
| 449 | # CONFIG_TC35815 is not set | 474 | # CONFIG_TC35815 is not set |
| 450 | # CONFIG_DGRS is not set | ||
| 451 | # CONFIG_EEPRO100 is not set | 475 | # CONFIG_EEPRO100 is not set |
| 452 | CONFIG_E100=y | 476 | CONFIG_E100=y |
| 453 | # CONFIG_FEALNX is not set | 477 | # CONFIG_FEALNX is not set |
| @@ -455,6 +479,7 @@ CONFIG_E100=y | |||
| 455 | # CONFIG_NE2K_PCI is not set | 479 | # CONFIG_NE2K_PCI is not set |
| 456 | # CONFIG_8139CP is not set | 480 | # CONFIG_8139CP is not set |
| 457 | # CONFIG_8139TOO is not set | 481 | # CONFIG_8139TOO is not set |
| 482 | # CONFIG_R6040 is not set | ||
| 458 | # CONFIG_SIS900 is not set | 483 | # CONFIG_SIS900 is not set |
| 459 | # CONFIG_EPIC100 is not set | 484 | # CONFIG_EPIC100 is not set |
| 460 | # CONFIG_SUNDANCE is not set | 485 | # CONFIG_SUNDANCE is not set |
| @@ -470,6 +495,7 @@ CONFIG_E100=y | |||
| 470 | # | 495 | # |
| 471 | # CONFIG_WLAN_PRE80211 is not set | 496 | # CONFIG_WLAN_PRE80211 is not set |
| 472 | # CONFIG_WLAN_80211 is not set | 497 | # CONFIG_WLAN_80211 is not set |
| 498 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 473 | 499 | ||
| 474 | # | 500 | # |
| 475 | # USB Network Adapters | 501 | # USB Network Adapters |
| @@ -478,7 +504,6 @@ CONFIG_USB_CATC=m | |||
| 478 | CONFIG_USB_KAWETH=m | 504 | CONFIG_USB_KAWETH=m |
| 479 | CONFIG_USB_PEGASUS=m | 505 | CONFIG_USB_PEGASUS=m |
| 480 | CONFIG_USB_RTL8150=m | 506 | CONFIG_USB_RTL8150=m |
| 481 | # CONFIG_USB_USBNET_MII is not set | ||
| 482 | # CONFIG_USB_USBNET is not set | 507 | # CONFIG_USB_USBNET is not set |
| 483 | # CONFIG_WAN is not set | 508 | # CONFIG_WAN is not set |
| 484 | # CONFIG_FDDI is not set | 509 | # CONFIG_FDDI is not set |
| @@ -486,7 +511,6 @@ CONFIG_USB_RTL8150=m | |||
| 486 | # CONFIG_PPP is not set | 511 | # CONFIG_PPP is not set |
| 487 | # CONFIG_SLIP is not set | 512 | # CONFIG_SLIP is not set |
| 488 | # CONFIG_NET_FC is not set | 513 | # CONFIG_NET_FC is not set |
| 489 | # CONFIG_SHAPER is not set | ||
| 490 | # CONFIG_NETCONSOLE is not set | 514 | # CONFIG_NETCONSOLE is not set |
| 491 | # CONFIG_NETPOLL is not set | 515 | # CONFIG_NETPOLL is not set |
| 492 | # CONFIG_NET_POLL_CONTROLLER is not set | 516 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -505,7 +529,6 @@ CONFIG_INPUT=y | |||
| 505 | # | 529 | # |
| 506 | # CONFIG_INPUT_MOUSEDEV is not set | 530 | # CONFIG_INPUT_MOUSEDEV is not set |
| 507 | # CONFIG_INPUT_JOYDEV is not set | 531 | # CONFIG_INPUT_JOYDEV is not set |
| 508 | # CONFIG_INPUT_TSDEV is not set | ||
| 509 | # CONFIG_INPUT_EVDEV is not set | 532 | # CONFIG_INPUT_EVDEV is not set |
| 510 | # CONFIG_INPUT_EVBUG is not set | 533 | # CONFIG_INPUT_EVBUG is not set |
| 511 | 534 | ||
| @@ -532,7 +555,9 @@ CONFIG_VT=y | |||
| 532 | CONFIG_VT_CONSOLE=y | 555 | CONFIG_VT_CONSOLE=y |
| 533 | CONFIG_HW_CONSOLE=y | 556 | CONFIG_HW_CONSOLE=y |
| 534 | CONFIG_VT_HW_CONSOLE_BINDING=y | 557 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 558 | # CONFIG_DEVKMEM is not set | ||
| 535 | # CONFIG_SERIAL_NONSTANDARD is not set | 559 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 560 | # CONFIG_NOZOMI is not set | ||
| 536 | 561 | ||
| 537 | # | 562 | # |
| 538 | # Serial drivers | 563 | # Serial drivers |
| @@ -551,52 +576,62 @@ CONFIG_UNIX98_PTYS=y | |||
| 551 | CONFIG_LEGACY_PTYS=y | 576 | CONFIG_LEGACY_PTYS=y |
| 552 | CONFIG_LEGACY_PTY_COUNT=256 | 577 | CONFIG_LEGACY_PTY_COUNT=256 |
| 553 | # CONFIG_IPMI_HANDLER is not set | 578 | # CONFIG_IPMI_HANDLER is not set |
| 554 | # CONFIG_WATCHDOG is not set | ||
| 555 | # CONFIG_HW_RANDOM is not set | 579 | # CONFIG_HW_RANDOM is not set |
| 556 | # CONFIG_RTC is not set | ||
| 557 | # CONFIG_R3964 is not set | 580 | # CONFIG_R3964 is not set |
| 558 | # CONFIG_APPLICOM is not set | 581 | # CONFIG_APPLICOM is not set |
| 559 | # CONFIG_GPIO_TB0219 is not set | 582 | # CONFIG_GPIO_TB0219 is not set |
| 560 | # CONFIG_DRM is not set | ||
| 561 | CONFIG_GPIO_VR41XX=y | 583 | CONFIG_GPIO_VR41XX=y |
| 562 | # CONFIG_RAW_DRIVER is not set | 584 | # CONFIG_RAW_DRIVER is not set |
| 563 | # CONFIG_TCG_TPM is not set | 585 | # CONFIG_TCG_TPM is not set |
| 564 | CONFIG_DEVPORT=y | 586 | CONFIG_DEVPORT=y |
| 565 | # CONFIG_I2C is not set | 587 | # CONFIG_I2C is not set |
| 566 | |||
| 567 | # | ||
| 568 | # SPI support | ||
| 569 | # | ||
| 570 | # CONFIG_SPI is not set | 588 | # CONFIG_SPI is not set |
| 571 | # CONFIG_SPI_MASTER is not set | ||
| 572 | # CONFIG_W1 is not set | 589 | # CONFIG_W1 is not set |
| 573 | # CONFIG_POWER_SUPPLY is not set | 590 | # CONFIG_POWER_SUPPLY is not set |
| 574 | # CONFIG_HWMON is not set | 591 | # CONFIG_HWMON is not set |
| 592 | # CONFIG_THERMAL is not set | ||
| 593 | # CONFIG_WATCHDOG is not set | ||
| 594 | |||
| 595 | # | ||
| 596 | # Sonics Silicon Backplane | ||
| 597 | # | ||
| 598 | CONFIG_SSB_POSSIBLE=y | ||
| 599 | # CONFIG_SSB is not set | ||
| 575 | 600 | ||
| 576 | # | 601 | # |
| 577 | # Multifunction device drivers | 602 | # Multifunction device drivers |
| 578 | # | 603 | # |
| 579 | # CONFIG_MFD_SM501 is not set | 604 | # CONFIG_MFD_SM501 is not set |
| 605 | # CONFIG_HTC_PASIC3 is not set | ||
| 580 | 606 | ||
| 581 | # | 607 | # |
| 582 | # Multimedia devices | 608 | # Multimedia devices |
| 583 | # | 609 | # |
| 610 | |||
| 611 | # | ||
| 612 | # Multimedia core support | ||
| 613 | # | ||
| 584 | # CONFIG_VIDEO_DEV is not set | 614 | # CONFIG_VIDEO_DEV is not set |
| 585 | # CONFIG_DVB_CORE is not set | 615 | # CONFIG_DVB_CORE is not set |
| 616 | |||
| 617 | # | ||
| 618 | # Multimedia drivers | ||
| 619 | # | ||
| 586 | # CONFIG_DAB is not set | 620 | # CONFIG_DAB is not set |
| 587 | 621 | ||
| 588 | # | 622 | # |
| 589 | # Graphics support | 623 | # Graphics support |
| 590 | # | 624 | # |
| 625 | # CONFIG_DRM is not set | ||
| 626 | # CONFIG_VGASTATE is not set | ||
| 627 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 628 | # CONFIG_FB is not set | ||
| 591 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 629 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 592 | 630 | ||
| 593 | # | 631 | # |
| 594 | # Display device support | 632 | # Display device support |
| 595 | # | 633 | # |
| 596 | # CONFIG_DISPLAY_SUPPORT is not set | 634 | # CONFIG_DISPLAY_SUPPORT is not set |
| 597 | # CONFIG_VGASTATE is not set | ||
| 598 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 599 | # CONFIG_FB is not set | ||
| 600 | 635 | ||
| 601 | # | 636 | # |
| 602 | # Console display driver support | 637 | # Console display driver support |
| @@ -615,6 +650,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 615 | CONFIG_USB_ARCH_HAS_EHCI=y | 650 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 616 | CONFIG_USB=y | 651 | CONFIG_USB=y |
| 617 | # CONFIG_USB_DEBUG is not set | 652 | # CONFIG_USB_DEBUG is not set |
| 653 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 618 | 654 | ||
| 619 | # | 655 | # |
| 620 | # Miscellaneous USB options | 656 | # Miscellaneous USB options |
| @@ -623,15 +659,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 623 | CONFIG_USB_DEVICE_CLASS=y | 659 | CONFIG_USB_DEVICE_CLASS=y |
| 624 | # CONFIG_USB_DYNAMIC_MINORS is not set | 660 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 625 | # CONFIG_USB_OTG is not set | 661 | # CONFIG_USB_OTG is not set |
| 662 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 663 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 626 | 664 | ||
| 627 | # | 665 | # |
| 628 | # USB Host Controller Drivers | 666 | # USB Host Controller Drivers |
| 629 | # | 667 | # |
| 668 | # CONFIG_USB_C67X00_HCD is not set | ||
| 630 | CONFIG_USB_EHCI_HCD=y | 669 | CONFIG_USB_EHCI_HCD=y |
| 631 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 632 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 670 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 633 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 671 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 634 | # CONFIG_USB_ISP116X_HCD is not set | 672 | # CONFIG_USB_ISP116X_HCD is not set |
| 673 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 635 | CONFIG_USB_OHCI_HCD=y | 674 | CONFIG_USB_OHCI_HCD=y |
| 636 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 675 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 637 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 676 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -657,13 +696,16 @@ CONFIG_USB_STORAGE=y | |||
| 657 | # CONFIG_USB_STORAGE_DEBUG is not set | 696 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 658 | # CONFIG_USB_STORAGE_DATAFAB is not set | 697 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 659 | # CONFIG_USB_STORAGE_FREECOM is not set | 698 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 699 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 660 | # CONFIG_USB_STORAGE_DPCM is not set | 700 | # CONFIG_USB_STORAGE_DPCM is not set |
| 661 | # CONFIG_USB_STORAGE_USBAT is not set | 701 | # CONFIG_USB_STORAGE_USBAT is not set |
| 662 | # CONFIG_USB_STORAGE_SDDR09 is not set | 702 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 663 | # CONFIG_USB_STORAGE_SDDR55 is not set | 703 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 664 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 704 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 665 | # CONFIG_USB_STORAGE_ALAUDA is not set | 705 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 706 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 666 | # CONFIG_USB_STORAGE_KARMA is not set | 707 | # CONFIG_USB_STORAGE_KARMA is not set |
| 708 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 667 | # CONFIG_USB_LIBUSUAL is not set | 709 | # CONFIG_USB_LIBUSUAL is not set |
| 668 | 710 | ||
| 669 | # | 711 | # |
| @@ -676,10 +718,6 @@ CONFIG_USB_STORAGE=y | |||
| 676 | # | 718 | # |
| 677 | # USB port drivers | 719 | # USB port drivers |
| 678 | # | 720 | # |
| 679 | |||
| 680 | # | ||
| 681 | # USB Serial Converter support | ||
| 682 | # | ||
| 683 | # CONFIG_USB_SERIAL is not set | 721 | # CONFIG_USB_SERIAL is not set |
| 684 | 722 | ||
| 685 | # | 723 | # |
| @@ -705,17 +743,11 @@ CONFIG_USB_STORAGE=y | |||
| 705 | # CONFIG_USB_TRANCEVIBRATOR is not set | 743 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 706 | # CONFIG_USB_IOWARRIOR is not set | 744 | # CONFIG_USB_IOWARRIOR is not set |
| 707 | # CONFIG_USB_TEST is not set | 745 | # CONFIG_USB_TEST is not set |
| 708 | |||
| 709 | # | ||
| 710 | # USB DSL modem support | ||
| 711 | # | ||
| 712 | |||
| 713 | # | ||
| 714 | # USB Gadget Support | ||
| 715 | # | ||
| 716 | # CONFIG_USB_GADGET is not set | 746 | # CONFIG_USB_GADGET is not set |
| 717 | # CONFIG_MMC is not set | 747 | # CONFIG_MMC is not set |
| 748 | # CONFIG_MEMSTICK is not set | ||
| 718 | # CONFIG_NEW_LEDS is not set | 749 | # CONFIG_NEW_LEDS is not set |
| 750 | # CONFIG_ACCESSIBILITY is not set | ||
| 719 | # CONFIG_INFINIBAND is not set | 751 | # CONFIG_INFINIBAND is not set |
| 720 | CONFIG_RTC_LIB=y | 752 | CONFIG_RTC_LIB=y |
| 721 | CONFIG_RTC_CLASS=y | 753 | CONFIG_RTC_CLASS=y |
| @@ -740,9 +772,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 740 | # Platform RTC drivers | 772 | # Platform RTC drivers |
| 741 | # | 773 | # |
| 742 | # CONFIG_RTC_DRV_CMOS is not set | 774 | # CONFIG_RTC_DRV_CMOS is not set |
| 775 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 743 | # CONFIG_RTC_DRV_DS1553 is not set | 776 | # CONFIG_RTC_DRV_DS1553 is not set |
| 744 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 745 | # CONFIG_RTC_DRV_DS1742 is not set | 777 | # CONFIG_RTC_DRV_DS1742 is not set |
| 778 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 746 | # CONFIG_RTC_DRV_M48T86 is not set | 779 | # CONFIG_RTC_DRV_M48T86 is not set |
| 747 | # CONFIG_RTC_DRV_M48T59 is not set | 780 | # CONFIG_RTC_DRV_M48T59 is not set |
| 748 | # CONFIG_RTC_DRV_V3020 is not set | 781 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -751,23 +784,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 751 | # on-CPU RTC drivers | 784 | # on-CPU RTC drivers |
| 752 | # | 785 | # |
| 753 | CONFIG_RTC_DRV_VR41XX=y | 786 | CONFIG_RTC_DRV_VR41XX=y |
| 754 | |||
| 755 | # | ||
| 756 | # DMA Engine support | ||
| 757 | # | ||
| 758 | # CONFIG_DMA_ENGINE is not set | ||
| 759 | |||
| 760 | # | ||
| 761 | # DMA Clients | ||
| 762 | # | ||
| 763 | |||
| 764 | # | ||
| 765 | # DMA Devices | ||
| 766 | # | ||
| 767 | |||
| 768 | # | ||
| 769 | # Userspace I/O | ||
| 770 | # | ||
| 771 | # CONFIG_UIO is not set | 787 | # CONFIG_UIO is not set |
| 772 | 788 | ||
| 773 | # | 789 | # |
| @@ -782,14 +798,11 @@ CONFIG_EXT2_FS=y | |||
| 782 | # CONFIG_JFS_FS is not set | 798 | # CONFIG_JFS_FS is not set |
| 783 | CONFIG_FS_POSIX_ACL=y | 799 | CONFIG_FS_POSIX_ACL=y |
| 784 | # CONFIG_XFS_FS is not set | 800 | # CONFIG_XFS_FS is not set |
| 785 | # CONFIG_GFS2_FS is not set | ||
| 786 | # CONFIG_OCFS2_FS is not set | 801 | # CONFIG_OCFS2_FS is not set |
| 787 | # CONFIG_MINIX_FS is not set | 802 | CONFIG_DNOTIFY=y |
| 788 | CONFIG_ROMFS_FS=m | ||
| 789 | CONFIG_INOTIFY=y | 803 | CONFIG_INOTIFY=y |
| 790 | CONFIG_INOTIFY_USER=y | 804 | CONFIG_INOTIFY_USER=y |
| 791 | # CONFIG_QUOTA is not set | 805 | # CONFIG_QUOTA is not set |
| 792 | CONFIG_DNOTIFY=y | ||
| 793 | # CONFIG_AUTOFS_FS is not set | 806 | # CONFIG_AUTOFS_FS is not set |
| 794 | CONFIG_AUTOFS4_FS=y | 807 | CONFIG_AUTOFS4_FS=y |
| 795 | # CONFIG_FUSE_FS is not set | 808 | # CONFIG_FUSE_FS is not set |
| @@ -818,7 +831,6 @@ CONFIG_SYSFS=y | |||
| 818 | CONFIG_TMPFS=y | 831 | CONFIG_TMPFS=y |
| 819 | CONFIG_TMPFS_POSIX_ACL=y | 832 | CONFIG_TMPFS_POSIX_ACL=y |
| 820 | # CONFIG_HUGETLB_PAGE is not set | 833 | # CONFIG_HUGETLB_PAGE is not set |
| 821 | CONFIG_RAMFS=y | ||
| 822 | # CONFIG_CONFIGFS_FS is not set | 834 | # CONFIG_CONFIGFS_FS is not set |
| 823 | 835 | ||
| 824 | # | 836 | # |
| @@ -833,24 +845,21 @@ CONFIG_RAMFS=y | |||
| 833 | # CONFIG_EFS_FS is not set | 845 | # CONFIG_EFS_FS is not set |
| 834 | CONFIG_CRAMFS=m | 846 | CONFIG_CRAMFS=m |
| 835 | # CONFIG_VXFS_FS is not set | 847 | # CONFIG_VXFS_FS is not set |
| 848 | # CONFIG_MINIX_FS is not set | ||
| 836 | # CONFIG_HPFS_FS is not set | 849 | # CONFIG_HPFS_FS is not set |
| 837 | # CONFIG_QNX4FS_FS is not set | 850 | # CONFIG_QNX4FS_FS is not set |
| 851 | CONFIG_ROMFS_FS=m | ||
| 838 | # CONFIG_SYSV_FS is not set | 852 | # CONFIG_SYSV_FS is not set |
| 839 | # CONFIG_UFS_FS is not set | 853 | # CONFIG_UFS_FS is not set |
| 840 | 854 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 841 | # | ||
| 842 | # Network File Systems | ||
| 843 | # | ||
| 844 | CONFIG_NFS_FS=y | 855 | CONFIG_NFS_FS=y |
| 845 | CONFIG_NFS_V3=y | 856 | CONFIG_NFS_V3=y |
| 846 | # CONFIG_NFS_V3_ACL is not set | 857 | # CONFIG_NFS_V3_ACL is not set |
| 847 | # CONFIG_NFS_V4 is not set | 858 | # CONFIG_NFS_V4 is not set |
| 848 | # CONFIG_NFS_DIRECTIO is not set | ||
| 849 | CONFIG_NFSD=m | 859 | CONFIG_NFSD=m |
| 850 | CONFIG_NFSD_V3=y | 860 | CONFIG_NFSD_V3=y |
| 851 | # CONFIG_NFSD_V3_ACL is not set | 861 | # CONFIG_NFSD_V3_ACL is not set |
| 852 | # CONFIG_NFSD_V4 is not set | 862 | # CONFIG_NFSD_V4 is not set |
| 853 | # CONFIG_NFSD_TCP is not set | ||
| 854 | CONFIG_ROOT_NFS=y | 863 | CONFIG_ROOT_NFS=y |
| 855 | CONFIG_LOCKD=y | 864 | CONFIG_LOCKD=y |
| 856 | CONFIG_LOCKD_V4=y | 865 | CONFIG_LOCKD_V4=y |
| @@ -871,47 +880,38 @@ CONFIG_SUNRPC=y | |||
| 871 | # | 880 | # |
| 872 | # CONFIG_PARTITION_ADVANCED is not set | 881 | # CONFIG_PARTITION_ADVANCED is not set |
| 873 | CONFIG_MSDOS_PARTITION=y | 882 | CONFIG_MSDOS_PARTITION=y |
| 874 | |||
| 875 | # | ||
| 876 | # Native Language Support | ||
| 877 | # | ||
| 878 | # CONFIG_NLS is not set | 883 | # CONFIG_NLS is not set |
| 879 | |||
| 880 | # | ||
| 881 | # Distributed Lock Manager | ||
| 882 | # | ||
| 883 | # CONFIG_DLM is not set | 884 | # CONFIG_DLM is not set |
| 884 | 885 | ||
| 885 | # | 886 | # |
| 886 | # Profiling support | ||
| 887 | # | ||
| 888 | # CONFIG_PROFILING is not set | ||
| 889 | |||
| 890 | # | ||
| 891 | # Kernel hacking | 887 | # Kernel hacking |
| 892 | # | 888 | # |
| 893 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 889 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 894 | # CONFIG_PRINTK_TIME is not set | 890 | # CONFIG_PRINTK_TIME is not set |
| 891 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 895 | CONFIG_ENABLE_MUST_CHECK=y | 892 | CONFIG_ENABLE_MUST_CHECK=y |
| 893 | CONFIG_FRAME_WARN=1024 | ||
| 896 | # CONFIG_MAGIC_SYSRQ is not set | 894 | # CONFIG_MAGIC_SYSRQ is not set |
| 897 | # CONFIG_UNUSED_SYMBOLS is not set | 895 | # CONFIG_UNUSED_SYMBOLS is not set |
| 898 | # CONFIG_DEBUG_FS is not set | 896 | # CONFIG_DEBUG_FS is not set |
| 899 | # CONFIG_HEADERS_CHECK is not set | 897 | # CONFIG_HEADERS_CHECK is not set |
| 900 | # CONFIG_DEBUG_KERNEL is not set | 898 | # CONFIG_DEBUG_KERNEL is not set |
| 901 | CONFIG_CROSSCOMPILE=y | 899 | # CONFIG_SAMPLES is not set |
| 902 | CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" | 900 | CONFIG_CMDLINE="cca=3 mem=32M console=ttyVR0,115200" |
| 903 | 901 | ||
| 904 | # | 902 | # |
| 905 | # Security options | 903 | # Security options |
| 906 | # | 904 | # |
| 907 | # CONFIG_KEYS is not set | 905 | # CONFIG_KEYS is not set |
| 908 | # CONFIG_SECURITY is not set | 906 | # CONFIG_SECURITY is not set |
| 907 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 909 | # CONFIG_CRYPTO is not set | 908 | # CONFIG_CRYPTO is not set |
| 910 | 909 | ||
| 911 | # | 910 | # |
| 912 | # Library routines | 911 | # Library routines |
| 913 | # | 912 | # |
| 914 | CONFIG_BITREVERSE=m | 913 | CONFIG_BITREVERSE=m |
| 914 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 915 | # CONFIG_CRC_CCITT is not set | 915 | # CONFIG_CRC_CCITT is not set |
| 916 | # CONFIG_CRC16 is not set | 916 | # CONFIG_CRC16 is not set |
| 917 | # CONFIG_CRC_ITU_T is not set | 917 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 40d4a40a970e..a5d0f3c55ed1 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Thu Aug 9 14:03:54 2007 | 4 | # Mon May 12 11:55:55 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,12 +171,15 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| @@ -173,6 +191,8 @@ CONFIG_HOTPLUG=y | |||
| 173 | CONFIG_PRINTK=y | 191 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 192 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 193 | CONFIG_ELF_CORE=y |
| 194 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 195 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 196 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 197 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 198 | CONFIG_ANON_INODES=y |
| @@ -185,10 +205,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 205 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 206 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 207 | # CONFIG_SLOB is not set |
| 208 | # CONFIG_PROFILING is not set | ||
| 209 | # CONFIG_MARKERS is not set | ||
| 210 | CONFIG_HAVE_OPROFILE=y | ||
| 211 | # CONFIG_HAVE_KPROBES is not set | ||
| 212 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 213 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 214 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 215 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 216 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 217 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 218 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 219 | CONFIG_MODULES=y |
| 220 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 221 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 222 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 223 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +241,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 241 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 242 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 243 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 244 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 245 | ||
| 216 | # | 246 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 247 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 248 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 249 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 250 | CONFIG_PCI=y |
| 251 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 252 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 253 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 254 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 257 | ||
| @@ -237,6 +265,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 265 | # |
| 238 | # Power management options | 266 | # Power management options |
| 239 | # | 267 | # |
| 268 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 269 | # CONFIG_PM is not set |
| 241 | 270 | ||
| 242 | # | 271 | # |
| @@ -278,6 +307,7 @@ CONFIG_INET_TUNNEL=m | |||
| 278 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 307 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 279 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 308 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 280 | # CONFIG_INET_XFRM_MODE_BEET is not set | 309 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 310 | # CONFIG_INET_LRO is not set | ||
| 281 | CONFIG_INET_DIAG=y | 311 | CONFIG_INET_DIAG=y |
| 282 | CONFIG_INET_TCP_DIAG=y | 312 | CONFIG_INET_TCP_DIAG=y |
| 283 | CONFIG_TCP_CONG_ADVANCED=y | 313 | CONFIG_TCP_CONG_ADVANCED=y |
| @@ -302,8 +332,6 @@ CONFIG_DEFAULT_BIC=y | |||
| 302 | CONFIG_DEFAULT_TCP_CONG="bic" | 332 | CONFIG_DEFAULT_TCP_CONG="bic" |
| 303 | # CONFIG_TCP_MD5SIG is not set | 333 | # CONFIG_TCP_MD5SIG is not set |
| 304 | # CONFIG_IPV6 is not set | 334 | # CONFIG_IPV6 is not set |
| 305 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 306 | # CONFIG_INET6_TUNNEL is not set | ||
| 307 | CONFIG_NETWORK_SECMARK=y | 335 | CONFIG_NETWORK_SECMARK=y |
| 308 | # CONFIG_NETFILTER is not set | 336 | # CONFIG_NETFILTER is not set |
| 309 | # CONFIG_IP_DCCP is not set | 337 | # CONFIG_IP_DCCP is not set |
| @@ -320,10 +348,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 320 | # CONFIG_LAPB is not set | 348 | # CONFIG_LAPB is not set |
| 321 | # CONFIG_ECONET is not set | 349 | # CONFIG_ECONET is not set |
| 322 | # CONFIG_WAN_ROUTER is not set | 350 | # CONFIG_WAN_ROUTER is not set |
| 323 | |||
| 324 | # | ||
| 325 | # QoS and/or fair queueing | ||
| 326 | # | ||
| 327 | # CONFIG_NET_SCHED is not set | 351 | # CONFIG_NET_SCHED is not set |
| 328 | 352 | ||
| 329 | # | 353 | # |
| @@ -331,6 +355,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 331 | # | 355 | # |
| 332 | # CONFIG_NET_PKTGEN is not set | 356 | # CONFIG_NET_PKTGEN is not set |
| 333 | # CONFIG_HAMRADIO is not set | 357 | # CONFIG_HAMRADIO is not set |
| 358 | # CONFIG_CAN is not set | ||
| 334 | # CONFIG_IRDA is not set | 359 | # CONFIG_IRDA is not set |
| 335 | # CONFIG_BT is not set | 360 | # CONFIG_BT is not set |
| 336 | # CONFIG_AF_RXRPC is not set | 361 | # CONFIG_AF_RXRPC is not set |
| @@ -353,6 +378,7 @@ CONFIG_FIB_RULES=y | |||
| 353 | # | 378 | # |
| 354 | # Generic Driver Options | 379 | # Generic Driver Options |
| 355 | # | 380 | # |
| 381 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 356 | CONFIG_STANDALONE=y | 382 | CONFIG_STANDALONE=y |
| 357 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 383 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 358 | CONFIG_FW_LOADER=m | 384 | CONFIG_FW_LOADER=m |
| @@ -374,10 +400,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 374 | CONFIG_BLK_DEV_RAM=y | 400 | CONFIG_BLK_DEV_RAM=y |
| 375 | CONFIG_BLK_DEV_RAM_COUNT=16 | 401 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 376 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 402 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 377 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 403 | CONFIG_BLK_DEV_XIP=y |
| 378 | # CONFIG_CDROM_PKTCDVD is not set | 404 | # CONFIG_CDROM_PKTCDVD is not set |
| 379 | # CONFIG_ATA_OVER_ETH is not set | 405 | # CONFIG_ATA_OVER_ETH is not set |
| 380 | # CONFIG_MISC_DEVICES is not set | 406 | # CONFIG_MISC_DEVICES is not set |
| 407 | CONFIG_HAVE_IDE=y | ||
| 381 | # CONFIG_IDE is not set | 408 | # CONFIG_IDE is not set |
| 382 | 409 | ||
| 383 | # | 410 | # |
| @@ -416,10 +443,14 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 416 | # CONFIG_SCSI_FC_ATTRS is not set | 443 | # CONFIG_SCSI_FC_ATTRS is not set |
| 417 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 444 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 418 | # CONFIG_SCSI_SAS_LIBSAS is not set | 445 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 446 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 419 | # CONFIG_SCSI_LOWLEVEL is not set | 447 | # CONFIG_SCSI_LOWLEVEL is not set |
| 420 | CONFIG_ATA=y | 448 | CONFIG_ATA=y |
| 421 | # CONFIG_ATA_NONSTANDARD is not set | 449 | # CONFIG_ATA_NONSTANDARD is not set |
| 450 | CONFIG_SATA_PMP=y | ||
| 422 | # CONFIG_SATA_AHCI is not set | 451 | # CONFIG_SATA_AHCI is not set |
| 452 | # CONFIG_SATA_SIL24 is not set | ||
| 453 | CONFIG_ATA_SFF=y | ||
| 423 | # CONFIG_SATA_SVW is not set | 454 | # CONFIG_SATA_SVW is not set |
| 424 | # CONFIG_ATA_PIIX is not set | 455 | # CONFIG_ATA_PIIX is not set |
| 425 | # CONFIG_SATA_MV is not set | 456 | # CONFIG_SATA_MV is not set |
| @@ -429,7 +460,6 @@ CONFIG_ATA=y | |||
| 429 | # CONFIG_SATA_PROMISE is not set | 460 | # CONFIG_SATA_PROMISE is not set |
| 430 | # CONFIG_SATA_SX4 is not set | 461 | # CONFIG_SATA_SX4 is not set |
| 431 | # CONFIG_SATA_SIL is not set | 462 | # CONFIG_SATA_SIL is not set |
| 432 | # CONFIG_SATA_SIL24 is not set | ||
| 433 | # CONFIG_SATA_SIS is not set | 463 | # CONFIG_SATA_SIS is not set |
| 434 | # CONFIG_SATA_ULI is not set | 464 | # CONFIG_SATA_ULI is not set |
| 435 | # CONFIG_SATA_VIA is not set | 465 | # CONFIG_SATA_VIA is not set |
| @@ -458,7 +488,9 @@ CONFIG_ATA=y | |||
| 458 | # CONFIG_PATA_MPIIX is not set | 488 | # CONFIG_PATA_MPIIX is not set |
| 459 | # CONFIG_PATA_OLDPIIX is not set | 489 | # CONFIG_PATA_OLDPIIX is not set |
| 460 | # CONFIG_PATA_NETCELL is not set | 490 | # CONFIG_PATA_NETCELL is not set |
| 491 | # CONFIG_PATA_NINJA32 is not set | ||
| 461 | # CONFIG_PATA_NS87410 is not set | 492 | # CONFIG_PATA_NS87410 is not set |
| 493 | # CONFIG_PATA_NS87415 is not set | ||
| 462 | # CONFIG_PATA_OPTI is not set | 494 | # CONFIG_PATA_OPTI is not set |
| 463 | # CONFIG_PATA_OPTIDMA is not set | 495 | # CONFIG_PATA_OPTIDMA is not set |
| 464 | # CONFIG_PATA_PDC_OLD is not set | 496 | # CONFIG_PATA_PDC_OLD is not set |
| @@ -472,15 +504,9 @@ CONFIG_PATA_SIL680=y | |||
| 472 | # CONFIG_PATA_VIA is not set | 504 | # CONFIG_PATA_VIA is not set |
| 473 | # CONFIG_PATA_WINBOND is not set | 505 | # CONFIG_PATA_WINBOND is not set |
| 474 | # CONFIG_PATA_PLATFORM is not set | 506 | # CONFIG_PATA_PLATFORM is not set |
| 507 | # CONFIG_PATA_SCH is not set | ||
| 475 | # CONFIG_MD is not set | 508 | # CONFIG_MD is not set |
| 476 | |||
| 477 | # | ||
| 478 | # Fusion MPT device support | ||
| 479 | # | ||
| 480 | # CONFIG_FUSION is not set | 509 | # CONFIG_FUSION is not set |
| 481 | # CONFIG_FUSION_SPI is not set | ||
| 482 | # CONFIG_FUSION_FC is not set | ||
| 483 | # CONFIG_FUSION_SAS is not set | ||
| 484 | 510 | ||
| 485 | # | 511 | # |
| 486 | # IEEE 1394 (FireWire) support | 512 | # IEEE 1394 (FireWire) support |
| @@ -520,6 +546,7 @@ CONFIG_NETDEVICES=y | |||
| 520 | # CONFIG_MACVLAN is not set | 546 | # CONFIG_MACVLAN is not set |
| 521 | # CONFIG_EQUALIZER is not set | 547 | # CONFIG_EQUALIZER is not set |
| 522 | # CONFIG_TUN is not set | 548 | # CONFIG_TUN is not set |
| 549 | # CONFIG_VETH is not set | ||
| 523 | # CONFIG_ARCNET is not set | 550 | # CONFIG_ARCNET is not set |
| 524 | # CONFIG_PHYLIB is not set | 551 | # CONFIG_PHYLIB is not set |
| 525 | CONFIG_NET_ETHERNET=y | 552 | CONFIG_NET_ETHERNET=y |
| @@ -532,6 +559,10 @@ CONFIG_MII=y | |||
| 532 | # CONFIG_DM9000 is not set | 559 | # CONFIG_DM9000 is not set |
| 533 | # CONFIG_NET_TULIP is not set | 560 | # CONFIG_NET_TULIP is not set |
| 534 | # CONFIG_HP100 is not set | 561 | # CONFIG_HP100 is not set |
| 562 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 563 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 564 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 565 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 535 | CONFIG_NET_PCI=y | 566 | CONFIG_NET_PCI=y |
| 536 | # CONFIG_PCNET32 is not set | 567 | # CONFIG_PCNET32 is not set |
| 537 | # CONFIG_AMD8111_ETH is not set | 568 | # CONFIG_AMD8111_ETH is not set |
| @@ -539,7 +570,6 @@ CONFIG_NET_PCI=y | |||
| 539 | # CONFIG_B44 is not set | 570 | # CONFIG_B44 is not set |
| 540 | # CONFIG_FORCEDETH is not set | 571 | # CONFIG_FORCEDETH is not set |
| 541 | # CONFIG_TC35815 is not set | 572 | # CONFIG_TC35815 is not set |
| 542 | # CONFIG_DGRS is not set | ||
| 543 | # CONFIG_EEPRO100 is not set | 573 | # CONFIG_EEPRO100 is not set |
| 544 | # CONFIG_E100 is not set | 574 | # CONFIG_E100 is not set |
| 545 | # CONFIG_FEALNX is not set | 575 | # CONFIG_FEALNX is not set |
| @@ -551,6 +581,7 @@ CONFIG_8139TOO_PIO=y | |||
| 551 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 581 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 552 | # CONFIG_8139TOO_8129 is not set | 582 | # CONFIG_8139TOO_8129 is not set |
| 553 | # CONFIG_8139_OLD_RX_RESET is not set | 583 | # CONFIG_8139_OLD_RX_RESET is not set |
| 584 | # CONFIG_R6040 is not set | ||
| 554 | # CONFIG_SIS900 is not set | 585 | # CONFIG_SIS900 is not set |
| 555 | # CONFIG_EPIC100 is not set | 586 | # CONFIG_EPIC100 is not set |
| 556 | # CONFIG_SUNDANCE is not set | 587 | # CONFIG_SUNDANCE is not set |
| @@ -563,6 +594,10 @@ CONFIG_NETDEV_1000=y | |||
| 563 | # CONFIG_ACENIC is not set | 594 | # CONFIG_ACENIC is not set |
| 564 | # CONFIG_DL2K is not set | 595 | # CONFIG_DL2K is not set |
| 565 | # CONFIG_E1000 is not set | 596 | # CONFIG_E1000 is not set |
| 597 | # CONFIG_E1000E is not set | ||
| 598 | # CONFIG_E1000E_ENABLED is not set | ||
| 599 | # CONFIG_IP1000 is not set | ||
| 600 | # CONFIG_IGB is not set | ||
| 566 | # CONFIG_NS83820 is not set | 601 | # CONFIG_NS83820 is not set |
| 567 | # CONFIG_HAMACHI is not set | 602 | # CONFIG_HAMACHI is not set |
| 568 | # CONFIG_YELLOWFIN is not set | 603 | # CONFIG_YELLOWFIN is not set |
| @@ -584,6 +619,7 @@ CONFIG_VIA_VELOCITY=y | |||
| 584 | # | 619 | # |
| 585 | # CONFIG_WLAN_PRE80211 is not set | 620 | # CONFIG_WLAN_PRE80211 is not set |
| 586 | # CONFIG_WLAN_80211 is not set | 621 | # CONFIG_WLAN_80211 is not set |
| 622 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 587 | 623 | ||
| 588 | # | 624 | # |
| 589 | # USB Network Adapters | 625 | # USB Network Adapters |
| @@ -592,7 +628,6 @@ CONFIG_VIA_VELOCITY=y | |||
| 592 | # CONFIG_USB_KAWETH is not set | 628 | # CONFIG_USB_KAWETH is not set |
| 593 | # CONFIG_USB_PEGASUS is not set | 629 | # CONFIG_USB_PEGASUS is not set |
| 594 | # CONFIG_USB_RTL8150 is not set | 630 | # CONFIG_USB_RTL8150 is not set |
| 595 | # CONFIG_USB_USBNET_MII is not set | ||
| 596 | # CONFIG_USB_USBNET is not set | 631 | # CONFIG_USB_USBNET is not set |
| 597 | # CONFIG_WAN is not set | 632 | # CONFIG_WAN is not set |
| 598 | # CONFIG_FDDI is not set | 633 | # CONFIG_FDDI is not set |
| @@ -600,7 +635,6 @@ CONFIG_VIA_VELOCITY=y | |||
| 600 | # CONFIG_PPP is not set | 635 | # CONFIG_PPP is not set |
| 601 | # CONFIG_SLIP is not set | 636 | # CONFIG_SLIP is not set |
| 602 | # CONFIG_NET_FC is not set | 637 | # CONFIG_NET_FC is not set |
| 603 | # CONFIG_SHAPER is not set | ||
| 604 | # CONFIG_NETCONSOLE is not set | 638 | # CONFIG_NETCONSOLE is not set |
| 605 | # CONFIG_NETPOLL is not set | 639 | # CONFIG_NETPOLL is not set |
| 606 | # CONFIG_NET_POLL_CONTROLLER is not set | 640 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -622,7 +656,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 622 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 656 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 623 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 657 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 624 | # CONFIG_INPUT_JOYDEV is not set | 658 | # CONFIG_INPUT_JOYDEV is not set |
| 625 | # CONFIG_INPUT_TSDEV is not set | ||
| 626 | # CONFIG_INPUT_EVDEV is not set | 659 | # CONFIG_INPUT_EVDEV is not set |
| 627 | # CONFIG_INPUT_EVBUG is not set | 660 | # CONFIG_INPUT_EVBUG is not set |
| 628 | 661 | ||
| @@ -649,7 +682,9 @@ CONFIG_VT=y | |||
| 649 | CONFIG_VT_CONSOLE=y | 682 | CONFIG_VT_CONSOLE=y |
| 650 | CONFIG_HW_CONSOLE=y | 683 | CONFIG_HW_CONSOLE=y |
| 651 | CONFIG_VT_HW_CONSOLE_BINDING=y | 684 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 685 | # CONFIG_DEVKMEM is not set | ||
| 652 | # CONFIG_SERIAL_NONSTANDARD is not set | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 687 | # CONFIG_NOZOMI is not set | ||
| 653 | 688 | ||
| 654 | # | 689 | # |
| 655 | # Serial drivers | 690 | # Serial drivers |
| @@ -668,49 +703,53 @@ CONFIG_UNIX98_PTYS=y | |||
| 668 | CONFIG_LEGACY_PTYS=y | 703 | CONFIG_LEGACY_PTYS=y |
| 669 | CONFIG_LEGACY_PTY_COUNT=256 | 704 | CONFIG_LEGACY_PTY_COUNT=256 |
| 670 | # CONFIG_IPMI_HANDLER is not set | 705 | # CONFIG_IPMI_HANDLER is not set |
| 671 | # CONFIG_WATCHDOG is not set | ||
| 672 | # CONFIG_HW_RANDOM is not set | 706 | # CONFIG_HW_RANDOM is not set |
| 673 | # CONFIG_RTC is not set | ||
| 674 | # CONFIG_R3964 is not set | 707 | # CONFIG_R3964 is not set |
| 675 | # CONFIG_APPLICOM is not set | 708 | # CONFIG_APPLICOM is not set |
| 676 | # CONFIG_GPIO_TB0219 is not set | 709 | # CONFIG_GPIO_TB0219 is not set |
| 677 | # CONFIG_DRM is not set | ||
| 678 | CONFIG_GPIO_VR41XX=y | 710 | CONFIG_GPIO_VR41XX=y |
| 679 | # CONFIG_RAW_DRIVER is not set | 711 | # CONFIG_RAW_DRIVER is not set |
| 680 | # CONFIG_TCG_TPM is not set | 712 | # CONFIG_TCG_TPM is not set |
| 681 | CONFIG_DEVPORT=y | 713 | CONFIG_DEVPORT=y |
| 682 | # CONFIG_I2C is not set | 714 | # CONFIG_I2C is not set |
| 683 | |||
| 684 | # | ||
| 685 | # SPI support | ||
| 686 | # | ||
| 687 | # CONFIG_SPI is not set | 715 | # CONFIG_SPI is not set |
| 688 | # CONFIG_SPI_MASTER is not set | ||
| 689 | # CONFIG_W1 is not set | 716 | # CONFIG_W1 is not set |
| 690 | # CONFIG_POWER_SUPPLY is not set | 717 | # CONFIG_POWER_SUPPLY is not set |
| 691 | # CONFIG_HWMON is not set | 718 | # CONFIG_HWMON is not set |
| 719 | # CONFIG_THERMAL is not set | ||
| 720 | # CONFIG_WATCHDOG is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # Sonics Silicon Backplane | ||
| 724 | # | ||
| 725 | CONFIG_SSB_POSSIBLE=y | ||
| 726 | # CONFIG_SSB is not set | ||
| 692 | 727 | ||
| 693 | # | 728 | # |
| 694 | # Multifunction device drivers | 729 | # Multifunction device drivers |
| 695 | # | 730 | # |
| 696 | CONFIG_MFD_SM501=y | 731 | CONFIG_MFD_SM501=y |
| 732 | # CONFIG_HTC_PASIC3 is not set | ||
| 697 | 733 | ||
| 698 | # | 734 | # |
| 699 | # Multimedia devices | 735 | # Multimedia devices |
| 700 | # | 736 | # |
| 737 | |||
| 738 | # | ||
| 739 | # Multimedia core support | ||
| 740 | # | ||
| 701 | # CONFIG_VIDEO_DEV is not set | 741 | # CONFIG_VIDEO_DEV is not set |
| 702 | # CONFIG_DVB_CORE is not set | 742 | # CONFIG_DVB_CORE is not set |
| 703 | # CONFIG_DAB is not set | ||
| 704 | 743 | ||
| 705 | # | 744 | # |
| 706 | # Graphics support | 745 | # Multimedia drivers |
| 707 | # | 746 | # |
| 708 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 747 | # CONFIG_DAB is not set |
| 709 | 748 | ||
| 710 | # | 749 | # |
| 711 | # Display device support | 750 | # Graphics support |
| 712 | # | 751 | # |
| 713 | # CONFIG_DISPLAY_SUPPORT is not set | 752 | # CONFIG_DRM is not set |
| 714 | # CONFIG_VGASTATE is not set | 753 | # CONFIG_VGASTATE is not set |
| 715 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 754 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| 716 | CONFIG_FB=y | 755 | CONFIG_FB=y |
| @@ -719,9 +758,11 @@ CONFIG_FB=y | |||
| 719 | CONFIG_FB_CFB_FILLRECT=y | 758 | CONFIG_FB_CFB_FILLRECT=y |
| 720 | CONFIG_FB_CFB_COPYAREA=y | 759 | CONFIG_FB_CFB_COPYAREA=y |
| 721 | CONFIG_FB_CFB_IMAGEBLIT=y | 760 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 761 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 722 | # CONFIG_FB_SYS_FILLRECT is not set | 762 | # CONFIG_FB_SYS_FILLRECT is not set |
| 723 | # CONFIG_FB_SYS_COPYAREA is not set | 763 | # CONFIG_FB_SYS_COPYAREA is not set |
| 724 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 764 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 765 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 725 | # CONFIG_FB_SYS_FOPS is not set | 766 | # CONFIG_FB_SYS_FOPS is not set |
| 726 | CONFIG_FB_DEFERRED_IO=y | 767 | CONFIG_FB_DEFERRED_IO=y |
| 727 | # CONFIG_FB_SVGALIB is not set | 768 | # CONFIG_FB_SVGALIB is not set |
| @@ -757,7 +798,14 @@ CONFIG_FB_DEFERRED_IO=y | |||
| 757 | # CONFIG_FB_ARK is not set | 798 | # CONFIG_FB_ARK is not set |
| 758 | # CONFIG_FB_PM3 is not set | 799 | # CONFIG_FB_PM3 is not set |
| 759 | CONFIG_FB_SM501=y | 800 | CONFIG_FB_SM501=y |
| 801 | # CONFIG_FB_COBALT is not set | ||
| 760 | # CONFIG_FB_VIRTUAL is not set | 802 | # CONFIG_FB_VIRTUAL is not set |
| 803 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 804 | |||
| 805 | # | ||
| 806 | # Display device support | ||
| 807 | # | ||
| 808 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 761 | 809 | ||
| 762 | # | 810 | # |
| 763 | # Console display driver support | 811 | # Console display driver support |
| @@ -787,6 +835,7 @@ CONFIG_FONT_8x16=y | |||
| 787 | CONFIG_HID_SUPPORT=y | 835 | CONFIG_HID_SUPPORT=y |
| 788 | CONFIG_HID=y | 836 | CONFIG_HID=y |
| 789 | # CONFIG_HID_DEBUG is not set | 837 | # CONFIG_HID_DEBUG is not set |
| 838 | # CONFIG_HIDRAW is not set | ||
| 790 | 839 | ||
| 791 | # | 840 | # |
| 792 | # USB Input Devices | 841 | # USB Input Devices |
| @@ -807,6 +856,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 807 | CONFIG_USB_ARCH_HAS_EHCI=y | 856 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 808 | CONFIG_USB=m | 857 | CONFIG_USB=m |
| 809 | # CONFIG_USB_DEBUG is not set | 858 | # CONFIG_USB_DEBUG is not set |
| 859 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 810 | 860 | ||
| 811 | # | 861 | # |
| 812 | # Miscellaneous USB options | 862 | # Miscellaneous USB options |
| @@ -815,15 +865,18 @@ CONFIG_USB=m | |||
| 815 | CONFIG_USB_DEVICE_CLASS=y | 865 | CONFIG_USB_DEVICE_CLASS=y |
| 816 | # CONFIG_USB_DYNAMIC_MINORS is not set | 866 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 817 | # CONFIG_USB_OTG is not set | 867 | # CONFIG_USB_OTG is not set |
| 868 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 869 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 818 | 870 | ||
| 819 | # | 871 | # |
| 820 | # USB Host Controller Drivers | 872 | # USB Host Controller Drivers |
| 821 | # | 873 | # |
| 874 | # CONFIG_USB_C67X00_HCD is not set | ||
| 822 | CONFIG_USB_EHCI_HCD=m | 875 | CONFIG_USB_EHCI_HCD=m |
| 823 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 824 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 876 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 825 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 877 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 826 | # CONFIG_USB_ISP116X_HCD is not set | 878 | # CONFIG_USB_ISP116X_HCD is not set |
| 879 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 827 | CONFIG_USB_OHCI_HCD=m | 880 | CONFIG_USB_OHCI_HCD=m |
| 828 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 881 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 829 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 882 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -849,13 +902,16 @@ CONFIG_USB_STORAGE=m | |||
| 849 | # CONFIG_USB_STORAGE_DEBUG is not set | 902 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 850 | # CONFIG_USB_STORAGE_DATAFAB is not set | 903 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 851 | # CONFIG_USB_STORAGE_FREECOM is not set | 904 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 905 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 852 | # CONFIG_USB_STORAGE_DPCM is not set | 906 | # CONFIG_USB_STORAGE_DPCM is not set |
| 853 | # CONFIG_USB_STORAGE_USBAT is not set | 907 | # CONFIG_USB_STORAGE_USBAT is not set |
| 854 | # CONFIG_USB_STORAGE_SDDR09 is not set | 908 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 855 | # CONFIG_USB_STORAGE_SDDR55 is not set | 909 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 856 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 910 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 857 | # CONFIG_USB_STORAGE_ALAUDA is not set | 911 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 912 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 858 | # CONFIG_USB_STORAGE_KARMA is not set | 913 | # CONFIG_USB_STORAGE_KARMA is not set |
| 914 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 859 | # CONFIG_USB_LIBUSUAL is not set | 915 | # CONFIG_USB_LIBUSUAL is not set |
| 860 | 916 | ||
| 861 | # | 917 | # |
| @@ -868,10 +924,6 @@ CONFIG_USB_MON=y | |||
| 868 | # | 924 | # |
| 869 | # USB port drivers | 925 | # USB port drivers |
| 870 | # | 926 | # |
| 871 | |||
| 872 | # | ||
| 873 | # USB Serial Converter support | ||
| 874 | # | ||
| 875 | # CONFIG_USB_SERIAL is not set | 927 | # CONFIG_USB_SERIAL is not set |
| 876 | 928 | ||
| 877 | # | 929 | # |
| @@ -896,36 +948,14 @@ CONFIG_USB_MON=y | |||
| 896 | # CONFIG_USB_LD is not set | 948 | # CONFIG_USB_LD is not set |
| 897 | # CONFIG_USB_TRANCEVIBRATOR is not set | 949 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 898 | # CONFIG_USB_IOWARRIOR is not set | 950 | # CONFIG_USB_IOWARRIOR is not set |
| 899 | |||
| 900 | # | ||
| 901 | # USB DSL modem support | ||
| 902 | # | ||
| 903 | |||
| 904 | # | ||
| 905 | # USB Gadget Support | ||
| 906 | # | ||
| 907 | # CONFIG_USB_GADGET is not set | 951 | # CONFIG_USB_GADGET is not set |
| 908 | # CONFIG_MMC is not set | 952 | # CONFIG_MMC is not set |
| 953 | # CONFIG_MEMSTICK is not set | ||
| 909 | # CONFIG_NEW_LEDS is not set | 954 | # CONFIG_NEW_LEDS is not set |
| 955 | # CONFIG_ACCESSIBILITY is not set | ||
| 910 | # CONFIG_INFINIBAND is not set | 956 | # CONFIG_INFINIBAND is not set |
| 957 | CONFIG_RTC_LIB=y | ||
| 911 | # CONFIG_RTC_CLASS is not set | 958 | # CONFIG_RTC_CLASS is not set |
| 912 | |||
| 913 | # | ||
| 914 | # DMA Engine support | ||
| 915 | # | ||
| 916 | # CONFIG_DMA_ENGINE is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # DMA Clients | ||
| 920 | # | ||
| 921 | |||
| 922 | # | ||
| 923 | # DMA Devices | ||
| 924 | # | ||
| 925 | |||
| 926 | # | ||
| 927 | # Userspace I/O | ||
| 928 | # | ||
| 929 | # CONFIG_UIO is not set | 959 | # CONFIG_UIO is not set |
| 930 | 960 | ||
| 931 | # | 961 | # |
| @@ -940,25 +970,21 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 940 | # CONFIG_EXT3_FS_SECURITY is not set | 970 | # CONFIG_EXT3_FS_SECURITY is not set |
| 941 | # CONFIG_EXT4DEV_FS is not set | 971 | # CONFIG_EXT4DEV_FS is not set |
| 942 | CONFIG_JBD=y | 972 | CONFIG_JBD=y |
| 943 | # CONFIG_JBD_DEBUG is not set | ||
| 944 | CONFIG_FS_MBCACHE=y | 973 | CONFIG_FS_MBCACHE=y |
| 945 | # CONFIG_REISERFS_FS is not set | 974 | # CONFIG_REISERFS_FS is not set |
| 946 | # CONFIG_JFS_FS is not set | 975 | # CONFIG_JFS_FS is not set |
| 947 | CONFIG_FS_POSIX_ACL=y | 976 | CONFIG_FS_POSIX_ACL=y |
| 948 | CONFIG_XFS_FS=y | 977 | CONFIG_XFS_FS=y |
| 949 | CONFIG_XFS_QUOTA=y | 978 | CONFIG_XFS_QUOTA=y |
| 950 | # CONFIG_XFS_SECURITY is not set | ||
| 951 | CONFIG_XFS_POSIX_ACL=y | 979 | CONFIG_XFS_POSIX_ACL=y |
| 952 | # CONFIG_XFS_RT is not set | 980 | # CONFIG_XFS_RT is not set |
| 953 | # CONFIG_GFS2_FS is not set | 981 | # CONFIG_XFS_DEBUG is not set |
| 954 | # CONFIG_OCFS2_FS is not set | 982 | # CONFIG_OCFS2_FS is not set |
| 955 | # CONFIG_MINIX_FS is not set | 983 | CONFIG_DNOTIFY=y |
| 956 | CONFIG_ROMFS_FS=m | ||
| 957 | CONFIG_INOTIFY=y | 984 | CONFIG_INOTIFY=y |
| 958 | CONFIG_INOTIFY_USER=y | 985 | CONFIG_INOTIFY_USER=y |
| 959 | # CONFIG_QUOTA is not set | 986 | # CONFIG_QUOTA is not set |
| 960 | CONFIG_QUOTACTL=y | 987 | CONFIG_QUOTACTL=y |
| 961 | CONFIG_DNOTIFY=y | ||
| 962 | # CONFIG_AUTOFS_FS is not set | 988 | # CONFIG_AUTOFS_FS is not set |
| 963 | CONFIG_AUTOFS4_FS=y | 989 | CONFIG_AUTOFS4_FS=y |
| 964 | # CONFIG_FUSE_FS is not set | 990 | # CONFIG_FUSE_FS is not set |
| @@ -987,7 +1013,6 @@ CONFIG_SYSFS=y | |||
| 987 | CONFIG_TMPFS=y | 1013 | CONFIG_TMPFS=y |
| 988 | CONFIG_TMPFS_POSIX_ACL=y | 1014 | CONFIG_TMPFS_POSIX_ACL=y |
| 989 | # CONFIG_HUGETLB_PAGE is not set | 1015 | # CONFIG_HUGETLB_PAGE is not set |
| 990 | CONFIG_RAMFS=y | ||
| 991 | # CONFIG_CONFIGFS_FS is not set | 1016 | # CONFIG_CONFIGFS_FS is not set |
| 992 | 1017 | ||
| 993 | # | 1018 | # |
| @@ -1002,24 +1027,21 @@ CONFIG_RAMFS=y | |||
| 1002 | # CONFIG_EFS_FS is not set | 1027 | # CONFIG_EFS_FS is not set |
| 1003 | CONFIG_CRAMFS=m | 1028 | CONFIG_CRAMFS=m |
| 1004 | # CONFIG_VXFS_FS is not set | 1029 | # CONFIG_VXFS_FS is not set |
| 1030 | # CONFIG_MINIX_FS is not set | ||
| 1005 | # CONFIG_HPFS_FS is not set | 1031 | # CONFIG_HPFS_FS is not set |
| 1006 | # CONFIG_QNX4FS_FS is not set | 1032 | # CONFIG_QNX4FS_FS is not set |
| 1033 | CONFIG_ROMFS_FS=m | ||
| 1007 | # CONFIG_SYSV_FS is not set | 1034 | # CONFIG_SYSV_FS is not set |
| 1008 | # CONFIG_UFS_FS is not set | 1035 | # CONFIG_UFS_FS is not set |
| 1009 | 1036 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1010 | # | ||
| 1011 | # Network File Systems | ||
| 1012 | # | ||
| 1013 | CONFIG_NFS_FS=y | 1037 | CONFIG_NFS_FS=y |
| 1014 | CONFIG_NFS_V3=y | 1038 | CONFIG_NFS_V3=y |
| 1015 | # CONFIG_NFS_V3_ACL is not set | 1039 | # CONFIG_NFS_V3_ACL is not set |
| 1016 | # CONFIG_NFS_V4 is not set | 1040 | # CONFIG_NFS_V4 is not set |
| 1017 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1018 | CONFIG_NFSD=m | 1041 | CONFIG_NFSD=m |
| 1019 | CONFIG_NFSD_V3=y | 1042 | CONFIG_NFSD_V3=y |
| 1020 | # CONFIG_NFSD_V3_ACL is not set | 1043 | # CONFIG_NFSD_V3_ACL is not set |
| 1021 | # CONFIG_NFSD_V4 is not set | 1044 | # CONFIG_NFSD_V4 is not set |
| 1022 | CONFIG_NFSD_TCP=y | ||
| 1023 | CONFIG_ROOT_NFS=y | 1045 | CONFIG_ROOT_NFS=y |
| 1024 | CONFIG_LOCKD=y | 1046 | CONFIG_LOCKD=y |
| 1025 | CONFIG_LOCKD_V4=y | 1047 | CONFIG_LOCKD_V4=y |
| @@ -1040,47 +1062,38 @@ CONFIG_SUNRPC=y | |||
| 1040 | # | 1062 | # |
| 1041 | # CONFIG_PARTITION_ADVANCED is not set | 1063 | # CONFIG_PARTITION_ADVANCED is not set |
| 1042 | CONFIG_MSDOS_PARTITION=y | 1064 | CONFIG_MSDOS_PARTITION=y |
| 1043 | |||
| 1044 | # | ||
| 1045 | # Native Language Support | ||
| 1046 | # | ||
| 1047 | # CONFIG_NLS is not set | 1065 | # CONFIG_NLS is not set |
| 1048 | |||
| 1049 | # | ||
| 1050 | # Distributed Lock Manager | ||
| 1051 | # | ||
| 1052 | # CONFIG_DLM is not set | 1066 | # CONFIG_DLM is not set |
| 1053 | 1067 | ||
| 1054 | # | 1068 | # |
| 1055 | # Profiling support | ||
| 1056 | # | ||
| 1057 | # CONFIG_PROFILING is not set | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # Kernel hacking | 1069 | # Kernel hacking |
| 1061 | # | 1070 | # |
| 1062 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1071 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1063 | # CONFIG_PRINTK_TIME is not set | 1072 | # CONFIG_PRINTK_TIME is not set |
| 1073 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1064 | CONFIG_ENABLE_MUST_CHECK=y | 1074 | CONFIG_ENABLE_MUST_CHECK=y |
| 1075 | CONFIG_FRAME_WARN=1024 | ||
| 1065 | # CONFIG_MAGIC_SYSRQ is not set | 1076 | # CONFIG_MAGIC_SYSRQ is not set |
| 1066 | # CONFIG_UNUSED_SYMBOLS is not set | 1077 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1067 | # CONFIG_DEBUG_FS is not set | 1078 | # CONFIG_DEBUG_FS is not set |
| 1068 | # CONFIG_HEADERS_CHECK is not set | 1079 | # CONFIG_HEADERS_CHECK is not set |
| 1069 | # CONFIG_DEBUG_KERNEL is not set | 1080 | # CONFIG_DEBUG_KERNEL is not set |
| 1070 | CONFIG_CROSSCOMPILE=y | 1081 | # CONFIG_SAMPLES is not set |
| 1071 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 1082 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 1072 | 1083 | ||
| 1073 | # | 1084 | # |
| 1074 | # Security options | 1085 | # Security options |
| 1075 | # | 1086 | # |
| 1076 | # CONFIG_KEYS is not set | 1087 | # CONFIG_KEYS is not set |
| 1077 | # CONFIG_SECURITY is not set | 1088 | # CONFIG_SECURITY is not set |
| 1089 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1078 | # CONFIG_CRYPTO is not set | 1090 | # CONFIG_CRYPTO is not set |
| 1079 | 1091 | ||
| 1080 | # | 1092 | # |
| 1081 | # Library routines | 1093 | # Library routines |
| 1082 | # | 1094 | # |
| 1083 | CONFIG_BITREVERSE=y | 1095 | CONFIG_BITREVERSE=y |
| 1096 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1084 | CONFIG_CRC_CCITT=y | 1097 | CONFIG_CRC_CCITT=y |
| 1085 | # CONFIG_CRC16 is not set | 1098 | # CONFIG_CRC16 is not set |
| 1086 | # CONFIG_CRC_ITU_T is not set | 1099 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c index 28dfd2e2989a..23066985a734 100644 --- a/arch/mips/fw/arc/identify.c +++ b/arch/mips/fw/arc/identify.c | |||
| @@ -67,6 +67,11 @@ static struct smatch mach_table[] = { | |||
| 67 | .liname = "SNI RM200_PCI", | 67 | .liname = "SNI RM200_PCI", |
| 68 | .type = MACH_SNI_RM200_PCI, | 68 | .type = MACH_SNI_RM200_PCI, |
| 69 | .flags = PROM_FLAG_DONT_FREE_TEMP, | 69 | .flags = PROM_FLAG_DONT_FREE_TEMP, |
| 70 | }, { | ||
| 71 | .arcname = "RM200PCI-R5K", | ||
| 72 | .liname = "SNI RM200_PCI-R5K", | ||
| 73 | .type = MACH_SNI_RM200_PCI, | ||
| 74 | .flags = PROM_FLAG_DONT_FREE_TEMP, | ||
| 70 | } | 75 | } |
| 71 | }; | 76 | }; |
| 72 | 77 | ||
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 63370cdd3c90..cdf87a9dd4ba 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
| @@ -216,6 +216,7 @@ int smp_call_function(void (*func) (void *info), void *info, int retry, | |||
| 216 | { | 216 | { |
| 217 | return smp_call_function_mask(cpu_online_map, func, info, retry, wait); | 217 | return smp_call_function_mask(cpu_online_map, func, info, retry, wait); |
| 218 | } | 218 | } |
| 219 | EXPORT_SYMBOL(smp_call_function); | ||
| 219 | 220 | ||
| 220 | void smp_call_function_interrupt(void) | 221 | void smp_call_function_interrupt(void) |
| 221 | { | 222 | { |
| @@ -271,6 +272,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
| 271 | put_cpu(); | 272 | put_cpu(); |
| 272 | return 0; | 273 | return 0; |
| 273 | } | 274 | } |
| 275 | EXPORT_SYMBOL(smp_call_function_single); | ||
| 274 | 276 | ||
| 275 | static void stop_this_cpu(void *dummy) | 277 | static void stop_this_cpu(void *dummy) |
| 276 | { | 278 | { |
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index cfeab669782f..a56c15026965 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
| @@ -34,11 +34,13 @@ static volatile int lasat_int_mask_shift; | |||
| 34 | 34 | ||
| 35 | void disable_lasat_irq(unsigned int irq_nr) | 35 | void disable_lasat_irq(unsigned int irq_nr) |
| 36 | { | 36 | { |
| 37 | irq_nr -= LASAT_IRQ_BASE; | ||
| 37 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; | 38 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; |
| 38 | } | 39 | } |
| 39 | 40 | ||
| 40 | void enable_lasat_irq(unsigned int irq_nr) | 41 | void enable_lasat_irq(unsigned int irq_nr) |
| 41 | { | 42 | { |
| 43 | irq_nr -= LASAT_IRQ_BASE; | ||
| 42 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; | 44 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; |
| 43 | } | 45 | } |
| 44 | 46 | ||
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c index ec2f658c3709..31e328b3814d 100644 --- a/arch/mips/lasat/lasat_board.c +++ b/arch/mips/lasat/lasat_board.c | |||
| @@ -23,18 +23,19 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/string.h> | 24 | #include <linux/string.h> |
| 25 | #include <linux/ctype.h> | 25 | #include <linux/ctype.h> |
| 26 | #include <linux/mutex.h> | ||
| 26 | #include <asm/bootinfo.h> | 27 | #include <asm/bootinfo.h> |
| 27 | #include <asm/addrspace.h> | 28 | #include <asm/addrspace.h> |
| 28 | #include "at93c.h" | 29 | #include "at93c.h" |
| 29 | /* New model description table */ | 30 | /* New model description table */ |
| 30 | #include "lasat_models.h" | 31 | #include "lasat_models.h" |
| 31 | 32 | ||
| 33 | static DEFINE_MUTEX(lasat_eeprom_mutex); | ||
| 34 | |||
| 32 | #define EEPROM_CRC(data, len) (~crc32(~0, data, len)) | 35 | #define EEPROM_CRC(data, len) (~crc32(~0, data, len)) |
| 33 | 36 | ||
| 34 | struct lasat_info lasat_board_info; | 37 | struct lasat_info lasat_board_info; |
| 35 | 38 | ||
| 36 | void update_bcastaddr(void); | ||
| 37 | |||
| 38 | int EEPROMRead(unsigned int pos, unsigned char *data, int len) | 39 | int EEPROMRead(unsigned int pos, unsigned char *data, int len) |
| 39 | { | 40 | { |
| 40 | int i; | 41 | int i; |
| @@ -258,10 +259,6 @@ int lasat_init_board_info(void) | |||
| 258 | sprintf(lasat_board_info.li_typestr, "%d", 10 * c); | 259 | sprintf(lasat_board_info.li_typestr, "%d", 10 * c); |
| 259 | } | 260 | } |
| 260 | 261 | ||
| 261 | #if defined(CONFIG_INET) && defined(CONFIG_SYSCTL) | ||
| 262 | update_bcastaddr(); | ||
| 263 | #endif | ||
| 264 | |||
| 265 | return 0; | 262 | return 0; |
| 266 | } | 263 | } |
| 267 | 264 | ||
| @@ -269,6 +266,8 @@ void lasat_write_eeprom_info(void) | |||
| 269 | { | 266 | { |
| 270 | unsigned long crc; | 267 | unsigned long crc; |
| 271 | 268 | ||
| 269 | mutex_lock(&lasat_eeprom_mutex); | ||
| 270 | |||
| 272 | /* Generate the CRC */ | 271 | /* Generate the CRC */ |
| 273 | crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info), | 272 | crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info), |
| 274 | sizeof(struct lasat_eeprom_struct) - 4); | 273 | sizeof(struct lasat_eeprom_struct) - 4); |
| @@ -277,4 +276,6 @@ void lasat_write_eeprom_info(void) | |||
| 277 | /* Write the EEPROM info */ | 276 | /* Write the EEPROM info */ |
| 278 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, | 277 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, |
| 279 | sizeof(struct lasat_eeprom_struct)); | 278 | sizeof(struct lasat_eeprom_struct)); |
| 279 | |||
| 280 | mutex_unlock(&lasat_eeprom_mutex); | ||
| 280 | } | 281 | } |
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 389336c4ecc5..866881ec0cf8 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
| @@ -29,15 +29,13 @@ | |||
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/net.h> | 30 | #include <linux/net.h> |
| 31 | #include <linux/inet.h> | 31 | #include <linux/inet.h> |
| 32 | #include <linux/mutex.h> | ||
| 33 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
| 34 | 33 | ||
| 35 | #include <asm/time.h> | 34 | #include <asm/time.h> |
| 36 | 35 | ||
| 37 | #include "sysctl.h" | 36 | #ifdef CONFIG_DS1603 |
| 38 | #include "ds1603.h" | 37 | #include "ds1603.h" |
| 39 | 38 | #endif | |
| 40 | static DEFINE_MUTEX(lasat_info_mutex); | ||
| 41 | 39 | ||
| 42 | /* Strategy function to write EEPROM after changing string entry */ | 40 | /* Strategy function to write EEPROM after changing string entry */ |
| 43 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | 41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, |
| @@ -46,18 +44,15 @@ int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | |||
| 46 | { | 44 | { |
| 47 | int r; | 45 | int r; |
| 48 | 46 | ||
| 49 | mutex_lock(&lasat_info_mutex); | ||
| 50 | r = sysctl_string(table, name, | 47 | r = sysctl_string(table, name, |
| 51 | nlen, oldval, oldlenp, newval, newlen); | 48 | nlen, oldval, oldlenp, newval, newlen); |
| 52 | if (r < 0) { | 49 | if (r < 0) |
| 53 | mutex_unlock(&lasat_info_mutex); | ||
| 54 | return r; | 50 | return r; |
| 55 | } | 51 | |
| 56 | if (newval && newlen) | 52 | if (newval && newlen) |
| 57 | lasat_write_eeprom_info(); | 53 | lasat_write_eeprom_info(); |
| 58 | mutex_unlock(&lasat_info_mutex); | ||
| 59 | 54 | ||
| 60 | return 1; | 55 | return 0; |
| 61 | } | 56 | } |
| 62 | 57 | ||
| 63 | 58 | ||
| @@ -67,14 +62,11 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp, | |||
| 67 | { | 62 | { |
| 68 | int r; | 63 | int r; |
| 69 | 64 | ||
| 70 | mutex_lock(&lasat_info_mutex); | ||
| 71 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); | 65 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); |
| 72 | if ((!write) || r) { | 66 | if ((!write) || r) |
| 73 | mutex_unlock(&lasat_info_mutex); | ||
| 74 | return r; | 67 | return r; |
| 75 | } | 68 | |
| 76 | lasat_write_eeprom_info(); | 69 | lasat_write_eeprom_info(); |
| 77 | mutex_unlock(&lasat_info_mutex); | ||
| 78 | 70 | ||
| 79 | return 0; | 71 | return 0; |
| 80 | } | 72 | } |
| @@ -85,28 +77,24 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp, | |||
| 85 | { | 77 | { |
| 86 | int r; | 78 | int r; |
| 87 | 79 | ||
| 88 | mutex_lock(&lasat_info_mutex); | ||
| 89 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 80 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 90 | if ((!write) || r) { | 81 | if ((!write) || r) |
| 91 | mutex_unlock(&lasat_info_mutex); | ||
| 92 | return r; | 82 | return r; |
| 93 | } | 83 | |
| 94 | lasat_write_eeprom_info(); | 84 | lasat_write_eeprom_info(); |
| 95 | mutex_unlock(&lasat_info_mutex); | ||
| 96 | 85 | ||
| 97 | return 0; | 86 | return 0; |
| 98 | } | 87 | } |
| 99 | 88 | ||
| 89 | #ifdef CONFIG_DS1603 | ||
| 100 | static int rtctmp; | 90 | static int rtctmp; |
| 101 | 91 | ||
| 102 | #ifdef CONFIG_DS1603 | ||
| 103 | /* proc function to read/write RealTime Clock */ | 92 | /* proc function to read/write RealTime Clock */ |
| 104 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | 93 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, |
| 105 | void *buffer, size_t *lenp, loff_t *ppos) | 94 | void *buffer, size_t *lenp, loff_t *ppos) |
| 106 | { | 95 | { |
| 107 | int r; | 96 | int r; |
| 108 | 97 | ||
| 109 | mutex_lock(&lasat_info_mutex); | ||
| 110 | if (!write) { | 98 | if (!write) { |
| 111 | rtctmp = read_persistent_clock(); | 99 | rtctmp = read_persistent_clock(); |
| 112 | /* check for time < 0 and set to 0 */ | 100 | /* check for time < 0 and set to 0 */ |
| @@ -114,12 +102,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | |||
| 114 | rtctmp = 0; | 102 | rtctmp = 0; |
| 115 | } | 103 | } |
| 116 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 104 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 117 | if ((!write) || r) { | 105 | if (r) |
| 118 | mutex_unlock(&lasat_info_mutex); | ||
| 119 | return r; | 106 | return r; |
| 120 | } | 107 | |
| 121 | rtc_mips_set_mmss(rtctmp); | 108 | if (write) |
| 122 | mutex_unlock(&lasat_info_mutex); | 109 | rtc_mips_set_mmss(rtctmp); |
| 123 | 110 | ||
| 124 | return 0; | 111 | return 0; |
| 125 | } | 112 | } |
| @@ -132,17 +119,14 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen, | |||
| 132 | { | 119 | { |
| 133 | int r; | 120 | int r; |
| 134 | 121 | ||
| 135 | mutex_lock(&lasat_info_mutex); | ||
| 136 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 122 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 137 | if (r < 0) { | 123 | if (r < 0) |
| 138 | mutex_unlock(&lasat_info_mutex); | ||
| 139 | return r; | 124 | return r; |
| 140 | } | 125 | |
| 141 | if (newval && newlen) | 126 | if (newval && newlen) |
| 142 | lasat_write_eeprom_info(); | 127 | lasat_write_eeprom_info(); |
| 143 | mutex_unlock(&lasat_info_mutex); | ||
| 144 | 128 | ||
| 145 | return 1; | 129 | return 0; |
| 146 | } | 130 | } |
| 147 | 131 | ||
| 148 | #ifdef CONFIG_DS1603 | 132 | #ifdef CONFIG_DS1603 |
| @@ -153,50 +137,27 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen, | |||
| 153 | { | 137 | { |
| 154 | int r; | 138 | int r; |
| 155 | 139 | ||
| 156 | mutex_lock(&lasat_info_mutex); | ||
| 157 | rtctmp = read_persistent_clock(); | 140 | rtctmp = read_persistent_clock(); |
| 158 | if (rtctmp < 0) | 141 | if (rtctmp < 0) |
| 159 | rtctmp = 0; | 142 | rtctmp = 0; |
| 160 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 143 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 161 | if (r < 0) { | 144 | if (r < 0) |
| 162 | mutex_unlock(&lasat_info_mutex); | ||
| 163 | return r; | 145 | return r; |
| 164 | } | ||
| 165 | if (newval && newlen) | 146 | if (newval && newlen) |
| 166 | rtc_mips_set_mmss(rtctmp); | 147 | rtc_mips_set_mmss(rtctmp); |
| 167 | mutex_unlock(&lasat_info_mutex); | ||
| 168 | 148 | ||
| 169 | return 1; | 149 | return r; |
| 170 | } | 150 | } |
| 171 | #endif | 151 | #endif |
| 172 | 152 | ||
| 173 | #ifdef CONFIG_INET | 153 | #ifdef CONFIG_INET |
| 174 | static char lasat_bcastaddr[16]; | ||
| 175 | |||
| 176 | void update_bcastaddr(void) | ||
| 177 | { | ||
| 178 | unsigned int ip; | ||
| 179 | |||
| 180 | ip = (lasat_board_info.li_eeprom_info.ipaddr & | ||
| 181 | lasat_board_info.li_eeprom_info.netmask) | | ||
| 182 | ~lasat_board_info.li_eeprom_info.netmask; | ||
| 183 | |||
| 184 | sprintf(lasat_bcastaddr, "%d.%d.%d.%d", | ||
| 185 | (ip) & 0xff, | ||
| 186 | (ip >> 8) & 0xff, | ||
| 187 | (ip >> 16) & 0xff, | ||
| 188 | (ip >> 24) & 0xff); | ||
| 189 | } | ||
| 190 | |||
| 191 | static char proc_lasat_ipbuf[32]; | ||
| 192 | |||
| 193 | /* Parsing of IP address */ | ||
| 194 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | 154 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, |
| 195 | void *buffer, size_t *lenp, loff_t *ppos) | 155 | void *buffer, size_t *lenp, loff_t *ppos) |
| 196 | { | 156 | { |
| 197 | unsigned int ip; | 157 | unsigned int ip; |
| 198 | char *p, c; | 158 | char *p, c; |
| 199 | int len; | 159 | int len; |
| 160 | char ipbuf[32]; | ||
| 200 | 161 | ||
| 201 | if (!table->data || !table->maxlen || !*lenp || | 162 | if (!table->data || !table->maxlen || !*lenp || |
| 202 | (*ppos && !write)) { | 163 | (*ppos && !write)) { |
| @@ -204,117 +165,88 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
| 204 | return 0; | 165 | return 0; |
| 205 | } | 166 | } |
| 206 | 167 | ||
| 207 | mutex_lock(&lasat_info_mutex); | ||
| 208 | if (write) { | 168 | if (write) { |
| 209 | len = 0; | 169 | len = 0; |
| 210 | p = buffer; | 170 | p = buffer; |
| 211 | while (len < *lenp) { | 171 | while (len < *lenp) { |
| 212 | if (get_user(c, p++)) { | 172 | if (get_user(c, p++)) |
| 213 | mutex_unlock(&lasat_info_mutex); | ||
| 214 | return -EFAULT; | 173 | return -EFAULT; |
| 215 | } | ||
| 216 | if (c == 0 || c == '\n') | 174 | if (c == 0 || c == '\n') |
| 217 | break; | 175 | break; |
| 218 | len++; | 176 | len++; |
| 219 | } | 177 | } |
| 220 | if (len >= sizeof(proc_lasat_ipbuf)-1) | 178 | if (len >= sizeof(ipbuf)-1) |
| 221 | len = sizeof(proc_lasat_ipbuf) - 1; | 179 | len = sizeof(ipbuf) - 1; |
| 222 | if (copy_from_user(proc_lasat_ipbuf, buffer, len)) { | 180 | if (copy_from_user(ipbuf, buffer, len)) |
| 223 | mutex_unlock(&lasat_info_mutex); | ||
| 224 | return -EFAULT; | 181 | return -EFAULT; |
| 225 | } | 182 | ipbuf[len] = 0; |
| 226 | proc_lasat_ipbuf[len] = 0; | ||
| 227 | *ppos += *lenp; | 183 | *ppos += *lenp; |
| 228 | /* Now see if we can convert it to a valid IP */ | 184 | /* Now see if we can convert it to a valid IP */ |
| 229 | ip = in_aton(proc_lasat_ipbuf); | 185 | ip = in_aton(ipbuf); |
| 230 | *(unsigned int *)(table->data) = ip; | 186 | *(unsigned int *)(table->data) = ip; |
| 231 | lasat_write_eeprom_info(); | 187 | lasat_write_eeprom_info(); |
| 232 | } else { | 188 | } else { |
| 233 | ip = *(unsigned int *)(table->data); | 189 | ip = *(unsigned int *)(table->data); |
| 234 | sprintf(proc_lasat_ipbuf, "%d.%d.%d.%d", | 190 | sprintf(ipbuf, "%d.%d.%d.%d", |
| 235 | (ip) & 0xff, | 191 | (ip) & 0xff, |
| 236 | (ip >> 8) & 0xff, | 192 | (ip >> 8) & 0xff, |
| 237 | (ip >> 16) & 0xff, | 193 | (ip >> 16) & 0xff, |
| 238 | (ip >> 24) & 0xff); | 194 | (ip >> 24) & 0xff); |
| 239 | len = strlen(proc_lasat_ipbuf); | 195 | len = strlen(ipbuf); |
| 240 | if (len > *lenp) | 196 | if (len > *lenp) |
| 241 | len = *lenp; | 197 | len = *lenp; |
| 242 | if (len) | 198 | if (len) |
| 243 | if (copy_to_user(buffer, proc_lasat_ipbuf, len)) { | 199 | if (copy_to_user(buffer, ipbuf, len)) |
| 244 | mutex_unlock(&lasat_info_mutex); | ||
| 245 | return -EFAULT; | 200 | return -EFAULT; |
| 246 | } | ||
| 247 | if (len < *lenp) { | 201 | if (len < *lenp) { |
| 248 | if (put_user('\n', ((char *) buffer) + len)) { | 202 | if (put_user('\n', ((char *) buffer) + len)) |
| 249 | mutex_unlock(&lasat_info_mutex); | ||
| 250 | return -EFAULT; | 203 | return -EFAULT; |
| 251 | } | ||
| 252 | len++; | 204 | len++; |
| 253 | } | 205 | } |
| 254 | *lenp = len; | 206 | *lenp = len; |
| 255 | *ppos += len; | 207 | *ppos += len; |
| 256 | } | 208 | } |
| 257 | update_bcastaddr(); | ||
| 258 | mutex_unlock(&lasat_info_mutex); | ||
| 259 | 209 | ||
| 260 | return 0; | 210 | return 0; |
| 261 | } | 211 | } |
| 262 | #endif /* defined(CONFIG_INET) */ | 212 | #endif |
| 263 | 213 | ||
| 264 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, | 214 | static int sysctl_lasat_prid(ctl_table *table, int *name, int nlen, |
| 265 | void *oldval, size_t *oldlenp, | 215 | void *oldval, size_t *oldlenp, |
| 266 | void *newval, size_t newlen) | 216 | void *newval, size_t newlen) |
| 267 | { | 217 | { |
| 268 | int r; | 218 | int r; |
| 269 | 219 | ||
| 270 | mutex_lock(&lasat_info_mutex); | ||
| 271 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 220 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 272 | if (r < 0) { | 221 | if (r < 0) |
| 273 | mutex_unlock(&lasat_info_mutex); | ||
| 274 | return r; | 222 | return r; |
| 275 | } | ||
| 276 | |||
| 277 | if (newval && newlen) { | 223 | if (newval && newlen) { |
| 278 | if (name && *name == LASAT_PRID) | 224 | lasat_board_info.li_eeprom_info.prid = *(int *)newval; |
| 279 | lasat_board_info.li_eeprom_info.prid = *(int *)newval; | ||
| 280 | |||
| 281 | lasat_write_eeprom_info(); | 225 | lasat_write_eeprom_info(); |
| 282 | lasat_init_board_info(); | 226 | lasat_init_board_info(); |
| 283 | } | 227 | } |
| 284 | mutex_unlock(&lasat_info_mutex); | ||
| 285 | |||
| 286 | return 0; | 228 | return 0; |
| 287 | } | 229 | } |
| 288 | 230 | ||
| 289 | int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp, | 231 | int proc_lasat_prid(ctl_table *table, int write, struct file *filp, |
| 290 | void *buffer, size_t *lenp, loff_t *ppos) | 232 | void *buffer, size_t *lenp, loff_t *ppos) |
| 291 | { | 233 | { |
| 292 | int r; | 234 | int r; |
| 293 | 235 | ||
| 294 | mutex_lock(&lasat_info_mutex); | ||
| 295 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 236 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 296 | if ((!write) || r) { | 237 | if (r < 0) |
| 297 | mutex_unlock(&lasat_info_mutex); | ||
| 298 | return r; | 238 | return r; |
| 239 | if (write) { | ||
| 240 | lasat_board_info.li_eeprom_info.prid = | ||
| 241 | lasat_board_info.li_prid; | ||
| 242 | lasat_write_eeprom_info(); | ||
| 243 | lasat_init_board_info(); | ||
| 299 | } | 244 | } |
| 300 | if (filp && filp->f_path.dentry) { | ||
| 301 | if (!strcmp(filp->f_path.dentry->d_name.name, "prid")) | ||
| 302 | lasat_board_info.li_eeprom_info.prid = | ||
| 303 | lasat_board_info.li_prid; | ||
| 304 | if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess")) | ||
| 305 | lasat_board_info.li_eeprom_info.debugaccess = | ||
| 306 | lasat_board_info.li_debugaccess; | ||
| 307 | } | ||
| 308 | lasat_write_eeprom_info(); | ||
| 309 | mutex_unlock(&lasat_info_mutex); | ||
| 310 | |||
| 311 | return 0; | 245 | return 0; |
| 312 | } | 246 | } |
| 313 | 247 | ||
| 314 | extern int lasat_boot_to_service; | 248 | extern int lasat_boot_to_service; |
| 315 | 249 | ||
| 316 | #ifdef CONFIG_SYSCTL | ||
| 317 | |||
| 318 | static ctl_table lasat_table[] = { | 250 | static ctl_table lasat_table[] = { |
| 319 | { | 251 | { |
| 320 | .ctl_name = CTL_UNNUMBERED, | 252 | .ctl_name = CTL_UNNUMBERED, |
| @@ -349,8 +281,8 @@ static ctl_table lasat_table[] = { | |||
| 349 | .data = &lasat_board_info.li_prid, | 281 | .data = &lasat_board_info.li_prid, |
| 350 | .maxlen = sizeof(int), | 282 | .maxlen = sizeof(int), |
| 351 | .mode = 0644, | 283 | .mode = 0644, |
| 352 | .proc_handler = &proc_lasat_eeprom_value, | 284 | .proc_handler = &proc_lasat_prid, |
| 353 | .strategy = &sysctl_lasat_eeprom_value | 285 | .strategy = &sysctl_lasat_prid |
| 354 | }, | 286 | }, |
| 355 | #ifdef CONFIG_INET | 287 | #ifdef CONFIG_INET |
| 356 | { | 288 | { |
| @@ -363,7 +295,7 @@ static ctl_table lasat_table[] = { | |||
| 363 | .strategy = &sysctl_lasat_intvec | 295 | .strategy = &sysctl_lasat_intvec |
| 364 | }, | 296 | }, |
| 365 | { | 297 | { |
| 366 | .ctl_name = LASAT_NETMASK, | 298 | .ctl_name = CTL_UNNUMBERED, |
| 367 | .procname = "netmask", | 299 | .procname = "netmask", |
| 368 | .data = &lasat_board_info.li_eeprom_info.netmask, | 300 | .data = &lasat_board_info.li_eeprom_info.netmask, |
| 369 | .maxlen = sizeof(int), | 301 | .maxlen = sizeof(int), |
| @@ -371,15 +303,6 @@ static ctl_table lasat_table[] = { | |||
| 371 | .proc_handler = &proc_lasat_ip, | 303 | .proc_handler = &proc_lasat_ip, |
| 372 | .strategy = &sysctl_lasat_intvec | 304 | .strategy = &sysctl_lasat_intvec |
| 373 | }, | 305 | }, |
| 374 | { | ||
| 375 | .ctl_name = CTL_UNNUMBERED, | ||
| 376 | .procname = "bcastaddr", | ||
| 377 | .data = &lasat_bcastaddr, | ||
| 378 | .maxlen = sizeof(lasat_bcastaddr), | ||
| 379 | .mode = 0600, | ||
| 380 | .proc_handler = &proc_dostring, | ||
| 381 | .strategy = &sysctl_string | ||
| 382 | }, | ||
| 383 | #endif | 306 | #endif |
| 384 | { | 307 | { |
| 385 | .ctl_name = CTL_UNNUMBERED, | 308 | .ctl_name = CTL_UNNUMBERED, |
| @@ -417,7 +340,7 @@ static ctl_table lasat_table[] = { | |||
| 417 | .data = &lasat_board_info.li_namestr, | 340 | .data = &lasat_board_info.li_namestr, |
| 418 | .maxlen = sizeof(lasat_board_info.li_namestr), | 341 | .maxlen = sizeof(lasat_board_info.li_namestr), |
| 419 | .mode = 0444, | 342 | .mode = 0444, |
| 420 | .proc_handler = &proc_dostring, | 343 | .proc_handler = &proc_dostring, |
| 421 | .strategy = &sysctl_string | 344 | .strategy = &sysctl_string |
| 422 | }, | 345 | }, |
| 423 | { | 346 | { |
| @@ -448,9 +371,12 @@ static int __init lasat_register_sysctl(void) | |||
| 448 | 371 | ||
| 449 | lasat_table_header = | 372 | lasat_table_header = |
| 450 | register_sysctl_table(lasat_root_table); | 373 | register_sysctl_table(lasat_root_table); |
| 374 | if (!lasat_table_header) { | ||
| 375 | printk(KERN_ERR "Unable to register LASAT sysctl\n"); | ||
| 376 | return -ENOMEM; | ||
| 377 | } | ||
| 451 | 378 | ||
| 452 | return 0; | 379 | return 0; |
| 453 | } | 380 | } |
| 454 | 381 | ||
| 455 | __initcall(lasat_register_sysctl); | 382 | __initcall(lasat_register_sysctl); |
| 456 | #endif /* CONFIG_SYSCTL */ | ||
diff --git a/arch/mips/lasat/sysctl.h b/arch/mips/lasat/sysctl.h deleted file mode 100644 index 341b97933423..000000000000 --- a/arch/mips/lasat/sysctl.h +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * LASAT sysctl values | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef _LASAT_SYSCTL_H | ||
| 6 | #define _LASAT_SYSCTL_H | ||
| 7 | |||
| 8 | /* /proc/sys/lasat */ | ||
| 9 | enum { | ||
| 10 | LASAT_CPU_HZ = 1, | ||
| 11 | LASAT_BUS_HZ, | ||
| 12 | LASAT_MODEL, | ||
| 13 | LASAT_PRID, | ||
| 14 | LASAT_IPADDR, | ||
| 15 | LASAT_NETMASK, | ||
| 16 | LASAT_BCAST, | ||
| 17 | LASAT_PASSWORD, | ||
| 18 | LASAT_SBOOT, | ||
| 19 | LASAT_RTC, | ||
| 20 | LASAT_NAMESTR, | ||
| 21 | LASAT_TYPESTR, | ||
| 22 | }; | ||
| 23 | |||
| 24 | #endif /* _LASAT_SYSCTL_H */ | ||
diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c index b7633fda4180..96236bf33838 100644 --- a/arch/mips/mips-boards/generic/amon.c +++ b/arch/mips/mips-boards/generic/amon.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | int amon_cpu_avail(int cpu) | 29 | int amon_cpu_avail(int cpu) |
| 30 | { | 30 | { |
| 31 | struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); | 31 | struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); |
| 32 | 32 | ||
| 33 | if (cpu < 0 || cpu >= NCPULAUNCH) { | 33 | if (cpu < 0 || cpu >= NCPULAUNCH) { |
| 34 | pr_debug("avail: cpu%d is out of range\n", cpu); | 34 | pr_debug("avail: cpu%d is out of range\n", cpu); |
| @@ -53,7 +53,7 @@ void amon_cpu_start(int cpu, | |||
| 53 | unsigned long gp, unsigned long a0) | 53 | unsigned long gp, unsigned long a0) |
| 54 | { | 54 | { |
| 55 | volatile struct cpulaunch *launch = | 55 | volatile struct cpulaunch *launch = |
| 56 | (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); | 56 | (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); |
| 57 | 57 | ||
| 58 | if (!amon_cpu_avail(cpu)) | 58 | if (!amon_cpu_avail(cpu)) |
| 59 | return; | 59 | return; |
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile index 8dc6e2ac4c03..db4ad654a6d3 100644 --- a/arch/mips/mips-boards/malta/Makefile +++ b/arch/mips/mips-boards/malta/Makefile | |||
| @@ -19,9 +19,8 @@ | |||
| 19 | # under Linux. | 19 | # under Linux. |
| 20 | # | 20 | # |
| 21 | 21 | ||
| 22 | obj-y := malta_int.o malta_platform.o malta_setup.o | 22 | obj-y := malta_int.o malta_mtd.o malta_platform.o malta_setup.o |
| 23 | 23 | ||
| 24 | obj-$(CONFIG_MTD) += malta_mtd.o | ||
| 25 | # FIXME FIXME FIXME | 24 | # FIXME FIXME FIXME |
| 26 | obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o | 25 | obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o |
| 27 | 26 | ||
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 643c8bcffff3..27096751ddce 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
| @@ -446,6 +446,7 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 446 | struct page *page = pfn_to_page(fcp_args->pfn); | 446 | struct page *page = pfn_to_page(fcp_args->pfn); |
| 447 | int exec = vma->vm_flags & VM_EXEC; | 447 | int exec = vma->vm_flags & VM_EXEC; |
| 448 | struct mm_struct *mm = vma->vm_mm; | 448 | struct mm_struct *mm = vma->vm_mm; |
| 449 | int map_coherent = 0; | ||
| 449 | pgd_t *pgdp; | 450 | pgd_t *pgdp; |
| 450 | pud_t *pudp; | 451 | pud_t *pudp; |
| 451 | pmd_t *pmdp; | 452 | pmd_t *pmdp; |
| @@ -479,7 +480,9 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 479 | * Use kmap_coherent or kmap_atomic to do flushes for | 480 | * Use kmap_coherent or kmap_atomic to do flushes for |
| 480 | * another ASID than the current one. | 481 | * another ASID than the current one. |
| 481 | */ | 482 | */ |
| 482 | if (cpu_has_dc_aliases) | 483 | map_coherent = (cpu_has_dc_aliases && |
| 484 | page_mapped(page) && !Page_dcache_dirty(page)); | ||
| 485 | if (map_coherent) | ||
| 483 | vaddr = kmap_coherent(page, addr); | 486 | vaddr = kmap_coherent(page, addr); |
| 484 | else | 487 | else |
| 485 | vaddr = kmap_atomic(page, KM_USER0); | 488 | vaddr = kmap_atomic(page, KM_USER0); |
| @@ -502,7 +505,7 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 502 | } | 505 | } |
| 503 | 506 | ||
| 504 | if (vaddr) { | 507 | if (vaddr) { |
| 505 | if (cpu_has_dc_aliases) | 508 | if (map_coherent) |
| 506 | kunmap_coherent(); | 509 | kunmap_coherent(); |
| 507 | else | 510 | else |
| 508 | kunmap_atomic(vaddr, KM_USER0); | 511 | kunmap_atomic(vaddr, KM_USER0); |
| @@ -1226,6 +1229,28 @@ void au1x00_fixup_config_od(void) | |||
| 1226 | } | 1229 | } |
| 1227 | } | 1230 | } |
| 1228 | 1231 | ||
| 1232 | /* CP0 hazard avoidance. */ | ||
| 1233 | #define NXP_BARRIER() \ | ||
| 1234 | __asm__ __volatile__( \ | ||
| 1235 | ".set noreorder\n\t" \ | ||
| 1236 | "nop; nop; nop; nop; nop; nop;\n\t" \ | ||
| 1237 | ".set reorder\n\t") | ||
| 1238 | |||
| 1239 | static void nxp_pr4450_fixup_config(void) | ||
| 1240 | { | ||
| 1241 | unsigned long config0; | ||
| 1242 | |||
| 1243 | config0 = read_c0_config(); | ||
| 1244 | |||
| 1245 | /* clear all three cache coherency fields */ | ||
| 1246 | config0 &= ~(0x7 | (7 << 25) | (7 << 28)); | ||
| 1247 | config0 |= (((_page_cachable_default >> _CACHE_SHIFT) << 0) | | ||
| 1248 | ((_page_cachable_default >> _CACHE_SHIFT) << 25) | | ||
| 1249 | ((_page_cachable_default >> _CACHE_SHIFT) << 28)); | ||
| 1250 | write_c0_config(config0); | ||
| 1251 | NXP_BARRIER(); | ||
| 1252 | } | ||
| 1253 | |||
| 1229 | static int __cpuinitdata cca = -1; | 1254 | static int __cpuinitdata cca = -1; |
| 1230 | 1255 | ||
| 1231 | static int __init cca_setup(char *str) | 1256 | static int __init cca_setup(char *str) |
| @@ -1271,6 +1296,10 @@ static void __cpuinit coherency_setup(void) | |||
| 1271 | case CPU_AU1500: /* rev. AB */ | 1296 | case CPU_AU1500: /* rev. AB */ |
| 1272 | au1x00_fixup_config_od(); | 1297 | au1x00_fixup_config_od(); |
| 1273 | break; | 1298 | break; |
| 1299 | |||
| 1300 | case PRID_IMP_PR4450: | ||
| 1301 | nxp_pr4450_fixup_config(); | ||
| 1302 | break; | ||
| 1274 | } | 1303 | } |
| 1275 | } | 1304 | } |
| 1276 | 1305 | ||
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index ecd562d2c348..137c14bafd6b 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -71,6 +71,7 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
| 71 | * don't have to care about aliases on other CPUs. | 71 | * don't have to care about aliases on other CPUs. |
| 72 | */ | 72 | */ |
| 73 | unsigned long empty_zero_page, zero_page_mask; | 73 | unsigned long empty_zero_page, zero_page_mask; |
| 74 | EXPORT_SYMBOL_GPL(empty_zero_page); | ||
| 74 | 75 | ||
| 75 | /* | 76 | /* |
| 76 | * Not static inline because used by IP27 special magic initialization code | 77 | * Not static inline because used by IP27 special magic initialization code |
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c index cab81f42eee5..1edf0cbbeede 100644 --- a/arch/mips/mm/page.c +++ b/arch/mips/mm/page.c | |||
| @@ -460,7 +460,7 @@ void __cpuinit build_copy_page(void) | |||
| 460 | build_copy_load_pref(&buf, -off); | 460 | build_copy_load_pref(&buf, -off); |
| 461 | off -= cache_line_size; | 461 | off -= cache_line_size; |
| 462 | } | 462 | } |
| 463 | off = cache_line_size ? min(8, pref_bias_copy_load / cache_line_size) * | 463 | off = cache_line_size ? min(8, pref_bias_copy_store / cache_line_size) * |
| 464 | cache_line_size : 0; | 464 | cache_line_size : 0; |
| 465 | while (off) { | 465 | while (off) { |
| 466 | build_copy_store_pref(&buf, -off); | 466 | build_copy_store_pref(&buf, -off); |
diff --git a/arch/mips/nxp/pnx8550/jbs/board_setup.c b/arch/mips/nxp/pnx8550/jbs/board_setup.c index f92826e0096d..57dd903ca408 100644 --- a/arch/mips/nxp/pnx8550/jbs/board_setup.c +++ b/arch/mips/nxp/pnx8550/jbs/board_setup.c | |||
| @@ -47,16 +47,7 @@ | |||
| 47 | 47 | ||
| 48 | void __init board_setup(void) | 48 | void __init board_setup(void) |
| 49 | { | 49 | { |
| 50 | unsigned long config0, configpr; | 50 | unsigned long configpr; |
| 51 | |||
| 52 | config0 = read_c0_config(); | ||
| 53 | |||
| 54 | /* clear all three cache coherency fields */ | ||
| 55 | config0 &= ~(0x7 | (7<<25) | (7<<28)); | ||
| 56 | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) | | ||
| 57 | (CONF_CM_DEFAULT<<28)); | ||
| 58 | write_c0_config(config0); | ||
| 59 | BARRIER; | ||
| 60 | 51 | ||
| 61 | configpr = read_c0_config7(); | 52 | configpr = read_c0_config7(); |
| 62 | configpr |= (1<<19); /* enable tlb */ | 53 | configpr |= (1<<19); /* enable tlb */ |
diff --git a/arch/mips/nxp/pnx8550/stb810/board_setup.c b/arch/mips/nxp/pnx8550/stb810/board_setup.c index 1282c27cfcb7..af2a55e0b4e9 100644 --- a/arch/mips/nxp/pnx8550/stb810/board_setup.c +++ b/arch/mips/nxp/pnx8550/stb810/board_setup.c | |||
| @@ -33,15 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | void __init board_setup(void) | 34 | void __init board_setup(void) |
| 35 | { | 35 | { |
| 36 | unsigned long config0, configpr; | 36 | unsigned long configpr; |
| 37 | |||
| 38 | config0 = read_c0_config(); | ||
| 39 | |||
| 40 | /* clear all three cache coherency fields */ | ||
| 41 | config0 &= ~(0x7 | (7<<25) | (7<<28)); | ||
| 42 | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) | | ||
| 43 | (CONF_CM_DEFAULT<<28)); | ||
| 44 | write_c0_config(config0); | ||
| 45 | 37 | ||
| 46 | configpr = read_c0_config7(); | 38 | configpr = read_c0_config7(); |
| 47 | configpr |= (1<<19); /* enable tlb */ | 39 | configpr |= (1<<19); /* enable tlb */ |
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index 42e4d2c800fa..2a09ad91ec8c 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
| @@ -207,6 +207,7 @@ struct pci_controller sb1250_controller = { | |||
| 207 | 207 | ||
| 208 | static int __init sb1250_pcibios_init(void) | 208 | static int __init sb1250_pcibios_init(void) |
| 209 | { | 209 | { |
| 210 | void __iomem *io_map_base; | ||
| 210 | uint32_t cmdreg; | 211 | uint32_t cmdreg; |
| 211 | uint64_t reg; | 212 | uint64_t reg; |
| 212 | extern int pci_probe_only; | 213 | extern int pci_probe_only; |
| @@ -253,12 +254,13 @@ static int __init sb1250_pcibios_init(void) | |||
| 253 | * works correctly with most of Linux's drivers. | 254 | * works correctly with most of Linux's drivers. |
| 254 | * XXX ehs: Should this happen in PCI Device mode? | 255 | * XXX ehs: Should this happen in PCI Device mode? |
| 255 | */ | 256 | */ |
| 256 | |||
| 257 | set_io_port_base((unsigned long) | ||
| 258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 65536)); | ||
| 259 | isa_slot_offset = (unsigned long) | 257 | isa_slot_offset = (unsigned long) |
| 260 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); | 258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); |
| 261 | 259 | ||
| 260 | io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024); | ||
| 261 | sb1250_controller.io_map_base = io_map_base; | ||
| 262 | set_io_port_base((unsigned long)io_map_base); | ||
| 263 | |||
| 262 | #ifdef CONFIG_SIBYTE_HAS_LDT | 264 | #ifdef CONFIG_SIBYTE_HAS_LDT |
| 263 | /* | 265 | /* |
| 264 | * Also check the LDT bridge's enable, just in case we didn't | 266 | * Also check the LDT bridge's enable, just in case we didn't |
diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c index 33c4f683d067..d1e049b55f34 100644 --- a/arch/mips/pci/pci-vr41xx.c +++ b/arch/mips/pci/pci-vr41xx.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2001-2003 MontaVista Software Inc. | 4 | * Copyright (C) 2001-2003 MontaVista Software Inc. |
| 5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> | 5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> |
| 6 | * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 6 | * Copyright (C) 2004-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> |
| 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| @@ -300,6 +300,18 @@ static int __init vr41xx_pciu_init(void) | |||
| 300 | ioport_resource.end = IO_PORT_RESOURCE_END; | 300 | ioport_resource.end = IO_PORT_RESOURCE_END; |
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | if (setup->master_io) { | ||
| 304 | void __iomem *io_map_base; | ||
| 305 | struct resource *res = vr41xx_pci_controller.io_resource; | ||
| 306 | master = setup->master_io; | ||
| 307 | io_map_base = ioremap(master->bus_base_address, | ||
| 308 | res->end - res->start + 1); | ||
| 309 | if (!io_map_base) | ||
| 310 | return -EBUSY; | ||
| 311 | |||
| 312 | vr41xx_pci_controller.io_map_base = (unsigned long)io_map_base; | ||
| 313 | } | ||
| 314 | |||
| 303 | register_pci_controller(&vr41xx_pci_controller); | 315 | register_pci_controller(&vr41xx_pci_controller); |
| 304 | 316 | ||
| 305 | return 0; | 317 | return 0; |
diff --git a/arch/mips/sibyte/swarm/Makefile b/arch/mips/sibyte/swarm/Makefile index 2d626039195c..1775755a2619 100644 --- a/arch/mips/sibyte/swarm/Makefile +++ b/arch/mips/sibyte/swarm/Makefile | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | lib-y = setup.o rtc_xicor1241.o rtc_m41t81.o | 1 | obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o |
| 2 | 2 | ||
| 3 | lib-$(CONFIG_KGDB) += dbg_io.o | 3 | obj-$(CONFIG_KGDB) += dbg_io.o |
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c index 3b0d579fc15d..9c623c88387b 100644 --- a/arch/mn10300/kernel/process.c +++ b/arch/mn10300/kernel/process.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/ptrace.h> | 20 | #include <linux/ptrace.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/user.h> | 22 | #include <linux/user.h> |
| 23 | #include <linux/a.out.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/reboot.h> | 25 | #include <linux/reboot.h> |
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 6b7ce2636851..017121ce896f 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/ptrace.h> | 17 | #include <linux/ptrace.h> |
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/user.h> | 19 | #include <linux/user.h> |
| 20 | #include <linux/a.out.h> | ||
| 21 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S index f0b18ce89842..38a1c1b8d4e8 100644 --- a/arch/parisc/hpux/gate.S +++ b/arch/parisc/hpux/gate.S | |||
| @@ -13,10 +13,9 @@ | |||
| 13 | #include <asm/unistd.h> | 13 | #include <asm/unistd.h> |
| 14 | #include <asm/errno.h> | 14 | #include <asm/errno.h> |
| 15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
| 16 | #include <linux/init.h> | ||
| 17 | 16 | ||
| 18 | .level LEVEL | 17 | .level LEVEL |
| 19 | __HEAD | 18 | .text |
| 20 | 19 | ||
| 21 | .import hpux_call_table | 20 | .import hpux_call_table |
| 22 | .import hpux_syscall_exit,code | 21 | .import hpux_syscall_exit,code |
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S index ccd3a50c0995..58c53c879c02 100644 --- a/arch/parisc/hpux/wrappers.S +++ b/arch/parisc/hpux/wrappers.S | |||
| @@ -28,10 +28,9 @@ | |||
| 28 | #include <asm/assembly.h> | 28 | #include <asm/assembly.h> |
| 29 | #include <asm/signal.h> | 29 | #include <asm/signal.h> |
| 30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 31 | #include <linux/init.h> | ||
| 32 | 31 | ||
| 33 | .level LEVEL | 32 | .level LEVEL |
| 34 | __HEAD | 33 | .text |
| 35 | 34 | ||
| 36 | /* These should probably go in a header file somewhere. | 35 | /* These should probably go in a header file somewhere. |
| 37 | * They are duplicated in kernel/wrappers.S | 36 | * They are duplicated in kernel/wrappers.S |
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 5d0837458c19..d1fa4edd2d80 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <asm/thread_info.h> | 38 | #include <asm/thread_info.h> |
| 39 | 39 | ||
| 40 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
| 41 | #include <linux/init.h> | ||
| 42 | 41 | ||
| 43 | #ifdef CONFIG_64BIT | 42 | #ifdef CONFIG_64BIT |
| 44 | .level 2.0w | 43 | .level 2.0w |
| @@ -622,7 +621,7 @@ | |||
| 622 | * the static part of the kernel address space. | 621 | * the static part of the kernel address space. |
| 623 | */ | 622 | */ |
| 624 | 623 | ||
| 625 | __HEAD | 624 | .text |
| 626 | 625 | ||
| 627 | .align PAGE_SIZE | 626 | .align PAGE_SIZE |
| 628 | 627 | ||
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 5680a2c3b13d..a84e31e82876 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
| @@ -33,6 +33,7 @@ ENTRY(boot_args) | |||
| 33 | END(boot_args) | 33 | END(boot_args) |
| 34 | 34 | ||
| 35 | __HEAD | 35 | __HEAD |
| 36 | |||
| 36 | .align 4 | 37 | .align 4 |
| 37 | .import init_thread_union,data | 38 | .import init_thread_union,data |
| 38 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ | 39 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ |
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S index 068322eb8c9b..2cbf13b3ef11 100644 --- a/arch/parisc/kernel/hpmc.S +++ b/arch/parisc/kernel/hpmc.S | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | #include <asm/pdc.h> | 47 | #include <asm/pdc.h> |
| 48 | 48 | ||
| 49 | #include <linux/linkage.h> | 49 | #include <linux/linkage.h> |
| 50 | #include <linux/init.h> | ||
| 51 | 50 | ||
| 52 | /* | 51 | /* |
| 53 | * stack for os_hpmc, the HPMC handler. | 52 | * stack for os_hpmc, the HPMC handler. |
| @@ -77,7 +76,7 @@ ENTRY(hpmc_pim_data) | |||
| 77 | .block HPMC_PIM_DATA_SIZE | 76 | .block HPMC_PIM_DATA_SIZE |
| 78 | END(hpmc_pim_data) | 77 | END(hpmc_pim_data) |
| 79 | 78 | ||
| 80 | __HEAD | 79 | .text |
| 81 | 80 | ||
| 82 | .import intr_save, code | 81 | .import intr_save, code |
| 83 | ENTRY(os_hpmc) | 82 | ENTRY(os_hpmc) |
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index e3246a5ca74f..09b77b2553c6 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
| @@ -37,9 +37,8 @@ | |||
| 37 | #include <asm/pgtable.h> | 37 | #include <asm/pgtable.h> |
| 38 | #include <asm/cache.h> | 38 | #include <asm/cache.h> |
| 39 | #include <linux/linkage.h> | 39 | #include <linux/linkage.h> |
| 40 | #include <linux/init.h> | ||
| 41 | 40 | ||
| 42 | __HEAD | 41 | .text |
| 43 | .align 128 | 42 | .align 128 |
| 44 | 43 | ||
| 45 | ENTRY(flush_tlb_all_local) | 44 | ENTRY(flush_tlb_all_local) |
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 5b7fc4aa044d..0eecfbbc59cd 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c | |||
| @@ -152,3 +152,6 @@ EXPORT_SYMBOL($$dyncall); | |||
| 152 | EXPORT_SYMBOL(node_data); | 152 | EXPORT_SYMBOL(node_data); |
| 153 | EXPORT_SYMBOL(pfnnid_map); | 153 | EXPORT_SYMBOL(pfnnid_map); |
| 154 | #endif | 154 | #endif |
| 155 | |||
| 156 | /* from pacache.S -- needed for copy_page */ | ||
| 157 | EXPORT_SYMBOL(copy_user_page_asm); | ||
diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S index d411dfb5b6d1..fa6ea99bb324 100644 --- a/arch/parisc/kernel/perf_asm.S +++ b/arch/parisc/kernel/perf_asm.S | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | ; The coprocessor only needs to be enabled when | 43 | ; The coprocessor only needs to be enabled when |
| 44 | ; starting/stopping the coprocessor with the pmenb/pmdis. | 44 | ; starting/stopping the coprocessor with the pmenb/pmdis. |
| 45 | ; | 45 | ; |
| 46 | __HEAD | 46 | .text |
| 47 | 47 | ||
| 48 | ENTRY(perf_intrigue_enable_perf_counters) | 48 | ENTRY(perf_intrigue_enable_perf_counters) |
| 49 | .proc | 49 | .proc |
diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S index 47fbdae6efd5..7a92695d95a6 100644 --- a/arch/parisc/kernel/real2.S +++ b/arch/parisc/kernel/real2.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <asm/assembly.h> | 12 | #include <asm/assembly.h> |
| 13 | 13 | ||
| 14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 15 | #include <linux/init.h> | ||
| 16 | 15 | ||
| 17 | .section .bss | 16 | .section .bss |
| 18 | .export real_stack | 17 | .export real_stack |
| @@ -40,7 +39,7 @@ save_cr_end: | |||
| 40 | /************************ 32-bit real-mode calls ***********************/ | 39 | /************************ 32-bit real-mode calls ***********************/ |
| 41 | /* This can be called in both narrow and wide kernels */ | 40 | /* This can be called in both narrow and wide kernels */ |
| 42 | 41 | ||
| 43 | __HEAD | 42 | .text |
| 44 | 43 | ||
| 45 | /* unsigned long real32_call_asm(unsigned int *sp, | 44 | /* unsigned long real32_call_asm(unsigned int *sp, |
| 46 | * unsigned int *arg0p, | 45 | * unsigned int *arg0p, |
| @@ -114,7 +113,7 @@ ENDPROC(real32_call_asm) | |||
| 114 | # define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where) | 113 | # define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where) |
| 115 | # define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r | 114 | # define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r |
| 116 | 115 | ||
| 117 | __HEAD | 116 | .text |
| 118 | save_control_regs: | 117 | save_control_regs: |
| 119 | load32 PA(save_cr_space), %r28 | 118 | load32 PA(save_cr_space), %r28 |
| 120 | PUSH_CR(%cr24, %r28) | 119 | PUSH_CR(%cr24, %r28) |
| @@ -146,7 +145,7 @@ restore_control_regs: | |||
| 146 | /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for | 145 | /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for |
| 147 | * more general-purpose use by the several places which need RFIs | 146 | * more general-purpose use by the several places which need RFIs |
| 148 | */ | 147 | */ |
| 149 | __HEAD | 148 | .text |
| 150 | .align 128 | 149 | .align 128 |
| 151 | rfi_virt2real: | 150 | rfi_virt2real: |
| 152 | /* switch to real mode... */ | 151 | /* switch to real mode... */ |
| @@ -181,7 +180,7 @@ rfi_v2r_1: | |||
| 181 | bv 0(%r2) | 180 | bv 0(%r2) |
| 182 | nop | 181 | nop |
| 183 | 182 | ||
| 184 | __HEAD | 183 | .text |
| 185 | .align 128 | 184 | .align 128 |
| 186 | rfi_real2virt: | 185 | rfi_real2virt: |
| 187 | rsm PSW_SM_I,%r0 | 186 | rsm PSW_SM_I,%r0 |
| @@ -219,7 +218,7 @@ rfi_r2v_1: | |||
| 219 | 218 | ||
| 220 | /************************ 64-bit real-mode calls ***********************/ | 219 | /************************ 64-bit real-mode calls ***********************/ |
| 221 | /* This is only usable in wide kernels right now and will probably stay so */ | 220 | /* This is only usable in wide kernels right now and will probably stay so */ |
| 222 | __HEAD | 221 | .text |
| 223 | /* unsigned long real64_call_asm(unsigned long *sp, | 222 | /* unsigned long real64_call_asm(unsigned long *sp, |
| 224 | * unsigned long *arg0p, | 223 | * unsigned long *arg0p, |
| 225 | * unsigned long fn) | 224 | * unsigned long fn) |
| @@ -277,7 +276,7 @@ ENDPROC(real64_call_asm) | |||
| 277 | 276 | ||
| 278 | #endif | 277 | #endif |
| 279 | 278 | ||
| 280 | __HEAD | 279 | .text |
| 281 | /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html | 280 | /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html |
| 282 | ** GCC 3.3 and later has a new function in libgcc.a for | 281 | ** GCC 3.3 and later has a new function in libgcc.a for |
| 283 | ** comparing function pointers. | 282 | ** comparing function pointers. |
diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c index db94affe5c71..fb59852006de 100644 --- a/arch/parisc/kernel/signal32.c +++ b/arch/parisc/kernel/signal32.c | |||
| @@ -289,7 +289,7 @@ setup_sigcontext32(struct compat_sigcontext __user *sc, struct compat_regfile __ | |||
| 289 | &sc->sc_iaoq[0], compat_reg); | 289 | &sc->sc_iaoq[0], compat_reg); |
| 290 | 290 | ||
| 291 | /* Store upper half */ | 291 | /* Store upper half */ |
| 292 | compat_reg = (compat_uint_t)(regs->gr[32] >> 32); | 292 | compat_reg = (compat_uint_t)(regs->gr[31] >> 32); |
| 293 | err |= __put_user(compat_reg, &rf->rf_iaoq[0]); | 293 | err |= __put_user(compat_reg, &rf->rf_iaoq[0]); |
| 294 | DBG(2,"setup_sigcontext32: upper half iaoq[0] = %#x\n", compat_reg); | 294 | DBG(2,"setup_sigcontext32: upper half iaoq[0] = %#x\n", compat_reg); |
| 295 | 295 | ||
| @@ -299,7 +299,7 @@ setup_sigcontext32(struct compat_sigcontext __user *sc, struct compat_regfile __ | |||
| 299 | DBG(2,"setup_sigcontext32: sc->sc_iaoq[1] = %p <= %#x\n", | 299 | DBG(2,"setup_sigcontext32: sc->sc_iaoq[1] = %p <= %#x\n", |
| 300 | &sc->sc_iaoq[1], compat_reg); | 300 | &sc->sc_iaoq[1], compat_reg); |
| 301 | /* Store upper half */ | 301 | /* Store upper half */ |
| 302 | compat_reg = (compat_uint_t)((regs->gr[32]+4) >> 32); | 302 | compat_reg = (compat_uint_t)((regs->gr[31]+4) >> 32); |
| 303 | err |= __put_user(compat_reg, &rf->rf_iaoq[1]); | 303 | err |= __put_user(compat_reg, &rf->rf_iaoq[1]); |
| 304 | DBG(2,"setup_sigcontext32: upper half iaoq[1] = %#x\n", compat_reg); | 304 | DBG(2,"setup_sigcontext32: upper half iaoq[1] = %#x\n", compat_reg); |
| 305 | 305 | ||
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index ae509d8cd03f..69b6eebc466e 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
| 18 | 18 | ||
| 19 | #include <linux/linkage.h> | 19 | #include <linux/linkage.h> |
| 20 | #include <linux/init.h> | ||
| 21 | 20 | ||
| 22 | /* We fill the empty parts of the gateway page with | 21 | /* We fill the empty parts of the gateway page with |
| 23 | * something that will kill the kernel or a | 22 | * something that will kill the kernel or a |
| @@ -27,7 +26,7 @@ | |||
| 27 | 26 | ||
| 28 | .level LEVEL | 27 | .level LEVEL |
| 29 | 28 | ||
| 30 | __HEAD | 29 | .text |
| 31 | 30 | ||
| 32 | .import syscall_exit,code | 31 | .import syscall_exit,code |
| 33 | .import syscall_exit_rfi,code | 32 | .import syscall_exit_rfi,code |
| @@ -637,7 +636,7 @@ END(sys_call_table64) | |||
| 637 | All light-weight-syscall atomic operations | 636 | All light-weight-syscall atomic operations |
| 638 | will use this set of locks | 637 | will use this set of locks |
| 639 | */ | 638 | */ |
| 640 | .section .data, "aw" | 639 | .section .data |
| 641 | .align PAGE_SIZE | 640 | .align PAGE_SIZE |
| 642 | ENTRY(lws_lock_start) | 641 | ENTRY(lws_lock_start) |
| 643 | /* lws locks */ | 642 | /* lws locks */ |
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 50b4a3a25d0a..2e516b871752 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
| @@ -50,6 +50,7 @@ SECTIONS | |||
| 50 | 50 | ||
| 51 | _text = .; /* Text and read-only data */ | 51 | _text = .; /* Text and read-only data */ |
| 52 | .text ALIGN(16) : { | 52 | .text ALIGN(16) : { |
| 53 | HEAD_TEXT | ||
| 53 | TEXT_TEXT | 54 | TEXT_TEXT |
| 54 | SCHED_TEXT | 55 | SCHED_TEXT |
| 55 | LOCK_TEXT | 56 | LOCK_TEXT |
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index 4821ad6d5269..d172d4245cdc 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <asm/assembly.h> | 23 | #include <asm/assembly.h> |
| 24 | #include <asm/errno.h> | 24 | #include <asm/errno.h> |
| 25 | #include <linux/linkage.h> | 25 | #include <linux/linkage.h> |
| 26 | #include <linux/init.h> | ||
| 27 | 26 | ||
| 28 | #ifdef CONFIG_SMP | 27 | #ifdef CONFIG_SMP |
| 29 | .macro get_fault_ip t1 t2 | 28 | .macro get_fault_ip t1 t2 |
| @@ -56,7 +55,7 @@ | |||
| 56 | 55 | ||
| 57 | .level LEVEL | 56 | .level LEVEL |
| 58 | 57 | ||
| 59 | __HEAD | 58 | .text |
| 60 | .section .fixup, "ax" | 59 | .section .fixup, "ax" |
| 61 | 60 | ||
| 62 | /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */ | 61 | /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */ |
diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S index b0d885350846..1bd23ccec17b 100644 --- a/arch/parisc/lib/lusercopy.S +++ b/arch/parisc/lib/lusercopy.S | |||
| @@ -33,12 +33,11 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | .text | ||
| 37 | |||
| 36 | #include <asm/assembly.h> | 38 | #include <asm/assembly.h> |
| 37 | #include <asm/errno.h> | 39 | #include <asm/errno.h> |
| 38 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
| 39 | #include <linux/init.h> | ||
| 40 | |||
| 41 | __HEAD | ||
| 42 | 41 | ||
| 43 | /* | 42 | /* |
| 44 | * get_sr gets the appropriate space value into | 43 | * get_sr gets the appropriate space value into |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 78fe252b92c3..ce0da689a89d 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
| @@ -547,6 +547,7 @@ void __init mem_init(void) | |||
| 547 | } | 547 | } |
| 548 | 548 | ||
| 549 | unsigned long *empty_zero_page __read_mostly; | 549 | unsigned long *empty_zero_page __read_mostly; |
| 550 | EXPORT_SYMBOL(empty_zero_page); | ||
| 550 | 551 | ||
| 551 | void show_mem(void) | 552 | void show_mem(void) |
| 552 | { | 553 | { |
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 9dcdc036cdf7..b7d4c4ce2fe6 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
| @@ -96,6 +96,8 @@ endif | |||
| 96 | else | 96 | else |
| 97 | KBUILD_CFLAGS += $(call cc-option,-mtune=power4) | 97 | KBUILD_CFLAGS += $(call cc-option,-mtune=power4) |
| 98 | endif | 98 | endif |
| 99 | else | ||
| 100 | LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o | ||
| 99 | endif | 101 | endif |
| 100 | 102 | ||
| 101 | ifeq ($(CONFIG_TUNE_CELL),y) | 103 | ifeq ($(CONFIG_TUNE_CELL),y) |
| @@ -154,7 +156,7 @@ all: zImage | |||
| 154 | 156 | ||
| 155 | CPPFLAGS_vmlinux.lds := -Upowerpc | 157 | CPPFLAGS_vmlinux.lds := -Upowerpc |
| 156 | 158 | ||
| 157 | BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% | 159 | BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.% |
| 158 | 160 | ||
| 159 | PHONY += $(BOOT_TARGETS) | 161 | PHONY += $(BOOT_TARGETS) |
| 160 | 162 | ||
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index d53b84e761a9..1cee2f9fdf06 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -51,7 +51,7 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ | |||
| 51 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) | 51 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) |
| 52 | 52 | ||
| 53 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c | 53 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c |
| 54 | src-wlib := string.S crt0.S stdio.c main.c \ | 54 | src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \ |
| 55 | $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \ | 55 | $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \ |
| 56 | ns16550.c serial.c simple_alloc.c div64.S util.S \ | 56 | ns16550.c serial.c simple_alloc.c div64.S util.S \ |
| 57 | gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ | 57 | gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ |
diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S new file mode 100644 index 000000000000..f3d9b35c07d4 --- /dev/null +++ b/arch/powerpc/boot/crtsavres.S | |||
| @@ -0,0 +1,233 @@ | |||
| 1 | /* | ||
| 2 | * Special support for eabi and SVR4 | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. | ||
| 5 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
| 6 | * Written By Michael Meissner | ||
| 7 | * | ||
| 8 | * Based on gcc/config/rs6000/crtsavres.asm from gcc | ||
| 9 | * | ||
| 10 | * This file is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2, or (at your option) any | ||
| 13 | * later version. | ||
| 14 | * | ||
| 15 | * In addition to the permissions in the GNU General Public License, the | ||
| 16 | * Free Software Foundation gives you unlimited permission to link the | ||
| 17 | * compiled version of this file with other programs, and to distribute | ||
| 18 | * those programs without any restriction coming from the use of this | ||
| 19 | * file. (The General Public License restrictions do apply in other | ||
| 20 | * respects; for example, they cover modification of the file, and | ||
| 21 | * distribution when not linked into another program.) | ||
| 22 | * | ||
| 23 | * This file is distributed in the hope that it will be useful, but | ||
| 24 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 26 | * General Public License for more details. | ||
| 27 | * | ||
| 28 | * You should have received a copy of the GNU General Public License | ||
| 29 | * along with this program; see the file COPYING. If not, write to | ||
| 30 | * the Free Software Foundation, 51 Franklin Street, Fifth Floor, | ||
| 31 | * Boston, MA 02110-1301, USA. | ||
| 32 | * | ||
| 33 | * As a special exception, if you link this library with files | ||
| 34 | * compiled with GCC to produce an executable, this does not cause | ||
| 35 | * the resulting executable to be covered by the GNU General Public License. | ||
| 36 | * This exception does not however invalidate any other reasons why | ||
| 37 | * the executable file might be covered by the GNU General Public License. | ||
| 38 | */ | ||
| 39 | |||
| 40 | .file "crtsavres.S" | ||
| 41 | .section ".text" | ||
| 42 | |||
| 43 | /* On PowerPC64 Linux, these functions are provided by the linker. */ | ||
| 44 | #ifndef __powerpc64__ | ||
| 45 | |||
| 46 | #define _GLOBAL(name) \ | ||
| 47 | .type name,@function; \ | ||
| 48 | .globl name; \ | ||
| 49 | name: | ||
| 50 | |||
| 51 | /* Routines for saving integer registers, called by the compiler. */ | ||
| 52 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 53 | /* function, just beyond the end of the integer save area. */ | ||
| 54 | |||
| 55 | _GLOBAL(_savegpr_14) | ||
| 56 | _GLOBAL(_save32gpr_14) | ||
| 57 | stw 14,-72(11) /* save gp registers */ | ||
| 58 | _GLOBAL(_savegpr_15) | ||
| 59 | _GLOBAL(_save32gpr_15) | ||
| 60 | stw 15,-68(11) | ||
| 61 | _GLOBAL(_savegpr_16) | ||
| 62 | _GLOBAL(_save32gpr_16) | ||
| 63 | stw 16,-64(11) | ||
| 64 | _GLOBAL(_savegpr_17) | ||
| 65 | _GLOBAL(_save32gpr_17) | ||
| 66 | stw 17,-60(11) | ||
| 67 | _GLOBAL(_savegpr_18) | ||
| 68 | _GLOBAL(_save32gpr_18) | ||
| 69 | stw 18,-56(11) | ||
| 70 | _GLOBAL(_savegpr_19) | ||
| 71 | _GLOBAL(_save32gpr_19) | ||
| 72 | stw 19,-52(11) | ||
| 73 | _GLOBAL(_savegpr_20) | ||
| 74 | _GLOBAL(_save32gpr_20) | ||
| 75 | stw 20,-48(11) | ||
| 76 | _GLOBAL(_savegpr_21) | ||
| 77 | _GLOBAL(_save32gpr_21) | ||
| 78 | stw 21,-44(11) | ||
| 79 | _GLOBAL(_savegpr_22) | ||
| 80 | _GLOBAL(_save32gpr_22) | ||
| 81 | stw 22,-40(11) | ||
| 82 | _GLOBAL(_savegpr_23) | ||
| 83 | _GLOBAL(_save32gpr_23) | ||
| 84 | stw 23,-36(11) | ||
| 85 | _GLOBAL(_savegpr_24) | ||
| 86 | _GLOBAL(_save32gpr_24) | ||
| 87 | stw 24,-32(11) | ||
| 88 | _GLOBAL(_savegpr_25) | ||
| 89 | _GLOBAL(_save32gpr_25) | ||
| 90 | stw 25,-28(11) | ||
| 91 | _GLOBAL(_savegpr_26) | ||
| 92 | _GLOBAL(_save32gpr_26) | ||
| 93 | stw 26,-24(11) | ||
| 94 | _GLOBAL(_savegpr_27) | ||
| 95 | _GLOBAL(_save32gpr_27) | ||
| 96 | stw 27,-20(11) | ||
| 97 | _GLOBAL(_savegpr_28) | ||
| 98 | _GLOBAL(_save32gpr_28) | ||
| 99 | stw 28,-16(11) | ||
| 100 | _GLOBAL(_savegpr_29) | ||
| 101 | _GLOBAL(_save32gpr_29) | ||
| 102 | stw 29,-12(11) | ||
| 103 | _GLOBAL(_savegpr_30) | ||
| 104 | _GLOBAL(_save32gpr_30) | ||
| 105 | stw 30,-8(11) | ||
| 106 | _GLOBAL(_savegpr_31) | ||
| 107 | _GLOBAL(_save32gpr_31) | ||
| 108 | stw 31,-4(11) | ||
| 109 | blr | ||
| 110 | |||
| 111 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 112 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 113 | /* function, just beyond the end of the integer restore area. */ | ||
| 114 | |||
| 115 | _GLOBAL(_restgpr_14) | ||
| 116 | _GLOBAL(_rest32gpr_14) | ||
| 117 | lwz 14,-72(11) /* restore gp registers */ | ||
| 118 | _GLOBAL(_restgpr_15) | ||
| 119 | _GLOBAL(_rest32gpr_15) | ||
| 120 | lwz 15,-68(11) | ||
| 121 | _GLOBAL(_restgpr_16) | ||
| 122 | _GLOBAL(_rest32gpr_16) | ||
| 123 | lwz 16,-64(11) | ||
| 124 | _GLOBAL(_restgpr_17) | ||
| 125 | _GLOBAL(_rest32gpr_17) | ||
| 126 | lwz 17,-60(11) | ||
| 127 | _GLOBAL(_restgpr_18) | ||
| 128 | _GLOBAL(_rest32gpr_18) | ||
| 129 | lwz 18,-56(11) | ||
| 130 | _GLOBAL(_restgpr_19) | ||
| 131 | _GLOBAL(_rest32gpr_19) | ||
| 132 | lwz 19,-52(11) | ||
| 133 | _GLOBAL(_restgpr_20) | ||
| 134 | _GLOBAL(_rest32gpr_20) | ||
| 135 | lwz 20,-48(11) | ||
| 136 | _GLOBAL(_restgpr_21) | ||
| 137 | _GLOBAL(_rest32gpr_21) | ||
| 138 | lwz 21,-44(11) | ||
| 139 | _GLOBAL(_restgpr_22) | ||
| 140 | _GLOBAL(_rest32gpr_22) | ||
| 141 | lwz 22,-40(11) | ||
| 142 | _GLOBAL(_restgpr_23) | ||
| 143 | _GLOBAL(_rest32gpr_23) | ||
| 144 | lwz 23,-36(11) | ||
| 145 | _GLOBAL(_restgpr_24) | ||
| 146 | _GLOBAL(_rest32gpr_24) | ||
| 147 | lwz 24,-32(11) | ||
| 148 | _GLOBAL(_restgpr_25) | ||
| 149 | _GLOBAL(_rest32gpr_25) | ||
| 150 | lwz 25,-28(11) | ||
| 151 | _GLOBAL(_restgpr_26) | ||
| 152 | _GLOBAL(_rest32gpr_26) | ||
| 153 | lwz 26,-24(11) | ||
| 154 | _GLOBAL(_restgpr_27) | ||
| 155 | _GLOBAL(_rest32gpr_27) | ||
| 156 | lwz 27,-20(11) | ||
| 157 | _GLOBAL(_restgpr_28) | ||
| 158 | _GLOBAL(_rest32gpr_28) | ||
| 159 | lwz 28,-16(11) | ||
| 160 | _GLOBAL(_restgpr_29) | ||
| 161 | _GLOBAL(_rest32gpr_29) | ||
| 162 | lwz 29,-12(11) | ||
| 163 | _GLOBAL(_restgpr_30) | ||
| 164 | _GLOBAL(_rest32gpr_30) | ||
| 165 | lwz 30,-8(11) | ||
| 166 | _GLOBAL(_restgpr_31) | ||
| 167 | _GLOBAL(_rest32gpr_31) | ||
| 168 | lwz 31,-4(11) | ||
| 169 | blr | ||
| 170 | |||
| 171 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 172 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 173 | /* function, just beyond the end of the integer restore area. */ | ||
| 174 | |||
| 175 | _GLOBAL(_restgpr_14_x) | ||
| 176 | _GLOBAL(_rest32gpr_14_x) | ||
| 177 | lwz 14,-72(11) /* restore gp registers */ | ||
| 178 | _GLOBAL(_restgpr_15_x) | ||
| 179 | _GLOBAL(_rest32gpr_15_x) | ||
| 180 | lwz 15,-68(11) | ||
| 181 | _GLOBAL(_restgpr_16_x) | ||
| 182 | _GLOBAL(_rest32gpr_16_x) | ||
| 183 | lwz 16,-64(11) | ||
| 184 | _GLOBAL(_restgpr_17_x) | ||
| 185 | _GLOBAL(_rest32gpr_17_x) | ||
| 186 | lwz 17,-60(11) | ||
| 187 | _GLOBAL(_restgpr_18_x) | ||
| 188 | _GLOBAL(_rest32gpr_18_x) | ||
| 189 | lwz 18,-56(11) | ||
| 190 | _GLOBAL(_restgpr_19_x) | ||
| 191 | _GLOBAL(_rest32gpr_19_x) | ||
| 192 | lwz 19,-52(11) | ||
| 193 | _GLOBAL(_restgpr_20_x) | ||
| 194 | _GLOBAL(_rest32gpr_20_x) | ||
| 195 | lwz 20,-48(11) | ||
| 196 | _GLOBAL(_restgpr_21_x) | ||
| 197 | _GLOBAL(_rest32gpr_21_x) | ||
| 198 | lwz 21,-44(11) | ||
| 199 | _GLOBAL(_restgpr_22_x) | ||
| 200 | _GLOBAL(_rest32gpr_22_x) | ||
| 201 | lwz 22,-40(11) | ||
| 202 | _GLOBAL(_restgpr_23_x) | ||
| 203 | _GLOBAL(_rest32gpr_23_x) | ||
| 204 | lwz 23,-36(11) | ||
| 205 | _GLOBAL(_restgpr_24_x) | ||
| 206 | _GLOBAL(_rest32gpr_24_x) | ||
| 207 | lwz 24,-32(11) | ||
| 208 | _GLOBAL(_restgpr_25_x) | ||
| 209 | _GLOBAL(_rest32gpr_25_x) | ||
| 210 | lwz 25,-28(11) | ||
| 211 | _GLOBAL(_restgpr_26_x) | ||
| 212 | _GLOBAL(_rest32gpr_26_x) | ||
| 213 | lwz 26,-24(11) | ||
| 214 | _GLOBAL(_restgpr_27_x) | ||
| 215 | _GLOBAL(_rest32gpr_27_x) | ||
| 216 | lwz 27,-20(11) | ||
| 217 | _GLOBAL(_restgpr_28_x) | ||
| 218 | _GLOBAL(_rest32gpr_28_x) | ||
| 219 | lwz 28,-16(11) | ||
| 220 | _GLOBAL(_restgpr_29_x) | ||
| 221 | _GLOBAL(_rest32gpr_29_x) | ||
| 222 | lwz 29,-12(11) | ||
| 223 | _GLOBAL(_restgpr_30_x) | ||
| 224 | _GLOBAL(_rest32gpr_30_x) | ||
| 225 | lwz 30,-8(11) | ||
| 226 | _GLOBAL(_restgpr_31_x) | ||
| 227 | _GLOBAL(_rest32gpr_31_x) | ||
| 228 | lwz 0,4(11) | ||
| 229 | lwz 31,-4(11) | ||
| 230 | mtlr 0 | ||
| 231 | mr 1,11 | ||
| 232 | blr | ||
| 233 | #endif | ||
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 5bc09ad016f5..f3083c779b66 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 711f9a30f9ab..0e872a60e091 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index c11ceb7d3299..1eb8defaff6f 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index fa298a8c81cc..4811b8107415 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
| @@ -409,7 +409,7 @@ | |||
| 409 | interrupts = <26 2>; | 409 | interrupts = <26 2>; |
| 410 | bus-range = <0 255>; | 410 | bus-range = <0 255>; |
| 411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 | 411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 |
| 412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>; | 412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>; |
| 413 | clock-frequency = <33333333>; | 413 | clock-frequency = <33333333>; |
| 414 | #interrupt-cells = <1>; | 414 | #interrupt-cells = <1>; |
| 415 | #size-cells = <2>; | 415 | #size-cells = <2>; |
| @@ -428,7 +428,7 @@ | |||
| 428 | 428 | ||
| 429 | 0x1000000 0x0 0x0 | 429 | 0x1000000 0x0 0x0 |
| 430 | 0x1000000 0x0 0x0 | 430 | 0x1000000 0x0 0x0 |
| 431 | 0x0 0x8000000>; | 431 | 0x0 0x100000>; |
| 432 | }; | 432 | }; |
| 433 | }; | 433 | }; |
| 434 | }; | 434 | }; |
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 7d18440e398f..5428f9f5ed85 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Fri Apr 11 11:10:09 2008 | 4 | # Mon Jun 9 08:52:21 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -196,7 +201,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 196 | # CONFIG_PREEMPT is not set | 201 | # CONFIG_PREEMPT is not set |
| 197 | CONFIG_BINFMT_ELF=y | 202 | CONFIG_BINFMT_ELF=y |
| 198 | # CONFIG_BINFMT_MISC is not set | 203 | # CONFIG_BINFMT_MISC is not set |
| 199 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 200 | # CONFIG_IOMMU_HELPER is not set | 204 | # CONFIG_IOMMU_HELPER is not set |
| 201 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 202 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| @@ -211,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -239,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 239 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
| 240 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 249 | ||
| 243 | # | 250 | # |
| 244 | # Advanced setup | 251 | # Advanced setup |
| @@ -248,11 +255,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 255 | # |
| 249 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 250 | # | 257 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 263 | ||
| 257 | # | 264 | # |
| 258 | # Networking | 265 | # Networking |
| @@ -300,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 307 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 309 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 310 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 311 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 312 | # CONFIG_IP_DCCP is not set |
| @@ -362,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 362 | # CONFIG_MTD_REDBOOT_PARTS is not set | 367 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 363 | # CONFIG_MTD_CMDLINE_PARTS is not set | 368 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 364 | CONFIG_MTD_OF_PARTS=y | 369 | CONFIG_MTD_OF_PARTS=y |
| 370 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 365 | 371 | ||
| 366 | # | 372 | # |
| 367 | # User Modules And Translation Layers | 373 | # User Modules And Translation Layers |
| @@ -445,6 +451,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 445 | # | 451 | # |
| 446 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
| 447 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | ||
| 448 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
| 449 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
| 450 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
| @@ -641,7 +648,6 @@ CONFIG_NETDEV_1000=y | |||
| 641 | # CONFIG_SIS190 is not set | 648 | # CONFIG_SIS190 is not set |
| 642 | # CONFIG_SKGE is not set | 649 | # CONFIG_SKGE is not set |
| 643 | # CONFIG_SKY2 is not set | 650 | # CONFIG_SKY2 is not set |
| 644 | # CONFIG_SK98LIN is not set | ||
| 645 | # CONFIG_VIA_VELOCITY is not set | 651 | # CONFIG_VIA_VELOCITY is not set |
| 646 | # CONFIG_TIGON3 is not set | 652 | # CONFIG_TIGON3 is not set |
| 647 | # CONFIG_BNX2 is not set | 653 | # CONFIG_BNX2 is not set |
| @@ -661,6 +667,7 @@ CONFIG_NETDEV_10000=y | |||
| 661 | # CONFIG_MLX4_CORE is not set | 667 | # CONFIG_MLX4_CORE is not set |
| 662 | # CONFIG_TEHUTI is not set | 668 | # CONFIG_TEHUTI is not set |
| 663 | # CONFIG_BNX2X is not set | 669 | # CONFIG_BNX2X is not set |
| 670 | # CONFIG_SFC is not set | ||
| 664 | # CONFIG_TR is not set | 671 | # CONFIG_TR is not set |
| 665 | 672 | ||
| 666 | # | 673 | # |
| @@ -668,6 +675,7 @@ CONFIG_NETDEV_10000=y | |||
| 668 | # | 675 | # |
| 669 | # CONFIG_WLAN_PRE80211 is not set | 676 | # CONFIG_WLAN_PRE80211 is not set |
| 670 | # CONFIG_WLAN_80211 is not set | 677 | # CONFIG_WLAN_80211 is not set |
| 678 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 671 | 679 | ||
| 672 | # | 680 | # |
| 673 | # USB Network Adapters | 681 | # USB Network Adapters |
| @@ -724,6 +732,7 @@ CONFIG_INPUT=y | |||
| 724 | # Character devices | 732 | # Character devices |
| 725 | # | 733 | # |
| 726 | # CONFIG_VT is not set | 734 | # CONFIG_VT is not set |
| 735 | CONFIG_DEVKMEM=y | ||
| 727 | # CONFIG_SERIAL_NONSTANDARD is not set | 736 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 728 | # CONFIG_NOZOMI is not set | 737 | # CONFIG_NOZOMI is not set |
| 729 | 738 | ||
| @@ -751,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 751 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 752 | CONFIG_HW_RANDOM=y | 761 | CONFIG_HW_RANDOM=y |
| 753 | # CONFIG_NVRAM is not set | 762 | # CONFIG_NVRAM is not set |
| 754 | # CONFIG_GEN_RTC is not set | ||
| 755 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 756 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 757 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -762,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 762 | CONFIG_I2C_CHARDEV=y | 770 | CONFIG_I2C_CHARDEV=y |
| 763 | 771 | ||
| 764 | # | 772 | # |
| 765 | # I2C Algorithms | ||
| 766 | # | ||
| 767 | # CONFIG_I2C_ALGOBIT is not set | ||
| 768 | # CONFIG_I2C_ALGOPCF is not set | ||
| 769 | # CONFIG_I2C_ALGOPCA is not set | ||
| 770 | |||
| 771 | # | ||
| 772 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 773 | # | 774 | # |
| 774 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -795,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 795 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 796 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 797 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 798 | 800 | ||
| 799 | # | 801 | # |
| 800 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -804,17 +806,12 @@ CONFIG_I2C_MPC=y | |||
| 804 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 805 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 806 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 807 | # CONFIG_TPS65010 is not set | ||
| 808 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 809 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 810 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 811 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 812 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 813 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 814 | |||
| 815 | # | ||
| 816 | # SPI support | ||
| 817 | # | ||
| 818 | CONFIG_SPI=y | 815 | CONFIG_SPI=y |
| 819 | # CONFIG_SPI_DEBUG is not set | 816 | # CONFIG_SPI_DEBUG is not set |
| 820 | CONFIG_SPI_MASTER=y | 817 | CONFIG_SPI_MASTER=y |
| @@ -919,12 +916,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 919 | # Multifunction device drivers | 916 | # Multifunction device drivers |
| 920 | # | 917 | # |
| 921 | # CONFIG_MFD_SM501 is not set | 918 | # CONFIG_MFD_SM501 is not set |
| 919 | # CONFIG_HTC_PASIC3 is not set | ||
| 922 | 920 | ||
| 923 | # | 921 | # |
| 924 | # Multimedia devices | 922 | # Multimedia devices |
| 925 | # | 923 | # |
| 924 | |||
| 925 | # | ||
| 926 | # Multimedia core support | ||
| 927 | # | ||
| 926 | # CONFIG_VIDEO_DEV is not set | 928 | # CONFIG_VIDEO_DEV is not set |
| 927 | # CONFIG_DVB_CORE is not set | 929 | # CONFIG_DVB_CORE is not set |
| 930 | # CONFIG_VIDEO_MEDIA is not set | ||
| 931 | |||
| 932 | # | ||
| 933 | # Multimedia drivers | ||
| 934 | # | ||
| 928 | CONFIG_DAB=y | 935 | CONFIG_DAB=y |
| 929 | # CONFIG_USB_DABUSB is not set | 936 | # CONFIG_USB_DABUSB is not set |
| 930 | 937 | ||
| @@ -977,16 +984,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 977 | CONFIG_USB_DEVICE_CLASS=y | 984 | CONFIG_USB_DEVICE_CLASS=y |
| 978 | # CONFIG_USB_DYNAMIC_MINORS is not set | 985 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 979 | # CONFIG_USB_OTG is not set | 986 | # CONFIG_USB_OTG is not set |
| 987 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 988 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 980 | 989 | ||
| 981 | # | 990 | # |
| 982 | # USB Host Controller Drivers | 991 | # USB Host Controller Drivers |
| 983 | # | 992 | # |
| 993 | # CONFIG_USB_C67X00_HCD is not set | ||
| 984 | CONFIG_USB_EHCI_HCD=y | 994 | CONFIG_USB_EHCI_HCD=y |
| 985 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 995 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 986 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 996 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 987 | CONFIG_USB_EHCI_FSL=y | 997 | CONFIG_USB_EHCI_FSL=y |
| 988 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 998 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 989 | # CONFIG_USB_ISP116X_HCD is not set | 999 | # CONFIG_USB_ISP116X_HCD is not set |
| 1000 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 990 | CONFIG_USB_OHCI_HCD=y | 1001 | CONFIG_USB_OHCI_HCD=y |
| 991 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1002 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 992 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1003 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1004,6 +1015,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1004 | # | 1015 | # |
| 1005 | # CONFIG_USB_ACM is not set | 1016 | # CONFIG_USB_ACM is not set |
| 1006 | # CONFIG_USB_PRINTER is not set | 1017 | # CONFIG_USB_PRINTER is not set |
| 1018 | # CONFIG_USB_WDM is not set | ||
| 1007 | 1019 | ||
| 1008 | # | 1020 | # |
| 1009 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1021 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1023,7 +1035,9 @@ CONFIG_USB_STORAGE=y | |||
| 1023 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1035 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1024 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1036 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1025 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1037 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1038 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1026 | # CONFIG_USB_STORAGE_KARMA is not set | 1039 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1040 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1027 | # CONFIG_USB_LIBUSUAL is not set | 1041 | # CONFIG_USB_LIBUSUAL is not set |
| 1028 | 1042 | ||
| 1029 | # | 1043 | # |
| @@ -1061,6 +1075,7 @@ CONFIG_USB_MON=y | |||
| 1061 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1075 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1062 | # CONFIG_USB_IOWARRIOR is not set | 1076 | # CONFIG_USB_IOWARRIOR is not set |
| 1063 | # CONFIG_USB_TEST is not set | 1077 | # CONFIG_USB_TEST is not set |
| 1078 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1064 | CONFIG_USB_GADGET=y | 1079 | CONFIG_USB_GADGET=y |
| 1065 | # CONFIG_USB_GADGET_DEBUG is not set | 1080 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1066 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1081 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1072,6 +1087,7 @@ CONFIG_USB_GADGET_NET2280=y | |||
| 1072 | CONFIG_USB_NET2280=y | 1087 | CONFIG_USB_NET2280=y |
| 1073 | # CONFIG_USB_GADGET_PXA2XX is not set | 1088 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 1074 | # CONFIG_USB_GADGET_M66592 is not set | 1089 | # CONFIG_USB_GADGET_M66592 is not set |
| 1090 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 1075 | # CONFIG_USB_GADGET_GOKU is not set | 1091 | # CONFIG_USB_GADGET_GOKU is not set |
| 1076 | # CONFIG_USB_GADGET_LH7A40X is not set | 1092 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 1077 | # CONFIG_USB_GADGET_OMAP is not set | 1093 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -1090,6 +1106,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1090 | # CONFIG_MMC is not set | 1106 | # CONFIG_MMC is not set |
| 1091 | # CONFIG_MEMSTICK is not set | 1107 | # CONFIG_MEMSTICK is not set |
| 1092 | # CONFIG_NEW_LEDS is not set | 1108 | # CONFIG_NEW_LEDS is not set |
| 1109 | # CONFIG_ACCESSIBILITY is not set | ||
| 1093 | # CONFIG_INFINIBAND is not set | 1110 | # CONFIG_INFINIBAND is not set |
| 1094 | # CONFIG_EDAC is not set | 1111 | # CONFIG_EDAC is not set |
| 1095 | CONFIG_RTC_LIB=y | 1112 | CONFIG_RTC_LIB=y |
| @@ -1144,11 +1161,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1144 | # | 1161 | # |
| 1145 | # on-CPU RTC drivers | 1162 | # on-CPU RTC drivers |
| 1146 | # | 1163 | # |
| 1164 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1147 | # CONFIG_DMADEVICES is not set | 1165 | # CONFIG_DMADEVICES is not set |
| 1148 | |||
| 1149 | # | ||
| 1150 | # Userspace I/O | ||
| 1151 | # | ||
| 1152 | # CONFIG_UIO is not set | 1166 | # CONFIG_UIO is not set |
| 1153 | 1167 | ||
| 1154 | # | 1168 | # |
| @@ -1168,7 +1182,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1168 | # CONFIG_JFS_FS is not set | 1182 | # CONFIG_JFS_FS is not set |
| 1169 | # CONFIG_FS_POSIX_ACL is not set | 1183 | # CONFIG_FS_POSIX_ACL is not set |
| 1170 | # CONFIG_XFS_FS is not set | 1184 | # CONFIG_XFS_FS is not set |
| 1171 | # CONFIG_GFS2_FS is not set | ||
| 1172 | # CONFIG_OCFS2_FS is not set | 1185 | # CONFIG_OCFS2_FS is not set |
| 1173 | CONFIG_DNOTIFY=y | 1186 | CONFIG_DNOTIFY=y |
| 1174 | CONFIG_INOTIFY=y | 1187 | CONFIG_INOTIFY=y |
| @@ -1237,7 +1250,6 @@ CONFIG_NFS_FS=y | |||
| 1237 | CONFIG_NFS_V3=y | 1250 | CONFIG_NFS_V3=y |
| 1238 | # CONFIG_NFS_V3_ACL is not set | 1251 | # CONFIG_NFS_V3_ACL is not set |
| 1239 | CONFIG_NFS_V4=y | 1252 | CONFIG_NFS_V4=y |
| 1240 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1241 | # CONFIG_NFSD is not set | 1253 | # CONFIG_NFSD is not set |
| 1242 | CONFIG_ROOT_NFS=y | 1254 | CONFIG_ROOT_NFS=y |
| 1243 | CONFIG_LOCKD=y | 1255 | CONFIG_LOCKD=y |
| @@ -1282,6 +1294,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1282 | # Library routines | 1294 | # Library routines |
| 1283 | # | 1295 | # |
| 1284 | CONFIG_BITREVERSE=y | 1296 | CONFIG_BITREVERSE=y |
| 1297 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1285 | # CONFIG_CRC_CCITT is not set | 1298 | # CONFIG_CRC_CCITT is not set |
| 1286 | # CONFIG_CRC16 is not set | 1299 | # CONFIG_CRC16 is not set |
| 1287 | # CONFIG_CRC_ITU_T is not set | 1300 | # CONFIG_CRC_ITU_T is not set |
| @@ -1302,6 +1315,7 @@ CONFIG_HAVE_LMB=y | |||
| 1302 | # CONFIG_PRINTK_TIME is not set | 1315 | # CONFIG_PRINTK_TIME is not set |
| 1303 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1316 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1304 | CONFIG_ENABLE_MUST_CHECK=y | 1317 | CONFIG_ENABLE_MUST_CHECK=y |
| 1318 | CONFIG_FRAME_WARN=1024 | ||
| 1305 | # CONFIG_MAGIC_SYSRQ is not set | 1319 | # CONFIG_MAGIC_SYSRQ is not set |
| 1306 | # CONFIG_UNUSED_SYMBOLS is not set | 1320 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1307 | # CONFIG_DEBUG_FS is not set | 1321 | # CONFIG_DEBUG_FS is not set |
| @@ -1312,6 +1326,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1312 | CONFIG_SCHED_DEBUG=y | 1326 | CONFIG_SCHED_DEBUG=y |
| 1313 | # CONFIG_SCHEDSTATS is not set | 1327 | # CONFIG_SCHEDSTATS is not set |
| 1314 | # CONFIG_TIMER_STATS is not set | 1328 | # CONFIG_TIMER_STATS is not set |
| 1329 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1315 | # CONFIG_SLUB_DEBUG_ON is not set | 1330 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1316 | # CONFIG_SLUB_STATS is not set | 1331 | # CONFIG_SLUB_STATS is not set |
| 1317 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1332 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1324,6 +1339,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1324 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1339 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1325 | # CONFIG_DEBUG_INFO is not set | 1340 | # CONFIG_DEBUG_INFO is not set |
| 1326 | # CONFIG_DEBUG_VM is not set | 1341 | # CONFIG_DEBUG_VM is not set |
| 1342 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1327 | # CONFIG_DEBUG_LIST is not set | 1343 | # CONFIG_DEBUG_LIST is not set |
| 1328 | # CONFIG_DEBUG_SG is not set | 1344 | # CONFIG_DEBUG_SG is not set |
| 1329 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1345 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1335,6 +1351,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1335 | # CONFIG_DEBUG_STACK_USAGE is not set | 1351 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1336 | # CONFIG_DEBUG_PAGEALLOC is not set | 1352 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1337 | # CONFIG_DEBUGGER is not set | 1353 | # CONFIG_DEBUGGER is not set |
| 1354 | # CONFIG_IRQSTACKS is not set | ||
| 1338 | # CONFIG_BDI_SWITCH is not set | 1355 | # CONFIG_BDI_SWITCH is not set |
| 1339 | # CONFIG_PPC_EARLY_DEBUG is not set | 1356 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1340 | 1357 | ||
| @@ -1345,51 +1362,81 @@ CONFIG_SCHED_DEBUG=y | |||
| 1345 | # CONFIG_SECURITY is not set | 1362 | # CONFIG_SECURITY is not set |
| 1346 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1363 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1347 | CONFIG_CRYPTO=y | 1364 | CONFIG_CRYPTO=y |
| 1365 | |||
| 1366 | # | ||
| 1367 | # Crypto core or helper | ||
| 1368 | # | ||
| 1348 | CONFIG_CRYPTO_ALGAPI=y | 1369 | CONFIG_CRYPTO_ALGAPI=y |
| 1349 | CONFIG_CRYPTO_BLKCIPHER=y | 1370 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1350 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1351 | CONFIG_CRYPTO_MANAGER=y | 1371 | CONFIG_CRYPTO_MANAGER=y |
| 1372 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1373 | # CONFIG_CRYPTO_NULL is not set | ||
| 1374 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1375 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1376 | # CONFIG_CRYPTO_TEST is not set | ||
| 1377 | |||
| 1378 | # | ||
| 1379 | # Authenticated Encryption with Associated Data | ||
| 1380 | # | ||
| 1381 | # CONFIG_CRYPTO_CCM is not set | ||
| 1382 | # CONFIG_CRYPTO_GCM is not set | ||
| 1383 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1384 | |||
| 1385 | # | ||
| 1386 | # Block modes | ||
| 1387 | # | ||
| 1388 | CONFIG_CRYPTO_CBC=y | ||
| 1389 | # CONFIG_CRYPTO_CTR is not set | ||
| 1390 | # CONFIG_CRYPTO_CTS is not set | ||
| 1391 | # CONFIG_CRYPTO_ECB is not set | ||
| 1392 | # CONFIG_CRYPTO_LRW is not set | ||
| 1393 | CONFIG_CRYPTO_PCBC=m | ||
| 1394 | # CONFIG_CRYPTO_XTS is not set | ||
| 1395 | |||
| 1396 | # | ||
| 1397 | # Hash modes | ||
| 1398 | # | ||
| 1352 | # CONFIG_CRYPTO_HMAC is not set | 1399 | # CONFIG_CRYPTO_HMAC is not set |
| 1353 | # CONFIG_CRYPTO_XCBC is not set | 1400 | # CONFIG_CRYPTO_XCBC is not set |
| 1354 | # CONFIG_CRYPTO_NULL is not set | 1401 | |
| 1402 | # | ||
| 1403 | # Digest | ||
| 1404 | # | ||
| 1405 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1355 | # CONFIG_CRYPTO_MD4 is not set | 1406 | # CONFIG_CRYPTO_MD4 is not set |
| 1356 | CONFIG_CRYPTO_MD5=y | 1407 | CONFIG_CRYPTO_MD5=y |
| 1408 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1357 | # CONFIG_CRYPTO_SHA1 is not set | 1409 | # CONFIG_CRYPTO_SHA1 is not set |
| 1358 | # CONFIG_CRYPTO_SHA256 is not set | 1410 | # CONFIG_CRYPTO_SHA256 is not set |
| 1359 | # CONFIG_CRYPTO_SHA512 is not set | 1411 | # CONFIG_CRYPTO_SHA512 is not set |
| 1360 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1361 | # CONFIG_CRYPTO_TGR192 is not set | 1412 | # CONFIG_CRYPTO_TGR192 is not set |
| 1362 | # CONFIG_CRYPTO_GF128MUL is not set | 1413 | # CONFIG_CRYPTO_WP512 is not set |
| 1363 | # CONFIG_CRYPTO_ECB is not set | 1414 | |
| 1364 | CONFIG_CRYPTO_CBC=y | 1415 | # |
| 1365 | CONFIG_CRYPTO_PCBC=m | 1416 | # Ciphers |
| 1366 | # CONFIG_CRYPTO_LRW is not set | 1417 | # |
| 1367 | # CONFIG_CRYPTO_XTS is not set | ||
| 1368 | # CONFIG_CRYPTO_CTR is not set | ||
| 1369 | # CONFIG_CRYPTO_GCM is not set | ||
| 1370 | # CONFIG_CRYPTO_CCM is not set | ||
| 1371 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1372 | CONFIG_CRYPTO_DES=y | ||
| 1373 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1374 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1375 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1376 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1377 | # CONFIG_CRYPTO_AES is not set | 1418 | # CONFIG_CRYPTO_AES is not set |
| 1419 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1420 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1421 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1422 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1378 | # CONFIG_CRYPTO_CAST5 is not set | 1423 | # CONFIG_CRYPTO_CAST5 is not set |
| 1379 | # CONFIG_CRYPTO_CAST6 is not set | 1424 | # CONFIG_CRYPTO_CAST6 is not set |
| 1380 | # CONFIG_CRYPTO_TEA is not set | 1425 | CONFIG_CRYPTO_DES=y |
| 1381 | # CONFIG_CRYPTO_ARC4 is not set | 1426 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1382 | # CONFIG_CRYPTO_KHAZAD is not set | 1427 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1383 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1384 | # CONFIG_CRYPTO_SEED is not set | ||
| 1385 | # CONFIG_CRYPTO_SALSA20 is not set | 1428 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1429 | # CONFIG_CRYPTO_SEED is not set | ||
| 1430 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1431 | # CONFIG_CRYPTO_TEA is not set | ||
| 1432 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1433 | |||
| 1434 | # | ||
| 1435 | # Compression | ||
| 1436 | # | ||
| 1386 | # CONFIG_CRYPTO_DEFLATE is not set | 1437 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1387 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1388 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1389 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1390 | # CONFIG_CRYPTO_TEST is not set | ||
| 1391 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1392 | # CONFIG_CRYPTO_LZO is not set | 1438 | # CONFIG_CRYPTO_LZO is not set |
| 1393 | CONFIG_CRYPTO_HW=y | 1439 | CONFIG_CRYPTO_HW=y |
| 1394 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1440 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1395 | # CONFIG_PPC_CLOCK is not set | 1441 | # CONFIG_PPC_CLOCK is not set |
| 1442 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index 1f57456dd81e..9bc3a03ae264 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:15 2008 | 4 | # Mon Jun 9 08:52:21 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -238,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 238 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
| 239 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 240 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 241 | 249 | ||
| 242 | # | 250 | # |
| 243 | # Advanced setup | 251 | # Advanced setup |
| @@ -247,11 +255,11 @@ CONFIG_PCI_LEGACY=y | |||
| 247 | # | 255 | # |
| 248 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 249 | # | 257 | # |
| 250 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 251 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 252 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 253 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 254 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 255 | 263 | ||
| 256 | # | 264 | # |
| 257 | # Networking | 265 | # Networking |
| @@ -299,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 307 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 309 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 310 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 311 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 312 | # CONFIG_IP_DCCP is not set |
| @@ -361,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 367 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 362 | # CONFIG_MTD_CMDLINE_PARTS is not set | 368 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 363 | # CONFIG_MTD_OF_PARTS is not set | 369 | # CONFIG_MTD_OF_PARTS is not set |
| 370 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 364 | 371 | ||
| 365 | # | 372 | # |
| 366 | # User Modules And Translation Layers | 373 | # User Modules And Translation Layers |
| @@ -444,6 +451,7 @@ CONFIG_MTD_NAND_IDS=y | |||
| 444 | # | 451 | # |
| 445 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
| 446 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | ||
| 447 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
| 448 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
| 449 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
| @@ -549,7 +557,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 549 | # CONFIG_SCSI_SRP is not set | 557 | # CONFIG_SCSI_SRP is not set |
| 550 | CONFIG_ATA=y | 558 | CONFIG_ATA=y |
| 551 | # CONFIG_ATA_NONSTANDARD is not set | 559 | # CONFIG_ATA_NONSTANDARD is not set |
| 560 | CONFIG_SATA_PMP=y | ||
| 552 | # CONFIG_SATA_AHCI is not set | 561 | # CONFIG_SATA_AHCI is not set |
| 562 | # CONFIG_SATA_SIL24 is not set | ||
| 563 | CONFIG_SATA_FSL=y | ||
| 564 | CONFIG_ATA_SFF=y | ||
| 553 | # CONFIG_SATA_SVW is not set | 565 | # CONFIG_SATA_SVW is not set |
| 554 | # CONFIG_ATA_PIIX is not set | 566 | # CONFIG_ATA_PIIX is not set |
| 555 | # CONFIG_SATA_MV is not set | 567 | # CONFIG_SATA_MV is not set |
| @@ -559,13 +571,11 @@ CONFIG_ATA=y | |||
| 559 | # CONFIG_SATA_PROMISE is not set | 571 | # CONFIG_SATA_PROMISE is not set |
| 560 | # CONFIG_SATA_SX4 is not set | 572 | # CONFIG_SATA_SX4 is not set |
| 561 | # CONFIG_SATA_SIL is not set | 573 | # CONFIG_SATA_SIL is not set |
| 562 | # CONFIG_SATA_SIL24 is not set | ||
| 563 | # CONFIG_SATA_SIS is not set | 574 | # CONFIG_SATA_SIS is not set |
| 564 | # CONFIG_SATA_ULI is not set | 575 | # CONFIG_SATA_ULI is not set |
| 565 | # CONFIG_SATA_VIA is not set | 576 | # CONFIG_SATA_VIA is not set |
| 566 | # CONFIG_SATA_VITESSE is not set | 577 | # CONFIG_SATA_VITESSE is not set |
| 567 | # CONFIG_SATA_INIC162X is not set | 578 | # CONFIG_SATA_INIC162X is not set |
| 568 | CONFIG_SATA_FSL=y | ||
| 569 | # CONFIG_PATA_ALI is not set | 579 | # CONFIG_PATA_ALI is not set |
| 570 | # CONFIG_PATA_AMD is not set | 580 | # CONFIG_PATA_AMD is not set |
| 571 | # CONFIG_PATA_ARTOP is not set | 581 | # CONFIG_PATA_ARTOP is not set |
| @@ -605,6 +615,7 @@ CONFIG_SATA_FSL=y | |||
| 605 | # CONFIG_PATA_VIA is not set | 615 | # CONFIG_PATA_VIA is not set |
| 606 | # CONFIG_PATA_WINBOND is not set | 616 | # CONFIG_PATA_WINBOND is not set |
| 607 | # CONFIG_PATA_PLATFORM is not set | 617 | # CONFIG_PATA_PLATFORM is not set |
| 618 | # CONFIG_PATA_SCH is not set | ||
| 608 | CONFIG_MD=y | 619 | CONFIG_MD=y |
| 609 | CONFIG_BLK_DEV_MD=y | 620 | CONFIG_BLK_DEV_MD=y |
| 610 | CONFIG_MD_LINEAR=y | 621 | CONFIG_MD_LINEAR=y |
| @@ -698,7 +709,6 @@ CONFIG_NETDEV_1000=y | |||
| 698 | # CONFIG_SIS190 is not set | 709 | # CONFIG_SIS190 is not set |
| 699 | # CONFIG_SKGE is not set | 710 | # CONFIG_SKGE is not set |
| 700 | # CONFIG_SKY2 is not set | 711 | # CONFIG_SKY2 is not set |
| 701 | # CONFIG_SK98LIN is not set | ||
| 702 | # CONFIG_VIA_VELOCITY is not set | 712 | # CONFIG_VIA_VELOCITY is not set |
| 703 | # CONFIG_TIGON3 is not set | 713 | # CONFIG_TIGON3 is not set |
| 704 | # CONFIG_BNX2 is not set | 714 | # CONFIG_BNX2 is not set |
| @@ -718,6 +728,7 @@ CONFIG_NETDEV_10000=y | |||
| 718 | # CONFIG_MLX4_CORE is not set | 728 | # CONFIG_MLX4_CORE is not set |
| 719 | # CONFIG_TEHUTI is not set | 729 | # CONFIG_TEHUTI is not set |
| 720 | # CONFIG_BNX2X is not set | 730 | # CONFIG_BNX2X is not set |
| 731 | # CONFIG_SFC is not set | ||
| 721 | # CONFIG_TR is not set | 732 | # CONFIG_TR is not set |
| 722 | 733 | ||
| 723 | # | 734 | # |
| @@ -725,6 +736,7 @@ CONFIG_NETDEV_10000=y | |||
| 725 | # | 736 | # |
| 726 | # CONFIG_WLAN_PRE80211 is not set | 737 | # CONFIG_WLAN_PRE80211 is not set |
| 727 | # CONFIG_WLAN_80211 is not set | 738 | # CONFIG_WLAN_80211 is not set |
| 739 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 728 | 740 | ||
| 729 | # | 741 | # |
| 730 | # USB Network Adapters | 742 | # USB Network Adapters |
| @@ -781,6 +793,7 @@ CONFIG_INPUT=y | |||
| 781 | # Character devices | 793 | # Character devices |
| 782 | # | 794 | # |
| 783 | # CONFIG_VT is not set | 795 | # CONFIG_VT is not set |
| 796 | CONFIG_DEVKMEM=y | ||
| 784 | # CONFIG_SERIAL_NONSTANDARD is not set | 797 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 785 | # CONFIG_NOZOMI is not set | 798 | # CONFIG_NOZOMI is not set |
| 786 | 799 | ||
| @@ -808,7 +821,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 808 | # CONFIG_IPMI_HANDLER is not set | 821 | # CONFIG_IPMI_HANDLER is not set |
| 809 | CONFIG_HW_RANDOM=y | 822 | CONFIG_HW_RANDOM=y |
| 810 | # CONFIG_NVRAM is not set | 823 | # CONFIG_NVRAM is not set |
| 811 | # CONFIG_GEN_RTC is not set | ||
| 812 | # CONFIG_R3964 is not set | 824 | # CONFIG_R3964 is not set |
| 813 | # CONFIG_APPLICOM is not set | 825 | # CONFIG_APPLICOM is not set |
| 814 | # CONFIG_RAW_DRIVER is not set | 826 | # CONFIG_RAW_DRIVER is not set |
| @@ -819,13 +831,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 819 | CONFIG_I2C_CHARDEV=y | 831 | CONFIG_I2C_CHARDEV=y |
| 820 | 832 | ||
| 821 | # | 833 | # |
| 822 | # I2C Algorithms | ||
| 823 | # | ||
| 824 | # CONFIG_I2C_ALGOBIT is not set | ||
| 825 | # CONFIG_I2C_ALGOPCF is not set | ||
| 826 | # CONFIG_I2C_ALGOPCA is not set | ||
| 827 | |||
| 828 | # | ||
| 829 | # I2C Hardware Bus support | 834 | # I2C Hardware Bus support |
| 830 | # | 835 | # |
| 831 | # CONFIG_I2C_ALI1535 is not set | 836 | # CONFIG_I2C_ALI1535 is not set |
| @@ -852,6 +857,7 @@ CONFIG_I2C_MPC=y | |||
| 852 | # CONFIG_I2C_VIA is not set | 857 | # CONFIG_I2C_VIA is not set |
| 853 | # CONFIG_I2C_VIAPRO is not set | 858 | # CONFIG_I2C_VIAPRO is not set |
| 854 | # CONFIG_I2C_VOODOO3 is not set | 859 | # CONFIG_I2C_VOODOO3 is not set |
| 860 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 855 | 861 | ||
| 856 | # | 862 | # |
| 857 | # Miscellaneous I2C Chip support | 863 | # Miscellaneous I2C Chip support |
| @@ -861,17 +867,12 @@ CONFIG_I2C_MPC=y | |||
| 861 | # CONFIG_SENSORS_PCF8574 is not set | 867 | # CONFIG_SENSORS_PCF8574 is not set |
| 862 | # CONFIG_PCF8575 is not set | 868 | # CONFIG_PCF8575 is not set |
| 863 | # CONFIG_SENSORS_PCF8591 is not set | 869 | # CONFIG_SENSORS_PCF8591 is not set |
| 864 | # CONFIG_TPS65010 is not set | ||
| 865 | # CONFIG_SENSORS_MAX6875 is not set | 870 | # CONFIG_SENSORS_MAX6875 is not set |
| 866 | # CONFIG_SENSORS_TSL2550 is not set | 871 | # CONFIG_SENSORS_TSL2550 is not set |
| 867 | # CONFIG_I2C_DEBUG_CORE is not set | 872 | # CONFIG_I2C_DEBUG_CORE is not set |
| 868 | # CONFIG_I2C_DEBUG_ALGO is not set | 873 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 869 | # CONFIG_I2C_DEBUG_BUS is not set | 874 | # CONFIG_I2C_DEBUG_BUS is not set |
| 870 | # CONFIG_I2C_DEBUG_CHIP is not set | 875 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 871 | |||
| 872 | # | ||
| 873 | # SPI support | ||
| 874 | # | ||
| 875 | CONFIG_SPI=y | 876 | CONFIG_SPI=y |
| 876 | # CONFIG_SPI_DEBUG is not set | 877 | # CONFIG_SPI_DEBUG is not set |
| 877 | CONFIG_SPI_MASTER=y | 878 | CONFIG_SPI_MASTER=y |
| @@ -976,12 +977,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 976 | # Multifunction device drivers | 977 | # Multifunction device drivers |
| 977 | # | 978 | # |
| 978 | # CONFIG_MFD_SM501 is not set | 979 | # CONFIG_MFD_SM501 is not set |
| 980 | # CONFIG_HTC_PASIC3 is not set | ||
| 979 | 981 | ||
| 980 | # | 982 | # |
| 981 | # Multimedia devices | 983 | # Multimedia devices |
| 982 | # | 984 | # |
| 985 | |||
| 986 | # | ||
| 987 | # Multimedia core support | ||
| 988 | # | ||
| 983 | # CONFIG_VIDEO_DEV is not set | 989 | # CONFIG_VIDEO_DEV is not set |
| 984 | # CONFIG_DVB_CORE is not set | 990 | # CONFIG_DVB_CORE is not set |
| 991 | # CONFIG_VIDEO_MEDIA is not set | ||
| 992 | |||
| 993 | # | ||
| 994 | # Multimedia drivers | ||
| 995 | # | ||
| 985 | CONFIG_DAB=y | 996 | CONFIG_DAB=y |
| 986 | # CONFIG_USB_DABUSB is not set | 997 | # CONFIG_USB_DABUSB is not set |
| 987 | 998 | ||
| @@ -1034,16 +1045,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1034 | CONFIG_USB_DEVICE_CLASS=y | 1045 | CONFIG_USB_DEVICE_CLASS=y |
| 1035 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1046 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1036 | # CONFIG_USB_OTG is not set | 1047 | # CONFIG_USB_OTG is not set |
| 1048 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1049 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1037 | 1050 | ||
| 1038 | # | 1051 | # |
| 1039 | # USB Host Controller Drivers | 1052 | # USB Host Controller Drivers |
| 1040 | # | 1053 | # |
| 1054 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1041 | CONFIG_USB_EHCI_HCD=y | 1055 | CONFIG_USB_EHCI_HCD=y |
| 1042 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1056 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1043 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1057 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1044 | CONFIG_USB_EHCI_FSL=y | 1058 | CONFIG_USB_EHCI_FSL=y |
| 1045 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1059 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1046 | # CONFIG_USB_ISP116X_HCD is not set | 1060 | # CONFIG_USB_ISP116X_HCD is not set |
| 1061 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1047 | CONFIG_USB_OHCI_HCD=y | 1062 | CONFIG_USB_OHCI_HCD=y |
| 1048 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1063 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1049 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1064 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1061,6 +1076,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1061 | # | 1076 | # |
| 1062 | # CONFIG_USB_ACM is not set | 1077 | # CONFIG_USB_ACM is not set |
| 1063 | # CONFIG_USB_PRINTER is not set | 1078 | # CONFIG_USB_PRINTER is not set |
| 1079 | # CONFIG_USB_WDM is not set | ||
| 1064 | 1080 | ||
| 1065 | # | 1081 | # |
| 1066 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1082 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1080,7 +1096,9 @@ CONFIG_USB_STORAGE=y | |||
| 1080 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1096 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1081 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1097 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1082 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1098 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1099 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1083 | # CONFIG_USB_STORAGE_KARMA is not set | 1100 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1101 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1084 | # CONFIG_USB_LIBUSUAL is not set | 1102 | # CONFIG_USB_LIBUSUAL is not set |
| 1085 | 1103 | ||
| 1086 | # | 1104 | # |
| @@ -1118,6 +1136,7 @@ CONFIG_USB_MON=y | |||
| 1118 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1136 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1119 | # CONFIG_USB_IOWARRIOR is not set | 1137 | # CONFIG_USB_IOWARRIOR is not set |
| 1120 | # CONFIG_USB_TEST is not set | 1138 | # CONFIG_USB_TEST is not set |
| 1139 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1121 | CONFIG_USB_GADGET=y | 1140 | CONFIG_USB_GADGET=y |
| 1122 | # CONFIG_USB_GADGET_DEBUG is not set | 1141 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1123 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1142 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1129,6 +1148,7 @@ CONFIG_USB_GADGET_NET2280=y | |||
| 1129 | CONFIG_USB_NET2280=y | 1148 | CONFIG_USB_NET2280=y |
| 1130 | # CONFIG_USB_GADGET_PXA2XX is not set | 1149 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 1131 | # CONFIG_USB_GADGET_M66592 is not set | 1150 | # CONFIG_USB_GADGET_M66592 is not set |
| 1151 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 1132 | # CONFIG_USB_GADGET_GOKU is not set | 1152 | # CONFIG_USB_GADGET_GOKU is not set |
| 1133 | # CONFIG_USB_GADGET_LH7A40X is not set | 1153 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 1134 | # CONFIG_USB_GADGET_OMAP is not set | 1154 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -1147,6 +1167,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1147 | # CONFIG_MMC is not set | 1167 | # CONFIG_MMC is not set |
| 1148 | # CONFIG_MEMSTICK is not set | 1168 | # CONFIG_MEMSTICK is not set |
| 1149 | # CONFIG_NEW_LEDS is not set | 1169 | # CONFIG_NEW_LEDS is not set |
| 1170 | # CONFIG_ACCESSIBILITY is not set | ||
| 1150 | # CONFIG_INFINIBAND is not set | 1171 | # CONFIG_INFINIBAND is not set |
| 1151 | # CONFIG_EDAC is not set | 1172 | # CONFIG_EDAC is not set |
| 1152 | CONFIG_RTC_LIB=y | 1173 | CONFIG_RTC_LIB=y |
| @@ -1201,11 +1222,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1201 | # | 1222 | # |
| 1202 | # on-CPU RTC drivers | 1223 | # on-CPU RTC drivers |
| 1203 | # | 1224 | # |
| 1225 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1204 | # CONFIG_DMADEVICES is not set | 1226 | # CONFIG_DMADEVICES is not set |
| 1205 | |||
| 1206 | # | ||
| 1207 | # Userspace I/O | ||
| 1208 | # | ||
| 1209 | # CONFIG_UIO is not set | 1227 | # CONFIG_UIO is not set |
| 1210 | 1228 | ||
| 1211 | # | 1229 | # |
| @@ -1225,7 +1243,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1225 | # CONFIG_JFS_FS is not set | 1243 | # CONFIG_JFS_FS is not set |
| 1226 | # CONFIG_FS_POSIX_ACL is not set | 1244 | # CONFIG_FS_POSIX_ACL is not set |
| 1227 | # CONFIG_XFS_FS is not set | 1245 | # CONFIG_XFS_FS is not set |
| 1228 | # CONFIG_GFS2_FS is not set | ||
| 1229 | # CONFIG_OCFS2_FS is not set | 1246 | # CONFIG_OCFS2_FS is not set |
| 1230 | CONFIG_DNOTIFY=y | 1247 | CONFIG_DNOTIFY=y |
| 1231 | CONFIG_INOTIFY=y | 1248 | CONFIG_INOTIFY=y |
| @@ -1294,7 +1311,6 @@ CONFIG_NFS_FS=y | |||
| 1294 | CONFIG_NFS_V3=y | 1311 | CONFIG_NFS_V3=y |
| 1295 | # CONFIG_NFS_V3_ACL is not set | 1312 | # CONFIG_NFS_V3_ACL is not set |
| 1296 | CONFIG_NFS_V4=y | 1313 | CONFIG_NFS_V4=y |
| 1297 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1298 | # CONFIG_NFSD is not set | 1314 | # CONFIG_NFSD is not set |
| 1299 | CONFIG_ROOT_NFS=y | 1315 | CONFIG_ROOT_NFS=y |
| 1300 | CONFIG_LOCKD=y | 1316 | CONFIG_LOCKD=y |
| @@ -1339,6 +1355,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1339 | # Library routines | 1355 | # Library routines |
| 1340 | # | 1356 | # |
| 1341 | CONFIG_BITREVERSE=y | 1357 | CONFIG_BITREVERSE=y |
| 1358 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1342 | # CONFIG_CRC_CCITT is not set | 1359 | # CONFIG_CRC_CCITT is not set |
| 1343 | # CONFIG_CRC16 is not set | 1360 | # CONFIG_CRC16 is not set |
| 1344 | # CONFIG_CRC_ITU_T is not set | 1361 | # CONFIG_CRC_ITU_T is not set |
| @@ -1351,6 +1368,7 @@ CONFIG_PLIST=y | |||
| 1351 | CONFIG_HAS_IOMEM=y | 1368 | CONFIG_HAS_IOMEM=y |
| 1352 | CONFIG_HAS_IOPORT=y | 1369 | CONFIG_HAS_IOPORT=y |
| 1353 | CONFIG_HAS_DMA=y | 1370 | CONFIG_HAS_DMA=y |
| 1371 | CONFIG_HAVE_LMB=y | ||
| 1354 | 1372 | ||
| 1355 | # | 1373 | # |
| 1356 | # Kernel hacking | 1374 | # Kernel hacking |
| @@ -1358,6 +1376,7 @@ CONFIG_HAS_DMA=y | |||
| 1358 | # CONFIG_PRINTK_TIME is not set | 1376 | # CONFIG_PRINTK_TIME is not set |
| 1359 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1377 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1360 | CONFIG_ENABLE_MUST_CHECK=y | 1378 | CONFIG_ENABLE_MUST_CHECK=y |
| 1379 | CONFIG_FRAME_WARN=1024 | ||
| 1361 | # CONFIG_MAGIC_SYSRQ is not set | 1380 | # CONFIG_MAGIC_SYSRQ is not set |
| 1362 | # CONFIG_UNUSED_SYMBOLS is not set | 1381 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1363 | # CONFIG_DEBUG_FS is not set | 1382 | # CONFIG_DEBUG_FS is not set |
| @@ -1368,6 +1387,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1368 | CONFIG_SCHED_DEBUG=y | 1387 | CONFIG_SCHED_DEBUG=y |
| 1369 | # CONFIG_SCHEDSTATS is not set | 1388 | # CONFIG_SCHEDSTATS is not set |
| 1370 | # CONFIG_TIMER_STATS is not set | 1389 | # CONFIG_TIMER_STATS is not set |
| 1390 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1371 | # CONFIG_SLUB_DEBUG_ON is not set | 1391 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1372 | # CONFIG_SLUB_STATS is not set | 1392 | # CONFIG_SLUB_STATS is not set |
| 1373 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1393 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1380,6 +1400,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1380 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1400 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1381 | # CONFIG_DEBUG_INFO is not set | 1401 | # CONFIG_DEBUG_INFO is not set |
| 1382 | # CONFIG_DEBUG_VM is not set | 1402 | # CONFIG_DEBUG_VM is not set |
| 1403 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1383 | # CONFIG_DEBUG_LIST is not set | 1404 | # CONFIG_DEBUG_LIST is not set |
| 1384 | # CONFIG_DEBUG_SG is not set | 1405 | # CONFIG_DEBUG_SG is not set |
| 1385 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1406 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1391,6 +1412,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1391 | # CONFIG_DEBUG_STACK_USAGE is not set | 1412 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1392 | # CONFIG_DEBUG_PAGEALLOC is not set | 1413 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1393 | # CONFIG_DEBUGGER is not set | 1414 | # CONFIG_DEBUGGER is not set |
| 1415 | # CONFIG_IRQSTACKS is not set | ||
| 1394 | # CONFIG_BDI_SWITCH is not set | 1416 | # CONFIG_BDI_SWITCH is not set |
| 1395 | # CONFIG_PPC_EARLY_DEBUG is not set | 1417 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1396 | 1418 | ||
| @@ -1401,51 +1423,81 @@ CONFIG_SCHED_DEBUG=y | |||
| 1401 | # CONFIG_SECURITY is not set | 1423 | # CONFIG_SECURITY is not set |
| 1402 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1424 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1403 | CONFIG_CRYPTO=y | 1425 | CONFIG_CRYPTO=y |
| 1426 | |||
| 1427 | # | ||
| 1428 | # Crypto core or helper | ||
| 1429 | # | ||
| 1404 | CONFIG_CRYPTO_ALGAPI=y | 1430 | CONFIG_CRYPTO_ALGAPI=y |
| 1405 | CONFIG_CRYPTO_BLKCIPHER=y | 1431 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1406 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1407 | CONFIG_CRYPTO_MANAGER=y | 1432 | CONFIG_CRYPTO_MANAGER=y |
| 1433 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1434 | # CONFIG_CRYPTO_NULL is not set | ||
| 1435 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1436 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1437 | # CONFIG_CRYPTO_TEST is not set | ||
| 1438 | |||
| 1439 | # | ||
| 1440 | # Authenticated Encryption with Associated Data | ||
| 1441 | # | ||
| 1442 | # CONFIG_CRYPTO_CCM is not set | ||
| 1443 | # CONFIG_CRYPTO_GCM is not set | ||
| 1444 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1445 | |||
| 1446 | # | ||
| 1447 | # Block modes | ||
| 1448 | # | ||
| 1449 | CONFIG_CRYPTO_CBC=y | ||
| 1450 | # CONFIG_CRYPTO_CTR is not set | ||
| 1451 | # CONFIG_CRYPTO_CTS is not set | ||
| 1452 | # CONFIG_CRYPTO_ECB is not set | ||
| 1453 | # CONFIG_CRYPTO_LRW is not set | ||
| 1454 | CONFIG_CRYPTO_PCBC=m | ||
| 1455 | # CONFIG_CRYPTO_XTS is not set | ||
| 1456 | |||
| 1457 | # | ||
| 1458 | # Hash modes | ||
| 1459 | # | ||
| 1408 | # CONFIG_CRYPTO_HMAC is not set | 1460 | # CONFIG_CRYPTO_HMAC is not set |
| 1409 | # CONFIG_CRYPTO_XCBC is not set | 1461 | # CONFIG_CRYPTO_XCBC is not set |
| 1410 | # CONFIG_CRYPTO_NULL is not set | 1462 | |
| 1463 | # | ||
| 1464 | # Digest | ||
| 1465 | # | ||
| 1466 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1411 | # CONFIG_CRYPTO_MD4 is not set | 1467 | # CONFIG_CRYPTO_MD4 is not set |
| 1412 | CONFIG_CRYPTO_MD5=y | 1468 | CONFIG_CRYPTO_MD5=y |
| 1469 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1413 | # CONFIG_CRYPTO_SHA1 is not set | 1470 | # CONFIG_CRYPTO_SHA1 is not set |
| 1414 | # CONFIG_CRYPTO_SHA256 is not set | 1471 | # CONFIG_CRYPTO_SHA256 is not set |
| 1415 | # CONFIG_CRYPTO_SHA512 is not set | 1472 | # CONFIG_CRYPTO_SHA512 is not set |
| 1416 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1417 | # CONFIG_CRYPTO_TGR192 is not set | 1473 | # CONFIG_CRYPTO_TGR192 is not set |
| 1418 | # CONFIG_CRYPTO_GF128MUL is not set | 1474 | # CONFIG_CRYPTO_WP512 is not set |
| 1419 | # CONFIG_CRYPTO_ECB is not set | 1475 | |
| 1420 | CONFIG_CRYPTO_CBC=y | 1476 | # |
| 1421 | CONFIG_CRYPTO_PCBC=m | 1477 | # Ciphers |
| 1422 | # CONFIG_CRYPTO_LRW is not set | 1478 | # |
| 1423 | # CONFIG_CRYPTO_XTS is not set | ||
| 1424 | # CONFIG_CRYPTO_CTR is not set | ||
| 1425 | # CONFIG_CRYPTO_GCM is not set | ||
| 1426 | # CONFIG_CRYPTO_CCM is not set | ||
| 1427 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1428 | CONFIG_CRYPTO_DES=y | ||
| 1429 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1430 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1431 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1432 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1433 | # CONFIG_CRYPTO_AES is not set | 1479 | # CONFIG_CRYPTO_AES is not set |
| 1480 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1481 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1482 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1483 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1434 | # CONFIG_CRYPTO_CAST5 is not set | 1484 | # CONFIG_CRYPTO_CAST5 is not set |
| 1435 | # CONFIG_CRYPTO_CAST6 is not set | 1485 | # CONFIG_CRYPTO_CAST6 is not set |
| 1436 | # CONFIG_CRYPTO_TEA is not set | 1486 | CONFIG_CRYPTO_DES=y |
| 1437 | # CONFIG_CRYPTO_ARC4 is not set | 1487 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1438 | # CONFIG_CRYPTO_KHAZAD is not set | 1488 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1439 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1440 | # CONFIG_CRYPTO_SEED is not set | ||
| 1441 | # CONFIG_CRYPTO_SALSA20 is not set | 1489 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1490 | # CONFIG_CRYPTO_SEED is not set | ||
| 1491 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1492 | # CONFIG_CRYPTO_TEA is not set | ||
| 1493 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1494 | |||
| 1495 | # | ||
| 1496 | # Compression | ||
| 1497 | # | ||
| 1442 | # CONFIG_CRYPTO_DEFLATE is not set | 1498 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1443 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1444 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1445 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1446 | # CONFIG_CRYPTO_TEST is not set | ||
| 1447 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1448 | # CONFIG_CRYPTO_LZO is not set | 1499 | # CONFIG_CRYPTO_LZO is not set |
| 1449 | CONFIG_CRYPTO_HW=y | 1500 | CONFIG_CRYPTO_HW=y |
| 1450 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1501 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1451 | # CONFIG_PPC_CLOCK is not set | 1502 | # CONFIG_PPC_CLOCK is not set |
| 1503 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index 50cceda8994f..1eca26f3659a 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:51 2008 | 4 | # Mon Jun 9 08:52:22 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -212,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -239,6 +246,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 239 | CONFIG_PCI_LEGACY=y | 246 | CONFIG_PCI_LEGACY=y |
| 240 | # CONFIG_PCCARD is not set | 247 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 248 | # CONFIG_HOTPLUG_PCI is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 250 | ||
| 243 | # | 251 | # |
| 244 | # Advanced setup | 252 | # Advanced setup |
| @@ -248,11 +256,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 256 | # |
| 249 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 250 | # | 258 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 264 | ||
| 257 | # | 265 | # |
| 258 | # Networking | 266 | # Networking |
| @@ -300,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -355,6 +361,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 355 | # CONFIG_CONNECTOR is not set | 361 | # CONFIG_CONNECTOR is not set |
| 356 | # CONFIG_MTD is not set | 362 | # CONFIG_MTD is not set |
| 357 | CONFIG_OF_DEVICE=y | 363 | CONFIG_OF_DEVICE=y |
| 364 | CONFIG_OF_I2C=y | ||
| 358 | # CONFIG_PARPORT is not set | 365 | # CONFIG_PARPORT is not set |
| 359 | CONFIG_BLK_DEV=y | 366 | CONFIG_BLK_DEV=y |
| 360 | # CONFIG_BLK_DEV_FD is not set | 367 | # CONFIG_BLK_DEV_FD is not set |
| @@ -522,7 +529,6 @@ CONFIG_NETDEV_1000=y | |||
| 522 | # CONFIG_SIS190 is not set | 529 | # CONFIG_SIS190 is not set |
| 523 | # CONFIG_SKGE is not set | 530 | # CONFIG_SKGE is not set |
| 524 | # CONFIG_SKY2 is not set | 531 | # CONFIG_SKY2 is not set |
| 525 | # CONFIG_SK98LIN is not set | ||
| 526 | # CONFIG_VIA_VELOCITY is not set | 532 | # CONFIG_VIA_VELOCITY is not set |
| 527 | # CONFIG_TIGON3 is not set | 533 | # CONFIG_TIGON3 is not set |
| 528 | # CONFIG_BNX2 is not set | 534 | # CONFIG_BNX2 is not set |
| @@ -546,6 +552,7 @@ CONFIG_NETDEV_10000=y | |||
| 546 | # CONFIG_MLX4_CORE is not set | 552 | # CONFIG_MLX4_CORE is not set |
| 547 | # CONFIG_TEHUTI is not set | 553 | # CONFIG_TEHUTI is not set |
| 548 | # CONFIG_BNX2X is not set | 554 | # CONFIG_BNX2X is not set |
| 555 | # CONFIG_SFC is not set | ||
| 549 | # CONFIG_TR is not set | 556 | # CONFIG_TR is not set |
| 550 | 557 | ||
| 551 | # | 558 | # |
| @@ -553,6 +560,7 @@ CONFIG_NETDEV_10000=y | |||
| 553 | # | 560 | # |
| 554 | # CONFIG_WLAN_PRE80211 is not set | 561 | # CONFIG_WLAN_PRE80211 is not set |
| 555 | # CONFIG_WLAN_80211 is not set | 562 | # CONFIG_WLAN_80211 is not set |
| 563 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 556 | # CONFIG_WAN is not set | 564 | # CONFIG_WAN is not set |
| 557 | # CONFIG_FDDI is not set | 565 | # CONFIG_FDDI is not set |
| 558 | # CONFIG_HIPPI is not set | 566 | # CONFIG_HIPPI is not set |
| @@ -600,6 +608,7 @@ CONFIG_INPUT=y | |||
| 600 | # Character devices | 608 | # Character devices |
| 601 | # | 609 | # |
| 602 | # CONFIG_VT is not set | 610 | # CONFIG_VT is not set |
| 611 | CONFIG_DEVKMEM=y | ||
| 603 | # CONFIG_SERIAL_NONSTANDARD is not set | 612 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 604 | # CONFIG_NOZOMI is not set | 613 | # CONFIG_NOZOMI is not set |
| 605 | 614 | ||
| @@ -628,7 +637,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 628 | # CONFIG_IPMI_HANDLER is not set | 637 | # CONFIG_IPMI_HANDLER is not set |
| 629 | CONFIG_HW_RANDOM=y | 638 | CONFIG_HW_RANDOM=y |
| 630 | # CONFIG_NVRAM is not set | 639 | # CONFIG_NVRAM is not set |
| 631 | # CONFIG_GEN_RTC is not set | ||
| 632 | # CONFIG_R3964 is not set | 640 | # CONFIG_R3964 is not set |
| 633 | # CONFIG_APPLICOM is not set | 641 | # CONFIG_APPLICOM is not set |
| 634 | # CONFIG_RAW_DRIVER is not set | 642 | # CONFIG_RAW_DRIVER is not set |
| @@ -639,13 +647,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 639 | CONFIG_I2C_CHARDEV=y | 647 | CONFIG_I2C_CHARDEV=y |
| 640 | 648 | ||
| 641 | # | 649 | # |
| 642 | # I2C Algorithms | ||
| 643 | # | ||
| 644 | # CONFIG_I2C_ALGOBIT is not set | ||
| 645 | # CONFIG_I2C_ALGOPCF is not set | ||
| 646 | # CONFIG_I2C_ALGOPCA is not set | ||
| 647 | |||
| 648 | # | ||
| 649 | # I2C Hardware Bus support | 650 | # I2C Hardware Bus support |
| 650 | # | 651 | # |
| 651 | # CONFIG_I2C_ALI1535 is not set | 652 | # CONFIG_I2C_ALI1535 is not set |
| @@ -671,6 +672,7 @@ CONFIG_I2C_MPC=y | |||
| 671 | # CONFIG_I2C_VIA is not set | 672 | # CONFIG_I2C_VIA is not set |
| 672 | # CONFIG_I2C_VIAPRO is not set | 673 | # CONFIG_I2C_VIAPRO is not set |
| 673 | # CONFIG_I2C_VOODOO3 is not set | 674 | # CONFIG_I2C_VOODOO3 is not set |
| 675 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 674 | 676 | ||
| 675 | # | 677 | # |
| 676 | # Miscellaneous I2C Chip support | 678 | # Miscellaneous I2C Chip support |
| @@ -680,19 +682,13 @@ CONFIG_I2C_MPC=y | |||
| 680 | # CONFIG_SENSORS_PCF8574 is not set | 682 | # CONFIG_SENSORS_PCF8574 is not set |
| 681 | # CONFIG_PCF8575 is not set | 683 | # CONFIG_PCF8575 is not set |
| 682 | # CONFIG_SENSORS_PCF8591 is not set | 684 | # CONFIG_SENSORS_PCF8591 is not set |
| 683 | # CONFIG_TPS65010 is not set | ||
| 684 | # CONFIG_SENSORS_MAX6875 is not set | 685 | # CONFIG_SENSORS_MAX6875 is not set |
| 685 | # CONFIG_SENSORS_TSL2550 is not set | 686 | # CONFIG_SENSORS_TSL2550 is not set |
| 686 | # CONFIG_I2C_DEBUG_CORE is not set | 687 | # CONFIG_I2C_DEBUG_CORE is not set |
| 687 | # CONFIG_I2C_DEBUG_ALGO is not set | 688 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 688 | # CONFIG_I2C_DEBUG_BUS is not set | 689 | # CONFIG_I2C_DEBUG_BUS is not set |
| 689 | # CONFIG_I2C_DEBUG_CHIP is not set | 690 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 690 | |||
| 691 | # | ||
| 692 | # SPI support | ||
| 693 | # | ||
| 694 | # CONFIG_SPI is not set | 691 | # CONFIG_SPI is not set |
| 695 | # CONFIG_SPI_MASTER is not set | ||
| 696 | # CONFIG_W1 is not set | 692 | # CONFIG_W1 is not set |
| 697 | # CONFIG_POWER_SUPPLY is not set | 693 | # CONFIG_POWER_SUPPLY is not set |
| 698 | CONFIG_HWMON=y | 694 | CONFIG_HWMON=y |
| @@ -775,12 +771,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 775 | # Multifunction device drivers | 771 | # Multifunction device drivers |
| 776 | # | 772 | # |
| 777 | # CONFIG_MFD_SM501 is not set | 773 | # CONFIG_MFD_SM501 is not set |
| 774 | # CONFIG_HTC_PASIC3 is not set | ||
| 778 | 775 | ||
| 779 | # | 776 | # |
| 780 | # Multimedia devices | 777 | # Multimedia devices |
| 781 | # | 778 | # |
| 779 | |||
| 780 | # | ||
| 781 | # Multimedia core support | ||
| 782 | # | ||
| 782 | # CONFIG_VIDEO_DEV is not set | 783 | # CONFIG_VIDEO_DEV is not set |
| 783 | # CONFIG_DVB_CORE is not set | 784 | # CONFIG_DVB_CORE is not set |
| 785 | # CONFIG_VIDEO_MEDIA is not set | ||
| 786 | |||
| 787 | # | ||
| 788 | # Multimedia drivers | ||
| 789 | # | ||
| 784 | CONFIG_DAB=y | 790 | CONFIG_DAB=y |
| 785 | 791 | ||
| 786 | # | 792 | # |
| @@ -811,6 +817,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 811 | CONFIG_USB_ARCH_HAS_OHCI=y | 817 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 812 | CONFIG_USB_ARCH_HAS_EHCI=y | 818 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 813 | # CONFIG_USB is not set | 819 | # CONFIG_USB is not set |
| 820 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 821 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 814 | 822 | ||
| 815 | # | 823 | # |
| 816 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 824 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -819,6 +827,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 819 | # CONFIG_MMC is not set | 827 | # CONFIG_MMC is not set |
| 820 | # CONFIG_MEMSTICK is not set | 828 | # CONFIG_MEMSTICK is not set |
| 821 | # CONFIG_NEW_LEDS is not set | 829 | # CONFIG_NEW_LEDS is not set |
| 830 | # CONFIG_ACCESSIBILITY is not set | ||
| 822 | # CONFIG_INFINIBAND is not set | 831 | # CONFIG_INFINIBAND is not set |
| 823 | # CONFIG_EDAC is not set | 832 | # CONFIG_EDAC is not set |
| 824 | CONFIG_RTC_LIB=y | 833 | CONFIG_RTC_LIB=y |
| @@ -870,11 +879,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 870 | # | 879 | # |
| 871 | # on-CPU RTC drivers | 880 | # on-CPU RTC drivers |
| 872 | # | 881 | # |
| 882 | # CONFIG_RTC_DRV_PPC is not set | ||
| 873 | # CONFIG_DMADEVICES is not set | 883 | # CONFIG_DMADEVICES is not set |
| 874 | |||
| 875 | # | ||
| 876 | # Userspace I/O | ||
| 877 | # | ||
| 878 | # CONFIG_UIO is not set | 884 | # CONFIG_UIO is not set |
| 879 | 885 | ||
| 880 | # | 886 | # |
| @@ -894,7 +900,6 @@ CONFIG_FS_MBCACHE=y | |||
| 894 | # CONFIG_JFS_FS is not set | 900 | # CONFIG_JFS_FS is not set |
| 895 | # CONFIG_FS_POSIX_ACL is not set | 901 | # CONFIG_FS_POSIX_ACL is not set |
| 896 | # CONFIG_XFS_FS is not set | 902 | # CONFIG_XFS_FS is not set |
| 897 | # CONFIG_GFS2_FS is not set | ||
| 898 | # CONFIG_OCFS2_FS is not set | 903 | # CONFIG_OCFS2_FS is not set |
| 899 | CONFIG_DNOTIFY=y | 904 | CONFIG_DNOTIFY=y |
| 900 | CONFIG_INOTIFY=y | 905 | CONFIG_INOTIFY=y |
| @@ -952,7 +957,6 @@ CONFIG_NFS_FS=y | |||
| 952 | CONFIG_NFS_V3=y | 957 | CONFIG_NFS_V3=y |
| 953 | # CONFIG_NFS_V3_ACL is not set | 958 | # CONFIG_NFS_V3_ACL is not set |
| 954 | CONFIG_NFS_V4=y | 959 | CONFIG_NFS_V4=y |
| 955 | # CONFIG_NFS_DIRECTIO is not set | ||
| 956 | # CONFIG_NFSD is not set | 960 | # CONFIG_NFSD is not set |
| 957 | CONFIG_ROOT_NFS=y | 961 | CONFIG_ROOT_NFS=y |
| 958 | CONFIG_LOCKD=y | 962 | CONFIG_LOCKD=y |
| @@ -995,6 +999,7 @@ CONFIG_UCC=y | |||
| 995 | # Library routines | 999 | # Library routines |
| 996 | # | 1000 | # |
| 997 | CONFIG_BITREVERSE=y | 1001 | CONFIG_BITREVERSE=y |
| 1002 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 998 | # CONFIG_CRC_CCITT is not set | 1003 | # CONFIG_CRC_CCITT is not set |
| 999 | # CONFIG_CRC16 is not set | 1004 | # CONFIG_CRC16 is not set |
| 1000 | # CONFIG_CRC_ITU_T is not set | 1005 | # CONFIG_CRC_ITU_T is not set |
| @@ -1005,6 +1010,7 @@ CONFIG_PLIST=y | |||
| 1005 | CONFIG_HAS_IOMEM=y | 1010 | CONFIG_HAS_IOMEM=y |
| 1006 | CONFIG_HAS_IOPORT=y | 1011 | CONFIG_HAS_IOPORT=y |
| 1007 | CONFIG_HAS_DMA=y | 1012 | CONFIG_HAS_DMA=y |
| 1013 | CONFIG_HAVE_LMB=y | ||
| 1008 | 1014 | ||
| 1009 | # | 1015 | # |
| 1010 | # Kernel hacking | 1016 | # Kernel hacking |
| @@ -1012,6 +1018,7 @@ CONFIG_HAS_DMA=y | |||
| 1012 | # CONFIG_PRINTK_TIME is not set | 1018 | # CONFIG_PRINTK_TIME is not set |
| 1013 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1019 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1014 | CONFIG_ENABLE_MUST_CHECK=y | 1020 | CONFIG_ENABLE_MUST_CHECK=y |
| 1021 | CONFIG_FRAME_WARN=1024 | ||
| 1015 | # CONFIG_MAGIC_SYSRQ is not set | 1022 | # CONFIG_MAGIC_SYSRQ is not set |
| 1016 | # CONFIG_UNUSED_SYMBOLS is not set | 1023 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1017 | # CONFIG_DEBUG_FS is not set | 1024 | # CONFIG_DEBUG_FS is not set |
| @@ -1021,6 +1028,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1021 | # CONFIG_SLUB_STATS is not set | 1028 | # CONFIG_SLUB_STATS is not set |
| 1022 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1029 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1023 | # CONFIG_SAMPLES is not set | 1030 | # CONFIG_SAMPLES is not set |
| 1031 | # CONFIG_IRQSTACKS is not set | ||
| 1024 | # CONFIG_PPC_EARLY_DEBUG is not set | 1032 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1025 | 1033 | ||
| 1026 | # | 1034 | # |
| @@ -1030,52 +1038,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1030 | # CONFIG_SECURITY is not set | 1038 | # CONFIG_SECURITY is not set |
| 1031 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1039 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1032 | CONFIG_CRYPTO=y | 1040 | CONFIG_CRYPTO=y |
| 1041 | |||
| 1042 | # | ||
| 1043 | # Crypto core or helper | ||
| 1044 | # | ||
| 1033 | CONFIG_CRYPTO_ALGAPI=y | 1045 | CONFIG_CRYPTO_ALGAPI=y |
| 1034 | CONFIG_CRYPTO_BLKCIPHER=y | 1046 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1035 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1036 | CONFIG_CRYPTO_MANAGER=y | 1047 | CONFIG_CRYPTO_MANAGER=y |
| 1048 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1049 | # CONFIG_CRYPTO_NULL is not set | ||
| 1050 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1051 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1052 | # CONFIG_CRYPTO_TEST is not set | ||
| 1053 | |||
| 1054 | # | ||
| 1055 | # Authenticated Encryption with Associated Data | ||
| 1056 | # | ||
| 1057 | # CONFIG_CRYPTO_CCM is not set | ||
| 1058 | # CONFIG_CRYPTO_GCM is not set | ||
| 1059 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1060 | |||
| 1061 | # | ||
| 1062 | # Block modes | ||
| 1063 | # | ||
| 1064 | CONFIG_CRYPTO_CBC=y | ||
| 1065 | # CONFIG_CRYPTO_CTR is not set | ||
| 1066 | # CONFIG_CRYPTO_CTS is not set | ||
| 1067 | CONFIG_CRYPTO_ECB=m | ||
| 1068 | # CONFIG_CRYPTO_LRW is not set | ||
| 1069 | CONFIG_CRYPTO_PCBC=m | ||
| 1070 | # CONFIG_CRYPTO_XTS is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Hash modes | ||
| 1074 | # | ||
| 1037 | # CONFIG_CRYPTO_HMAC is not set | 1075 | # CONFIG_CRYPTO_HMAC is not set |
| 1038 | # CONFIG_CRYPTO_XCBC is not set | 1076 | # CONFIG_CRYPTO_XCBC is not set |
| 1039 | # CONFIG_CRYPTO_NULL is not set | 1077 | |
| 1078 | # | ||
| 1079 | # Digest | ||
| 1080 | # | ||
| 1081 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1040 | # CONFIG_CRYPTO_MD4 is not set | 1082 | # CONFIG_CRYPTO_MD4 is not set |
| 1041 | CONFIG_CRYPTO_MD5=y | 1083 | CONFIG_CRYPTO_MD5=y |
| 1084 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1042 | # CONFIG_CRYPTO_SHA1 is not set | 1085 | # CONFIG_CRYPTO_SHA1 is not set |
| 1043 | # CONFIG_CRYPTO_SHA256 is not set | 1086 | # CONFIG_CRYPTO_SHA256 is not set |
| 1044 | # CONFIG_CRYPTO_SHA512 is not set | 1087 | # CONFIG_CRYPTO_SHA512 is not set |
| 1045 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1046 | # CONFIG_CRYPTO_TGR192 is not set | 1088 | # CONFIG_CRYPTO_TGR192 is not set |
| 1047 | # CONFIG_CRYPTO_GF128MUL is not set | 1089 | # CONFIG_CRYPTO_WP512 is not set |
| 1048 | CONFIG_CRYPTO_ECB=m | 1090 | |
| 1049 | CONFIG_CRYPTO_CBC=y | 1091 | # |
| 1050 | CONFIG_CRYPTO_PCBC=m | 1092 | # Ciphers |
| 1051 | # CONFIG_CRYPTO_LRW is not set | 1093 | # |
| 1052 | # CONFIG_CRYPTO_XTS is not set | ||
| 1053 | # CONFIG_CRYPTO_CTR is not set | ||
| 1054 | # CONFIG_CRYPTO_GCM is not set | ||
| 1055 | # CONFIG_CRYPTO_CCM is not set | ||
| 1056 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1057 | CONFIG_CRYPTO_DES=y | ||
| 1058 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1059 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1060 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1061 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1062 | # CONFIG_CRYPTO_AES is not set | 1094 | # CONFIG_CRYPTO_AES is not set |
| 1095 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1096 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1097 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1098 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1063 | # CONFIG_CRYPTO_CAST5 is not set | 1099 | # CONFIG_CRYPTO_CAST5 is not set |
| 1064 | # CONFIG_CRYPTO_CAST6 is not set | 1100 | # CONFIG_CRYPTO_CAST6 is not set |
| 1065 | # CONFIG_CRYPTO_TEA is not set | 1101 | CONFIG_CRYPTO_DES=y |
| 1066 | # CONFIG_CRYPTO_ARC4 is not set | 1102 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1067 | # CONFIG_CRYPTO_KHAZAD is not set | 1103 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1068 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1069 | # CONFIG_CRYPTO_SEED is not set | ||
| 1070 | # CONFIG_CRYPTO_SALSA20 is not set | 1104 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1105 | # CONFIG_CRYPTO_SEED is not set | ||
| 1106 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1107 | # CONFIG_CRYPTO_TEA is not set | ||
| 1108 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1109 | |||
| 1110 | # | ||
| 1111 | # Compression | ||
| 1112 | # | ||
| 1071 | # CONFIG_CRYPTO_DEFLATE is not set | 1113 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1072 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1073 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1074 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1075 | # CONFIG_CRYPTO_TEST is not set | ||
| 1076 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1077 | # CONFIG_CRYPTO_LZO is not set | 1114 | # CONFIG_CRYPTO_LZO is not set |
| 1078 | CONFIG_CRYPTO_HW=y | 1115 | CONFIG_CRYPTO_HW=y |
| 1079 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1116 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1080 | # CONFIG_PPC_CLOCK is not set | 1117 | # CONFIG_PPC_CLOCK is not set |
| 1081 | CONFIG_PPC_LIB_RHEAP=y | 1118 | CONFIG_PPC_LIB_RHEAP=y |
| 1119 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index ac913025713e..de95d327463c 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:16 2008 | 4 | # Mon Jun 9 08:52:24 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -212,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -239,6 +246,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 239 | CONFIG_PCI_LEGACY=y | 246 | CONFIG_PCI_LEGACY=y |
| 240 | # CONFIG_PCCARD is not set | 247 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 248 | # CONFIG_HOTPLUG_PCI is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 250 | ||
| 243 | # | 251 | # |
| 244 | # Advanced setup | 252 | # Advanced setup |
| @@ -248,11 +256,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 256 | # |
| 249 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 250 | # | 258 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 264 | ||
| 257 | # | 265 | # |
| 258 | # Networking | 266 | # Networking |
| @@ -300,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -355,6 +361,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 355 | # CONFIG_CONNECTOR is not set | 361 | # CONFIG_CONNECTOR is not set |
| 356 | # CONFIG_MTD is not set | 362 | # CONFIG_MTD is not set |
| 357 | CONFIG_OF_DEVICE=y | 363 | CONFIG_OF_DEVICE=y |
| 364 | CONFIG_OF_I2C=y | ||
| 358 | # CONFIG_PARPORT is not set | 365 | # CONFIG_PARPORT is not set |
| 359 | CONFIG_BLK_DEV=y | 366 | CONFIG_BLK_DEV=y |
| 360 | # CONFIG_BLK_DEV_FD is not set | 367 | # CONFIG_BLK_DEV_FD is not set |
| @@ -526,7 +533,6 @@ CONFIG_E1000=y | |||
| 526 | # CONFIG_SIS190 is not set | 533 | # CONFIG_SIS190 is not set |
| 527 | # CONFIG_SKGE is not set | 534 | # CONFIG_SKGE is not set |
| 528 | # CONFIG_SKY2 is not set | 535 | # CONFIG_SKY2 is not set |
| 529 | # CONFIG_SK98LIN is not set | ||
| 530 | # CONFIG_VIA_VELOCITY is not set | 536 | # CONFIG_VIA_VELOCITY is not set |
| 531 | # CONFIG_TIGON3 is not set | 537 | # CONFIG_TIGON3 is not set |
| 532 | # CONFIG_BNX2 is not set | 538 | # CONFIG_BNX2 is not set |
| @@ -550,6 +556,7 @@ CONFIG_NETDEV_10000=y | |||
| 550 | # CONFIG_MLX4_CORE is not set | 556 | # CONFIG_MLX4_CORE is not set |
| 551 | # CONFIG_TEHUTI is not set | 557 | # CONFIG_TEHUTI is not set |
| 552 | # CONFIG_BNX2X is not set | 558 | # CONFIG_BNX2X is not set |
| 559 | # CONFIG_SFC is not set | ||
| 553 | # CONFIG_TR is not set | 560 | # CONFIG_TR is not set |
| 554 | 561 | ||
| 555 | # | 562 | # |
| @@ -557,6 +564,7 @@ CONFIG_NETDEV_10000=y | |||
| 557 | # | 564 | # |
| 558 | # CONFIG_WLAN_PRE80211 is not set | 565 | # CONFIG_WLAN_PRE80211 is not set |
| 559 | # CONFIG_WLAN_80211 is not set | 566 | # CONFIG_WLAN_80211 is not set |
| 567 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 560 | 568 | ||
| 561 | # | 569 | # |
| 562 | # USB Network Adapters | 570 | # USB Network Adapters |
| @@ -613,6 +621,7 @@ CONFIG_INPUT=y | |||
| 613 | # Character devices | 621 | # Character devices |
| 614 | # | 622 | # |
| 615 | # CONFIG_VT is not set | 623 | # CONFIG_VT is not set |
| 624 | CONFIG_DEVKMEM=y | ||
| 616 | # CONFIG_SERIAL_NONSTANDARD is not set | 625 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 617 | # CONFIG_NOZOMI is not set | 626 | # CONFIG_NOZOMI is not set |
| 618 | 627 | ||
| @@ -653,13 +662,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 653 | CONFIG_I2C_CHARDEV=y | 662 | CONFIG_I2C_CHARDEV=y |
| 654 | 663 | ||
| 655 | # | 664 | # |
| 656 | # I2C Algorithms | ||
| 657 | # | ||
| 658 | # CONFIG_I2C_ALGOBIT is not set | ||
| 659 | # CONFIG_I2C_ALGOPCF is not set | ||
| 660 | # CONFIG_I2C_ALGOPCA is not set | ||
| 661 | |||
| 662 | # | ||
| 663 | # I2C Hardware Bus support | 665 | # I2C Hardware Bus support |
| 664 | # | 666 | # |
| 665 | # CONFIG_I2C_ALI1535 is not set | 667 | # CONFIG_I2C_ALI1535 is not set |
| @@ -686,6 +688,7 @@ CONFIG_I2C_MPC=y | |||
| 686 | # CONFIG_I2C_VIA is not set | 688 | # CONFIG_I2C_VIA is not set |
| 687 | # CONFIG_I2C_VIAPRO is not set | 689 | # CONFIG_I2C_VIAPRO is not set |
| 688 | # CONFIG_I2C_VOODOO3 is not set | 690 | # CONFIG_I2C_VOODOO3 is not set |
| 691 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 689 | 692 | ||
| 690 | # | 693 | # |
| 691 | # Miscellaneous I2C Chip support | 694 | # Miscellaneous I2C Chip support |
| @@ -695,17 +698,12 @@ CONFIG_I2C_MPC=y | |||
| 695 | # CONFIG_SENSORS_PCF8574 is not set | 698 | # CONFIG_SENSORS_PCF8574 is not set |
| 696 | # CONFIG_PCF8575 is not set | 699 | # CONFIG_PCF8575 is not set |
| 697 | # CONFIG_SENSORS_PCF8591 is not set | 700 | # CONFIG_SENSORS_PCF8591 is not set |
| 698 | # CONFIG_TPS65010 is not set | ||
| 699 | # CONFIG_SENSORS_MAX6875 is not set | 701 | # CONFIG_SENSORS_MAX6875 is not set |
| 700 | # CONFIG_SENSORS_TSL2550 is not set | 702 | # CONFIG_SENSORS_TSL2550 is not set |
| 701 | # CONFIG_I2C_DEBUG_CORE is not set | 703 | # CONFIG_I2C_DEBUG_CORE is not set |
| 702 | # CONFIG_I2C_DEBUG_ALGO is not set | 704 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 703 | # CONFIG_I2C_DEBUG_BUS is not set | 705 | # CONFIG_I2C_DEBUG_BUS is not set |
| 704 | # CONFIG_I2C_DEBUG_CHIP is not set | 706 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 705 | |||
| 706 | # | ||
| 707 | # SPI support | ||
| 708 | # | ||
| 709 | CONFIG_SPI=y | 707 | CONFIG_SPI=y |
| 710 | CONFIG_SPI_MASTER=y | 708 | CONFIG_SPI_MASTER=y |
| 711 | 709 | ||
| @@ -809,12 +807,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 809 | # Multifunction device drivers | 807 | # Multifunction device drivers |
| 810 | # | 808 | # |
| 811 | # CONFIG_MFD_SM501 is not set | 809 | # CONFIG_MFD_SM501 is not set |
| 810 | # CONFIG_HTC_PASIC3 is not set | ||
| 812 | 811 | ||
| 813 | # | 812 | # |
| 814 | # Multimedia devices | 813 | # Multimedia devices |
| 815 | # | 814 | # |
| 815 | |||
| 816 | # | ||
| 817 | # Multimedia core support | ||
| 818 | # | ||
| 816 | # CONFIG_VIDEO_DEV is not set | 819 | # CONFIG_VIDEO_DEV is not set |
| 817 | # CONFIG_DVB_CORE is not set | 820 | # CONFIG_DVB_CORE is not set |
| 821 | # CONFIG_VIDEO_MEDIA is not set | ||
| 822 | |||
| 823 | # | ||
| 824 | # Multimedia drivers | ||
| 825 | # | ||
| 818 | CONFIG_DAB=y | 826 | CONFIG_DAB=y |
| 819 | # CONFIG_USB_DABUSB is not set | 827 | # CONFIG_USB_DABUSB is not set |
| 820 | 828 | ||
| @@ -867,16 +875,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 867 | CONFIG_USB_DEVICE_CLASS=y | 875 | CONFIG_USB_DEVICE_CLASS=y |
| 868 | # CONFIG_USB_DYNAMIC_MINORS is not set | 876 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 869 | # CONFIG_USB_OTG is not set | 877 | # CONFIG_USB_OTG is not set |
| 878 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 879 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 870 | 880 | ||
| 871 | # | 881 | # |
| 872 | # USB Host Controller Drivers | 882 | # USB Host Controller Drivers |
| 873 | # | 883 | # |
| 884 | # CONFIG_USB_C67X00_HCD is not set | ||
| 874 | CONFIG_USB_EHCI_HCD=y | 885 | CONFIG_USB_EHCI_HCD=y |
| 875 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 886 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 876 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 887 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 877 | # CONFIG_USB_EHCI_FSL is not set | 888 | # CONFIG_USB_EHCI_FSL is not set |
| 878 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 889 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 879 | # CONFIG_USB_ISP116X_HCD is not set | 890 | # CONFIG_USB_ISP116X_HCD is not set |
| 891 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 880 | CONFIG_USB_OHCI_HCD=y | 892 | CONFIG_USB_OHCI_HCD=y |
| 881 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 893 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 882 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 894 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -894,6 +906,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 894 | # | 906 | # |
| 895 | # CONFIG_USB_ACM is not set | 907 | # CONFIG_USB_ACM is not set |
| 896 | # CONFIG_USB_PRINTER is not set | 908 | # CONFIG_USB_PRINTER is not set |
| 909 | # CONFIG_USB_WDM is not set | ||
| 897 | 910 | ||
| 898 | # | 911 | # |
| 899 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 912 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -913,7 +926,9 @@ CONFIG_USB_STORAGE=y | |||
| 913 | # CONFIG_USB_STORAGE_SDDR55 is not set | 926 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 914 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 927 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 915 | # CONFIG_USB_STORAGE_ALAUDA is not set | 928 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 929 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 916 | # CONFIG_USB_STORAGE_KARMA is not set | 930 | # CONFIG_USB_STORAGE_KARMA is not set |
| 931 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 917 | # CONFIG_USB_LIBUSUAL is not set | 932 | # CONFIG_USB_LIBUSUAL is not set |
| 918 | 933 | ||
| 919 | # | 934 | # |
| @@ -951,6 +966,7 @@ CONFIG_USB_MON=y | |||
| 951 | # CONFIG_USB_TRANCEVIBRATOR is not set | 966 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 952 | # CONFIG_USB_IOWARRIOR is not set | 967 | # CONFIG_USB_IOWARRIOR is not set |
| 953 | # CONFIG_USB_TEST is not set | 968 | # CONFIG_USB_TEST is not set |
| 969 | # CONFIG_USB_ISIGHTFW is not set | ||
| 954 | # CONFIG_USB_GADGET is not set | 970 | # CONFIG_USB_GADGET is not set |
| 955 | CONFIG_MMC=y | 971 | CONFIG_MMC=y |
| 956 | # CONFIG_MMC_DEBUG is not set | 972 | # CONFIG_MMC_DEBUG is not set |
| @@ -962,6 +978,7 @@ CONFIG_MMC=y | |||
| 962 | CONFIG_MMC_BLOCK=y | 978 | CONFIG_MMC_BLOCK=y |
| 963 | CONFIG_MMC_BLOCK_BOUNCE=y | 979 | CONFIG_MMC_BLOCK_BOUNCE=y |
| 964 | # CONFIG_SDIO_UART is not set | 980 | # CONFIG_SDIO_UART is not set |
| 981 | # CONFIG_MMC_TEST is not set | ||
| 965 | 982 | ||
| 966 | # | 983 | # |
| 967 | # MMC/SD Host Controller Drivers | 984 | # MMC/SD Host Controller Drivers |
| @@ -972,14 +989,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
| 972 | CONFIG_MMC_SPI=y | 989 | CONFIG_MMC_SPI=y |
| 973 | # CONFIG_MEMSTICK is not set | 990 | # CONFIG_MEMSTICK is not set |
| 974 | # CONFIG_NEW_LEDS is not set | 991 | # CONFIG_NEW_LEDS is not set |
| 992 | # CONFIG_ACCESSIBILITY is not set | ||
| 975 | # CONFIG_INFINIBAND is not set | 993 | # CONFIG_INFINIBAND is not set |
| 976 | # CONFIG_EDAC is not set | 994 | # CONFIG_EDAC is not set |
| 977 | # CONFIG_RTC_CLASS is not set | 995 | # CONFIG_RTC_CLASS is not set |
| 978 | # CONFIG_DMADEVICES is not set | 996 | # CONFIG_DMADEVICES is not set |
| 979 | |||
| 980 | # | ||
| 981 | # Userspace I/O | ||
| 982 | # | ||
| 983 | # CONFIG_UIO is not set | 997 | # CONFIG_UIO is not set |
| 984 | 998 | ||
| 985 | # | 999 | # |
| @@ -999,7 +1013,6 @@ CONFIG_FS_MBCACHE=y | |||
| 999 | # CONFIG_JFS_FS is not set | 1013 | # CONFIG_JFS_FS is not set |
| 1000 | # CONFIG_FS_POSIX_ACL is not set | 1014 | # CONFIG_FS_POSIX_ACL is not set |
| 1001 | # CONFIG_XFS_FS is not set | 1015 | # CONFIG_XFS_FS is not set |
| 1002 | # CONFIG_GFS2_FS is not set | ||
| 1003 | # CONFIG_OCFS2_FS is not set | 1016 | # CONFIG_OCFS2_FS is not set |
| 1004 | CONFIG_DNOTIFY=y | 1017 | CONFIG_DNOTIFY=y |
| 1005 | CONFIG_INOTIFY=y | 1018 | CONFIG_INOTIFY=y |
| @@ -1060,7 +1073,6 @@ CONFIG_NFS_FS=y | |||
| 1060 | CONFIG_NFS_V3=y | 1073 | CONFIG_NFS_V3=y |
| 1061 | # CONFIG_NFS_V3_ACL is not set | 1074 | # CONFIG_NFS_V3_ACL is not set |
| 1062 | CONFIG_NFS_V4=y | 1075 | CONFIG_NFS_V4=y |
| 1063 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1064 | # CONFIG_NFSD is not set | 1076 | # CONFIG_NFSD is not set |
| 1065 | CONFIG_ROOT_NFS=y | 1077 | CONFIG_ROOT_NFS=y |
| 1066 | CONFIG_LOCKD=y | 1078 | CONFIG_LOCKD=y |
| @@ -1147,6 +1159,7 @@ CONFIG_UCC=y | |||
| 1147 | # Library routines | 1159 | # Library routines |
| 1148 | # | 1160 | # |
| 1149 | CONFIG_BITREVERSE=y | 1161 | CONFIG_BITREVERSE=y |
| 1162 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1150 | # CONFIG_CRC_CCITT is not set | 1163 | # CONFIG_CRC_CCITT is not set |
| 1151 | # CONFIG_CRC16 is not set | 1164 | # CONFIG_CRC16 is not set |
| 1152 | CONFIG_CRC_ITU_T=y | 1165 | CONFIG_CRC_ITU_T=y |
| @@ -1157,6 +1170,7 @@ CONFIG_PLIST=y | |||
| 1157 | CONFIG_HAS_IOMEM=y | 1170 | CONFIG_HAS_IOMEM=y |
| 1158 | CONFIG_HAS_IOPORT=y | 1171 | CONFIG_HAS_IOPORT=y |
| 1159 | CONFIG_HAS_DMA=y | 1172 | CONFIG_HAS_DMA=y |
| 1173 | CONFIG_HAVE_LMB=y | ||
| 1160 | 1174 | ||
| 1161 | # | 1175 | # |
| 1162 | # Kernel hacking | 1176 | # Kernel hacking |
| @@ -1164,6 +1178,7 @@ CONFIG_HAS_DMA=y | |||
| 1164 | # CONFIG_PRINTK_TIME is not set | 1178 | # CONFIG_PRINTK_TIME is not set |
| 1165 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1179 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1166 | CONFIG_ENABLE_MUST_CHECK=y | 1180 | CONFIG_ENABLE_MUST_CHECK=y |
| 1181 | CONFIG_FRAME_WARN=1024 | ||
| 1167 | # CONFIG_MAGIC_SYSRQ is not set | 1182 | # CONFIG_MAGIC_SYSRQ is not set |
| 1168 | # CONFIG_UNUSED_SYMBOLS is not set | 1183 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1169 | # CONFIG_DEBUG_FS is not set | 1184 | # CONFIG_DEBUG_FS is not set |
| @@ -1173,6 +1188,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1173 | # CONFIG_SLUB_STATS is not set | 1188 | # CONFIG_SLUB_STATS is not set |
| 1174 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1189 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1175 | # CONFIG_SAMPLES is not set | 1190 | # CONFIG_SAMPLES is not set |
| 1191 | # CONFIG_IRQSTACKS is not set | ||
| 1176 | # CONFIG_PPC_EARLY_DEBUG is not set | 1192 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1177 | 1193 | ||
| 1178 | # | 1194 | # |
| @@ -1182,52 +1198,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1182 | # CONFIG_SECURITY is not set | 1198 | # CONFIG_SECURITY is not set |
| 1183 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1199 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1184 | CONFIG_CRYPTO=y | 1200 | CONFIG_CRYPTO=y |
| 1201 | |||
| 1202 | # | ||
| 1203 | # Crypto core or helper | ||
| 1204 | # | ||
| 1185 | CONFIG_CRYPTO_ALGAPI=y | 1205 | CONFIG_CRYPTO_ALGAPI=y |
| 1186 | CONFIG_CRYPTO_BLKCIPHER=y | 1206 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1187 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1188 | CONFIG_CRYPTO_MANAGER=y | 1207 | CONFIG_CRYPTO_MANAGER=y |
| 1208 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1209 | # CONFIG_CRYPTO_NULL is not set | ||
| 1210 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1211 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1212 | # CONFIG_CRYPTO_TEST is not set | ||
| 1213 | |||
| 1214 | # | ||
| 1215 | # Authenticated Encryption with Associated Data | ||
| 1216 | # | ||
| 1217 | # CONFIG_CRYPTO_CCM is not set | ||
| 1218 | # CONFIG_CRYPTO_GCM is not set | ||
| 1219 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1220 | |||
| 1221 | # | ||
| 1222 | # Block modes | ||
| 1223 | # | ||
| 1224 | CONFIG_CRYPTO_CBC=y | ||
| 1225 | # CONFIG_CRYPTO_CTR is not set | ||
| 1226 | # CONFIG_CRYPTO_CTS is not set | ||
| 1227 | CONFIG_CRYPTO_ECB=m | ||
| 1228 | # CONFIG_CRYPTO_LRW is not set | ||
| 1229 | CONFIG_CRYPTO_PCBC=m | ||
| 1230 | # CONFIG_CRYPTO_XTS is not set | ||
| 1231 | |||
| 1232 | # | ||
| 1233 | # Hash modes | ||
| 1234 | # | ||
| 1189 | # CONFIG_CRYPTO_HMAC is not set | 1235 | # CONFIG_CRYPTO_HMAC is not set |
| 1190 | # CONFIG_CRYPTO_XCBC is not set | 1236 | # CONFIG_CRYPTO_XCBC is not set |
| 1191 | # CONFIG_CRYPTO_NULL is not set | 1237 | |
| 1238 | # | ||
| 1239 | # Digest | ||
| 1240 | # | ||
| 1241 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1192 | # CONFIG_CRYPTO_MD4 is not set | 1242 | # CONFIG_CRYPTO_MD4 is not set |
| 1193 | CONFIG_CRYPTO_MD5=y | 1243 | CONFIG_CRYPTO_MD5=y |
| 1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1194 | # CONFIG_CRYPTO_SHA1 is not set | 1245 | # CONFIG_CRYPTO_SHA1 is not set |
| 1195 | # CONFIG_CRYPTO_SHA256 is not set | 1246 | # CONFIG_CRYPTO_SHA256 is not set |
| 1196 | # CONFIG_CRYPTO_SHA512 is not set | 1247 | # CONFIG_CRYPTO_SHA512 is not set |
| 1197 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1198 | # CONFIG_CRYPTO_TGR192 is not set | 1248 | # CONFIG_CRYPTO_TGR192 is not set |
| 1199 | # CONFIG_CRYPTO_GF128MUL is not set | 1249 | # CONFIG_CRYPTO_WP512 is not set |
| 1200 | CONFIG_CRYPTO_ECB=m | 1250 | |
| 1201 | CONFIG_CRYPTO_CBC=y | 1251 | # |
| 1202 | CONFIG_CRYPTO_PCBC=m | 1252 | # Ciphers |
| 1203 | # CONFIG_CRYPTO_LRW is not set | 1253 | # |
| 1204 | # CONFIG_CRYPTO_XTS is not set | ||
| 1205 | # CONFIG_CRYPTO_CTR is not set | ||
| 1206 | # CONFIG_CRYPTO_GCM is not set | ||
| 1207 | # CONFIG_CRYPTO_CCM is not set | ||
| 1208 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1209 | CONFIG_CRYPTO_DES=y | ||
| 1210 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1211 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1212 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1213 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1214 | # CONFIG_CRYPTO_AES is not set | 1254 | # CONFIG_CRYPTO_AES is not set |
| 1255 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1256 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1257 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1258 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1215 | # CONFIG_CRYPTO_CAST5 is not set | 1259 | # CONFIG_CRYPTO_CAST5 is not set |
| 1216 | # CONFIG_CRYPTO_CAST6 is not set | 1260 | # CONFIG_CRYPTO_CAST6 is not set |
| 1217 | # CONFIG_CRYPTO_TEA is not set | 1261 | CONFIG_CRYPTO_DES=y |
| 1218 | # CONFIG_CRYPTO_ARC4 is not set | 1262 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1219 | # CONFIG_CRYPTO_KHAZAD is not set | 1263 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1220 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1221 | # CONFIG_CRYPTO_SEED is not set | ||
| 1222 | # CONFIG_CRYPTO_SALSA20 is not set | 1264 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1265 | # CONFIG_CRYPTO_SEED is not set | ||
| 1266 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1267 | # CONFIG_CRYPTO_TEA is not set | ||
| 1268 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1269 | |||
| 1270 | # | ||
| 1271 | # Compression | ||
| 1272 | # | ||
| 1223 | # CONFIG_CRYPTO_DEFLATE is not set | 1273 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1224 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1225 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1226 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1227 | # CONFIG_CRYPTO_TEST is not set | ||
| 1228 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1229 | # CONFIG_CRYPTO_LZO is not set | 1274 | # CONFIG_CRYPTO_LZO is not set |
| 1230 | CONFIG_CRYPTO_HW=y | 1275 | CONFIG_CRYPTO_HW=y |
| 1231 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1276 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1232 | # CONFIG_PPC_CLOCK is not set | 1277 | # CONFIG_PPC_CLOCK is not set |
| 1233 | CONFIG_PPC_LIB_RHEAP=y | 1278 | CONFIG_PPC_LIB_RHEAP=y |
| 1279 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index e1de399a7bdd..b47fc9185708 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:17 2008 | 4 | # Mon Jun 9 08:52:25 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -432,6 +438,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 432 | # | 438 | # |
| 433 | # CONFIG_MTD_UBI is not set | 439 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
| 441 | CONFIG_OF_I2C=y | ||
| 435 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 436 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
| 437 | # CONFIG_BLK_DEV_FD is not set | 444 | # CONFIG_BLK_DEV_FD is not set |
| @@ -541,7 +548,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 541 | # CONFIG_SCSI_SRP is not set | 548 | # CONFIG_SCSI_SRP is not set |
| 542 | CONFIG_ATA=y | 549 | CONFIG_ATA=y |
| 543 | # CONFIG_ATA_NONSTANDARD is not set | 550 | # CONFIG_ATA_NONSTANDARD is not set |
| 551 | CONFIG_SATA_PMP=y | ||
| 544 | # CONFIG_SATA_AHCI is not set | 552 | # CONFIG_SATA_AHCI is not set |
| 553 | # CONFIG_SATA_SIL24 is not set | ||
| 554 | # CONFIG_SATA_FSL is not set | ||
| 555 | CONFIG_ATA_SFF=y | ||
| 545 | # CONFIG_SATA_SVW is not set | 556 | # CONFIG_SATA_SVW is not set |
| 546 | # CONFIG_ATA_PIIX is not set | 557 | # CONFIG_ATA_PIIX is not set |
| 547 | # CONFIG_SATA_MV is not set | 558 | # CONFIG_SATA_MV is not set |
| @@ -551,13 +562,11 @@ CONFIG_ATA=y | |||
| 551 | # CONFIG_SATA_PROMISE is not set | 562 | # CONFIG_SATA_PROMISE is not set |
| 552 | # CONFIG_SATA_SX4 is not set | 563 | # CONFIG_SATA_SX4 is not set |
| 553 | CONFIG_SATA_SIL=y | 564 | CONFIG_SATA_SIL=y |
| 554 | # CONFIG_SATA_SIL24 is not set | ||
| 555 | # CONFIG_SATA_SIS is not set | 565 | # CONFIG_SATA_SIS is not set |
| 556 | # CONFIG_SATA_ULI is not set | 566 | # CONFIG_SATA_ULI is not set |
| 557 | # CONFIG_SATA_VIA is not set | 567 | # CONFIG_SATA_VIA is not set |
| 558 | # CONFIG_SATA_VITESSE is not set | 568 | # CONFIG_SATA_VITESSE is not set |
| 559 | # CONFIG_SATA_INIC162X is not set | 569 | # CONFIG_SATA_INIC162X is not set |
| 560 | # CONFIG_SATA_FSL is not set | ||
| 561 | # CONFIG_PATA_ALI is not set | 570 | # CONFIG_PATA_ALI is not set |
| 562 | # CONFIG_PATA_AMD is not set | 571 | # CONFIG_PATA_AMD is not set |
| 563 | # CONFIG_PATA_ARTOP is not set | 572 | # CONFIG_PATA_ARTOP is not set |
| @@ -598,6 +607,7 @@ CONFIG_SATA_SIL=y | |||
| 598 | # CONFIG_PATA_WINBOND is not set | 607 | # CONFIG_PATA_WINBOND is not set |
| 599 | CONFIG_PATA_PLATFORM=y | 608 | CONFIG_PATA_PLATFORM=y |
| 600 | CONFIG_PATA_OF_PLATFORM=y | 609 | CONFIG_PATA_OF_PLATFORM=y |
| 610 | # CONFIG_PATA_SCH is not set | ||
| 601 | CONFIG_MD=y | 611 | CONFIG_MD=y |
| 602 | CONFIG_BLK_DEV_MD=y | 612 | CONFIG_BLK_DEV_MD=y |
| 603 | CONFIG_MD_LINEAR=y | 613 | CONFIG_MD_LINEAR=y |
| @@ -659,7 +669,6 @@ CONFIG_NETDEV_1000=y | |||
| 659 | # CONFIG_SIS190 is not set | 669 | # CONFIG_SIS190 is not set |
| 660 | # CONFIG_SKGE is not set | 670 | # CONFIG_SKGE is not set |
| 661 | # CONFIG_SKY2 is not set | 671 | # CONFIG_SKY2 is not set |
| 662 | # CONFIG_SK98LIN is not set | ||
| 663 | # CONFIG_VIA_VELOCITY is not set | 672 | # CONFIG_VIA_VELOCITY is not set |
| 664 | # CONFIG_TIGON3 is not set | 673 | # CONFIG_TIGON3 is not set |
| 665 | # CONFIG_BNX2 is not set | 674 | # CONFIG_BNX2 is not set |
| @@ -679,6 +688,7 @@ CONFIG_NETDEV_10000=y | |||
| 679 | # CONFIG_MLX4_CORE is not set | 688 | # CONFIG_MLX4_CORE is not set |
| 680 | # CONFIG_TEHUTI is not set | 689 | # CONFIG_TEHUTI is not set |
| 681 | # CONFIG_BNX2X is not set | 690 | # CONFIG_BNX2X is not set |
| 691 | # CONFIG_SFC is not set | ||
| 682 | # CONFIG_TR is not set | 692 | # CONFIG_TR is not set |
| 683 | 693 | ||
| 684 | # | 694 | # |
| @@ -686,6 +696,7 @@ CONFIG_NETDEV_10000=y | |||
| 686 | # | 696 | # |
| 687 | # CONFIG_WLAN_PRE80211 is not set | 697 | # CONFIG_WLAN_PRE80211 is not set |
| 688 | # CONFIG_WLAN_80211 is not set | 698 | # CONFIG_WLAN_80211 is not set |
| 699 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 689 | 700 | ||
| 690 | # | 701 | # |
| 691 | # USB Network Adapters | 702 | # USB Network Adapters |
| @@ -722,6 +733,7 @@ CONFIG_NETDEV_10000=y | |||
| 722 | # Character devices | 733 | # Character devices |
| 723 | # | 734 | # |
| 724 | # CONFIG_VT is not set | 735 | # CONFIG_VT is not set |
| 736 | CONFIG_DEVKMEM=y | ||
| 725 | # CONFIG_SERIAL_NONSTANDARD is not set | 737 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 726 | # CONFIG_NOZOMI is not set | 738 | # CONFIG_NOZOMI is not set |
| 727 | 739 | ||
| @@ -749,7 +761,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 749 | # CONFIG_IPMI_HANDLER is not set | 761 | # CONFIG_IPMI_HANDLER is not set |
| 750 | CONFIG_HW_RANDOM=y | 762 | CONFIG_HW_RANDOM=y |
| 751 | # CONFIG_NVRAM is not set | 763 | # CONFIG_NVRAM is not set |
| 752 | # CONFIG_GEN_RTC is not set | ||
| 753 | # CONFIG_R3964 is not set | 764 | # CONFIG_R3964 is not set |
| 754 | # CONFIG_APPLICOM is not set | 765 | # CONFIG_APPLICOM is not set |
| 755 | # CONFIG_RAW_DRIVER is not set | 766 | # CONFIG_RAW_DRIVER is not set |
| @@ -760,13 +771,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 760 | CONFIG_I2C_CHARDEV=y | 771 | CONFIG_I2C_CHARDEV=y |
| 761 | 772 | ||
| 762 | # | 773 | # |
| 763 | # I2C Algorithms | ||
| 764 | # | ||
| 765 | # CONFIG_I2C_ALGOBIT is not set | ||
| 766 | # CONFIG_I2C_ALGOPCF is not set | ||
| 767 | # CONFIG_I2C_ALGOPCA is not set | ||
| 768 | |||
| 769 | # | ||
| 770 | # I2C Hardware Bus support | 774 | # I2C Hardware Bus support |
| 771 | # | 775 | # |
| 772 | # CONFIG_I2C_ALI1535 is not set | 776 | # CONFIG_I2C_ALI1535 is not set |
| @@ -793,6 +797,7 @@ CONFIG_I2C_MPC=y | |||
| 793 | # CONFIG_I2C_VIA is not set | 797 | # CONFIG_I2C_VIA is not set |
| 794 | # CONFIG_I2C_VIAPRO is not set | 798 | # CONFIG_I2C_VIAPRO is not set |
| 795 | # CONFIG_I2C_VOODOO3 is not set | 799 | # CONFIG_I2C_VOODOO3 is not set |
| 800 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 796 | 801 | ||
| 797 | # | 802 | # |
| 798 | # Miscellaneous I2C Chip support | 803 | # Miscellaneous I2C Chip support |
| @@ -802,17 +807,12 @@ CONFIG_I2C_MPC=y | |||
| 802 | CONFIG_SENSORS_PCF8574=y | 807 | CONFIG_SENSORS_PCF8574=y |
| 803 | # CONFIG_PCF8575 is not set | 808 | # CONFIG_PCF8575 is not set |
| 804 | # CONFIG_SENSORS_PCF8591 is not set | 809 | # CONFIG_SENSORS_PCF8591 is not set |
| 805 | # CONFIG_TPS65010 is not set | ||
| 806 | # CONFIG_SENSORS_MAX6875 is not set | 810 | # CONFIG_SENSORS_MAX6875 is not set |
| 807 | # CONFIG_SENSORS_TSL2550 is not set | 811 | # CONFIG_SENSORS_TSL2550 is not set |
| 808 | # CONFIG_I2C_DEBUG_CORE is not set | 812 | # CONFIG_I2C_DEBUG_CORE is not set |
| 809 | # CONFIG_I2C_DEBUG_ALGO is not set | 813 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 810 | # CONFIG_I2C_DEBUG_BUS is not set | 814 | # CONFIG_I2C_DEBUG_BUS is not set |
| 811 | # CONFIG_I2C_DEBUG_CHIP is not set | 815 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 812 | |||
| 813 | # | ||
| 814 | # SPI support | ||
| 815 | # | ||
| 816 | CONFIG_SPI=y | 816 | CONFIG_SPI=y |
| 817 | CONFIG_SPI_MASTER=y | 817 | CONFIG_SPI_MASTER=y |
| 818 | 818 | ||
| @@ -862,12 +862,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 862 | # Multifunction device drivers | 862 | # Multifunction device drivers |
| 863 | # | 863 | # |
| 864 | # CONFIG_MFD_SM501 is not set | 864 | # CONFIG_MFD_SM501 is not set |
| 865 | # CONFIG_HTC_PASIC3 is not set | ||
| 865 | 866 | ||
| 866 | # | 867 | # |
| 867 | # Multimedia devices | 868 | # Multimedia devices |
| 868 | # | 869 | # |
| 870 | |||
| 871 | # | ||
| 872 | # Multimedia core support | ||
| 873 | # | ||
| 869 | # CONFIG_VIDEO_DEV is not set | 874 | # CONFIG_VIDEO_DEV is not set |
| 870 | # CONFIG_DVB_CORE is not set | 875 | # CONFIG_DVB_CORE is not set |
| 876 | # CONFIG_VIDEO_MEDIA is not set | ||
| 877 | |||
| 878 | # | ||
| 879 | # Multimedia drivers | ||
| 880 | # | ||
| 871 | CONFIG_DAB=y | 881 | CONFIG_DAB=y |
| 872 | # CONFIG_USB_DABUSB is not set | 882 | # CONFIG_USB_DABUSB is not set |
| 873 | 883 | ||
| @@ -905,16 +915,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 905 | CONFIG_USB_DEVICE_CLASS=y | 915 | CONFIG_USB_DEVICE_CLASS=y |
| 906 | # CONFIG_USB_DYNAMIC_MINORS is not set | 916 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 907 | # CONFIG_USB_OTG is not set | 917 | # CONFIG_USB_OTG is not set |
| 918 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 908 | 920 | ||
| 909 | # | 921 | # |
| 910 | # USB Host Controller Drivers | 922 | # USB Host Controller Drivers |
| 911 | # | 923 | # |
| 924 | # CONFIG_USB_C67X00_HCD is not set | ||
| 912 | CONFIG_USB_EHCI_HCD=y | 925 | CONFIG_USB_EHCI_HCD=y |
| 913 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 926 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 914 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 927 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 915 | CONFIG_USB_EHCI_FSL=y | 928 | CONFIG_USB_EHCI_FSL=y |
| 916 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 929 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 917 | # CONFIG_USB_ISP116X_HCD is not set | 930 | # CONFIG_USB_ISP116X_HCD is not set |
| 931 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 918 | # CONFIG_USB_OHCI_HCD is not set | 932 | # CONFIG_USB_OHCI_HCD is not set |
| 919 | CONFIG_USB_UHCI_HCD=y | 933 | CONFIG_USB_UHCI_HCD=y |
| 920 | # CONFIG_USB_SL811_HCD is not set | 934 | # CONFIG_USB_SL811_HCD is not set |
| @@ -925,6 +939,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 925 | # | 939 | # |
| 926 | # CONFIG_USB_ACM is not set | 940 | # CONFIG_USB_ACM is not set |
| 927 | # CONFIG_USB_PRINTER is not set | 941 | # CONFIG_USB_PRINTER is not set |
| 942 | # CONFIG_USB_WDM is not set | ||
| 928 | 943 | ||
| 929 | # | 944 | # |
| 930 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 945 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -945,6 +960,7 @@ CONFIG_USB_STORAGE=y | |||
| 945 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 960 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 946 | # CONFIG_USB_STORAGE_ALAUDA is not set | 961 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 947 | # CONFIG_USB_STORAGE_KARMA is not set | 962 | # CONFIG_USB_STORAGE_KARMA is not set |
| 963 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 948 | # CONFIG_USB_LIBUSUAL is not set | 964 | # CONFIG_USB_LIBUSUAL is not set |
| 949 | 965 | ||
| 950 | # | 966 | # |
| @@ -982,10 +998,12 @@ CONFIG_USB_MON=y | |||
| 982 | # CONFIG_USB_TRANCEVIBRATOR is not set | 998 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 983 | # CONFIG_USB_IOWARRIOR is not set | 999 | # CONFIG_USB_IOWARRIOR is not set |
| 984 | # CONFIG_USB_TEST is not set | 1000 | # CONFIG_USB_TEST is not set |
| 1001 | # CONFIG_USB_ISIGHTFW is not set | ||
| 985 | # CONFIG_USB_GADGET is not set | 1002 | # CONFIG_USB_GADGET is not set |
| 986 | # CONFIG_MMC is not set | 1003 | # CONFIG_MMC is not set |
| 987 | # CONFIG_MEMSTICK is not set | 1004 | # CONFIG_MEMSTICK is not set |
| 988 | # CONFIG_NEW_LEDS is not set | 1005 | # CONFIG_NEW_LEDS is not set |
| 1006 | # CONFIG_ACCESSIBILITY is not set | ||
| 989 | # CONFIG_INFINIBAND is not set | 1007 | # CONFIG_INFINIBAND is not set |
| 990 | # CONFIG_EDAC is not set | 1008 | # CONFIG_EDAC is not set |
| 991 | CONFIG_RTC_LIB=y | 1009 | CONFIG_RTC_LIB=y |
| @@ -1040,11 +1058,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1040 | # | 1058 | # |
| 1041 | # on-CPU RTC drivers | 1059 | # on-CPU RTC drivers |
| 1042 | # | 1060 | # |
| 1061 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1043 | # CONFIG_DMADEVICES is not set | 1062 | # CONFIG_DMADEVICES is not set |
| 1044 | |||
| 1045 | # | ||
| 1046 | # Userspace I/O | ||
| 1047 | # | ||
| 1048 | # CONFIG_UIO is not set | 1063 | # CONFIG_UIO is not set |
| 1049 | 1064 | ||
| 1050 | # | 1065 | # |
| @@ -1064,7 +1079,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1064 | # CONFIG_JFS_FS is not set | 1079 | # CONFIG_JFS_FS is not set |
| 1065 | # CONFIG_FS_POSIX_ACL is not set | 1080 | # CONFIG_FS_POSIX_ACL is not set |
| 1066 | # CONFIG_XFS_FS is not set | 1081 | # CONFIG_XFS_FS is not set |
| 1067 | # CONFIG_GFS2_FS is not set | ||
| 1068 | # CONFIG_OCFS2_FS is not set | 1082 | # CONFIG_OCFS2_FS is not set |
| 1069 | CONFIG_DNOTIFY=y | 1083 | CONFIG_DNOTIFY=y |
| 1070 | CONFIG_INOTIFY=y | 1084 | CONFIG_INOTIFY=y |
| @@ -1126,7 +1140,6 @@ CONFIG_NFS_FS=y | |||
| 1126 | CONFIG_NFS_V3=y | 1140 | CONFIG_NFS_V3=y |
| 1127 | # CONFIG_NFS_V3_ACL is not set | 1141 | # CONFIG_NFS_V3_ACL is not set |
| 1128 | CONFIG_NFS_V4=y | 1142 | CONFIG_NFS_V4=y |
| 1129 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1130 | # CONFIG_NFSD is not set | 1143 | # CONFIG_NFSD is not set |
| 1131 | CONFIG_ROOT_NFS=y | 1144 | CONFIG_ROOT_NFS=y |
| 1132 | CONFIG_LOCKD=y | 1145 | CONFIG_LOCKD=y |
| @@ -1210,6 +1223,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1210 | # Library routines | 1223 | # Library routines |
| 1211 | # | 1224 | # |
| 1212 | CONFIG_BITREVERSE=y | 1225 | CONFIG_BITREVERSE=y |
| 1226 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1213 | # CONFIG_CRC_CCITT is not set | 1227 | # CONFIG_CRC_CCITT is not set |
| 1214 | # CONFIG_CRC16 is not set | 1228 | # CONFIG_CRC16 is not set |
| 1215 | # CONFIG_CRC_ITU_T is not set | 1229 | # CONFIG_CRC_ITU_T is not set |
| @@ -1220,6 +1234,7 @@ CONFIG_PLIST=y | |||
| 1220 | CONFIG_HAS_IOMEM=y | 1234 | CONFIG_HAS_IOMEM=y |
| 1221 | CONFIG_HAS_IOPORT=y | 1235 | CONFIG_HAS_IOPORT=y |
| 1222 | CONFIG_HAS_DMA=y | 1236 | CONFIG_HAS_DMA=y |
| 1237 | CONFIG_HAVE_LMB=y | ||
| 1223 | 1238 | ||
| 1224 | # | 1239 | # |
| 1225 | # Kernel hacking | 1240 | # Kernel hacking |
| @@ -1227,6 +1242,7 @@ CONFIG_HAS_DMA=y | |||
| 1227 | # CONFIG_PRINTK_TIME is not set | 1242 | # CONFIG_PRINTK_TIME is not set |
| 1228 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1243 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1229 | CONFIG_ENABLE_MUST_CHECK=y | 1244 | CONFIG_ENABLE_MUST_CHECK=y |
| 1245 | CONFIG_FRAME_WARN=1024 | ||
| 1230 | # CONFIG_MAGIC_SYSRQ is not set | 1246 | # CONFIG_MAGIC_SYSRQ is not set |
| 1231 | # CONFIG_UNUSED_SYMBOLS is not set | 1247 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1232 | # CONFIG_DEBUG_FS is not set | 1248 | # CONFIG_DEBUG_FS is not set |
| @@ -1236,6 +1252,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1236 | # CONFIG_SLUB_STATS is not set | 1252 | # CONFIG_SLUB_STATS is not set |
| 1237 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1253 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1238 | # CONFIG_SAMPLES is not set | 1254 | # CONFIG_SAMPLES is not set |
| 1255 | # CONFIG_IRQSTACKS is not set | ||
| 1239 | # CONFIG_PPC_EARLY_DEBUG is not set | 1256 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1240 | 1257 | ||
| 1241 | # | 1258 | # |
| @@ -1245,51 +1262,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1245 | # CONFIG_SECURITY is not set | 1262 | # CONFIG_SECURITY is not set |
| 1246 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1263 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1247 | CONFIG_CRYPTO=y | 1264 | CONFIG_CRYPTO=y |
| 1265 | |||
| 1266 | # | ||
| 1267 | # Crypto core or helper | ||
| 1268 | # | ||
| 1248 | CONFIG_CRYPTO_ALGAPI=y | 1269 | CONFIG_CRYPTO_ALGAPI=y |
| 1249 | CONFIG_CRYPTO_BLKCIPHER=y | 1270 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1250 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1251 | CONFIG_CRYPTO_MANAGER=y | 1271 | CONFIG_CRYPTO_MANAGER=y |
| 1272 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1273 | # CONFIG_CRYPTO_NULL is not set | ||
| 1274 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1275 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1276 | # CONFIG_CRYPTO_TEST is not set | ||
| 1277 | |||
| 1278 | # | ||
| 1279 | # Authenticated Encryption with Associated Data | ||
| 1280 | # | ||
| 1281 | # CONFIG_CRYPTO_CCM is not set | ||
| 1282 | # CONFIG_CRYPTO_GCM is not set | ||
| 1283 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1284 | |||
| 1285 | # | ||
| 1286 | # Block modes | ||
| 1287 | # | ||
| 1288 | CONFIG_CRYPTO_CBC=y | ||
| 1289 | # CONFIG_CRYPTO_CTR is not set | ||
| 1290 | # CONFIG_CRYPTO_CTS is not set | ||
| 1291 | # CONFIG_CRYPTO_ECB is not set | ||
| 1292 | # CONFIG_CRYPTO_LRW is not set | ||
| 1293 | CONFIG_CRYPTO_PCBC=m | ||
| 1294 | # CONFIG_CRYPTO_XTS is not set | ||
| 1295 | |||
| 1296 | # | ||
| 1297 | # Hash modes | ||
| 1298 | # | ||
| 1252 | # CONFIG_CRYPTO_HMAC is not set | 1299 | # CONFIG_CRYPTO_HMAC is not set |
| 1253 | # CONFIG_CRYPTO_XCBC is not set | 1300 | # CONFIG_CRYPTO_XCBC is not set |
| 1254 | # CONFIG_CRYPTO_NULL is not set | 1301 | |
| 1302 | # | ||
| 1303 | # Digest | ||
| 1304 | # | ||
| 1305 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1255 | # CONFIG_CRYPTO_MD4 is not set | 1306 | # CONFIG_CRYPTO_MD4 is not set |
| 1256 | CONFIG_CRYPTO_MD5=y | 1307 | CONFIG_CRYPTO_MD5=y |
| 1308 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1257 | # CONFIG_CRYPTO_SHA1 is not set | 1309 | # CONFIG_CRYPTO_SHA1 is not set |
| 1258 | # CONFIG_CRYPTO_SHA256 is not set | 1310 | # CONFIG_CRYPTO_SHA256 is not set |
| 1259 | # CONFIG_CRYPTO_SHA512 is not set | 1311 | # CONFIG_CRYPTO_SHA512 is not set |
| 1260 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1261 | # CONFIG_CRYPTO_TGR192 is not set | 1312 | # CONFIG_CRYPTO_TGR192 is not set |
| 1262 | # CONFIG_CRYPTO_GF128MUL is not set | 1313 | # CONFIG_CRYPTO_WP512 is not set |
| 1263 | # CONFIG_CRYPTO_ECB is not set | 1314 | |
| 1264 | CONFIG_CRYPTO_CBC=y | 1315 | # |
| 1265 | CONFIG_CRYPTO_PCBC=m | 1316 | # Ciphers |
| 1266 | # CONFIG_CRYPTO_LRW is not set | 1317 | # |
| 1267 | # CONFIG_CRYPTO_XTS is not set | ||
| 1268 | # CONFIG_CRYPTO_CTR is not set | ||
| 1269 | # CONFIG_CRYPTO_GCM is not set | ||
| 1270 | # CONFIG_CRYPTO_CCM is not set | ||
| 1271 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1272 | CONFIG_CRYPTO_DES=y | ||
| 1273 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1274 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1275 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1276 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1277 | # CONFIG_CRYPTO_AES is not set | 1318 | # CONFIG_CRYPTO_AES is not set |
| 1319 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1320 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1321 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1322 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1278 | # CONFIG_CRYPTO_CAST5 is not set | 1323 | # CONFIG_CRYPTO_CAST5 is not set |
| 1279 | # CONFIG_CRYPTO_CAST6 is not set | 1324 | # CONFIG_CRYPTO_CAST6 is not set |
| 1280 | # CONFIG_CRYPTO_TEA is not set | 1325 | CONFIG_CRYPTO_DES=y |
| 1281 | # CONFIG_CRYPTO_ARC4 is not set | 1326 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1282 | # CONFIG_CRYPTO_KHAZAD is not set | 1327 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1283 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1284 | # CONFIG_CRYPTO_SEED is not set | ||
| 1285 | # CONFIG_CRYPTO_SALSA20 is not set | 1328 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1329 | # CONFIG_CRYPTO_SEED is not set | ||
| 1330 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1331 | # CONFIG_CRYPTO_TEA is not set | ||
| 1332 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1333 | |||
| 1334 | # | ||
| 1335 | # Compression | ||
| 1336 | # | ||
| 1286 | # CONFIG_CRYPTO_DEFLATE is not set | 1337 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1287 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1288 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1289 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1290 | # CONFIG_CRYPTO_TEST is not set | ||
| 1291 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1292 | # CONFIG_CRYPTO_LZO is not set | 1338 | # CONFIG_CRYPTO_LZO is not set |
| 1293 | CONFIG_CRYPTO_HW=y | 1339 | CONFIG_CRYPTO_HW=y |
| 1294 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1295 | # CONFIG_PPC_CLOCK is not set | 1341 | # CONFIG_PPC_CLOCK is not set |
| 1342 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index b4e39cf82a8c..fdac4845bad9 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:18 2008 | 4 | # Mon Jun 9 08:52:26 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -432,6 +438,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 432 | # | 438 | # |
| 433 | # CONFIG_MTD_UBI is not set | 439 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
| 441 | CONFIG_OF_I2C=y | ||
| 435 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 436 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
| 437 | # CONFIG_BLK_DEV_FD is not set | 444 | # CONFIG_BLK_DEV_FD is not set |
| @@ -587,7 +594,6 @@ CONFIG_NETDEV_1000=y | |||
| 587 | # CONFIG_SIS190 is not set | 594 | # CONFIG_SIS190 is not set |
| 588 | # CONFIG_SKGE is not set | 595 | # CONFIG_SKGE is not set |
| 589 | # CONFIG_SKY2 is not set | 596 | # CONFIG_SKY2 is not set |
| 590 | # CONFIG_SK98LIN is not set | ||
| 591 | # CONFIG_VIA_VELOCITY is not set | 597 | # CONFIG_VIA_VELOCITY is not set |
| 592 | # CONFIG_TIGON3 is not set | 598 | # CONFIG_TIGON3 is not set |
| 593 | # CONFIG_BNX2 is not set | 599 | # CONFIG_BNX2 is not set |
| @@ -607,6 +613,7 @@ CONFIG_NETDEV_10000=y | |||
| 607 | # CONFIG_MLX4_CORE is not set | 613 | # CONFIG_MLX4_CORE is not set |
| 608 | # CONFIG_TEHUTI is not set | 614 | # CONFIG_TEHUTI is not set |
| 609 | # CONFIG_BNX2X is not set | 615 | # CONFIG_BNX2X is not set |
| 616 | # CONFIG_SFC is not set | ||
| 610 | # CONFIG_TR is not set | 617 | # CONFIG_TR is not set |
| 611 | 618 | ||
| 612 | # | 619 | # |
| @@ -614,6 +621,7 @@ CONFIG_NETDEV_10000=y | |||
| 614 | # | 621 | # |
| 615 | # CONFIG_WLAN_PRE80211 is not set | 622 | # CONFIG_WLAN_PRE80211 is not set |
| 616 | # CONFIG_WLAN_80211 is not set | 623 | # CONFIG_WLAN_80211 is not set |
| 624 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 617 | 625 | ||
| 618 | # | 626 | # |
| 619 | # USB Network Adapters | 627 | # USB Network Adapters |
| @@ -650,6 +658,7 @@ CONFIG_NETDEV_10000=y | |||
| 650 | # Character devices | 658 | # Character devices |
| 651 | # | 659 | # |
| 652 | # CONFIG_VT is not set | 660 | # CONFIG_VT is not set |
| 661 | CONFIG_DEVKMEM=y | ||
| 653 | # CONFIG_SERIAL_NONSTANDARD is not set | 662 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 654 | # CONFIG_NOZOMI is not set | 663 | # CONFIG_NOZOMI is not set |
| 655 | 664 | ||
| @@ -677,7 +686,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 677 | # CONFIG_IPMI_HANDLER is not set | 686 | # CONFIG_IPMI_HANDLER is not set |
| 678 | CONFIG_HW_RANDOM=y | 687 | CONFIG_HW_RANDOM=y |
| 679 | # CONFIG_NVRAM is not set | 688 | # CONFIG_NVRAM is not set |
| 680 | # CONFIG_GEN_RTC is not set | ||
| 681 | # CONFIG_R3964 is not set | 689 | # CONFIG_R3964 is not set |
| 682 | # CONFIG_APPLICOM is not set | 690 | # CONFIG_APPLICOM is not set |
| 683 | # CONFIG_RAW_DRIVER is not set | 691 | # CONFIG_RAW_DRIVER is not set |
| @@ -688,13 +696,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 688 | CONFIG_I2C_CHARDEV=y | 696 | CONFIG_I2C_CHARDEV=y |
| 689 | 697 | ||
| 690 | # | 698 | # |
| 691 | # I2C Algorithms | ||
| 692 | # | ||
| 693 | # CONFIG_I2C_ALGOBIT is not set | ||
| 694 | # CONFIG_I2C_ALGOPCF is not set | ||
| 695 | # CONFIG_I2C_ALGOPCA is not set | ||
| 696 | |||
| 697 | # | ||
| 698 | # I2C Hardware Bus support | 699 | # I2C Hardware Bus support |
| 699 | # | 700 | # |
| 700 | # CONFIG_I2C_ALI1535 is not set | 701 | # CONFIG_I2C_ALI1535 is not set |
| @@ -721,6 +722,7 @@ CONFIG_I2C_MPC=y | |||
| 721 | # CONFIG_I2C_VIA is not set | 722 | # CONFIG_I2C_VIA is not set |
| 722 | # CONFIG_I2C_VIAPRO is not set | 723 | # CONFIG_I2C_VIAPRO is not set |
| 723 | # CONFIG_I2C_VOODOO3 is not set | 724 | # CONFIG_I2C_VOODOO3 is not set |
| 725 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 724 | 726 | ||
| 725 | # | 727 | # |
| 726 | # Miscellaneous I2C Chip support | 728 | # Miscellaneous I2C Chip support |
| @@ -730,17 +732,12 @@ CONFIG_I2C_MPC=y | |||
| 730 | CONFIG_SENSORS_PCF8574=y | 732 | CONFIG_SENSORS_PCF8574=y |
| 731 | # CONFIG_PCF8575 is not set | 733 | # CONFIG_PCF8575 is not set |
| 732 | # CONFIG_SENSORS_PCF8591 is not set | 734 | # CONFIG_SENSORS_PCF8591 is not set |
| 733 | # CONFIG_TPS65010 is not set | ||
| 734 | # CONFIG_SENSORS_MAX6875 is not set | 735 | # CONFIG_SENSORS_MAX6875 is not set |
| 735 | # CONFIG_SENSORS_TSL2550 is not set | 736 | # CONFIG_SENSORS_TSL2550 is not set |
| 736 | # CONFIG_I2C_DEBUG_CORE is not set | 737 | # CONFIG_I2C_DEBUG_CORE is not set |
| 737 | # CONFIG_I2C_DEBUG_ALGO is not set | 738 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 738 | # CONFIG_I2C_DEBUG_BUS is not set | 739 | # CONFIG_I2C_DEBUG_BUS is not set |
| 739 | # CONFIG_I2C_DEBUG_CHIP is not set | 740 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 740 | |||
| 741 | # | ||
| 742 | # SPI support | ||
| 743 | # | ||
| 744 | CONFIG_SPI=y | 741 | CONFIG_SPI=y |
| 745 | CONFIG_SPI_MASTER=y | 742 | CONFIG_SPI_MASTER=y |
| 746 | 743 | ||
| @@ -790,12 +787,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 790 | # Multifunction device drivers | 787 | # Multifunction device drivers |
| 791 | # | 788 | # |
| 792 | # CONFIG_MFD_SM501 is not set | 789 | # CONFIG_MFD_SM501 is not set |
| 790 | # CONFIG_HTC_PASIC3 is not set | ||
| 793 | 791 | ||
| 794 | # | 792 | # |
| 795 | # Multimedia devices | 793 | # Multimedia devices |
| 796 | # | 794 | # |
| 795 | |||
| 796 | # | ||
| 797 | # Multimedia core support | ||
| 798 | # | ||
| 797 | # CONFIG_VIDEO_DEV is not set | 799 | # CONFIG_VIDEO_DEV is not set |
| 798 | # CONFIG_DVB_CORE is not set | 800 | # CONFIG_DVB_CORE is not set |
| 801 | # CONFIG_VIDEO_MEDIA is not set | ||
| 802 | |||
| 803 | # | ||
| 804 | # Multimedia drivers | ||
| 805 | # | ||
| 799 | CONFIG_DAB=y | 806 | CONFIG_DAB=y |
| 800 | # CONFIG_USB_DABUSB is not set | 807 | # CONFIG_USB_DABUSB is not set |
| 801 | 808 | ||
| @@ -833,16 +840,20 @@ CONFIG_USB=y | |||
| 833 | CONFIG_USB_DEVICE_CLASS=y | 840 | CONFIG_USB_DEVICE_CLASS=y |
| 834 | # CONFIG_USB_DYNAMIC_MINORS is not set | 841 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 835 | # CONFIG_USB_OTG is not set | 842 | # CONFIG_USB_OTG is not set |
| 843 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 844 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 836 | 845 | ||
| 837 | # | 846 | # |
| 838 | # USB Host Controller Drivers | 847 | # USB Host Controller Drivers |
| 839 | # | 848 | # |
| 849 | # CONFIG_USB_C67X00_HCD is not set | ||
| 840 | CONFIG_USB_EHCI_HCD=y | 850 | CONFIG_USB_EHCI_HCD=y |
| 841 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 851 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 842 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 852 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 843 | CONFIG_USB_EHCI_FSL=y | 853 | CONFIG_USB_EHCI_FSL=y |
| 844 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 854 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 845 | # CONFIG_USB_ISP116X_HCD is not set | 855 | # CONFIG_USB_ISP116X_HCD is not set |
| 856 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 846 | # CONFIG_USB_OHCI_HCD is not set | 857 | # CONFIG_USB_OHCI_HCD is not set |
| 847 | CONFIG_USB_UHCI_HCD=y | 858 | CONFIG_USB_UHCI_HCD=y |
| 848 | # CONFIG_USB_SL811_HCD is not set | 859 | # CONFIG_USB_SL811_HCD is not set |
| @@ -853,6 +864,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 853 | # | 864 | # |
| 854 | # CONFIG_USB_ACM is not set | 865 | # CONFIG_USB_ACM is not set |
| 855 | # CONFIG_USB_PRINTER is not set | 866 | # CONFIG_USB_PRINTER is not set |
| 867 | # CONFIG_USB_WDM is not set | ||
| 856 | 868 | ||
| 857 | # | 869 | # |
| 858 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 870 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -873,6 +885,7 @@ CONFIG_USB_STORAGE=y | |||
| 873 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 874 | # CONFIG_USB_STORAGE_ALAUDA is not set | 886 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 875 | # CONFIG_USB_STORAGE_KARMA is not set | 887 | # CONFIG_USB_STORAGE_KARMA is not set |
| 888 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 876 | # CONFIG_USB_LIBUSUAL is not set | 889 | # CONFIG_USB_LIBUSUAL is not set |
| 877 | 890 | ||
| 878 | # | 891 | # |
| @@ -909,10 +922,12 @@ CONFIG_USB_MON=y | |||
| 909 | # CONFIG_USB_LD is not set | 922 | # CONFIG_USB_LD is not set |
| 910 | # CONFIG_USB_TRANCEVIBRATOR is not set | 923 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 911 | # CONFIG_USB_IOWARRIOR is not set | 924 | # CONFIG_USB_IOWARRIOR is not set |
| 925 | # CONFIG_USB_ISIGHTFW is not set | ||
| 912 | # CONFIG_USB_GADGET is not set | 926 | # CONFIG_USB_GADGET is not set |
| 913 | # CONFIG_MMC is not set | 927 | # CONFIG_MMC is not set |
| 914 | # CONFIG_MEMSTICK is not set | 928 | # CONFIG_MEMSTICK is not set |
| 915 | # CONFIG_NEW_LEDS is not set | 929 | # CONFIG_NEW_LEDS is not set |
| 930 | # CONFIG_ACCESSIBILITY is not set | ||
| 916 | # CONFIG_INFINIBAND is not set | 931 | # CONFIG_INFINIBAND is not set |
| 917 | # CONFIG_EDAC is not set | 932 | # CONFIG_EDAC is not set |
| 918 | CONFIG_RTC_LIB=y | 933 | CONFIG_RTC_LIB=y |
| @@ -967,11 +982,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 967 | # | 982 | # |
| 968 | # on-CPU RTC drivers | 983 | # on-CPU RTC drivers |
| 969 | # | 984 | # |
| 985 | # CONFIG_RTC_DRV_PPC is not set | ||
| 970 | # CONFIG_DMADEVICES is not set | 986 | # CONFIG_DMADEVICES is not set |
| 971 | |||
| 972 | # | ||
| 973 | # Userspace I/O | ||
| 974 | # | ||
| 975 | # CONFIG_UIO is not set | 987 | # CONFIG_UIO is not set |
| 976 | 988 | ||
| 977 | # | 989 | # |
| @@ -991,7 +1003,6 @@ CONFIG_FS_MBCACHE=y | |||
| 991 | # CONFIG_JFS_FS is not set | 1003 | # CONFIG_JFS_FS is not set |
| 992 | # CONFIG_FS_POSIX_ACL is not set | 1004 | # CONFIG_FS_POSIX_ACL is not set |
| 993 | # CONFIG_XFS_FS is not set | 1005 | # CONFIG_XFS_FS is not set |
| 994 | # CONFIG_GFS2_FS is not set | ||
| 995 | # CONFIG_OCFS2_FS is not set | 1006 | # CONFIG_OCFS2_FS is not set |
| 996 | CONFIG_DNOTIFY=y | 1007 | CONFIG_DNOTIFY=y |
| 997 | CONFIG_INOTIFY=y | 1008 | CONFIG_INOTIFY=y |
| @@ -1053,7 +1064,6 @@ CONFIG_NFS_FS=y | |||
| 1053 | CONFIG_NFS_V3=y | 1064 | CONFIG_NFS_V3=y |
| 1054 | # CONFIG_NFS_V3_ACL is not set | 1065 | # CONFIG_NFS_V3_ACL is not set |
| 1055 | CONFIG_NFS_V4=y | 1066 | CONFIG_NFS_V4=y |
| 1056 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1057 | # CONFIG_NFSD is not set | 1067 | # CONFIG_NFSD is not set |
| 1058 | CONFIG_ROOT_NFS=y | 1068 | CONFIG_ROOT_NFS=y |
| 1059 | CONFIG_LOCKD=y | 1069 | CONFIG_LOCKD=y |
| @@ -1137,6 +1147,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1137 | # Library routines | 1147 | # Library routines |
| 1138 | # | 1148 | # |
| 1139 | CONFIG_BITREVERSE=y | 1149 | CONFIG_BITREVERSE=y |
| 1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1140 | # CONFIG_CRC_CCITT is not set | 1151 | # CONFIG_CRC_CCITT is not set |
| 1141 | # CONFIG_CRC16 is not set | 1152 | # CONFIG_CRC16 is not set |
| 1142 | # CONFIG_CRC_ITU_T is not set | 1153 | # CONFIG_CRC_ITU_T is not set |
| @@ -1147,6 +1158,7 @@ CONFIG_PLIST=y | |||
| 1147 | CONFIG_HAS_IOMEM=y | 1158 | CONFIG_HAS_IOMEM=y |
| 1148 | CONFIG_HAS_IOPORT=y | 1159 | CONFIG_HAS_IOPORT=y |
| 1149 | CONFIG_HAS_DMA=y | 1160 | CONFIG_HAS_DMA=y |
| 1161 | CONFIG_HAVE_LMB=y | ||
| 1150 | 1162 | ||
| 1151 | # | 1163 | # |
| 1152 | # Kernel hacking | 1164 | # Kernel hacking |
| @@ -1154,6 +1166,7 @@ CONFIG_HAS_DMA=y | |||
| 1154 | # CONFIG_PRINTK_TIME is not set | 1166 | # CONFIG_PRINTK_TIME is not set |
| 1155 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1167 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1156 | CONFIG_ENABLE_MUST_CHECK=y | 1168 | CONFIG_ENABLE_MUST_CHECK=y |
| 1169 | CONFIG_FRAME_WARN=1024 | ||
| 1157 | # CONFIG_MAGIC_SYSRQ is not set | 1170 | # CONFIG_MAGIC_SYSRQ is not set |
| 1158 | # CONFIG_UNUSED_SYMBOLS is not set | 1171 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1159 | # CONFIG_DEBUG_FS is not set | 1172 | # CONFIG_DEBUG_FS is not set |
| @@ -1163,6 +1176,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1163 | # CONFIG_SLUB_STATS is not set | 1176 | # CONFIG_SLUB_STATS is not set |
| 1164 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1177 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1165 | # CONFIG_SAMPLES is not set | 1178 | # CONFIG_SAMPLES is not set |
| 1179 | # CONFIG_IRQSTACKS is not set | ||
| 1166 | # CONFIG_PPC_EARLY_DEBUG is not set | 1180 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1167 | 1181 | ||
| 1168 | # | 1182 | # |
| @@ -1172,51 +1186,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1172 | # CONFIG_SECURITY is not set | 1186 | # CONFIG_SECURITY is not set |
| 1173 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1187 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1174 | CONFIG_CRYPTO=y | 1188 | CONFIG_CRYPTO=y |
| 1189 | |||
| 1190 | # | ||
| 1191 | # Crypto core or helper | ||
| 1192 | # | ||
| 1175 | CONFIG_CRYPTO_ALGAPI=y | 1193 | CONFIG_CRYPTO_ALGAPI=y |
| 1176 | CONFIG_CRYPTO_BLKCIPHER=y | 1194 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1177 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1178 | CONFIG_CRYPTO_MANAGER=y | 1195 | CONFIG_CRYPTO_MANAGER=y |
| 1196 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1197 | # CONFIG_CRYPTO_NULL is not set | ||
| 1198 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1199 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1200 | # CONFIG_CRYPTO_TEST is not set | ||
| 1201 | |||
| 1202 | # | ||
| 1203 | # Authenticated Encryption with Associated Data | ||
| 1204 | # | ||
| 1205 | # CONFIG_CRYPTO_CCM is not set | ||
| 1206 | # CONFIG_CRYPTO_GCM is not set | ||
| 1207 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1208 | |||
| 1209 | # | ||
| 1210 | # Block modes | ||
| 1211 | # | ||
| 1212 | CONFIG_CRYPTO_CBC=y | ||
| 1213 | # CONFIG_CRYPTO_CTR is not set | ||
| 1214 | # CONFIG_CRYPTO_CTS is not set | ||
| 1215 | # CONFIG_CRYPTO_ECB is not set | ||
| 1216 | # CONFIG_CRYPTO_LRW is not set | ||
| 1217 | CONFIG_CRYPTO_PCBC=m | ||
| 1218 | # CONFIG_CRYPTO_XTS is not set | ||
| 1219 | |||
| 1220 | # | ||
| 1221 | # Hash modes | ||
| 1222 | # | ||
| 1179 | # CONFIG_CRYPTO_HMAC is not set | 1223 | # CONFIG_CRYPTO_HMAC is not set |
| 1180 | # CONFIG_CRYPTO_XCBC is not set | 1224 | # CONFIG_CRYPTO_XCBC is not set |
| 1181 | # CONFIG_CRYPTO_NULL is not set | 1225 | |
| 1226 | # | ||
| 1227 | # Digest | ||
| 1228 | # | ||
| 1229 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1182 | # CONFIG_CRYPTO_MD4 is not set | 1230 | # CONFIG_CRYPTO_MD4 is not set |
| 1183 | CONFIG_CRYPTO_MD5=y | 1231 | CONFIG_CRYPTO_MD5=y |
| 1232 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1184 | # CONFIG_CRYPTO_SHA1 is not set | 1233 | # CONFIG_CRYPTO_SHA1 is not set |
| 1185 | # CONFIG_CRYPTO_SHA256 is not set | 1234 | # CONFIG_CRYPTO_SHA256 is not set |
| 1186 | # CONFIG_CRYPTO_SHA512 is not set | 1235 | # CONFIG_CRYPTO_SHA512 is not set |
| 1187 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1188 | # CONFIG_CRYPTO_TGR192 is not set | 1236 | # CONFIG_CRYPTO_TGR192 is not set |
| 1189 | # CONFIG_CRYPTO_GF128MUL is not set | 1237 | # CONFIG_CRYPTO_WP512 is not set |
| 1190 | # CONFIG_CRYPTO_ECB is not set | 1238 | |
| 1191 | CONFIG_CRYPTO_CBC=y | 1239 | # |
| 1192 | CONFIG_CRYPTO_PCBC=m | 1240 | # Ciphers |
| 1193 | # CONFIG_CRYPTO_LRW is not set | 1241 | # |
| 1194 | # CONFIG_CRYPTO_XTS is not set | ||
| 1195 | # CONFIG_CRYPTO_CTR is not set | ||
| 1196 | # CONFIG_CRYPTO_GCM is not set | ||
| 1197 | # CONFIG_CRYPTO_CCM is not set | ||
| 1198 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1199 | CONFIG_CRYPTO_DES=y | ||
| 1200 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1201 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1202 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1203 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1204 | # CONFIG_CRYPTO_AES is not set | 1242 | # CONFIG_CRYPTO_AES is not set |
| 1243 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1244 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1245 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1246 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1205 | # CONFIG_CRYPTO_CAST5 is not set | 1247 | # CONFIG_CRYPTO_CAST5 is not set |
| 1206 | # CONFIG_CRYPTO_CAST6 is not set | 1248 | # CONFIG_CRYPTO_CAST6 is not set |
| 1207 | # CONFIG_CRYPTO_TEA is not set | 1249 | CONFIG_CRYPTO_DES=y |
| 1208 | # CONFIG_CRYPTO_ARC4 is not set | 1250 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1209 | # CONFIG_CRYPTO_KHAZAD is not set | 1251 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1210 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1211 | # CONFIG_CRYPTO_SEED is not set | ||
| 1212 | # CONFIG_CRYPTO_SALSA20 is not set | 1252 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1253 | # CONFIG_CRYPTO_SEED is not set | ||
| 1254 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1255 | # CONFIG_CRYPTO_TEA is not set | ||
| 1256 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1257 | |||
| 1258 | # | ||
| 1259 | # Compression | ||
| 1260 | # | ||
| 1213 | # CONFIG_CRYPTO_DEFLATE is not set | 1261 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1214 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1215 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1216 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1217 | # CONFIG_CRYPTO_TEST is not set | ||
| 1218 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1219 | # CONFIG_CRYPTO_LZO is not set | 1262 | # CONFIG_CRYPTO_LZO is not set |
| 1220 | CONFIG_CRYPTO_HW=y | 1263 | CONFIG_CRYPTO_HW=y |
| 1221 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1264 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1222 | # CONFIG_PPC_CLOCK is not set | 1265 | # CONFIG_PPC_CLOCK is not set |
| 1266 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index b4e82c0e2be7..c82e96e984fc 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:56 2008 | 4 | # Mon Jun 9 08:52:26 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +359,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 353 | # CONFIG_CONNECTOR is not set | 359 | # CONFIG_CONNECTOR is not set |
| 354 | # CONFIG_MTD is not set | 360 | # CONFIG_MTD is not set |
| 355 | CONFIG_OF_DEVICE=y | 361 | CONFIG_OF_DEVICE=y |
| 362 | CONFIG_OF_I2C=y | ||
| 356 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
| 357 | CONFIG_BLK_DEV=y | 364 | CONFIG_BLK_DEV=y |
| 358 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
| @@ -471,7 +478,6 @@ CONFIG_NETDEV_1000=y | |||
| 471 | # CONFIG_SIS190 is not set | 478 | # CONFIG_SIS190 is not set |
| 472 | # CONFIG_SKGE is not set | 479 | # CONFIG_SKGE is not set |
| 473 | # CONFIG_SKY2 is not set | 480 | # CONFIG_SKY2 is not set |
| 474 | # CONFIG_SK98LIN is not set | ||
| 475 | # CONFIG_VIA_VELOCITY is not set | 481 | # CONFIG_VIA_VELOCITY is not set |
| 476 | # CONFIG_TIGON3 is not set | 482 | # CONFIG_TIGON3 is not set |
| 477 | # CONFIG_BNX2 is not set | 483 | # CONFIG_BNX2 is not set |
| @@ -491,6 +497,7 @@ CONFIG_NETDEV_10000=y | |||
| 491 | # CONFIG_MLX4_CORE is not set | 497 | # CONFIG_MLX4_CORE is not set |
| 492 | # CONFIG_TEHUTI is not set | 498 | # CONFIG_TEHUTI is not set |
| 493 | # CONFIG_BNX2X is not set | 499 | # CONFIG_BNX2X is not set |
| 500 | # CONFIG_SFC is not set | ||
| 494 | # CONFIG_TR is not set | 501 | # CONFIG_TR is not set |
| 495 | 502 | ||
| 496 | # | 503 | # |
| @@ -498,6 +505,7 @@ CONFIG_NETDEV_10000=y | |||
| 498 | # | 505 | # |
| 499 | # CONFIG_WLAN_PRE80211 is not set | 506 | # CONFIG_WLAN_PRE80211 is not set |
| 500 | # CONFIG_WLAN_80211 is not set | 507 | # CONFIG_WLAN_80211 is not set |
| 508 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 501 | # CONFIG_WAN is not set | 509 | # CONFIG_WAN is not set |
| 502 | # CONFIG_FDDI is not set | 510 | # CONFIG_FDDI is not set |
| 503 | # CONFIG_HIPPI is not set | 511 | # CONFIG_HIPPI is not set |
| @@ -544,6 +552,7 @@ CONFIG_INPUT=y | |||
| 544 | # Character devices | 552 | # Character devices |
| 545 | # | 553 | # |
| 546 | # CONFIG_VT is not set | 554 | # CONFIG_VT is not set |
| 555 | CONFIG_DEVKMEM=y | ||
| 547 | # CONFIG_SERIAL_NONSTANDARD is not set | 556 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 548 | # CONFIG_NOZOMI is not set | 557 | # CONFIG_NOZOMI is not set |
| 549 | 558 | ||
| @@ -571,7 +580,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 571 | # CONFIG_IPMI_HANDLER is not set | 580 | # CONFIG_IPMI_HANDLER is not set |
| 572 | # CONFIG_HW_RANDOM is not set | 581 | # CONFIG_HW_RANDOM is not set |
| 573 | # CONFIG_NVRAM is not set | 582 | # CONFIG_NVRAM is not set |
| 574 | # CONFIG_GEN_RTC is not set | ||
| 575 | # CONFIG_R3964 is not set | 583 | # CONFIG_R3964 is not set |
| 576 | # CONFIG_APPLICOM is not set | 584 | # CONFIG_APPLICOM is not set |
| 577 | # CONFIG_RAW_DRIVER is not set | 585 | # CONFIG_RAW_DRIVER is not set |
| @@ -582,13 +590,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 582 | CONFIG_I2C_CHARDEV=y | 590 | CONFIG_I2C_CHARDEV=y |
| 583 | 591 | ||
| 584 | # | 592 | # |
| 585 | # I2C Algorithms | ||
| 586 | # | ||
| 587 | # CONFIG_I2C_ALGOBIT is not set | ||
| 588 | # CONFIG_I2C_ALGOPCF is not set | ||
| 589 | # CONFIG_I2C_ALGOPCA is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # I2C Hardware Bus support | 593 | # I2C Hardware Bus support |
| 593 | # | 594 | # |
| 594 | # CONFIG_I2C_ALI1535 is not set | 595 | # CONFIG_I2C_ALI1535 is not set |
| @@ -614,6 +615,7 @@ CONFIG_I2C_MPC=y | |||
| 614 | # CONFIG_I2C_VIA is not set | 615 | # CONFIG_I2C_VIA is not set |
| 615 | # CONFIG_I2C_VIAPRO is not set | 616 | # CONFIG_I2C_VIAPRO is not set |
| 616 | # CONFIG_I2C_VOODOO3 is not set | 617 | # CONFIG_I2C_VOODOO3 is not set |
| 618 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 617 | 619 | ||
| 618 | # | 620 | # |
| 619 | # Miscellaneous I2C Chip support | 621 | # Miscellaneous I2C Chip support |
| @@ -623,19 +625,13 @@ CONFIG_I2C_MPC=y | |||
| 623 | # CONFIG_SENSORS_PCF8574 is not set | 625 | # CONFIG_SENSORS_PCF8574 is not set |
| 624 | # CONFIG_PCF8575 is not set | 626 | # CONFIG_PCF8575 is not set |
| 625 | # CONFIG_SENSORS_PCF8591 is not set | 627 | # CONFIG_SENSORS_PCF8591 is not set |
| 626 | # CONFIG_TPS65010 is not set | ||
| 627 | # CONFIG_SENSORS_MAX6875 is not set | 628 | # CONFIG_SENSORS_MAX6875 is not set |
| 628 | # CONFIG_SENSORS_TSL2550 is not set | 629 | # CONFIG_SENSORS_TSL2550 is not set |
| 629 | # CONFIG_I2C_DEBUG_CORE is not set | 630 | # CONFIG_I2C_DEBUG_CORE is not set |
| 630 | # CONFIG_I2C_DEBUG_ALGO is not set | 631 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 631 | # CONFIG_I2C_DEBUG_BUS is not set | 632 | # CONFIG_I2C_DEBUG_BUS is not set |
| 632 | # CONFIG_I2C_DEBUG_CHIP is not set | 633 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 633 | |||
| 634 | # | ||
| 635 | # SPI support | ||
| 636 | # | ||
| 637 | # CONFIG_SPI is not set | 634 | # CONFIG_SPI is not set |
| 638 | # CONFIG_SPI_MASTER is not set | ||
| 639 | # CONFIG_W1 is not set | 635 | # CONFIG_W1 is not set |
| 640 | # CONFIG_POWER_SUPPLY is not set | 636 | # CONFIG_POWER_SUPPLY is not set |
| 641 | CONFIG_HWMON=y | 637 | CONFIG_HWMON=y |
| @@ -718,12 +714,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 718 | # Multifunction device drivers | 714 | # Multifunction device drivers |
| 719 | # | 715 | # |
| 720 | # CONFIG_MFD_SM501 is not set | 716 | # CONFIG_MFD_SM501 is not set |
| 717 | # CONFIG_HTC_PASIC3 is not set | ||
| 721 | 718 | ||
| 722 | # | 719 | # |
| 723 | # Multimedia devices | 720 | # Multimedia devices |
| 724 | # | 721 | # |
| 722 | |||
| 723 | # | ||
| 724 | # Multimedia core support | ||
| 725 | # | ||
| 725 | # CONFIG_VIDEO_DEV is not set | 726 | # CONFIG_VIDEO_DEV is not set |
| 726 | # CONFIG_DVB_CORE is not set | 727 | # CONFIG_DVB_CORE is not set |
| 728 | # CONFIG_VIDEO_MEDIA is not set | ||
| 729 | |||
| 730 | # | ||
| 731 | # Multimedia drivers | ||
| 732 | # | ||
| 727 | CONFIG_DAB=y | 733 | CONFIG_DAB=y |
| 728 | 734 | ||
| 729 | # | 735 | # |
| @@ -754,6 +760,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 754 | CONFIG_USB_ARCH_HAS_OHCI=y | 760 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 755 | CONFIG_USB_ARCH_HAS_EHCI=y | 761 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 756 | # CONFIG_USB is not set | 762 | # CONFIG_USB is not set |
| 763 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 764 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 757 | 765 | ||
| 758 | # | 766 | # |
| 759 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 767 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -762,6 +770,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 762 | # CONFIG_MMC is not set | 770 | # CONFIG_MMC is not set |
| 763 | # CONFIG_MEMSTICK is not set | 771 | # CONFIG_MEMSTICK is not set |
| 764 | # CONFIG_NEW_LEDS is not set | 772 | # CONFIG_NEW_LEDS is not set |
| 773 | # CONFIG_ACCESSIBILITY is not set | ||
| 765 | # CONFIG_INFINIBAND is not set | 774 | # CONFIG_INFINIBAND is not set |
| 766 | # CONFIG_EDAC is not set | 775 | # CONFIG_EDAC is not set |
| 767 | CONFIG_RTC_LIB=y | 776 | CONFIG_RTC_LIB=y |
| @@ -813,11 +822,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 813 | # | 822 | # |
| 814 | # on-CPU RTC drivers | 823 | # on-CPU RTC drivers |
| 815 | # | 824 | # |
| 825 | # CONFIG_RTC_DRV_PPC is not set | ||
| 816 | # CONFIG_DMADEVICES is not set | 826 | # CONFIG_DMADEVICES is not set |
| 817 | |||
| 818 | # | ||
| 819 | # Userspace I/O | ||
| 820 | # | ||
| 821 | # CONFIG_UIO is not set | 827 | # CONFIG_UIO is not set |
| 822 | 828 | ||
| 823 | # | 829 | # |
| @@ -837,7 +843,6 @@ CONFIG_FS_MBCACHE=y | |||
| 837 | # CONFIG_JFS_FS is not set | 843 | # CONFIG_JFS_FS is not set |
| 838 | # CONFIG_FS_POSIX_ACL is not set | 844 | # CONFIG_FS_POSIX_ACL is not set |
| 839 | # CONFIG_XFS_FS is not set | 845 | # CONFIG_XFS_FS is not set |
| 840 | # CONFIG_GFS2_FS is not set | ||
| 841 | # CONFIG_OCFS2_FS is not set | 846 | # CONFIG_OCFS2_FS is not set |
| 842 | CONFIG_DNOTIFY=y | 847 | CONFIG_DNOTIFY=y |
| 843 | CONFIG_INOTIFY=y | 848 | CONFIG_INOTIFY=y |
| @@ -895,7 +900,6 @@ CONFIG_NFS_FS=y | |||
| 895 | CONFIG_NFS_V3=y | 900 | CONFIG_NFS_V3=y |
| 896 | # CONFIG_NFS_V3_ACL is not set | 901 | # CONFIG_NFS_V3_ACL is not set |
| 897 | CONFIG_NFS_V4=y | 902 | CONFIG_NFS_V4=y |
| 898 | # CONFIG_NFS_DIRECTIO is not set | ||
| 899 | # CONFIG_NFSD is not set | 903 | # CONFIG_NFSD is not set |
| 900 | CONFIG_ROOT_NFS=y | 904 | CONFIG_ROOT_NFS=y |
| 901 | CONFIG_LOCKD=y | 905 | CONFIG_LOCKD=y |
| @@ -936,6 +940,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 936 | # Library routines | 940 | # Library routines |
| 937 | # | 941 | # |
| 938 | CONFIG_BITREVERSE=y | 942 | CONFIG_BITREVERSE=y |
| 943 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 939 | # CONFIG_CRC_CCITT is not set | 944 | # CONFIG_CRC_CCITT is not set |
| 940 | # CONFIG_CRC16 is not set | 945 | # CONFIG_CRC16 is not set |
| 941 | # CONFIG_CRC_ITU_T is not set | 946 | # CONFIG_CRC_ITU_T is not set |
| @@ -946,6 +951,7 @@ CONFIG_PLIST=y | |||
| 946 | CONFIG_HAS_IOMEM=y | 951 | CONFIG_HAS_IOMEM=y |
| 947 | CONFIG_HAS_IOPORT=y | 952 | CONFIG_HAS_IOPORT=y |
| 948 | CONFIG_HAS_DMA=y | 953 | CONFIG_HAS_DMA=y |
| 954 | CONFIG_HAVE_LMB=y | ||
| 949 | 955 | ||
| 950 | # | 956 | # |
| 951 | # Kernel hacking | 957 | # Kernel hacking |
| @@ -953,6 +959,7 @@ CONFIG_HAS_DMA=y | |||
| 953 | # CONFIG_PRINTK_TIME is not set | 959 | # CONFIG_PRINTK_TIME is not set |
| 954 | CONFIG_ENABLE_WARN_DEPRECATED=y | 960 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 955 | CONFIG_ENABLE_MUST_CHECK=y | 961 | CONFIG_ENABLE_MUST_CHECK=y |
| 962 | CONFIG_FRAME_WARN=1024 | ||
| 956 | # CONFIG_MAGIC_SYSRQ is not set | 963 | # CONFIG_MAGIC_SYSRQ is not set |
| 957 | # CONFIG_UNUSED_SYMBOLS is not set | 964 | # CONFIG_UNUSED_SYMBOLS is not set |
| 958 | # CONFIG_DEBUG_FS is not set | 965 | # CONFIG_DEBUG_FS is not set |
| @@ -962,6 +969,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 962 | # CONFIG_SLUB_STATS is not set | 969 | # CONFIG_SLUB_STATS is not set |
| 963 | # CONFIG_DEBUG_BUGVERBOSE is not set | 970 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 964 | # CONFIG_SAMPLES is not set | 971 | # CONFIG_SAMPLES is not set |
| 972 | # CONFIG_IRQSTACKS is not set | ||
| 965 | # CONFIG_PPC_EARLY_DEBUG is not set | 973 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 966 | 974 | ||
| 967 | # | 975 | # |
| @@ -971,51 +979,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 971 | # CONFIG_SECURITY is not set | 979 | # CONFIG_SECURITY is not set |
| 972 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 980 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 973 | CONFIG_CRYPTO=y | 981 | CONFIG_CRYPTO=y |
| 982 | |||
| 983 | # | ||
| 984 | # Crypto core or helper | ||
| 985 | # | ||
| 974 | CONFIG_CRYPTO_ALGAPI=y | 986 | CONFIG_CRYPTO_ALGAPI=y |
| 975 | CONFIG_CRYPTO_BLKCIPHER=y | 987 | CONFIG_CRYPTO_BLKCIPHER=y |
| 976 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 977 | CONFIG_CRYPTO_MANAGER=y | 988 | CONFIG_CRYPTO_MANAGER=y |
| 989 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 990 | # CONFIG_CRYPTO_NULL is not set | ||
| 991 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 992 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 993 | # CONFIG_CRYPTO_TEST is not set | ||
| 994 | |||
| 995 | # | ||
| 996 | # Authenticated Encryption with Associated Data | ||
| 997 | # | ||
| 998 | # CONFIG_CRYPTO_CCM is not set | ||
| 999 | # CONFIG_CRYPTO_GCM is not set | ||
| 1000 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1001 | |||
| 1002 | # | ||
| 1003 | # Block modes | ||
| 1004 | # | ||
| 1005 | CONFIG_CRYPTO_CBC=y | ||
| 1006 | # CONFIG_CRYPTO_CTR is not set | ||
| 1007 | # CONFIG_CRYPTO_CTS is not set | ||
| 1008 | CONFIG_CRYPTO_ECB=m | ||
| 1009 | # CONFIG_CRYPTO_LRW is not set | ||
| 1010 | CONFIG_CRYPTO_PCBC=m | ||
| 1011 | # CONFIG_CRYPTO_XTS is not set | ||
| 1012 | |||
| 1013 | # | ||
| 1014 | # Hash modes | ||
| 1015 | # | ||
| 978 | # CONFIG_CRYPTO_HMAC is not set | 1016 | # CONFIG_CRYPTO_HMAC is not set |
| 979 | # CONFIG_CRYPTO_XCBC is not set | 1017 | # CONFIG_CRYPTO_XCBC is not set |
| 980 | # CONFIG_CRYPTO_NULL is not set | 1018 | |
| 1019 | # | ||
| 1020 | # Digest | ||
| 1021 | # | ||
| 1022 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 981 | # CONFIG_CRYPTO_MD4 is not set | 1023 | # CONFIG_CRYPTO_MD4 is not set |
| 982 | CONFIG_CRYPTO_MD5=y | 1024 | CONFIG_CRYPTO_MD5=y |
| 1025 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 983 | # CONFIG_CRYPTO_SHA1 is not set | 1026 | # CONFIG_CRYPTO_SHA1 is not set |
| 984 | # CONFIG_CRYPTO_SHA256 is not set | 1027 | # CONFIG_CRYPTO_SHA256 is not set |
| 985 | # CONFIG_CRYPTO_SHA512 is not set | 1028 | # CONFIG_CRYPTO_SHA512 is not set |
| 986 | # CONFIG_CRYPTO_WP512 is not set | ||
| 987 | # CONFIG_CRYPTO_TGR192 is not set | 1029 | # CONFIG_CRYPTO_TGR192 is not set |
| 988 | # CONFIG_CRYPTO_GF128MUL is not set | 1030 | # CONFIG_CRYPTO_WP512 is not set |
| 989 | CONFIG_CRYPTO_ECB=m | 1031 | |
| 990 | CONFIG_CRYPTO_CBC=y | 1032 | # |
| 991 | CONFIG_CRYPTO_PCBC=m | 1033 | # Ciphers |
| 992 | # CONFIG_CRYPTO_LRW is not set | 1034 | # |
| 993 | # CONFIG_CRYPTO_XTS is not set | ||
| 994 | # CONFIG_CRYPTO_CTR is not set | ||
| 995 | # CONFIG_CRYPTO_GCM is not set | ||
| 996 | # CONFIG_CRYPTO_CCM is not set | ||
| 997 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 998 | CONFIG_CRYPTO_DES=y | ||
| 999 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1000 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1001 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1002 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1003 | # CONFIG_CRYPTO_AES is not set | 1035 | # CONFIG_CRYPTO_AES is not set |
| 1036 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1037 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1038 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1039 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1004 | # CONFIG_CRYPTO_CAST5 is not set | 1040 | # CONFIG_CRYPTO_CAST5 is not set |
| 1005 | # CONFIG_CRYPTO_CAST6 is not set | 1041 | # CONFIG_CRYPTO_CAST6 is not set |
| 1006 | # CONFIG_CRYPTO_TEA is not set | 1042 | CONFIG_CRYPTO_DES=y |
| 1007 | # CONFIG_CRYPTO_ARC4 is not set | 1043 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1008 | # CONFIG_CRYPTO_KHAZAD is not set | 1044 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1009 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1010 | # CONFIG_CRYPTO_SEED is not set | ||
| 1011 | # CONFIG_CRYPTO_SALSA20 is not set | 1045 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1046 | # CONFIG_CRYPTO_SEED is not set | ||
| 1047 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1048 | # CONFIG_CRYPTO_TEA is not set | ||
| 1049 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1050 | |||
| 1051 | # | ||
| 1052 | # Compression | ||
| 1053 | # | ||
| 1012 | # CONFIG_CRYPTO_DEFLATE is not set | 1054 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1014 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1015 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1016 | # CONFIG_CRYPTO_TEST is not set | ||
| 1017 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1018 | # CONFIG_CRYPTO_LZO is not set | 1055 | # CONFIG_CRYPTO_LZO is not set |
| 1019 | CONFIG_CRYPTO_HW=y | 1056 | CONFIG_CRYPTO_HW=y |
| 1020 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1057 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1021 | # CONFIG_PPC_CLOCK is not set | 1058 | # CONFIG_PPC_CLOCK is not set |
| 1059 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index d50a96eddcdc..20fd9f58cf42 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:57 2008 | 4 | # Mon Jun 9 08:52:27 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +359,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 353 | # CONFIG_CONNECTOR is not set | 359 | # CONFIG_CONNECTOR is not set |
| 354 | # CONFIG_MTD is not set | 360 | # CONFIG_MTD is not set |
| 355 | CONFIG_OF_DEVICE=y | 361 | CONFIG_OF_DEVICE=y |
| 362 | CONFIG_OF_I2C=y | ||
| 356 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
| 357 | CONFIG_BLK_DEV=y | 364 | CONFIG_BLK_DEV=y |
| 358 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
| @@ -520,7 +527,6 @@ CONFIG_NETDEV_1000=y | |||
| 520 | # CONFIG_SIS190 is not set | 527 | # CONFIG_SIS190 is not set |
| 521 | # CONFIG_SKGE is not set | 528 | # CONFIG_SKGE is not set |
| 522 | # CONFIG_SKY2 is not set | 529 | # CONFIG_SKY2 is not set |
| 523 | # CONFIG_SK98LIN is not set | ||
| 524 | # CONFIG_VIA_VELOCITY is not set | 530 | # CONFIG_VIA_VELOCITY is not set |
| 525 | # CONFIG_TIGON3 is not set | 531 | # CONFIG_TIGON3 is not set |
| 526 | # CONFIG_BNX2 is not set | 532 | # CONFIG_BNX2 is not set |
| @@ -544,6 +550,7 @@ CONFIG_NETDEV_10000=y | |||
| 544 | # CONFIG_MLX4_CORE is not set | 550 | # CONFIG_MLX4_CORE is not set |
| 545 | # CONFIG_TEHUTI is not set | 551 | # CONFIG_TEHUTI is not set |
| 546 | # CONFIG_BNX2X is not set | 552 | # CONFIG_BNX2X is not set |
| 553 | # CONFIG_SFC is not set | ||
| 547 | # CONFIG_TR is not set | 554 | # CONFIG_TR is not set |
| 548 | 555 | ||
| 549 | # | 556 | # |
| @@ -551,6 +558,7 @@ CONFIG_NETDEV_10000=y | |||
| 551 | # | 558 | # |
| 552 | # CONFIG_WLAN_PRE80211 is not set | 559 | # CONFIG_WLAN_PRE80211 is not set |
| 553 | # CONFIG_WLAN_80211 is not set | 560 | # CONFIG_WLAN_80211 is not set |
| 561 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 554 | # CONFIG_WAN is not set | 562 | # CONFIG_WAN is not set |
| 555 | # CONFIG_FDDI is not set | 563 | # CONFIG_FDDI is not set |
| 556 | # CONFIG_HIPPI is not set | 564 | # CONFIG_HIPPI is not set |
| @@ -598,6 +606,7 @@ CONFIG_INPUT=y | |||
| 598 | # Character devices | 606 | # Character devices |
| 599 | # | 607 | # |
| 600 | # CONFIG_VT is not set | 608 | # CONFIG_VT is not set |
| 609 | CONFIG_DEVKMEM=y | ||
| 601 | # CONFIG_SERIAL_NONSTANDARD is not set | 610 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 602 | # CONFIG_NOZOMI is not set | 611 | # CONFIG_NOZOMI is not set |
| 603 | 612 | ||
| @@ -626,7 +635,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 626 | # CONFIG_IPMI_HANDLER is not set | 635 | # CONFIG_IPMI_HANDLER is not set |
| 627 | CONFIG_HW_RANDOM=y | 636 | CONFIG_HW_RANDOM=y |
| 628 | # CONFIG_NVRAM is not set | 637 | # CONFIG_NVRAM is not set |
| 629 | # CONFIG_GEN_RTC is not set | ||
| 630 | # CONFIG_R3964 is not set | 638 | # CONFIG_R3964 is not set |
| 631 | # CONFIG_APPLICOM is not set | 639 | # CONFIG_APPLICOM is not set |
| 632 | # CONFIG_RAW_DRIVER is not set | 640 | # CONFIG_RAW_DRIVER is not set |
| @@ -637,13 +645,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 637 | CONFIG_I2C_CHARDEV=y | 645 | CONFIG_I2C_CHARDEV=y |
| 638 | 646 | ||
| 639 | # | 647 | # |
| 640 | # I2C Algorithms | ||
| 641 | # | ||
| 642 | # CONFIG_I2C_ALGOBIT is not set | ||
| 643 | # CONFIG_I2C_ALGOPCF is not set | ||
| 644 | # CONFIG_I2C_ALGOPCA is not set | ||
| 645 | |||
| 646 | # | ||
| 647 | # I2C Hardware Bus support | 648 | # I2C Hardware Bus support |
| 648 | # | 649 | # |
| 649 | # CONFIG_I2C_ALI1535 is not set | 650 | # CONFIG_I2C_ALI1535 is not set |
| @@ -669,6 +670,7 @@ CONFIG_I2C_MPC=y | |||
| 669 | # CONFIG_I2C_VIA is not set | 670 | # CONFIG_I2C_VIA is not set |
| 670 | # CONFIG_I2C_VIAPRO is not set | 671 | # CONFIG_I2C_VIAPRO is not set |
| 671 | # CONFIG_I2C_VOODOO3 is not set | 672 | # CONFIG_I2C_VOODOO3 is not set |
| 673 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 672 | 674 | ||
| 673 | # | 675 | # |
| 674 | # Miscellaneous I2C Chip support | 676 | # Miscellaneous I2C Chip support |
| @@ -678,19 +680,13 @@ CONFIG_I2C_MPC=y | |||
| 678 | # CONFIG_SENSORS_PCF8574 is not set | 680 | # CONFIG_SENSORS_PCF8574 is not set |
| 679 | # CONFIG_PCF8575 is not set | 681 | # CONFIG_PCF8575 is not set |
| 680 | # CONFIG_SENSORS_PCF8591 is not set | 682 | # CONFIG_SENSORS_PCF8591 is not set |
| 681 | # CONFIG_TPS65010 is not set | ||
| 682 | # CONFIG_SENSORS_MAX6875 is not set | 683 | # CONFIG_SENSORS_MAX6875 is not set |
| 683 | # CONFIG_SENSORS_TSL2550 is not set | 684 | # CONFIG_SENSORS_TSL2550 is not set |
| 684 | # CONFIG_I2C_DEBUG_CORE is not set | 685 | # CONFIG_I2C_DEBUG_CORE is not set |
| 685 | # CONFIG_I2C_DEBUG_ALGO is not set | 686 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 686 | # CONFIG_I2C_DEBUG_BUS is not set | 687 | # CONFIG_I2C_DEBUG_BUS is not set |
| 687 | # CONFIG_I2C_DEBUG_CHIP is not set | 688 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 688 | |||
| 689 | # | ||
| 690 | # SPI support | ||
| 691 | # | ||
| 692 | # CONFIG_SPI is not set | 689 | # CONFIG_SPI is not set |
| 693 | # CONFIG_SPI_MASTER is not set | ||
| 694 | # CONFIG_W1 is not set | 690 | # CONFIG_W1 is not set |
| 695 | # CONFIG_POWER_SUPPLY is not set | 691 | # CONFIG_POWER_SUPPLY is not set |
| 696 | CONFIG_HWMON=y | 692 | CONFIG_HWMON=y |
| @@ -773,12 +769,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 773 | # Multifunction device drivers | 769 | # Multifunction device drivers |
| 774 | # | 770 | # |
| 775 | # CONFIG_MFD_SM501 is not set | 771 | # CONFIG_MFD_SM501 is not set |
| 772 | # CONFIG_HTC_PASIC3 is not set | ||
| 776 | 773 | ||
| 777 | # | 774 | # |
| 778 | # Multimedia devices | 775 | # Multimedia devices |
| 779 | # | 776 | # |
| 777 | |||
| 778 | # | ||
| 779 | # Multimedia core support | ||
| 780 | # | ||
| 780 | # CONFIG_VIDEO_DEV is not set | 781 | # CONFIG_VIDEO_DEV is not set |
| 781 | # CONFIG_DVB_CORE is not set | 782 | # CONFIG_DVB_CORE is not set |
| 783 | # CONFIG_VIDEO_MEDIA is not set | ||
| 784 | |||
| 785 | # | ||
| 786 | # Multimedia drivers | ||
| 787 | # | ||
| 782 | CONFIG_DAB=y | 788 | CONFIG_DAB=y |
| 783 | 789 | ||
| 784 | # | 790 | # |
| @@ -809,6 +815,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 809 | CONFIG_USB_ARCH_HAS_OHCI=y | 815 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 810 | CONFIG_USB_ARCH_HAS_EHCI=y | 816 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 811 | # CONFIG_USB is not set | 817 | # CONFIG_USB is not set |
| 818 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 819 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 812 | 820 | ||
| 813 | # | 821 | # |
| 814 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 822 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -817,6 +825,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 817 | # CONFIG_MMC is not set | 825 | # CONFIG_MMC is not set |
| 818 | # CONFIG_MEMSTICK is not set | 826 | # CONFIG_MEMSTICK is not set |
| 819 | # CONFIG_NEW_LEDS is not set | 827 | # CONFIG_NEW_LEDS is not set |
| 828 | # CONFIG_ACCESSIBILITY is not set | ||
| 820 | # CONFIG_INFINIBAND is not set | 829 | # CONFIG_INFINIBAND is not set |
| 821 | # CONFIG_EDAC is not set | 830 | # CONFIG_EDAC is not set |
| 822 | CONFIG_RTC_LIB=y | 831 | CONFIG_RTC_LIB=y |
| @@ -868,11 +877,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 868 | # | 877 | # |
| 869 | # on-CPU RTC drivers | 878 | # on-CPU RTC drivers |
| 870 | # | 879 | # |
| 880 | # CONFIG_RTC_DRV_PPC is not set | ||
| 871 | # CONFIG_DMADEVICES is not set | 881 | # CONFIG_DMADEVICES is not set |
| 872 | |||
| 873 | # | ||
| 874 | # Userspace I/O | ||
| 875 | # | ||
| 876 | # CONFIG_UIO is not set | 882 | # CONFIG_UIO is not set |
| 877 | 883 | ||
| 878 | # | 884 | # |
| @@ -892,7 +898,6 @@ CONFIG_FS_MBCACHE=y | |||
| 892 | # CONFIG_JFS_FS is not set | 898 | # CONFIG_JFS_FS is not set |
| 893 | # CONFIG_FS_POSIX_ACL is not set | 899 | # CONFIG_FS_POSIX_ACL is not set |
| 894 | # CONFIG_XFS_FS is not set | 900 | # CONFIG_XFS_FS is not set |
| 895 | # CONFIG_GFS2_FS is not set | ||
| 896 | # CONFIG_OCFS2_FS is not set | 901 | # CONFIG_OCFS2_FS is not set |
| 897 | CONFIG_DNOTIFY=y | 902 | CONFIG_DNOTIFY=y |
| 898 | CONFIG_INOTIFY=y | 903 | CONFIG_INOTIFY=y |
| @@ -950,7 +955,6 @@ CONFIG_NFS_FS=y | |||
| 950 | CONFIG_NFS_V3=y | 955 | CONFIG_NFS_V3=y |
| 951 | # CONFIG_NFS_V3_ACL is not set | 956 | # CONFIG_NFS_V3_ACL is not set |
| 952 | CONFIG_NFS_V4=y | 957 | CONFIG_NFS_V4=y |
| 953 | # CONFIG_NFS_DIRECTIO is not set | ||
| 954 | # CONFIG_NFSD is not set | 958 | # CONFIG_NFSD is not set |
| 955 | CONFIG_ROOT_NFS=y | 959 | CONFIG_ROOT_NFS=y |
| 956 | CONFIG_LOCKD=y | 960 | CONFIG_LOCKD=y |
| @@ -993,6 +997,7 @@ CONFIG_UCC=y | |||
| 993 | # Library routines | 997 | # Library routines |
| 994 | # | 998 | # |
| 995 | CONFIG_BITREVERSE=y | 999 | CONFIG_BITREVERSE=y |
| 1000 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 996 | # CONFIG_CRC_CCITT is not set | 1001 | # CONFIG_CRC_CCITT is not set |
| 997 | # CONFIG_CRC16 is not set | 1002 | # CONFIG_CRC16 is not set |
| 998 | # CONFIG_CRC_ITU_T is not set | 1003 | # CONFIG_CRC_ITU_T is not set |
| @@ -1003,6 +1008,7 @@ CONFIG_PLIST=y | |||
| 1003 | CONFIG_HAS_IOMEM=y | 1008 | CONFIG_HAS_IOMEM=y |
| 1004 | CONFIG_HAS_IOPORT=y | 1009 | CONFIG_HAS_IOPORT=y |
| 1005 | CONFIG_HAS_DMA=y | 1010 | CONFIG_HAS_DMA=y |
| 1011 | CONFIG_HAVE_LMB=y | ||
| 1006 | 1012 | ||
| 1007 | # | 1013 | # |
| 1008 | # Kernel hacking | 1014 | # Kernel hacking |
| @@ -1010,6 +1016,7 @@ CONFIG_HAS_DMA=y | |||
| 1010 | # CONFIG_PRINTK_TIME is not set | 1016 | # CONFIG_PRINTK_TIME is not set |
| 1011 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1017 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1012 | CONFIG_ENABLE_MUST_CHECK=y | 1018 | CONFIG_ENABLE_MUST_CHECK=y |
| 1019 | CONFIG_FRAME_WARN=1024 | ||
| 1013 | # CONFIG_MAGIC_SYSRQ is not set | 1020 | # CONFIG_MAGIC_SYSRQ is not set |
| 1014 | # CONFIG_UNUSED_SYMBOLS is not set | 1021 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1015 | # CONFIG_DEBUG_FS is not set | 1022 | # CONFIG_DEBUG_FS is not set |
| @@ -1019,6 +1026,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1019 | # CONFIG_SLUB_STATS is not set | 1026 | # CONFIG_SLUB_STATS is not set |
| 1020 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1027 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1021 | # CONFIG_SAMPLES is not set | 1028 | # CONFIG_SAMPLES is not set |
| 1029 | # CONFIG_IRQSTACKS is not set | ||
| 1022 | # CONFIG_PPC_EARLY_DEBUG is not set | 1030 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1023 | 1031 | ||
| 1024 | # | 1032 | # |
| @@ -1028,52 +1036,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1028 | # CONFIG_SECURITY is not set | 1036 | # CONFIG_SECURITY is not set |
| 1029 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1037 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1030 | CONFIG_CRYPTO=y | 1038 | CONFIG_CRYPTO=y |
| 1039 | |||
| 1040 | # | ||
| 1041 | # Crypto core or helper | ||
| 1042 | # | ||
| 1031 | CONFIG_CRYPTO_ALGAPI=y | 1043 | CONFIG_CRYPTO_ALGAPI=y |
| 1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1044 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1033 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1034 | CONFIG_CRYPTO_MANAGER=y | 1045 | CONFIG_CRYPTO_MANAGER=y |
| 1046 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1047 | # CONFIG_CRYPTO_NULL is not set | ||
| 1048 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1049 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1050 | # CONFIG_CRYPTO_TEST is not set | ||
| 1051 | |||
| 1052 | # | ||
| 1053 | # Authenticated Encryption with Associated Data | ||
| 1054 | # | ||
| 1055 | # CONFIG_CRYPTO_CCM is not set | ||
| 1056 | # CONFIG_CRYPTO_GCM is not set | ||
| 1057 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # Block modes | ||
| 1061 | # | ||
| 1062 | CONFIG_CRYPTO_CBC=y | ||
| 1063 | # CONFIG_CRYPTO_CTR is not set | ||
| 1064 | # CONFIG_CRYPTO_CTS is not set | ||
| 1065 | CONFIG_CRYPTO_ECB=m | ||
| 1066 | # CONFIG_CRYPTO_LRW is not set | ||
| 1067 | CONFIG_CRYPTO_PCBC=m | ||
| 1068 | # CONFIG_CRYPTO_XTS is not set | ||
| 1069 | |||
| 1070 | # | ||
| 1071 | # Hash modes | ||
| 1072 | # | ||
| 1035 | # CONFIG_CRYPTO_HMAC is not set | 1073 | # CONFIG_CRYPTO_HMAC is not set |
| 1036 | # CONFIG_CRYPTO_XCBC is not set | 1074 | # CONFIG_CRYPTO_XCBC is not set |
| 1037 | # CONFIG_CRYPTO_NULL is not set | 1075 | |
| 1076 | # | ||
| 1077 | # Digest | ||
| 1078 | # | ||
| 1079 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1038 | # CONFIG_CRYPTO_MD4 is not set | 1080 | # CONFIG_CRYPTO_MD4 is not set |
| 1039 | CONFIG_CRYPTO_MD5=y | 1081 | CONFIG_CRYPTO_MD5=y |
| 1082 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1040 | # CONFIG_CRYPTO_SHA1 is not set | 1083 | # CONFIG_CRYPTO_SHA1 is not set |
| 1041 | # CONFIG_CRYPTO_SHA256 is not set | 1084 | # CONFIG_CRYPTO_SHA256 is not set |
| 1042 | # CONFIG_CRYPTO_SHA512 is not set | 1085 | # CONFIG_CRYPTO_SHA512 is not set |
| 1043 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1044 | # CONFIG_CRYPTO_TGR192 is not set | 1086 | # CONFIG_CRYPTO_TGR192 is not set |
| 1045 | # CONFIG_CRYPTO_GF128MUL is not set | 1087 | # CONFIG_CRYPTO_WP512 is not set |
| 1046 | CONFIG_CRYPTO_ECB=m | 1088 | |
| 1047 | CONFIG_CRYPTO_CBC=y | 1089 | # |
| 1048 | CONFIG_CRYPTO_PCBC=m | 1090 | # Ciphers |
| 1049 | # CONFIG_CRYPTO_LRW is not set | 1091 | # |
| 1050 | # CONFIG_CRYPTO_XTS is not set | ||
| 1051 | # CONFIG_CRYPTO_CTR is not set | ||
| 1052 | # CONFIG_CRYPTO_GCM is not set | ||
| 1053 | # CONFIG_CRYPTO_CCM is not set | ||
| 1054 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1055 | CONFIG_CRYPTO_DES=y | ||
| 1056 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1057 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1058 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1059 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1060 | # CONFIG_CRYPTO_AES is not set | 1092 | # CONFIG_CRYPTO_AES is not set |
| 1093 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1094 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1095 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1096 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1061 | # CONFIG_CRYPTO_CAST5 is not set | 1097 | # CONFIG_CRYPTO_CAST5 is not set |
| 1062 | # CONFIG_CRYPTO_CAST6 is not set | 1098 | # CONFIG_CRYPTO_CAST6 is not set |
| 1063 | # CONFIG_CRYPTO_TEA is not set | 1099 | CONFIG_CRYPTO_DES=y |
| 1064 | # CONFIG_CRYPTO_ARC4 is not set | 1100 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1065 | # CONFIG_CRYPTO_KHAZAD is not set | 1101 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1066 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1067 | # CONFIG_CRYPTO_SEED is not set | ||
| 1068 | # CONFIG_CRYPTO_SALSA20 is not set | 1102 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1103 | # CONFIG_CRYPTO_SEED is not set | ||
| 1104 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1105 | # CONFIG_CRYPTO_TEA is not set | ||
| 1106 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1107 | |||
| 1108 | # | ||
| 1109 | # Compression | ||
| 1110 | # | ||
| 1069 | # CONFIG_CRYPTO_DEFLATE is not set | 1111 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1070 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1072 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1073 | # CONFIG_CRYPTO_TEST is not set | ||
| 1074 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1075 | # CONFIG_CRYPTO_LZO is not set | 1112 | # CONFIG_CRYPTO_LZO is not set |
| 1076 | CONFIG_CRYPTO_HW=y | 1113 | CONFIG_CRYPTO_HW=y |
| 1077 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1114 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1078 | # CONFIG_PPC_CLOCK is not set | 1115 | # CONFIG_PPC_CLOCK is not set |
| 1079 | CONFIG_PPC_LIB_RHEAP=y | 1116 | CONFIG_PPC_LIB_RHEAP=y |
| 1117 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index f377cde785b0..0f94d9f56beb 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:23 2008 | 4 | # Mon Jun 9 08:52:28 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -211,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 226 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_SYSCALL is not set | 241 | # CONFIG_PCI_SYSCALL is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,11 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 259 | ||
| 252 | # | 260 | # |
| 253 | # Networking | 261 | # Networking |
| @@ -295,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -350,6 +356,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 350 | # CONFIG_CONNECTOR is not set | 356 | # CONFIG_CONNECTOR is not set |
| 351 | # CONFIG_MTD is not set | 357 | # CONFIG_MTD is not set |
| 352 | CONFIG_OF_DEVICE=y | 358 | CONFIG_OF_DEVICE=y |
| 359 | CONFIG_OF_I2C=y | ||
| 353 | # CONFIG_PARPORT is not set | 360 | # CONFIG_PARPORT is not set |
| 354 | CONFIG_BLK_DEV=y | 361 | CONFIG_BLK_DEV=y |
| 355 | # CONFIG_BLK_DEV_FD is not set | 362 | # CONFIG_BLK_DEV_FD is not set |
| @@ -411,8 +418,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 411 | # CONFIG_SCSI_DEBUG is not set | 418 | # CONFIG_SCSI_DEBUG is not set |
| 412 | CONFIG_ATA=y | 419 | CONFIG_ATA=y |
| 413 | # CONFIG_ATA_NONSTANDARD is not set | 420 | # CONFIG_ATA_NONSTANDARD is not set |
| 414 | # CONFIG_SATA_MV is not set | 421 | CONFIG_SATA_PMP=y |
| 415 | CONFIG_SATA_FSL=y | 422 | CONFIG_SATA_FSL=y |
| 423 | CONFIG_ATA_SFF=y | ||
| 424 | # CONFIG_SATA_MV is not set | ||
| 416 | # CONFIG_PATA_PLATFORM is not set | 425 | # CONFIG_PATA_PLATFORM is not set |
| 417 | # CONFIG_MD is not set | 426 | # CONFIG_MD is not set |
| 418 | # CONFIG_MACINTOSH_DRIVERS is not set | 427 | # CONFIG_MACINTOSH_DRIVERS is not set |
| @@ -459,6 +468,7 @@ CONFIG_NETDEV_10000=y | |||
| 459 | # | 468 | # |
| 460 | # CONFIG_WLAN_PRE80211 is not set | 469 | # CONFIG_WLAN_PRE80211 is not set |
| 461 | # CONFIG_WLAN_80211 is not set | 470 | # CONFIG_WLAN_80211 is not set |
| 471 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 462 | # CONFIG_WAN is not set | 472 | # CONFIG_WAN is not set |
| 463 | # CONFIG_PPP is not set | 473 | # CONFIG_PPP is not set |
| 464 | # CONFIG_SLIP is not set | 474 | # CONFIG_SLIP is not set |
| @@ -503,6 +513,7 @@ CONFIG_INPUT=y | |||
| 503 | # Character devices | 513 | # Character devices |
| 504 | # | 514 | # |
| 505 | # CONFIG_VT is not set | 515 | # CONFIG_VT is not set |
| 516 | CONFIG_DEVKMEM=y | ||
| 506 | # CONFIG_SERIAL_NONSTANDARD is not set | 517 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 507 | 518 | ||
| 508 | # | 519 | # |
| @@ -537,13 +548,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 537 | CONFIG_I2C_CHARDEV=y | 548 | CONFIG_I2C_CHARDEV=y |
| 538 | 549 | ||
| 539 | # | 550 | # |
| 540 | # I2C Algorithms | ||
| 541 | # | ||
| 542 | # CONFIG_I2C_ALGOBIT is not set | ||
| 543 | # CONFIG_I2C_ALGOPCF is not set | ||
| 544 | # CONFIG_I2C_ALGOPCA is not set | ||
| 545 | |||
| 546 | # | ||
| 547 | # I2C Hardware Bus support | 551 | # I2C Hardware Bus support |
| 548 | # | 552 | # |
| 549 | CONFIG_I2C_MPC=y | 553 | CONFIG_I2C_MPC=y |
| @@ -552,6 +556,7 @@ CONFIG_I2C_MPC=y | |||
| 552 | # CONFIG_I2C_SIMTEC is not set | 556 | # CONFIG_I2C_SIMTEC is not set |
| 553 | # CONFIG_I2C_TAOS_EVM is not set | 557 | # CONFIG_I2C_TAOS_EVM is not set |
| 554 | # CONFIG_I2C_STUB is not set | 558 | # CONFIG_I2C_STUB is not set |
| 559 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 555 | 560 | ||
| 556 | # | 561 | # |
| 557 | # Miscellaneous I2C Chip support | 562 | # Miscellaneous I2C Chip support |
| @@ -561,19 +566,13 @@ CONFIG_I2C_MPC=y | |||
| 561 | # CONFIG_SENSORS_PCF8574 is not set | 566 | # CONFIG_SENSORS_PCF8574 is not set |
| 562 | # CONFIG_PCF8575 is not set | 567 | # CONFIG_PCF8575 is not set |
| 563 | # CONFIG_SENSORS_PCF8591 is not set | 568 | # CONFIG_SENSORS_PCF8591 is not set |
| 564 | # CONFIG_TPS65010 is not set | ||
| 565 | # CONFIG_SENSORS_MAX6875 is not set | 569 | # CONFIG_SENSORS_MAX6875 is not set |
| 566 | # CONFIG_SENSORS_TSL2550 is not set | 570 | # CONFIG_SENSORS_TSL2550 is not set |
| 567 | # CONFIG_I2C_DEBUG_CORE is not set | 571 | # CONFIG_I2C_DEBUG_CORE is not set |
| 568 | # CONFIG_I2C_DEBUG_ALGO is not set | 572 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 569 | # CONFIG_I2C_DEBUG_BUS is not set | 573 | # CONFIG_I2C_DEBUG_BUS is not set |
| 570 | # CONFIG_I2C_DEBUG_CHIP is not set | 574 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 571 | |||
| 572 | # | ||
| 573 | # SPI support | ||
| 574 | # | ||
| 575 | # CONFIG_SPI is not set | 575 | # CONFIG_SPI is not set |
| 576 | # CONFIG_SPI_MASTER is not set | ||
| 577 | # CONFIG_W1 is not set | 576 | # CONFIG_W1 is not set |
| 578 | # CONFIG_POWER_SUPPLY is not set | 577 | # CONFIG_POWER_SUPPLY is not set |
| 579 | CONFIG_HWMON=y | 578 | CONFIG_HWMON=y |
| @@ -646,12 +645,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 646 | # Multifunction device drivers | 645 | # Multifunction device drivers |
| 647 | # | 646 | # |
| 648 | # CONFIG_MFD_SM501 is not set | 647 | # CONFIG_MFD_SM501 is not set |
| 648 | # CONFIG_HTC_PASIC3 is not set | ||
| 649 | 649 | ||
| 650 | # | 650 | # |
| 651 | # Multimedia devices | 651 | # Multimedia devices |
| 652 | # | 652 | # |
| 653 | |||
| 654 | # | ||
| 655 | # Multimedia core support | ||
| 656 | # | ||
| 653 | # CONFIG_VIDEO_DEV is not set | 657 | # CONFIG_VIDEO_DEV is not set |
| 654 | # CONFIG_DVB_CORE is not set | 658 | # CONFIG_DVB_CORE is not set |
| 659 | # CONFIG_VIDEO_MEDIA is not set | ||
| 660 | |||
| 661 | # | ||
| 662 | # Multimedia drivers | ||
| 663 | # | ||
| 655 | CONFIG_DAB=y | 664 | CONFIG_DAB=y |
| 656 | 665 | ||
| 657 | # | 666 | # |
| @@ -680,6 +689,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 680 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 689 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 681 | CONFIG_USB_ARCH_HAS_EHCI=y | 690 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 682 | # CONFIG_USB is not set | 691 | # CONFIG_USB is not set |
| 692 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 693 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 683 | 694 | ||
| 684 | # | 695 | # |
| 685 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -688,13 +699,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 688 | # CONFIG_MMC is not set | 699 | # CONFIG_MMC is not set |
| 689 | # CONFIG_MEMSTICK is not set | 700 | # CONFIG_MEMSTICK is not set |
| 690 | # CONFIG_NEW_LEDS is not set | 701 | # CONFIG_NEW_LEDS is not set |
| 702 | # CONFIG_ACCESSIBILITY is not set | ||
| 691 | # CONFIG_EDAC is not set | 703 | # CONFIG_EDAC is not set |
| 692 | # CONFIG_RTC_CLASS is not set | 704 | # CONFIG_RTC_CLASS is not set |
| 693 | # CONFIG_DMADEVICES is not set | 705 | # CONFIG_DMADEVICES is not set |
| 694 | |||
| 695 | # | ||
| 696 | # Userspace I/O | ||
| 697 | # | ||
| 698 | # CONFIG_UIO is not set | 706 | # CONFIG_UIO is not set |
| 699 | 707 | ||
| 700 | # | 708 | # |
| @@ -714,7 +722,6 @@ CONFIG_FS_MBCACHE=y | |||
| 714 | # CONFIG_JFS_FS is not set | 722 | # CONFIG_JFS_FS is not set |
| 715 | # CONFIG_FS_POSIX_ACL is not set | 723 | # CONFIG_FS_POSIX_ACL is not set |
| 716 | # CONFIG_XFS_FS is not set | 724 | # CONFIG_XFS_FS is not set |
| 717 | # CONFIG_GFS2_FS is not set | ||
| 718 | # CONFIG_OCFS2_FS is not set | 725 | # CONFIG_OCFS2_FS is not set |
| 719 | CONFIG_DNOTIFY=y | 726 | CONFIG_DNOTIFY=y |
| 720 | CONFIG_INOTIFY=y | 727 | CONFIG_INOTIFY=y |
| @@ -772,7 +779,6 @@ CONFIG_NFS_FS=y | |||
| 772 | CONFIG_NFS_V3=y | 779 | CONFIG_NFS_V3=y |
| 773 | # CONFIG_NFS_V3_ACL is not set | 780 | # CONFIG_NFS_V3_ACL is not set |
| 774 | CONFIG_NFS_V4=y | 781 | CONFIG_NFS_V4=y |
| 775 | # CONFIG_NFS_DIRECTIO is not set | ||
| 776 | # CONFIG_NFSD is not set | 782 | # CONFIG_NFSD is not set |
| 777 | CONFIG_ROOT_NFS=y | 783 | CONFIG_ROOT_NFS=y |
| 778 | CONFIG_LOCKD=y | 784 | CONFIG_LOCKD=y |
| @@ -817,6 +823,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 817 | # Library routines | 823 | # Library routines |
| 818 | # | 824 | # |
| 819 | CONFIG_BITREVERSE=y | 825 | CONFIG_BITREVERSE=y |
| 826 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 820 | # CONFIG_CRC_CCITT is not set | 827 | # CONFIG_CRC_CCITT is not set |
| 821 | # CONFIG_CRC16 is not set | 828 | # CONFIG_CRC16 is not set |
| 822 | # CONFIG_CRC_ITU_T is not set | 829 | # CONFIG_CRC_ITU_T is not set |
| @@ -827,6 +834,7 @@ CONFIG_PLIST=y | |||
| 827 | CONFIG_HAS_IOMEM=y | 834 | CONFIG_HAS_IOMEM=y |
| 828 | CONFIG_HAS_IOPORT=y | 835 | CONFIG_HAS_IOPORT=y |
| 829 | CONFIG_HAS_DMA=y | 836 | CONFIG_HAS_DMA=y |
| 837 | CONFIG_HAVE_LMB=y | ||
| 830 | 838 | ||
| 831 | # | 839 | # |
| 832 | # Kernel hacking | 840 | # Kernel hacking |
| @@ -834,6 +842,7 @@ CONFIG_HAS_DMA=y | |||
| 834 | # CONFIG_PRINTK_TIME is not set | 842 | # CONFIG_PRINTK_TIME is not set |
| 835 | CONFIG_ENABLE_WARN_DEPRECATED=y | 843 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 836 | CONFIG_ENABLE_MUST_CHECK=y | 844 | CONFIG_ENABLE_MUST_CHECK=y |
| 845 | CONFIG_FRAME_WARN=1024 | ||
| 837 | # CONFIG_MAGIC_SYSRQ is not set | 846 | # CONFIG_MAGIC_SYSRQ is not set |
| 838 | # CONFIG_UNUSED_SYMBOLS is not set | 847 | # CONFIG_UNUSED_SYMBOLS is not set |
| 839 | # CONFIG_DEBUG_FS is not set | 848 | # CONFIG_DEBUG_FS is not set |
| @@ -841,6 +850,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 841 | # CONFIG_DEBUG_KERNEL is not set | 850 | # CONFIG_DEBUG_KERNEL is not set |
| 842 | # CONFIG_DEBUG_BUGVERBOSE is not set | 851 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 843 | # CONFIG_SAMPLES is not set | 852 | # CONFIG_SAMPLES is not set |
| 853 | # CONFIG_IRQSTACKS is not set | ||
| 844 | # CONFIG_PPC_EARLY_DEBUG is not set | 854 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 845 | 855 | ||
| 846 | # | 856 | # |
| @@ -850,50 +860,80 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 850 | # CONFIG_SECURITY is not set | 860 | # CONFIG_SECURITY is not set |
| 851 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 861 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 852 | CONFIG_CRYPTO=y | 862 | CONFIG_CRYPTO=y |
| 863 | |||
| 864 | # | ||
| 865 | # Crypto core or helper | ||
| 866 | # | ||
| 853 | CONFIG_CRYPTO_ALGAPI=y | 867 | CONFIG_CRYPTO_ALGAPI=y |
| 854 | CONFIG_CRYPTO_BLKCIPHER=y | 868 | CONFIG_CRYPTO_BLKCIPHER=y |
| 855 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 856 | CONFIG_CRYPTO_MANAGER=y | 869 | CONFIG_CRYPTO_MANAGER=y |
| 870 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 871 | # CONFIG_CRYPTO_NULL is not set | ||
| 872 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 873 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 874 | # CONFIG_CRYPTO_TEST is not set | ||
| 875 | |||
| 876 | # | ||
| 877 | # Authenticated Encryption with Associated Data | ||
| 878 | # | ||
| 879 | # CONFIG_CRYPTO_CCM is not set | ||
| 880 | # CONFIG_CRYPTO_GCM is not set | ||
| 881 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 882 | |||
| 883 | # | ||
| 884 | # Block modes | ||
| 885 | # | ||
| 886 | CONFIG_CRYPTO_CBC=y | ||
| 887 | # CONFIG_CRYPTO_CTR is not set | ||
| 888 | # CONFIG_CRYPTO_CTS is not set | ||
| 889 | CONFIG_CRYPTO_ECB=m | ||
| 890 | # CONFIG_CRYPTO_LRW is not set | ||
| 891 | CONFIG_CRYPTO_PCBC=m | ||
| 892 | # CONFIG_CRYPTO_XTS is not set | ||
| 893 | |||
| 894 | # | ||
| 895 | # Hash modes | ||
| 896 | # | ||
| 857 | # CONFIG_CRYPTO_HMAC is not set | 897 | # CONFIG_CRYPTO_HMAC is not set |
| 858 | # CONFIG_CRYPTO_XCBC is not set | 898 | # CONFIG_CRYPTO_XCBC is not set |
| 859 | # CONFIG_CRYPTO_NULL is not set | 899 | |
| 900 | # | ||
| 901 | # Digest | ||
| 902 | # | ||
| 903 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 860 | # CONFIG_CRYPTO_MD4 is not set | 904 | # CONFIG_CRYPTO_MD4 is not set |
| 861 | CONFIG_CRYPTO_MD5=y | 905 | CONFIG_CRYPTO_MD5=y |
| 906 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 862 | # CONFIG_CRYPTO_SHA1 is not set | 907 | # CONFIG_CRYPTO_SHA1 is not set |
| 863 | # CONFIG_CRYPTO_SHA256 is not set | 908 | # CONFIG_CRYPTO_SHA256 is not set |
| 864 | # CONFIG_CRYPTO_SHA512 is not set | 909 | # CONFIG_CRYPTO_SHA512 is not set |
| 865 | # CONFIG_CRYPTO_WP512 is not set | ||
| 866 | # CONFIG_CRYPTO_TGR192 is not set | 910 | # CONFIG_CRYPTO_TGR192 is not set |
| 867 | # CONFIG_CRYPTO_GF128MUL is not set | 911 | # CONFIG_CRYPTO_WP512 is not set |
| 868 | CONFIG_CRYPTO_ECB=m | 912 | |
| 869 | CONFIG_CRYPTO_CBC=y | 913 | # |
| 870 | CONFIG_CRYPTO_PCBC=m | 914 | # Ciphers |
| 871 | # CONFIG_CRYPTO_LRW is not set | 915 | # |
| 872 | # CONFIG_CRYPTO_XTS is not set | ||
| 873 | # CONFIG_CRYPTO_CTR is not set | ||
| 874 | # CONFIG_CRYPTO_GCM is not set | ||
| 875 | # CONFIG_CRYPTO_CCM is not set | ||
| 876 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 877 | CONFIG_CRYPTO_DES=y | ||
| 878 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 881 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 882 | # CONFIG_CRYPTO_AES is not set | 916 | # CONFIG_CRYPTO_AES is not set |
| 917 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 918 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 919 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 920 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 883 | # CONFIG_CRYPTO_CAST5 is not set | 921 | # CONFIG_CRYPTO_CAST5 is not set |
| 884 | # CONFIG_CRYPTO_CAST6 is not set | 922 | # CONFIG_CRYPTO_CAST6 is not set |
| 885 | # CONFIG_CRYPTO_TEA is not set | 923 | CONFIG_CRYPTO_DES=y |
| 886 | # CONFIG_CRYPTO_ARC4 is not set | 924 | # CONFIG_CRYPTO_FCRYPT is not set |
| 887 | # CONFIG_CRYPTO_KHAZAD is not set | 925 | # CONFIG_CRYPTO_KHAZAD is not set |
| 888 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 889 | # CONFIG_CRYPTO_SEED is not set | ||
| 890 | # CONFIG_CRYPTO_SALSA20 is not set | 926 | # CONFIG_CRYPTO_SALSA20 is not set |
| 927 | # CONFIG_CRYPTO_SEED is not set | ||
| 928 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 929 | # CONFIG_CRYPTO_TEA is not set | ||
| 930 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 931 | |||
| 932 | # | ||
| 933 | # Compression | ||
| 934 | # | ||
| 891 | # CONFIG_CRYPTO_DEFLATE is not set | 935 | # CONFIG_CRYPTO_DEFLATE is not set |
| 892 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 894 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 895 | # CONFIG_CRYPTO_TEST is not set | ||
| 896 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 897 | # CONFIG_CRYPTO_LZO is not set | 936 | # CONFIG_CRYPTO_LZO is not set |
| 898 | CONFIG_CRYPTO_HW=y | 937 | CONFIG_CRYPTO_HW=y |
| 899 | # CONFIG_PPC_CLOCK is not set | 938 | # CONFIG_PPC_CLOCK is not set |
| 939 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index a6331769d88f..0d448556f53a 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:24 2008 | 4 | # Tue Jun 10 09:17:12 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -211,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 226 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_SYSCALL is not set | 241 | # CONFIG_PCI_SYSCALL is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,11 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 259 | ||
| 252 | # | 260 | # |
| 253 | # Networking | 261 | # Networking |
| @@ -290,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -345,6 +351,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 345 | # CONFIG_CONNECTOR is not set | 351 | # CONFIG_CONNECTOR is not set |
| 346 | # CONFIG_MTD is not set | 352 | # CONFIG_MTD is not set |
| 347 | CONFIG_OF_DEVICE=y | 353 | CONFIG_OF_DEVICE=y |
| 354 | CONFIG_OF_I2C=y | ||
| 348 | # CONFIG_PARPORT is not set | 355 | # CONFIG_PARPORT is not set |
| 349 | CONFIG_BLK_DEV=y | 356 | CONFIG_BLK_DEV=y |
| 350 | # CONFIG_BLK_DEV_FD is not set | 357 | # CONFIG_BLK_DEV_FD is not set |
| @@ -352,6 +359,7 @@ CONFIG_BLK_DEV=y | |||
| 352 | CONFIG_BLK_DEV_LOOP=y | 359 | CONFIG_BLK_DEV_LOOP=y |
| 353 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 360 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 354 | # CONFIG_BLK_DEV_NBD is not set | 361 | # CONFIG_BLK_DEV_NBD is not set |
| 362 | # CONFIG_BLK_DEV_UB is not set | ||
| 355 | CONFIG_BLK_DEV_RAM=y | 363 | CONFIG_BLK_DEV_RAM=y |
| 356 | CONFIG_BLK_DEV_RAM_COUNT=16 | 364 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 357 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 365 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| @@ -406,8 +414,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 406 | # CONFIG_SCSI_DEBUG is not set | 414 | # CONFIG_SCSI_DEBUG is not set |
| 407 | CONFIG_ATA=y | 415 | CONFIG_ATA=y |
| 408 | # CONFIG_ATA_NONSTANDARD is not set | 416 | # CONFIG_ATA_NONSTANDARD is not set |
| 409 | # CONFIG_SATA_MV is not set | 417 | CONFIG_SATA_PMP=y |
| 410 | CONFIG_SATA_FSL=y | 418 | CONFIG_SATA_FSL=y |
| 419 | CONFIG_ATA_SFF=y | ||
| 420 | # CONFIG_SATA_MV is not set | ||
| 411 | # CONFIG_PATA_PLATFORM is not set | 421 | # CONFIG_PATA_PLATFORM is not set |
| 412 | CONFIG_MD=y | 422 | CONFIG_MD=y |
| 413 | CONFIG_BLK_DEV_MD=y | 423 | CONFIG_BLK_DEV_MD=y |
| @@ -444,7 +454,7 @@ CONFIG_MARVELL_PHY=y | |||
| 444 | # CONFIG_BROADCOM_PHY is not set | 454 | # CONFIG_BROADCOM_PHY is not set |
| 445 | # CONFIG_ICPLUS_PHY is not set | 455 | # CONFIG_ICPLUS_PHY is not set |
| 446 | # CONFIG_REALTEK_PHY is not set | 456 | # CONFIG_REALTEK_PHY is not set |
| 447 | # CONFIG_FIXED_PHY is not set | 457 | CONFIG_FIXED_PHY=y |
| 448 | # CONFIG_MDIO_BITBANG is not set | 458 | # CONFIG_MDIO_BITBANG is not set |
| 449 | CONFIG_NET_ETHERNET=y | 459 | CONFIG_NET_ETHERNET=y |
| 450 | CONFIG_MII=y | 460 | CONFIG_MII=y |
| @@ -464,6 +474,16 @@ CONFIG_GFAR_NAPI=y | |||
| 464 | # | 474 | # |
| 465 | # CONFIG_WLAN_PRE80211 is not set | 475 | # CONFIG_WLAN_PRE80211 is not set |
| 466 | # CONFIG_WLAN_80211 is not set | 476 | # CONFIG_WLAN_80211 is not set |
| 477 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # USB Network Adapters | ||
| 481 | # | ||
| 482 | # CONFIG_USB_CATC is not set | ||
| 483 | # CONFIG_USB_KAWETH is not set | ||
| 484 | # CONFIG_USB_PEGASUS is not set | ||
| 485 | # CONFIG_USB_RTL8150 is not set | ||
| 486 | # CONFIG_USB_USBNET is not set | ||
| 467 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
| 468 | # CONFIG_PPP is not set | 488 | # CONFIG_PPP is not set |
| 469 | # CONFIG_SLIP is not set | 489 | # CONFIG_SLIP is not set |
| @@ -508,6 +528,7 @@ CONFIG_INPUT=y | |||
| 508 | # Character devices | 528 | # Character devices |
| 509 | # | 529 | # |
| 510 | # CONFIG_VT is not set | 530 | # CONFIG_VT is not set |
| 531 | CONFIG_DEVKMEM=y | ||
| 511 | # CONFIG_SERIAL_NONSTANDARD is not set | 532 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 512 | 533 | ||
| 513 | # | 534 | # |
| @@ -542,13 +563,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 542 | CONFIG_I2C_CHARDEV=y | 563 | CONFIG_I2C_CHARDEV=y |
| 543 | 564 | ||
| 544 | # | 565 | # |
| 545 | # I2C Algorithms | ||
| 546 | # | ||
| 547 | # CONFIG_I2C_ALGOBIT is not set | ||
| 548 | # CONFIG_I2C_ALGOPCF is not set | ||
| 549 | # CONFIG_I2C_ALGOPCA is not set | ||
| 550 | |||
| 551 | # | ||
| 552 | # I2C Hardware Bus support | 566 | # I2C Hardware Bus support |
| 553 | # | 567 | # |
| 554 | CONFIG_I2C_MPC=y | 568 | CONFIG_I2C_MPC=y |
| @@ -557,6 +571,8 @@ CONFIG_I2C_MPC=y | |||
| 557 | # CONFIG_I2C_SIMTEC is not set | 571 | # CONFIG_I2C_SIMTEC is not set |
| 558 | # CONFIG_I2C_TAOS_EVM is not set | 572 | # CONFIG_I2C_TAOS_EVM is not set |
| 559 | # CONFIG_I2C_STUB is not set | 573 | # CONFIG_I2C_STUB is not set |
| 574 | # CONFIG_I2C_TINY_USB is not set | ||
| 575 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 560 | 576 | ||
| 561 | # | 577 | # |
| 562 | # Miscellaneous I2C Chip support | 578 | # Miscellaneous I2C Chip support |
| @@ -566,19 +582,13 @@ CONFIG_I2C_MPC=y | |||
| 566 | # CONFIG_SENSORS_PCF8574 is not set | 582 | # CONFIG_SENSORS_PCF8574 is not set |
| 567 | # CONFIG_PCF8575 is not set | 583 | # CONFIG_PCF8575 is not set |
| 568 | # CONFIG_SENSORS_PCF8591 is not set | 584 | # CONFIG_SENSORS_PCF8591 is not set |
| 569 | # CONFIG_TPS65010 is not set | ||
| 570 | # CONFIG_SENSORS_MAX6875 is not set | 585 | # CONFIG_SENSORS_MAX6875 is not set |
| 571 | # CONFIG_SENSORS_TSL2550 is not set | 586 | # CONFIG_SENSORS_TSL2550 is not set |
| 572 | # CONFIG_I2C_DEBUG_CORE is not set | 587 | # CONFIG_I2C_DEBUG_CORE is not set |
| 573 | # CONFIG_I2C_DEBUG_ALGO is not set | 588 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 574 | # CONFIG_I2C_DEBUG_BUS is not set | 589 | # CONFIG_I2C_DEBUG_BUS is not set |
| 575 | # CONFIG_I2C_DEBUG_CHIP is not set | 590 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 576 | |||
| 577 | # | ||
| 578 | # SPI support | ||
| 579 | # | ||
| 580 | # CONFIG_SPI is not set | 591 | # CONFIG_SPI is not set |
| 581 | # CONFIG_SPI_MASTER is not set | ||
| 582 | # CONFIG_W1 is not set | 592 | # CONFIG_W1 is not set |
| 583 | # CONFIG_POWER_SUPPLY is not set | 593 | # CONFIG_POWER_SUPPLY is not set |
| 584 | CONFIG_HWMON=y | 594 | CONFIG_HWMON=y |
| @@ -642,6 +652,11 @@ CONFIG_WATCHDOG=y | |||
| 642 | CONFIG_83xx_WDT=y | 652 | CONFIG_83xx_WDT=y |
| 643 | 653 | ||
| 644 | # | 654 | # |
| 655 | # USB-based Watchdog Cards | ||
| 656 | # | ||
| 657 | # CONFIG_USBPCWATCHDOG is not set | ||
| 658 | |||
| 659 | # | ||
| 645 | # Sonics Silicon Backplane | 660 | # Sonics Silicon Backplane |
| 646 | # | 661 | # |
| 647 | CONFIG_SSB_POSSIBLE=y | 662 | CONFIG_SSB_POSSIBLE=y |
| @@ -651,13 +666,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 651 | # Multifunction device drivers | 666 | # Multifunction device drivers |
| 652 | # | 667 | # |
| 653 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
| 669 | # CONFIG_HTC_PASIC3 is not set | ||
| 654 | 670 | ||
| 655 | # | 671 | # |
| 656 | # Multimedia devices | 672 | # Multimedia devices |
| 657 | # | 673 | # |
| 674 | |||
| 675 | # | ||
| 676 | # Multimedia core support | ||
| 677 | # | ||
| 658 | # CONFIG_VIDEO_DEV is not set | 678 | # CONFIG_VIDEO_DEV is not set |
| 659 | # CONFIG_DVB_CORE is not set | 679 | # CONFIG_DVB_CORE is not set |
| 680 | # CONFIG_VIDEO_MEDIA is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Multimedia drivers | ||
| 684 | # | ||
| 660 | CONFIG_DAB=y | 685 | CONFIG_DAB=y |
| 686 | # CONFIG_USB_DABUSB is not set | ||
| 661 | 687 | ||
| 662 | # | 688 | # |
| 663 | # Graphics support | 689 | # Graphics support |
| @@ -680,6 +706,14 @@ CONFIG_HID_SUPPORT=y | |||
| 680 | CONFIG_HID=y | 706 | CONFIG_HID=y |
| 681 | # CONFIG_HID_DEBUG is not set | 707 | # CONFIG_HID_DEBUG is not set |
| 682 | # CONFIG_HIDRAW is not set | 708 | # CONFIG_HIDRAW is not set |
| 709 | |||
| 710 | # | ||
| 711 | # USB Input Devices | ||
| 712 | # | ||
| 713 | CONFIG_USB_HID=y | ||
| 714 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 715 | # CONFIG_HID_FF is not set | ||
| 716 | # CONFIG_USB_HIDDEV is not set | ||
| 683 | CONFIG_USB_SUPPORT=y | 717 | CONFIG_USB_SUPPORT=y |
| 684 | CONFIG_USB_ARCH_HAS_HCD=y | 718 | CONFIG_USB_ARCH_HAS_HCD=y |
| 685 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 719 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| @@ -695,33 +729,83 @@ CONFIG_USB=y | |||
| 695 | CONFIG_USB_DEVICE_CLASS=y | 729 | CONFIG_USB_DEVICE_CLASS=y |
| 696 | # CONFIG_USB_DYNAMIC_MINORS is not set | 730 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 697 | # CONFIG_USB_OTG is not set | 731 | # CONFIG_USB_OTG is not set |
| 732 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 733 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 698 | 734 | ||
| 699 | # | 735 | # |
| 700 | # USB Host Controller Drivers | 736 | # USB Host Controller Drivers |
| 701 | # | 737 | # |
| 738 | # CONFIG_USB_C67X00_HCD is not set | ||
| 702 | CONFIG_USB_EHCI_HCD=y | 739 | CONFIG_USB_EHCI_HCD=y |
| 703 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 740 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 704 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 741 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 705 | CONFIG_USB_EHCI_FSL=y | 742 | CONFIG_USB_EHCI_FSL=y |
| 706 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 743 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 707 | # CONFIG_USB_ISP116X_HCD is not set | 744 | # CONFIG_USB_ISP116X_HCD is not set |
| 745 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 708 | # CONFIG_USB_SL811_HCD is not set | 746 | # CONFIG_USB_SL811_HCD is not set |
| 709 | # CONFIG_USB_R8A66597_HCD is not set | 747 | # CONFIG_USB_R8A66597_HCD is not set |
| 710 | 748 | ||
| 711 | # | 749 | # |
| 750 | # USB Device Class drivers | ||
| 751 | # | ||
| 752 | # CONFIG_USB_ACM is not set | ||
| 753 | # CONFIG_USB_PRINTER is not set | ||
| 754 | # CONFIG_USB_WDM is not set | ||
| 755 | |||
| 756 | # | ||
| 712 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 757 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 713 | # | 758 | # |
| 759 | |||
| 760 | # | ||
| 761 | # may also be needed; see USB_STORAGE Help for more information | ||
| 762 | # | ||
| 763 | # CONFIG_USB_STORAGE is not set | ||
| 764 | # CONFIG_USB_LIBUSUAL is not set | ||
| 765 | |||
| 766 | # | ||
| 767 | # USB Imaging devices | ||
| 768 | # | ||
| 769 | # CONFIG_USB_MDC800 is not set | ||
| 770 | # CONFIG_USB_MICROTEK is not set | ||
| 771 | CONFIG_USB_MON=y | ||
| 772 | |||
| 773 | # | ||
| 774 | # USB port drivers | ||
| 775 | # | ||
| 776 | # CONFIG_USB_SERIAL is not set | ||
| 777 | |||
| 778 | # | ||
| 779 | # USB Miscellaneous drivers | ||
| 780 | # | ||
| 781 | # CONFIG_USB_EMI62 is not set | ||
| 782 | # CONFIG_USB_EMI26 is not set | ||
| 783 | # CONFIG_USB_ADUTUX is not set | ||
| 784 | # CONFIG_USB_AUERSWALD is not set | ||
| 785 | # CONFIG_USB_RIO500 is not set | ||
| 786 | # CONFIG_USB_LEGOTOWER is not set | ||
| 787 | # CONFIG_USB_LCD is not set | ||
| 788 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 789 | # CONFIG_USB_LED is not set | ||
| 790 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 791 | # CONFIG_USB_CYTHERM is not set | ||
| 792 | # CONFIG_USB_PHIDGET is not set | ||
| 793 | # CONFIG_USB_IDMOUSE is not set | ||
| 794 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 795 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 796 | # CONFIG_USB_SISUSBVGA is not set | ||
| 797 | # CONFIG_USB_LD is not set | ||
| 798 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 799 | # CONFIG_USB_IOWARRIOR is not set | ||
| 800 | # CONFIG_USB_ISIGHTFW is not set | ||
| 714 | # CONFIG_USB_GADGET is not set | 801 | # CONFIG_USB_GADGET is not set |
| 715 | # CONFIG_MMC is not set | 802 | # CONFIG_MMC is not set |
| 716 | # CONFIG_MEMSTICK is not set | 803 | # CONFIG_MEMSTICK is not set |
| 717 | # CONFIG_NEW_LEDS is not set | 804 | # CONFIG_NEW_LEDS is not set |
| 805 | # CONFIG_ACCESSIBILITY is not set | ||
| 718 | # CONFIG_EDAC is not set | 806 | # CONFIG_EDAC is not set |
| 719 | # CONFIG_RTC_CLASS is not set | 807 | # CONFIG_RTC_CLASS is not set |
| 720 | # CONFIG_DMADEVICES is not set | 808 | # CONFIG_DMADEVICES is not set |
| 721 | |||
| 722 | # | ||
| 723 | # Userspace I/O | ||
| 724 | # | ||
| 725 | # CONFIG_UIO is not set | 809 | # CONFIG_UIO is not set |
| 726 | 810 | ||
| 727 | # | 811 | # |
| @@ -741,7 +825,6 @@ CONFIG_FS_MBCACHE=y | |||
| 741 | # CONFIG_JFS_FS is not set | 825 | # CONFIG_JFS_FS is not set |
| 742 | # CONFIG_FS_POSIX_ACL is not set | 826 | # CONFIG_FS_POSIX_ACL is not set |
| 743 | # CONFIG_XFS_FS is not set | 827 | # CONFIG_XFS_FS is not set |
| 744 | # CONFIG_GFS2_FS is not set | ||
| 745 | # CONFIG_OCFS2_FS is not set | 828 | # CONFIG_OCFS2_FS is not set |
| 746 | CONFIG_DNOTIFY=y | 829 | CONFIG_DNOTIFY=y |
| 747 | CONFIG_INOTIFY=y | 830 | CONFIG_INOTIFY=y |
| @@ -799,7 +882,6 @@ CONFIG_NFS_FS=y | |||
| 799 | CONFIG_NFS_V3=y | 882 | CONFIG_NFS_V3=y |
| 800 | # CONFIG_NFS_V3_ACL is not set | 883 | # CONFIG_NFS_V3_ACL is not set |
| 801 | CONFIG_NFS_V4=y | 884 | CONFIG_NFS_V4=y |
| 802 | # CONFIG_NFS_DIRECTIO is not set | ||
| 803 | # CONFIG_NFSD is not set | 885 | # CONFIG_NFSD is not set |
| 804 | CONFIG_ROOT_NFS=y | 886 | CONFIG_ROOT_NFS=y |
| 805 | CONFIG_LOCKD=y | 887 | CONFIG_LOCKD=y |
| @@ -844,6 +926,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 844 | # Library routines | 926 | # Library routines |
| 845 | # | 927 | # |
| 846 | CONFIG_BITREVERSE=y | 928 | CONFIG_BITREVERSE=y |
| 929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 847 | # CONFIG_CRC_CCITT is not set | 930 | # CONFIG_CRC_CCITT is not set |
| 848 | # CONFIG_CRC16 is not set | 931 | # CONFIG_CRC16 is not set |
| 849 | # CONFIG_CRC_ITU_T is not set | 932 | # CONFIG_CRC_ITU_T is not set |
| @@ -854,6 +937,7 @@ CONFIG_PLIST=y | |||
| 854 | CONFIG_HAS_IOMEM=y | 937 | CONFIG_HAS_IOMEM=y |
| 855 | CONFIG_HAS_IOPORT=y | 938 | CONFIG_HAS_IOPORT=y |
| 856 | CONFIG_HAS_DMA=y | 939 | CONFIG_HAS_DMA=y |
| 940 | CONFIG_HAVE_LMB=y | ||
| 857 | 941 | ||
| 858 | # | 942 | # |
| 859 | # Kernel hacking | 943 | # Kernel hacking |
| @@ -861,6 +945,7 @@ CONFIG_HAS_DMA=y | |||
| 861 | # CONFIG_PRINTK_TIME is not set | 945 | # CONFIG_PRINTK_TIME is not set |
| 862 | CONFIG_ENABLE_WARN_DEPRECATED=y | 946 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 863 | # CONFIG_ENABLE_MUST_CHECK is not set | 947 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 948 | CONFIG_FRAME_WARN=1024 | ||
| 864 | # CONFIG_MAGIC_SYSRQ is not set | 949 | # CONFIG_MAGIC_SYSRQ is not set |
| 865 | # CONFIG_UNUSED_SYMBOLS is not set | 950 | # CONFIG_UNUSED_SYMBOLS is not set |
| 866 | # CONFIG_DEBUG_FS is not set | 951 | # CONFIG_DEBUG_FS is not set |
| @@ -868,6 +953,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
| 868 | # CONFIG_DEBUG_KERNEL is not set | 953 | # CONFIG_DEBUG_KERNEL is not set |
| 869 | # CONFIG_DEBUG_BUGVERBOSE is not set | 954 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 870 | # CONFIG_SAMPLES is not set | 955 | # CONFIG_SAMPLES is not set |
| 956 | # CONFIG_IRQSTACKS is not set | ||
| 871 | # CONFIG_PPC_EARLY_DEBUG is not set | 957 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 872 | 958 | ||
| 873 | # | 959 | # |
| @@ -881,50 +967,80 @@ CONFIG_ASYNC_CORE=y | |||
| 881 | CONFIG_ASYNC_MEMCPY=y | 967 | CONFIG_ASYNC_MEMCPY=y |
| 882 | CONFIG_ASYNC_XOR=y | 968 | CONFIG_ASYNC_XOR=y |
| 883 | CONFIG_CRYPTO=y | 969 | CONFIG_CRYPTO=y |
| 970 | |||
| 971 | # | ||
| 972 | # Crypto core or helper | ||
| 973 | # | ||
| 884 | CONFIG_CRYPTO_ALGAPI=y | 974 | CONFIG_CRYPTO_ALGAPI=y |
| 885 | CONFIG_CRYPTO_BLKCIPHER=y | 975 | CONFIG_CRYPTO_BLKCIPHER=y |
| 886 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 887 | CONFIG_CRYPTO_MANAGER=y | 976 | CONFIG_CRYPTO_MANAGER=y |
| 977 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 978 | # CONFIG_CRYPTO_NULL is not set | ||
| 979 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 980 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 981 | # CONFIG_CRYPTO_TEST is not set | ||
| 982 | |||
| 983 | # | ||
| 984 | # Authenticated Encryption with Associated Data | ||
| 985 | # | ||
| 986 | # CONFIG_CRYPTO_CCM is not set | ||
| 987 | # CONFIG_CRYPTO_GCM is not set | ||
| 988 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 989 | |||
| 990 | # | ||
| 991 | # Block modes | ||
| 992 | # | ||
| 993 | CONFIG_CRYPTO_CBC=y | ||
| 994 | # CONFIG_CRYPTO_CTR is not set | ||
| 995 | # CONFIG_CRYPTO_CTS is not set | ||
| 996 | CONFIG_CRYPTO_ECB=m | ||
| 997 | # CONFIG_CRYPTO_LRW is not set | ||
| 998 | CONFIG_CRYPTO_PCBC=m | ||
| 999 | # CONFIG_CRYPTO_XTS is not set | ||
| 1000 | |||
| 1001 | # | ||
| 1002 | # Hash modes | ||
| 1003 | # | ||
| 888 | # CONFIG_CRYPTO_HMAC is not set | 1004 | # CONFIG_CRYPTO_HMAC is not set |
| 889 | # CONFIG_CRYPTO_XCBC is not set | 1005 | # CONFIG_CRYPTO_XCBC is not set |
| 890 | # CONFIG_CRYPTO_NULL is not set | 1006 | |
| 1007 | # | ||
| 1008 | # Digest | ||
| 1009 | # | ||
| 1010 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 891 | # CONFIG_CRYPTO_MD4 is not set | 1011 | # CONFIG_CRYPTO_MD4 is not set |
| 892 | CONFIG_CRYPTO_MD5=y | 1012 | CONFIG_CRYPTO_MD5=y |
| 1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_SHA1 is not set | 1014 | # CONFIG_CRYPTO_SHA1 is not set |
| 894 | # CONFIG_CRYPTO_SHA256 is not set | 1015 | # CONFIG_CRYPTO_SHA256 is not set |
| 895 | # CONFIG_CRYPTO_SHA512 is not set | 1016 | # CONFIG_CRYPTO_SHA512 is not set |
| 896 | # CONFIG_CRYPTO_WP512 is not set | ||
| 897 | # CONFIG_CRYPTO_TGR192 is not set | 1017 | # CONFIG_CRYPTO_TGR192 is not set |
| 898 | # CONFIG_CRYPTO_GF128MUL is not set | 1018 | # CONFIG_CRYPTO_WP512 is not set |
| 899 | CONFIG_CRYPTO_ECB=m | 1019 | |
| 900 | CONFIG_CRYPTO_CBC=y | 1020 | # |
| 901 | CONFIG_CRYPTO_PCBC=m | 1021 | # Ciphers |
| 902 | # CONFIG_CRYPTO_LRW is not set | 1022 | # |
| 903 | # CONFIG_CRYPTO_XTS is not set | ||
| 904 | # CONFIG_CRYPTO_CTR is not set | ||
| 905 | # CONFIG_CRYPTO_GCM is not set | ||
| 906 | # CONFIG_CRYPTO_CCM is not set | ||
| 907 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 908 | CONFIG_CRYPTO_DES=y | ||
| 909 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 910 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 911 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 912 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 913 | # CONFIG_CRYPTO_AES is not set | 1023 | # CONFIG_CRYPTO_AES is not set |
| 1024 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1025 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1026 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1027 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 914 | # CONFIG_CRYPTO_CAST5 is not set | 1028 | # CONFIG_CRYPTO_CAST5 is not set |
| 915 | # CONFIG_CRYPTO_CAST6 is not set | 1029 | # CONFIG_CRYPTO_CAST6 is not set |
| 916 | # CONFIG_CRYPTO_TEA is not set | 1030 | CONFIG_CRYPTO_DES=y |
| 917 | # CONFIG_CRYPTO_ARC4 is not set | 1031 | # CONFIG_CRYPTO_FCRYPT is not set |
| 918 | # CONFIG_CRYPTO_KHAZAD is not set | 1032 | # CONFIG_CRYPTO_KHAZAD is not set |
| 919 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 920 | # CONFIG_CRYPTO_SEED is not set | ||
| 921 | # CONFIG_CRYPTO_SALSA20 is not set | 1033 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1034 | # CONFIG_CRYPTO_SEED is not set | ||
| 1035 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1036 | # CONFIG_CRYPTO_TEA is not set | ||
| 1037 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1038 | |||
| 1039 | # | ||
| 1040 | # Compression | ||
| 1041 | # | ||
| 922 | # CONFIG_CRYPTO_DEFLATE is not set | 1042 | # CONFIG_CRYPTO_DEFLATE is not set |
| 923 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 924 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 925 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 926 | # CONFIG_CRYPTO_TEST is not set | ||
| 927 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 928 | # CONFIG_CRYPTO_LZO is not set | 1043 | # CONFIG_CRYPTO_LZO is not set |
| 929 | CONFIG_CRYPTO_HW=y | 1044 | CONFIG_CRYPTO_HW=y |
| 930 | # CONFIG_PPC_CLOCK is not set | 1045 | # CONFIG_PPC_CLOCK is not set |
| 1046 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index 1f1518229f6d..1752918be2c1 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:38 2008 | 4 | # Mon Jun 9 08:52:30 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -109,12 +112,14 @@ CONFIG_SLAB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| 115 | # CONFIG_TINY_SHMEM is not set | 119 | # CONFIG_TINY_SHMEM is not set |
| 116 | CONFIG_BASE_SMALL=0 | 120 | CONFIG_BASE_SMALL=0 |
| 117 | CONFIG_MODULES=y | 121 | CONFIG_MODULES=y |
| 122 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 118 | CONFIG_MODULE_UNLOAD=y | 123 | CONFIG_MODULE_UNLOAD=y |
| 119 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 120 | # CONFIG_MODVERSIONS is not set | 125 | # CONFIG_MODVERSIONS is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | CONFIG_PROC_DEVICETREE=y | 224 | CONFIG_PROC_DEVICETREE=y |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -232,6 +239,7 @@ CONFIG_FSL_SOC=y | |||
| 232 | # CONFIG_PCI_SYSCALL is not set | 239 | # CONFIG_PCI_SYSCALL is not set |
| 233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 234 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 235 | 243 | ||
| 236 | # | 244 | # |
| 237 | # Advanced setup | 245 | # Advanced setup |
| @@ -241,11 +249,11 @@ CONFIG_FSL_SOC=y | |||
| 241 | # | 249 | # |
| 242 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 243 | # | 251 | # |
| 244 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 245 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 246 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 247 | CONFIG_TASK_SIZE=0xc0000000 | 256 | CONFIG_TASK_SIZE=0xc0000000 |
| 248 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 249 | 257 | ||
| 250 | # | 258 | # |
| 251 | # Networking | 259 | # Networking |
| @@ -293,8 +301,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 293 | CONFIG_DEFAULT_TCP_CONG="cubic" | 301 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 294 | # CONFIG_TCP_MD5SIG is not set | 302 | # CONFIG_TCP_MD5SIG is not set |
| 295 | # CONFIG_IPV6 is not set | 303 | # CONFIG_IPV6 is not set |
| 296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 297 | # CONFIG_INET6_TUNNEL is not set | ||
| 298 | # CONFIG_NETWORK_SECMARK is not set | 304 | # CONFIG_NETWORK_SECMARK is not set |
| 299 | # CONFIG_NETFILTER is not set | 305 | # CONFIG_NETFILTER is not set |
| 300 | # CONFIG_IP_DCCP is not set | 306 | # CONFIG_IP_DCCP is not set |
| @@ -348,6 +354,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 348 | # CONFIG_CONNECTOR is not set | 354 | # CONFIG_CONNECTOR is not set |
| 349 | # CONFIG_MTD is not set | 355 | # CONFIG_MTD is not set |
| 350 | CONFIG_OF_DEVICE=y | 356 | CONFIG_OF_DEVICE=y |
| 357 | CONFIG_OF_I2C=y | ||
| 351 | # CONFIG_PARPORT is not set | 358 | # CONFIG_PARPORT is not set |
| 352 | CONFIG_BLK_DEV=y | 359 | CONFIG_BLK_DEV=y |
| 353 | # CONFIG_BLK_DEV_FD is not set | 360 | # CONFIG_BLK_DEV_FD is not set |
| @@ -420,6 +427,7 @@ CONFIG_GIANFAR=y | |||
| 420 | # | 427 | # |
| 421 | # CONFIG_WLAN_PRE80211 is not set | 428 | # CONFIG_WLAN_PRE80211 is not set |
| 422 | # CONFIG_WLAN_80211 is not set | 429 | # CONFIG_WLAN_80211 is not set |
| 430 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 423 | # CONFIG_WAN is not set | 431 | # CONFIG_WAN is not set |
| 424 | # CONFIG_PPP is not set | 432 | # CONFIG_PPP is not set |
| 425 | # CONFIG_SLIP is not set | 433 | # CONFIG_SLIP is not set |
| @@ -464,6 +472,7 @@ CONFIG_INPUT=y | |||
| 464 | # Character devices | 472 | # Character devices |
| 465 | # | 473 | # |
| 466 | # CONFIG_VT is not set | 474 | # CONFIG_VT is not set |
| 475 | CONFIG_DEVKMEM=y | ||
| 467 | # CONFIG_SERIAL_NONSTANDARD is not set | 476 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 468 | 477 | ||
| 469 | # | 478 | # |
| @@ -498,13 +507,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 498 | CONFIG_I2C_CHARDEV=y | 507 | CONFIG_I2C_CHARDEV=y |
| 499 | 508 | ||
| 500 | # | 509 | # |
| 501 | # I2C Algorithms | ||
| 502 | # | ||
| 503 | # CONFIG_I2C_ALGOBIT is not set | ||
| 504 | # CONFIG_I2C_ALGOPCF is not set | ||
| 505 | # CONFIG_I2C_ALGOPCA is not set | ||
| 506 | |||
| 507 | # | ||
| 508 | # I2C Hardware Bus support | 510 | # I2C Hardware Bus support |
| 509 | # | 511 | # |
| 510 | CONFIG_I2C_MPC=y | 512 | CONFIG_I2C_MPC=y |
| @@ -513,6 +515,7 @@ CONFIG_I2C_MPC=y | |||
| 513 | # CONFIG_I2C_SIMTEC is not set | 515 | # CONFIG_I2C_SIMTEC is not set |
| 514 | # CONFIG_I2C_TAOS_EVM is not set | 516 | # CONFIG_I2C_TAOS_EVM is not set |
| 515 | # CONFIG_I2C_STUB is not set | 517 | # CONFIG_I2C_STUB is not set |
| 518 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 516 | 519 | ||
| 517 | # | 520 | # |
| 518 | # Miscellaneous I2C Chip support | 521 | # Miscellaneous I2C Chip support |
| @@ -522,19 +525,13 @@ CONFIG_I2C_MPC=y | |||
| 522 | # CONFIG_SENSORS_PCF8574 is not set | 525 | # CONFIG_SENSORS_PCF8574 is not set |
| 523 | # CONFIG_PCF8575 is not set | 526 | # CONFIG_PCF8575 is not set |
| 524 | # CONFIG_SENSORS_PCF8591 is not set | 527 | # CONFIG_SENSORS_PCF8591 is not set |
| 525 | # CONFIG_TPS65010 is not set | ||
| 526 | # CONFIG_SENSORS_MAX6875 is not set | 528 | # CONFIG_SENSORS_MAX6875 is not set |
| 527 | # CONFIG_SENSORS_TSL2550 is not set | 529 | # CONFIG_SENSORS_TSL2550 is not set |
| 528 | # CONFIG_I2C_DEBUG_CORE is not set | 530 | # CONFIG_I2C_DEBUG_CORE is not set |
| 529 | # CONFIG_I2C_DEBUG_ALGO is not set | 531 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 530 | # CONFIG_I2C_DEBUG_BUS is not set | 532 | # CONFIG_I2C_DEBUG_BUS is not set |
| 531 | # CONFIG_I2C_DEBUG_CHIP is not set | 533 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 532 | |||
| 533 | # | ||
| 534 | # SPI support | ||
| 535 | # | ||
| 536 | # CONFIG_SPI is not set | 534 | # CONFIG_SPI is not set |
| 537 | # CONFIG_SPI_MASTER is not set | ||
| 538 | # CONFIG_W1 is not set | 535 | # CONFIG_W1 is not set |
| 539 | # CONFIG_POWER_SUPPLY is not set | 536 | # CONFIG_POWER_SUPPLY is not set |
| 540 | CONFIG_HWMON=y | 537 | CONFIG_HWMON=y |
| @@ -607,12 +604,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 607 | # Multifunction device drivers | 604 | # Multifunction device drivers |
| 608 | # | 605 | # |
| 609 | # CONFIG_MFD_SM501 is not set | 606 | # CONFIG_MFD_SM501 is not set |
| 607 | # CONFIG_HTC_PASIC3 is not set | ||
| 610 | 608 | ||
| 611 | # | 609 | # |
| 612 | # Multimedia devices | 610 | # Multimedia devices |
| 613 | # | 611 | # |
| 612 | |||
| 613 | # | ||
| 614 | # Multimedia core support | ||
| 615 | # | ||
| 614 | # CONFIG_VIDEO_DEV is not set | 616 | # CONFIG_VIDEO_DEV is not set |
| 615 | # CONFIG_DVB_CORE is not set | 617 | # CONFIG_DVB_CORE is not set |
| 618 | # CONFIG_VIDEO_MEDIA is not set | ||
| 619 | |||
| 620 | # | ||
| 621 | # Multimedia drivers | ||
| 622 | # | ||
| 616 | # CONFIG_DAB is not set | 623 | # CONFIG_DAB is not set |
| 617 | 624 | ||
| 618 | # | 625 | # |
| @@ -640,13 +647,10 @@ CONFIG_HID=y | |||
| 640 | # CONFIG_MMC is not set | 647 | # CONFIG_MMC is not set |
| 641 | # CONFIG_MEMSTICK is not set | 648 | # CONFIG_MEMSTICK is not set |
| 642 | # CONFIG_NEW_LEDS is not set | 649 | # CONFIG_NEW_LEDS is not set |
| 650 | # CONFIG_ACCESSIBILITY is not set | ||
| 643 | # CONFIG_EDAC is not set | 651 | # CONFIG_EDAC is not set |
| 644 | # CONFIG_RTC_CLASS is not set | 652 | # CONFIG_RTC_CLASS is not set |
| 645 | # CONFIG_DMADEVICES is not set | 653 | # CONFIG_DMADEVICES is not set |
| 646 | |||
| 647 | # | ||
| 648 | # Userspace I/O | ||
| 649 | # | ||
| 650 | # CONFIG_UIO is not set | 654 | # CONFIG_UIO is not set |
| 651 | 655 | ||
| 652 | # | 656 | # |
| @@ -659,7 +663,6 @@ CONFIG_HID=y | |||
| 659 | # CONFIG_JFS_FS is not set | 663 | # CONFIG_JFS_FS is not set |
| 660 | # CONFIG_FS_POSIX_ACL is not set | 664 | # CONFIG_FS_POSIX_ACL is not set |
| 661 | # CONFIG_XFS_FS is not set | 665 | # CONFIG_XFS_FS is not set |
| 662 | # CONFIG_GFS2_FS is not set | ||
| 663 | # CONFIG_OCFS2_FS is not set | 666 | # CONFIG_OCFS2_FS is not set |
| 664 | CONFIG_DNOTIFY=y | 667 | CONFIG_DNOTIFY=y |
| 665 | CONFIG_INOTIFY=y | 668 | CONFIG_INOTIFY=y |
| @@ -717,7 +720,6 @@ CONFIG_NFS_FS=y | |||
| 717 | CONFIG_NFS_V3=y | 720 | CONFIG_NFS_V3=y |
| 718 | # CONFIG_NFS_V3_ACL is not set | 721 | # CONFIG_NFS_V3_ACL is not set |
| 719 | CONFIG_NFS_V4=y | 722 | CONFIG_NFS_V4=y |
| 720 | # CONFIG_NFS_DIRECTIO is not set | ||
| 721 | # CONFIG_NFSD is not set | 723 | # CONFIG_NFSD is not set |
| 722 | CONFIG_ROOT_NFS=y | 724 | CONFIG_ROOT_NFS=y |
| 723 | CONFIG_LOCKD=y | 725 | CONFIG_LOCKD=y |
| @@ -746,6 +748,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 746 | # Library routines | 748 | # Library routines |
| 747 | # | 749 | # |
| 748 | CONFIG_BITREVERSE=y | 750 | CONFIG_BITREVERSE=y |
| 751 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 749 | # CONFIG_CRC_CCITT is not set | 752 | # CONFIG_CRC_CCITT is not set |
| 750 | # CONFIG_CRC16 is not set | 753 | # CONFIG_CRC16 is not set |
| 751 | # CONFIG_CRC_ITU_T is not set | 754 | # CONFIG_CRC_ITU_T is not set |
| @@ -756,6 +759,7 @@ CONFIG_PLIST=y | |||
| 756 | CONFIG_HAS_IOMEM=y | 759 | CONFIG_HAS_IOMEM=y |
| 757 | CONFIG_HAS_IOPORT=y | 760 | CONFIG_HAS_IOPORT=y |
| 758 | CONFIG_HAS_DMA=y | 761 | CONFIG_HAS_DMA=y |
| 762 | CONFIG_HAVE_LMB=y | ||
| 759 | 763 | ||
| 760 | # | 764 | # |
| 761 | # Kernel hacking | 765 | # Kernel hacking |
| @@ -763,6 +767,7 @@ CONFIG_HAS_DMA=y | |||
| 763 | # CONFIG_PRINTK_TIME is not set | 767 | # CONFIG_PRINTK_TIME is not set |
| 764 | CONFIG_ENABLE_WARN_DEPRECATED=y | 768 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 765 | CONFIG_ENABLE_MUST_CHECK=y | 769 | CONFIG_ENABLE_MUST_CHECK=y |
| 770 | CONFIG_FRAME_WARN=1024 | ||
| 766 | # CONFIG_MAGIC_SYSRQ is not set | 771 | # CONFIG_MAGIC_SYSRQ is not set |
| 767 | # CONFIG_UNUSED_SYMBOLS is not set | 772 | # CONFIG_UNUSED_SYMBOLS is not set |
| 768 | # CONFIG_DEBUG_FS is not set | 773 | # CONFIG_DEBUG_FS is not set |
| @@ -770,6 +775,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 770 | # CONFIG_DEBUG_KERNEL is not set | 775 | # CONFIG_DEBUG_KERNEL is not set |
| 771 | # CONFIG_DEBUG_BUGVERBOSE is not set | 776 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 772 | # CONFIG_SAMPLES is not set | 777 | # CONFIG_SAMPLES is not set |
| 778 | # CONFIG_IRQSTACKS is not set | ||
| 773 | # CONFIG_PPC_EARLY_DEBUG is not set | 779 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 774 | 780 | ||
| 775 | # | 781 | # |
| @@ -779,50 +785,80 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 779 | # CONFIG_SECURITY is not set | 785 | # CONFIG_SECURITY is not set |
| 780 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 786 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 781 | CONFIG_CRYPTO=y | 787 | CONFIG_CRYPTO=y |
| 788 | |||
| 789 | # | ||
| 790 | # Crypto core or helper | ||
| 791 | # | ||
| 782 | CONFIG_CRYPTO_ALGAPI=y | 792 | CONFIG_CRYPTO_ALGAPI=y |
| 783 | CONFIG_CRYPTO_BLKCIPHER=y | 793 | CONFIG_CRYPTO_BLKCIPHER=y |
| 784 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 785 | CONFIG_CRYPTO_MANAGER=y | 794 | CONFIG_CRYPTO_MANAGER=y |
| 795 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 796 | # CONFIG_CRYPTO_NULL is not set | ||
| 797 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 798 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 799 | # CONFIG_CRYPTO_TEST is not set | ||
| 800 | |||
| 801 | # | ||
| 802 | # Authenticated Encryption with Associated Data | ||
| 803 | # | ||
| 804 | # CONFIG_CRYPTO_CCM is not set | ||
| 805 | # CONFIG_CRYPTO_GCM is not set | ||
| 806 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 807 | |||
| 808 | # | ||
| 809 | # Block modes | ||
| 810 | # | ||
| 811 | CONFIG_CRYPTO_CBC=y | ||
| 812 | # CONFIG_CRYPTO_CTR is not set | ||
| 813 | # CONFIG_CRYPTO_CTS is not set | ||
| 814 | CONFIG_CRYPTO_ECB=m | ||
| 815 | # CONFIG_CRYPTO_LRW is not set | ||
| 816 | CONFIG_CRYPTO_PCBC=m | ||
| 817 | # CONFIG_CRYPTO_XTS is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # Hash modes | ||
| 821 | # | ||
| 786 | # CONFIG_CRYPTO_HMAC is not set | 822 | # CONFIG_CRYPTO_HMAC is not set |
| 787 | # CONFIG_CRYPTO_XCBC is not set | 823 | # CONFIG_CRYPTO_XCBC is not set |
| 788 | # CONFIG_CRYPTO_NULL is not set | 824 | |
| 825 | # | ||
| 826 | # Digest | ||
| 827 | # | ||
| 828 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 789 | # CONFIG_CRYPTO_MD4 is not set | 829 | # CONFIG_CRYPTO_MD4 is not set |
| 790 | CONFIG_CRYPTO_MD5=y | 830 | CONFIG_CRYPTO_MD5=y |
| 831 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 791 | # CONFIG_CRYPTO_SHA1 is not set | 832 | # CONFIG_CRYPTO_SHA1 is not set |
| 792 | # CONFIG_CRYPTO_SHA256 is not set | 833 | # CONFIG_CRYPTO_SHA256 is not set |
| 793 | # CONFIG_CRYPTO_SHA512 is not set | 834 | # CONFIG_CRYPTO_SHA512 is not set |
| 794 | # CONFIG_CRYPTO_WP512 is not set | ||
| 795 | # CONFIG_CRYPTO_TGR192 is not set | 835 | # CONFIG_CRYPTO_TGR192 is not set |
| 796 | # CONFIG_CRYPTO_GF128MUL is not set | 836 | # CONFIG_CRYPTO_WP512 is not set |
| 797 | CONFIG_CRYPTO_ECB=m | 837 | |
| 798 | CONFIG_CRYPTO_CBC=y | 838 | # |
| 799 | CONFIG_CRYPTO_PCBC=m | 839 | # Ciphers |
| 800 | # CONFIG_CRYPTO_LRW is not set | 840 | # |
| 801 | # CONFIG_CRYPTO_XTS is not set | ||
| 802 | # CONFIG_CRYPTO_CTR is not set | ||
| 803 | # CONFIG_CRYPTO_GCM is not set | ||
| 804 | # CONFIG_CRYPTO_CCM is not set | ||
| 805 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 806 | CONFIG_CRYPTO_DES=y | ||
| 807 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 808 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 809 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 810 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 811 | # CONFIG_CRYPTO_AES is not set | 841 | # CONFIG_CRYPTO_AES is not set |
| 842 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 843 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 844 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 845 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 812 | # CONFIG_CRYPTO_CAST5 is not set | 846 | # CONFIG_CRYPTO_CAST5 is not set |
| 813 | # CONFIG_CRYPTO_CAST6 is not set | 847 | # CONFIG_CRYPTO_CAST6 is not set |
| 814 | # CONFIG_CRYPTO_TEA is not set | 848 | CONFIG_CRYPTO_DES=y |
| 815 | # CONFIG_CRYPTO_ARC4 is not set | 849 | # CONFIG_CRYPTO_FCRYPT is not set |
| 816 | # CONFIG_CRYPTO_KHAZAD is not set | 850 | # CONFIG_CRYPTO_KHAZAD is not set |
| 817 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 818 | # CONFIG_CRYPTO_SEED is not set | ||
| 819 | # CONFIG_CRYPTO_SALSA20 is not set | 851 | # CONFIG_CRYPTO_SALSA20 is not set |
| 852 | # CONFIG_CRYPTO_SEED is not set | ||
| 853 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 854 | # CONFIG_CRYPTO_TEA is not set | ||
| 855 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 856 | |||
| 857 | # | ||
| 858 | # Compression | ||
| 859 | # | ||
| 820 | # CONFIG_CRYPTO_DEFLATE is not set | 860 | # CONFIG_CRYPTO_DEFLATE is not set |
| 821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 822 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 823 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 824 | # CONFIG_CRYPTO_TEST is not set | ||
| 825 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 826 | # CONFIG_CRYPTO_LZO is not set | 861 | # CONFIG_CRYPTO_LZO is not set |
| 827 | # CONFIG_CRYPTO_HW is not set | 862 | # CONFIG_CRYPTO_HW is not set |
| 828 | # CONFIG_PPC_CLOCK is not set | 863 | # CONFIG_PPC_CLOCK is not set |
| 864 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index 2d0debcefdbf..b82bb042308a 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_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.24 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Feb 11 16:25:19 2008 | 4 | # Mon Jun 9 08:52:30 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -68,23 +70,22 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 68 | # CONFIG_POSIX_MQUEUE is not set | 70 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_USER_NS is not set | ||
| 72 | # CONFIG_PID_NS is not set | ||
| 73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
| 74 | # CONFIG_IKCONFIG is not set | 74 | # CONFIG_IKCONFIG is not set |
| 75 | CONFIG_LOG_BUF_SHIFT=14 | 75 | CONFIG_LOG_BUF_SHIFT=14 |
| 76 | # CONFIG_CGROUPS is not set | 76 | # CONFIG_CGROUPS is not set |
| 77 | CONFIG_FAIR_GROUP_SCHED=y | 77 | # CONFIG_GROUP_SCHED is not set |
| 78 | CONFIG_FAIR_USER_SCHED=y | ||
| 79 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 80 | CONFIG_SYSFS_DEPRECATED=y | 78 | CONFIG_SYSFS_DEPRECATED=y |
| 79 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 81 | # CONFIG_RELAY is not set | 80 | # CONFIG_RELAY is not set |
| 81 | # CONFIG_NAMESPACES is not set | ||
| 82 | CONFIG_BLK_DEV_INITRD=y | 82 | CONFIG_BLK_DEV_INITRD=y |
| 83 | CONFIG_INITRAMFS_SOURCE="" | 83 | CONFIG_INITRAMFS_SOURCE="" |
| 84 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 84 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 85 | CONFIG_SYSCTL=y | 85 | CONFIG_SYSCTL=y |
| 86 | CONFIG_EMBEDDED=y | 86 | CONFIG_EMBEDDED=y |
| 87 | CONFIG_SYSCTL_SYSCALL=y | 87 | CONFIG_SYSCTL_SYSCALL=y |
| 88 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 88 | CONFIG_KALLSYMS=y | 89 | CONFIG_KALLSYMS=y |
| 89 | # CONFIG_KALLSYMS_ALL is not set | 90 | # CONFIG_KALLSYMS_ALL is not set |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -92,6 +93,7 @@ CONFIG_HOTPLUG=y | |||
| 92 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| 93 | CONFIG_BUG=y | 94 | CONFIG_BUG=y |
| 94 | CONFIG_ELF_CORE=y | 95 | CONFIG_ELF_CORE=y |
| 96 | CONFIG_COMPAT_BRK=y | ||
| 95 | CONFIG_BASE_FULL=y | 97 | CONFIG_BASE_FULL=y |
| 96 | CONFIG_FUTEX=y | 98 | CONFIG_FUTEX=y |
| 97 | CONFIG_ANON_INODES=y | 99 | CONFIG_ANON_INODES=y |
| @@ -109,6 +111,8 @@ CONFIG_SLUB=y | |||
| 109 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
| 110 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | ||
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| @@ -134,7 +138,6 @@ CONFIG_DEFAULT_AS=y | |||
| 134 | # CONFIG_DEFAULT_NOOP is not set | 138 | # CONFIG_DEFAULT_NOOP is not set |
| 135 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 139 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 136 | CONFIG_CLASSIC_RCU=y | 140 | CONFIG_CLASSIC_RCU=y |
| 137 | # CONFIG_PREEMPT_RCU is not set | ||
| 138 | 141 | ||
| 139 | # | 142 | # |
| 140 | # Platform support | 143 | # Platform support |
| @@ -191,12 +194,13 @@ CONFIG_HZ=250 | |||
| 191 | CONFIG_PREEMPT_NONE=y | 194 | CONFIG_PREEMPT_NONE=y |
| 192 | # CONFIG_PREEMPT_VOLUNTARY is not set | 195 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 193 | # CONFIG_PREEMPT is not set | 196 | # CONFIG_PREEMPT is not set |
| 194 | CONFIG_RCU_TRACE=y | ||
| 195 | CONFIG_BINFMT_ELF=y | 197 | CONFIG_BINFMT_ELF=y |
| 196 | CONFIG_BINFMT_MISC=y | 198 | CONFIG_BINFMT_MISC=y |
| 197 | CONFIG_MATH_EMULATION=y | 199 | CONFIG_MATH_EMULATION=y |
| 198 | # CONFIG_IOMMU_HELPER is not set | 200 | # CONFIG_IOMMU_HELPER is not set |
| 199 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 201 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 202 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 203 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 200 | CONFIG_ARCH_FLATMEM_ENABLE=y | 204 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 201 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 205 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 202 | CONFIG_SELECT_MEMORY_MODEL=y | 206 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -207,16 +211,17 @@ CONFIG_FLATMEM=y | |||
| 207 | CONFIG_FLAT_NODE_MEM_MAP=y | 211 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 208 | # CONFIG_SPARSEMEM_STATIC is not set | 212 | # CONFIG_SPARSEMEM_STATIC is not set |
| 209 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 214 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 211 | # CONFIG_RESOURCES_64BIT is not set | 216 | # CONFIG_RESOURCES_64BIT is not set |
| 212 | CONFIG_ZONE_DMA_FLAG=1 | 217 | CONFIG_ZONE_DMA_FLAG=1 |
| 213 | CONFIG_BOUNCE=y | 218 | CONFIG_BOUNCE=y |
| 214 | CONFIG_VIRT_TO_BUS=y | 219 | CONFIG_VIRT_TO_BUS=y |
| 220 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 215 | # CONFIG_PROC_DEVICETREE is not set | 221 | # CONFIG_PROC_DEVICETREE is not set |
| 216 | # CONFIG_CMDLINE_BOOL is not set | 222 | # CONFIG_CMDLINE_BOOL is not set |
| 217 | # CONFIG_PM is not set | 223 | # CONFIG_PM is not set |
| 218 | # CONFIG_SECCOMP is not set | 224 | # CONFIG_SECCOMP is not set |
| 219 | CONFIG_WANT_DEVICE_TREE=y | ||
| 220 | CONFIG_ISA_DMA_API=y | 225 | CONFIG_ISA_DMA_API=y |
| 221 | 226 | ||
| 222 | # | 227 | # |
| @@ -229,6 +234,7 @@ CONFIG_FSL_SOC=y | |||
| 229 | # CONFIG_PCI_SYSCALL is not set | 234 | # CONFIG_PCI_SYSCALL is not set |
| 230 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 231 | # CONFIG_PCCARD is not set | 236 | # CONFIG_PCCARD is not set |
| 237 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 238 | ||
| 233 | # | 239 | # |
| 234 | # Advanced setup | 240 | # Advanced setup |
| @@ -238,11 +244,12 @@ CONFIG_FSL_SOC=y | |||
| 238 | # | 244 | # |
| 239 | # Default settings for advanced configuration options are used | 245 | # Default settings for advanced configuration options are used |
| 240 | # | 246 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 247 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 248 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 249 | CONFIG_KERNEL_START=0xc0000000 |
| 250 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 251 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 252 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 253 | ||
| 247 | # | 254 | # |
| 248 | # Networking | 255 | # Networking |
| @@ -290,8 +297,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 297 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 298 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 299 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 300 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 301 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 302 | # CONFIG_IP_DCCP is not set |
| @@ -351,6 +356,8 @@ CONFIG_MTD_CONCAT=y | |||
| 351 | CONFIG_MTD_PARTITIONS=y | 356 | CONFIG_MTD_PARTITIONS=y |
| 352 | # CONFIG_MTD_REDBOOT_PARTS is not set | 357 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 353 | # CONFIG_MTD_CMDLINE_PARTS is not set | 358 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 359 | # CONFIG_MTD_OF_PARTS is not set | ||
| 360 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 354 | 361 | ||
| 355 | # | 362 | # |
| 356 | # User Modules And Translation Layers | 363 | # User Modules And Translation Layers |
| @@ -430,17 +437,19 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 430 | CONFIG_BLK_DEV_RAM=y | 437 | CONFIG_BLK_DEV_RAM=y |
| 431 | CONFIG_BLK_DEV_RAM_COUNT=16 | 438 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 432 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 439 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| 433 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 440 | # CONFIG_BLK_DEV_XIP is not set |
| 434 | # CONFIG_CDROM_PKTCDVD is not set | 441 | # CONFIG_CDROM_PKTCDVD is not set |
| 435 | # CONFIG_ATA_OVER_ETH is not set | 442 | # CONFIG_ATA_OVER_ETH is not set |
| 436 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
| 437 | # CONFIG_EEPROM_93CX6 is not set | 444 | # CONFIG_EEPROM_93CX6 is not set |
| 445 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 446 | CONFIG_HAVE_IDE=y | ||
| 438 | CONFIG_IDE=y | 447 | CONFIG_IDE=y |
| 439 | CONFIG_IDE_MAX_HWIFS=4 | 448 | CONFIG_IDE_MAX_HWIFS=4 |
| 440 | CONFIG_BLK_DEV_IDE=y | 449 | CONFIG_BLK_DEV_IDE=y |
| 441 | 450 | ||
| 442 | # | 451 | # |
| 443 | # Please see Documentation/ide.txt for help/info on IDE drives | 452 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 444 | # | 453 | # |
| 445 | # CONFIG_BLK_DEV_IDE_SATA is not set | 454 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 446 | # CONFIG_BLK_DEV_IDEDISK is not set | 455 | # CONFIG_BLK_DEV_IDEDISK is not set |
| @@ -457,7 +466,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 457 | CONFIG_IDE_GENERIC=y | 466 | CONFIG_IDE_GENERIC=y |
| 458 | # CONFIG_BLK_DEV_PLATFORM is not set | 467 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 459 | # CONFIG_BLK_DEV_IDEDMA is not set | 468 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 460 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 469 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 461 | # CONFIG_BLK_DEV_HD is not set | 470 | # CONFIG_BLK_DEV_HD is not set |
| 462 | 471 | ||
| 463 | # | 472 | # |
| @@ -517,6 +526,7 @@ CONFIG_NETDEV_10000=y | |||
| 517 | # | 526 | # |
| 518 | # CONFIG_WLAN_PRE80211 is not set | 527 | # CONFIG_WLAN_PRE80211 is not set |
| 519 | # CONFIG_WLAN_80211 is not set | 528 | # CONFIG_WLAN_80211 is not set |
| 529 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 520 | # CONFIG_WAN is not set | 530 | # CONFIG_WAN is not set |
| 521 | # CONFIG_PPP is not set | 531 | # CONFIG_PPP is not set |
| 522 | # CONFIG_SLIP is not set | 532 | # CONFIG_SLIP is not set |
| @@ -561,6 +571,7 @@ CONFIG_INPUT=y | |||
| 561 | # Character devices | 571 | # Character devices |
| 562 | # | 572 | # |
| 563 | # CONFIG_VT is not set | 573 | # CONFIG_VT is not set |
| 574 | CONFIG_DEVKMEM=y | ||
| 564 | # CONFIG_SERIAL_NONSTANDARD is not set | 575 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 565 | 576 | ||
| 566 | # | 577 | # |
| @@ -594,12 +605,7 @@ CONFIG_GEN_RTC=y | |||
| 594 | # CONFIG_RAW_DRIVER is not set | 605 | # CONFIG_RAW_DRIVER is not set |
| 595 | # CONFIG_TCG_TPM is not set | 606 | # CONFIG_TCG_TPM is not set |
| 596 | # CONFIG_I2C is not set | 607 | # CONFIG_I2C is not set |
| 597 | |||
| 598 | # | ||
| 599 | # SPI support | ||
| 600 | # | ||
| 601 | # CONFIG_SPI is not set | 608 | # CONFIG_SPI is not set |
| 602 | # CONFIG_SPI_MASTER is not set | ||
| 603 | # CONFIG_W1 is not set | 609 | # CONFIG_W1 is not set |
| 604 | # CONFIG_POWER_SUPPLY is not set | 610 | # CONFIG_POWER_SUPPLY is not set |
| 605 | CONFIG_HWMON=y | 611 | CONFIG_HWMON=y |
| @@ -615,6 +621,7 @@ CONFIG_HWMON=y | |||
| 615 | # CONFIG_SENSORS_W83627HF is not set | 621 | # CONFIG_SENSORS_W83627HF is not set |
| 616 | # CONFIG_SENSORS_W83627EHF is not set | 622 | # CONFIG_SENSORS_W83627EHF is not set |
| 617 | # CONFIG_HWMON_DEBUG_CHIP is not set | 623 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 624 | # CONFIG_THERMAL is not set | ||
| 618 | # CONFIG_WATCHDOG is not set | 625 | # CONFIG_WATCHDOG is not set |
| 619 | 626 | ||
| 620 | # | 627 | # |
| @@ -627,12 +634,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 627 | # Multifunction device drivers | 634 | # Multifunction device drivers |
| 628 | # | 635 | # |
| 629 | # CONFIG_MFD_SM501 is not set | 636 | # CONFIG_MFD_SM501 is not set |
| 637 | # CONFIG_HTC_PASIC3 is not set | ||
| 630 | 638 | ||
| 631 | # | 639 | # |
| 632 | # Multimedia devices | 640 | # Multimedia devices |
| 633 | # | 641 | # |
| 642 | |||
| 643 | # | ||
| 644 | # Multimedia core support | ||
| 645 | # | ||
| 634 | # CONFIG_VIDEO_DEV is not set | 646 | # CONFIG_VIDEO_DEV is not set |
| 635 | # CONFIG_DVB_CORE is not set | 647 | # CONFIG_DVB_CORE is not set |
| 648 | # CONFIG_VIDEO_MEDIA is not set | ||
| 649 | |||
| 650 | # | ||
| 651 | # Multimedia drivers | ||
| 652 | # | ||
| 636 | CONFIG_DAB=y | 653 | CONFIG_DAB=y |
| 637 | 654 | ||
| 638 | # | 655 | # |
| @@ -660,19 +677,20 @@ CONFIG_USB_SUPPORT=y | |||
| 660 | # CONFIG_USB_ARCH_HAS_HCD is not set | 677 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 661 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 678 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 662 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 679 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 680 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 681 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 663 | 682 | ||
| 664 | # | 683 | # |
| 665 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 684 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 666 | # | 685 | # |
| 667 | # CONFIG_USB_GADGET is not set | 686 | # CONFIG_USB_GADGET is not set |
| 668 | # CONFIG_MMC is not set | 687 | # CONFIG_MMC is not set |
| 688 | # CONFIG_MEMSTICK is not set | ||
| 669 | # CONFIG_NEW_LEDS is not set | 689 | # CONFIG_NEW_LEDS is not set |
| 690 | # CONFIG_ACCESSIBILITY is not set | ||
| 670 | # CONFIG_EDAC is not set | 691 | # CONFIG_EDAC is not set |
| 671 | # CONFIG_RTC_CLASS is not set | 692 | # CONFIG_RTC_CLASS is not set |
| 672 | 693 | # CONFIG_DMADEVICES is not set | |
| 673 | # | ||
| 674 | # Userspace I/O | ||
| 675 | # | ||
| 676 | # CONFIG_UIO is not set | 694 | # CONFIG_UIO is not set |
| 677 | 695 | ||
| 678 | # | 696 | # |
| @@ -693,14 +711,11 @@ CONFIG_FS_MBCACHE=y | |||
| 693 | # CONFIG_JFS_FS is not set | 711 | # CONFIG_JFS_FS is not set |
| 694 | # CONFIG_FS_POSIX_ACL is not set | 712 | # CONFIG_FS_POSIX_ACL is not set |
| 695 | # CONFIG_XFS_FS is not set | 713 | # CONFIG_XFS_FS is not set |
| 696 | # CONFIG_GFS2_FS is not set | ||
| 697 | # CONFIG_OCFS2_FS is not set | 714 | # CONFIG_OCFS2_FS is not set |
| 698 | # CONFIG_MINIX_FS is not set | 715 | CONFIG_DNOTIFY=y |
| 699 | # CONFIG_ROMFS_FS is not set | ||
| 700 | CONFIG_INOTIFY=y | 716 | CONFIG_INOTIFY=y |
| 701 | CONFIG_INOTIFY_USER=y | 717 | CONFIG_INOTIFY_USER=y |
| 702 | # CONFIG_QUOTA is not set | 718 | # CONFIG_QUOTA is not set |
| 703 | CONFIG_DNOTIFY=y | ||
| 704 | # CONFIG_AUTOFS_FS is not set | 719 | # CONFIG_AUTOFS_FS is not set |
| 705 | # CONFIG_AUTOFS4_FS is not set | 720 | # CONFIG_AUTOFS4_FS is not set |
| 706 | # CONFIG_FUSE_FS is not set | 721 | # CONFIG_FUSE_FS is not set |
| @@ -743,15 +758,16 @@ CONFIG_TMPFS=y | |||
| 743 | # CONFIG_JFFS2_FS is not set | 758 | # CONFIG_JFFS2_FS is not set |
| 744 | # CONFIG_CRAMFS is not set | 759 | # CONFIG_CRAMFS is not set |
| 745 | # CONFIG_VXFS_FS is not set | 760 | # CONFIG_VXFS_FS is not set |
| 761 | # CONFIG_MINIX_FS is not set | ||
| 746 | # CONFIG_HPFS_FS is not set | 762 | # CONFIG_HPFS_FS is not set |
| 747 | # CONFIG_QNX4FS_FS is not set | 763 | # CONFIG_QNX4FS_FS is not set |
| 764 | # CONFIG_ROMFS_FS is not set | ||
| 748 | # CONFIG_SYSV_FS is not set | 765 | # CONFIG_SYSV_FS is not set |
| 749 | # CONFIG_UFS_FS is not set | 766 | # CONFIG_UFS_FS is not set |
| 750 | CONFIG_NETWORK_FILESYSTEMS=y | 767 | CONFIG_NETWORK_FILESYSTEMS=y |
| 751 | CONFIG_NFS_FS=y | 768 | CONFIG_NFS_FS=y |
| 752 | # CONFIG_NFS_V3 is not set | 769 | # CONFIG_NFS_V3 is not set |
| 753 | # CONFIG_NFS_V4 is not set | 770 | # CONFIG_NFS_V4 is not set |
| 754 | # CONFIG_NFS_DIRECTIO is not set | ||
| 755 | # CONFIG_NFSD is not set | 771 | # CONFIG_NFSD is not set |
| 756 | CONFIG_ROOT_NFS=y | 772 | CONFIG_ROOT_NFS=y |
| 757 | CONFIG_LOCKD=y | 773 | CONFIG_LOCKD=y |
| @@ -790,6 +806,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 790 | # Library routines | 806 | # Library routines |
| 791 | # | 807 | # |
| 792 | CONFIG_BITREVERSE=y | 808 | CONFIG_BITREVERSE=y |
| 809 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 793 | # CONFIG_CRC_CCITT is not set | 810 | # CONFIG_CRC_CCITT is not set |
| 794 | # CONFIG_CRC16 is not set | 811 | # CONFIG_CRC16 is not set |
| 795 | # CONFIG_CRC_ITU_T is not set | 812 | # CONFIG_CRC_ITU_T is not set |
| @@ -800,6 +817,7 @@ CONFIG_PLIST=y | |||
| 800 | CONFIG_HAS_IOMEM=y | 817 | CONFIG_HAS_IOMEM=y |
| 801 | CONFIG_HAS_IOPORT=y | 818 | CONFIG_HAS_IOPORT=y |
| 802 | CONFIG_HAS_DMA=y | 819 | CONFIG_HAS_DMA=y |
| 820 | CONFIG_HAVE_LMB=y | ||
| 803 | 821 | ||
| 804 | # | 822 | # |
| 805 | # Kernel hacking | 823 | # Kernel hacking |
| @@ -807,6 +825,7 @@ CONFIG_HAS_DMA=y | |||
| 807 | # CONFIG_PRINTK_TIME is not set | 825 | # CONFIG_PRINTK_TIME is not set |
| 808 | CONFIG_ENABLE_WARN_DEPRECATED=y | 826 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 809 | CONFIG_ENABLE_MUST_CHECK=y | 827 | CONFIG_ENABLE_MUST_CHECK=y |
| 828 | CONFIG_FRAME_WARN=1024 | ||
| 810 | # CONFIG_MAGIC_SYSRQ is not set | 829 | # CONFIG_MAGIC_SYSRQ is not set |
| 811 | # CONFIG_UNUSED_SYMBOLS is not set | 830 | # CONFIG_UNUSED_SYMBOLS is not set |
| 812 | CONFIG_DEBUG_FS=y | 831 | CONFIG_DEBUG_FS=y |
| @@ -817,7 +836,9 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 817 | CONFIG_SCHED_DEBUG=y | 836 | CONFIG_SCHED_DEBUG=y |
| 818 | # CONFIG_SCHEDSTATS is not set | 837 | # CONFIG_SCHEDSTATS is not set |
| 819 | # CONFIG_TIMER_STATS is not set | 838 | # CONFIG_TIMER_STATS is not set |
| 839 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 820 | # CONFIG_SLUB_DEBUG_ON is not set | 840 | # CONFIG_SLUB_DEBUG_ON is not set |
| 841 | # CONFIG_SLUB_STATS is not set | ||
| 821 | # CONFIG_DEBUG_RT_MUTEXES is not set | 842 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 822 | # CONFIG_RT_MUTEX_TESTER is not set | 843 | # CONFIG_RT_MUTEX_TESTER is not set |
| 823 | # CONFIG_DEBUG_SPINLOCK is not set | 844 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -829,9 +850,9 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 829 | # CONFIG_DEBUG_BUGVERBOSE is not set | 850 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 830 | # CONFIG_DEBUG_INFO is not set | 851 | # CONFIG_DEBUG_INFO is not set |
| 831 | # CONFIG_DEBUG_VM is not set | 852 | # CONFIG_DEBUG_VM is not set |
| 853 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 832 | # CONFIG_DEBUG_LIST is not set | 854 | # CONFIG_DEBUG_LIST is not set |
| 833 | # CONFIG_DEBUG_SG is not set | 855 | # CONFIG_DEBUG_SG is not set |
| 834 | CONFIG_FORCED_INLINING=y | ||
| 835 | # CONFIG_BOOT_PRINTK_DELAY is not set | 856 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 836 | # CONFIG_BACKTRACE_SELF_TEST is not set | 857 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 837 | # CONFIG_FAULT_INJECTION is not set | 858 | # CONFIG_FAULT_INJECTION is not set |
| @@ -841,6 +862,7 @@ CONFIG_FORCED_INLINING=y | |||
| 841 | # CONFIG_DEBUG_PAGEALLOC is not set | 862 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 842 | # CONFIG_DEBUGGER is not set | 863 | # CONFIG_DEBUGGER is not set |
| 843 | # CONFIG_KGDB_CONSOLE is not set | 864 | # CONFIG_KGDB_CONSOLE is not set |
| 865 | # CONFIG_IRQSTACKS is not set | ||
| 844 | # CONFIG_VIRQ_DEBUG is not set | 866 | # CONFIG_VIRQ_DEBUG is not set |
| 845 | # CONFIG_BDI_SWITCH is not set | 867 | # CONFIG_BDI_SWITCH is not set |
| 846 | # CONFIG_PPC_EARLY_DEBUG is not set | 868 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -852,48 +874,78 @@ CONFIG_FORCED_INLINING=y | |||
| 852 | # CONFIG_SECURITY is not set | 874 | # CONFIG_SECURITY is not set |
| 853 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 875 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 854 | CONFIG_CRYPTO=y | 876 | CONFIG_CRYPTO=y |
| 855 | # CONFIG_CRYPTO_SEQIV is not set | 877 | |
| 878 | # | ||
| 879 | # Crypto core or helper | ||
| 880 | # | ||
| 856 | # CONFIG_CRYPTO_MANAGER is not set | 881 | # CONFIG_CRYPTO_MANAGER is not set |
| 882 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 883 | # CONFIG_CRYPTO_NULL is not set | ||
| 884 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 885 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 886 | |||
| 887 | # | ||
| 888 | # Authenticated Encryption with Associated Data | ||
| 889 | # | ||
| 890 | # CONFIG_CRYPTO_CCM is not set | ||
| 891 | # CONFIG_CRYPTO_GCM is not set | ||
| 892 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 893 | |||
| 894 | # | ||
| 895 | # Block modes | ||
| 896 | # | ||
| 897 | # CONFIG_CRYPTO_CBC is not set | ||
| 898 | # CONFIG_CRYPTO_CTR is not set | ||
| 899 | # CONFIG_CRYPTO_CTS is not set | ||
| 900 | # CONFIG_CRYPTO_ECB is not set | ||
| 901 | # CONFIG_CRYPTO_LRW is not set | ||
| 902 | # CONFIG_CRYPTO_PCBC is not set | ||
| 903 | # CONFIG_CRYPTO_XTS is not set | ||
| 904 | |||
| 905 | # | ||
| 906 | # Hash modes | ||
| 907 | # | ||
| 857 | # CONFIG_CRYPTO_HMAC is not set | 908 | # CONFIG_CRYPTO_HMAC is not set |
| 858 | # CONFIG_CRYPTO_XCBC is not set | 909 | # CONFIG_CRYPTO_XCBC is not set |
| 859 | # CONFIG_CRYPTO_NULL is not set | 910 | |
| 911 | # | ||
| 912 | # Digest | ||
| 913 | # | ||
| 914 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 860 | # CONFIG_CRYPTO_MD4 is not set | 915 | # CONFIG_CRYPTO_MD4 is not set |
| 861 | # CONFIG_CRYPTO_MD5 is not set | 916 | # CONFIG_CRYPTO_MD5 is not set |
| 917 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 862 | # CONFIG_CRYPTO_SHA1 is not set | 918 | # CONFIG_CRYPTO_SHA1 is not set |
| 863 | # CONFIG_CRYPTO_SHA256 is not set | 919 | # CONFIG_CRYPTO_SHA256 is not set |
| 864 | # CONFIG_CRYPTO_SHA512 is not set | 920 | # CONFIG_CRYPTO_SHA512 is not set |
| 865 | # CONFIG_CRYPTO_WP512 is not set | ||
| 866 | # CONFIG_CRYPTO_TGR192 is not set | 921 | # CONFIG_CRYPTO_TGR192 is not set |
| 867 | # CONFIG_CRYPTO_GF128MUL is not set | 922 | # CONFIG_CRYPTO_WP512 is not set |
| 868 | # CONFIG_CRYPTO_ECB is not set | 923 | |
| 869 | # CONFIG_CRYPTO_CBC is not set | 924 | # |
| 870 | # CONFIG_CRYPTO_PCBC is not set | 925 | # Ciphers |
| 871 | # CONFIG_CRYPTO_LRW is not set | 926 | # |
| 872 | # CONFIG_CRYPTO_XTS is not set | ||
| 873 | # CONFIG_CRYPTO_CTR is not set | ||
| 874 | # CONFIG_CRYPTO_GCM is not set | ||
| 875 | # CONFIG_CRYPTO_CCM is not set | ||
| 876 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 877 | # CONFIG_CRYPTO_DES is not set | ||
| 878 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 881 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 882 | # CONFIG_CRYPTO_AES is not set | 927 | # CONFIG_CRYPTO_AES is not set |
| 928 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 929 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 930 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 931 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 883 | # CONFIG_CRYPTO_CAST5 is not set | 932 | # CONFIG_CRYPTO_CAST5 is not set |
| 884 | # CONFIG_CRYPTO_CAST6 is not set | 933 | # CONFIG_CRYPTO_CAST6 is not set |
| 885 | # CONFIG_CRYPTO_TEA is not set | 934 | # CONFIG_CRYPTO_DES is not set |
| 886 | # CONFIG_CRYPTO_ARC4 is not set | 935 | # CONFIG_CRYPTO_FCRYPT is not set |
| 887 | # CONFIG_CRYPTO_KHAZAD is not set | 936 | # CONFIG_CRYPTO_KHAZAD is not set |
| 888 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 889 | # CONFIG_CRYPTO_SEED is not set | ||
| 890 | # CONFIG_CRYPTO_SALSA20 is not set | 937 | # CONFIG_CRYPTO_SALSA20 is not set |
| 938 | # CONFIG_CRYPTO_SEED is not set | ||
| 939 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 940 | # CONFIG_CRYPTO_TEA is not set | ||
| 941 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 942 | |||
| 943 | # | ||
| 944 | # Compression | ||
| 945 | # | ||
| 891 | # CONFIG_CRYPTO_DEFLATE is not set | 946 | # CONFIG_CRYPTO_DEFLATE is not set |
| 892 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 894 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 895 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 896 | # CONFIG_CRYPTO_LZO is not set | 947 | # CONFIG_CRYPTO_LZO is not set |
| 897 | CONFIG_CRYPTO_HW=y | 948 | CONFIG_CRYPTO_HW=y |
| 898 | # CONFIG_PPC_CLOCK is not set | 949 | # CONFIG_PPC_CLOCK is not set |
| 899 | CONFIG_PPC_LIB_RHEAP=y | 950 | CONFIG_PPC_LIB_RHEAP=y |
| 951 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig index b998539da86e..f33fd516fd54 100644 --- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8540_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:25 2008 | 4 | # Mon Jun 9 08:52:31 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC8540_ADS=y | |||
| 153 | # CONFIG_MPC85xx_CDS is not set | 157 | # CONFIG_MPC85xx_CDS is not set |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -208,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -229,6 +236,7 @@ CONFIG_FSL_SOC=y | |||
| 229 | # CONFIG_PCI_SYSCALL is not set | 236 | # CONFIG_PCI_SYSCALL is not set |
| 230 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 237 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 231 | # CONFIG_PCCARD is not set | 238 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 240 | ||
| 233 | # | 241 | # |
| 234 | # Advanced setup | 242 | # Advanced setup |
| @@ -238,11 +246,12 @@ CONFIG_FSL_SOC=y | |||
| 238 | # | 246 | # |
| 239 | # Default settings for advanced configuration options are used | 247 | # Default settings for advanced configuration options are used |
| 240 | # | 248 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 249 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 250 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 251 | CONFIG_KERNEL_START=0xc0000000 |
| 252 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 253 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 254 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 255 | ||
| 247 | # | 256 | # |
| 248 | # Networking | 257 | # Networking |
| @@ -290,8 +299,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 299 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 300 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 301 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 303 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 304 | # CONFIG_IP_DCCP is not set |
| @@ -419,6 +426,7 @@ CONFIG_NETDEV_10000=y | |||
| 419 | # | 426 | # |
| 420 | # CONFIG_WLAN_PRE80211 is not set | 427 | # CONFIG_WLAN_PRE80211 is not set |
| 421 | # CONFIG_WLAN_80211 is not set | 428 | # CONFIG_WLAN_80211 is not set |
| 429 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 422 | # CONFIG_WAN is not set | 430 | # CONFIG_WAN is not set |
| 423 | # CONFIG_PPP is not set | 431 | # CONFIG_PPP is not set |
| 424 | # CONFIG_SLIP is not set | 432 | # CONFIG_SLIP is not set |
| @@ -463,6 +471,7 @@ CONFIG_INPUT=y | |||
| 463 | # Character devices | 471 | # Character devices |
| 464 | # | 472 | # |
| 465 | # CONFIG_VT is not set | 473 | # CONFIG_VT is not set |
| 474 | CONFIG_DEVKMEM=y | ||
| 466 | # CONFIG_SERIAL_NONSTANDARD is not set | 475 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 467 | 476 | ||
| 468 | # | 477 | # |
| @@ -494,12 +503,7 @@ CONFIG_GEN_RTC=y | |||
| 494 | # CONFIG_RAW_DRIVER is not set | 503 | # CONFIG_RAW_DRIVER is not set |
| 495 | # CONFIG_TCG_TPM is not set | 504 | # CONFIG_TCG_TPM is not set |
| 496 | # CONFIG_I2C is not set | 505 | # CONFIG_I2C is not set |
| 497 | |||
| 498 | # | ||
| 499 | # SPI support | ||
| 500 | # | ||
| 501 | # CONFIG_SPI is not set | 506 | # CONFIG_SPI is not set |
| 502 | # CONFIG_SPI_MASTER is not set | ||
| 503 | # CONFIG_W1 is not set | 507 | # CONFIG_W1 is not set |
| 504 | # CONFIG_POWER_SUPPLY is not set | 508 | # CONFIG_POWER_SUPPLY is not set |
| 505 | CONFIG_HWMON=y | 509 | CONFIG_HWMON=y |
| @@ -528,12 +532,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 528 | # Multifunction device drivers | 532 | # Multifunction device drivers |
| 529 | # | 533 | # |
| 530 | # CONFIG_MFD_SM501 is not set | 534 | # CONFIG_MFD_SM501 is not set |
| 535 | # CONFIG_HTC_PASIC3 is not set | ||
| 531 | 536 | ||
| 532 | # | 537 | # |
| 533 | # Multimedia devices | 538 | # Multimedia devices |
| 534 | # | 539 | # |
| 540 | |||
| 541 | # | ||
| 542 | # Multimedia core support | ||
| 543 | # | ||
| 535 | # CONFIG_VIDEO_DEV is not set | 544 | # CONFIG_VIDEO_DEV is not set |
| 536 | # CONFIG_DVB_CORE is not set | 545 | # CONFIG_DVB_CORE is not set |
| 546 | # CONFIG_VIDEO_MEDIA is not set | ||
| 547 | |||
| 548 | # | ||
| 549 | # Multimedia drivers | ||
| 550 | # | ||
| 537 | CONFIG_DAB=y | 551 | CONFIG_DAB=y |
| 538 | 552 | ||
| 539 | # | 553 | # |
| @@ -561,6 +575,8 @@ CONFIG_USB_SUPPORT=y | |||
| 561 | # CONFIG_USB_ARCH_HAS_HCD is not set | 575 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 562 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 576 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 563 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 577 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 578 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 579 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 564 | 580 | ||
| 565 | # | 581 | # |
| 566 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 582 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -569,13 +585,10 @@ CONFIG_USB_SUPPORT=y | |||
| 569 | # CONFIG_MMC is not set | 585 | # CONFIG_MMC is not set |
| 570 | # CONFIG_MEMSTICK is not set | 586 | # CONFIG_MEMSTICK is not set |
| 571 | # CONFIG_NEW_LEDS is not set | 587 | # CONFIG_NEW_LEDS is not set |
| 588 | # CONFIG_ACCESSIBILITY is not set | ||
| 572 | # CONFIG_EDAC is not set | 589 | # CONFIG_EDAC is not set |
| 573 | # CONFIG_RTC_CLASS is not set | 590 | # CONFIG_RTC_CLASS is not set |
| 574 | # CONFIG_DMADEVICES is not set | 591 | # CONFIG_DMADEVICES is not set |
| 575 | |||
| 576 | # | ||
| 577 | # Userspace I/O | ||
| 578 | # | ||
| 579 | # CONFIG_UIO is not set | 592 | # CONFIG_UIO is not set |
| 580 | 593 | ||
| 581 | # | 594 | # |
| @@ -595,7 +608,6 @@ CONFIG_FS_MBCACHE=y | |||
| 595 | # CONFIG_JFS_FS is not set | 608 | # CONFIG_JFS_FS is not set |
| 596 | # CONFIG_FS_POSIX_ACL is not set | 609 | # CONFIG_FS_POSIX_ACL is not set |
| 597 | # CONFIG_XFS_FS is not set | 610 | # CONFIG_XFS_FS is not set |
| 598 | # CONFIG_GFS2_FS is not set | ||
| 599 | # CONFIG_OCFS2_FS is not set | 611 | # CONFIG_OCFS2_FS is not set |
| 600 | CONFIG_DNOTIFY=y | 612 | CONFIG_DNOTIFY=y |
| 601 | CONFIG_INOTIFY=y | 613 | CONFIG_INOTIFY=y |
| @@ -652,7 +664,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 652 | CONFIG_NFS_FS=y | 664 | CONFIG_NFS_FS=y |
| 653 | # CONFIG_NFS_V3 is not set | 665 | # CONFIG_NFS_V3 is not set |
| 654 | # CONFIG_NFS_V4 is not set | 666 | # CONFIG_NFS_V4 is not set |
| 655 | # CONFIG_NFS_DIRECTIO is not set | ||
| 656 | # CONFIG_NFSD is not set | 667 | # CONFIG_NFSD is not set |
| 657 | CONFIG_ROOT_NFS=y | 668 | CONFIG_ROOT_NFS=y |
| 658 | CONFIG_LOCKD=y | 669 | CONFIG_LOCKD=y |
| @@ -691,6 +702,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 691 | # Library routines | 702 | # Library routines |
| 692 | # | 703 | # |
| 693 | CONFIG_BITREVERSE=y | 704 | CONFIG_BITREVERSE=y |
| 705 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 694 | # CONFIG_CRC_CCITT is not set | 706 | # CONFIG_CRC_CCITT is not set |
| 695 | # CONFIG_CRC16 is not set | 707 | # CONFIG_CRC16 is not set |
| 696 | # CONFIG_CRC_ITU_T is not set | 708 | # CONFIG_CRC_ITU_T is not set |
| @@ -701,6 +713,7 @@ CONFIG_PLIST=y | |||
| 701 | CONFIG_HAS_IOMEM=y | 713 | CONFIG_HAS_IOMEM=y |
| 702 | CONFIG_HAS_IOPORT=y | 714 | CONFIG_HAS_IOPORT=y |
| 703 | CONFIG_HAS_DMA=y | 715 | CONFIG_HAS_DMA=y |
| 716 | CONFIG_HAVE_LMB=y | ||
| 704 | 717 | ||
| 705 | # | 718 | # |
| 706 | # Kernel hacking | 719 | # Kernel hacking |
| @@ -708,6 +721,7 @@ CONFIG_HAS_DMA=y | |||
| 708 | # CONFIG_PRINTK_TIME is not set | 721 | # CONFIG_PRINTK_TIME is not set |
| 709 | CONFIG_ENABLE_WARN_DEPRECATED=y | 722 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 710 | CONFIG_ENABLE_MUST_CHECK=y | 723 | CONFIG_ENABLE_MUST_CHECK=y |
| 724 | CONFIG_FRAME_WARN=1024 | ||
| 711 | # CONFIG_MAGIC_SYSRQ is not set | 725 | # CONFIG_MAGIC_SYSRQ is not set |
| 712 | # CONFIG_UNUSED_SYMBOLS is not set | 726 | # CONFIG_UNUSED_SYMBOLS is not set |
| 713 | # CONFIG_DEBUG_FS is not set | 727 | # CONFIG_DEBUG_FS is not set |
| @@ -718,6 +732,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 718 | CONFIG_SCHED_DEBUG=y | 732 | CONFIG_SCHED_DEBUG=y |
| 719 | # CONFIG_SCHEDSTATS is not set | 733 | # CONFIG_SCHEDSTATS is not set |
| 720 | # CONFIG_TIMER_STATS is not set | 734 | # CONFIG_TIMER_STATS is not set |
| 735 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 721 | # CONFIG_SLUB_DEBUG_ON is not set | 736 | # CONFIG_SLUB_DEBUG_ON is not set |
| 722 | # CONFIG_SLUB_STATS is not set | 737 | # CONFIG_SLUB_STATS is not set |
| 723 | # CONFIG_DEBUG_RT_MUTEXES is not set | 738 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -730,6 +745,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 730 | # CONFIG_DEBUG_BUGVERBOSE is not set | 745 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 731 | # CONFIG_DEBUG_INFO is not set | 746 | # CONFIG_DEBUG_INFO is not set |
| 732 | # CONFIG_DEBUG_VM is not set | 747 | # CONFIG_DEBUG_VM is not set |
| 748 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 733 | # CONFIG_DEBUG_LIST is not set | 749 | # CONFIG_DEBUG_LIST is not set |
| 734 | # CONFIG_DEBUG_SG is not set | 750 | # CONFIG_DEBUG_SG is not set |
| 735 | # CONFIG_BOOT_PRINTK_DELAY is not set | 751 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -740,6 +756,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 740 | # CONFIG_DEBUG_STACK_USAGE is not set | 756 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 741 | # CONFIG_DEBUG_PAGEALLOC is not set | 757 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 742 | # CONFIG_DEBUGGER is not set | 758 | # CONFIG_DEBUGGER is not set |
| 759 | # CONFIG_IRQSTACKS is not set | ||
| 743 | # CONFIG_BDI_SWITCH is not set | 760 | # CONFIG_BDI_SWITCH is not set |
| 744 | # CONFIG_PPC_EARLY_DEBUG is not set | 761 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 745 | 762 | ||
| @@ -750,47 +767,77 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 750 | # CONFIG_SECURITY is not set | 767 | # CONFIG_SECURITY is not set |
| 751 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 768 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 752 | CONFIG_CRYPTO=y | 769 | CONFIG_CRYPTO=y |
| 753 | # CONFIG_CRYPTO_SEQIV is not set | 770 | |
| 771 | # | ||
| 772 | # Crypto core or helper | ||
| 773 | # | ||
| 754 | # CONFIG_CRYPTO_MANAGER is not set | 774 | # CONFIG_CRYPTO_MANAGER is not set |
| 775 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 776 | # CONFIG_CRYPTO_NULL is not set | ||
| 777 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 778 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 779 | |||
| 780 | # | ||
| 781 | # Authenticated Encryption with Associated Data | ||
| 782 | # | ||
| 783 | # CONFIG_CRYPTO_CCM is not set | ||
| 784 | # CONFIG_CRYPTO_GCM is not set | ||
| 785 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 786 | |||
| 787 | # | ||
| 788 | # Block modes | ||
| 789 | # | ||
| 790 | # CONFIG_CRYPTO_CBC is not set | ||
| 791 | # CONFIG_CRYPTO_CTR is not set | ||
| 792 | # CONFIG_CRYPTO_CTS is not set | ||
| 793 | # CONFIG_CRYPTO_ECB is not set | ||
| 794 | # CONFIG_CRYPTO_LRW is not set | ||
| 795 | # CONFIG_CRYPTO_PCBC is not set | ||
| 796 | # CONFIG_CRYPTO_XTS is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # Hash modes | ||
| 800 | # | ||
| 755 | # CONFIG_CRYPTO_HMAC is not set | 801 | # CONFIG_CRYPTO_HMAC is not set |
| 756 | # CONFIG_CRYPTO_XCBC is not set | 802 | # CONFIG_CRYPTO_XCBC is not set |
| 757 | # CONFIG_CRYPTO_NULL is not set | 803 | |
| 804 | # | ||
| 805 | # Digest | ||
| 806 | # | ||
| 807 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 758 | # CONFIG_CRYPTO_MD4 is not set | 808 | # CONFIG_CRYPTO_MD4 is not set |
| 759 | # CONFIG_CRYPTO_MD5 is not set | 809 | # CONFIG_CRYPTO_MD5 is not set |
| 810 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 760 | # CONFIG_CRYPTO_SHA1 is not set | 811 | # CONFIG_CRYPTO_SHA1 is not set |
| 761 | # CONFIG_CRYPTO_SHA256 is not set | 812 | # CONFIG_CRYPTO_SHA256 is not set |
| 762 | # CONFIG_CRYPTO_SHA512 is not set | 813 | # CONFIG_CRYPTO_SHA512 is not set |
| 763 | # CONFIG_CRYPTO_WP512 is not set | ||
| 764 | # CONFIG_CRYPTO_TGR192 is not set | 814 | # CONFIG_CRYPTO_TGR192 is not set |
| 765 | # CONFIG_CRYPTO_GF128MUL is not set | 815 | # CONFIG_CRYPTO_WP512 is not set |
| 766 | # CONFIG_CRYPTO_ECB is not set | 816 | |
| 767 | # CONFIG_CRYPTO_CBC is not set | 817 | # |
| 768 | # CONFIG_CRYPTO_PCBC is not set | 818 | # Ciphers |
| 769 | # CONFIG_CRYPTO_LRW is not set | 819 | # |
| 770 | # CONFIG_CRYPTO_XTS is not set | ||
| 771 | # CONFIG_CRYPTO_CTR is not set | ||
| 772 | # CONFIG_CRYPTO_GCM is not set | ||
| 773 | # CONFIG_CRYPTO_CCM is not set | ||
| 774 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 775 | # CONFIG_CRYPTO_DES is not set | ||
| 776 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 777 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 778 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 779 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 780 | # CONFIG_CRYPTO_AES is not set | 820 | # CONFIG_CRYPTO_AES is not set |
| 821 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 822 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 823 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 824 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 781 | # CONFIG_CRYPTO_CAST5 is not set | 825 | # CONFIG_CRYPTO_CAST5 is not set |
| 782 | # CONFIG_CRYPTO_CAST6 is not set | 826 | # CONFIG_CRYPTO_CAST6 is not set |
| 783 | # CONFIG_CRYPTO_TEA is not set | 827 | # CONFIG_CRYPTO_DES is not set |
| 784 | # CONFIG_CRYPTO_ARC4 is not set | 828 | # CONFIG_CRYPTO_FCRYPT is not set |
| 785 | # CONFIG_CRYPTO_KHAZAD is not set | 829 | # CONFIG_CRYPTO_KHAZAD is not set |
| 786 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 787 | # CONFIG_CRYPTO_SEED is not set | ||
| 788 | # CONFIG_CRYPTO_SALSA20 is not set | 830 | # CONFIG_CRYPTO_SALSA20 is not set |
| 831 | # CONFIG_CRYPTO_SEED is not set | ||
| 832 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 833 | # CONFIG_CRYPTO_TEA is not set | ||
| 834 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 835 | |||
| 836 | # | ||
| 837 | # Compression | ||
| 838 | # | ||
| 789 | # CONFIG_CRYPTO_DEFLATE is not set | 839 | # CONFIG_CRYPTO_DEFLATE is not set |
| 790 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 791 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 792 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 793 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 794 | # CONFIG_CRYPTO_LZO is not set | 840 | # CONFIG_CRYPTO_LZO is not set |
| 795 | CONFIG_CRYPTO_HW=y | 841 | CONFIG_CRYPTO_HW=y |
| 796 | # CONFIG_PPC_CLOCK is not set | 842 | # CONFIG_PPC_CLOCK is not set |
| 843 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig index a9f113b243ae..042a85ea7b72 100644 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8544_ds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:03 2008 | 4 | # Mon Jun 9 08:52:32 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -203,7 +208,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 208 | # CONFIG_PREEMPT is not set |
| 204 | CONFIG_BINFMT_ELF=y | 209 | CONFIG_BINFMT_ELF=y |
| 205 | CONFIG_BINFMT_MISC=m | 210 | CONFIG_BINFMT_MISC=m |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 207 | CONFIG_MATH_EMULATION=y | 211 | CONFIG_MATH_EMULATION=y |
| 208 | # CONFIG_IOMMU_HELPER is not set | 212 | # CONFIG_IOMMU_HELPER is not set |
| 209 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 213 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -219,11 +223,13 @@ CONFIG_FLATMEM=y | |||
| 219 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 220 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 223 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 224 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 225 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| 226 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 227 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 229 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| @@ -248,6 +254,7 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # CONFIG_PCI_DEBUG is not set | 254 | # CONFIG_PCI_DEBUG is not set |
| 249 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 250 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 257 | # CONFIG_HAS_RAPIDIO is not set | ||
| 251 | 258 | ||
| 252 | # | 259 | # |
| 253 | # Advanced setup | 260 | # Advanced setup |
| @@ -257,11 +264,12 @@ CONFIG_PCI_LEGACY=y | |||
| 257 | # | 264 | # |
| 258 | # Default settings for advanced configuration options are used | 265 | # Default settings for advanced configuration options are used |
| 259 | # | 266 | # |
| 260 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 261 | CONFIG_LOWMEM_SIZE=0x30000000 | 267 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 268 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 262 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
| 270 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 263 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
| 264 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 265 | 273 | ||
| 266 | # | 274 | # |
| 267 | # Networking | 275 | # Networking |
| @@ -332,8 +340,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 332 | CONFIG_INET6_XFRM_MODE_BEET=y | 340 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 333 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 341 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 334 | CONFIG_IPV6_SIT=y | 342 | CONFIG_IPV6_SIT=y |
| 343 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 335 | # CONFIG_IPV6_TUNNEL is not set | 344 | # CONFIG_IPV6_TUNNEL is not set |
| 336 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 345 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 346 | # CONFIG_IPV6_MROUTE is not set | ||
| 337 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
| 338 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
| 339 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
| @@ -395,6 +405,7 @@ CONFIG_FW_LOADER=y | |||
| 395 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
| 396 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
| 397 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
| 408 | CONFIG_OF_I2C=y | ||
| 398 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
| 399 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
| 400 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
| @@ -501,7 +512,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 501 | # CONFIG_SCSI_SRP is not set | 512 | # CONFIG_SCSI_SRP is not set |
| 502 | CONFIG_ATA=y | 513 | CONFIG_ATA=y |
| 503 | # CONFIG_ATA_NONSTANDARD is not set | 514 | # CONFIG_ATA_NONSTANDARD is not set |
| 515 | CONFIG_SATA_PMP=y | ||
| 504 | CONFIG_SATA_AHCI=y | 516 | CONFIG_SATA_AHCI=y |
| 517 | # CONFIG_SATA_SIL24 is not set | ||
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_ATA_SFF=y | ||
| 505 | # CONFIG_SATA_SVW is not set | 520 | # CONFIG_SATA_SVW is not set |
| 506 | # CONFIG_ATA_PIIX is not set | 521 | # CONFIG_ATA_PIIX is not set |
| 507 | # CONFIG_SATA_MV is not set | 522 | # CONFIG_SATA_MV is not set |
| @@ -511,13 +526,11 @@ CONFIG_SATA_AHCI=y | |||
| 511 | # CONFIG_SATA_PROMISE is not set | 526 | # CONFIG_SATA_PROMISE is not set |
| 512 | # CONFIG_SATA_SX4 is not set | 527 | # CONFIG_SATA_SX4 is not set |
| 513 | # CONFIG_SATA_SIL is not set | 528 | # CONFIG_SATA_SIL is not set |
| 514 | # CONFIG_SATA_SIL24 is not set | ||
| 515 | # CONFIG_SATA_SIS is not set | 529 | # CONFIG_SATA_SIS is not set |
| 516 | # CONFIG_SATA_ULI is not set | 530 | # CONFIG_SATA_ULI is not set |
| 517 | # CONFIG_SATA_VIA is not set | 531 | # CONFIG_SATA_VIA is not set |
| 518 | # CONFIG_SATA_VITESSE is not set | 532 | # CONFIG_SATA_VITESSE is not set |
| 519 | # CONFIG_SATA_INIC162X is not set | 533 | # CONFIG_SATA_INIC162X is not set |
| 520 | # CONFIG_SATA_FSL is not set | ||
| 521 | CONFIG_PATA_ALI=y | 534 | CONFIG_PATA_ALI=y |
| 522 | # CONFIG_PATA_AMD is not set | 535 | # CONFIG_PATA_AMD is not set |
| 523 | # CONFIG_PATA_ARTOP is not set | 536 | # CONFIG_PATA_ARTOP is not set |
| @@ -557,6 +570,7 @@ CONFIG_PATA_ALI=y | |||
| 557 | # CONFIG_PATA_VIA is not set | 570 | # CONFIG_PATA_VIA is not set |
| 558 | # CONFIG_PATA_WINBOND is not set | 571 | # CONFIG_PATA_WINBOND is not set |
| 559 | # CONFIG_PATA_PLATFORM is not set | 572 | # CONFIG_PATA_PLATFORM is not set |
| 573 | # CONFIG_PATA_SCH is not set | ||
| 560 | # CONFIG_MD is not set | 574 | # CONFIG_MD is not set |
| 561 | # CONFIG_FUSION is not set | 575 | # CONFIG_FUSION is not set |
| 562 | 576 | ||
| @@ -622,7 +636,6 @@ CONFIG_NETDEV_1000=y | |||
| 622 | # CONFIG_SIS190 is not set | 636 | # CONFIG_SIS190 is not set |
| 623 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
| 624 | # CONFIG_SKY2 is not set | 638 | # CONFIG_SKY2 is not set |
| 625 | # CONFIG_SK98LIN is not set | ||
| 626 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
| 627 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
| 628 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
| @@ -642,6 +655,7 @@ CONFIG_NETDEV_10000=y | |||
| 642 | # CONFIG_MLX4_CORE is not set | 655 | # CONFIG_MLX4_CORE is not set |
| 643 | # CONFIG_TEHUTI is not set | 656 | # CONFIG_TEHUTI is not set |
| 644 | # CONFIG_BNX2X is not set | 657 | # CONFIG_BNX2X is not set |
| 658 | # CONFIG_SFC is not set | ||
| 645 | # CONFIG_TR is not set | 659 | # CONFIG_TR is not set |
| 646 | 660 | ||
| 647 | # | 661 | # |
| @@ -649,6 +663,7 @@ CONFIG_NETDEV_10000=y | |||
| 649 | # | 663 | # |
| 650 | # CONFIG_WLAN_PRE80211 is not set | 664 | # CONFIG_WLAN_PRE80211 is not set |
| 651 | # CONFIG_WLAN_80211 is not set | 665 | # CONFIG_WLAN_80211 is not set |
| 666 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 652 | 667 | ||
| 653 | # | 668 | # |
| 654 | # USB Network Adapters | 669 | # USB Network Adapters |
| @@ -713,6 +728,7 @@ CONFIG_VT=y | |||
| 713 | CONFIG_VT_CONSOLE=y | 728 | CONFIG_VT_CONSOLE=y |
| 714 | CONFIG_HW_CONSOLE=y | 729 | CONFIG_HW_CONSOLE=y |
| 715 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 731 | CONFIG_DEVKMEM=y | ||
| 716 | # CONFIG_SERIAL_NONSTANDARD is not set | 732 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 717 | # CONFIG_NOZOMI is not set | 733 | # CONFIG_NOZOMI is not set |
| 718 | 734 | ||
| @@ -744,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 744 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 745 | # CONFIG_HW_RANDOM is not set | 761 | # CONFIG_HW_RANDOM is not set |
| 746 | CONFIG_NVRAM=y | 762 | CONFIG_NVRAM=y |
| 747 | # CONFIG_GEN_RTC is not set | ||
| 748 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 749 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 750 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -755,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 755 | # CONFIG_I2C_CHARDEV is not set | 770 | # CONFIG_I2C_CHARDEV is not set |
| 756 | 771 | ||
| 757 | # | 772 | # |
| 758 | # I2C Algorithms | ||
| 759 | # | ||
| 760 | # CONFIG_I2C_ALGOBIT is not set | ||
| 761 | # CONFIG_I2C_ALGOPCF is not set | ||
| 762 | # CONFIG_I2C_ALGOPCA is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 766 | # | 774 | # |
| 767 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -788,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 788 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 789 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 790 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 791 | 800 | ||
| 792 | # | 801 | # |
| 793 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -797,19 +806,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 797 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 798 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 799 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 800 | # CONFIG_TPS65010 is not set | ||
| 801 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 802 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 803 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 804 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 805 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 806 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 807 | |||
| 808 | # | ||
| 809 | # SPI support | ||
| 810 | # | ||
| 811 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
| 812 | # CONFIG_SPI_MASTER is not set | ||
| 813 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
| 814 | # CONFIG_POWER_SUPPLY is not set | 817 | # CONFIG_POWER_SUPPLY is not set |
| 815 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
| @@ -826,13 +829,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 826 | # Multifunction device drivers | 829 | # Multifunction device drivers |
| 827 | # | 830 | # |
| 828 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
| 832 | # CONFIG_HTC_PASIC3 is not set | ||
| 829 | 833 | ||
| 830 | # | 834 | # |
| 831 | # Multimedia devices | 835 | # Multimedia devices |
| 832 | # | 836 | # |
| 837 | |||
| 838 | # | ||
| 839 | # Multimedia core support | ||
| 840 | # | ||
| 833 | # CONFIG_VIDEO_DEV is not set | 841 | # CONFIG_VIDEO_DEV is not set |
| 834 | CONFIG_DVB_CORE=m | 842 | CONFIG_DVB_CORE=m |
| 835 | # CONFIG_DVB_CORE_ATTACH is not set | 843 | CONFIG_VIDEO_MEDIA=m |
| 844 | |||
| 845 | # | ||
| 846 | # Multimedia drivers | ||
| 847 | # | ||
| 848 | # CONFIG_MEDIA_ATTACH is not set | ||
| 849 | CONFIG_MEDIA_TUNER=m | ||
| 850 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 851 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 852 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 853 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 854 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 855 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 856 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 857 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 858 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 836 | CONFIG_DVB_CAPTURE_DRIVERS=y | 859 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 837 | 860 | ||
| 838 | # | 861 | # |
| @@ -875,14 +898,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 875 | # | 898 | # |
| 876 | # DVB-S (satellite) frontends | 899 | # DVB-S (satellite) frontends |
| 877 | # | 900 | # |
| 878 | # CONFIG_DVB_STV0299 is not set | ||
| 879 | # CONFIG_DVB_CX24110 is not set | 901 | # CONFIG_DVB_CX24110 is not set |
| 880 | # CONFIG_DVB_CX24123 is not set | 902 | # CONFIG_DVB_CX24123 is not set |
| 881 | # CONFIG_DVB_TDA8083 is not set | ||
| 882 | # CONFIG_DVB_MT312 is not set | 903 | # CONFIG_DVB_MT312 is not set |
| 883 | # CONFIG_DVB_VES1X93 is not set | ||
| 884 | # CONFIG_DVB_S5H1420 is not set | 904 | # CONFIG_DVB_S5H1420 is not set |
| 905 | # CONFIG_DVB_STV0299 is not set | ||
| 906 | # CONFIG_DVB_TDA8083 is not set | ||
| 885 | # CONFIG_DVB_TDA10086 is not set | 907 | # CONFIG_DVB_TDA10086 is not set |
| 908 | # CONFIG_DVB_VES1X93 is not set | ||
| 909 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 910 | # CONFIG_DVB_TDA826X is not set | ||
| 911 | # CONFIG_DVB_TUA6100 is not set | ||
| 886 | 912 | ||
| 887 | # | 913 | # |
| 888 | # DVB-T (terrestrial) frontends | 914 | # DVB-T (terrestrial) frontends |
| @@ -900,6 +926,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 900 | # CONFIG_DVB_DIB3000MC is not set | 926 | # CONFIG_DVB_DIB3000MC is not set |
| 901 | # CONFIG_DVB_DIB7000M is not set | 927 | # CONFIG_DVB_DIB7000M is not set |
| 902 | # CONFIG_DVB_DIB7000P is not set | 928 | # CONFIG_DVB_DIB7000P is not set |
| 929 | # CONFIG_DVB_TDA10048 is not set | ||
| 903 | 930 | ||
| 904 | # | 931 | # |
| 905 | # DVB-C (cable) frontends | 932 | # DVB-C (cable) frontends |
| @@ -918,27 +945,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 918 | # CONFIG_DVB_BCM3510 is not set | 945 | # CONFIG_DVB_BCM3510 is not set |
| 919 | # CONFIG_DVB_LGDT330X is not set | 946 | # CONFIG_DVB_LGDT330X is not set |
| 920 | # CONFIG_DVB_S5H1409 is not set | 947 | # CONFIG_DVB_S5H1409 is not set |
| 948 | # CONFIG_DVB_AU8522 is not set | ||
| 949 | # CONFIG_DVB_S5H1411 is not set | ||
| 921 | 950 | ||
| 922 | # | 951 | # |
| 923 | # Tuners/PLL support | 952 | # Digital terrestrial only tuners/PLL |
| 924 | # | 953 | # |
| 925 | # CONFIG_DVB_PLL is not set | 954 | # CONFIG_DVB_PLL is not set |
| 926 | # CONFIG_DVB_TDA826X is not set | ||
| 927 | # CONFIG_DVB_TDA827X is not set | ||
| 928 | # CONFIG_DVB_TDA18271 is not set | ||
| 929 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 930 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 931 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 932 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 933 | # CONFIG_DVB_TUNER_DIB0070 is not set | 955 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 934 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 935 | 956 | ||
| 936 | # | 957 | # |
| 937 | # Miscellaneous devices | 958 | # SEC control devices for DVB-S |
| 938 | # | 959 | # |
| 939 | # CONFIG_DVB_LNBP21 is not set | 960 | # CONFIG_DVB_LNBP21 is not set |
| 961 | # CONFIG_DVB_ISL6405 is not set | ||
| 940 | # CONFIG_DVB_ISL6421 is not set | 962 | # CONFIG_DVB_ISL6421 is not set |
| 941 | # CONFIG_DVB_TUA6100 is not set | ||
| 942 | CONFIG_DAB=y | 963 | CONFIG_DAB=y |
| 943 | # CONFIG_USB_DABUSB is not set | 964 | # CONFIG_USB_DABUSB is not set |
| 944 | 965 | ||
| @@ -1005,6 +1026,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1005 | # CONFIG_SND_AU8810 is not set | 1026 | # CONFIG_SND_AU8810 is not set |
| 1006 | # CONFIG_SND_AU8820 is not set | 1027 | # CONFIG_SND_AU8820 is not set |
| 1007 | # CONFIG_SND_AU8830 is not set | 1028 | # CONFIG_SND_AU8830 is not set |
| 1029 | # CONFIG_SND_AW2 is not set | ||
| 1008 | # CONFIG_SND_AZT3328 is not set | 1030 | # CONFIG_SND_AZT3328 is not set |
| 1009 | # CONFIG_SND_BT87X is not set | 1031 | # CONFIG_SND_BT87X is not set |
| 1010 | # CONFIG_SND_CA0106 is not set | 1032 | # CONFIG_SND_CA0106 is not set |
| @@ -1079,11 +1101,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1079 | # CONFIG_SND_SOC is not set | 1101 | # CONFIG_SND_SOC is not set |
| 1080 | 1102 | ||
| 1081 | # | 1103 | # |
| 1082 | # SoC Audio support for SuperH | 1104 | # ALSA SoC audio for Freescale SOCs |
| 1083 | # | 1105 | # |
| 1084 | 1106 | ||
| 1085 | # | 1107 | # |
| 1086 | # ALSA SoC audio for Freescale SOCs | 1108 | # SoC Audio for the Texas Instruments OMAP |
| 1087 | # | 1109 | # |
| 1088 | 1110 | ||
| 1089 | # | 1111 | # |
| @@ -1118,16 +1140,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1118 | CONFIG_USB_DEVICE_CLASS=y | 1140 | CONFIG_USB_DEVICE_CLASS=y |
| 1119 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1141 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1120 | # CONFIG_USB_OTG is not set | 1142 | # CONFIG_USB_OTG is not set |
| 1143 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1144 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1121 | 1145 | ||
| 1122 | # | 1146 | # |
| 1123 | # USB Host Controller Drivers | 1147 | # USB Host Controller Drivers |
| 1124 | # | 1148 | # |
| 1149 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1125 | CONFIG_USB_EHCI_HCD=y | 1150 | CONFIG_USB_EHCI_HCD=y |
| 1126 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1151 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1127 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1152 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1128 | # CONFIG_USB_EHCI_FSL is not set | 1153 | # CONFIG_USB_EHCI_FSL is not set |
| 1129 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1154 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1130 | # CONFIG_USB_ISP116X_HCD is not set | 1155 | # CONFIG_USB_ISP116X_HCD is not set |
| 1156 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1131 | CONFIG_USB_OHCI_HCD=y | 1157 | CONFIG_USB_OHCI_HCD=y |
| 1132 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1158 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1133 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1159 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1145,6 +1171,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1145 | # | 1171 | # |
| 1146 | # CONFIG_USB_ACM is not set | 1172 | # CONFIG_USB_ACM is not set |
| 1147 | # CONFIG_USB_PRINTER is not set | 1173 | # CONFIG_USB_PRINTER is not set |
| 1174 | # CONFIG_USB_WDM is not set | ||
| 1148 | 1175 | ||
| 1149 | # | 1176 | # |
| 1150 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1177 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1164,7 +1191,9 @@ CONFIG_USB_STORAGE=y | |||
| 1164 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1191 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1165 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1192 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1166 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1193 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1194 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1167 | # CONFIG_USB_STORAGE_KARMA is not set | 1195 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1196 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1168 | # CONFIG_USB_LIBUSUAL is not set | 1197 | # CONFIG_USB_LIBUSUAL is not set |
| 1169 | 1198 | ||
| 1170 | # | 1199 | # |
| @@ -1202,10 +1231,12 @@ CONFIG_USB_MON=y | |||
| 1202 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1231 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1203 | # CONFIG_USB_IOWARRIOR is not set | 1232 | # CONFIG_USB_IOWARRIOR is not set |
| 1204 | # CONFIG_USB_TEST is not set | 1233 | # CONFIG_USB_TEST is not set |
| 1234 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1205 | # CONFIG_USB_GADGET is not set | 1235 | # CONFIG_USB_GADGET is not set |
| 1206 | # CONFIG_MMC is not set | 1236 | # CONFIG_MMC is not set |
| 1207 | # CONFIG_MEMSTICK is not set | 1237 | # CONFIG_MEMSTICK is not set |
| 1208 | # CONFIG_NEW_LEDS is not set | 1238 | # CONFIG_NEW_LEDS is not set |
| 1239 | # CONFIG_ACCESSIBILITY is not set | ||
| 1209 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
| 1210 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
| 1211 | CONFIG_RTC_LIB=y | 1242 | CONFIG_RTC_LIB=y |
| @@ -1257,23 +1288,19 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1257 | # | 1288 | # |
| 1258 | # on-CPU RTC drivers | 1289 | # on-CPU RTC drivers |
| 1259 | # | 1290 | # |
| 1291 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1260 | CONFIG_DMADEVICES=y | 1292 | CONFIG_DMADEVICES=y |
| 1261 | 1293 | ||
| 1262 | # | 1294 | # |
| 1263 | # DMA Devices | 1295 | # DMA Devices |
| 1264 | # | 1296 | # |
| 1265 | CONFIG_FSL_DMA=y | 1297 | CONFIG_FSL_DMA=y |
| 1266 | # CONFIG_FSL_DMA_SELFTEST is not set | ||
| 1267 | CONFIG_DMA_ENGINE=y | 1298 | CONFIG_DMA_ENGINE=y |
| 1268 | 1299 | ||
| 1269 | # | 1300 | # |
| 1270 | # DMA Clients | 1301 | # DMA Clients |
| 1271 | # | 1302 | # |
| 1272 | # CONFIG_NET_DMA is not set | 1303 | # CONFIG_NET_DMA is not set |
| 1273 | |||
| 1274 | # | ||
| 1275 | # Userspace I/O | ||
| 1276 | # | ||
| 1277 | # CONFIG_UIO is not set | 1304 | # CONFIG_UIO is not set |
| 1278 | 1305 | ||
| 1279 | # | 1306 | # |
| @@ -1293,7 +1320,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1293 | # CONFIG_JFS_FS is not set | 1320 | # CONFIG_JFS_FS is not set |
| 1294 | # CONFIG_FS_POSIX_ACL is not set | 1321 | # CONFIG_FS_POSIX_ACL is not set |
| 1295 | # CONFIG_XFS_FS is not set | 1322 | # CONFIG_XFS_FS is not set |
| 1296 | # CONFIG_GFS2_FS is not set | ||
| 1297 | # CONFIG_OCFS2_FS is not set | 1323 | # CONFIG_OCFS2_FS is not set |
| 1298 | CONFIG_DNOTIFY=y | 1324 | CONFIG_DNOTIFY=y |
| 1299 | CONFIG_INOTIFY=y | 1325 | CONFIG_INOTIFY=y |
| @@ -1363,10 +1389,9 @@ CONFIG_NFS_FS=y | |||
| 1363 | CONFIG_NFS_V3=y | 1389 | CONFIG_NFS_V3=y |
| 1364 | # CONFIG_NFS_V3_ACL is not set | 1390 | # CONFIG_NFS_V3_ACL is not set |
| 1365 | CONFIG_NFS_V4=y | 1391 | CONFIG_NFS_V4=y |
| 1366 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1367 | CONFIG_NFSD=y | 1392 | CONFIG_NFSD=y |
| 1368 | # CONFIG_NFSD_V3 is not set | 1393 | # CONFIG_NFSD_V3 is not set |
| 1369 | CONFIG_NFSD_TCP=y | 1394 | # CONFIG_NFSD_V4 is not set |
| 1370 | CONFIG_ROOT_NFS=y | 1395 | CONFIG_ROOT_NFS=y |
| 1371 | CONFIG_LOCKD=y | 1396 | CONFIG_LOCKD=y |
| 1372 | CONFIG_LOCKD_V4=y | 1397 | CONFIG_LOCKD_V4=y |
| @@ -1450,9 +1475,10 @@ CONFIG_NLS_UTF8=m | |||
| 1450 | # Library routines | 1475 | # Library routines |
| 1451 | # | 1476 | # |
| 1452 | CONFIG_BITREVERSE=y | 1477 | CONFIG_BITREVERSE=y |
| 1478 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1453 | # CONFIG_CRC_CCITT is not set | 1479 | # CONFIG_CRC_CCITT is not set |
| 1454 | # CONFIG_CRC16 is not set | 1480 | # CONFIG_CRC16 is not set |
| 1455 | # CONFIG_CRC_ITU_T is not set | 1481 | CONFIG_CRC_ITU_T=m |
| 1456 | CONFIG_CRC32=y | 1482 | CONFIG_CRC32=y |
| 1457 | # CONFIG_CRC7 is not set | 1483 | # CONFIG_CRC7 is not set |
| 1458 | CONFIG_LIBCRC32C=m | 1484 | CONFIG_LIBCRC32C=m |
| @@ -1469,6 +1495,7 @@ CONFIG_HAVE_LMB=y | |||
| 1469 | # CONFIG_PRINTK_TIME is not set | 1495 | # CONFIG_PRINTK_TIME is not set |
| 1470 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1496 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1471 | CONFIG_ENABLE_MUST_CHECK=y | 1497 | CONFIG_ENABLE_MUST_CHECK=y |
| 1498 | CONFIG_FRAME_WARN=1024 | ||
| 1472 | # CONFIG_MAGIC_SYSRQ is not set | 1499 | # CONFIG_MAGIC_SYSRQ is not set |
| 1473 | # CONFIG_UNUSED_SYMBOLS is not set | 1500 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1474 | # CONFIG_DEBUG_FS is not set | 1501 | # CONFIG_DEBUG_FS is not set |
| @@ -1479,6 +1506,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1479 | CONFIG_SCHED_DEBUG=y | 1506 | CONFIG_SCHED_DEBUG=y |
| 1480 | # CONFIG_SCHEDSTATS is not set | 1507 | # CONFIG_SCHEDSTATS is not set |
| 1481 | # CONFIG_TIMER_STATS is not set | 1508 | # CONFIG_TIMER_STATS is not set |
| 1509 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1482 | # CONFIG_SLUB_DEBUG_ON is not set | 1510 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1483 | # CONFIG_SLUB_STATS is not set | 1511 | # CONFIG_SLUB_STATS is not set |
| 1484 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1512 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1492,6 +1520,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1492 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1520 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1493 | CONFIG_DEBUG_INFO=y | 1521 | CONFIG_DEBUG_INFO=y |
| 1494 | # CONFIG_DEBUG_VM is not set | 1522 | # CONFIG_DEBUG_VM is not set |
| 1523 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1495 | # CONFIG_DEBUG_LIST is not set | 1524 | # CONFIG_DEBUG_LIST is not set |
| 1496 | # CONFIG_DEBUG_SG is not set | 1525 | # CONFIG_DEBUG_SG is not set |
| 1497 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1526 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1503,6 +1532,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1503 | # CONFIG_DEBUG_STACK_USAGE is not set | 1532 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1504 | # CONFIG_DEBUG_PAGEALLOC is not set | 1533 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1505 | # CONFIG_DEBUGGER is not set | 1534 | # CONFIG_DEBUGGER is not set |
| 1535 | # CONFIG_IRQSTACKS is not set | ||
| 1506 | # CONFIG_BDI_SWITCH is not set | 1536 | # CONFIG_BDI_SWITCH is not set |
| 1507 | # CONFIG_PPC_EARLY_DEBUG is not set | 1537 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1508 | 1538 | ||
| @@ -1513,52 +1543,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1513 | # CONFIG_SECURITY is not set | 1543 | # CONFIG_SECURITY is not set |
| 1514 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1544 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1515 | CONFIG_CRYPTO=y | 1545 | CONFIG_CRYPTO=y |
| 1546 | |||
| 1547 | # | ||
| 1548 | # Crypto core or helper | ||
| 1549 | # | ||
| 1516 | CONFIG_CRYPTO_ALGAPI=y | 1550 | CONFIG_CRYPTO_ALGAPI=y |
| 1517 | CONFIG_CRYPTO_BLKCIPHER=y | 1551 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1518 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1519 | CONFIG_CRYPTO_HASH=y | 1552 | CONFIG_CRYPTO_HASH=y |
| 1520 | CONFIG_CRYPTO_MANAGER=y | 1553 | CONFIG_CRYPTO_MANAGER=y |
| 1554 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1555 | # CONFIG_CRYPTO_NULL is not set | ||
| 1556 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1557 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1558 | # CONFIG_CRYPTO_TEST is not set | ||
| 1559 | |||
| 1560 | # | ||
| 1561 | # Authenticated Encryption with Associated Data | ||
| 1562 | # | ||
| 1563 | # CONFIG_CRYPTO_CCM is not set | ||
| 1564 | # CONFIG_CRYPTO_GCM is not set | ||
| 1565 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1566 | |||
| 1567 | # | ||
| 1568 | # Block modes | ||
| 1569 | # | ||
| 1570 | CONFIG_CRYPTO_CBC=y | ||
| 1571 | # CONFIG_CRYPTO_CTR is not set | ||
| 1572 | # CONFIG_CRYPTO_CTS is not set | ||
| 1573 | # CONFIG_CRYPTO_ECB is not set | ||
| 1574 | # CONFIG_CRYPTO_LRW is not set | ||
| 1575 | CONFIG_CRYPTO_PCBC=m | ||
| 1576 | # CONFIG_CRYPTO_XTS is not set | ||
| 1577 | |||
| 1578 | # | ||
| 1579 | # Hash modes | ||
| 1580 | # | ||
| 1521 | CONFIG_CRYPTO_HMAC=y | 1581 | CONFIG_CRYPTO_HMAC=y |
| 1522 | # CONFIG_CRYPTO_XCBC is not set | 1582 | # CONFIG_CRYPTO_XCBC is not set |
| 1523 | # CONFIG_CRYPTO_NULL is not set | 1583 | |
| 1584 | # | ||
| 1585 | # Digest | ||
| 1586 | # | ||
| 1587 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1524 | # CONFIG_CRYPTO_MD4 is not set | 1588 | # CONFIG_CRYPTO_MD4 is not set |
| 1525 | CONFIG_CRYPTO_MD5=y | 1589 | CONFIG_CRYPTO_MD5=y |
| 1590 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1526 | CONFIG_CRYPTO_SHA1=m | 1591 | CONFIG_CRYPTO_SHA1=m |
| 1527 | # CONFIG_CRYPTO_SHA256 is not set | 1592 | # CONFIG_CRYPTO_SHA256 is not set |
| 1528 | # CONFIG_CRYPTO_SHA512 is not set | 1593 | # CONFIG_CRYPTO_SHA512 is not set |
| 1529 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1530 | # CONFIG_CRYPTO_TGR192 is not set | 1594 | # CONFIG_CRYPTO_TGR192 is not set |
| 1531 | # CONFIG_CRYPTO_GF128MUL is not set | 1595 | # CONFIG_CRYPTO_WP512 is not set |
| 1532 | # CONFIG_CRYPTO_ECB is not set | 1596 | |
| 1533 | CONFIG_CRYPTO_CBC=y | 1597 | # |
| 1534 | CONFIG_CRYPTO_PCBC=m | 1598 | # Ciphers |
| 1535 | # CONFIG_CRYPTO_LRW is not set | 1599 | # |
| 1536 | # CONFIG_CRYPTO_XTS is not set | ||
| 1537 | # CONFIG_CRYPTO_CTR is not set | ||
| 1538 | # CONFIG_CRYPTO_GCM is not set | ||
| 1539 | # CONFIG_CRYPTO_CCM is not set | ||
| 1540 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1541 | CONFIG_CRYPTO_DES=y | ||
| 1542 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1543 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1544 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1545 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1546 | # CONFIG_CRYPTO_AES is not set | 1600 | # CONFIG_CRYPTO_AES is not set |
| 1601 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1602 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1603 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1604 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1547 | # CONFIG_CRYPTO_CAST5 is not set | 1605 | # CONFIG_CRYPTO_CAST5 is not set |
| 1548 | # CONFIG_CRYPTO_CAST6 is not set | 1606 | # CONFIG_CRYPTO_CAST6 is not set |
| 1549 | # CONFIG_CRYPTO_TEA is not set | 1607 | CONFIG_CRYPTO_DES=y |
| 1550 | # CONFIG_CRYPTO_ARC4 is not set | 1608 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1551 | # CONFIG_CRYPTO_KHAZAD is not set | 1609 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1552 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1553 | # CONFIG_CRYPTO_SEED is not set | ||
| 1554 | # CONFIG_CRYPTO_SALSA20 is not set | 1610 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1611 | # CONFIG_CRYPTO_SEED is not set | ||
| 1612 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1613 | # CONFIG_CRYPTO_TEA is not set | ||
| 1614 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1615 | |||
| 1616 | # | ||
| 1617 | # Compression | ||
| 1618 | # | ||
| 1555 | # CONFIG_CRYPTO_DEFLATE is not set | 1619 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1556 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1557 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1558 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1559 | # CONFIG_CRYPTO_TEST is not set | ||
| 1560 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1561 | # CONFIG_CRYPTO_LZO is not set | 1620 | # CONFIG_CRYPTO_LZO is not set |
| 1562 | CONFIG_CRYPTO_HW=y | 1621 | CONFIG_CRYPTO_HW=y |
| 1563 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1622 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1564 | # CONFIG_PPC_CLOCK is not set | 1623 | # CONFIG_PPC_CLOCK is not set |
| 1624 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig index 851ac9115617..e19592b42043 100644 --- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8560_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:27 2008 | 4 | # Mon Jun 9 08:52:33 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC8560_ADS=y | |||
| 153 | # CONFIG_MPC85xx_CDS is not set | 157 | # CONFIG_MPC85xx_CDS is not set |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | # CONFIG_PROC_DEVICETREE is not set | 225 | # CONFIG_PROC_DEVICETREE is not set |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -238,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 238 | CONFIG_PCI_DEBUG=y | 245 | CONFIG_PCI_DEBUG=y |
| 239 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 240 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 241 | 249 | ||
| 242 | # | 250 | # |
| 243 | # Advanced setup | 251 | # Advanced setup |
| @@ -247,11 +255,12 @@ CONFIG_PCI_DEBUG=y | |||
| 247 | # | 255 | # |
| 248 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 249 | # | 257 | # |
| 250 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 251 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 252 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 262 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 253 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 254 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 255 | 264 | ||
| 256 | # | 265 | # |
| 257 | # Networking | 266 | # Networking |
| @@ -299,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -462,7 +469,6 @@ CONFIG_E1000_NAPI=y | |||
| 462 | # CONFIG_SIS190 is not set | 469 | # CONFIG_SIS190 is not set |
| 463 | # CONFIG_SKGE is not set | 470 | # CONFIG_SKGE is not set |
| 464 | # CONFIG_SKY2 is not set | 471 | # CONFIG_SKY2 is not set |
| 465 | # CONFIG_SK98LIN is not set | ||
| 466 | # CONFIG_VIA_VELOCITY is not set | 472 | # CONFIG_VIA_VELOCITY is not set |
| 467 | # CONFIG_TIGON3 is not set | 473 | # CONFIG_TIGON3 is not set |
| 468 | # CONFIG_BNX2 is not set | 474 | # CONFIG_BNX2 is not set |
| @@ -482,6 +488,7 @@ CONFIG_NETDEV_10000=y | |||
| 482 | # CONFIG_MLX4_CORE is not set | 488 | # CONFIG_MLX4_CORE is not set |
| 483 | # CONFIG_TEHUTI is not set | 489 | # CONFIG_TEHUTI is not set |
| 484 | # CONFIG_BNX2X is not set | 490 | # CONFIG_BNX2X is not set |
| 491 | # CONFIG_SFC is not set | ||
| 485 | # CONFIG_TR is not set | 492 | # CONFIG_TR is not set |
| 486 | 493 | ||
| 487 | # | 494 | # |
| @@ -489,6 +496,7 @@ CONFIG_NETDEV_10000=y | |||
| 489 | # | 496 | # |
| 490 | # CONFIG_WLAN_PRE80211 is not set | 497 | # CONFIG_WLAN_PRE80211 is not set |
| 491 | # CONFIG_WLAN_80211 is not set | 498 | # CONFIG_WLAN_80211 is not set |
| 499 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 492 | # CONFIG_WAN is not set | 500 | # CONFIG_WAN is not set |
| 493 | # CONFIG_FDDI is not set | 501 | # CONFIG_FDDI is not set |
| 494 | # CONFIG_HIPPI is not set | 502 | # CONFIG_HIPPI is not set |
| @@ -535,6 +543,7 @@ CONFIG_INPUT=y | |||
| 535 | # Character devices | 543 | # Character devices |
| 536 | # | 544 | # |
| 537 | # CONFIG_VT is not set | 545 | # CONFIG_VT is not set |
| 546 | CONFIG_DEVKMEM=y | ||
| 538 | # CONFIG_SERIAL_NONSTANDARD is not set | 547 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 539 | # CONFIG_NOZOMI is not set | 548 | # CONFIG_NOZOMI is not set |
| 540 | 549 | ||
| @@ -572,12 +581,7 @@ CONFIG_GEN_RTC=y | |||
| 572 | # CONFIG_TCG_TPM is not set | 581 | # CONFIG_TCG_TPM is not set |
| 573 | CONFIG_DEVPORT=y | 582 | CONFIG_DEVPORT=y |
| 574 | # CONFIG_I2C is not set | 583 | # CONFIG_I2C is not set |
| 575 | |||
| 576 | # | ||
| 577 | # SPI support | ||
| 578 | # | ||
| 579 | # CONFIG_SPI is not set | 584 | # CONFIG_SPI is not set |
| 580 | # CONFIG_SPI_MASTER is not set | ||
| 581 | # CONFIG_W1 is not set | 585 | # CONFIG_W1 is not set |
| 582 | # CONFIG_POWER_SUPPLY is not set | 586 | # CONFIG_POWER_SUPPLY is not set |
| 583 | CONFIG_HWMON=y | 587 | CONFIG_HWMON=y |
| @@ -610,12 +614,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 610 | # Multifunction device drivers | 614 | # Multifunction device drivers |
| 611 | # | 615 | # |
| 612 | # CONFIG_MFD_SM501 is not set | 616 | # CONFIG_MFD_SM501 is not set |
| 617 | # CONFIG_HTC_PASIC3 is not set | ||
| 613 | 618 | ||
| 614 | # | 619 | # |
| 615 | # Multimedia devices | 620 | # Multimedia devices |
| 616 | # | 621 | # |
| 622 | |||
| 623 | # | ||
| 624 | # Multimedia core support | ||
| 625 | # | ||
| 617 | # CONFIG_VIDEO_DEV is not set | 626 | # CONFIG_VIDEO_DEV is not set |
| 618 | # CONFIG_DVB_CORE is not set | 627 | # CONFIG_DVB_CORE is not set |
| 628 | # CONFIG_VIDEO_MEDIA is not set | ||
| 629 | |||
| 630 | # | ||
| 631 | # Multimedia drivers | ||
| 632 | # | ||
| 619 | CONFIG_DAB=y | 633 | CONFIG_DAB=y |
| 620 | 634 | ||
| 621 | # | 635 | # |
| @@ -646,6 +660,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 646 | CONFIG_USB_ARCH_HAS_OHCI=y | 660 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 647 | CONFIG_USB_ARCH_HAS_EHCI=y | 661 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 648 | # CONFIG_USB is not set | 662 | # CONFIG_USB is not set |
| 663 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 664 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 649 | 665 | ||
| 650 | # | 666 | # |
| 651 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 667 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -654,14 +670,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 654 | # CONFIG_MMC is not set | 670 | # CONFIG_MMC is not set |
| 655 | # CONFIG_MEMSTICK is not set | 671 | # CONFIG_MEMSTICK is not set |
| 656 | # CONFIG_NEW_LEDS is not set | 672 | # CONFIG_NEW_LEDS is not set |
| 673 | # CONFIG_ACCESSIBILITY is not set | ||
| 657 | # CONFIG_INFINIBAND is not set | 674 | # CONFIG_INFINIBAND is not set |
| 658 | # CONFIG_EDAC is not set | 675 | # CONFIG_EDAC is not set |
| 659 | # CONFIG_RTC_CLASS is not set | 676 | # CONFIG_RTC_CLASS is not set |
| 660 | # CONFIG_DMADEVICES is not set | 677 | # CONFIG_DMADEVICES is not set |
| 661 | |||
| 662 | # | ||
| 663 | # Userspace I/O | ||
| 664 | # | ||
| 665 | # CONFIG_UIO is not set | 678 | # CONFIG_UIO is not set |
| 666 | 679 | ||
| 667 | # | 680 | # |
| @@ -681,7 +694,6 @@ CONFIG_FS_MBCACHE=y | |||
| 681 | # CONFIG_JFS_FS is not set | 694 | # CONFIG_JFS_FS is not set |
| 682 | # CONFIG_FS_POSIX_ACL is not set | 695 | # CONFIG_FS_POSIX_ACL is not set |
| 683 | # CONFIG_XFS_FS is not set | 696 | # CONFIG_XFS_FS is not set |
| 684 | # CONFIG_GFS2_FS is not set | ||
| 685 | # CONFIG_OCFS2_FS is not set | 697 | # CONFIG_OCFS2_FS is not set |
| 686 | CONFIG_DNOTIFY=y | 698 | CONFIG_DNOTIFY=y |
| 687 | CONFIG_INOTIFY=y | 699 | CONFIG_INOTIFY=y |
| @@ -738,7 +750,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 738 | CONFIG_NFS_FS=y | 750 | CONFIG_NFS_FS=y |
| 739 | # CONFIG_NFS_V3 is not set | 751 | # CONFIG_NFS_V3 is not set |
| 740 | # CONFIG_NFS_V4 is not set | 752 | # CONFIG_NFS_V4 is not set |
| 741 | # CONFIG_NFS_DIRECTIO is not set | ||
| 742 | # CONFIG_NFSD is not set | 753 | # CONFIG_NFSD is not set |
| 743 | CONFIG_ROOT_NFS=y | 754 | CONFIG_ROOT_NFS=y |
| 744 | CONFIG_LOCKD=y | 755 | CONFIG_LOCKD=y |
| @@ -777,6 +788,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 777 | # Library routines | 788 | # Library routines |
| 778 | # | 789 | # |
| 779 | CONFIG_BITREVERSE=y | 790 | CONFIG_BITREVERSE=y |
| 791 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 780 | # CONFIG_CRC_CCITT is not set | 792 | # CONFIG_CRC_CCITT is not set |
| 781 | # CONFIG_CRC16 is not set | 793 | # CONFIG_CRC16 is not set |
| 782 | # CONFIG_CRC_ITU_T is not set | 794 | # CONFIG_CRC_ITU_T is not set |
| @@ -787,6 +799,7 @@ CONFIG_PLIST=y | |||
| 787 | CONFIG_HAS_IOMEM=y | 799 | CONFIG_HAS_IOMEM=y |
| 788 | CONFIG_HAS_IOPORT=y | 800 | CONFIG_HAS_IOPORT=y |
| 789 | CONFIG_HAS_DMA=y | 801 | CONFIG_HAS_DMA=y |
| 802 | CONFIG_HAVE_LMB=y | ||
| 790 | 803 | ||
| 791 | # | 804 | # |
| 792 | # Kernel hacking | 805 | # Kernel hacking |
| @@ -794,6 +807,7 @@ CONFIG_HAS_DMA=y | |||
| 794 | # CONFIG_PRINTK_TIME is not set | 807 | # CONFIG_PRINTK_TIME is not set |
| 795 | CONFIG_ENABLE_WARN_DEPRECATED=y | 808 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 796 | CONFIG_ENABLE_MUST_CHECK=y | 809 | CONFIG_ENABLE_MUST_CHECK=y |
| 810 | CONFIG_FRAME_WARN=1024 | ||
| 797 | # CONFIG_MAGIC_SYSRQ is not set | 811 | # CONFIG_MAGIC_SYSRQ is not set |
| 798 | # CONFIG_UNUSED_SYMBOLS is not set | 812 | # CONFIG_UNUSED_SYMBOLS is not set |
| 799 | # CONFIG_DEBUG_FS is not set | 813 | # CONFIG_DEBUG_FS is not set |
| @@ -804,6 +818,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 804 | CONFIG_SCHED_DEBUG=y | 818 | CONFIG_SCHED_DEBUG=y |
| 805 | # CONFIG_SCHEDSTATS is not set | 819 | # CONFIG_SCHEDSTATS is not set |
| 806 | # CONFIG_TIMER_STATS is not set | 820 | # CONFIG_TIMER_STATS is not set |
| 821 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 807 | # CONFIG_SLUB_DEBUG_ON is not set | 822 | # CONFIG_SLUB_DEBUG_ON is not set |
| 808 | # CONFIG_SLUB_STATS is not set | 823 | # CONFIG_SLUB_STATS is not set |
| 809 | # CONFIG_DEBUG_RT_MUTEXES is not set | 824 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -816,6 +831,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 816 | # CONFIG_DEBUG_BUGVERBOSE is not set | 831 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 817 | # CONFIG_DEBUG_INFO is not set | 832 | # CONFIG_DEBUG_INFO is not set |
| 818 | # CONFIG_DEBUG_VM is not set | 833 | # CONFIG_DEBUG_VM is not set |
| 834 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 819 | # CONFIG_DEBUG_LIST is not set | 835 | # CONFIG_DEBUG_LIST is not set |
| 820 | # CONFIG_DEBUG_SG is not set | 836 | # CONFIG_DEBUG_SG is not set |
| 821 | # CONFIG_BOOT_PRINTK_DELAY is not set | 837 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -827,6 +843,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 827 | # CONFIG_DEBUG_PAGEALLOC is not set | 843 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 828 | # CONFIG_DEBUGGER is not set | 844 | # CONFIG_DEBUGGER is not set |
| 829 | # CONFIG_KGDB_CONSOLE is not set | 845 | # CONFIG_KGDB_CONSOLE is not set |
| 846 | # CONFIG_IRQSTACKS is not set | ||
| 830 | # CONFIG_BDI_SWITCH is not set | 847 | # CONFIG_BDI_SWITCH is not set |
| 831 | # CONFIG_PPC_EARLY_DEBUG is not set | 848 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 832 | 849 | ||
| @@ -837,49 +854,79 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 837 | # CONFIG_SECURITY is not set | 854 | # CONFIG_SECURITY is not set |
| 838 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 855 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 839 | CONFIG_CRYPTO=y | 856 | CONFIG_CRYPTO=y |
| 840 | # CONFIG_CRYPTO_SEQIV is not set | 857 | |
| 858 | # | ||
| 859 | # Crypto core or helper | ||
| 860 | # | ||
| 841 | # CONFIG_CRYPTO_MANAGER is not set | 861 | # CONFIG_CRYPTO_MANAGER is not set |
| 862 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 863 | # CONFIG_CRYPTO_NULL is not set | ||
| 864 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 865 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 866 | |||
| 867 | # | ||
| 868 | # Authenticated Encryption with Associated Data | ||
| 869 | # | ||
| 870 | # CONFIG_CRYPTO_CCM is not set | ||
| 871 | # CONFIG_CRYPTO_GCM is not set | ||
| 872 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 873 | |||
| 874 | # | ||
| 875 | # Block modes | ||
| 876 | # | ||
| 877 | # CONFIG_CRYPTO_CBC is not set | ||
| 878 | # CONFIG_CRYPTO_CTR is not set | ||
| 879 | # CONFIG_CRYPTO_CTS is not set | ||
| 880 | # CONFIG_CRYPTO_ECB is not set | ||
| 881 | # CONFIG_CRYPTO_LRW is not set | ||
| 882 | # CONFIG_CRYPTO_PCBC is not set | ||
| 883 | # CONFIG_CRYPTO_XTS is not set | ||
| 884 | |||
| 885 | # | ||
| 886 | # Hash modes | ||
| 887 | # | ||
| 842 | # CONFIG_CRYPTO_HMAC is not set | 888 | # CONFIG_CRYPTO_HMAC is not set |
| 843 | # CONFIG_CRYPTO_XCBC is not set | 889 | # CONFIG_CRYPTO_XCBC is not set |
| 844 | # CONFIG_CRYPTO_NULL is not set | 890 | |
| 891 | # | ||
| 892 | # Digest | ||
| 893 | # | ||
| 894 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 845 | # CONFIG_CRYPTO_MD4 is not set | 895 | # CONFIG_CRYPTO_MD4 is not set |
| 846 | # CONFIG_CRYPTO_MD5 is not set | 896 | # CONFIG_CRYPTO_MD5 is not set |
| 897 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 847 | # CONFIG_CRYPTO_SHA1 is not set | 898 | # CONFIG_CRYPTO_SHA1 is not set |
| 848 | # CONFIG_CRYPTO_SHA256 is not set | 899 | # CONFIG_CRYPTO_SHA256 is not set |
| 849 | # CONFIG_CRYPTO_SHA512 is not set | 900 | # CONFIG_CRYPTO_SHA512 is not set |
| 850 | # CONFIG_CRYPTO_WP512 is not set | ||
| 851 | # CONFIG_CRYPTO_TGR192 is not set | 901 | # CONFIG_CRYPTO_TGR192 is not set |
| 852 | # CONFIG_CRYPTO_GF128MUL is not set | 902 | # CONFIG_CRYPTO_WP512 is not set |
| 853 | # CONFIG_CRYPTO_ECB is not set | 903 | |
| 854 | # CONFIG_CRYPTO_CBC is not set | 904 | # |
| 855 | # CONFIG_CRYPTO_PCBC is not set | 905 | # Ciphers |
| 856 | # CONFIG_CRYPTO_LRW is not set | 906 | # |
| 857 | # CONFIG_CRYPTO_XTS is not set | ||
| 858 | # CONFIG_CRYPTO_CTR is not set | ||
| 859 | # CONFIG_CRYPTO_GCM is not set | ||
| 860 | # CONFIG_CRYPTO_CCM is not set | ||
| 861 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 862 | # CONFIG_CRYPTO_DES is not set | ||
| 863 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 864 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 865 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 866 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 867 | # CONFIG_CRYPTO_AES is not set | 907 | # CONFIG_CRYPTO_AES is not set |
| 908 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 909 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 910 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 911 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 868 | # CONFIG_CRYPTO_CAST5 is not set | 912 | # CONFIG_CRYPTO_CAST5 is not set |
| 869 | # CONFIG_CRYPTO_CAST6 is not set | 913 | # CONFIG_CRYPTO_CAST6 is not set |
| 870 | # CONFIG_CRYPTO_TEA is not set | 914 | # CONFIG_CRYPTO_DES is not set |
| 871 | # CONFIG_CRYPTO_ARC4 is not set | 915 | # CONFIG_CRYPTO_FCRYPT is not set |
| 872 | # CONFIG_CRYPTO_KHAZAD is not set | 916 | # CONFIG_CRYPTO_KHAZAD is not set |
| 873 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 874 | # CONFIG_CRYPTO_SEED is not set | ||
| 875 | # CONFIG_CRYPTO_SALSA20 is not set | 917 | # CONFIG_CRYPTO_SALSA20 is not set |
| 918 | # CONFIG_CRYPTO_SEED is not set | ||
| 919 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 920 | # CONFIG_CRYPTO_TEA is not set | ||
| 921 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 922 | |||
| 923 | # | ||
| 924 | # Compression | ||
| 925 | # | ||
| 876 | # CONFIG_CRYPTO_DEFLATE is not set | 926 | # CONFIG_CRYPTO_DEFLATE is not set |
| 877 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 878 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 879 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 880 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 881 | # CONFIG_CRYPTO_LZO is not set | 927 | # CONFIG_CRYPTO_LZO is not set |
| 882 | CONFIG_CRYPTO_HW=y | 928 | CONFIG_CRYPTO_HW=y |
| 883 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 929 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 884 | # CONFIG_PPC_CLOCK is not set | 930 | # CONFIG_PPC_CLOCK is not set |
| 885 | CONFIG_PPC_LIB_RHEAP=y | 931 | CONFIG_PPC_LIB_RHEAP=y |
| 932 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig index 2b866b385607..28004e93aeee 100644 --- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8568mds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:05 2008 | 4 | # Mon Jun 9 08:52:34 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,12 +114,14 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -156,6 +161,7 @@ CONFIG_MPC85xx=y | |||
| 156 | # CONFIG_MPC85xx_CDS is not set | 161 | # CONFIG_MPC85xx_CDS is not set |
| 157 | CONFIG_MPC85xx_MDS=y | 162 | CONFIG_MPC85xx_MDS=y |
| 158 | # CONFIG_MPC85xx_DS is not set | 163 | # CONFIG_MPC85xx_DS is not set |
| 164 | # CONFIG_KSI8560 is not set | ||
| 159 | # CONFIG_STX_GP3 is not set | 165 | # CONFIG_STX_GP3 is not set |
| 160 | # CONFIG_TQM8540 is not set | 166 | # CONFIG_TQM8540 is not set |
| 161 | # CONFIG_TQM8541 is not set | 167 | # CONFIG_TQM8541 is not set |
| @@ -212,11 +218,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 218 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 219 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 221 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 223 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 226 | CONFIG_VIRT_TO_BUS=y |
| 227 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 228 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 229 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 230 | # CONFIG_PM is not set |
| @@ -240,6 +248,7 @@ CONFIG_PCI_LEGACY=y | |||
| 240 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
| 241 | # CONFIG_PCCARD is not set | 249 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HOTPLUG_PCI is not set | 250 | # CONFIG_HOTPLUG_PCI is not set |
| 251 | # CONFIG_HAS_RAPIDIO is not set | ||
| 243 | 252 | ||
| 244 | # | 253 | # |
| 245 | # Advanced setup | 254 | # Advanced setup |
| @@ -249,11 +258,12 @@ CONFIG_PCI_LEGACY=y | |||
| 249 | # | 258 | # |
| 250 | # Default settings for advanced configuration options are used | 259 | # Default settings for advanced configuration options are used |
| 251 | # | 260 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 261 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 262 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 263 | CONFIG_KERNEL_START=0xc0000000 |
| 264 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 265 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 267 | ||
| 258 | # | 268 | # |
| 259 | # Networking | 269 | # Networking |
| @@ -301,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 301 | CONFIG_DEFAULT_TCP_CONG="cubic" | 311 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 302 | # CONFIG_TCP_MD5SIG is not set | 312 | # CONFIG_TCP_MD5SIG is not set |
| 303 | # CONFIG_IPV6 is not set | 313 | # CONFIG_IPV6 is not set |
| 304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 305 | # CONFIG_INET6_TUNNEL is not set | ||
| 306 | # CONFIG_NETWORK_SECMARK is not set | 314 | # CONFIG_NETWORK_SECMARK is not set |
| 307 | # CONFIG_NETFILTER is not set | 315 | # CONFIG_NETFILTER is not set |
| 308 | # CONFIG_IP_DCCP is not set | 316 | # CONFIG_IP_DCCP is not set |
| @@ -358,6 +366,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 358 | # CONFIG_CONNECTOR is not set | 366 | # CONFIG_CONNECTOR is not set |
| 359 | # CONFIG_MTD is not set | 367 | # CONFIG_MTD is not set |
| 360 | CONFIG_OF_DEVICE=y | 368 | CONFIG_OF_DEVICE=y |
| 369 | CONFIG_OF_I2C=y | ||
| 361 | # CONFIG_PARPORT is not set | 370 | # CONFIG_PARPORT is not set |
| 362 | CONFIG_BLK_DEV=y | 371 | CONFIG_BLK_DEV=y |
| 363 | # CONFIG_BLK_DEV_FD is not set | 372 | # CONFIG_BLK_DEV_FD is not set |
| @@ -525,7 +534,6 @@ CONFIG_NETDEV_1000=y | |||
| 525 | # CONFIG_SIS190 is not set | 534 | # CONFIG_SIS190 is not set |
| 526 | # CONFIG_SKGE is not set | 535 | # CONFIG_SKGE is not set |
| 527 | # CONFIG_SKY2 is not set | 536 | # CONFIG_SKY2 is not set |
| 528 | # CONFIG_SK98LIN is not set | ||
| 529 | # CONFIG_VIA_VELOCITY is not set | 537 | # CONFIG_VIA_VELOCITY is not set |
| 530 | # CONFIG_TIGON3 is not set | 538 | # CONFIG_TIGON3 is not set |
| 531 | # CONFIG_BNX2 is not set | 539 | # CONFIG_BNX2 is not set |
| @@ -546,6 +554,7 @@ CONFIG_NETDEV_10000=y | |||
| 546 | # CONFIG_MLX4_CORE is not set | 554 | # CONFIG_MLX4_CORE is not set |
| 547 | # CONFIG_TEHUTI is not set | 555 | # CONFIG_TEHUTI is not set |
| 548 | # CONFIG_BNX2X is not set | 556 | # CONFIG_BNX2X is not set |
| 557 | # CONFIG_SFC is not set | ||
| 549 | # CONFIG_TR is not set | 558 | # CONFIG_TR is not set |
| 550 | 559 | ||
| 551 | # | 560 | # |
| @@ -553,6 +562,7 @@ CONFIG_NETDEV_10000=y | |||
| 553 | # | 562 | # |
| 554 | # CONFIG_WLAN_PRE80211 is not set | 563 | # CONFIG_WLAN_PRE80211 is not set |
| 555 | # CONFIG_WLAN_80211 is not set | 564 | # CONFIG_WLAN_80211 is not set |
| 565 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 556 | # CONFIG_WAN is not set | 566 | # CONFIG_WAN is not set |
| 557 | # CONFIG_FDDI is not set | 567 | # CONFIG_FDDI is not set |
| 558 | # CONFIG_HIPPI is not set | 568 | # CONFIG_HIPPI is not set |
| @@ -600,6 +610,7 @@ CONFIG_INPUT=y | |||
| 600 | # Character devices | 610 | # Character devices |
| 601 | # | 611 | # |
| 602 | # CONFIG_VT is not set | 612 | # CONFIG_VT is not set |
| 613 | CONFIG_DEVKMEM=y | ||
| 603 | # CONFIG_SERIAL_NONSTANDARD is not set | 614 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 604 | # CONFIG_NOZOMI is not set | 615 | # CONFIG_NOZOMI is not set |
| 605 | 616 | ||
| @@ -629,7 +640,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 629 | # CONFIG_IPMI_HANDLER is not set | 640 | # CONFIG_IPMI_HANDLER is not set |
| 630 | CONFIG_HW_RANDOM=y | 641 | CONFIG_HW_RANDOM=y |
| 631 | # CONFIG_NVRAM is not set | 642 | # CONFIG_NVRAM is not set |
| 632 | # CONFIG_GEN_RTC is not set | ||
| 633 | # CONFIG_R3964 is not set | 643 | # CONFIG_R3964 is not set |
| 634 | # CONFIG_APPLICOM is not set | 644 | # CONFIG_APPLICOM is not set |
| 635 | # CONFIG_RAW_DRIVER is not set | 645 | # CONFIG_RAW_DRIVER is not set |
| @@ -640,13 +650,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 640 | CONFIG_I2C_CHARDEV=y | 650 | CONFIG_I2C_CHARDEV=y |
| 641 | 651 | ||
| 642 | # | 652 | # |
| 643 | # I2C Algorithms | ||
| 644 | # | ||
| 645 | # CONFIG_I2C_ALGOBIT is not set | ||
| 646 | # CONFIG_I2C_ALGOPCF is not set | ||
| 647 | # CONFIG_I2C_ALGOPCA is not set | ||
| 648 | |||
| 649 | # | ||
| 650 | # I2C Hardware Bus support | 653 | # I2C Hardware Bus support |
| 651 | # | 654 | # |
| 652 | # CONFIG_I2C_ALI1535 is not set | 655 | # CONFIG_I2C_ALI1535 is not set |
| @@ -672,6 +675,7 @@ CONFIG_I2C_MPC=y | |||
| 672 | # CONFIG_I2C_VIA is not set | 675 | # CONFIG_I2C_VIA is not set |
| 673 | # CONFIG_I2C_VIAPRO is not set | 676 | # CONFIG_I2C_VIAPRO is not set |
| 674 | # CONFIG_I2C_VOODOO3 is not set | 677 | # CONFIG_I2C_VOODOO3 is not set |
| 678 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 675 | 679 | ||
| 676 | # | 680 | # |
| 677 | # Miscellaneous I2C Chip support | 681 | # Miscellaneous I2C Chip support |
| @@ -681,19 +685,13 @@ CONFIG_I2C_MPC=y | |||
| 681 | # CONFIG_SENSORS_PCF8574 is not set | 685 | # CONFIG_SENSORS_PCF8574 is not set |
| 682 | # CONFIG_PCF8575 is not set | 686 | # CONFIG_PCF8575 is not set |
| 683 | # CONFIG_SENSORS_PCF8591 is not set | 687 | # CONFIG_SENSORS_PCF8591 is not set |
| 684 | # CONFIG_TPS65010 is not set | ||
| 685 | # CONFIG_SENSORS_MAX6875 is not set | 688 | # CONFIG_SENSORS_MAX6875 is not set |
| 686 | # CONFIG_SENSORS_TSL2550 is not set | 689 | # CONFIG_SENSORS_TSL2550 is not set |
| 687 | # CONFIG_I2C_DEBUG_CORE is not set | 690 | # CONFIG_I2C_DEBUG_CORE is not set |
| 688 | # CONFIG_I2C_DEBUG_ALGO is not set | 691 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 689 | # CONFIG_I2C_DEBUG_BUS is not set | 692 | # CONFIG_I2C_DEBUG_BUS is not set |
| 690 | # CONFIG_I2C_DEBUG_CHIP is not set | 693 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 691 | |||
| 692 | # | ||
| 693 | # SPI support | ||
| 694 | # | ||
| 695 | # CONFIG_SPI is not set | 694 | # CONFIG_SPI is not set |
| 696 | # CONFIG_SPI_MASTER is not set | ||
| 697 | # CONFIG_W1 is not set | 695 | # CONFIG_W1 is not set |
| 698 | # CONFIG_POWER_SUPPLY is not set | 696 | # CONFIG_POWER_SUPPLY is not set |
| 699 | CONFIG_HWMON=y | 697 | CONFIG_HWMON=y |
| @@ -776,12 +774,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 776 | # Multifunction device drivers | 774 | # Multifunction device drivers |
| 777 | # | 775 | # |
| 778 | # CONFIG_MFD_SM501 is not set | 776 | # CONFIG_MFD_SM501 is not set |
| 777 | # CONFIG_HTC_PASIC3 is not set | ||
| 779 | 778 | ||
| 780 | # | 779 | # |
| 781 | # Multimedia devices | 780 | # Multimedia devices |
| 782 | # | 781 | # |
| 782 | |||
| 783 | # | ||
| 784 | # Multimedia core support | ||
| 785 | # | ||
| 783 | # CONFIG_VIDEO_DEV is not set | 786 | # CONFIG_VIDEO_DEV is not set |
| 784 | # CONFIG_DVB_CORE is not set | 787 | # CONFIG_DVB_CORE is not set |
| 788 | # CONFIG_VIDEO_MEDIA is not set | ||
| 789 | |||
| 790 | # | ||
| 791 | # Multimedia drivers | ||
| 792 | # | ||
| 785 | CONFIG_DAB=y | 793 | CONFIG_DAB=y |
| 786 | 794 | ||
| 787 | # | 795 | # |
| @@ -812,6 +820,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 812 | CONFIG_USB_ARCH_HAS_OHCI=y | 820 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 813 | CONFIG_USB_ARCH_HAS_EHCI=y | 821 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 814 | # CONFIG_USB is not set | 822 | # CONFIG_USB is not set |
| 823 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 824 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 815 | 825 | ||
| 816 | # | 826 | # |
| 817 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 827 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -820,6 +830,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 820 | # CONFIG_MMC is not set | 830 | # CONFIG_MMC is not set |
| 821 | # CONFIG_MEMSTICK is not set | 831 | # CONFIG_MEMSTICK is not set |
| 822 | # CONFIG_NEW_LEDS is not set | 832 | # CONFIG_NEW_LEDS is not set |
| 833 | # CONFIG_ACCESSIBILITY is not set | ||
| 823 | # CONFIG_INFINIBAND is not set | 834 | # CONFIG_INFINIBAND is not set |
| 824 | # CONFIG_EDAC is not set | 835 | # CONFIG_EDAC is not set |
| 825 | CONFIG_RTC_LIB=y | 836 | CONFIG_RTC_LIB=y |
| @@ -871,11 +882,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 871 | # | 882 | # |
| 872 | # on-CPU RTC drivers | 883 | # on-CPU RTC drivers |
| 873 | # | 884 | # |
| 885 | # CONFIG_RTC_DRV_PPC is not set | ||
| 874 | # CONFIG_DMADEVICES is not set | 886 | # CONFIG_DMADEVICES is not set |
| 875 | |||
| 876 | # | ||
| 877 | # Userspace I/O | ||
| 878 | # | ||
| 879 | # CONFIG_UIO is not set | 887 | # CONFIG_UIO is not set |
| 880 | 888 | ||
| 881 | # | 889 | # |
| @@ -895,7 +903,6 @@ CONFIG_FS_MBCACHE=y | |||
| 895 | # CONFIG_JFS_FS is not set | 903 | # CONFIG_JFS_FS is not set |
| 896 | # CONFIG_FS_POSIX_ACL is not set | 904 | # CONFIG_FS_POSIX_ACL is not set |
| 897 | # CONFIG_XFS_FS is not set | 905 | # CONFIG_XFS_FS is not set |
| 898 | # CONFIG_GFS2_FS is not set | ||
| 899 | # CONFIG_OCFS2_FS is not set | 906 | # CONFIG_OCFS2_FS is not set |
| 900 | CONFIG_DNOTIFY=y | 907 | CONFIG_DNOTIFY=y |
| 901 | CONFIG_INOTIFY=y | 908 | CONFIG_INOTIFY=y |
| @@ -953,7 +960,6 @@ CONFIG_NFS_FS=y | |||
| 953 | CONFIG_NFS_V3=y | 960 | CONFIG_NFS_V3=y |
| 954 | # CONFIG_NFS_V3_ACL is not set | 961 | # CONFIG_NFS_V3_ACL is not set |
| 955 | CONFIG_NFS_V4=y | 962 | CONFIG_NFS_V4=y |
| 956 | # CONFIG_NFS_DIRECTIO is not set | ||
| 957 | # CONFIG_NFSD is not set | 963 | # CONFIG_NFSD is not set |
| 958 | CONFIG_ROOT_NFS=y | 964 | CONFIG_ROOT_NFS=y |
| 959 | CONFIG_LOCKD=y | 965 | CONFIG_LOCKD=y |
| @@ -994,6 +1000,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 994 | # Library routines | 1000 | # Library routines |
| 995 | # | 1001 | # |
| 996 | CONFIG_BITREVERSE=y | 1002 | CONFIG_BITREVERSE=y |
| 1003 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 997 | # CONFIG_CRC_CCITT is not set | 1004 | # CONFIG_CRC_CCITT is not set |
| 998 | # CONFIG_CRC16 is not set | 1005 | # CONFIG_CRC16 is not set |
| 999 | # CONFIG_CRC_ITU_T is not set | 1006 | # CONFIG_CRC_ITU_T is not set |
| @@ -1004,6 +1011,7 @@ CONFIG_PLIST=y | |||
| 1004 | CONFIG_HAS_IOMEM=y | 1011 | CONFIG_HAS_IOMEM=y |
| 1005 | CONFIG_HAS_IOPORT=y | 1012 | CONFIG_HAS_IOPORT=y |
| 1006 | CONFIG_HAS_DMA=y | 1013 | CONFIG_HAS_DMA=y |
| 1014 | CONFIG_HAVE_LMB=y | ||
| 1007 | 1015 | ||
| 1008 | # | 1016 | # |
| 1009 | # Kernel hacking | 1017 | # Kernel hacking |
| @@ -1011,6 +1019,7 @@ CONFIG_HAS_DMA=y | |||
| 1011 | # CONFIG_PRINTK_TIME is not set | 1019 | # CONFIG_PRINTK_TIME is not set |
| 1012 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1020 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1013 | CONFIG_ENABLE_MUST_CHECK=y | 1021 | CONFIG_ENABLE_MUST_CHECK=y |
| 1022 | CONFIG_FRAME_WARN=1024 | ||
| 1014 | # CONFIG_MAGIC_SYSRQ is not set | 1023 | # CONFIG_MAGIC_SYSRQ is not set |
| 1015 | # CONFIG_UNUSED_SYMBOLS is not set | 1024 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1016 | # CONFIG_DEBUG_FS is not set | 1025 | # CONFIG_DEBUG_FS is not set |
| @@ -1021,6 +1030,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1021 | CONFIG_SCHED_DEBUG=y | 1030 | CONFIG_SCHED_DEBUG=y |
| 1022 | # CONFIG_SCHEDSTATS is not set | 1031 | # CONFIG_SCHEDSTATS is not set |
| 1023 | # CONFIG_TIMER_STATS is not set | 1032 | # CONFIG_TIMER_STATS is not set |
| 1033 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1024 | # CONFIG_SLUB_DEBUG_ON is not set | 1034 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1025 | # CONFIG_SLUB_STATS is not set | 1035 | # CONFIG_SLUB_STATS is not set |
| 1026 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1036 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1033,6 +1043,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1033 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1043 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1034 | # CONFIG_DEBUG_INFO is not set | 1044 | # CONFIG_DEBUG_INFO is not set |
| 1035 | # CONFIG_DEBUG_VM is not set | 1045 | # CONFIG_DEBUG_VM is not set |
| 1046 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1036 | # CONFIG_DEBUG_LIST is not set | 1047 | # CONFIG_DEBUG_LIST is not set |
| 1037 | # CONFIG_DEBUG_SG is not set | 1048 | # CONFIG_DEBUG_SG is not set |
| 1038 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1049 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1045,6 +1056,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1045 | # CONFIG_DEBUG_PAGEALLOC is not set | 1056 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1046 | CONFIG_DEBUGGER=y | 1057 | CONFIG_DEBUGGER=y |
| 1047 | # CONFIG_XMON is not set | 1058 | # CONFIG_XMON is not set |
| 1059 | # CONFIG_IRQSTACKS is not set | ||
| 1048 | # CONFIG_BDI_SWITCH is not set | 1060 | # CONFIG_BDI_SWITCH is not set |
| 1049 | CONFIG_PPC_EARLY_DEBUG=y | 1061 | CONFIG_PPC_EARLY_DEBUG=y |
| 1050 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 1062 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
| @@ -1066,52 +1078,82 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
| 1066 | # CONFIG_SECURITY is not set | 1078 | # CONFIG_SECURITY is not set |
| 1067 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1079 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1068 | CONFIG_CRYPTO=y | 1080 | CONFIG_CRYPTO=y |
| 1081 | |||
| 1082 | # | ||
| 1083 | # Crypto core or helper | ||
| 1084 | # | ||
| 1069 | CONFIG_CRYPTO_ALGAPI=y | 1085 | CONFIG_CRYPTO_ALGAPI=y |
| 1070 | CONFIG_CRYPTO_BLKCIPHER=y | 1086 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1071 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1072 | CONFIG_CRYPTO_MANAGER=y | 1087 | CONFIG_CRYPTO_MANAGER=y |
| 1088 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1089 | # CONFIG_CRYPTO_NULL is not set | ||
| 1090 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1091 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1092 | # CONFIG_CRYPTO_TEST is not set | ||
| 1093 | |||
| 1094 | # | ||
| 1095 | # Authenticated Encryption with Associated Data | ||
| 1096 | # | ||
| 1097 | # CONFIG_CRYPTO_CCM is not set | ||
| 1098 | # CONFIG_CRYPTO_GCM is not set | ||
| 1099 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1100 | |||
| 1101 | # | ||
| 1102 | # Block modes | ||
| 1103 | # | ||
| 1104 | CONFIG_CRYPTO_CBC=y | ||
| 1105 | # CONFIG_CRYPTO_CTR is not set | ||
| 1106 | # CONFIG_CRYPTO_CTS is not set | ||
| 1107 | CONFIG_CRYPTO_ECB=m | ||
| 1108 | # CONFIG_CRYPTO_LRW is not set | ||
| 1109 | CONFIG_CRYPTO_PCBC=m | ||
| 1110 | # CONFIG_CRYPTO_XTS is not set | ||
| 1111 | |||
| 1112 | # | ||
| 1113 | # Hash modes | ||
| 1114 | # | ||
| 1073 | # CONFIG_CRYPTO_HMAC is not set | 1115 | # CONFIG_CRYPTO_HMAC is not set |
| 1074 | # CONFIG_CRYPTO_XCBC is not set | 1116 | # CONFIG_CRYPTO_XCBC is not set |
| 1075 | # CONFIG_CRYPTO_NULL is not set | 1117 | |
| 1118 | # | ||
| 1119 | # Digest | ||
| 1120 | # | ||
| 1121 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1076 | # CONFIG_CRYPTO_MD4 is not set | 1122 | # CONFIG_CRYPTO_MD4 is not set |
| 1077 | CONFIG_CRYPTO_MD5=y | 1123 | CONFIG_CRYPTO_MD5=y |
| 1124 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1078 | # CONFIG_CRYPTO_SHA1 is not set | 1125 | # CONFIG_CRYPTO_SHA1 is not set |
| 1079 | # CONFIG_CRYPTO_SHA256 is not set | 1126 | # CONFIG_CRYPTO_SHA256 is not set |
| 1080 | # CONFIG_CRYPTO_SHA512 is not set | 1127 | # CONFIG_CRYPTO_SHA512 is not set |
| 1081 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1082 | # CONFIG_CRYPTO_TGR192 is not set | 1128 | # CONFIG_CRYPTO_TGR192 is not set |
| 1083 | # CONFIG_CRYPTO_GF128MUL is not set | 1129 | # CONFIG_CRYPTO_WP512 is not set |
| 1084 | CONFIG_CRYPTO_ECB=m | 1130 | |
| 1085 | CONFIG_CRYPTO_CBC=y | 1131 | # |
| 1086 | CONFIG_CRYPTO_PCBC=m | 1132 | # Ciphers |
| 1087 | # CONFIG_CRYPTO_LRW is not set | 1133 | # |
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | # CONFIG_CRYPTO_CTR is not set | ||
| 1090 | # CONFIG_CRYPTO_GCM is not set | ||
| 1091 | # CONFIG_CRYPTO_CCM is not set | ||
| 1092 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1093 | CONFIG_CRYPTO_DES=y | ||
| 1094 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1095 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1096 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1097 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1098 | # CONFIG_CRYPTO_AES is not set | 1134 | # CONFIG_CRYPTO_AES is not set |
| 1135 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1136 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1137 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1138 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1099 | # CONFIG_CRYPTO_CAST5 is not set | 1139 | # CONFIG_CRYPTO_CAST5 is not set |
| 1100 | # CONFIG_CRYPTO_CAST6 is not set | 1140 | # CONFIG_CRYPTO_CAST6 is not set |
| 1101 | # CONFIG_CRYPTO_TEA is not set | 1141 | CONFIG_CRYPTO_DES=y |
| 1102 | # CONFIG_CRYPTO_ARC4 is not set | 1142 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1103 | # CONFIG_CRYPTO_KHAZAD is not set | 1143 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1104 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1105 | # CONFIG_CRYPTO_SEED is not set | ||
| 1106 | # CONFIG_CRYPTO_SALSA20 is not set | 1144 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1145 | # CONFIG_CRYPTO_SEED is not set | ||
| 1146 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1147 | # CONFIG_CRYPTO_TEA is not set | ||
| 1148 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1149 | |||
| 1150 | # | ||
| 1151 | # Compression | ||
| 1152 | # | ||
| 1107 | # CONFIG_CRYPTO_DEFLATE is not set | 1153 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1109 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1110 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1111 | # CONFIG_CRYPTO_TEST is not set | ||
| 1112 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1113 | # CONFIG_CRYPTO_LZO is not set | 1154 | # CONFIG_CRYPTO_LZO is not set |
| 1114 | CONFIG_CRYPTO_HW=y | 1155 | CONFIG_CRYPTO_HW=y |
| 1115 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1156 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1116 | # CONFIG_PPC_CLOCK is not set | 1157 | # CONFIG_PPC_CLOCK is not set |
| 1117 | CONFIG_PPC_LIB_RHEAP=y | 1158 | CONFIG_PPC_LIB_RHEAP=y |
| 1159 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig index 53aa6f3173a5..03627cfebcb4 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8572_ds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:06 2008 | 4 | # Mon Jun 9 08:52:35 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_MPC85xx=y | |||
| 162 | # CONFIG_MPC85xx_CDS is not set | 167 | # CONFIG_MPC85xx_CDS is not set |
| 163 | # CONFIG_MPC85xx_MDS is not set | 168 | # CONFIG_MPC85xx_MDS is not set |
| 164 | CONFIG_MPC85xx_DS=y | 169 | CONFIG_MPC85xx_DS=y |
| 170 | # CONFIG_KSI8560 is not set | ||
| 165 | # CONFIG_STX_GP3 is not set | 171 | # CONFIG_STX_GP3 is not set |
| 166 | # CONFIG_TQM8540 is not set | 172 | # CONFIG_TQM8540 is not set |
| 167 | # CONFIG_TQM8541 is not set | 173 | # CONFIG_TQM8541 is not set |
| @@ -217,11 +223,13 @@ CONFIG_FLATMEM=y | |||
| 217 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 218 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| 224 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 225 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| @@ -246,6 +254,7 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # CONFIG_PCI_DEBUG is not set | 254 | # CONFIG_PCI_DEBUG is not set |
| 247 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 248 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 257 | # CONFIG_HAS_RAPIDIO is not set | ||
| 249 | 258 | ||
| 250 | # | 259 | # |
| 251 | # Advanced setup | 260 | # Advanced setup |
| @@ -255,11 +264,12 @@ CONFIG_PCI_LEGACY=y | |||
| 255 | # | 264 | # |
| 256 | # Default settings for advanced configuration options are used | 265 | # Default settings for advanced configuration options are used |
| 257 | # | 266 | # |
| 258 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 259 | CONFIG_LOWMEM_SIZE=0x30000000 | 267 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 268 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 260 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
| 270 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 263 | 273 | ||
| 264 | # | 274 | # |
| 265 | # Networking | 275 | # Networking |
| @@ -330,8 +340,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 330 | CONFIG_INET6_XFRM_MODE_BEET=y | 340 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 331 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 341 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 332 | CONFIG_IPV6_SIT=y | 342 | CONFIG_IPV6_SIT=y |
| 343 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 333 | # CONFIG_IPV6_TUNNEL is not set | 344 | # CONFIG_IPV6_TUNNEL is not set |
| 334 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 345 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 346 | # CONFIG_IPV6_MROUTE is not set | ||
| 335 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
| 336 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
| 337 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
| @@ -393,6 +405,7 @@ CONFIG_FW_LOADER=y | |||
| 393 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
| 394 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
| 395 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
| 408 | CONFIG_OF_I2C=y | ||
| 396 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
| 397 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
| 398 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
| @@ -499,7 +512,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 499 | # CONFIG_SCSI_SRP is not set | 512 | # CONFIG_SCSI_SRP is not set |
| 500 | CONFIG_ATA=y | 513 | CONFIG_ATA=y |
| 501 | # CONFIG_ATA_NONSTANDARD is not set | 514 | # CONFIG_ATA_NONSTANDARD is not set |
| 515 | CONFIG_SATA_PMP=y | ||
| 502 | CONFIG_SATA_AHCI=y | 516 | CONFIG_SATA_AHCI=y |
| 517 | # CONFIG_SATA_SIL24 is not set | ||
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_ATA_SFF=y | ||
| 503 | # CONFIG_SATA_SVW is not set | 520 | # CONFIG_SATA_SVW is not set |
| 504 | # CONFIG_ATA_PIIX is not set | 521 | # CONFIG_ATA_PIIX is not set |
| 505 | # CONFIG_SATA_MV is not set | 522 | # CONFIG_SATA_MV is not set |
| @@ -509,13 +526,11 @@ CONFIG_SATA_AHCI=y | |||
| 509 | # CONFIG_SATA_PROMISE is not set | 526 | # CONFIG_SATA_PROMISE is not set |
| 510 | # CONFIG_SATA_SX4 is not set | 527 | # CONFIG_SATA_SX4 is not set |
| 511 | # CONFIG_SATA_SIL is not set | 528 | # CONFIG_SATA_SIL is not set |
| 512 | # CONFIG_SATA_SIL24 is not set | ||
| 513 | # CONFIG_SATA_SIS is not set | 529 | # CONFIG_SATA_SIS is not set |
| 514 | # CONFIG_SATA_ULI is not set | 530 | # CONFIG_SATA_ULI is not set |
| 515 | # CONFIG_SATA_VIA is not set | 531 | # CONFIG_SATA_VIA is not set |
| 516 | # CONFIG_SATA_VITESSE is not set | 532 | # CONFIG_SATA_VITESSE is not set |
| 517 | # CONFIG_SATA_INIC162X is not set | 533 | # CONFIG_SATA_INIC162X is not set |
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_PATA_ALI=y | 534 | CONFIG_PATA_ALI=y |
| 520 | # CONFIG_PATA_AMD is not set | 535 | # CONFIG_PATA_AMD is not set |
| 521 | # CONFIG_PATA_ARTOP is not set | 536 | # CONFIG_PATA_ARTOP is not set |
| @@ -555,6 +570,7 @@ CONFIG_PATA_ALI=y | |||
| 555 | # CONFIG_PATA_VIA is not set | 570 | # CONFIG_PATA_VIA is not set |
| 556 | # CONFIG_PATA_WINBOND is not set | 571 | # CONFIG_PATA_WINBOND is not set |
| 557 | # CONFIG_PATA_PLATFORM is not set | 572 | # CONFIG_PATA_PLATFORM is not set |
| 573 | # CONFIG_PATA_SCH is not set | ||
| 558 | # CONFIG_MD is not set | 574 | # CONFIG_MD is not set |
| 559 | # CONFIG_FUSION is not set | 575 | # CONFIG_FUSION is not set |
| 560 | 576 | ||
| @@ -620,7 +636,6 @@ CONFIG_NETDEV_1000=y | |||
| 620 | # CONFIG_SIS190 is not set | 636 | # CONFIG_SIS190 is not set |
| 621 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
| 622 | # CONFIG_SKY2 is not set | 638 | # CONFIG_SKY2 is not set |
| 623 | # CONFIG_SK98LIN is not set | ||
| 624 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
| 625 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
| 626 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
| @@ -640,6 +655,7 @@ CONFIG_NETDEV_10000=y | |||
| 640 | # CONFIG_MLX4_CORE is not set | 655 | # CONFIG_MLX4_CORE is not set |
| 641 | # CONFIG_TEHUTI is not set | 656 | # CONFIG_TEHUTI is not set |
| 642 | # CONFIG_BNX2X is not set | 657 | # CONFIG_BNX2X is not set |
| 658 | # CONFIG_SFC is not set | ||
| 643 | # CONFIG_TR is not set | 659 | # CONFIG_TR is not set |
| 644 | 660 | ||
| 645 | # | 661 | # |
| @@ -647,6 +663,7 @@ CONFIG_NETDEV_10000=y | |||
| 647 | # | 663 | # |
| 648 | # CONFIG_WLAN_PRE80211 is not set | 664 | # CONFIG_WLAN_PRE80211 is not set |
| 649 | # CONFIG_WLAN_80211 is not set | 665 | # CONFIG_WLAN_80211 is not set |
| 666 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 650 | 667 | ||
| 651 | # | 668 | # |
| 652 | # USB Network Adapters | 669 | # USB Network Adapters |
| @@ -711,6 +728,7 @@ CONFIG_VT=y | |||
| 711 | CONFIG_VT_CONSOLE=y | 728 | CONFIG_VT_CONSOLE=y |
| 712 | CONFIG_HW_CONSOLE=y | 729 | CONFIG_HW_CONSOLE=y |
| 713 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 731 | CONFIG_DEVKMEM=y | ||
| 714 | # CONFIG_SERIAL_NONSTANDARD is not set | 732 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 715 | # CONFIG_NOZOMI is not set | 733 | # CONFIG_NOZOMI is not set |
| 716 | 734 | ||
| @@ -742,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 742 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 743 | # CONFIG_HW_RANDOM is not set | 761 | # CONFIG_HW_RANDOM is not set |
| 744 | CONFIG_NVRAM=y | 762 | CONFIG_NVRAM=y |
| 745 | # CONFIG_GEN_RTC is not set | ||
| 746 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 747 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 748 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -753,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 753 | # CONFIG_I2C_CHARDEV is not set | 770 | # CONFIG_I2C_CHARDEV is not set |
| 754 | 771 | ||
| 755 | # | 772 | # |
| 756 | # I2C Algorithms | ||
| 757 | # | ||
| 758 | # CONFIG_I2C_ALGOBIT is not set | ||
| 759 | # CONFIG_I2C_ALGOPCF is not set | ||
| 760 | # CONFIG_I2C_ALGOPCA is not set | ||
| 761 | |||
| 762 | # | ||
| 763 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 764 | # | 774 | # |
| 765 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -786,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 786 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 787 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 788 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 789 | 800 | ||
| 790 | # | 801 | # |
| 791 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -795,19 +806,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 795 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 796 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 797 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 798 | # CONFIG_TPS65010 is not set | ||
| 799 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 800 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 801 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 802 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 803 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 804 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 805 | |||
| 806 | # | ||
| 807 | # SPI support | ||
| 808 | # | ||
| 809 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
| 810 | # CONFIG_SPI_MASTER is not set | ||
| 811 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
| 812 | # CONFIG_POWER_SUPPLY is not set | 817 | # CONFIG_POWER_SUPPLY is not set |
| 813 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
| @@ -824,13 +829,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 824 | # Multifunction device drivers | 829 | # Multifunction device drivers |
| 825 | # | 830 | # |
| 826 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
| 832 | # CONFIG_HTC_PASIC3 is not set | ||
| 827 | 833 | ||
| 828 | # | 834 | # |
| 829 | # Multimedia devices | 835 | # Multimedia devices |
| 830 | # | 836 | # |
| 837 | |||
| 838 | # | ||
| 839 | # Multimedia core support | ||
| 840 | # | ||
| 831 | # CONFIG_VIDEO_DEV is not set | 841 | # CONFIG_VIDEO_DEV is not set |
| 832 | CONFIG_DVB_CORE=m | 842 | CONFIG_DVB_CORE=m |
| 833 | # CONFIG_DVB_CORE_ATTACH is not set | 843 | CONFIG_VIDEO_MEDIA=m |
| 844 | |||
| 845 | # | ||
| 846 | # Multimedia drivers | ||
| 847 | # | ||
| 848 | # CONFIG_MEDIA_ATTACH is not set | ||
| 849 | CONFIG_MEDIA_TUNER=m | ||
| 850 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 851 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 852 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 853 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 854 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 855 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 856 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 857 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 858 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 834 | CONFIG_DVB_CAPTURE_DRIVERS=y | 859 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 835 | 860 | ||
| 836 | # | 861 | # |
| @@ -873,14 +898,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 873 | # | 898 | # |
| 874 | # DVB-S (satellite) frontends | 899 | # DVB-S (satellite) frontends |
| 875 | # | 900 | # |
| 876 | # CONFIG_DVB_STV0299 is not set | ||
| 877 | # CONFIG_DVB_CX24110 is not set | 901 | # CONFIG_DVB_CX24110 is not set |
| 878 | # CONFIG_DVB_CX24123 is not set | 902 | # CONFIG_DVB_CX24123 is not set |
| 879 | # CONFIG_DVB_TDA8083 is not set | ||
| 880 | # CONFIG_DVB_MT312 is not set | 903 | # CONFIG_DVB_MT312 is not set |
| 881 | # CONFIG_DVB_VES1X93 is not set | ||
| 882 | # CONFIG_DVB_S5H1420 is not set | 904 | # CONFIG_DVB_S5H1420 is not set |
| 905 | # CONFIG_DVB_STV0299 is not set | ||
| 906 | # CONFIG_DVB_TDA8083 is not set | ||
| 883 | # CONFIG_DVB_TDA10086 is not set | 907 | # CONFIG_DVB_TDA10086 is not set |
| 908 | # CONFIG_DVB_VES1X93 is not set | ||
| 909 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 910 | # CONFIG_DVB_TDA826X is not set | ||
| 911 | # CONFIG_DVB_TUA6100 is not set | ||
| 884 | 912 | ||
| 885 | # | 913 | # |
| 886 | # DVB-T (terrestrial) frontends | 914 | # DVB-T (terrestrial) frontends |
| @@ -898,6 +926,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 898 | # CONFIG_DVB_DIB3000MC is not set | 926 | # CONFIG_DVB_DIB3000MC is not set |
| 899 | # CONFIG_DVB_DIB7000M is not set | 927 | # CONFIG_DVB_DIB7000M is not set |
| 900 | # CONFIG_DVB_DIB7000P is not set | 928 | # CONFIG_DVB_DIB7000P is not set |
| 929 | # CONFIG_DVB_TDA10048 is not set | ||
| 901 | 930 | ||
| 902 | # | 931 | # |
| 903 | # DVB-C (cable) frontends | 932 | # DVB-C (cable) frontends |
| @@ -916,27 +945,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 916 | # CONFIG_DVB_BCM3510 is not set | 945 | # CONFIG_DVB_BCM3510 is not set |
| 917 | # CONFIG_DVB_LGDT330X is not set | 946 | # CONFIG_DVB_LGDT330X is not set |
| 918 | # CONFIG_DVB_S5H1409 is not set | 947 | # CONFIG_DVB_S5H1409 is not set |
| 948 | # CONFIG_DVB_AU8522 is not set | ||
| 949 | # CONFIG_DVB_S5H1411 is not set | ||
| 919 | 950 | ||
| 920 | # | 951 | # |
| 921 | # Tuners/PLL support | 952 | # Digital terrestrial only tuners/PLL |
| 922 | # | 953 | # |
| 923 | # CONFIG_DVB_PLL is not set | 954 | # CONFIG_DVB_PLL is not set |
| 924 | # CONFIG_DVB_TDA826X is not set | ||
| 925 | # CONFIG_DVB_TDA827X is not set | ||
| 926 | # CONFIG_DVB_TDA18271 is not set | ||
| 927 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 928 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 929 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 930 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 931 | # CONFIG_DVB_TUNER_DIB0070 is not set | 955 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 932 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 933 | 956 | ||
| 934 | # | 957 | # |
| 935 | # Miscellaneous devices | 958 | # SEC control devices for DVB-S |
| 936 | # | 959 | # |
| 937 | # CONFIG_DVB_LNBP21 is not set | 960 | # CONFIG_DVB_LNBP21 is not set |
| 961 | # CONFIG_DVB_ISL6405 is not set | ||
| 938 | # CONFIG_DVB_ISL6421 is not set | 962 | # CONFIG_DVB_ISL6421 is not set |
| 939 | # CONFIG_DVB_TUA6100 is not set | ||
| 940 | CONFIG_DAB=y | 963 | CONFIG_DAB=y |
| 941 | # CONFIG_USB_DABUSB is not set | 964 | # CONFIG_USB_DABUSB is not set |
| 942 | 965 | ||
| @@ -1003,6 +1026,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1003 | # CONFIG_SND_AU8810 is not set | 1026 | # CONFIG_SND_AU8810 is not set |
| 1004 | # CONFIG_SND_AU8820 is not set | 1027 | # CONFIG_SND_AU8820 is not set |
| 1005 | # CONFIG_SND_AU8830 is not set | 1028 | # CONFIG_SND_AU8830 is not set |
| 1029 | # CONFIG_SND_AW2 is not set | ||
| 1006 | # CONFIG_SND_AZT3328 is not set | 1030 | # CONFIG_SND_AZT3328 is not set |
| 1007 | # CONFIG_SND_BT87X is not set | 1031 | # CONFIG_SND_BT87X is not set |
| 1008 | # CONFIG_SND_CA0106 is not set | 1032 | # CONFIG_SND_CA0106 is not set |
| @@ -1077,11 +1101,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1077 | # CONFIG_SND_SOC is not set | 1101 | # CONFIG_SND_SOC is not set |
| 1078 | 1102 | ||
| 1079 | # | 1103 | # |
| 1080 | # SoC Audio support for SuperH | 1104 | # ALSA SoC audio for Freescale SOCs |
| 1081 | # | 1105 | # |
| 1082 | 1106 | ||
| 1083 | # | 1107 | # |
| 1084 | # ALSA SoC audio for Freescale SOCs | 1108 | # SoC Audio for the Texas Instruments OMAP |
| 1085 | # | 1109 | # |
| 1086 | 1110 | ||
| 1087 | # | 1111 | # |
| @@ -1116,16 +1140,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1116 | CONFIG_USB_DEVICE_CLASS=y | 1140 | CONFIG_USB_DEVICE_CLASS=y |
| 1117 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1141 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1118 | # CONFIG_USB_OTG is not set | 1142 | # CONFIG_USB_OTG is not set |
| 1143 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1144 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1119 | 1145 | ||
| 1120 | # | 1146 | # |
| 1121 | # USB Host Controller Drivers | 1147 | # USB Host Controller Drivers |
| 1122 | # | 1148 | # |
| 1149 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1123 | CONFIG_USB_EHCI_HCD=y | 1150 | CONFIG_USB_EHCI_HCD=y |
| 1124 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1151 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1125 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1152 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1126 | # CONFIG_USB_EHCI_FSL is not set | 1153 | # CONFIG_USB_EHCI_FSL is not set |
| 1127 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1154 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1128 | # CONFIG_USB_ISP116X_HCD is not set | 1155 | # CONFIG_USB_ISP116X_HCD is not set |
| 1156 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1129 | CONFIG_USB_OHCI_HCD=y | 1157 | CONFIG_USB_OHCI_HCD=y |
| 1130 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1158 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1131 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1159 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1143,6 +1171,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1143 | # | 1171 | # |
| 1144 | # CONFIG_USB_ACM is not set | 1172 | # CONFIG_USB_ACM is not set |
| 1145 | # CONFIG_USB_PRINTER is not set | 1173 | # CONFIG_USB_PRINTER is not set |
| 1174 | # CONFIG_USB_WDM is not set | ||
| 1146 | 1175 | ||
| 1147 | # | 1176 | # |
| 1148 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1177 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1162,7 +1191,9 @@ CONFIG_USB_STORAGE=y | |||
| 1162 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1191 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1163 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1192 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1164 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1193 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1194 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1165 | # CONFIG_USB_STORAGE_KARMA is not set | 1195 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1196 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1166 | # CONFIG_USB_LIBUSUAL is not set | 1197 | # CONFIG_USB_LIBUSUAL is not set |
| 1167 | 1198 | ||
| 1168 | # | 1199 | # |
| @@ -1200,10 +1231,12 @@ CONFIG_USB_MON=y | |||
| 1200 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1231 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1201 | # CONFIG_USB_IOWARRIOR is not set | 1232 | # CONFIG_USB_IOWARRIOR is not set |
| 1202 | # CONFIG_USB_TEST is not set | 1233 | # CONFIG_USB_TEST is not set |
| 1234 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1203 | # CONFIG_USB_GADGET is not set | 1235 | # CONFIG_USB_GADGET is not set |
| 1204 | # CONFIG_MMC is not set | 1236 | # CONFIG_MMC is not set |
| 1205 | # CONFIG_MEMSTICK is not set | 1237 | # CONFIG_MEMSTICK is not set |
| 1206 | # CONFIG_NEW_LEDS is not set | 1238 | # CONFIG_NEW_LEDS is not set |
| 1239 | # CONFIG_ACCESSIBILITY is not set | ||
| 1207 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
| 1208 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
| 1209 | CONFIG_RTC_LIB=y | 1242 | CONFIG_RTC_LIB=y |
| @@ -1255,11 +1288,8 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1255 | # | 1288 | # |
| 1256 | # on-CPU RTC drivers | 1289 | # on-CPU RTC drivers |
| 1257 | # | 1290 | # |
| 1291 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1258 | # CONFIG_DMADEVICES is not set | 1292 | # CONFIG_DMADEVICES is not set |
| 1259 | |||
| 1260 | # | ||
| 1261 | # Userspace I/O | ||
| 1262 | # | ||
| 1263 | # CONFIG_UIO is not set | 1293 | # CONFIG_UIO is not set |
| 1264 | 1294 | ||
| 1265 | # | 1295 | # |
| @@ -1279,7 +1309,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1279 | # CONFIG_JFS_FS is not set | 1309 | # CONFIG_JFS_FS is not set |
| 1280 | # CONFIG_FS_POSIX_ACL is not set | 1310 | # CONFIG_FS_POSIX_ACL is not set |
| 1281 | # CONFIG_XFS_FS is not set | 1311 | # CONFIG_XFS_FS is not set |
| 1282 | # CONFIG_GFS2_FS is not set | ||
| 1283 | # CONFIG_OCFS2_FS is not set | 1312 | # CONFIG_OCFS2_FS is not set |
| 1284 | CONFIG_DNOTIFY=y | 1313 | CONFIG_DNOTIFY=y |
| 1285 | CONFIG_INOTIFY=y | 1314 | CONFIG_INOTIFY=y |
| @@ -1349,10 +1378,9 @@ CONFIG_NFS_FS=y | |||
| 1349 | CONFIG_NFS_V3=y | 1378 | CONFIG_NFS_V3=y |
| 1350 | # CONFIG_NFS_V3_ACL is not set | 1379 | # CONFIG_NFS_V3_ACL is not set |
| 1351 | CONFIG_NFS_V4=y | 1380 | CONFIG_NFS_V4=y |
| 1352 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1353 | CONFIG_NFSD=y | 1381 | CONFIG_NFSD=y |
| 1354 | # CONFIG_NFSD_V3 is not set | 1382 | # CONFIG_NFSD_V3 is not set |
| 1355 | CONFIG_NFSD_TCP=y | 1383 | # CONFIG_NFSD_V4 is not set |
| 1356 | CONFIG_ROOT_NFS=y | 1384 | CONFIG_ROOT_NFS=y |
| 1357 | CONFIG_LOCKD=y | 1385 | CONFIG_LOCKD=y |
| 1358 | CONFIG_LOCKD_V4=y | 1386 | CONFIG_LOCKD_V4=y |
| @@ -1436,9 +1464,10 @@ CONFIG_NLS_UTF8=m | |||
| 1436 | # Library routines | 1464 | # Library routines |
| 1437 | # | 1465 | # |
| 1438 | CONFIG_BITREVERSE=y | 1466 | CONFIG_BITREVERSE=y |
| 1467 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1439 | # CONFIG_CRC_CCITT is not set | 1468 | # CONFIG_CRC_CCITT is not set |
| 1440 | # CONFIG_CRC16 is not set | 1469 | # CONFIG_CRC16 is not set |
| 1441 | # CONFIG_CRC_ITU_T is not set | 1470 | CONFIG_CRC_ITU_T=m |
| 1442 | CONFIG_CRC32=y | 1471 | CONFIG_CRC32=y |
| 1443 | # CONFIG_CRC7 is not set | 1472 | # CONFIG_CRC7 is not set |
| 1444 | CONFIG_LIBCRC32C=m | 1473 | CONFIG_LIBCRC32C=m |
| @@ -1447,6 +1476,7 @@ CONFIG_PLIST=y | |||
| 1447 | CONFIG_HAS_IOMEM=y | 1476 | CONFIG_HAS_IOMEM=y |
| 1448 | CONFIG_HAS_IOPORT=y | 1477 | CONFIG_HAS_IOPORT=y |
| 1449 | CONFIG_HAS_DMA=y | 1478 | CONFIG_HAS_DMA=y |
| 1479 | CONFIG_HAVE_LMB=y | ||
| 1450 | 1480 | ||
| 1451 | # | 1481 | # |
| 1452 | # Kernel hacking | 1482 | # Kernel hacking |
| @@ -1454,6 +1484,7 @@ CONFIG_HAS_DMA=y | |||
| 1454 | # CONFIG_PRINTK_TIME is not set | 1484 | # CONFIG_PRINTK_TIME is not set |
| 1455 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1485 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1456 | CONFIG_ENABLE_MUST_CHECK=y | 1486 | CONFIG_ENABLE_MUST_CHECK=y |
| 1487 | CONFIG_FRAME_WARN=1024 | ||
| 1457 | # CONFIG_MAGIC_SYSRQ is not set | 1488 | # CONFIG_MAGIC_SYSRQ is not set |
| 1458 | # CONFIG_UNUSED_SYMBOLS is not set | 1489 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1459 | # CONFIG_DEBUG_FS is not set | 1490 | # CONFIG_DEBUG_FS is not set |
| @@ -1464,6 +1495,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1464 | CONFIG_SCHED_DEBUG=y | 1495 | CONFIG_SCHED_DEBUG=y |
| 1465 | # CONFIG_SCHEDSTATS is not set | 1496 | # CONFIG_SCHEDSTATS is not set |
| 1466 | # CONFIG_TIMER_STATS is not set | 1497 | # CONFIG_TIMER_STATS is not set |
| 1498 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1467 | # CONFIG_SLUB_DEBUG_ON is not set | 1499 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1468 | # CONFIG_SLUB_STATS is not set | 1500 | # CONFIG_SLUB_STATS is not set |
| 1469 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1501 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1477,6 +1509,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1477 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1509 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1478 | CONFIG_DEBUG_INFO=y | 1510 | CONFIG_DEBUG_INFO=y |
| 1479 | # CONFIG_DEBUG_VM is not set | 1511 | # CONFIG_DEBUG_VM is not set |
| 1512 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1480 | # CONFIG_DEBUG_LIST is not set | 1513 | # CONFIG_DEBUG_LIST is not set |
| 1481 | # CONFIG_DEBUG_SG is not set | 1514 | # CONFIG_DEBUG_SG is not set |
| 1482 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1515 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1488,6 +1521,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1488 | # CONFIG_DEBUG_STACK_USAGE is not set | 1521 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1489 | # CONFIG_DEBUG_PAGEALLOC is not set | 1522 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1490 | # CONFIG_DEBUGGER is not set | 1523 | # CONFIG_DEBUGGER is not set |
| 1524 | # CONFIG_IRQSTACKS is not set | ||
| 1491 | # CONFIG_BDI_SWITCH is not set | 1525 | # CONFIG_BDI_SWITCH is not set |
| 1492 | # CONFIG_PPC_EARLY_DEBUG is not set | 1526 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1493 | 1527 | ||
| @@ -1498,52 +1532,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1498 | # CONFIG_SECURITY is not set | 1532 | # CONFIG_SECURITY is not set |
| 1499 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1533 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1500 | CONFIG_CRYPTO=y | 1534 | CONFIG_CRYPTO=y |
| 1535 | |||
| 1536 | # | ||
| 1537 | # Crypto core or helper | ||
| 1538 | # | ||
| 1501 | CONFIG_CRYPTO_ALGAPI=y | 1539 | CONFIG_CRYPTO_ALGAPI=y |
| 1502 | CONFIG_CRYPTO_BLKCIPHER=y | 1540 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1503 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1504 | CONFIG_CRYPTO_HASH=y | 1541 | CONFIG_CRYPTO_HASH=y |
| 1505 | CONFIG_CRYPTO_MANAGER=y | 1542 | CONFIG_CRYPTO_MANAGER=y |
| 1543 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1544 | # CONFIG_CRYPTO_NULL is not set | ||
| 1545 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1546 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1547 | # CONFIG_CRYPTO_TEST is not set | ||
| 1548 | |||
| 1549 | # | ||
| 1550 | # Authenticated Encryption with Associated Data | ||
| 1551 | # | ||
| 1552 | # CONFIG_CRYPTO_CCM is not set | ||
| 1553 | # CONFIG_CRYPTO_GCM is not set | ||
| 1554 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1555 | |||
| 1556 | # | ||
| 1557 | # Block modes | ||
| 1558 | # | ||
| 1559 | CONFIG_CRYPTO_CBC=y | ||
| 1560 | # CONFIG_CRYPTO_CTR is not set | ||
| 1561 | # CONFIG_CRYPTO_CTS is not set | ||
| 1562 | # CONFIG_CRYPTO_ECB is not set | ||
| 1563 | # CONFIG_CRYPTO_LRW is not set | ||
| 1564 | CONFIG_CRYPTO_PCBC=m | ||
| 1565 | # CONFIG_CRYPTO_XTS is not set | ||
| 1566 | |||
| 1567 | # | ||
| 1568 | # Hash modes | ||
| 1569 | # | ||
| 1506 | CONFIG_CRYPTO_HMAC=y | 1570 | CONFIG_CRYPTO_HMAC=y |
| 1507 | # CONFIG_CRYPTO_XCBC is not set | 1571 | # CONFIG_CRYPTO_XCBC is not set |
| 1508 | # CONFIG_CRYPTO_NULL is not set | 1572 | |
| 1573 | # | ||
| 1574 | # Digest | ||
| 1575 | # | ||
| 1576 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1509 | # CONFIG_CRYPTO_MD4 is not set | 1577 | # CONFIG_CRYPTO_MD4 is not set |
| 1510 | CONFIG_CRYPTO_MD5=y | 1578 | CONFIG_CRYPTO_MD5=y |
| 1579 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1511 | CONFIG_CRYPTO_SHA1=m | 1580 | CONFIG_CRYPTO_SHA1=m |
| 1512 | # CONFIG_CRYPTO_SHA256 is not set | 1581 | # CONFIG_CRYPTO_SHA256 is not set |
| 1513 | # CONFIG_CRYPTO_SHA512 is not set | 1582 | # CONFIG_CRYPTO_SHA512 is not set |
| 1514 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1515 | # CONFIG_CRYPTO_TGR192 is not set | 1583 | # CONFIG_CRYPTO_TGR192 is not set |
| 1516 | # CONFIG_CRYPTO_GF128MUL is not set | 1584 | # CONFIG_CRYPTO_WP512 is not set |
| 1517 | # CONFIG_CRYPTO_ECB is not set | 1585 | |
| 1518 | CONFIG_CRYPTO_CBC=y | 1586 | # |
| 1519 | CONFIG_CRYPTO_PCBC=m | 1587 | # Ciphers |
| 1520 | # CONFIG_CRYPTO_LRW is not set | 1588 | # |
| 1521 | # CONFIG_CRYPTO_XTS is not set | ||
| 1522 | # CONFIG_CRYPTO_CTR is not set | ||
| 1523 | # CONFIG_CRYPTO_GCM is not set | ||
| 1524 | # CONFIG_CRYPTO_CCM is not set | ||
| 1525 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1526 | CONFIG_CRYPTO_DES=y | ||
| 1527 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1528 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1529 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1530 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1531 | # CONFIG_CRYPTO_AES is not set | 1589 | # CONFIG_CRYPTO_AES is not set |
| 1590 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1591 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1592 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1593 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1532 | # CONFIG_CRYPTO_CAST5 is not set | 1594 | # CONFIG_CRYPTO_CAST5 is not set |
| 1533 | # CONFIG_CRYPTO_CAST6 is not set | 1595 | # CONFIG_CRYPTO_CAST6 is not set |
| 1534 | # CONFIG_CRYPTO_TEA is not set | 1596 | CONFIG_CRYPTO_DES=y |
| 1535 | # CONFIG_CRYPTO_ARC4 is not set | 1597 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1536 | # CONFIG_CRYPTO_KHAZAD is not set | 1598 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1537 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1538 | # CONFIG_CRYPTO_SEED is not set | ||
| 1539 | # CONFIG_CRYPTO_SALSA20 is not set | 1599 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1600 | # CONFIG_CRYPTO_SEED is not set | ||
| 1601 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1602 | # CONFIG_CRYPTO_TEA is not set | ||
| 1603 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1604 | |||
| 1605 | # | ||
| 1606 | # Compression | ||
| 1607 | # | ||
| 1540 | # CONFIG_CRYPTO_DEFLATE is not set | 1608 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1541 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1542 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1543 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1544 | # CONFIG_CRYPTO_TEST is not set | ||
| 1545 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1546 | # CONFIG_CRYPTO_LZO is not set | 1609 | # CONFIG_CRYPTO_LZO is not set |
| 1547 | CONFIG_CRYPTO_HW=y | 1610 | CONFIG_CRYPTO_HW=y |
| 1548 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1611 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1549 | # CONFIG_PPC_CLOCK is not set | 1612 | # CONFIG_PPC_CLOCK is not set |
| 1613 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig index a469fe918816..b09f0032a10b 100644 --- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/85xx/mpc85xx_cds_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:30 2008 | 4 | # Mon Jun 9 08:52:36 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC85xx=y | |||
| 153 | CONFIG_MPC85xx_CDS=y | 157 | CONFIG_MPC85xx_CDS=y |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -208,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -236,6 +243,7 @@ CONFIG_PCI_LEGACY=y | |||
| 236 | # CONFIG_PCI_DEBUG is not set | 243 | # CONFIG_PCI_DEBUG is not set |
| 237 | # CONFIG_PCCARD is not set | 244 | # CONFIG_PCCARD is not set |
| 238 | # CONFIG_HOTPLUG_PCI is not set | 245 | # CONFIG_HOTPLUG_PCI is not set |
| 246 | # CONFIG_HAS_RAPIDIO is not set | ||
| 239 | 247 | ||
| 240 | # | 248 | # |
| 241 | # Advanced setup | 249 | # Advanced setup |
| @@ -245,11 +253,12 @@ CONFIG_PCI_LEGACY=y | |||
| 245 | # | 253 | # |
| 246 | # Default settings for advanced configuration options are used | 254 | # Default settings for advanced configuration options are used |
| 247 | # | 255 | # |
| 248 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 249 | CONFIG_LOWMEM_SIZE=0x30000000 | 256 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 257 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 250 | CONFIG_KERNEL_START=0xc0000000 | 258 | CONFIG_KERNEL_START=0xc0000000 |
| 259 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 260 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 251 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 252 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 253 | 262 | ||
| 254 | # | 263 | # |
| 255 | # Networking | 264 | # Networking |
| @@ -297,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 297 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 298 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 299 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 300 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 301 | # CONFIG_INET6_TUNNEL is not set | ||
| 302 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 303 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 304 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -437,7 +444,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 437 | CONFIG_BLK_DEV_VIA82CXXX=y | 444 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 438 | # CONFIG_BLK_DEV_TC86C001 is not set | 445 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 439 | CONFIG_BLK_DEV_IDEDMA=y | 446 | CONFIG_BLK_DEV_IDEDMA=y |
| 440 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 447 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 441 | # CONFIG_BLK_DEV_HD is not set | 448 | # CONFIG_BLK_DEV_HD is not set |
| 442 | 449 | ||
| 443 | # | 450 | # |
| @@ -515,7 +522,6 @@ CONFIG_E1000_NAPI=y | |||
| 515 | # CONFIG_SIS190 is not set | 522 | # CONFIG_SIS190 is not set |
| 516 | # CONFIG_SKGE is not set | 523 | # CONFIG_SKGE is not set |
| 517 | # CONFIG_SKY2 is not set | 524 | # CONFIG_SKY2 is not set |
| 518 | # CONFIG_SK98LIN is not set | ||
| 519 | # CONFIG_VIA_VELOCITY is not set | 525 | # CONFIG_VIA_VELOCITY is not set |
| 520 | # CONFIG_TIGON3 is not set | 526 | # CONFIG_TIGON3 is not set |
| 521 | # CONFIG_BNX2 is not set | 527 | # CONFIG_BNX2 is not set |
| @@ -535,6 +541,7 @@ CONFIG_NETDEV_10000=y | |||
| 535 | # CONFIG_MLX4_CORE is not set | 541 | # CONFIG_MLX4_CORE is not set |
| 536 | # CONFIG_TEHUTI is not set | 542 | # CONFIG_TEHUTI is not set |
| 537 | # CONFIG_BNX2X is not set | 543 | # CONFIG_BNX2X is not set |
| 544 | # CONFIG_SFC is not set | ||
| 538 | # CONFIG_TR is not set | 545 | # CONFIG_TR is not set |
| 539 | 546 | ||
| 540 | # | 547 | # |
| @@ -542,6 +549,7 @@ CONFIG_NETDEV_10000=y | |||
| 542 | # | 549 | # |
| 543 | # CONFIG_WLAN_PRE80211 is not set | 550 | # CONFIG_WLAN_PRE80211 is not set |
| 544 | # CONFIG_WLAN_80211 is not set | 551 | # CONFIG_WLAN_80211 is not set |
| 552 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 545 | # CONFIG_WAN is not set | 553 | # CONFIG_WAN is not set |
| 546 | # CONFIG_FDDI is not set | 554 | # CONFIG_FDDI is not set |
| 547 | # CONFIG_HIPPI is not set | 555 | # CONFIG_HIPPI is not set |
| @@ -588,6 +596,7 @@ CONFIG_INPUT=y | |||
| 588 | # Character devices | 596 | # Character devices |
| 589 | # | 597 | # |
| 590 | # CONFIG_VT is not set | 598 | # CONFIG_VT is not set |
| 599 | CONFIG_DEVKMEM=y | ||
| 591 | # CONFIG_SERIAL_NONSTANDARD is not set | 600 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 592 | # CONFIG_NOZOMI is not set | 601 | # CONFIG_NOZOMI is not set |
| 593 | 602 | ||
| @@ -624,12 +633,7 @@ CONFIG_GEN_RTC=y | |||
| 624 | # CONFIG_TCG_TPM is not set | 633 | # CONFIG_TCG_TPM is not set |
| 625 | CONFIG_DEVPORT=y | 634 | CONFIG_DEVPORT=y |
| 626 | # CONFIG_I2C is not set | 635 | # CONFIG_I2C is not set |
| 627 | |||
| 628 | # | ||
| 629 | # SPI support | ||
| 630 | # | ||
| 631 | # CONFIG_SPI is not set | 636 | # CONFIG_SPI is not set |
| 632 | # CONFIG_SPI_MASTER is not set | ||
| 633 | # CONFIG_W1 is not set | 637 | # CONFIG_W1 is not set |
| 634 | # CONFIG_POWER_SUPPLY is not set | 638 | # CONFIG_POWER_SUPPLY is not set |
| 635 | CONFIG_HWMON=y | 639 | CONFIG_HWMON=y |
| @@ -662,12 +666,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 662 | # Multifunction device drivers | 666 | # Multifunction device drivers |
| 663 | # | 667 | # |
| 664 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
| 669 | # CONFIG_HTC_PASIC3 is not set | ||
| 665 | 670 | ||
| 666 | # | 671 | # |
| 667 | # Multimedia devices | 672 | # Multimedia devices |
| 668 | # | 673 | # |
| 674 | |||
| 675 | # | ||
| 676 | # Multimedia core support | ||
| 677 | # | ||
| 669 | # CONFIG_VIDEO_DEV is not set | 678 | # CONFIG_VIDEO_DEV is not set |
| 670 | # CONFIG_DVB_CORE is not set | 679 | # CONFIG_DVB_CORE is not set |
| 680 | # CONFIG_VIDEO_MEDIA is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Multimedia drivers | ||
| 684 | # | ||
| 671 | CONFIG_DAB=y | 685 | CONFIG_DAB=y |
| 672 | 686 | ||
| 673 | # | 687 | # |
| @@ -698,6 +712,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 698 | CONFIG_USB_ARCH_HAS_OHCI=y | 712 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 699 | CONFIG_USB_ARCH_HAS_EHCI=y | 713 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 700 | # CONFIG_USB is not set | 714 | # CONFIG_USB is not set |
| 715 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 716 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 701 | 717 | ||
| 702 | # | 718 | # |
| 703 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 719 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -706,14 +722,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 706 | # CONFIG_MMC is not set | 722 | # CONFIG_MMC is not set |
| 707 | # CONFIG_MEMSTICK is not set | 723 | # CONFIG_MEMSTICK is not set |
| 708 | # CONFIG_NEW_LEDS is not set | 724 | # CONFIG_NEW_LEDS is not set |
| 725 | # CONFIG_ACCESSIBILITY is not set | ||
| 709 | # CONFIG_INFINIBAND is not set | 726 | # CONFIG_INFINIBAND is not set |
| 710 | # CONFIG_EDAC is not set | 727 | # CONFIG_EDAC is not set |
| 711 | # CONFIG_RTC_CLASS is not set | 728 | # CONFIG_RTC_CLASS is not set |
| 712 | # CONFIG_DMADEVICES is not set | 729 | # CONFIG_DMADEVICES is not set |
| 713 | |||
| 714 | # | ||
| 715 | # Userspace I/O | ||
| 716 | # | ||
| 717 | # CONFIG_UIO is not set | 730 | # CONFIG_UIO is not set |
| 718 | 731 | ||
| 719 | # | 732 | # |
| @@ -733,7 +746,6 @@ CONFIG_FS_MBCACHE=y | |||
| 733 | # CONFIG_JFS_FS is not set | 746 | # CONFIG_JFS_FS is not set |
| 734 | # CONFIG_FS_POSIX_ACL is not set | 747 | # CONFIG_FS_POSIX_ACL is not set |
| 735 | # CONFIG_XFS_FS is not set | 748 | # CONFIG_XFS_FS is not set |
| 736 | # CONFIG_GFS2_FS is not set | ||
| 737 | # CONFIG_OCFS2_FS is not set | 749 | # CONFIG_OCFS2_FS is not set |
| 738 | CONFIG_DNOTIFY=y | 750 | CONFIG_DNOTIFY=y |
| 739 | CONFIG_INOTIFY=y | 751 | CONFIG_INOTIFY=y |
| @@ -790,7 +802,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 790 | CONFIG_NFS_FS=y | 802 | CONFIG_NFS_FS=y |
| 791 | # CONFIG_NFS_V3 is not set | 803 | # CONFIG_NFS_V3 is not set |
| 792 | # CONFIG_NFS_V4 is not set | 804 | # CONFIG_NFS_V4 is not set |
| 793 | # CONFIG_NFS_DIRECTIO is not set | ||
| 794 | # CONFIG_NFSD is not set | 805 | # CONFIG_NFSD is not set |
| 795 | CONFIG_ROOT_NFS=y | 806 | CONFIG_ROOT_NFS=y |
| 796 | CONFIG_LOCKD=y | 807 | CONFIG_LOCKD=y |
| @@ -829,6 +840,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 829 | # Library routines | 840 | # Library routines |
| 830 | # | 841 | # |
| 831 | CONFIG_BITREVERSE=y | 842 | CONFIG_BITREVERSE=y |
| 843 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 832 | # CONFIG_CRC_CCITT is not set | 844 | # CONFIG_CRC_CCITT is not set |
| 833 | # CONFIG_CRC16 is not set | 845 | # CONFIG_CRC16 is not set |
| 834 | # CONFIG_CRC_ITU_T is not set | 846 | # CONFIG_CRC_ITU_T is not set |
| @@ -839,6 +851,7 @@ CONFIG_PLIST=y | |||
| 839 | CONFIG_HAS_IOMEM=y | 851 | CONFIG_HAS_IOMEM=y |
| 840 | CONFIG_HAS_IOPORT=y | 852 | CONFIG_HAS_IOPORT=y |
| 841 | CONFIG_HAS_DMA=y | 853 | CONFIG_HAS_DMA=y |
| 854 | CONFIG_HAVE_LMB=y | ||
| 842 | 855 | ||
| 843 | # | 856 | # |
| 844 | # Kernel hacking | 857 | # Kernel hacking |
| @@ -846,6 +859,7 @@ CONFIG_HAS_DMA=y | |||
| 846 | # CONFIG_PRINTK_TIME is not set | 859 | # CONFIG_PRINTK_TIME is not set |
| 847 | CONFIG_ENABLE_WARN_DEPRECATED=y | 860 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 848 | CONFIG_ENABLE_MUST_CHECK=y | 861 | CONFIG_ENABLE_MUST_CHECK=y |
| 862 | CONFIG_FRAME_WARN=1024 | ||
| 849 | # CONFIG_MAGIC_SYSRQ is not set | 863 | # CONFIG_MAGIC_SYSRQ is not set |
| 850 | # CONFIG_UNUSED_SYMBOLS is not set | 864 | # CONFIG_UNUSED_SYMBOLS is not set |
| 851 | # CONFIG_DEBUG_FS is not set | 865 | # CONFIG_DEBUG_FS is not set |
| @@ -856,6 +870,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 856 | CONFIG_SCHED_DEBUG=y | 870 | CONFIG_SCHED_DEBUG=y |
| 857 | # CONFIG_SCHEDSTATS is not set | 871 | # CONFIG_SCHEDSTATS is not set |
| 858 | # CONFIG_TIMER_STATS is not set | 872 | # CONFIG_TIMER_STATS is not set |
| 873 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 859 | # CONFIG_SLUB_DEBUG_ON is not set | 874 | # CONFIG_SLUB_DEBUG_ON is not set |
| 860 | # CONFIG_SLUB_STATS is not set | 875 | # CONFIG_SLUB_STATS is not set |
| 861 | # CONFIG_DEBUG_RT_MUTEXES is not set | 876 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -868,6 +883,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 868 | # CONFIG_DEBUG_BUGVERBOSE is not set | 883 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 869 | # CONFIG_DEBUG_INFO is not set | 884 | # CONFIG_DEBUG_INFO is not set |
| 870 | # CONFIG_DEBUG_VM is not set | 885 | # CONFIG_DEBUG_VM is not set |
| 886 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 871 | # CONFIG_DEBUG_LIST is not set | 887 | # CONFIG_DEBUG_LIST is not set |
| 872 | # CONFIG_DEBUG_SG is not set | 888 | # CONFIG_DEBUG_SG is not set |
| 873 | # CONFIG_BOOT_PRINTK_DELAY is not set | 889 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -878,6 +894,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 878 | # CONFIG_DEBUG_STACK_USAGE is not set | 894 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 879 | # CONFIG_DEBUG_PAGEALLOC is not set | 895 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 880 | # CONFIG_DEBUGGER is not set | 896 | # CONFIG_DEBUGGER is not set |
| 897 | # CONFIG_IRQSTACKS is not set | ||
| 881 | # CONFIG_BDI_SWITCH is not set | 898 | # CONFIG_BDI_SWITCH is not set |
| 882 | # CONFIG_PPC_EARLY_DEBUG is not set | 899 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 883 | 900 | ||
| @@ -888,48 +905,78 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 888 | # CONFIG_SECURITY is not set | 905 | # CONFIG_SECURITY is not set |
| 889 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 906 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 890 | CONFIG_CRYPTO=y | 907 | CONFIG_CRYPTO=y |
| 891 | # CONFIG_CRYPTO_SEQIV is not set | 908 | |
| 909 | # | ||
| 910 | # Crypto core or helper | ||
| 911 | # | ||
| 892 | # CONFIG_CRYPTO_MANAGER is not set | 912 | # CONFIG_CRYPTO_MANAGER is not set |
| 913 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 914 | # CONFIG_CRYPTO_NULL is not set | ||
| 915 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 916 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # Authenticated Encryption with Associated Data | ||
| 920 | # | ||
| 921 | # CONFIG_CRYPTO_CCM is not set | ||
| 922 | # CONFIG_CRYPTO_GCM is not set | ||
| 923 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 924 | |||
| 925 | # | ||
| 926 | # Block modes | ||
| 927 | # | ||
| 928 | # CONFIG_CRYPTO_CBC is not set | ||
| 929 | # CONFIG_CRYPTO_CTR is not set | ||
| 930 | # CONFIG_CRYPTO_CTS is not set | ||
| 931 | # CONFIG_CRYPTO_ECB is not set | ||
| 932 | # CONFIG_CRYPTO_LRW is not set | ||
| 933 | # CONFIG_CRYPTO_PCBC is not set | ||
| 934 | # CONFIG_CRYPTO_XTS is not set | ||
| 935 | |||
| 936 | # | ||
| 937 | # Hash modes | ||
| 938 | # | ||
| 893 | # CONFIG_CRYPTO_HMAC is not set | 939 | # CONFIG_CRYPTO_HMAC is not set |
| 894 | # CONFIG_CRYPTO_XCBC is not set | 940 | # CONFIG_CRYPTO_XCBC is not set |
| 895 | # CONFIG_CRYPTO_NULL is not set | 941 | |
| 942 | # | ||
| 943 | # Digest | ||
| 944 | # | ||
| 945 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 896 | # CONFIG_CRYPTO_MD4 is not set | 946 | # CONFIG_CRYPTO_MD4 is not set |
| 897 | # CONFIG_CRYPTO_MD5 is not set | 947 | # CONFIG_CRYPTO_MD5 is not set |
| 948 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 898 | # CONFIG_CRYPTO_SHA1 is not set | 949 | # CONFIG_CRYPTO_SHA1 is not set |
| 899 | # CONFIG_CRYPTO_SHA256 is not set | 950 | # CONFIG_CRYPTO_SHA256 is not set |
| 900 | # CONFIG_CRYPTO_SHA512 is not set | 951 | # CONFIG_CRYPTO_SHA512 is not set |
| 901 | # CONFIG_CRYPTO_WP512 is not set | ||
| 902 | # CONFIG_CRYPTO_TGR192 is not set | 952 | # CONFIG_CRYPTO_TGR192 is not set |
| 903 | # CONFIG_CRYPTO_GF128MUL is not set | 953 | # CONFIG_CRYPTO_WP512 is not set |
| 904 | # CONFIG_CRYPTO_ECB is not set | 954 | |
| 905 | # CONFIG_CRYPTO_CBC is not set | 955 | # |
| 906 | # CONFIG_CRYPTO_PCBC is not set | 956 | # Ciphers |
| 907 | # CONFIG_CRYPTO_LRW is not set | 957 | # |
| 908 | # CONFIG_CRYPTO_XTS is not set | ||
| 909 | # CONFIG_CRYPTO_CTR is not set | ||
| 910 | # CONFIG_CRYPTO_GCM is not set | ||
| 911 | # CONFIG_CRYPTO_CCM is not set | ||
| 912 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 913 | # CONFIG_CRYPTO_DES is not set | ||
| 914 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 915 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 916 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 917 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 918 | # CONFIG_CRYPTO_AES is not set | 958 | # CONFIG_CRYPTO_AES is not set |
| 959 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 960 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 961 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 962 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 919 | # CONFIG_CRYPTO_CAST5 is not set | 963 | # CONFIG_CRYPTO_CAST5 is not set |
| 920 | # CONFIG_CRYPTO_CAST6 is not set | 964 | # CONFIG_CRYPTO_CAST6 is not set |
| 921 | # CONFIG_CRYPTO_TEA is not set | 965 | # CONFIG_CRYPTO_DES is not set |
| 922 | # CONFIG_CRYPTO_ARC4 is not set | 966 | # CONFIG_CRYPTO_FCRYPT is not set |
| 923 | # CONFIG_CRYPTO_KHAZAD is not set | 967 | # CONFIG_CRYPTO_KHAZAD is not set |
| 924 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 925 | # CONFIG_CRYPTO_SEED is not set | ||
| 926 | # CONFIG_CRYPTO_SALSA20 is not set | 968 | # CONFIG_CRYPTO_SALSA20 is not set |
| 969 | # CONFIG_CRYPTO_SEED is not set | ||
| 970 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 971 | # CONFIG_CRYPTO_TEA is not set | ||
| 972 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 973 | |||
| 974 | # | ||
| 975 | # Compression | ||
| 976 | # | ||
| 927 | # CONFIG_CRYPTO_DEFLATE is not set | 977 | # CONFIG_CRYPTO_DEFLATE is not set |
| 928 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 929 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 930 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 931 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 932 | # CONFIG_CRYPTO_LZO is not set | 978 | # CONFIG_CRYPTO_LZO is not set |
| 933 | CONFIG_CRYPTO_HW=y | 979 | CONFIG_CRYPTO_HW=y |
| 934 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 980 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 935 | # CONFIG_PPC_CLOCK is not set | 981 | # CONFIG_PPC_CLOCK is not set |
| 982 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig index 67f67978c742..24f7f44b4821 100644 --- a/arch/powerpc/configs/85xx/sbc8548_defconfig +++ b/arch/powerpc/configs/85xx/sbc8548_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:39 2008 | 4 | # Mon Jun 9 08:52:37 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 94 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 92 | CONFIG_HOTPLUG=y | 95 | CONFIG_HOTPLUG=y |
| @@ -111,6 +114,7 @@ CONFIG_SLAB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -206,11 +211,13 @@ CONFIG_FLATMEM=y | |||
| 206 | CONFIG_FLAT_NODE_MEM_MAP=y | 211 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 207 | # CONFIG_SPARSEMEM_STATIC is not set | 212 | # CONFIG_SPARSEMEM_STATIC is not set |
| 208 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 214 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 209 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 210 | # CONFIG_RESOURCES_64BIT is not set | 216 | # CONFIG_RESOURCES_64BIT is not set |
| 211 | CONFIG_ZONE_DMA_FLAG=1 | 217 | CONFIG_ZONE_DMA_FLAG=1 |
| 212 | CONFIG_BOUNCE=y | 218 | CONFIG_BOUNCE=y |
| 213 | CONFIG_VIRT_TO_BUS=y | 219 | CONFIG_VIRT_TO_BUS=y |
| 220 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 214 | CONFIG_PROC_DEVICETREE=y | 221 | CONFIG_PROC_DEVICETREE=y |
| 215 | # CONFIG_CMDLINE_BOOL is not set | 222 | # CONFIG_CMDLINE_BOOL is not set |
| 216 | # CONFIG_PM is not set | 223 | # CONFIG_PM is not set |
| @@ -233,6 +240,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 233 | CONFIG_PCI_LEGACY=y | 240 | CONFIG_PCI_LEGACY=y |
| 234 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 235 | # CONFIG_HOTPLUG_PCI is not set | 242 | # CONFIG_HOTPLUG_PCI is not set |
| 243 | # CONFIG_HAS_RAPIDIO is not set | ||
| 236 | 244 | ||
| 237 | # | 245 | # |
| 238 | # Advanced setup | 246 | # Advanced setup |
| @@ -242,11 +250,12 @@ CONFIG_PCI_LEGACY=y | |||
| 242 | # | 250 | # |
| 243 | # Default settings for advanced configuration options are used | 251 | # Default settings for advanced configuration options are used |
| 244 | # | 252 | # |
| 245 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 246 | CONFIG_LOWMEM_SIZE=0x30000000 | 253 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 254 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 247 | CONFIG_KERNEL_START=0xc0000000 | 255 | CONFIG_KERNEL_START=0xc0000000 |
| 256 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 257 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 248 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 249 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 250 | 259 | ||
| 251 | # | 260 | # |
| 252 | # Networking | 261 | # Networking |
| @@ -294,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -449,7 +456,6 @@ CONFIG_NETDEV_1000=y | |||
| 449 | # CONFIG_SIS190 is not set | 456 | # CONFIG_SIS190 is not set |
| 450 | # CONFIG_SKGE is not set | 457 | # CONFIG_SKGE is not set |
| 451 | # CONFIG_SKY2 is not set | 458 | # CONFIG_SKY2 is not set |
| 452 | # CONFIG_SK98LIN is not set | ||
| 453 | # CONFIG_VIA_VELOCITY is not set | 459 | # CONFIG_VIA_VELOCITY is not set |
| 454 | # CONFIG_TIGON3 is not set | 460 | # CONFIG_TIGON3 is not set |
| 455 | # CONFIG_BNX2 is not set | 461 | # CONFIG_BNX2 is not set |
| @@ -469,6 +475,7 @@ CONFIG_NETDEV_10000=y | |||
| 469 | # CONFIG_MLX4_CORE is not set | 475 | # CONFIG_MLX4_CORE is not set |
| 470 | # CONFIG_TEHUTI is not set | 476 | # CONFIG_TEHUTI is not set |
| 471 | # CONFIG_BNX2X is not set | 477 | # CONFIG_BNX2X is not set |
| 478 | # CONFIG_SFC is not set | ||
| 472 | # CONFIG_TR is not set | 479 | # CONFIG_TR is not set |
| 473 | 480 | ||
| 474 | # | 481 | # |
| @@ -476,6 +483,7 @@ CONFIG_NETDEV_10000=y | |||
| 476 | # | 483 | # |
| 477 | # CONFIG_WLAN_PRE80211 is not set | 484 | # CONFIG_WLAN_PRE80211 is not set |
| 478 | # CONFIG_WLAN_80211 is not set | 485 | # CONFIG_WLAN_80211 is not set |
| 486 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 479 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
| 480 | # CONFIG_FDDI is not set | 488 | # CONFIG_FDDI is not set |
| 481 | # CONFIG_HIPPI is not set | 489 | # CONFIG_HIPPI is not set |
| @@ -522,6 +530,7 @@ CONFIG_INPUT=y | |||
| 522 | # Character devices | 530 | # Character devices |
| 523 | # | 531 | # |
| 524 | # CONFIG_VT is not set | 532 | # CONFIG_VT is not set |
| 533 | CONFIG_DEVKMEM=y | ||
| 525 | # CONFIG_SERIAL_NONSTANDARD is not set | 534 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 526 | # CONFIG_NOZOMI is not set | 535 | # CONFIG_NOZOMI is not set |
| 527 | 536 | ||
| @@ -558,12 +567,7 @@ CONFIG_GEN_RTC=y | |||
| 558 | # CONFIG_TCG_TPM is not set | 567 | # CONFIG_TCG_TPM is not set |
| 559 | CONFIG_DEVPORT=y | 568 | CONFIG_DEVPORT=y |
| 560 | # CONFIG_I2C is not set | 569 | # CONFIG_I2C is not set |
| 561 | |||
| 562 | # | ||
| 563 | # SPI support | ||
| 564 | # | ||
| 565 | # CONFIG_SPI is not set | 570 | # CONFIG_SPI is not set |
| 566 | # CONFIG_SPI_MASTER is not set | ||
| 567 | # CONFIG_W1 is not set | 571 | # CONFIG_W1 is not set |
| 568 | # CONFIG_POWER_SUPPLY is not set | 572 | # CONFIG_POWER_SUPPLY is not set |
| 569 | CONFIG_HWMON=y | 573 | CONFIG_HWMON=y |
| @@ -596,12 +600,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 596 | # Multifunction device drivers | 600 | # Multifunction device drivers |
| 597 | # | 601 | # |
| 598 | # CONFIG_MFD_SM501 is not set | 602 | # CONFIG_MFD_SM501 is not set |
| 603 | # CONFIG_HTC_PASIC3 is not set | ||
| 599 | 604 | ||
| 600 | # | 605 | # |
| 601 | # Multimedia devices | 606 | # Multimedia devices |
| 602 | # | 607 | # |
| 608 | |||
| 609 | # | ||
| 610 | # Multimedia core support | ||
| 611 | # | ||
| 603 | # CONFIG_VIDEO_DEV is not set | 612 | # CONFIG_VIDEO_DEV is not set |
| 604 | # CONFIG_DVB_CORE is not set | 613 | # CONFIG_DVB_CORE is not set |
| 614 | # CONFIG_VIDEO_MEDIA is not set | ||
| 615 | |||
| 616 | # | ||
| 617 | # Multimedia drivers | ||
| 618 | # | ||
| 605 | CONFIG_DAB=y | 619 | CONFIG_DAB=y |
| 606 | 620 | ||
| 607 | # | 621 | # |
| @@ -628,14 +642,11 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 628 | # CONFIG_MMC is not set | 642 | # CONFIG_MMC is not set |
| 629 | # CONFIG_MEMSTICK is not set | 643 | # CONFIG_MEMSTICK is not set |
| 630 | # CONFIG_NEW_LEDS is not set | 644 | # CONFIG_NEW_LEDS is not set |
| 645 | # CONFIG_ACCESSIBILITY is not set | ||
| 631 | # CONFIG_INFINIBAND is not set | 646 | # CONFIG_INFINIBAND is not set |
| 632 | # CONFIG_EDAC is not set | 647 | # CONFIG_EDAC is not set |
| 633 | # CONFIG_RTC_CLASS is not set | 648 | # CONFIG_RTC_CLASS is not set |
| 634 | # CONFIG_DMADEVICES is not set | 649 | # CONFIG_DMADEVICES is not set |
| 635 | |||
| 636 | # | ||
| 637 | # Userspace I/O | ||
| 638 | # | ||
| 639 | # CONFIG_UIO is not set | 650 | # CONFIG_UIO is not set |
| 640 | 651 | ||
| 641 | # | 652 | # |
| @@ -648,7 +659,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 648 | # CONFIG_JFS_FS is not set | 659 | # CONFIG_JFS_FS is not set |
| 649 | # CONFIG_FS_POSIX_ACL is not set | 660 | # CONFIG_FS_POSIX_ACL is not set |
| 650 | # CONFIG_XFS_FS is not set | 661 | # CONFIG_XFS_FS is not set |
| 651 | # CONFIG_GFS2_FS is not set | ||
| 652 | # CONFIG_OCFS2_FS is not set | 662 | # CONFIG_OCFS2_FS is not set |
| 653 | CONFIG_DNOTIFY=y | 663 | CONFIG_DNOTIFY=y |
| 654 | CONFIG_INOTIFY=y | 664 | CONFIG_INOTIFY=y |
| @@ -705,7 +715,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 705 | CONFIG_NFS_FS=y | 715 | CONFIG_NFS_FS=y |
| 706 | # CONFIG_NFS_V3 is not set | 716 | # CONFIG_NFS_V3 is not set |
| 707 | # CONFIG_NFS_V4 is not set | 717 | # CONFIG_NFS_V4 is not set |
| 708 | # CONFIG_NFS_DIRECTIO is not set | ||
| 709 | # CONFIG_NFSD is not set | 718 | # CONFIG_NFSD is not set |
| 710 | CONFIG_ROOT_NFS=y | 719 | CONFIG_ROOT_NFS=y |
| 711 | CONFIG_LOCKD=y | 720 | CONFIG_LOCKD=y |
| @@ -732,6 +741,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 732 | # Library routines | 741 | # Library routines |
| 733 | # | 742 | # |
| 734 | CONFIG_BITREVERSE=y | 743 | CONFIG_BITREVERSE=y |
| 744 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 735 | # CONFIG_CRC_CCITT is not set | 745 | # CONFIG_CRC_CCITT is not set |
| 736 | # CONFIG_CRC16 is not set | 746 | # CONFIG_CRC16 is not set |
| 737 | # CONFIG_CRC_ITU_T is not set | 747 | # CONFIG_CRC_ITU_T is not set |
| @@ -742,6 +752,7 @@ CONFIG_PLIST=y | |||
| 742 | CONFIG_HAS_IOMEM=y | 752 | CONFIG_HAS_IOMEM=y |
| 743 | CONFIG_HAS_IOPORT=y | 753 | CONFIG_HAS_IOPORT=y |
| 744 | CONFIG_HAS_DMA=y | 754 | CONFIG_HAS_DMA=y |
| 755 | CONFIG_HAVE_LMB=y | ||
| 745 | 756 | ||
| 746 | # | 757 | # |
| 747 | # Kernel hacking | 758 | # Kernel hacking |
| @@ -749,6 +760,7 @@ CONFIG_HAS_DMA=y | |||
| 749 | # CONFIG_PRINTK_TIME is not set | 760 | # CONFIG_PRINTK_TIME is not set |
| 750 | CONFIG_ENABLE_WARN_DEPRECATED=y | 761 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 751 | CONFIG_ENABLE_MUST_CHECK=y | 762 | CONFIG_ENABLE_MUST_CHECK=y |
| 763 | CONFIG_FRAME_WARN=1024 | ||
| 752 | # CONFIG_MAGIC_SYSRQ is not set | 764 | # CONFIG_MAGIC_SYSRQ is not set |
| 753 | # CONFIG_UNUSED_SYMBOLS is not set | 765 | # CONFIG_UNUSED_SYMBOLS is not set |
| 754 | # CONFIG_DEBUG_FS is not set | 766 | # CONFIG_DEBUG_FS is not set |
| @@ -756,6 +768,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 756 | # CONFIG_DEBUG_KERNEL is not set | 768 | # CONFIG_DEBUG_KERNEL is not set |
| 757 | # CONFIG_DEBUG_BUGVERBOSE is not set | 769 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 758 | # CONFIG_SAMPLES is not set | 770 | # CONFIG_SAMPLES is not set |
| 771 | # CONFIG_IRQSTACKS is not set | ||
| 759 | # CONFIG_PPC_EARLY_DEBUG is not set | 772 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 760 | 773 | ||
| 761 | # | 774 | # |
| @@ -765,48 +778,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 765 | # CONFIG_SECURITY is not set | 778 | # CONFIG_SECURITY is not set |
| 766 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 779 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 767 | CONFIG_CRYPTO=y | 780 | CONFIG_CRYPTO=y |
| 768 | # CONFIG_CRYPTO_SEQIV is not set | 781 | |
| 782 | # | ||
| 783 | # Crypto core or helper | ||
| 784 | # | ||
| 769 | # CONFIG_CRYPTO_MANAGER is not set | 785 | # CONFIG_CRYPTO_MANAGER is not set |
| 786 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 787 | # CONFIG_CRYPTO_NULL is not set | ||
| 788 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 789 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 790 | |||
| 791 | # | ||
| 792 | # Authenticated Encryption with Associated Data | ||
| 793 | # | ||
| 794 | # CONFIG_CRYPTO_CCM is not set | ||
| 795 | # CONFIG_CRYPTO_GCM is not set | ||
| 796 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # Block modes | ||
| 800 | # | ||
| 801 | # CONFIG_CRYPTO_CBC is not set | ||
| 802 | # CONFIG_CRYPTO_CTR is not set | ||
| 803 | # CONFIG_CRYPTO_CTS is not set | ||
| 804 | # CONFIG_CRYPTO_ECB is not set | ||
| 805 | # CONFIG_CRYPTO_LRW is not set | ||
| 806 | # CONFIG_CRYPTO_PCBC is not set | ||
| 807 | # CONFIG_CRYPTO_XTS is not set | ||
| 808 | |||
| 809 | # | ||
| 810 | # Hash modes | ||
| 811 | # | ||
| 770 | # CONFIG_CRYPTO_HMAC is not set | 812 | # CONFIG_CRYPTO_HMAC is not set |
| 771 | # CONFIG_CRYPTO_XCBC is not set | 813 | # CONFIG_CRYPTO_XCBC is not set |
| 772 | # CONFIG_CRYPTO_NULL is not set | 814 | |
| 815 | # | ||
| 816 | # Digest | ||
| 817 | # | ||
| 818 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 773 | # CONFIG_CRYPTO_MD4 is not set | 819 | # CONFIG_CRYPTO_MD4 is not set |
| 774 | # CONFIG_CRYPTO_MD5 is not set | 820 | # CONFIG_CRYPTO_MD5 is not set |
| 821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 775 | # CONFIG_CRYPTO_SHA1 is not set | 822 | # CONFIG_CRYPTO_SHA1 is not set |
| 776 | # CONFIG_CRYPTO_SHA256 is not set | 823 | # CONFIG_CRYPTO_SHA256 is not set |
| 777 | # CONFIG_CRYPTO_SHA512 is not set | 824 | # CONFIG_CRYPTO_SHA512 is not set |
| 778 | # CONFIG_CRYPTO_WP512 is not set | ||
| 779 | # CONFIG_CRYPTO_TGR192 is not set | 825 | # CONFIG_CRYPTO_TGR192 is not set |
| 780 | # CONFIG_CRYPTO_GF128MUL is not set | 826 | # CONFIG_CRYPTO_WP512 is not set |
| 781 | # CONFIG_CRYPTO_ECB is not set | 827 | |
| 782 | # CONFIG_CRYPTO_CBC is not set | 828 | # |
| 783 | # CONFIG_CRYPTO_PCBC is not set | 829 | # Ciphers |
| 784 | # CONFIG_CRYPTO_LRW is not set | 830 | # |
| 785 | # CONFIG_CRYPTO_XTS is not set | ||
| 786 | # CONFIG_CRYPTO_CTR is not set | ||
| 787 | # CONFIG_CRYPTO_GCM is not set | ||
| 788 | # CONFIG_CRYPTO_CCM is not set | ||
| 789 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 790 | # CONFIG_CRYPTO_DES is not set | ||
| 791 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 792 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 793 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 794 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 795 | # CONFIG_CRYPTO_AES is not set | 831 | # CONFIG_CRYPTO_AES is not set |
| 832 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 833 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 834 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 835 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 796 | # CONFIG_CRYPTO_CAST5 is not set | 836 | # CONFIG_CRYPTO_CAST5 is not set |
| 797 | # CONFIG_CRYPTO_CAST6 is not set | 837 | # CONFIG_CRYPTO_CAST6 is not set |
| 798 | # CONFIG_CRYPTO_TEA is not set | 838 | # CONFIG_CRYPTO_DES is not set |
| 799 | # CONFIG_CRYPTO_ARC4 is not set | 839 | # CONFIG_CRYPTO_FCRYPT is not set |
| 800 | # CONFIG_CRYPTO_KHAZAD is not set | 840 | # CONFIG_CRYPTO_KHAZAD is not set |
| 801 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 802 | # CONFIG_CRYPTO_SEED is not set | ||
| 803 | # CONFIG_CRYPTO_SALSA20 is not set | 841 | # CONFIG_CRYPTO_SALSA20 is not set |
| 842 | # CONFIG_CRYPTO_SEED is not set | ||
| 843 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 844 | # CONFIG_CRYPTO_TEA is not set | ||
| 845 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 846 | |||
| 847 | # | ||
| 848 | # Compression | ||
| 849 | # | ||
| 804 | # CONFIG_CRYPTO_DEFLATE is not set | 850 | # CONFIG_CRYPTO_DEFLATE is not set |
| 805 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 806 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 807 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 808 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 809 | # CONFIG_CRYPTO_LZO is not set | 851 | # CONFIG_CRYPTO_LZO is not set |
| 810 | CONFIG_CRYPTO_HW=y | 852 | CONFIG_CRYPTO_HW=y |
| 811 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 853 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 812 | # CONFIG_PPC_CLOCK is not set | 854 | # CONFIG_PPC_CLOCK is not set |
| 855 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index fef605579e29..655518dcd73f 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:39 2008 | 4 | # Mon Jun 9 08:52:38 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -112,6 +115,7 @@ CONFIG_SLAB=y | |||
| 112 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
| 113 | CONFIG_HAVE_KPROBES=y | 116 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 117 | CONFIG_HAVE_KRETPROBES=y |
| 118 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_PROC_PAGE_MONITOR=y |
| 116 | CONFIG_SLABINFO=y | 120 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 121 | CONFIG_RT_MUTEXES=y |
| @@ -152,6 +156,7 @@ CONFIG_MPC85xx=y | |||
| 152 | # CONFIG_MPC85xx_CDS is not set | 156 | # CONFIG_MPC85xx_CDS is not set |
| 153 | # CONFIG_MPC85xx_MDS is not set | 157 | # CONFIG_MPC85xx_MDS is not set |
| 154 | # CONFIG_MPC85xx_DS is not set | 158 | # CONFIG_MPC85xx_DS is not set |
| 159 | # CONFIG_KSI8560 is not set | ||
| 155 | # CONFIG_STX_GP3 is not set | 160 | # CONFIG_STX_GP3 is not set |
| 156 | # CONFIG_TQM8540 is not set | 161 | # CONFIG_TQM8540 is not set |
| 157 | # CONFIG_TQM8541 is not set | 162 | # CONFIG_TQM8541 is not set |
| @@ -207,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 207 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 208 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 209 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 211 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 212 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 213 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 214 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 215 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
| 216 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 217 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -228,6 +235,7 @@ CONFIG_FSL_SOC=y | |||
| 228 | # CONFIG_PCI_SYSCALL is not set | 235 | # CONFIG_PCI_SYSCALL is not set |
| 229 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 230 | # CONFIG_PCCARD is not set | 237 | # CONFIG_PCCARD is not set |
| 238 | # CONFIG_HAS_RAPIDIO is not set | ||
| 231 | 239 | ||
| 232 | # | 240 | # |
| 233 | # Advanced setup | 241 | # Advanced setup |
| @@ -237,11 +245,12 @@ CONFIG_FSL_SOC=y | |||
| 237 | # | 245 | # |
| 238 | # Default settings for advanced configuration options are used | 246 | # Default settings for advanced configuration options are used |
| 239 | # | 247 | # |
| 240 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 241 | CONFIG_LOWMEM_SIZE=0x30000000 | 248 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 249 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 242 | CONFIG_KERNEL_START=0xc0000000 | 250 | CONFIG_KERNEL_START=0xc0000000 |
| 251 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 243 | CONFIG_TASK_SIZE=0xc0000000 | 253 | CONFIG_TASK_SIZE=0xc0000000 |
| 244 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 245 | 254 | ||
| 246 | # | 255 | # |
| 247 | # Networking | 256 | # Networking |
| @@ -289,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 289 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 290 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 291 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 292 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 293 | # CONFIG_INET6_TUNNEL is not set | ||
| 294 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 295 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 296 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -418,6 +425,7 @@ CONFIG_NETDEV_10000=y | |||
| 418 | # | 425 | # |
| 419 | # CONFIG_WLAN_PRE80211 is not set | 426 | # CONFIG_WLAN_PRE80211 is not set |
| 420 | # CONFIG_WLAN_80211 is not set | 427 | # CONFIG_WLAN_80211 is not set |
| 428 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 421 | # CONFIG_WAN is not set | 429 | # CONFIG_WAN is not set |
| 422 | # CONFIG_PPP is not set | 430 | # CONFIG_PPP is not set |
| 423 | # CONFIG_SLIP is not set | 431 | # CONFIG_SLIP is not set |
| @@ -462,6 +470,7 @@ CONFIG_INPUT=y | |||
| 462 | # Character devices | 470 | # Character devices |
| 463 | # | 471 | # |
| 464 | # CONFIG_VT is not set | 472 | # CONFIG_VT is not set |
| 473 | CONFIG_DEVKMEM=y | ||
| 465 | # CONFIG_SERIAL_NONSTANDARD is not set | 474 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 466 | 475 | ||
| 467 | # | 476 | # |
| @@ -487,17 +496,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 487 | # CONFIG_IPMI_HANDLER is not set | 496 | # CONFIG_IPMI_HANDLER is not set |
| 488 | # CONFIG_HW_RANDOM is not set | 497 | # CONFIG_HW_RANDOM is not set |
| 489 | # CONFIG_NVRAM is not set | 498 | # CONFIG_NVRAM is not set |
| 490 | # CONFIG_GEN_RTC is not set | ||
| 491 | # CONFIG_R3964 is not set | 499 | # CONFIG_R3964 is not set |
| 492 | # CONFIG_RAW_DRIVER is not set | 500 | # CONFIG_RAW_DRIVER is not set |
| 493 | # CONFIG_TCG_TPM is not set | 501 | # CONFIG_TCG_TPM is not set |
| 494 | # CONFIG_I2C is not set | 502 | # CONFIG_I2C is not set |
| 495 | |||
| 496 | # | ||
| 497 | # SPI support | ||
| 498 | # | ||
| 499 | # CONFIG_SPI is not set | 503 | # CONFIG_SPI is not set |
| 500 | # CONFIG_SPI_MASTER is not set | ||
| 501 | # CONFIG_W1 is not set | 504 | # CONFIG_W1 is not set |
| 502 | # CONFIG_POWER_SUPPLY is not set | 505 | # CONFIG_POWER_SUPPLY is not set |
| 503 | CONFIG_HWMON=y | 506 | CONFIG_HWMON=y |
| @@ -526,12 +529,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 526 | # Multifunction device drivers | 529 | # Multifunction device drivers |
| 527 | # | 530 | # |
| 528 | # CONFIG_MFD_SM501 is not set | 531 | # CONFIG_MFD_SM501 is not set |
| 532 | # CONFIG_HTC_PASIC3 is not set | ||
| 529 | 533 | ||
| 530 | # | 534 | # |
| 531 | # Multimedia devices | 535 | # Multimedia devices |
| 532 | # | 536 | # |
| 537 | |||
| 538 | # | ||
| 539 | # Multimedia core support | ||
| 540 | # | ||
| 533 | # CONFIG_VIDEO_DEV is not set | 541 | # CONFIG_VIDEO_DEV is not set |
| 534 | # CONFIG_DVB_CORE is not set | 542 | # CONFIG_DVB_CORE is not set |
| 543 | # CONFIG_VIDEO_MEDIA is not set | ||
| 544 | |||
| 545 | # | ||
| 546 | # Multimedia drivers | ||
| 547 | # | ||
| 535 | CONFIG_DAB=y | 548 | CONFIG_DAB=y |
| 536 | 549 | ||
| 537 | # | 550 | # |
| @@ -559,6 +572,8 @@ CONFIG_USB_SUPPORT=y | |||
| 559 | # CONFIG_USB_ARCH_HAS_HCD is not set | 572 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 560 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 573 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 561 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 574 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 575 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 576 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 562 | 577 | ||
| 563 | # | 578 | # |
| 564 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 579 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -567,6 +582,7 @@ CONFIG_USB_SUPPORT=y | |||
| 567 | # CONFIG_MMC is not set | 582 | # CONFIG_MMC is not set |
| 568 | # CONFIG_MEMSTICK is not set | 583 | # CONFIG_MEMSTICK is not set |
| 569 | # CONFIG_NEW_LEDS is not set | 584 | # CONFIG_NEW_LEDS is not set |
| 585 | # CONFIG_ACCESSIBILITY is not set | ||
| 570 | # CONFIG_EDAC is not set | 586 | # CONFIG_EDAC is not set |
| 571 | CONFIG_RTC_LIB=y | 587 | CONFIG_RTC_LIB=y |
| 572 | CONFIG_RTC_CLASS=y | 588 | CONFIG_RTC_CLASS=y |
| @@ -602,11 +618,8 @@ CONFIG_RTC_DRV_M48T59=y | |||
| 602 | # | 618 | # |
| 603 | # on-CPU RTC drivers | 619 | # on-CPU RTC drivers |
| 604 | # | 620 | # |
| 621 | # CONFIG_RTC_DRV_PPC is not set | ||
| 605 | # CONFIG_DMADEVICES is not set | 622 | # CONFIG_DMADEVICES is not set |
| 606 | |||
| 607 | # | ||
| 608 | # Userspace I/O | ||
| 609 | # | ||
| 610 | # CONFIG_UIO is not set | 623 | # CONFIG_UIO is not set |
| 611 | 624 | ||
| 612 | # | 625 | # |
| @@ -619,7 +632,6 @@ CONFIG_RTC_DRV_M48T59=y | |||
| 619 | # CONFIG_JFS_FS is not set | 632 | # CONFIG_JFS_FS is not set |
| 620 | # CONFIG_FS_POSIX_ACL is not set | 633 | # CONFIG_FS_POSIX_ACL is not set |
| 621 | # CONFIG_XFS_FS is not set | 634 | # CONFIG_XFS_FS is not set |
| 622 | # CONFIG_GFS2_FS is not set | ||
| 623 | # CONFIG_OCFS2_FS is not set | 635 | # CONFIG_OCFS2_FS is not set |
| 624 | CONFIG_DNOTIFY=y | 636 | CONFIG_DNOTIFY=y |
| 625 | CONFIG_INOTIFY=y | 637 | CONFIG_INOTIFY=y |
| @@ -676,7 +688,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 676 | CONFIG_NFS_FS=y | 688 | CONFIG_NFS_FS=y |
| 677 | # CONFIG_NFS_V3 is not set | 689 | # CONFIG_NFS_V3 is not set |
| 678 | # CONFIG_NFS_V4 is not set | 690 | # CONFIG_NFS_V4 is not set |
| 679 | # CONFIG_NFS_DIRECTIO is not set | ||
| 680 | # CONFIG_NFSD is not set | 691 | # CONFIG_NFSD is not set |
| 681 | CONFIG_ROOT_NFS=y | 692 | CONFIG_ROOT_NFS=y |
| 682 | CONFIG_LOCKD=y | 693 | CONFIG_LOCKD=y |
| @@ -715,6 +726,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 715 | # Library routines | 726 | # Library routines |
| 716 | # | 727 | # |
| 717 | CONFIG_BITREVERSE=y | 728 | CONFIG_BITREVERSE=y |
| 729 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 718 | # CONFIG_CRC_CCITT is not set | 730 | # CONFIG_CRC_CCITT is not set |
| 719 | # CONFIG_CRC16 is not set | 731 | # CONFIG_CRC16 is not set |
| 720 | # CONFIG_CRC_ITU_T is not set | 732 | # CONFIG_CRC_ITU_T is not set |
| @@ -725,6 +737,7 @@ CONFIG_PLIST=y | |||
| 725 | CONFIG_HAS_IOMEM=y | 737 | CONFIG_HAS_IOMEM=y |
| 726 | CONFIG_HAS_IOPORT=y | 738 | CONFIG_HAS_IOPORT=y |
| 727 | CONFIG_HAS_DMA=y | 739 | CONFIG_HAS_DMA=y |
| 740 | CONFIG_HAVE_LMB=y | ||
| 728 | 741 | ||
| 729 | # | 742 | # |
| 730 | # Kernel hacking | 743 | # Kernel hacking |
| @@ -732,6 +745,7 @@ CONFIG_HAS_DMA=y | |||
| 732 | # CONFIG_PRINTK_TIME is not set | 745 | # CONFIG_PRINTK_TIME is not set |
| 733 | CONFIG_ENABLE_WARN_DEPRECATED=y | 746 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 734 | CONFIG_ENABLE_MUST_CHECK=y | 747 | CONFIG_ENABLE_MUST_CHECK=y |
| 748 | CONFIG_FRAME_WARN=1024 | ||
| 735 | CONFIG_MAGIC_SYSRQ=y | 749 | CONFIG_MAGIC_SYSRQ=y |
| 736 | # CONFIG_UNUSED_SYMBOLS is not set | 750 | # CONFIG_UNUSED_SYMBOLS is not set |
| 737 | # CONFIG_DEBUG_FS is not set | 751 | # CONFIG_DEBUG_FS is not set |
| @@ -742,6 +756,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 742 | CONFIG_SCHED_DEBUG=y | 756 | CONFIG_SCHED_DEBUG=y |
| 743 | # CONFIG_SCHEDSTATS is not set | 757 | # CONFIG_SCHEDSTATS is not set |
| 744 | # CONFIG_TIMER_STATS is not set | 758 | # CONFIG_TIMER_STATS is not set |
| 759 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 745 | # CONFIG_DEBUG_SLAB is not set | 760 | # CONFIG_DEBUG_SLAB is not set |
| 746 | # CONFIG_DEBUG_RT_MUTEXES is not set | 761 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 747 | # CONFIG_RT_MUTEX_TESTER is not set | 762 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -753,6 +768,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 753 | # CONFIG_DEBUG_BUGVERBOSE is not set | 768 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 754 | # CONFIG_DEBUG_INFO is not set | 769 | # CONFIG_DEBUG_INFO is not set |
| 755 | # CONFIG_DEBUG_VM is not set | 770 | # CONFIG_DEBUG_VM is not set |
| 771 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 756 | # CONFIG_DEBUG_LIST is not set | 772 | # CONFIG_DEBUG_LIST is not set |
| 757 | # CONFIG_DEBUG_SG is not set | 773 | # CONFIG_DEBUG_SG is not set |
| 758 | # CONFIG_BOOT_PRINTK_DELAY is not set | 774 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -763,6 +779,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 763 | # CONFIG_DEBUG_STACK_USAGE is not set | 779 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 764 | # CONFIG_DEBUG_PAGEALLOC is not set | 780 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 765 | # CONFIG_DEBUGGER is not set | 781 | # CONFIG_DEBUGGER is not set |
| 782 | # CONFIG_IRQSTACKS is not set | ||
| 766 | # CONFIG_BDI_SWITCH is not set | 783 | # CONFIG_BDI_SWITCH is not set |
| 767 | CONFIG_PPC_EARLY_DEBUG=y | 784 | CONFIG_PPC_EARLY_DEBUG=y |
| 768 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 785 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
| @@ -784,47 +801,77 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
| 784 | # CONFIG_SECURITY is not set | 801 | # CONFIG_SECURITY is not set |
| 785 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 802 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 786 | CONFIG_CRYPTO=y | 803 | CONFIG_CRYPTO=y |
| 787 | # CONFIG_CRYPTO_SEQIV is not set | 804 | |
| 805 | # | ||
| 806 | # Crypto core or helper | ||
| 807 | # | ||
| 788 | # CONFIG_CRYPTO_MANAGER is not set | 808 | # CONFIG_CRYPTO_MANAGER is not set |
| 809 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 810 | # CONFIG_CRYPTO_NULL is not set | ||
| 811 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 812 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 813 | |||
| 814 | # | ||
| 815 | # Authenticated Encryption with Associated Data | ||
| 816 | # | ||
| 817 | # CONFIG_CRYPTO_CCM is not set | ||
| 818 | # CONFIG_CRYPTO_GCM is not set | ||
| 819 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 820 | |||
| 821 | # | ||
| 822 | # Block modes | ||
| 823 | # | ||
| 824 | # CONFIG_CRYPTO_CBC is not set | ||
| 825 | # CONFIG_CRYPTO_CTR is not set | ||
| 826 | # CONFIG_CRYPTO_CTS is not set | ||
| 827 | # CONFIG_CRYPTO_ECB is not set | ||
| 828 | # CONFIG_CRYPTO_LRW is not set | ||
| 829 | # CONFIG_CRYPTO_PCBC is not set | ||
| 830 | # CONFIG_CRYPTO_XTS is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # Hash modes | ||
| 834 | # | ||
| 789 | # CONFIG_CRYPTO_HMAC is not set | 835 | # CONFIG_CRYPTO_HMAC is not set |
| 790 | # CONFIG_CRYPTO_XCBC is not set | 836 | # CONFIG_CRYPTO_XCBC is not set |
| 791 | # CONFIG_CRYPTO_NULL is not set | 837 | |
| 838 | # | ||
| 839 | # Digest | ||
| 840 | # | ||
| 841 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 792 | # CONFIG_CRYPTO_MD4 is not set | 842 | # CONFIG_CRYPTO_MD4 is not set |
| 793 | # CONFIG_CRYPTO_MD5 is not set | 843 | # CONFIG_CRYPTO_MD5 is not set |
| 844 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 794 | # CONFIG_CRYPTO_SHA1 is not set | 845 | # CONFIG_CRYPTO_SHA1 is not set |
| 795 | # CONFIG_CRYPTO_SHA256 is not set | 846 | # CONFIG_CRYPTO_SHA256 is not set |
| 796 | # CONFIG_CRYPTO_SHA512 is not set | 847 | # CONFIG_CRYPTO_SHA512 is not set |
| 797 | # CONFIG_CRYPTO_WP512 is not set | ||
| 798 | # CONFIG_CRYPTO_TGR192 is not set | 848 | # CONFIG_CRYPTO_TGR192 is not set |
| 799 | # CONFIG_CRYPTO_GF128MUL is not set | 849 | # CONFIG_CRYPTO_WP512 is not set |
| 800 | # CONFIG_CRYPTO_ECB is not set | 850 | |
| 801 | # CONFIG_CRYPTO_CBC is not set | 851 | # |
| 802 | # CONFIG_CRYPTO_PCBC is not set | 852 | # Ciphers |
| 803 | # CONFIG_CRYPTO_LRW is not set | 853 | # |
| 804 | # CONFIG_CRYPTO_XTS is not set | ||
| 805 | # CONFIG_CRYPTO_CTR is not set | ||
| 806 | # CONFIG_CRYPTO_GCM is not set | ||
| 807 | # CONFIG_CRYPTO_CCM is not set | ||
| 808 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 809 | # CONFIG_CRYPTO_DES is not set | ||
| 810 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 811 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 812 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 813 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 814 | # CONFIG_CRYPTO_AES is not set | 854 | # CONFIG_CRYPTO_AES is not set |
| 855 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 856 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 857 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 858 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 815 | # CONFIG_CRYPTO_CAST5 is not set | 859 | # CONFIG_CRYPTO_CAST5 is not set |
| 816 | # CONFIG_CRYPTO_CAST6 is not set | 860 | # CONFIG_CRYPTO_CAST6 is not set |
| 817 | # CONFIG_CRYPTO_TEA is not set | 861 | # CONFIG_CRYPTO_DES is not set |
| 818 | # CONFIG_CRYPTO_ARC4 is not set | 862 | # CONFIG_CRYPTO_FCRYPT is not set |
| 819 | # CONFIG_CRYPTO_KHAZAD is not set | 863 | # CONFIG_CRYPTO_KHAZAD is not set |
| 820 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 821 | # CONFIG_CRYPTO_SEED is not set | ||
| 822 | # CONFIG_CRYPTO_SALSA20 is not set | 864 | # CONFIG_CRYPTO_SALSA20 is not set |
| 865 | # CONFIG_CRYPTO_SEED is not set | ||
| 866 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 867 | # CONFIG_CRYPTO_TEA is not set | ||
| 868 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 869 | |||
| 870 | # | ||
| 871 | # Compression | ||
| 872 | # | ||
| 823 | # CONFIG_CRYPTO_DEFLATE is not set | 873 | # CONFIG_CRYPTO_DEFLATE is not set |
| 824 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 825 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 826 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 827 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 828 | # CONFIG_CRYPTO_LZO is not set | 874 | # CONFIG_CRYPTO_LZO is not set |
| 829 | CONFIG_CRYPTO_HW=y | 875 | CONFIG_CRYPTO_HW=y |
| 830 | # CONFIG_PPC_CLOCK is not set | 876 | # CONFIG_PPC_CLOCK is not set |
| 877 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index 1d303c49bb0c..7804ca1ecc94 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:42 2008 | 4 | # Mon Jun 9 08:52:38 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -114,12 +117,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 114 | # CONFIG_KPROBES is not set | 117 | # CONFIG_KPROBES is not set |
| 115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 118 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| 121 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
| 122 | CONFIG_MODULES=y | 126 | CONFIG_MODULES=y |
| 127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 123 | # CONFIG_MODULE_UNLOAD is not set | 128 | # CONFIG_MODULE_UNLOAD is not set |
| 124 | CONFIG_MODVERSIONS=y | 129 | CONFIG_MODVERSIONS=y |
| 125 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 130 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| @@ -158,6 +163,7 @@ CONFIG_MPC85xx=y | |||
| 158 | # CONFIG_MPC85xx_CDS is not set | 163 | # CONFIG_MPC85xx_CDS is not set |
| 159 | # CONFIG_MPC85xx_MDS is not set | 164 | # CONFIG_MPC85xx_MDS is not set |
| 160 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
| 166 | # CONFIG_KSI8560 is not set | ||
| 161 | CONFIG_STX_GP3=y | 167 | CONFIG_STX_GP3=y |
| 162 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
| 163 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
| @@ -215,11 +221,13 @@ CONFIG_FLATMEM=y | |||
| 215 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 216 | # CONFIG_SPARSEMEM_STATIC is not set | 222 | # CONFIG_SPARSEMEM_STATIC is not set |
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 219 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 222 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 223 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 225 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| @@ -243,6 +251,7 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # CONFIG_PCI_DEBUG is not set | 251 | # CONFIG_PCI_DEBUG is not set |
| 244 | # CONFIG_PCCARD is not set | 252 | # CONFIG_PCCARD is not set |
| 245 | # CONFIG_HOTPLUG_PCI is not set | 253 | # CONFIG_HOTPLUG_PCI is not set |
| 254 | # CONFIG_HAS_RAPIDIO is not set | ||
| 246 | 255 | ||
| 247 | # | 256 | # |
| 248 | # Advanced setup | 257 | # Advanced setup |
| @@ -252,11 +261,12 @@ CONFIG_PCI_LEGACY=y | |||
| 252 | # | 261 | # |
| 253 | # Default settings for advanced configuration options are used | 262 | # Default settings for advanced configuration options are used |
| 254 | # | 263 | # |
| 255 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 256 | CONFIG_LOWMEM_SIZE=0x30000000 | 264 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 265 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 257 | CONFIG_KERNEL_START=0xc0000000 | 266 | CONFIG_KERNEL_START=0xc0000000 |
| 267 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 268 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 269 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 270 | ||
| 261 | # | 271 | # |
| 262 | # Networking | 272 | # Networking |
| @@ -304,8 +314,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 304 | # CONFIG_TCP_MD5SIG is not set | 314 | # CONFIG_TCP_MD5SIG is not set |
| 305 | # CONFIG_IP_VS is not set | 315 | # CONFIG_IP_VS is not set |
| 306 | # CONFIG_IPV6 is not set | 316 | # CONFIG_IPV6 is not set |
| 307 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 308 | # CONFIG_INET6_TUNNEL is not set | ||
| 309 | # CONFIG_NETWORK_SECMARK is not set | 317 | # CONFIG_NETWORK_SECMARK is not set |
| 310 | CONFIG_NETFILTER=y | 318 | CONFIG_NETFILTER=y |
| 311 | # CONFIG_NETFILTER_DEBUG is not set | 319 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -418,6 +426,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 418 | # CONFIG_CONNECTOR is not set | 426 | # CONFIG_CONNECTOR is not set |
| 419 | # CONFIG_MTD is not set | 427 | # CONFIG_MTD is not set |
| 420 | CONFIG_OF_DEVICE=y | 428 | CONFIG_OF_DEVICE=y |
| 429 | CONFIG_OF_I2C=m | ||
| 421 | CONFIG_PARPORT=m | 430 | CONFIG_PARPORT=m |
| 422 | CONFIG_PARPORT_PC=m | 431 | CONFIG_PARPORT_PC=m |
| 423 | # CONFIG_PARPORT_PC_FIFO is not set | 432 | # CONFIG_PARPORT_PC_FIFO is not set |
| @@ -505,7 +514,7 @@ CONFIG_IDE_GENERIC=y | |||
| 505 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 514 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 506 | # CONFIG_BLK_DEV_TC86C001 is not set | 515 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 507 | # CONFIG_BLK_DEV_IDEDMA is not set | 516 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 508 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 517 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 509 | # CONFIG_BLK_DEV_HD is not set | 518 | # CONFIG_BLK_DEV_HD is not set |
| 510 | 519 | ||
| 511 | # | 520 | # |
| @@ -653,7 +662,6 @@ CONFIG_NETDEV_1000=y | |||
| 653 | # CONFIG_SIS190 is not set | 662 | # CONFIG_SIS190 is not set |
| 654 | # CONFIG_SKGE is not set | 663 | # CONFIG_SKGE is not set |
| 655 | # CONFIG_SKY2 is not set | 664 | # CONFIG_SKY2 is not set |
| 656 | # CONFIG_SK98LIN is not set | ||
| 657 | # CONFIG_VIA_VELOCITY is not set | 665 | # CONFIG_VIA_VELOCITY is not set |
| 658 | # CONFIG_TIGON3 is not set | 666 | # CONFIG_TIGON3 is not set |
| 659 | # CONFIG_BNX2 is not set | 667 | # CONFIG_BNX2 is not set |
| @@ -673,6 +681,7 @@ CONFIG_NETDEV_10000=y | |||
| 673 | # CONFIG_MLX4_CORE is not set | 681 | # CONFIG_MLX4_CORE is not set |
| 674 | # CONFIG_TEHUTI is not set | 682 | # CONFIG_TEHUTI is not set |
| 675 | # CONFIG_BNX2X is not set | 683 | # CONFIG_BNX2X is not set |
| 684 | # CONFIG_SFC is not set | ||
| 676 | # CONFIG_TR is not set | 685 | # CONFIG_TR is not set |
| 677 | 686 | ||
| 678 | # | 687 | # |
| @@ -680,6 +689,7 @@ CONFIG_NETDEV_10000=y | |||
| 680 | # | 689 | # |
| 681 | # CONFIG_WLAN_PRE80211 is not set | 690 | # CONFIG_WLAN_PRE80211 is not set |
| 682 | # CONFIG_WLAN_80211 is not set | 691 | # CONFIG_WLAN_80211 is not set |
| 692 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 683 | # CONFIG_WAN is not set | 693 | # CONFIG_WAN is not set |
| 684 | # CONFIG_FDDI is not set | 694 | # CONFIG_FDDI is not set |
| 685 | # CONFIG_HIPPI is not set | 695 | # CONFIG_HIPPI is not set |
| @@ -753,6 +763,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 753 | # Character devices | 763 | # Character devices |
| 754 | # | 764 | # |
| 755 | # CONFIG_VT is not set | 765 | # CONFIG_VT is not set |
| 766 | CONFIG_DEVKMEM=y | ||
| 756 | # CONFIG_SERIAL_NONSTANDARD is not set | 767 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 757 | # CONFIG_NOZOMI is not set | 768 | # CONFIG_NOZOMI is not set |
| 758 | 769 | ||
| @@ -796,13 +807,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 796 | CONFIG_I2C_CHARDEV=m | 807 | CONFIG_I2C_CHARDEV=m |
| 797 | 808 | ||
| 798 | # | 809 | # |
| 799 | # I2C Algorithms | ||
| 800 | # | ||
| 801 | CONFIG_I2C_ALGOBIT=m | ||
| 802 | # CONFIG_I2C_ALGOPCF is not set | ||
| 803 | # CONFIG_I2C_ALGOPCA is not set | ||
| 804 | |||
| 805 | # | ||
| 806 | # I2C Hardware Bus support | 810 | # I2C Hardware Bus support |
| 807 | # | 811 | # |
| 808 | # CONFIG_I2C_ALI1535 is not set | 812 | # CONFIG_I2C_ALI1535 is not set |
| @@ -829,6 +833,7 @@ CONFIG_I2C_ALGOBIT=m | |||
| 829 | # CONFIG_I2C_VIA is not set | 833 | # CONFIG_I2C_VIA is not set |
| 830 | # CONFIG_I2C_VIAPRO is not set | 834 | # CONFIG_I2C_VIAPRO is not set |
| 831 | # CONFIG_I2C_VOODOO3 is not set | 835 | # CONFIG_I2C_VOODOO3 is not set |
| 836 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 832 | 837 | ||
| 833 | # | 838 | # |
| 834 | # Miscellaneous I2C Chip support | 839 | # Miscellaneous I2C Chip support |
| @@ -838,19 +843,13 @@ CONFIG_I2C_ALGOBIT=m | |||
| 838 | # CONFIG_SENSORS_PCF8574 is not set | 843 | # CONFIG_SENSORS_PCF8574 is not set |
| 839 | # CONFIG_PCF8575 is not set | 844 | # CONFIG_PCF8575 is not set |
| 840 | # CONFIG_SENSORS_PCF8591 is not set | 845 | # CONFIG_SENSORS_PCF8591 is not set |
| 841 | # CONFIG_TPS65010 is not set | ||
| 842 | # CONFIG_SENSORS_MAX6875 is not set | 846 | # CONFIG_SENSORS_MAX6875 is not set |
| 843 | # CONFIG_SENSORS_TSL2550 is not set | 847 | # CONFIG_SENSORS_TSL2550 is not set |
| 844 | # CONFIG_I2C_DEBUG_CORE is not set | 848 | # CONFIG_I2C_DEBUG_CORE is not set |
| 845 | # CONFIG_I2C_DEBUG_ALGO is not set | 849 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 846 | # CONFIG_I2C_DEBUG_BUS is not set | 850 | # CONFIG_I2C_DEBUG_BUS is not set |
| 847 | # CONFIG_I2C_DEBUG_CHIP is not set | 851 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 848 | |||
| 849 | # | ||
| 850 | # SPI support | ||
| 851 | # | ||
| 852 | # CONFIG_SPI is not set | 852 | # CONFIG_SPI is not set |
| 853 | # CONFIG_SPI_MASTER is not set | ||
| 854 | # CONFIG_W1 is not set | 853 | # CONFIG_W1 is not set |
| 855 | # CONFIG_POWER_SUPPLY is not set | 854 | # CONFIG_POWER_SUPPLY is not set |
| 856 | CONFIG_HWMON=y | 855 | CONFIG_HWMON=y |
| @@ -920,12 +919,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 920 | # Multifunction device drivers | 919 | # Multifunction device drivers |
| 921 | # | 920 | # |
| 922 | # CONFIG_MFD_SM501 is not set | 921 | # CONFIG_MFD_SM501 is not set |
| 922 | # CONFIG_HTC_PASIC3 is not set | ||
| 923 | 923 | ||
| 924 | # | 924 | # |
| 925 | # Multimedia devices | 925 | # Multimedia devices |
| 926 | # | 926 | # |
| 927 | |||
| 928 | # | ||
| 929 | # Multimedia core support | ||
| 930 | # | ||
| 927 | # CONFIG_VIDEO_DEV is not set | 931 | # CONFIG_VIDEO_DEV is not set |
| 928 | # CONFIG_DVB_CORE is not set | 932 | # CONFIG_DVB_CORE is not set |
| 933 | # CONFIG_VIDEO_MEDIA is not set | ||
| 934 | |||
| 935 | # | ||
| 936 | # Multimedia drivers | ||
| 937 | # | ||
| 929 | CONFIG_DAB=y | 938 | CONFIG_DAB=y |
| 930 | 939 | ||
| 931 | # | 940 | # |
| @@ -973,6 +982,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 973 | CONFIG_USB_ARCH_HAS_OHCI=y | 982 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 974 | CONFIG_USB_ARCH_HAS_EHCI=y | 983 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 975 | # CONFIG_USB is not set | 984 | # CONFIG_USB is not set |
| 985 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 986 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 976 | 987 | ||
| 977 | # | 988 | # |
| 978 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 989 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -981,15 +992,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 981 | # CONFIG_MMC is not set | 992 | # CONFIG_MMC is not set |
| 982 | # CONFIG_MEMSTICK is not set | 993 | # CONFIG_MEMSTICK is not set |
| 983 | # CONFIG_NEW_LEDS is not set | 994 | # CONFIG_NEW_LEDS is not set |
| 995 | # CONFIG_ACCESSIBILITY is not set | ||
| 984 | # CONFIG_INFINIBAND is not set | 996 | # CONFIG_INFINIBAND is not set |
| 985 | # CONFIG_EDAC is not set | 997 | # CONFIG_EDAC is not set |
| 986 | # CONFIG_RTC_CLASS is not set | 998 | # CONFIG_RTC_CLASS is not set |
| 987 | # CONFIG_DMADEVICES is not set | 999 | # CONFIG_DMADEVICES is not set |
| 988 | # CONFIG_AUXDISPLAY is not set | 1000 | # CONFIG_AUXDISPLAY is not set |
| 989 | |||
| 990 | # | ||
| 991 | # Userspace I/O | ||
| 992 | # | ||
| 993 | # CONFIG_UIO is not set | 1001 | # CONFIG_UIO is not set |
| 994 | 1002 | ||
| 995 | # | 1003 | # |
| @@ -1009,7 +1017,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1009 | # CONFIG_JFS_FS is not set | 1017 | # CONFIG_JFS_FS is not set |
| 1010 | # CONFIG_FS_POSIX_ACL is not set | 1018 | # CONFIG_FS_POSIX_ACL is not set |
| 1011 | # CONFIG_XFS_FS is not set | 1019 | # CONFIG_XFS_FS is not set |
| 1012 | # CONFIG_GFS2_FS is not set | ||
| 1013 | # CONFIG_OCFS2_FS is not set | 1020 | # CONFIG_OCFS2_FS is not set |
| 1014 | CONFIG_DNOTIFY=y | 1021 | CONFIG_DNOTIFY=y |
| 1015 | CONFIG_INOTIFY=y | 1022 | CONFIG_INOTIFY=y |
| @@ -1073,7 +1080,6 @@ CONFIG_NFS_FS=y | |||
| 1073 | CONFIG_NFS_V3=y | 1080 | CONFIG_NFS_V3=y |
| 1074 | # CONFIG_NFS_V3_ACL is not set | 1081 | # CONFIG_NFS_V3_ACL is not set |
| 1075 | # CONFIG_NFS_V4 is not set | 1082 | # CONFIG_NFS_V4 is not set |
| 1076 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1077 | # CONFIG_NFSD is not set | 1083 | # CONFIG_NFSD is not set |
| 1078 | CONFIG_ROOT_NFS=y | 1084 | CONFIG_ROOT_NFS=y |
| 1079 | CONFIG_LOCKD=y | 1085 | CONFIG_LOCKD=y |
| @@ -1141,9 +1147,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1141 | # Library routines | 1147 | # Library routines |
| 1142 | # | 1148 | # |
| 1143 | CONFIG_BITREVERSE=y | 1149 | CONFIG_BITREVERSE=y |
| 1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1144 | CONFIG_CRC_CCITT=y | 1151 | CONFIG_CRC_CCITT=y |
| 1145 | # CONFIG_CRC16 is not set | 1152 | # CONFIG_CRC16 is not set |
| 1146 | # CONFIG_CRC_ITU_T is not set | 1153 | CONFIG_CRC_ITU_T=m |
| 1147 | CONFIG_CRC32=y | 1154 | CONFIG_CRC32=y |
| 1148 | # CONFIG_CRC7 is not set | 1155 | # CONFIG_CRC7 is not set |
| 1149 | # CONFIG_LIBCRC32C is not set | 1156 | # CONFIG_LIBCRC32C is not set |
| @@ -1152,6 +1159,7 @@ CONFIG_PLIST=y | |||
| 1152 | CONFIG_HAS_IOMEM=y | 1159 | CONFIG_HAS_IOMEM=y |
| 1153 | CONFIG_HAS_IOPORT=y | 1160 | CONFIG_HAS_IOPORT=y |
| 1154 | CONFIG_HAS_DMA=y | 1161 | CONFIG_HAS_DMA=y |
| 1162 | CONFIG_HAVE_LMB=y | ||
| 1155 | 1163 | ||
| 1156 | # | 1164 | # |
| 1157 | # Kernel hacking | 1165 | # Kernel hacking |
| @@ -1159,6 +1167,7 @@ CONFIG_HAS_DMA=y | |||
| 1159 | # CONFIG_PRINTK_TIME is not set | 1167 | # CONFIG_PRINTK_TIME is not set |
| 1160 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1168 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1161 | CONFIG_ENABLE_MUST_CHECK=y | 1169 | CONFIG_ENABLE_MUST_CHECK=y |
| 1170 | CONFIG_FRAME_WARN=1024 | ||
| 1162 | # CONFIG_MAGIC_SYSRQ is not set | 1171 | # CONFIG_MAGIC_SYSRQ is not set |
| 1163 | # CONFIG_UNUSED_SYMBOLS is not set | 1172 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1164 | # CONFIG_DEBUG_FS is not set | 1173 | # CONFIG_DEBUG_FS is not set |
| @@ -1169,6 +1178,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1169 | CONFIG_SCHED_DEBUG=y | 1178 | CONFIG_SCHED_DEBUG=y |
| 1170 | # CONFIG_SCHEDSTATS is not set | 1179 | # CONFIG_SCHEDSTATS is not set |
| 1171 | # CONFIG_TIMER_STATS is not set | 1180 | # CONFIG_TIMER_STATS is not set |
| 1181 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1172 | # CONFIG_SLUB_DEBUG_ON is not set | 1182 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1173 | # CONFIG_SLUB_STATS is not set | 1183 | # CONFIG_SLUB_STATS is not set |
| 1174 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1184 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1182,6 +1192,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1182 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1192 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1183 | # CONFIG_DEBUG_INFO is not set | 1193 | # CONFIG_DEBUG_INFO is not set |
| 1184 | # CONFIG_DEBUG_VM is not set | 1194 | # CONFIG_DEBUG_VM is not set |
| 1195 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1185 | # CONFIG_DEBUG_LIST is not set | 1196 | # CONFIG_DEBUG_LIST is not set |
| 1186 | # CONFIG_DEBUG_SG is not set | 1197 | # CONFIG_DEBUG_SG is not set |
| 1187 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1198 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1194,6 +1205,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1194 | # CONFIG_DEBUG_PAGEALLOC is not set | 1205 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1195 | # CONFIG_DEBUGGER is not set | 1206 | # CONFIG_DEBUGGER is not set |
| 1196 | # CONFIG_KGDB_CONSOLE is not set | 1207 | # CONFIG_KGDB_CONSOLE is not set |
| 1208 | # CONFIG_IRQSTACKS is not set | ||
| 1197 | CONFIG_BDI_SWITCH=y | 1209 | CONFIG_BDI_SWITCH=y |
| 1198 | # CONFIG_PPC_EARLY_DEBUG is not set | 1210 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1199 | 1211 | ||
| @@ -1204,50 +1216,80 @@ CONFIG_BDI_SWITCH=y | |||
| 1204 | # CONFIG_SECURITY is not set | 1216 | # CONFIG_SECURITY is not set |
| 1205 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1217 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1206 | CONFIG_CRYPTO=y | 1218 | CONFIG_CRYPTO=y |
| 1207 | # CONFIG_CRYPTO_SEQIV is not set | 1219 | |
| 1220 | # | ||
| 1221 | # Crypto core or helper | ||
| 1222 | # | ||
| 1208 | # CONFIG_CRYPTO_MANAGER is not set | 1223 | # CONFIG_CRYPTO_MANAGER is not set |
| 1224 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1225 | # CONFIG_CRYPTO_NULL is not set | ||
| 1226 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1227 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1228 | # CONFIG_CRYPTO_TEST is not set | ||
| 1229 | |||
| 1230 | # | ||
| 1231 | # Authenticated Encryption with Associated Data | ||
| 1232 | # | ||
| 1233 | # CONFIG_CRYPTO_CCM is not set | ||
| 1234 | # CONFIG_CRYPTO_GCM is not set | ||
| 1235 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1236 | |||
| 1237 | # | ||
| 1238 | # Block modes | ||
| 1239 | # | ||
| 1240 | # CONFIG_CRYPTO_CBC is not set | ||
| 1241 | # CONFIG_CRYPTO_CTR is not set | ||
| 1242 | # CONFIG_CRYPTO_CTS is not set | ||
| 1243 | # CONFIG_CRYPTO_ECB is not set | ||
| 1244 | # CONFIG_CRYPTO_LRW is not set | ||
| 1245 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1246 | # CONFIG_CRYPTO_XTS is not set | ||
| 1247 | |||
| 1248 | # | ||
| 1249 | # Hash modes | ||
| 1250 | # | ||
| 1209 | # CONFIG_CRYPTO_HMAC is not set | 1251 | # CONFIG_CRYPTO_HMAC is not set |
| 1210 | # CONFIG_CRYPTO_XCBC is not set | 1252 | # CONFIG_CRYPTO_XCBC is not set |
| 1211 | # CONFIG_CRYPTO_NULL is not set | 1253 | |
| 1254 | # | ||
| 1255 | # Digest | ||
| 1256 | # | ||
| 1257 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1212 | # CONFIG_CRYPTO_MD4 is not set | 1258 | # CONFIG_CRYPTO_MD4 is not set |
| 1213 | # CONFIG_CRYPTO_MD5 is not set | 1259 | # CONFIG_CRYPTO_MD5 is not set |
| 1260 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1214 | # CONFIG_CRYPTO_SHA1 is not set | 1261 | # CONFIG_CRYPTO_SHA1 is not set |
| 1215 | # CONFIG_CRYPTO_SHA256 is not set | 1262 | # CONFIG_CRYPTO_SHA256 is not set |
| 1216 | # CONFIG_CRYPTO_SHA512 is not set | 1263 | # CONFIG_CRYPTO_SHA512 is not set |
| 1217 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1218 | # CONFIG_CRYPTO_TGR192 is not set | 1264 | # CONFIG_CRYPTO_TGR192 is not set |
| 1219 | # CONFIG_CRYPTO_GF128MUL is not set | 1265 | # CONFIG_CRYPTO_WP512 is not set |
| 1220 | # CONFIG_CRYPTO_ECB is not set | 1266 | |
| 1221 | # CONFIG_CRYPTO_CBC is not set | 1267 | # |
| 1222 | # CONFIG_CRYPTO_PCBC is not set | 1268 | # Ciphers |
| 1223 | # CONFIG_CRYPTO_LRW is not set | 1269 | # |
| 1224 | # CONFIG_CRYPTO_XTS is not set | ||
| 1225 | # CONFIG_CRYPTO_CTR is not set | ||
| 1226 | # CONFIG_CRYPTO_GCM is not set | ||
| 1227 | # CONFIG_CRYPTO_CCM is not set | ||
| 1228 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1229 | # CONFIG_CRYPTO_DES is not set | ||
| 1230 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1231 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1232 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1233 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1234 | # CONFIG_CRYPTO_AES is not set | 1270 | # CONFIG_CRYPTO_AES is not set |
| 1271 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1272 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1273 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1274 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1235 | # CONFIG_CRYPTO_CAST5 is not set | 1275 | # CONFIG_CRYPTO_CAST5 is not set |
| 1236 | # CONFIG_CRYPTO_CAST6 is not set | 1276 | # CONFIG_CRYPTO_CAST6 is not set |
| 1237 | # CONFIG_CRYPTO_TEA is not set | 1277 | # CONFIG_CRYPTO_DES is not set |
| 1238 | # CONFIG_CRYPTO_ARC4 is not set | 1278 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1239 | # CONFIG_CRYPTO_KHAZAD is not set | 1279 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1240 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1241 | # CONFIG_CRYPTO_SEED is not set | ||
| 1242 | # CONFIG_CRYPTO_SALSA20 is not set | 1280 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1281 | # CONFIG_CRYPTO_SEED is not set | ||
| 1282 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1283 | # CONFIG_CRYPTO_TEA is not set | ||
| 1284 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1285 | |||
| 1286 | # | ||
| 1287 | # Compression | ||
| 1288 | # | ||
| 1243 | # CONFIG_CRYPTO_DEFLATE is not set | 1289 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1245 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1246 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1247 | # CONFIG_CRYPTO_TEST is not set | ||
| 1248 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1249 | # CONFIG_CRYPTO_LZO is not set | 1290 | # CONFIG_CRYPTO_LZO is not set |
| 1250 | CONFIG_CRYPTO_HW=y | 1291 | CONFIG_CRYPTO_HW=y |
| 1251 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1292 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1252 | # CONFIG_PPC_CLOCK is not set | 1293 | # CONFIG_PPC_CLOCK is not set |
| 1253 | CONFIG_PPC_LIB_RHEAP=y | 1294 | CONFIG_PPC_LIB_RHEAP=y |
| 1295 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index d39ee3b35bfc..e0b5559e84aa 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:43 2008 | 4 | # Mon Jun 9 08:52:39 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | CONFIG_TQM8540=y | 160 | CONFIG_TQM8540=y |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -171,7 +176,6 @@ CONFIG_MPIC=y | |||
| 171 | # CONFIG_GENERIC_IOMAP is not set | 176 | # CONFIG_GENERIC_IOMAP is not set |
| 172 | # CONFIG_CPU_FREQ is not set | 177 | # CONFIG_CPU_FREQ is not set |
| 173 | # CONFIG_CPM2 is not set | 178 | # CONFIG_CPM2 is not set |
| 174 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 175 | # CONFIG_FSL_ULI1575 is not set | 179 | # CONFIG_FSL_ULI1575 is not set |
| 176 | 180 | ||
| 177 | # | 181 | # |
| @@ -208,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | # CONFIG_PROC_DEVICETREE is not set | 222 | # CONFIG_PROC_DEVICETREE is not set |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -233,6 +239,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 233 | CONFIG_ARCH_SUPPORTS_MSI=y | 239 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 234 | # CONFIG_PCI_MSI is not set | 240 | # CONFIG_PCI_MSI is not set |
| 235 | CONFIG_PCI_LEGACY=y | 241 | CONFIG_PCI_LEGACY=y |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 236 | 243 | ||
| 237 | # | 244 | # |
| 238 | # Advanced setup | 245 | # Advanced setup |
| @@ -242,11 +249,12 @@ CONFIG_PCI_LEGACY=y | |||
| 242 | # | 249 | # |
| 243 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 244 | # | 251 | # |
| 245 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 246 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 247 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 248 | CONFIG_TASK_SIZE=0xc0000000 | 257 | CONFIG_TASK_SIZE=0xc0000000 |
| 249 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 250 | 258 | ||
| 251 | # | 259 | # |
| 252 | # Networking | 260 | # Networking |
| @@ -294,8 +302,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 302 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 303 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 304 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 305 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 306 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 307 | # CONFIG_IP_DCCP is not set |
| @@ -352,6 +358,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 352 | # CONFIG_MTD_REDBOOT_PARTS is not set | 358 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 353 | CONFIG_MTD_CMDLINE_PARTS=y | 359 | CONFIG_MTD_CMDLINE_PARTS=y |
| 354 | # CONFIG_MTD_OF_PARTS is not set | 360 | # CONFIG_MTD_OF_PARTS is not set |
| 361 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 355 | 362 | ||
| 356 | # | 363 | # |
| 357 | # User Modules And Translation Layers | 364 | # User Modules And Translation Layers |
| @@ -423,6 +430,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 423 | # | 430 | # |
| 424 | # CONFIG_MTD_UBI is not set | 431 | # CONFIG_MTD_UBI is not set |
| 425 | CONFIG_OF_DEVICE=y | 432 | CONFIG_OF_DEVICE=y |
| 433 | CONFIG_OF_I2C=y | ||
| 426 | # CONFIG_PARPORT is not set | 434 | # CONFIG_PARPORT is not set |
| 427 | CONFIG_BLK_DEV=y | 435 | CONFIG_BLK_DEV=y |
| 428 | # CONFIG_BLK_DEV_FD is not set | 436 | # CONFIG_BLK_DEV_FD is not set |
| @@ -506,7 +514,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 506 | CONFIG_BLK_DEV_VIA82CXXX=y | 514 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 507 | # CONFIG_BLK_DEV_TC86C001 is not set | 515 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 508 | CONFIG_BLK_DEV_IDEDMA=y | 516 | CONFIG_BLK_DEV_IDEDMA=y |
| 509 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 517 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 510 | # CONFIG_BLK_DEV_HD is not set | 518 | # CONFIG_BLK_DEV_HD is not set |
| 511 | 519 | ||
| 512 | # | 520 | # |
| @@ -600,7 +608,6 @@ CONFIG_NETDEV_1000=y | |||
| 600 | # CONFIG_SIS190 is not set | 608 | # CONFIG_SIS190 is not set |
| 601 | # CONFIG_SKGE is not set | 609 | # CONFIG_SKGE is not set |
| 602 | # CONFIG_SKY2 is not set | 610 | # CONFIG_SKY2 is not set |
| 603 | # CONFIG_SK98LIN is not set | ||
| 604 | # CONFIG_VIA_VELOCITY is not set | 611 | # CONFIG_VIA_VELOCITY is not set |
| 605 | # CONFIG_TIGON3 is not set | 612 | # CONFIG_TIGON3 is not set |
| 606 | # CONFIG_BNX2 is not set | 613 | # CONFIG_BNX2 is not set |
| @@ -620,6 +627,7 @@ CONFIG_NETDEV_10000=y | |||
| 620 | # CONFIG_MLX4_CORE is not set | 627 | # CONFIG_MLX4_CORE is not set |
| 621 | # CONFIG_TEHUTI is not set | 628 | # CONFIG_TEHUTI is not set |
| 622 | # CONFIG_BNX2X is not set | 629 | # CONFIG_BNX2X is not set |
| 630 | # CONFIG_SFC is not set | ||
| 623 | # CONFIG_TR is not set | 631 | # CONFIG_TR is not set |
| 624 | 632 | ||
| 625 | # | 633 | # |
| @@ -627,6 +635,7 @@ CONFIG_NETDEV_10000=y | |||
| 627 | # | 635 | # |
| 628 | # CONFIG_WLAN_PRE80211 is not set | 636 | # CONFIG_WLAN_PRE80211 is not set |
| 629 | # CONFIG_WLAN_80211 is not set | 637 | # CONFIG_WLAN_80211 is not set |
| 638 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 630 | # CONFIG_WAN is not set | 639 | # CONFIG_WAN is not set |
| 631 | # CONFIG_FDDI is not set | 640 | # CONFIG_FDDI is not set |
| 632 | # CONFIG_HIPPI is not set | 641 | # CONFIG_HIPPI is not set |
| @@ -673,6 +682,7 @@ CONFIG_INPUT=y | |||
| 673 | # Character devices | 682 | # Character devices |
| 674 | # | 683 | # |
| 675 | # CONFIG_VT is not set | 684 | # CONFIG_VT is not set |
| 685 | CONFIG_DEVKMEM=y | ||
| 676 | # CONFIG_SERIAL_NONSTANDARD is not set | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 677 | # CONFIG_NOZOMI is not set | 687 | # CONFIG_NOZOMI is not set |
| 678 | 688 | ||
| @@ -713,13 +723,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 713 | CONFIG_I2C_CHARDEV=y | 723 | CONFIG_I2C_CHARDEV=y |
| 714 | 724 | ||
| 715 | # | 725 | # |
| 716 | # I2C Algorithms | ||
| 717 | # | ||
| 718 | # CONFIG_I2C_ALGOBIT is not set | ||
| 719 | # CONFIG_I2C_ALGOPCF is not set | ||
| 720 | # CONFIG_I2C_ALGOPCA is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # I2C Hardware Bus support | 726 | # I2C Hardware Bus support |
| 724 | # | 727 | # |
| 725 | # CONFIG_I2C_ALI1535 is not set | 728 | # CONFIG_I2C_ALI1535 is not set |
| @@ -744,6 +747,7 @@ CONFIG_I2C_MPC=y | |||
| 744 | # CONFIG_I2C_VIA is not set | 747 | # CONFIG_I2C_VIA is not set |
| 745 | # CONFIG_I2C_VIAPRO is not set | 748 | # CONFIG_I2C_VIAPRO is not set |
| 746 | # CONFIG_I2C_VOODOO3 is not set | 749 | # CONFIG_I2C_VOODOO3 is not set |
| 750 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 747 | 751 | ||
| 748 | # | 752 | # |
| 749 | # Miscellaneous I2C Chip support | 753 | # Miscellaneous I2C Chip support |
| @@ -753,19 +757,13 @@ CONFIG_I2C_MPC=y | |||
| 753 | # CONFIG_SENSORS_PCF8574 is not set | 757 | # CONFIG_SENSORS_PCF8574 is not set |
| 754 | # CONFIG_PCF8575 is not set | 758 | # CONFIG_PCF8575 is not set |
| 755 | # CONFIG_SENSORS_PCF8591 is not set | 759 | # CONFIG_SENSORS_PCF8591 is not set |
| 756 | # CONFIG_TPS65010 is not set | ||
| 757 | # CONFIG_SENSORS_MAX6875 is not set | 760 | # CONFIG_SENSORS_MAX6875 is not set |
| 758 | # CONFIG_SENSORS_TSL2550 is not set | 761 | # CONFIG_SENSORS_TSL2550 is not set |
| 759 | # CONFIG_I2C_DEBUG_CORE is not set | 762 | # CONFIG_I2C_DEBUG_CORE is not set |
| 760 | # CONFIG_I2C_DEBUG_ALGO is not set | 763 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 761 | # CONFIG_I2C_DEBUG_BUS is not set | 764 | # CONFIG_I2C_DEBUG_BUS is not set |
| 762 | # CONFIG_I2C_DEBUG_CHIP is not set | 765 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 763 | |||
| 764 | # | ||
| 765 | # SPI support | ||
| 766 | # | ||
| 767 | # CONFIG_SPI is not set | 766 | # CONFIG_SPI is not set |
| 768 | # CONFIG_SPI_MASTER is not set | ||
| 769 | # CONFIG_W1 is not set | 767 | # CONFIG_W1 is not set |
| 770 | # CONFIG_POWER_SUPPLY is not set | 768 | # CONFIG_POWER_SUPPLY is not set |
| 771 | CONFIG_HWMON=y | 769 | CONFIG_HWMON=y |
| @@ -835,12 +833,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 835 | # Multifunction device drivers | 833 | # Multifunction device drivers |
| 836 | # | 834 | # |
| 837 | # CONFIG_MFD_SM501 is not set | 835 | # CONFIG_MFD_SM501 is not set |
| 836 | # CONFIG_HTC_PASIC3 is not set | ||
| 838 | 837 | ||
| 839 | # | 838 | # |
| 840 | # Multimedia devices | 839 | # Multimedia devices |
| 841 | # | 840 | # |
| 841 | |||
| 842 | # | ||
| 843 | # Multimedia core support | ||
| 844 | # | ||
| 842 | # CONFIG_VIDEO_DEV is not set | 845 | # CONFIG_VIDEO_DEV is not set |
| 843 | # CONFIG_DVB_CORE is not set | 846 | # CONFIG_DVB_CORE is not set |
| 847 | # CONFIG_VIDEO_MEDIA is not set | ||
| 848 | |||
| 849 | # | ||
| 850 | # Multimedia drivers | ||
| 851 | # | ||
| 844 | CONFIG_DAB=y | 852 | CONFIG_DAB=y |
| 845 | 853 | ||
| 846 | # | 854 | # |
| @@ -871,6 +879,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 871 | CONFIG_USB_ARCH_HAS_OHCI=y | 879 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 872 | CONFIG_USB_ARCH_HAS_EHCI=y | 880 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 873 | # CONFIG_USB is not set | 881 | # CONFIG_USB is not set |
| 882 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 883 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 874 | 884 | ||
| 875 | # | 885 | # |
| 876 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -879,14 +889,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 879 | # CONFIG_MMC is not set | 889 | # CONFIG_MMC is not set |
| 880 | # CONFIG_MEMSTICK is not set | 890 | # CONFIG_MEMSTICK is not set |
| 881 | # CONFIG_NEW_LEDS is not set | 891 | # CONFIG_NEW_LEDS is not set |
| 892 | # CONFIG_ACCESSIBILITY is not set | ||
| 882 | # CONFIG_INFINIBAND is not set | 893 | # CONFIG_INFINIBAND is not set |
| 883 | # CONFIG_EDAC is not set | 894 | # CONFIG_EDAC is not set |
| 884 | # CONFIG_RTC_CLASS is not set | 895 | # CONFIG_RTC_CLASS is not set |
| 885 | # CONFIG_DMADEVICES is not set | 896 | # CONFIG_DMADEVICES is not set |
| 886 | |||
| 887 | # | ||
| 888 | # Userspace I/O | ||
| 889 | # | ||
| 890 | # CONFIG_UIO is not set | 897 | # CONFIG_UIO is not set |
| 891 | 898 | ||
| 892 | # | 899 | # |
| @@ -906,7 +913,6 @@ CONFIG_FS_MBCACHE=y | |||
| 906 | # CONFIG_JFS_FS is not set | 913 | # CONFIG_JFS_FS is not set |
| 907 | # CONFIG_FS_POSIX_ACL is not set | 914 | # CONFIG_FS_POSIX_ACL is not set |
| 908 | # CONFIG_XFS_FS is not set | 915 | # CONFIG_XFS_FS is not set |
| 909 | # CONFIG_GFS2_FS is not set | ||
| 910 | # CONFIG_OCFS2_FS is not set | 916 | # CONFIG_OCFS2_FS is not set |
| 911 | CONFIG_DNOTIFY=y | 917 | CONFIG_DNOTIFY=y |
| 912 | CONFIG_INOTIFY=y | 918 | CONFIG_INOTIFY=y |
| @@ -974,7 +980,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 974 | CONFIG_NFS_FS=y | 980 | CONFIG_NFS_FS=y |
| 975 | # CONFIG_NFS_V3 is not set | 981 | # CONFIG_NFS_V3 is not set |
| 976 | # CONFIG_NFS_V4 is not set | 982 | # CONFIG_NFS_V4 is not set |
| 977 | # CONFIG_NFS_DIRECTIO is not set | ||
| 978 | # CONFIG_NFSD is not set | 983 | # CONFIG_NFSD is not set |
| 979 | CONFIG_ROOT_NFS=y | 984 | CONFIG_ROOT_NFS=y |
| 980 | CONFIG_LOCKD=y | 985 | CONFIG_LOCKD=y |
| @@ -1013,6 +1018,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1013 | # Library routines | 1018 | # Library routines |
| 1014 | # | 1019 | # |
| 1015 | CONFIG_BITREVERSE=y | 1020 | CONFIG_BITREVERSE=y |
| 1021 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1016 | # CONFIG_CRC_CCITT is not set | 1022 | # CONFIG_CRC_CCITT is not set |
| 1017 | # CONFIG_CRC16 is not set | 1023 | # CONFIG_CRC16 is not set |
| 1018 | # CONFIG_CRC_ITU_T is not set | 1024 | # CONFIG_CRC_ITU_T is not set |
| @@ -1025,6 +1031,7 @@ CONFIG_PLIST=y | |||
| 1025 | CONFIG_HAS_IOMEM=y | 1031 | CONFIG_HAS_IOMEM=y |
| 1026 | CONFIG_HAS_IOPORT=y | 1032 | CONFIG_HAS_IOPORT=y |
| 1027 | CONFIG_HAS_DMA=y | 1033 | CONFIG_HAS_DMA=y |
| 1034 | CONFIG_HAVE_LMB=y | ||
| 1028 | 1035 | ||
| 1029 | # | 1036 | # |
| 1030 | # Kernel hacking | 1037 | # Kernel hacking |
| @@ -1032,6 +1039,7 @@ CONFIG_HAS_DMA=y | |||
| 1032 | # CONFIG_PRINTK_TIME is not set | 1039 | # CONFIG_PRINTK_TIME is not set |
| 1033 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1040 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1034 | CONFIG_ENABLE_MUST_CHECK=y | 1041 | CONFIG_ENABLE_MUST_CHECK=y |
| 1042 | CONFIG_FRAME_WARN=1024 | ||
| 1035 | # CONFIG_MAGIC_SYSRQ is not set | 1043 | # CONFIG_MAGIC_SYSRQ is not set |
| 1036 | # CONFIG_UNUSED_SYMBOLS is not set | 1044 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1037 | # CONFIG_DEBUG_FS is not set | 1045 | # CONFIG_DEBUG_FS is not set |
| @@ -1041,6 +1049,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1041 | # CONFIG_SLUB_STATS is not set | 1049 | # CONFIG_SLUB_STATS is not set |
| 1042 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1050 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1043 | # CONFIG_SAMPLES is not set | 1051 | # CONFIG_SAMPLES is not set |
| 1052 | # CONFIG_IRQSTACKS is not set | ||
| 1044 | # CONFIG_PPC_EARLY_DEBUG is not set | 1053 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1045 | 1054 | ||
| 1046 | # | 1055 | # |
| @@ -1050,48 +1059,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1050 | # CONFIG_SECURITY is not set | 1059 | # CONFIG_SECURITY is not set |
| 1051 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1060 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1052 | CONFIG_CRYPTO=y | 1061 | CONFIG_CRYPTO=y |
| 1053 | # CONFIG_CRYPTO_SEQIV is not set | 1062 | |
| 1063 | # | ||
| 1064 | # Crypto core or helper | ||
| 1065 | # | ||
| 1054 | # CONFIG_CRYPTO_MANAGER is not set | 1066 | # CONFIG_CRYPTO_MANAGER is not set |
| 1067 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1068 | # CONFIG_CRYPTO_NULL is not set | ||
| 1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1070 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Authenticated Encryption with Associated Data | ||
| 1074 | # | ||
| 1075 | # CONFIG_CRYPTO_CCM is not set | ||
| 1076 | # CONFIG_CRYPTO_GCM is not set | ||
| 1077 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1078 | |||
| 1079 | # | ||
| 1080 | # Block modes | ||
| 1081 | # | ||
| 1082 | # CONFIG_CRYPTO_CBC is not set | ||
| 1083 | # CONFIG_CRYPTO_CTR is not set | ||
| 1084 | # CONFIG_CRYPTO_CTS is not set | ||
| 1085 | # CONFIG_CRYPTO_ECB is not set | ||
| 1086 | # CONFIG_CRYPTO_LRW is not set | ||
| 1087 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | |||
| 1090 | # | ||
| 1091 | # Hash modes | ||
| 1092 | # | ||
| 1055 | # CONFIG_CRYPTO_HMAC is not set | 1093 | # CONFIG_CRYPTO_HMAC is not set |
| 1056 | # CONFIG_CRYPTO_XCBC is not set | 1094 | # CONFIG_CRYPTO_XCBC is not set |
| 1057 | # CONFIG_CRYPTO_NULL is not set | 1095 | |
| 1096 | # | ||
| 1097 | # Digest | ||
| 1098 | # | ||
| 1099 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1058 | # CONFIG_CRYPTO_MD4 is not set | 1100 | # CONFIG_CRYPTO_MD4 is not set |
| 1059 | # CONFIG_CRYPTO_MD5 is not set | 1101 | # CONFIG_CRYPTO_MD5 is not set |
| 1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1060 | # CONFIG_CRYPTO_SHA1 is not set | 1103 | # CONFIG_CRYPTO_SHA1 is not set |
| 1061 | # CONFIG_CRYPTO_SHA256 is not set | 1104 | # CONFIG_CRYPTO_SHA256 is not set |
| 1062 | # CONFIG_CRYPTO_SHA512 is not set | 1105 | # CONFIG_CRYPTO_SHA512 is not set |
| 1063 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1064 | # CONFIG_CRYPTO_TGR192 is not set | 1106 | # CONFIG_CRYPTO_TGR192 is not set |
| 1065 | # CONFIG_CRYPTO_GF128MUL is not set | 1107 | # CONFIG_CRYPTO_WP512 is not set |
| 1066 | # CONFIG_CRYPTO_ECB is not set | 1108 | |
| 1067 | # CONFIG_CRYPTO_CBC is not set | 1109 | # |
| 1068 | # CONFIG_CRYPTO_PCBC is not set | 1110 | # Ciphers |
| 1069 | # CONFIG_CRYPTO_LRW is not set | 1111 | # |
| 1070 | # CONFIG_CRYPTO_XTS is not set | ||
| 1071 | # CONFIG_CRYPTO_CTR is not set | ||
| 1072 | # CONFIG_CRYPTO_GCM is not set | ||
| 1073 | # CONFIG_CRYPTO_CCM is not set | ||
| 1074 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1075 | # CONFIG_CRYPTO_DES is not set | ||
| 1076 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1077 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1078 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1079 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1080 | # CONFIG_CRYPTO_AES is not set | 1112 | # CONFIG_CRYPTO_AES is not set |
| 1113 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1114 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1115 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1116 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1081 | # CONFIG_CRYPTO_CAST5 is not set | 1117 | # CONFIG_CRYPTO_CAST5 is not set |
| 1082 | # CONFIG_CRYPTO_CAST6 is not set | 1118 | # CONFIG_CRYPTO_CAST6 is not set |
| 1083 | # CONFIG_CRYPTO_TEA is not set | 1119 | # CONFIG_CRYPTO_DES is not set |
| 1084 | # CONFIG_CRYPTO_ARC4 is not set | 1120 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1085 | # CONFIG_CRYPTO_KHAZAD is not set | 1121 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1086 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1087 | # CONFIG_CRYPTO_SEED is not set | ||
| 1088 | # CONFIG_CRYPTO_SALSA20 is not set | 1122 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1123 | # CONFIG_CRYPTO_SEED is not set | ||
| 1124 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1125 | # CONFIG_CRYPTO_TEA is not set | ||
| 1126 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Compression | ||
| 1130 | # | ||
| 1089 | # CONFIG_CRYPTO_DEFLATE is not set | 1131 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1090 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1091 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1092 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1093 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1094 | # CONFIG_CRYPTO_LZO is not set | 1132 | # CONFIG_CRYPTO_LZO is not set |
| 1095 | CONFIG_CRYPTO_HW=y | 1133 | CONFIG_CRYPTO_HW=y |
| 1096 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1134 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1097 | # CONFIG_PPC_CLOCK is not set | 1135 | # CONFIG_PPC_CLOCK is not set |
| 1136 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index cbf6ad2d71da..6f9067b49e07 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:44 2008 | 4 | # Mon Jun 9 08:52:40 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | CONFIG_TQM8541=y | 161 | CONFIG_TQM8541=y |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index bbff962c8472..03120b5b52fa 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:44 2008 | 4 | # Mon Jun 9 08:52:41 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index 63c5ec8b6515..3113257edf5a 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:45 2008 | 4 | # Mon Jun 9 08:52:42 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index a3cc94a2ff06..6740f2a3aa3d 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_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.25-rc2 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Wed Feb 20 12:26:07 2008 | 4 | # Mon Jun 9 08:52:08 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -75,6 +77,7 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
| 75 | CONFIG_USER_SCHED=y | 77 | CONFIG_USER_SCHED=y |
| 76 | # CONFIG_CGROUP_SCHED is not set | 78 | # CONFIG_CGROUP_SCHED is not set |
| 77 | CONFIG_SYSFS_DEPRECATED=y | 79 | CONFIG_SYSFS_DEPRECATED=y |
| 80 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 78 | # CONFIG_RELAY is not set | 81 | # CONFIG_RELAY is not set |
| 79 | # CONFIG_NAMESPACES is not set | 82 | # CONFIG_NAMESPACES is not set |
| 80 | # CONFIG_BLK_DEV_INITRD is not set | 83 | # CONFIG_BLK_DEV_INITRD is not set |
| @@ -107,6 +110,8 @@ CONFIG_SLUB=y | |||
| 107 | # CONFIG_MARKERS is not set | 110 | # CONFIG_MARKERS is not set |
| 108 | CONFIG_HAVE_OPROFILE=y | 111 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 112 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | ||
| 114 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 110 | CONFIG_PROC_PAGE_MONITOR=y | 115 | CONFIG_PROC_PAGE_MONITOR=y |
| 111 | CONFIG_SLABINFO=y | 116 | CONFIG_SLABINFO=y |
| 112 | # CONFIG_TINY_SHMEM is not set | 117 | # CONFIG_TINY_SHMEM is not set |
| @@ -131,7 +136,6 @@ CONFIG_DEFAULT_DEADLINE=y | |||
| 131 | # CONFIG_DEFAULT_NOOP is not set | 136 | # CONFIG_DEFAULT_NOOP is not set |
| 132 | CONFIG_DEFAULT_IOSCHED="deadline" | 137 | CONFIG_DEFAULT_IOSCHED="deadline" |
| 133 | CONFIG_CLASSIC_RCU=y | 138 | CONFIG_CLASSIC_RCU=y |
| 134 | # CONFIG_PREEMPT_RCU is not set | ||
| 135 | 139 | ||
| 136 | # | 140 | # |
| 137 | # Platform support | 141 | # Platform support |
| @@ -194,7 +198,6 @@ CONFIG_HZ=1000 | |||
| 194 | CONFIG_PREEMPT_NONE=y | 198 | CONFIG_PREEMPT_NONE=y |
| 195 | # CONFIG_PREEMPT_VOLUNTARY is not set | 199 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 196 | # CONFIG_PREEMPT is not set | 200 | # CONFIG_PREEMPT is not set |
| 197 | CONFIG_RCU_TRACE=y | ||
| 198 | CONFIG_BINFMT_ELF=y | 201 | CONFIG_BINFMT_ELF=y |
| 199 | # CONFIG_BINFMT_MISC is not set | 202 | # CONFIG_BINFMT_MISC is not set |
| 200 | # CONFIG_MATH_EMULATION is not set | 203 | # CONFIG_MATH_EMULATION is not set |
| @@ -213,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 213 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 214 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 217 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 218 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 219 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 220 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 221 | # CONFIG_PROC_DEVICETREE is not set | 226 | # CONFIG_PROC_DEVICETREE is not set |
| 222 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 223 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -235,6 +240,7 @@ CONFIG_FSL_SOC=y | |||
| 235 | # CONFIG_PCI_QSPAN is not set | 240 | # CONFIG_PCI_QSPAN is not set |
| 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 241 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 237 | # CONFIG_PCCARD is not set | 242 | # CONFIG_PCCARD is not set |
| 243 | # CONFIG_HAS_RAPIDIO is not set | ||
| 238 | 244 | ||
| 239 | # | 245 | # |
| 240 | # Advanced setup | 246 | # Advanced setup |
| @@ -244,13 +250,13 @@ CONFIG_FSL_SOC=y | |||
| 244 | # | 250 | # |
| 245 | # Default settings for advanced configuration options are used | 251 | # Default settings for advanced configuration options are used |
| 246 | # | 252 | # |
| 247 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 248 | CONFIG_LOWMEM_SIZE=0x30000000 | 253 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 254 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 249 | CONFIG_KERNEL_START=0xc0000000 | 255 | CONFIG_KERNEL_START=0xc0000000 |
| 256 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 250 | CONFIG_TASK_SIZE=0x80000000 | 257 | CONFIG_TASK_SIZE=0x80000000 |
| 251 | CONFIG_CONSISTENT_START=0xfd000000 | 258 | CONFIG_CONSISTENT_START=0xfd000000 |
| 252 | CONFIG_CONSISTENT_SIZE=0x00200000 | 259 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 253 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 254 | 260 | ||
| 255 | # | 261 | # |
| 256 | # Networking | 262 | # Networking |
| @@ -293,8 +299,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 293 | CONFIG_DEFAULT_TCP_CONG="cubic" | 299 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 294 | # CONFIG_TCP_MD5SIG is not set | 300 | # CONFIG_TCP_MD5SIG is not set |
| 295 | # CONFIG_IPV6 is not set | 301 | # CONFIG_IPV6 is not set |
| 296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 297 | # CONFIG_INET6_TUNNEL is not set | ||
| 298 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 299 | # CONFIG_NETFILTER is not set | 303 | # CONFIG_NETFILTER is not set |
| 300 | # CONFIG_IP_DCCP is not set | 304 | # CONFIG_IP_DCCP is not set |
| @@ -482,6 +486,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 482 | # | 486 | # |
| 483 | # CONFIG_WLAN_PRE80211 is not set | 487 | # CONFIG_WLAN_PRE80211 is not set |
| 484 | # CONFIG_WLAN_80211 is not set | 488 | # CONFIG_WLAN_80211 is not set |
| 489 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 485 | # CONFIG_WAN is not set | 490 | # CONFIG_WAN is not set |
| 486 | # CONFIG_PPP is not set | 491 | # CONFIG_PPP is not set |
| 487 | # CONFIG_SLIP is not set | 492 | # CONFIG_SLIP is not set |
| @@ -548,6 +553,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 548 | # Character devices | 553 | # Character devices |
| 549 | # | 554 | # |
| 550 | # CONFIG_VT is not set | 555 | # CONFIG_VT is not set |
| 556 | CONFIG_DEVKMEM=y | ||
| 551 | # CONFIG_SERIAL_NONSTANDARD is not set | 557 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 552 | 558 | ||
| 553 | # | 559 | # |
| @@ -580,12 +586,7 @@ CONFIG_GEN_RTC=y | |||
| 580 | # CONFIG_RAW_DRIVER is not set | 586 | # CONFIG_RAW_DRIVER is not set |
| 581 | # CONFIG_TCG_TPM is not set | 587 | # CONFIG_TCG_TPM is not set |
| 582 | # CONFIG_I2C is not set | 588 | # CONFIG_I2C is not set |
| 583 | |||
| 584 | # | ||
| 585 | # SPI support | ||
| 586 | # | ||
| 587 | # CONFIG_SPI is not set | 589 | # CONFIG_SPI is not set |
| 588 | # CONFIG_SPI_MASTER is not set | ||
| 589 | # CONFIG_W1 is not set | 590 | # CONFIG_W1 is not set |
| 590 | # CONFIG_POWER_SUPPLY is not set | 591 | # CONFIG_POWER_SUPPLY is not set |
| 591 | # CONFIG_HWMON is not set | 592 | # CONFIG_HWMON is not set |
| @@ -602,12 +603,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 602 | # Multifunction device drivers | 603 | # Multifunction device drivers |
| 603 | # | 604 | # |
| 604 | # CONFIG_MFD_SM501 is not set | 605 | # CONFIG_MFD_SM501 is not set |
| 606 | # CONFIG_HTC_PASIC3 is not set | ||
| 605 | 607 | ||
| 606 | # | 608 | # |
| 607 | # Multimedia devices | 609 | # Multimedia devices |
| 608 | # | 610 | # |
| 611 | |||
| 612 | # | ||
| 613 | # Multimedia core support | ||
| 614 | # | ||
| 609 | # CONFIG_VIDEO_DEV is not set | 615 | # CONFIG_VIDEO_DEV is not set |
| 610 | # CONFIG_DVB_CORE is not set | 616 | # CONFIG_DVB_CORE is not set |
| 617 | # CONFIG_VIDEO_MEDIA is not set | ||
| 618 | |||
| 619 | # | ||
| 620 | # Multimedia drivers | ||
| 621 | # | ||
| 611 | CONFIG_DAB=y | 622 | CONFIG_DAB=y |
| 612 | 623 | ||
| 613 | # | 624 | # |
| @@ -632,12 +643,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 632 | # CONFIG_MMC is not set | 643 | # CONFIG_MMC is not set |
| 633 | # CONFIG_MEMSTICK is not set | 644 | # CONFIG_MEMSTICK is not set |
| 634 | # CONFIG_NEW_LEDS is not set | 645 | # CONFIG_NEW_LEDS is not set |
| 646 | # CONFIG_ACCESSIBILITY is not set | ||
| 635 | # CONFIG_EDAC is not set | 647 | # CONFIG_EDAC is not set |
| 636 | # CONFIG_RTC_CLASS is not set | 648 | # CONFIG_RTC_CLASS is not set |
| 637 | 649 | # CONFIG_DMADEVICES is not set | |
| 638 | # | ||
| 639 | # Userspace I/O | ||
| 640 | # | ||
| 641 | # CONFIG_UIO is not set | 650 | # CONFIG_UIO is not set |
| 642 | 651 | ||
| 643 | # | 652 | # |
| @@ -650,7 +659,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 650 | # CONFIG_JFS_FS is not set | 659 | # CONFIG_JFS_FS is not set |
| 651 | # CONFIG_FS_POSIX_ACL is not set | 660 | # CONFIG_FS_POSIX_ACL is not set |
| 652 | # CONFIG_XFS_FS is not set | 661 | # CONFIG_XFS_FS is not set |
| 653 | # CONFIG_GFS2_FS is not set | ||
| 654 | # CONFIG_OCFS2_FS is not set | 662 | # CONFIG_OCFS2_FS is not set |
| 655 | # CONFIG_DNOTIFY is not set | 663 | # CONFIG_DNOTIFY is not set |
| 656 | # CONFIG_INOTIFY is not set | 664 | # CONFIG_INOTIFY is not set |
| @@ -708,7 +716,6 @@ CONFIG_NFS_FS=y | |||
| 708 | CONFIG_NFS_V3=y | 716 | CONFIG_NFS_V3=y |
| 709 | # CONFIG_NFS_V3_ACL is not set | 717 | # CONFIG_NFS_V3_ACL is not set |
| 710 | # CONFIG_NFS_V4 is not set | 718 | # CONFIG_NFS_V4 is not set |
| 711 | # CONFIG_NFS_DIRECTIO is not set | ||
| 712 | # CONFIG_NFSD is not set | 719 | # CONFIG_NFSD is not set |
| 713 | CONFIG_ROOT_NFS=y | 720 | CONFIG_ROOT_NFS=y |
| 714 | CONFIG_LOCKD=y | 721 | CONFIG_LOCKD=y |
| @@ -751,6 +758,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 751 | # | 758 | # |
| 752 | # Library routines | 759 | # Library routines |
| 753 | # | 760 | # |
| 761 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 754 | # CONFIG_CRC_CCITT is not set | 762 | # CONFIG_CRC_CCITT is not set |
| 755 | # CONFIG_CRC16 is not set | 763 | # CONFIG_CRC16 is not set |
| 756 | # CONFIG_CRC_ITU_T is not set | 764 | # CONFIG_CRC_ITU_T is not set |
| @@ -761,6 +769,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 761 | CONFIG_HAS_IOMEM=y | 769 | CONFIG_HAS_IOMEM=y |
| 762 | CONFIG_HAS_IOPORT=y | 770 | CONFIG_HAS_IOPORT=y |
| 763 | CONFIG_HAS_DMA=y | 771 | CONFIG_HAS_DMA=y |
| 772 | CONFIG_HAVE_LMB=y | ||
| 764 | 773 | ||
| 765 | # | 774 | # |
| 766 | # Kernel hacking | 775 | # Kernel hacking |
| @@ -768,6 +777,7 @@ CONFIG_HAS_DMA=y | |||
| 768 | # CONFIG_PRINTK_TIME is not set | 777 | # CONFIG_PRINTK_TIME is not set |
| 769 | CONFIG_ENABLE_WARN_DEPRECATED=y | 778 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 770 | CONFIG_ENABLE_MUST_CHECK=y | 779 | CONFIG_ENABLE_MUST_CHECK=y |
| 780 | CONFIG_FRAME_WARN=1024 | ||
| 771 | CONFIG_MAGIC_SYSRQ=y | 781 | CONFIG_MAGIC_SYSRQ=y |
| 772 | # CONFIG_UNUSED_SYMBOLS is not set | 782 | # CONFIG_UNUSED_SYMBOLS is not set |
| 773 | CONFIG_DEBUG_FS=y | 783 | CONFIG_DEBUG_FS=y |
| @@ -778,6 +788,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 778 | CONFIG_SCHED_DEBUG=y | 788 | CONFIG_SCHED_DEBUG=y |
| 779 | # CONFIG_SCHEDSTATS is not set | 789 | # CONFIG_SCHEDSTATS is not set |
| 780 | # CONFIG_TIMER_STATS is not set | 790 | # CONFIG_TIMER_STATS is not set |
| 791 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 781 | # CONFIG_SLUB_DEBUG_ON is not set | 792 | # CONFIG_SLUB_DEBUG_ON is not set |
| 782 | # CONFIG_SLUB_STATS is not set | 793 | # CONFIG_SLUB_STATS is not set |
| 783 | # CONFIG_DEBUG_SPINLOCK is not set | 794 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -788,6 +799,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 788 | CONFIG_DEBUG_BUGVERBOSE=y | 799 | CONFIG_DEBUG_BUGVERBOSE=y |
| 789 | CONFIG_DEBUG_INFO=y | 800 | CONFIG_DEBUG_INFO=y |
| 790 | # CONFIG_DEBUG_VM is not set | 801 | # CONFIG_DEBUG_VM is not set |
| 802 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 791 | # CONFIG_DEBUG_LIST is not set | 803 | # CONFIG_DEBUG_LIST is not set |
| 792 | # CONFIG_DEBUG_SG is not set | 804 | # CONFIG_DEBUG_SG is not set |
| 793 | # CONFIG_BOOT_PRINTK_DELAY is not set | 805 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -798,6 +810,7 @@ CONFIG_DEBUG_INFO=y | |||
| 798 | # CONFIG_DEBUG_STACK_USAGE is not set | 810 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 799 | # CONFIG_DEBUG_PAGEALLOC is not set | 811 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 800 | # CONFIG_DEBUGGER is not set | 812 | # CONFIG_DEBUGGER is not set |
| 813 | # CONFIG_IRQSTACKS is not set | ||
| 801 | # CONFIG_VIRQ_DEBUG is not set | 814 | # CONFIG_VIRQ_DEBUG is not set |
| 802 | # CONFIG_BDI_SWITCH is not set | 815 | # CONFIG_BDI_SWITCH is not set |
| 803 | # CONFIG_PPC_EARLY_DEBUG is not set | 816 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -811,3 +824,4 @@ CONFIG_DEBUG_INFO=y | |||
| 811 | # CONFIG_CRYPTO is not set | 824 | # CONFIG_CRYPTO is not set |
| 812 | # CONFIG_PPC_CLOCK is not set | 825 | # CONFIG_PPC_CLOCK is not set |
| 813 | CONFIG_PPC_LIB_RHEAP=y | 826 | CONFIG_PPC_LIB_RHEAP=y |
| 827 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index 2b1504e0a111..ba2a463b9305 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:09 2008 | 4 | # Mon Jun 9 08:52:09 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,18 +72,16 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | # CONFIG_BLK_DEV_INITRD is not set | 79 | # CONFIG_BLK_DEV_INITRD is not set |
| 80 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 82 | CONFIG_SYSCTL=y | 81 | CONFIG_SYSCTL=y |
| 83 | CONFIG_EMBEDDED=y | 82 | CONFIG_EMBEDDED=y |
| 84 | CONFIG_SYSCTL_SYSCALL=y | 83 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 85 | CONFIG_KALLSYMS=y | 85 | CONFIG_KALLSYMS=y |
| 86 | CONFIG_KALLSYMS_ALL=y | 86 | CONFIG_KALLSYMS_ALL=y |
| 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -107,6 +107,7 @@ CONFIG_SLAB=y | |||
| 107 | CONFIG_HAVE_OPROFILE=y | 107 | CONFIG_HAVE_OPROFILE=y |
| 108 | CONFIG_HAVE_KPROBES=y | 108 | CONFIG_HAVE_KPROBES=y |
| 109 | CONFIG_HAVE_KRETPROBES=y | 109 | CONFIG_HAVE_KRETPROBES=y |
| 110 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 110 | CONFIG_PROC_PAGE_MONITOR=y | 111 | CONFIG_PROC_PAGE_MONITOR=y |
| 111 | CONFIG_SLABINFO=y | 112 | CONFIG_SLABINFO=y |
| 112 | CONFIG_RT_MUTEXES=y | 113 | CONFIG_RT_MUTEXES=y |
| @@ -194,11 +195,13 @@ CONFIG_FLATMEM=y | |||
| 194 | CONFIG_FLAT_NODE_MEM_MAP=y | 195 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 195 | # CONFIG_SPARSEMEM_STATIC is not set | 196 | # CONFIG_SPARSEMEM_STATIC is not set |
| 196 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 197 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 198 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 197 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 198 | # CONFIG_RESOURCES_64BIT is not set | 200 | # CONFIG_RESOURCES_64BIT is not set |
| 199 | CONFIG_ZONE_DMA_FLAG=1 | 201 | CONFIG_ZONE_DMA_FLAG=1 |
| 200 | CONFIG_BOUNCE=y | 202 | CONFIG_BOUNCE=y |
| 201 | CONFIG_VIRT_TO_BUS=y | 203 | CONFIG_VIRT_TO_BUS=y |
| 204 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 202 | CONFIG_PROC_DEVICETREE=y | 205 | CONFIG_PROC_DEVICETREE=y |
| 203 | # CONFIG_CMDLINE_BOOL is not set | 206 | # CONFIG_CMDLINE_BOOL is not set |
| 204 | # CONFIG_PM is not set | 207 | # CONFIG_PM is not set |
| @@ -215,6 +218,7 @@ CONFIG_FSL_SOC=y | |||
| 215 | # CONFIG_PCI_SYSCALL is not set | 218 | # CONFIG_PCI_SYSCALL is not set |
| 216 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 219 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 217 | # CONFIG_PCCARD is not set | 220 | # CONFIG_PCCARD is not set |
| 221 | # CONFIG_HAS_RAPIDIO is not set | ||
| 218 | 222 | ||
| 219 | # | 223 | # |
| 220 | # Advanced setup | 224 | # Advanced setup |
| @@ -224,11 +228,11 @@ CONFIG_FSL_SOC=y | |||
| 224 | # | 228 | # |
| 225 | # Default settings for advanced configuration options are used | 229 | # Default settings for advanced configuration options are used |
| 226 | # | 230 | # |
| 227 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 228 | CONFIG_LOWMEM_SIZE=0x30000000 | 231 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 232 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 229 | CONFIG_KERNEL_START=0xc0000000 | 233 | CONFIG_KERNEL_START=0xc0000000 |
| 234 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 230 | CONFIG_TASK_SIZE=0xc0000000 | 235 | CONFIG_TASK_SIZE=0xc0000000 |
| 231 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 232 | 236 | ||
| 233 | # | 237 | # |
| 234 | # Networking | 238 | # Networking |
| @@ -283,6 +287,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 283 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 287 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 284 | CONFIG_INET6_XFRM_MODE_BEET=y | 288 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 285 | CONFIG_IPV6_SIT=y | 289 | CONFIG_IPV6_SIT=y |
| 290 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 286 | # CONFIG_IPV6_TUNNEL is not set | 291 | # CONFIG_IPV6_TUNNEL is not set |
| 287 | # CONFIG_NETWORK_SECMARK is not set | 292 | # CONFIG_NETWORK_SECMARK is not set |
| 288 | CONFIG_NETFILTER=y | 293 | CONFIG_NETFILTER=y |
| @@ -498,6 +503,7 @@ CONFIG_NETDEV_10000=y | |||
| 498 | # | 503 | # |
| 499 | # CONFIG_WLAN_PRE80211 is not set | 504 | # CONFIG_WLAN_PRE80211 is not set |
| 500 | # CONFIG_WLAN_80211 is not set | 505 | # CONFIG_WLAN_80211 is not set |
| 506 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 501 | # CONFIG_WAN is not set | 507 | # CONFIG_WAN is not set |
| 502 | # CONFIG_PPP is not set | 508 | # CONFIG_PPP is not set |
| 503 | # CONFIG_SLIP is not set | 509 | # CONFIG_SLIP is not set |
| @@ -521,6 +527,7 @@ CONFIG_NETDEV_10000=y | |||
| 521 | # Character devices | 527 | # Character devices |
| 522 | # | 528 | # |
| 523 | # CONFIG_VT is not set | 529 | # CONFIG_VT is not set |
| 530 | CONFIG_DEVKMEM=y | ||
| 524 | # CONFIG_SERIAL_NONSTANDARD is not set | 531 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 525 | 532 | ||
| 526 | # | 533 | # |
| @@ -552,12 +559,7 @@ CONFIG_HW_RANDOM=y | |||
| 552 | # CONFIG_R3964 is not set | 559 | # CONFIG_R3964 is not set |
| 553 | # CONFIG_RAW_DRIVER is not set | 560 | # CONFIG_RAW_DRIVER is not set |
| 554 | # CONFIG_I2C is not set | 561 | # CONFIG_I2C is not set |
| 555 | |||
| 556 | # | ||
| 557 | # SPI support | ||
| 558 | # | ||
| 559 | # CONFIG_SPI is not set | 562 | # CONFIG_SPI is not set |
| 560 | # CONFIG_SPI_MASTER is not set | ||
| 561 | # CONFIG_W1 is not set | 563 | # CONFIG_W1 is not set |
| 562 | # CONFIG_POWER_SUPPLY is not set | 564 | # CONFIG_POWER_SUPPLY is not set |
| 563 | # CONFIG_HWMON is not set | 565 | # CONFIG_HWMON is not set |
| @@ -574,12 +576,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 574 | # Multifunction device drivers | 576 | # Multifunction device drivers |
| 575 | # | 577 | # |
| 576 | # CONFIG_MFD_SM501 is not set | 578 | # CONFIG_MFD_SM501 is not set |
| 579 | # CONFIG_HTC_PASIC3 is not set | ||
| 577 | 580 | ||
| 578 | # | 581 | # |
| 579 | # Multimedia devices | 582 | # Multimedia devices |
| 580 | # | 583 | # |
| 584 | |||
| 585 | # | ||
| 586 | # Multimedia core support | ||
| 587 | # | ||
| 581 | # CONFIG_VIDEO_DEV is not set | 588 | # CONFIG_VIDEO_DEV is not set |
| 582 | # CONFIG_DVB_CORE is not set | 589 | # CONFIG_DVB_CORE is not set |
| 590 | # CONFIG_VIDEO_MEDIA is not set | ||
| 591 | |||
| 592 | # | ||
| 593 | # Multimedia drivers | ||
| 594 | # | ||
| 583 | CONFIG_DAB=y | 595 | CONFIG_DAB=y |
| 584 | 596 | ||
| 585 | # | 597 | # |
| @@ -603,12 +615,9 @@ CONFIG_DAB=y | |||
| 603 | # CONFIG_MMC is not set | 615 | # CONFIG_MMC is not set |
| 604 | # CONFIG_MEMSTICK is not set | 616 | # CONFIG_MEMSTICK is not set |
| 605 | # CONFIG_NEW_LEDS is not set | 617 | # CONFIG_NEW_LEDS is not set |
| 618 | # CONFIG_ACCESSIBILITY is not set | ||
| 606 | # CONFIG_RTC_CLASS is not set | 619 | # CONFIG_RTC_CLASS is not set |
| 607 | # CONFIG_DMADEVICES is not set | 620 | # CONFIG_DMADEVICES is not set |
| 608 | |||
| 609 | # | ||
| 610 | # Userspace I/O | ||
| 611 | # | ||
| 612 | # CONFIG_UIO is not set | 621 | # CONFIG_UIO is not set |
| 613 | 622 | ||
| 614 | # | 623 | # |
| @@ -675,7 +684,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 675 | CONFIG_NFS_FS=y | 684 | CONFIG_NFS_FS=y |
| 676 | CONFIG_NFS_V3=y | 685 | CONFIG_NFS_V3=y |
| 677 | # CONFIG_NFS_V3_ACL is not set | 686 | # CONFIG_NFS_V3_ACL is not set |
| 678 | # CONFIG_NFS_DIRECTIO is not set | ||
| 679 | # CONFIG_NFSD is not set | 687 | # CONFIG_NFSD is not set |
| 680 | CONFIG_ROOT_NFS=y | 688 | CONFIG_ROOT_NFS=y |
| 681 | CONFIG_LOCKD=y | 689 | CONFIG_LOCKD=y |
| @@ -752,6 +760,7 @@ CONFIG_NLS_UTF8=y | |||
| 752 | # | 760 | # |
| 753 | # Library routines | 761 | # Library routines |
| 754 | # | 762 | # |
| 763 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 755 | # CONFIG_CRC_CCITT is not set | 764 | # CONFIG_CRC_CCITT is not set |
| 756 | # CONFIG_CRC16 is not set | 765 | # CONFIG_CRC16 is not set |
| 757 | # CONFIG_CRC_ITU_T is not set | 766 | # CONFIG_CRC_ITU_T is not set |
| @@ -763,6 +772,7 @@ CONFIG_PLIST=y | |||
| 763 | CONFIG_HAS_IOMEM=y | 772 | CONFIG_HAS_IOMEM=y |
| 764 | CONFIG_HAS_IOPORT=y | 773 | CONFIG_HAS_IOPORT=y |
| 765 | CONFIG_HAS_DMA=y | 774 | CONFIG_HAS_DMA=y |
| 775 | CONFIG_HAVE_LMB=y | ||
| 766 | 776 | ||
| 767 | # | 777 | # |
| 768 | # Kernel hacking | 778 | # Kernel hacking |
| @@ -770,6 +780,7 @@ CONFIG_HAS_DMA=y | |||
| 770 | # CONFIG_PRINTK_TIME is not set | 780 | # CONFIG_PRINTK_TIME is not set |
| 771 | CONFIG_ENABLE_WARN_DEPRECATED=y | 781 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 772 | CONFIG_ENABLE_MUST_CHECK=y | 782 | CONFIG_ENABLE_MUST_CHECK=y |
| 783 | CONFIG_FRAME_WARN=1024 | ||
| 773 | CONFIG_MAGIC_SYSRQ=y | 784 | CONFIG_MAGIC_SYSRQ=y |
| 774 | # CONFIG_UNUSED_SYMBOLS is not set | 785 | # CONFIG_UNUSED_SYMBOLS is not set |
| 775 | # CONFIG_DEBUG_FS is not set | 786 | # CONFIG_DEBUG_FS is not set |
| @@ -780,6 +791,7 @@ CONFIG_DEBUG_KERNEL=y | |||
| 780 | # CONFIG_SCHED_DEBUG is not set | 791 | # CONFIG_SCHED_DEBUG is not set |
| 781 | # CONFIG_SCHEDSTATS is not set | 792 | # CONFIG_SCHEDSTATS is not set |
| 782 | # CONFIG_TIMER_STATS is not set | 793 | # CONFIG_TIMER_STATS is not set |
| 794 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 783 | # CONFIG_DEBUG_SLAB is not set | 795 | # CONFIG_DEBUG_SLAB is not set |
| 784 | # CONFIG_DEBUG_RT_MUTEXES is not set | 796 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 785 | # CONFIG_RT_MUTEX_TESTER is not set | 797 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -791,6 +803,7 @@ CONFIG_DEBUG_KERNEL=y | |||
| 791 | CONFIG_DEBUG_BUGVERBOSE=y | 803 | CONFIG_DEBUG_BUGVERBOSE=y |
| 792 | CONFIG_DEBUG_INFO=y | 804 | CONFIG_DEBUG_INFO=y |
| 793 | # CONFIG_DEBUG_VM is not set | 805 | # CONFIG_DEBUG_VM is not set |
| 806 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 794 | # CONFIG_DEBUG_LIST is not set | 807 | # CONFIG_DEBUG_LIST is not set |
| 795 | # CONFIG_DEBUG_SG is not set | 808 | # CONFIG_DEBUG_SG is not set |
| 796 | # CONFIG_BOOT_PRINTK_DELAY is not set | 809 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -802,6 +815,7 @@ CONFIG_DEBUG_INFO=y | |||
| 802 | # CONFIG_DEBUG_PAGEALLOC is not set | 815 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 803 | # CONFIG_DEBUGGER is not set | 816 | # CONFIG_DEBUGGER is not set |
| 804 | # CONFIG_KGDB_CONSOLE is not set | 817 | # CONFIG_KGDB_CONSOLE is not set |
| 818 | # CONFIG_IRQSTACKS is not set | ||
| 805 | CONFIG_BDI_SWITCH=y | 819 | CONFIG_BDI_SWITCH=y |
| 806 | # CONFIG_PPC_EARLY_DEBUG is not set | 820 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 807 | 821 | ||
| @@ -811,45 +825,75 @@ CONFIG_BDI_SWITCH=y | |||
| 811 | # CONFIG_KEYS is not set | 825 | # CONFIG_KEYS is not set |
| 812 | # CONFIG_SECURITY is not set | 826 | # CONFIG_SECURITY is not set |
| 813 | CONFIG_CRYPTO=y | 827 | CONFIG_CRYPTO=y |
| 828 | |||
| 829 | # | ||
| 830 | # Crypto core or helper | ||
| 831 | # | ||
| 814 | CONFIG_CRYPTO_ALGAPI=y | 832 | CONFIG_CRYPTO_ALGAPI=y |
| 815 | CONFIG_CRYPTO_BLKCIPHER=y | 833 | CONFIG_CRYPTO_BLKCIPHER=y |
| 816 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 817 | CONFIG_CRYPTO_MANAGER=y | 834 | CONFIG_CRYPTO_MANAGER=y |
| 818 | # CONFIG_CRYPTO_HMAC is not set | ||
| 819 | # CONFIG_CRYPTO_NULL is not set | 835 | # CONFIG_CRYPTO_NULL is not set |
| 836 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 837 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 838 | |||
| 839 | # | ||
| 840 | # Authenticated Encryption with Associated Data | ||
| 841 | # | ||
| 842 | # CONFIG_CRYPTO_CCM is not set | ||
| 843 | # CONFIG_CRYPTO_GCM is not set | ||
| 844 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 845 | |||
| 846 | # | ||
| 847 | # Block modes | ||
| 848 | # | ||
| 849 | CONFIG_CRYPTO_CBC=y | ||
| 850 | # CONFIG_CRYPTO_CTR is not set | ||
| 851 | # CONFIG_CRYPTO_CTS is not set | ||
| 852 | CONFIG_CRYPTO_ECB=y | ||
| 853 | CONFIG_CRYPTO_PCBC=y | ||
| 854 | |||
| 855 | # | ||
| 856 | # Hash modes | ||
| 857 | # | ||
| 858 | # CONFIG_CRYPTO_HMAC is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Digest | ||
| 862 | # | ||
| 863 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 820 | # CONFIG_CRYPTO_MD4 is not set | 864 | # CONFIG_CRYPTO_MD4 is not set |
| 821 | CONFIG_CRYPTO_MD5=y | 865 | CONFIG_CRYPTO_MD5=y |
| 866 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 822 | # CONFIG_CRYPTO_SHA1 is not set | 867 | # CONFIG_CRYPTO_SHA1 is not set |
| 823 | # CONFIG_CRYPTO_SHA256 is not set | 868 | # CONFIG_CRYPTO_SHA256 is not set |
| 824 | # CONFIG_CRYPTO_SHA512 is not set | 869 | # CONFIG_CRYPTO_SHA512 is not set |
| 825 | # CONFIG_CRYPTO_WP512 is not set | ||
| 826 | # CONFIG_CRYPTO_TGR192 is not set | 870 | # CONFIG_CRYPTO_TGR192 is not set |
| 827 | CONFIG_CRYPTO_ECB=y | 871 | # CONFIG_CRYPTO_WP512 is not set |
| 828 | CONFIG_CRYPTO_CBC=y | 872 | |
| 829 | CONFIG_CRYPTO_PCBC=y | 873 | # |
| 830 | # CONFIG_CRYPTO_CTR is not set | 874 | # Ciphers |
| 831 | # CONFIG_CRYPTO_GCM is not set | 875 | # |
| 832 | # CONFIG_CRYPTO_CCM is not set | ||
| 833 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 834 | CONFIG_CRYPTO_DES=y | ||
| 835 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 836 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 837 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 838 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 839 | # CONFIG_CRYPTO_AES is not set | 876 | # CONFIG_CRYPTO_AES is not set |
| 877 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 878 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 840 | # CONFIG_CRYPTO_CAST5 is not set | 881 | # CONFIG_CRYPTO_CAST5 is not set |
| 841 | # CONFIG_CRYPTO_CAST6 is not set | 882 | # CONFIG_CRYPTO_CAST6 is not set |
| 842 | # CONFIG_CRYPTO_TEA is not set | 883 | CONFIG_CRYPTO_DES=y |
| 843 | # CONFIG_CRYPTO_ARC4 is not set | 884 | # CONFIG_CRYPTO_FCRYPT is not set |
| 844 | # CONFIG_CRYPTO_KHAZAD is not set | 885 | # CONFIG_CRYPTO_KHAZAD is not set |
| 845 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 846 | # CONFIG_CRYPTO_SEED is not set | 886 | # CONFIG_CRYPTO_SEED is not set |
| 887 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 888 | # CONFIG_CRYPTO_TEA is not set | ||
| 889 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 890 | |||
| 891 | # | ||
| 892 | # Compression | ||
| 893 | # | ||
| 847 | # CONFIG_CRYPTO_DEFLATE is not set | 894 | # CONFIG_CRYPTO_DEFLATE is not set |
| 848 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 849 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 850 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 851 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 852 | # CONFIG_CRYPTO_LZO is not set | 895 | # CONFIG_CRYPTO_LZO is not set |
| 853 | # CONFIG_CRYPTO_HW is not set | 896 | # CONFIG_CRYPTO_HW is not set |
| 854 | # CONFIG_PPC_CLOCK is not set | 897 | # CONFIG_PPC_CLOCK is not set |
| 855 | CONFIG_PPC_LIB_RHEAP=y | 898 | CONFIG_PPC_LIB_RHEAP=y |
| 899 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index 125b4764aadd..ac72b48542dc 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:10 2008 | 4 | # Mon Jun 9 08:52:09 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -108,6 +110,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 110 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 111 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 112 | CONFIG_HAVE_KRETPROBES=y |
| 113 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 114 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
| 113 | # CONFIG_TINY_SHMEM is not set | 116 | # CONFIG_TINY_SHMEM is not set |
| @@ -212,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -234,6 +239,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_QSPAN is not set | 239 | # CONFIG_PCI_QSPAN is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 243 | ||
| 238 | # | 244 | # |
| 239 | # Advanced setup | 245 | # Advanced setup |
| @@ -243,13 +249,13 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 249 | # |
| 244 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 245 | # | 251 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0x80000000 | 256 | CONFIG_TASK_SIZE=0x80000000 |
| 250 | CONFIG_CONSISTENT_START=0xfd000000 | 257 | CONFIG_CONSISTENT_START=0xfd000000 |
| 251 | CONFIG_CONSISTENT_SIZE=0x00200000 | 258 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 252 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 253 | 259 | ||
| 254 | # | 260 | # |
| 255 | # Networking | 261 | # Networking |
| @@ -292,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 292 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 293 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 294 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 295 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 296 | # CONFIG_INET6_TUNNEL is not set | ||
| 297 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 298 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 299 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -481,6 +485,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 481 | # | 485 | # |
| 482 | # CONFIG_WLAN_PRE80211 is not set | 486 | # CONFIG_WLAN_PRE80211 is not set |
| 483 | # CONFIG_WLAN_80211 is not set | 487 | # CONFIG_WLAN_80211 is not set |
| 488 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 484 | # CONFIG_WAN is not set | 489 | # CONFIG_WAN is not set |
| 485 | # CONFIG_PPP is not set | 490 | # CONFIG_PPP is not set |
| 486 | # CONFIG_SLIP is not set | 491 | # CONFIG_SLIP is not set |
| @@ -505,6 +510,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 505 | # Character devices | 510 | # Character devices |
| 506 | # | 511 | # |
| 507 | # CONFIG_VT is not set | 512 | # CONFIG_VT is not set |
| 513 | CONFIG_DEVKMEM=y | ||
| 508 | # CONFIG_SERIAL_NONSTANDARD is not set | 514 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 509 | 515 | ||
| 510 | # | 516 | # |
| @@ -537,12 +543,7 @@ CONFIG_GEN_RTC=y | |||
| 537 | # CONFIG_RAW_DRIVER is not set | 543 | # CONFIG_RAW_DRIVER is not set |
| 538 | # CONFIG_TCG_TPM is not set | 544 | # CONFIG_TCG_TPM is not set |
| 539 | # CONFIG_I2C is not set | 545 | # CONFIG_I2C is not set |
| 540 | |||
| 541 | # | ||
| 542 | # SPI support | ||
| 543 | # | ||
| 544 | # CONFIG_SPI is not set | 546 | # CONFIG_SPI is not set |
| 545 | # CONFIG_SPI_MASTER is not set | ||
| 546 | # CONFIG_W1 is not set | 547 | # CONFIG_W1 is not set |
| 547 | # CONFIG_POWER_SUPPLY is not set | 548 | # CONFIG_POWER_SUPPLY is not set |
| 548 | # CONFIG_HWMON is not set | 549 | # CONFIG_HWMON is not set |
| @@ -559,12 +560,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 559 | # Multifunction device drivers | 560 | # Multifunction device drivers |
| 560 | # | 561 | # |
| 561 | # CONFIG_MFD_SM501 is not set | 562 | # CONFIG_MFD_SM501 is not set |
| 563 | # CONFIG_HTC_PASIC3 is not set | ||
| 562 | 564 | ||
| 563 | # | 565 | # |
| 564 | # Multimedia devices | 566 | # Multimedia devices |
| 565 | # | 567 | # |
| 568 | |||
| 569 | # | ||
| 570 | # Multimedia core support | ||
| 571 | # | ||
| 566 | # CONFIG_VIDEO_DEV is not set | 572 | # CONFIG_VIDEO_DEV is not set |
| 567 | # CONFIG_DVB_CORE is not set | 573 | # CONFIG_DVB_CORE is not set |
| 574 | # CONFIG_VIDEO_MEDIA is not set | ||
| 575 | |||
| 576 | # | ||
| 577 | # Multimedia drivers | ||
| 578 | # | ||
| 568 | CONFIG_DAB=y | 579 | CONFIG_DAB=y |
| 569 | 580 | ||
| 570 | # | 581 | # |
| @@ -588,13 +599,10 @@ CONFIG_DAB=y | |||
| 588 | # CONFIG_MMC is not set | 599 | # CONFIG_MMC is not set |
| 589 | # CONFIG_MEMSTICK is not set | 600 | # CONFIG_MEMSTICK is not set |
| 590 | # CONFIG_NEW_LEDS is not set | 601 | # CONFIG_NEW_LEDS is not set |
| 602 | # CONFIG_ACCESSIBILITY is not set | ||
| 591 | # CONFIG_EDAC is not set | 603 | # CONFIG_EDAC is not set |
| 592 | # CONFIG_RTC_CLASS is not set | 604 | # CONFIG_RTC_CLASS is not set |
| 593 | # CONFIG_DMADEVICES is not set | 605 | # CONFIG_DMADEVICES is not set |
| 594 | |||
| 595 | # | ||
| 596 | # Userspace I/O | ||
| 597 | # | ||
| 598 | # CONFIG_UIO is not set | 606 | # CONFIG_UIO is not set |
| 599 | 607 | ||
| 600 | # | 608 | # |
| @@ -607,7 +615,6 @@ CONFIG_DAB=y | |||
| 607 | # CONFIG_JFS_FS is not set | 615 | # CONFIG_JFS_FS is not set |
| 608 | # CONFIG_FS_POSIX_ACL is not set | 616 | # CONFIG_FS_POSIX_ACL is not set |
| 609 | # CONFIG_XFS_FS is not set | 617 | # CONFIG_XFS_FS is not set |
| 610 | # CONFIG_GFS2_FS is not set | ||
| 611 | # CONFIG_OCFS2_FS is not set | 618 | # CONFIG_OCFS2_FS is not set |
| 612 | # CONFIG_DNOTIFY is not set | 619 | # CONFIG_DNOTIFY is not set |
| 613 | # CONFIG_INOTIFY is not set | 620 | # CONFIG_INOTIFY is not set |
| @@ -665,7 +672,6 @@ CONFIG_NFS_FS=y | |||
| 665 | CONFIG_NFS_V3=y | 672 | CONFIG_NFS_V3=y |
| 666 | # CONFIG_NFS_V3_ACL is not set | 673 | # CONFIG_NFS_V3_ACL is not set |
| 667 | # CONFIG_NFS_V4 is not set | 674 | # CONFIG_NFS_V4 is not set |
| 668 | # CONFIG_NFS_DIRECTIO is not set | ||
| 669 | # CONFIG_NFSD is not set | 675 | # CONFIG_NFSD is not set |
| 670 | CONFIG_ROOT_NFS=y | 676 | CONFIG_ROOT_NFS=y |
| 671 | CONFIG_LOCKD=y | 677 | CONFIG_LOCKD=y |
| @@ -708,6 +714,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 708 | # | 714 | # |
| 709 | # Library routines | 715 | # Library routines |
| 710 | # | 716 | # |
| 717 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 711 | # CONFIG_CRC_CCITT is not set | 718 | # CONFIG_CRC_CCITT is not set |
| 712 | # CONFIG_CRC16 is not set | 719 | # CONFIG_CRC16 is not set |
| 713 | # CONFIG_CRC_ITU_T is not set | 720 | # CONFIG_CRC_ITU_T is not set |
| @@ -718,6 +725,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 718 | CONFIG_HAS_IOMEM=y | 725 | CONFIG_HAS_IOMEM=y |
| 719 | CONFIG_HAS_IOPORT=y | 726 | CONFIG_HAS_IOPORT=y |
| 720 | CONFIG_HAS_DMA=y | 727 | CONFIG_HAS_DMA=y |
| 728 | CONFIG_HAVE_LMB=y | ||
| 721 | 729 | ||
| 722 | # | 730 | # |
| 723 | # Kernel hacking | 731 | # Kernel hacking |
| @@ -725,6 +733,7 @@ CONFIG_HAS_DMA=y | |||
| 725 | # CONFIG_PRINTK_TIME is not set | 733 | # CONFIG_PRINTK_TIME is not set |
| 726 | CONFIG_ENABLE_WARN_DEPRECATED=y | 734 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 727 | CONFIG_ENABLE_MUST_CHECK=y | 735 | CONFIG_ENABLE_MUST_CHECK=y |
| 736 | CONFIG_FRAME_WARN=1024 | ||
| 728 | CONFIG_MAGIC_SYSRQ=y | 737 | CONFIG_MAGIC_SYSRQ=y |
| 729 | # CONFIG_UNUSED_SYMBOLS is not set | 738 | # CONFIG_UNUSED_SYMBOLS is not set |
| 730 | # CONFIG_DEBUG_FS is not set | 739 | # CONFIG_DEBUG_FS is not set |
| @@ -735,6 +744,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 735 | CONFIG_SCHED_DEBUG=y | 744 | CONFIG_SCHED_DEBUG=y |
| 736 | # CONFIG_SCHEDSTATS is not set | 745 | # CONFIG_SCHEDSTATS is not set |
| 737 | # CONFIG_TIMER_STATS is not set | 746 | # CONFIG_TIMER_STATS is not set |
| 747 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 738 | # CONFIG_SLUB_DEBUG_ON is not set | 748 | # CONFIG_SLUB_DEBUG_ON is not set |
| 739 | # CONFIG_SLUB_STATS is not set | 749 | # CONFIG_SLUB_STATS is not set |
| 740 | # CONFIG_DEBUG_SPINLOCK is not set | 750 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -745,6 +755,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 745 | CONFIG_DEBUG_BUGVERBOSE=y | 755 | CONFIG_DEBUG_BUGVERBOSE=y |
| 746 | CONFIG_DEBUG_INFO=y | 756 | CONFIG_DEBUG_INFO=y |
| 747 | # CONFIG_DEBUG_VM is not set | 757 | # CONFIG_DEBUG_VM is not set |
| 758 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 748 | # CONFIG_DEBUG_LIST is not set | 759 | # CONFIG_DEBUG_LIST is not set |
| 749 | # CONFIG_DEBUG_SG is not set | 760 | # CONFIG_DEBUG_SG is not set |
| 750 | # CONFIG_BOOT_PRINTK_DELAY is not set | 761 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -755,6 +766,7 @@ CONFIG_DEBUG_INFO=y | |||
| 755 | # CONFIG_DEBUG_STACK_USAGE is not set | 766 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 756 | # CONFIG_DEBUG_PAGEALLOC is not set | 767 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 757 | # CONFIG_DEBUGGER is not set | 768 | # CONFIG_DEBUGGER is not set |
| 769 | # CONFIG_IRQSTACKS is not set | ||
| 758 | # CONFIG_BDI_SWITCH is not set | 770 | # CONFIG_BDI_SWITCH is not set |
| 759 | # CONFIG_PPC_EARLY_DEBUG is not set | 771 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 760 | 772 | ||
| @@ -767,3 +779,4 @@ CONFIG_DEBUG_INFO=y | |||
| 767 | # CONFIG_CRYPTO is not set | 779 | # CONFIG_CRYPTO is not set |
| 768 | # CONFIG_PPC_CLOCK is not set | 780 | # CONFIG_PPC_CLOCK is not set |
| 769 | CONFIG_PPC_LIB_RHEAP=y | 781 | CONFIG_PPC_LIB_RHEAP=y |
| 782 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index db34909831a2..0ccc6e493dcb 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_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.26-rc3 | 3 | # Linux kernel version: 2.6.26-rc6 |
| 4 | # Tue May 20 20:01:18 2008 | 4 | # Mon Jun 16 21:08:31 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -597,7 +597,61 @@ CONFIG_ATA=y | |||
| 597 | CONFIG_SATA_PMP=y | 597 | CONFIG_SATA_PMP=y |
| 598 | # CONFIG_SATA_AHCI is not set | 598 | # CONFIG_SATA_AHCI is not set |
| 599 | # CONFIG_SATA_SIL24 is not set | 599 | # CONFIG_SATA_SIL24 is not set |
| 600 | # CONFIG_ATA_SFF is not set | 600 | CONFIG_ATA_SFF=y |
| 601 | CONFIG_SATA_SVW=y | ||
| 602 | # CONFIG_ATA_PIIX is not set | ||
| 603 | # CONFIG_SATA_MV is not set | ||
| 604 | # CONFIG_SATA_NV is not set | ||
| 605 | # CONFIG_PDC_ADMA is not set | ||
| 606 | # CONFIG_SATA_QSTOR is not set | ||
| 607 | # CONFIG_SATA_PROMISE is not set | ||
| 608 | # CONFIG_SATA_SX4 is not set | ||
| 609 | # CONFIG_SATA_SIL is not set | ||
| 610 | # CONFIG_SATA_SIS is not set | ||
| 611 | # CONFIG_SATA_ULI is not set | ||
| 612 | # CONFIG_SATA_VIA is not set | ||
| 613 | # CONFIG_SATA_VITESSE is not set | ||
| 614 | # CONFIG_SATA_INIC162X is not set | ||
| 615 | # CONFIG_PATA_ALI is not set | ||
| 616 | # CONFIG_PATA_AMD is not set | ||
| 617 | # CONFIG_PATA_ARTOP is not set | ||
| 618 | # CONFIG_PATA_ATIIXP is not set | ||
| 619 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 620 | # CONFIG_PATA_CMD64X is not set | ||
| 621 | # CONFIG_PATA_CS5520 is not set | ||
| 622 | # CONFIG_PATA_CS5530 is not set | ||
| 623 | # CONFIG_PATA_CYPRESS is not set | ||
| 624 | # CONFIG_PATA_EFAR is not set | ||
| 625 | # CONFIG_ATA_GENERIC is not set | ||
| 626 | # CONFIG_PATA_HPT366 is not set | ||
| 627 | # CONFIG_PATA_HPT37X is not set | ||
| 628 | # CONFIG_PATA_HPT3X2N is not set | ||
| 629 | # CONFIG_PATA_HPT3X3 is not set | ||
| 630 | # CONFIG_PATA_IT821X is not set | ||
| 631 | # CONFIG_PATA_IT8213 is not set | ||
| 632 | # CONFIG_PATA_JMICRON is not set | ||
| 633 | # CONFIG_PATA_TRIFLEX is not set | ||
| 634 | # CONFIG_PATA_MARVELL is not set | ||
| 635 | # CONFIG_PATA_MPIIX is not set | ||
| 636 | # CONFIG_PATA_OLDPIIX is not set | ||
| 637 | # CONFIG_PATA_NETCELL is not set | ||
| 638 | # CONFIG_PATA_NINJA32 is not set | ||
| 639 | # CONFIG_PATA_NS87410 is not set | ||
| 640 | # CONFIG_PATA_NS87415 is not set | ||
| 641 | # CONFIG_PATA_OPTI is not set | ||
| 642 | # CONFIG_PATA_OPTIDMA is not set | ||
| 643 | # CONFIG_PATA_PDC_OLD is not set | ||
| 644 | # CONFIG_PATA_RADISYS is not set | ||
| 645 | # CONFIG_PATA_RZ1000 is not set | ||
| 646 | # CONFIG_PATA_SC1200 is not set | ||
| 647 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 648 | # CONFIG_PATA_PDC2027X is not set | ||
| 649 | # CONFIG_PATA_SIL680 is not set | ||
| 650 | # CONFIG_PATA_SIS is not set | ||
| 651 | # CONFIG_PATA_VIA is not set | ||
| 652 | # CONFIG_PATA_WINBOND is not set | ||
| 653 | # CONFIG_PATA_PLATFORM is not set | ||
| 654 | # CONFIG_PATA_SCH is not set | ||
| 601 | CONFIG_MD=y | 655 | CONFIG_MD=y |
| 602 | CONFIG_BLK_DEV_MD=y | 656 | CONFIG_BLK_DEV_MD=y |
| 603 | CONFIG_MD_LINEAR=y | 657 | CONFIG_MD_LINEAR=y |
| @@ -1230,6 +1284,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1230 | # | 1284 | # |
| 1231 | CONFIG_USB_ACM=m | 1285 | CONFIG_USB_ACM=m |
| 1232 | CONFIG_USB_PRINTER=y | 1286 | CONFIG_USB_PRINTER=y |
| 1287 | # CONFIG_USB_WDM is not set | ||
| 1233 | 1288 | ||
| 1234 | # | 1289 | # |
| 1235 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1290 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1345,6 +1400,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1345 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1400 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1346 | # CONFIG_USB_IOWARRIOR is not set | 1401 | # CONFIG_USB_IOWARRIOR is not set |
| 1347 | # CONFIG_USB_TEST is not set | 1402 | # CONFIG_USB_TEST is not set |
| 1403 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1348 | # CONFIG_USB_GADGET is not set | 1404 | # CONFIG_USB_GADGET is not set |
| 1349 | # CONFIG_MMC is not set | 1405 | # CONFIG_MMC is not set |
| 1350 | # CONFIG_MEMSTICK is not set | 1406 | # CONFIG_MEMSTICK is not set |
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 22a943afc3c0..48434c2c7628 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:10 2008 | 4 | # Mon Jun 9 08:52:10 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -91,6 +93,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 91 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 92 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 94 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 95 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -118,12 +121,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 118 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 119 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 121 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
| 122 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 123 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
| 124 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
| 125 | CONFIG_BASE_SMALL=0 | 129 | CONFIG_BASE_SMALL=0 |
| 126 | CONFIG_MODULES=y | 130 | CONFIG_MODULES=y |
| 131 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 127 | CONFIG_MODULE_UNLOAD=y | 132 | CONFIG_MODULE_UNLOAD=y |
| 128 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 133 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 129 | # CONFIG_MODVERSIONS is not set | 134 | # CONFIG_MODVERSIONS is not set |
| @@ -223,11 +228,13 @@ CONFIG_FLATMEM=y | |||
| 223 | CONFIG_FLAT_NODE_MEM_MAP=y | 228 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 224 | # CONFIG_SPARSEMEM_STATIC is not set | 229 | # CONFIG_SPARSEMEM_STATIC is not set |
| 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 231 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 227 | # CONFIG_RESOURCES_64BIT is not set | 233 | # CONFIG_RESOURCES_64BIT is not set |
| 228 | CONFIG_ZONE_DMA_FLAG=1 | 234 | CONFIG_ZONE_DMA_FLAG=1 |
| 229 | CONFIG_BOUNCE=y | 235 | CONFIG_BOUNCE=y |
| 230 | CONFIG_VIRT_TO_BUS=y | 236 | CONFIG_VIRT_TO_BUS=y |
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 231 | CONFIG_PROC_DEVICETREE=y | 238 | CONFIG_PROC_DEVICETREE=y |
| 232 | # CONFIG_CMDLINE_BOOL is not set | 239 | # CONFIG_CMDLINE_BOOL is not set |
| 233 | # CONFIG_PM is not set | 240 | # CONFIG_PM is not set |
| @@ -251,6 +258,7 @@ CONFIG_PCI_LEGACY=y | |||
| 251 | # CONFIG_PCI_DEBUG is not set | 258 | # CONFIG_PCI_DEBUG is not set |
| 252 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
| 253 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
| 261 | # CONFIG_HAS_RAPIDIO is not set | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Advanced setup | 264 | # Advanced setup |
| @@ -260,11 +268,11 @@ CONFIG_PCI_LEGACY=y | |||
| 260 | # | 268 | # |
| 261 | # Default settings for advanced configuration options are used | 269 | # Default settings for advanced configuration options are used |
| 262 | # | 270 | # |
| 263 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 264 | CONFIG_LOWMEM_SIZE=0x30000000 | 271 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 265 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
| 274 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 266 | CONFIG_TASK_SIZE=0xc0000000 | 275 | CONFIG_TASK_SIZE=0xc0000000 |
| 267 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 268 | 276 | ||
| 269 | # | 277 | # |
| 270 | # Networking | 278 | # Networking |
| @@ -313,8 +321,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 313 | # CONFIG_TCP_MD5SIG is not set | 321 | # CONFIG_TCP_MD5SIG is not set |
| 314 | # CONFIG_IP_VS is not set | 322 | # CONFIG_IP_VS is not set |
| 315 | # CONFIG_IPV6 is not set | 323 | # CONFIG_IPV6 is not set |
| 316 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 317 | # CONFIG_INET6_TUNNEL is not set | ||
| 318 | # CONFIG_NETWORK_SECMARK is not set | 324 | # CONFIG_NETWORK_SECMARK is not set |
| 319 | CONFIG_NETFILTER=y | 325 | CONFIG_NETFILTER=y |
| 320 | # CONFIG_NETFILTER_DEBUG is not set | 326 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -329,6 +335,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 329 | # CONFIG_NF_CT_ACCT is not set | 335 | # CONFIG_NF_CT_ACCT is not set |
| 330 | # CONFIG_NF_CONNTRACK_MARK is not set | 336 | # CONFIG_NF_CONNTRACK_MARK is not set |
| 331 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 337 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
| 338 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
| 332 | CONFIG_NF_CT_PROTO_GRE=m | 339 | CONFIG_NF_CT_PROTO_GRE=m |
| 333 | CONFIG_NF_CT_PROTO_SCTP=m | 340 | CONFIG_NF_CT_PROTO_SCTP=m |
| 334 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 341 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
| @@ -407,6 +414,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m | |||
| 407 | # CONFIG_IP_NF_TARGET_NETMAP is not set | 414 | # CONFIG_IP_NF_TARGET_NETMAP is not set |
| 408 | # CONFIG_NF_NAT_SNMP_BASIC is not set | 415 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
| 409 | CONFIG_NF_NAT_PROTO_GRE=m | 416 | CONFIG_NF_NAT_PROTO_GRE=m |
| 417 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
| 410 | CONFIG_NF_NAT_FTP=m | 418 | CONFIG_NF_NAT_FTP=m |
| 411 | CONFIG_NF_NAT_IRC=m | 419 | CONFIG_NF_NAT_IRC=m |
| 412 | CONFIG_NF_NAT_TFTP=m | 420 | CONFIG_NF_NAT_TFTP=m |
| @@ -459,8 +467,6 @@ CONFIG_IEEE80211_DEBUG=y | |||
| 459 | CONFIG_IEEE80211_CRYPT_WEP=m | 467 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 460 | CONFIG_IEEE80211_CRYPT_CCMP=m | 468 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 461 | CONFIG_IEEE80211_CRYPT_TKIP=m | 469 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 462 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 463 | CONFIG_IEEE80211_SOFTMAC_DEBUG=y | ||
| 464 | # CONFIG_RFKILL is not set | 470 | # CONFIG_RFKILL is not set |
| 465 | # CONFIG_NET_9P is not set | 471 | # CONFIG_NET_9P is not set |
| 466 | 472 | ||
| @@ -486,6 +492,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 486 | # CONFIG_MTD_REDBOOT_PARTS is not set | 492 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 487 | # CONFIG_MTD_CMDLINE_PARTS is not set | 493 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 488 | # CONFIG_MTD_OF_PARTS is not set | 494 | # CONFIG_MTD_OF_PARTS is not set |
| 495 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 489 | 496 | ||
| 490 | # | 497 | # |
| 491 | # User Modules And Translation Layers | 498 | # User Modules And Translation Layers |
| @@ -565,6 +572,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 565 | # | 572 | # |
| 566 | # CONFIG_MTD_UBI is not set | 573 | # CONFIG_MTD_UBI is not set |
| 567 | CONFIG_OF_DEVICE=y | 574 | CONFIG_OF_DEVICE=y |
| 575 | CONFIG_OF_I2C=y | ||
| 568 | # CONFIG_PARPORT is not set | 576 | # CONFIG_PARPORT is not set |
| 569 | CONFIG_BLK_DEV=y | 577 | CONFIG_BLK_DEV=y |
| 570 | # CONFIG_BLK_DEV_FD is not set | 578 | # CONFIG_BLK_DEV_FD is not set |
| @@ -670,7 +678,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 670 | # CONFIG_SCSI_SRP is not set | 678 | # CONFIG_SCSI_SRP is not set |
| 671 | CONFIG_ATA=y | 679 | CONFIG_ATA=y |
| 672 | # CONFIG_ATA_NONSTANDARD is not set | 680 | # CONFIG_ATA_NONSTANDARD is not set |
| 681 | CONFIG_SATA_PMP=y | ||
| 673 | # CONFIG_SATA_AHCI is not set | 682 | # CONFIG_SATA_AHCI is not set |
| 683 | # CONFIG_SATA_SIL24 is not set | ||
| 684 | # CONFIG_SATA_FSL is not set | ||
| 685 | CONFIG_ATA_SFF=y | ||
| 674 | # CONFIG_SATA_SVW is not set | 686 | # CONFIG_SATA_SVW is not set |
| 675 | # CONFIG_ATA_PIIX is not set | 687 | # CONFIG_ATA_PIIX is not set |
| 676 | # CONFIG_SATA_MV is not set | 688 | # CONFIG_SATA_MV is not set |
| @@ -680,13 +692,11 @@ CONFIG_ATA=y | |||
| 680 | # CONFIG_SATA_PROMISE is not set | 692 | # CONFIG_SATA_PROMISE is not set |
| 681 | # CONFIG_SATA_SX4 is not set | 693 | # CONFIG_SATA_SX4 is not set |
| 682 | # CONFIG_SATA_SIL is not set | 694 | # CONFIG_SATA_SIL is not set |
| 683 | # CONFIG_SATA_SIL24 is not set | ||
| 684 | # CONFIG_SATA_SIS is not set | 695 | # CONFIG_SATA_SIS is not set |
| 685 | # CONFIG_SATA_ULI is not set | 696 | # CONFIG_SATA_ULI is not set |
| 686 | # CONFIG_SATA_VIA is not set | 697 | # CONFIG_SATA_VIA is not set |
| 687 | # CONFIG_SATA_VITESSE is not set | 698 | # CONFIG_SATA_VITESSE is not set |
| 688 | # CONFIG_SATA_INIC162X is not set | 699 | # CONFIG_SATA_INIC162X is not set |
| 689 | # CONFIG_SATA_FSL is not set | ||
| 690 | # CONFIG_PATA_ALI is not set | 700 | # CONFIG_PATA_ALI is not set |
| 691 | # CONFIG_PATA_AMD is not set | 701 | # CONFIG_PATA_AMD is not set |
| 692 | # CONFIG_PATA_ARTOP is not set | 702 | # CONFIG_PATA_ARTOP is not set |
| @@ -726,6 +736,7 @@ CONFIG_PATA_SIL680=y | |||
| 726 | # CONFIG_PATA_VIA is not set | 736 | # CONFIG_PATA_VIA is not set |
| 727 | # CONFIG_PATA_WINBOND is not set | 737 | # CONFIG_PATA_WINBOND is not set |
| 728 | # CONFIG_PATA_PLATFORM is not set | 738 | # CONFIG_PATA_PLATFORM is not set |
| 739 | # CONFIG_PATA_SCH is not set | ||
| 729 | # CONFIG_MD is not set | 740 | # CONFIG_MD is not set |
| 730 | # CONFIG_FUSION is not set | 741 | # CONFIG_FUSION is not set |
| 731 | 742 | ||
| @@ -785,7 +796,6 @@ CONFIG_R8169=y | |||
| 785 | # CONFIG_SIS190 is not set | 796 | # CONFIG_SIS190 is not set |
| 786 | # CONFIG_SKGE is not set | 797 | # CONFIG_SKGE is not set |
| 787 | # CONFIG_SKY2 is not set | 798 | # CONFIG_SKY2 is not set |
| 788 | # CONFIG_SK98LIN is not set | ||
| 789 | # CONFIG_VIA_VELOCITY is not set | 799 | # CONFIG_VIA_VELOCITY is not set |
| 790 | # CONFIG_TIGON3 is not set | 800 | # CONFIG_TIGON3 is not set |
| 791 | # CONFIG_BNX2 is not set | 801 | # CONFIG_BNX2 is not set |
| @@ -805,6 +815,7 @@ CONFIG_NETDEV_10000=y | |||
| 805 | # CONFIG_MLX4_CORE is not set | 815 | # CONFIG_MLX4_CORE is not set |
| 806 | # CONFIG_TEHUTI is not set | 816 | # CONFIG_TEHUTI is not set |
| 807 | # CONFIG_BNX2X is not set | 817 | # CONFIG_BNX2X is not set |
| 818 | # CONFIG_SFC is not set | ||
| 808 | # CONFIG_TR is not set | 819 | # CONFIG_TR is not set |
| 809 | 820 | ||
| 810 | # | 821 | # |
| @@ -812,6 +823,7 @@ CONFIG_NETDEV_10000=y | |||
| 812 | # | 823 | # |
| 813 | # CONFIG_WLAN_PRE80211 is not set | 824 | # CONFIG_WLAN_PRE80211 is not set |
| 814 | # CONFIG_WLAN_80211 is not set | 825 | # CONFIG_WLAN_80211 is not set |
| 826 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 815 | 827 | ||
| 816 | # | 828 | # |
| 817 | # USB Network Adapters | 829 | # USB Network Adapters |
| @@ -886,6 +898,7 @@ CONFIG_VT=y | |||
| 886 | CONFIG_VT_CONSOLE=y | 898 | CONFIG_VT_CONSOLE=y |
| 887 | CONFIG_HW_CONSOLE=y | 899 | CONFIG_HW_CONSOLE=y |
| 888 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 900 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 901 | CONFIG_DEVKMEM=y | ||
| 889 | # CONFIG_SERIAL_NONSTANDARD is not set | 902 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 890 | # CONFIG_NOZOMI is not set | 903 | # CONFIG_NOZOMI is not set |
| 891 | 904 | ||
| @@ -913,7 +926,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 913 | # CONFIG_IPMI_HANDLER is not set | 926 | # CONFIG_IPMI_HANDLER is not set |
| 914 | CONFIG_HW_RANDOM=y | 927 | CONFIG_HW_RANDOM=y |
| 915 | # CONFIG_NVRAM is not set | 928 | # CONFIG_NVRAM is not set |
| 916 | # CONFIG_GEN_RTC is not set | ||
| 917 | # CONFIG_R3964 is not set | 929 | # CONFIG_R3964 is not set |
| 918 | # CONFIG_APPLICOM is not set | 930 | # CONFIG_APPLICOM is not set |
| 919 | # CONFIG_RAW_DRIVER is not set | 931 | # CONFIG_RAW_DRIVER is not set |
| @@ -924,13 +936,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 924 | CONFIG_I2C_CHARDEV=y | 936 | CONFIG_I2C_CHARDEV=y |
| 925 | 937 | ||
| 926 | # | 938 | # |
| 927 | # I2C Algorithms | ||
| 928 | # | ||
| 929 | # CONFIG_I2C_ALGOBIT is not set | ||
| 930 | # CONFIG_I2C_ALGOPCF is not set | ||
| 931 | # CONFIG_I2C_ALGOPCA is not set | ||
| 932 | |||
| 933 | # | ||
| 934 | # I2C Hardware Bus support | 939 | # I2C Hardware Bus support |
| 935 | # | 940 | # |
| 936 | # CONFIG_I2C_ALI1535 is not set | 941 | # CONFIG_I2C_ALI1535 is not set |
| @@ -957,6 +962,7 @@ CONFIG_I2C_MPC=y | |||
| 957 | # CONFIG_I2C_VIA is not set | 962 | # CONFIG_I2C_VIA is not set |
| 958 | # CONFIG_I2C_VIAPRO is not set | 963 | # CONFIG_I2C_VIAPRO is not set |
| 959 | # CONFIG_I2C_VOODOO3 is not set | 964 | # CONFIG_I2C_VOODOO3 is not set |
| 965 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 960 | 966 | ||
| 961 | # | 967 | # |
| 962 | # Miscellaneous I2C Chip support | 968 | # Miscellaneous I2C Chip support |
| @@ -966,19 +972,13 @@ CONFIG_SENSORS_EEPROM=m | |||
| 966 | # CONFIG_SENSORS_PCF8574 is not set | 972 | # CONFIG_SENSORS_PCF8574 is not set |
| 967 | # CONFIG_PCF8575 is not set | 973 | # CONFIG_PCF8575 is not set |
| 968 | # CONFIG_SENSORS_PCF8591 is not set | 974 | # CONFIG_SENSORS_PCF8591 is not set |
| 969 | # CONFIG_TPS65010 is not set | ||
| 970 | # CONFIG_SENSORS_MAX6875 is not set | 975 | # CONFIG_SENSORS_MAX6875 is not set |
| 971 | # CONFIG_SENSORS_TSL2550 is not set | 976 | # CONFIG_SENSORS_TSL2550 is not set |
| 972 | # CONFIG_I2C_DEBUG_CORE is not set | 977 | # CONFIG_I2C_DEBUG_CORE is not set |
| 973 | # CONFIG_I2C_DEBUG_ALGO is not set | 978 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 974 | # CONFIG_I2C_DEBUG_BUS is not set | 979 | # CONFIG_I2C_DEBUG_BUS is not set |
| 975 | # CONFIG_I2C_DEBUG_CHIP is not set | 980 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 976 | |||
| 977 | # | ||
| 978 | # SPI support | ||
| 979 | # | ||
| 980 | # CONFIG_SPI is not set | 981 | # CONFIG_SPI is not set |
| 981 | # CONFIG_SPI_MASTER is not set | ||
| 982 | # CONFIG_W1 is not set | 982 | # CONFIG_W1 is not set |
| 983 | # CONFIG_POWER_SUPPLY is not set | 983 | # CONFIG_POWER_SUPPLY is not set |
| 984 | CONFIG_HWMON=y | 984 | CONFIG_HWMON=y |
| @@ -1048,12 +1048,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1048 | # Multifunction device drivers | 1048 | # Multifunction device drivers |
| 1049 | # | 1049 | # |
| 1050 | # CONFIG_MFD_SM501 is not set | 1050 | # CONFIG_MFD_SM501 is not set |
| 1051 | # CONFIG_HTC_PASIC3 is not set | ||
| 1051 | 1052 | ||
| 1052 | # | 1053 | # |
| 1053 | # Multimedia devices | 1054 | # Multimedia devices |
| 1054 | # | 1055 | # |
| 1056 | |||
| 1057 | # | ||
| 1058 | # Multimedia core support | ||
| 1059 | # | ||
| 1055 | # CONFIG_VIDEO_DEV is not set | 1060 | # CONFIG_VIDEO_DEV is not set |
| 1056 | # CONFIG_DVB_CORE is not set | 1061 | # CONFIG_DVB_CORE is not set |
| 1062 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1063 | |||
| 1064 | # | ||
| 1065 | # Multimedia drivers | ||
| 1066 | # | ||
| 1057 | # CONFIG_DAB is not set | 1067 | # CONFIG_DAB is not set |
| 1058 | 1068 | ||
| 1059 | # | 1069 | # |
| @@ -1115,12 +1125,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1115 | # | 1125 | # |
| 1116 | # USB Host Controller Drivers | 1126 | # USB Host Controller Drivers |
| 1117 | # | 1127 | # |
| 1128 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1118 | CONFIG_USB_EHCI_HCD=y | 1129 | CONFIG_USB_EHCI_HCD=y |
| 1119 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1130 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1120 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1131 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1121 | # CONFIG_USB_EHCI_FSL is not set | 1132 | # CONFIG_USB_EHCI_FSL is not set |
| 1122 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1133 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1123 | # CONFIG_USB_ISP116X_HCD is not set | 1134 | # CONFIG_USB_ISP116X_HCD is not set |
| 1135 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1124 | CONFIG_USB_OHCI_HCD=y | 1136 | CONFIG_USB_OHCI_HCD=y |
| 1125 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1137 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1126 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1138 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1138,6 +1150,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1138 | # | 1150 | # |
| 1139 | # CONFIG_USB_ACM is not set | 1151 | # CONFIG_USB_ACM is not set |
| 1140 | CONFIG_USB_PRINTER=m | 1152 | CONFIG_USB_PRINTER=m |
| 1153 | # CONFIG_USB_WDM is not set | ||
| 1141 | 1154 | ||
| 1142 | # | 1155 | # |
| 1143 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1156 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1159,6 +1172,7 @@ CONFIG_USB_STORAGE=m | |||
| 1159 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1172 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1160 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1173 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1161 | # CONFIG_USB_STORAGE_KARMA is not set | 1174 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1175 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1162 | # CONFIG_USB_LIBUSUAL is not set | 1176 | # CONFIG_USB_LIBUSUAL is not set |
| 1163 | 1177 | ||
| 1164 | # | 1178 | # |
| @@ -1202,9 +1216,11 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1202 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1216 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
| 1203 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1217 | # CONFIG_USB_SERIAL_MOS7720 is not set |
| 1204 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1218 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1219 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 1205 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1220 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1206 | # CONFIG_USB_SERIAL_PL2303 is not set | 1221 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 1207 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1222 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1223 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
| 1208 | # CONFIG_USB_SERIAL_HP4X is not set | 1224 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1209 | # CONFIG_USB_SERIAL_SAFE is not set | 1225 | # CONFIG_USB_SERIAL_SAFE is not set |
| 1210 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1226 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
| @@ -1238,10 +1254,12 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1238 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1254 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1239 | # CONFIG_USB_IOWARRIOR is not set | 1255 | # CONFIG_USB_IOWARRIOR is not set |
| 1240 | # CONFIG_USB_TEST is not set | 1256 | # CONFIG_USB_TEST is not set |
| 1257 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1241 | # CONFIG_USB_GADGET is not set | 1258 | # CONFIG_USB_GADGET is not set |
| 1242 | # CONFIG_MMC is not set | 1259 | # CONFIG_MMC is not set |
| 1243 | # CONFIG_MEMSTICK is not set | 1260 | # CONFIG_MEMSTICK is not set |
| 1244 | # CONFIG_NEW_LEDS is not set | 1261 | # CONFIG_NEW_LEDS is not set |
| 1262 | # CONFIG_ACCESSIBILITY is not set | ||
| 1245 | # CONFIG_INFINIBAND is not set | 1263 | # CONFIG_INFINIBAND is not set |
| 1246 | # CONFIG_EDAC is not set | 1264 | # CONFIG_EDAC is not set |
| 1247 | CONFIG_RTC_LIB=y | 1265 | CONFIG_RTC_LIB=y |
| @@ -1293,11 +1311,8 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1293 | # | 1311 | # |
| 1294 | # on-CPU RTC drivers | 1312 | # on-CPU RTC drivers |
| 1295 | # | 1313 | # |
| 1314 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1296 | # CONFIG_DMADEVICES is not set | 1315 | # CONFIG_DMADEVICES is not set |
| 1297 | |||
| 1298 | # | ||
| 1299 | # Userspace I/O | ||
| 1300 | # | ||
| 1301 | # CONFIG_UIO is not set | 1316 | # CONFIG_UIO is not set |
| 1302 | 1317 | ||
| 1303 | # | 1318 | # |
| @@ -1318,10 +1333,9 @@ CONFIG_FS_MBCACHE=y | |||
| 1318 | CONFIG_FS_POSIX_ACL=y | 1333 | CONFIG_FS_POSIX_ACL=y |
| 1319 | CONFIG_XFS_FS=m | 1334 | CONFIG_XFS_FS=m |
| 1320 | # CONFIG_XFS_QUOTA is not set | 1335 | # CONFIG_XFS_QUOTA is not set |
| 1321 | # CONFIG_XFS_SECURITY is not set | ||
| 1322 | # CONFIG_XFS_POSIX_ACL is not set | 1336 | # CONFIG_XFS_POSIX_ACL is not set |
| 1323 | # CONFIG_XFS_RT is not set | 1337 | # CONFIG_XFS_RT is not set |
| 1324 | # CONFIG_GFS2_FS is not set | 1338 | # CONFIG_XFS_DEBUG is not set |
| 1325 | # CONFIG_OCFS2_FS is not set | 1339 | # CONFIG_OCFS2_FS is not set |
| 1326 | CONFIG_DNOTIFY=y | 1340 | CONFIG_DNOTIFY=y |
| 1327 | CONFIG_INOTIFY=y | 1341 | CONFIG_INOTIFY=y |
| @@ -1388,12 +1402,10 @@ CONFIG_NFS_FS=y | |||
| 1388 | CONFIG_NFS_V3=y | 1402 | CONFIG_NFS_V3=y |
| 1389 | CONFIG_NFS_V3_ACL=y | 1403 | CONFIG_NFS_V3_ACL=y |
| 1390 | CONFIG_NFS_V4=y | 1404 | CONFIG_NFS_V4=y |
| 1391 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1392 | CONFIG_NFSD=m | 1405 | CONFIG_NFSD=m |
| 1393 | CONFIG_NFSD_V3=y | 1406 | CONFIG_NFSD_V3=y |
| 1394 | # CONFIG_NFSD_V3_ACL is not set | 1407 | # CONFIG_NFSD_V3_ACL is not set |
| 1395 | # CONFIG_NFSD_V4 is not set | 1408 | # CONFIG_NFSD_V4 is not set |
| 1396 | CONFIG_NFSD_TCP=y | ||
| 1397 | CONFIG_ROOT_NFS=y | 1409 | CONFIG_ROOT_NFS=y |
| 1398 | CONFIG_LOCKD=y | 1410 | CONFIG_LOCKD=y |
| 1399 | CONFIG_LOCKD_V4=y | 1411 | CONFIG_LOCKD_V4=y |
| @@ -1467,9 +1479,10 @@ CONFIG_NLS_UTF8=m | |||
| 1467 | # Library routines | 1479 | # Library routines |
| 1468 | # | 1480 | # |
| 1469 | CONFIG_BITREVERSE=y | 1481 | CONFIG_BITREVERSE=y |
| 1482 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1470 | CONFIG_CRC_CCITT=m | 1483 | CONFIG_CRC_CCITT=m |
| 1471 | # CONFIG_CRC16 is not set | 1484 | # CONFIG_CRC16 is not set |
| 1472 | # CONFIG_CRC_ITU_T is not set | 1485 | CONFIG_CRC_ITU_T=m |
| 1473 | CONFIG_CRC32=y | 1486 | CONFIG_CRC32=y |
| 1474 | # CONFIG_CRC7 is not set | 1487 | # CONFIG_CRC7 is not set |
| 1475 | CONFIG_LIBCRC32C=m | 1488 | CONFIG_LIBCRC32C=m |
| @@ -1481,6 +1494,7 @@ CONFIG_PLIST=y | |||
| 1481 | CONFIG_HAS_IOMEM=y | 1494 | CONFIG_HAS_IOMEM=y |
| 1482 | CONFIG_HAS_IOPORT=y | 1495 | CONFIG_HAS_IOPORT=y |
| 1483 | CONFIG_HAS_DMA=y | 1496 | CONFIG_HAS_DMA=y |
| 1497 | CONFIG_HAVE_LMB=y | ||
| 1484 | 1498 | ||
| 1485 | # | 1499 | # |
| 1486 | # Kernel hacking | 1500 | # Kernel hacking |
| @@ -1488,6 +1502,7 @@ CONFIG_HAS_DMA=y | |||
| 1488 | # CONFIG_PRINTK_TIME is not set | 1502 | # CONFIG_PRINTK_TIME is not set |
| 1489 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1503 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1490 | CONFIG_ENABLE_MUST_CHECK=y | 1504 | CONFIG_ENABLE_MUST_CHECK=y |
| 1505 | CONFIG_FRAME_WARN=1024 | ||
| 1491 | CONFIG_MAGIC_SYSRQ=y | 1506 | CONFIG_MAGIC_SYSRQ=y |
| 1492 | # CONFIG_UNUSED_SYMBOLS is not set | 1507 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1493 | # CONFIG_DEBUG_FS is not set | 1508 | # CONFIG_DEBUG_FS is not set |
| @@ -1498,6 +1513,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1498 | CONFIG_SCHED_DEBUG=y | 1513 | CONFIG_SCHED_DEBUG=y |
| 1499 | # CONFIG_SCHEDSTATS is not set | 1514 | # CONFIG_SCHEDSTATS is not set |
| 1500 | # CONFIG_TIMER_STATS is not set | 1515 | # CONFIG_TIMER_STATS is not set |
| 1516 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1501 | # CONFIG_SLUB_DEBUG_ON is not set | 1517 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1502 | # CONFIG_SLUB_STATS is not set | 1518 | # CONFIG_SLUB_STATS is not set |
| 1503 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1519 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1510,6 +1526,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1510 | CONFIG_DEBUG_BUGVERBOSE=y | 1526 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1511 | # CONFIG_DEBUG_INFO is not set | 1527 | # CONFIG_DEBUG_INFO is not set |
| 1512 | # CONFIG_DEBUG_VM is not set | 1528 | # CONFIG_DEBUG_VM is not set |
| 1529 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1513 | # CONFIG_DEBUG_LIST is not set | 1530 | # CONFIG_DEBUG_LIST is not set |
| 1514 | # CONFIG_DEBUG_SG is not set | 1531 | # CONFIG_DEBUG_SG is not set |
| 1515 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1532 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1521,6 +1538,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1521 | # CONFIG_DEBUG_STACK_USAGE is not set | 1538 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1522 | # CONFIG_DEBUG_PAGEALLOC is not set | 1539 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1523 | # CONFIG_DEBUGGER is not set | 1540 | # CONFIG_DEBUGGER is not set |
| 1541 | # CONFIG_IRQSTACKS is not set | ||
| 1524 | # CONFIG_BDI_SWITCH is not set | 1542 | # CONFIG_BDI_SWITCH is not set |
| 1525 | # CONFIG_BOOTX_TEXT is not set | 1543 | # CONFIG_BOOTX_TEXT is not set |
| 1526 | # CONFIG_PPC_EARLY_DEBUG is not set | 1544 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1532,52 +1550,82 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1532 | # CONFIG_SECURITY is not set | 1550 | # CONFIG_SECURITY is not set |
| 1533 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1551 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1534 | CONFIG_CRYPTO=y | 1552 | CONFIG_CRYPTO=y |
| 1553 | |||
| 1554 | # | ||
| 1555 | # Crypto core or helper | ||
| 1556 | # | ||
| 1535 | CONFIG_CRYPTO_ALGAPI=y | 1557 | CONFIG_CRYPTO_ALGAPI=y |
| 1536 | CONFIG_CRYPTO_BLKCIPHER=y | 1558 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1537 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1538 | CONFIG_CRYPTO_MANAGER=y | 1559 | CONFIG_CRYPTO_MANAGER=y |
| 1560 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1561 | # CONFIG_CRYPTO_NULL is not set | ||
| 1562 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1563 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1564 | # CONFIG_CRYPTO_TEST is not set | ||
| 1565 | |||
| 1566 | # | ||
| 1567 | # Authenticated Encryption with Associated Data | ||
| 1568 | # | ||
| 1569 | # CONFIG_CRYPTO_CCM is not set | ||
| 1570 | # CONFIG_CRYPTO_GCM is not set | ||
| 1571 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1572 | |||
| 1573 | # | ||
| 1574 | # Block modes | ||
| 1575 | # | ||
| 1576 | CONFIG_CRYPTO_CBC=y | ||
| 1577 | # CONFIG_CRYPTO_CTR is not set | ||
| 1578 | # CONFIG_CRYPTO_CTS is not set | ||
| 1579 | CONFIG_CRYPTO_ECB=m | ||
| 1580 | # CONFIG_CRYPTO_LRW is not set | ||
| 1581 | CONFIG_CRYPTO_PCBC=m | ||
| 1582 | # CONFIG_CRYPTO_XTS is not set | ||
| 1583 | |||
| 1584 | # | ||
| 1585 | # Hash modes | ||
| 1586 | # | ||
| 1539 | # CONFIG_CRYPTO_HMAC is not set | 1587 | # CONFIG_CRYPTO_HMAC is not set |
| 1540 | # CONFIG_CRYPTO_XCBC is not set | 1588 | # CONFIG_CRYPTO_XCBC is not set |
| 1541 | # CONFIG_CRYPTO_NULL is not set | 1589 | |
| 1590 | # | ||
| 1591 | # Digest | ||
| 1592 | # | ||
| 1593 | CONFIG_CRYPTO_CRC32C=m | ||
| 1542 | CONFIG_CRYPTO_MD4=m | 1594 | CONFIG_CRYPTO_MD4=m |
| 1543 | CONFIG_CRYPTO_MD5=y | 1595 | CONFIG_CRYPTO_MD5=y |
| 1596 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1544 | CONFIG_CRYPTO_SHA1=m | 1597 | CONFIG_CRYPTO_SHA1=m |
| 1545 | # CONFIG_CRYPTO_SHA256 is not set | 1598 | # CONFIG_CRYPTO_SHA256 is not set |
| 1546 | # CONFIG_CRYPTO_SHA512 is not set | 1599 | # CONFIG_CRYPTO_SHA512 is not set |
| 1547 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1548 | # CONFIG_CRYPTO_TGR192 is not set | 1600 | # CONFIG_CRYPTO_TGR192 is not set |
| 1549 | # CONFIG_CRYPTO_GF128MUL is not set | 1601 | # CONFIG_CRYPTO_WP512 is not set |
| 1550 | CONFIG_CRYPTO_ECB=m | 1602 | |
| 1551 | CONFIG_CRYPTO_CBC=y | 1603 | # |
| 1552 | CONFIG_CRYPTO_PCBC=m | 1604 | # Ciphers |
| 1553 | # CONFIG_CRYPTO_LRW is not set | 1605 | # |
| 1554 | # CONFIG_CRYPTO_XTS is not set | ||
| 1555 | # CONFIG_CRYPTO_CTR is not set | ||
| 1556 | # CONFIG_CRYPTO_GCM is not set | ||
| 1557 | # CONFIG_CRYPTO_CCM is not set | ||
| 1558 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1559 | CONFIG_CRYPTO_DES=y | ||
| 1560 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1561 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1562 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1563 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1564 | CONFIG_CRYPTO_SERPENT=m | ||
| 1565 | CONFIG_CRYPTO_AES=m | 1606 | CONFIG_CRYPTO_AES=m |
| 1607 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1608 | CONFIG_CRYPTO_ARC4=m | ||
| 1609 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1610 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1566 | # CONFIG_CRYPTO_CAST5 is not set | 1611 | # CONFIG_CRYPTO_CAST5 is not set |
| 1567 | # CONFIG_CRYPTO_CAST6 is not set | 1612 | # CONFIG_CRYPTO_CAST6 is not set |
| 1568 | # CONFIG_CRYPTO_TEA is not set | 1613 | CONFIG_CRYPTO_DES=y |
| 1569 | CONFIG_CRYPTO_ARC4=m | 1614 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1570 | # CONFIG_CRYPTO_KHAZAD is not set | 1615 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1571 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1572 | # CONFIG_CRYPTO_SEED is not set | ||
| 1573 | # CONFIG_CRYPTO_SALSA20 is not set | 1616 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1617 | # CONFIG_CRYPTO_SEED is not set | ||
| 1618 | CONFIG_CRYPTO_SERPENT=m | ||
| 1619 | # CONFIG_CRYPTO_TEA is not set | ||
| 1620 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1621 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1622 | |||
| 1623 | # | ||
| 1624 | # Compression | ||
| 1625 | # | ||
| 1574 | CONFIG_CRYPTO_DEFLATE=m | 1626 | CONFIG_CRYPTO_DEFLATE=m |
| 1575 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1576 | CONFIG_CRYPTO_CRC32C=m | ||
| 1577 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1578 | # CONFIG_CRYPTO_TEST is not set | ||
| 1579 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1580 | # CONFIG_CRYPTO_LZO is not set | 1627 | # CONFIG_CRYPTO_LZO is not set |
| 1581 | CONFIG_CRYPTO_HW=y | 1628 | CONFIG_CRYPTO_HW=y |
| 1582 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1629 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1583 | # CONFIG_PPC_CLOCK is not set | 1630 | # CONFIG_PPC_CLOCK is not set |
| 1631 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index a3d52e3f2ded..066c583c1f8a 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:11 2008 | 4 | # Mon Jun 9 08:52:11 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -209,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -235,6 +241,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 235 | CONFIG_PCI_LEGACY=y | 241 | CONFIG_PCI_LEGACY=y |
| 236 | # CONFIG_PCCARD is not set | 242 | # CONFIG_PCCARD is not set |
| 237 | # CONFIG_HOTPLUG_PCI is not set | 243 | # CONFIG_HOTPLUG_PCI is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 238 | 245 | ||
| 239 | # | 246 | # |
| 240 | # Advanced setup | 247 | # Advanced setup |
| @@ -244,11 +251,11 @@ CONFIG_PCI_LEGACY=y | |||
| 244 | # | 251 | # |
| 245 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 246 | # | 253 | # |
| 247 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 248 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 249 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 250 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 251 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 252 | 259 | ||
| 253 | # | 260 | # |
| 254 | # Networking | 261 | # Networking |
| @@ -296,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 296 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 297 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 298 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 299 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 300 | # CONFIG_INET6_TUNNEL is not set | ||
| 301 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 302 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 303 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -454,7 +459,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 454 | # CONFIG_SCSI_SRP is not set | 459 | # CONFIG_SCSI_SRP is not set |
| 455 | CONFIG_ATA=y | 460 | CONFIG_ATA=y |
| 456 | # CONFIG_ATA_NONSTANDARD is not set | 461 | # CONFIG_ATA_NONSTANDARD is not set |
| 462 | CONFIG_SATA_PMP=y | ||
| 457 | # CONFIG_SATA_AHCI is not set | 463 | # CONFIG_SATA_AHCI is not set |
| 464 | # CONFIG_SATA_SIL24 is not set | ||
| 465 | CONFIG_ATA_SFF=y | ||
| 458 | # CONFIG_SATA_SVW is not set | 466 | # CONFIG_SATA_SVW is not set |
| 459 | # CONFIG_ATA_PIIX is not set | 467 | # CONFIG_ATA_PIIX is not set |
| 460 | CONFIG_SATA_MV=y | 468 | CONFIG_SATA_MV=y |
| @@ -464,7 +472,6 @@ CONFIG_SATA_MV=y | |||
| 464 | # CONFIG_SATA_PROMISE is not set | 472 | # CONFIG_SATA_PROMISE is not set |
| 465 | # CONFIG_SATA_SX4 is not set | 473 | # CONFIG_SATA_SX4 is not set |
| 466 | # CONFIG_SATA_SIL is not set | 474 | # CONFIG_SATA_SIL is not set |
| 467 | # CONFIG_SATA_SIL24 is not set | ||
| 468 | # CONFIG_SATA_SIS is not set | 475 | # CONFIG_SATA_SIS is not set |
| 469 | # CONFIG_SATA_ULI is not set | 476 | # CONFIG_SATA_ULI is not set |
| 470 | # CONFIG_SATA_VIA is not set | 477 | # CONFIG_SATA_VIA is not set |
| @@ -509,6 +516,7 @@ CONFIG_SATA_MV=y | |||
| 509 | # CONFIG_PATA_VIA is not set | 516 | # CONFIG_PATA_VIA is not set |
| 510 | # CONFIG_PATA_WINBOND is not set | 517 | # CONFIG_PATA_WINBOND is not set |
| 511 | # CONFIG_PATA_PLATFORM is not set | 518 | # CONFIG_PATA_PLATFORM is not set |
| 519 | # CONFIG_PATA_SCH is not set | ||
| 512 | # CONFIG_MD is not set | 520 | # CONFIG_MD is not set |
| 513 | # CONFIG_FUSION is not set | 521 | # CONFIG_FUSION is not set |
| 514 | 522 | ||
| @@ -596,7 +604,6 @@ CONFIG_NETDEV_1000=y | |||
| 596 | # CONFIG_SIS190 is not set | 604 | # CONFIG_SIS190 is not set |
| 597 | # CONFIG_SKGE is not set | 605 | # CONFIG_SKGE is not set |
| 598 | # CONFIG_SKY2 is not set | 606 | # CONFIG_SKY2 is not set |
| 599 | # CONFIG_SK98LIN is not set | ||
| 600 | # CONFIG_VIA_VELOCITY is not set | 607 | # CONFIG_VIA_VELOCITY is not set |
| 601 | # CONFIG_TIGON3 is not set | 608 | # CONFIG_TIGON3 is not set |
| 602 | # CONFIG_BNX2 is not set | 609 | # CONFIG_BNX2 is not set |
| @@ -616,6 +623,7 @@ CONFIG_NETDEV_10000=y | |||
| 616 | # CONFIG_MLX4_CORE is not set | 623 | # CONFIG_MLX4_CORE is not set |
| 617 | # CONFIG_TEHUTI is not set | 624 | # CONFIG_TEHUTI is not set |
| 618 | # CONFIG_BNX2X is not set | 625 | # CONFIG_BNX2X is not set |
| 626 | # CONFIG_SFC is not set | ||
| 619 | # CONFIG_TR is not set | 627 | # CONFIG_TR is not set |
| 620 | 628 | ||
| 621 | # | 629 | # |
| @@ -623,6 +631,7 @@ CONFIG_NETDEV_10000=y | |||
| 623 | # | 631 | # |
| 624 | # CONFIG_WLAN_PRE80211 is not set | 632 | # CONFIG_WLAN_PRE80211 is not set |
| 625 | # CONFIG_WLAN_80211 is not set | 633 | # CONFIG_WLAN_80211 is not set |
| 634 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 626 | # CONFIG_WAN is not set | 635 | # CONFIG_WAN is not set |
| 627 | # CONFIG_FDDI is not set | 636 | # CONFIG_FDDI is not set |
| 628 | # CONFIG_HIPPI is not set | 637 | # CONFIG_HIPPI is not set |
| @@ -670,6 +679,7 @@ CONFIG_INPUT=y | |||
| 670 | # Character devices | 679 | # Character devices |
| 671 | # | 680 | # |
| 672 | # CONFIG_VT is not set | 681 | # CONFIG_VT is not set |
| 682 | CONFIG_DEVKMEM=y | ||
| 673 | # CONFIG_SERIAL_NONSTANDARD is not set | 683 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 674 | # CONFIG_NOZOMI is not set | 684 | # CONFIG_NOZOMI is not set |
| 675 | 685 | ||
| @@ -705,12 +715,7 @@ CONFIG_GEN_RTC=y | |||
| 705 | # CONFIG_TCG_TPM is not set | 715 | # CONFIG_TCG_TPM is not set |
| 706 | CONFIG_DEVPORT=y | 716 | CONFIG_DEVPORT=y |
| 707 | # CONFIG_I2C is not set | 717 | # CONFIG_I2C is not set |
| 708 | |||
| 709 | # | ||
| 710 | # SPI support | ||
| 711 | # | ||
| 712 | # CONFIG_SPI is not set | 718 | # CONFIG_SPI is not set |
| 713 | # CONFIG_SPI_MASTER is not set | ||
| 714 | # CONFIG_W1 is not set | 719 | # CONFIG_W1 is not set |
| 715 | # CONFIG_POWER_SUPPLY is not set | 720 | # CONFIG_POWER_SUPPLY is not set |
| 716 | CONFIG_HWMON=y | 721 | CONFIG_HWMON=y |
| @@ -743,12 +748,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 743 | # Multifunction device drivers | 748 | # Multifunction device drivers |
| 744 | # | 749 | # |
| 745 | # CONFIG_MFD_SM501 is not set | 750 | # CONFIG_MFD_SM501 is not set |
| 751 | # CONFIG_HTC_PASIC3 is not set | ||
| 746 | 752 | ||
| 747 | # | 753 | # |
| 748 | # Multimedia devices | 754 | # Multimedia devices |
| 749 | # | 755 | # |
| 756 | |||
| 757 | # | ||
| 758 | # Multimedia core support | ||
| 759 | # | ||
| 750 | # CONFIG_VIDEO_DEV is not set | 760 | # CONFIG_VIDEO_DEV is not set |
| 751 | # CONFIG_DVB_CORE is not set | 761 | # CONFIG_DVB_CORE is not set |
| 762 | # CONFIG_VIDEO_MEDIA is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # Multimedia drivers | ||
| 766 | # | ||
| 752 | CONFIG_DAB=y | 767 | CONFIG_DAB=y |
| 753 | 768 | ||
| 754 | # | 769 | # |
| @@ -779,6 +794,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 779 | CONFIG_USB_ARCH_HAS_OHCI=y | 794 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 780 | CONFIG_USB_ARCH_HAS_EHCI=y | 795 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 781 | # CONFIG_USB is not set | 796 | # CONFIG_USB is not set |
| 797 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 798 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 782 | 799 | ||
| 783 | # | 800 | # |
| 784 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 801 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -787,14 +804,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 787 | # CONFIG_MMC is not set | 804 | # CONFIG_MMC is not set |
| 788 | # CONFIG_MEMSTICK is not set | 805 | # CONFIG_MEMSTICK is not set |
| 789 | # CONFIG_NEW_LEDS is not set | 806 | # CONFIG_NEW_LEDS is not set |
| 807 | # CONFIG_ACCESSIBILITY is not set | ||
| 790 | # CONFIG_INFINIBAND is not set | 808 | # CONFIG_INFINIBAND is not set |
| 791 | # CONFIG_EDAC is not set | 809 | # CONFIG_EDAC is not set |
| 792 | # CONFIG_RTC_CLASS is not set | 810 | # CONFIG_RTC_CLASS is not set |
| 793 | # CONFIG_DMADEVICES is not set | 811 | # CONFIG_DMADEVICES is not set |
| 794 | |||
| 795 | # | ||
| 796 | # Userspace I/O | ||
| 797 | # | ||
| 798 | # CONFIG_UIO is not set | 812 | # CONFIG_UIO is not set |
| 799 | 813 | ||
| 800 | # | 814 | # |
| @@ -814,7 +828,6 @@ CONFIG_FS_MBCACHE=y | |||
| 814 | # CONFIG_JFS_FS is not set | 828 | # CONFIG_JFS_FS is not set |
| 815 | # CONFIG_FS_POSIX_ACL is not set | 829 | # CONFIG_FS_POSIX_ACL is not set |
| 816 | # CONFIG_XFS_FS is not set | 830 | # CONFIG_XFS_FS is not set |
| 817 | # CONFIG_GFS2_FS is not set | ||
| 818 | # CONFIG_OCFS2_FS is not set | 831 | # CONFIG_OCFS2_FS is not set |
| 819 | CONFIG_DNOTIFY=y | 832 | CONFIG_DNOTIFY=y |
| 820 | CONFIG_INOTIFY=y | 833 | CONFIG_INOTIFY=y |
| @@ -871,7 +884,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 871 | CONFIG_NFS_FS=y | 884 | CONFIG_NFS_FS=y |
| 872 | # CONFIG_NFS_V3 is not set | 885 | # CONFIG_NFS_V3 is not set |
| 873 | # CONFIG_NFS_V4 is not set | 886 | # CONFIG_NFS_V4 is not set |
| 874 | # CONFIG_NFS_DIRECTIO is not set | ||
| 875 | # CONFIG_NFSD is not set | 887 | # CONFIG_NFSD is not set |
| 876 | CONFIG_ROOT_NFS=y | 888 | CONFIG_ROOT_NFS=y |
| 877 | CONFIG_LOCKD=y | 889 | CONFIG_LOCKD=y |
| @@ -914,6 +926,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 914 | # Library routines | 926 | # Library routines |
| 915 | # | 927 | # |
| 916 | CONFIG_BITREVERSE=y | 928 | CONFIG_BITREVERSE=y |
| 929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 917 | # CONFIG_CRC_CCITT is not set | 930 | # CONFIG_CRC_CCITT is not set |
| 918 | # CONFIG_CRC16 is not set | 931 | # CONFIG_CRC16 is not set |
| 919 | # CONFIG_CRC_ITU_T is not set | 932 | # CONFIG_CRC_ITU_T is not set |
| @@ -924,6 +937,7 @@ CONFIG_PLIST=y | |||
| 924 | CONFIG_HAS_IOMEM=y | 937 | CONFIG_HAS_IOMEM=y |
| 925 | CONFIG_HAS_IOPORT=y | 938 | CONFIG_HAS_IOPORT=y |
| 926 | CONFIG_HAS_DMA=y | 939 | CONFIG_HAS_DMA=y |
| 940 | CONFIG_HAVE_LMB=y | ||
| 927 | 941 | ||
| 928 | # | 942 | # |
| 929 | # Kernel hacking | 943 | # Kernel hacking |
| @@ -931,6 +945,7 @@ CONFIG_HAS_DMA=y | |||
| 931 | # CONFIG_PRINTK_TIME is not set | 945 | # CONFIG_PRINTK_TIME is not set |
| 932 | CONFIG_ENABLE_WARN_DEPRECATED=y | 946 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 933 | CONFIG_ENABLE_MUST_CHECK=y | 947 | CONFIG_ENABLE_MUST_CHECK=y |
| 948 | CONFIG_FRAME_WARN=1024 | ||
| 934 | # CONFIG_MAGIC_SYSRQ is not set | 949 | # CONFIG_MAGIC_SYSRQ is not set |
| 935 | # CONFIG_UNUSED_SYMBOLS is not set | 950 | # CONFIG_UNUSED_SYMBOLS is not set |
| 936 | # CONFIG_DEBUG_FS is not set | 951 | # CONFIG_DEBUG_FS is not set |
| @@ -940,6 +955,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 940 | # CONFIG_SLUB_STATS is not set | 955 | # CONFIG_SLUB_STATS is not set |
| 941 | # CONFIG_DEBUG_BUGVERBOSE is not set | 956 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 942 | # CONFIG_SAMPLES is not set | 957 | # CONFIG_SAMPLES is not set |
| 958 | # CONFIG_IRQSTACKS is not set | ||
| 943 | # CONFIG_BOOTX_TEXT is not set | 959 | # CONFIG_BOOTX_TEXT is not set |
| 944 | # CONFIG_PPC_EARLY_DEBUG is not set | 960 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 945 | 961 | ||
| @@ -950,48 +966,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 950 | # CONFIG_SECURITY is not set | 966 | # CONFIG_SECURITY is not set |
| 951 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 967 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 952 | CONFIG_CRYPTO=y | 968 | CONFIG_CRYPTO=y |
| 953 | # CONFIG_CRYPTO_SEQIV is not set | 969 | |
| 970 | # | ||
| 971 | # Crypto core or helper | ||
| 972 | # | ||
| 954 | # CONFIG_CRYPTO_MANAGER is not set | 973 | # CONFIG_CRYPTO_MANAGER is not set |
| 974 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 975 | # CONFIG_CRYPTO_NULL is not set | ||
| 976 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 977 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 978 | |||
| 979 | # | ||
| 980 | # Authenticated Encryption with Associated Data | ||
| 981 | # | ||
| 982 | # CONFIG_CRYPTO_CCM is not set | ||
| 983 | # CONFIG_CRYPTO_GCM is not set | ||
| 984 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 985 | |||
| 986 | # | ||
| 987 | # Block modes | ||
| 988 | # | ||
| 989 | # CONFIG_CRYPTO_CBC is not set | ||
| 990 | # CONFIG_CRYPTO_CTR is not set | ||
| 991 | # CONFIG_CRYPTO_CTS is not set | ||
| 992 | # CONFIG_CRYPTO_ECB is not set | ||
| 993 | # CONFIG_CRYPTO_LRW is not set | ||
| 994 | # CONFIG_CRYPTO_PCBC is not set | ||
| 995 | # CONFIG_CRYPTO_XTS is not set | ||
| 996 | |||
| 997 | # | ||
| 998 | # Hash modes | ||
| 999 | # | ||
| 955 | # CONFIG_CRYPTO_HMAC is not set | 1000 | # CONFIG_CRYPTO_HMAC is not set |
| 956 | # CONFIG_CRYPTO_XCBC is not set | 1001 | # CONFIG_CRYPTO_XCBC is not set |
| 957 | # CONFIG_CRYPTO_NULL is not set | 1002 | |
| 1003 | # | ||
| 1004 | # Digest | ||
| 1005 | # | ||
| 1006 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 958 | # CONFIG_CRYPTO_MD4 is not set | 1007 | # CONFIG_CRYPTO_MD4 is not set |
| 959 | # CONFIG_CRYPTO_MD5 is not set | 1008 | # CONFIG_CRYPTO_MD5 is not set |
| 1009 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 960 | # CONFIG_CRYPTO_SHA1 is not set | 1010 | # CONFIG_CRYPTO_SHA1 is not set |
| 961 | # CONFIG_CRYPTO_SHA256 is not set | 1011 | # CONFIG_CRYPTO_SHA256 is not set |
| 962 | # CONFIG_CRYPTO_SHA512 is not set | 1012 | # CONFIG_CRYPTO_SHA512 is not set |
| 963 | # CONFIG_CRYPTO_WP512 is not set | ||
| 964 | # CONFIG_CRYPTO_TGR192 is not set | 1013 | # CONFIG_CRYPTO_TGR192 is not set |
| 965 | # CONFIG_CRYPTO_GF128MUL is not set | 1014 | # CONFIG_CRYPTO_WP512 is not set |
| 966 | # CONFIG_CRYPTO_ECB is not set | 1015 | |
| 967 | # CONFIG_CRYPTO_CBC is not set | 1016 | # |
| 968 | # CONFIG_CRYPTO_PCBC is not set | 1017 | # Ciphers |
| 969 | # CONFIG_CRYPTO_LRW is not set | 1018 | # |
| 970 | # CONFIG_CRYPTO_XTS is not set | ||
| 971 | # CONFIG_CRYPTO_CTR is not set | ||
| 972 | # CONFIG_CRYPTO_GCM is not set | ||
| 973 | # CONFIG_CRYPTO_CCM is not set | ||
| 974 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 975 | # CONFIG_CRYPTO_DES is not set | ||
| 976 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 977 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 978 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 979 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 980 | # CONFIG_CRYPTO_AES is not set | 1019 | # CONFIG_CRYPTO_AES is not set |
| 1020 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1021 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1022 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1023 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 981 | # CONFIG_CRYPTO_CAST5 is not set | 1024 | # CONFIG_CRYPTO_CAST5 is not set |
| 982 | # CONFIG_CRYPTO_CAST6 is not set | 1025 | # CONFIG_CRYPTO_CAST6 is not set |
| 983 | # CONFIG_CRYPTO_TEA is not set | 1026 | # CONFIG_CRYPTO_DES is not set |
| 984 | # CONFIG_CRYPTO_ARC4 is not set | 1027 | # CONFIG_CRYPTO_FCRYPT is not set |
| 985 | # CONFIG_CRYPTO_KHAZAD is not set | 1028 | # CONFIG_CRYPTO_KHAZAD is not set |
| 986 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 987 | # CONFIG_CRYPTO_SEED is not set | ||
| 988 | # CONFIG_CRYPTO_SALSA20 is not set | 1029 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1030 | # CONFIG_CRYPTO_SEED is not set | ||
| 1031 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1032 | # CONFIG_CRYPTO_TEA is not set | ||
| 1033 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1034 | |||
| 1035 | # | ||
| 1036 | # Compression | ||
| 1037 | # | ||
| 989 | # CONFIG_CRYPTO_DEFLATE is not set | 1038 | # CONFIG_CRYPTO_DEFLATE is not set |
| 990 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 991 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 992 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 993 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 994 | # CONFIG_CRYPTO_LZO is not set | 1039 | # CONFIG_CRYPTO_LZO is not set |
| 995 | CONFIG_CRYPTO_HW=y | 1040 | CONFIG_CRYPTO_HW=y |
| 996 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1041 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 997 | # CONFIG_PPC_CLOCK is not set | 1042 | # CONFIG_PPC_CLOCK is not set |
| 1043 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 0264c5757f78..30d7834b7db1 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:13 2008 | 4 | # Mon Jun 9 08:52:12 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,18 +72,16 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | # CONFIG_BLK_DEV_INITRD is not set | 79 | # CONFIG_BLK_DEV_INITRD is not set |
| 80 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 82 | CONFIG_SYSCTL=y | 81 | CONFIG_SYSCTL=y |
| 83 | CONFIG_EMBEDDED=y | 82 | CONFIG_EMBEDDED=y |
| 84 | CONFIG_SYSCTL_SYSCALL=y | 83 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 85 | CONFIG_KALLSYMS=y | 85 | CONFIG_KALLSYMS=y |
| 86 | CONFIG_KALLSYMS_ALL=y | 86 | CONFIG_KALLSYMS_ALL=y |
| 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -108,6 +108,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 108 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 109 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 110 | CONFIG_HAVE_KRETPROBES=y |
| 111 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 112 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 113 | CONFIG_SLABINFO=y |
| 113 | CONFIG_RT_MUTEXES=y | 114 | CONFIG_RT_MUTEXES=y |
| @@ -196,11 +197,13 @@ CONFIG_FLATMEM=y | |||
| 196 | CONFIG_FLAT_NODE_MEM_MAP=y | 197 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 197 | # CONFIG_SPARSEMEM_STATIC is not set | 198 | # CONFIG_SPARSEMEM_STATIC is not set |
| 198 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 200 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 200 | # CONFIG_RESOURCES_64BIT is not set | 202 | # CONFIG_RESOURCES_64BIT is not set |
| 201 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
| 202 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
| 203 | CONFIG_VIRT_TO_BUS=y | 205 | CONFIG_VIRT_TO_BUS=y |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 204 | CONFIG_PROC_DEVICETREE=y | 207 | CONFIG_PROC_DEVICETREE=y |
| 205 | # CONFIG_CMDLINE_BOOL is not set | 208 | # CONFIG_CMDLINE_BOOL is not set |
| 206 | # CONFIG_PM is not set | 209 | # CONFIG_PM is not set |
| @@ -224,6 +227,7 @@ CONFIG_PCI_LEGACY=y | |||
| 224 | # CONFIG_PCI_DEBUG is not set | 227 | # CONFIG_PCI_DEBUG is not set |
| 225 | # CONFIG_PCCARD is not set | 228 | # CONFIG_PCCARD is not set |
| 226 | # CONFIG_HOTPLUG_PCI is not set | 229 | # CONFIG_HOTPLUG_PCI is not set |
| 230 | # CONFIG_HAS_RAPIDIO is not set | ||
| 227 | 231 | ||
| 228 | # | 232 | # |
| 229 | # Advanced setup | 233 | # Advanced setup |
| @@ -233,11 +237,11 @@ CONFIG_PCI_LEGACY=y | |||
| 233 | # | 237 | # |
| 234 | # Default settings for advanced configuration options are used | 238 | # Default settings for advanced configuration options are used |
| 235 | # | 239 | # |
| 236 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 237 | CONFIG_LOWMEM_SIZE=0x30000000 | 240 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 241 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 238 | CONFIG_KERNEL_START=0xc0000000 | 242 | CONFIG_KERNEL_START=0xc0000000 |
| 243 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 239 | CONFIG_TASK_SIZE=0xc0000000 | 244 | CONFIG_TASK_SIZE=0xc0000000 |
| 240 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 241 | 245 | ||
| 242 | # | 246 | # |
| 243 | # Networking | 247 | # Networking |
| @@ -292,6 +296,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 292 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 296 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 293 | CONFIG_INET6_XFRM_MODE_BEET=y | 297 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 294 | CONFIG_IPV6_SIT=y | 298 | CONFIG_IPV6_SIT=y |
| 299 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 295 | # CONFIG_IPV6_TUNNEL is not set | 300 | # CONFIG_IPV6_TUNNEL is not set |
| 296 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 297 | CONFIG_NETFILTER=y | 302 | CONFIG_NETFILTER=y |
| @@ -536,7 +541,6 @@ CONFIG_NETDEV_1000=y | |||
| 536 | # CONFIG_SIS190 is not set | 541 | # CONFIG_SIS190 is not set |
| 537 | # CONFIG_SKGE is not set | 542 | # CONFIG_SKGE is not set |
| 538 | # CONFIG_SKY2 is not set | 543 | # CONFIG_SKY2 is not set |
| 539 | # CONFIG_SK98LIN is not set | ||
| 540 | # CONFIG_VIA_VELOCITY is not set | 544 | # CONFIG_VIA_VELOCITY is not set |
| 541 | # CONFIG_TIGON3 is not set | 545 | # CONFIG_TIGON3 is not set |
| 542 | # CONFIG_BNX2 is not set | 546 | # CONFIG_BNX2 is not set |
| @@ -554,6 +558,7 @@ CONFIG_NETDEV_10000=y | |||
| 554 | # CONFIG_MLX4_CORE is not set | 558 | # CONFIG_MLX4_CORE is not set |
| 555 | # CONFIG_TEHUTI is not set | 559 | # CONFIG_TEHUTI is not set |
| 556 | # CONFIG_BNX2X is not set | 560 | # CONFIG_BNX2X is not set |
| 561 | # CONFIG_SFC is not set | ||
| 557 | # CONFIG_TR is not set | 562 | # CONFIG_TR is not set |
| 558 | 563 | ||
| 559 | # | 564 | # |
| @@ -561,6 +566,7 @@ CONFIG_NETDEV_10000=y | |||
| 561 | # | 566 | # |
| 562 | # CONFIG_WLAN_PRE80211 is not set | 567 | # CONFIG_WLAN_PRE80211 is not set |
| 563 | # CONFIG_WLAN_80211 is not set | 568 | # CONFIG_WLAN_80211 is not set |
| 569 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 564 | # CONFIG_WAN is not set | 570 | # CONFIG_WAN is not set |
| 565 | # CONFIG_FDDI is not set | 571 | # CONFIG_FDDI is not set |
| 566 | CONFIG_PPP=y | 572 | CONFIG_PPP=y |
| @@ -634,6 +640,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 634 | # Character devices | 640 | # Character devices |
| 635 | # | 641 | # |
| 636 | # CONFIG_VT is not set | 642 | # CONFIG_VT is not set |
| 643 | CONFIG_DEVKMEM=y | ||
| 637 | # CONFIG_SERIAL_NONSTANDARD is not set | 644 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 638 | 645 | ||
| 639 | # | 646 | # |
| @@ -668,12 +675,7 @@ CONFIG_HW_RANDOM=y | |||
| 668 | # CONFIG_RAW_DRIVER is not set | 675 | # CONFIG_RAW_DRIVER is not set |
| 669 | CONFIG_DEVPORT=y | 676 | CONFIG_DEVPORT=y |
| 670 | # CONFIG_I2C is not set | 677 | # CONFIG_I2C is not set |
| 671 | |||
| 672 | # | ||
| 673 | # SPI support | ||
| 674 | # | ||
| 675 | # CONFIG_SPI is not set | 678 | # CONFIG_SPI is not set |
| 676 | # CONFIG_SPI_MASTER is not set | ||
| 677 | # CONFIG_W1 is not set | 679 | # CONFIG_W1 is not set |
| 678 | # CONFIG_POWER_SUPPLY is not set | 680 | # CONFIG_POWER_SUPPLY is not set |
| 679 | # CONFIG_HWMON is not set | 681 | # CONFIG_HWMON is not set |
| @@ -690,12 +692,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 690 | # Multifunction device drivers | 692 | # Multifunction device drivers |
| 691 | # | 693 | # |
| 692 | # CONFIG_MFD_SM501 is not set | 694 | # CONFIG_MFD_SM501 is not set |
| 695 | # CONFIG_HTC_PASIC3 is not set | ||
| 693 | 696 | ||
| 694 | # | 697 | # |
| 695 | # Multimedia devices | 698 | # Multimedia devices |
| 696 | # | 699 | # |
| 700 | |||
| 701 | # | ||
| 702 | # Multimedia core support | ||
| 703 | # | ||
| 697 | # CONFIG_VIDEO_DEV is not set | 704 | # CONFIG_VIDEO_DEV is not set |
| 698 | # CONFIG_DVB_CORE is not set | 705 | # CONFIG_DVB_CORE is not set |
| 706 | # CONFIG_VIDEO_MEDIA is not set | ||
| 707 | |||
| 708 | # | ||
| 709 | # Multimedia drivers | ||
| 710 | # | ||
| 699 | CONFIG_DAB=y | 711 | CONFIG_DAB=y |
| 700 | 712 | ||
| 701 | # | 713 | # |
| @@ -722,13 +734,10 @@ CONFIG_DAB=y | |||
| 722 | # CONFIG_MMC is not set | 734 | # CONFIG_MMC is not set |
| 723 | # CONFIG_MEMSTICK is not set | 735 | # CONFIG_MEMSTICK is not set |
| 724 | # CONFIG_NEW_LEDS is not set | 736 | # CONFIG_NEW_LEDS is not set |
| 737 | # CONFIG_ACCESSIBILITY is not set | ||
| 725 | # CONFIG_INFINIBAND is not set | 738 | # CONFIG_INFINIBAND is not set |
| 726 | # CONFIG_RTC_CLASS is not set | 739 | # CONFIG_RTC_CLASS is not set |
| 727 | # CONFIG_DMADEVICES is not set | 740 | # CONFIG_DMADEVICES is not set |
| 728 | |||
| 729 | # | ||
| 730 | # Userspace I/O | ||
| 731 | # | ||
| 732 | # CONFIG_UIO is not set | 741 | # CONFIG_UIO is not set |
| 733 | 742 | ||
| 734 | # | 743 | # |
| @@ -798,7 +807,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 798 | CONFIG_NFS_FS=y | 807 | CONFIG_NFS_FS=y |
| 799 | CONFIG_NFS_V3=y | 808 | CONFIG_NFS_V3=y |
| 800 | CONFIG_NFS_V3_ACL=y | 809 | CONFIG_NFS_V3_ACL=y |
| 801 | # CONFIG_NFS_DIRECTIO is not set | ||
| 802 | # CONFIG_NFSD is not set | 810 | # CONFIG_NFSD is not set |
| 803 | CONFIG_ROOT_NFS=y | 811 | CONFIG_ROOT_NFS=y |
| 804 | CONFIG_LOCKD=y | 812 | CONFIG_LOCKD=y |
| @@ -877,6 +885,7 @@ CONFIG_NLS_UTF8=y | |||
| 877 | # Library routines | 885 | # Library routines |
| 878 | # | 886 | # |
| 879 | CONFIG_BITREVERSE=y | 887 | CONFIG_BITREVERSE=y |
| 888 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 880 | CONFIG_CRC_CCITT=y | 889 | CONFIG_CRC_CCITT=y |
| 881 | # CONFIG_CRC16 is not set | 890 | # CONFIG_CRC16 is not set |
| 882 | # CONFIG_CRC_ITU_T is not set | 891 | # CONFIG_CRC_ITU_T is not set |
| @@ -889,6 +898,7 @@ CONFIG_PLIST=y | |||
| 889 | CONFIG_HAS_IOMEM=y | 898 | CONFIG_HAS_IOMEM=y |
| 890 | CONFIG_HAS_IOPORT=y | 899 | CONFIG_HAS_IOPORT=y |
| 891 | CONFIG_HAS_DMA=y | 900 | CONFIG_HAS_DMA=y |
| 901 | CONFIG_HAVE_LMB=y | ||
| 892 | 902 | ||
| 893 | # | 903 | # |
| 894 | # Kernel hacking | 904 | # Kernel hacking |
| @@ -896,6 +906,7 @@ CONFIG_HAS_DMA=y | |||
| 896 | # CONFIG_PRINTK_TIME is not set | 906 | # CONFIG_PRINTK_TIME is not set |
| 897 | CONFIG_ENABLE_WARN_DEPRECATED=y | 907 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 898 | CONFIG_ENABLE_MUST_CHECK=y | 908 | CONFIG_ENABLE_MUST_CHECK=y |
| 909 | CONFIG_FRAME_WARN=1024 | ||
| 899 | CONFIG_MAGIC_SYSRQ=y | 910 | CONFIG_MAGIC_SYSRQ=y |
| 900 | # CONFIG_UNUSED_SYMBOLS is not set | 911 | # CONFIG_UNUSED_SYMBOLS is not set |
| 901 | # CONFIG_DEBUG_FS is not set | 912 | # CONFIG_DEBUG_FS is not set |
| @@ -906,6 +917,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 906 | CONFIG_SCHED_DEBUG=y | 917 | CONFIG_SCHED_DEBUG=y |
| 907 | # CONFIG_SCHEDSTATS is not set | 918 | # CONFIG_SCHEDSTATS is not set |
| 908 | # CONFIG_TIMER_STATS is not set | 919 | # CONFIG_TIMER_STATS is not set |
| 920 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 909 | # CONFIG_SLUB_DEBUG_ON is not set | 921 | # CONFIG_SLUB_DEBUG_ON is not set |
| 910 | # CONFIG_SLUB_STATS is not set | 922 | # CONFIG_SLUB_STATS is not set |
| 911 | # CONFIG_DEBUG_RT_MUTEXES is not set | 923 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -918,6 +930,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 918 | CONFIG_DEBUG_BUGVERBOSE=y | 930 | CONFIG_DEBUG_BUGVERBOSE=y |
| 919 | CONFIG_DEBUG_INFO=y | 931 | CONFIG_DEBUG_INFO=y |
| 920 | # CONFIG_DEBUG_VM is not set | 932 | # CONFIG_DEBUG_VM is not set |
| 933 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 921 | # CONFIG_DEBUG_LIST is not set | 934 | # CONFIG_DEBUG_LIST is not set |
| 922 | # CONFIG_DEBUG_SG is not set | 935 | # CONFIG_DEBUG_SG is not set |
| 923 | # CONFIG_BOOT_PRINTK_DELAY is not set | 936 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -929,6 +942,7 @@ CONFIG_DEBUG_INFO=y | |||
| 929 | # CONFIG_DEBUG_PAGEALLOC is not set | 942 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 930 | # CONFIG_DEBUGGER is not set | 943 | # CONFIG_DEBUGGER is not set |
| 931 | # CONFIG_KGDB_CONSOLE is not set | 944 | # CONFIG_KGDB_CONSOLE is not set |
| 945 | # CONFIG_IRQSTACKS is not set | ||
| 932 | CONFIG_BDI_SWITCH=y | 946 | CONFIG_BDI_SWITCH=y |
| 933 | # CONFIG_PPC_EARLY_DEBUG is not set | 947 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 934 | 948 | ||
| @@ -938,45 +952,75 @@ CONFIG_BDI_SWITCH=y | |||
| 938 | # CONFIG_KEYS is not set | 952 | # CONFIG_KEYS is not set |
| 939 | # CONFIG_SECURITY is not set | 953 | # CONFIG_SECURITY is not set |
| 940 | CONFIG_CRYPTO=y | 954 | CONFIG_CRYPTO=y |
| 955 | |||
| 956 | # | ||
| 957 | # Crypto core or helper | ||
| 958 | # | ||
| 941 | CONFIG_CRYPTO_ALGAPI=y | 959 | CONFIG_CRYPTO_ALGAPI=y |
| 942 | CONFIG_CRYPTO_BLKCIPHER=y | 960 | CONFIG_CRYPTO_BLKCIPHER=y |
| 943 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 944 | CONFIG_CRYPTO_MANAGER=y | 961 | CONFIG_CRYPTO_MANAGER=y |
| 945 | # CONFIG_CRYPTO_HMAC is not set | ||
| 946 | # CONFIG_CRYPTO_NULL is not set | 962 | # CONFIG_CRYPTO_NULL is not set |
| 963 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 964 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 965 | |||
| 966 | # | ||
| 967 | # Authenticated Encryption with Associated Data | ||
| 968 | # | ||
| 969 | # CONFIG_CRYPTO_CCM is not set | ||
| 970 | # CONFIG_CRYPTO_GCM is not set | ||
| 971 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 972 | |||
| 973 | # | ||
| 974 | # Block modes | ||
| 975 | # | ||
| 976 | CONFIG_CRYPTO_CBC=y | ||
| 977 | # CONFIG_CRYPTO_CTR is not set | ||
| 978 | # CONFIG_CRYPTO_CTS is not set | ||
| 979 | CONFIG_CRYPTO_ECB=y | ||
| 980 | CONFIG_CRYPTO_PCBC=y | ||
| 981 | |||
| 982 | # | ||
| 983 | # Hash modes | ||
| 984 | # | ||
| 985 | # CONFIG_CRYPTO_HMAC is not set | ||
| 986 | |||
| 987 | # | ||
| 988 | # Digest | ||
| 989 | # | ||
| 990 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 947 | # CONFIG_CRYPTO_MD4 is not set | 991 | # CONFIG_CRYPTO_MD4 is not set |
| 948 | CONFIG_CRYPTO_MD5=y | 992 | CONFIG_CRYPTO_MD5=y |
| 993 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 949 | # CONFIG_CRYPTO_SHA1 is not set | 994 | # CONFIG_CRYPTO_SHA1 is not set |
| 950 | # CONFIG_CRYPTO_SHA256 is not set | 995 | # CONFIG_CRYPTO_SHA256 is not set |
| 951 | # CONFIG_CRYPTO_SHA512 is not set | 996 | # CONFIG_CRYPTO_SHA512 is not set |
| 952 | # CONFIG_CRYPTO_WP512 is not set | ||
| 953 | # CONFIG_CRYPTO_TGR192 is not set | 997 | # CONFIG_CRYPTO_TGR192 is not set |
| 954 | CONFIG_CRYPTO_ECB=y | 998 | # CONFIG_CRYPTO_WP512 is not set |
| 955 | CONFIG_CRYPTO_CBC=y | 999 | |
| 956 | CONFIG_CRYPTO_PCBC=y | 1000 | # |
| 957 | # CONFIG_CRYPTO_CTR is not set | 1001 | # Ciphers |
| 958 | # CONFIG_CRYPTO_GCM is not set | 1002 | # |
| 959 | # CONFIG_CRYPTO_CCM is not set | ||
| 960 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 961 | CONFIG_CRYPTO_DES=y | ||
| 962 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 963 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 964 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 965 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 966 | # CONFIG_CRYPTO_AES is not set | 1003 | # CONFIG_CRYPTO_AES is not set |
| 1004 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1005 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1006 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1007 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 967 | # CONFIG_CRYPTO_CAST5 is not set | 1008 | # CONFIG_CRYPTO_CAST5 is not set |
| 968 | # CONFIG_CRYPTO_CAST6 is not set | 1009 | # CONFIG_CRYPTO_CAST6 is not set |
| 969 | # CONFIG_CRYPTO_TEA is not set | 1010 | CONFIG_CRYPTO_DES=y |
| 970 | # CONFIG_CRYPTO_ARC4 is not set | 1011 | # CONFIG_CRYPTO_FCRYPT is not set |
| 971 | # CONFIG_CRYPTO_KHAZAD is not set | 1012 | # CONFIG_CRYPTO_KHAZAD is not set |
| 972 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 973 | # CONFIG_CRYPTO_SEED is not set | 1013 | # CONFIG_CRYPTO_SEED is not set |
| 1014 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1015 | # CONFIG_CRYPTO_TEA is not set | ||
| 1016 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1017 | |||
| 1018 | # | ||
| 1019 | # Compression | ||
| 1020 | # | ||
| 974 | # CONFIG_CRYPTO_DEFLATE is not set | 1021 | # CONFIG_CRYPTO_DEFLATE is not set |
| 975 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 976 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 977 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 978 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 979 | # CONFIG_CRYPTO_LZO is not set | 1022 | # CONFIG_CRYPTO_LZO is not set |
| 980 | # CONFIG_CRYPTO_HW is not set | 1023 | # CONFIG_CRYPTO_HW is not set |
| 981 | # CONFIG_PPC_CLOCK is not set | 1024 | # CONFIG_PPC_CLOCK is not set |
| 982 | CONFIG_PPC_LIB_RHEAP=y | 1025 | CONFIG_PPC_LIB_RHEAP=y |
| 1026 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 9e0dd8201691..4293c8be06e1 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_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.25-rc9 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Tue Apr 15 18:07:36 2008 | 4 | # Mon Jun 9 08:52:14 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -201,7 +206,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 201 | # CONFIG_PREEMPT is not set | 206 | # CONFIG_PREEMPT is not set |
| 202 | CONFIG_BINFMT_ELF=y | 207 | CONFIG_BINFMT_ELF=y |
| 203 | # CONFIG_BINFMT_MISC is not set | 208 | # CONFIG_BINFMT_MISC is not set |
| 204 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 205 | CONFIG_MATH_EMULATION=y | 209 | CONFIG_MATH_EMULATION=y |
| 206 | # CONFIG_IOMMU_HELPER is not set | 210 | # CONFIG_IOMMU_HELPER is not set |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 211 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -217,11 +221,13 @@ CONFIG_FLATMEM=y | |||
| 217 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 218 | # CONFIG_SPARSEMEM_STATIC is not set | 222 | # CONFIG_SPARSEMEM_STATIC is not set |
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 224 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 225 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 227 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| @@ -240,6 +246,7 @@ CONFIG_FSL_SOC=y | |||
| 240 | # CONFIG_PCI_SYSCALL is not set | 246 | # CONFIG_PCI_SYSCALL is not set |
| 241 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 242 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 243 | 250 | ||
| 244 | # | 251 | # |
| 245 | # Advanced setup | 252 | # Advanced setup |
| @@ -249,11 +256,11 @@ CONFIG_FSL_SOC=y | |||
| 249 | # | 256 | # |
| 250 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 251 | # | 258 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 264 | ||
| 258 | # | 265 | # |
| 259 | # Networking | 266 | # Networking |
| @@ -301,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 301 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 302 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 303 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 305 | # CONFIG_INET6_TUNNEL is not set | ||
| 306 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 307 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 308 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -361,6 +366,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 366 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 362 | # CONFIG_MTD_CMDLINE_PARTS is not set | 367 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 363 | CONFIG_MTD_OF_PARTS=y | 368 | CONFIG_MTD_OF_PARTS=y |
| 369 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 364 | 370 | ||
| 365 | # | 371 | # |
| 366 | # User Modules And Translation Layers | 372 | # User Modules And Translation Layers |
| @@ -439,6 +445,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 439 | # | 445 | # |
| 440 | # CONFIG_MTD_UBI is not set | 446 | # CONFIG_MTD_UBI is not set |
| 441 | CONFIG_OF_DEVICE=y | 447 | CONFIG_OF_DEVICE=y |
| 448 | CONFIG_OF_I2C=y | ||
| 442 | # CONFIG_PARPORT is not set | 449 | # CONFIG_PARPORT is not set |
| 443 | CONFIG_BLK_DEV=y | 450 | CONFIG_BLK_DEV=y |
| 444 | # CONFIG_BLK_DEV_FD is not set | 451 | # CONFIG_BLK_DEV_FD is not set |
| @@ -501,8 +508,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 501 | # CONFIG_SCSI_DEBUG is not set | 508 | # CONFIG_SCSI_DEBUG is not set |
| 502 | CONFIG_ATA=y | 509 | CONFIG_ATA=y |
| 503 | # CONFIG_ATA_NONSTANDARD is not set | 510 | # CONFIG_ATA_NONSTANDARD is not set |
| 504 | # CONFIG_SATA_MV is not set | 511 | CONFIG_SATA_PMP=y |
| 505 | CONFIG_SATA_FSL=y | 512 | CONFIG_SATA_FSL=y |
| 513 | CONFIG_ATA_SFF=y | ||
| 514 | # CONFIG_SATA_MV is not set | ||
| 506 | # CONFIG_PATA_PLATFORM is not set | 515 | # CONFIG_PATA_PLATFORM is not set |
| 507 | # CONFIG_MD is not set | 516 | # CONFIG_MD is not set |
| 508 | # CONFIG_MACINTOSH_DRIVERS is not set | 517 | # CONFIG_MACINTOSH_DRIVERS is not set |
| @@ -554,6 +563,7 @@ CONFIG_NETDEV_10000=y | |||
| 554 | # | 563 | # |
| 555 | # CONFIG_WLAN_PRE80211 is not set | 564 | # CONFIG_WLAN_PRE80211 is not set |
| 556 | # CONFIG_WLAN_80211 is not set | 565 | # CONFIG_WLAN_80211 is not set |
| 566 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 557 | 567 | ||
| 558 | # | 568 | # |
| 559 | # USB Network Adapters | 569 | # USB Network Adapters |
| @@ -607,6 +617,7 @@ CONFIG_INPUT=y | |||
| 607 | # Character devices | 617 | # Character devices |
| 608 | # | 618 | # |
| 609 | # CONFIG_VT is not set | 619 | # CONFIG_VT is not set |
| 620 | CONFIG_DEVKMEM=y | ||
| 610 | # CONFIG_SERIAL_NONSTANDARD is not set | 621 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 611 | 622 | ||
| 612 | # | 623 | # |
| @@ -642,13 +653,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 642 | CONFIG_I2C_CHARDEV=y | 653 | CONFIG_I2C_CHARDEV=y |
| 643 | 654 | ||
| 644 | # | 655 | # |
| 645 | # I2C Algorithms | ||
| 646 | # | ||
| 647 | # CONFIG_I2C_ALGOBIT is not set | ||
| 648 | # CONFIG_I2C_ALGOPCF is not set | ||
| 649 | # CONFIG_I2C_ALGOPCA is not set | ||
| 650 | |||
| 651 | # | ||
| 652 | # I2C Hardware Bus support | 656 | # I2C Hardware Bus support |
| 653 | # | 657 | # |
| 654 | CONFIG_I2C_MPC=y | 658 | CONFIG_I2C_MPC=y |
| @@ -658,6 +662,7 @@ CONFIG_I2C_MPC=y | |||
| 658 | # CONFIG_I2C_TAOS_EVM is not set | 662 | # CONFIG_I2C_TAOS_EVM is not set |
| 659 | # CONFIG_I2C_STUB is not set | 663 | # CONFIG_I2C_STUB is not set |
| 660 | # CONFIG_I2C_TINY_USB is not set | 664 | # CONFIG_I2C_TINY_USB is not set |
| 665 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 661 | 666 | ||
| 662 | # | 667 | # |
| 663 | # Miscellaneous I2C Chip support | 668 | # Miscellaneous I2C Chip support |
| @@ -667,19 +672,13 @@ CONFIG_I2C_MPC=y | |||
| 667 | # CONFIG_SENSORS_PCF8574 is not set | 672 | # CONFIG_SENSORS_PCF8574 is not set |
| 668 | # CONFIG_PCF8575 is not set | 673 | # CONFIG_PCF8575 is not set |
| 669 | # CONFIG_SENSORS_PCF8591 is not set | 674 | # CONFIG_SENSORS_PCF8591 is not set |
| 670 | # CONFIG_TPS65010 is not set | ||
| 671 | # CONFIG_SENSORS_MAX6875 is not set | 675 | # CONFIG_SENSORS_MAX6875 is not set |
| 672 | # CONFIG_SENSORS_TSL2550 is not set | 676 | # CONFIG_SENSORS_TSL2550 is not set |
| 673 | # CONFIG_I2C_DEBUG_CORE is not set | 677 | # CONFIG_I2C_DEBUG_CORE is not set |
| 674 | # CONFIG_I2C_DEBUG_ALGO is not set | 678 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 675 | # CONFIG_I2C_DEBUG_BUS is not set | 679 | # CONFIG_I2C_DEBUG_BUS is not set |
| 676 | # CONFIG_I2C_DEBUG_CHIP is not set | 680 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 677 | |||
| 678 | # | ||
| 679 | # SPI support | ||
| 680 | # | ||
| 681 | # CONFIG_SPI is not set | 681 | # CONFIG_SPI is not set |
| 682 | # CONFIG_SPI_MASTER is not set | ||
| 683 | # CONFIG_W1 is not set | 682 | # CONFIG_W1 is not set |
| 684 | # CONFIG_POWER_SUPPLY is not set | 683 | # CONFIG_POWER_SUPPLY is not set |
| 685 | CONFIG_HWMON=y | 684 | CONFIG_HWMON=y |
| @@ -757,12 +756,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 757 | # Multifunction device drivers | 756 | # Multifunction device drivers |
| 758 | # | 757 | # |
| 759 | # CONFIG_MFD_SM501 is not set | 758 | # CONFIG_MFD_SM501 is not set |
| 759 | # CONFIG_HTC_PASIC3 is not set | ||
| 760 | 760 | ||
| 761 | # | 761 | # |
| 762 | # Multimedia devices | 762 | # Multimedia devices |
| 763 | # | 763 | # |
| 764 | |||
| 765 | # | ||
| 766 | # Multimedia core support | ||
| 767 | # | ||
| 764 | # CONFIG_VIDEO_DEV is not set | 768 | # CONFIG_VIDEO_DEV is not set |
| 765 | # CONFIG_DVB_CORE is not set | 769 | # CONFIG_DVB_CORE is not set |
| 770 | # CONFIG_VIDEO_MEDIA is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # Multimedia drivers | ||
| 774 | # | ||
| 766 | CONFIG_DAB=y | 775 | CONFIG_DAB=y |
| 767 | # CONFIG_USB_DABUSB is not set | 776 | # CONFIG_USB_DABUSB is not set |
| 768 | 777 | ||
| @@ -810,16 +819,20 @@ CONFIG_USB=y | |||
| 810 | CONFIG_USB_DEVICE_CLASS=y | 819 | CONFIG_USB_DEVICE_CLASS=y |
| 811 | # CONFIG_USB_DYNAMIC_MINORS is not set | 820 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 812 | # CONFIG_USB_OTG is not set | 821 | # CONFIG_USB_OTG is not set |
| 822 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 823 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 813 | 824 | ||
| 814 | # | 825 | # |
| 815 | # USB Host Controller Drivers | 826 | # USB Host Controller Drivers |
| 816 | # | 827 | # |
| 828 | # CONFIG_USB_C67X00_HCD is not set | ||
| 817 | CONFIG_USB_EHCI_HCD=y | 829 | CONFIG_USB_EHCI_HCD=y |
| 818 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 830 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 819 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 831 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 820 | CONFIG_USB_EHCI_FSL=y | 832 | CONFIG_USB_EHCI_FSL=y |
| 821 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 833 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 822 | # CONFIG_USB_ISP116X_HCD is not set | 834 | # CONFIG_USB_ISP116X_HCD is not set |
| 835 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 823 | # CONFIG_USB_SL811_HCD is not set | 836 | # CONFIG_USB_SL811_HCD is not set |
| 824 | # CONFIG_USB_R8A66597_HCD is not set | 837 | # CONFIG_USB_R8A66597_HCD is not set |
| 825 | 838 | ||
| @@ -828,6 +841,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 828 | # | 841 | # |
| 829 | # CONFIG_USB_ACM is not set | 842 | # CONFIG_USB_ACM is not set |
| 830 | # CONFIG_USB_PRINTER is not set | 843 | # CONFIG_USB_PRINTER is not set |
| 844 | # CONFIG_USB_WDM is not set | ||
| 831 | 845 | ||
| 832 | # | 846 | # |
| 833 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 847 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -873,17 +887,15 @@ CONFIG_USB_MON=y | |||
| 873 | # CONFIG_USB_LD is not set | 887 | # CONFIG_USB_LD is not set |
| 874 | # CONFIG_USB_TRANCEVIBRATOR is not set | 888 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 875 | # CONFIG_USB_IOWARRIOR is not set | 889 | # CONFIG_USB_IOWARRIOR is not set |
| 890 | # CONFIG_USB_ISIGHTFW is not set | ||
| 876 | # CONFIG_USB_GADGET is not set | 891 | # CONFIG_USB_GADGET is not set |
| 877 | # CONFIG_MMC is not set | 892 | # CONFIG_MMC is not set |
| 878 | # CONFIG_MEMSTICK is not set | 893 | # CONFIG_MEMSTICK is not set |
| 879 | # CONFIG_NEW_LEDS is not set | 894 | # CONFIG_NEW_LEDS is not set |
| 895 | # CONFIG_ACCESSIBILITY is not set | ||
| 880 | # CONFIG_EDAC is not set | 896 | # CONFIG_EDAC is not set |
| 881 | # CONFIG_RTC_CLASS is not set | 897 | # CONFIG_RTC_CLASS is not set |
| 882 | # CONFIG_DMADEVICES is not set | 898 | # CONFIG_DMADEVICES is not set |
| 883 | |||
| 884 | # | ||
| 885 | # Userspace I/O | ||
| 886 | # | ||
| 887 | # CONFIG_UIO is not set | 899 | # CONFIG_UIO is not set |
| 888 | 900 | ||
| 889 | # | 901 | # |
| @@ -903,7 +915,6 @@ CONFIG_FS_MBCACHE=y | |||
| 903 | # CONFIG_JFS_FS is not set | 915 | # CONFIG_JFS_FS is not set |
| 904 | # CONFIG_FS_POSIX_ACL is not set | 916 | # CONFIG_FS_POSIX_ACL is not set |
| 905 | # CONFIG_XFS_FS is not set | 917 | # CONFIG_XFS_FS is not set |
| 906 | # CONFIG_GFS2_FS is not set | ||
| 907 | # CONFIG_OCFS2_FS is not set | 918 | # CONFIG_OCFS2_FS is not set |
| 908 | CONFIG_DNOTIFY=y | 919 | CONFIG_DNOTIFY=y |
| 909 | CONFIG_INOTIFY=y | 920 | CONFIG_INOTIFY=y |
| @@ -962,7 +973,6 @@ CONFIG_NFS_FS=y | |||
| 962 | CONFIG_NFS_V3=y | 973 | CONFIG_NFS_V3=y |
| 963 | # CONFIG_NFS_V3_ACL is not set | 974 | # CONFIG_NFS_V3_ACL is not set |
| 964 | CONFIG_NFS_V4=y | 975 | CONFIG_NFS_V4=y |
| 965 | # CONFIG_NFS_DIRECTIO is not set | ||
| 966 | # CONFIG_NFSD is not set | 976 | # CONFIG_NFSD is not set |
| 967 | CONFIG_ROOT_NFS=y | 977 | CONFIG_ROOT_NFS=y |
| 968 | CONFIG_LOCKD=y | 978 | CONFIG_LOCKD=y |
| @@ -1009,6 +1019,7 @@ CONFIG_UCC=y | |||
| 1009 | # Library routines | 1019 | # Library routines |
| 1010 | # | 1020 | # |
| 1011 | CONFIG_BITREVERSE=y | 1021 | CONFIG_BITREVERSE=y |
| 1022 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1012 | # CONFIG_CRC_CCITT is not set | 1023 | # CONFIG_CRC_CCITT is not set |
| 1013 | # CONFIG_CRC16 is not set | 1024 | # CONFIG_CRC16 is not set |
| 1014 | # CONFIG_CRC_ITU_T is not set | 1025 | # CONFIG_CRC_ITU_T is not set |
| @@ -1027,6 +1038,7 @@ CONFIG_HAVE_LMB=y | |||
| 1027 | # CONFIG_PRINTK_TIME is not set | 1038 | # CONFIG_PRINTK_TIME is not set |
| 1028 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1039 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1029 | CONFIG_ENABLE_MUST_CHECK=y | 1040 | CONFIG_ENABLE_MUST_CHECK=y |
| 1041 | CONFIG_FRAME_WARN=1024 | ||
| 1030 | # CONFIG_MAGIC_SYSRQ is not set | 1042 | # CONFIG_MAGIC_SYSRQ is not set |
| 1031 | # CONFIG_UNUSED_SYMBOLS is not set | 1043 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1032 | # CONFIG_DEBUG_FS is not set | 1044 | # CONFIG_DEBUG_FS is not set |
| @@ -1034,6 +1046,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1034 | # CONFIG_DEBUG_KERNEL is not set | 1046 | # CONFIG_DEBUG_KERNEL is not set |
| 1035 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1047 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1036 | # CONFIG_SAMPLES is not set | 1048 | # CONFIG_SAMPLES is not set |
| 1049 | # CONFIG_IRQSTACKS is not set | ||
| 1037 | # CONFIG_PPC_EARLY_DEBUG is not set | 1050 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1038 | 1051 | ||
| 1039 | # | 1052 | # |
| @@ -1043,51 +1056,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1043 | # CONFIG_SECURITY is not set | 1056 | # CONFIG_SECURITY is not set |
| 1044 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1057 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1045 | CONFIG_CRYPTO=y | 1058 | CONFIG_CRYPTO=y |
| 1059 | |||
| 1060 | # | ||
| 1061 | # Crypto core or helper | ||
| 1062 | # | ||
| 1046 | CONFIG_CRYPTO_ALGAPI=y | 1063 | CONFIG_CRYPTO_ALGAPI=y |
| 1047 | CONFIG_CRYPTO_BLKCIPHER=y | 1064 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1048 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1049 | CONFIG_CRYPTO_MANAGER=y | 1065 | CONFIG_CRYPTO_MANAGER=y |
| 1066 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1067 | # CONFIG_CRYPTO_NULL is not set | ||
| 1068 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1069 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1070 | # CONFIG_CRYPTO_TEST is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Authenticated Encryption with Associated Data | ||
| 1074 | # | ||
| 1075 | # CONFIG_CRYPTO_CCM is not set | ||
| 1076 | # CONFIG_CRYPTO_GCM is not set | ||
| 1077 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1078 | |||
| 1079 | # | ||
| 1080 | # Block modes | ||
| 1081 | # | ||
| 1082 | CONFIG_CRYPTO_CBC=y | ||
| 1083 | # CONFIG_CRYPTO_CTR is not set | ||
| 1084 | # CONFIG_CRYPTO_CTS is not set | ||
| 1085 | CONFIG_CRYPTO_ECB=m | ||
| 1086 | # CONFIG_CRYPTO_LRW is not set | ||
| 1087 | CONFIG_CRYPTO_PCBC=m | ||
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | |||
| 1090 | # | ||
| 1091 | # Hash modes | ||
| 1092 | # | ||
| 1050 | # CONFIG_CRYPTO_HMAC is not set | 1093 | # CONFIG_CRYPTO_HMAC is not set |
| 1051 | # CONFIG_CRYPTO_XCBC is not set | 1094 | # CONFIG_CRYPTO_XCBC is not set |
| 1052 | # CONFIG_CRYPTO_NULL is not set | 1095 | |
| 1096 | # | ||
| 1097 | # Digest | ||
| 1098 | # | ||
| 1099 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1053 | # CONFIG_CRYPTO_MD4 is not set | 1100 | # CONFIG_CRYPTO_MD4 is not set |
| 1054 | CONFIG_CRYPTO_MD5=y | 1101 | CONFIG_CRYPTO_MD5=y |
| 1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1055 | # CONFIG_CRYPTO_SHA1 is not set | 1103 | # CONFIG_CRYPTO_SHA1 is not set |
| 1056 | # CONFIG_CRYPTO_SHA256 is not set | 1104 | # CONFIG_CRYPTO_SHA256 is not set |
| 1057 | # CONFIG_CRYPTO_SHA512 is not set | 1105 | # CONFIG_CRYPTO_SHA512 is not set |
| 1058 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1059 | # CONFIG_CRYPTO_TGR192 is not set | 1106 | # CONFIG_CRYPTO_TGR192 is not set |
| 1060 | # CONFIG_CRYPTO_GF128MUL is not set | 1107 | # CONFIG_CRYPTO_WP512 is not set |
| 1061 | CONFIG_CRYPTO_ECB=m | 1108 | |
| 1062 | CONFIG_CRYPTO_CBC=y | 1109 | # |
| 1063 | CONFIG_CRYPTO_PCBC=m | 1110 | # Ciphers |
| 1064 | # CONFIG_CRYPTO_LRW is not set | 1111 | # |
| 1065 | # CONFIG_CRYPTO_XTS is not set | ||
| 1066 | # CONFIG_CRYPTO_CTR is not set | ||
| 1067 | # CONFIG_CRYPTO_GCM is not set | ||
| 1068 | # CONFIG_CRYPTO_CCM is not set | ||
| 1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1070 | CONFIG_CRYPTO_DES=y | ||
| 1071 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1072 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1073 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1074 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1075 | # CONFIG_CRYPTO_AES is not set | 1112 | # CONFIG_CRYPTO_AES is not set |
| 1113 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1114 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1115 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1116 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1076 | # CONFIG_CRYPTO_CAST5 is not set | 1117 | # CONFIG_CRYPTO_CAST5 is not set |
| 1077 | # CONFIG_CRYPTO_CAST6 is not set | 1118 | # CONFIG_CRYPTO_CAST6 is not set |
| 1078 | # CONFIG_CRYPTO_TEA is not set | 1119 | CONFIG_CRYPTO_DES=y |
| 1079 | # CONFIG_CRYPTO_ARC4 is not set | 1120 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1080 | # CONFIG_CRYPTO_KHAZAD is not set | 1121 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1081 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1082 | # CONFIG_CRYPTO_SEED is not set | ||
| 1083 | # CONFIG_CRYPTO_SALSA20 is not set | 1122 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1123 | # CONFIG_CRYPTO_SEED is not set | ||
| 1124 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1125 | # CONFIG_CRYPTO_TEA is not set | ||
| 1126 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Compression | ||
| 1130 | # | ||
| 1084 | # CONFIG_CRYPTO_DEFLATE is not set | 1131 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1085 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1086 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1087 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1088 | # CONFIG_CRYPTO_TEST is not set | ||
| 1089 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1090 | # CONFIG_CRYPTO_LZO is not set | 1132 | # CONFIG_CRYPTO_LZO is not set |
| 1091 | CONFIG_CRYPTO_HW=y | 1133 | CONFIG_CRYPTO_HW=y |
| 1092 | # CONFIG_PPC_CLOCK is not set | 1134 | # CONFIG_PPC_CLOCK is not set |
| 1093 | CONFIG_PPC_LIB_RHEAP=y | 1135 | CONFIG_PPC_LIB_RHEAP=y |
| 1136 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 2075722911bb..3efab71a603b 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:08 2008 | 4 | # Mon Jun 9 09:03:46 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_MPC8560_ADS=y | |||
| 162 | CONFIG_MPC85xx_CDS=y | 167 | CONFIG_MPC85xx_CDS=y |
| 163 | CONFIG_MPC85xx_MDS=y | 168 | CONFIG_MPC85xx_MDS=y |
| 164 | CONFIG_MPC85xx_DS=y | 169 | CONFIG_MPC85xx_DS=y |
| 170 | CONFIG_KSI8560=y | ||
| 165 | # CONFIG_STX_GP3 is not set | 171 | # CONFIG_STX_GP3 is not set |
| 166 | CONFIG_TQM8540=y | 172 | CONFIG_TQM8540=y |
| 167 | CONFIG_TQM8541=y | 173 | CONFIG_TQM8541=y |
| @@ -221,11 +227,13 @@ CONFIG_FLATMEM=y | |||
| 221 | CONFIG_FLAT_NODE_MEM_MAP=y | 227 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 222 | # CONFIG_SPARSEMEM_STATIC is not set | 228 | # CONFIG_SPARSEMEM_STATIC is not set |
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 230 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 225 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
| 226 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 227 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| 228 | CONFIG_VIRT_TO_BUS=y | 235 | CONFIG_VIRT_TO_BUS=y |
| 236 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 229 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
| 230 | # CONFIG_CMDLINE_BOOL is not set | 238 | # CONFIG_CMDLINE_BOOL is not set |
| 231 | # CONFIG_PM is not set | 239 | # CONFIG_PM is not set |
| @@ -250,6 +258,7 @@ CONFIG_PCI_LEGACY=y | |||
| 250 | # CONFIG_PCI_DEBUG is not set | 258 | # CONFIG_PCI_DEBUG is not set |
| 251 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
| 252 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
| 261 | # CONFIG_HAS_RAPIDIO is not set | ||
| 253 | 262 | ||
| 254 | # | 263 | # |
| 255 | # Advanced setup | 264 | # Advanced setup |
| @@ -259,11 +268,12 @@ CONFIG_PCI_LEGACY=y | |||
| 259 | # | 268 | # |
| 260 | # Default settings for advanced configuration options are used | 269 | # Default settings for advanced configuration options are used |
| 261 | # | 270 | # |
| 262 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 263 | CONFIG_LOWMEM_SIZE=0x30000000 | 271 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 264 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
| 274 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 275 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 265 | CONFIG_TASK_SIZE=0xc0000000 | 276 | CONFIG_TASK_SIZE=0xc0000000 |
| 266 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 267 | 277 | ||
| 268 | # | 278 | # |
| 269 | # Networking | 279 | # Networking |
| @@ -334,8 +344,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 334 | CONFIG_INET6_XFRM_MODE_BEET=y | 344 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 345 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 336 | CONFIG_IPV6_SIT=y | 346 | CONFIG_IPV6_SIT=y |
| 347 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 337 | # CONFIG_IPV6_TUNNEL is not set | 348 | # CONFIG_IPV6_TUNNEL is not set |
| 338 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 349 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 350 | # CONFIG_IPV6_MROUTE is not set | ||
| 339 | # CONFIG_NETWORK_SECMARK is not set | 351 | # CONFIG_NETWORK_SECMARK is not set |
| 340 | # CONFIG_NETFILTER is not set | 352 | # CONFIG_NETFILTER is not set |
| 341 | # CONFIG_IP_DCCP is not set | 353 | # CONFIG_IP_DCCP is not set |
| @@ -397,6 +409,7 @@ CONFIG_FW_LOADER=y | |||
| 397 | # CONFIG_CONNECTOR is not set | 409 | # CONFIG_CONNECTOR is not set |
| 398 | # CONFIG_MTD is not set | 410 | # CONFIG_MTD is not set |
| 399 | CONFIG_OF_DEVICE=y | 411 | CONFIG_OF_DEVICE=y |
| 412 | CONFIG_OF_I2C=y | ||
| 400 | # CONFIG_PARPORT is not set | 413 | # CONFIG_PARPORT is not set |
| 401 | CONFIG_BLK_DEV=y | 414 | CONFIG_BLK_DEV=y |
| 402 | # CONFIG_BLK_DEV_FD is not set | 415 | # CONFIG_BLK_DEV_FD is not set |
| @@ -503,7 +516,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 503 | # CONFIG_SCSI_SRP is not set | 516 | # CONFIG_SCSI_SRP is not set |
| 504 | CONFIG_ATA=y | 517 | CONFIG_ATA=y |
| 505 | # CONFIG_ATA_NONSTANDARD is not set | 518 | # CONFIG_ATA_NONSTANDARD is not set |
| 519 | CONFIG_SATA_PMP=y | ||
| 506 | CONFIG_SATA_AHCI=y | 520 | CONFIG_SATA_AHCI=y |
| 521 | # CONFIG_SATA_SIL24 is not set | ||
| 522 | CONFIG_SATA_FSL=y | ||
| 523 | CONFIG_ATA_SFF=y | ||
| 507 | # CONFIG_SATA_SVW is not set | 524 | # CONFIG_SATA_SVW is not set |
| 508 | # CONFIG_ATA_PIIX is not set | 525 | # CONFIG_ATA_PIIX is not set |
| 509 | # CONFIG_SATA_MV is not set | 526 | # CONFIG_SATA_MV is not set |
| @@ -513,13 +530,11 @@ CONFIG_SATA_AHCI=y | |||
| 513 | # CONFIG_SATA_PROMISE is not set | 530 | # CONFIG_SATA_PROMISE is not set |
| 514 | # CONFIG_SATA_SX4 is not set | 531 | # CONFIG_SATA_SX4 is not set |
| 515 | # CONFIG_SATA_SIL is not set | 532 | # CONFIG_SATA_SIL is not set |
| 516 | # CONFIG_SATA_SIL24 is not set | ||
| 517 | # CONFIG_SATA_SIS is not set | 533 | # CONFIG_SATA_SIS is not set |
| 518 | # CONFIG_SATA_ULI is not set | 534 | # CONFIG_SATA_ULI is not set |
| 519 | # CONFIG_SATA_VIA is not set | 535 | # CONFIG_SATA_VIA is not set |
| 520 | # CONFIG_SATA_VITESSE is not set | 536 | # CONFIG_SATA_VITESSE is not set |
| 521 | # CONFIG_SATA_INIC162X is not set | 537 | # CONFIG_SATA_INIC162X is not set |
| 522 | # CONFIG_SATA_FSL is not set | ||
| 523 | CONFIG_PATA_ALI=y | 538 | CONFIG_PATA_ALI=y |
| 524 | # CONFIG_PATA_AMD is not set | 539 | # CONFIG_PATA_AMD is not set |
| 525 | # CONFIG_PATA_ARTOP is not set | 540 | # CONFIG_PATA_ARTOP is not set |
| @@ -559,6 +574,7 @@ CONFIG_PATA_ALI=y | |||
| 559 | # CONFIG_PATA_VIA is not set | 574 | # CONFIG_PATA_VIA is not set |
| 560 | # CONFIG_PATA_WINBOND is not set | 575 | # CONFIG_PATA_WINBOND is not set |
| 561 | # CONFIG_PATA_PLATFORM is not set | 576 | # CONFIG_PATA_PLATFORM is not set |
| 577 | # CONFIG_PATA_SCH is not set | ||
| 562 | # CONFIG_MD is not set | 578 | # CONFIG_MD is not set |
| 563 | # CONFIG_FUSION is not set | 579 | # CONFIG_FUSION is not set |
| 564 | 580 | ||
| @@ -625,7 +641,6 @@ CONFIG_NETDEV_1000=y | |||
| 625 | # CONFIG_SIS190 is not set | 641 | # CONFIG_SIS190 is not set |
| 626 | # CONFIG_SKGE is not set | 642 | # CONFIG_SKGE is not set |
| 627 | # CONFIG_SKY2 is not set | 643 | # CONFIG_SKY2 is not set |
| 628 | # CONFIG_SK98LIN is not set | ||
| 629 | # CONFIG_VIA_VELOCITY is not set | 644 | # CONFIG_VIA_VELOCITY is not set |
| 630 | # CONFIG_TIGON3 is not set | 645 | # CONFIG_TIGON3 is not set |
| 631 | # CONFIG_BNX2 is not set | 646 | # CONFIG_BNX2 is not set |
| @@ -646,6 +661,7 @@ CONFIG_NETDEV_10000=y | |||
| 646 | # CONFIG_MLX4_CORE is not set | 661 | # CONFIG_MLX4_CORE is not set |
| 647 | # CONFIG_TEHUTI is not set | 662 | # CONFIG_TEHUTI is not set |
| 648 | # CONFIG_BNX2X is not set | 663 | # CONFIG_BNX2X is not set |
| 664 | # CONFIG_SFC is not set | ||
| 649 | # CONFIG_TR is not set | 665 | # CONFIG_TR is not set |
| 650 | 666 | ||
| 651 | # | 667 | # |
| @@ -653,6 +669,7 @@ CONFIG_NETDEV_10000=y | |||
| 653 | # | 669 | # |
| 654 | # CONFIG_WLAN_PRE80211 is not set | 670 | # CONFIG_WLAN_PRE80211 is not set |
| 655 | # CONFIG_WLAN_80211 is not set | 671 | # CONFIG_WLAN_80211 is not set |
| 672 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 656 | 673 | ||
| 657 | # | 674 | # |
| 658 | # USB Network Adapters | 675 | # USB Network Adapters |
| @@ -717,6 +734,7 @@ CONFIG_VT=y | |||
| 717 | CONFIG_VT_CONSOLE=y | 734 | CONFIG_VT_CONSOLE=y |
| 718 | CONFIG_HW_CONSOLE=y | 735 | CONFIG_HW_CONSOLE=y |
| 719 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 736 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 737 | CONFIG_DEVKMEM=y | ||
| 720 | # CONFIG_SERIAL_NONSTANDARD is not set | 738 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 721 | # CONFIG_NOZOMI is not set | 739 | # CONFIG_NOZOMI is not set |
| 722 | 740 | ||
| @@ -750,7 +768,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 750 | # CONFIG_IPMI_HANDLER is not set | 768 | # CONFIG_IPMI_HANDLER is not set |
| 751 | # CONFIG_HW_RANDOM is not set | 769 | # CONFIG_HW_RANDOM is not set |
| 752 | CONFIG_NVRAM=y | 770 | CONFIG_NVRAM=y |
| 753 | # CONFIG_GEN_RTC is not set | ||
| 754 | # CONFIG_R3964 is not set | 771 | # CONFIG_R3964 is not set |
| 755 | # CONFIG_APPLICOM is not set | 772 | # CONFIG_APPLICOM is not set |
| 756 | # CONFIG_RAW_DRIVER is not set | 773 | # CONFIG_RAW_DRIVER is not set |
| @@ -761,13 +778,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 761 | # CONFIG_I2C_CHARDEV is not set | 778 | # CONFIG_I2C_CHARDEV is not set |
| 762 | 779 | ||
| 763 | # | 780 | # |
| 764 | # I2C Algorithms | ||
| 765 | # | ||
| 766 | # CONFIG_I2C_ALGOBIT is not set | ||
| 767 | # CONFIG_I2C_ALGOPCF is not set | ||
| 768 | # CONFIG_I2C_ALGOPCA is not set | ||
| 769 | |||
| 770 | # | ||
| 771 | # I2C Hardware Bus support | 781 | # I2C Hardware Bus support |
| 772 | # | 782 | # |
| 773 | # CONFIG_I2C_ALI1535 is not set | 783 | # CONFIG_I2C_ALI1535 is not set |
| @@ -794,6 +804,7 @@ CONFIG_I2C_MPC=y | |||
| 794 | # CONFIG_I2C_VIA is not set | 804 | # CONFIG_I2C_VIA is not set |
| 795 | # CONFIG_I2C_VIAPRO is not set | 805 | # CONFIG_I2C_VIAPRO is not set |
| 796 | # CONFIG_I2C_VOODOO3 is not set | 806 | # CONFIG_I2C_VOODOO3 is not set |
| 807 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 797 | 808 | ||
| 798 | # | 809 | # |
| 799 | # Miscellaneous I2C Chip support | 810 | # Miscellaneous I2C Chip support |
| @@ -803,19 +814,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 803 | # CONFIG_SENSORS_PCF8574 is not set | 814 | # CONFIG_SENSORS_PCF8574 is not set |
| 804 | # CONFIG_PCF8575 is not set | 815 | # CONFIG_PCF8575 is not set |
| 805 | # CONFIG_SENSORS_PCF8591 is not set | 816 | # CONFIG_SENSORS_PCF8591 is not set |
| 806 | # CONFIG_TPS65010 is not set | ||
| 807 | # CONFIG_SENSORS_MAX6875 is not set | 817 | # CONFIG_SENSORS_MAX6875 is not set |
| 808 | # CONFIG_SENSORS_TSL2550 is not set | 818 | # CONFIG_SENSORS_TSL2550 is not set |
| 809 | # CONFIG_I2C_DEBUG_CORE is not set | 819 | # CONFIG_I2C_DEBUG_CORE is not set |
| 810 | # CONFIG_I2C_DEBUG_ALGO is not set | 820 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 811 | # CONFIG_I2C_DEBUG_BUS is not set | 821 | # CONFIG_I2C_DEBUG_BUS is not set |
| 812 | # CONFIG_I2C_DEBUG_CHIP is not set | 822 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 813 | |||
| 814 | # | ||
| 815 | # SPI support | ||
| 816 | # | ||
| 817 | # CONFIG_SPI is not set | 823 | # CONFIG_SPI is not set |
| 818 | # CONFIG_SPI_MASTER is not set | ||
| 819 | # CONFIG_W1 is not set | 824 | # CONFIG_W1 is not set |
| 820 | # CONFIG_POWER_SUPPLY is not set | 825 | # CONFIG_POWER_SUPPLY is not set |
| 821 | # CONFIG_HWMON is not set | 826 | # CONFIG_HWMON is not set |
| @@ -832,13 +837,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 832 | # Multifunction device drivers | 837 | # Multifunction device drivers |
| 833 | # | 838 | # |
| 834 | # CONFIG_MFD_SM501 is not set | 839 | # CONFIG_MFD_SM501 is not set |
| 840 | # CONFIG_HTC_PASIC3 is not set | ||
| 835 | 841 | ||
| 836 | # | 842 | # |
| 837 | # Multimedia devices | 843 | # Multimedia devices |
| 838 | # | 844 | # |
| 845 | |||
| 846 | # | ||
| 847 | # Multimedia core support | ||
| 848 | # | ||
| 839 | # CONFIG_VIDEO_DEV is not set | 849 | # CONFIG_VIDEO_DEV is not set |
| 840 | CONFIG_DVB_CORE=m | 850 | CONFIG_DVB_CORE=m |
| 841 | # CONFIG_DVB_CORE_ATTACH is not set | 851 | CONFIG_VIDEO_MEDIA=m |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia drivers | ||
| 855 | # | ||
| 856 | # CONFIG_MEDIA_ATTACH is not set | ||
| 857 | CONFIG_MEDIA_TUNER=m | ||
| 858 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 859 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 860 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 861 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 862 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 863 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 864 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 865 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 866 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 842 | CONFIG_DVB_CAPTURE_DRIVERS=y | 867 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 843 | 868 | ||
| 844 | # | 869 | # |
| @@ -881,14 +906,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 881 | # | 906 | # |
| 882 | # DVB-S (satellite) frontends | 907 | # DVB-S (satellite) frontends |
| 883 | # | 908 | # |
| 884 | # CONFIG_DVB_STV0299 is not set | ||
| 885 | # CONFIG_DVB_CX24110 is not set | 909 | # CONFIG_DVB_CX24110 is not set |
| 886 | # CONFIG_DVB_CX24123 is not set | 910 | # CONFIG_DVB_CX24123 is not set |
| 887 | # CONFIG_DVB_TDA8083 is not set | ||
| 888 | # CONFIG_DVB_MT312 is not set | 911 | # CONFIG_DVB_MT312 is not set |
| 889 | # CONFIG_DVB_VES1X93 is not set | ||
| 890 | # CONFIG_DVB_S5H1420 is not set | 912 | # CONFIG_DVB_S5H1420 is not set |
| 913 | # CONFIG_DVB_STV0299 is not set | ||
| 914 | # CONFIG_DVB_TDA8083 is not set | ||
| 891 | # CONFIG_DVB_TDA10086 is not set | 915 | # CONFIG_DVB_TDA10086 is not set |
| 916 | # CONFIG_DVB_VES1X93 is not set | ||
| 917 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 918 | # CONFIG_DVB_TDA826X is not set | ||
| 919 | # CONFIG_DVB_TUA6100 is not set | ||
| 892 | 920 | ||
| 893 | # | 921 | # |
| 894 | # DVB-T (terrestrial) frontends | 922 | # DVB-T (terrestrial) frontends |
| @@ -906,6 +934,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 906 | # CONFIG_DVB_DIB3000MC is not set | 934 | # CONFIG_DVB_DIB3000MC is not set |
| 907 | # CONFIG_DVB_DIB7000M is not set | 935 | # CONFIG_DVB_DIB7000M is not set |
| 908 | # CONFIG_DVB_DIB7000P is not set | 936 | # CONFIG_DVB_DIB7000P is not set |
| 937 | # CONFIG_DVB_TDA10048 is not set | ||
| 909 | 938 | ||
| 910 | # | 939 | # |
| 911 | # DVB-C (cable) frontends | 940 | # DVB-C (cable) frontends |
| @@ -924,27 +953,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 924 | # CONFIG_DVB_BCM3510 is not set | 953 | # CONFIG_DVB_BCM3510 is not set |
| 925 | # CONFIG_DVB_LGDT330X is not set | 954 | # CONFIG_DVB_LGDT330X is not set |
| 926 | # CONFIG_DVB_S5H1409 is not set | 955 | # CONFIG_DVB_S5H1409 is not set |
| 956 | # CONFIG_DVB_AU8522 is not set | ||
| 957 | # CONFIG_DVB_S5H1411 is not set | ||
| 927 | 958 | ||
| 928 | # | 959 | # |
| 929 | # Tuners/PLL support | 960 | # Digital terrestrial only tuners/PLL |
| 930 | # | 961 | # |
| 931 | # CONFIG_DVB_PLL is not set | 962 | # CONFIG_DVB_PLL is not set |
| 932 | # CONFIG_DVB_TDA826X is not set | ||
| 933 | # CONFIG_DVB_TDA827X is not set | ||
| 934 | # CONFIG_DVB_TDA18271 is not set | ||
| 935 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 936 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 937 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 938 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 939 | # CONFIG_DVB_TUNER_DIB0070 is not set | 963 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 940 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 941 | 964 | ||
| 942 | # | 965 | # |
| 943 | # Miscellaneous devices | 966 | # SEC control devices for DVB-S |
| 944 | # | 967 | # |
| 945 | # CONFIG_DVB_LNBP21 is not set | 968 | # CONFIG_DVB_LNBP21 is not set |
| 969 | # CONFIG_DVB_ISL6405 is not set | ||
| 946 | # CONFIG_DVB_ISL6421 is not set | 970 | # CONFIG_DVB_ISL6421 is not set |
| 947 | # CONFIG_DVB_TUA6100 is not set | ||
| 948 | CONFIG_DAB=y | 971 | CONFIG_DAB=y |
| 949 | # CONFIG_USB_DABUSB is not set | 972 | # CONFIG_USB_DABUSB is not set |
| 950 | 973 | ||
| @@ -1011,6 +1034,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1011 | # CONFIG_SND_AU8810 is not set | 1034 | # CONFIG_SND_AU8810 is not set |
| 1012 | # CONFIG_SND_AU8820 is not set | 1035 | # CONFIG_SND_AU8820 is not set |
| 1013 | # CONFIG_SND_AU8830 is not set | 1036 | # CONFIG_SND_AU8830 is not set |
| 1037 | # CONFIG_SND_AW2 is not set | ||
| 1014 | # CONFIG_SND_AZT3328 is not set | 1038 | # CONFIG_SND_AZT3328 is not set |
| 1015 | # CONFIG_SND_BT87X is not set | 1039 | # CONFIG_SND_BT87X is not set |
| 1016 | # CONFIG_SND_CA0106 is not set | 1040 | # CONFIG_SND_CA0106 is not set |
| @@ -1085,11 +1109,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1085 | # CONFIG_SND_SOC is not set | 1109 | # CONFIG_SND_SOC is not set |
| 1086 | 1110 | ||
| 1087 | # | 1111 | # |
| 1088 | # SoC Audio support for SuperH | 1112 | # ALSA SoC audio for Freescale SOCs |
| 1089 | # | 1113 | # |
| 1090 | 1114 | ||
| 1091 | # | 1115 | # |
| 1092 | # ALSA SoC audio for Freescale SOCs | 1116 | # SoC Audio for the Texas Instruments OMAP |
| 1093 | # | 1117 | # |
| 1094 | 1118 | ||
| 1095 | # | 1119 | # |
| @@ -1124,16 +1148,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1124 | CONFIG_USB_DEVICE_CLASS=y | 1148 | CONFIG_USB_DEVICE_CLASS=y |
| 1125 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1149 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1126 | # CONFIG_USB_OTG is not set | 1150 | # CONFIG_USB_OTG is not set |
| 1151 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1152 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1127 | 1153 | ||
| 1128 | # | 1154 | # |
| 1129 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
| 1130 | # | 1156 | # |
| 1157 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1131 | CONFIG_USB_EHCI_HCD=y | 1158 | CONFIG_USB_EHCI_HCD=y |
| 1132 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1159 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1133 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1160 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1134 | # CONFIG_USB_EHCI_FSL is not set | 1161 | CONFIG_USB_EHCI_FSL=y |
| 1135 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1162 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1136 | # CONFIG_USB_ISP116X_HCD is not set | 1163 | # CONFIG_USB_ISP116X_HCD is not set |
| 1164 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1137 | CONFIG_USB_OHCI_HCD=y | 1165 | CONFIG_USB_OHCI_HCD=y |
| 1138 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1166 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1139 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1167 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1151,6 +1179,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1151 | # | 1179 | # |
| 1152 | # CONFIG_USB_ACM is not set | 1180 | # CONFIG_USB_ACM is not set |
| 1153 | # CONFIG_USB_PRINTER is not set | 1181 | # CONFIG_USB_PRINTER is not set |
| 1182 | # CONFIG_USB_WDM is not set | ||
| 1154 | 1183 | ||
| 1155 | # | 1184 | # |
| 1156 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1185 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1170,7 +1199,9 @@ CONFIG_USB_STORAGE=y | |||
| 1170 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1199 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1171 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1200 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1172 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1173 | # CONFIG_USB_STORAGE_KARMA is not set | 1203 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1204 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1174 | # CONFIG_USB_LIBUSUAL is not set | 1205 | # CONFIG_USB_LIBUSUAL is not set |
| 1175 | 1206 | ||
| 1176 | # | 1207 | # |
| @@ -1208,12 +1239,21 @@ CONFIG_USB_MON=y | |||
| 1208 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1239 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1209 | # CONFIG_USB_IOWARRIOR is not set | 1240 | # CONFIG_USB_IOWARRIOR is not set |
| 1210 | # CONFIG_USB_TEST is not set | 1241 | # CONFIG_USB_TEST is not set |
| 1242 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1211 | # CONFIG_USB_GADGET is not set | 1243 | # CONFIG_USB_GADGET is not set |
| 1212 | # CONFIG_MMC is not set | 1244 | # CONFIG_MMC is not set |
| 1213 | # CONFIG_MEMSTICK is not set | 1245 | # CONFIG_MEMSTICK is not set |
| 1214 | # CONFIG_NEW_LEDS is not set | 1246 | # CONFIG_NEW_LEDS is not set |
| 1247 | # CONFIG_ACCESSIBILITY is not set | ||
| 1215 | # CONFIG_INFINIBAND is not set | 1248 | # CONFIG_INFINIBAND is not set |
| 1216 | # CONFIG_EDAC is not set | 1249 | CONFIG_EDAC=y |
| 1250 | |||
| 1251 | # | ||
| 1252 | # Reporting subsystems | ||
| 1253 | # | ||
| 1254 | # CONFIG_EDAC_DEBUG is not set | ||
| 1255 | CONFIG_EDAC_MM_EDAC=y | ||
| 1256 | CONFIG_EDAC_MPC85XX=y | ||
| 1217 | CONFIG_RTC_LIB=y | 1257 | CONFIG_RTC_LIB=y |
| 1218 | CONFIG_RTC_CLASS=y | 1258 | CONFIG_RTC_CLASS=y |
| 1219 | CONFIG_RTC_HCTOSYS=y | 1259 | CONFIG_RTC_HCTOSYS=y |
| @@ -1263,11 +1303,19 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1263 | # | 1303 | # |
| 1264 | # on-CPU RTC drivers | 1304 | # on-CPU RTC drivers |
| 1265 | # | 1305 | # |
| 1266 | # CONFIG_DMADEVICES is not set | 1306 | # CONFIG_RTC_DRV_PPC is not set |
| 1307 | CONFIG_DMADEVICES=y | ||
| 1267 | 1308 | ||
| 1268 | # | 1309 | # |
| 1269 | # Userspace I/O | 1310 | # DMA Devices |
| 1270 | # | 1311 | # |
| 1312 | CONFIG_FSL_DMA=y | ||
| 1313 | CONFIG_DMA_ENGINE=y | ||
| 1314 | |||
| 1315 | # | ||
| 1316 | # DMA Clients | ||
| 1317 | # | ||
| 1318 | # CONFIG_NET_DMA is not set | ||
| 1271 | # CONFIG_UIO is not set | 1319 | # CONFIG_UIO is not set |
| 1272 | 1320 | ||
| 1273 | # | 1321 | # |
| @@ -1287,7 +1335,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1287 | # CONFIG_JFS_FS is not set | 1335 | # CONFIG_JFS_FS is not set |
| 1288 | # CONFIG_FS_POSIX_ACL is not set | 1336 | # CONFIG_FS_POSIX_ACL is not set |
| 1289 | # CONFIG_XFS_FS is not set | 1337 | # CONFIG_XFS_FS is not set |
| 1290 | # CONFIG_GFS2_FS is not set | ||
| 1291 | # CONFIG_OCFS2_FS is not set | 1338 | # CONFIG_OCFS2_FS is not set |
| 1292 | CONFIG_DNOTIFY=y | 1339 | CONFIG_DNOTIFY=y |
| 1293 | CONFIG_INOTIFY=y | 1340 | CONFIG_INOTIFY=y |
| @@ -1357,10 +1404,9 @@ CONFIG_NFS_FS=y | |||
| 1357 | CONFIG_NFS_V3=y | 1404 | CONFIG_NFS_V3=y |
| 1358 | # CONFIG_NFS_V3_ACL is not set | 1405 | # CONFIG_NFS_V3_ACL is not set |
| 1359 | CONFIG_NFS_V4=y | 1406 | CONFIG_NFS_V4=y |
| 1360 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1361 | CONFIG_NFSD=y | 1407 | CONFIG_NFSD=y |
| 1362 | # CONFIG_NFSD_V3 is not set | 1408 | # CONFIG_NFSD_V3 is not set |
| 1363 | CONFIG_NFSD_TCP=y | 1409 | # CONFIG_NFSD_V4 is not set |
| 1364 | CONFIG_ROOT_NFS=y | 1410 | CONFIG_ROOT_NFS=y |
| 1365 | CONFIG_LOCKD=y | 1411 | CONFIG_LOCKD=y |
| 1366 | CONFIG_LOCKD_V4=y | 1412 | CONFIG_LOCKD_V4=y |
| @@ -1444,9 +1490,10 @@ CONFIG_NLS_UTF8=m | |||
| 1444 | # Library routines | 1490 | # Library routines |
| 1445 | # | 1491 | # |
| 1446 | CONFIG_BITREVERSE=y | 1492 | CONFIG_BITREVERSE=y |
| 1493 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1447 | # CONFIG_CRC_CCITT is not set | 1494 | # CONFIG_CRC_CCITT is not set |
| 1448 | # CONFIG_CRC16 is not set | 1495 | # CONFIG_CRC16 is not set |
| 1449 | # CONFIG_CRC_ITU_T is not set | 1496 | CONFIG_CRC_ITU_T=m |
| 1450 | CONFIG_CRC32=y | 1497 | CONFIG_CRC32=y |
| 1451 | # CONFIG_CRC7 is not set | 1498 | # CONFIG_CRC7 is not set |
| 1452 | CONFIG_LIBCRC32C=m | 1499 | CONFIG_LIBCRC32C=m |
| @@ -1455,6 +1502,7 @@ CONFIG_PLIST=y | |||
| 1455 | CONFIG_HAS_IOMEM=y | 1502 | CONFIG_HAS_IOMEM=y |
| 1456 | CONFIG_HAS_IOPORT=y | 1503 | CONFIG_HAS_IOPORT=y |
| 1457 | CONFIG_HAS_DMA=y | 1504 | CONFIG_HAS_DMA=y |
| 1505 | CONFIG_HAVE_LMB=y | ||
| 1458 | 1506 | ||
| 1459 | # | 1507 | # |
| 1460 | # Kernel hacking | 1508 | # Kernel hacking |
| @@ -1462,6 +1510,7 @@ CONFIG_HAS_DMA=y | |||
| 1462 | # CONFIG_PRINTK_TIME is not set | 1510 | # CONFIG_PRINTK_TIME is not set |
| 1463 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1511 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1464 | CONFIG_ENABLE_MUST_CHECK=y | 1512 | CONFIG_ENABLE_MUST_CHECK=y |
| 1513 | CONFIG_FRAME_WARN=1024 | ||
| 1465 | # CONFIG_MAGIC_SYSRQ is not set | 1514 | # CONFIG_MAGIC_SYSRQ is not set |
| 1466 | # CONFIG_UNUSED_SYMBOLS is not set | 1515 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1467 | # CONFIG_DEBUG_FS is not set | 1516 | # CONFIG_DEBUG_FS is not set |
| @@ -1472,6 +1521,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1472 | CONFIG_SCHED_DEBUG=y | 1521 | CONFIG_SCHED_DEBUG=y |
| 1473 | # CONFIG_SCHEDSTATS is not set | 1522 | # CONFIG_SCHEDSTATS is not set |
| 1474 | # CONFIG_TIMER_STATS is not set | 1523 | # CONFIG_TIMER_STATS is not set |
| 1524 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1475 | # CONFIG_SLUB_DEBUG_ON is not set | 1525 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1476 | # CONFIG_SLUB_STATS is not set | 1526 | # CONFIG_SLUB_STATS is not set |
| 1477 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1527 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1485,6 +1535,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1485 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1535 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1486 | CONFIG_DEBUG_INFO=y | 1536 | CONFIG_DEBUG_INFO=y |
| 1487 | # CONFIG_DEBUG_VM is not set | 1537 | # CONFIG_DEBUG_VM is not set |
| 1538 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1488 | # CONFIG_DEBUG_LIST is not set | 1539 | # CONFIG_DEBUG_LIST is not set |
| 1489 | # CONFIG_DEBUG_SG is not set | 1540 | # CONFIG_DEBUG_SG is not set |
| 1490 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1541 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1497,6 +1548,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1497 | # CONFIG_DEBUG_PAGEALLOC is not set | 1548 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1498 | # CONFIG_DEBUGGER is not set | 1549 | # CONFIG_DEBUGGER is not set |
| 1499 | # CONFIG_KGDB_CONSOLE is not set | 1550 | # CONFIG_KGDB_CONSOLE is not set |
| 1551 | # CONFIG_IRQSTACKS is not set | ||
| 1500 | # CONFIG_BDI_SWITCH is not set | 1552 | # CONFIG_BDI_SWITCH is not set |
| 1501 | # CONFIG_PPC_EARLY_DEBUG is not set | 1553 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1502 | 1554 | ||
| @@ -1507,53 +1559,83 @@ CONFIG_DEBUG_INFO=y | |||
| 1507 | # CONFIG_SECURITY is not set | 1559 | # CONFIG_SECURITY is not set |
| 1508 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1560 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1509 | CONFIG_CRYPTO=y | 1561 | CONFIG_CRYPTO=y |
| 1562 | |||
| 1563 | # | ||
| 1564 | # Crypto core or helper | ||
| 1565 | # | ||
| 1510 | CONFIG_CRYPTO_ALGAPI=y | 1566 | CONFIG_CRYPTO_ALGAPI=y |
| 1511 | CONFIG_CRYPTO_BLKCIPHER=y | 1567 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1512 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1513 | CONFIG_CRYPTO_HASH=y | 1568 | CONFIG_CRYPTO_HASH=y |
| 1514 | CONFIG_CRYPTO_MANAGER=y | 1569 | CONFIG_CRYPTO_MANAGER=y |
| 1570 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1571 | # CONFIG_CRYPTO_NULL is not set | ||
| 1572 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1573 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1574 | # CONFIG_CRYPTO_TEST is not set | ||
| 1575 | |||
| 1576 | # | ||
| 1577 | # Authenticated Encryption with Associated Data | ||
| 1578 | # | ||
| 1579 | # CONFIG_CRYPTO_CCM is not set | ||
| 1580 | # CONFIG_CRYPTO_GCM is not set | ||
| 1581 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1582 | |||
| 1583 | # | ||
| 1584 | # Block modes | ||
| 1585 | # | ||
| 1586 | CONFIG_CRYPTO_CBC=y | ||
| 1587 | # CONFIG_CRYPTO_CTR is not set | ||
| 1588 | # CONFIG_CRYPTO_CTS is not set | ||
| 1589 | # CONFIG_CRYPTO_ECB is not set | ||
| 1590 | # CONFIG_CRYPTO_LRW is not set | ||
| 1591 | CONFIG_CRYPTO_PCBC=m | ||
| 1592 | # CONFIG_CRYPTO_XTS is not set | ||
| 1593 | |||
| 1594 | # | ||
| 1595 | # Hash modes | ||
| 1596 | # | ||
| 1515 | CONFIG_CRYPTO_HMAC=y | 1597 | CONFIG_CRYPTO_HMAC=y |
| 1516 | # CONFIG_CRYPTO_XCBC is not set | 1598 | # CONFIG_CRYPTO_XCBC is not set |
| 1517 | # CONFIG_CRYPTO_NULL is not set | 1599 | |
| 1600 | # | ||
| 1601 | # Digest | ||
| 1602 | # | ||
| 1603 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1518 | # CONFIG_CRYPTO_MD4 is not set | 1604 | # CONFIG_CRYPTO_MD4 is not set |
| 1519 | CONFIG_CRYPTO_MD5=y | 1605 | CONFIG_CRYPTO_MD5=y |
| 1606 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1520 | CONFIG_CRYPTO_SHA1=m | 1607 | CONFIG_CRYPTO_SHA1=m |
| 1521 | # CONFIG_CRYPTO_SHA256 is not set | 1608 | # CONFIG_CRYPTO_SHA256 is not set |
| 1522 | # CONFIG_CRYPTO_SHA512 is not set | 1609 | # CONFIG_CRYPTO_SHA512 is not set |
| 1523 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1524 | # CONFIG_CRYPTO_TGR192 is not set | 1610 | # CONFIG_CRYPTO_TGR192 is not set |
| 1525 | # CONFIG_CRYPTO_GF128MUL is not set | 1611 | # CONFIG_CRYPTO_WP512 is not set |
| 1526 | # CONFIG_CRYPTO_ECB is not set | 1612 | |
| 1527 | CONFIG_CRYPTO_CBC=y | 1613 | # |
| 1528 | CONFIG_CRYPTO_PCBC=m | 1614 | # Ciphers |
| 1529 | # CONFIG_CRYPTO_LRW is not set | 1615 | # |
| 1530 | # CONFIG_CRYPTO_XTS is not set | ||
| 1531 | # CONFIG_CRYPTO_CTR is not set | ||
| 1532 | # CONFIG_CRYPTO_GCM is not set | ||
| 1533 | # CONFIG_CRYPTO_CCM is not set | ||
| 1534 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1535 | CONFIG_CRYPTO_DES=y | ||
| 1536 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1537 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1538 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1539 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1540 | # CONFIG_CRYPTO_AES is not set | 1616 | # CONFIG_CRYPTO_AES is not set |
| 1617 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1618 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1619 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1620 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1541 | # CONFIG_CRYPTO_CAST5 is not set | 1621 | # CONFIG_CRYPTO_CAST5 is not set |
| 1542 | # CONFIG_CRYPTO_CAST6 is not set | 1622 | # CONFIG_CRYPTO_CAST6 is not set |
| 1543 | # CONFIG_CRYPTO_TEA is not set | 1623 | CONFIG_CRYPTO_DES=y |
| 1544 | # CONFIG_CRYPTO_ARC4 is not set | 1624 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1545 | # CONFIG_CRYPTO_KHAZAD is not set | 1625 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1546 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1547 | # CONFIG_CRYPTO_SEED is not set | ||
| 1548 | # CONFIG_CRYPTO_SALSA20 is not set | 1626 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1627 | # CONFIG_CRYPTO_SEED is not set | ||
| 1628 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1629 | # CONFIG_CRYPTO_TEA is not set | ||
| 1630 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1631 | |||
| 1632 | # | ||
| 1633 | # Compression | ||
| 1634 | # | ||
| 1549 | # CONFIG_CRYPTO_DEFLATE is not set | 1635 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1550 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1551 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1552 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1553 | # CONFIG_CRYPTO_TEST is not set | ||
| 1554 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1555 | # CONFIG_CRYPTO_LZO is not set | 1636 | # CONFIG_CRYPTO_LZO is not set |
| 1556 | CONFIG_CRYPTO_HW=y | 1637 | CONFIG_CRYPTO_HW=y |
| 1557 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1638 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1558 | # CONFIG_PPC_CLOCK is not set | 1639 | # CONFIG_PPC_CLOCK is not set |
| 1559 | CONFIG_PPC_LIB_RHEAP=y | 1640 | CONFIG_PPC_LIB_RHEAP=y |
| 1641 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig index 7e5b9ce58d89..5612d40d0463 100644 --- a/arch/powerpc/configs/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/mpc8610_hpcd_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:33 2008 | 4 | # Mon Jun 9 08:50:24 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -60,9 +62,10 @@ CONFIG_EXPERIMENTAL=y | |||
| 60 | CONFIG_BROKEN_ON_SMP=y | 62 | CONFIG_BROKEN_ON_SMP=y |
| 61 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 63 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 62 | CONFIG_LOCALVERSION="" | 64 | CONFIG_LOCALVERSION="" |
| 63 | # CONFIG_LOCALVERSION_AUTO is not set | 65 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | # CONFIG_SWAP is not set | 66 | # CONFIG_SWAP is not set |
| 65 | # CONFIG_SYSVIPC is not set | 67 | CONFIG_SYSVIPC=y |
| 68 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 66 | # CONFIG_POSIX_MQUEUE is not set | 69 | # CONFIG_POSIX_MQUEUE is not set |
| 67 | # CONFIG_BSD_PROCESS_ACCT is not set | 70 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 68 | # CONFIG_TASKSTATS is not set | 71 | # CONFIG_TASKSTATS is not set |
| @@ -86,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 91 | CONFIG_KALLSYMS_EXTRA_PASS=y | 95 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -110,14 +114,22 @@ CONFIG_SLUB=y | |||
| 110 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 117 | # CONFIG_KPROBES is not set | ||
| 113 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| 119 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
| 120 | # CONFIG_MODULES is not set | 126 | CONFIG_MODULES=y |
| 127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 128 | CONFIG_MODULE_UNLOAD=y | ||
| 129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 130 | # CONFIG_MODVERSIONS is not set | ||
| 131 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 132 | CONFIG_KMOD=y | ||
| 121 | CONFIG_BLOCK=y | 133 | CONFIG_BLOCK=y |
| 122 | # CONFIG_LBD is not set | 134 | # CONFIG_LBD is not set |
| 123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| @@ -151,6 +163,7 @@ CONFIG_PPC_86xx=y | |||
| 151 | # CONFIG_PPC_CELL_NATIVE is not set | 163 | # CONFIG_PPC_CELL_NATIVE is not set |
| 152 | # CONFIG_PQ2ADS is not set | 164 | # CONFIG_PQ2ADS is not set |
| 153 | # CONFIG_MPC8641_HPCN is not set | 165 | # CONFIG_MPC8641_HPCN is not set |
| 166 | # CONFIG_SBC8641D is not set | ||
| 154 | CONFIG_MPC8610_HPCD=y | 167 | CONFIG_MPC8610_HPCD=y |
| 155 | CONFIG_MPC8610=y | 168 | CONFIG_MPC8610=y |
| 156 | # CONFIG_IPIC is not set | 169 | # CONFIG_IPIC is not set |
| @@ -199,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 199 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 200 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 201 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 202 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 203 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 204 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 205 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 206 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=12 | ||
| 207 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
| 208 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 209 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -223,12 +238,14 @@ CONFIG_PCI_DOMAINS=y | |||
| 223 | CONFIG_PCI_SYSCALL=y | 238 | CONFIG_PCI_SYSCALL=y |
| 224 | CONFIG_PCIEPORTBUS=y | 239 | CONFIG_PCIEPORTBUS=y |
| 225 | CONFIG_PCIEAER=y | 240 | CONFIG_PCIEAER=y |
| 241 | # CONFIG_PCIEASPM is not set | ||
| 226 | CONFIG_ARCH_SUPPORTS_MSI=y | 242 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 227 | # CONFIG_PCI_MSI is not set | 243 | # CONFIG_PCI_MSI is not set |
| 228 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 229 | CONFIG_PCI_DEBUG=y | 245 | CONFIG_PCI_DEBUG=y |
| 230 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 231 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 249 | ||
| 233 | # | 250 | # |
| 234 | # Advanced setup | 251 | # Advanced setup |
| @@ -238,11 +255,11 @@ CONFIG_PCI_DEBUG=y | |||
| 238 | # | 255 | # |
| 239 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 240 | # | 257 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 263 | ||
| 247 | # | 264 | # |
| 248 | # Networking | 265 | # Networking |
| @@ -303,8 +320,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 303 | CONFIG_INET6_XFRM_MODE_BEET=y | 320 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 304 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 321 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 305 | CONFIG_IPV6_SIT=y | 322 | CONFIG_IPV6_SIT=y |
| 323 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 306 | # CONFIG_IPV6_TUNNEL is not set | 324 | # CONFIG_IPV6_TUNNEL is not set |
| 307 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 325 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 326 | # CONFIG_IPV6_MROUTE is not set | ||
| 308 | # CONFIG_NETWORK_SECMARK is not set | 327 | # CONFIG_NETWORK_SECMARK is not set |
| 309 | # CONFIG_NETFILTER is not set | 328 | # CONFIG_NETFILTER is not set |
| 310 | # CONFIG_IP_DCCP is not set | 329 | # CONFIG_IP_DCCP is not set |
| @@ -446,6 +465,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 446 | # | 465 | # |
| 447 | # CONFIG_MTD_UBI is not set | 466 | # CONFIG_MTD_UBI is not set |
| 448 | CONFIG_OF_DEVICE=y | 467 | CONFIG_OF_DEVICE=y |
| 468 | CONFIG_OF_I2C=y | ||
| 449 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
| 450 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
| 451 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
| @@ -504,6 +524,7 @@ CONFIG_CHR_DEV_SG=y | |||
| 504 | # CONFIG_SCSI_CONSTANTS is not set | 524 | # CONFIG_SCSI_CONSTANTS is not set |
| 505 | # CONFIG_SCSI_LOGGING is not set | 525 | # CONFIG_SCSI_LOGGING is not set |
| 506 | # CONFIG_SCSI_SCAN_ASYNC is not set | 526 | # CONFIG_SCSI_SCAN_ASYNC is not set |
| 527 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 507 | 528 | ||
| 508 | # | 529 | # |
| 509 | # SCSI Transports | 530 | # SCSI Transports |
| @@ -553,7 +574,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 553 | # CONFIG_SCSI_SRP is not set | 574 | # CONFIG_SCSI_SRP is not set |
| 554 | CONFIG_ATA=y | 575 | CONFIG_ATA=y |
| 555 | # CONFIG_ATA_NONSTANDARD is not set | 576 | # CONFIG_ATA_NONSTANDARD is not set |
| 577 | CONFIG_SATA_PMP=y | ||
| 556 | CONFIG_SATA_AHCI=y | 578 | CONFIG_SATA_AHCI=y |
| 579 | # CONFIG_SATA_SIL24 is not set | ||
| 580 | # CONFIG_SATA_FSL is not set | ||
| 581 | CONFIG_ATA_SFF=y | ||
| 557 | # CONFIG_SATA_SVW is not set | 582 | # CONFIG_SATA_SVW is not set |
| 558 | # CONFIG_ATA_PIIX is not set | 583 | # CONFIG_ATA_PIIX is not set |
| 559 | # CONFIG_SATA_MV is not set | 584 | # CONFIG_SATA_MV is not set |
| @@ -563,13 +588,11 @@ CONFIG_SATA_AHCI=y | |||
| 563 | # CONFIG_SATA_PROMISE is not set | 588 | # CONFIG_SATA_PROMISE is not set |
| 564 | # CONFIG_SATA_SX4 is not set | 589 | # CONFIG_SATA_SX4 is not set |
| 565 | # CONFIG_SATA_SIL is not set | 590 | # CONFIG_SATA_SIL is not set |
| 566 | # CONFIG_SATA_SIL24 is not set | ||
| 567 | # CONFIG_SATA_SIS is not set | 591 | # CONFIG_SATA_SIS is not set |
| 568 | # CONFIG_SATA_ULI is not set | 592 | # CONFIG_SATA_ULI is not set |
| 569 | # CONFIG_SATA_VIA is not set | 593 | # CONFIG_SATA_VIA is not set |
| 570 | # CONFIG_SATA_VITESSE is not set | 594 | # CONFIG_SATA_VITESSE is not set |
| 571 | # CONFIG_SATA_INIC162X is not set | 595 | # CONFIG_SATA_INIC162X is not set |
| 572 | # CONFIG_SATA_FSL is not set | ||
| 573 | CONFIG_PATA_ALI=y | 596 | CONFIG_PATA_ALI=y |
| 574 | # CONFIG_PATA_AMD is not set | 597 | # CONFIG_PATA_AMD is not set |
| 575 | # CONFIG_PATA_ARTOP is not set | 598 | # CONFIG_PATA_ARTOP is not set |
| @@ -609,6 +632,7 @@ CONFIG_PATA_ALI=y | |||
| 609 | # CONFIG_PATA_VIA is not set | 632 | # CONFIG_PATA_VIA is not set |
| 610 | # CONFIG_PATA_WINBOND is not set | 633 | # CONFIG_PATA_WINBOND is not set |
| 611 | # CONFIG_PATA_PLATFORM is not set | 634 | # CONFIG_PATA_PLATFORM is not set |
| 635 | # CONFIG_PATA_SCH is not set | ||
| 612 | # CONFIG_MD is not set | 636 | # CONFIG_MD is not set |
| 613 | # CONFIG_FUSION is not set | 637 | # CONFIG_FUSION is not set |
| 614 | 638 | ||
| @@ -628,25 +652,9 @@ CONFIG_DUMMY=y | |||
| 628 | # CONFIG_TUN is not set | 652 | # CONFIG_TUN is not set |
| 629 | # CONFIG_VETH is not set | 653 | # CONFIG_VETH is not set |
| 630 | # CONFIG_ARCNET is not set | 654 | # CONFIG_ARCNET is not set |
| 631 | CONFIG_PHYLIB=y | 655 | # CONFIG_PHYLIB is not set |
| 632 | |||
| 633 | # | ||
| 634 | # MII PHY device drivers | ||
| 635 | # | ||
| 636 | # CONFIG_MARVELL_PHY is not set | ||
| 637 | # CONFIG_DAVICOM_PHY is not set | ||
| 638 | # CONFIG_QSEMI_PHY is not set | ||
| 639 | # CONFIG_LXT_PHY is not set | ||
| 640 | # CONFIG_CICADA_PHY is not set | ||
| 641 | # CONFIG_VITESSE_PHY is not set | ||
| 642 | # CONFIG_SMSC_PHY is not set | ||
| 643 | # CONFIG_BROADCOM_PHY is not set | ||
| 644 | # CONFIG_ICPLUS_PHY is not set | ||
| 645 | # CONFIG_REALTEK_PHY is not set | ||
| 646 | # CONFIG_FIXED_PHY is not set | ||
| 647 | # CONFIG_MDIO_BITBANG is not set | ||
| 648 | CONFIG_NET_ETHERNET=y | 656 | CONFIG_NET_ETHERNET=y |
| 649 | CONFIG_MII=y | 657 | # CONFIG_MII is not set |
| 650 | # CONFIG_HAPPYMEAL is not set | 658 | # CONFIG_HAPPYMEAL is not set |
| 651 | # CONFIG_SUNGEM is not set | 659 | # CONFIG_SUNGEM is not set |
| 652 | # CONFIG_CASSINI is not set | 660 | # CONFIG_CASSINI is not set |
| @@ -663,64 +671,10 @@ CONFIG_ULI526X=y | |||
| 663 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 671 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 664 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 672 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 665 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 673 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 666 | CONFIG_NET_PCI=y | 674 | # CONFIG_NET_PCI is not set |
| 667 | # CONFIG_PCNET32 is not set | ||
| 668 | # CONFIG_AMD8111_ETH is not set | ||
| 669 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
| 670 | # CONFIG_B44 is not set | 675 | # CONFIG_B44 is not set |
| 671 | # CONFIG_FORCEDETH is not set | 676 | # CONFIG_NETDEV_1000 is not set |
| 672 | # CONFIG_EEPRO100 is not set | 677 | # CONFIG_NETDEV_10000 is not set |
| 673 | # CONFIG_E100 is not set | ||
| 674 | # CONFIG_FEALNX is not set | ||
| 675 | # CONFIG_NATSEMI is not set | ||
| 676 | # CONFIG_NE2K_PCI is not set | ||
| 677 | # CONFIG_8139CP is not set | ||
| 678 | CONFIG_8139TOO=y | ||
| 679 | CONFIG_8139TOO_PIO=y | ||
| 680 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
| 681 | # CONFIG_8139TOO_8129 is not set | ||
| 682 | # CONFIG_8139_OLD_RX_RESET is not set | ||
| 683 | # CONFIG_R6040 is not set | ||
| 684 | # CONFIG_SIS900 is not set | ||
| 685 | # CONFIG_EPIC100 is not set | ||
| 686 | # CONFIG_SUNDANCE is not set | ||
| 687 | # CONFIG_TLAN is not set | ||
| 688 | # CONFIG_VIA_RHINE is not set | ||
| 689 | # CONFIG_SC92031 is not set | ||
| 690 | CONFIG_NETDEV_1000=y | ||
| 691 | # CONFIG_ACENIC is not set | ||
| 692 | # CONFIG_DL2K is not set | ||
| 693 | # CONFIG_E1000 is not set | ||
| 694 | # CONFIG_E1000E is not set | ||
| 695 | # CONFIG_E1000E_ENABLED is not set | ||
| 696 | # CONFIG_IP1000 is not set | ||
| 697 | # CONFIG_IGB is not set | ||
| 698 | # CONFIG_NS83820 is not set | ||
| 699 | # CONFIG_HAMACHI is not set | ||
| 700 | # CONFIG_YELLOWFIN is not set | ||
| 701 | # CONFIG_R8169 is not set | ||
| 702 | # CONFIG_SIS190 is not set | ||
| 703 | # CONFIG_SKGE is not set | ||
| 704 | # CONFIG_SKY2 is not set | ||
| 705 | # CONFIG_SK98LIN is not set | ||
| 706 | # CONFIG_VIA_VELOCITY is not set | ||
| 707 | # CONFIG_TIGON3 is not set | ||
| 708 | # CONFIG_BNX2 is not set | ||
| 709 | # CONFIG_GIANFAR is not set | ||
| 710 | # CONFIG_QLA3XXX is not set | ||
| 711 | # CONFIG_ATL1 is not set | ||
| 712 | CONFIG_NETDEV_10000=y | ||
| 713 | # CONFIG_CHELSIO_T1 is not set | ||
| 714 | # CONFIG_CHELSIO_T3 is not set | ||
| 715 | # CONFIG_IXGBE is not set | ||
| 716 | # CONFIG_IXGB is not set | ||
| 717 | # CONFIG_S2IO is not set | ||
| 718 | # CONFIG_MYRI10GE is not set | ||
| 719 | # CONFIG_NETXEN_NIC is not set | ||
| 720 | # CONFIG_NIU is not set | ||
| 721 | # CONFIG_MLX4_CORE is not set | ||
| 722 | # CONFIG_TEHUTI is not set | ||
| 723 | # CONFIG_BNX2X is not set | ||
| 724 | # CONFIG_TR is not set | 678 | # CONFIG_TR is not set |
| 725 | 679 | ||
| 726 | # | 680 | # |
| @@ -728,6 +682,7 @@ CONFIG_NETDEV_10000=y | |||
| 728 | # | 682 | # |
| 729 | # CONFIG_WLAN_PRE80211 is not set | 683 | # CONFIG_WLAN_PRE80211 is not set |
| 730 | # CONFIG_WLAN_80211 is not set | 684 | # CONFIG_WLAN_80211 is not set |
| 685 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 731 | # CONFIG_WAN is not set | 686 | # CONFIG_WAN is not set |
| 732 | # CONFIG_FDDI is not set | 687 | # CONFIG_FDDI is not set |
| 733 | # CONFIG_HIPPI is not set | 688 | # CONFIG_HIPPI is not set |
| @@ -783,6 +738,7 @@ CONFIG_VT=y | |||
| 783 | CONFIG_VT_CONSOLE=y | 738 | CONFIG_VT_CONSOLE=y |
| 784 | CONFIG_HW_CONSOLE=y | 739 | CONFIG_HW_CONSOLE=y |
| 785 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 740 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 741 | CONFIG_DEVKMEM=y | ||
| 786 | # CONFIG_SERIAL_NONSTANDARD is not set | 742 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 787 | # CONFIG_NOZOMI is not set | 743 | # CONFIG_NOZOMI is not set |
| 788 | 744 | ||
| @@ -824,13 +780,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 824 | # CONFIG_I2C_CHARDEV is not set | 780 | # CONFIG_I2C_CHARDEV is not set |
| 825 | 781 | ||
| 826 | # | 782 | # |
| 827 | # I2C Algorithms | ||
| 828 | # | ||
| 829 | # CONFIG_I2C_ALGOBIT is not set | ||
| 830 | # CONFIG_I2C_ALGOPCF is not set | ||
| 831 | # CONFIG_I2C_ALGOPCA is not set | ||
| 832 | |||
| 833 | # | ||
| 834 | # I2C Hardware Bus support | 783 | # I2C Hardware Bus support |
| 835 | # | 784 | # |
| 836 | # CONFIG_I2C_ALI1535 is not set | 785 | # CONFIG_I2C_ALI1535 is not set |
| @@ -852,9 +801,11 @@ CONFIG_I2C_MPC=y | |||
| 852 | # CONFIG_I2C_SIS630 is not set | 801 | # CONFIG_I2C_SIS630 is not set |
| 853 | # CONFIG_I2C_SIS96X is not set | 802 | # CONFIG_I2C_SIS96X is not set |
| 854 | # CONFIG_I2C_TAOS_EVM is not set | 803 | # CONFIG_I2C_TAOS_EVM is not set |
| 804 | # CONFIG_I2C_STUB is not set | ||
| 855 | # CONFIG_I2C_VIA is not set | 805 | # CONFIG_I2C_VIA is not set |
| 856 | # CONFIG_I2C_VIAPRO is not set | 806 | # CONFIG_I2C_VIAPRO is not set |
| 857 | # CONFIG_I2C_VOODOO3 is not set | 807 | # CONFIG_I2C_VOODOO3 is not set |
| 808 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 858 | 809 | ||
| 859 | # | 810 | # |
| 860 | # Miscellaneous I2C Chip support | 811 | # Miscellaneous I2C Chip support |
| @@ -864,19 +815,13 @@ CONFIG_I2C_MPC=y | |||
| 864 | # CONFIG_SENSORS_PCF8574 is not set | 815 | # CONFIG_SENSORS_PCF8574 is not set |
| 865 | # CONFIG_PCF8575 is not set | 816 | # CONFIG_PCF8575 is not set |
| 866 | # CONFIG_SENSORS_PCF8591 is not set | 817 | # CONFIG_SENSORS_PCF8591 is not set |
| 867 | # CONFIG_TPS65010 is not set | ||
| 868 | # CONFIG_SENSORS_MAX6875 is not set | 818 | # CONFIG_SENSORS_MAX6875 is not set |
| 869 | # CONFIG_SENSORS_TSL2550 is not set | 819 | # CONFIG_SENSORS_TSL2550 is not set |
| 870 | # CONFIG_I2C_DEBUG_CORE is not set | 820 | # CONFIG_I2C_DEBUG_CORE is not set |
| 871 | # CONFIG_I2C_DEBUG_ALGO is not set | 821 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 872 | # CONFIG_I2C_DEBUG_BUS is not set | 822 | # CONFIG_I2C_DEBUG_BUS is not set |
| 873 | # CONFIG_I2C_DEBUG_CHIP is not set | 823 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 874 | |||
| 875 | # | ||
| 876 | # SPI support | ||
| 877 | # | ||
| 878 | # CONFIG_SPI is not set | 824 | # CONFIG_SPI is not set |
| 879 | # CONFIG_SPI_MASTER is not set | ||
| 880 | # CONFIG_W1 is not set | 825 | # CONFIG_W1 is not set |
| 881 | # CONFIG_POWER_SUPPLY is not set | 826 | # CONFIG_POWER_SUPPLY is not set |
| 882 | # CONFIG_HWMON is not set | 827 | # CONFIG_HWMON is not set |
| @@ -893,12 +838,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 893 | # Multifunction device drivers | 838 | # Multifunction device drivers |
| 894 | # | 839 | # |
| 895 | # CONFIG_MFD_SM501 is not set | 840 | # CONFIG_MFD_SM501 is not set |
| 841 | # CONFIG_HTC_PASIC3 is not set | ||
| 896 | 842 | ||
| 897 | # | 843 | # |
| 898 | # Multimedia devices | 844 | # Multimedia devices |
| 899 | # | 845 | # |
| 846 | |||
| 847 | # | ||
| 848 | # Multimedia core support | ||
| 849 | # | ||
| 900 | # CONFIG_VIDEO_DEV is not set | 850 | # CONFIG_VIDEO_DEV is not set |
| 901 | # CONFIG_DVB_CORE is not set | 851 | # CONFIG_DVB_CORE is not set |
| 852 | # CONFIG_VIDEO_MEDIA is not set | ||
| 853 | |||
| 854 | # | ||
| 855 | # Multimedia drivers | ||
| 856 | # | ||
| 902 | CONFIG_DAB=y | 857 | CONFIG_DAB=y |
| 903 | 858 | ||
| 904 | # | 859 | # |
| @@ -908,7 +863,56 @@ CONFIG_DAB=y | |||
| 908 | # CONFIG_DRM is not set | 863 | # CONFIG_DRM is not set |
| 909 | # CONFIG_VGASTATE is not set | 864 | # CONFIG_VGASTATE is not set |
| 910 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 865 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| 911 | # CONFIG_FB is not set | 866 | CONFIG_FB=y |
| 867 | # CONFIG_FIRMWARE_EDID is not set | ||
| 868 | # CONFIG_FB_DDC is not set | ||
| 869 | CONFIG_FB_CFB_FILLRECT=y | ||
| 870 | CONFIG_FB_CFB_COPYAREA=y | ||
| 871 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 872 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 873 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 874 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 875 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 876 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 877 | # CONFIG_FB_SYS_FOPS is not set | ||
| 878 | # CONFIG_FB_SVGALIB is not set | ||
| 879 | # CONFIG_FB_MACMODES is not set | ||
| 880 | # CONFIG_FB_BACKLIGHT is not set | ||
| 881 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 882 | # CONFIG_FB_TILEBLITTING is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # Frame buffer hardware drivers | ||
| 886 | # | ||
| 887 | # CONFIG_FB_CIRRUS is not set | ||
| 888 | # CONFIG_FB_PM2 is not set | ||
| 889 | # CONFIG_FB_CYBER2000 is not set | ||
| 890 | # CONFIG_FB_OF is not set | ||
| 891 | # CONFIG_FB_CT65550 is not set | ||
| 892 | # CONFIG_FB_ASILIANT is not set | ||
| 893 | # CONFIG_FB_IMSTT is not set | ||
| 894 | # CONFIG_FB_VGA16 is not set | ||
| 895 | # CONFIG_FB_S1D13XXX is not set | ||
| 896 | # CONFIG_FB_NVIDIA is not set | ||
| 897 | # CONFIG_FB_RIVA is not set | ||
| 898 | # CONFIG_FB_MATROX is not set | ||
| 899 | # CONFIG_FB_RADEON is not set | ||
| 900 | # CONFIG_FB_ATY128 is not set | ||
| 901 | # CONFIG_FB_ATY is not set | ||
| 902 | # CONFIG_FB_S3 is not set | ||
| 903 | # CONFIG_FB_SAVAGE is not set | ||
| 904 | # CONFIG_FB_SIS is not set | ||
| 905 | # CONFIG_FB_NEOMAGIC is not set | ||
| 906 | # CONFIG_FB_KYRO is not set | ||
| 907 | # CONFIG_FB_3DFX is not set | ||
| 908 | # CONFIG_FB_VOODOO1 is not set | ||
| 909 | # CONFIG_FB_VT8623 is not set | ||
| 910 | # CONFIG_FB_TRIDENT is not set | ||
| 911 | # CONFIG_FB_ARK is not set | ||
| 912 | # CONFIG_FB_PM3 is not set | ||
| 913 | CONFIG_FB_FSL_DIU=y | ||
| 914 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 915 | # CONFIG_FB_VIRTUAL is not set | ||
| 912 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 916 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 913 | 917 | ||
| 914 | # | 918 | # |
| @@ -922,6 +926,8 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 922 | CONFIG_VGA_CONSOLE=y | 926 | CONFIG_VGA_CONSOLE=y |
| 923 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 927 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 924 | CONFIG_DUMMY_CONSOLE=y | 928 | CONFIG_DUMMY_CONSOLE=y |
| 929 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 930 | # CONFIG_LOGO is not set | ||
| 925 | 931 | ||
| 926 | # | 932 | # |
| 927 | # Sound | 933 | # Sound |
| @@ -938,7 +944,7 @@ CONFIG_SND_PCM=y | |||
| 938 | CONFIG_SND_OSSEMUL=y | 944 | CONFIG_SND_OSSEMUL=y |
| 939 | CONFIG_SND_MIXER_OSS=y | 945 | CONFIG_SND_MIXER_OSS=y |
| 940 | CONFIG_SND_PCM_OSS=y | 946 | CONFIG_SND_PCM_OSS=y |
| 941 | # CONFIG_SND_PCM_OSS_PLUGINS is not set | 947 | CONFIG_SND_PCM_OSS_PLUGINS=y |
| 942 | # CONFIG_SND_DYNAMIC_MINORS is not set | 948 | # CONFIG_SND_DYNAMIC_MINORS is not set |
| 943 | # CONFIG_SND_SUPPORT_OLD_API is not set | 949 | # CONFIG_SND_SUPPORT_OLD_API is not set |
| 944 | CONFIG_SND_VERBOSE_PROCFS=y | 950 | CONFIG_SND_VERBOSE_PROCFS=y |
| @@ -965,6 +971,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 965 | # CONFIG_SND_AU8810 is not set | 971 | # CONFIG_SND_AU8810 is not set |
| 966 | # CONFIG_SND_AU8820 is not set | 972 | # CONFIG_SND_AU8820 is not set |
| 967 | # CONFIG_SND_AU8830 is not set | 973 | # CONFIG_SND_AU8830 is not set |
| 974 | # CONFIG_SND_AW2 is not set | ||
| 968 | # CONFIG_SND_AZT3328 is not set | 975 | # CONFIG_SND_AZT3328 is not set |
| 969 | # CONFIG_SND_BT87X is not set | 976 | # CONFIG_SND_BT87X is not set |
| 970 | # CONFIG_SND_CA0106 is not set | 977 | # CONFIG_SND_CA0106 is not set |
| @@ -1031,14 +1038,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1031 | CONFIG_SND_SOC=y | 1038 | CONFIG_SND_SOC=y |
| 1032 | 1039 | ||
| 1033 | # | 1040 | # |
| 1034 | # SoC Audio support for SuperH | ||
| 1035 | # | ||
| 1036 | |||
| 1037 | # | ||
| 1038 | # ALSA SoC audio for Freescale SOCs | 1041 | # ALSA SoC audio for Freescale SOCs |
| 1039 | # | 1042 | # |
| 1040 | CONFIG_SND_SOC_MPC8610=y | 1043 | CONFIG_SND_SOC_MPC8610=y |
| 1041 | CONFIG_SND_SOC_MPC8610_HPCD=y | 1044 | CONFIG_SND_SOC_MPC8610_HPCD=y |
| 1045 | |||
| 1046 | # | ||
| 1047 | # SoC Audio for the Texas Instruments OMAP | ||
| 1048 | # | ||
| 1042 | CONFIG_SND_SOC_CS4270=y | 1049 | CONFIG_SND_SOC_CS4270=y |
| 1043 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y | 1050 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y |
| 1044 | 1051 | ||
| @@ -1055,6 +1062,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 1055 | CONFIG_USB_ARCH_HAS_OHCI=y | 1062 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1056 | CONFIG_USB_ARCH_HAS_EHCI=y | 1063 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1057 | # CONFIG_USB is not set | 1064 | # CONFIG_USB is not set |
| 1065 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1066 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1058 | 1067 | ||
| 1059 | # | 1068 | # |
| 1060 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1069 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1063,14 +1072,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 1063 | # CONFIG_MMC is not set | 1072 | # CONFIG_MMC is not set |
| 1064 | # CONFIG_MEMSTICK is not set | 1073 | # CONFIG_MEMSTICK is not set |
| 1065 | # CONFIG_NEW_LEDS is not set | 1074 | # CONFIG_NEW_LEDS is not set |
| 1075 | # CONFIG_ACCESSIBILITY is not set | ||
| 1066 | # CONFIG_INFINIBAND is not set | 1076 | # CONFIG_INFINIBAND is not set |
| 1067 | # CONFIG_EDAC is not set | 1077 | # CONFIG_EDAC is not set |
| 1068 | # CONFIG_RTC_CLASS is not set | 1078 | # CONFIG_RTC_CLASS is not set |
| 1069 | # CONFIG_DMADEVICES is not set | 1079 | # CONFIG_DMADEVICES is not set |
| 1070 | |||
| 1071 | # | ||
| 1072 | # Userspace I/O | ||
| 1073 | # | ||
| 1074 | # CONFIG_UIO is not set | 1080 | # CONFIG_UIO is not set |
| 1075 | 1081 | ||
| 1076 | # | 1082 | # |
| @@ -1090,7 +1096,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1090 | # CONFIG_JFS_FS is not set | 1096 | # CONFIG_JFS_FS is not set |
| 1091 | # CONFIG_FS_POSIX_ACL is not set | 1097 | # CONFIG_FS_POSIX_ACL is not set |
| 1092 | # CONFIG_XFS_FS is not set | 1098 | # CONFIG_XFS_FS is not set |
| 1093 | # CONFIG_GFS2_FS is not set | ||
| 1094 | # CONFIG_OCFS2_FS is not set | 1099 | # CONFIG_OCFS2_FS is not set |
| 1095 | # CONFIG_DNOTIFY is not set | 1100 | # CONFIG_DNOTIFY is not set |
| 1096 | # CONFIG_INOTIFY is not set | 1101 | # CONFIG_INOTIFY is not set |
| @@ -1134,6 +1139,7 @@ CONFIG_TMPFS=y | |||
| 1134 | # CONFIG_BEFS_FS is not set | 1139 | # CONFIG_BEFS_FS is not set |
| 1135 | # CONFIG_BFS_FS is not set | 1140 | # CONFIG_BFS_FS is not set |
| 1136 | # CONFIG_EFS_FS is not set | 1141 | # CONFIG_EFS_FS is not set |
| 1142 | # CONFIG_JFFS2_FS is not set | ||
| 1137 | # CONFIG_CRAMFS is not set | 1143 | # CONFIG_CRAMFS is not set |
| 1138 | # CONFIG_VXFS_FS is not set | 1144 | # CONFIG_VXFS_FS is not set |
| 1139 | # CONFIG_MINIX_FS is not set | 1145 | # CONFIG_MINIX_FS is not set |
| @@ -1147,10 +1153,9 @@ CONFIG_NFS_FS=y | |||
| 1147 | CONFIG_NFS_V3=y | 1153 | CONFIG_NFS_V3=y |
| 1148 | # CONFIG_NFS_V3_ACL is not set | 1154 | # CONFIG_NFS_V3_ACL is not set |
| 1149 | # CONFIG_NFS_V4 is not set | 1155 | # CONFIG_NFS_V4 is not set |
| 1150 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1151 | CONFIG_NFSD=y | 1156 | CONFIG_NFSD=y |
| 1152 | # CONFIG_NFSD_V3 is not set | 1157 | # CONFIG_NFSD_V3 is not set |
| 1153 | CONFIG_NFSD_TCP=y | 1158 | # CONFIG_NFSD_V4 is not set |
| 1154 | CONFIG_ROOT_NFS=y | 1159 | CONFIG_ROOT_NFS=y |
| 1155 | CONFIG_LOCKD=y | 1160 | CONFIG_LOCKD=y |
| 1156 | CONFIG_LOCKD_V4=y | 1161 | CONFIG_LOCKD_V4=y |
| @@ -1234,6 +1239,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1234 | # Library routines | 1239 | # Library routines |
| 1235 | # | 1240 | # |
| 1236 | CONFIG_BITREVERSE=y | 1241 | CONFIG_BITREVERSE=y |
| 1242 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1237 | # CONFIG_CRC_CCITT is not set | 1243 | # CONFIG_CRC_CCITT is not set |
| 1238 | # CONFIG_CRC16 is not set | 1244 | # CONFIG_CRC16 is not set |
| 1239 | # CONFIG_CRC_ITU_T is not set | 1245 | # CONFIG_CRC_ITU_T is not set |
| @@ -1244,6 +1250,7 @@ CONFIG_PLIST=y | |||
| 1244 | CONFIG_HAS_IOMEM=y | 1250 | CONFIG_HAS_IOMEM=y |
| 1245 | CONFIG_HAS_IOPORT=y | 1251 | CONFIG_HAS_IOPORT=y |
| 1246 | CONFIG_HAS_DMA=y | 1252 | CONFIG_HAS_DMA=y |
| 1253 | CONFIG_HAVE_LMB=y | ||
| 1247 | 1254 | ||
| 1248 | # | 1255 | # |
| 1249 | # Kernel hacking | 1256 | # Kernel hacking |
| @@ -1251,6 +1258,7 @@ CONFIG_HAS_DMA=y | |||
| 1251 | # CONFIG_PRINTK_TIME is not set | 1258 | # CONFIG_PRINTK_TIME is not set |
| 1252 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1259 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1253 | CONFIG_ENABLE_MUST_CHECK=y | 1260 | CONFIG_ENABLE_MUST_CHECK=y |
| 1261 | CONFIG_FRAME_WARN=1024 | ||
| 1254 | # CONFIG_MAGIC_SYSRQ is not set | 1262 | # CONFIG_MAGIC_SYSRQ is not set |
| 1255 | # CONFIG_UNUSED_SYMBOLS is not set | 1263 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1256 | # CONFIG_DEBUG_FS is not set | 1264 | # CONFIG_DEBUG_FS is not set |
| @@ -1261,6 +1269,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1261 | CONFIG_SCHED_DEBUG=y | 1269 | CONFIG_SCHED_DEBUG=y |
| 1262 | # CONFIG_SCHEDSTATS is not set | 1270 | # CONFIG_SCHEDSTATS is not set |
| 1263 | # CONFIG_TIMER_STATS is not set | 1271 | # CONFIG_TIMER_STATS is not set |
| 1272 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1264 | # CONFIG_SLUB_DEBUG_ON is not set | 1273 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1265 | # CONFIG_SLUB_STATS is not set | 1274 | # CONFIG_SLUB_STATS is not set |
| 1266 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1275 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1274,9 +1283,11 @@ CONFIG_SCHED_DEBUG=y | |||
| 1274 | CONFIG_DEBUG_BUGVERBOSE=y | 1283 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1275 | CONFIG_DEBUG_INFO=y | 1284 | CONFIG_DEBUG_INFO=y |
| 1276 | # CONFIG_DEBUG_VM is not set | 1285 | # CONFIG_DEBUG_VM is not set |
| 1286 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1277 | # CONFIG_DEBUG_LIST is not set | 1287 | # CONFIG_DEBUG_LIST is not set |
| 1278 | # CONFIG_DEBUG_SG is not set | 1288 | # CONFIG_DEBUG_SG is not set |
| 1279 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1289 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1290 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1280 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1291 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1281 | # CONFIG_FAULT_INJECTION is not set | 1292 | # CONFIG_FAULT_INJECTION is not set |
| 1282 | # CONFIG_SAMPLES is not set | 1293 | # CONFIG_SAMPLES is not set |
| @@ -1284,6 +1295,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1284 | # CONFIG_DEBUG_STACK_USAGE is not set | 1295 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1285 | # CONFIG_DEBUG_PAGEALLOC is not set | 1296 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1286 | # CONFIG_DEBUGGER is not set | 1297 | # CONFIG_DEBUGGER is not set |
| 1298 | # CONFIG_IRQSTACKS is not set | ||
| 1287 | # CONFIG_BDI_SWITCH is not set | 1299 | # CONFIG_BDI_SWITCH is not set |
| 1288 | # CONFIG_PPC_EARLY_DEBUG is not set | 1300 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1289 | 1301 | ||
| @@ -1294,48 +1306,80 @@ CONFIG_DEBUG_INFO=y | |||
| 1294 | # CONFIG_SECURITY is not set | 1306 | # CONFIG_SECURITY is not set |
| 1295 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1307 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1296 | CONFIG_CRYPTO=y | 1308 | CONFIG_CRYPTO=y |
| 1297 | # CONFIG_CRYPTO_SEQIV is not set | 1309 | |
| 1310 | # | ||
| 1311 | # Crypto core or helper | ||
| 1312 | # | ||
| 1298 | # CONFIG_CRYPTO_MANAGER is not set | 1313 | # CONFIG_CRYPTO_MANAGER is not set |
| 1314 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1315 | # CONFIG_CRYPTO_NULL is not set | ||
| 1316 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1317 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1318 | # CONFIG_CRYPTO_TEST is not set | ||
| 1319 | |||
| 1320 | # | ||
| 1321 | # Authenticated Encryption with Associated Data | ||
| 1322 | # | ||
| 1323 | # CONFIG_CRYPTO_CCM is not set | ||
| 1324 | # CONFIG_CRYPTO_GCM is not set | ||
| 1325 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1326 | |||
| 1327 | # | ||
| 1328 | # Block modes | ||
| 1329 | # | ||
| 1330 | # CONFIG_CRYPTO_CBC is not set | ||
| 1331 | # CONFIG_CRYPTO_CTR is not set | ||
| 1332 | # CONFIG_CRYPTO_CTS is not set | ||
| 1333 | # CONFIG_CRYPTO_ECB is not set | ||
| 1334 | # CONFIG_CRYPTO_LRW is not set | ||
| 1335 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1336 | # CONFIG_CRYPTO_XTS is not set | ||
| 1337 | |||
| 1338 | # | ||
| 1339 | # Hash modes | ||
| 1340 | # | ||
| 1299 | # CONFIG_CRYPTO_HMAC is not set | 1341 | # CONFIG_CRYPTO_HMAC is not set |
| 1300 | # CONFIG_CRYPTO_XCBC is not set | 1342 | # CONFIG_CRYPTO_XCBC is not set |
| 1301 | # CONFIG_CRYPTO_NULL is not set | 1343 | |
| 1344 | # | ||
| 1345 | # Digest | ||
| 1346 | # | ||
| 1347 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1302 | # CONFIG_CRYPTO_MD4 is not set | 1348 | # CONFIG_CRYPTO_MD4 is not set |
| 1303 | # CONFIG_CRYPTO_MD5 is not set | 1349 | # CONFIG_CRYPTO_MD5 is not set |
| 1350 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1304 | # CONFIG_CRYPTO_SHA1 is not set | 1351 | # CONFIG_CRYPTO_SHA1 is not set |
| 1305 | # CONFIG_CRYPTO_SHA256 is not set | 1352 | # CONFIG_CRYPTO_SHA256 is not set |
| 1306 | # CONFIG_CRYPTO_SHA512 is not set | 1353 | # CONFIG_CRYPTO_SHA512 is not set |
| 1307 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1308 | # CONFIG_CRYPTO_TGR192 is not set | 1354 | # CONFIG_CRYPTO_TGR192 is not set |
| 1309 | # CONFIG_CRYPTO_GF128MUL is not set | 1355 | # CONFIG_CRYPTO_WP512 is not set |
| 1310 | # CONFIG_CRYPTO_ECB is not set | 1356 | |
| 1311 | # CONFIG_CRYPTO_CBC is not set | 1357 | # |
| 1312 | # CONFIG_CRYPTO_PCBC is not set | 1358 | # Ciphers |
| 1313 | # CONFIG_CRYPTO_LRW is not set | 1359 | # |
| 1314 | # CONFIG_CRYPTO_XTS is not set | ||
| 1315 | # CONFIG_CRYPTO_CTR is not set | ||
| 1316 | # CONFIG_CRYPTO_GCM is not set | ||
| 1317 | # CONFIG_CRYPTO_CCM is not set | ||
| 1318 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1319 | # CONFIG_CRYPTO_DES is not set | ||
| 1320 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1321 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1322 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1323 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1324 | # CONFIG_CRYPTO_AES is not set | 1360 | # CONFIG_CRYPTO_AES is not set |
| 1361 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1362 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1363 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1364 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1325 | # CONFIG_CRYPTO_CAST5 is not set | 1365 | # CONFIG_CRYPTO_CAST5 is not set |
| 1326 | # CONFIG_CRYPTO_CAST6 is not set | 1366 | # CONFIG_CRYPTO_CAST6 is not set |
| 1327 | # CONFIG_CRYPTO_TEA is not set | 1367 | # CONFIG_CRYPTO_DES is not set |
| 1328 | # CONFIG_CRYPTO_ARC4 is not set | 1368 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1329 | # CONFIG_CRYPTO_KHAZAD is not set | 1369 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1330 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1331 | # CONFIG_CRYPTO_SEED is not set | ||
| 1332 | # CONFIG_CRYPTO_SALSA20 is not set | 1370 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1371 | # CONFIG_CRYPTO_SEED is not set | ||
| 1372 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1373 | # CONFIG_CRYPTO_TEA is not set | ||
| 1374 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1375 | |||
| 1376 | # | ||
| 1377 | # Compression | ||
| 1378 | # | ||
| 1333 | # CONFIG_CRYPTO_DEFLATE is not set | 1379 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1334 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1335 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1336 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1337 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1338 | # CONFIG_CRYPTO_LZO is not set | 1380 | # CONFIG_CRYPTO_LZO is not set |
| 1339 | CONFIG_CRYPTO_HW=y | 1381 | CONFIG_CRYPTO_HW=y |
| 1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1382 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1341 | # CONFIG_PPC_CLOCK is not set | 1383 | # CONFIG_PPC_CLOCK is not set |
| 1384 | CONFIG_PPC_LIB_RHEAP=y | ||
| 1385 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index d01dcdb70bd7..4a8171507391 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:11 2008 | 4 | # Mon Jun 9 08:52:15 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_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 |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_PPC_86xx=y | |||
| 162 | # CONFIG_PPC_CELL_NATIVE is not set | 167 | # CONFIG_PPC_CELL_NATIVE is not set |
| 163 | # CONFIG_PQ2ADS is not set | 168 | # CONFIG_PQ2ADS is not set |
| 164 | CONFIG_MPC8641_HPCN=y | 169 | CONFIG_MPC8641_HPCN=y |
| 170 | # CONFIG_SBC8641D is not set | ||
| 165 | # CONFIG_MPC8610_HPCD is not set | 171 | # CONFIG_MPC8610_HPCD is not set |
| 166 | CONFIG_MPC8641=y | 172 | CONFIG_MPC8641=y |
| 167 | # CONFIG_IPIC is not set | 173 | # CONFIG_IPIC is not set |
| @@ -211,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -240,6 +248,8 @@ CONFIG_PCI_LEGACY=y | |||
| 240 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
| 241 | # CONFIG_PCCARD is not set | 249 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HOTPLUG_PCI is not set | 250 | # CONFIG_HOTPLUG_PCI is not set |
| 251 | CONFIG_HAS_RAPIDIO=y | ||
| 252 | # CONFIG_RAPIDIO is not set | ||
| 243 | 253 | ||
| 244 | # | 254 | # |
| 245 | # Advanced setup | 255 | # Advanced setup |
| @@ -249,11 +259,11 @@ CONFIG_PCI_LEGACY=y | |||
| 249 | # | 259 | # |
| 250 | # Default settings for advanced configuration options are used | 260 | # Default settings for advanced configuration options are used |
| 251 | # | 261 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 262 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 263 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 264 | CONFIG_KERNEL_START=0xc0000000 |
| 265 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 267 | ||
| 258 | # | 268 | # |
| 259 | # Networking | 269 | # Networking |
| @@ -324,8 +334,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 324 | CONFIG_INET6_XFRM_MODE_BEET=y | 334 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 325 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 326 | CONFIG_IPV6_SIT=y | 336 | CONFIG_IPV6_SIT=y |
| 337 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 327 | # CONFIG_IPV6_TUNNEL is not set | 338 | # CONFIG_IPV6_TUNNEL is not set |
| 328 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 339 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 340 | # CONFIG_IPV6_MROUTE is not set | ||
| 329 | # CONFIG_NETWORK_SECMARK is not set | 341 | # CONFIG_NETWORK_SECMARK is not set |
| 330 | # CONFIG_NETFILTER is not set | 342 | # CONFIG_NETFILTER is not set |
| 331 | # CONFIG_IP_DCCP is not set | 343 | # CONFIG_IP_DCCP is not set |
| @@ -387,6 +399,7 @@ CONFIG_FW_LOADER=y | |||
| 387 | # CONFIG_CONNECTOR is not set | 399 | # CONFIG_CONNECTOR is not set |
| 388 | # CONFIG_MTD is not set | 400 | # CONFIG_MTD is not set |
| 389 | CONFIG_OF_DEVICE=y | 401 | CONFIG_OF_DEVICE=y |
| 402 | CONFIG_OF_I2C=y | ||
| 390 | # CONFIG_PARPORT is not set | 403 | # CONFIG_PARPORT is not set |
| 391 | CONFIG_BLK_DEV=y | 404 | CONFIG_BLK_DEV=y |
| 392 | # CONFIG_BLK_DEV_FD is not set | 405 | # CONFIG_BLK_DEV_FD is not set |
| @@ -493,7 +506,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 493 | # CONFIG_SCSI_SRP is not set | 506 | # CONFIG_SCSI_SRP is not set |
| 494 | CONFIG_ATA=y | 507 | CONFIG_ATA=y |
| 495 | # CONFIG_ATA_NONSTANDARD is not set | 508 | # CONFIG_ATA_NONSTANDARD is not set |
| 509 | CONFIG_SATA_PMP=y | ||
| 496 | CONFIG_SATA_AHCI=y | 510 | CONFIG_SATA_AHCI=y |
| 511 | # CONFIG_SATA_SIL24 is not set | ||
| 512 | # CONFIG_SATA_FSL is not set | ||
| 513 | CONFIG_ATA_SFF=y | ||
| 497 | # CONFIG_SATA_SVW is not set | 514 | # CONFIG_SATA_SVW is not set |
| 498 | # CONFIG_ATA_PIIX is not set | 515 | # CONFIG_ATA_PIIX is not set |
| 499 | # CONFIG_SATA_MV is not set | 516 | # CONFIG_SATA_MV is not set |
| @@ -503,13 +520,11 @@ CONFIG_SATA_AHCI=y | |||
| 503 | # CONFIG_SATA_PROMISE is not set | 520 | # CONFIG_SATA_PROMISE is not set |
| 504 | # CONFIG_SATA_SX4 is not set | 521 | # CONFIG_SATA_SX4 is not set |
| 505 | # CONFIG_SATA_SIL is not set | 522 | # CONFIG_SATA_SIL is not set |
| 506 | # CONFIG_SATA_SIL24 is not set | ||
| 507 | # CONFIG_SATA_SIS is not set | 523 | # CONFIG_SATA_SIS is not set |
| 508 | # CONFIG_SATA_ULI is not set | 524 | # CONFIG_SATA_ULI is not set |
| 509 | # CONFIG_SATA_VIA is not set | 525 | # CONFIG_SATA_VIA is not set |
| 510 | # CONFIG_SATA_VITESSE is not set | 526 | # CONFIG_SATA_VITESSE is not set |
| 511 | # CONFIG_SATA_INIC162X is not set | 527 | # CONFIG_SATA_INIC162X is not set |
| 512 | # CONFIG_SATA_FSL is not set | ||
| 513 | CONFIG_PATA_ALI=y | 528 | CONFIG_PATA_ALI=y |
| 514 | # CONFIG_PATA_AMD is not set | 529 | # CONFIG_PATA_AMD is not set |
| 515 | # CONFIG_PATA_ARTOP is not set | 530 | # CONFIG_PATA_ARTOP is not set |
| @@ -549,6 +564,7 @@ CONFIG_PATA_ALI=y | |||
| 549 | # CONFIG_PATA_VIA is not set | 564 | # CONFIG_PATA_VIA is not set |
| 550 | # CONFIG_PATA_WINBOND is not set | 565 | # CONFIG_PATA_WINBOND is not set |
| 551 | # CONFIG_PATA_PLATFORM is not set | 566 | # CONFIG_PATA_PLATFORM is not set |
| 567 | # CONFIG_PATA_SCH is not set | ||
| 552 | # CONFIG_MD is not set | 568 | # CONFIG_MD is not set |
| 553 | # CONFIG_FUSION is not set | 569 | # CONFIG_FUSION is not set |
| 554 | 570 | ||
| @@ -614,7 +630,6 @@ CONFIG_NETDEV_1000=y | |||
| 614 | # CONFIG_SIS190 is not set | 630 | # CONFIG_SIS190 is not set |
| 615 | # CONFIG_SKGE is not set | 631 | # CONFIG_SKGE is not set |
| 616 | # CONFIG_SKY2 is not set | 632 | # CONFIG_SKY2 is not set |
| 617 | # CONFIG_SK98LIN is not set | ||
| 618 | # CONFIG_VIA_VELOCITY is not set | 633 | # CONFIG_VIA_VELOCITY is not set |
| 619 | # CONFIG_TIGON3 is not set | 634 | # CONFIG_TIGON3 is not set |
| 620 | # CONFIG_BNX2 is not set | 635 | # CONFIG_BNX2 is not set |
| @@ -634,6 +649,7 @@ CONFIG_NETDEV_10000=y | |||
| 634 | # CONFIG_MLX4_CORE is not set | 649 | # CONFIG_MLX4_CORE is not set |
| 635 | # CONFIG_TEHUTI is not set | 650 | # CONFIG_TEHUTI is not set |
| 636 | # CONFIG_BNX2X is not set | 651 | # CONFIG_BNX2X is not set |
| 652 | # CONFIG_SFC is not set | ||
| 637 | # CONFIG_TR is not set | 653 | # CONFIG_TR is not set |
| 638 | 654 | ||
| 639 | # | 655 | # |
| @@ -641,6 +657,7 @@ CONFIG_NETDEV_10000=y | |||
| 641 | # | 657 | # |
| 642 | # CONFIG_WLAN_PRE80211 is not set | 658 | # CONFIG_WLAN_PRE80211 is not set |
| 643 | # CONFIG_WLAN_80211 is not set | 659 | # CONFIG_WLAN_80211 is not set |
| 660 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 644 | 661 | ||
| 645 | # | 662 | # |
| 646 | # USB Network Adapters | 663 | # USB Network Adapters |
| @@ -705,6 +722,7 @@ CONFIG_VT=y | |||
| 705 | CONFIG_VT_CONSOLE=y | 722 | CONFIG_VT_CONSOLE=y |
| 706 | CONFIG_HW_CONSOLE=y | 723 | CONFIG_HW_CONSOLE=y |
| 707 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 724 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 725 | CONFIG_DEVKMEM=y | ||
| 708 | # CONFIG_SERIAL_NONSTANDARD is not set | 726 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 709 | # CONFIG_NOZOMI is not set | 727 | # CONFIG_NOZOMI is not set |
| 710 | 728 | ||
| @@ -736,7 +754,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 736 | # CONFIG_IPMI_HANDLER is not set | 754 | # CONFIG_IPMI_HANDLER is not set |
| 737 | # CONFIG_HW_RANDOM is not set | 755 | # CONFIG_HW_RANDOM is not set |
| 738 | CONFIG_NVRAM=y | 756 | CONFIG_NVRAM=y |
| 739 | # CONFIG_GEN_RTC is not set | ||
| 740 | # CONFIG_R3964 is not set | 757 | # CONFIG_R3964 is not set |
| 741 | # CONFIG_APPLICOM is not set | 758 | # CONFIG_APPLICOM is not set |
| 742 | # CONFIG_RAW_DRIVER is not set | 759 | # CONFIG_RAW_DRIVER is not set |
| @@ -747,13 +764,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 747 | # CONFIG_I2C_CHARDEV is not set | 764 | # CONFIG_I2C_CHARDEV is not set |
| 748 | 765 | ||
| 749 | # | 766 | # |
| 750 | # I2C Algorithms | ||
| 751 | # | ||
| 752 | # CONFIG_I2C_ALGOBIT is not set | ||
| 753 | # CONFIG_I2C_ALGOPCF is not set | ||
| 754 | # CONFIG_I2C_ALGOPCA is not set | ||
| 755 | |||
| 756 | # | ||
| 757 | # I2C Hardware Bus support | 767 | # I2C Hardware Bus support |
| 758 | # | 768 | # |
| 759 | # CONFIG_I2C_ALI1535 is not set | 769 | # CONFIG_I2C_ALI1535 is not set |
| @@ -780,6 +790,7 @@ CONFIG_I2C_MPC=y | |||
| 780 | # CONFIG_I2C_VIA is not set | 790 | # CONFIG_I2C_VIA is not set |
| 781 | # CONFIG_I2C_VIAPRO is not set | 791 | # CONFIG_I2C_VIAPRO is not set |
| 782 | # CONFIG_I2C_VOODOO3 is not set | 792 | # CONFIG_I2C_VOODOO3 is not set |
| 793 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 783 | 794 | ||
| 784 | # | 795 | # |
| 785 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
| @@ -789,19 +800,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 789 | # CONFIG_SENSORS_PCF8574 is not set | 800 | # CONFIG_SENSORS_PCF8574 is not set |
| 790 | # CONFIG_PCF8575 is not set | 801 | # CONFIG_PCF8575 is not set |
| 791 | # CONFIG_SENSORS_PCF8591 is not set | 802 | # CONFIG_SENSORS_PCF8591 is not set |
| 792 | # CONFIG_TPS65010 is not set | ||
| 793 | # CONFIG_SENSORS_MAX6875 is not set | 803 | # CONFIG_SENSORS_MAX6875 is not set |
| 794 | # CONFIG_SENSORS_TSL2550 is not set | 804 | # CONFIG_SENSORS_TSL2550 is not set |
| 795 | # CONFIG_I2C_DEBUG_CORE is not set | 805 | # CONFIG_I2C_DEBUG_CORE is not set |
| 796 | # CONFIG_I2C_DEBUG_ALGO is not set | 806 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 797 | # CONFIG_I2C_DEBUG_BUS is not set | 807 | # CONFIG_I2C_DEBUG_BUS is not set |
| 798 | # CONFIG_I2C_DEBUG_CHIP is not set | 808 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 799 | |||
| 800 | # | ||
| 801 | # SPI support | ||
| 802 | # | ||
| 803 | # CONFIG_SPI is not set | 809 | # CONFIG_SPI is not set |
| 804 | # CONFIG_SPI_MASTER is not set | ||
| 805 | # CONFIG_W1 is not set | 810 | # CONFIG_W1 is not set |
| 806 | # CONFIG_POWER_SUPPLY is not set | 811 | # CONFIG_POWER_SUPPLY is not set |
| 807 | # CONFIG_HWMON is not set | 812 | # CONFIG_HWMON is not set |
| @@ -818,13 +823,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 818 | # Multifunction device drivers | 823 | # Multifunction device drivers |
| 819 | # | 824 | # |
| 820 | # CONFIG_MFD_SM501 is not set | 825 | # CONFIG_MFD_SM501 is not set |
| 826 | # CONFIG_HTC_PASIC3 is not set | ||
| 821 | 827 | ||
| 822 | # | 828 | # |
| 823 | # Multimedia devices | 829 | # Multimedia devices |
| 824 | # | 830 | # |
| 831 | |||
| 832 | # | ||
| 833 | # Multimedia core support | ||
| 834 | # | ||
| 825 | # CONFIG_VIDEO_DEV is not set | 835 | # CONFIG_VIDEO_DEV is not set |
| 826 | CONFIG_DVB_CORE=m | 836 | CONFIG_DVB_CORE=m |
| 827 | # CONFIG_DVB_CORE_ATTACH is not set | 837 | CONFIG_VIDEO_MEDIA=m |
| 838 | |||
| 839 | # | ||
| 840 | # Multimedia drivers | ||
| 841 | # | ||
| 842 | # CONFIG_MEDIA_ATTACH is not set | ||
| 843 | CONFIG_MEDIA_TUNER=m | ||
| 844 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 845 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 846 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 847 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 848 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 849 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 850 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 851 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 852 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 828 | CONFIG_DVB_CAPTURE_DRIVERS=y | 853 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 829 | 854 | ||
| 830 | # | 855 | # |
| @@ -867,14 +892,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 867 | # | 892 | # |
| 868 | # DVB-S (satellite) frontends | 893 | # DVB-S (satellite) frontends |
| 869 | # | 894 | # |
| 870 | # CONFIG_DVB_STV0299 is not set | ||
| 871 | # CONFIG_DVB_CX24110 is not set | 895 | # CONFIG_DVB_CX24110 is not set |
| 872 | # CONFIG_DVB_CX24123 is not set | 896 | # CONFIG_DVB_CX24123 is not set |
| 873 | # CONFIG_DVB_TDA8083 is not set | ||
| 874 | # CONFIG_DVB_MT312 is not set | 897 | # CONFIG_DVB_MT312 is not set |
| 875 | # CONFIG_DVB_VES1X93 is not set | ||
| 876 | # CONFIG_DVB_S5H1420 is not set | 898 | # CONFIG_DVB_S5H1420 is not set |
| 899 | # CONFIG_DVB_STV0299 is not set | ||
| 900 | # CONFIG_DVB_TDA8083 is not set | ||
| 877 | # CONFIG_DVB_TDA10086 is not set | 901 | # CONFIG_DVB_TDA10086 is not set |
| 902 | # CONFIG_DVB_VES1X93 is not set | ||
| 903 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 904 | # CONFIG_DVB_TDA826X is not set | ||
| 905 | # CONFIG_DVB_TUA6100 is not set | ||
| 878 | 906 | ||
| 879 | # | 907 | # |
| 880 | # DVB-T (terrestrial) frontends | 908 | # DVB-T (terrestrial) frontends |
| @@ -892,6 +920,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 892 | # CONFIG_DVB_DIB3000MC is not set | 920 | # CONFIG_DVB_DIB3000MC is not set |
| 893 | # CONFIG_DVB_DIB7000M is not set | 921 | # CONFIG_DVB_DIB7000M is not set |
| 894 | # CONFIG_DVB_DIB7000P is not set | 922 | # CONFIG_DVB_DIB7000P is not set |
| 923 | # CONFIG_DVB_TDA10048 is not set | ||
| 895 | 924 | ||
| 896 | # | 925 | # |
| 897 | # DVB-C (cable) frontends | 926 | # DVB-C (cable) frontends |
| @@ -910,27 +939,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 910 | # CONFIG_DVB_BCM3510 is not set | 939 | # CONFIG_DVB_BCM3510 is not set |
| 911 | # CONFIG_DVB_LGDT330X is not set | 940 | # CONFIG_DVB_LGDT330X is not set |
| 912 | # CONFIG_DVB_S5H1409 is not set | 941 | # CONFIG_DVB_S5H1409 is not set |
| 942 | # CONFIG_DVB_AU8522 is not set | ||
| 943 | # CONFIG_DVB_S5H1411 is not set | ||
| 913 | 944 | ||
| 914 | # | 945 | # |
| 915 | # Tuners/PLL support | 946 | # Digital terrestrial only tuners/PLL |
| 916 | # | 947 | # |
| 917 | # CONFIG_DVB_PLL is not set | 948 | # CONFIG_DVB_PLL is not set |
| 918 | # CONFIG_DVB_TDA826X is not set | ||
| 919 | # CONFIG_DVB_TDA827X is not set | ||
| 920 | # CONFIG_DVB_TDA18271 is not set | ||
| 921 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 922 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 923 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 924 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 925 | # CONFIG_DVB_TUNER_DIB0070 is not set | 949 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 926 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 927 | 950 | ||
| 928 | # | 951 | # |
| 929 | # Miscellaneous devices | 952 | # SEC control devices for DVB-S |
| 930 | # | 953 | # |
| 931 | # CONFIG_DVB_LNBP21 is not set | 954 | # CONFIG_DVB_LNBP21 is not set |
| 955 | # CONFIG_DVB_ISL6405 is not set | ||
| 932 | # CONFIG_DVB_ISL6421 is not set | 956 | # CONFIG_DVB_ISL6421 is not set |
| 933 | # CONFIG_DVB_TUA6100 is not set | ||
| 934 | CONFIG_DAB=y | 957 | CONFIG_DAB=y |
| 935 | # CONFIG_USB_DABUSB is not set | 958 | # CONFIG_USB_DABUSB is not set |
| 936 | 959 | ||
| @@ -997,6 +1020,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 997 | # CONFIG_SND_AU8810 is not set | 1020 | # CONFIG_SND_AU8810 is not set |
| 998 | # CONFIG_SND_AU8820 is not set | 1021 | # CONFIG_SND_AU8820 is not set |
| 999 | # CONFIG_SND_AU8830 is not set | 1022 | # CONFIG_SND_AU8830 is not set |
| 1023 | # CONFIG_SND_AW2 is not set | ||
| 1000 | # CONFIG_SND_AZT3328 is not set | 1024 | # CONFIG_SND_AZT3328 is not set |
| 1001 | # CONFIG_SND_BT87X is not set | 1025 | # CONFIG_SND_BT87X is not set |
| 1002 | # CONFIG_SND_CA0106 is not set | 1026 | # CONFIG_SND_CA0106 is not set |
| @@ -1071,11 +1095,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1071 | # CONFIG_SND_SOC is not set | 1095 | # CONFIG_SND_SOC is not set |
| 1072 | 1096 | ||
| 1073 | # | 1097 | # |
| 1074 | # SoC Audio support for SuperH | 1098 | # ALSA SoC audio for Freescale SOCs |
| 1075 | # | 1099 | # |
| 1076 | 1100 | ||
| 1077 | # | 1101 | # |
| 1078 | # ALSA SoC audio for Freescale SOCs | 1102 | # SoC Audio for the Texas Instruments OMAP |
| 1079 | # | 1103 | # |
| 1080 | 1104 | ||
| 1081 | # | 1105 | # |
| @@ -1110,16 +1134,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1110 | CONFIG_USB_DEVICE_CLASS=y | 1134 | CONFIG_USB_DEVICE_CLASS=y |
| 1111 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1135 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1112 | # CONFIG_USB_OTG is not set | 1136 | # CONFIG_USB_OTG is not set |
| 1137 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1138 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1113 | 1139 | ||
| 1114 | # | 1140 | # |
| 1115 | # USB Host Controller Drivers | 1141 | # USB Host Controller Drivers |
| 1116 | # | 1142 | # |
| 1143 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1117 | CONFIG_USB_EHCI_HCD=y | 1144 | CONFIG_USB_EHCI_HCD=y |
| 1118 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1145 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1119 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1146 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1120 | # CONFIG_USB_EHCI_FSL is not set | 1147 | # CONFIG_USB_EHCI_FSL is not set |
| 1121 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1148 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1122 | # CONFIG_USB_ISP116X_HCD is not set | 1149 | # CONFIG_USB_ISP116X_HCD is not set |
| 1150 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1123 | CONFIG_USB_OHCI_HCD=y | 1151 | CONFIG_USB_OHCI_HCD=y |
| 1124 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1152 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1125 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1153 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1137,6 +1165,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1137 | # | 1165 | # |
| 1138 | # CONFIG_USB_ACM is not set | 1166 | # CONFIG_USB_ACM is not set |
| 1139 | # CONFIG_USB_PRINTER is not set | 1167 | # CONFIG_USB_PRINTER is not set |
| 1168 | # CONFIG_USB_WDM is not set | ||
| 1140 | 1169 | ||
| 1141 | # | 1170 | # |
| 1142 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1171 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1156,7 +1185,9 @@ CONFIG_USB_STORAGE=y | |||
| 1156 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1185 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1157 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1186 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1158 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1187 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1188 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1159 | # CONFIG_USB_STORAGE_KARMA is not set | 1189 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1190 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1160 | # CONFIG_USB_LIBUSUAL is not set | 1191 | # CONFIG_USB_LIBUSUAL is not set |
| 1161 | 1192 | ||
| 1162 | # | 1193 | # |
| @@ -1194,10 +1225,12 @@ CONFIG_USB_MON=y | |||
| 1194 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1225 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1195 | # CONFIG_USB_IOWARRIOR is not set | 1226 | # CONFIG_USB_IOWARRIOR is not set |
| 1196 | # CONFIG_USB_TEST is not set | 1227 | # CONFIG_USB_TEST is not set |
| 1228 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1197 | # CONFIG_USB_GADGET is not set | 1229 | # CONFIG_USB_GADGET is not set |
| 1198 | # CONFIG_MMC is not set | 1230 | # CONFIG_MMC is not set |
| 1199 | # CONFIG_MEMSTICK is not set | 1231 | # CONFIG_MEMSTICK is not set |
| 1200 | # CONFIG_NEW_LEDS is not set | 1232 | # CONFIG_NEW_LEDS is not set |
| 1233 | # CONFIG_ACCESSIBILITY is not set | ||
| 1201 | # CONFIG_INFINIBAND is not set | 1234 | # CONFIG_INFINIBAND is not set |
| 1202 | # CONFIG_EDAC is not set | 1235 | # CONFIG_EDAC is not set |
| 1203 | CONFIG_RTC_LIB=y | 1236 | CONFIG_RTC_LIB=y |
| @@ -1249,11 +1282,8 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1249 | # | 1282 | # |
| 1250 | # on-CPU RTC drivers | 1283 | # on-CPU RTC drivers |
| 1251 | # | 1284 | # |
| 1285 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1252 | # CONFIG_DMADEVICES is not set | 1286 | # CONFIG_DMADEVICES is not set |
| 1253 | |||
| 1254 | # | ||
| 1255 | # Userspace I/O | ||
| 1256 | # | ||
| 1257 | # CONFIG_UIO is not set | 1287 | # CONFIG_UIO is not set |
| 1258 | 1288 | ||
| 1259 | # | 1289 | # |
| @@ -1273,7 +1303,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1273 | # CONFIG_JFS_FS is not set | 1303 | # CONFIG_JFS_FS is not set |
| 1274 | # CONFIG_FS_POSIX_ACL is not set | 1304 | # CONFIG_FS_POSIX_ACL is not set |
| 1275 | # CONFIG_XFS_FS is not set | 1305 | # CONFIG_XFS_FS is not set |
| 1276 | # CONFIG_GFS2_FS is not set | ||
| 1277 | # CONFIG_OCFS2_FS is not set | 1306 | # CONFIG_OCFS2_FS is not set |
| 1278 | CONFIG_DNOTIFY=y | 1307 | CONFIG_DNOTIFY=y |
| 1279 | CONFIG_INOTIFY=y | 1308 | CONFIG_INOTIFY=y |
| @@ -1343,10 +1372,9 @@ CONFIG_NFS_FS=y | |||
| 1343 | CONFIG_NFS_V3=y | 1372 | CONFIG_NFS_V3=y |
| 1344 | # CONFIG_NFS_V3_ACL is not set | 1373 | # CONFIG_NFS_V3_ACL is not set |
| 1345 | CONFIG_NFS_V4=y | 1374 | CONFIG_NFS_V4=y |
| 1346 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1347 | CONFIG_NFSD=y | 1375 | CONFIG_NFSD=y |
| 1348 | # CONFIG_NFSD_V3 is not set | 1376 | # CONFIG_NFSD_V3 is not set |
| 1349 | CONFIG_NFSD_TCP=y | 1377 | # CONFIG_NFSD_V4 is not set |
| 1350 | CONFIG_ROOT_NFS=y | 1378 | CONFIG_ROOT_NFS=y |
| 1351 | CONFIG_LOCKD=y | 1379 | CONFIG_LOCKD=y |
| 1352 | CONFIG_LOCKD_V4=y | 1380 | CONFIG_LOCKD_V4=y |
| @@ -1430,9 +1458,10 @@ CONFIG_NLS_UTF8=m | |||
| 1430 | # Library routines | 1458 | # Library routines |
| 1431 | # | 1459 | # |
| 1432 | CONFIG_BITREVERSE=y | 1460 | CONFIG_BITREVERSE=y |
| 1461 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1433 | # CONFIG_CRC_CCITT is not set | 1462 | # CONFIG_CRC_CCITT is not set |
| 1434 | # CONFIG_CRC16 is not set | 1463 | # CONFIG_CRC16 is not set |
| 1435 | # CONFIG_CRC_ITU_T is not set | 1464 | CONFIG_CRC_ITU_T=m |
| 1436 | CONFIG_CRC32=y | 1465 | CONFIG_CRC32=y |
| 1437 | # CONFIG_CRC7 is not set | 1466 | # CONFIG_CRC7 is not set |
| 1438 | CONFIG_LIBCRC32C=m | 1467 | CONFIG_LIBCRC32C=m |
| @@ -1441,6 +1470,7 @@ CONFIG_PLIST=y | |||
| 1441 | CONFIG_HAS_IOMEM=y | 1470 | CONFIG_HAS_IOMEM=y |
| 1442 | CONFIG_HAS_IOPORT=y | 1471 | CONFIG_HAS_IOPORT=y |
| 1443 | CONFIG_HAS_DMA=y | 1472 | CONFIG_HAS_DMA=y |
| 1473 | CONFIG_HAVE_LMB=y | ||
| 1444 | 1474 | ||
| 1445 | # | 1475 | # |
| 1446 | # Kernel hacking | 1476 | # Kernel hacking |
| @@ -1448,6 +1478,7 @@ CONFIG_HAS_DMA=y | |||
| 1448 | # CONFIG_PRINTK_TIME is not set | 1478 | # CONFIG_PRINTK_TIME is not set |
| 1449 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1479 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1450 | CONFIG_ENABLE_MUST_CHECK=y | 1480 | CONFIG_ENABLE_MUST_CHECK=y |
| 1481 | CONFIG_FRAME_WARN=1024 | ||
| 1451 | # CONFIG_MAGIC_SYSRQ is not set | 1482 | # CONFIG_MAGIC_SYSRQ is not set |
| 1452 | # CONFIG_UNUSED_SYMBOLS is not set | 1483 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1453 | # CONFIG_DEBUG_FS is not set | 1484 | # CONFIG_DEBUG_FS is not set |
| @@ -1458,6 +1489,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1458 | CONFIG_SCHED_DEBUG=y | 1489 | CONFIG_SCHED_DEBUG=y |
| 1459 | # CONFIG_SCHEDSTATS is not set | 1490 | # CONFIG_SCHEDSTATS is not set |
| 1460 | # CONFIG_TIMER_STATS is not set | 1491 | # CONFIG_TIMER_STATS is not set |
| 1492 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1461 | # CONFIG_SLUB_DEBUG_ON is not set | 1493 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1462 | # CONFIG_SLUB_STATS is not set | 1494 | # CONFIG_SLUB_STATS is not set |
| 1463 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1495 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1471,6 +1503,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1471 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1503 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1472 | CONFIG_DEBUG_INFO=y | 1504 | CONFIG_DEBUG_INFO=y |
| 1473 | # CONFIG_DEBUG_VM is not set | 1505 | # CONFIG_DEBUG_VM is not set |
| 1506 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1474 | # CONFIG_DEBUG_LIST is not set | 1507 | # CONFIG_DEBUG_LIST is not set |
| 1475 | # CONFIG_DEBUG_SG is not set | 1508 | # CONFIG_DEBUG_SG is not set |
| 1476 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1509 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1482,6 +1515,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1482 | # CONFIG_DEBUG_STACK_USAGE is not set | 1515 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1483 | # CONFIG_DEBUG_PAGEALLOC is not set | 1516 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1484 | # CONFIG_DEBUGGER is not set | 1517 | # CONFIG_DEBUGGER is not set |
| 1518 | # CONFIG_IRQSTACKS is not set | ||
| 1485 | # CONFIG_BDI_SWITCH is not set | 1519 | # CONFIG_BDI_SWITCH is not set |
| 1486 | # CONFIG_PPC_EARLY_DEBUG is not set | 1520 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1487 | 1521 | ||
| @@ -1492,52 +1526,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1492 | # CONFIG_SECURITY is not set | 1526 | # CONFIG_SECURITY is not set |
| 1493 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1527 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1494 | CONFIG_CRYPTO=y | 1528 | CONFIG_CRYPTO=y |
| 1529 | |||
| 1530 | # | ||
| 1531 | # Crypto core or helper | ||
| 1532 | # | ||
| 1495 | CONFIG_CRYPTO_ALGAPI=y | 1533 | CONFIG_CRYPTO_ALGAPI=y |
| 1496 | CONFIG_CRYPTO_BLKCIPHER=y | 1534 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1497 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1498 | CONFIG_CRYPTO_HASH=y | 1535 | CONFIG_CRYPTO_HASH=y |
| 1499 | CONFIG_CRYPTO_MANAGER=y | 1536 | CONFIG_CRYPTO_MANAGER=y |
| 1537 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1538 | # CONFIG_CRYPTO_NULL is not set | ||
| 1539 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1540 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1541 | # CONFIG_CRYPTO_TEST is not set | ||
| 1542 | |||
| 1543 | # | ||
| 1544 | # Authenticated Encryption with Associated Data | ||
| 1545 | # | ||
| 1546 | # CONFIG_CRYPTO_CCM is not set | ||
| 1547 | # CONFIG_CRYPTO_GCM is not set | ||
| 1548 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1549 | |||
| 1550 | # | ||
| 1551 | # Block modes | ||
| 1552 | # | ||
| 1553 | CONFIG_CRYPTO_CBC=y | ||
| 1554 | # CONFIG_CRYPTO_CTR is not set | ||
| 1555 | # CONFIG_CRYPTO_CTS is not set | ||
| 1556 | # CONFIG_CRYPTO_ECB is not set | ||
| 1557 | # CONFIG_CRYPTO_LRW is not set | ||
| 1558 | CONFIG_CRYPTO_PCBC=m | ||
| 1559 | # CONFIG_CRYPTO_XTS is not set | ||
| 1560 | |||
| 1561 | # | ||
| 1562 | # Hash modes | ||
| 1563 | # | ||
| 1500 | CONFIG_CRYPTO_HMAC=y | 1564 | CONFIG_CRYPTO_HMAC=y |
| 1501 | # CONFIG_CRYPTO_XCBC is not set | 1565 | # CONFIG_CRYPTO_XCBC is not set |
| 1502 | # CONFIG_CRYPTO_NULL is not set | 1566 | |
| 1567 | # | ||
| 1568 | # Digest | ||
| 1569 | # | ||
| 1570 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1503 | # CONFIG_CRYPTO_MD4 is not set | 1571 | # CONFIG_CRYPTO_MD4 is not set |
| 1504 | CONFIG_CRYPTO_MD5=y | 1572 | CONFIG_CRYPTO_MD5=y |
| 1573 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1505 | CONFIG_CRYPTO_SHA1=m | 1574 | CONFIG_CRYPTO_SHA1=m |
| 1506 | # CONFIG_CRYPTO_SHA256 is not set | 1575 | # CONFIG_CRYPTO_SHA256 is not set |
| 1507 | # CONFIG_CRYPTO_SHA512 is not set | 1576 | # CONFIG_CRYPTO_SHA512 is not set |
| 1508 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1509 | # CONFIG_CRYPTO_TGR192 is not set | 1577 | # CONFIG_CRYPTO_TGR192 is not set |
| 1510 | # CONFIG_CRYPTO_GF128MUL is not set | 1578 | # CONFIG_CRYPTO_WP512 is not set |
| 1511 | # CONFIG_CRYPTO_ECB is not set | 1579 | |
| 1512 | CONFIG_CRYPTO_CBC=y | 1580 | # |
| 1513 | CONFIG_CRYPTO_PCBC=m | 1581 | # Ciphers |
| 1514 | # CONFIG_CRYPTO_LRW is not set | 1582 | # |
| 1515 | # CONFIG_CRYPTO_XTS is not set | ||
| 1516 | # CONFIG_CRYPTO_CTR is not set | ||
| 1517 | # CONFIG_CRYPTO_GCM is not set | ||
| 1518 | # CONFIG_CRYPTO_CCM is not set | ||
| 1519 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1520 | CONFIG_CRYPTO_DES=y | ||
| 1521 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1522 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1523 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1524 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1525 | # CONFIG_CRYPTO_AES is not set | 1583 | # CONFIG_CRYPTO_AES is not set |
| 1584 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1585 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1586 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1587 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1526 | # CONFIG_CRYPTO_CAST5 is not set | 1588 | # CONFIG_CRYPTO_CAST5 is not set |
| 1527 | # CONFIG_CRYPTO_CAST6 is not set | 1589 | # CONFIG_CRYPTO_CAST6 is not set |
| 1528 | # CONFIG_CRYPTO_TEA is not set | 1590 | CONFIG_CRYPTO_DES=y |
| 1529 | # CONFIG_CRYPTO_ARC4 is not set | 1591 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1530 | # CONFIG_CRYPTO_KHAZAD is not set | 1592 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1531 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1532 | # CONFIG_CRYPTO_SEED is not set | ||
| 1533 | # CONFIG_CRYPTO_SALSA20 is not set | 1593 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1594 | # CONFIG_CRYPTO_SEED is not set | ||
| 1595 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1596 | # CONFIG_CRYPTO_TEA is not set | ||
| 1597 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1598 | |||
| 1599 | # | ||
| 1600 | # Compression | ||
| 1601 | # | ||
| 1534 | # CONFIG_CRYPTO_DEFLATE is not set | 1602 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1535 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1536 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1537 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1538 | # CONFIG_CRYPTO_TEST is not set | ||
| 1539 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1540 | # CONFIG_CRYPTO_LZO is not set | 1603 | # CONFIG_CRYPTO_LZO is not set |
| 1541 | CONFIG_CRYPTO_HW=y | 1604 | CONFIG_CRYPTO_HW=y |
| 1542 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1605 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1543 | # CONFIG_PPC_CLOCK is not set | 1606 | # CONFIG_PPC_CLOCK is not set |
| 1607 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 2d831db9ae5b..46fffbcd3f99 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:35 2008 | 4 | # Mon Jun 9 08:52:16 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -106,6 +108,7 @@ CONFIG_SLUB=y | |||
| 106 | CONFIG_HAVE_OPROFILE=y | 108 | CONFIG_HAVE_OPROFILE=y |
| 107 | CONFIG_HAVE_KPROBES=y | 109 | CONFIG_HAVE_KPROBES=y |
| 108 | CONFIG_HAVE_KRETPROBES=y | 110 | CONFIG_HAVE_KRETPROBES=y |
| 111 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 109 | CONFIG_PROC_PAGE_MONITOR=y | 112 | CONFIG_PROC_PAGE_MONITOR=y |
| 110 | CONFIG_SLABINFO=y | 113 | CONFIG_SLABINFO=y |
| 111 | CONFIG_RT_MUTEXES=y | 114 | CONFIG_RT_MUTEXES=y |
| @@ -210,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | # CONFIG_PROC_DEVICETREE is not set | 223 | # CONFIG_PROC_DEVICETREE is not set |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -231,6 +236,7 @@ CONFIG_FSL_SOC=y | |||
| 231 | # CONFIG_PCI_SYSCALL is not set | 236 | # CONFIG_PCI_SYSCALL is not set |
| 232 | # CONFIG_PCI_QSPAN is not set | 237 | # CONFIG_PCI_QSPAN is not set |
| 233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 238 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 239 | # CONFIG_HAS_RAPIDIO is not set | ||
| 234 | 240 | ||
| 235 | # | 241 | # |
| 236 | # Advanced setup | 242 | # Advanced setup |
| @@ -240,13 +246,13 @@ CONFIG_FSL_SOC=y | |||
| 240 | # | 246 | # |
| 241 | # Default settings for advanced configuration options are used | 247 | # Default settings for advanced configuration options are used |
| 242 | # | 248 | # |
| 243 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 244 | CONFIG_LOWMEM_SIZE=0x30000000 | 249 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 250 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 245 | CONFIG_KERNEL_START=0xc0000000 | 251 | CONFIG_KERNEL_START=0xc0000000 |
| 252 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 246 | CONFIG_TASK_SIZE=0x80000000 | 253 | CONFIG_TASK_SIZE=0x80000000 |
| 247 | CONFIG_CONSISTENT_START=0xfd000000 | 254 | CONFIG_CONSISTENT_START=0xfd000000 |
| 248 | CONFIG_CONSISTENT_SIZE=0x00200000 | 255 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 249 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 250 | 256 | ||
| 251 | # | 257 | # |
| 252 | # Networking | 258 | # Networking |
| @@ -294,8 +300,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 300 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 301 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 302 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 303 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 304 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 305 | # CONFIG_IP_DCCP is not set |
| @@ -419,6 +423,7 @@ CONFIG_NETDEV_10000=y | |||
| 419 | # | 423 | # |
| 420 | # CONFIG_WLAN_PRE80211 is not set | 424 | # CONFIG_WLAN_PRE80211 is not set |
| 421 | # CONFIG_WLAN_80211 is not set | 425 | # CONFIG_WLAN_80211 is not set |
| 426 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 422 | # CONFIG_WAN is not set | 427 | # CONFIG_WAN is not set |
| 423 | # CONFIG_PPP is not set | 428 | # CONFIG_PPP is not set |
| 424 | # CONFIG_SLIP is not set | 429 | # CONFIG_SLIP is not set |
| @@ -485,6 +490,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 485 | # Character devices | 490 | # Character devices |
| 486 | # | 491 | # |
| 487 | # CONFIG_VT is not set | 492 | # CONFIG_VT is not set |
| 493 | CONFIG_DEVKMEM=y | ||
| 488 | # CONFIG_SERIAL_NONSTANDARD is not set | 494 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 489 | 495 | ||
| 490 | # | 496 | # |
| @@ -517,12 +523,7 @@ CONFIG_GEN_RTC=y | |||
| 517 | # CONFIG_RAW_DRIVER is not set | 523 | # CONFIG_RAW_DRIVER is not set |
| 518 | # CONFIG_TCG_TPM is not set | 524 | # CONFIG_TCG_TPM is not set |
| 519 | # CONFIG_I2C is not set | 525 | # CONFIG_I2C is not set |
| 520 | |||
| 521 | # | ||
| 522 | # SPI support | ||
| 523 | # | ||
| 524 | # CONFIG_SPI is not set | 526 | # CONFIG_SPI is not set |
| 525 | # CONFIG_SPI_MASTER is not set | ||
| 526 | # CONFIG_W1 is not set | 527 | # CONFIG_W1 is not set |
| 527 | # CONFIG_POWER_SUPPLY is not set | 528 | # CONFIG_POWER_SUPPLY is not set |
| 528 | CONFIG_HWMON=y | 529 | CONFIG_HWMON=y |
| @@ -551,12 +552,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 551 | # Multifunction device drivers | 552 | # Multifunction device drivers |
| 552 | # | 553 | # |
| 553 | # CONFIG_MFD_SM501 is not set | 554 | # CONFIG_MFD_SM501 is not set |
| 555 | # CONFIG_HTC_PASIC3 is not set | ||
| 554 | 556 | ||
| 555 | # | 557 | # |
| 556 | # Multimedia devices | 558 | # Multimedia devices |
| 557 | # | 559 | # |
| 560 | |||
| 561 | # | ||
| 562 | # Multimedia core support | ||
| 563 | # | ||
| 558 | # CONFIG_VIDEO_DEV is not set | 564 | # CONFIG_VIDEO_DEV is not set |
| 559 | # CONFIG_DVB_CORE is not set | 565 | # CONFIG_DVB_CORE is not set |
| 566 | # CONFIG_VIDEO_MEDIA is not set | ||
| 567 | |||
| 568 | # | ||
| 569 | # Multimedia drivers | ||
| 570 | # | ||
| 560 | CONFIG_DAB=y | 571 | CONFIG_DAB=y |
| 561 | 572 | ||
| 562 | # | 573 | # |
| @@ -584,6 +595,8 @@ CONFIG_USB_SUPPORT=y | |||
| 584 | # CONFIG_USB_ARCH_HAS_HCD is not set | 595 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 585 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 596 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 586 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 597 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 598 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 599 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 587 | 600 | ||
| 588 | # | 601 | # |
| 589 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 602 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -592,13 +605,10 @@ CONFIG_USB_SUPPORT=y | |||
| 592 | # CONFIG_MMC is not set | 605 | # CONFIG_MMC is not set |
| 593 | # CONFIG_MEMSTICK is not set | 606 | # CONFIG_MEMSTICK is not set |
| 594 | # CONFIG_NEW_LEDS is not set | 607 | # CONFIG_NEW_LEDS is not set |
| 608 | # CONFIG_ACCESSIBILITY is not set | ||
| 595 | # CONFIG_EDAC is not set | 609 | # CONFIG_EDAC is not set |
| 596 | # CONFIG_RTC_CLASS is not set | 610 | # CONFIG_RTC_CLASS is not set |
| 597 | # CONFIG_DMADEVICES is not set | 611 | # CONFIG_DMADEVICES is not set |
| 598 | |||
| 599 | # | ||
| 600 | # Userspace I/O | ||
| 601 | # | ||
| 602 | # CONFIG_UIO is not set | 612 | # CONFIG_UIO is not set |
| 603 | 613 | ||
| 604 | # | 614 | # |
| @@ -620,7 +630,6 @@ CONFIG_FS_MBCACHE=y | |||
| 620 | # CONFIG_JFS_FS is not set | 630 | # CONFIG_JFS_FS is not set |
| 621 | # CONFIG_FS_POSIX_ACL is not set | 631 | # CONFIG_FS_POSIX_ACL is not set |
| 622 | # CONFIG_XFS_FS is not set | 632 | # CONFIG_XFS_FS is not set |
| 623 | # CONFIG_GFS2_FS is not set | ||
| 624 | # CONFIG_OCFS2_FS is not set | 633 | # CONFIG_OCFS2_FS is not set |
| 625 | CONFIG_DNOTIFY=y | 634 | CONFIG_DNOTIFY=y |
| 626 | CONFIG_INOTIFY=y | 635 | CONFIG_INOTIFY=y |
| @@ -678,7 +687,6 @@ CONFIG_NFS_FS=y | |||
| 678 | CONFIG_NFS_V3=y | 687 | CONFIG_NFS_V3=y |
| 679 | # CONFIG_NFS_V3_ACL is not set | 688 | # CONFIG_NFS_V3_ACL is not set |
| 680 | # CONFIG_NFS_V4 is not set | 689 | # CONFIG_NFS_V4 is not set |
| 681 | # CONFIG_NFS_DIRECTIO is not set | ||
| 682 | # CONFIG_NFSD is not set | 690 | # CONFIG_NFSD is not set |
| 683 | CONFIG_ROOT_NFS=y | 691 | CONFIG_ROOT_NFS=y |
| 684 | CONFIG_LOCKD=y | 692 | CONFIG_LOCKD=y |
| @@ -722,6 +730,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 722 | # Library routines | 730 | # Library routines |
| 723 | # | 731 | # |
| 724 | CONFIG_BITREVERSE=y | 732 | CONFIG_BITREVERSE=y |
| 733 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 725 | CONFIG_CRC_CCITT=y | 734 | CONFIG_CRC_CCITT=y |
| 726 | # CONFIG_CRC16 is not set | 735 | # CONFIG_CRC16 is not set |
| 727 | # CONFIG_CRC_ITU_T is not set | 736 | # CONFIG_CRC_ITU_T is not set |
| @@ -733,6 +742,7 @@ CONFIG_PLIST=y | |||
| 733 | CONFIG_HAS_IOMEM=y | 742 | CONFIG_HAS_IOMEM=y |
| 734 | CONFIG_HAS_IOPORT=y | 743 | CONFIG_HAS_IOPORT=y |
| 735 | CONFIG_HAS_DMA=y | 744 | CONFIG_HAS_DMA=y |
| 745 | CONFIG_HAVE_LMB=y | ||
| 736 | 746 | ||
| 737 | # | 747 | # |
| 738 | # Kernel hacking | 748 | # Kernel hacking |
| @@ -740,6 +750,7 @@ CONFIG_HAS_DMA=y | |||
| 740 | # CONFIG_PRINTK_TIME is not set | 750 | # CONFIG_PRINTK_TIME is not set |
| 741 | CONFIG_ENABLE_WARN_DEPRECATED=y | 751 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 742 | CONFIG_ENABLE_MUST_CHECK=y | 752 | CONFIG_ENABLE_MUST_CHECK=y |
| 753 | CONFIG_FRAME_WARN=1024 | ||
| 743 | # CONFIG_MAGIC_SYSRQ is not set | 754 | # CONFIG_MAGIC_SYSRQ is not set |
| 744 | # CONFIG_UNUSED_SYMBOLS is not set | 755 | # CONFIG_UNUSED_SYMBOLS is not set |
| 745 | # CONFIG_DEBUG_FS is not set | 756 | # CONFIG_DEBUG_FS is not set |
| @@ -748,6 +759,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 748 | # CONFIG_SLUB_DEBUG_ON is not set | 759 | # CONFIG_SLUB_DEBUG_ON is not set |
| 749 | # CONFIG_SLUB_STATS is not set | 760 | # CONFIG_SLUB_STATS is not set |
| 750 | # CONFIG_SAMPLES is not set | 761 | # CONFIG_SAMPLES is not set |
| 762 | # CONFIG_IRQSTACKS is not set | ||
| 751 | # CONFIG_PPC_EARLY_DEBUG is not set | 763 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 752 | 764 | ||
| 753 | # | 765 | # |
| @@ -757,48 +769,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 757 | # CONFIG_SECURITY is not set | 769 | # CONFIG_SECURITY is not set |
| 758 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 770 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 759 | CONFIG_CRYPTO=y | 771 | CONFIG_CRYPTO=y |
| 760 | # CONFIG_CRYPTO_SEQIV is not set | 772 | |
| 773 | # | ||
| 774 | # Crypto core or helper | ||
| 775 | # | ||
| 761 | # CONFIG_CRYPTO_MANAGER is not set | 776 | # CONFIG_CRYPTO_MANAGER is not set |
| 777 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 778 | # CONFIG_CRYPTO_NULL is not set | ||
| 779 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 780 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 781 | |||
| 782 | # | ||
| 783 | # Authenticated Encryption with Associated Data | ||
| 784 | # | ||
| 785 | # CONFIG_CRYPTO_CCM is not set | ||
| 786 | # CONFIG_CRYPTO_GCM is not set | ||
| 787 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 788 | |||
| 789 | # | ||
| 790 | # Block modes | ||
| 791 | # | ||
| 792 | # CONFIG_CRYPTO_CBC is not set | ||
| 793 | # CONFIG_CRYPTO_CTR is not set | ||
| 794 | # CONFIG_CRYPTO_CTS is not set | ||
| 795 | # CONFIG_CRYPTO_ECB is not set | ||
| 796 | # CONFIG_CRYPTO_LRW is not set | ||
| 797 | # CONFIG_CRYPTO_PCBC is not set | ||
| 798 | # CONFIG_CRYPTO_XTS is not set | ||
| 799 | |||
| 800 | # | ||
| 801 | # Hash modes | ||
| 802 | # | ||
| 762 | # CONFIG_CRYPTO_HMAC is not set | 803 | # CONFIG_CRYPTO_HMAC is not set |
| 763 | # CONFIG_CRYPTO_XCBC is not set | 804 | # CONFIG_CRYPTO_XCBC is not set |
| 764 | # CONFIG_CRYPTO_NULL is not set | 805 | |
| 806 | # | ||
| 807 | # Digest | ||
| 808 | # | ||
| 809 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 765 | # CONFIG_CRYPTO_MD4 is not set | 810 | # CONFIG_CRYPTO_MD4 is not set |
| 766 | # CONFIG_CRYPTO_MD5 is not set | 811 | # CONFIG_CRYPTO_MD5 is not set |
| 812 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 767 | # CONFIG_CRYPTO_SHA1 is not set | 813 | # CONFIG_CRYPTO_SHA1 is not set |
| 768 | # CONFIG_CRYPTO_SHA256 is not set | 814 | # CONFIG_CRYPTO_SHA256 is not set |
| 769 | # CONFIG_CRYPTO_SHA512 is not set | 815 | # CONFIG_CRYPTO_SHA512 is not set |
| 770 | # CONFIG_CRYPTO_WP512 is not set | ||
| 771 | # CONFIG_CRYPTO_TGR192 is not set | 816 | # CONFIG_CRYPTO_TGR192 is not set |
| 772 | # CONFIG_CRYPTO_GF128MUL is not set | 817 | # CONFIG_CRYPTO_WP512 is not set |
| 773 | # CONFIG_CRYPTO_ECB is not set | 818 | |
| 774 | # CONFIG_CRYPTO_CBC is not set | 819 | # |
| 775 | # CONFIG_CRYPTO_PCBC is not set | 820 | # Ciphers |
| 776 | # CONFIG_CRYPTO_LRW is not set | 821 | # |
| 777 | # CONFIG_CRYPTO_XTS is not set | ||
| 778 | # CONFIG_CRYPTO_CTR is not set | ||
| 779 | # CONFIG_CRYPTO_GCM is not set | ||
| 780 | # CONFIG_CRYPTO_CCM is not set | ||
| 781 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 782 | # CONFIG_CRYPTO_DES is not set | ||
| 783 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 784 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 785 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 786 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 787 | # CONFIG_CRYPTO_AES is not set | 822 | # CONFIG_CRYPTO_AES is not set |
| 823 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 824 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 825 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 826 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 788 | # CONFIG_CRYPTO_CAST5 is not set | 827 | # CONFIG_CRYPTO_CAST5 is not set |
| 789 | # CONFIG_CRYPTO_CAST6 is not set | 828 | # CONFIG_CRYPTO_CAST6 is not set |
| 790 | # CONFIG_CRYPTO_TEA is not set | 829 | # CONFIG_CRYPTO_DES is not set |
| 791 | # CONFIG_CRYPTO_ARC4 is not set | 830 | # CONFIG_CRYPTO_FCRYPT is not set |
| 792 | # CONFIG_CRYPTO_KHAZAD is not set | 831 | # CONFIG_CRYPTO_KHAZAD is not set |
| 793 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 794 | # CONFIG_CRYPTO_SEED is not set | ||
| 795 | # CONFIG_CRYPTO_SALSA20 is not set | 832 | # CONFIG_CRYPTO_SALSA20 is not set |
| 833 | # CONFIG_CRYPTO_SEED is not set | ||
| 834 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 835 | # CONFIG_CRYPTO_TEA is not set | ||
| 836 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 837 | |||
| 838 | # | ||
| 839 | # Compression | ||
| 840 | # | ||
| 796 | # CONFIG_CRYPTO_DEFLATE is not set | 841 | # CONFIG_CRYPTO_DEFLATE is not set |
| 797 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 798 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 799 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 800 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 801 | # CONFIG_CRYPTO_LZO is not set | 842 | # CONFIG_CRYPTO_LZO is not set |
| 802 | CONFIG_CRYPTO_HW=y | 843 | CONFIG_CRYPTO_HW=y |
| 803 | # CONFIG_PPC_CLOCK is not set | 844 | # CONFIG_PPC_CLOCK is not set |
| 804 | CONFIG_PPC_LIB_RHEAP=y | 845 | CONFIG_PPC_LIB_RHEAP=y |
| 846 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 82151b9bba26..9df78973005e 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:35 2008 | 4 | # Mon Jun 9 08:52:17 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -108,6 +110,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 110 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 111 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 112 | CONFIG_HAVE_KRETPROBES=y |
| 113 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 114 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
| 113 | # CONFIG_TINY_SHMEM is not set | 116 | # CONFIG_TINY_SHMEM is not set |
| @@ -219,11 +222,13 @@ CONFIG_FLATMEM=y | |||
| 219 | CONFIG_FLAT_NODE_MEM_MAP=y | 222 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 220 | # CONFIG_SPARSEMEM_STATIC is not set | 223 | # CONFIG_SPARSEMEM_STATIC is not set |
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 225 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 223 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
| 224 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
| 225 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
| 226 | CONFIG_VIRT_TO_BUS=y | 230 | CONFIG_VIRT_TO_BUS=y |
| 231 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 227 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
| 229 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
| @@ -241,6 +246,7 @@ CONFIG_FSL_SOC=y | |||
| 241 | # CONFIG_PCI_QSPAN is not set | 246 | # CONFIG_PCI_QSPAN is not set |
| 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 243 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 244 | 250 | ||
| 245 | # | 251 | # |
| 246 | # Advanced setup | 252 | # Advanced setup |
| @@ -250,13 +256,13 @@ CONFIG_FSL_SOC=y | |||
| 250 | # | 256 | # |
| 251 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 252 | # | 258 | # |
| 253 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 254 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 255 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_TASK_SIZE=0x80000000 | 263 | CONFIG_TASK_SIZE=0x80000000 |
| 257 | CONFIG_CONSISTENT_START=0xfd000000 | 264 | CONFIG_CONSISTENT_START=0xfd000000 |
| 258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 265 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 259 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 260 | 266 | ||
| 261 | # | 267 | # |
| 262 | # Networking | 268 | # Networking |
| @@ -299,8 +305,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 305 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 306 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 307 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 308 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 309 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 310 | # CONFIG_IP_DCCP is not set |
| @@ -492,6 +496,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 492 | # | 496 | # |
| 493 | # CONFIG_WLAN_PRE80211 is not set | 497 | # CONFIG_WLAN_PRE80211 is not set |
| 494 | # CONFIG_WLAN_80211 is not set | 498 | # CONFIG_WLAN_80211 is not set |
| 499 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 495 | # CONFIG_WAN is not set | 500 | # CONFIG_WAN is not set |
| 496 | # CONFIG_PPP is not set | 501 | # CONFIG_PPP is not set |
| 497 | # CONFIG_SLIP is not set | 502 | # CONFIG_SLIP is not set |
| @@ -516,6 +521,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 516 | # Character devices | 521 | # Character devices |
| 517 | # | 522 | # |
| 518 | # CONFIG_VT is not set | 523 | # CONFIG_VT is not set |
| 524 | CONFIG_DEVKMEM=y | ||
| 519 | # CONFIG_SERIAL_NONSTANDARD is not set | 525 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 520 | 526 | ||
| 521 | # | 527 | # |
| @@ -548,12 +554,7 @@ CONFIG_GEN_RTC=y | |||
| 548 | # CONFIG_RAW_DRIVER is not set | 554 | # CONFIG_RAW_DRIVER is not set |
| 549 | # CONFIG_TCG_TPM is not set | 555 | # CONFIG_TCG_TPM is not set |
| 550 | # CONFIG_I2C is not set | 556 | # CONFIG_I2C is not set |
| 551 | |||
| 552 | # | ||
| 553 | # SPI support | ||
| 554 | # | ||
| 555 | # CONFIG_SPI is not set | 557 | # CONFIG_SPI is not set |
| 556 | # CONFIG_SPI_MASTER is not set | ||
| 557 | # CONFIG_W1 is not set | 558 | # CONFIG_W1 is not set |
| 558 | # CONFIG_POWER_SUPPLY is not set | 559 | # CONFIG_POWER_SUPPLY is not set |
| 559 | # CONFIG_HWMON is not set | 560 | # CONFIG_HWMON is not set |
| @@ -570,12 +571,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 570 | # Multifunction device drivers | 571 | # Multifunction device drivers |
| 571 | # | 572 | # |
| 572 | # CONFIG_MFD_SM501 is not set | 573 | # CONFIG_MFD_SM501 is not set |
| 574 | # CONFIG_HTC_PASIC3 is not set | ||
| 573 | 575 | ||
| 574 | # | 576 | # |
| 575 | # Multimedia devices | 577 | # Multimedia devices |
| 576 | # | 578 | # |
| 579 | |||
| 580 | # | ||
| 581 | # Multimedia core support | ||
| 582 | # | ||
| 577 | # CONFIG_VIDEO_DEV is not set | 583 | # CONFIG_VIDEO_DEV is not set |
| 578 | # CONFIG_DVB_CORE is not set | 584 | # CONFIG_DVB_CORE is not set |
| 585 | # CONFIG_VIDEO_MEDIA is not set | ||
| 586 | |||
| 587 | # | ||
| 588 | # Multimedia drivers | ||
| 589 | # | ||
| 579 | CONFIG_DAB=y | 590 | CONFIG_DAB=y |
| 580 | 591 | ||
| 581 | # | 592 | # |
| @@ -599,13 +610,10 @@ CONFIG_DAB=y | |||
| 599 | # CONFIG_MMC is not set | 610 | # CONFIG_MMC is not set |
| 600 | # CONFIG_MEMSTICK is not set | 611 | # CONFIG_MEMSTICK is not set |
| 601 | # CONFIG_NEW_LEDS is not set | 612 | # CONFIG_NEW_LEDS is not set |
| 613 | # CONFIG_ACCESSIBILITY is not set | ||
| 602 | # CONFIG_EDAC is not set | 614 | # CONFIG_EDAC is not set |
| 603 | # CONFIG_RTC_CLASS is not set | 615 | # CONFIG_RTC_CLASS is not set |
| 604 | # CONFIG_DMADEVICES is not set | 616 | # CONFIG_DMADEVICES is not set |
| 605 | |||
| 606 | # | ||
| 607 | # Userspace I/O | ||
| 608 | # | ||
| 609 | # CONFIG_UIO is not set | 617 | # CONFIG_UIO is not set |
| 610 | 618 | ||
| 611 | # | 619 | # |
| @@ -618,7 +626,6 @@ CONFIG_DAB=y | |||
| 618 | # CONFIG_JFS_FS is not set | 626 | # CONFIG_JFS_FS is not set |
| 619 | # CONFIG_FS_POSIX_ACL is not set | 627 | # CONFIG_FS_POSIX_ACL is not set |
| 620 | # CONFIG_XFS_FS is not set | 628 | # CONFIG_XFS_FS is not set |
| 621 | # CONFIG_GFS2_FS is not set | ||
| 622 | # CONFIG_OCFS2_FS is not set | 629 | # CONFIG_OCFS2_FS is not set |
| 623 | # CONFIG_DNOTIFY is not set | 630 | # CONFIG_DNOTIFY is not set |
| 624 | # CONFIG_INOTIFY is not set | 631 | # CONFIG_INOTIFY is not set |
| @@ -676,7 +683,6 @@ CONFIG_NFS_FS=y | |||
| 676 | CONFIG_NFS_V3=y | 683 | CONFIG_NFS_V3=y |
| 677 | # CONFIG_NFS_V3_ACL is not set | 684 | # CONFIG_NFS_V3_ACL is not set |
| 678 | # CONFIG_NFS_V4 is not set | 685 | # CONFIG_NFS_V4 is not set |
| 679 | # CONFIG_NFS_DIRECTIO is not set | ||
| 680 | # CONFIG_NFSD is not set | 686 | # CONFIG_NFSD is not set |
| 681 | CONFIG_ROOT_NFS=y | 687 | CONFIG_ROOT_NFS=y |
| 682 | CONFIG_LOCKD=y | 688 | CONFIG_LOCKD=y |
| @@ -719,6 +725,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 719 | # | 725 | # |
| 720 | # Library routines | 726 | # Library routines |
| 721 | # | 727 | # |
| 728 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 722 | # CONFIG_CRC_CCITT is not set | 729 | # CONFIG_CRC_CCITT is not set |
| 723 | # CONFIG_CRC16 is not set | 730 | # CONFIG_CRC16 is not set |
| 724 | # CONFIG_CRC_ITU_T is not set | 731 | # CONFIG_CRC_ITU_T is not set |
| @@ -729,6 +736,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 729 | CONFIG_HAS_IOMEM=y | 736 | CONFIG_HAS_IOMEM=y |
| 730 | CONFIG_HAS_IOPORT=y | 737 | CONFIG_HAS_IOPORT=y |
| 731 | CONFIG_HAS_DMA=y | 738 | CONFIG_HAS_DMA=y |
| 739 | CONFIG_HAVE_LMB=y | ||
| 732 | 740 | ||
| 733 | # | 741 | # |
| 734 | # Kernel hacking | 742 | # Kernel hacking |
| @@ -736,6 +744,7 @@ CONFIG_HAS_DMA=y | |||
| 736 | # CONFIG_PRINTK_TIME is not set | 744 | # CONFIG_PRINTK_TIME is not set |
| 737 | CONFIG_ENABLE_WARN_DEPRECATED=y | 745 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 738 | CONFIG_ENABLE_MUST_CHECK=y | 746 | CONFIG_ENABLE_MUST_CHECK=y |
| 747 | CONFIG_FRAME_WARN=1024 | ||
| 739 | CONFIG_MAGIC_SYSRQ=y | 748 | CONFIG_MAGIC_SYSRQ=y |
| 740 | # CONFIG_UNUSED_SYMBOLS is not set | 749 | # CONFIG_UNUSED_SYMBOLS is not set |
| 741 | # CONFIG_DEBUG_FS is not set | 750 | # CONFIG_DEBUG_FS is not set |
| @@ -746,6 +755,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 746 | CONFIG_SCHED_DEBUG=y | 755 | CONFIG_SCHED_DEBUG=y |
| 747 | # CONFIG_SCHEDSTATS is not set | 756 | # CONFIG_SCHEDSTATS is not set |
| 748 | # CONFIG_TIMER_STATS is not set | 757 | # CONFIG_TIMER_STATS is not set |
| 758 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 749 | # CONFIG_SLUB_DEBUG_ON is not set | 759 | # CONFIG_SLUB_DEBUG_ON is not set |
| 750 | # CONFIG_SLUB_STATS is not set | 760 | # CONFIG_SLUB_STATS is not set |
| 751 | # CONFIG_DEBUG_SPINLOCK is not set | 761 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -756,6 +766,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 756 | CONFIG_DEBUG_BUGVERBOSE=y | 766 | CONFIG_DEBUG_BUGVERBOSE=y |
| 757 | CONFIG_DEBUG_INFO=y | 767 | CONFIG_DEBUG_INFO=y |
| 758 | # CONFIG_DEBUG_VM is not set | 768 | # CONFIG_DEBUG_VM is not set |
| 769 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 759 | # CONFIG_DEBUG_LIST is not set | 770 | # CONFIG_DEBUG_LIST is not set |
| 760 | # CONFIG_DEBUG_SG is not set | 771 | # CONFIG_DEBUG_SG is not set |
| 761 | # CONFIG_BOOT_PRINTK_DELAY is not set | 772 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -766,6 +777,7 @@ CONFIG_DEBUG_INFO=y | |||
| 766 | # CONFIG_DEBUG_STACK_USAGE is not set | 777 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 767 | # CONFIG_DEBUG_PAGEALLOC is not set | 778 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 768 | # CONFIG_DEBUGGER is not set | 779 | # CONFIG_DEBUGGER is not set |
| 780 | # CONFIG_IRQSTACKS is not set | ||
| 769 | # CONFIG_BDI_SWITCH is not set | 781 | # CONFIG_BDI_SWITCH is not set |
| 770 | # CONFIG_PPC_EARLY_DEBUG is not set | 782 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 771 | 783 | ||
| @@ -778,3 +790,4 @@ CONFIG_DEBUG_INFO=y | |||
| 778 | # CONFIG_CRYPTO is not set | 790 | # CONFIG_CRYPTO is not set |
| 779 | # CONFIG_PPC_CLOCK is not set | 791 | # CONFIG_PPC_CLOCK is not set |
| 780 | CONFIG_PPC_LIB_RHEAP=y | 792 | CONFIG_PPC_LIB_RHEAP=y |
| 793 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 40f84fa2bd29..ce250bc98584 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_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.26-rc3 | 3 | # Linux kernel version: 2.6.26-rc6 |
| 4 | # Tue May 20 20:03:02 2008 | 4 | # Mon Jun 16 21:11:19 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -763,7 +763,63 @@ CONFIG_ATA_NONSTANDARD=y | |||
| 763 | CONFIG_SATA_PMP=y | 763 | CONFIG_SATA_PMP=y |
| 764 | # CONFIG_SATA_AHCI is not set | 764 | # CONFIG_SATA_AHCI is not set |
| 765 | CONFIG_SATA_SIL24=y | 765 | CONFIG_SATA_SIL24=y |
| 766 | # CONFIG_ATA_SFF is not set | 766 | CONFIG_ATA_SFF=y |
| 767 | CONFIG_SATA_SVW=y | ||
| 768 | # CONFIG_ATA_PIIX is not set | ||
| 769 | # CONFIG_SATA_MV is not set | ||
| 770 | # CONFIG_SATA_NV is not set | ||
| 771 | # CONFIG_PDC_ADMA is not set | ||
| 772 | # CONFIG_SATA_QSTOR is not set | ||
| 773 | # CONFIG_SATA_PROMISE is not set | ||
| 774 | # CONFIG_SATA_SX4 is not set | ||
| 775 | # CONFIG_SATA_SIL is not set | ||
| 776 | # CONFIG_SATA_SIS is not set | ||
| 777 | # CONFIG_SATA_ULI is not set | ||
| 778 | # CONFIG_SATA_VIA is not set | ||
| 779 | # CONFIG_SATA_VITESSE is not set | ||
| 780 | # CONFIG_SATA_INIC162X is not set | ||
| 781 | # CONFIG_PATA_ALI is not set | ||
| 782 | # CONFIG_PATA_AMD is not set | ||
| 783 | # CONFIG_PATA_ARTOP is not set | ||
| 784 | # CONFIG_PATA_ATIIXP is not set | ||
| 785 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 786 | # CONFIG_PATA_CMD64X is not set | ||
| 787 | # CONFIG_PATA_CS5520 is not set | ||
| 788 | # CONFIG_PATA_CS5530 is not set | ||
| 789 | # CONFIG_PATA_CYPRESS is not set | ||
| 790 | # CONFIG_PATA_EFAR is not set | ||
| 791 | # CONFIG_ATA_GENERIC is not set | ||
| 792 | # CONFIG_PATA_HPT366 is not set | ||
| 793 | # CONFIG_PATA_HPT37X is not set | ||
| 794 | # CONFIG_PATA_HPT3X2N is not set | ||
| 795 | # CONFIG_PATA_HPT3X3 is not set | ||
| 796 | # CONFIG_PATA_IT821X is not set | ||
| 797 | # CONFIG_PATA_IT8213 is not set | ||
| 798 | # CONFIG_PATA_JMICRON is not set | ||
| 799 | # CONFIG_PATA_TRIFLEX is not set | ||
| 800 | # CONFIG_PATA_MARVELL is not set | ||
| 801 | # CONFIG_PATA_MPIIX is not set | ||
| 802 | # CONFIG_PATA_OLDPIIX is not set | ||
| 803 | # CONFIG_PATA_NETCELL is not set | ||
| 804 | # CONFIG_PATA_NINJA32 is not set | ||
| 805 | # CONFIG_PATA_NS87410 is not set | ||
| 806 | # CONFIG_PATA_NS87415 is not set | ||
| 807 | # CONFIG_PATA_OPTI is not set | ||
| 808 | # CONFIG_PATA_OPTIDMA is not set | ||
| 809 | # CONFIG_PATA_PCMCIA is not set | ||
| 810 | # CONFIG_PATA_PDC_OLD is not set | ||
| 811 | # CONFIG_PATA_RADISYS is not set | ||
| 812 | # CONFIG_PATA_RZ1000 is not set | ||
| 813 | # CONFIG_PATA_SC1200 is not set | ||
| 814 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 815 | # CONFIG_PATA_PDC2027X is not set | ||
| 816 | # CONFIG_PATA_SIL680 is not set | ||
| 817 | # CONFIG_PATA_SIS is not set | ||
| 818 | # CONFIG_PATA_VIA is not set | ||
| 819 | # CONFIG_PATA_WINBOND is not set | ||
| 820 | # CONFIG_PATA_PLATFORM is not set | ||
| 821 | # CONFIG_PATA_SCC is not set | ||
| 822 | # CONFIG_PATA_SCH is not set | ||
| 767 | CONFIG_MD=y | 823 | CONFIG_MD=y |
| 768 | CONFIG_BLK_DEV_MD=y | 824 | CONFIG_BLK_DEV_MD=y |
| 769 | CONFIG_MD_LINEAR=y | 825 | CONFIG_MD_LINEAR=y |
| @@ -1478,6 +1534,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1478 | # | 1534 | # |
| 1479 | # CONFIG_USB_ACM is not set | 1535 | # CONFIG_USB_ACM is not set |
| 1480 | # CONFIG_USB_PRINTER is not set | 1536 | # CONFIG_USB_PRINTER is not set |
| 1537 | # CONFIG_USB_WDM is not set | ||
| 1481 | 1538 | ||
| 1482 | # | 1539 | # |
| 1483 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1540 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1537,6 +1594,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1537 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1594 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1538 | # CONFIG_USB_IOWARRIOR is not set | 1595 | # CONFIG_USB_IOWARRIOR is not set |
| 1539 | # CONFIG_USB_TEST is not set | 1596 | # CONFIG_USB_TEST is not set |
| 1597 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1540 | # CONFIG_USB_GADGET is not set | 1598 | # CONFIG_USB_GADGET is not set |
| 1541 | # CONFIG_MMC is not set | 1599 | # CONFIG_MMC is not set |
| 1542 | # CONFIG_MEMSTICK is not set | 1600 | # CONFIG_MEMSTICK is not set |
| @@ -1597,6 +1655,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1597 | # CONFIG_RTC_DRV_PCF8583 is not set | 1655 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1598 | # CONFIG_RTC_DRV_M41T80 is not set | 1656 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1599 | # CONFIG_RTC_DRV_S35390A is not set | 1657 | # CONFIG_RTC_DRV_S35390A is not set |
| 1658 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1600 | 1659 | ||
| 1601 | # | 1660 | # |
| 1602 | # SPI RTC drivers | 1661 | # SPI RTC drivers |
| @@ -1617,6 +1676,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1617 | # | 1676 | # |
| 1618 | # on-CPU RTC drivers | 1677 | # on-CPU RTC drivers |
| 1619 | # | 1678 | # |
| 1679 | CONFIG_RTC_DRV_PPC=y | ||
| 1620 | # CONFIG_DMADEVICES is not set | 1680 | # CONFIG_DMADEVICES is not set |
| 1621 | # CONFIG_UIO is not set | 1681 | # CONFIG_UIO is not set |
| 1622 | 1682 | ||
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 1383eb696a20..bc3bf62ddc2f 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:36 2008 | 4 | # Mon Jun 9 08:52:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,19 +72,17 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | CONFIG_BLK_DEV_INITRD=y | 79 | CONFIG_BLK_DEV_INITRD=y |
| 82 | CONFIG_INITRAMFS_SOURCE="" | 80 | CONFIG_INITRAMFS_SOURCE="" |
| 81 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 83 | CONFIG_SYSCTL=y | 82 | CONFIG_SYSCTL=y |
| 84 | CONFIG_EMBEDDED=y | 83 | CONFIG_EMBEDDED=y |
| 85 | CONFIG_SYSCTL_SYSCALL=y | 84 | CONFIG_SYSCTL_SYSCALL=y |
| 85 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 86 | CONFIG_KALLSYMS=y | 86 | CONFIG_KALLSYMS=y |
| 87 | CONFIG_KALLSYMS_ALL=y | 87 | CONFIG_KALLSYMS_ALL=y |
| 88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -109,6 +109,7 @@ CONFIG_SLUB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 109 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 110 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 111 | CONFIG_HAVE_KRETPROBES=y |
| 112 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 113 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 114 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 115 | CONFIG_RT_MUTEXES=y |
| @@ -196,11 +197,13 @@ CONFIG_FLATMEM=y | |||
| 196 | CONFIG_FLAT_NODE_MEM_MAP=y | 197 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 197 | # CONFIG_SPARSEMEM_STATIC is not set | 198 | # CONFIG_SPARSEMEM_STATIC is not set |
| 198 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 200 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 200 | # CONFIG_RESOURCES_64BIT is not set | 202 | # CONFIG_RESOURCES_64BIT is not set |
| 201 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
| 202 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
| 203 | CONFIG_VIRT_TO_BUS=y | 205 | CONFIG_VIRT_TO_BUS=y |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 204 | CONFIG_PROC_DEVICETREE=y | 207 | CONFIG_PROC_DEVICETREE=y |
| 205 | # CONFIG_CMDLINE_BOOL is not set | 208 | # CONFIG_CMDLINE_BOOL is not set |
| 206 | # CONFIG_PM is not set | 209 | # CONFIG_PM is not set |
| @@ -225,6 +228,7 @@ CONFIG_PCI_LEGACY=y | |||
| 225 | # CONFIG_PCI_DEBUG is not set | 228 | # CONFIG_PCI_DEBUG is not set |
| 226 | # CONFIG_PCCARD is not set | 229 | # CONFIG_PCCARD is not set |
| 227 | # CONFIG_HOTPLUG_PCI is not set | 230 | # CONFIG_HOTPLUG_PCI is not set |
| 231 | # CONFIG_HAS_RAPIDIO is not set | ||
| 228 | 232 | ||
| 229 | # | 233 | # |
| 230 | # Advanced setup | 234 | # Advanced setup |
| @@ -234,11 +238,11 @@ CONFIG_PCI_LEGACY=y | |||
| 234 | # | 238 | # |
| 235 | # Default settings for advanced configuration options are used | 239 | # Default settings for advanced configuration options are used |
| 236 | # | 240 | # |
| 237 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 238 | CONFIG_LOWMEM_SIZE=0x30000000 | 241 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 242 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 239 | CONFIG_KERNEL_START=0xc0000000 | 243 | CONFIG_KERNEL_START=0xc0000000 |
| 244 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 240 | CONFIG_TASK_SIZE=0xc0000000 | 245 | CONFIG_TASK_SIZE=0xc0000000 |
| 241 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 242 | 246 | ||
| 243 | # | 247 | # |
| 244 | # Networking | 248 | # Networking |
| @@ -293,6 +297,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 293 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 297 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 294 | CONFIG_INET6_XFRM_MODE_BEET=y | 298 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 295 | CONFIG_IPV6_SIT=y | 299 | CONFIG_IPV6_SIT=y |
| 300 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 296 | # CONFIG_IPV6_TUNNEL is not set | 301 | # CONFIG_IPV6_TUNNEL is not set |
| 297 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 298 | CONFIG_NETFILTER=y | 303 | CONFIG_NETFILTER=y |
| @@ -513,7 +518,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 513 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 518 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 514 | # CONFIG_BLK_DEV_TC86C001 is not set | 519 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 515 | # CONFIG_BLK_DEV_IDEDMA is not set | 520 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 516 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 521 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 517 | # CONFIG_BLK_DEV_HD is not set | 522 | # CONFIG_BLK_DEV_HD is not set |
| 518 | 523 | ||
| 519 | # | 524 | # |
| @@ -593,7 +598,6 @@ CONFIG_NETDEV_1000=y | |||
| 593 | # CONFIG_SIS190 is not set | 598 | # CONFIG_SIS190 is not set |
| 594 | # CONFIG_SKGE is not set | 599 | # CONFIG_SKGE is not set |
| 595 | # CONFIG_SKY2 is not set | 600 | # CONFIG_SKY2 is not set |
| 596 | # CONFIG_SK98LIN is not set | ||
| 597 | # CONFIG_VIA_VELOCITY is not set | 601 | # CONFIG_VIA_VELOCITY is not set |
| 598 | # CONFIG_TIGON3 is not set | 602 | # CONFIG_TIGON3 is not set |
| 599 | # CONFIG_BNX2 is not set | 603 | # CONFIG_BNX2 is not set |
| @@ -611,6 +615,7 @@ CONFIG_NETDEV_10000=y | |||
| 611 | # CONFIG_MLX4_CORE is not set | 615 | # CONFIG_MLX4_CORE is not set |
| 612 | # CONFIG_TEHUTI is not set | 616 | # CONFIG_TEHUTI is not set |
| 613 | # CONFIG_BNX2X is not set | 617 | # CONFIG_BNX2X is not set |
| 618 | # CONFIG_SFC is not set | ||
| 614 | # CONFIG_TR is not set | 619 | # CONFIG_TR is not set |
| 615 | 620 | ||
| 616 | # | 621 | # |
| @@ -618,6 +623,7 @@ CONFIG_NETDEV_10000=y | |||
| 618 | # | 623 | # |
| 619 | # CONFIG_WLAN_PRE80211 is not set | 624 | # CONFIG_WLAN_PRE80211 is not set |
| 620 | # CONFIG_WLAN_80211 is not set | 625 | # CONFIG_WLAN_80211 is not set |
| 626 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 621 | # CONFIG_WAN is not set | 627 | # CONFIG_WAN is not set |
| 622 | # CONFIG_FDDI is not set | 628 | # CONFIG_FDDI is not set |
| 623 | CONFIG_PPP=y | 629 | CONFIG_PPP=y |
| @@ -692,6 +698,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 692 | # Character devices | 698 | # Character devices |
| 693 | # | 699 | # |
| 694 | # CONFIG_VT is not set | 700 | # CONFIG_VT is not set |
| 701 | CONFIG_DEVKMEM=y | ||
| 695 | # CONFIG_SERIAL_NONSTANDARD is not set | 702 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 696 | 703 | ||
| 697 | # | 704 | # |
| @@ -726,12 +733,7 @@ CONFIG_HW_RANDOM=y | |||
| 726 | # CONFIG_RAW_DRIVER is not set | 733 | # CONFIG_RAW_DRIVER is not set |
| 727 | CONFIG_DEVPORT=y | 734 | CONFIG_DEVPORT=y |
| 728 | # CONFIG_I2C is not set | 735 | # CONFIG_I2C is not set |
| 729 | |||
| 730 | # | ||
| 731 | # SPI support | ||
| 732 | # | ||
| 733 | # CONFIG_SPI is not set | 736 | # CONFIG_SPI is not set |
| 734 | # CONFIG_SPI_MASTER is not set | ||
| 735 | # CONFIG_W1 is not set | 737 | # CONFIG_W1 is not set |
| 736 | # CONFIG_POWER_SUPPLY is not set | 738 | # CONFIG_POWER_SUPPLY is not set |
| 737 | # CONFIG_HWMON is not set | 739 | # CONFIG_HWMON is not set |
| @@ -748,12 +750,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 748 | # Multifunction device drivers | 750 | # Multifunction device drivers |
| 749 | # | 751 | # |
| 750 | # CONFIG_MFD_SM501 is not set | 752 | # CONFIG_MFD_SM501 is not set |
| 753 | # CONFIG_HTC_PASIC3 is not set | ||
| 751 | 754 | ||
| 752 | # | 755 | # |
| 753 | # Multimedia devices | 756 | # Multimedia devices |
| 754 | # | 757 | # |
| 758 | |||
| 759 | # | ||
| 760 | # Multimedia core support | ||
| 761 | # | ||
| 755 | # CONFIG_VIDEO_DEV is not set | 762 | # CONFIG_VIDEO_DEV is not set |
| 756 | # CONFIG_DVB_CORE is not set | 763 | # CONFIG_DVB_CORE is not set |
| 764 | # CONFIG_VIDEO_MEDIA is not set | ||
| 765 | |||
| 766 | # | ||
| 767 | # Multimedia drivers | ||
| 768 | # | ||
| 757 | CONFIG_DAB=y | 769 | CONFIG_DAB=y |
| 758 | 770 | ||
| 759 | # | 771 | # |
| @@ -781,11 +793,14 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 781 | CONFIG_USB_ARCH_HAS_OHCI=y | 793 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 782 | CONFIG_USB_ARCH_HAS_EHCI=y | 794 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 783 | # CONFIG_USB is not set | 795 | # CONFIG_USB is not set |
| 796 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 797 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 784 | 798 | ||
| 785 | # | 799 | # |
| 786 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 787 | # | 801 | # |
| 788 | CONFIG_USB_GADGET=y | 802 | CONFIG_USB_GADGET=y |
| 803 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 789 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 804 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| 790 | CONFIG_USB_GADGET_SELECTED=y | 805 | CONFIG_USB_GADGET_SELECTED=y |
| 791 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 806 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
| @@ -795,6 +810,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
| 795 | # CONFIG_USB_GADGET_PXA2XX is not set | 810 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 796 | CONFIG_USB_GADGET_M66592=y | 811 | CONFIG_USB_GADGET_M66592=y |
| 797 | CONFIG_USB_M66592=y | 812 | CONFIG_USB_M66592=y |
| 813 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 798 | # CONFIG_USB_GADGET_GOKU is not set | 814 | # CONFIG_USB_GADGET_GOKU is not set |
| 799 | # CONFIG_USB_GADGET_LH7A40X is not set | 815 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 800 | # CONFIG_USB_GADGET_OMAP is not set | 816 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -804,6 +820,7 @@ CONFIG_USB_M66592=y | |||
| 804 | CONFIG_USB_GADGET_DUALSPEED=y | 820 | CONFIG_USB_GADGET_DUALSPEED=y |
| 805 | # CONFIG_USB_ZERO is not set | 821 | # CONFIG_USB_ZERO is not set |
| 806 | CONFIG_USB_ETH=y | 822 | CONFIG_USB_ETH=y |
| 823 | CONFIG_USB_ETH_RNDIS=y | ||
| 807 | # CONFIG_USB_GADGETFS is not set | 824 | # CONFIG_USB_GADGETFS is not set |
| 808 | # CONFIG_USB_FILE_STORAGE is not set | 825 | # CONFIG_USB_FILE_STORAGE is not set |
| 809 | # CONFIG_USB_G_SERIAL is not set | 826 | # CONFIG_USB_G_SERIAL is not set |
| @@ -812,13 +829,10 @@ CONFIG_USB_ETH=y | |||
| 812 | # CONFIG_MMC is not set | 829 | # CONFIG_MMC is not set |
| 813 | # CONFIG_MEMSTICK is not set | 830 | # CONFIG_MEMSTICK is not set |
| 814 | # CONFIG_NEW_LEDS is not set | 831 | # CONFIG_NEW_LEDS is not set |
| 832 | # CONFIG_ACCESSIBILITY is not set | ||
| 815 | # CONFIG_INFINIBAND is not set | 833 | # CONFIG_INFINIBAND is not set |
| 816 | # CONFIG_RTC_CLASS is not set | 834 | # CONFIG_RTC_CLASS is not set |
| 817 | # CONFIG_DMADEVICES is not set | 835 | # CONFIG_DMADEVICES is not set |
| 818 | |||
| 819 | # | ||
| 820 | # Userspace I/O | ||
| 821 | # | ||
| 822 | # CONFIG_UIO is not set | 836 | # CONFIG_UIO is not set |
| 823 | 837 | ||
| 824 | # | 838 | # |
| @@ -888,7 +902,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 888 | CONFIG_NFS_FS=y | 902 | CONFIG_NFS_FS=y |
| 889 | CONFIG_NFS_V3=y | 903 | CONFIG_NFS_V3=y |
| 890 | CONFIG_NFS_V3_ACL=y | 904 | CONFIG_NFS_V3_ACL=y |
| 891 | # CONFIG_NFS_DIRECTIO is not set | ||
| 892 | # CONFIG_NFSD is not set | 905 | # CONFIG_NFSD is not set |
| 893 | CONFIG_ROOT_NFS=y | 906 | CONFIG_ROOT_NFS=y |
| 894 | CONFIG_LOCKD=y | 907 | CONFIG_LOCKD=y |
| @@ -967,6 +980,7 @@ CONFIG_NLS_UTF8=y | |||
| 967 | # Library routines | 980 | # Library routines |
| 968 | # | 981 | # |
| 969 | CONFIG_BITREVERSE=y | 982 | CONFIG_BITREVERSE=y |
| 983 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 970 | CONFIG_CRC_CCITT=y | 984 | CONFIG_CRC_CCITT=y |
| 971 | # CONFIG_CRC16 is not set | 985 | # CONFIG_CRC16 is not set |
| 972 | # CONFIG_CRC_ITU_T is not set | 986 | # CONFIG_CRC_ITU_T is not set |
| @@ -979,6 +993,7 @@ CONFIG_PLIST=y | |||
| 979 | CONFIG_HAS_IOMEM=y | 993 | CONFIG_HAS_IOMEM=y |
| 980 | CONFIG_HAS_IOPORT=y | 994 | CONFIG_HAS_IOPORT=y |
| 981 | CONFIG_HAS_DMA=y | 995 | CONFIG_HAS_DMA=y |
| 996 | CONFIG_HAVE_LMB=y | ||
| 982 | 997 | ||
| 983 | # | 998 | # |
| 984 | # Kernel hacking | 999 | # Kernel hacking |
| @@ -986,6 +1001,7 @@ CONFIG_HAS_DMA=y | |||
| 986 | # CONFIG_PRINTK_TIME is not set | 1001 | # CONFIG_PRINTK_TIME is not set |
| 987 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1002 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 988 | CONFIG_ENABLE_MUST_CHECK=y | 1003 | CONFIG_ENABLE_MUST_CHECK=y |
| 1004 | CONFIG_FRAME_WARN=1024 | ||
| 989 | CONFIG_MAGIC_SYSRQ=y | 1005 | CONFIG_MAGIC_SYSRQ=y |
| 990 | # CONFIG_UNUSED_SYMBOLS is not set | 1006 | # CONFIG_UNUSED_SYMBOLS is not set |
| 991 | # CONFIG_DEBUG_FS is not set | 1007 | # CONFIG_DEBUG_FS is not set |
| @@ -996,6 +1012,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 996 | # CONFIG_SCHED_DEBUG is not set | 1012 | # CONFIG_SCHED_DEBUG is not set |
| 997 | # CONFIG_SCHEDSTATS is not set | 1013 | # CONFIG_SCHEDSTATS is not set |
| 998 | # CONFIG_TIMER_STATS is not set | 1014 | # CONFIG_TIMER_STATS is not set |
| 1015 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 999 | # CONFIG_SLUB_DEBUG_ON is not set | 1016 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1000 | # CONFIG_SLUB_STATS is not set | 1017 | # CONFIG_SLUB_STATS is not set |
| 1001 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1018 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1008,6 +1025,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1008 | CONFIG_DEBUG_BUGVERBOSE=y | 1025 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1009 | CONFIG_DEBUG_INFO=y | 1026 | CONFIG_DEBUG_INFO=y |
| 1010 | # CONFIG_DEBUG_VM is not set | 1027 | # CONFIG_DEBUG_VM is not set |
| 1028 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1011 | # CONFIG_DEBUG_LIST is not set | 1029 | # CONFIG_DEBUG_LIST is not set |
| 1012 | # CONFIG_DEBUG_SG is not set | 1030 | # CONFIG_DEBUG_SG is not set |
| 1013 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1031 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1019,6 +1037,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1019 | # CONFIG_DEBUG_PAGEALLOC is not set | 1037 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1020 | # CONFIG_DEBUGGER is not set | 1038 | # CONFIG_DEBUGGER is not set |
| 1021 | # CONFIG_KGDB_CONSOLE is not set | 1039 | # CONFIG_KGDB_CONSOLE is not set |
| 1040 | # CONFIG_IRQSTACKS is not set | ||
| 1022 | CONFIG_BDI_SWITCH=y | 1041 | CONFIG_BDI_SWITCH=y |
| 1023 | # CONFIG_PPC_EARLY_DEBUG is not set | 1042 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1024 | 1043 | ||
| @@ -1028,46 +1047,76 @@ CONFIG_BDI_SWITCH=y | |||
| 1028 | # CONFIG_KEYS is not set | 1047 | # CONFIG_KEYS is not set |
| 1029 | # CONFIG_SECURITY is not set | 1048 | # CONFIG_SECURITY is not set |
| 1030 | CONFIG_CRYPTO=y | 1049 | CONFIG_CRYPTO=y |
| 1050 | |||
| 1051 | # | ||
| 1052 | # Crypto core or helper | ||
| 1053 | # | ||
| 1031 | CONFIG_CRYPTO_ALGAPI=y | 1054 | CONFIG_CRYPTO_ALGAPI=y |
| 1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1055 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1033 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1034 | CONFIG_CRYPTO_MANAGER=y | 1056 | CONFIG_CRYPTO_MANAGER=y |
| 1035 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1036 | # CONFIG_CRYPTO_NULL is not set | 1057 | # CONFIG_CRYPTO_NULL is not set |
| 1058 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1059 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1060 | |||
| 1061 | # | ||
| 1062 | # Authenticated Encryption with Associated Data | ||
| 1063 | # | ||
| 1064 | # CONFIG_CRYPTO_CCM is not set | ||
| 1065 | # CONFIG_CRYPTO_GCM is not set | ||
| 1066 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1067 | |||
| 1068 | # | ||
| 1069 | # Block modes | ||
| 1070 | # | ||
| 1071 | CONFIG_CRYPTO_CBC=y | ||
| 1072 | # CONFIG_CRYPTO_CTR is not set | ||
| 1073 | # CONFIG_CRYPTO_CTS is not set | ||
| 1074 | CONFIG_CRYPTO_ECB=y | ||
| 1075 | CONFIG_CRYPTO_PCBC=y | ||
| 1076 | |||
| 1077 | # | ||
| 1078 | # Hash modes | ||
| 1079 | # | ||
| 1080 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1081 | |||
| 1082 | # | ||
| 1083 | # Digest | ||
| 1084 | # | ||
| 1085 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1037 | # CONFIG_CRYPTO_MD4 is not set | 1086 | # CONFIG_CRYPTO_MD4 is not set |
| 1038 | CONFIG_CRYPTO_MD5=y | 1087 | CONFIG_CRYPTO_MD5=y |
| 1088 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1039 | # CONFIG_CRYPTO_SHA1 is not set | 1089 | # CONFIG_CRYPTO_SHA1 is not set |
| 1040 | # CONFIG_CRYPTO_SHA256 is not set | 1090 | # CONFIG_CRYPTO_SHA256 is not set |
| 1041 | # CONFIG_CRYPTO_SHA512 is not set | 1091 | # CONFIG_CRYPTO_SHA512 is not set |
| 1042 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1043 | # CONFIG_CRYPTO_TGR192 is not set | 1092 | # CONFIG_CRYPTO_TGR192 is not set |
| 1044 | CONFIG_CRYPTO_ECB=y | 1093 | # CONFIG_CRYPTO_WP512 is not set |
| 1045 | CONFIG_CRYPTO_CBC=y | 1094 | |
| 1046 | CONFIG_CRYPTO_PCBC=y | 1095 | # |
| 1047 | # CONFIG_CRYPTO_CTR is not set | 1096 | # Ciphers |
| 1048 | # CONFIG_CRYPTO_GCM is not set | 1097 | # |
| 1049 | # CONFIG_CRYPTO_CCM is not set | ||
| 1050 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1051 | CONFIG_CRYPTO_DES=y | ||
| 1052 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1053 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1054 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1055 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1056 | # CONFIG_CRYPTO_AES is not set | 1098 | # CONFIG_CRYPTO_AES is not set |
| 1099 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1100 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1101 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1102 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1057 | # CONFIG_CRYPTO_CAST5 is not set | 1103 | # CONFIG_CRYPTO_CAST5 is not set |
| 1058 | # CONFIG_CRYPTO_CAST6 is not set | 1104 | # CONFIG_CRYPTO_CAST6 is not set |
| 1059 | # CONFIG_CRYPTO_TEA is not set | 1105 | CONFIG_CRYPTO_DES=y |
| 1060 | # CONFIG_CRYPTO_ARC4 is not set | 1106 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1061 | # CONFIG_CRYPTO_KHAZAD is not set | 1107 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1062 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1063 | # CONFIG_CRYPTO_SEED is not set | 1108 | # CONFIG_CRYPTO_SEED is not set |
| 1109 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1110 | # CONFIG_CRYPTO_TEA is not set | ||
| 1111 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # Compression | ||
| 1115 | # | ||
| 1064 | # CONFIG_CRYPTO_DEFLATE is not set | 1116 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1065 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1066 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1067 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1068 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1069 | # CONFIG_CRYPTO_LZO is not set | 1117 | # CONFIG_CRYPTO_LZO is not set |
| 1070 | CONFIG_CRYPTO_HW=y | 1118 | CONFIG_CRYPTO_HW=y |
| 1071 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1119 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1072 | # CONFIG_PPC_CLOCK is not set | 1120 | # CONFIG_PPC_CLOCK is not set |
| 1073 | CONFIG_PPC_LIB_RHEAP=y | 1121 | CONFIG_PPC_LIB_RHEAP=y |
| 1122 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index f9121685f11a..c6b83577c055 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:15 2008 | 4 | # Mon Jun 9 08:52:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -33,6 +33,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 33 | CONFIG_GENERIC_HARDIRQS=y | 33 | CONFIG_GENERIC_HARDIRQS=y |
| 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 37 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 38 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -92,6 +94,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 93 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 95 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 97 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
| @@ -117,6 +120,7 @@ CONFIG_SLUB=y | |||
| 117 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| @@ -215,11 +219,13 @@ CONFIG_FLATMEM=y | |||
| 215 | CONFIG_FLAT_NODE_MEM_MAP=y | 219 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 216 | # CONFIG_SPARSEMEM_STATIC is not set | 220 | # CONFIG_SPARSEMEM_STATIC is not set |
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 219 | # CONFIG_RESOURCES_64BIT is not set | 224 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 225 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 226 | CONFIG_BOUNCE=y |
| 222 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 223 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 230 | # CONFIG_CMDLINE_BOOL is not set |
| 225 | # CONFIG_PM is not set | 231 | # CONFIG_PM is not set |
| @@ -241,6 +247,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 241 | CONFIG_PCI_LEGACY=y | 247 | CONFIG_PCI_LEGACY=y |
| 242 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 243 | # CONFIG_HOTPLUG_PCI is not set | 249 | # CONFIG_HOTPLUG_PCI is not set |
| 250 | # CONFIG_HAS_RAPIDIO is not set | ||
| 244 | 251 | ||
| 245 | # | 252 | # |
| 246 | # Advanced setup | 253 | # Advanced setup |
| @@ -250,13 +257,13 @@ CONFIG_PCI_LEGACY=y | |||
| 250 | # | 257 | # |
| 251 | # Default settings for advanced configuration options are used | 258 | # Default settings for advanced configuration options are used |
| 252 | # | 259 | # |
| 253 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 254 | CONFIG_LOWMEM_SIZE=0x30000000 | 260 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 261 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 255 | CONFIG_KERNEL_START=0xc0000000 | 262 | CONFIG_KERNEL_START=0xc0000000 |
| 263 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_TASK_SIZE=0xc0000000 | 264 | CONFIG_TASK_SIZE=0xc0000000 |
| 257 | CONFIG_CONSISTENT_START=0xff100000 | 265 | CONFIG_CONSISTENT_START=0xff100000 |
| 258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 266 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 267 | ||
| 261 | # | 268 | # |
| 262 | # Networking | 269 | # Networking |
| @@ -304,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 304 | CONFIG_DEFAULT_TCP_CONG="cubic" | 311 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 305 | # CONFIG_TCP_MD5SIG is not set | 312 | # CONFIG_TCP_MD5SIG is not set |
| 306 | # CONFIG_IPV6 is not set | 313 | # CONFIG_IPV6 is not set |
| 307 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 308 | # CONFIG_INET6_TUNNEL is not set | ||
| 309 | # CONFIG_NETWORK_SECMARK is not set | 314 | # CONFIG_NETWORK_SECMARK is not set |
| 310 | # CONFIG_NETFILTER is not set | 315 | # CONFIG_NETFILTER is not set |
| 311 | # CONFIG_IP_DCCP is not set | 316 | # CONFIG_IP_DCCP is not set |
| @@ -364,6 +369,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 364 | # CONFIG_MTD_REDBOOT_PARTS is not set | 369 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 365 | # CONFIG_MTD_CMDLINE_PARTS is not set | 370 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 366 | # CONFIG_MTD_OF_PARTS is not set | 371 | # CONFIG_MTD_OF_PARTS is not set |
| 372 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 367 | 373 | ||
| 368 | # | 374 | # |
| 369 | # User Modules And Translation Layers | 375 | # User Modules And Translation Layers |
| @@ -435,6 +441,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 435 | # | 441 | # |
| 436 | # CONFIG_MTD_UBI is not set | 442 | # CONFIG_MTD_UBI is not set |
| 437 | CONFIG_OF_DEVICE=y | 443 | CONFIG_OF_DEVICE=y |
| 444 | CONFIG_OF_I2C=y | ||
| 438 | # CONFIG_PARPORT is not set | 445 | # CONFIG_PARPORT is not set |
| 439 | CONFIG_BLK_DEV=y | 446 | CONFIG_BLK_DEV=y |
| 440 | # CONFIG_BLK_DEV_FD is not set | 447 | # CONFIG_BLK_DEV_FD is not set |
| @@ -519,7 +526,7 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y | |||
| 519 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 526 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 520 | # CONFIG_BLK_DEV_TC86C001 is not set | 527 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 521 | CONFIG_BLK_DEV_IDEDMA=y | 528 | CONFIG_BLK_DEV_IDEDMA=y |
| 522 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 529 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 523 | # CONFIG_BLK_DEV_HD is not set | 530 | # CONFIG_BLK_DEV_HD is not set |
| 524 | 531 | ||
| 525 | # | 532 | # |
| @@ -598,7 +605,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 598 | # CONFIG_SCSI_SRP is not set | 605 | # CONFIG_SCSI_SRP is not set |
| 599 | CONFIG_ATA=y | 606 | CONFIG_ATA=y |
| 600 | # CONFIG_ATA_NONSTANDARD is not set | 607 | # CONFIG_ATA_NONSTANDARD is not set |
| 608 | CONFIG_SATA_PMP=y | ||
| 601 | # CONFIG_SATA_AHCI is not set | 609 | # CONFIG_SATA_AHCI is not set |
| 610 | # CONFIG_SATA_SIL24 is not set | ||
| 611 | CONFIG_ATA_SFF=y | ||
| 602 | # CONFIG_SATA_SVW is not set | 612 | # CONFIG_SATA_SVW is not set |
| 603 | # CONFIG_ATA_PIIX is not set | 613 | # CONFIG_ATA_PIIX is not set |
| 604 | CONFIG_SATA_MV=y | 614 | CONFIG_SATA_MV=y |
| @@ -608,7 +618,6 @@ CONFIG_SATA_MV=y | |||
| 608 | # CONFIG_SATA_PROMISE is not set | 618 | # CONFIG_SATA_PROMISE is not set |
| 609 | # CONFIG_SATA_SX4 is not set | 619 | # CONFIG_SATA_SX4 is not set |
| 610 | # CONFIG_SATA_SIL is not set | 620 | # CONFIG_SATA_SIL is not set |
| 611 | # CONFIG_SATA_SIL24 is not set | ||
| 612 | # CONFIG_SATA_SIS is not set | 621 | # CONFIG_SATA_SIS is not set |
| 613 | # CONFIG_SATA_ULI is not set | 622 | # CONFIG_SATA_ULI is not set |
| 614 | # CONFIG_SATA_VIA is not set | 623 | # CONFIG_SATA_VIA is not set |
| @@ -653,6 +662,7 @@ CONFIG_SATA_MV=y | |||
| 653 | # CONFIG_PATA_VIA is not set | 662 | # CONFIG_PATA_VIA is not set |
| 654 | # CONFIG_PATA_WINBOND is not set | 663 | # CONFIG_PATA_WINBOND is not set |
| 655 | # CONFIG_PATA_PLATFORM is not set | 664 | # CONFIG_PATA_PLATFORM is not set |
| 665 | # CONFIG_PATA_SCH is not set | ||
| 656 | # CONFIG_MD is not set | 666 | # CONFIG_MD is not set |
| 657 | # CONFIG_FUSION is not set | 667 | # CONFIG_FUSION is not set |
| 658 | 668 | ||
| @@ -744,7 +754,6 @@ CONFIG_E1000=y | |||
| 744 | # CONFIG_SIS190 is not set | 754 | # CONFIG_SIS190 is not set |
| 745 | # CONFIG_SKGE is not set | 755 | # CONFIG_SKGE is not set |
| 746 | # CONFIG_SKY2 is not set | 756 | # CONFIG_SKY2 is not set |
| 747 | # CONFIG_SK98LIN is not set | ||
| 748 | # CONFIG_VIA_VELOCITY is not set | 757 | # CONFIG_VIA_VELOCITY is not set |
| 749 | # CONFIG_TIGON3 is not set | 758 | # CONFIG_TIGON3 is not set |
| 750 | # CONFIG_BNX2 is not set | 759 | # CONFIG_BNX2 is not set |
| @@ -763,6 +772,7 @@ CONFIG_NETDEV_10000=y | |||
| 763 | # CONFIG_MLX4_CORE is not set | 772 | # CONFIG_MLX4_CORE is not set |
| 764 | # CONFIG_TEHUTI is not set | 773 | # CONFIG_TEHUTI is not set |
| 765 | # CONFIG_BNX2X is not set | 774 | # CONFIG_BNX2X is not set |
| 775 | # CONFIG_SFC is not set | ||
| 766 | # CONFIG_TR is not set | 776 | # CONFIG_TR is not set |
| 767 | 777 | ||
| 768 | # | 778 | # |
| @@ -770,6 +780,7 @@ CONFIG_NETDEV_10000=y | |||
| 770 | # | 780 | # |
| 771 | # CONFIG_WLAN_PRE80211 is not set | 781 | # CONFIG_WLAN_PRE80211 is not set |
| 772 | # CONFIG_WLAN_80211 is not set | 782 | # CONFIG_WLAN_80211 is not set |
| 783 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 773 | 784 | ||
| 774 | # | 785 | # |
| 775 | # USB Network Adapters | 786 | # USB Network Adapters |
| @@ -832,6 +843,7 @@ CONFIG_VT=y | |||
| 832 | CONFIG_VT_CONSOLE=y | 843 | CONFIG_VT_CONSOLE=y |
| 833 | CONFIG_HW_CONSOLE=y | 844 | CONFIG_HW_CONSOLE=y |
| 834 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 845 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 846 | CONFIG_DEVKMEM=y | ||
| 835 | # CONFIG_SERIAL_NONSTANDARD is not set | 847 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 836 | # CONFIG_NOZOMI is not set | 848 | # CONFIG_NOZOMI is not set |
| 837 | 849 | ||
| @@ -855,7 +867,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 855 | # CONFIG_IPMI_HANDLER is not set | 867 | # CONFIG_IPMI_HANDLER is not set |
| 856 | # CONFIG_HW_RANDOM is not set | 868 | # CONFIG_HW_RANDOM is not set |
| 857 | # CONFIG_NVRAM is not set | 869 | # CONFIG_NVRAM is not set |
| 858 | # CONFIG_GEN_RTC is not set | ||
| 859 | # CONFIG_R3964 is not set | 870 | # CONFIG_R3964 is not set |
| 860 | # CONFIG_APPLICOM is not set | 871 | # CONFIG_APPLICOM is not set |
| 861 | # CONFIG_RAW_DRIVER is not set | 872 | # CONFIG_RAW_DRIVER is not set |
| @@ -866,13 +877,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 866 | CONFIG_I2C_CHARDEV=y | 877 | CONFIG_I2C_CHARDEV=y |
| 867 | 878 | ||
| 868 | # | 879 | # |
| 869 | # I2C Algorithms | ||
| 870 | # | ||
| 871 | # CONFIG_I2C_ALGOBIT is not set | ||
| 872 | # CONFIG_I2C_ALGOPCF is not set | ||
| 873 | # CONFIG_I2C_ALGOPCA is not set | ||
| 874 | |||
| 875 | # | ||
| 876 | # I2C Hardware Bus support | 880 | # I2C Hardware Bus support |
| 877 | # | 881 | # |
| 878 | # CONFIG_I2C_ALI1535 is not set | 882 | # CONFIG_I2C_ALI1535 is not set |
| @@ -898,6 +902,7 @@ CONFIG_I2C_CHARDEV=y | |||
| 898 | # CONFIG_I2C_VIA is not set | 902 | # CONFIG_I2C_VIA is not set |
| 899 | # CONFIG_I2C_VIAPRO is not set | 903 | # CONFIG_I2C_VIAPRO is not set |
| 900 | # CONFIG_I2C_VOODOO3 is not set | 904 | # CONFIG_I2C_VOODOO3 is not set |
| 905 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 901 | CONFIG_I2C_MV64XXX=y | 906 | CONFIG_I2C_MV64XXX=y |
| 902 | 907 | ||
| 903 | # | 908 | # |
| @@ -908,19 +913,13 @@ CONFIG_I2C_MV64XXX=y | |||
| 908 | # CONFIG_SENSORS_PCF8574 is not set | 913 | # CONFIG_SENSORS_PCF8574 is not set |
| 909 | # CONFIG_PCF8575 is not set | 914 | # CONFIG_PCF8575 is not set |
| 910 | # CONFIG_SENSORS_PCF8591 is not set | 915 | # CONFIG_SENSORS_PCF8591 is not set |
| 911 | # CONFIG_TPS65010 is not set | ||
| 912 | # CONFIG_SENSORS_MAX6875 is not set | 916 | # CONFIG_SENSORS_MAX6875 is not set |
| 913 | # CONFIG_SENSORS_TSL2550 is not set | 917 | # CONFIG_SENSORS_TSL2550 is not set |
| 914 | # CONFIG_I2C_DEBUG_CORE is not set | 918 | # CONFIG_I2C_DEBUG_CORE is not set |
| 915 | # CONFIG_I2C_DEBUG_ALGO is not set | 919 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 916 | # CONFIG_I2C_DEBUG_BUS is not set | 920 | # CONFIG_I2C_DEBUG_BUS is not set |
| 917 | # CONFIG_I2C_DEBUG_CHIP is not set | 921 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 918 | |||
| 919 | # | ||
| 920 | # SPI support | ||
| 921 | # | ||
| 922 | # CONFIG_SPI is not set | 922 | # CONFIG_SPI is not set |
| 923 | # CONFIG_SPI_MASTER is not set | ||
| 924 | # CONFIG_W1 is not set | 923 | # CONFIG_W1 is not set |
| 925 | # CONFIG_POWER_SUPPLY is not set | 924 | # CONFIG_POWER_SUPPLY is not set |
| 926 | CONFIG_HWMON=y | 925 | CONFIG_HWMON=y |
| @@ -990,12 +989,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 990 | # Multifunction device drivers | 989 | # Multifunction device drivers |
| 991 | # | 990 | # |
| 992 | # CONFIG_MFD_SM501 is not set | 991 | # CONFIG_MFD_SM501 is not set |
| 992 | # CONFIG_HTC_PASIC3 is not set | ||
| 993 | 993 | ||
| 994 | # | 994 | # |
| 995 | # Multimedia devices | 995 | # Multimedia devices |
| 996 | # | 996 | # |
| 997 | |||
| 998 | # | ||
| 999 | # Multimedia core support | ||
| 1000 | # | ||
| 997 | # CONFIG_VIDEO_DEV is not set | 1001 | # CONFIG_VIDEO_DEV is not set |
| 998 | # CONFIG_DVB_CORE is not set | 1002 | # CONFIG_DVB_CORE is not set |
| 1003 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1004 | |||
| 1005 | # | ||
| 1006 | # Multimedia drivers | ||
| 1007 | # | ||
| 999 | # CONFIG_DAB is not set | 1008 | # CONFIG_DAB is not set |
| 1000 | 1009 | ||
| 1001 | # | 1010 | # |
| @@ -1055,11 +1064,13 @@ CONFIG_USB_DEVICEFS=y | |||
| 1055 | # | 1064 | # |
| 1056 | # USB Host Controller Drivers | 1065 | # USB Host Controller Drivers |
| 1057 | # | 1066 | # |
| 1067 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1058 | CONFIG_USB_EHCI_HCD=y | 1068 | CONFIG_USB_EHCI_HCD=y |
| 1059 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1069 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1060 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1070 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1061 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1071 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1062 | # CONFIG_USB_ISP116X_HCD is not set | 1072 | # CONFIG_USB_ISP116X_HCD is not set |
| 1073 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1063 | CONFIG_USB_OHCI_HCD=y | 1074 | CONFIG_USB_OHCI_HCD=y |
| 1064 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1075 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1065 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1076 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1074,6 +1085,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1074 | # | 1085 | # |
| 1075 | # CONFIG_USB_ACM is not set | 1086 | # CONFIG_USB_ACM is not set |
| 1076 | # CONFIG_USB_PRINTER is not set | 1087 | # CONFIG_USB_PRINTER is not set |
| 1088 | # CONFIG_USB_WDM is not set | ||
| 1077 | 1089 | ||
| 1078 | # | 1090 | # |
| 1079 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1091 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1120,10 +1132,12 @@ CONFIG_USB_MON=y | |||
| 1120 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1132 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1121 | # CONFIG_USB_IOWARRIOR is not set | 1133 | # CONFIG_USB_IOWARRIOR is not set |
| 1122 | # CONFIG_USB_TEST is not set | 1134 | # CONFIG_USB_TEST is not set |
| 1135 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1123 | # CONFIG_USB_GADGET is not set | 1136 | # CONFIG_USB_GADGET is not set |
| 1124 | # CONFIG_MMC is not set | 1137 | # CONFIG_MMC is not set |
| 1125 | # CONFIG_MEMSTICK is not set | 1138 | # CONFIG_MEMSTICK is not set |
| 1126 | # CONFIG_NEW_LEDS is not set | 1139 | # CONFIG_NEW_LEDS is not set |
| 1140 | # CONFIG_ACCESSIBILITY is not set | ||
| 1127 | # CONFIG_INFINIBAND is not set | 1141 | # CONFIG_INFINIBAND is not set |
| 1128 | # CONFIG_EDAC is not set | 1142 | # CONFIG_EDAC is not set |
| 1129 | CONFIG_RTC_LIB=y | 1143 | CONFIG_RTC_LIB=y |
| @@ -1175,11 +1189,8 @@ CONFIG_RTC_DRV_MAX6900=y | |||
| 1175 | # | 1189 | # |
| 1176 | # on-CPU RTC drivers | 1190 | # on-CPU RTC drivers |
| 1177 | # | 1191 | # |
| 1192 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1178 | # CONFIG_DMADEVICES is not set | 1193 | # CONFIG_DMADEVICES is not set |
| 1179 | |||
| 1180 | # | ||
| 1181 | # Userspace I/O | ||
| 1182 | # | ||
| 1183 | # CONFIG_UIO is not set | 1194 | # CONFIG_UIO is not set |
| 1184 | 1195 | ||
| 1185 | # | 1196 | # |
| @@ -1199,7 +1210,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1199 | # CONFIG_JFS_FS is not set | 1210 | # CONFIG_JFS_FS is not set |
| 1200 | # CONFIG_FS_POSIX_ACL is not set | 1211 | # CONFIG_FS_POSIX_ACL is not set |
| 1201 | # CONFIG_XFS_FS is not set | 1212 | # CONFIG_XFS_FS is not set |
| 1202 | # CONFIG_GFS2_FS is not set | ||
| 1203 | # CONFIG_OCFS2_FS is not set | 1213 | # CONFIG_OCFS2_FS is not set |
| 1204 | CONFIG_DNOTIFY=y | 1214 | CONFIG_DNOTIFY=y |
| 1205 | CONFIG_INOTIFY=y | 1215 | CONFIG_INOTIFY=y |
| @@ -1257,7 +1267,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 1257 | CONFIG_NFS_FS=y | 1267 | CONFIG_NFS_FS=y |
| 1258 | # CONFIG_NFS_V3 is not set | 1268 | # CONFIG_NFS_V3 is not set |
| 1259 | # CONFIG_NFS_V4 is not set | 1269 | # CONFIG_NFS_V4 is not set |
| 1260 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1261 | # CONFIG_NFSD is not set | 1270 | # CONFIG_NFSD is not set |
| 1262 | CONFIG_ROOT_NFS=y | 1271 | CONFIG_ROOT_NFS=y |
| 1263 | CONFIG_LOCKD=y | 1272 | CONFIG_LOCKD=y |
| @@ -1300,6 +1309,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1300 | # Library routines | 1309 | # Library routines |
| 1301 | # | 1310 | # |
| 1302 | CONFIG_BITREVERSE=y | 1311 | CONFIG_BITREVERSE=y |
| 1312 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1303 | # CONFIG_CRC_CCITT is not set | 1313 | # CONFIG_CRC_CCITT is not set |
| 1304 | # CONFIG_CRC16 is not set | 1314 | # CONFIG_CRC16 is not set |
| 1305 | # CONFIG_CRC_ITU_T is not set | 1315 | # CONFIG_CRC_ITU_T is not set |
| @@ -1310,6 +1320,7 @@ CONFIG_PLIST=y | |||
| 1310 | CONFIG_HAS_IOMEM=y | 1320 | CONFIG_HAS_IOMEM=y |
| 1311 | CONFIG_HAS_IOPORT=y | 1321 | CONFIG_HAS_IOPORT=y |
| 1312 | CONFIG_HAS_DMA=y | 1322 | CONFIG_HAS_DMA=y |
| 1323 | CONFIG_HAVE_LMB=y | ||
| 1313 | 1324 | ||
| 1314 | # | 1325 | # |
| 1315 | # Kernel hacking | 1326 | # Kernel hacking |
| @@ -1317,6 +1328,7 @@ CONFIG_HAS_DMA=y | |||
| 1317 | # CONFIG_PRINTK_TIME is not set | 1328 | # CONFIG_PRINTK_TIME is not set |
| 1318 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1329 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1319 | CONFIG_ENABLE_MUST_CHECK=y | 1330 | CONFIG_ENABLE_MUST_CHECK=y |
| 1331 | CONFIG_FRAME_WARN=1024 | ||
| 1320 | # CONFIG_MAGIC_SYSRQ is not set | 1332 | # CONFIG_MAGIC_SYSRQ is not set |
| 1321 | # CONFIG_UNUSED_SYMBOLS is not set | 1333 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1322 | # CONFIG_DEBUG_FS is not set | 1334 | # CONFIG_DEBUG_FS is not set |
| @@ -1326,6 +1338,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1326 | # CONFIG_SLUB_STATS is not set | 1338 | # CONFIG_SLUB_STATS is not set |
| 1327 | CONFIG_DEBUG_BUGVERBOSE=y | 1339 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1328 | # CONFIG_SAMPLES is not set | 1340 | # CONFIG_SAMPLES is not set |
| 1341 | # CONFIG_IRQSTACKS is not set | ||
| 1329 | # CONFIG_BOOTX_TEXT is not set | 1342 | # CONFIG_BOOTX_TEXT is not set |
| 1330 | # CONFIG_PPC_EARLY_DEBUG is not set | 1343 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1331 | 1344 | ||
| @@ -1336,48 +1349,78 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1336 | # CONFIG_SECURITY is not set | 1349 | # CONFIG_SECURITY is not set |
| 1337 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1350 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1338 | CONFIG_CRYPTO=y | 1351 | CONFIG_CRYPTO=y |
| 1339 | # CONFIG_CRYPTO_SEQIV is not set | 1352 | |
| 1353 | # | ||
| 1354 | # Crypto core or helper | ||
| 1355 | # | ||
| 1340 | # CONFIG_CRYPTO_MANAGER is not set | 1356 | # CONFIG_CRYPTO_MANAGER is not set |
| 1357 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1358 | # CONFIG_CRYPTO_NULL is not set | ||
| 1359 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1360 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1361 | |||
| 1362 | # | ||
| 1363 | # Authenticated Encryption with Associated Data | ||
| 1364 | # | ||
| 1365 | # CONFIG_CRYPTO_CCM is not set | ||
| 1366 | # CONFIG_CRYPTO_GCM is not set | ||
| 1367 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1368 | |||
| 1369 | # | ||
| 1370 | # Block modes | ||
| 1371 | # | ||
| 1372 | # CONFIG_CRYPTO_CBC is not set | ||
| 1373 | # CONFIG_CRYPTO_CTR is not set | ||
| 1374 | # CONFIG_CRYPTO_CTS is not set | ||
| 1375 | # CONFIG_CRYPTO_ECB is not set | ||
| 1376 | # CONFIG_CRYPTO_LRW is not set | ||
| 1377 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1378 | # CONFIG_CRYPTO_XTS is not set | ||
| 1379 | |||
| 1380 | # | ||
| 1381 | # Hash modes | ||
| 1382 | # | ||
| 1341 | # CONFIG_CRYPTO_HMAC is not set | 1383 | # CONFIG_CRYPTO_HMAC is not set |
| 1342 | # CONFIG_CRYPTO_XCBC is not set | 1384 | # CONFIG_CRYPTO_XCBC is not set |
| 1343 | # CONFIG_CRYPTO_NULL is not set | 1385 | |
| 1386 | # | ||
| 1387 | # Digest | ||
| 1388 | # | ||
| 1389 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1344 | # CONFIG_CRYPTO_MD4 is not set | 1390 | # CONFIG_CRYPTO_MD4 is not set |
| 1345 | # CONFIG_CRYPTO_MD5 is not set | 1391 | # CONFIG_CRYPTO_MD5 is not set |
| 1392 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1346 | # CONFIG_CRYPTO_SHA1 is not set | 1393 | # CONFIG_CRYPTO_SHA1 is not set |
| 1347 | # CONFIG_CRYPTO_SHA256 is not set | 1394 | # CONFIG_CRYPTO_SHA256 is not set |
| 1348 | # CONFIG_CRYPTO_SHA512 is not set | 1395 | # CONFIG_CRYPTO_SHA512 is not set |
| 1349 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1350 | # CONFIG_CRYPTO_TGR192 is not set | 1396 | # CONFIG_CRYPTO_TGR192 is not set |
| 1351 | # CONFIG_CRYPTO_GF128MUL is not set | 1397 | # CONFIG_CRYPTO_WP512 is not set |
| 1352 | # CONFIG_CRYPTO_ECB is not set | 1398 | |
| 1353 | # CONFIG_CRYPTO_CBC is not set | 1399 | # |
| 1354 | # CONFIG_CRYPTO_PCBC is not set | 1400 | # Ciphers |
| 1355 | # CONFIG_CRYPTO_LRW is not set | 1401 | # |
| 1356 | # CONFIG_CRYPTO_XTS is not set | ||
| 1357 | # CONFIG_CRYPTO_CTR is not set | ||
| 1358 | # CONFIG_CRYPTO_GCM is not set | ||
| 1359 | # CONFIG_CRYPTO_CCM is not set | ||
| 1360 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1361 | # CONFIG_CRYPTO_DES is not set | ||
| 1362 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1363 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1364 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1365 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1366 | # CONFIG_CRYPTO_AES is not set | 1402 | # CONFIG_CRYPTO_AES is not set |
| 1403 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1404 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1405 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1406 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1367 | # CONFIG_CRYPTO_CAST5 is not set | 1407 | # CONFIG_CRYPTO_CAST5 is not set |
| 1368 | # CONFIG_CRYPTO_CAST6 is not set | 1408 | # CONFIG_CRYPTO_CAST6 is not set |
| 1369 | # CONFIG_CRYPTO_TEA is not set | 1409 | # CONFIG_CRYPTO_DES is not set |
| 1370 | # CONFIG_CRYPTO_ARC4 is not set | 1410 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1371 | # CONFIG_CRYPTO_KHAZAD is not set | 1411 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1372 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1373 | # CONFIG_CRYPTO_SEED is not set | ||
| 1374 | # CONFIG_CRYPTO_SALSA20 is not set | 1412 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1413 | # CONFIG_CRYPTO_SEED is not set | ||
| 1414 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1415 | # CONFIG_CRYPTO_TEA is not set | ||
| 1416 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1417 | |||
| 1418 | # | ||
| 1419 | # Compression | ||
| 1420 | # | ||
| 1375 | # CONFIG_CRYPTO_DEFLATE is not set | 1421 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1376 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1377 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1378 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1379 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1380 | # CONFIG_CRYPTO_LZO is not set | 1422 | # CONFIG_CRYPTO_LZO is not set |
| 1381 | CONFIG_CRYPTO_HW=y | 1423 | CONFIG_CRYPTO_HW=y |
| 1382 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1424 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1383 | # CONFIG_PPC_CLOCK is not set | 1425 | # CONFIG_PPC_CLOCK is not set |
| 1426 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/sbc8641d_defconfig index 3180125aa6c4..8227510b41a9 100644 --- a/arch/powerpc/configs/sbc8641d_defconfig +++ b/arch/powerpc/configs/sbc8641d_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Thu Apr 10 18:03:25 2008 | 4 | # Mon Jun 9 08:52:19 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_GENERIC_LOCKBREAK=y | 38 | CONFIG_GENERIC_LOCKBREAK=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_ALL is not set | 97 | # CONFIG_KALLSYMS_ALL is not set |
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -116,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 116 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 117 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 118 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 119 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
| 120 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 121 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
| 122 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
| 123 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
| 124 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
| 129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 125 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
| 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 127 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
| @@ -197,7 +202,6 @@ CONFIG_PREEMPT=y | |||
| 197 | # CONFIG_PREEMPT_RCU is not set | 202 | # CONFIG_PREEMPT_RCU is not set |
| 198 | CONFIG_BINFMT_ELF=y | 203 | CONFIG_BINFMT_ELF=y |
| 199 | CONFIG_BINFMT_MISC=m | 204 | CONFIG_BINFMT_MISC=m |
| 200 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 201 | # CONFIG_IOMMU_HELPER is not set | 205 | # CONFIG_IOMMU_HELPER is not set |
| 202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 203 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 207 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| @@ -213,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 213 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 214 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 217 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 218 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 219 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 220 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 221 | # CONFIG_PROC_DEVICETREE is not set | 227 | # CONFIG_PROC_DEVICETREE is not set |
| 222 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 223 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -237,12 +243,14 @@ CONFIG_PCI_DOMAINS=y | |||
| 237 | CONFIG_PCI_SYSCALL=y | 243 | CONFIG_PCI_SYSCALL=y |
| 238 | CONFIG_PCIEPORTBUS=y | 244 | CONFIG_PCIEPORTBUS=y |
| 239 | CONFIG_PCIEAER=y | 245 | CONFIG_PCIEAER=y |
| 246 | # CONFIG_PCIEASPM is not set | ||
| 240 | CONFIG_ARCH_SUPPORTS_MSI=y | 247 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 241 | # CONFIG_PCI_MSI is not set | 248 | # CONFIG_PCI_MSI is not set |
| 242 | CONFIG_PCI_LEGACY=y | 249 | CONFIG_PCI_LEGACY=y |
| 243 | # CONFIG_PCI_DEBUG is not set | 250 | # CONFIG_PCI_DEBUG is not set |
| 244 | # CONFIG_PCCARD is not set | 251 | # CONFIG_PCCARD is not set |
| 245 | # CONFIG_HOTPLUG_PCI is not set | 252 | # CONFIG_HOTPLUG_PCI is not set |
| 253 | # CONFIG_HAS_RAPIDIO is not set | ||
| 246 | 254 | ||
| 247 | # | 255 | # |
| 248 | # Advanced setup | 256 | # Advanced setup |
| @@ -252,11 +260,11 @@ CONFIG_PCI_LEGACY=y | |||
| 252 | # | 260 | # |
| 253 | # Default settings for advanced configuration options are used | 261 | # Default settings for advanced configuration options are used |
| 254 | # | 262 | # |
| 255 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 256 | CONFIG_LOWMEM_SIZE=0x30000000 | 263 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 264 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 257 | CONFIG_KERNEL_START=0xc0000000 | 265 | CONFIG_KERNEL_START=0xc0000000 |
| 266 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 267 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 268 | ||
| 261 | # | 269 | # |
| 262 | # Networking | 270 | # Networking |
| @@ -328,8 +336,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
| 328 | CONFIG_INET6_XFRM_MODE_BEET=m | 336 | CONFIG_INET6_XFRM_MODE_BEET=m |
| 329 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 337 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 330 | CONFIG_IPV6_SIT=m | 338 | CONFIG_IPV6_SIT=m |
| 339 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 331 | CONFIG_IPV6_TUNNEL=m | 340 | CONFIG_IPV6_TUNNEL=m |
| 332 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 341 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 342 | # CONFIG_IPV6_MROUTE is not set | ||
| 333 | # CONFIG_NETLABEL is not set | 343 | # CONFIG_NETLABEL is not set |
| 334 | # CONFIG_NETWORK_SECMARK is not set | 344 | # CONFIG_NETWORK_SECMARK is not set |
| 335 | CONFIG_NETFILTER=y | 345 | CONFIG_NETFILTER=y |
| @@ -534,6 +544,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 534 | # CONFIG_MTD_REDBOOT_PARTS is not set | 544 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 535 | # CONFIG_MTD_CMDLINE_PARTS is not set | 545 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 536 | # CONFIG_MTD_OF_PARTS is not set | 546 | # CONFIG_MTD_OF_PARTS is not set |
| 547 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 537 | 548 | ||
| 538 | # | 549 | # |
| 539 | # User Modules And Translation Layers | 550 | # User Modules And Translation Layers |
| @@ -610,6 +621,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 610 | # | 621 | # |
| 611 | # CONFIG_MTD_UBI is not set | 622 | # CONFIG_MTD_UBI is not set |
| 612 | CONFIG_OF_DEVICE=y | 623 | CONFIG_OF_DEVICE=y |
| 624 | CONFIG_OF_I2C=y | ||
| 613 | # CONFIG_PARPORT is not set | 625 | # CONFIG_PARPORT is not set |
| 614 | CONFIG_BLK_DEV=y | 626 | CONFIG_BLK_DEV=y |
| 615 | # CONFIG_BLK_DEV_FD is not set | 627 | # CONFIG_BLK_DEV_FD is not set |
| @@ -727,7 +739,6 @@ CONFIG_NETDEV_1000=y | |||
| 727 | # CONFIG_SIS190 is not set | 739 | # CONFIG_SIS190 is not set |
| 728 | # CONFIG_SKGE is not set | 740 | # CONFIG_SKGE is not set |
| 729 | # CONFIG_SKY2 is not set | 741 | # CONFIG_SKY2 is not set |
| 730 | # CONFIG_SK98LIN is not set | ||
| 731 | # CONFIG_VIA_VELOCITY is not set | 742 | # CONFIG_VIA_VELOCITY is not set |
| 732 | # CONFIG_TIGON3 is not set | 743 | # CONFIG_TIGON3 is not set |
| 733 | # CONFIG_BNX2 is not set | 744 | # CONFIG_BNX2 is not set |
| @@ -743,6 +754,7 @@ CONFIG_GIANFAR=y | |||
| 743 | # | 754 | # |
| 744 | # CONFIG_WLAN_PRE80211 is not set | 755 | # CONFIG_WLAN_PRE80211 is not set |
| 745 | # CONFIG_WLAN_80211 is not set | 756 | # CONFIG_WLAN_80211 is not set |
| 757 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 746 | # CONFIG_WAN is not set | 758 | # CONFIG_WAN is not set |
| 747 | CONFIG_ATM_DRIVERS=y | 759 | CONFIG_ATM_DRIVERS=y |
| 748 | # CONFIG_ATM_DUMMY is not set | 760 | # CONFIG_ATM_DUMMY is not set |
| @@ -825,6 +837,7 @@ CONFIG_VT=y | |||
| 825 | CONFIG_VT_CONSOLE=y | 837 | CONFIG_VT_CONSOLE=y |
| 826 | CONFIG_HW_CONSOLE=y | 838 | CONFIG_HW_CONSOLE=y |
| 827 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 839 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 840 | CONFIG_DEVKMEM=y | ||
| 828 | # CONFIG_SERIAL_NONSTANDARD is not set | 841 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 829 | # CONFIG_NOZOMI is not set | 842 | # CONFIG_NOZOMI is not set |
| 830 | 843 | ||
| @@ -863,13 +876,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 863 | CONFIG_I2C_CHARDEV=y | 876 | CONFIG_I2C_CHARDEV=y |
| 864 | 877 | ||
| 865 | # | 878 | # |
| 866 | # I2C Algorithms | ||
| 867 | # | ||
| 868 | # CONFIG_I2C_ALGOBIT is not set | ||
| 869 | # CONFIG_I2C_ALGOPCF is not set | ||
| 870 | # CONFIG_I2C_ALGOPCA is not set | ||
| 871 | |||
| 872 | # | ||
| 873 | # I2C Hardware Bus support | 879 | # I2C Hardware Bus support |
| 874 | # | 880 | # |
| 875 | # CONFIG_I2C_ALI1535 is not set | 881 | # CONFIG_I2C_ALI1535 is not set |
| @@ -895,6 +901,7 @@ CONFIG_I2C_MPC=y | |||
| 895 | # CONFIG_I2C_VIA is not set | 901 | # CONFIG_I2C_VIA is not set |
| 896 | # CONFIG_I2C_VIAPRO is not set | 902 | # CONFIG_I2C_VIAPRO is not set |
| 897 | # CONFIG_I2C_VOODOO3 is not set | 903 | # CONFIG_I2C_VOODOO3 is not set |
| 904 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 898 | 905 | ||
| 899 | # | 906 | # |
| 900 | # Miscellaneous I2C Chip support | 907 | # Miscellaneous I2C Chip support |
| @@ -904,19 +911,13 @@ CONFIG_I2C_MPC=y | |||
| 904 | # CONFIG_SENSORS_PCF8574 is not set | 911 | # CONFIG_SENSORS_PCF8574 is not set |
| 905 | # CONFIG_PCF8575 is not set | 912 | # CONFIG_PCF8575 is not set |
| 906 | # CONFIG_SENSORS_PCF8591 is not set | 913 | # CONFIG_SENSORS_PCF8591 is not set |
| 907 | # CONFIG_TPS65010 is not set | ||
| 908 | # CONFIG_SENSORS_MAX6875 is not set | 914 | # CONFIG_SENSORS_MAX6875 is not set |
| 909 | # CONFIG_SENSORS_TSL2550 is not set | 915 | # CONFIG_SENSORS_TSL2550 is not set |
| 910 | # CONFIG_I2C_DEBUG_CORE is not set | 916 | # CONFIG_I2C_DEBUG_CORE is not set |
| 911 | # CONFIG_I2C_DEBUG_ALGO is not set | 917 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 912 | # CONFIG_I2C_DEBUG_BUS is not set | 918 | # CONFIG_I2C_DEBUG_BUS is not set |
| 913 | # CONFIG_I2C_DEBUG_CHIP is not set | 919 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 914 | |||
| 915 | # | ||
| 916 | # SPI support | ||
| 917 | # | ||
| 918 | # CONFIG_SPI is not set | 920 | # CONFIG_SPI is not set |
| 919 | # CONFIG_SPI_MASTER is not set | ||
| 920 | # CONFIG_W1 is not set | 921 | # CONFIG_W1 is not set |
| 921 | # CONFIG_POWER_SUPPLY is not set | 922 | # CONFIG_POWER_SUPPLY is not set |
| 922 | CONFIG_HWMON=y | 923 | CONFIG_HWMON=y |
| @@ -998,12 +999,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 998 | # Multifunction device drivers | 999 | # Multifunction device drivers |
| 999 | # | 1000 | # |
| 1000 | # CONFIG_MFD_SM501 is not set | 1001 | # CONFIG_MFD_SM501 is not set |
| 1002 | # CONFIG_HTC_PASIC3 is not set | ||
| 1001 | 1003 | ||
| 1002 | # | 1004 | # |
| 1003 | # Multimedia devices | 1005 | # Multimedia devices |
| 1004 | # | 1006 | # |
| 1007 | |||
| 1008 | # | ||
| 1009 | # Multimedia core support | ||
| 1010 | # | ||
| 1005 | # CONFIG_VIDEO_DEV is not set | 1011 | # CONFIG_VIDEO_DEV is not set |
| 1006 | # CONFIG_DVB_CORE is not set | 1012 | # CONFIG_DVB_CORE is not set |
| 1013 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1014 | |||
| 1015 | # | ||
| 1016 | # Multimedia drivers | ||
| 1017 | # | ||
| 1007 | CONFIG_DAB=y | 1018 | CONFIG_DAB=y |
| 1008 | 1019 | ||
| 1009 | # | 1020 | # |
| @@ -1041,6 +1052,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 1041 | CONFIG_USB_ARCH_HAS_OHCI=y | 1052 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1042 | CONFIG_USB_ARCH_HAS_EHCI=y | 1053 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1043 | # CONFIG_USB is not set | 1054 | # CONFIG_USB is not set |
| 1055 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1056 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1044 | 1057 | ||
| 1045 | # | 1058 | # |
| 1046 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1059 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1049,14 +1062,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 1049 | # CONFIG_MMC is not set | 1062 | # CONFIG_MMC is not set |
| 1050 | # CONFIG_MEMSTICK is not set | 1063 | # CONFIG_MEMSTICK is not set |
| 1051 | # CONFIG_NEW_LEDS is not set | 1064 | # CONFIG_NEW_LEDS is not set |
| 1065 | # CONFIG_ACCESSIBILITY is not set | ||
| 1052 | # CONFIG_INFINIBAND is not set | 1066 | # CONFIG_INFINIBAND is not set |
| 1053 | # CONFIG_EDAC is not set | 1067 | # CONFIG_EDAC is not set |
| 1054 | # CONFIG_RTC_CLASS is not set | 1068 | # CONFIG_RTC_CLASS is not set |
| 1055 | # CONFIG_DMADEVICES is not set | 1069 | # CONFIG_DMADEVICES is not set |
| 1056 | |||
| 1057 | # | ||
| 1058 | # Userspace I/O | ||
| 1059 | # | ||
| 1060 | # CONFIG_UIO is not set | 1070 | # CONFIG_UIO is not set |
| 1061 | 1071 | ||
| 1062 | # | 1072 | # |
| @@ -1084,8 +1094,8 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
| 1084 | # CONFIG_JFS_FS is not set | 1094 | # CONFIG_JFS_FS is not set |
| 1085 | CONFIG_FS_POSIX_ACL=y | 1095 | CONFIG_FS_POSIX_ACL=y |
| 1086 | # CONFIG_XFS_FS is not set | 1096 | # CONFIG_XFS_FS is not set |
| 1087 | # CONFIG_GFS2_FS is not set | ||
| 1088 | CONFIG_OCFS2_FS=m | 1097 | CONFIG_OCFS2_FS=m |
| 1098 | CONFIG_OCFS2_FS_O2CB=m | ||
| 1089 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1099 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
| 1090 | # CONFIG_OCFS2_DEBUG_FS is not set | 1100 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1091 | CONFIG_DNOTIFY=y | 1101 | CONFIG_DNOTIFY=y |
| @@ -1145,7 +1155,6 @@ CONFIG_NFS_FS=y | |||
| 1145 | CONFIG_NFS_V3=y | 1155 | CONFIG_NFS_V3=y |
| 1146 | # CONFIG_NFS_V3_ACL is not set | 1156 | # CONFIG_NFS_V3_ACL is not set |
| 1147 | CONFIG_NFS_V4=y | 1157 | CONFIG_NFS_V4=y |
| 1148 | CONFIG_NFS_DIRECTIO=y | ||
| 1149 | # CONFIG_NFSD is not set | 1158 | # CONFIG_NFSD is not set |
| 1150 | CONFIG_ROOT_NFS=y | 1159 | CONFIG_ROOT_NFS=y |
| 1151 | CONFIG_LOCKD=y | 1160 | CONFIG_LOCKD=y |
| @@ -1221,6 +1230,7 @@ CONFIG_NLS_UTF8=m | |||
| 1221 | # Library routines | 1230 | # Library routines |
| 1222 | # | 1231 | # |
| 1223 | CONFIG_BITREVERSE=y | 1232 | CONFIG_BITREVERSE=y |
| 1233 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1224 | CONFIG_CRC_CCITT=m | 1234 | CONFIG_CRC_CCITT=m |
| 1225 | # CONFIG_CRC16 is not set | 1235 | # CONFIG_CRC16 is not set |
| 1226 | # CONFIG_CRC_ITU_T is not set | 1236 | # CONFIG_CRC_ITU_T is not set |
| @@ -1241,6 +1251,7 @@ CONFIG_HAVE_LMB=y | |||
| 1241 | # CONFIG_PRINTK_TIME is not set | 1251 | # CONFIG_PRINTK_TIME is not set |
| 1242 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1252 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1243 | CONFIG_ENABLE_MUST_CHECK=y | 1253 | CONFIG_ENABLE_MUST_CHECK=y |
| 1254 | CONFIG_FRAME_WARN=1024 | ||
| 1244 | CONFIG_MAGIC_SYSRQ=y | 1255 | CONFIG_MAGIC_SYSRQ=y |
| 1245 | # CONFIG_UNUSED_SYMBOLS is not set | 1256 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1246 | CONFIG_DEBUG_FS=y | 1257 | CONFIG_DEBUG_FS=y |
| @@ -1251,6 +1262,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1251 | CONFIG_SCHED_DEBUG=y | 1262 | CONFIG_SCHED_DEBUG=y |
| 1252 | # CONFIG_SCHEDSTATS is not set | 1263 | # CONFIG_SCHEDSTATS is not set |
| 1253 | # CONFIG_TIMER_STATS is not set | 1264 | # CONFIG_TIMER_STATS is not set |
| 1265 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1254 | # CONFIG_DEBUG_SLAB is not set | 1266 | # CONFIG_DEBUG_SLAB is not set |
| 1255 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1267 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1256 | # CONFIG_RT_MUTEX_TESTER is not set | 1268 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -1262,6 +1274,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1262 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1274 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1263 | CONFIG_DEBUG_INFO=y | 1275 | CONFIG_DEBUG_INFO=y |
| 1264 | # CONFIG_DEBUG_VM is not set | 1276 | # CONFIG_DEBUG_VM is not set |
| 1277 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1265 | # CONFIG_DEBUG_LIST is not set | 1278 | # CONFIG_DEBUG_LIST is not set |
| 1266 | # CONFIG_DEBUG_SG is not set | 1279 | # CONFIG_DEBUG_SG is not set |
| 1267 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1280 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1274,6 +1287,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1274 | # CONFIG_DEBUG_PAGEALLOC is not set | 1287 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1275 | CONFIG_DEBUGGER=y | 1288 | CONFIG_DEBUGGER=y |
| 1276 | # CONFIG_XMON is not set | 1289 | # CONFIG_XMON is not set |
| 1290 | # CONFIG_IRQSTACKS is not set | ||
| 1277 | # CONFIG_VIRQ_DEBUG is not set | 1291 | # CONFIG_VIRQ_DEBUG is not set |
| 1278 | # CONFIG_BDI_SWITCH is not set | 1292 | # CONFIG_BDI_SWITCH is not set |
| 1279 | # CONFIG_PPC_EARLY_DEBUG is not set | 1293 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1289,54 +1303,84 @@ CONFIG_SECURITY_CAPABILITIES=y | |||
| 1289 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1303 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1290 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | 1304 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
| 1291 | CONFIG_CRYPTO=y | 1305 | CONFIG_CRYPTO=y |
| 1306 | |||
| 1307 | # | ||
| 1308 | # Crypto core or helper | ||
| 1309 | # | ||
| 1292 | CONFIG_CRYPTO_ALGAPI=y | 1310 | CONFIG_CRYPTO_ALGAPI=y |
| 1293 | CONFIG_CRYPTO_AEAD=m | 1311 | CONFIG_CRYPTO_AEAD=m |
| 1294 | CONFIG_CRYPTO_BLKCIPHER=y | 1312 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1295 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1296 | CONFIG_CRYPTO_HASH=y | 1313 | CONFIG_CRYPTO_HASH=y |
| 1297 | CONFIG_CRYPTO_MANAGER=y | 1314 | CONFIG_CRYPTO_MANAGER=y |
| 1315 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1316 | CONFIG_CRYPTO_NULL=m | ||
| 1317 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1318 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1319 | CONFIG_CRYPTO_TEST=m | ||
| 1320 | |||
| 1321 | # | ||
| 1322 | # Authenticated Encryption with Associated Data | ||
| 1323 | # | ||
| 1324 | # CONFIG_CRYPTO_CCM is not set | ||
| 1325 | # CONFIG_CRYPTO_GCM is not set | ||
| 1326 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1327 | |||
| 1328 | # | ||
| 1329 | # Block modes | ||
| 1330 | # | ||
| 1331 | CONFIG_CRYPTO_CBC=y | ||
| 1332 | # CONFIG_CRYPTO_CTR is not set | ||
| 1333 | # CONFIG_CRYPTO_CTS is not set | ||
| 1334 | CONFIG_CRYPTO_ECB=m | ||
| 1335 | # CONFIG_CRYPTO_LRW is not set | ||
| 1336 | CONFIG_CRYPTO_PCBC=m | ||
| 1337 | # CONFIG_CRYPTO_XTS is not set | ||
| 1338 | |||
| 1339 | # | ||
| 1340 | # Hash modes | ||
| 1341 | # | ||
| 1298 | CONFIG_CRYPTO_HMAC=y | 1342 | CONFIG_CRYPTO_HMAC=y |
| 1299 | # CONFIG_CRYPTO_XCBC is not set | 1343 | # CONFIG_CRYPTO_XCBC is not set |
| 1300 | CONFIG_CRYPTO_NULL=m | 1344 | |
| 1345 | # | ||
| 1346 | # Digest | ||
| 1347 | # | ||
| 1348 | CONFIG_CRYPTO_CRC32C=m | ||
| 1301 | CONFIG_CRYPTO_MD4=m | 1349 | CONFIG_CRYPTO_MD4=m |
| 1302 | CONFIG_CRYPTO_MD5=y | 1350 | CONFIG_CRYPTO_MD5=y |
| 1351 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1303 | CONFIG_CRYPTO_SHA1=m | 1352 | CONFIG_CRYPTO_SHA1=m |
| 1304 | CONFIG_CRYPTO_SHA256=m | 1353 | CONFIG_CRYPTO_SHA256=m |
| 1305 | CONFIG_CRYPTO_SHA512=m | 1354 | CONFIG_CRYPTO_SHA512=m |
| 1306 | CONFIG_CRYPTO_WP512=m | ||
| 1307 | # CONFIG_CRYPTO_TGR192 is not set | 1355 | # CONFIG_CRYPTO_TGR192 is not set |
| 1308 | # CONFIG_CRYPTO_GF128MUL is not set | 1356 | CONFIG_CRYPTO_WP512=m |
| 1309 | CONFIG_CRYPTO_ECB=m | 1357 | |
| 1310 | CONFIG_CRYPTO_CBC=y | 1358 | # |
| 1311 | CONFIG_CRYPTO_PCBC=m | 1359 | # Ciphers |
| 1312 | # CONFIG_CRYPTO_LRW is not set | 1360 | # |
| 1313 | # CONFIG_CRYPTO_XTS is not set | ||
| 1314 | # CONFIG_CRYPTO_CTR is not set | ||
| 1315 | # CONFIG_CRYPTO_GCM is not set | ||
| 1316 | # CONFIG_CRYPTO_CCM is not set | ||
| 1317 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1318 | CONFIG_CRYPTO_DES=y | ||
| 1319 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1320 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1321 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1322 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1323 | CONFIG_CRYPTO_SERPENT=m | ||
| 1324 | CONFIG_CRYPTO_AES=m | 1361 | CONFIG_CRYPTO_AES=m |
| 1362 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1363 | CONFIG_CRYPTO_ARC4=m | ||
| 1364 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1365 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1325 | CONFIG_CRYPTO_CAST5=m | 1366 | CONFIG_CRYPTO_CAST5=m |
| 1326 | CONFIG_CRYPTO_CAST6=m | 1367 | CONFIG_CRYPTO_CAST6=m |
| 1327 | CONFIG_CRYPTO_TEA=m | 1368 | CONFIG_CRYPTO_DES=y |
| 1328 | CONFIG_CRYPTO_ARC4=m | 1369 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1329 | CONFIG_CRYPTO_KHAZAD=m | 1370 | CONFIG_CRYPTO_KHAZAD=m |
| 1330 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1331 | # CONFIG_CRYPTO_SEED is not set | ||
| 1332 | # CONFIG_CRYPTO_SALSA20 is not set | 1371 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1372 | # CONFIG_CRYPTO_SEED is not set | ||
| 1373 | CONFIG_CRYPTO_SERPENT=m | ||
| 1374 | CONFIG_CRYPTO_TEA=m | ||
| 1375 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1376 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1377 | |||
| 1378 | # | ||
| 1379 | # Compression | ||
| 1380 | # | ||
| 1333 | CONFIG_CRYPTO_DEFLATE=m | 1381 | CONFIG_CRYPTO_DEFLATE=m |
| 1334 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1335 | CONFIG_CRYPTO_CRC32C=m | ||
| 1336 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1337 | CONFIG_CRYPTO_TEST=m | ||
| 1338 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1339 | # CONFIG_CRYPTO_LZO is not set | 1382 | # CONFIG_CRYPTO_LZO is not set |
| 1340 | CONFIG_CRYPTO_HW=y | 1383 | CONFIG_CRYPTO_HW=y |
| 1341 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1384 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1342 | # CONFIG_PPC_CLOCK is not set | 1385 | # CONFIG_PPC_CLOCK is not set |
| 1386 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index fdbfd39a3aca..88f6aa8273be 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:19 2008 | 4 | # Mon Jun 9 08:52:20 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -85,6 +87,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 85 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 86 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 87 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 90 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 88 | # CONFIG_KALLSYMS is not set | 91 | # CONFIG_KALLSYMS is not set |
| 89 | CONFIG_HOTPLUG=y | 92 | CONFIG_HOTPLUG=y |
| 90 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| @@ -109,12 +112,14 @@ CONFIG_SLUB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| 115 | # CONFIG_TINY_SHMEM is not set | 119 | # CONFIG_TINY_SHMEM is not set |
| 116 | CONFIG_BASE_SMALL=0 | 120 | CONFIG_BASE_SMALL=0 |
| 117 | CONFIG_MODULES=y | 121 | CONFIG_MODULES=y |
| 122 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 118 | CONFIG_MODULE_UNLOAD=y | 123 | CONFIG_MODULE_UNLOAD=y |
| 119 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 120 | # CONFIG_MODVERSIONS is not set | 125 | # CONFIG_MODVERSIONS is not set |
| @@ -214,11 +219,13 @@ CONFIG_FLATMEM=y | |||
| 214 | CONFIG_FLAT_NODE_MEM_MAP=y | 219 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 215 | # CONFIG_SPARSEMEM_STATIC is not set | 220 | # CONFIG_SPARSEMEM_STATIC is not set |
| 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 218 | # CONFIG_RESOURCES_64BIT is not set | 224 | # CONFIG_RESOURCES_64BIT is not set |
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 225 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 226 | CONFIG_BOUNCE=y |
| 221 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 222 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
| 223 | CONFIG_CMDLINE_BOOL=y | 230 | CONFIG_CMDLINE_BOOL=y |
| 224 | CONFIG_CMDLINE="console=ttyS0,115200" | 231 | CONFIG_CMDLINE="console=ttyS0,115200" |
| @@ -242,6 +249,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 242 | CONFIG_PCI_LEGACY=y | 249 | CONFIG_PCI_LEGACY=y |
| 243 | # CONFIG_PCCARD is not set | 250 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HOTPLUG_PCI is not set | 251 | # CONFIG_HOTPLUG_PCI is not set |
| 252 | # CONFIG_HAS_RAPIDIO is not set | ||
| 245 | 253 | ||
| 246 | # | 254 | # |
| 247 | # Advanced setup | 255 | # Advanced setup |
| @@ -251,11 +259,11 @@ CONFIG_PCI_LEGACY=y | |||
| 251 | # | 259 | # |
| 252 | # Default settings for advanced configuration options are used | 260 | # Default settings for advanced configuration options are used |
| 253 | # | 261 | # |
| 254 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 255 | CONFIG_LOWMEM_SIZE=0x30000000 | 262 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 263 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 256 | CONFIG_KERNEL_START=0xc0000000 | 264 | CONFIG_KERNEL_START=0xc0000000 |
| 265 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 257 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 258 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 259 | 267 | ||
| 260 | # | 268 | # |
| 261 | # Networking | 269 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -358,6 +364,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 358 | # CONFIG_MTD_REDBOOT_PARTS is not set | 364 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 359 | # CONFIG_MTD_CMDLINE_PARTS is not set | 365 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 360 | # CONFIG_MTD_OF_PARTS is not set | 366 | # CONFIG_MTD_OF_PARTS is not set |
| 367 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 361 | 368 | ||
| 362 | # | 369 | # |
| 363 | # User Modules And Translation Layers | 370 | # User Modules And Translation Layers |
| @@ -433,6 +440,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 433 | # | 440 | # |
| 434 | # CONFIG_MTD_UBI is not set | 441 | # CONFIG_MTD_UBI is not set |
| 435 | CONFIG_OF_DEVICE=y | 442 | CONFIG_OF_DEVICE=y |
| 443 | CONFIG_OF_I2C=y | ||
| 436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
| 437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
| 438 | # CONFIG_BLK_DEV_FD is not set | 446 | # CONFIG_BLK_DEV_FD is not set |
| @@ -513,7 +521,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 513 | CONFIG_BLK_DEV_VIA82CXXX=y | 521 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 514 | # CONFIG_BLK_DEV_TC86C001 is not set | 522 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 515 | CONFIG_BLK_DEV_IDEDMA=y | 523 | CONFIG_BLK_DEV_IDEDMA=y |
| 516 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 524 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 517 | # CONFIG_BLK_DEV_HD is not set | 525 | # CONFIG_BLK_DEV_HD is not set |
| 518 | 526 | ||
| 519 | # | 527 | # |
| @@ -638,7 +646,6 @@ CONFIG_R8169=y | |||
| 638 | # CONFIG_SIS190 is not set | 646 | # CONFIG_SIS190 is not set |
| 639 | # CONFIG_SKGE is not set | 647 | # CONFIG_SKGE is not set |
| 640 | # CONFIG_SKY2 is not set | 648 | # CONFIG_SKY2 is not set |
| 641 | # CONFIG_SK98LIN is not set | ||
| 642 | # CONFIG_VIA_VELOCITY is not set | 649 | # CONFIG_VIA_VELOCITY is not set |
| 643 | # CONFIG_TIGON3 is not set | 650 | # CONFIG_TIGON3 is not set |
| 644 | # CONFIG_BNX2 is not set | 651 | # CONFIG_BNX2 is not set |
| @@ -654,6 +661,7 @@ CONFIG_R8169=y | |||
| 654 | # | 661 | # |
| 655 | # CONFIG_WLAN_PRE80211 is not set | 662 | # CONFIG_WLAN_PRE80211 is not set |
| 656 | # CONFIG_WLAN_80211 is not set | 663 | # CONFIG_WLAN_80211 is not set |
| 664 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 657 | 665 | ||
| 658 | # | 666 | # |
| 659 | # USB Network Adapters | 667 | # USB Network Adapters |
| @@ -690,6 +698,7 @@ CONFIG_R8169=y | |||
| 690 | # Character devices | 698 | # Character devices |
| 691 | # | 699 | # |
| 692 | # CONFIG_VT is not set | 700 | # CONFIG_VT is not set |
| 701 | CONFIG_DEVKMEM=y | ||
| 693 | # CONFIG_SERIAL_NONSTANDARD is not set | 702 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 694 | # CONFIG_NOZOMI is not set | 703 | # CONFIG_NOZOMI is not set |
| 695 | 704 | ||
| @@ -717,7 +726,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 717 | # CONFIG_IPMI_HANDLER is not set | 726 | # CONFIG_IPMI_HANDLER is not set |
| 718 | CONFIG_HW_RANDOM=m | 727 | CONFIG_HW_RANDOM=m |
| 719 | CONFIG_NVRAM=y | 728 | CONFIG_NVRAM=y |
| 720 | # CONFIG_GEN_RTC is not set | ||
| 721 | # CONFIG_R3964 is not set | 729 | # CONFIG_R3964 is not set |
| 722 | # CONFIG_APPLICOM is not set | 730 | # CONFIG_APPLICOM is not set |
| 723 | # CONFIG_RAW_DRIVER is not set | 731 | # CONFIG_RAW_DRIVER is not set |
| @@ -728,13 +736,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 728 | CONFIG_I2C_CHARDEV=y | 736 | CONFIG_I2C_CHARDEV=y |
| 729 | 737 | ||
| 730 | # | 738 | # |
| 731 | # I2C Algorithms | ||
| 732 | # | ||
| 733 | # CONFIG_I2C_ALGOBIT is not set | ||
| 734 | # CONFIG_I2C_ALGOPCF is not set | ||
| 735 | # CONFIG_I2C_ALGOPCA is not set | ||
| 736 | |||
| 737 | # | ||
| 738 | # I2C Hardware Bus support | 739 | # I2C Hardware Bus support |
| 739 | # | 740 | # |
| 740 | # CONFIG_I2C_ALI1535 is not set | 741 | # CONFIG_I2C_ALI1535 is not set |
| @@ -761,6 +762,7 @@ CONFIG_I2C_MPC=y | |||
| 761 | # CONFIG_I2C_VIA is not set | 762 | # CONFIG_I2C_VIA is not set |
| 762 | # CONFIG_I2C_VIAPRO is not set | 763 | # CONFIG_I2C_VIAPRO is not set |
| 763 | # CONFIG_I2C_VOODOO3 is not set | 764 | # CONFIG_I2C_VOODOO3 is not set |
| 765 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 764 | 766 | ||
| 765 | # | 767 | # |
| 766 | # Miscellaneous I2C Chip support | 768 | # Miscellaneous I2C Chip support |
| @@ -770,19 +772,13 @@ CONFIG_I2C_MPC=y | |||
| 770 | # CONFIG_SENSORS_PCF8574 is not set | 772 | # CONFIG_SENSORS_PCF8574 is not set |
| 771 | # CONFIG_PCF8575 is not set | 773 | # CONFIG_PCF8575 is not set |
| 772 | # CONFIG_SENSORS_PCF8591 is not set | 774 | # CONFIG_SENSORS_PCF8591 is not set |
| 773 | # CONFIG_TPS65010 is not set | ||
| 774 | # CONFIG_SENSORS_MAX6875 is not set | 775 | # CONFIG_SENSORS_MAX6875 is not set |
| 775 | # CONFIG_SENSORS_TSL2550 is not set | 776 | # CONFIG_SENSORS_TSL2550 is not set |
| 776 | # CONFIG_I2C_DEBUG_CORE is not set | 777 | # CONFIG_I2C_DEBUG_CORE is not set |
| 777 | # CONFIG_I2C_DEBUG_ALGO is not set | 778 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 778 | # CONFIG_I2C_DEBUG_BUS is not set | 779 | # CONFIG_I2C_DEBUG_BUS is not set |
| 779 | # CONFIG_I2C_DEBUG_CHIP is not set | 780 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 780 | |||
| 781 | # | ||
| 782 | # SPI support | ||
| 783 | # | ||
| 784 | # CONFIG_SPI is not set | 781 | # CONFIG_SPI is not set |
| 785 | # CONFIG_SPI_MASTER is not set | ||
| 786 | # CONFIG_W1 is not set | 782 | # CONFIG_W1 is not set |
| 787 | # CONFIG_POWER_SUPPLY is not set | 783 | # CONFIG_POWER_SUPPLY is not set |
| 788 | # CONFIG_HWMON is not set | 784 | # CONFIG_HWMON is not set |
| @@ -799,12 +795,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 799 | # Multifunction device drivers | 795 | # Multifunction device drivers |
| 800 | # | 796 | # |
| 801 | # CONFIG_MFD_SM501 is not set | 797 | # CONFIG_MFD_SM501 is not set |
| 798 | # CONFIG_HTC_PASIC3 is not set | ||
| 802 | 799 | ||
| 803 | # | 800 | # |
| 804 | # Multimedia devices | 801 | # Multimedia devices |
| 805 | # | 802 | # |
| 803 | |||
| 804 | # | ||
| 805 | # Multimedia core support | ||
| 806 | # | ||
| 806 | # CONFIG_VIDEO_DEV is not set | 807 | # CONFIG_VIDEO_DEV is not set |
| 807 | # CONFIG_DVB_CORE is not set | 808 | # CONFIG_DVB_CORE is not set |
| 809 | # CONFIG_VIDEO_MEDIA is not set | ||
| 810 | |||
| 811 | # | ||
| 812 | # Multimedia drivers | ||
| 813 | # | ||
| 808 | # CONFIG_DAB is not set | 814 | # CONFIG_DAB is not set |
| 809 | 815 | ||
| 810 | # | 816 | # |
| @@ -841,16 +847,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 841 | CONFIG_USB_DEVICE_CLASS=y | 847 | CONFIG_USB_DEVICE_CLASS=y |
| 842 | # CONFIG_USB_DYNAMIC_MINORS is not set | 848 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 843 | # CONFIG_USB_OTG is not set | 849 | # CONFIG_USB_OTG is not set |
| 850 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 851 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 844 | 852 | ||
| 845 | # | 853 | # |
| 846 | # USB Host Controller Drivers | 854 | # USB Host Controller Drivers |
| 847 | # | 855 | # |
| 856 | # CONFIG_USB_C67X00_HCD is not set | ||
| 848 | CONFIG_USB_EHCI_HCD=y | 857 | CONFIG_USB_EHCI_HCD=y |
| 849 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 858 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 850 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 859 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 851 | # CONFIG_USB_EHCI_FSL is not set | 860 | # CONFIG_USB_EHCI_FSL is not set |
| 852 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 861 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 853 | # CONFIG_USB_ISP116X_HCD is not set | 862 | # CONFIG_USB_ISP116X_HCD is not set |
| 863 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 854 | CONFIG_USB_OHCI_HCD=y | 864 | CONFIG_USB_OHCI_HCD=y |
| 855 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 865 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 856 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 866 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -865,6 +875,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 865 | # | 875 | # |
| 866 | # CONFIG_USB_ACM is not set | 876 | # CONFIG_USB_ACM is not set |
| 867 | # CONFIG_USB_PRINTER is not set | 877 | # CONFIG_USB_PRINTER is not set |
| 878 | # CONFIG_USB_WDM is not set | ||
| 868 | 879 | ||
| 869 | # | 880 | # |
| 870 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 881 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -885,6 +896,7 @@ CONFIG_USB_STORAGE=y | |||
| 885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 896 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 886 | # CONFIG_USB_STORAGE_ALAUDA is not set | 897 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 887 | # CONFIG_USB_STORAGE_KARMA is not set | 898 | # CONFIG_USB_STORAGE_KARMA is not set |
| 899 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 888 | # CONFIG_USB_LIBUSUAL is not set | 900 | # CONFIG_USB_LIBUSUAL is not set |
| 889 | 901 | ||
| 890 | # | 902 | # |
| @@ -922,10 +934,12 @@ CONFIG_USB_STORAGE=y | |||
| 922 | # CONFIG_USB_TRANCEVIBRATOR is not set | 934 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 923 | # CONFIG_USB_IOWARRIOR is not set | 935 | # CONFIG_USB_IOWARRIOR is not set |
| 924 | # CONFIG_USB_TEST is not set | 936 | # CONFIG_USB_TEST is not set |
| 937 | # CONFIG_USB_ISIGHTFW is not set | ||
| 925 | # CONFIG_USB_GADGET is not set | 938 | # CONFIG_USB_GADGET is not set |
| 926 | # CONFIG_MMC is not set | 939 | # CONFIG_MMC is not set |
| 927 | # CONFIG_MEMSTICK is not set | 940 | # CONFIG_MEMSTICK is not set |
| 928 | # CONFIG_NEW_LEDS is not set | 941 | # CONFIG_NEW_LEDS is not set |
| 942 | # CONFIG_ACCESSIBILITY is not set | ||
| 929 | # CONFIG_INFINIBAND is not set | 943 | # CONFIG_INFINIBAND is not set |
| 930 | # CONFIG_EDAC is not set | 944 | # CONFIG_EDAC is not set |
| 931 | CONFIG_RTC_LIB=y | 945 | CONFIG_RTC_LIB=y |
| @@ -977,11 +991,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 977 | # | 991 | # |
| 978 | # on-CPU RTC drivers | 992 | # on-CPU RTC drivers |
| 979 | # | 993 | # |
| 994 | # CONFIG_RTC_DRV_PPC is not set | ||
| 980 | # CONFIG_DMADEVICES is not set | 995 | # CONFIG_DMADEVICES is not set |
| 981 | |||
| 982 | # | ||
| 983 | # Userspace I/O | ||
| 984 | # | ||
| 985 | # CONFIG_UIO is not set | 996 | # CONFIG_UIO is not set |
| 986 | 997 | ||
| 987 | # | 998 | # |
| @@ -1002,10 +1013,9 @@ CONFIG_FS_MBCACHE=y | |||
| 1002 | # CONFIG_FS_POSIX_ACL is not set | 1013 | # CONFIG_FS_POSIX_ACL is not set |
| 1003 | CONFIG_XFS_FS=m | 1014 | CONFIG_XFS_FS=m |
| 1004 | # CONFIG_XFS_QUOTA is not set | 1015 | # CONFIG_XFS_QUOTA is not set |
| 1005 | # CONFIG_XFS_SECURITY is not set | ||
| 1006 | # CONFIG_XFS_POSIX_ACL is not set | 1016 | # CONFIG_XFS_POSIX_ACL is not set |
| 1007 | # CONFIG_XFS_RT is not set | 1017 | # CONFIG_XFS_RT is not set |
| 1008 | # CONFIG_GFS2_FS is not set | 1018 | # CONFIG_XFS_DEBUG is not set |
| 1009 | # CONFIG_OCFS2_FS is not set | 1019 | # CONFIG_OCFS2_FS is not set |
| 1010 | CONFIG_DNOTIFY=y | 1020 | CONFIG_DNOTIFY=y |
| 1011 | CONFIG_INOTIFY=y | 1021 | CONFIG_INOTIFY=y |
| @@ -1138,6 +1148,7 @@ CONFIG_NLS_UTF8=y | |||
| 1138 | # Library routines | 1148 | # Library routines |
| 1139 | # | 1149 | # |
| 1140 | CONFIG_BITREVERSE=y | 1150 | CONFIG_BITREVERSE=y |
| 1151 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1141 | # CONFIG_CRC_CCITT is not set | 1152 | # CONFIG_CRC_CCITT is not set |
| 1142 | # CONFIG_CRC16 is not set | 1153 | # CONFIG_CRC16 is not set |
| 1143 | # CONFIG_CRC_ITU_T is not set | 1154 | # CONFIG_CRC_ITU_T is not set |
| @@ -1150,6 +1161,7 @@ CONFIG_PLIST=y | |||
| 1150 | CONFIG_HAS_IOMEM=y | 1161 | CONFIG_HAS_IOMEM=y |
| 1151 | CONFIG_HAS_IOPORT=y | 1162 | CONFIG_HAS_IOPORT=y |
| 1152 | CONFIG_HAS_DMA=y | 1163 | CONFIG_HAS_DMA=y |
| 1164 | CONFIG_HAVE_LMB=y | ||
| 1153 | 1165 | ||
| 1154 | # | 1166 | # |
| 1155 | # Kernel hacking | 1167 | # Kernel hacking |
| @@ -1157,6 +1169,7 @@ CONFIG_HAS_DMA=y | |||
| 1157 | # CONFIG_PRINTK_TIME is not set | 1169 | # CONFIG_PRINTK_TIME is not set |
| 1158 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 1170 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
| 1159 | # CONFIG_ENABLE_MUST_CHECK is not set | 1171 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 1172 | CONFIG_FRAME_WARN=1024 | ||
| 1160 | # CONFIG_MAGIC_SYSRQ is not set | 1173 | # CONFIG_MAGIC_SYSRQ is not set |
| 1161 | # CONFIG_UNUSED_SYMBOLS is not set | 1174 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1162 | # CONFIG_DEBUG_FS is not set | 1175 | # CONFIG_DEBUG_FS is not set |
| @@ -1166,6 +1179,7 @@ CONFIG_HAS_DMA=y | |||
| 1166 | # CONFIG_SLUB_STATS is not set | 1179 | # CONFIG_SLUB_STATS is not set |
| 1167 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1180 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1168 | # CONFIG_SAMPLES is not set | 1181 | # CONFIG_SAMPLES is not set |
| 1182 | # CONFIG_IRQSTACKS is not set | ||
| 1169 | # CONFIG_BOOTX_TEXT is not set | 1183 | # CONFIG_BOOTX_TEXT is not set |
| 1170 | # CONFIG_PPC_EARLY_DEBUG is not set | 1184 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1171 | 1185 | ||
| @@ -1181,3 +1195,4 @@ CONFIG_ASYNC_MEMCPY=y | |||
| 1181 | CONFIG_ASYNC_XOR=y | 1195 | CONFIG_ASYNC_XOR=y |
| 1182 | # CONFIG_CRYPTO is not set | 1196 | # CONFIG_CRYPTO is not set |
| 1183 | # CONFIG_PPC_CLOCK is not set | 1197 | # CONFIG_PPC_CLOCK is not set |
| 1198 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 2f73f705d564..bcc249d90c4d 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -1073,7 +1073,7 @@ static const struct file_operations virq_debug_fops = { | |||
| 1073 | static int __init irq_debugfs_init(void) | 1073 | static int __init irq_debugfs_init(void) |
| 1074 | { | 1074 | { |
| 1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, | 1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, |
| 1076 | NULL, &virq_debug_fops)) | 1076 | NULL, &virq_debug_fops) == NULL) |
| 1077 | return -ENOMEM; | 1077 | return -ENOMEM; |
| 1078 | 1078 | ||
| 1079 | return 0; | 1079 | return 0; |
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index cf6b5a7d8b3f..d3ac631cbd26 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/screen_info.h> | 8 | #include <linux/screen_info.h> |
| 9 | #include <linux/vt_kern.h> | 9 | #include <linux/vt_kern.h> |
| 10 | #include <linux/nvram.h> | 10 | #include <linux/nvram.h> |
| 11 | #include <linux/console.h> | ||
| 12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| 13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| @@ -160,7 +159,6 @@ EXPORT_SYMBOL(screen_info); | |||
| 160 | EXPORT_SYMBOL(timer_interrupt); | 159 | EXPORT_SYMBOL(timer_interrupt); |
| 161 | EXPORT_SYMBOL(irq_desc); | 160 | EXPORT_SYMBOL(irq_desc); |
| 162 | EXPORT_SYMBOL(tb_ticks_per_jiffy); | 161 | EXPORT_SYMBOL(tb_ticks_per_jiffy); |
| 163 | EXPORT_SYMBOL(console_drivers); | ||
| 164 | EXPORT_SYMBOL(cacheable_memcpy); | 162 | EXPORT_SYMBOL(cacheable_memcpy); |
| 165 | #endif | 163 | #endif |
| 166 | 164 | ||
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh index 31729a9387df..2c7e8e87f770 100644 --- a/arch/powerpc/kernel/prom_init_check.sh +++ b/arch/powerpc/kernel/prom_init_check.sh | |||
| @@ -48,6 +48,20 @@ do | |||
| 48 | fi | 48 | fi |
| 49 | done | 49 | done |
| 50 | 50 | ||
| 51 | # ignore register save/restore funcitons | ||
| 52 | if [ "${UNDEF:0:9}" = "_restgpr_" ]; then | ||
| 53 | OK=1 | ||
| 54 | fi | ||
| 55 | if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then | ||
| 56 | OK=1 | ||
| 57 | fi | ||
| 58 | if [ "${UNDEF:0:9}" = "_savegpr_" ]; then | ||
| 59 | OK=1 | ||
| 60 | fi | ||
| 61 | if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then | ||
| 62 | OK=1 | ||
| 63 | fi | ||
| 64 | |||
| 51 | if [ $OK -eq 0 ]; then | 65 | if [ $OK -eq 0 ]; then |
| 52 | ERROR=1 | 66 | ERROR=1 |
| 53 | echo "Error: External symbol '$UNDEF' referenced" \ | 67 | echo "Error: External symbol '$UNDEF' referenced" \ |
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c index f5d7a5eab96e..75dff7cfa814 100644 --- a/arch/powerpc/kvm/44x_tlb.c +++ b/arch/powerpc/kvm/44x_tlb.c | |||
| @@ -116,8 +116,6 @@ static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu, | |||
| 116 | struct tlbe *stlbe = &vcpu->arch.shadow_tlb[index]; | 116 | struct tlbe *stlbe = &vcpu->arch.shadow_tlb[index]; |
| 117 | struct page *page = vcpu->arch.shadow_pages[index]; | 117 | struct page *page = vcpu->arch.shadow_pages[index]; |
| 118 | 118 | ||
| 119 | kunmap(vcpu->arch.shadow_pages[index]); | ||
| 120 | |||
| 121 | if (get_tlb_v(stlbe)) { | 119 | if (get_tlb_v(stlbe)) { |
| 122 | if (kvmppc_44x_tlbe_is_writable(stlbe)) | 120 | if (kvmppc_44x_tlbe_is_writable(stlbe)) |
| 123 | kvm_release_page_dirty(page); | 121 | kvm_release_page_dirty(page); |
| @@ -144,18 +142,19 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid, | |||
| 144 | stlbe = &vcpu->arch.shadow_tlb[victim]; | 142 | stlbe = &vcpu->arch.shadow_tlb[victim]; |
| 145 | 143 | ||
| 146 | /* Get reference to new page. */ | 144 | /* Get reference to new page. */ |
| 147 | down_write(¤t->mm->mmap_sem); | 145 | down_read(¤t->mm->mmap_sem); |
| 148 | new_page = gfn_to_page(vcpu->kvm, gfn); | 146 | new_page = gfn_to_page(vcpu->kvm, gfn); |
| 149 | if (is_error_page(new_page)) { | 147 | if (is_error_page(new_page)) { |
| 150 | printk(KERN_ERR "Couldn't get guest page!\n"); | 148 | printk(KERN_ERR "Couldn't get guest page for gfn %lx!\n", gfn); |
| 151 | kvm_release_page_clean(new_page); | 149 | kvm_release_page_clean(new_page); |
| 150 | up_read(¤t->mm->mmap_sem); | ||
| 152 | return; | 151 | return; |
| 153 | } | 152 | } |
| 154 | hpaddr = page_to_phys(new_page); | 153 | hpaddr = page_to_phys(new_page); |
| 155 | 154 | ||
| 156 | /* Drop reference to old page. */ | 155 | /* Drop reference to old page. */ |
| 157 | kvmppc_44x_shadow_release(vcpu, victim); | 156 | kvmppc_44x_shadow_release(vcpu, victim); |
| 158 | up_write(¤t->mm->mmap_sem); | 157 | up_read(¤t->mm->mmap_sem); |
| 159 | 158 | ||
| 160 | vcpu->arch.shadow_pages[victim] = new_page; | 159 | vcpu->arch.shadow_pages[victim] = new_page; |
| 161 | 160 | ||
diff --git a/arch/powerpc/kvm/booke_guest.c b/arch/powerpc/kvm/booke_guest.c index 712d89a28c46..9c8ad850c6e3 100644 --- a/arch/powerpc/kvm/booke_guest.c +++ b/arch/powerpc/kvm/booke_guest.c | |||
| @@ -227,39 +227,6 @@ void kvmppc_check_and_deliver_interrupts(struct kvm_vcpu *vcpu) | |||
| 227 | } | 227 | } |
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | static int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu) | ||
| 231 | { | ||
| 232 | enum emulation_result er; | ||
| 233 | int r; | ||
| 234 | |||
| 235 | er = kvmppc_emulate_instruction(run, vcpu); | ||
| 236 | switch (er) { | ||
| 237 | case EMULATE_DONE: | ||
| 238 | /* Future optimization: only reload non-volatiles if they were | ||
| 239 | * actually modified. */ | ||
| 240 | r = RESUME_GUEST_NV; | ||
| 241 | break; | ||
| 242 | case EMULATE_DO_MMIO: | ||
| 243 | run->exit_reason = KVM_EXIT_MMIO; | ||
| 244 | /* We must reload nonvolatiles because "update" load/store | ||
| 245 | * instructions modify register state. */ | ||
| 246 | /* Future optimization: only reload non-volatiles if they were | ||
| 247 | * actually modified. */ | ||
| 248 | r = RESUME_HOST_NV; | ||
| 249 | break; | ||
| 250 | case EMULATE_FAIL: | ||
| 251 | /* XXX Deliver Program interrupt to guest. */ | ||
| 252 | printk(KERN_EMERG "%s: emulation failed (%08x)\n", __func__, | ||
| 253 | vcpu->arch.last_inst); | ||
| 254 | r = RESUME_HOST; | ||
| 255 | break; | ||
| 256 | default: | ||
| 257 | BUG(); | ||
| 258 | } | ||
| 259 | |||
| 260 | return r; | ||
| 261 | } | ||
| 262 | |||
| 263 | /** | 230 | /** |
| 264 | * kvmppc_handle_exit | 231 | * kvmppc_handle_exit |
| 265 | * | 232 | * |
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index a03fe0c80698..000097461283 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c | |||
| @@ -246,6 +246,11 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) | |||
| 246 | case 31: | 246 | case 31: |
| 247 | switch (get_xop(inst)) { | 247 | switch (get_xop(inst)) { |
| 248 | 248 | ||
| 249 | case 23: /* lwzx */ | ||
| 250 | rt = get_rt(inst); | ||
| 251 | emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1); | ||
| 252 | break; | ||
| 253 | |||
| 249 | case 83: /* mfmsr */ | 254 | case 83: /* mfmsr */ |
| 250 | rt = get_rt(inst); | 255 | rt = get_rt(inst); |
| 251 | vcpu->arch.gpr[rt] = vcpu->arch.msr; | 256 | vcpu->arch.gpr[rt] = vcpu->arch.msr; |
| @@ -267,6 +272,13 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) | |||
| 267 | kvmppc_set_msr(vcpu, vcpu->arch.gpr[rs]); | 272 | kvmppc_set_msr(vcpu, vcpu->arch.gpr[rs]); |
| 268 | break; | 273 | break; |
| 269 | 274 | ||
| 275 | case 151: /* stwx */ | ||
| 276 | rs = get_rs(inst); | ||
| 277 | emulated = kvmppc_handle_store(run, vcpu, | ||
| 278 | vcpu->arch.gpr[rs], | ||
| 279 | 4, 1); | ||
| 280 | break; | ||
| 281 | |||
| 270 | case 163: /* wrteei */ | 282 | case 163: /* wrteei */ |
| 271 | vcpu->arch.msr = (vcpu->arch.msr & ~MSR_EE) | 283 | vcpu->arch.msr = (vcpu->arch.msr & ~MSR_EE) |
| 272 | | (inst & MSR_EE); | 284 | | (inst & MSR_EE); |
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index c71d37dc6a88..e522b06cc42f 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
| @@ -9,7 +9,7 @@ endif | |||
| 9 | ifeq ($(CONFIG_PPC_MERGE),y) | 9 | ifeq ($(CONFIG_PPC_MERGE),y) |
| 10 | obj-y := string.o alloc.o \ | 10 | obj-y := string.o alloc.o \ |
| 11 | checksum_$(CONFIG_WORD_SIZE).o | 11 | checksum_$(CONFIG_WORD_SIZE).o |
| 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o | 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o |
| 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o | 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o |
| 14 | endif | 14 | endif |
| 15 | 15 | ||
diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S new file mode 100644 index 000000000000..70a9cd8a3008 --- /dev/null +++ b/arch/powerpc/lib/crtsavres.S | |||
| @@ -0,0 +1,229 @@ | |||
| 1 | /* | ||
| 2 | * Special support for eabi and SVR4 | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. | ||
| 5 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
| 6 | * Written By Michael Meissner | ||
| 7 | * | ||
| 8 | * Based on gcc/config/rs6000/crtsavres.asm from gcc | ||
| 9 | * | ||
| 10 | * This file is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2, or (at your option) any | ||
| 13 | * later version. | ||
| 14 | * | ||
| 15 | * In addition to the permissions in the GNU General Public License, the | ||
| 16 | * Free Software Foundation gives you unlimited permission to link the | ||
| 17 | * compiled version of this file with other programs, and to distribute | ||
| 18 | * those programs without any restriction coming from the use of this | ||
| 19 | * file. (The General Public License restrictions do apply in other | ||
| 20 | * respects; for example, they cover modification of the file, and | ||
| 21 | * distribution when not linked into another program.) | ||
| 22 | * | ||
| 23 | * This file is distributed in the hope that it will be useful, but | ||
| 24 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 26 | * General Public License for more details. | ||
| 27 | * | ||
| 28 | * You should have received a copy of the GNU General Public License | ||
| 29 | * along with this program; see the file COPYING. If not, write to | ||
| 30 | * the Free Software Foundation, 51 Franklin Street, Fifth Floor, | ||
| 31 | * Boston, MA 02110-1301, USA. | ||
| 32 | * | ||
| 33 | * As a special exception, if you link this library with files | ||
| 34 | * compiled with GCC to produce an executable, this does not cause | ||
| 35 | * the resulting executable to be covered by the GNU General Public License. | ||
| 36 | * This exception does not however invalidate any other reasons why | ||
| 37 | * the executable file might be covered by the GNU General Public License. | ||
| 38 | */ | ||
| 39 | |||
| 40 | #include <asm/ppc_asm.h> | ||
| 41 | |||
| 42 | .file "crtsavres.S" | ||
| 43 | .section ".text" | ||
| 44 | |||
| 45 | #ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE | ||
| 46 | |||
| 47 | /* Routines for saving integer registers, called by the compiler. */ | ||
| 48 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 49 | /* function, just beyond the end of the integer save area. */ | ||
| 50 | |||
| 51 | _GLOBAL(_savegpr_14) | ||
| 52 | _GLOBAL(_save32gpr_14) | ||
| 53 | stw 14,-72(11) /* save gp registers */ | ||
| 54 | _GLOBAL(_savegpr_15) | ||
| 55 | _GLOBAL(_save32gpr_15) | ||
| 56 | stw 15,-68(11) | ||
| 57 | _GLOBAL(_savegpr_16) | ||
| 58 | _GLOBAL(_save32gpr_16) | ||
| 59 | stw 16,-64(11) | ||
| 60 | _GLOBAL(_savegpr_17) | ||
| 61 | _GLOBAL(_save32gpr_17) | ||
| 62 | stw 17,-60(11) | ||
| 63 | _GLOBAL(_savegpr_18) | ||
| 64 | _GLOBAL(_save32gpr_18) | ||
| 65 | stw 18,-56(11) | ||
| 66 | _GLOBAL(_savegpr_19) | ||
| 67 | _GLOBAL(_save32gpr_19) | ||
| 68 | stw 19,-52(11) | ||
| 69 | _GLOBAL(_savegpr_20) | ||
| 70 | _GLOBAL(_save32gpr_20) | ||
| 71 | stw 20,-48(11) | ||
| 72 | _GLOBAL(_savegpr_21) | ||
| 73 | _GLOBAL(_save32gpr_21) | ||
| 74 | stw 21,-44(11) | ||
| 75 | _GLOBAL(_savegpr_22) | ||
| 76 | _GLOBAL(_save32gpr_22) | ||
| 77 | stw 22,-40(11) | ||
| 78 | _GLOBAL(_savegpr_23) | ||
| 79 | _GLOBAL(_save32gpr_23) | ||
| 80 | stw 23,-36(11) | ||
| 81 | _GLOBAL(_savegpr_24) | ||
| 82 | _GLOBAL(_save32gpr_24) | ||
| 83 | stw 24,-32(11) | ||
| 84 | _GLOBAL(_savegpr_25) | ||
| 85 | _GLOBAL(_save32gpr_25) | ||
| 86 | stw 25,-28(11) | ||
| 87 | _GLOBAL(_savegpr_26) | ||
| 88 | _GLOBAL(_save32gpr_26) | ||
| 89 | stw 26,-24(11) | ||
| 90 | _GLOBAL(_savegpr_27) | ||
| 91 | _GLOBAL(_save32gpr_27) | ||
| 92 | stw 27,-20(11) | ||
| 93 | _GLOBAL(_savegpr_28) | ||
| 94 | _GLOBAL(_save32gpr_28) | ||
| 95 | stw 28,-16(11) | ||
| 96 | _GLOBAL(_savegpr_29) | ||
| 97 | _GLOBAL(_save32gpr_29) | ||
| 98 | stw 29,-12(11) | ||
| 99 | _GLOBAL(_savegpr_30) | ||
| 100 | _GLOBAL(_save32gpr_30) | ||
| 101 | stw 30,-8(11) | ||
| 102 | _GLOBAL(_savegpr_31) | ||
| 103 | _GLOBAL(_save32gpr_31) | ||
| 104 | stw 31,-4(11) | ||
| 105 | blr | ||
| 106 | |||
| 107 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 108 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 109 | /* function, just beyond the end of the integer restore area. */ | ||
| 110 | |||
| 111 | _GLOBAL(_restgpr_14) | ||
| 112 | _GLOBAL(_rest32gpr_14) | ||
| 113 | lwz 14,-72(11) /* restore gp registers */ | ||
| 114 | _GLOBAL(_restgpr_15) | ||
| 115 | _GLOBAL(_rest32gpr_15) | ||
| 116 | lwz 15,-68(11) | ||
| 117 | _GLOBAL(_restgpr_16) | ||
| 118 | _GLOBAL(_rest32gpr_16) | ||
| 119 | lwz 16,-64(11) | ||
| 120 | _GLOBAL(_restgpr_17) | ||
| 121 | _GLOBAL(_rest32gpr_17) | ||
| 122 | lwz 17,-60(11) | ||
| 123 | _GLOBAL(_restgpr_18) | ||
| 124 | _GLOBAL(_rest32gpr_18) | ||
| 125 | lwz 18,-56(11) | ||
| 126 | _GLOBAL(_restgpr_19) | ||
| 127 | _GLOBAL(_rest32gpr_19) | ||
| 128 | lwz 19,-52(11) | ||
| 129 | _GLOBAL(_restgpr_20) | ||
| 130 | _GLOBAL(_rest32gpr_20) | ||
| 131 | lwz 20,-48(11) | ||
| 132 | _GLOBAL(_restgpr_21) | ||
| 133 | _GLOBAL(_rest32gpr_21) | ||
| 134 | lwz 21,-44(11) | ||
| 135 | _GLOBAL(_restgpr_22) | ||
| 136 | _GLOBAL(_rest32gpr_22) | ||
| 137 | lwz 22,-40(11) | ||
| 138 | _GLOBAL(_restgpr_23) | ||
| 139 | _GLOBAL(_rest32gpr_23) | ||
| 140 | lwz 23,-36(11) | ||
| 141 | _GLOBAL(_restgpr_24) | ||
| 142 | _GLOBAL(_rest32gpr_24) | ||
| 143 | lwz 24,-32(11) | ||
| 144 | _GLOBAL(_restgpr_25) | ||
| 145 | _GLOBAL(_rest32gpr_25) | ||
| 146 | lwz 25,-28(11) | ||
| 147 | _GLOBAL(_restgpr_26) | ||
| 148 | _GLOBAL(_rest32gpr_26) | ||
| 149 | lwz 26,-24(11) | ||
| 150 | _GLOBAL(_restgpr_27) | ||
| 151 | _GLOBAL(_rest32gpr_27) | ||
| 152 | lwz 27,-20(11) | ||
| 153 | _GLOBAL(_restgpr_28) | ||
| 154 | _GLOBAL(_rest32gpr_28) | ||
| 155 | lwz 28,-16(11) | ||
| 156 | _GLOBAL(_restgpr_29) | ||
| 157 | _GLOBAL(_rest32gpr_29) | ||
| 158 | lwz 29,-12(11) | ||
| 159 | _GLOBAL(_restgpr_30) | ||
| 160 | _GLOBAL(_rest32gpr_30) | ||
| 161 | lwz 30,-8(11) | ||
| 162 | _GLOBAL(_restgpr_31) | ||
| 163 | _GLOBAL(_rest32gpr_31) | ||
| 164 | lwz 31,-4(11) | ||
| 165 | blr | ||
| 166 | |||
| 167 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 168 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 169 | /* function, just beyond the end of the integer restore area. */ | ||
| 170 | |||
| 171 | _GLOBAL(_restgpr_14_x) | ||
| 172 | _GLOBAL(_rest32gpr_14_x) | ||
| 173 | lwz 14,-72(11) /* restore gp registers */ | ||
| 174 | _GLOBAL(_restgpr_15_x) | ||
| 175 | _GLOBAL(_rest32gpr_15_x) | ||
| 176 | lwz 15,-68(11) | ||
| 177 | _GLOBAL(_restgpr_16_x) | ||
| 178 | _GLOBAL(_rest32gpr_16_x) | ||
| 179 | lwz 16,-64(11) | ||
| 180 | _GLOBAL(_restgpr_17_x) | ||
| 181 | _GLOBAL(_rest32gpr_17_x) | ||
| 182 | lwz 17,-60(11) | ||
| 183 | _GLOBAL(_restgpr_18_x) | ||
| 184 | _GLOBAL(_rest32gpr_18_x) | ||
| 185 | lwz 18,-56(11) | ||
| 186 | _GLOBAL(_restgpr_19_x) | ||
| 187 | _GLOBAL(_rest32gpr_19_x) | ||
| 188 | lwz 19,-52(11) | ||
| 189 | _GLOBAL(_restgpr_20_x) | ||
| 190 | _GLOBAL(_rest32gpr_20_x) | ||
| 191 | lwz 20,-48(11) | ||
| 192 | _GLOBAL(_restgpr_21_x) | ||
| 193 | _GLOBAL(_rest32gpr_21_x) | ||
| 194 | lwz 21,-44(11) | ||
| 195 | _GLOBAL(_restgpr_22_x) | ||
| 196 | _GLOBAL(_rest32gpr_22_x) | ||
| 197 | lwz 22,-40(11) | ||
| 198 | _GLOBAL(_restgpr_23_x) | ||
| 199 | _GLOBAL(_rest32gpr_23_x) | ||
| 200 | lwz 23,-36(11) | ||
| 201 | _GLOBAL(_restgpr_24_x) | ||
| 202 | _GLOBAL(_rest32gpr_24_x) | ||
| 203 | lwz 24,-32(11) | ||
| 204 | _GLOBAL(_restgpr_25_x) | ||
| 205 | _GLOBAL(_rest32gpr_25_x) | ||
| 206 | lwz 25,-28(11) | ||
| 207 | _GLOBAL(_restgpr_26_x) | ||
| 208 | _GLOBAL(_rest32gpr_26_x) | ||
| 209 | lwz 26,-24(11) | ||
| 210 | _GLOBAL(_restgpr_27_x) | ||
| 211 | _GLOBAL(_rest32gpr_27_x) | ||
| 212 | lwz 27,-20(11) | ||
| 213 | _GLOBAL(_restgpr_28_x) | ||
| 214 | _GLOBAL(_rest32gpr_28_x) | ||
| 215 | lwz 28,-16(11) | ||
| 216 | _GLOBAL(_restgpr_29_x) | ||
| 217 | _GLOBAL(_rest32gpr_29_x) | ||
| 218 | lwz 29,-12(11) | ||
| 219 | _GLOBAL(_restgpr_30_x) | ||
| 220 | _GLOBAL(_rest32gpr_30_x) | ||
| 221 | lwz 30,-8(11) | ||
| 222 | _GLOBAL(_restgpr_31_x) | ||
| 223 | _GLOBAL(_rest32gpr_31_x) | ||
| 224 | lwz 0,4(11) | ||
| 225 | lwz 31,-4(11) | ||
| 226 | mtlr 0 | ||
| 227 | mr 1,11 | ||
| 228 | blr | ||
| 229 | #endif | ||
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 7ff29d53dc2d..ecbe580c3f32 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
| @@ -34,6 +34,7 @@ config MPC85xx_MDS | |||
| 34 | bool "Freescale MPC85xx MDS" | 34 | bool "Freescale MPC85xx MDS" |
| 35 | select DEFAULT_UIMAGE | 35 | select DEFAULT_UIMAGE |
| 36 | select QUICC_ENGINE | 36 | select QUICC_ENGINE |
| 37 | select PHYLIB | ||
| 37 | help | 38 | help |
| 38 | This option enables support for the MPC85xx MDS board | 39 | This option enables support for the MPC85xx MDS board |
| 39 | 40 | ||
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c index 70c660121ec4..78f905bc6a42 100644 --- a/arch/powerpc/platforms/cell/spu_base.c +++ b/arch/powerpc/platforms/cell/spu_base.c | |||
| @@ -219,15 +219,25 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea) | |||
| 219 | extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX | 219 | extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX |
| 220 | static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) | 220 | static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) |
| 221 | { | 221 | { |
| 222 | int ret; | ||
| 223 | |||
| 222 | pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea); | 224 | pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea); |
| 223 | 225 | ||
| 224 | /* Handle kernel space hash faults immediately. | 226 | /* |
| 225 | User hash faults need to be deferred to process context. */ | 227 | * Handle kernel space hash faults immediately. User hash |
| 226 | if ((dsisr & MFC_DSISR_PTE_NOT_FOUND) | 228 | * faults need to be deferred to process context. |
| 227 | && REGION_ID(ea) != USER_REGION_ID | 229 | */ |
| 228 | && hash_page(ea, _PAGE_PRESENT, 0x300) == 0) { | 230 | if ((dsisr & MFC_DSISR_PTE_NOT_FOUND) && |
| 229 | spu_restart_dma(spu); | 231 | (REGION_ID(ea) != USER_REGION_ID)) { |
| 230 | return 0; | 232 | |
| 233 | spin_unlock(&spu->register_lock); | ||
| 234 | ret = hash_page(ea, _PAGE_PRESENT, 0x300); | ||
| 235 | spin_lock(&spu->register_lock); | ||
| 236 | |||
| 237 | if (!ret) { | ||
| 238 | spu_restart_dma(spu); | ||
| 239 | return 0; | ||
| 240 | } | ||
| 231 | } | 241 | } |
| 232 | 242 | ||
| 233 | spu->class_1_dar = ea; | 243 | spu->class_1_dar = ea; |
| @@ -324,17 +334,13 @@ spu_irq_class_0(int irq, void *data) | |||
| 324 | stat = spu_int_stat_get(spu, 0) & mask; | 334 | stat = spu_int_stat_get(spu, 0) & mask; |
| 325 | 335 | ||
| 326 | spu->class_0_pending |= stat; | 336 | spu->class_0_pending |= stat; |
| 327 | spu->class_0_dsisr = spu_mfc_dsisr_get(spu); | ||
| 328 | spu->class_0_dar = spu_mfc_dar_get(spu); | 337 | spu->class_0_dar = spu_mfc_dar_get(spu); |
| 329 | spin_unlock(&spu->register_lock); | ||
| 330 | |||
| 331 | spu->stop_callback(spu, 0); | 338 | spu->stop_callback(spu, 0); |
| 332 | |||
| 333 | spu->class_0_pending = 0; | 339 | spu->class_0_pending = 0; |
| 334 | spu->class_0_dsisr = 0; | ||
| 335 | spu->class_0_dar = 0; | 340 | spu->class_0_dar = 0; |
| 336 | 341 | ||
| 337 | spu_int_stat_clear(spu, 0, stat); | 342 | spu_int_stat_clear(spu, 0, stat); |
| 343 | spin_unlock(&spu->register_lock); | ||
| 338 | 344 | ||
| 339 | return IRQ_HANDLED; | 345 | return IRQ_HANDLED; |
| 340 | } | 346 | } |
| @@ -357,13 +363,12 @@ spu_irq_class_1(int irq, void *data) | |||
| 357 | spu_mfc_dsisr_set(spu, 0ul); | 363 | spu_mfc_dsisr_set(spu, 0ul); |
| 358 | spu_int_stat_clear(spu, 1, stat); | 364 | spu_int_stat_clear(spu, 1, stat); |
| 359 | 365 | ||
| 360 | if (stat & CLASS1_SEGMENT_FAULT_INTR) | ||
| 361 | __spu_trap_data_seg(spu, dar); | ||
| 362 | |||
| 363 | spin_unlock(&spu->register_lock); | ||
| 364 | pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat, | 366 | pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat, |
| 365 | dar, dsisr); | 367 | dar, dsisr); |
| 366 | 368 | ||
| 369 | if (stat & CLASS1_SEGMENT_FAULT_INTR) | ||
| 370 | __spu_trap_data_seg(spu, dar); | ||
| 371 | |||
| 367 | if (stat & CLASS1_STORAGE_FAULT_INTR) | 372 | if (stat & CLASS1_STORAGE_FAULT_INTR) |
| 368 | __spu_trap_data_map(spu, dar, dsisr); | 373 | __spu_trap_data_map(spu, dar, dsisr); |
| 369 | 374 | ||
| @@ -376,6 +381,8 @@ spu_irq_class_1(int irq, void *data) | |||
| 376 | spu->class_1_dsisr = 0; | 381 | spu->class_1_dsisr = 0; |
| 377 | spu->class_1_dar = 0; | 382 | spu->class_1_dar = 0; |
| 378 | 383 | ||
| 384 | spin_unlock(&spu->register_lock); | ||
| 385 | |||
| 379 | return stat ? IRQ_HANDLED : IRQ_NONE; | 386 | return stat ? IRQ_HANDLED : IRQ_NONE; |
| 380 | } | 387 | } |
| 381 | 388 | ||
| @@ -394,14 +401,12 @@ spu_irq_class_2(int irq, void *data) | |||
| 394 | mask = spu_int_mask_get(spu, 2); | 401 | mask = spu_int_mask_get(spu, 2); |
| 395 | /* ignore interrupts we're not waiting for */ | 402 | /* ignore interrupts we're not waiting for */ |
| 396 | stat &= mask; | 403 | stat &= mask; |
| 397 | |||
| 398 | /* mailbox interrupts are level triggered. mask them now before | 404 | /* mailbox interrupts are level triggered. mask them now before |
| 399 | * acknowledging */ | 405 | * acknowledging */ |
| 400 | if (stat & mailbox_intrs) | 406 | if (stat & mailbox_intrs) |
| 401 | spu_int_mask_and(spu, 2, ~(stat & mailbox_intrs)); | 407 | spu_int_mask_and(spu, 2, ~(stat & mailbox_intrs)); |
| 402 | /* acknowledge all interrupts before the callbacks */ | 408 | /* acknowledge all interrupts before the callbacks */ |
| 403 | spu_int_stat_clear(spu, 2, stat); | 409 | spu_int_stat_clear(spu, 2, stat); |
| 404 | spin_unlock(&spu->register_lock); | ||
| 405 | 410 | ||
| 406 | pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask); | 411 | pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask); |
| 407 | 412 | ||
| @@ -421,6 +426,9 @@ spu_irq_class_2(int irq, void *data) | |||
| 421 | spu->wbox_callback(spu); | 426 | spu->wbox_callback(spu); |
| 422 | 427 | ||
| 423 | spu->stats.class2_intr++; | 428 | spu->stats.class2_intr++; |
| 429 | |||
| 430 | spin_unlock(&spu->register_lock); | ||
| 431 | |||
| 424 | return stat ? IRQ_HANDLED : IRQ_NONE; | 432 | return stat ? IRQ_HANDLED : IRQ_NONE; |
| 425 | } | 433 | } |
| 426 | 434 | ||
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index b7493b865812..f7edba6cb795 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c | |||
| @@ -27,7 +27,6 @@ void spufs_stop_callback(struct spu *spu, int irq) | |||
| 27 | switch(irq) { | 27 | switch(irq) { |
| 28 | case 0 : | 28 | case 0 : |
| 29 | ctx->csa.class_0_pending = spu->class_0_pending; | 29 | ctx->csa.class_0_pending = spu->class_0_pending; |
| 30 | ctx->csa.class_0_dsisr = spu->class_0_dsisr; | ||
| 31 | ctx->csa.class_0_dar = spu->class_0_dar; | 30 | ctx->csa.class_0_dar = spu->class_0_dar; |
| 32 | break; | 31 | break; |
| 33 | case 1 : | 32 | case 1 : |
| @@ -51,18 +50,22 @@ int spu_stopped(struct spu_context *ctx, u32 *stat) | |||
| 51 | u64 dsisr; | 50 | u64 dsisr; |
| 52 | u32 stopped; | 51 | u32 stopped; |
| 53 | 52 | ||
| 54 | *stat = ctx->ops->status_read(ctx); | ||
| 55 | |||
| 56 | if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags)) | ||
| 57 | return 1; | ||
| 58 | |||
| 59 | stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP | | 53 | stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP | |
| 60 | SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP; | 54 | SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP; |
| 61 | if (!(*stat & SPU_STATUS_RUNNING) && (*stat & stopped)) | 55 | |
| 56 | top: | ||
| 57 | *stat = ctx->ops->status_read(ctx); | ||
| 58 | if (*stat & stopped) { | ||
| 59 | /* | ||
| 60 | * If the spu hasn't finished stopping, we need to | ||
| 61 | * re-read the register to get the stopped value. | ||
| 62 | */ | ||
| 63 | if (*stat & SPU_STATUS_RUNNING) | ||
| 64 | goto top; | ||
| 62 | return 1; | 65 | return 1; |
| 66 | } | ||
| 63 | 67 | ||
| 64 | dsisr = ctx->csa.class_0_dsisr; | 68 | if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags)) |
| 65 | if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)) | ||
| 66 | return 1; | 69 | return 1; |
| 67 | 70 | ||
| 68 | dsisr = ctx->csa.class_1_dsisr; | 71 | dsisr = ctx->csa.class_1_dsisr; |
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 745dd51ec37f..e929e70a84e3 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/arch/powerpc/platforms/cell/spufs/sched.c | |||
| @@ -230,19 +230,23 @@ static void spu_bind_context(struct spu *spu, struct spu_context *ctx) | |||
| 230 | ctx->stats.slb_flt_base = spu->stats.slb_flt; | 230 | ctx->stats.slb_flt_base = spu->stats.slb_flt; |
| 231 | ctx->stats.class2_intr_base = spu->stats.class2_intr; | 231 | ctx->stats.class2_intr_base = spu->stats.class2_intr; |
| 232 | 232 | ||
| 233 | spu_associate_mm(spu, ctx->owner); | ||
| 234 | |||
| 235 | spin_lock_irq(&spu->register_lock); | ||
| 233 | spu->ctx = ctx; | 236 | spu->ctx = ctx; |
| 234 | spu->flags = 0; | 237 | spu->flags = 0; |
| 235 | ctx->spu = spu; | 238 | ctx->spu = spu; |
| 236 | ctx->ops = &spu_hw_ops; | 239 | ctx->ops = &spu_hw_ops; |
| 237 | spu->pid = current->pid; | 240 | spu->pid = current->pid; |
| 238 | spu->tgid = current->tgid; | 241 | spu->tgid = current->tgid; |
| 239 | spu_associate_mm(spu, ctx->owner); | ||
| 240 | spu->ibox_callback = spufs_ibox_callback; | 242 | spu->ibox_callback = spufs_ibox_callback; |
| 241 | spu->wbox_callback = spufs_wbox_callback; | 243 | spu->wbox_callback = spufs_wbox_callback; |
| 242 | spu->stop_callback = spufs_stop_callback; | 244 | spu->stop_callback = spufs_stop_callback; |
| 243 | spu->mfc_callback = spufs_mfc_callback; | 245 | spu->mfc_callback = spufs_mfc_callback; |
| 244 | mb(); | 246 | spin_unlock_irq(&spu->register_lock); |
| 247 | |||
| 245 | spu_unmap_mappings(ctx); | 248 | spu_unmap_mappings(ctx); |
| 249 | |||
| 246 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0); | 250 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0); |
| 247 | spu_restore(&ctx->csa, spu); | 251 | spu_restore(&ctx->csa, spu); |
| 248 | spu->timestamp = jiffies; | 252 | spu->timestamp = jiffies; |
| @@ -403,6 +407,8 @@ static int has_affinity(struct spu_context *ctx) | |||
| 403 | */ | 407 | */ |
| 404 | static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | 408 | static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) |
| 405 | { | 409 | { |
| 410 | u32 status; | ||
| 411 | |||
| 406 | spu_context_trace(spu_unbind_context__enter, ctx, spu); | 412 | spu_context_trace(spu_unbind_context__enter, ctx, spu); |
| 407 | 413 | ||
| 408 | spuctx_switch_state(ctx, SPU_UTIL_SYSTEM); | 414 | spuctx_switch_state(ctx, SPU_UTIL_SYSTEM); |
| @@ -423,18 +429,22 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | |||
| 423 | spu_unmap_mappings(ctx); | 429 | spu_unmap_mappings(ctx); |
| 424 | spu_save(&ctx->csa, spu); | 430 | spu_save(&ctx->csa, spu); |
| 425 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0); | 431 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0); |
| 432 | |||
| 433 | spin_lock_irq(&spu->register_lock); | ||
| 426 | spu->timestamp = jiffies; | 434 | spu->timestamp = jiffies; |
| 427 | ctx->state = SPU_STATE_SAVED; | 435 | ctx->state = SPU_STATE_SAVED; |
| 428 | spu->ibox_callback = NULL; | 436 | spu->ibox_callback = NULL; |
| 429 | spu->wbox_callback = NULL; | 437 | spu->wbox_callback = NULL; |
| 430 | spu->stop_callback = NULL; | 438 | spu->stop_callback = NULL; |
| 431 | spu->mfc_callback = NULL; | 439 | spu->mfc_callback = NULL; |
| 432 | spu_associate_mm(spu, NULL); | ||
| 433 | spu->pid = 0; | 440 | spu->pid = 0; |
| 434 | spu->tgid = 0; | 441 | spu->tgid = 0; |
| 435 | ctx->ops = &spu_backing_ops; | 442 | ctx->ops = &spu_backing_ops; |
| 436 | spu->flags = 0; | 443 | spu->flags = 0; |
| 437 | spu->ctx = NULL; | 444 | spu->ctx = NULL; |
| 445 | spin_unlock_irq(&spu->register_lock); | ||
| 446 | |||
| 447 | spu_associate_mm(spu, NULL); | ||
| 438 | 448 | ||
| 439 | ctx->stats.slb_flt += | 449 | ctx->stats.slb_flt += |
| 440 | (spu->stats.slb_flt - ctx->stats.slb_flt_base); | 450 | (spu->stats.slb_flt - ctx->stats.slb_flt_base); |
| @@ -444,6 +454,9 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | |||
| 444 | /* This maps the underlying spu state to idle */ | 454 | /* This maps the underlying spu state to idle */ |
| 445 | spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); | 455 | spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); |
| 446 | ctx->spu = NULL; | 456 | ctx->spu = NULL; |
| 457 | |||
| 458 | if (spu_stopped(ctx, &status)) | ||
| 459 | wake_up_all(&ctx->stop_wq); | ||
| 447 | } | 460 | } |
| 448 | 461 | ||
| 449 | /** | 462 | /** |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 68ea5eee39a8..8c1ca477c52c 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
| @@ -42,17 +42,20 @@ static inline const char * pcid_name (struct pci_dev *pdev) | |||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | #ifdef DEBUG | 44 | #ifdef DEBUG |
| 45 | static void print_device_node_tree (struct pci_dn *pdn, int dent) | 45 | static void print_device_node_tree(struct pci_dn *pdn, int dent) |
| 46 | { | 46 | { |
| 47 | int i; | 47 | int i; |
| 48 | if (!pdn) return; | 48 | struct device_node *pc; |
| 49 | for (i=0;i<dent; i++) | 49 | |
| 50 | if (!pdn) | ||
| 51 | return; | ||
| 52 | for (i = 0; i < dent; i++) | ||
| 50 | printk(" "); | 53 | printk(" "); |
| 51 | printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n", | 54 | printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n", |
| 52 | pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr, | 55 | pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr, |
| 53 | pdn->eeh_pe_config_addr, pdn->node->full_name); | 56 | pdn->eeh_pe_config_addr, pdn->node->full_name); |
| 54 | dent += 3; | 57 | dent += 3; |
| 55 | struct device_node *pc = pdn->node->child; | 58 | pc = pdn->node->child; |
| 56 | while (pc) { | 59 | while (pc) { |
| 57 | print_device_node_tree(PCI_DN(pc), dent); | 60 | print_device_node_tree(PCI_DN(pc), dent); |
| 58 | pc = pc->sibling; | 61 | pc = pc->sibling; |
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c index f68903e15bd5..42f7e384e6c4 100644 --- a/arch/powerpc/platforms/pseries/nvram.c +++ b/arch/powerpc/platforms/pseries/nvram.c | |||
| @@ -131,8 +131,10 @@ int __init pSeries_nvram_init(void) | |||
| 131 | return -ENODEV; | 131 | return -ENODEV; |
| 132 | 132 | ||
| 133 | nbytes_p = of_get_property(nvram, "#bytes", &proplen); | 133 | nbytes_p = of_get_property(nvram, "#bytes", &proplen); |
| 134 | if (nbytes_p == NULL || proplen != sizeof(unsigned int)) | 134 | if (nbytes_p == NULL || proplen != sizeof(unsigned int)) { |
| 135 | of_node_put(nvram); | ||
| 135 | return -EIO; | 136 | return -EIO; |
| 137 | } | ||
| 136 | 138 | ||
| 137 | nvram_size = *nbytes_p; | 139 | nvram_size = *nbytes_p; |
| 138 | 140 | ||
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 1702de9395ee..bfcf70ee8959 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
| @@ -2844,7 +2844,6 @@ static void dump_spu_fields(struct spu *spu) | |||
| 2844 | DUMP_FIELD(spu, "0x%lx", flags); | 2844 | DUMP_FIELD(spu, "0x%lx", flags); |
| 2845 | DUMP_FIELD(spu, "%d", class_0_pending); | 2845 | DUMP_FIELD(spu, "%d", class_0_pending); |
| 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); | 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); |
| 2847 | DUMP_FIELD(spu, "0x%lx", class_0_dsisr); | ||
| 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dar); | 2847 | DUMP_FIELD(spu, "0x%lx", class_1_dar); |
| 2849 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); | 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); |
| 2850 | DUMP_FIELD(spu, "0x%lx", irqs[0]); | 2849 | DUMP_FIELD(spu, "0x%lx", irqs[0]); |
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index f639a152869f..a0775e1f08df 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c | |||
| @@ -20,7 +20,7 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu) | |||
| 20 | VCPU_EVENT(vcpu, 5, "%s", "diag time slice end"); | 20 | VCPU_EVENT(vcpu, 5, "%s", "diag time slice end"); |
| 21 | vcpu->stat.diagnose_44++; | 21 | vcpu->stat.diagnose_44++; |
| 22 | vcpu_put(vcpu); | 22 | vcpu_put(vcpu); |
| 23 | schedule(); | 23 | yield(); |
| 24 | vcpu_load(vcpu); | 24 | vcpu_load(vcpu); |
| 25 | return 0; | 25 | return 0; |
| 26 | } | 26 | } |
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index fcd1ed8015c1..84a7fed4cd4e 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
| @@ -339,6 +339,11 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) | |||
| 339 | if (kvm_cpu_has_interrupt(vcpu)) | 339 | if (kvm_cpu_has_interrupt(vcpu)) |
| 340 | return 0; | 340 | return 0; |
| 341 | 341 | ||
| 342 | __set_cpu_idle(vcpu); | ||
| 343 | spin_lock_bh(&vcpu->arch.local_int.lock); | ||
| 344 | vcpu->arch.local_int.timer_due = 0; | ||
| 345 | spin_unlock_bh(&vcpu->arch.local_int.lock); | ||
| 346 | |||
| 342 | if (psw_interrupts_disabled(vcpu)) { | 347 | if (psw_interrupts_disabled(vcpu)) { |
| 343 | VCPU_EVENT(vcpu, 3, "%s", "disabled wait"); | 348 | VCPU_EVENT(vcpu, 3, "%s", "disabled wait"); |
| 344 | __unset_cpu_idle(vcpu); | 349 | __unset_cpu_idle(vcpu); |
| @@ -366,8 +371,6 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) | |||
| 366 | no_timer: | 371 | no_timer: |
| 367 | spin_lock_bh(&vcpu->arch.local_int.float_int->lock); | 372 | spin_lock_bh(&vcpu->arch.local_int.float_int->lock); |
| 368 | spin_lock_bh(&vcpu->arch.local_int.lock); | 373 | spin_lock_bh(&vcpu->arch.local_int.lock); |
| 369 | __set_cpu_idle(vcpu); | ||
| 370 | vcpu->arch.local_int.timer_due = 0; | ||
| 371 | add_wait_queue(&vcpu->arch.local_int.wq, &wait); | 374 | add_wait_queue(&vcpu->arch.local_int.wq, &wait); |
| 372 | while (list_empty(&vcpu->arch.local_int.list) && | 375 | while (list_empty(&vcpu->arch.local_int.list) && |
| 373 | list_empty(&vcpu->arch.local_int.float_int->list) && | 376 | list_empty(&vcpu->arch.local_int.float_int->list) && |
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 0ac36a649eba..6558b09ff579 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c | |||
| @@ -423,6 +423,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, | |||
| 423 | return -EINVAL; /* not implemented yet */ | 423 | return -EINVAL; /* not implemented yet */ |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | extern void s390_handle_mcck(void); | ||
| 427 | |||
| 426 | static void __vcpu_run(struct kvm_vcpu *vcpu) | 428 | static void __vcpu_run(struct kvm_vcpu *vcpu) |
| 427 | { | 429 | { |
| 428 | memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16); | 430 | memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16); |
| @@ -430,13 +432,21 @@ static void __vcpu_run(struct kvm_vcpu *vcpu) | |||
| 430 | if (need_resched()) | 432 | if (need_resched()) |
| 431 | schedule(); | 433 | schedule(); |
| 432 | 434 | ||
| 435 | if (test_thread_flag(TIF_MCCK_PENDING)) | ||
| 436 | s390_handle_mcck(); | ||
| 437 | |||
| 438 | kvm_s390_deliver_pending_interrupts(vcpu); | ||
| 439 | |||
| 433 | vcpu->arch.sie_block->icptcode = 0; | 440 | vcpu->arch.sie_block->icptcode = 0; |
| 434 | local_irq_disable(); | 441 | local_irq_disable(); |
| 435 | kvm_guest_enter(); | 442 | kvm_guest_enter(); |
| 436 | local_irq_enable(); | 443 | local_irq_enable(); |
| 437 | VCPU_EVENT(vcpu, 6, "entering sie flags %x", | 444 | VCPU_EVENT(vcpu, 6, "entering sie flags %x", |
| 438 | atomic_read(&vcpu->arch.sie_block->cpuflags)); | 445 | atomic_read(&vcpu->arch.sie_block->cpuflags)); |
| 439 | sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs); | 446 | if (sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs)) { |
| 447 | VCPU_EVENT(vcpu, 3, "%s", "fault in sie instruction"); | ||
| 448 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); | ||
| 449 | } | ||
| 440 | VCPU_EVENT(vcpu, 6, "exit sie icptcode %d", | 450 | VCPU_EVENT(vcpu, 6, "exit sie icptcode %d", |
| 441 | vcpu->arch.sie_block->icptcode); | 451 | vcpu->arch.sie_block->icptcode); |
| 442 | local_irq_disable(); | 452 | local_irq_disable(); |
| @@ -475,7 +485,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
| 475 | might_sleep(); | 485 | might_sleep(); |
| 476 | 486 | ||
| 477 | do { | 487 | do { |
| 478 | kvm_s390_deliver_pending_interrupts(vcpu); | ||
| 479 | __vcpu_run(vcpu); | 488 | __vcpu_run(vcpu); |
| 480 | rc = kvm_handle_sie_intercept(vcpu); | 489 | rc = kvm_handle_sie_intercept(vcpu); |
| 481 | } while (!signal_pending(current) && !rc); | 490 | } while (!signal_pending(current) && !rc); |
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 5c1aea97cd12..3d98ba82ea67 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c | |||
| @@ -254,36 +254,46 @@ void disable_noexec(struct mm_struct *mm, struct task_struct *tsk) | |||
| 254 | int s390_enable_sie(void) | 254 | int s390_enable_sie(void) |
| 255 | { | 255 | { |
| 256 | struct task_struct *tsk = current; | 256 | struct task_struct *tsk = current; |
| 257 | struct mm_struct *mm; | 257 | struct mm_struct *mm, *old_mm; |
| 258 | int rc; | ||
| 259 | 258 | ||
| 260 | task_lock(tsk); | 259 | /* Do we have pgstes? if yes, we are done */ |
| 261 | |||
| 262 | rc = 0; | ||
| 263 | if (tsk->mm->context.pgstes) | 260 | if (tsk->mm->context.pgstes) |
| 264 | goto unlock; | 261 | return 0; |
| 265 | 262 | ||
| 266 | rc = -EINVAL; | 263 | /* lets check if we are allowed to replace the mm */ |
| 264 | task_lock(tsk); | ||
| 267 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || | 265 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || |
| 268 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) | 266 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) { |
| 269 | goto unlock; | 267 | task_unlock(tsk); |
| 268 | return -EINVAL; | ||
| 269 | } | ||
| 270 | task_unlock(tsk); | ||
| 270 | 271 | ||
| 271 | tsk->mm->context.pgstes = 1; /* dirty little tricks .. */ | 272 | /* we copy the mm with pgstes enabled */ |
| 273 | tsk->mm->context.pgstes = 1; | ||
| 272 | mm = dup_mm(tsk); | 274 | mm = dup_mm(tsk); |
| 273 | tsk->mm->context.pgstes = 0; | 275 | tsk->mm->context.pgstes = 0; |
| 274 | |||
| 275 | rc = -ENOMEM; | ||
| 276 | if (!mm) | 276 | if (!mm) |
| 277 | goto unlock; | 277 | return -ENOMEM; |
| 278 | mmput(tsk->mm); | 278 | |
| 279 | /* Now lets check again if somebody attached ptrace etc */ | ||
| 280 | task_lock(tsk); | ||
| 281 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || | ||
| 282 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) { | ||
| 283 | mmput(mm); | ||
| 284 | task_unlock(tsk); | ||
| 285 | return -EINVAL; | ||
| 286 | } | ||
| 287 | |||
| 288 | /* ok, we are alone. No ptrace, no threads, etc. */ | ||
| 289 | old_mm = tsk->mm; | ||
| 279 | tsk->mm = tsk->active_mm = mm; | 290 | tsk->mm = tsk->active_mm = mm; |
| 280 | preempt_disable(); | 291 | preempt_disable(); |
| 281 | update_mm(mm, tsk); | 292 | update_mm(mm, tsk); |
| 282 | cpu_set(smp_processor_id(), mm->cpu_vm_mask); | 293 | cpu_set(smp_processor_id(), mm->cpu_vm_mask); |
| 283 | preempt_enable(); | 294 | preempt_enable(); |
| 284 | rc = 0; | ||
| 285 | unlock: | ||
| 286 | task_unlock(tsk); | 295 | task_unlock(tsk); |
| 287 | return rc; | 296 | mmput(old_mm); |
| 297 | return 0; | ||
| 288 | } | 298 | } |
| 289 | EXPORT_SYMBOL_GPL(s390_enable_sie); | 299 | EXPORT_SYMBOL_GPL(s390_enable_sie); |
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index b4b36e0f2e89..183db26d01bf 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c | |||
| @@ -121,8 +121,10 @@ static int stop_ptraced_child(int pid, int exitcode, int mustexit) | |||
| 121 | { | 121 | { |
| 122 | int status, n, ret = 0; | 122 | int status, n, ret = 0; |
| 123 | 123 | ||
| 124 | if (ptrace(PTRACE_CONT, pid, 0, 0) < 0) | 124 | if (ptrace(PTRACE_CONT, pid, 0, 0) < 0) { |
| 125 | fatal_perror("stop_ptraced_child : ptrace failed"); | 125 | perror("stop_ptraced_child : ptrace failed"); |
| 126 | return -1; | ||
| 127 | } | ||
| 126 | CATCH_EINTR(n = waitpid(pid, &status, 0)); | 128 | CATCH_EINTR(n = waitpid(pid, &status, 0)); |
| 127 | if (!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) { | 129 | if (!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) { |
| 128 | int exit_with = WEXITSTATUS(status); | 130 | int exit_with = WEXITSTATUS(status); |
| @@ -212,7 +214,7 @@ static void __init check_sysemu(void) | |||
| 212 | if (n < 0) | 214 | if (n < 0) |
| 213 | fatal_perror("check_sysemu : wait failed"); | 215 | fatal_perror("check_sysemu : wait failed"); |
| 214 | if (!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGTRAP)) | 216 | if (!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGTRAP)) |
| 215 | fatal("check_sysemu : expected SIGTRAP, got status = %d", | 217 | fatal("check_sysemu : expected SIGTRAP, got status = %d\n", |
| 216 | status); | 218 | status); |
| 217 | 219 | ||
| 218 | if (ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) | 220 | if (ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) |
| @@ -254,9 +256,11 @@ static void __init check_sysemu(void) | |||
| 254 | 256 | ||
| 255 | if (WIFSTOPPED(status) && | 257 | if (WIFSTOPPED(status) && |
| 256 | (WSTOPSIG(status) == (SIGTRAP|0x80))) { | 258 | (WSTOPSIG(status) == (SIGTRAP|0x80))) { |
| 257 | if (!count) | 259 | if (!count) { |
| 258 | fatal("check_ptrace : SYSEMU_SINGLESTEP " | 260 | non_fatal("check_ptrace : SYSEMU_SINGLESTEP " |
| 259 | "doesn't singlestep"); | 261 | "doesn't singlestep"); |
| 262 | goto fail; | ||
| 263 | } | ||
| 260 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, | 264 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, |
| 261 | os_getpid()); | 265 | os_getpid()); |
| 262 | if (n < 0) | 266 | if (n < 0) |
| @@ -266,9 +270,12 @@ static void __init check_sysemu(void) | |||
| 266 | } | 270 | } |
| 267 | else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) | 271 | else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) |
| 268 | count++; | 272 | count++; |
| 269 | else | 273 | else { |
| 270 | fatal("check_ptrace : expected SIGTRAP or " | 274 | non_fatal("check_ptrace : expected SIGTRAP or " |
| 271 | "(SIGTRAP | 0x80), got status = %d", status); | 275 | "(SIGTRAP | 0x80), got status = %d\n", |
| 276 | status); | ||
| 277 | goto fail; | ||
| 278 | } | ||
| 272 | } | 279 | } |
| 273 | if (stop_ptraced_child(pid, 0, 0) < 0) | 280 | if (stop_ptraced_child(pid, 0, 0) < 0) |
| 274 | goto fail_stopped; | 281 | goto fail_stopped; |
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c index b487cbead1bd..229f7a53d8da 100644 --- a/arch/um/os-Linux/sys-i386/registers.c +++ b/arch/um/os-Linux/sys-i386/registers.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <errno.h> | 7 | #include <errno.h> |
| 8 | #include <sys/ptrace.h> | 8 | #include <sys/ptrace.h> |
| 9 | #include <asm/user.h> | 9 | #include <sys/user.h> |
| 10 | #include "kern_constants.h" | 10 | #include "kern_constants.h" |
| 11 | #include "longjmp.h" | 11 | #include "longjmp.h" |
| 12 | #include "user.h" | 12 | #include "user.h" |
| @@ -76,7 +76,7 @@ int put_fp_registers(int pid, unsigned long *regs) | |||
| 76 | 76 | ||
| 77 | void arch_init_registers(int pid) | 77 | void arch_init_registers(int pid) |
| 78 | { | 78 | { |
| 79 | struct user_fxsr_struct fpx_regs; | 79 | struct user_fpxregs_struct fpx_regs; |
| 80 | int err; | 80 | int err; |
| 81 | 81 | ||
| 82 | err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs); | 82 | err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs); |
diff --git a/arch/x86/boot/a20.c b/arch/x86/boot/a20.c index 90943f83e84d..e01aafd03bde 100644 --- a/arch/x86/boot/a20.c +++ b/arch/x86/boot/a20.c | |||
| @@ -115,8 +115,6 @@ static void enable_a20_fast(void) | |||
| 115 | 115 | ||
| 116 | int enable_a20(void) | 116 | int enable_a20(void) |
| 117 | { | 117 | { |
| 118 | int loops = A20_ENABLE_LOOPS; | ||
| 119 | |||
| 120 | #if defined(CONFIG_X86_ELAN) | 118 | #if defined(CONFIG_X86_ELAN) |
| 121 | /* Elan croaks if we try to touch the KBC */ | 119 | /* Elan croaks if we try to touch the KBC */ |
| 122 | enable_a20_fast(); | 120 | enable_a20_fast(); |
| @@ -128,6 +126,7 @@ int enable_a20(void) | |||
| 128 | enable_a20_kbc(); | 126 | enable_a20_kbc(); |
| 129 | return 0; | 127 | return 0; |
| 130 | #else | 128 | #else |
| 129 | int loops = A20_ENABLE_LOOPS; | ||
| 131 | while (loops--) { | 130 | while (loops--) { |
| 132 | /* First, check to see if A20 is already enabled | 131 | /* First, check to see if A20 is already enabled |
| 133 | (legacy free, etc.) */ | 132 | (legacy free, etc.) */ |
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 2a609dc3271c..c778e4fa55a2 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
| @@ -248,6 +248,7 @@ ENTRY(resume_userspace) | |||
| 248 | DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt | 248 | DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt |
| 249 | # setting need_resched or sigpending | 249 | # setting need_resched or sigpending |
| 250 | # between sampling and the iret | 250 | # between sampling and the iret |
| 251 | TRACE_IRQS_OFF | ||
| 251 | movl TI_flags(%ebp), %ecx | 252 | movl TI_flags(%ebp), %ecx |
| 252 | andl $_TIF_WORK_MASK, %ecx # is there any work to be done on | 253 | andl $_TIF_WORK_MASK, %ecx # is there any work to be done on |
| 253 | # int/exception return? | 254 | # int/exception return? |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index b2cc73768a9d..f7357cc0162c 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
| @@ -189,7 +189,7 @@ default_entry: | |||
| 189 | * this stage. | 189 | * this stage. |
| 190 | */ | 190 | */ |
| 191 | 191 | ||
| 192 | #define KPMDS ((0x100000000-__PAGE_OFFSET) >> 30) /* Number of kernel PMDs */ | 192 | #define KPMDS (((-__PAGE_OFFSET) >> 30) & 3) /* Number of kernel PMDs */ |
| 193 | 193 | ||
| 194 | xorl %ebx,%ebx /* %ebx is kept at zero */ | 194 | xorl %ebx,%ebx /* %ebx is kept at zero */ |
| 195 | 195 | ||
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index a40d54fc1fdd..4dc8600d9d20 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
| @@ -2130,14 +2130,10 @@ static inline void __init check_timer(void) | |||
| 2130 | { | 2130 | { |
| 2131 | int apic1, pin1, apic2, pin2; | 2131 | int apic1, pin1, apic2, pin2; |
| 2132 | int vector; | 2132 | int vector; |
| 2133 | unsigned int ver; | ||
| 2134 | unsigned long flags; | 2133 | unsigned long flags; |
| 2135 | 2134 | ||
| 2136 | local_irq_save(flags); | 2135 | local_irq_save(flags); |
| 2137 | 2136 | ||
| 2138 | ver = apic_read(APIC_LVR); | ||
| 2139 | ver = GET_APIC_VERSION(ver); | ||
| 2140 | |||
| 2141 | /* | 2137 | /* |
| 2142 | * get/set the timer IRQ vector: | 2138 | * get/set the timer IRQ vector: |
| 2143 | */ | 2139 | */ |
| @@ -2150,15 +2146,11 @@ static inline void __init check_timer(void) | |||
| 2150 | * mode for the 8259A whenever interrupts are routed | 2146 | * mode for the 8259A whenever interrupts are routed |
| 2151 | * through I/O APICs. Also IRQ0 has to be enabled in | 2147 | * through I/O APICs. Also IRQ0 has to be enabled in |
| 2152 | * the 8259A which implies the virtual wire has to be | 2148 | * the 8259A which implies the virtual wire has to be |
| 2153 | * disabled in the local APIC. Finally timer interrupts | 2149 | * disabled in the local APIC. |
| 2154 | * need to be acknowledged manually in the 8259A for | ||
| 2155 | * timer_interrupt() and for the i82489DX when using | ||
| 2156 | * the NMI watchdog. | ||
| 2157 | */ | 2150 | */ |
| 2158 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 2151 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
| 2159 | init_8259A(1); | 2152 | init_8259A(1); |
| 2160 | timer_ack = !cpu_has_tsc; | 2153 | timer_ack = 1; |
| 2161 | timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); | ||
| 2162 | if (timer_over_8254 > 0) | 2154 | if (timer_over_8254 > 0) |
| 2163 | enable_8259A_irq(0); | 2155 | enable_8259A_irq(0); |
| 2164 | 2156 | ||
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 3cad17fe026b..07c0f828f488 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
| @@ -155,6 +155,7 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable) | |||
| 155 | wrmsr(msr, value, dummy); | 155 | wrmsr(msr, value, dummy); |
| 156 | return 0; | 156 | return 0; |
| 157 | } | 157 | } |
| 158 | EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event); | ||
| 158 | 159 | ||
| 159 | int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable) | 160 | int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable) |
| 160 | { | 161 | { |
| @@ -222,6 +223,7 @@ int geode_mfgpt_alloc_timer(int timer, int domain) | |||
| 222 | /* No timers available - too bad */ | 223 | /* No timers available - too bad */ |
| 223 | return -1; | 224 | return -1; |
| 224 | } | 225 | } |
| 226 | EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer); | ||
| 225 | 227 | ||
| 226 | 228 | ||
| 227 | #ifdef CONFIG_GEODE_MFGPT_TIMER | 229 | #ifdef CONFIG_GEODE_MFGPT_TIMER |
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index 11b14bbaa61e..84160f74eeb0 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/smp.h> | 27 | #include <asm/smp.h> |
| 28 | #include <asm/nmi.h> | 28 | #include <asm/nmi.h> |
| 29 | #include <asm/timer.h> | ||
| 30 | 29 | ||
| 31 | #include "mach_traps.h" | 30 | #include "mach_traps.h" |
| 32 | 31 | ||
| @@ -82,7 +81,7 @@ int __init check_nmi_watchdog(void) | |||
| 82 | 81 | ||
| 83 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 82 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); |
| 84 | if (!prev_nmi_count) | 83 | if (!prev_nmi_count) |
| 85 | goto error; | 84 | return -1; |
| 86 | 85 | ||
| 87 | printk(KERN_INFO "Testing NMI watchdog ... "); | 86 | printk(KERN_INFO "Testing NMI watchdog ... "); |
| 88 | 87 | ||
| @@ -119,7 +118,7 @@ int __init check_nmi_watchdog(void) | |||
| 119 | if (!atomic_read(&nmi_active)) { | 118 | if (!atomic_read(&nmi_active)) { |
| 120 | kfree(prev_nmi_count); | 119 | kfree(prev_nmi_count); |
| 121 | atomic_set(&nmi_active, -1); | 120 | atomic_set(&nmi_active, -1); |
| 122 | goto error; | 121 | return -1; |
| 123 | } | 122 | } |
| 124 | printk("OK.\n"); | 123 | printk("OK.\n"); |
| 125 | 124 | ||
| @@ -130,10 +129,6 @@ int __init check_nmi_watchdog(void) | |||
| 130 | 129 | ||
| 131 | kfree(prev_nmi_count); | 130 | kfree(prev_nmi_count); |
| 132 | return 0; | 131 | return 0; |
| 133 | error: | ||
| 134 | timer_ack = !cpu_has_tsc; | ||
| 135 | |||
| 136 | return -1; | ||
| 137 | } | 132 | } |
| 138 | 133 | ||
| 139 | static int __init setup_nmi_watchdog(char *str) | 134 | static int __init setup_nmi_watchdog(char *str) |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index c5ef1af8e79d..dc00a1331ace 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -378,6 +378,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
| 378 | struct page *page; | 378 | struct page *page; |
| 379 | unsigned long dma_mask = 0; | 379 | unsigned long dma_mask = 0; |
| 380 | dma_addr_t bus; | 380 | dma_addr_t bus; |
| 381 | int noretry = 0; | ||
| 381 | 382 | ||
| 382 | /* ignore region specifiers */ | 383 | /* ignore region specifiers */ |
| 383 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); | 384 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); |
| @@ -397,20 +398,25 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
| 397 | if (dev->dma_mask == NULL) | 398 | if (dev->dma_mask == NULL) |
| 398 | return NULL; | 399 | return NULL; |
| 399 | 400 | ||
| 400 | /* Don't invoke OOM killer */ | 401 | /* Don't invoke OOM killer or retry in lower 16MB DMA zone */ |
| 401 | gfp |= __GFP_NORETRY; | 402 | if (gfp & __GFP_DMA) |
| 403 | noretry = 1; | ||
| 402 | 404 | ||
| 403 | #ifdef CONFIG_X86_64 | 405 | #ifdef CONFIG_X86_64 |
| 404 | /* Why <=? Even when the mask is smaller than 4GB it is often | 406 | /* Why <=? Even when the mask is smaller than 4GB it is often |
| 405 | larger than 16MB and in this case we have a chance of | 407 | larger than 16MB and in this case we have a chance of |
| 406 | finding fitting memory in the next higher zone first. If | 408 | finding fitting memory in the next higher zone first. If |
| 407 | not retry with true GFP_DMA. -AK */ | 409 | not retry with true GFP_DMA. -AK */ |
| 408 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) | 410 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) { |
| 409 | gfp |= GFP_DMA32; | 411 | gfp |= GFP_DMA32; |
| 412 | if (dma_mask < DMA_32BIT_MASK) | ||
| 413 | noretry = 1; | ||
| 414 | } | ||
| 410 | #endif | 415 | #endif |
| 411 | 416 | ||
| 412 | again: | 417 | again: |
| 413 | page = dma_alloc_pages(dev, gfp, get_order(size)); | 418 | page = dma_alloc_pages(dev, |
| 419 | noretry ? gfp | __GFP_NORETRY : gfp, get_order(size)); | ||
| 414 | if (page == NULL) | 420 | if (page == NULL) |
| 415 | return NULL; | 421 | return NULL; |
| 416 | 422 | ||
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 9615eee9b775..05191bbc68b8 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c | |||
| @@ -4,6 +4,8 @@ | |||
| 4 | #include <linux/acpi.h> | 4 | #include <linux/acpi.h> |
| 5 | #include <linux/bcd.h> | 5 | #include <linux/bcd.h> |
| 6 | #include <linux/mc146818rtc.h> | 6 | #include <linux/mc146818rtc.h> |
| 7 | #include <linux/platform_device.h> | ||
| 8 | #include <linux/pnp.h> | ||
| 7 | 9 | ||
| 8 | #include <asm/time.h> | 10 | #include <asm/time.h> |
| 9 | #include <asm/vsyscall.h> | 11 | #include <asm/vsyscall.h> |
| @@ -197,3 +199,35 @@ unsigned long long native_read_tsc(void) | |||
| 197 | } | 199 | } |
| 198 | EXPORT_SYMBOL(native_read_tsc); | 200 | EXPORT_SYMBOL(native_read_tsc); |
| 199 | 201 | ||
| 202 | |||
| 203 | static struct resource rtc_resources[] = { | ||
| 204 | [0] = { | ||
| 205 | .start = RTC_PORT(0), | ||
| 206 | .end = RTC_PORT(1), | ||
| 207 | .flags = IORESOURCE_IO, | ||
| 208 | }, | ||
| 209 | [1] = { | ||
| 210 | .start = RTC_IRQ, | ||
| 211 | .end = RTC_IRQ, | ||
| 212 | .flags = IORESOURCE_IRQ, | ||
| 213 | } | ||
| 214 | }; | ||
| 215 | |||
| 216 | static struct platform_device rtc_device = { | ||
| 217 | .name = "rtc_cmos", | ||
| 218 | .id = -1, | ||
| 219 | .resource = rtc_resources, | ||
| 220 | .num_resources = ARRAY_SIZE(rtc_resources), | ||
| 221 | }; | ||
| 222 | |||
| 223 | static __init int add_rtc_cmos(void) | ||
| 224 | { | ||
| 225 | #ifdef CONFIG_PNP | ||
| 226 | if (!pnp_platform_devices) | ||
| 227 | platform_device_register(&rtc_device); | ||
| 228 | #else | ||
| 229 | platform_device_register(&rtc_device); | ||
| 230 | #endif /* CONFIG_PNP */ | ||
| 231 | return 0; | ||
| 232 | } | ||
| 233 | device_initcall(add_rtc_cmos); | ||
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index bde6f63e15d5..08d752de4eee 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
| @@ -544,6 +544,7 @@ vm86_trap: | |||
| 544 | #define DO_ERROR(trapnr, signr, str, name) \ | 544 | #define DO_ERROR(trapnr, signr, str, name) \ |
| 545 | void do_##name(struct pt_regs *regs, long error_code) \ | 545 | void do_##name(struct pt_regs *regs, long error_code) \ |
| 546 | { \ | 546 | { \ |
| 547 | trace_hardirqs_fixup(); \ | ||
| 547 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ | 548 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ |
| 548 | == NOTIFY_STOP) \ | 549 | == NOTIFY_STOP) \ |
| 549 | return; \ | 550 | return; \ |
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 7c077a9d9777..f2f5d260874e 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
| @@ -200,7 +200,6 @@ int __pit_timer_fn(struct kvm_kpit_state *ps) | |||
| 200 | 200 | ||
| 201 | atomic_inc(&pt->pending); | 201 | atomic_inc(&pt->pending); |
| 202 | smp_mb__after_atomic_inc(); | 202 | smp_mb__after_atomic_inc(); |
| 203 | /* FIXME: handle case where the guest is in guest mode */ | ||
| 204 | if (vcpu0 && waitqueue_active(&vcpu0->wq)) { | 203 | if (vcpu0 && waitqueue_active(&vcpu0->wq)) { |
| 205 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; | 204 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; |
| 206 | wake_up_interruptible(&vcpu0->wq); | 205 | wake_up_interruptible(&vcpu0->wq); |
| @@ -237,6 +236,19 @@ static enum hrtimer_restart pit_timer_fn(struct hrtimer *data) | |||
| 237 | return HRTIMER_NORESTART; | 236 | return HRTIMER_NORESTART; |
| 238 | } | 237 | } |
| 239 | 238 | ||
| 239 | void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu) | ||
| 240 | { | ||
| 241 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; | ||
| 242 | struct hrtimer *timer; | ||
| 243 | |||
| 244 | if (vcpu->vcpu_id != 0 || !pit) | ||
| 245 | return; | ||
| 246 | |||
| 247 | timer = &pit->pit_state.pit_timer.timer; | ||
| 248 | if (hrtimer_cancel(timer)) | ||
| 249 | hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS); | ||
| 250 | } | ||
| 251 | |||
| 240 | static void destroy_pit_timer(struct kvm_kpit_timer *pt) | 252 | static void destroy_pit_timer(struct kvm_kpit_timer *pt) |
| 241 | { | 253 | { |
| 242 | pr_debug("pit: execute del timer!\n"); | 254 | pr_debug("pit: execute del timer!\n"); |
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index ce1f583459b1..76d736b5f664 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c | |||
| @@ -94,3 +94,9 @@ void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec) | |||
| 94 | /* TODO: PIT, RTC etc. */ | 94 | /* TODO: PIT, RTC etc. */ |
| 95 | } | 95 | } |
| 96 | EXPORT_SYMBOL_GPL(kvm_timer_intr_post); | 96 | EXPORT_SYMBOL_GPL(kvm_timer_intr_post); |
| 97 | |||
| 98 | void __kvm_migrate_timers(struct kvm_vcpu *vcpu) | ||
| 99 | { | ||
| 100 | __kvm_migrate_apic_timer(vcpu); | ||
| 101 | __kvm_migrate_pit_timer(vcpu); | ||
| 102 | } | ||
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index 1802134b836f..2a15be2275c0 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h | |||
| @@ -84,6 +84,8 @@ void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec); | |||
| 84 | void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); | 84 | void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); |
| 85 | void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); | 85 | void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); |
| 86 | void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); | 86 | void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); |
| 87 | void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu); | ||
| 88 | void __kvm_migrate_timers(struct kvm_vcpu *vcpu); | ||
| 87 | 89 | ||
| 88 | int pit_has_pending_timer(struct kvm_vcpu *vcpu); | 90 | int pit_has_pending_timer(struct kvm_vcpu *vcpu); |
| 89 | int apic_has_pending_timer(struct kvm_vcpu *vcpu); | 91 | int apic_has_pending_timer(struct kvm_vcpu *vcpu); |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 7246b60afb96..ee3f53098f0c 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
| @@ -658,7 +658,7 @@ static int is_empty_shadow_page(u64 *spt) | |||
| 658 | u64 *end; | 658 | u64 *end; |
| 659 | 659 | ||
| 660 | for (pos = spt, end = pos + PAGE_SIZE / sizeof(u64); pos != end; pos++) | 660 | for (pos = spt, end = pos + PAGE_SIZE / sizeof(u64); pos != end; pos++) |
| 661 | if (*pos != shadow_trap_nonpresent_pte) { | 661 | if (is_shadow_present_pte(*pos)) { |
| 662 | printk(KERN_ERR "%s: %p %llx\n", __func__, | 662 | printk(KERN_ERR "%s: %p %llx\n", __func__, |
| 663 | pos, *pos); | 663 | pos, *pos); |
| 664 | return 0; | 664 | return 0; |
| @@ -1858,6 +1858,7 @@ static void free_mmu_pages(struct kvm_vcpu *vcpu) | |||
| 1858 | sp = container_of(vcpu->kvm->arch.active_mmu_pages.next, | 1858 | sp = container_of(vcpu->kvm->arch.active_mmu_pages.next, |
| 1859 | struct kvm_mmu_page, link); | 1859 | struct kvm_mmu_page, link); |
| 1860 | kvm_mmu_zap_page(vcpu->kvm, sp); | 1860 | kvm_mmu_zap_page(vcpu->kvm, sp); |
| 1861 | cond_resched(); | ||
| 1861 | } | 1862 | } |
| 1862 | free_page((unsigned long)vcpu->arch.mmu.pae_root); | 1863 | free_page((unsigned long)vcpu->arch.mmu.pae_root); |
| 1863 | } | 1864 | } |
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 156fe10288ae..934c7b619396 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
| @@ -418,7 +418,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, | |||
| 418 | 418 | ||
| 419 | /* mmio */ | 419 | /* mmio */ |
| 420 | if (is_error_pfn(pfn)) { | 420 | if (is_error_pfn(pfn)) { |
| 421 | pgprintk("gfn %x is mmio\n", walker.gfn); | 421 | pgprintk("gfn %lx is mmio\n", walker.gfn); |
| 422 | kvm_release_pfn_clean(pfn); | 422 | kvm_release_pfn_clean(pfn); |
| 423 | return 1; | 423 | return 1; |
| 424 | } | 424 | } |
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ab22615eee89..6b0d5fa5bab3 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
| @@ -688,7 +688,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
| 688 | delta = vcpu->arch.host_tsc - tsc_this; | 688 | delta = vcpu->arch.host_tsc - tsc_this; |
| 689 | svm->vmcb->control.tsc_offset += delta; | 689 | svm->vmcb->control.tsc_offset += delta; |
| 690 | vcpu->cpu = cpu; | 690 | vcpu->cpu = cpu; |
| 691 | kvm_migrate_apic_timer(vcpu); | 691 | kvm_migrate_timers(vcpu); |
| 692 | } | 692 | } |
| 693 | 693 | ||
| 694 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) | 694 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index bfe4db11989c..02efbe75f317 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -608,7 +608,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
| 608 | 608 | ||
| 609 | if (vcpu->cpu != cpu) { | 609 | if (vcpu->cpu != cpu) { |
| 610 | vcpu_clear(vmx); | 610 | vcpu_clear(vmx); |
| 611 | kvm_migrate_apic_timer(vcpu); | 611 | kvm_migrate_timers(vcpu); |
| 612 | vpid_sync_vcpu_all(vmx); | 612 | vpid_sync_vcpu_all(vmx); |
| 613 | } | 613 | } |
| 614 | 614 | ||
| @@ -1036,6 +1036,7 @@ static void hardware_enable(void *garbage) | |||
| 1036 | static void hardware_disable(void *garbage) | 1036 | static void hardware_disable(void *garbage) |
| 1037 | { | 1037 | { |
| 1038 | asm volatile (ASM_VMX_VMXOFF : : : "cc"); | 1038 | asm volatile (ASM_VMX_VMXOFF : : : "cc"); |
| 1039 | write_cr4(read_cr4() & ~X86_CR4_VMXE); | ||
| 1039 | } | 1040 | } |
| 1040 | 1041 | ||
| 1041 | static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, | 1042 | static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 21338bdb28ff..00acf1301a15 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -2758,7 +2758,7 @@ again: | |||
| 2758 | 2758 | ||
| 2759 | if (vcpu->requests) { | 2759 | if (vcpu->requests) { |
| 2760 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) | 2760 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) |
| 2761 | __kvm_migrate_apic_timer(vcpu); | 2761 | __kvm_migrate_timers(vcpu); |
| 2762 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, | 2762 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, |
| 2763 | &vcpu->requests)) { | 2763 | &vcpu->requests)) { |
| 2764 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; | 2764 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; |
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c index 8a96320ab071..932f216d890c 100644 --- a/arch/x86/kvm/x86_emulate.c +++ b/arch/x86/kvm/x86_emulate.c | |||
| @@ -1727,7 +1727,8 @@ twobyte_insn: | |||
| 1727 | if (rc) | 1727 | if (rc) |
| 1728 | goto done; | 1728 | goto done; |
| 1729 | 1729 | ||
| 1730 | kvm_emulate_hypercall(ctxt->vcpu); | 1730 | /* Let the processor re-execute the fixed hypercall */ |
| 1731 | c->eip = ctxt->vcpu->arch.rip; | ||
| 1731 | /* Disable writeback. */ | 1732 | /* Disable writeback. */ |
| 1732 | c->dst.type = OP_NONE; | 1733 | c->dst.type = OP_NONE; |
| 1733 | break; | 1734 | break; |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index fd7e1798c75a..8bcb6f40ccb6 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -497,6 +497,11 @@ static int vmalloc_fault(unsigned long address) | |||
| 497 | unsigned long pgd_paddr; | 497 | unsigned long pgd_paddr; |
| 498 | pmd_t *pmd_k; | 498 | pmd_t *pmd_k; |
| 499 | pte_t *pte_k; | 499 | pte_t *pte_k; |
| 500 | |||
| 501 | /* Make sure we are in vmalloc area */ | ||
| 502 | if (!(address >= VMALLOC_START && address < VMALLOC_END)) | ||
| 503 | return -1; | ||
| 504 | |||
| 500 | /* | 505 | /* |
| 501 | * Synchronize this task's top level page-table | 506 | * Synchronize this task's top level page-table |
| 502 | * with the 'reference' page table. | 507 | * with the 'reference' page table. |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 3890234e5b26..99649dccad28 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
| @@ -97,36 +97,9 @@ static __init inline int srat_disabled(void) | |||
| 97 | return numa_off || acpi_numa < 0; | 97 | return numa_off || acpi_numa < 0; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | /* | ||
| 101 | * A lot of BIOS fill in 10 (= no distance) everywhere. This messes | ||
| 102 | * up the NUMA heuristics which wants the local node to have a smaller | ||
| 103 | * distance than the others. | ||
| 104 | * Do some quick checks here and only use the SLIT if it passes. | ||
| 105 | */ | ||
| 106 | static __init int slit_valid(struct acpi_table_slit *slit) | ||
| 107 | { | ||
| 108 | int i, j; | ||
| 109 | int d = slit->locality_count; | ||
| 110 | for (i = 0; i < d; i++) { | ||
| 111 | for (j = 0; j < d; j++) { | ||
| 112 | u8 val = slit->entry[d*i + j]; | ||
| 113 | if (i == j) { | ||
| 114 | if (val != LOCAL_DISTANCE) | ||
| 115 | return 0; | ||
| 116 | } else if (val <= LOCAL_DISTANCE) | ||
| 117 | return 0; | ||
| 118 | } | ||
| 119 | } | ||
| 120 | return 1; | ||
| 121 | } | ||
| 122 | |||
| 123 | /* Callback for SLIT parsing */ | 100 | /* Callback for SLIT parsing */ |
| 124 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | 101 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) |
| 125 | { | 102 | { |
| 126 | if (!slit_valid(slit)) { | ||
| 127 | printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n"); | ||
| 128 | return; | ||
| 129 | } | ||
| 130 | acpi_slit = slit; | 103 | acpi_slit = slit; |
| 131 | } | 104 | } |
| 132 | 105 | ||
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 6e64aaf00d1d..940185ecaeda 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
| @@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { | |||
| 328 | #endif | 328 | #endif |
| 329 | { | 329 | { |
| 330 | .callback = set_bf_sort, | 330 | .callback = set_bf_sort, |
| 331 | .ident = "HP ProLiant DL385 G2", | 331 | .ident = "HP ProLiant DL360", |
| 332 | .matches = { | 332 | .matches = { |
| 333 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 333 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
| 334 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), | 334 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"), |
| 335 | }, | 335 | }, |
| 336 | }, | 336 | }, |
| 337 | { | 337 | { |
| 338 | .callback = set_bf_sort, | 338 | .callback = set_bf_sort, |
| 339 | .ident = "HP ProLiant DL585 G2", | 339 | .ident = "HP ProLiant DL380", |
| 340 | .matches = { | 340 | .matches = { |
| 341 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 341 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
| 342 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), | 342 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"), |
| 343 | }, | 343 | }, |
| 344 | }, | 344 | }, |
| 345 | {} | 345 | {} |
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index c39e1a5aa241..52b2e3856980 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/clocksource.h> | 12 | #include <linux/clocksource.h> |
| 13 | #include <linux/clockchips.h> | 13 | #include <linux/clockchips.h> |
| 14 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
| 15 | #include <linux/math64.h> | ||
| 15 | 16 | ||
| 16 | #include <asm/xen/hypervisor.h> | 17 | #include <asm/xen/hypervisor.h> |
| 17 | #include <asm/xen/hypercall.h> | 18 | #include <asm/xen/hypercall.h> |
| @@ -150,11 +151,7 @@ static void do_stolen_accounting(void) | |||
| 150 | if (stolen < 0) | 151 | if (stolen < 0) |
| 151 | stolen = 0; | 152 | stolen = 0; |
| 152 | 153 | ||
| 153 | ticks = 0; | 154 | ticks = iter_div_u64_rem(stolen, NS_PER_TICK, &stolen); |
| 154 | while (stolen >= NS_PER_TICK) { | ||
| 155 | ticks++; | ||
| 156 | stolen -= NS_PER_TICK; | ||
| 157 | } | ||
| 158 | __get_cpu_var(residual_stolen) = stolen; | 155 | __get_cpu_var(residual_stolen) = stolen; |
| 159 | account_steal_time(NULL, ticks); | 156 | account_steal_time(NULL, ticks); |
| 160 | 157 | ||
| @@ -166,11 +163,7 @@ static void do_stolen_accounting(void) | |||
| 166 | if (blocked < 0) | 163 | if (blocked < 0) |
| 167 | blocked = 0; | 164 | blocked = 0; |
| 168 | 165 | ||
| 169 | ticks = 0; | 166 | ticks = iter_div_u64_rem(blocked, NS_PER_TICK, &blocked); |
| 170 | while (blocked >= NS_PER_TICK) { | ||
| 171 | ticks++; | ||
| 172 | blocked -= NS_PER_TICK; | ||
| 173 | } | ||
| 174 | __get_cpu_var(residual_blocked) = blocked; | 167 | __get_cpu_var(residual_blocked) = blocked; |
| 175 | account_steal_time(idle_task(smp_processor_id()), ticks); | 168 | account_steal_time(idle_task(smp_processor_id()), ticks); |
| 176 | } | 169 | } |
diff --git a/block/blktrace.c b/block/blktrace.c index 7ae87cc4a163..8d3a27780260 100644 --- a/block/blktrace.c +++ b/block/blktrace.c | |||
| @@ -79,16 +79,17 @@ void __trace_note_message(struct blk_trace *bt, const char *fmt, ...) | |||
| 79 | { | 79 | { |
| 80 | int n; | 80 | int n; |
| 81 | va_list args; | 81 | va_list args; |
| 82 | unsigned long flags; | ||
| 82 | char *buf; | 83 | char *buf; |
| 83 | 84 | ||
| 84 | preempt_disable(); | 85 | local_irq_save(flags); |
| 85 | buf = per_cpu_ptr(bt->msg_data, smp_processor_id()); | 86 | buf = per_cpu_ptr(bt->msg_data, smp_processor_id()); |
| 86 | va_start(args, fmt); | 87 | va_start(args, fmt); |
| 87 | n = vscnprintf(buf, BLK_TN_MAX_MSG, fmt, args); | 88 | n = vscnprintf(buf, BLK_TN_MAX_MSG, fmt, args); |
| 88 | va_end(args); | 89 | va_end(args); |
| 89 | 90 | ||
| 90 | trace_note(bt, 0, BLK_TN_MESSAGE, buf, n); | 91 | trace_note(bt, 0, BLK_TN_MESSAGE, buf, n); |
| 91 | preempt_enable(); | 92 | local_irq_restore(flags); |
| 92 | } | 93 | } |
| 93 | EXPORT_SYMBOL_GPL(__trace_note_message); | 94 | EXPORT_SYMBOL_GPL(__trace_note_message); |
| 94 | 95 | ||
| @@ -158,10 +159,7 @@ void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes, | |||
| 158 | /* | 159 | /* |
| 159 | * A word about the locking here - we disable interrupts to reserve | 160 | * A word about the locking here - we disable interrupts to reserve |
| 160 | * some space in the relay per-cpu buffer, to prevent an irq | 161 | * some space in the relay per-cpu buffer, to prevent an irq |
| 161 | * from coming in and stepping on our toes. Once reserved, it's | 162 | * from coming in and stepping on our toes. |
| 162 | * enough to get preemption disabled to prevent read of this data | ||
| 163 | * before we are through filling it. get_cpu()/put_cpu() does this | ||
| 164 | * for us | ||
| 165 | */ | 163 | */ |
| 166 | local_irq_save(flags); | 164 | local_irq_save(flags); |
| 167 | 165 | ||
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index d2fc94161848..26038c2a2a71 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c | |||
| @@ -301,16 +301,20 @@ static int bay_add(acpi_handle handle, int id) | |||
| 301 | */ | 301 | */ |
| 302 | pdev->dev.uevent_suppress = 0; | 302 | pdev->dev.uevent_suppress = 0; |
| 303 | 303 | ||
| 304 | if (acpi_bay_add_fs(new_bay)) { | ||
| 305 | platform_device_unregister(new_bay->pdev); | ||
| 306 | goto bay_add_err; | ||
| 307 | } | ||
| 308 | |||
| 309 | /* register for events on this device */ | 304 | /* register for events on this device */ |
| 310 | status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, | 305 | status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, |
| 311 | bay_notify, new_bay); | 306 | bay_notify, new_bay); |
| 312 | if (ACPI_FAILURE(status)) { | 307 | if (ACPI_FAILURE(status)) { |
| 313 | printk(KERN_ERR PREFIX "Error installing bay notify handler\n"); | 308 | printk(KERN_INFO PREFIX "Error installing bay notify handler\n"); |
| 309 | platform_device_unregister(new_bay->pdev); | ||
| 310 | goto bay_add_err; | ||
| 311 | } | ||
| 312 | |||
| 313 | if (acpi_bay_add_fs(new_bay)) { | ||
| 314 | acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY, | ||
| 315 | bay_notify); | ||
| 316 | platform_device_unregister(new_bay->pdev); | ||
| 317 | goto bay_add_err; | ||
| 314 | } | 318 | } |
| 315 | 319 | ||
| 316 | /* if we are on a dock station, we should register for dock | 320 | /* if we are on a dock station, we should register for dock |
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c index c78078315be9..f988a5e7d2b4 100644 --- a/drivers/acpi/dispatcher/dsfield.c +++ b/drivers/acpi/dispatcher/dsfield.c | |||
| @@ -450,10 +450,6 @@ acpi_ds_init_field_objects(union acpi_parse_object *op, | |||
| 450 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 450 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
| 451 | } | 451 | } |
| 452 | 452 | ||
| 453 | if (!arg) { | ||
| 454 | return_ACPI_STATUS(AE_AML_NO_OPERAND); | ||
| 455 | } | ||
| 456 | |||
| 457 | /* Creating new namespace node(s), should not already exist */ | 453 | /* Creating new namespace node(s), should not already exist */ |
| 458 | 454 | ||
| 459 | flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | | 455 | flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | |
| @@ -467,6 +463,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op, | |||
| 467 | 463 | ||
| 468 | /* | 464 | /* |
| 469 | * Walk the list of entries in the field_list | 465 | * Walk the list of entries in the field_list |
| 466 | * Note: field_list can be of zero length. In this case, Arg will be NULL. | ||
| 470 | */ | 467 | */ |
| 471 | while (arg) { | 468 | while (arg) { |
| 472 | /* | 469 | /* |
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index fa44fb96fc34..96c542f7fded 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -834,7 +834,7 @@ static int dock_add(acpi_handle handle) | |||
| 834 | goto dock_add_err; | 834 | goto dock_add_err; |
| 835 | } | 835 | } |
| 836 | 836 | ||
| 837 | printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_DESCRIPTION); | 837 | printk(KERN_INFO PREFIX "%s\n", ACPI_DOCK_DRIVER_DESCRIPTION); |
| 838 | 838 | ||
| 839 | return 0; | 839 | return 0; |
| 840 | 840 | ||
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 0924992187e8..5622aee996b2 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -194,7 +194,7 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll) | |||
| 194 | while (time_before(jiffies, delay)) { | 194 | while (time_before(jiffies, delay)) { |
| 195 | if (acpi_ec_check_status(ec, event)) | 195 | if (acpi_ec_check_status(ec, event)) |
| 196 | return 0; | 196 | return 0; |
| 197 | udelay(ACPI_EC_UDELAY); | 197 | msleep(1); |
| 198 | } | 198 | } |
| 199 | } | 199 | } |
| 200 | pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n", | 200 | pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n", |
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c index 24da921d13e3..39d742190584 100644 --- a/drivers/acpi/executer/exconfig.c +++ b/drivers/acpi/executer/exconfig.c | |||
| @@ -375,9 +375,15 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, | |||
| 375 | goto cleanup; | 375 | goto cleanup; |
| 376 | } | 376 | } |
| 377 | 377 | ||
| 378 | /* | ||
| 379 | * Add the table to the namespace. | ||
| 380 | * | ||
| 381 | * Note: We load the table objects relative to the root of the namespace. | ||
| 382 | * This appears to go against the ACPI specification, but we do it for | ||
| 383 | * compatibility with other ACPI implementations. | ||
| 384 | */ | ||
| 378 | status = | 385 | status = |
| 379 | acpi_ex_add_table(table_index, walk_state->scope_info->scope.node, | 386 | acpi_ex_add_table(table_index, acpi_gbl_root_node, &ddb_handle); |
| 380 | &ddb_handle); | ||
| 381 | if (ACPI_FAILURE(status)) { | 387 | if (ACPI_FAILURE(status)) { |
| 382 | 388 | ||
| 383 | /* On error, table_ptr was deallocated above */ | 389 | /* On error, table_ptr was deallocated above */ |
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 06f8634fe58b..2808dc60fd67 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
| @@ -272,6 +272,12 @@ static u32 rtc_handler(void *context) | |||
| 272 | static inline void rtc_wake_setup(void) | 272 | static inline void rtc_wake_setup(void) |
| 273 | { | 273 | { |
| 274 | acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL); | 274 | acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL); |
| 275 | /* | ||
| 276 | * After the RTC handler is installed, the Fixed_RTC event should | ||
| 277 | * be disabled. Only when the RTC alarm is set will it be enabled. | ||
| 278 | */ | ||
| 279 | acpi_clear_event(ACPI_EVENT_RTC); | ||
| 280 | acpi_disable_event(ACPI_EVENT_RTC, 0); | ||
| 275 | } | 281 | } |
| 276 | 282 | ||
| 277 | static void rtc_wake_on(struct device *dev) | 283 | static void rtc_wake_on(struct device *dev) |
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index d9937e05ec6a..dba3cfbe8cba 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c | |||
| @@ -223,15 +223,17 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state) | |||
| 223 | break; | 223 | break; |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | /* Set the system indicators to show the desired sleep state. */ | 226 | /* |
| 227 | 227 | * Set the system indicators to show the desired sleep state. | |
| 228 | * _SST is an optional method (return no error if not found) | ||
| 229 | */ | ||
| 228 | status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL); | 230 | status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL); |
| 229 | if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { | 231 | if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { |
| 230 | ACPI_EXCEPTION((AE_INFO, status, | 232 | ACPI_EXCEPTION((AE_INFO, status, |
| 231 | "While executing method _SST")); | 233 | "While executing method _SST")); |
| 232 | } | 234 | } |
| 233 | 235 | ||
| 234 | return_ACPI_STATUS(status); | 236 | return_ACPI_STATUS(AE_OK); |
| 235 | } | 237 | } |
| 236 | 238 | ||
| 237 | ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep) | 239 | ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep) |
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 5d59cb33b1a5..658e5f3abae0 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
| @@ -140,19 +140,42 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) | |||
| 140 | } | 140 | } |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | /* | ||
| 144 | * A lot of BIOS fill in 10 (= no distance) everywhere. This messes | ||
| 145 | * up the NUMA heuristics which wants the local node to have a smaller | ||
| 146 | * distance than the others. | ||
| 147 | * Do some quick checks here and only use the SLIT if it passes. | ||
| 148 | */ | ||
| 149 | static __init int slit_valid(struct acpi_table_slit *slit) | ||
| 150 | { | ||
| 151 | int i, j; | ||
| 152 | int d = slit->locality_count; | ||
| 153 | for (i = 0; i < d; i++) { | ||
| 154 | for (j = 0; j < d; j++) { | ||
| 155 | u8 val = slit->entry[d*i + j]; | ||
| 156 | if (i == j) { | ||
| 157 | if (val != LOCAL_DISTANCE) | ||
| 158 | return 0; | ||
| 159 | } else if (val <= LOCAL_DISTANCE) | ||
| 160 | return 0; | ||
| 161 | } | ||
| 162 | } | ||
| 163 | return 1; | ||
| 164 | } | ||
| 165 | |||
| 143 | static int __init acpi_parse_slit(struct acpi_table_header *table) | 166 | static int __init acpi_parse_slit(struct acpi_table_header *table) |
| 144 | { | 167 | { |
| 145 | struct acpi_table_slit *slit; | 168 | struct acpi_table_slit *slit; |
| 146 | u32 localities; | ||
| 147 | 169 | ||
| 148 | if (!table) | 170 | if (!table) |
| 149 | return -EINVAL; | 171 | return -EINVAL; |
| 150 | 172 | ||
| 151 | slit = (struct acpi_table_slit *)table; | 173 | slit = (struct acpi_table_slit *)table; |
| 152 | 174 | ||
| 153 | /* downcast just for %llu vs %lu for i386/ia64 */ | 175 | if (!slit_valid(slit)) { |
| 154 | localities = (u32) slit->locality_count; | 176 | printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n"); |
| 155 | 177 | return -EINVAL; | |
| 178 | } | ||
| 156 | acpi_numa_slit_init(slit); | 179 | acpi_numa_slit_init(slit); |
| 157 | 180 | ||
| 158 | return 0; | 181 | return 0; |
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c index f1e8bf65e24e..e94463778845 100644 --- a/drivers/acpi/parser/psargs.c +++ b/drivers/acpi/parser/psargs.c | |||
| @@ -268,7 +268,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state, | |||
| 268 | */ | 268 | */ |
| 269 | if (ACPI_SUCCESS(status) && | 269 | if (ACPI_SUCCESS(status) && |
| 270 | possible_method_call && (node->type == ACPI_TYPE_METHOD)) { | 270 | possible_method_call && (node->type == ACPI_TYPE_METHOD)) { |
| 271 | if (walk_state->op->common.aml_opcode == AML_UNLOAD_OP) { | 271 | if (walk_state->opcode == AML_UNLOAD_OP) { |
| 272 | /* | 272 | /* |
| 273 | * acpi_ps_get_next_namestring has increased the AML pointer, | 273 | * acpi_ps_get_next_namestring has increased the AML pointer, |
| 274 | * so we need to restore the saved AML pointer for method call. | 274 | * so we need to restore the saved AML pointer for method call. |
| @@ -691,7 +691,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state, | |||
| 691 | 691 | ||
| 692 | /* To support super_name arg of Unload */ | 692 | /* To support super_name arg of Unload */ |
| 693 | 693 | ||
| 694 | if (walk_state->op->common.aml_opcode == AML_UNLOAD_OP) { | 694 | if (walk_state->opcode == AML_UNLOAD_OP) { |
| 695 | status = | 695 | status = |
| 696 | acpi_ps_get_next_namepath(walk_state, | 696 | acpi_ps_get_next_namepath(walk_state, |
| 697 | parser_state, arg, | 697 | parser_state, arg, |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 386e5aa48834..9dd0fa93b9e1 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -86,7 +86,6 @@ static int acpi_processor_info_open_fs(struct inode *inode, struct file *file); | |||
| 86 | static void acpi_processor_notify(acpi_handle handle, u32 event, void *data); | 86 | static void acpi_processor_notify(acpi_handle handle, u32 event, void *data); |
| 87 | static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu); | 87 | static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu); |
| 88 | static int acpi_processor_handle_eject(struct acpi_processor *pr); | 88 | static int acpi_processor_handle_eject(struct acpi_processor *pr); |
| 89 | extern int acpi_processor_tstate_has_changed(struct acpi_processor *pr); | ||
| 90 | 89 | ||
| 91 | 90 | ||
| 92 | static const struct acpi_device_id processor_device_ids[] = { | 91 | static const struct acpi_device_id processor_device_ids[] = { |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 2dd2c1f3a01c..556ee1585192 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -1669,6 +1669,7 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) | |||
| 1669 | return -EINVAL; | 1669 | return -EINVAL; |
| 1670 | } | 1670 | } |
| 1671 | 1671 | ||
| 1672 | dev->cpu = pr->id; | ||
| 1672 | for (i = 0; i < CPUIDLE_STATE_MAX; i++) { | 1673 | for (i = 0; i < CPUIDLE_STATE_MAX; i++) { |
| 1673 | dev->states[i].name[0] = '\0'; | 1674 | dev->states[i].name[0] = '\0'; |
| 1674 | dev->states[i].desc[0] = '\0'; | 1675 | dev->states[i].desc[0] = '\0'; |
| @@ -1738,7 +1739,7 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) | |||
| 1738 | 1739 | ||
| 1739 | int acpi_processor_cst_has_changed(struct acpi_processor *pr) | 1740 | int acpi_processor_cst_has_changed(struct acpi_processor *pr) |
| 1740 | { | 1741 | { |
| 1741 | int ret; | 1742 | int ret = 0; |
| 1742 | 1743 | ||
| 1743 | if (boot_option_idle_override) | 1744 | if (boot_option_idle_override) |
| 1744 | return 0; | 1745 | return 0; |
| @@ -1756,8 +1757,10 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) | |||
| 1756 | cpuidle_pause_and_lock(); | 1757 | cpuidle_pause_and_lock(); |
| 1757 | cpuidle_disable_device(&pr->power.dev); | 1758 | cpuidle_disable_device(&pr->power.dev); |
| 1758 | acpi_processor_get_power_info(pr); | 1759 | acpi_processor_get_power_info(pr); |
| 1759 | acpi_processor_setup_cpuidle(pr); | 1760 | if (pr->flags.power) { |
| 1760 | ret = cpuidle_enable_device(&pr->power.dev); | 1761 | acpi_processor_setup_cpuidle(pr); |
| 1762 | ret = cpuidle_enable_device(&pr->power.dev); | ||
| 1763 | } | ||
| 1761 | cpuidle_resume_and_unlock(); | 1764 | cpuidle_resume_and_unlock(); |
| 1762 | 1765 | ||
| 1763 | return ret; | 1766 | return ret; |
| @@ -1813,7 +1816,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, | |||
| 1813 | if (pr->flags.power) { | 1816 | if (pr->flags.power) { |
| 1814 | #ifdef CONFIG_CPU_IDLE | 1817 | #ifdef CONFIG_CPU_IDLE |
| 1815 | acpi_processor_setup_cpuidle(pr); | 1818 | acpi_processor_setup_cpuidle(pr); |
| 1816 | pr->power.dev.cpu = pr->id; | ||
| 1817 | if (cpuidle_register_device(&pr->power.dev)) | 1819 | if (cpuidle_register_device(&pr->power.dev)) |
| 1818 | return -EIO; | 1820 | return -EIO; |
| 1819 | #endif | 1821 | #endif |
| @@ -1850,8 +1852,7 @@ int acpi_processor_power_exit(struct acpi_processor *pr, | |||
| 1850 | return 0; | 1852 | return 0; |
| 1851 | 1853 | ||
| 1852 | #ifdef CONFIG_CPU_IDLE | 1854 | #ifdef CONFIG_CPU_IDLE |
| 1853 | if (pr->flags.power) | 1855 | cpuidle_unregister_device(&pr->power.dev); |
| 1854 | cpuidle_unregister_device(&pr->power.dev); | ||
| 1855 | #endif | 1856 | #endif |
| 1856 | pr->flags.power_setup_done = 0; | 1857 | pr->flags.power_setup_done = 0; |
| 1857 | 1858 | ||
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c index 8a5fe8710513..224c57c03381 100644 --- a/drivers/acpi/sleep/proc.c +++ b/drivers/acpi/sleep/proc.c | |||
| @@ -495,6 +495,12 @@ static int __init acpi_sleep_proc_init(void) | |||
| 495 | acpi_root_dir, &acpi_system_alarm_fops); | 495 | acpi_root_dir, &acpi_system_alarm_fops); |
| 496 | 496 | ||
| 497 | acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL); | 497 | acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL); |
| 498 | /* | ||
| 499 | * Disable the RTC event after installing RTC handler. | ||
| 500 | * Only when RTC alarm is set will it be enabled. | ||
| 501 | */ | ||
| 502 | acpi_clear_event(ACPI_EVENT_RTC); | ||
| 503 | acpi_disable_event(ACPI_EVENT_RTC, 0); | ||
| 498 | #endif /* HAVE_ACPI_LEGACY_ALARM */ | 504 | #endif /* HAVE_ACPI_LEGACY_ALARM */ |
| 499 | 505 | ||
| 500 | /* 'wakeup device' [R/W] */ | 506 | /* 'wakeup device' [R/W] */ |
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index 769f24855eb6..5bd2dec9a7ac 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
| @@ -77,7 +77,6 @@ static ssize_t acpi_table_show(struct kobject *kobj, | |||
| 77 | container_of(bin_attr, struct acpi_table_attr, attr); | 77 | container_of(bin_attr, struct acpi_table_attr, attr); |
| 78 | struct acpi_table_header *table_header = NULL; | 78 | struct acpi_table_header *table_header = NULL; |
| 79 | acpi_status status; | 79 | acpi_status status; |
| 80 | ssize_t ret_count = count; | ||
| 81 | 80 | ||
| 82 | status = | 81 | status = |
| 83 | acpi_get_table(table_attr->name, table_attr->instance, | 82 | acpi_get_table(table_attr->name, table_attr->instance, |
| @@ -85,18 +84,8 @@ static ssize_t acpi_table_show(struct kobject *kobj, | |||
| 85 | if (ACPI_FAILURE(status)) | 84 | if (ACPI_FAILURE(status)) |
| 86 | return -ENODEV; | 85 | return -ENODEV; |
| 87 | 86 | ||
| 88 | if (offset >= table_header->length) { | 87 | return memory_read_from_buffer(buf, count, &offset, |
| 89 | ret_count = 0; | 88 | table_header, table_header->length); |
| 90 | goto end; | ||
| 91 | } | ||
| 92 | |||
| 93 | if (offset + ret_count > table_header->length) | ||
| 94 | ret_count = table_header->length - offset; | ||
| 95 | |||
| 96 | memcpy(buf, ((char *)table_header) + offset, ret_count); | ||
| 97 | |||
| 98 | end: | ||
| 99 | return ret_count; | ||
| 100 | } | 89 | } |
| 101 | 90 | ||
| 102 | static void acpi_table_attr_init(struct acpi_table_attr *table_attr, | 91 | static void acpi_table_attr_init(struct acpi_table_attr *table_attr, |
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c index 402f93e1ff20..5336ce88f89f 100644 --- a/drivers/acpi/tables/tbinstal.c +++ b/drivers/acpi/tables/tbinstal.c | |||
| @@ -123,24 +123,13 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, | |||
| 123 | } | 123 | } |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | /* The table must be either an SSDT or a PSDT or an OEMx */ | 126 | /* |
| 127 | 127 | * Originally, we checked the table signature for "SSDT" or "PSDT" here. | |
| 128 | if (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_PSDT)&& | 128 | * Next, we added support for OEMx tables, signature "OEM". |
| 129 | !ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT)&& | 129 | * Valid tables were encountered with a null signature, so we've just |
| 130 | strncmp(table_desc->pointer->signature, "OEM", 3)) { | 130 | * given up on validating the signature, since it seems to be a waste |
| 131 | /* Check for a printable name */ | 131 | * of code. The original code was removed (05/2008). |
| 132 | if (acpi_ut_valid_acpi_name( | 132 | */ |
| 133 | *(u32 *) table_desc->pointer->signature)) { | ||
| 134 | ACPI_ERROR((AE_INFO, "Table has invalid signature " | ||
| 135 | "[%4.4s], must be SSDT or PSDT", | ||
| 136 | table_desc->pointer->signature)); | ||
| 137 | } else { | ||
| 138 | ACPI_ERROR((AE_INFO, "Table has invalid signature " | ||
| 139 | "(0x%8.8X), must be SSDT or PSDT", | ||
| 140 | *(u32 *) table_desc->pointer->signature)); | ||
| 141 | } | ||
| 142 | return_ACPI_STATUS(AE_BAD_SIGNATURE); | ||
| 143 | } | ||
| 144 | 133 | ||
| 145 | (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES); | 134 | (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES); |
| 146 | 135 | ||
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c index fb57b93c2495..0e319604d3e7 100644 --- a/drivers/acpi/tables/tbxface.c +++ b/drivers/acpi/tables/tbxface.c | |||
| @@ -540,7 +540,7 @@ static acpi_status acpi_tb_load_namespace(void) | |||
| 540 | acpi_tb_print_table_header(0, table); | 540 | acpi_tb_print_table_header(0, table); |
| 541 | 541 | ||
| 542 | if (no_auto_ssdt == 0) { | 542 | if (no_auto_ssdt == 0) { |
| 543 | printk(KERN_WARNING "ACPI: DSDT override uses original SSDTs unless \"acpi_no_auto_ssdt\""); | 543 | printk(KERN_WARNING "ACPI: DSDT override uses original SSDTs unless \"acpi_no_auto_ssdt\"\n"); |
| 544 | } | 544 | } |
| 545 | } | 545 | } |
| 546 | 546 | ||
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 504385b1f211..84c795fb9b1e 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
| @@ -364,10 +364,17 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) | |||
| 364 | if (flag & ACPI_TRIPS_CRITICAL) { | 364 | if (flag & ACPI_TRIPS_CRITICAL) { |
| 365 | status = acpi_evaluate_integer(tz->device->handle, | 365 | status = acpi_evaluate_integer(tz->device->handle, |
| 366 | "_CRT", NULL, &tz->trips.critical.temperature); | 366 | "_CRT", NULL, &tz->trips.critical.temperature); |
| 367 | if (ACPI_FAILURE(status)) { | 367 | /* |
| 368 | * Treat freezing temperatures as invalid as well; some | ||
| 369 | * BIOSes return really low values and cause reboots at startup. | ||
| 370 | * Below zero (Celcius) values clearly aren't right for sure.. | ||
| 371 | * ... so lets discard those as invalid. | ||
| 372 | */ | ||
| 373 | if (ACPI_FAILURE(status) || | ||
| 374 | tz->trips.critical.temperature <= 2732) { | ||
| 368 | tz->trips.critical.flags.valid = 0; | 375 | tz->trips.critical.flags.valid = 0; |
| 369 | ACPI_EXCEPTION((AE_INFO, status, | 376 | ACPI_EXCEPTION((AE_INFO, status, |
| 370 | "No critical threshold")); | 377 | "No or invalid critical threshold")); |
| 371 | return -ENODEV; | 378 | return -ENODEV; |
| 372 | } else { | 379 | } else { |
| 373 | tz->trips.critical.flags.valid = 1; | 380 | tz->trips.critical.flags.valid = 1; |
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c index e4ba7192cd15..1f057b71db1a 100644 --- a/drivers/acpi/utilities/utmisc.c +++ b/drivers/acpi/utilities/utmisc.c | |||
| @@ -1048,6 +1048,7 @@ acpi_ut_exception(char *module_name, | |||
| 1048 | va_start(args, format); | 1048 | va_start(args, format); |
| 1049 | acpi_os_vprintf(format, args); | 1049 | acpi_os_vprintf(format, args); |
| 1050 | acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); | 1050 | acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); |
| 1051 | va_end(args); | ||
| 1051 | } | 1052 | } |
| 1052 | 1053 | ||
| 1053 | EXPORT_SYMBOL(acpi_ut_exception); | 1054 | EXPORT_SYMBOL(acpi_ut_exception); |
| @@ -1063,7 +1064,6 @@ acpi_ut_warning(char *module_name, u32 line_number, char *format, ...) | |||
| 1063 | acpi_os_vprintf(format, args); | 1064 | acpi_os_vprintf(format, args); |
| 1064 | acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); | 1065 | acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); |
| 1065 | va_end(args); | 1066 | va_end(args); |
| 1066 | va_end(args); | ||
| 1067 | } | 1067 | } |
| 1068 | 1068 | ||
| 1069 | void ACPI_INTERNAL_VAR_XFACE | 1069 | void ACPI_INTERNAL_VAR_XFACE |
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 544b7d6c617c..966ab401e523 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -89,6 +89,7 @@ enum { | |||
| 89 | board_ahci_sb600 = 3, | 89 | board_ahci_sb600 = 3, |
| 90 | board_ahci_mv = 4, | 90 | board_ahci_mv = 4, |
| 91 | board_ahci_sb700 = 5, | 91 | board_ahci_sb700 = 5, |
| 92 | board_ahci_mcp65 = 6, | ||
| 92 | 93 | ||
| 93 | /* global controller registers */ | 94 | /* global controller registers */ |
| 94 | HOST_CAP = 0x00, /* host capabilities */ | 95 | HOST_CAP = 0x00, /* host capabilities */ |
| @@ -190,6 +191,7 @@ enum { | |||
| 190 | AHCI_HFLAG_NO_PMP = (1 << 6), /* no PMP */ | 191 | AHCI_HFLAG_NO_PMP = (1 << 6), /* no PMP */ |
| 191 | AHCI_HFLAG_NO_HOTPLUG = (1 << 7), /* ignore PxSERR.DIAG.N */ | 192 | AHCI_HFLAG_NO_HOTPLUG = (1 << 7), /* ignore PxSERR.DIAG.N */ |
| 192 | AHCI_HFLAG_SECT255 = (1 << 8), /* max 255 sectors */ | 193 | AHCI_HFLAG_SECT255 = (1 << 8), /* max 255 sectors */ |
| 194 | AHCI_HFLAG_YES_NCQ = (1 << 9), /* force NCQ cap on */ | ||
| 193 | 195 | ||
| 194 | /* ap->flags bits */ | 196 | /* ap->flags bits */ |
| 195 | 197 | ||
| @@ -253,6 +255,8 @@ static void ahci_pmp_attach(struct ata_port *ap); | |||
| 253 | static void ahci_pmp_detach(struct ata_port *ap); | 255 | static void ahci_pmp_detach(struct ata_port *ap); |
| 254 | static int ahci_softreset(struct ata_link *link, unsigned int *class, | 256 | static int ahci_softreset(struct ata_link *link, unsigned int *class, |
| 255 | unsigned long deadline); | 257 | unsigned long deadline); |
| 258 | static int ahci_sb600_softreset(struct ata_link *link, unsigned int *class, | ||
| 259 | unsigned long deadline); | ||
| 256 | static int ahci_hardreset(struct ata_link *link, unsigned int *class, | 260 | static int ahci_hardreset(struct ata_link *link, unsigned int *class, |
| 257 | unsigned long deadline); | 261 | unsigned long deadline); |
| 258 | static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, | 262 | static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, |
| @@ -329,6 +333,12 @@ static struct ata_port_operations ahci_p5wdh_ops = { | |||
| 329 | .hardreset = ahci_p5wdh_hardreset, | 333 | .hardreset = ahci_p5wdh_hardreset, |
| 330 | }; | 334 | }; |
| 331 | 335 | ||
| 336 | static struct ata_port_operations ahci_sb600_ops = { | ||
| 337 | .inherits = &ahci_ops, | ||
| 338 | .softreset = ahci_sb600_softreset, | ||
| 339 | .pmp_softreset = ahci_sb600_softreset, | ||
| 340 | }; | ||
| 341 | |||
| 332 | #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) | 342 | #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) |
| 333 | 343 | ||
| 334 | static const struct ata_port_info ahci_port_info[] = { | 344 | static const struct ata_port_info ahci_port_info[] = { |
| @@ -359,11 +369,11 @@ static const struct ata_port_info ahci_port_info[] = { | |||
| 359 | { | 369 | { |
| 360 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL | | 370 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL | |
| 361 | AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI | | 371 | AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI | |
| 362 | AHCI_HFLAG_SECT255 | AHCI_HFLAG_NO_PMP), | 372 | AHCI_HFLAG_SECT255), |
| 363 | .flags = AHCI_FLAG_COMMON, | 373 | .flags = AHCI_FLAG_COMMON, |
| 364 | .pio_mask = 0x1f, /* pio0-4 */ | 374 | .pio_mask = 0x1f, /* pio0-4 */ |
| 365 | .udma_mask = ATA_UDMA6, | 375 | .udma_mask = ATA_UDMA6, |
| 366 | .port_ops = &ahci_ops, | 376 | .port_ops = &ahci_sb600_ops, |
| 367 | }, | 377 | }, |
| 368 | /* board_ahci_mv */ | 378 | /* board_ahci_mv */ |
| 369 | { | 379 | { |
| @@ -377,8 +387,15 @@ static const struct ata_port_info ahci_port_info[] = { | |||
| 377 | }, | 387 | }, |
| 378 | /* board_ahci_sb700 */ | 388 | /* board_ahci_sb700 */ |
| 379 | { | 389 | { |
| 380 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL | | 390 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL), |
| 381 | AHCI_HFLAG_NO_PMP), | 391 | .flags = AHCI_FLAG_COMMON, |
| 392 | .pio_mask = 0x1f, /* pio0-4 */ | ||
| 393 | .udma_mask = ATA_UDMA6, | ||
| 394 | .port_ops = &ahci_sb600_ops, | ||
| 395 | }, | ||
| 396 | /* board_ahci_mcp65 */ | ||
| 397 | { | ||
| 398 | AHCI_HFLAGS (AHCI_HFLAG_YES_NCQ), | ||
| 382 | .flags = AHCI_FLAG_COMMON, | 399 | .flags = AHCI_FLAG_COMMON, |
| 383 | .pio_mask = 0x1f, /* pio0-4 */ | 400 | .pio_mask = 0x1f, /* pio0-4 */ |
| 384 | .udma_mask = ATA_UDMA6, | 401 | .udma_mask = ATA_UDMA6, |
| @@ -438,14 +455,14 @@ static const struct pci_device_id ahci_pci_tbl[] = { | |||
| 438 | { PCI_VDEVICE(VIA, 0x6287), board_ahci_vt8251 }, /* VIA VT8251 */ | 455 | { PCI_VDEVICE(VIA, 0x6287), board_ahci_vt8251 }, /* VIA VT8251 */ |
| 439 | 456 | ||
| 440 | /* NVIDIA */ | 457 | /* NVIDIA */ |
| 441 | { PCI_VDEVICE(NVIDIA, 0x044c), board_ahci }, /* MCP65 */ | 458 | { PCI_VDEVICE(NVIDIA, 0x044c), board_ahci_mcp65 }, /* MCP65 */ |
| 442 | { PCI_VDEVICE(NVIDIA, 0x044d), board_ahci }, /* MCP65 */ | 459 | { PCI_VDEVICE(NVIDIA, 0x044d), board_ahci_mcp65 }, /* MCP65 */ |
| 443 | { PCI_VDEVICE(NVIDIA, 0x044e), board_ahci }, /* MCP65 */ | 460 | { PCI_VDEVICE(NVIDIA, 0x044e), board_ahci_mcp65 }, /* MCP65 */ |
| 444 | { PCI_VDEVICE(NVIDIA, 0x044f), board_ahci }, /* MCP65 */ | 461 | { PCI_VDEVICE(NVIDIA, 0x044f), board_ahci_mcp65 }, /* MCP65 */ |
| 445 | { PCI_VDEVICE(NVIDIA, 0x045c), board_ahci }, /* MCP65 */ | 462 | { PCI_VDEVICE(NVIDIA, 0x045c), board_ahci_mcp65 }, /* MCP65 */ |
| 446 | { PCI_VDEVICE(NVIDIA, 0x045d), board_ahci }, /* MCP65 */ | 463 | { PCI_VDEVICE(NVIDIA, 0x045d), board_ahci_mcp65 }, /* MCP65 */ |
| 447 | { PCI_VDEVICE(NVIDIA, 0x045e), board_ahci }, /* MCP65 */ | 464 | { PCI_VDEVICE(NVIDIA, 0x045e), board_ahci_mcp65 }, /* MCP65 */ |
| 448 | { PCI_VDEVICE(NVIDIA, 0x045f), board_ahci }, /* MCP65 */ | 465 | { PCI_VDEVICE(NVIDIA, 0x045f), board_ahci_mcp65 }, /* MCP65 */ |
| 449 | { PCI_VDEVICE(NVIDIA, 0x0550), board_ahci }, /* MCP67 */ | 466 | { PCI_VDEVICE(NVIDIA, 0x0550), board_ahci }, /* MCP67 */ |
| 450 | { PCI_VDEVICE(NVIDIA, 0x0551), board_ahci }, /* MCP67 */ | 467 | { PCI_VDEVICE(NVIDIA, 0x0551), board_ahci }, /* MCP67 */ |
| 451 | { PCI_VDEVICE(NVIDIA, 0x0552), board_ahci }, /* MCP67 */ | 468 | { PCI_VDEVICE(NVIDIA, 0x0552), board_ahci }, /* MCP67 */ |
| @@ -624,6 +641,12 @@ static void ahci_save_initial_config(struct pci_dev *pdev, | |||
| 624 | cap &= ~HOST_CAP_NCQ; | 641 | cap &= ~HOST_CAP_NCQ; |
| 625 | } | 642 | } |
| 626 | 643 | ||
| 644 | if (!(cap & HOST_CAP_NCQ) && (hpriv->flags & AHCI_HFLAG_YES_NCQ)) { | ||
| 645 | dev_printk(KERN_INFO, &pdev->dev, | ||
| 646 | "controller can do NCQ, turning on CAP_NCQ\n"); | ||
| 647 | cap |= HOST_CAP_NCQ; | ||
| 648 | } | ||
| 649 | |||
| 627 | if ((cap & HOST_CAP_PMP) && (hpriv->flags & AHCI_HFLAG_NO_PMP)) { | 650 | if ((cap & HOST_CAP_PMP) && (hpriv->flags & AHCI_HFLAG_NO_PMP)) { |
| 628 | dev_printk(KERN_INFO, &pdev->dev, | 651 | dev_printk(KERN_INFO, &pdev->dev, |
| 629 | "controller can't do PMP, turning off CAP_PMP\n"); | 652 | "controller can't do PMP, turning off CAP_PMP\n"); |
| @@ -1262,19 +1285,11 @@ static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, | |||
| 1262 | return 0; | 1285 | return 0; |
| 1263 | } | 1286 | } |
| 1264 | 1287 | ||
| 1265 | static int ahci_check_ready(struct ata_link *link) | 1288 | static int ahci_do_softreset(struct ata_link *link, unsigned int *class, |
| 1266 | { | 1289 | int pmp, unsigned long deadline, |
| 1267 | void __iomem *port_mmio = ahci_port_base(link->ap); | 1290 | int (*check_ready)(struct ata_link *link)) |
| 1268 | u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF; | ||
| 1269 | |||
| 1270 | return ata_check_ready(status); | ||
| 1271 | } | ||
| 1272 | |||
| 1273 | static int ahci_softreset(struct ata_link *link, unsigned int *class, | ||
| 1274 | unsigned long deadline) | ||
| 1275 | { | 1291 | { |
| 1276 | struct ata_port *ap = link->ap; | 1292 | struct ata_port *ap = link->ap; |
| 1277 | int pmp = sata_srst_pmp(link); | ||
| 1278 | const char *reason = NULL; | 1293 | const char *reason = NULL; |
| 1279 | unsigned long now, msecs; | 1294 | unsigned long now, msecs; |
| 1280 | struct ata_taskfile tf; | 1295 | struct ata_taskfile tf; |
| @@ -1312,7 +1327,7 @@ static int ahci_softreset(struct ata_link *link, unsigned int *class, | |||
| 1312 | ahci_exec_polled_cmd(ap, pmp, &tf, 0, 0, 0); | 1327 | ahci_exec_polled_cmd(ap, pmp, &tf, 0, 0, 0); |
| 1313 | 1328 | ||
| 1314 | /* wait for link to become ready */ | 1329 | /* wait for link to become ready */ |
| 1315 | rc = ata_wait_after_reset(link, deadline, ahci_check_ready); | 1330 | rc = ata_wait_after_reset(link, deadline, check_ready); |
| 1316 | /* link occupied, -ENODEV too is an error */ | 1331 | /* link occupied, -ENODEV too is an error */ |
| 1317 | if (rc) { | 1332 | if (rc) { |
| 1318 | reason = "device not ready"; | 1333 | reason = "device not ready"; |
| @@ -1328,6 +1343,72 @@ static int ahci_softreset(struct ata_link *link, unsigned int *class, | |||
| 1328 | return rc; | 1343 | return rc; |
| 1329 | } | 1344 | } |
| 1330 | 1345 | ||
| 1346 | static int ahci_check_ready(struct ata_link *link) | ||
| 1347 | { | ||
| 1348 | void __iomem *port_mmio = ahci_port_base(link->ap); | ||
| 1349 | u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF; | ||
| 1350 | |||
| 1351 | return ata_check_ready(status); | ||
| 1352 | } | ||
| 1353 | |||
| 1354 | static int ahci_softreset(struct ata_link *link, unsigned int *class, | ||
| 1355 | unsigned long deadline) | ||
| 1356 | { | ||
| 1357 | int pmp = sata_srst_pmp(link); | ||
| 1358 | |||
| 1359 | DPRINTK("ENTER\n"); | ||
| 1360 | |||
| 1361 | return ahci_do_softreset(link, class, pmp, deadline, ahci_check_ready); | ||
| 1362 | } | ||
| 1363 | |||
| 1364 | static int ahci_sb600_check_ready(struct ata_link *link) | ||
| 1365 | { | ||
| 1366 | void __iomem *port_mmio = ahci_port_base(link->ap); | ||
| 1367 | u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF; | ||
| 1368 | u32 irq_status = readl(port_mmio + PORT_IRQ_STAT); | ||
| 1369 | |||
| 1370 | /* | ||
| 1371 | * There is no need to check TFDATA if BAD PMP is found due to HW bug, | ||
| 1372 | * which can save timeout delay. | ||
| 1373 | */ | ||
| 1374 | if (irq_status & PORT_IRQ_BAD_PMP) | ||
| 1375 | return -EIO; | ||
| 1376 | |||
| 1377 | return ata_check_ready(status); | ||
| 1378 | } | ||
| 1379 | |||
| 1380 | static int ahci_sb600_softreset(struct ata_link *link, unsigned int *class, | ||
| 1381 | unsigned long deadline) | ||
| 1382 | { | ||
| 1383 | struct ata_port *ap = link->ap; | ||
| 1384 | void __iomem *port_mmio = ahci_port_base(ap); | ||
| 1385 | int pmp = sata_srst_pmp(link); | ||
| 1386 | int rc; | ||
| 1387 | u32 irq_sts; | ||
| 1388 | |||
| 1389 | DPRINTK("ENTER\n"); | ||
| 1390 | |||
| 1391 | rc = ahci_do_softreset(link, class, pmp, deadline, | ||
| 1392 | ahci_sb600_check_ready); | ||
| 1393 | |||
| 1394 | /* | ||
| 1395 | * Soft reset fails on some ATI chips with IPMS set when PMP | ||
| 1396 | * is enabled but SATA HDD/ODD is connected to SATA port, | ||
| 1397 | * do soft reset again to port 0. | ||
| 1398 | */ | ||
| 1399 | if (rc == -EIO) { | ||
| 1400 | irq_sts = readl(port_mmio + PORT_IRQ_STAT); | ||
| 1401 | if (irq_sts & PORT_IRQ_BAD_PMP) { | ||
| 1402 | ata_link_printk(link, KERN_WARNING, | ||
| 1403 | "failed due to HW bug, retry pmp=0\n"); | ||
| 1404 | rc = ahci_do_softreset(link, class, 0, deadline, | ||
| 1405 | ahci_check_ready); | ||
| 1406 | } | ||
| 1407 | } | ||
| 1408 | |||
| 1409 | return rc; | ||
| 1410 | } | ||
| 1411 | |||
| 1331 | static int ahci_hardreset(struct ata_link *link, unsigned int *class, | 1412 | static int ahci_hardreset(struct ata_link *link, unsigned int *class, |
| 1332 | unsigned long deadline) | 1413 | unsigned long deadline) |
| 1333 | { | 1414 | { |
| @@ -2118,7 +2199,8 @@ static void ahci_p5wdh_workaround(struct ata_host *host) | |||
| 2118 | static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | 2199 | static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
| 2119 | { | 2200 | { |
| 2120 | static int printed_version; | 2201 | static int printed_version; |
| 2121 | struct ata_port_info pi = ahci_port_info[ent->driver_data]; | 2202 | unsigned int board_id = ent->driver_data; |
| 2203 | struct ata_port_info pi = ahci_port_info[board_id]; | ||
| 2122 | const struct ata_port_info *ppi[] = { &pi, NULL }; | 2204 | const struct ata_port_info *ppi[] = { &pi, NULL }; |
| 2123 | struct device *dev = &pdev->dev; | 2205 | struct device *dev = &pdev->dev; |
| 2124 | struct ahci_host_priv *hpriv; | 2206 | struct ahci_host_priv *hpriv; |
| @@ -2167,6 +2249,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 2167 | return -ENOMEM; | 2249 | return -ENOMEM; |
| 2168 | hpriv->flags |= (unsigned long)pi.private_data; | 2250 | hpriv->flags |= (unsigned long)pi.private_data; |
| 2169 | 2251 | ||
| 2252 | /* MCP65 revision A1 and A2 can't do MSI */ | ||
| 2253 | if (board_id == board_ahci_mcp65 && | ||
| 2254 | (pdev->revision == 0xa1 || pdev->revision == 0xa2)) | ||
| 2255 | hpriv->flags |= AHCI_HFLAG_NO_MSI; | ||
| 2256 | |||
| 2170 | if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev)) | 2257 | if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev)) |
| 2171 | pci_intx(pdev, 1); | 2258 | pci_intx(pdev, 1); |
| 2172 | 2259 | ||
diff --git a/drivers/atm/eni.h b/drivers/atm/eni.h index d04fefb0841f..e4c9525e60b3 100644 --- a/drivers/atm/eni.h +++ b/drivers/atm/eni.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include "midway.h" | 18 | #include "midway.h" |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | #define KERNEL_OFFSET 0xC0000000 /* kernel 0x0 is at phys 0xC0000000 */ | ||
| 22 | #define DEV_LABEL "eni" | 21 | #define DEV_LABEL "eni" |
| 23 | 22 | ||
| 24 | #define UBR_BUFFER (128*1024) /* UBR buffer size */ | 23 | #define UBR_BUFFER (128*1024) /* UBR buffer size */ |
diff --git a/drivers/base/core.c b/drivers/base/core.c index 422cfcad486d..ee0a51a3a41d 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -762,6 +762,7 @@ static void device_remove_class_symlinks(struct device *dev) | |||
| 762 | /** | 762 | /** |
| 763 | * dev_set_name - set a device name | 763 | * dev_set_name - set a device name |
| 764 | * @dev: device | 764 | * @dev: device |
| 765 | * @fmt: format string for the device's name | ||
| 765 | */ | 766 | */ |
| 766 | int dev_set_name(struct device *dev, const char *fmt, ...) | 767 | int dev_set_name(struct device *dev, const char *fmt, ...) |
| 767 | { | 768 | { |
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index e336b05fe4a7..5f1e1cc6165a 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -53,15 +53,16 @@ | |||
| 53 | #include <linux/scatterlist.h> | 53 | #include <linux/scatterlist.h> |
| 54 | 54 | ||
| 55 | #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) | 55 | #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) |
| 56 | #define DRIVER_NAME "HP CISS Driver (v 3.6.14)" | 56 | #define DRIVER_NAME "HP CISS Driver (v 3.6.20)" |
| 57 | #define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,14) | 57 | #define DRIVER_VERSION CCISS_DRIVER_VERSION(3, 6, 20) |
| 58 | 58 | ||
| 59 | /* Embedded module documentation macros - see modules.h */ | 59 | /* Embedded module documentation macros - see modules.h */ |
| 60 | MODULE_AUTHOR("Hewlett-Packard Company"); | 60 | MODULE_AUTHOR("Hewlett-Packard Company"); |
| 61 | MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.14"); | 61 | MODULE_DESCRIPTION("Driver for HP Smart Array Controllers"); |
| 62 | MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" | 62 | MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" |
| 63 | " SA6i P600 P800 P400 P400i E200 E200i E500"); | 63 | " SA6i P600 P800 P400 P400i E200 E200i E500 P700m" |
| 64 | MODULE_VERSION("3.6.14"); | 64 | " Smart Array G2 Series SAS/SATA Controllers"); |
| 65 | MODULE_VERSION("3.6.20"); | ||
| 65 | MODULE_LICENSE("GPL"); | 66 | MODULE_LICENSE("GPL"); |
| 66 | 67 | ||
| 67 | #include "cciss_cmd.h" | 68 | #include "cciss_cmd.h" |
| @@ -90,6 +91,11 @@ static const struct pci_device_id cciss_pci_device_id[] = { | |||
| 90 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215}, | 91 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215}, |
| 91 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237}, | 92 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237}, |
| 92 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x323D}, | 93 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x323D}, |
| 94 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3241}, | ||
| 95 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3243}, | ||
| 96 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245}, | ||
| 97 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3247}, | ||
| 98 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249}, | ||
| 93 | {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, | 99 | {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, |
| 94 | PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, | 100 | PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, |
| 95 | {0,} | 101 | {0,} |
| @@ -123,6 +129,11 @@ static struct board_type products[] = { | |||
| 123 | {0x3215103C, "Smart Array E200i", &SA5_access, 120}, | 129 | {0x3215103C, "Smart Array E200i", &SA5_access, 120}, |
| 124 | {0x3237103C, "Smart Array E500", &SA5_access, 512}, | 130 | {0x3237103C, "Smart Array E500", &SA5_access, 512}, |
| 125 | {0x323D103C, "Smart Array P700m", &SA5_access, 512}, | 131 | {0x323D103C, "Smart Array P700m", &SA5_access, 512}, |
| 132 | {0x3241103C, "Smart Array P212", &SA5_access, 384}, | ||
| 133 | {0x3243103C, "Smart Array P410", &SA5_access, 384}, | ||
| 134 | {0x3245103C, "Smart Array P410i", &SA5_access, 384}, | ||
| 135 | {0x3247103C, "Smart Array P411", &SA5_access, 384}, | ||
| 136 | {0x3249103C, "Smart Array P812", &SA5_access, 384}, | ||
| 126 | {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120}, | 137 | {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120}, |
| 127 | }; | 138 | }; |
| 128 | 139 | ||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index d307bf26af58..2d854bb9373e 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -749,7 +749,7 @@ config NVRAM | |||
| 749 | if RTC_LIB=n | 749 | if RTC_LIB=n |
| 750 | 750 | ||
| 751 | config RTC | 751 | config RTC |
| 752 | tristate "Enhanced Real Time Clock Support" | 752 | tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)" |
| 753 | depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \ | 753 | depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \ |
| 754 | && !ARM && !SUPERH && !S390 && !AVR32 | 754 | && !ARM && !SUPERH && !S390 && !AVR32 |
| 755 | ---help--- | 755 | ---help--- |
| @@ -1036,9 +1036,9 @@ config HPET | |||
| 1036 | non-periodic and/or periodic. | 1036 | non-periodic and/or periodic. |
| 1037 | 1037 | ||
| 1038 | config HPET_RTC_IRQ | 1038 | config HPET_RTC_IRQ |
| 1039 | bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC | 1039 | bool |
| 1040 | default n | 1040 | default HPET_EMULATE_RTC |
| 1041 | depends on HPET | 1041 | depends on RTC && HPET |
| 1042 | help | 1042 | help |
| 1043 | If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It | 1043 | If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It |
| 1044 | is assumed the platform called hpet_alloc with the RTC IRQ values for | 1044 | is assumed the platform called hpet_alloc with the RTC IRQ values for |
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c index 55c97f623242..07b4d8ff56e5 100644 --- a/drivers/char/agp/ati-agp.c +++ b/drivers/char/agp/ati-agp.c | |||
| @@ -458,6 +458,10 @@ static struct agp_device_ids ati_agp_device_ids[] __devinitdata = | |||
| 458 | .chipset_name = "IGP9100/M", | 458 | .chipset_name = "IGP9100/M", |
| 459 | }, | 459 | }, |
| 460 | { | 460 | { |
| 461 | .device_id = PCI_DEVICE_ID_ATI_RS350_133, | ||
| 462 | .chipset_name = "IGP9000/M", | ||
| 463 | }, | ||
| 464 | { | ||
| 461 | .device_id = PCI_DEVICE_ID_ATI_RS350_200, | 465 | .device_id = PCI_DEVICE_ID_ATI_RS350_200, |
| 462 | .chipset_name = "IGP9100/M", | 466 | .chipset_name = "IGP9100/M", |
| 463 | }, | 467 | }, |
diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c index 2398e864c28d..a00869c650d5 100644 --- a/drivers/char/generic_nvram.c +++ b/drivers/char/generic_nvram.c | |||
| @@ -133,7 +133,7 @@ static struct miscdevice nvram_dev = { | |||
| 133 | 133 | ||
| 134 | int __init nvram_init(void) | 134 | int __init nvram_init(void) |
| 135 | { | 135 | { |
| 136 | printk(KERN_INFO "Macintosh non-volatile memory driver v%s\n", | 136 | printk(KERN_INFO "Generic non-volatile memory driver v%s\n", |
| 137 | NVRAM_VERSION); | 137 | NVRAM_VERSION); |
| 138 | return misc_register(&nvram_dev); | 138 | return misc_register(&nvram_dev); |
| 139 | } | 139 | } |
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c index 5cc651ef75eb..27fdc0866496 100644 --- a/drivers/char/hw_random/intel-rng.c +++ b/drivers/char/hw_random/intel-rng.c | |||
| @@ -273,7 +273,7 @@ static int __init intel_rng_hw_init(void *_intel_rng_hw) | |||
| 273 | if (mfc != INTEL_FWH_MANUFACTURER_CODE || | 273 | if (mfc != INTEL_FWH_MANUFACTURER_CODE || |
| 274 | (dvc != INTEL_FWH_DEVICE_CODE_8M && | 274 | (dvc != INTEL_FWH_DEVICE_CODE_8M && |
| 275 | dvc != INTEL_FWH_DEVICE_CODE_4M)) { | 275 | dvc != INTEL_FWH_DEVICE_CODE_4M)) { |
| 276 | printk(KERN_ERR PFX "FWH not detected\n"); | 276 | printk(KERN_NOTICE PFX "FWH not detected\n"); |
| 277 | return -ENODEV; | 277 | return -ENODEV; |
| 278 | } | 278 | } |
| 279 | 279 | ||
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 7f7e798c1384..d9a0a53c842d 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
| @@ -677,12 +677,7 @@ static void k_deadunicode(struct vc_data *vc, unsigned int value, char up_flag) | |||
| 677 | 677 | ||
| 678 | static void k_self(struct vc_data *vc, unsigned char value, char up_flag) | 678 | static void k_self(struct vc_data *vc, unsigned char value, char up_flag) |
| 679 | { | 679 | { |
| 680 | unsigned int uni; | 680 | k_unicode(vc, conv_8bit_to_uni(value), up_flag); |
| 681 | if (kbd->kbdmode == VC_UNICODE) | ||
| 682 | uni = value; | ||
| 683 | else | ||
| 684 | uni = conv_8bit_to_uni(value); | ||
| 685 | k_unicode(vc, uni, up_flag); | ||
| 686 | } | 681 | } |
| 687 | 682 | ||
| 688 | static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag) | 683 | static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag) |
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index fc555a90bb21..23554b676d6e 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c | |||
| @@ -38,6 +38,8 @@ static void cpuidle_kick_cpus(void) | |||
| 38 | static void cpuidle_kick_cpus(void) {} | 38 | static void cpuidle_kick_cpus(void) {} |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | static int __cpuidle_register_device(struct cpuidle_device *dev); | ||
| 42 | |||
| 41 | /** | 43 | /** |
| 42 | * cpuidle_idle_call - the main idle loop | 44 | * cpuidle_idle_call - the main idle loop |
| 43 | * | 45 | * |
| @@ -138,6 +140,12 @@ int cpuidle_enable_device(struct cpuidle_device *dev) | |||
| 138 | if (!dev->state_count) | 140 | if (!dev->state_count) |
| 139 | return -EINVAL; | 141 | return -EINVAL; |
| 140 | 142 | ||
| 143 | if (dev->registered == 0) { | ||
| 144 | ret = __cpuidle_register_device(dev); | ||
| 145 | if (ret) | ||
| 146 | return ret; | ||
| 147 | } | ||
| 148 | |||
| 141 | if ((ret = cpuidle_add_state_sysfs(dev))) | 149 | if ((ret = cpuidle_add_state_sysfs(dev))) |
| 142 | return ret; | 150 | return ret; |
| 143 | 151 | ||
| @@ -232,10 +240,13 @@ static void poll_idle_init(struct cpuidle_device *dev) {} | |||
| 232 | #endif /* CONFIG_ARCH_HAS_CPU_RELAX */ | 240 | #endif /* CONFIG_ARCH_HAS_CPU_RELAX */ |
| 233 | 241 | ||
| 234 | /** | 242 | /** |
| 235 | * cpuidle_register_device - registers a CPU's idle PM feature | 243 | * __cpuidle_register_device - internal register function called before register |
| 244 | * and enable routines | ||
| 236 | * @dev: the cpu | 245 | * @dev: the cpu |
| 246 | * | ||
| 247 | * cpuidle_lock mutex must be held before this is called | ||
| 237 | */ | 248 | */ |
| 238 | int cpuidle_register_device(struct cpuidle_device *dev) | 249 | static int __cpuidle_register_device(struct cpuidle_device *dev) |
| 239 | { | 250 | { |
| 240 | int ret; | 251 | int ret; |
| 241 | struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu); | 252 | struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu); |
| @@ -247,18 +258,34 @@ int cpuidle_register_device(struct cpuidle_device *dev) | |||
| 247 | 258 | ||
| 248 | init_completion(&dev->kobj_unregister); | 259 | init_completion(&dev->kobj_unregister); |
| 249 | 260 | ||
| 250 | mutex_lock(&cpuidle_lock); | ||
| 251 | |||
| 252 | poll_idle_init(dev); | 261 | poll_idle_init(dev); |
| 253 | 262 | ||
| 254 | per_cpu(cpuidle_devices, dev->cpu) = dev; | 263 | per_cpu(cpuidle_devices, dev->cpu) = dev; |
| 255 | list_add(&dev->device_list, &cpuidle_detected_devices); | 264 | list_add(&dev->device_list, &cpuidle_detected_devices); |
| 256 | if ((ret = cpuidle_add_sysfs(sys_dev))) { | 265 | if ((ret = cpuidle_add_sysfs(sys_dev))) { |
| 257 | mutex_unlock(&cpuidle_lock); | ||
| 258 | module_put(cpuidle_curr_driver->owner); | 266 | module_put(cpuidle_curr_driver->owner); |
| 259 | return ret; | 267 | return ret; |
| 260 | } | 268 | } |
| 261 | 269 | ||
| 270 | dev->registered = 1; | ||
| 271 | return 0; | ||
| 272 | } | ||
| 273 | |||
| 274 | /** | ||
| 275 | * cpuidle_register_device - registers a CPU's idle PM feature | ||
| 276 | * @dev: the cpu | ||
| 277 | */ | ||
| 278 | int cpuidle_register_device(struct cpuidle_device *dev) | ||
| 279 | { | ||
| 280 | int ret; | ||
| 281 | |||
| 282 | mutex_lock(&cpuidle_lock); | ||
| 283 | |||
| 284 | if ((ret = __cpuidle_register_device(dev))) { | ||
| 285 | mutex_unlock(&cpuidle_lock); | ||
| 286 | return ret; | ||
| 287 | } | ||
| 288 | |||
| 262 | cpuidle_enable_device(dev); | 289 | cpuidle_enable_device(dev); |
| 263 | cpuidle_install_idle_handler(); | 290 | cpuidle_install_idle_handler(); |
| 264 | 291 | ||
| @@ -278,6 +305,9 @@ void cpuidle_unregister_device(struct cpuidle_device *dev) | |||
| 278 | { | 305 | { |
| 279 | struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu); | 306 | struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu); |
| 280 | 307 | ||
| 308 | if (dev->registered == 0) | ||
| 309 | return; | ||
| 310 | |||
| 281 | cpuidle_pause_and_lock(); | 311 | cpuidle_pause_and_lock(); |
| 282 | 312 | ||
| 283 | cpuidle_disable_device(dev); | 313 | cpuidle_disable_device(dev); |
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index 9134488ac043..2d92214096ab 100644 --- a/drivers/ide/ide-generic.c +++ b/drivers/ide/ide-generic.c | |||
| @@ -22,6 +22,10 @@ | |||
| 22 | 22 | ||
| 23 | #define DRV_NAME "ide_generic" | 23 | #define DRV_NAME "ide_generic" |
| 24 | 24 | ||
| 25 | static int probe_mask = 0x03; | ||
| 26 | module_param(probe_mask, int, 0); | ||
| 27 | MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports"); | ||
| 28 | |||
| 25 | static ssize_t store_add(struct class *cls, const char *buf, size_t n) | 29 | static ssize_t store_add(struct class *cls, const char *buf, size_t n) |
| 26 | { | 30 | { |
| 27 | ide_hwif_t *hwif; | 31 | ide_hwif_t *hwif; |
| @@ -89,6 +93,9 @@ static int __init ide_generic_init(void) | |||
| 89 | u8 idx[MAX_HWIFS]; | 93 | u8 idx[MAX_HWIFS]; |
| 90 | int i; | 94 | int i; |
| 91 | 95 | ||
| 96 | printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module " | ||
| 97 | "parameter for probing all legacy ISA IDE ports\n"); | ||
| 98 | |||
| 92 | for (i = 0; i < MAX_HWIFS; i++) { | 99 | for (i = 0; i < MAX_HWIFS; i++) { |
| 93 | ide_hwif_t *hwif; | 100 | ide_hwif_t *hwif; |
| 94 | unsigned long io_addr = ide_default_io_base(i); | 101 | unsigned long io_addr = ide_default_io_base(i); |
| @@ -96,7 +103,7 @@ static int __init ide_generic_init(void) | |||
| 96 | 103 | ||
| 97 | idx[i] = 0xff; | 104 | idx[i] = 0xff; |
| 98 | 105 | ||
| 99 | if (io_addr) { | 106 | if ((probe_mask & (1 << i)) && io_addr) { |
| 100 | if (!request_region(io_addr, 8, DRV_NAME)) { | 107 | if (!request_region(io_addr, 8, DRV_NAME)) { |
| 101 | printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX " | 108 | printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX " |
| 102 | "not free.\n", | 109 | "not free.\n", |
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index aa2ea3deac85..f633b6b3c7f3 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
| @@ -135,13 +135,17 @@ static void ide_detach(struct pcmcia_device *link) | |||
| 135 | { | 135 | { |
| 136 | ide_info_t *info = link->priv; | 136 | ide_info_t *info = link->priv; |
| 137 | ide_hwif_t *hwif = info->hwif; | 137 | ide_hwif_t *hwif = info->hwif; |
| 138 | unsigned long data_addr, ctl_addr; | ||
| 138 | 139 | ||
| 139 | DEBUG(0, "ide_detach(0x%p)\n", link); | 140 | DEBUG(0, "ide_detach(0x%p)\n", link); |
| 140 | 141 | ||
| 142 | data_addr = hwif->io_ports.data_addr; | ||
| 143 | ctl_addr = hwif->io_ports.ctl_addr; | ||
| 144 | |||
| 141 | ide_release(link); | 145 | ide_release(link); |
| 142 | 146 | ||
| 143 | release_region(hwif->io_ports.ctl_addr, 1); | 147 | release_region(ctl_addr, 1); |
| 144 | release_region(hwif->io_ports.data_addr, 8); | 148 | release_region(data_addr, 8); |
| 145 | 149 | ||
| 146 | kfree(info); | 150 | kfree(info); |
| 147 | } /* ide_detach */ | 151 | } /* ide_detach */ |
| @@ -194,6 +198,16 @@ static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl, | |||
| 194 | if (hwif->present) | 198 | if (hwif->present) |
| 195 | return hwif; | 199 | return hwif; |
| 196 | 200 | ||
| 201 | /* retry registration in case device is still spinning up */ | ||
| 202 | for (i = 0; i < 10; i++) { | ||
| 203 | msleep(100); | ||
| 204 | ide_port_scan(hwif); | ||
| 205 | if (hwif->present) | ||
| 206 | return hwif; | ||
| 207 | } | ||
| 208 | |||
| 209 | return hwif; | ||
| 210 | |||
| 197 | out_release: | 211 | out_release: |
| 198 | release_region(ctl, 1); | 212 | release_region(ctl, 1); |
| 199 | release_region(io, 8); | 213 | release_region(io, 8); |
| @@ -222,7 +236,7 @@ static int ide_config(struct pcmcia_device *link) | |||
| 222 | cistpl_cftable_entry_t dflt; | 236 | cistpl_cftable_entry_t dflt; |
| 223 | } *stk = NULL; | 237 | } *stk = NULL; |
| 224 | cistpl_cftable_entry_t *cfg; | 238 | cistpl_cftable_entry_t *cfg; |
| 225 | int i, pass, last_ret = 0, last_fn = 0, is_kme = 0; | 239 | int pass, last_ret = 0, last_fn = 0, is_kme = 0; |
| 226 | unsigned long io_base, ctl_base; | 240 | unsigned long io_base, ctl_base; |
| 227 | ide_hwif_t *hwif; | 241 | ide_hwif_t *hwif; |
| 228 | 242 | ||
| @@ -319,30 +333,15 @@ static int ide_config(struct pcmcia_device *link) | |||
| 319 | if (is_kme) | 333 | if (is_kme) |
| 320 | outb(0x81, ctl_base+1); | 334 | outb(0x81, ctl_base+1); |
| 321 | 335 | ||
| 322 | /* retry registration in case device is still spinning up */ | 336 | hwif = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link); |
| 323 | for (i = 0; i < 10; i++) { | 337 | if (hwif == NULL && link->io.NumPorts1 == 0x20) { |
| 324 | hwif = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link); | ||
| 325 | if (hwif) | ||
| 326 | break; | ||
| 327 | if (link->io.NumPorts1 == 0x20) { | ||
| 328 | outb(0x02, ctl_base + 0x10); | 338 | outb(0x02, ctl_base + 0x10); |
| 329 | hwif = idecs_register(io_base + 0x10, ctl_base + 0x10, | 339 | hwif = idecs_register(io_base + 0x10, ctl_base + 0x10, |
| 330 | link->irq.AssignedIRQ, link); | 340 | link->irq.AssignedIRQ, link); |
| 331 | if (hwif) { | ||
| 332 | io_base += 0x10; | ||
| 333 | ctl_base += 0x10; | ||
| 334 | break; | ||
| 335 | } | ||
| 336 | } | ||
| 337 | msleep(100); | ||
| 338 | } | 341 | } |
| 339 | 342 | ||
| 340 | if (hwif == NULL) { | 343 | if (hwif == NULL) |
| 341 | printk(KERN_NOTICE "ide-cs: ide_register() at 0x%3lx & 0x%3lx" | ||
| 342 | ", irq %u failed\n", io_base, ctl_base, | ||
| 343 | link->irq.AssignedIRQ); | ||
| 344 | goto failed; | 344 | goto failed; |
| 345 | } | ||
| 346 | 345 | ||
| 347 | info->ndev = 1; | 346 | info->ndev = 1; |
| 348 | sprintf(info->node.dev_name, "hd%c", 'a' + hwif->index * 2); | 347 | sprintf(info->node.dev_name, "hd%c", 'a' + hwif->index * 2); |
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c index 6e99080497bf..725c80508d90 100644 --- a/drivers/ide/pci/opti621.c +++ b/drivers/ide/pci/opti621.c | |||
| @@ -81,8 +81,6 @@ | |||
| 81 | * 0.5 doesn't work. | 81 | * 0.5 doesn't work. |
| 82 | */ | 82 | */ |
| 83 | 83 | ||
| 84 | #define OPTI621_DEBUG /* define for debug messages */ | ||
| 85 | |||
| 86 | #include <linux/types.h> | 84 | #include <linux/types.h> |
| 87 | #include <linux/module.h> | 85 | #include <linux/module.h> |
| 88 | #include <linux/kernel.h> | 86 | #include <linux/kernel.h> |
| @@ -92,28 +90,6 @@ | |||
| 92 | 90 | ||
| 93 | #include <asm/io.h> | 91 | #include <asm/io.h> |
| 94 | 92 | ||
| 95 | //#define OPTI621_MAX_PIO 3 | ||
| 96 | /* In fact, I do not have any PIO 4 drive | ||
| 97 | * (address: 25 ns, data: 70 ns, recovery: 35 ns), | ||
| 98 | * but OPTi 82C621 is programmable and it can do (minimal values): | ||
| 99 | * on 40MHz PCI bus (pulse 25 ns): | ||
| 100 | * address: 25 ns, data: 25 ns, recovery: 50 ns; | ||
| 101 | * on 20MHz PCI bus (pulse 50 ns): | ||
| 102 | * address: 50 ns, data: 50 ns, recovery: 100 ns. | ||
| 103 | */ | ||
| 104 | |||
| 105 | /* #define READ_PREFETCH 0 */ | ||
| 106 | /* Uncomment for disable read prefetch. | ||
| 107 | * There is some readprefetch capatibility in hdparm, | ||
| 108 | * but when I type hdparm -P 1 /dev/hda, I got errors | ||
| 109 | * and till reset drive is inaccessible. | ||
| 110 | * This (hw) read prefetch is safe on my drive. | ||
| 111 | */ | ||
| 112 | |||
| 113 | #ifndef READ_PREFETCH | ||
| 114 | #define READ_PREFETCH 0x40 /* read prefetch is enabled */ | ||
| 115 | #endif /* else read prefetch is disabled */ | ||
| 116 | |||
| 117 | #define READ_REG 0 /* index of Read cycle timing register */ | 93 | #define READ_REG 0 /* index of Read cycle timing register */ |
| 118 | #define WRITE_REG 1 /* index of Write cycle timing register */ | 94 | #define WRITE_REG 1 /* index of Write cycle timing register */ |
| 119 | #define CNTRL_REG 3 /* index of Control register */ | 95 | #define CNTRL_REG 3 /* index of Control register */ |
| @@ -122,51 +98,8 @@ | |||
| 122 | 98 | ||
| 123 | static int reg_base; | 99 | static int reg_base; |
| 124 | 100 | ||
| 125 | #define PIO_NOT_EXIST 254 | ||
| 126 | #define PIO_DONT_KNOW 255 | ||
| 127 | |||
| 128 | static DEFINE_SPINLOCK(opti621_lock); | 101 | static DEFINE_SPINLOCK(opti621_lock); |
| 129 | 102 | ||
| 130 | /* there are stored pio numbers from other calls of opti621_set_pio_mode */ | ||
| 131 | static void compute_pios(ide_drive_t *drive, const u8 pio) | ||
| 132 | /* Store values into drive->drive_data | ||
| 133 | * second_contr - 0 for primary controller, 1 for secondary | ||
| 134 | * slave_drive - 0 -> pio is for master, 1 -> pio is for slave | ||
| 135 | * pio - PIO mode for selected drive (for other we don't know) | ||
| 136 | */ | ||
| 137 | { | ||
| 138 | int d; | ||
| 139 | ide_hwif_t *hwif = HWIF(drive); | ||
| 140 | |||
| 141 | drive->drive_data = pio; | ||
| 142 | |||
| 143 | for (d = 0; d < 2; ++d) { | ||
| 144 | drive = &hwif->drives[d]; | ||
| 145 | if (drive->present) { | ||
| 146 | if (drive->drive_data == PIO_DONT_KNOW) | ||
| 147 | drive->drive_data = ide_get_best_pio_mode(drive, 255, 3); | ||
| 148 | #ifdef OPTI621_DEBUG | ||
| 149 | printk("%s: Selected PIO mode %d\n", | ||
| 150 | drive->name, drive->drive_data); | ||
| 151 | #endif | ||
| 152 | } else { | ||
| 153 | drive->drive_data = PIO_NOT_EXIST; | ||
| 154 | } | ||
| 155 | } | ||
| 156 | } | ||
| 157 | |||
| 158 | static int cmpt_clk(int time, int bus_speed) | ||
| 159 | /* Returns (rounded up) time in clocks for time in ns, | ||
| 160 | * with bus_speed in MHz. | ||
| 161 | * Example: bus_speed = 40 MHz, time = 80 ns | ||
| 162 | * 1000/40 = 25 ns (clk value), | ||
| 163 | * 80/25 = 3.2, rounded up to 4 (I hope ;-)). | ||
| 164 | * Use idebus=xx to select right frequency. | ||
| 165 | */ | ||
| 166 | { | ||
| 167 | return ((time*bus_speed+999)/1000); | ||
| 168 | } | ||
| 169 | |||
| 170 | /* Write value to register reg, base of register | 103 | /* Write value to register reg, base of register |
| 171 | * is at reg_base (0x1f0 primary, 0x170 secondary, | 104 | * is at reg_base (0x1f0 primary, 0x170 secondary, |
| 172 | * if not changed by PCI configuration). | 105 | * if not changed by PCI configuration). |
| @@ -199,83 +132,29 @@ static u8 read_reg(int reg) | |||
| 199 | return ret; | 132 | return ret; |
| 200 | } | 133 | } |
| 201 | 134 | ||
| 202 | typedef struct pio_clocks_s { | ||
| 203 | int address_time; /* Address setup (clocks) */ | ||
| 204 | int data_time; /* Active/data pulse (clocks) */ | ||
| 205 | int recovery_time; /* Recovery time (clocks) */ | ||
| 206 | } pio_clocks_t; | ||
| 207 | |||
| 208 | static void compute_clocks(int pio, pio_clocks_t *clks) | ||
| 209 | { | ||
| 210 | if (pio != PIO_NOT_EXIST) { | ||
| 211 | int adr_setup, data_pls; | ||
| 212 | int bus_speed = ide_pci_clk ? ide_pci_clk : system_bus_clock(); | ||
| 213 | |||
| 214 | adr_setup = ide_pio_timings[pio].setup_time; | ||
| 215 | data_pls = ide_pio_timings[pio].active_time; | ||
| 216 | clks->address_time = cmpt_clk(adr_setup, bus_speed); | ||
| 217 | clks->data_time = cmpt_clk(data_pls, bus_speed); | ||
| 218 | clks->recovery_time = cmpt_clk(ide_pio_timings[pio].cycle_time | ||
| 219 | - adr_setup-data_pls, bus_speed); | ||
| 220 | if (clks->address_time < 1) | ||
| 221 | clks->address_time = 1; | ||
| 222 | if (clks->address_time > 4) | ||
| 223 | clks->address_time = 4; | ||
| 224 | if (clks->data_time < 1) | ||
| 225 | clks->data_time = 1; | ||
| 226 | if (clks->data_time > 16) | ||
| 227 | clks->data_time = 16; | ||
| 228 | if (clks->recovery_time < 2) | ||
| 229 | clks->recovery_time = 2; | ||
| 230 | if (clks->recovery_time > 17) | ||
| 231 | clks->recovery_time = 17; | ||
| 232 | } else { | ||
| 233 | clks->address_time = 1; | ||
| 234 | clks->data_time = 1; | ||
| 235 | clks->recovery_time = 2; | ||
| 236 | /* minimal values */ | ||
| 237 | } | ||
| 238 | } | ||
| 239 | |||
| 240 | static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) | 135 | static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) |
| 241 | { | 136 | { |
| 242 | /* primary and secondary drives share some registers, | 137 | ide_hwif_t *hwif = drive->hwif; |
| 243 | * so we have to program both drives | 138 | ide_drive_t *pair = ide_get_paired_drive(drive); |
| 244 | */ | ||
| 245 | unsigned long flags; | 139 | unsigned long flags; |
| 246 | u8 pio1 = 0, pio2 = 0; | 140 | u8 tim, misc, addr_pio = pio, clk; |
| 247 | pio_clocks_t first, second; | 141 | |
| 248 | int ax, drdy; | 142 | /* DRDY is default 2 (by OPTi Databook) */ |
| 249 | u8 cycle1, cycle2, misc; | 143 | static const u8 addr_timings[2][5] = { |
| 250 | ide_hwif_t *hwif = HWIF(drive); | 144 | { 0x20, 0x10, 0x00, 0x00, 0x00 }, /* 33 MHz */ |
| 251 | 145 | { 0x10, 0x10, 0x00, 0x00, 0x00 }, /* 25 MHz */ | |
| 252 | /* sets drive->drive_data for both drives */ | 146 | }; |
| 253 | compute_pios(drive, pio); | 147 | static const u8 data_rec_timings[2][5] = { |
| 254 | pio1 = hwif->drives[0].drive_data; | 148 | { 0x5b, 0x45, 0x32, 0x21, 0x20 }, /* 33 MHz */ |
| 255 | pio2 = hwif->drives[1].drive_data; | 149 | { 0x48, 0x34, 0x21, 0x10, 0x10 } /* 25 MHz */ |
| 256 | 150 | }; | |
| 257 | compute_clocks(pio1, &first); | 151 | |
| 258 | compute_clocks(pio2, &second); | 152 | drive->drive_data = XFER_PIO_0 + pio; |
| 259 | 153 | ||
| 260 | /* ax = max(a1,a2) */ | 154 | if (pair->present) { |
| 261 | ax = (first.address_time < second.address_time) ? second.address_time : first.address_time; | 155 | if (pair->drive_data && pair->drive_data < drive->drive_data) |
| 262 | 156 | addr_pio = pair->drive_data - XFER_PIO_0; | |
| 263 | drdy = 2; /* DRDY is default 2 (by OPTi Databook) */ | 157 | } |
| 264 | |||
| 265 | cycle1 = ((first.data_time-1)<<4) | (first.recovery_time-2); | ||
| 266 | cycle2 = ((second.data_time-1)<<4) | (second.recovery_time-2); | ||
| 267 | misc = READ_PREFETCH | ((ax-1)<<4) | ((drdy-2)<<1); | ||
| 268 | |||
| 269 | #ifdef OPTI621_DEBUG | ||
| 270 | printk("%s: master: address: %d, data: %d, " | ||
| 271 | "recovery: %d, drdy: %d [clk]\n", | ||
| 272 | hwif->name, ax, first.data_time, | ||
| 273 | first.recovery_time, drdy); | ||
| 274 | printk("%s: slave: address: %d, data: %d, " | ||
| 275 | "recovery: %d, drdy: %d [clk]\n", | ||
| 276 | hwif->name, ax, second.data_time, | ||
| 277 | second.recovery_time, drdy); | ||
| 278 | #endif | ||
| 279 | 158 | ||
| 280 | spin_lock_irqsave(&opti621_lock, flags); | 159 | spin_lock_irqsave(&opti621_lock, flags); |
| 281 | 160 | ||
| @@ -289,24 +168,21 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
| 289 | (void)inb(reg_base + CNTRL_REG); | 168 | (void)inb(reg_base + CNTRL_REG); |
| 290 | /* if reads 0xc0, no interface exist? */ | 169 | /* if reads 0xc0, no interface exist? */ |
| 291 | read_reg(CNTRL_REG); | 170 | read_reg(CNTRL_REG); |
| 292 | /* read version, probably 0 */ | ||
| 293 | read_reg(STRAP_REG); | ||
| 294 | 171 | ||
| 295 | /* program primary drive */ | 172 | /* check CLK speed */ |
| 296 | /* select Index-0 for Register-A */ | 173 | clk = read_reg(STRAP_REG) & 1; |
| 297 | write_reg(0, MISC_REG); | 174 | |
| 298 | /* set read cycle timings */ | 175 | printk(KERN_INFO "%s: CLK = %d MHz\n", hwif->name, clk ? 25 : 33); |
| 299 | write_reg(cycle1, READ_REG); | ||
| 300 | /* set write cycle timings */ | ||
| 301 | write_reg(cycle1, WRITE_REG); | ||
| 302 | 176 | ||
| 303 | /* program secondary drive */ | 177 | tim = data_rec_timings[clk][pio]; |
| 304 | /* select Index-1 for Register-B */ | 178 | misc = addr_timings[clk][addr_pio]; |
| 305 | write_reg(1, MISC_REG); | 179 | |
| 180 | /* select Index-0/1 for Register-A/B */ | ||
| 181 | write_reg(drive->select.b.unit, MISC_REG); | ||
| 306 | /* set read cycle timings */ | 182 | /* set read cycle timings */ |
| 307 | write_reg(cycle2, READ_REG); | 183 | write_reg(tim, READ_REG); |
| 308 | /* set write cycle timings */ | 184 | /* set write cycle timings */ |
| 309 | write_reg(cycle2, WRITE_REG); | 185 | write_reg(tim, WRITE_REG); |
| 310 | 186 | ||
| 311 | /* use Register-A for drive 0 */ | 187 | /* use Register-A for drive 0 */ |
| 312 | /* use Register-B for drive 1 */ | 188 | /* use Register-B for drive 1 */ |
| @@ -319,45 +195,26 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
| 319 | spin_unlock_irqrestore(&opti621_lock, flags); | 195 | spin_unlock_irqrestore(&opti621_lock, flags); |
| 320 | } | 196 | } |
| 321 | 197 | ||
| 322 | static void __devinit opti621_port_init_devs(ide_hwif_t *hwif) | ||
| 323 | { | ||
| 324 | hwif->drives[0].drive_data = PIO_DONT_KNOW; | ||
| 325 | hwif->drives[1].drive_data = PIO_DONT_KNOW; | ||
| 326 | } | ||
| 327 | |||
| 328 | static const struct ide_port_ops opti621_port_ops = { | 198 | static const struct ide_port_ops opti621_port_ops = { |
| 329 | .port_init_devs = opti621_port_init_devs, | ||
| 330 | .set_pio_mode = opti621_set_pio_mode, | 199 | .set_pio_mode = opti621_set_pio_mode, |
| 331 | }; | 200 | }; |
| 332 | 201 | ||
| 333 | static const struct ide_port_info opti621_chipsets[] __devinitdata = { | 202 | static const struct ide_port_info opti621_chipset __devinitdata = { |
| 334 | { /* 0 */ | 203 | .name = "OPTI621/X", |
| 335 | .name = "OPTI621", | 204 | .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} }, |
| 336 | .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} }, | 205 | .port_ops = &opti621_port_ops, |
| 337 | .port_ops = &opti621_port_ops, | 206 | .host_flags = IDE_HFLAG_NO_DMA, |
| 338 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, | 207 | .pio_mask = ATA_PIO4, |
| 339 | .pio_mask = ATA_PIO3, | ||
| 340 | .swdma_mask = ATA_SWDMA2, | ||
| 341 | .mwdma_mask = ATA_MWDMA2, | ||
| 342 | }, { /* 1 */ | ||
| 343 | .name = "OPTI621X", | ||
| 344 | .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} }, | ||
| 345 | .port_ops = &opti621_port_ops, | ||
| 346 | .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, | ||
| 347 | .pio_mask = ATA_PIO3, | ||
| 348 | .swdma_mask = ATA_SWDMA2, | ||
| 349 | .mwdma_mask = ATA_MWDMA2, | ||
| 350 | } | ||
| 351 | }; | 208 | }; |
| 352 | 209 | ||
| 353 | static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 210 | static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
| 354 | { | 211 | { |
| 355 | return ide_setup_pci_device(dev, &opti621_chipsets[id->driver_data]); | 212 | return ide_setup_pci_device(dev, &opti621_chipset); |
| 356 | } | 213 | } |
| 357 | 214 | ||
| 358 | static const struct pci_device_id opti621_pci_tbl[] = { | 215 | static const struct pci_device_id opti621_pci_tbl[] = { |
| 359 | { PCI_VDEVICE(OPTI, PCI_DEVICE_ID_OPTI_82C621), 0 }, | 216 | { PCI_VDEVICE(OPTI, PCI_DEVICE_ID_OPTI_82C621), 0 }, |
| 360 | { PCI_VDEVICE(OPTI, PCI_DEVICE_ID_OPTI_82C825), 1 }, | 217 | { PCI_VDEVICE(OPTI, PCI_DEVICE_ID_OPTI_82C825), 0 }, |
| 361 | { 0, }, | 218 | { 0, }, |
| 362 | }; | 219 | }; |
| 363 | MODULE_DEVICE_TABLE(pci, opti621_pci_tbl); | 220 | MODULE_DEVICE_TABLE(pci, opti621_pci_tbl); |
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 48aa019127bc..ba2d58727964 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
| @@ -59,7 +59,6 @@ typedef struct pmac_ide_hwif { | |||
| 59 | int irq; | 59 | int irq; |
| 60 | int kind; | 60 | int kind; |
| 61 | int aapl_bus_id; | 61 | int aapl_bus_id; |
| 62 | unsigned cable_80 : 1; | ||
| 63 | unsigned mediabay : 1; | 62 | unsigned mediabay : 1; |
| 64 | unsigned broken_dma : 1; | 63 | unsigned broken_dma : 1; |
| 65 | unsigned broken_dma_warn : 1; | 64 | unsigned broken_dma_warn : 1; |
| @@ -918,10 +917,40 @@ pmac_ide_do_resume(ide_hwif_t *hwif) | |||
| 918 | return 0; | 917 | return 0; |
| 919 | } | 918 | } |
| 920 | 919 | ||
| 920 | static u8 pmac_ide_cable_detect(ide_hwif_t *hwif) | ||
| 921 | { | ||
| 922 | pmac_ide_hwif_t *pmif = (pmac_ide_hwif_t *)ide_get_hwifdata(hwif); | ||
| 923 | struct device_node *np = pmif->node; | ||
| 924 | const char *cable = of_get_property(np, "cable-type", NULL); | ||
| 925 | |||
| 926 | /* Get cable type from device-tree. */ | ||
| 927 | if (cable && !strncmp(cable, "80-", 3)) | ||
| 928 | return ATA_CBL_PATA80; | ||
| 929 | |||
| 930 | /* | ||
| 931 | * G5's seem to have incorrect cable type in device-tree. | ||
| 932 | * Let's assume they have a 80 conductor cable, this seem | ||
| 933 | * to be always the case unless the user mucked around. | ||
| 934 | */ | ||
| 935 | if (of_device_is_compatible(np, "K2-UATA") || | ||
| 936 | of_device_is_compatible(np, "shasta-ata")) | ||
| 937 | return ATA_CBL_PATA80; | ||
| 938 | |||
| 939 | return ATA_CBL_PATA40; | ||
| 940 | } | ||
| 941 | |||
| 921 | static const struct ide_port_ops pmac_ide_ata6_port_ops = { | 942 | static const struct ide_port_ops pmac_ide_ata6_port_ops = { |
| 922 | .set_pio_mode = pmac_ide_set_pio_mode, | 943 | .set_pio_mode = pmac_ide_set_pio_mode, |
| 923 | .set_dma_mode = pmac_ide_set_dma_mode, | 944 | .set_dma_mode = pmac_ide_set_dma_mode, |
| 924 | .selectproc = pmac_ide_kauai_selectproc, | 945 | .selectproc = pmac_ide_kauai_selectproc, |
| 946 | .cable_detect = pmac_ide_cable_detect, | ||
| 947 | }; | ||
| 948 | |||
| 949 | static const struct ide_port_ops pmac_ide_ata4_port_ops = { | ||
| 950 | .set_pio_mode = pmac_ide_set_pio_mode, | ||
| 951 | .set_dma_mode = pmac_ide_set_dma_mode, | ||
| 952 | .selectproc = pmac_ide_selectproc, | ||
| 953 | .cable_detect = pmac_ide_cable_detect, | ||
| 925 | }; | 954 | }; |
| 926 | 955 | ||
| 927 | static const struct ide_port_ops pmac_ide_port_ops = { | 956 | static const struct ide_port_ops pmac_ide_port_ops = { |
| @@ -949,10 +978,7 @@ static const struct ide_port_info pmac_port_info = { | |||
| 949 | 978 | ||
| 950 | /* | 979 | /* |
| 951 | * Setup, register & probe an IDE channel driven by this driver, this is | 980 | * Setup, register & probe an IDE channel driven by this driver, this is |
| 952 | * called by one of the 2 probe functions (macio or PCI). Note that a channel | 981 | * called by one of the 2 probe functions (macio or PCI). |
| 953 | * that ends up beeing free of any device is not kept around by this driver | ||
| 954 | * (it is kept in 2.4). This introduce an interface numbering change on some | ||
| 955 | * rare machines unfortunately, but it's better this way. | ||
| 956 | */ | 982 | */ |
| 957 | static int __devinit | 983 | static int __devinit |
| 958 | pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) | 984 | pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) |
| @@ -962,7 +988,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) | |||
| 962 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | 988 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; |
| 963 | struct ide_port_info d = pmac_port_info; | 989 | struct ide_port_info d = pmac_port_info; |
| 964 | 990 | ||
| 965 | pmif->cable_80 = 0; | ||
| 966 | pmif->broken_dma = pmif->broken_dma_warn = 0; | 991 | pmif->broken_dma = pmif->broken_dma_warn = 0; |
| 967 | if (of_device_is_compatible(np, "shasta-ata")) { | 992 | if (of_device_is_compatible(np, "shasta-ata")) { |
| 968 | pmif->kind = controller_sh_ata6; | 993 | pmif->kind = controller_sh_ata6; |
| @@ -979,6 +1004,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) | |||
| 979 | } else if (of_device_is_compatible(np, "keylargo-ata")) { | 1004 | } else if (of_device_is_compatible(np, "keylargo-ata")) { |
| 980 | if (strcmp(np->name, "ata-4") == 0) { | 1005 | if (strcmp(np->name, "ata-4") == 0) { |
| 981 | pmif->kind = controller_kl_ata4; | 1006 | pmif->kind = controller_kl_ata4; |
| 1007 | d.port_ops = &pmac_ide_ata4_port_ops; | ||
| 982 | d.udma_mask = ATA_UDMA4; | 1008 | d.udma_mask = ATA_UDMA4; |
| 983 | } else | 1009 | } else |
| 984 | pmif->kind = controller_kl_ata3; | 1010 | pmif->kind = controller_kl_ata3; |
| @@ -992,22 +1018,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) | |||
| 992 | bidp = of_get_property(np, "AAPL,bus-id", NULL); | 1018 | bidp = of_get_property(np, "AAPL,bus-id", NULL); |
| 993 | pmif->aapl_bus_id = bidp ? *bidp : 0; | 1019 | pmif->aapl_bus_id = bidp ? *bidp : 0; |
| 994 | 1020 | ||
| 995 | /* Get cable type from device-tree */ | ||
| 996 | if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6 | ||
| 997 | || pmif->kind == controller_k2_ata6 | ||
| 998 | || pmif->kind == controller_sh_ata6) { | ||
| 999 | const char* cable = of_get_property(np, "cable-type", NULL); | ||
| 1000 | if (cable && !strncmp(cable, "80-", 3)) | ||
| 1001 | pmif->cable_80 = 1; | ||
| 1002 | } | ||
| 1003 | /* G5's seem to have incorrect cable type in device-tree. Let's assume | ||
| 1004 | * they have a 80 conductor cable, this seem to be always the case unless | ||
| 1005 | * the user mucked around | ||
| 1006 | */ | ||
| 1007 | if (of_device_is_compatible(np, "K2-UATA") || | ||
| 1008 | of_device_is_compatible(np, "shasta-ata")) | ||
| 1009 | pmif->cable_80 = 1; | ||
| 1010 | |||
| 1011 | /* On Kauai-type controllers, we make sure the FCR is correct */ | 1021 | /* On Kauai-type controllers, we make sure the FCR is correct */ |
| 1012 | if (pmif->kauai_fcr) | 1022 | if (pmif->kauai_fcr) |
| 1013 | writel(KAUAI_FCR_UATA_MAGIC | | 1023 | writel(KAUAI_FCR_UATA_MAGIC | |
| @@ -1053,7 +1063,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) | |||
| 1053 | 1063 | ||
| 1054 | hwif->hwif_data = pmif; | 1064 | hwif->hwif_data = pmif; |
| 1055 | ide_init_port_hw(hwif, hw); | 1065 | ide_init_port_hw(hwif, hw); |
| 1056 | hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40; | ||
| 1057 | 1066 | ||
| 1058 | printk(KERN_INFO "ide%d: Found Apple %s controller, bus ID %d%s, irq %d\n", | 1067 | printk(KERN_INFO "ide%d: Found Apple %s controller, bus ID %d%s, irq %d\n", |
| 1059 | hwif->index, model_name[pmif->kind], pmif->aapl_bus_id, | 1068 | hwif->index, model_name[pmif->kind], pmif->aapl_bus_id, |
| @@ -1070,11 +1079,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) | |||
| 1070 | } | 1079 | } |
| 1071 | } | 1080 | } |
| 1072 | 1081 | ||
| 1073 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | ||
| 1074 | if (pmif->cable_80 == 0) | ||
| 1075 | d.udma_mask &= ATA_UDMA2; | ||
| 1076 | #endif | ||
| 1077 | |||
| 1078 | idx[0] = hwif->index; | 1082 | idx[0] = hwif->index; |
| 1079 | 1083 | ||
| 1080 | ide_device_add(idx, &d); | 1084 | ide_device_add(idx, &d); |
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index 5fcbdccd7a53..16a874bb1561 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c | |||
| @@ -806,7 +806,6 @@ static int DIVA_INIT_FUNCTION divas_init(void) | |||
| 806 | 806 | ||
| 807 | if (!create_divas_proc()) { | 807 | if (!create_divas_proc()) { |
| 808 | #ifdef MODULE | 808 | #ifdef MODULE |
| 809 | remove_divas_proc(); | ||
| 810 | divas_unregister_chrdev(); | 809 | divas_unregister_chrdev(); |
| 811 | divasfunc_exit(); | 810 | divasfunc_exit(); |
| 812 | #endif | 811 | #endif |
diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c index fae895828a17..040827288ec9 100644 --- a/drivers/isdn/hardware/eicon/divasproc.c +++ b/drivers/isdn/hardware/eicon/divasproc.c | |||
| @@ -125,8 +125,8 @@ static const struct file_operations divas_fops = { | |||
| 125 | 125 | ||
| 126 | int create_divas_proc(void) | 126 | int create_divas_proc(void) |
| 127 | { | 127 | { |
| 128 | proc_create(divas_proc_name, S_IFREG | S_IRUGO, proc_net_eicon, | 128 | divas_proc_entry = proc_create(divas_proc_name, S_IFREG | S_IRUGO, |
| 129 | &divas_fops); | 129 | proc_net_eicon, &divas_fops); |
| 130 | if (!divas_proc_entry) | 130 | if (!divas_proc_entry) |
| 131 | return (0); | 131 | return (0); |
| 132 | 132 | ||
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c index 15906d005b05..484299b031f8 100644 --- a/drivers/isdn/hysdn/hysdn_procconf.c +++ b/drivers/isdn/hysdn/hysdn_procconf.c | |||
| @@ -207,30 +207,17 @@ hysdn_conf_write(struct file *file, const char __user *buf, size_t count, loff_t | |||
| 207 | /* read conf file -> output card info data */ | 207 | /* read conf file -> output card info data */ |
| 208 | /*******************************************/ | 208 | /*******************************************/ |
| 209 | static ssize_t | 209 | static ssize_t |
| 210 | hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t * off) | 210 | hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t *off) |
| 211 | { | 211 | { |
| 212 | char *cp; | 212 | char *cp; |
| 213 | int i; | ||
| 214 | 213 | ||
| 215 | if (file->f_mode & FMODE_READ) { | 214 | if (!(file->f_mode & FMODE_READ)) |
| 216 | if (!(cp = file->private_data)) | 215 | return -EPERM; /* no permission to read */ |
| 217 | return (-EFAULT); /* should never happen */ | 216 | |
| 218 | i = strlen(cp); /* get total string length */ | 217 | if (!(cp = file->private_data)) |
| 219 | if (*off < i) { | 218 | return -EFAULT; /* should never happen */ |
| 220 | /* still bytes to transfer */ | 219 | |
| 221 | cp += *off; /* point to desired data offset */ | 220 | return simple_read_from_buffer(buf, count, off, cp, strlen(cp)); |
| 222 | i -= *off; /* remaining length */ | ||
| 223 | if (i > count) | ||
| 224 | i = count; /* limit length to transfer */ | ||
| 225 | if (copy_to_user(buf, cp, i)) | ||
| 226 | return (-EFAULT); /* copy error */ | ||
| 227 | *off += i; /* adjust offset */ | ||
| 228 | } else | ||
| 229 | return (0); | ||
| 230 | } else | ||
| 231 | return (-EPERM); /* no permission to read */ | ||
| 232 | |||
| 233 | return (i); | ||
| 234 | } /* hysdn_conf_read */ | 221 | } /* hysdn_conf_read */ |
| 235 | 222 | ||
| 236 | /******************/ | 223 | /******************/ |
diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c index 7817d2244921..1081091bbfaf 100644 --- a/drivers/isdn/sc/ioctl.c +++ b/drivers/isdn/sc/ioctl.c | |||
| @@ -226,6 +226,7 @@ int sc_ioctl(int card, scs_ioctl *data) | |||
| 226 | */ | 226 | */ |
| 227 | if (copy_from_user(spid, data->dataptr, SCIOC_SPIDSIZE)) { | 227 | if (copy_from_user(spid, data->dataptr, SCIOC_SPIDSIZE)) { |
| 228 | kfree(rcvmsg); | 228 | kfree(rcvmsg); |
| 229 | kfree(spid); | ||
| 229 | return -EFAULT; | 230 | return -EFAULT; |
| 230 | } | 231 | } |
| 231 | 232 | ||
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 82add26cc665..818aba368541 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
| @@ -84,7 +84,7 @@ struct media_bay_info { | |||
| 84 | int cd_irq; | 84 | int cd_irq; |
| 85 | int cd_retry; | 85 | int cd_retry; |
| 86 | #endif | 86 | #endif |
| 87 | #if defined(CONFIG_BLK_DEV_IDE_PMAC) || defined(CONFIG_MAC_FLOPPY) | 87 | #if defined(CONFIG_BLK_DEV_IDE_PMAC) |
| 88 | int cd_index; | 88 | int cd_index; |
| 89 | #endif | 89 | #endif |
| 90 | }; | 90 | }; |
| @@ -417,6 +417,7 @@ static void poll_media_bay(struct media_bay_info* bay) | |||
| 417 | } | 417 | } |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | #ifdef CONFIG_BLK_DEV_IDE_PMAC | ||
| 420 | int check_media_bay(struct device_node *which_bay, int what) | 421 | int check_media_bay(struct device_node *which_bay, int what) |
| 421 | { | 422 | { |
| 422 | int i; | 423 | int i; |
| @@ -432,7 +433,6 @@ int check_media_bay(struct device_node *which_bay, int what) | |||
| 432 | } | 433 | } |
| 433 | EXPORT_SYMBOL(check_media_bay); | 434 | EXPORT_SYMBOL(check_media_bay); |
| 434 | 435 | ||
| 435 | #ifdef CONFIG_BLK_DEV_IDE_PMAC | ||
| 436 | int check_media_bay_by_base(unsigned long base, int what) | 436 | int check_media_bay_by_base(unsigned long base, int what) |
| 437 | { | 437 | { |
| 438 | int i; | 438 | int i; |
| @@ -556,7 +556,8 @@ static void media_bay_step(int i) | |||
| 556 | printk("mediabay %d, registering IDE...\n", i); | 556 | printk("mediabay %d, registering IDE...\n", i); |
| 557 | pmu_suspend(); | 557 | pmu_suspend(); |
| 558 | ide_port_scan(bay->cd_port); | 558 | ide_port_scan(bay->cd_port); |
| 559 | bay->cd_index = bay->cd_port->index; | 559 | if (bay->cd_port->present) |
| 560 | bay->cd_index = bay->cd_port->index; | ||
| 560 | pmu_resume(); | 561 | pmu_resume(); |
| 561 | } | 562 | } |
| 562 | if (bay->cd_index == -1) { | 563 | if (bay->cd_index == -1) { |
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 77ad192962c5..d86d57af282a 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
| @@ -483,12 +483,15 @@ int __init smu_init (void) | |||
| 483 | 483 | ||
| 484 | if (smu_cmdbuf_abs == 0) { | 484 | if (smu_cmdbuf_abs == 0) { |
| 485 | printk(KERN_ERR "SMU: Command buffer not allocated !\n"); | 485 | printk(KERN_ERR "SMU: Command buffer not allocated !\n"); |
| 486 | of_node_put(np); | ||
| 486 | return -EINVAL; | 487 | return -EINVAL; |
| 487 | } | 488 | } |
| 488 | 489 | ||
| 489 | smu = alloc_bootmem(sizeof(struct smu_device)); | 490 | smu = alloc_bootmem(sizeof(struct smu_device)); |
| 490 | if (smu == NULL) | 491 | if (smu == NULL) { |
| 492 | of_node_put(np); | ||
| 491 | return -ENOMEM; | 493 | return -ENOMEM; |
| 494 | } | ||
| 492 | memset(smu, 0, sizeof(*smu)); | 495 | memset(smu, 0, sizeof(*smu)); |
| 493 | 496 | ||
| 494 | spin_lock_init(&smu->lock); | 497 | spin_lock_init(&smu->lock); |
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index 54f4942a2968..5366dc93fb38 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
| @@ -562,18 +562,24 @@ thermostat_init(void) | |||
| 562 | therm_type = ADT7460; | 562 | therm_type = ADT7460; |
| 563 | else if (of_device_is_compatible(np, "adt7467")) | 563 | else if (of_device_is_compatible(np, "adt7467")) |
| 564 | therm_type = ADT7467; | 564 | therm_type = ADT7467; |
| 565 | else | 565 | else { |
| 566 | of_node_put(np); | ||
| 566 | return -ENODEV; | 567 | return -ENODEV; |
| 568 | } | ||
| 567 | 569 | ||
| 568 | prop = of_get_property(np, "hwsensor-params-version", NULL); | 570 | prop = of_get_property(np, "hwsensor-params-version", NULL); |
| 569 | printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, | 571 | printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, |
| 570 | (*prop == 1)?"":"un"); | 572 | (*prop == 1)?"":"un"); |
| 571 | if (*prop != 1) | 573 | if (*prop != 1) { |
| 574 | of_node_put(np); | ||
| 572 | return -ENODEV; | 575 | return -ENODEV; |
| 576 | } | ||
| 573 | 577 | ||
| 574 | prop = of_get_property(np, "reg", NULL); | 578 | prop = of_get_property(np, "reg", NULL); |
| 575 | if (!prop) | 579 | if (!prop) { |
| 580 | of_node_put(np); | ||
| 576 | return -ENODEV; | 581 | return -ENODEV; |
| 582 | } | ||
| 577 | 583 | ||
| 578 | /* look for bus either by path or using "reg" */ | 584 | /* look for bus either by path or using "reg" */ |
| 579 | if (strstr(np->full_name, "/i2c-bus@") != NULL) { | 585 | if (strstr(np->full_name, "/i2c-bus@") != NULL) { |
| @@ -610,6 +616,7 @@ thermostat_init(void) | |||
| 610 | 616 | ||
| 611 | if (of_dev == NULL) { | 617 | if (of_dev == NULL) { |
| 612 | printk(KERN_ERR "Can't register temperatures device !\n"); | 618 | printk(KERN_ERR "Can't register temperatures device !\n"); |
| 619 | of_node_put(np); | ||
| 613 | return -ENODEV; | 620 | return -ENODEV; |
| 614 | } | 621 | } |
| 615 | 622 | ||
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index a0ce0b2fa03e..b5969298f3d3 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
| @@ -1293,7 +1293,7 @@ static void tpacpi_input_send_radiosw(void) | |||
| 1293 | mutex_lock(&tpacpi_inputdev_send_mutex); | 1293 | mutex_lock(&tpacpi_inputdev_send_mutex); |
| 1294 | 1294 | ||
| 1295 | input_report_switch(tpacpi_inputdev, | 1295 | input_report_switch(tpacpi_inputdev, |
| 1296 | SW_RADIO, !!wlsw); | 1296 | SW_RFKILL_ALL, !!wlsw); |
| 1297 | input_sync(tpacpi_inputdev); | 1297 | input_sync(tpacpi_inputdev); |
| 1298 | 1298 | ||
| 1299 | mutex_unlock(&tpacpi_inputdev_send_mutex); | 1299 | mutex_unlock(&tpacpi_inputdev_send_mutex); |
| @@ -1921,6 +1921,29 @@ static struct attribute *hotkey_mask_attributes[] __initdata = { | |||
| 1921 | &dev_attr_hotkey_wakeup_hotunplug_complete.attr, | 1921 | &dev_attr_hotkey_wakeup_hotunplug_complete.attr, |
| 1922 | }; | 1922 | }; |
| 1923 | 1923 | ||
| 1924 | static void hotkey_exit(void) | ||
| 1925 | { | ||
| 1926 | #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL | ||
| 1927 | hotkey_poll_stop_sync(); | ||
| 1928 | #endif | ||
| 1929 | |||
| 1930 | if (hotkey_dev_attributes) | ||
| 1931 | delete_attr_set(hotkey_dev_attributes, &tpacpi_pdev->dev.kobj); | ||
| 1932 | |||
| 1933 | kfree(hotkey_keycode_map); | ||
| 1934 | |||
| 1935 | if (tp_features.hotkey) { | ||
| 1936 | dbg_printk(TPACPI_DBG_EXIT, | ||
| 1937 | "restoring original hot key mask\n"); | ||
| 1938 | /* no short-circuit boolean operator below! */ | ||
| 1939 | if ((hotkey_mask_set(hotkey_orig_mask) | | ||
| 1940 | hotkey_status_set(hotkey_orig_status)) != 0) | ||
| 1941 | printk(TPACPI_ERR | ||
| 1942 | "failed to restore hot key mask " | ||
| 1943 | "to BIOS defaults\n"); | ||
| 1944 | } | ||
| 1945 | } | ||
| 1946 | |||
| 1924 | static int __init hotkey_init(struct ibm_init_struct *iibm) | 1947 | static int __init hotkey_init(struct ibm_init_struct *iibm) |
| 1925 | { | 1948 | { |
| 1926 | /* Requirements for changing the default keymaps: | 1949 | /* Requirements for changing the default keymaps: |
| @@ -2060,226 +2083,220 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) | |||
| 2060 | vdbg_printk(TPACPI_DBG_INIT, "hotkeys are %s\n", | 2083 | vdbg_printk(TPACPI_DBG_INIT, "hotkeys are %s\n", |
| 2061 | str_supported(tp_features.hotkey)); | 2084 | str_supported(tp_features.hotkey)); |
| 2062 | 2085 | ||
| 2063 | if (tp_features.hotkey) { | 2086 | if (!tp_features.hotkey) |
| 2064 | hotkey_dev_attributes = create_attr_set(13, NULL); | 2087 | return 1; |
| 2065 | if (!hotkey_dev_attributes) | ||
| 2066 | return -ENOMEM; | ||
| 2067 | res = add_many_to_attr_set(hotkey_dev_attributes, | ||
| 2068 | hotkey_attributes, | ||
| 2069 | ARRAY_SIZE(hotkey_attributes)); | ||
| 2070 | if (res) | ||
| 2071 | return res; | ||
| 2072 | 2088 | ||
| 2073 | /* mask not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p, | 2089 | hotkey_dev_attributes = create_attr_set(13, NULL); |
| 2074 | A30, R30, R31, T20-22, X20-21, X22-24. Detected by checking | 2090 | if (!hotkey_dev_attributes) |
| 2075 | for HKEY interface version 0x100 */ | 2091 | return -ENOMEM; |
| 2076 | if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) { | 2092 | res = add_many_to_attr_set(hotkey_dev_attributes, |
| 2077 | if ((hkeyv >> 8) != 1) { | 2093 | hotkey_attributes, |
| 2078 | printk(TPACPI_ERR "unknown version of the " | 2094 | ARRAY_SIZE(hotkey_attributes)); |
| 2079 | "HKEY interface: 0x%x\n", hkeyv); | 2095 | if (res) |
| 2080 | printk(TPACPI_ERR "please report this to %s\n", | 2096 | goto err_exit; |
| 2081 | TPACPI_MAIL); | 2097 | |
| 2082 | } else { | 2098 | /* mask not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p, |
| 2083 | /* | 2099 | A30, R30, R31, T20-22, X20-21, X22-24. Detected by checking |
| 2084 | * MHKV 0x100 in A31, R40, R40e, | 2100 | for HKEY interface version 0x100 */ |
| 2085 | * T4x, X31, and later | 2101 | if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) { |
| 2086 | */ | 2102 | if ((hkeyv >> 8) != 1) { |
| 2087 | tp_features.hotkey_mask = 1; | 2103 | printk(TPACPI_ERR "unknown version of the " |
| 2088 | } | 2104 | "HKEY interface: 0x%x\n", hkeyv); |
| 2105 | printk(TPACPI_ERR "please report this to %s\n", | ||
| 2106 | TPACPI_MAIL); | ||
| 2107 | } else { | ||
| 2108 | /* | ||
| 2109 | * MHKV 0x100 in A31, R40, R40e, | ||
| 2110 | * T4x, X31, and later | ||
| 2111 | */ | ||
| 2112 | tp_features.hotkey_mask = 1; | ||
| 2089 | } | 2113 | } |
| 2114 | } | ||
| 2090 | 2115 | ||
| 2091 | vdbg_printk(TPACPI_DBG_INIT, "hotkey masks are %s\n", | 2116 | vdbg_printk(TPACPI_DBG_INIT, "hotkey masks are %s\n", |
| 2092 | str_supported(tp_features.hotkey_mask)); | 2117 | str_supported(tp_features.hotkey_mask)); |
| 2093 | 2118 | ||
| 2094 | if (tp_features.hotkey_mask) { | 2119 | if (tp_features.hotkey_mask) { |
| 2095 | if (!acpi_evalf(hkey_handle, &hotkey_all_mask, | 2120 | if (!acpi_evalf(hkey_handle, &hotkey_all_mask, |
| 2096 | "MHKA", "qd")) { | 2121 | "MHKA", "qd")) { |
| 2097 | printk(TPACPI_ERR | 2122 | printk(TPACPI_ERR |
| 2098 | "missing MHKA handler, " | 2123 | "missing MHKA handler, " |
| 2099 | "please report this to %s\n", | 2124 | "please report this to %s\n", |
| 2100 | TPACPI_MAIL); | 2125 | TPACPI_MAIL); |
| 2101 | /* FN+F12, FN+F4, FN+F3 */ | 2126 | /* FN+F12, FN+F4, FN+F3 */ |
| 2102 | hotkey_all_mask = 0x080cU; | 2127 | hotkey_all_mask = 0x080cU; |
| 2103 | } | ||
| 2104 | } | 2128 | } |
| 2129 | } | ||
| 2105 | 2130 | ||
| 2106 | /* hotkey_source_mask *must* be zero for | 2131 | /* hotkey_source_mask *must* be zero for |
| 2107 | * the first hotkey_mask_get */ | 2132 | * the first hotkey_mask_get */ |
| 2108 | res = hotkey_status_get(&hotkey_orig_status); | 2133 | res = hotkey_status_get(&hotkey_orig_status); |
| 2109 | if (!res && tp_features.hotkey_mask) { | 2134 | if (res) |
| 2110 | res = hotkey_mask_get(); | 2135 | goto err_exit; |
| 2111 | hotkey_orig_mask = hotkey_mask; | 2136 | |
| 2112 | if (!res) { | 2137 | if (tp_features.hotkey_mask) { |
| 2113 | res = add_many_to_attr_set( | 2138 | res = hotkey_mask_get(); |
| 2114 | hotkey_dev_attributes, | 2139 | if (res) |
| 2115 | hotkey_mask_attributes, | 2140 | goto err_exit; |
| 2116 | ARRAY_SIZE(hotkey_mask_attributes)); | 2141 | |
| 2117 | } | 2142 | hotkey_orig_mask = hotkey_mask; |
| 2118 | } | 2143 | res = add_many_to_attr_set( |
| 2144 | hotkey_dev_attributes, | ||
| 2145 | hotkey_mask_attributes, | ||
| 2146 | ARRAY_SIZE(hotkey_mask_attributes)); | ||
| 2147 | if (res) | ||
| 2148 | goto err_exit; | ||
| 2149 | } | ||
| 2119 | 2150 | ||
| 2120 | #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL | 2151 | #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL |
| 2121 | if (tp_features.hotkey_mask) { | 2152 | if (tp_features.hotkey_mask) { |
| 2122 | hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK | 2153 | hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK |
| 2123 | & ~hotkey_all_mask; | 2154 | & ~hotkey_all_mask; |
| 2124 | } else { | 2155 | } else { |
| 2125 | hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK; | 2156 | hotkey_source_mask = TPACPI_HKEY_NVRAM_GOOD_MASK; |
| 2126 | } | 2157 | } |
| 2127 | 2158 | ||
| 2128 | vdbg_printk(TPACPI_DBG_INIT, | 2159 | vdbg_printk(TPACPI_DBG_INIT, |
| 2129 | "hotkey source mask 0x%08x, polling freq %d\n", | 2160 | "hotkey source mask 0x%08x, polling freq %d\n", |
| 2130 | hotkey_source_mask, hotkey_poll_freq); | 2161 | hotkey_source_mask, hotkey_poll_freq); |
| 2131 | #endif | 2162 | #endif |
| 2132 | 2163 | ||
| 2133 | /* Not all thinkpads have a hardware radio switch */ | 2164 | /* Not all thinkpads have a hardware radio switch */ |
| 2134 | if (!res && acpi_evalf(hkey_handle, &status, "WLSW", "qd")) { | 2165 | if (acpi_evalf(hkey_handle, &status, "WLSW", "qd")) { |
| 2135 | tp_features.hotkey_wlsw = 1; | 2166 | tp_features.hotkey_wlsw = 1; |
| 2136 | printk(TPACPI_INFO | 2167 | printk(TPACPI_INFO |
| 2137 | "radio switch found; radios are %s\n", | 2168 | "radio switch found; radios are %s\n", |
| 2138 | enabled(status, 0)); | 2169 | enabled(status, 0)); |
| 2139 | res = add_to_attr_set(hotkey_dev_attributes, | 2170 | res = add_to_attr_set(hotkey_dev_attributes, |
| 2140 | &dev_attr_hotkey_radio_sw.attr); | 2171 | &dev_attr_hotkey_radio_sw.attr); |
| 2141 | } | 2172 | } |
| 2142 | 2173 | ||
| 2143 | /* For X41t, X60t, X61t Tablets... */ | 2174 | /* For X41t, X60t, X61t Tablets... */ |
| 2144 | if (!res && acpi_evalf(hkey_handle, &status, "MHKG", "qd")) { | 2175 | if (!res && acpi_evalf(hkey_handle, &status, "MHKG", "qd")) { |
| 2145 | tp_features.hotkey_tablet = 1; | 2176 | tp_features.hotkey_tablet = 1; |
| 2146 | printk(TPACPI_INFO | 2177 | printk(TPACPI_INFO |
| 2147 | "possible tablet mode switch found; " | 2178 | "possible tablet mode switch found; " |
| 2148 | "ThinkPad in %s mode\n", | 2179 | "ThinkPad in %s mode\n", |
| 2149 | (status & TP_HOTKEY_TABLET_MASK)? | 2180 | (status & TP_HOTKEY_TABLET_MASK)? |
| 2150 | "tablet" : "laptop"); | 2181 | "tablet" : "laptop"); |
| 2151 | res = add_to_attr_set(hotkey_dev_attributes, | 2182 | res = add_to_attr_set(hotkey_dev_attributes, |
| 2152 | &dev_attr_hotkey_tablet_mode.attr); | 2183 | &dev_attr_hotkey_tablet_mode.attr); |
| 2153 | } | 2184 | } |
| 2154 | 2185 | ||
| 2155 | if (!res) | 2186 | if (!res) |
| 2156 | res = register_attr_set_with_sysfs( | 2187 | res = register_attr_set_with_sysfs( |
| 2157 | hotkey_dev_attributes, | 2188 | hotkey_dev_attributes, |
| 2158 | &tpacpi_pdev->dev.kobj); | 2189 | &tpacpi_pdev->dev.kobj); |
| 2159 | if (res) | 2190 | if (res) |
| 2160 | return res; | 2191 | goto err_exit; |
| 2161 | 2192 | ||
| 2162 | /* Set up key map */ | 2193 | /* Set up key map */ |
| 2163 | 2194 | ||
| 2164 | hotkey_keycode_map = kmalloc(TPACPI_HOTKEY_MAP_SIZE, | 2195 | hotkey_keycode_map = kmalloc(TPACPI_HOTKEY_MAP_SIZE, |
| 2165 | GFP_KERNEL); | 2196 | GFP_KERNEL); |
| 2166 | if (!hotkey_keycode_map) { | 2197 | if (!hotkey_keycode_map) { |
| 2167 | printk(TPACPI_ERR | 2198 | printk(TPACPI_ERR |
| 2168 | "failed to allocate memory for key map\n"); | 2199 | "failed to allocate memory for key map\n"); |
| 2169 | return -ENOMEM; | 2200 | res = -ENOMEM; |
| 2170 | } | 2201 | goto err_exit; |
| 2202 | } | ||
| 2171 | 2203 | ||
| 2172 | if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) { | 2204 | if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) { |
| 2173 | dbg_printk(TPACPI_DBG_INIT, | 2205 | dbg_printk(TPACPI_DBG_INIT, |
| 2174 | "using Lenovo default hot key map\n"); | 2206 | "using Lenovo default hot key map\n"); |
| 2175 | memcpy(hotkey_keycode_map, &lenovo_keycode_map, | 2207 | memcpy(hotkey_keycode_map, &lenovo_keycode_map, |
| 2176 | TPACPI_HOTKEY_MAP_SIZE); | 2208 | TPACPI_HOTKEY_MAP_SIZE); |
| 2209 | } else { | ||
| 2210 | dbg_printk(TPACPI_DBG_INIT, | ||
| 2211 | "using IBM default hot key map\n"); | ||
| 2212 | memcpy(hotkey_keycode_map, &ibm_keycode_map, | ||
| 2213 | TPACPI_HOTKEY_MAP_SIZE); | ||
| 2214 | } | ||
| 2215 | |||
| 2216 | set_bit(EV_KEY, tpacpi_inputdev->evbit); | ||
| 2217 | set_bit(EV_MSC, tpacpi_inputdev->evbit); | ||
| 2218 | set_bit(MSC_SCAN, tpacpi_inputdev->mscbit); | ||
| 2219 | tpacpi_inputdev->keycodesize = TPACPI_HOTKEY_MAP_TYPESIZE; | ||
| 2220 | tpacpi_inputdev->keycodemax = TPACPI_HOTKEY_MAP_LEN; | ||
| 2221 | tpacpi_inputdev->keycode = hotkey_keycode_map; | ||
| 2222 | for (i = 0; i < TPACPI_HOTKEY_MAP_LEN; i++) { | ||
| 2223 | if (hotkey_keycode_map[i] != KEY_RESERVED) { | ||
| 2224 | set_bit(hotkey_keycode_map[i], | ||
| 2225 | tpacpi_inputdev->keybit); | ||
| 2177 | } else { | 2226 | } else { |
| 2178 | dbg_printk(TPACPI_DBG_INIT, | 2227 | if (i < sizeof(hotkey_reserved_mask)*8) |
| 2179 | "using IBM default hot key map\n"); | 2228 | hotkey_reserved_mask |= 1 << i; |
| 2180 | memcpy(hotkey_keycode_map, &ibm_keycode_map, | ||
| 2181 | TPACPI_HOTKEY_MAP_SIZE); | ||
| 2182 | } | ||
| 2183 | |||
| 2184 | set_bit(EV_KEY, tpacpi_inputdev->evbit); | ||
| 2185 | set_bit(EV_MSC, tpacpi_inputdev->evbit); | ||
| 2186 | set_bit(MSC_SCAN, tpacpi_inputdev->mscbit); | ||
| 2187 | tpacpi_inputdev->keycodesize = TPACPI_HOTKEY_MAP_TYPESIZE; | ||
| 2188 | tpacpi_inputdev->keycodemax = TPACPI_HOTKEY_MAP_LEN; | ||
| 2189 | tpacpi_inputdev->keycode = hotkey_keycode_map; | ||
| 2190 | for (i = 0; i < TPACPI_HOTKEY_MAP_LEN; i++) { | ||
| 2191 | if (hotkey_keycode_map[i] != KEY_RESERVED) { | ||
| 2192 | set_bit(hotkey_keycode_map[i], | ||
| 2193 | tpacpi_inputdev->keybit); | ||
| 2194 | } else { | ||
| 2195 | if (i < sizeof(hotkey_reserved_mask)*8) | ||
| 2196 | hotkey_reserved_mask |= 1 << i; | ||
| 2197 | } | ||
| 2198 | } | ||
| 2199 | |||
| 2200 | if (tp_features.hotkey_wlsw) { | ||
| 2201 | set_bit(EV_SW, tpacpi_inputdev->evbit); | ||
| 2202 | set_bit(SW_RADIO, tpacpi_inputdev->swbit); | ||
| 2203 | } | ||
| 2204 | if (tp_features.hotkey_tablet) { | ||
| 2205 | set_bit(EV_SW, tpacpi_inputdev->evbit); | ||
| 2206 | set_bit(SW_TABLET_MODE, tpacpi_inputdev->swbit); | ||
| 2207 | } | 2229 | } |
| 2230 | } | ||
| 2208 | 2231 | ||
| 2209 | /* Do not issue duplicate brightness change events to | 2232 | if (tp_features.hotkey_wlsw) { |
| 2210 | * userspace */ | 2233 | set_bit(EV_SW, tpacpi_inputdev->evbit); |
| 2211 | if (!tp_features.bright_acpimode) | 2234 | set_bit(SW_RFKILL_ALL, tpacpi_inputdev->swbit); |
| 2212 | /* update bright_acpimode... */ | 2235 | } |
| 2213 | tpacpi_check_std_acpi_brightness_support(); | 2236 | if (tp_features.hotkey_tablet) { |
| 2214 | 2237 | set_bit(EV_SW, tpacpi_inputdev->evbit); | |
| 2215 | if (tp_features.bright_acpimode) { | 2238 | set_bit(SW_TABLET_MODE, tpacpi_inputdev->swbit); |
| 2216 | printk(TPACPI_INFO | 2239 | } |
| 2217 | "This ThinkPad has standard ACPI backlight " | ||
| 2218 | "brightness control, supported by the ACPI " | ||
| 2219 | "video driver\n"); | ||
| 2220 | printk(TPACPI_NOTICE | ||
| 2221 | "Disabling thinkpad-acpi brightness events " | ||
| 2222 | "by default...\n"); | ||
| 2223 | |||
| 2224 | /* The hotkey_reserved_mask change below is not | ||
| 2225 | * necessary while the keys are at KEY_RESERVED in the | ||
| 2226 | * default map, but better safe than sorry, leave it | ||
| 2227 | * here as a marker of what we have to do, especially | ||
| 2228 | * when we finally become able to set this at runtime | ||
| 2229 | * on response to X.org requests */ | ||
| 2230 | hotkey_reserved_mask |= | ||
| 2231 | (1 << TP_ACPI_HOTKEYSCAN_FNHOME) | ||
| 2232 | | (1 << TP_ACPI_HOTKEYSCAN_FNEND); | ||
| 2233 | } | ||
| 2234 | 2240 | ||
| 2235 | dbg_printk(TPACPI_DBG_INIT, | 2241 | /* Do not issue duplicate brightness change events to |
| 2236 | "enabling hot key handling\n"); | 2242 | * userspace */ |
| 2237 | res = hotkey_status_set(1); | 2243 | if (!tp_features.bright_acpimode) |
| 2238 | if (res) | 2244 | /* update bright_acpimode... */ |
| 2239 | return res; | 2245 | tpacpi_check_std_acpi_brightness_support(); |
| 2240 | res = hotkey_mask_set(((hotkey_all_mask | hotkey_source_mask) | ||
| 2241 | & ~hotkey_reserved_mask) | ||
| 2242 | | hotkey_orig_mask); | ||
| 2243 | if (res < 0 && res != -ENXIO) | ||
| 2244 | return res; | ||
| 2245 | 2246 | ||
| 2246 | dbg_printk(TPACPI_DBG_INIT, | 2247 | if (tp_features.bright_acpimode) { |
| 2247 | "legacy hot key reporting over procfs %s\n", | 2248 | printk(TPACPI_INFO |
| 2248 | (hotkey_report_mode < 2) ? | 2249 | "This ThinkPad has standard ACPI backlight " |
| 2249 | "enabled" : "disabled"); | 2250 | "brightness control, supported by the ACPI " |
| 2251 | "video driver\n"); | ||
| 2252 | printk(TPACPI_NOTICE | ||
| 2253 | "Disabling thinkpad-acpi brightness events " | ||
| 2254 | "by default...\n"); | ||
| 2255 | |||
| 2256 | /* The hotkey_reserved_mask change below is not | ||
| 2257 | * necessary while the keys are at KEY_RESERVED in the | ||
| 2258 | * default map, but better safe than sorry, leave it | ||
| 2259 | * here as a marker of what we have to do, especially | ||
| 2260 | * when we finally become able to set this at runtime | ||
| 2261 | * on response to X.org requests */ | ||
| 2262 | hotkey_reserved_mask |= | ||
| 2263 | (1 << TP_ACPI_HOTKEYSCAN_FNHOME) | ||
| 2264 | | (1 << TP_ACPI_HOTKEYSCAN_FNEND); | ||
| 2265 | } | ||
| 2266 | |||
| 2267 | dbg_printk(TPACPI_DBG_INIT, "enabling hot key handling\n"); | ||
| 2268 | res = hotkey_status_set(1); | ||
| 2269 | if (res) { | ||
| 2270 | hotkey_exit(); | ||
| 2271 | return res; | ||
| 2272 | } | ||
| 2273 | res = hotkey_mask_set(((hotkey_all_mask | hotkey_source_mask) | ||
| 2274 | & ~hotkey_reserved_mask) | ||
| 2275 | | hotkey_orig_mask); | ||
| 2276 | if (res < 0 && res != -ENXIO) { | ||
| 2277 | hotkey_exit(); | ||
| 2278 | return res; | ||
| 2279 | } | ||
| 2250 | 2280 | ||
| 2251 | tpacpi_inputdev->open = &hotkey_inputdev_open; | 2281 | dbg_printk(TPACPI_DBG_INIT, |
| 2252 | tpacpi_inputdev->close = &hotkey_inputdev_close; | 2282 | "legacy hot key reporting over procfs %s\n", |
| 2283 | (hotkey_report_mode < 2) ? | ||
| 2284 | "enabled" : "disabled"); | ||
| 2253 | 2285 | ||
| 2254 | hotkey_poll_setup_safe(1); | 2286 | tpacpi_inputdev->open = &hotkey_inputdev_open; |
| 2255 | tpacpi_input_send_radiosw(); | 2287 | tpacpi_inputdev->close = &hotkey_inputdev_close; |
| 2256 | tpacpi_input_send_tabletsw(); | ||
| 2257 | } | ||
| 2258 | 2288 | ||
| 2259 | return (tp_features.hotkey)? 0 : 1; | 2289 | hotkey_poll_setup_safe(1); |
| 2260 | } | 2290 | tpacpi_input_send_radiosw(); |
| 2291 | tpacpi_input_send_tabletsw(); | ||
| 2261 | 2292 | ||
| 2262 | static void hotkey_exit(void) | 2293 | return 0; |
| 2263 | { | ||
| 2264 | #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL | ||
| 2265 | hotkey_poll_stop_sync(); | ||
| 2266 | #endif | ||
| 2267 | 2294 | ||
| 2268 | if (tp_features.hotkey) { | 2295 | err_exit: |
| 2269 | dbg_printk(TPACPI_DBG_EXIT, | 2296 | delete_attr_set(hotkey_dev_attributes, &tpacpi_pdev->dev.kobj); |
| 2270 | "restoring original hot key mask\n"); | 2297 | hotkey_dev_attributes = NULL; |
| 2271 | /* no short-circuit boolean operator below! */ | ||
| 2272 | if ((hotkey_mask_set(hotkey_orig_mask) | | ||
| 2273 | hotkey_status_set(hotkey_orig_status)) != 0) | ||
| 2274 | printk(TPACPI_ERR | ||
| 2275 | "failed to restore hot key mask " | ||
| 2276 | "to BIOS defaults\n"); | ||
| 2277 | } | ||
| 2278 | 2298 | ||
| 2279 | if (hotkey_dev_attributes) { | 2299 | return (res < 0)? res : 1; |
| 2280 | delete_attr_set(hotkey_dev_attributes, &tpacpi_pdev->dev.kobj); | ||
| 2281 | hotkey_dev_attributes = NULL; | ||
| 2282 | } | ||
| 2283 | } | 2300 | } |
| 2284 | 2301 | ||
| 2285 | static void hotkey_notify(struct ibm_struct *ibm, u32 event) | 2302 | static void hotkey_notify(struct ibm_struct *ibm, u32 event) |
| @@ -3319,7 +3336,7 @@ static struct tpacpi_led_classdev tpacpi_led_thinklight = { | |||
| 3319 | 3336 | ||
| 3320 | static int __init light_init(struct ibm_init_struct *iibm) | 3337 | static int __init light_init(struct ibm_init_struct *iibm) |
| 3321 | { | 3338 | { |
| 3322 | int rc = 0; | 3339 | int rc; |
| 3323 | 3340 | ||
| 3324 | vdbg_printk(TPACPI_DBG_INIT, "initializing light subdriver\n"); | 3341 | vdbg_printk(TPACPI_DBG_INIT, "initializing light subdriver\n"); |
| 3325 | 3342 | ||
| @@ -3337,20 +3354,23 @@ static int __init light_init(struct ibm_init_struct *iibm) | |||
| 3337 | tp_features.light_status = | 3354 | tp_features.light_status = |
| 3338 | acpi_evalf(ec_handle, NULL, "KBLT", "qv"); | 3355 | acpi_evalf(ec_handle, NULL, "KBLT", "qv"); |
| 3339 | 3356 | ||
| 3340 | vdbg_printk(TPACPI_DBG_INIT, "light is %s\n", | 3357 | vdbg_printk(TPACPI_DBG_INIT, "light is %s, light status is %s\n", |
| 3341 | str_supported(tp_features.light)); | 3358 | str_supported(tp_features.light), |
| 3359 | str_supported(tp_features.light_status)); | ||
| 3342 | 3360 | ||
| 3343 | if (tp_features.light) { | 3361 | if (!tp_features.light) |
| 3344 | rc = led_classdev_register(&tpacpi_pdev->dev, | 3362 | return 1; |
| 3345 | &tpacpi_led_thinklight.led_classdev); | 3363 | |
| 3346 | } | 3364 | rc = led_classdev_register(&tpacpi_pdev->dev, |
| 3365 | &tpacpi_led_thinklight.led_classdev); | ||
| 3347 | 3366 | ||
| 3348 | if (rc < 0) { | 3367 | if (rc < 0) { |
| 3349 | tp_features.light = 0; | 3368 | tp_features.light = 0; |
| 3350 | tp_features.light_status = 0; | 3369 | tp_features.light_status = 0; |
| 3351 | } else { | 3370 | } else { |
| 3352 | rc = (tp_features.light)? 0 : 1; | 3371 | rc = 0; |
| 3353 | } | 3372 | } |
| 3373 | |||
| 3354 | return rc; | 3374 | return rc; |
| 3355 | } | 3375 | } |
| 3356 | 3376 | ||
| @@ -3833,7 +3853,7 @@ static const char * const tpacpi_led_names[TPACPI_LED_NUMLEDS] = { | |||
| 3833 | "tpacpi::standby", | 3853 | "tpacpi::standby", |
| 3834 | }; | 3854 | }; |
| 3835 | 3855 | ||
| 3836 | static int led_get_status(unsigned int led) | 3856 | static int led_get_status(const unsigned int led) |
| 3837 | { | 3857 | { |
| 3838 | int status; | 3858 | int status; |
| 3839 | enum led_status_t led_s; | 3859 | enum led_status_t led_s; |
| @@ -3857,41 +3877,42 @@ static int led_get_status(unsigned int led) | |||
| 3857 | /* not reached */ | 3877 | /* not reached */ |
| 3858 | } | 3878 | } |
| 3859 | 3879 | ||
| 3860 | static int led_set_status(unsigned int led, enum led_status_t ledstatus) | 3880 | static int led_set_status(const unsigned int led, |
| 3881 | const enum led_status_t ledstatus) | ||
| 3861 | { | 3882 | { |
| 3862 | /* off, on, blink. Index is led_status_t */ | 3883 | /* off, on, blink. Index is led_status_t */ |
| 3863 | static const int led_sled_arg1[] = { 0, 1, 3 }; | 3884 | static const unsigned int led_sled_arg1[] = { 0, 1, 3 }; |
| 3864 | static const int led_exp_hlbl[] = { 0, 0, 1 }; /* led# * */ | 3885 | static const unsigned int led_led_arg1[] = { 0, 0x80, 0xc0 }; |
| 3865 | static const int led_exp_hlcl[] = { 0, 1, 1 }; /* led# * */ | ||
| 3866 | static const int led_led_arg1[] = { 0, 0x80, 0xc0 }; | ||
| 3867 | 3886 | ||
| 3868 | int rc = 0; | 3887 | int rc = 0; |
| 3869 | 3888 | ||
| 3870 | switch (led_supported) { | 3889 | switch (led_supported) { |
| 3871 | case TPACPI_LED_570: | 3890 | case TPACPI_LED_570: |
| 3872 | /* 570 */ | 3891 | /* 570 */ |
| 3873 | led = 1 << led; | 3892 | if (led > 7) |
| 3874 | if (!acpi_evalf(led_handle, NULL, NULL, "vdd", | 3893 | return -EINVAL; |
| 3875 | led, led_sled_arg1[ledstatus])) | 3894 | if (!acpi_evalf(led_handle, NULL, NULL, "vdd", |
| 3876 | rc = -EIO; | 3895 | (1 << led), led_sled_arg1[ledstatus])) |
| 3877 | break; | 3896 | rc = -EIO; |
| 3897 | break; | ||
| 3878 | case TPACPI_LED_OLD: | 3898 | case TPACPI_LED_OLD: |
| 3879 | /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20 */ | 3899 | /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20 */ |
| 3880 | led = 1 << led; | 3900 | if (led > 7) |
| 3881 | rc = ec_write(TPACPI_LED_EC_HLMS, led); | 3901 | return -EINVAL; |
| 3882 | if (rc >= 0) | 3902 | rc = ec_write(TPACPI_LED_EC_HLMS, (1 << led)); |
| 3883 | rc = ec_write(TPACPI_LED_EC_HLBL, | 3903 | if (rc >= 0) |
| 3884 | led * led_exp_hlbl[ledstatus]); | 3904 | rc = ec_write(TPACPI_LED_EC_HLBL, |
| 3885 | if (rc >= 0) | 3905 | (ledstatus == TPACPI_LED_BLINK) << led); |
| 3886 | rc = ec_write(TPACPI_LED_EC_HLCL, | 3906 | if (rc >= 0) |
| 3887 | led * led_exp_hlcl[ledstatus]); | 3907 | rc = ec_write(TPACPI_LED_EC_HLCL, |
| 3888 | break; | 3908 | (ledstatus != TPACPI_LED_OFF) << led); |
| 3909 | break; | ||
| 3889 | case TPACPI_LED_NEW: | 3910 | case TPACPI_LED_NEW: |
| 3890 | /* all others */ | 3911 | /* all others */ |
| 3891 | if (!acpi_evalf(led_handle, NULL, NULL, "vdd", | 3912 | if (!acpi_evalf(led_handle, NULL, NULL, "vdd", |
| 3892 | led, led_led_arg1[ledstatus])) | 3913 | led, led_led_arg1[ledstatus])) |
| 3893 | rc = -EIO; | 3914 | rc = -EIO; |
| 3894 | break; | 3915 | break; |
| 3895 | default: | 3916 | default: |
| 3896 | rc = -ENXIO; | 3917 | rc = -ENXIO; |
| 3897 | } | 3918 | } |
| @@ -3978,7 +3999,6 @@ static void led_exit(void) | |||
| 3978 | } | 3999 | } |
| 3979 | 4000 | ||
| 3980 | kfree(tpacpi_leds); | 4001 | kfree(tpacpi_leds); |
| 3981 | tpacpi_leds = NULL; | ||
| 3982 | } | 4002 | } |
| 3983 | 4003 | ||
| 3984 | static int __init led_init(struct ibm_init_struct *iibm) | 4004 | static int __init led_init(struct ibm_init_struct *iibm) |
| @@ -4802,7 +4822,6 @@ static void brightness_exit(void) | |||
| 4802 | vdbg_printk(TPACPI_DBG_EXIT, | 4822 | vdbg_printk(TPACPI_DBG_EXIT, |
| 4803 | "calling backlight_device_unregister()\n"); | 4823 | "calling backlight_device_unregister()\n"); |
| 4804 | backlight_device_unregister(ibm_backlight_device); | 4824 | backlight_device_unregister(ibm_backlight_device); |
| 4805 | ibm_backlight_device = NULL; | ||
| 4806 | } | 4825 | } |
| 4807 | } | 4826 | } |
| 4808 | 4827 | ||
| @@ -5764,11 +5783,16 @@ static int __init fan_init(struct ibm_init_struct *iibm) | |||
| 5764 | fan_control_access_mode != TPACPI_FAN_WR_NONE) { | 5783 | fan_control_access_mode != TPACPI_FAN_WR_NONE) { |
| 5765 | rc = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj, | 5784 | rc = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj, |
| 5766 | &fan_attr_group); | 5785 | &fan_attr_group); |
| 5767 | if (!(rc < 0)) | ||
| 5768 | rc = driver_create_file(&tpacpi_hwmon_pdriver.driver, | ||
| 5769 | &driver_attr_fan_watchdog); | ||
| 5770 | if (rc < 0) | 5786 | if (rc < 0) |
| 5771 | return rc; | 5787 | return rc; |
| 5788 | |||
| 5789 | rc = driver_create_file(&tpacpi_hwmon_pdriver.driver, | ||
| 5790 | &driver_attr_fan_watchdog); | ||
| 5791 | if (rc < 0) { | ||
| 5792 | sysfs_remove_group(&tpacpi_sensors_pdev->dev.kobj, | ||
| 5793 | &fan_attr_group); | ||
| 5794 | return rc; | ||
| 5795 | } | ||
| 5772 | return 0; | 5796 | return 0; |
| 5773 | } else | 5797 | } else |
| 5774 | return 1; | 5798 | return 1; |
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index be624a049c67..c303e7f57ab4 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c | |||
| @@ -1457,17 +1457,7 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq) | |||
| 1457 | int ret; | 1457 | int ret; |
| 1458 | 1458 | ||
| 1459 | /* | 1459 | /* |
| 1460 | * Allocate interrupt. | 1460 | * Set up tasklets. Must be done before requesting interrupt. |
| 1461 | */ | ||
| 1462 | |||
| 1463 | ret = request_irq(irq, wbsd_irq, IRQF_SHARED, DRIVER_NAME, host); | ||
| 1464 | if (ret) | ||
| 1465 | return ret; | ||
| 1466 | |||
| 1467 | host->irq = irq; | ||
| 1468 | |||
| 1469 | /* | ||
| 1470 | * Set up tasklets. | ||
| 1471 | */ | 1461 | */ |
| 1472 | tasklet_init(&host->card_tasklet, wbsd_tasklet_card, | 1462 | tasklet_init(&host->card_tasklet, wbsd_tasklet_card, |
| 1473 | (unsigned long)host); | 1463 | (unsigned long)host); |
| @@ -1480,6 +1470,15 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq) | |||
| 1480 | tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish, | 1470 | tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish, |
| 1481 | (unsigned long)host); | 1471 | (unsigned long)host); |
| 1482 | 1472 | ||
| 1473 | /* | ||
| 1474 | * Allocate interrupt. | ||
| 1475 | */ | ||
| 1476 | ret = request_irq(irq, wbsd_irq, IRQF_SHARED, DRIVER_NAME, host); | ||
| 1477 | if (ret) | ||
| 1478 | return ret; | ||
| 1479 | |||
| 1480 | host->irq = irq; | ||
| 1481 | |||
| 1483 | return 0; | 1482 | return 0; |
| 1484 | } | 1483 | } |
| 1485 | 1484 | ||
diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 750a46f4bc58..ad6b8a5b6574 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c | |||
| @@ -506,6 +506,7 @@ int lance_open (struct net_device *dev) | |||
| 506 | 506 | ||
| 507 | return res; | 507 | return res; |
| 508 | } | 508 | } |
| 509 | EXPORT_SYMBOL_GPL(lance_open); | ||
| 509 | 510 | ||
| 510 | int lance_close (struct net_device *dev) | 511 | int lance_close (struct net_device *dev) |
| 511 | { | 512 | { |
| @@ -521,6 +522,7 @@ int lance_close (struct net_device *dev) | |||
| 521 | 522 | ||
| 522 | return 0; | 523 | return 0; |
| 523 | } | 524 | } |
| 525 | EXPORT_SYMBOL_GPL(lance_close); | ||
| 524 | 526 | ||
| 525 | void lance_tx_timeout(struct net_device *dev) | 527 | void lance_tx_timeout(struct net_device *dev) |
| 526 | { | 528 | { |
| @@ -529,7 +531,7 @@ void lance_tx_timeout(struct net_device *dev) | |||
| 529 | dev->trans_start = jiffies; | 531 | dev->trans_start = jiffies; |
| 530 | netif_wake_queue (dev); | 532 | netif_wake_queue (dev); |
| 531 | } | 533 | } |
| 532 | 534 | EXPORT_SYMBOL_GPL(lance_tx_timeout); | |
| 533 | 535 | ||
| 534 | int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) | 536 | int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) |
| 535 | { | 537 | { |
| @@ -586,6 +588,7 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
| 586 | 588 | ||
| 587 | return 0; | 589 | return 0; |
| 588 | } | 590 | } |
| 591 | EXPORT_SYMBOL_GPL(lance_start_xmit); | ||
| 589 | 592 | ||
| 590 | /* taken from the depca driver via a2065.c */ | 593 | /* taken from the depca driver via a2065.c */ |
| 591 | static void lance_load_multicast (struct net_device *dev) | 594 | static void lance_load_multicast (struct net_device *dev) |
| @@ -654,6 +657,7 @@ void lance_set_multicast (struct net_device *dev) | |||
| 654 | if (!stopped) | 657 | if (!stopped) |
| 655 | netif_start_queue (dev); | 658 | netif_start_queue (dev); |
| 656 | } | 659 | } |
| 660 | EXPORT_SYMBOL_GPL(lance_set_multicast); | ||
| 657 | 661 | ||
| 658 | #ifdef CONFIG_NET_POLL_CONTROLLER | 662 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 659 | void lance_poll(struct net_device *dev) | 663 | void lance_poll(struct net_device *dev) |
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 6ddc911e7d15..99e0b4cdc56f 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
| @@ -637,22 +637,6 @@ static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw) | |||
| 637 | } | 637 | } |
| 638 | 638 | ||
| 639 | /* | 639 | /* |
| 640 | * Force the PHY into power saving mode using vendor magic. | ||
| 641 | */ | ||
| 642 | #ifdef CONFIG_PM | ||
| 643 | static void atl1_phy_enter_power_saving(struct atl1_hw *hw) | ||
| 644 | { | ||
| 645 | atl1_write_phy_reg(hw, MII_DBG_ADDR, 0); | ||
| 646 | atl1_write_phy_reg(hw, MII_DBG_DATA, 0x124E); | ||
| 647 | atl1_write_phy_reg(hw, MII_DBG_ADDR, 2); | ||
| 648 | atl1_write_phy_reg(hw, MII_DBG_DATA, 0x3000); | ||
| 649 | atl1_write_phy_reg(hw, MII_DBG_ADDR, 3); | ||
| 650 | atl1_write_phy_reg(hw, MII_DBG_DATA, 0); | ||
| 651 | |||
| 652 | } | ||
| 653 | #endif | ||
| 654 | |||
| 655 | /* | ||
| 656 | * Resets the PHY and make all config validate | 640 | * Resets the PHY and make all config validate |
| 657 | * hw - Struct containing variables accessed by shared code | 641 | * hw - Struct containing variables accessed by shared code |
| 658 | * | 642 | * |
| @@ -2860,7 +2844,6 @@ disable_wol: | |||
| 2860 | ctrl |= PCIE_PHYMISC_FORCE_RCV_DET; | 2844 | ctrl |= PCIE_PHYMISC_FORCE_RCV_DET; |
| 2861 | iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC); | 2845 | iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC); |
| 2862 | ioread32(hw->hw_addr + REG_PCIE_PHYMISC); | 2846 | ioread32(hw->hw_addr + REG_PCIE_PHYMISC); |
| 2863 | atl1_phy_enter_power_saving(hw); | ||
| 2864 | hw->phy_configured = false; | 2847 | hw->phy_configured = false; |
| 2865 | pci_enable_wake(pdev, pci_choose_state(pdev, state), 0); | 2848 | pci_enable_wake(pdev, pci_choose_state(pdev, state), 0); |
| 2866 | exit: | 2849 | exit: |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 4b46e68183e0..367b6d462708 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -5724,14 +5724,12 @@ bnx2_reset_task(struct work_struct *work) | |||
| 5724 | if (!netif_running(bp->dev)) | 5724 | if (!netif_running(bp->dev)) |
| 5725 | return; | 5725 | return; |
| 5726 | 5726 | ||
| 5727 | bp->in_reset_task = 1; | ||
| 5728 | bnx2_netif_stop(bp); | 5727 | bnx2_netif_stop(bp); |
| 5729 | 5728 | ||
| 5730 | bnx2_init_nic(bp); | 5729 | bnx2_init_nic(bp); |
| 5731 | 5730 | ||
| 5732 | atomic_set(&bp->intr_sem, 1); | 5731 | atomic_set(&bp->intr_sem, 1); |
| 5733 | bnx2_netif_start(bp); | 5732 | bnx2_netif_start(bp); |
| 5734 | bp->in_reset_task = 0; | ||
| 5735 | } | 5733 | } |
| 5736 | 5734 | ||
| 5737 | static void | 5735 | static void |
| @@ -5907,12 +5905,7 @@ bnx2_close(struct net_device *dev) | |||
| 5907 | struct bnx2 *bp = netdev_priv(dev); | 5905 | struct bnx2 *bp = netdev_priv(dev); |
| 5908 | u32 reset_code; | 5906 | u32 reset_code; |
| 5909 | 5907 | ||
| 5910 | /* Calling flush_scheduled_work() may deadlock because | 5908 | cancel_work_sync(&bp->reset_task); |
| 5911 | * linkwatch_event() may be on the workqueue and it will try to get | ||
| 5912 | * the rtnl_lock which we are holding. | ||
| 5913 | */ | ||
| 5914 | while (bp->in_reset_task) | ||
| 5915 | msleep(1); | ||
| 5916 | 5909 | ||
| 5917 | bnx2_disable_int_sync(bp); | 5910 | bnx2_disable_int_sync(bp); |
| 5918 | bnx2_napi_disable(bp); | 5911 | bnx2_napi_disable(bp); |
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 1eaf5bb3d9c2..2377cc13bf61 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
| @@ -6656,7 +6656,6 @@ struct bnx2 { | |||
| 6656 | int current_interval; | 6656 | int current_interval; |
| 6657 | struct timer_list timer; | 6657 | struct timer_list timer; |
| 6658 | struct work_struct reset_task; | 6658 | struct work_struct reset_task; |
| 6659 | int in_reset_task; | ||
| 6660 | 6659 | ||
| 6661 | /* Used to synchronize phy accesses. */ | 6660 | /* Used to synchronize phy accesses. */ |
| 6662 | spinlock_t phy_lock; | 6661 | spinlock_t phy_lock; |
diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c index 7bdb5af35951..70cba64732ca 100644 --- a/drivers/net/bnx2x.c +++ b/drivers/net/bnx2x.c | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
| 7 | * the Free Software Foundation. | 7 | * the Free Software Foundation. |
| 8 | * | 8 | * |
| 9 | * Written by: Eliezer Tamir <eliezert@broadcom.com> | 9 | * Maintained by: Eilon Greenstein <eilong@broadcom.com> |
| 10 | * Written by: Eliezer Tamir | ||
| 10 | * Based on code from Michael Chan's bnx2 driver | 11 | * Based on code from Michael Chan's bnx2 driver |
| 11 | * UDP CSUM errata workaround by Arik Gendelman | 12 | * UDP CSUM errata workaround by Arik Gendelman |
| 12 | * Slowpath rework by Vladislav Zolotarov | 13 | * Slowpath rework by Vladislav Zolotarov |
| @@ -74,7 +75,7 @@ static char version[] __devinitdata = | |||
| 74 | "Broadcom NetXtreme II 5771X 10Gigabit Ethernet Driver " | 75 | "Broadcom NetXtreme II 5771X 10Gigabit Ethernet Driver " |
| 75 | DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; | 76 | DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; |
| 76 | 77 | ||
| 77 | MODULE_AUTHOR("Eliezer Tamir <eliezert@broadcom.com>"); | 78 | MODULE_AUTHOR("Eliezer Tamir"); |
| 78 | MODULE_DESCRIPTION("Broadcom NetXtreme II BCM57710 Driver"); | 79 | MODULE_DESCRIPTION("Broadcom NetXtreme II BCM57710 Driver"); |
| 79 | MODULE_LICENSE("GPL"); | 80 | MODULE_LICENSE("GPL"); |
| 80 | MODULE_VERSION(DRV_MODULE_VERSION); | 81 | MODULE_VERSION(DRV_MODULE_VERSION); |
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index 4f0c0d31e7c1..8e68d06510a6 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
| 7 | * the Free Software Foundation. | 7 | * the Free Software Foundation. |
| 8 | * | 8 | * |
| 9 | * Written by: Eliezer Tamir <eliezert@broadcom.com> | 9 | * Maintained by: Eilon Greenstein <eilong@broadcom.com> |
| 10 | * Written by: Eliezer Tamir | ||
| 10 | * Based on code from Michael Chan's bnx2 driver | 11 | * Based on code from Michael Chan's bnx2 driver |
| 11 | */ | 12 | */ |
| 12 | 13 | ||
diff --git a/drivers/net/bnx2x_init.h b/drivers/net/bnx2x_init.h index dcaecc53bdb1..370686eef97c 100644 --- a/drivers/net/bnx2x_init.h +++ b/drivers/net/bnx2x_init.h | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
| 7 | * the Free Software Foundation. | 7 | * the Free Software Foundation. |
| 8 | * | 8 | * |
| 9 | * Written by: Eliezer Tamir <eliezert@broadcom.com> | 9 | * Maintained by: Eilon Greenstein <eilong@broadcom.com> |
| 10 | * Written by: Eliezer Tamir | ||
| 10 | */ | 11 | */ |
| 11 | 12 | ||
| 12 | #ifndef BNX2X_INIT_H | 13 | #ifndef BNX2X_INIT_H |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 287a61918739..075fd547421e 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
| @@ -1766,16 +1766,20 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa) | |||
| 1766 | mutex_lock(&ehea_bcmc_regs.lock); | 1766 | mutex_lock(&ehea_bcmc_regs.lock); |
| 1767 | 1767 | ||
| 1768 | /* Deregister old MAC in pHYP */ | 1768 | /* Deregister old MAC in pHYP */ |
| 1769 | ret = ehea_broadcast_reg_helper(port, H_DEREG_BCMC); | 1769 | if (port->state == EHEA_PORT_UP) { |
| 1770 | if (ret) | 1770 | ret = ehea_broadcast_reg_helper(port, H_DEREG_BCMC); |
| 1771 | goto out_upregs; | 1771 | if (ret) |
| 1772 | goto out_upregs; | ||
| 1773 | } | ||
| 1772 | 1774 | ||
| 1773 | port->mac_addr = cb0->port_mac_addr << 16; | 1775 | port->mac_addr = cb0->port_mac_addr << 16; |
| 1774 | 1776 | ||
| 1775 | /* Register new MAC in pHYP */ | 1777 | /* Register new MAC in pHYP */ |
| 1776 | ret = ehea_broadcast_reg_helper(port, H_REG_BCMC); | 1778 | if (port->state == EHEA_PORT_UP) { |
| 1777 | if (ret) | 1779 | ret = ehea_broadcast_reg_helper(port, H_REG_BCMC); |
| 1778 | goto out_upregs; | 1780 | if (ret) |
| 1781 | goto out_upregs; | ||
| 1782 | } | ||
| 1779 | 1783 | ||
| 1780 | ret = 0; | 1784 | ret = 0; |
| 1781 | 1785 | ||
| @@ -2601,7 +2605,8 @@ static int ehea_stop(struct net_device *dev) | |||
| 2601 | if (netif_msg_ifdown(port)) | 2605 | if (netif_msg_ifdown(port)) |
| 2602 | ehea_info("disabling port %s", dev->name); | 2606 | ehea_info("disabling port %s", dev->name); |
| 2603 | 2607 | ||
| 2604 | flush_scheduled_work(); | 2608 | cancel_work_sync(&port->reset_task); |
| 2609 | |||
| 2605 | mutex_lock(&port->port_lock); | 2610 | mutex_lock(&port->port_lock); |
| 2606 | netif_stop_queue(dev); | 2611 | netif_stop_queue(dev); |
| 2607 | port_napi_disable(port); | 2612 | port_napi_disable(port); |
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index 5f9c42e7a7f1..329edd9c08fc 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c | |||
| @@ -78,7 +78,7 @@ module_param_array_named(mac, mpc52xx_fec_mac_addr, byte, NULL, 0); | |||
| 78 | MODULE_PARM_DESC(mac, "six hex digits, ie. 0x1,0x2,0xc0,0x01,0xba,0xbe"); | 78 | MODULE_PARM_DESC(mac, "six hex digits, ie. 0x1,0x2,0xc0,0x01,0xba,0xbe"); |
| 79 | 79 | ||
| 80 | #define MPC52xx_MESSAGES_DEFAULT ( NETIF_MSG_DRV | NETIF_MSG_PROBE | \ | 80 | #define MPC52xx_MESSAGES_DEFAULT ( NETIF_MSG_DRV | NETIF_MSG_PROBE | \ |
| 81 | NETIF_MSG_LINK | NETIF_MSG_IFDOWN | NETIF_MSG_IFDOWN ) | 81 | NETIF_MSG_LINK | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP) |
| 82 | static int debug = -1; /* the above default */ | 82 | static int debug = -1; /* the above default */ |
| 83 | module_param(debug, int, 0); | 83 | module_param(debug, int, 0); |
| 84 | MODULE_PARM_DESC(debug, "debugging messages level"); | 84 | MODULE_PARM_DESC(debug, "debugging messages level"); |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 9eca97fb0a54..2cb244763292 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -3273,6 +3273,20 @@ static void nv_link_irq(struct net_device *dev) | |||
| 3273 | dprintk(KERN_DEBUG "%s: link change notification done.\n", dev->name); | 3273 | dprintk(KERN_DEBUG "%s: link change notification done.\n", dev->name); |
| 3274 | } | 3274 | } |
| 3275 | 3275 | ||
| 3276 | static void nv_msi_workaround(struct fe_priv *np) | ||
| 3277 | { | ||
| 3278 | |||
| 3279 | /* Need to toggle the msi irq mask within the ethernet device, | ||
| 3280 | * otherwise, future interrupts will not be detected. | ||
| 3281 | */ | ||
| 3282 | if (np->msi_flags & NV_MSI_ENABLED) { | ||
| 3283 | u8 __iomem *base = np->base; | ||
| 3284 | |||
| 3285 | writel(0, base + NvRegMSIIrqMask); | ||
| 3286 | writel(NVREG_MSI_VECTOR_0_ENABLED, base + NvRegMSIIrqMask); | ||
| 3287 | } | ||
| 3288 | } | ||
| 3289 | |||
| 3276 | static irqreturn_t nv_nic_irq(int foo, void *data) | 3290 | static irqreturn_t nv_nic_irq(int foo, void *data) |
| 3277 | { | 3291 | { |
| 3278 | struct net_device *dev = (struct net_device *) data; | 3292 | struct net_device *dev = (struct net_device *) data; |
| @@ -3295,6 +3309,8 @@ static irqreturn_t nv_nic_irq(int foo, void *data) | |||
| 3295 | if (!(events & np->irqmask)) | 3309 | if (!(events & np->irqmask)) |
| 3296 | break; | 3310 | break; |
| 3297 | 3311 | ||
| 3312 | nv_msi_workaround(np); | ||
| 3313 | |||
| 3298 | spin_lock(&np->lock); | 3314 | spin_lock(&np->lock); |
| 3299 | nv_tx_done(dev); | 3315 | nv_tx_done(dev); |
| 3300 | spin_unlock(&np->lock); | 3316 | spin_unlock(&np->lock); |
| @@ -3410,6 +3426,8 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) | |||
| 3410 | if (!(events & np->irqmask)) | 3426 | if (!(events & np->irqmask)) |
| 3411 | break; | 3427 | break; |
| 3412 | 3428 | ||
| 3429 | nv_msi_workaround(np); | ||
| 3430 | |||
| 3413 | spin_lock(&np->lock); | 3431 | spin_lock(&np->lock); |
| 3414 | nv_tx_done_optimized(dev, TX_WORK_PER_LOOP); | 3432 | nv_tx_done_optimized(dev, TX_WORK_PER_LOOP); |
| 3415 | spin_unlock(&np->lock); | 3433 | spin_unlock(&np->lock); |
| @@ -3750,6 +3768,8 @@ static irqreturn_t nv_nic_irq_test(int foo, void *data) | |||
| 3750 | if (!(events & NVREG_IRQ_TIMER)) | 3768 | if (!(events & NVREG_IRQ_TIMER)) |
| 3751 | return IRQ_RETVAL(0); | 3769 | return IRQ_RETVAL(0); |
| 3752 | 3770 | ||
| 3771 | nv_msi_workaround(np); | ||
| 3772 | |||
| 3753 | spin_lock(&np->lock); | 3773 | spin_lock(&np->lock); |
| 3754 | np->intr_test = 1; | 3774 | np->intr_test = 1; |
| 3755 | spin_unlock(&np->lock); | 3775 | spin_unlock(&np->lock); |
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index dde9c7e6408a..00bc7fbb6b37 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c | |||
| @@ -959,7 +959,7 @@ static int epp_close(struct net_device *dev) | |||
| 959 | unsigned char tmp[1]; | 959 | unsigned char tmp[1]; |
| 960 | 960 | ||
| 961 | bc->work_running = 0; | 961 | bc->work_running = 0; |
| 962 | flush_scheduled_work(); | 962 | cancel_delayed_work_sync(&bc->run_work); |
| 963 | bc->stat = EPP_DCDBIT; | 963 | bc->stat = EPP_DCDBIT; |
| 964 | tmp[0] = 0; | 964 | tmp[0] = 0; |
| 965 | pp->ops->epp_write_addr(pp, tmp, 1, 0); | 965 | pp->ops->epp_write_addr(pp, tmp, 1, 0); |
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index 9b358f61ed7f..679a0826780e 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c | |||
| @@ -577,12 +577,12 @@ static void ipg_nic_set_multicast_list(struct net_device *dev) | |||
| 577 | /* NIC to be configured in promiscuous mode. */ | 577 | /* NIC to be configured in promiscuous mode. */ |
| 578 | receivemode = IPG_RM_RECEIVEALLFRAMES; | 578 | receivemode = IPG_RM_RECEIVEALLFRAMES; |
| 579 | } else if ((dev->flags & IFF_ALLMULTI) || | 579 | } else if ((dev->flags & IFF_ALLMULTI) || |
| 580 | (dev->flags & IFF_MULTICAST & | 580 | ((dev->flags & IFF_MULTICAST) && |
| 581 | (dev->mc_count > IPG_MULTICAST_HASHTABLE_SIZE))) { | 581 | (dev->mc_count > IPG_MULTICAST_HASHTABLE_SIZE))) { |
| 582 | /* NIC to be configured to receive all multicast | 582 | /* NIC to be configured to receive all multicast |
| 583 | * frames. */ | 583 | * frames. */ |
| 584 | receivemode |= IPG_RM_RECEIVEMULTICAST; | 584 | receivemode |= IPG_RM_RECEIVEMULTICAST; |
| 585 | } else if (dev->flags & IFF_MULTICAST & (dev->mc_count > 0)) { | 585 | } else if ((dev->flags & IFF_MULTICAST) && (dev->mc_count > 0)) { |
| 586 | /* NIC to be configured to receive selected | 586 | /* NIC to be configured to receive selected |
| 587 | * multicast addresses. */ | 587 | * multicast addresses. */ |
| 588 | receivemode |= IPG_RM_RECEIVEMULTICASTHASH; | 588 | receivemode |= IPG_RM_RECEIVEMULTICASTHASH; |
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index ce816ba9c40d..e6317557a531 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig | |||
| @@ -329,6 +329,7 @@ config PXA_FICP | |||
| 329 | config MCS_FIR | 329 | config MCS_FIR |
| 330 | tristate "MosChip MCS7780 IrDA-USB dongle" | 330 | tristate "MosChip MCS7780 IrDA-USB dongle" |
| 331 | depends on IRDA && USB && EXPERIMENTAL | 331 | depends on IRDA && USB && EXPERIMENTAL |
| 332 | select CRC32 | ||
| 332 | help | 333 | help |
| 333 | Say Y or M here if you want to build support for the MosChip | 334 | Say Y or M here if you want to build support for the MosChip |
| 334 | MCS7780 IrDA-USB bridge device driver. | 335 | MCS7780 IrDA-USB bridge device driver. |
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c index 6321b059ce13..2f38e847e2cd 100644 --- a/drivers/net/ixgbe/ixgbe_82598.c +++ b/drivers/net/ixgbe/ixgbe_82598.c | |||
| @@ -58,8 +58,8 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw); | |||
| 58 | 58 | ||
| 59 | static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw) | 59 | static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw) |
| 60 | { | 60 | { |
| 61 | hw->mac.num_rx_queues = IXGBE_82598_MAX_TX_QUEUES; | 61 | hw->mac.num_rx_queues = IXGBE_82598_MAX_RX_QUEUES; |
| 62 | hw->mac.num_tx_queues = IXGBE_82598_MAX_RX_QUEUES; | 62 | hw->mac.num_tx_queues = IXGBE_82598_MAX_TX_QUEUES; |
| 63 | hw->mac.num_rx_addrs = IXGBE_82598_RAR_ENTRIES; | 63 | hw->mac.num_rx_addrs = IXGBE_82598_RAR_ENTRIES; |
| 64 | 64 | ||
| 65 | /* PHY ops are filled in by default properly for Fiber only */ | 65 | /* PHY ops are filled in by default properly for Fiber only */ |
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 58a26a47af29..bafb69b6f7cb 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
| @@ -341,12 +341,6 @@ static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb) | |||
| 341 | struct pppox_sock *relay_po; | 341 | struct pppox_sock *relay_po; |
| 342 | 342 | ||
| 343 | if (sk->sk_state & PPPOX_BOUND) { | 343 | if (sk->sk_state & PPPOX_BOUND) { |
| 344 | struct pppoe_hdr *ph = pppoe_hdr(skb); | ||
| 345 | int len = ntohs(ph->length); | ||
| 346 | skb_pull_rcsum(skb, sizeof(struct pppoe_hdr)); | ||
| 347 | if (pskb_trim_rcsum(skb, len)) | ||
| 348 | goto abort_kfree; | ||
| 349 | |||
| 350 | ppp_input(&po->chan, skb); | 344 | ppp_input(&po->chan, skb); |
| 351 | } else if (sk->sk_state & PPPOX_RELAY) { | 345 | } else if (sk->sk_state & PPPOX_RELAY) { |
| 352 | relay_po = get_item_by_addr(&po->pppoe_relay); | 346 | relay_po = get_item_by_addr(&po->pppoe_relay); |
| @@ -357,7 +351,6 @@ static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb) | |||
| 357 | if ((sk_pppox(relay_po)->sk_state & PPPOX_CONNECTED) == 0) | 351 | if ((sk_pppox(relay_po)->sk_state & PPPOX_CONNECTED) == 0) |
| 358 | goto abort_put; | 352 | goto abort_put; |
| 359 | 353 | ||
| 360 | skb_pull(skb, sizeof(struct pppoe_hdr)); | ||
| 361 | if (!__pppoe_xmit(sk_pppox(relay_po), skb)) | 354 | if (!__pppoe_xmit(sk_pppox(relay_po), skb)) |
| 362 | goto abort_put; | 355 | goto abort_put; |
| 363 | } else { | 356 | } else { |
| @@ -388,6 +381,7 @@ static int pppoe_rcv(struct sk_buff *skb, | |||
| 388 | { | 381 | { |
| 389 | struct pppoe_hdr *ph; | 382 | struct pppoe_hdr *ph; |
| 390 | struct pppox_sock *po; | 383 | struct pppox_sock *po; |
| 384 | int len; | ||
| 391 | 385 | ||
| 392 | if (!(skb = skb_share_check(skb, GFP_ATOMIC))) | 386 | if (!(skb = skb_share_check(skb, GFP_ATOMIC))) |
| 393 | goto out; | 387 | goto out; |
| @@ -399,10 +393,21 @@ static int pppoe_rcv(struct sk_buff *skb, | |||
| 399 | goto drop; | 393 | goto drop; |
| 400 | 394 | ||
| 401 | ph = pppoe_hdr(skb); | 395 | ph = pppoe_hdr(skb); |
| 396 | len = ntohs(ph->length); | ||
| 397 | |||
| 398 | skb_pull_rcsum(skb, sizeof(*ph)); | ||
| 399 | if (skb->len < len) | ||
| 400 | goto drop; | ||
| 402 | 401 | ||
| 403 | po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex); | 402 | po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex); |
| 404 | if (po != NULL) | 403 | if (!po) |
| 405 | return sk_receive_skb(sk_pppox(po), skb, 0); | 404 | goto drop; |
| 405 | |||
| 406 | if (pskb_trim_rcsum(skb, len)) | ||
| 407 | goto drop; | ||
| 408 | |||
| 409 | return sk_receive_skb(sk_pppox(po), skb, 0); | ||
| 410 | |||
| 406 | drop: | 411 | drop: |
| 407 | kfree_skb(skb); | 412 | kfree_skb(skb); |
| 408 | out: | 413 | out: |
| @@ -427,12 +432,12 @@ static int pppoe_disc_rcv(struct sk_buff *skb, | |||
| 427 | if (dev_net(dev) != &init_net) | 432 | if (dev_net(dev) != &init_net) |
| 428 | goto abort; | 433 | goto abort; |
| 429 | 434 | ||
| 430 | if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) | ||
| 431 | goto abort; | ||
| 432 | |||
| 433 | if (!(skb = skb_share_check(skb, GFP_ATOMIC))) | 435 | if (!(skb = skb_share_check(skb, GFP_ATOMIC))) |
| 434 | goto out; | 436 | goto out; |
| 435 | 437 | ||
| 438 | if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) | ||
| 439 | goto abort; | ||
| 440 | |||
| 436 | ph = pppoe_hdr(skb); | 441 | ph = pppoe_hdr(skb); |
| 437 | if (ph->code != PADT_CODE) | 442 | if (ph->code != PADT_CODE) |
| 438 | goto abort; | 443 | goto abort; |
| @@ -937,12 +942,10 @@ static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 937 | m->msg_namelen = 0; | 942 | m->msg_namelen = 0; |
| 938 | 943 | ||
| 939 | if (skb) { | 944 | if (skb) { |
| 940 | struct pppoe_hdr *ph = pppoe_hdr(skb); | 945 | total_len = min(total_len, skb->len); |
| 941 | const int len = ntohs(ph->length); | 946 | error = skb_copy_datagram_iovec(skb, 0, m->msg_iov, total_len); |
| 942 | |||
| 943 | error = memcpy_toiovec(m->msg_iov, (unsigned char *) &ph->tag[0], len); | ||
| 944 | if (error == 0) | 947 | if (error == 0) |
| 945 | error = len; | 948 | error = total_len; |
| 946 | } | 949 | } |
| 947 | 950 | ||
| 948 | kfree_skb(skb); | 951 | kfree_skb(skb); |
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index 70cfdb46aa27..f9298827a76c 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c | |||
| @@ -783,14 +783,18 @@ static int pppol2tp_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 783 | err = 0; | 783 | err = 0; |
| 784 | skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, | 784 | skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, |
| 785 | flags & MSG_DONTWAIT, &err); | 785 | flags & MSG_DONTWAIT, &err); |
| 786 | if (skb) { | 786 | if (!skb) |
| 787 | err = memcpy_toiovec(msg->msg_iov, (unsigned char *) skb->data, | 787 | goto end; |
| 788 | skb->len); | 788 | |
| 789 | if (err < 0) | 789 | if (len > skb->len) |
| 790 | goto do_skb_free; | 790 | len = skb->len; |
| 791 | err = skb->len; | 791 | else if (len < skb->len) |
| 792 | } | 792 | msg->msg_flags |= MSG_TRUNC; |
| 793 | do_skb_free: | 793 | |
| 794 | err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, len); | ||
| 795 | if (likely(err == 0)) | ||
| 796 | err = len; | ||
| 797 | |||
| 794 | kfree_skb(skb); | 798 | kfree_skb(skb); |
| 795 | end: | 799 | end: |
| 796 | return err; | 800 | return err; |
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 169edc154928..858b191517b3 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -733,7 +733,7 @@ static void r6040_timer(unsigned long data) | |||
| 733 | } | 733 | } |
| 734 | 734 | ||
| 735 | /* Timer active again */ | 735 | /* Timer active again */ |
| 736 | mod_timer(&lp->timer, jiffies + round_jiffies(HZ)); | 736 | mod_timer(&lp->timer, round_jiffies(jiffies + HZ)); |
| 737 | } | 737 | } |
| 738 | 738 | ||
| 739 | /* Read/set MAC address routines */ | 739 | /* Read/set MAC address routines */ |
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index d3f749c72d41..790db89db345 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
| @@ -733,8 +733,10 @@ void falcon_fini_rx(struct efx_rx_queue *rx_queue) | |||
| 733 | continue; | 733 | continue; |
| 734 | break; | 734 | break; |
| 735 | } | 735 | } |
| 736 | if (rc) | 736 | if (rc) { |
| 737 | EFX_ERR(efx, "failed to flush rx queue %d\n", rx_queue->queue); | 737 | EFX_ERR(efx, "failed to flush rx queue %d\n", rx_queue->queue); |
| 738 | efx_schedule_reset(efx, RESET_TYPE_INVISIBLE); | ||
| 739 | } | ||
| 738 | 740 | ||
| 739 | /* Remove RX descriptor ring from card */ | 741 | /* Remove RX descriptor ring from card */ |
| 740 | EFX_ZERO_OWORD(rx_desc_ptr); | 742 | EFX_ZERO_OWORD(rx_desc_ptr); |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 3bb60530d4d7..62436b3a18c6 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -4404,7 +4404,9 @@ static int sky2_resume(struct pci_dev *pdev) | |||
| 4404 | if (err) { | 4404 | if (err) { |
| 4405 | printk(KERN_ERR PFX "%s: could not up: %d\n", | 4405 | printk(KERN_ERR PFX "%s: could not up: %d\n", |
| 4406 | dev->name, err); | 4406 | dev->name, err); |
| 4407 | rtnl_lock(); | ||
| 4407 | dev_close(dev); | 4408 | dev_close(dev); |
| 4409 | rtnl_unlock(); | ||
| 4408 | goto out; | 4410 | goto out; |
| 4409 | } | 4411 | } |
| 4410 | } | 4412 | } |
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 4e2800205189..e2ee91a6ae7e 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
| @@ -136,7 +136,6 @@ struct smc911x_local { | |||
| 136 | 136 | ||
| 137 | /* work queue */ | 137 | /* work queue */ |
| 138 | struct work_struct phy_configure; | 138 | struct work_struct phy_configure; |
| 139 | int work_pending; | ||
| 140 | 139 | ||
| 141 | int tx_throttle; | 140 | int tx_throttle; |
| 142 | spinlock_t lock; | 141 | spinlock_t lock; |
| @@ -960,11 +959,11 @@ static void smc911x_phy_configure(struct work_struct *work) | |||
| 960 | * We should not be called if phy_type is zero. | 959 | * We should not be called if phy_type is zero. |
| 961 | */ | 960 | */ |
| 962 | if (lp->phy_type == 0) | 961 | if (lp->phy_type == 0) |
| 963 | goto smc911x_phy_configure_exit_nolock; | 962 | return; |
| 964 | 963 | ||
| 965 | if (smc911x_phy_reset(dev, phyaddr)) { | 964 | if (smc911x_phy_reset(dev, phyaddr)) { |
| 966 | printk("%s: PHY reset timed out\n", dev->name); | 965 | printk("%s: PHY reset timed out\n", dev->name); |
| 967 | goto smc911x_phy_configure_exit_nolock; | 966 | return; |
| 968 | } | 967 | } |
| 969 | spin_lock_irqsave(&lp->lock, flags); | 968 | spin_lock_irqsave(&lp->lock, flags); |
| 970 | 969 | ||
| @@ -1033,8 +1032,6 @@ static void smc911x_phy_configure(struct work_struct *work) | |||
| 1033 | 1032 | ||
| 1034 | smc911x_phy_configure_exit: | 1033 | smc911x_phy_configure_exit: |
| 1035 | spin_unlock_irqrestore(&lp->lock, flags); | 1034 | spin_unlock_irqrestore(&lp->lock, flags); |
| 1036 | smc911x_phy_configure_exit_nolock: | ||
| 1037 | lp->work_pending = 0; | ||
| 1038 | } | 1035 | } |
| 1039 | 1036 | ||
| 1040 | /* | 1037 | /* |
| @@ -1356,11 +1353,8 @@ static void smc911x_timeout(struct net_device *dev) | |||
| 1356 | * smc911x_phy_configure() calls msleep() which calls schedule_timeout() | 1353 | * smc911x_phy_configure() calls msleep() which calls schedule_timeout() |
| 1357 | * which calls schedule(). Hence we use a work queue. | 1354 | * which calls schedule(). Hence we use a work queue. |
| 1358 | */ | 1355 | */ |
| 1359 | if (lp->phy_type != 0) { | 1356 | if (lp->phy_type != 0) |
| 1360 | if (schedule_work(&lp->phy_configure)) { | 1357 | schedule_work(&lp->phy_configure); |
| 1361 | lp->work_pending = 1; | ||
| 1362 | } | ||
| 1363 | } | ||
| 1364 | 1358 | ||
| 1365 | /* We can accept TX packets again */ | 1359 | /* We can accept TX packets again */ |
| 1366 | dev->trans_start = jiffies; | 1360 | dev->trans_start = jiffies; |
| @@ -1531,16 +1525,8 @@ static int smc911x_close(struct net_device *dev) | |||
| 1531 | if (lp->phy_type != 0) { | 1525 | if (lp->phy_type != 0) { |
| 1532 | /* We need to ensure that no calls to | 1526 | /* We need to ensure that no calls to |
| 1533 | * smc911x_phy_configure are pending. | 1527 | * smc911x_phy_configure are pending. |
| 1534 | |||
| 1535 | * flush_scheduled_work() cannot be called because we | ||
| 1536 | * are running with the netlink semaphore held (from | ||
| 1537 | * devinet_ioctl()) and the pending work queue | ||
| 1538 | * contains linkwatch_event() (scheduled by | ||
| 1539 | * netif_carrier_off() above). linkwatch_event() also | ||
| 1540 | * wants the netlink semaphore. | ||
| 1541 | */ | 1528 | */ |
| 1542 | while (lp->work_pending) | 1529 | cancel_work_sync(&lp->phy_configure); |
| 1543 | schedule(); | ||
| 1544 | smc911x_phy_powerdown(dev, lp->mii.phy_id); | 1530 | smc911x_phy_powerdown(dev, lp->mii.phy_id); |
| 1545 | } | 1531 | } |
| 1546 | 1532 | ||
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index a188e33484e6..f2051b209da2 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
| @@ -1016,15 +1016,8 @@ static void smc_phy_powerdown(struct net_device *dev) | |||
| 1016 | 1016 | ||
| 1017 | /* We need to ensure that no calls to smc_phy_configure are | 1017 | /* We need to ensure that no calls to smc_phy_configure are |
| 1018 | pending. | 1018 | pending. |
| 1019 | |||
| 1020 | flush_scheduled_work() cannot be called because we are | ||
| 1021 | running with the netlink semaphore held (from | ||
| 1022 | devinet_ioctl()) and the pending work queue contains | ||
| 1023 | linkwatch_event() (scheduled by netif_carrier_off() | ||
| 1024 | above). linkwatch_event() also wants the netlink semaphore. | ||
| 1025 | */ | 1019 | */ |
| 1026 | while(lp->work_pending) | 1020 | cancel_work_sync(&lp->phy_configure); |
| 1027 | yield(); | ||
| 1028 | 1021 | ||
| 1029 | bmcr = smc_phy_read(dev, phy, MII_BMCR); | 1022 | bmcr = smc_phy_read(dev, phy, MII_BMCR); |
| 1030 | smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN); | 1023 | smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN); |
| @@ -1161,7 +1154,6 @@ static void smc_phy_configure(struct work_struct *work) | |||
| 1161 | smc_phy_configure_exit: | 1154 | smc_phy_configure_exit: |
| 1162 | SMC_SELECT_BANK(lp, 2); | 1155 | SMC_SELECT_BANK(lp, 2); |
| 1163 | spin_unlock_irq(&lp->lock); | 1156 | spin_unlock_irq(&lp->lock); |
| 1164 | lp->work_pending = 0; | ||
| 1165 | } | 1157 | } |
| 1166 | 1158 | ||
| 1167 | /* | 1159 | /* |
| @@ -1389,11 +1381,8 @@ static void smc_timeout(struct net_device *dev) | |||
| 1389 | * smc_phy_configure() calls msleep() which calls schedule_timeout() | 1381 | * smc_phy_configure() calls msleep() which calls schedule_timeout() |
| 1390 | * which calls schedule(). Hence we use a work queue. | 1382 | * which calls schedule(). Hence we use a work queue. |
| 1391 | */ | 1383 | */ |
| 1392 | if (lp->phy_type != 0) { | 1384 | if (lp->phy_type != 0) |
| 1393 | if (schedule_work(&lp->phy_configure)) { | 1385 | schedule_work(&lp->phy_configure); |
| 1394 | lp->work_pending = 1; | ||
| 1395 | } | ||
| 1396 | } | ||
| 1397 | 1386 | ||
| 1398 | /* We can accept TX packets again */ | 1387 | /* We can accept TX packets again */ |
| 1399 | dev->trans_start = jiffies; | 1388 | dev->trans_start = jiffies; |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 69e97a1cb1c4..8606818653f8 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -93,14 +93,14 @@ | |||
| 93 | #define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l) | 93 | #define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l) |
| 94 | # endif | 94 | # endif |
| 95 | /* check if the mac in reg is valid */ | 95 | /* check if the mac in reg is valid */ |
| 96 | #define SMC_GET_MAC_ADDR(addr) \ | 96 | #define SMC_GET_MAC_ADDR(lp, addr) \ |
| 97 | do { \ | 97 | do { \ |
| 98 | unsigned int __v; \ | 98 | unsigned int __v; \ |
| 99 | __v = SMC_inw(ioaddr, ADDR0_REG); \ | 99 | __v = SMC_inw(ioaddr, ADDR0_REG(lp)); \ |
| 100 | addr[0] = __v; addr[1] = __v >> 8; \ | 100 | addr[0] = __v; addr[1] = __v >> 8; \ |
| 101 | __v = SMC_inw(ioaddr, ADDR1_REG); \ | 101 | __v = SMC_inw(ioaddr, ADDR1_REG(lp)); \ |
| 102 | addr[2] = __v; addr[3] = __v >> 8; \ | 102 | addr[2] = __v; addr[3] = __v >> 8; \ |
| 103 | __v = SMC_inw(ioaddr, ADDR2_REG); \ | 103 | __v = SMC_inw(ioaddr, ADDR2_REG(lp)); \ |
| 104 | addr[4] = __v; addr[5] = __v >> 8; \ | 104 | addr[4] = __v; addr[5] = __v >> 8; \ |
| 105 | if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \ | 105 | if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \ |
| 106 | random_ether_addr(addr); \ | 106 | random_ether_addr(addr); \ |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 07b3f77e7626..cc4bde852542 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -64,8 +64,8 @@ | |||
| 64 | 64 | ||
| 65 | #define DRV_MODULE_NAME "tg3" | 65 | #define DRV_MODULE_NAME "tg3" |
| 66 | #define PFX DRV_MODULE_NAME ": " | 66 | #define PFX DRV_MODULE_NAME ": " |
| 67 | #define DRV_MODULE_VERSION "3.92" | 67 | #define DRV_MODULE_VERSION "3.92.1" |
| 68 | #define DRV_MODULE_RELDATE "May 2, 2008" | 68 | #define DRV_MODULE_RELDATE "June 9, 2008" |
| 69 | 69 | ||
| 70 | #define TG3_DEF_MAC_MODE 0 | 70 | #define TG3_DEF_MAC_MODE 0 |
| 71 | #define TG3_DEF_RX_MODE 0 | 71 | #define TG3_DEF_RX_MODE 0 |
| @@ -1295,6 +1295,21 @@ static void tg3_frob_aux_power(struct tg3 *tp) | |||
| 1295 | GRC_LCLCTRL_GPIO_OUTPUT0 | | 1295 | GRC_LCLCTRL_GPIO_OUTPUT0 | |
| 1296 | GRC_LCLCTRL_GPIO_OUTPUT1), | 1296 | GRC_LCLCTRL_GPIO_OUTPUT1), |
| 1297 | 100); | 1297 | 100); |
| 1298 | } else if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761) { | ||
| 1299 | /* The 5761 non-e device swaps GPIO 0 and GPIO 2. */ | ||
| 1300 | u32 grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 | | ||
| 1301 | GRC_LCLCTRL_GPIO_OE1 | | ||
| 1302 | GRC_LCLCTRL_GPIO_OE2 | | ||
| 1303 | GRC_LCLCTRL_GPIO_OUTPUT0 | | ||
| 1304 | GRC_LCLCTRL_GPIO_OUTPUT1 | | ||
| 1305 | tp->grc_local_ctrl; | ||
| 1306 | tw32_wait_f(GRC_LOCAL_CTRL, grc_local_ctrl, 100); | ||
| 1307 | |||
| 1308 | grc_local_ctrl |= GRC_LCLCTRL_GPIO_OUTPUT2; | ||
| 1309 | tw32_wait_f(GRC_LOCAL_CTRL, grc_local_ctrl, 100); | ||
| 1310 | |||
| 1311 | grc_local_ctrl &= ~GRC_LCLCTRL_GPIO_OUTPUT0; | ||
| 1312 | tw32_wait_f(GRC_LOCAL_CTRL, grc_local_ctrl, 100); | ||
| 1298 | } else { | 1313 | } else { |
| 1299 | u32 no_gpio2; | 1314 | u32 no_gpio2; |
| 1300 | u32 grc_local_ctrl = 0; | 1315 | u32 grc_local_ctrl = 0; |
| @@ -3168,8 +3183,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, int force_reset) | |||
| 3168 | err |= tg3_readphy(tp, MII_BMCR, &bmcr); | 3183 | err |= tg3_readphy(tp, MII_BMCR, &bmcr); |
| 3169 | 3184 | ||
| 3170 | if ((tp->link_config.autoneg == AUTONEG_ENABLE) && !force_reset && | 3185 | if ((tp->link_config.autoneg == AUTONEG_ENABLE) && !force_reset && |
| 3171 | (tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT) && | 3186 | (tp->tg3_flags2 & TG3_FLG2_PARALLEL_DETECT)) { |
| 3172 | tp->link_config.flowctrl == tp->link_config.active_flowctrl) { | ||
| 3173 | /* do nothing, just check for link up at the end */ | 3187 | /* do nothing, just check for link up at the end */ |
| 3174 | } else if (tp->link_config.autoneg == AUTONEG_ENABLE) { | 3188 | } else if (tp->link_config.autoneg == AUTONEG_ENABLE) { |
| 3175 | u32 adv, new_adv; | 3189 | u32 adv, new_adv; |
| @@ -8599,7 +8613,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 8599 | (cmd->speed == SPEED_1000)) | 8613 | (cmd->speed == SPEED_1000)) |
| 8600 | return -EINVAL; | 8614 | return -EINVAL; |
| 8601 | else if ((cmd->speed == SPEED_1000) && | 8615 | else if ((cmd->speed == SPEED_1000) && |
| 8602 | (tp->tg3_flags2 & TG3_FLAG_10_100_ONLY)) | 8616 | (tp->tg3_flags & TG3_FLAG_10_100_ONLY)) |
| 8603 | return -EINVAL; | 8617 | return -EINVAL; |
| 8604 | 8618 | ||
| 8605 | tg3_full_lock(tp, 0); | 8619 | tg3_full_lock(tp, 0); |
| @@ -11768,6 +11782,15 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
| 11768 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755) | 11782 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755) |
| 11769 | tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; | 11783 | tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; |
| 11770 | 11784 | ||
| 11785 | if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761) { | ||
| 11786 | /* Turn off the debug UART. */ | ||
| 11787 | tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; | ||
| 11788 | if (tp->tg3_flags2 & TG3_FLG2_IS_NIC) | ||
| 11789 | /* Keep VMain power. */ | ||
| 11790 | tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE0 | | ||
| 11791 | GRC_LCLCTRL_GPIO_OUTPUT0; | ||
| 11792 | } | ||
| 11793 | |||
| 11771 | /* Force the chip into D0. */ | 11794 | /* Force the chip into D0. */ |
| 11772 | err = tg3_set_power_state(tp, PCI_D0); | 11795 | err = tg3_set_power_state(tp, PCI_D0); |
| 11773 | if (err) { | 11796 | if (err) { |
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 55670b5eb611..af8d2c436efd 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
| @@ -731,7 +731,7 @@ static void tulip_down (struct net_device *dev) | |||
| 731 | void __iomem *ioaddr = tp->base_addr; | 731 | void __iomem *ioaddr = tp->base_addr; |
| 732 | unsigned long flags; | 732 | unsigned long flags; |
| 733 | 733 | ||
| 734 | flush_scheduled_work(); | 734 | cancel_work_sync(&tp->media_work); |
| 735 | 735 | ||
| 736 | #ifdef CONFIG_TULIP_NAPI | 736 | #ifdef CONFIG_TULIP_NAPI |
| 737 | napi_disable(&tp->napi); | 737 | napi_disable(&tp->napi); |
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 0dcfc0310264..7c66b052f55a 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
| @@ -706,7 +706,7 @@ static void kaweth_kill_urbs(struct kaweth_device *kaweth) | |||
| 706 | usb_kill_urb(kaweth->rx_urb); | 706 | usb_kill_urb(kaweth->rx_urb); |
| 707 | usb_kill_urb(kaweth->tx_urb); | 707 | usb_kill_urb(kaweth->tx_urb); |
| 708 | 708 | ||
| 709 | flush_scheduled_work(); | 709 | cancel_delayed_work_sync(&kaweth->lowmem_work); |
| 710 | 710 | ||
| 711 | /* a scheduled work may have resubmitted, | 711 | /* a scheduled work may have resubmitted, |
| 712 | we hit them again */ | 712 | we hit them again */ |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 5450eac9e263..4452306d5328 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -44,11 +44,15 @@ struct virtnet_info | |||
| 44 | /* The skb we couldn't send because buffers were full. */ | 44 | /* The skb we couldn't send because buffers were full. */ |
| 45 | struct sk_buff *last_xmit_skb; | 45 | struct sk_buff *last_xmit_skb; |
| 46 | 46 | ||
| 47 | /* If we need to free in a timer, this is it. */ | ||
| 48 | struct timer_list xmit_free_timer; | ||
| 49 | |||
| 47 | /* Number of input buffers, and max we've ever had. */ | 50 | /* Number of input buffers, and max we've ever had. */ |
| 48 | unsigned int num, max; | 51 | unsigned int num, max; |
| 49 | 52 | ||
| 50 | /* For cleaning up after transmission. */ | 53 | /* For cleaning up after transmission. */ |
| 51 | struct tasklet_struct tasklet; | 54 | struct tasklet_struct tasklet; |
| 55 | bool free_in_tasklet; | ||
| 52 | 56 | ||
| 53 | /* Receive & send queues. */ | 57 | /* Receive & send queues. */ |
| 54 | struct sk_buff_head recv; | 58 | struct sk_buff_head recv; |
| @@ -72,7 +76,7 @@ static void skb_xmit_done(struct virtqueue *svq) | |||
| 72 | /* Suppress further interrupts. */ | 76 | /* Suppress further interrupts. */ |
| 73 | svq->vq_ops->disable_cb(svq); | 77 | svq->vq_ops->disable_cb(svq); |
| 74 | 78 | ||
| 75 | /* We were waiting for more output buffers. */ | 79 | /* We were probably waiting for more output buffers. */ |
| 76 | netif_wake_queue(vi->dev); | 80 | netif_wake_queue(vi->dev); |
| 77 | 81 | ||
| 78 | /* Make sure we re-xmit last_xmit_skb: if there are no more packets | 82 | /* Make sure we re-xmit last_xmit_skb: if there are no more packets |
| @@ -94,9 +98,7 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, | |||
| 94 | BUG_ON(len > MAX_PACKET_LEN); | 98 | BUG_ON(len > MAX_PACKET_LEN); |
| 95 | 99 | ||
| 96 | skb_trim(skb, len); | 100 | skb_trim(skb, len); |
| 97 | skb->protocol = eth_type_trans(skb, dev); | 101 | |
| 98 | pr_debug("Receiving skb proto 0x%04x len %i type %i\n", | ||
| 99 | ntohs(skb->protocol), skb->len, skb->pkt_type); | ||
| 100 | dev->stats.rx_bytes += skb->len; | 102 | dev->stats.rx_bytes += skb->len; |
| 101 | dev->stats.rx_packets++; | 103 | dev->stats.rx_packets++; |
| 102 | 104 | ||
| @@ -106,6 +108,10 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, | |||
| 106 | goto frame_err; | 108 | goto frame_err; |
| 107 | } | 109 | } |
| 108 | 110 | ||
| 111 | skb->protocol = eth_type_trans(skb, dev); | ||
| 112 | pr_debug("Receiving skb proto 0x%04x len %i type %i\n", | ||
| 113 | ntohs(skb->protocol), skb->len, skb->pkt_type); | ||
| 114 | |||
| 109 | if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) { | 115 | if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) { |
| 110 | pr_debug("GSO!\n"); | 116 | pr_debug("GSO!\n"); |
| 111 | switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) { | 117 | switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) { |
| @@ -238,9 +244,25 @@ static void free_old_xmit_skbs(struct virtnet_info *vi) | |||
| 238 | } | 244 | } |
| 239 | } | 245 | } |
| 240 | 246 | ||
| 247 | /* If the virtio transport doesn't always notify us when all in-flight packets | ||
| 248 | * are consumed, we fall back to using this function on a timer to free them. */ | ||
| 249 | static void xmit_free(unsigned long data) | ||
| 250 | { | ||
| 251 | struct virtnet_info *vi = (void *)data; | ||
| 252 | |||
| 253 | netif_tx_lock(vi->dev); | ||
| 254 | |||
| 255 | free_old_xmit_skbs(vi); | ||
| 256 | |||
| 257 | if (!skb_queue_empty(&vi->send)) | ||
| 258 | mod_timer(&vi->xmit_free_timer, jiffies + (HZ/10)); | ||
| 259 | |||
| 260 | netif_tx_unlock(vi->dev); | ||
| 261 | } | ||
| 262 | |||
| 241 | static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb) | 263 | static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb) |
| 242 | { | 264 | { |
| 243 | int num; | 265 | int num, err; |
| 244 | struct scatterlist sg[2+MAX_SKB_FRAGS]; | 266 | struct scatterlist sg[2+MAX_SKB_FRAGS]; |
| 245 | struct virtio_net_hdr *hdr; | 267 | struct virtio_net_hdr *hdr; |
| 246 | const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; | 268 | const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest; |
| @@ -283,7 +305,11 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb) | |||
| 283 | vnet_hdr_to_sg(sg, skb); | 305 | vnet_hdr_to_sg(sg, skb); |
| 284 | num = skb_to_sgvec(skb, sg+1, 0, skb->len) + 1; | 306 | num = skb_to_sgvec(skb, sg+1, 0, skb->len) + 1; |
| 285 | 307 | ||
| 286 | return vi->svq->vq_ops->add_buf(vi->svq, sg, num, 0, skb); | 308 | err = vi->svq->vq_ops->add_buf(vi->svq, sg, num, 0, skb); |
| 309 | if (!err && !vi->free_in_tasklet) | ||
| 310 | mod_timer(&vi->xmit_free_timer, jiffies + (HZ/10)); | ||
| 311 | |||
| 312 | return err; | ||
| 287 | } | 313 | } |
| 288 | 314 | ||
| 289 | static void xmit_tasklet(unsigned long data) | 315 | static void xmit_tasklet(unsigned long data) |
| @@ -295,6 +321,8 @@ static void xmit_tasklet(unsigned long data) | |||
| 295 | vi->svq->vq_ops->kick(vi->svq); | 321 | vi->svq->vq_ops->kick(vi->svq); |
| 296 | vi->last_xmit_skb = NULL; | 322 | vi->last_xmit_skb = NULL; |
| 297 | } | 323 | } |
| 324 | if (vi->free_in_tasklet) | ||
| 325 | free_old_xmit_skbs(vi); | ||
| 298 | netif_tx_unlock_bh(vi->dev); | 326 | netif_tx_unlock_bh(vi->dev); |
| 299 | } | 327 | } |
| 300 | 328 | ||
| @@ -435,6 +463,10 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
| 435 | vi->vdev = vdev; | 463 | vi->vdev = vdev; |
| 436 | vdev->priv = vi; | 464 | vdev->priv = vi; |
| 437 | 465 | ||
| 466 | /* If they give us a callback when all buffers are done, we don't need | ||
| 467 | * the timer. */ | ||
| 468 | vi->free_in_tasklet = virtio_has_feature(vdev,VIRTIO_F_NOTIFY_ON_EMPTY); | ||
| 469 | |||
| 438 | /* We expect two virtqueues, receive then send. */ | 470 | /* We expect two virtqueues, receive then send. */ |
| 439 | vi->rvq = vdev->config->find_vq(vdev, 0, skb_recv_done); | 471 | vi->rvq = vdev->config->find_vq(vdev, 0, skb_recv_done); |
| 440 | if (IS_ERR(vi->rvq)) { | 472 | if (IS_ERR(vi->rvq)) { |
| @@ -454,6 +486,9 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
| 454 | 486 | ||
| 455 | tasklet_init(&vi->tasklet, xmit_tasklet, (unsigned long)vi); | 487 | tasklet_init(&vi->tasklet, xmit_tasklet, (unsigned long)vi); |
| 456 | 488 | ||
| 489 | if (!vi->free_in_tasklet) | ||
| 490 | setup_timer(&vi->xmit_free_timer, xmit_free, (unsigned long)vi); | ||
| 491 | |||
| 457 | err = register_netdev(dev); | 492 | err = register_netdev(dev); |
| 458 | if (err) { | 493 | if (err) { |
| 459 | pr_debug("virtio_net: registering device failed\n"); | 494 | pr_debug("virtio_net: registering device failed\n"); |
| @@ -491,6 +526,9 @@ static void virtnet_remove(struct virtio_device *vdev) | |||
| 491 | /* Stop all the virtqueues. */ | 526 | /* Stop all the virtqueues. */ |
| 492 | vdev->config->reset(vdev); | 527 | vdev->config->reset(vdev); |
| 493 | 528 | ||
| 529 | if (!vi->free_in_tasklet) | ||
| 530 | del_timer_sync(&vi->xmit_free_timer); | ||
| 531 | |||
| 494 | /* Free our skbs in send and recv queues, if any. */ | 532 | /* Free our skbs in send and recv queues, if any. */ |
| 495 | while ((skb = __skb_dequeue(&vi->recv)) != NULL) { | 533 | while ((skb = __skb_dequeue(&vi->recv)) != NULL) { |
| 496 | kfree_skb(skb); | 534 | kfree_skb(skb); |
| @@ -514,7 +552,7 @@ static struct virtio_device_id id_table[] = { | |||
| 514 | static unsigned int features[] = { | 552 | static unsigned int features[] = { |
| 515 | VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GSO, VIRTIO_NET_F_MAC, | 553 | VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GSO, VIRTIO_NET_F_MAC, |
| 516 | VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6, | 554 | VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6, |
| 517 | VIRTIO_NET_F_HOST_ECN, | 555 | VIRTIO_NET_F_HOST_ECN, VIRTIO_F_NOTIFY_ON_EMPTY, |
| 518 | }; | 556 | }; |
| 519 | 557 | ||
| 520 | static struct virtio_driver virtio_net = { | 558 | static struct virtio_driver virtio_net = { |
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 20d387f6658c..f7aec9309d04 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c | |||
| @@ -682,7 +682,13 @@ static int prism2_close(struct net_device *dev) | |||
| 682 | netif_device_detach(dev); | 682 | netif_device_detach(dev); |
| 683 | } | 683 | } |
| 684 | 684 | ||
| 685 | flush_scheduled_work(); | 685 | cancel_work_sync(&local->reset_queue); |
| 686 | cancel_work_sync(&local->set_multicast_list_queue); | ||
| 687 | cancel_work_sync(&local->set_tim_queue); | ||
| 688 | #ifndef PRISM2_NO_STATION_MODES | ||
| 689 | cancel_work_sync(&local->info_queue); | ||
| 690 | #endif | ||
| 691 | cancel_work_sync(&local->comms_qual_update); | ||
| 686 | 692 | ||
| 687 | module_put(local->hw_module); | 693 | module_put(local->hw_module); |
| 688 | 694 | ||
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 729336774828..6e704608947c 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
| @@ -1753,6 +1753,8 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio) | |||
| 1753 | 1753 | ||
| 1754 | if (priv->workqueue) { | 1754 | if (priv->workqueue) { |
| 1755 | cancel_delayed_work(&priv->request_scan); | 1755 | cancel_delayed_work(&priv->request_scan); |
| 1756 | cancel_delayed_work(&priv->request_direct_scan); | ||
| 1757 | cancel_delayed_work(&priv->request_passive_scan); | ||
| 1756 | cancel_delayed_work(&priv->scan_event); | 1758 | cancel_delayed_work(&priv->scan_event); |
| 1757 | } | 1759 | } |
| 1758 | queue_work(priv->workqueue, &priv->down); | 1760 | queue_work(priv->workqueue, &priv->down); |
| @@ -2005,6 +2007,8 @@ static void ipw_irq_tasklet(struct ipw_priv *priv) | |||
| 2005 | wake_up_interruptible(&priv->wait_command_queue); | 2007 | wake_up_interruptible(&priv->wait_command_queue); |
| 2006 | priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING); | 2008 | priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING); |
| 2007 | cancel_delayed_work(&priv->request_scan); | 2009 | cancel_delayed_work(&priv->request_scan); |
| 2010 | cancel_delayed_work(&priv->request_direct_scan); | ||
| 2011 | cancel_delayed_work(&priv->request_passive_scan); | ||
| 2008 | cancel_delayed_work(&priv->scan_event); | 2012 | cancel_delayed_work(&priv->scan_event); |
| 2009 | schedule_work(&priv->link_down); | 2013 | schedule_work(&priv->link_down); |
| 2010 | queue_delayed_work(priv->workqueue, &priv->rf_kill, 2 * HZ); | 2014 | queue_delayed_work(priv->workqueue, &priv->rf_kill, 2 * HZ); |
| @@ -4712,6 +4716,12 @@ static void ipw_rx_notification(struct ipw_priv *priv, | |||
| 4712 | priv->status &= ~STATUS_SCAN_FORCED; | 4716 | priv->status &= ~STATUS_SCAN_FORCED; |
| 4713 | #endif /* CONFIG_IPW2200_MONITOR */ | 4717 | #endif /* CONFIG_IPW2200_MONITOR */ |
| 4714 | 4718 | ||
| 4719 | /* Do queued direct scans first */ | ||
| 4720 | if (priv->status & STATUS_DIRECT_SCAN_PENDING) { | ||
| 4721 | queue_delayed_work(priv->workqueue, | ||
| 4722 | &priv->request_direct_scan, 0); | ||
| 4723 | } | ||
| 4724 | |||
| 4715 | if (!(priv->status & (STATUS_ASSOCIATED | | 4725 | if (!(priv->status & (STATUS_ASSOCIATED | |
| 4716 | STATUS_ASSOCIATING | | 4726 | STATUS_ASSOCIATING | |
| 4717 | STATUS_ROAMING | | 4727 | STATUS_ROAMING | |
| @@ -6267,7 +6277,7 @@ static void ipw_add_scan_channels(struct ipw_priv *priv, | |||
| 6267 | } | 6277 | } |
| 6268 | } | 6278 | } |
| 6269 | 6279 | ||
| 6270 | static int ipw_request_scan_helper(struct ipw_priv *priv, int type) | 6280 | static int ipw_request_scan_helper(struct ipw_priv *priv, int type, int direct) |
| 6271 | { | 6281 | { |
| 6272 | struct ipw_scan_request_ext scan; | 6282 | struct ipw_scan_request_ext scan; |
| 6273 | int err = 0, scan_type; | 6283 | int err = 0, scan_type; |
| @@ -6278,22 +6288,31 @@ static int ipw_request_scan_helper(struct ipw_priv *priv, int type) | |||
| 6278 | 6288 | ||
| 6279 | mutex_lock(&priv->mutex); | 6289 | mutex_lock(&priv->mutex); |
| 6280 | 6290 | ||
| 6291 | if (direct && (priv->direct_scan_ssid_len == 0)) { | ||
| 6292 | IPW_DEBUG_HC("Direct scan requested but no SSID to scan for\n"); | ||
| 6293 | priv->status &= ~STATUS_DIRECT_SCAN_PENDING; | ||
| 6294 | goto done; | ||
| 6295 | } | ||
| 6296 | |||
| 6281 | if (priv->status & STATUS_SCANNING) { | 6297 | if (priv->status & STATUS_SCANNING) { |
| 6282 | IPW_DEBUG_HC("Concurrent scan requested. Ignoring.\n"); | 6298 | IPW_DEBUG_HC("Concurrent scan requested. Queuing.\n"); |
| 6283 | priv->status |= STATUS_SCAN_PENDING; | 6299 | priv->status |= direct ? STATUS_DIRECT_SCAN_PENDING : |
| 6300 | STATUS_SCAN_PENDING; | ||
| 6284 | goto done; | 6301 | goto done; |
| 6285 | } | 6302 | } |
| 6286 | 6303 | ||
| 6287 | if (!(priv->status & STATUS_SCAN_FORCED) && | 6304 | if (!(priv->status & STATUS_SCAN_FORCED) && |
| 6288 | priv->status & STATUS_SCAN_ABORTING) { | 6305 | priv->status & STATUS_SCAN_ABORTING) { |
| 6289 | IPW_DEBUG_HC("Scan request while abort pending. Queuing.\n"); | 6306 | IPW_DEBUG_HC("Scan request while abort pending. Queuing.\n"); |
| 6290 | priv->status |= STATUS_SCAN_PENDING; | 6307 | priv->status |= direct ? STATUS_DIRECT_SCAN_PENDING : |
| 6308 | STATUS_SCAN_PENDING; | ||
| 6291 | goto done; | 6309 | goto done; |
| 6292 | } | 6310 | } |
| 6293 | 6311 | ||
| 6294 | if (priv->status & STATUS_RF_KILL_MASK) { | 6312 | if (priv->status & STATUS_RF_KILL_MASK) { |
| 6295 | IPW_DEBUG_HC("Aborting scan due to RF Kill activation\n"); | 6313 | IPW_DEBUG_HC("Queuing scan due to RF Kill activation\n"); |
| 6296 | priv->status |= STATUS_SCAN_PENDING; | 6314 | priv->status |= direct ? STATUS_DIRECT_SCAN_PENDING : |
| 6315 | STATUS_SCAN_PENDING; | ||
| 6297 | goto done; | 6316 | goto done; |
| 6298 | } | 6317 | } |
| 6299 | 6318 | ||
| @@ -6321,6 +6340,7 @@ static int ipw_request_scan_helper(struct ipw_priv *priv, int type) | |||
| 6321 | cpu_to_le16(20); | 6340 | cpu_to_le16(20); |
| 6322 | 6341 | ||
| 6323 | scan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = cpu_to_le16(120); | 6342 | scan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = cpu_to_le16(120); |
| 6343 | scan.dwell_time[IPW_SCAN_ACTIVE_DIRECT_SCAN] = cpu_to_le16(20); | ||
| 6324 | 6344 | ||
| 6325 | #ifdef CONFIG_IPW2200_MONITOR | 6345 | #ifdef CONFIG_IPW2200_MONITOR |
| 6326 | if (priv->ieee->iw_mode == IW_MODE_MONITOR) { | 6346 | if (priv->ieee->iw_mode == IW_MODE_MONITOR) { |
| @@ -6360,13 +6380,23 @@ static int ipw_request_scan_helper(struct ipw_priv *priv, int type) | |||
| 6360 | cpu_to_le16(2000); | 6380 | cpu_to_le16(2000); |
| 6361 | } else { | 6381 | } else { |
| 6362 | #endif /* CONFIG_IPW2200_MONITOR */ | 6382 | #endif /* CONFIG_IPW2200_MONITOR */ |
| 6363 | /* If we are roaming, then make this a directed scan for the | 6383 | /* Honor direct scans first, otherwise if we are roaming make |
| 6364 | * current network. Otherwise, ensure that every other scan | 6384 | * this a direct scan for the current network. Finally, |
| 6365 | * is a fast channel hop scan */ | 6385 | * ensure that every other scan is a fast channel hop scan */ |
| 6366 | if ((priv->status & STATUS_ROAMING) | 6386 | if (direct) { |
| 6367 | || (!(priv->status & STATUS_ASSOCIATED) | 6387 | err = ipw_send_ssid(priv, priv->direct_scan_ssid, |
| 6368 | && (priv->config & CFG_STATIC_ESSID) | 6388 | priv->direct_scan_ssid_len); |
| 6369 | && (le32_to_cpu(scan.full_scan_index) % 2))) { | 6389 | if (err) { |
| 6390 | IPW_DEBUG_HC("Attempt to send SSID command " | ||
| 6391 | "failed\n"); | ||
| 6392 | goto done; | ||
| 6393 | } | ||
| 6394 | |||
| 6395 | scan_type = IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN; | ||
| 6396 | } else if ((priv->status & STATUS_ROAMING) | ||
| 6397 | || (!(priv->status & STATUS_ASSOCIATED) | ||
| 6398 | && (priv->config & CFG_STATIC_ESSID) | ||
| 6399 | && (le32_to_cpu(scan.full_scan_index) % 2))) { | ||
| 6370 | err = ipw_send_ssid(priv, priv->essid, priv->essid_len); | 6400 | err = ipw_send_ssid(priv, priv->essid, priv->essid_len); |
| 6371 | if (err) { | 6401 | if (err) { |
| 6372 | IPW_DEBUG_HC("Attempt to send SSID command " | 6402 | IPW_DEBUG_HC("Attempt to send SSID command " |
| @@ -6391,7 +6421,12 @@ send_request: | |||
| 6391 | } | 6421 | } |
| 6392 | 6422 | ||
| 6393 | priv->status |= STATUS_SCANNING; | 6423 | priv->status |= STATUS_SCANNING; |
| 6394 | priv->status &= ~STATUS_SCAN_PENDING; | 6424 | if (direct) { |
| 6425 | priv->status &= ~STATUS_DIRECT_SCAN_PENDING; | ||
| 6426 | priv->direct_scan_ssid_len = 0; | ||
| 6427 | } else | ||
| 6428 | priv->status &= ~STATUS_SCAN_PENDING; | ||
| 6429 | |||
| 6395 | queue_delayed_work(priv->workqueue, &priv->scan_check, | 6430 | queue_delayed_work(priv->workqueue, &priv->scan_check, |
| 6396 | IPW_SCAN_CHECK_WATCHDOG); | 6431 | IPW_SCAN_CHECK_WATCHDOG); |
| 6397 | done: | 6432 | done: |
| @@ -6402,15 +6437,22 @@ done: | |||
| 6402 | static void ipw_request_passive_scan(struct work_struct *work) | 6437 | static void ipw_request_passive_scan(struct work_struct *work) |
| 6403 | { | 6438 | { |
| 6404 | struct ipw_priv *priv = | 6439 | struct ipw_priv *priv = |
| 6405 | container_of(work, struct ipw_priv, request_passive_scan); | 6440 | container_of(work, struct ipw_priv, request_passive_scan.work); |
| 6406 | ipw_request_scan_helper(priv, IW_SCAN_TYPE_PASSIVE); | 6441 | ipw_request_scan_helper(priv, IW_SCAN_TYPE_PASSIVE, 0); |
| 6407 | } | 6442 | } |
| 6408 | 6443 | ||
| 6409 | static void ipw_request_scan(struct work_struct *work) | 6444 | static void ipw_request_scan(struct work_struct *work) |
| 6410 | { | 6445 | { |
| 6411 | struct ipw_priv *priv = | 6446 | struct ipw_priv *priv = |
| 6412 | container_of(work, struct ipw_priv, request_scan.work); | 6447 | container_of(work, struct ipw_priv, request_scan.work); |
| 6413 | ipw_request_scan_helper(priv, IW_SCAN_TYPE_ACTIVE); | 6448 | ipw_request_scan_helper(priv, IW_SCAN_TYPE_ACTIVE, 0); |
| 6449 | } | ||
| 6450 | |||
| 6451 | static void ipw_request_direct_scan(struct work_struct *work) | ||
| 6452 | { | ||
| 6453 | struct ipw_priv *priv = | ||
| 6454 | container_of(work, struct ipw_priv, request_direct_scan.work); | ||
| 6455 | ipw_request_scan_helper(priv, IW_SCAN_TYPE_ACTIVE, 1); | ||
| 6414 | } | 6456 | } |
| 6415 | 6457 | ||
| 6416 | static void ipw_bg_abort_scan(struct work_struct *work) | 6458 | static void ipw_bg_abort_scan(struct work_struct *work) |
| @@ -9477,99 +9519,38 @@ static int ipw_wx_get_retry(struct net_device *dev, | |||
| 9477 | return 0; | 9519 | return 0; |
| 9478 | } | 9520 | } |
| 9479 | 9521 | ||
| 9480 | static int ipw_request_direct_scan(struct ipw_priv *priv, char *essid, | ||
| 9481 | int essid_len) | ||
| 9482 | { | ||
| 9483 | struct ipw_scan_request_ext scan; | ||
| 9484 | int err = 0, scan_type; | ||
| 9485 | |||
| 9486 | if (!(priv->status & STATUS_INIT) || | ||
| 9487 | (priv->status & STATUS_EXIT_PENDING)) | ||
| 9488 | return 0; | ||
| 9489 | |||
| 9490 | mutex_lock(&priv->mutex); | ||
| 9491 | |||
| 9492 | if (priv->status & STATUS_RF_KILL_MASK) { | ||
| 9493 | IPW_DEBUG_HC("Aborting scan due to RF kill activation\n"); | ||
| 9494 | priv->status |= STATUS_SCAN_PENDING; | ||
| 9495 | goto done; | ||
| 9496 | } | ||
| 9497 | |||
| 9498 | IPW_DEBUG_HC("starting request direct scan!\n"); | ||
| 9499 | |||
| 9500 | if (priv->status & (STATUS_SCANNING | STATUS_SCAN_ABORTING)) { | ||
| 9501 | /* We should not sleep here; otherwise we will block most | ||
| 9502 | * of the system (for instance, we hold rtnl_lock when we | ||
| 9503 | * get here). | ||
| 9504 | */ | ||
| 9505 | err = -EAGAIN; | ||
| 9506 | goto done; | ||
| 9507 | } | ||
| 9508 | memset(&scan, 0, sizeof(scan)); | ||
| 9509 | |||
| 9510 | if (priv->config & CFG_SPEED_SCAN) | ||
| 9511 | scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_SCAN] = | ||
| 9512 | cpu_to_le16(30); | ||
| 9513 | else | ||
| 9514 | scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_SCAN] = | ||
| 9515 | cpu_to_le16(20); | ||
| 9516 | |||
| 9517 | scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN] = | ||
| 9518 | cpu_to_le16(20); | ||
| 9519 | scan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = cpu_to_le16(120); | ||
| 9520 | scan.dwell_time[IPW_SCAN_ACTIVE_DIRECT_SCAN] = cpu_to_le16(20); | ||
| 9521 | |||
| 9522 | scan.full_scan_index = cpu_to_le32(ieee80211_get_scans(priv->ieee)); | ||
| 9523 | |||
| 9524 | err = ipw_send_ssid(priv, essid, essid_len); | ||
| 9525 | if (err) { | ||
| 9526 | IPW_DEBUG_HC("Attempt to send SSID command failed\n"); | ||
| 9527 | goto done; | ||
| 9528 | } | ||
| 9529 | scan_type = IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN; | ||
| 9530 | |||
| 9531 | ipw_add_scan_channels(priv, &scan, scan_type); | ||
| 9532 | |||
| 9533 | err = ipw_send_scan_request_ext(priv, &scan); | ||
| 9534 | if (err) { | ||
| 9535 | IPW_DEBUG_HC("Sending scan command failed: %08X\n", err); | ||
| 9536 | goto done; | ||
| 9537 | } | ||
| 9538 | |||
| 9539 | priv->status |= STATUS_SCANNING; | ||
| 9540 | |||
| 9541 | done: | ||
| 9542 | mutex_unlock(&priv->mutex); | ||
| 9543 | return err; | ||
| 9544 | } | ||
| 9545 | |||
| 9546 | static int ipw_wx_set_scan(struct net_device *dev, | 9522 | static int ipw_wx_set_scan(struct net_device *dev, |
| 9547 | struct iw_request_info *info, | 9523 | struct iw_request_info *info, |
| 9548 | union iwreq_data *wrqu, char *extra) | 9524 | union iwreq_data *wrqu, char *extra) |
| 9549 | { | 9525 | { |
| 9550 | struct ipw_priv *priv = ieee80211_priv(dev); | 9526 | struct ipw_priv *priv = ieee80211_priv(dev); |
| 9551 | struct iw_scan_req *req = (struct iw_scan_req *)extra; | 9527 | struct iw_scan_req *req = (struct iw_scan_req *)extra; |
| 9528 | struct delayed_work *work = NULL; | ||
| 9552 | 9529 | ||
| 9553 | mutex_lock(&priv->mutex); | 9530 | mutex_lock(&priv->mutex); |
| 9531 | |||
| 9554 | priv->user_requested_scan = 1; | 9532 | priv->user_requested_scan = 1; |
| 9555 | mutex_unlock(&priv->mutex); | ||
| 9556 | 9533 | ||
| 9557 | if (wrqu->data.length == sizeof(struct iw_scan_req)) { | 9534 | if (wrqu->data.length == sizeof(struct iw_scan_req)) { |
| 9558 | if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { | 9535 | if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { |
| 9559 | ipw_request_direct_scan(priv, req->essid, | 9536 | int len = min((int)req->essid_len, |
| 9560 | req->essid_len); | 9537 | (int)sizeof(priv->direct_scan_ssid)); |
| 9561 | return 0; | 9538 | memcpy(priv->direct_scan_ssid, req->essid, len); |
| 9562 | } | 9539 | priv->direct_scan_ssid_len = len; |
| 9563 | if (req->scan_type == IW_SCAN_TYPE_PASSIVE) { | 9540 | work = &priv->request_direct_scan; |
| 9564 | queue_work(priv->workqueue, | 9541 | } else if (req->scan_type == IW_SCAN_TYPE_PASSIVE) { |
| 9565 | &priv->request_passive_scan); | 9542 | work = &priv->request_passive_scan; |
| 9566 | return 0; | ||
| 9567 | } | 9543 | } |
| 9544 | } else { | ||
| 9545 | /* Normal active broadcast scan */ | ||
| 9546 | work = &priv->request_scan; | ||
| 9568 | } | 9547 | } |
| 9569 | 9548 | ||
| 9549 | mutex_unlock(&priv->mutex); | ||
| 9550 | |||
| 9570 | IPW_DEBUG_WX("Start scan\n"); | 9551 | IPW_DEBUG_WX("Start scan\n"); |
| 9571 | 9552 | ||
| 9572 | queue_delayed_work(priv->workqueue, &priv->request_scan, 0); | 9553 | queue_delayed_work(priv->workqueue, work, 0); |
| 9573 | 9554 | ||
| 9574 | return 0; | 9555 | return 0; |
| 9575 | } | 9556 | } |
| @@ -10731,6 +10712,8 @@ static void ipw_link_up(struct ipw_priv *priv) | |||
| 10731 | } | 10712 | } |
| 10732 | 10713 | ||
| 10733 | cancel_delayed_work(&priv->request_scan); | 10714 | cancel_delayed_work(&priv->request_scan); |
| 10715 | cancel_delayed_work(&priv->request_direct_scan); | ||
| 10716 | cancel_delayed_work(&priv->request_passive_scan); | ||
| 10734 | cancel_delayed_work(&priv->scan_event); | 10717 | cancel_delayed_work(&priv->scan_event); |
| 10735 | ipw_reset_stats(priv); | 10718 | ipw_reset_stats(priv); |
| 10736 | /* Ensure the rate is updated immediately */ | 10719 | /* Ensure the rate is updated immediately */ |
| @@ -10761,6 +10744,8 @@ static void ipw_link_down(struct ipw_priv *priv) | |||
| 10761 | 10744 | ||
| 10762 | /* Cancel any queued work ... */ | 10745 | /* Cancel any queued work ... */ |
| 10763 | cancel_delayed_work(&priv->request_scan); | 10746 | cancel_delayed_work(&priv->request_scan); |
| 10747 | cancel_delayed_work(&priv->request_direct_scan); | ||
| 10748 | cancel_delayed_work(&priv->request_passive_scan); | ||
| 10764 | cancel_delayed_work(&priv->adhoc_check); | 10749 | cancel_delayed_work(&priv->adhoc_check); |
| 10765 | cancel_delayed_work(&priv->gather_stats); | 10750 | cancel_delayed_work(&priv->gather_stats); |
| 10766 | 10751 | ||
| @@ -10800,8 +10785,9 @@ static int __devinit ipw_setup_deferred_work(struct ipw_priv *priv) | |||
| 10800 | INIT_WORK(&priv->up, ipw_bg_up); | 10785 | INIT_WORK(&priv->up, ipw_bg_up); |
| 10801 | INIT_WORK(&priv->down, ipw_bg_down); | 10786 | INIT_WORK(&priv->down, ipw_bg_down); |
| 10802 | INIT_DELAYED_WORK(&priv->request_scan, ipw_request_scan); | 10787 | INIT_DELAYED_WORK(&priv->request_scan, ipw_request_scan); |
| 10788 | INIT_DELAYED_WORK(&priv->request_direct_scan, ipw_request_direct_scan); | ||
| 10789 | INIT_DELAYED_WORK(&priv->request_passive_scan, ipw_request_passive_scan); | ||
| 10803 | INIT_DELAYED_WORK(&priv->scan_event, ipw_scan_event); | 10790 | INIT_DELAYED_WORK(&priv->scan_event, ipw_scan_event); |
| 10804 | INIT_WORK(&priv->request_passive_scan, ipw_request_passive_scan); | ||
| 10805 | INIT_DELAYED_WORK(&priv->gather_stats, ipw_bg_gather_stats); | 10791 | INIT_DELAYED_WORK(&priv->gather_stats, ipw_bg_gather_stats); |
| 10806 | INIT_WORK(&priv->abort_scan, ipw_bg_abort_scan); | 10792 | INIT_WORK(&priv->abort_scan, ipw_bg_abort_scan); |
| 10807 | INIT_WORK(&priv->roam, ipw_bg_roam); | 10793 | INIT_WORK(&priv->roam, ipw_bg_roam); |
| @@ -11835,6 +11821,8 @@ static void __devexit ipw_pci_remove(struct pci_dev *pdev) | |||
| 11835 | cancel_delayed_work(&priv->adhoc_check); | 11821 | cancel_delayed_work(&priv->adhoc_check); |
| 11836 | cancel_delayed_work(&priv->gather_stats); | 11822 | cancel_delayed_work(&priv->gather_stats); |
| 11837 | cancel_delayed_work(&priv->request_scan); | 11823 | cancel_delayed_work(&priv->request_scan); |
| 11824 | cancel_delayed_work(&priv->request_direct_scan); | ||
| 11825 | cancel_delayed_work(&priv->request_passive_scan); | ||
| 11838 | cancel_delayed_work(&priv->scan_event); | 11826 | cancel_delayed_work(&priv->scan_event); |
| 11839 | cancel_delayed_work(&priv->rf_kill); | 11827 | cancel_delayed_work(&priv->rf_kill); |
| 11840 | cancel_delayed_work(&priv->scan_check); | 11828 | cancel_delayed_work(&priv->scan_check); |
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index cd3295b66dd6..d4ab28b73b32 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h | |||
| @@ -1037,6 +1037,7 @@ struct ipw_cmd { /* XXX */ | |||
| 1037 | #define STATUS_DISASSOC_PENDING (1<<12) | 1037 | #define STATUS_DISASSOC_PENDING (1<<12) |
| 1038 | #define STATUS_STATE_PENDING (1<<13) | 1038 | #define STATUS_STATE_PENDING (1<<13) |
| 1039 | 1039 | ||
| 1040 | #define STATUS_DIRECT_SCAN_PENDING (1<<19) | ||
| 1040 | #define STATUS_SCAN_PENDING (1<<20) | 1041 | #define STATUS_SCAN_PENDING (1<<20) |
| 1041 | #define STATUS_SCANNING (1<<21) | 1042 | #define STATUS_SCANNING (1<<21) |
| 1042 | #define STATUS_SCAN_ABORTING (1<<22) | 1043 | #define STATUS_SCAN_ABORTING (1<<22) |
| @@ -1292,6 +1293,8 @@ struct ipw_priv { | |||
| 1292 | struct iw_public_data wireless_data; | 1293 | struct iw_public_data wireless_data; |
| 1293 | 1294 | ||
| 1294 | int user_requested_scan; | 1295 | int user_requested_scan; |
| 1296 | u8 direct_scan_ssid[IW_ESSID_MAX_SIZE]; | ||
| 1297 | u8 direct_scan_ssid_len; | ||
| 1295 | 1298 | ||
| 1296 | struct workqueue_struct *workqueue; | 1299 | struct workqueue_struct *workqueue; |
| 1297 | 1300 | ||
| @@ -1301,8 +1304,9 @@ struct ipw_priv { | |||
| 1301 | struct work_struct system_config; | 1304 | struct work_struct system_config; |
| 1302 | struct work_struct rx_replenish; | 1305 | struct work_struct rx_replenish; |
| 1303 | struct delayed_work request_scan; | 1306 | struct delayed_work request_scan; |
| 1307 | struct delayed_work request_direct_scan; | ||
| 1308 | struct delayed_work request_passive_scan; | ||
| 1304 | struct delayed_work scan_event; | 1309 | struct delayed_work scan_event; |
| 1305 | struct work_struct request_passive_scan; | ||
| 1306 | struct work_struct adapter_restart; | 1310 | struct work_struct adapter_restart; |
| 1307 | struct delayed_work rf_kill; | 1311 | struct delayed_work rf_kill; |
| 1308 | struct work_struct up; | 1312 | struct work_struct up; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-led.c b/drivers/net/wireless/iwlwifi/iwl-3945-led.c index d200d08fb086..8b1528e52d43 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945-led.c | |||
| @@ -229,14 +229,15 @@ static int iwl3945_led_register_led(struct iwl3945_priv *priv, | |||
| 229 | led->led_dev.brightness_set = iwl3945_led_brightness_set; | 229 | led->led_dev.brightness_set = iwl3945_led_brightness_set; |
| 230 | led->led_dev.default_trigger = trigger; | 230 | led->led_dev.default_trigger = trigger; |
| 231 | 231 | ||
| 232 | led->priv = priv; | ||
| 233 | led->type = type; | ||
| 234 | |||
| 232 | ret = led_classdev_register(device, &led->led_dev); | 235 | ret = led_classdev_register(device, &led->led_dev); |
| 233 | if (ret) { | 236 | if (ret) { |
| 234 | IWL_ERROR("Error: failed to register led handler.\n"); | 237 | IWL_ERROR("Error: failed to register led handler.\n"); |
| 235 | return ret; | 238 | return ret; |
| 236 | } | 239 | } |
| 237 | 240 | ||
| 238 | led->priv = priv; | ||
| 239 | led->type = type; | ||
| 240 | led->registered = 1; | 241 | led->registered = 1; |
| 241 | 242 | ||
| 242 | if (set_led && led->led_on) | 243 | if (set_led && led->led_on) |
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 6328b9593877..8124fd9b1353 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
| @@ -1842,6 +1842,9 @@ static void lbs_send_confirmsleep(struct lbs_private *priv) | |||
| 1842 | 1842 | ||
| 1843 | spin_lock_irqsave(&priv->driver_lock, flags); | 1843 | spin_lock_irqsave(&priv->driver_lock, flags); |
| 1844 | 1844 | ||
| 1845 | /* We don't get a response on the sleep-confirmation */ | ||
| 1846 | priv->dnld_sent = DNLD_RES_RECEIVED; | ||
| 1847 | |||
| 1845 | /* If nothing to do, go back to sleep (?) */ | 1848 | /* If nothing to do, go back to sleep (?) */ |
| 1846 | if (!__kfifo_len(priv->event_fifo) && !priv->resp_len[priv->resp_idx]) | 1849 | if (!__kfifo_len(priv->event_fifo) && !priv->resp_len[priv->resp_idx]) |
| 1847 | priv->psstate = PS_STATE_SLEEP; | 1850 | priv->psstate = PS_STATE_SLEEP; |
| @@ -1904,12 +1907,12 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv) | |||
| 1904 | 1907 | ||
| 1905 | lbs_deb_enter(LBS_DEB_HOST); | 1908 | lbs_deb_enter(LBS_DEB_HOST); |
| 1906 | 1909 | ||
| 1910 | spin_lock_irqsave(&priv->driver_lock, flags); | ||
| 1907 | if (priv->dnld_sent) { | 1911 | if (priv->dnld_sent) { |
| 1908 | allowed = 0; | 1912 | allowed = 0; |
| 1909 | lbs_deb_host("dnld_sent was set\n"); | 1913 | lbs_deb_host("dnld_sent was set\n"); |
| 1910 | } | 1914 | } |
| 1911 | 1915 | ||
| 1912 | spin_lock_irqsave(&priv->driver_lock, flags); | ||
| 1913 | /* In-progress command? */ | 1916 | /* In-progress command? */ |
| 1914 | if (priv->cur_cmd) { | 1917 | if (priv->cur_cmd) { |
| 1915 | allowed = 0; | 1918 | allowed = 0; |
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index e1f066068590..acfc4bfcc262 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
| @@ -732,8 +732,8 @@ static int lbs_thread(void *data) | |||
| 732 | lbs_deb_thread("4: currenttxskb %p, dnld_sent %d\n", | 732 | lbs_deb_thread("4: currenttxskb %p, dnld_sent %d\n", |
| 733 | priv->currenttxskb, priv->dnld_sent); | 733 | priv->currenttxskb, priv->dnld_sent); |
| 734 | 734 | ||
| 735 | spin_lock_irq(&priv->driver_lock); | ||
| 736 | /* Process any pending command response */ | 735 | /* Process any pending command response */ |
| 736 | spin_lock_irq(&priv->driver_lock); | ||
| 737 | resp_idx = priv->resp_idx; | 737 | resp_idx = priv->resp_idx; |
| 738 | if (priv->resp_len[resp_idx]) { | 738 | if (priv->resp_len[resp_idx]) { |
| 739 | spin_unlock_irq(&priv->driver_lock); | 739 | spin_unlock_irq(&priv->driver_lock); |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 6424e5a2c83d..418606ac1c3b 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
| @@ -719,7 +719,7 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length) | |||
| 719 | fc = le16_to_cpu(*((__le16 *) buffer)); | 719 | fc = le16_to_cpu(*((__le16 *) buffer)); |
| 720 | 720 | ||
| 721 | is_qos = ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) && | 721 | is_qos = ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) && |
| 722 | ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_QOS_DATA); | 722 | (fc & IEEE80211_STYPE_QOS_DATA); |
| 723 | is_4addr = (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == | 723 | is_4addr = (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == |
| 724 | (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS); | 724 | (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS); |
| 725 | need_padding = is_qos ^ is_4addr; | 725 | need_padding = is_qos ^ is_4addr; |
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 72cf61ed8f96..e1637bd82b8e 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
| @@ -181,7 +181,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, | |||
| 181 | any need to change it. */ | 181 | any need to change it. */ |
| 182 | struct mempolicy *oldpol; | 182 | struct mempolicy *oldpol; |
| 183 | cpumask_t oldmask = current->cpus_allowed; | 183 | cpumask_t oldmask = current->cpus_allowed; |
| 184 | int node = pcibus_to_node(dev->bus); | 184 | int node = dev_to_node(&dev->dev); |
| 185 | 185 | ||
| 186 | if (node >= 0) { | 186 | if (node >= 0) { |
| 187 | node_to_cpumask_ptr(nodecpumask, node); | 187 | node_to_cpumask_ptr(nodecpumask, node); |
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 271d41cc05ab..6f3c7446c329 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -489,13 +489,13 @@ pci_mmap_legacy_mem(struct kobject *kobj, struct bin_attribute *attr, | |||
| 489 | * @kobj: kobject for mapping | 489 | * @kobj: kobject for mapping |
| 490 | * @attr: struct bin_attribute for the file being mapped | 490 | * @attr: struct bin_attribute for the file being mapped |
| 491 | * @vma: struct vm_area_struct passed into the mmap | 491 | * @vma: struct vm_area_struct passed into the mmap |
| 492 | * @write_combine: 1 for write_combine mapping | ||
| 492 | * | 493 | * |
| 493 | * Use the regular PCI mapping routines to map a PCI resource into userspace. | 494 | * Use the regular PCI mapping routines to map a PCI resource into userspace. |
| 494 | * FIXME: write combining? maybe automatic for prefetchable regions? | ||
| 495 | */ | 495 | */ |
| 496 | static int | 496 | static int |
| 497 | pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, | 497 | pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, |
| 498 | struct vm_area_struct *vma) | 498 | struct vm_area_struct *vma, int write_combine) |
| 499 | { | 499 | { |
| 500 | struct pci_dev *pdev = to_pci_dev(container_of(kobj, | 500 | struct pci_dev *pdev = to_pci_dev(container_of(kobj, |
| 501 | struct device, kobj)); | 501 | struct device, kobj)); |
| @@ -518,7 +518,21 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, | |||
| 518 | vma->vm_pgoff += start >> PAGE_SHIFT; | 518 | vma->vm_pgoff += start >> PAGE_SHIFT; |
| 519 | mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io; | 519 | mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io; |
| 520 | 520 | ||
| 521 | return pci_mmap_page_range(pdev, vma, mmap_type, 0); | 521 | return pci_mmap_page_range(pdev, vma, mmap_type, write_combine); |
| 522 | } | ||
| 523 | |||
| 524 | static int | ||
| 525 | pci_mmap_resource_uc(struct kobject *kobj, struct bin_attribute *attr, | ||
| 526 | struct vm_area_struct *vma) | ||
| 527 | { | ||
| 528 | return pci_mmap_resource(kobj, attr, vma, 0); | ||
| 529 | } | ||
| 530 | |||
| 531 | static int | ||
| 532 | pci_mmap_resource_wc(struct kobject *kobj, struct bin_attribute *attr, | ||
| 533 | struct vm_area_struct *vma) | ||
| 534 | { | ||
| 535 | return pci_mmap_resource(kobj, attr, vma, 1); | ||
| 522 | } | 536 | } |
| 523 | 537 | ||
| 524 | /** | 538 | /** |
| @@ -541,9 +555,46 @@ pci_remove_resource_files(struct pci_dev *pdev) | |||
| 541 | sysfs_remove_bin_file(&pdev->dev.kobj, res_attr); | 555 | sysfs_remove_bin_file(&pdev->dev.kobj, res_attr); |
| 542 | kfree(res_attr); | 556 | kfree(res_attr); |
| 543 | } | 557 | } |
| 558 | |||
| 559 | res_attr = pdev->res_attr_wc[i]; | ||
| 560 | if (res_attr) { | ||
| 561 | sysfs_remove_bin_file(&pdev->dev.kobj, res_attr); | ||
| 562 | kfree(res_attr); | ||
| 563 | } | ||
| 544 | } | 564 | } |
| 545 | } | 565 | } |
| 546 | 566 | ||
| 567 | static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) | ||
| 568 | { | ||
| 569 | /* allocate attribute structure, piggyback attribute name */ | ||
| 570 | int name_len = write_combine ? 13 : 10; | ||
| 571 | struct bin_attribute *res_attr; | ||
| 572 | int retval; | ||
| 573 | |||
| 574 | res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC); | ||
| 575 | if (res_attr) { | ||
| 576 | char *res_attr_name = (char *)(res_attr + 1); | ||
| 577 | |||
| 578 | if (write_combine) { | ||
| 579 | pdev->res_attr_wc[num] = res_attr; | ||
| 580 | sprintf(res_attr_name, "resource%d_wc", num); | ||
| 581 | res_attr->mmap = pci_mmap_resource_wc; | ||
| 582 | } else { | ||
| 583 | pdev->res_attr[num] = res_attr; | ||
| 584 | sprintf(res_attr_name, "resource%d", num); | ||
| 585 | res_attr->mmap = pci_mmap_resource_uc; | ||
| 586 | } | ||
| 587 | res_attr->attr.name = res_attr_name; | ||
| 588 | res_attr->attr.mode = S_IRUSR | S_IWUSR; | ||
| 589 | res_attr->size = pci_resource_len(pdev, num); | ||
| 590 | res_attr->private = &pdev->resource[num]; | ||
| 591 | retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr); | ||
| 592 | } else | ||
| 593 | retval = -ENOMEM; | ||
| 594 | |||
| 595 | return retval; | ||
| 596 | } | ||
| 597 | |||
| 547 | /** | 598 | /** |
| 548 | * pci_create_resource_files - create resource files in sysfs for @dev | 599 | * pci_create_resource_files - create resource files in sysfs for @dev |
| 549 | * @dev: dev in question | 600 | * @dev: dev in question |
| @@ -557,31 +608,19 @@ static int pci_create_resource_files(struct pci_dev *pdev) | |||
| 557 | 608 | ||
| 558 | /* Expose the PCI resources from this device as files */ | 609 | /* Expose the PCI resources from this device as files */ |
| 559 | for (i = 0; i < PCI_ROM_RESOURCE; i++) { | 610 | for (i = 0; i < PCI_ROM_RESOURCE; i++) { |
| 560 | struct bin_attribute *res_attr; | ||
| 561 | 611 | ||
| 562 | /* skip empty resources */ | 612 | /* skip empty resources */ |
| 563 | if (!pci_resource_len(pdev, i)) | 613 | if (!pci_resource_len(pdev, i)) |
| 564 | continue; | 614 | continue; |
| 565 | 615 | ||
| 566 | /* allocate attribute structure, piggyback attribute name */ | 616 | retval = pci_create_attr(pdev, i, 0); |
| 567 | res_attr = kzalloc(sizeof(*res_attr) + 10, GFP_ATOMIC); | 617 | /* for prefetchable resources, create a WC mappable file */ |
| 568 | if (res_attr) { | 618 | if (!retval && pdev->resource[i].flags & IORESOURCE_PREFETCH) |
| 569 | char *res_attr_name = (char *)(res_attr + 1); | 619 | retval = pci_create_attr(pdev, i, 1); |
| 570 | 620 | ||
| 571 | pdev->res_attr[i] = res_attr; | 621 | if (retval) { |
| 572 | sprintf(res_attr_name, "resource%d", i); | 622 | pci_remove_resource_files(pdev); |
| 573 | res_attr->attr.name = res_attr_name; | 623 | return retval; |
| 574 | res_attr->attr.mode = S_IRUSR | S_IWUSR; | ||
| 575 | res_attr->size = pci_resource_len(pdev, i); | ||
| 576 | res_attr->mmap = pci_mmap_resource; | ||
| 577 | res_attr->private = &pdev->resource[i]; | ||
| 578 | retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr); | ||
| 579 | if (retval) { | ||
| 580 | pci_remove_resource_files(pdev); | ||
| 581 | return retval; | ||
| 582 | } | ||
| 583 | } else { | ||
| 584 | return -ENOMEM; | ||
| 585 | } | 624 | } |
| 586 | } | 625 | } |
| 587 | return 0; | 626 | return 0; |
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 0201c8adfda7..46c791adb894 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c | |||
| @@ -50,15 +50,17 @@ static int irq_flags(int triggering, int polarity, int shareable) | |||
| 50 | flags = IORESOURCE_IRQ_HIGHEDGE; | 50 | flags = IORESOURCE_IRQ_HIGHEDGE; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | if (shareable) | 53 | if (shareable == ACPI_SHARED) |
| 54 | flags |= IORESOURCE_IRQ_SHAREABLE; | 54 | flags |= IORESOURCE_IRQ_SHAREABLE; |
| 55 | 55 | ||
| 56 | return flags; | 56 | return flags; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | static void decode_irq_flags(int flag, int *triggering, int *polarity) | 59 | static void decode_irq_flags(struct pnp_dev *dev, int flags, int *triggering, |
| 60 | int *polarity, int *shareable) | ||
| 60 | { | 61 | { |
| 61 | switch (flag) { | 62 | switch (flags & (IORESOURCE_IRQ_LOWLEVEL | IORESOURCE_IRQ_HIGHLEVEL | |
| 63 | IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE)) { | ||
| 62 | case IORESOURCE_IRQ_LOWLEVEL: | 64 | case IORESOURCE_IRQ_LOWLEVEL: |
| 63 | *triggering = ACPI_LEVEL_SENSITIVE; | 65 | *triggering = ACPI_LEVEL_SENSITIVE; |
| 64 | *polarity = ACPI_ACTIVE_LOW; | 66 | *polarity = ACPI_ACTIVE_LOW; |
| @@ -75,7 +77,18 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity) | |||
| 75 | *triggering = ACPI_EDGE_SENSITIVE; | 77 | *triggering = ACPI_EDGE_SENSITIVE; |
| 76 | *polarity = ACPI_ACTIVE_HIGH; | 78 | *polarity = ACPI_ACTIVE_HIGH; |
| 77 | break; | 79 | break; |
| 80 | default: | ||
| 81 | dev_err(&dev->dev, "can't encode invalid IRQ mode %#x\n", | ||
| 82 | flags); | ||
| 83 | *triggering = ACPI_EDGE_SENSITIVE; | ||
| 84 | *polarity = ACPI_ACTIVE_HIGH; | ||
| 85 | break; | ||
| 78 | } | 86 | } |
| 87 | |||
| 88 | if (flags & IORESOURCE_IRQ_SHAREABLE) | ||
| 89 | *shareable = ACPI_SHARED; | ||
| 90 | else | ||
| 91 | *shareable = ACPI_EXCLUSIVE; | ||
| 79 | } | 92 | } |
| 80 | 93 | ||
| 81 | static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev, | 94 | static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev, |
| @@ -742,6 +755,9 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data) | |||
| 742 | if (pnpacpi_supported_resource(res)) { | 755 | if (pnpacpi_supported_resource(res)) { |
| 743 | (*resource)->type = res->type; | 756 | (*resource)->type = res->type; |
| 744 | (*resource)->length = sizeof(struct acpi_resource); | 757 | (*resource)->length = sizeof(struct acpi_resource); |
| 758 | if (res->type == ACPI_RESOURCE_TYPE_IRQ) | ||
| 759 | (*resource)->data.irq.descriptor_length = | ||
| 760 | res->data.irq.descriptor_length; | ||
| 745 | (*resource)++; | 761 | (*resource)++; |
| 746 | } | 762 | } |
| 747 | 763 | ||
| @@ -788,22 +804,21 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev, | |||
| 788 | struct resource *p) | 804 | struct resource *p) |
| 789 | { | 805 | { |
| 790 | struct acpi_resource_irq *irq = &resource->data.irq; | 806 | struct acpi_resource_irq *irq = &resource->data.irq; |
| 791 | int triggering, polarity; | 807 | int triggering, polarity, shareable; |
| 792 | 808 | ||
| 793 | decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity); | 809 | decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable); |
| 794 | irq->triggering = triggering; | 810 | irq->triggering = triggering; |
| 795 | irq->polarity = polarity; | 811 | irq->polarity = polarity; |
| 796 | if (triggering == ACPI_EDGE_SENSITIVE) | 812 | irq->sharable = shareable; |
| 797 | irq->sharable = ACPI_EXCLUSIVE; | ||
| 798 | else | ||
| 799 | irq->sharable = ACPI_SHARED; | ||
| 800 | irq->interrupt_count = 1; | 813 | irq->interrupt_count = 1; |
| 801 | irq->interrupts[0] = p->start; | 814 | irq->interrupts[0] = p->start; |
| 802 | 815 | ||
| 803 | dev_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start, | 816 | dev_dbg(&dev->dev, " encode irq %d %s %s %s (%d-byte descriptor)\n", |
| 817 | (int) p->start, | ||
| 804 | triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge", | 818 | triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge", |
| 805 | polarity == ACPI_ACTIVE_LOW ? "low" : "high", | 819 | polarity == ACPI_ACTIVE_LOW ? "low" : "high", |
| 806 | irq->sharable == ACPI_SHARED ? "shared" : "exclusive"); | 820 | irq->sharable == ACPI_SHARED ? "shared" : "exclusive", |
| 821 | irq->descriptor_length); | ||
| 807 | } | 822 | } |
| 808 | 823 | ||
| 809 | static void pnpacpi_encode_ext_irq(struct pnp_dev *dev, | 824 | static void pnpacpi_encode_ext_irq(struct pnp_dev *dev, |
| @@ -811,16 +826,13 @@ static void pnpacpi_encode_ext_irq(struct pnp_dev *dev, | |||
| 811 | struct resource *p) | 826 | struct resource *p) |
| 812 | { | 827 | { |
| 813 | struct acpi_resource_extended_irq *extended_irq = &resource->data.extended_irq; | 828 | struct acpi_resource_extended_irq *extended_irq = &resource->data.extended_irq; |
| 814 | int triggering, polarity; | 829 | int triggering, polarity, shareable; |
| 815 | 830 | ||
| 816 | decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity); | 831 | decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable); |
| 817 | extended_irq->producer_consumer = ACPI_CONSUMER; | 832 | extended_irq->producer_consumer = ACPI_CONSUMER; |
| 818 | extended_irq->triggering = triggering; | 833 | extended_irq->triggering = triggering; |
| 819 | extended_irq->polarity = polarity; | 834 | extended_irq->polarity = polarity; |
| 820 | if (triggering == ACPI_EDGE_SENSITIVE) | 835 | extended_irq->sharable = shareable; |
| 821 | extended_irq->sharable = ACPI_EXCLUSIVE; | ||
| 822 | else | ||
| 823 | extended_irq->sharable = ACPI_SHARED; | ||
| 824 | extended_irq->interrupt_count = 1; | 836 | extended_irq->interrupt_count = 1; |
| 825 | extended_irq->interrupts[0] = p->start; | 837 | extended_irq->interrupts[0] = p->start; |
| 826 | 838 | ||
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 60f8afc7a56e..4949dc4859be 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -256,6 +256,17 @@ config RTC_DRV_S35390A | |||
| 256 | This driver can also be built as a module. If so the module | 256 | This driver can also be built as a module. If so the module |
| 257 | will be called rtc-s35390a. | 257 | will be called rtc-s35390a. |
| 258 | 258 | ||
| 259 | config RTC_DRV_FM3130 | ||
| 260 | tristate "Ramtron FM3130" | ||
| 261 | help | ||
| 262 | If you say Y here you will get support for the | ||
| 263 | Ramtron FM3130 RTC chips. | ||
| 264 | Ramtron FM3130 is a chip with two separate devices inside, | ||
| 265 | RTC clock and FRAM. This driver provides only RTC functionality. | ||
| 266 | |||
| 267 | This driver can also be built as a module. If so the module | ||
| 268 | will be called rtc-fm3130. | ||
| 269 | |||
| 259 | endif # I2C | 270 | endif # I2C |
| 260 | 271 | ||
| 261 | comment "SPI RTC drivers" | 272 | comment "SPI RTC drivers" |
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index ebe871cf16c1..b6e14d51670b 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile | |||
| @@ -31,6 +31,7 @@ obj-$(CONFIG_RTC_DRV_DS1553) += rtc-ds1553.o | |||
| 31 | obj-$(CONFIG_RTC_DRV_DS1672) += rtc-ds1672.o | 31 | obj-$(CONFIG_RTC_DRV_DS1672) += rtc-ds1672.o |
| 32 | obj-$(CONFIG_RTC_DRV_DS1742) += rtc-ds1742.o | 32 | obj-$(CONFIG_RTC_DRV_DS1742) += rtc-ds1742.o |
| 33 | obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o | 33 | obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o |
| 34 | obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o | ||
| 34 | obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o | 35 | obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o |
| 35 | obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o | 36 | obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o |
| 36 | obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o | 37 | obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o |
| @@ -41,6 +42,7 @@ obj-$(CONFIG_RTC_DRV_OMAP) += rtc-omap.o | |||
| 41 | obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o | 42 | obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o |
| 42 | obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o | 43 | obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o |
| 43 | obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o | 44 | obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o |
| 45 | obj-$(CONFIG_RTC_DRV_PPC) += rtc-ppc.o | ||
| 44 | obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o | 46 | obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o |
| 45 | obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o | 47 | obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o |
| 46 | obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o | 48 | obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o |
| @@ -54,4 +56,3 @@ obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o | |||
| 54 | obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o | 56 | obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o |
| 55 | obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o | 57 | obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o |
| 56 | obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o | 58 | obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o |
| 57 | obj-$(CONFIG_RTC_DRV_PPC) += rtc-ppc.o | ||
diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c index 42244f14b41c..2ef8cdfda4a7 100644 --- a/drivers/rtc/rtc-at32ap700x.c +++ b/drivers/rtc/rtc-at32ap700x.c | |||
| @@ -94,8 +94,11 @@ static int at32_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
| 94 | { | 94 | { |
| 95 | struct rtc_at32ap700x *rtc = dev_get_drvdata(dev); | 95 | struct rtc_at32ap700x *rtc = dev_get_drvdata(dev); |
| 96 | 96 | ||
| 97 | spin_lock_irq(&rtc->lock); | ||
| 97 | rtc_time_to_tm(rtc->alarm_time, &alrm->time); | 98 | rtc_time_to_tm(rtc->alarm_time, &alrm->time); |
| 98 | alrm->pending = rtc_readl(rtc, IMR) & RTC_BIT(IMR_TOPI) ? 1 : 0; | 99 | alrm->enabled = rtc_readl(rtc, IMR) & RTC_BIT(IMR_TOPI) ? 1 : 0; |
| 100 | alrm->pending = rtc_readl(rtc, ISR) & RTC_BIT(ISR_TOPI) ? 1 : 0; | ||
| 101 | spin_unlock_irq(&rtc->lock); | ||
| 99 | 102 | ||
| 100 | return 0; | 103 | return 0; |
| 101 | } | 104 | } |
| @@ -119,7 +122,7 @@ static int at32_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
| 119 | spin_lock_irq(&rtc->lock); | 122 | spin_lock_irq(&rtc->lock); |
| 120 | rtc->alarm_time = alarm_unix_time; | 123 | rtc->alarm_time = alarm_unix_time; |
| 121 | rtc_writel(rtc, TOP, rtc->alarm_time); | 124 | rtc_writel(rtc, TOP, rtc->alarm_time); |
| 122 | if (alrm->pending) | 125 | if (alrm->enabled) |
| 123 | rtc_writel(rtc, CTRL, rtc_readl(rtc, CTRL) | 126 | rtc_writel(rtc, CTRL, rtc_readl(rtc, CTRL) |
| 124 | | RTC_BIT(CTRL_TOPEN)); | 127 | | RTC_BIT(CTRL_TOPEN)); |
| 125 | else | 128 | else |
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index d060a06ce05b..d7bb9bac71df 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
| @@ -905,19 +905,7 @@ static struct pnp_driver cmos_pnp_driver = { | |||
| 905 | .resume = cmos_pnp_resume, | 905 | .resume = cmos_pnp_resume, |
| 906 | }; | 906 | }; |
| 907 | 907 | ||
| 908 | static int __init cmos_init(void) | 908 | #endif /* CONFIG_PNP */ |
| 909 | { | ||
| 910 | return pnp_register_driver(&cmos_pnp_driver); | ||
| 911 | } | ||
| 912 | module_init(cmos_init); | ||
| 913 | |||
| 914 | static void __exit cmos_exit(void) | ||
| 915 | { | ||
| 916 | pnp_unregister_driver(&cmos_pnp_driver); | ||
| 917 | } | ||
| 918 | module_exit(cmos_exit); | ||
| 919 | |||
| 920 | #else /* no PNP */ | ||
| 921 | 909 | ||
| 922 | /*----------------------------------------------------------------*/ | 910 | /*----------------------------------------------------------------*/ |
| 923 | 911 | ||
| @@ -958,20 +946,33 @@ static struct platform_driver cmos_platform_driver = { | |||
| 958 | 946 | ||
| 959 | static int __init cmos_init(void) | 947 | static int __init cmos_init(void) |
| 960 | { | 948 | { |
| 949 | #ifdef CONFIG_PNP | ||
| 950 | if (pnp_platform_devices) | ||
| 951 | return pnp_register_driver(&cmos_pnp_driver); | ||
| 952 | else | ||
| 953 | return platform_driver_probe(&cmos_platform_driver, | ||
| 954 | cmos_platform_probe); | ||
| 955 | #else | ||
| 961 | return platform_driver_probe(&cmos_platform_driver, | 956 | return platform_driver_probe(&cmos_platform_driver, |
| 962 | cmos_platform_probe); | 957 | cmos_platform_probe); |
| 958 | #endif /* CONFIG_PNP */ | ||
| 963 | } | 959 | } |
| 964 | module_init(cmos_init); | 960 | module_init(cmos_init); |
| 965 | 961 | ||
| 966 | static void __exit cmos_exit(void) | 962 | static void __exit cmos_exit(void) |
| 967 | { | 963 | { |
| 964 | #ifdef CONFIG_PNP | ||
| 965 | if (pnp_platform_devices) | ||
| 966 | pnp_unregister_driver(&cmos_pnp_driver); | ||
| 967 | else | ||
| 968 | platform_driver_unregister(&cmos_platform_driver); | ||
| 969 | #else | ||
| 968 | platform_driver_unregister(&cmos_platform_driver); | 970 | platform_driver_unregister(&cmos_platform_driver); |
| 971 | #endif /* CONFIG_PNP */ | ||
| 969 | } | 972 | } |
| 970 | module_exit(cmos_exit); | 973 | module_exit(cmos_exit); |
| 971 | 974 | ||
| 972 | 975 | ||
| 973 | #endif /* !PNP */ | ||
| 974 | |||
| 975 | MODULE_AUTHOR("David Brownell"); | 976 | MODULE_AUTHOR("David Brownell"); |
| 976 | MODULE_DESCRIPTION("Driver for PC-style 'CMOS' RTCs"); | 977 | MODULE_DESCRIPTION("Driver for PC-style 'CMOS' RTCs"); |
| 977 | MODULE_LICENSE("GPL"); | 978 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c new file mode 100644 index 000000000000..11644c8fca82 --- /dev/null +++ b/drivers/rtc/rtc-fm3130.c | |||
| @@ -0,0 +1,501 @@ | |||
| 1 | /* | ||
| 2 | * rtc-fm3130.c - RTC driver for Ramtron FM3130 I2C chip. | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Sergey Lapin | ||
| 5 | * Based on ds1307 driver by James Chapman and David Brownell | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/module.h> | ||
| 13 | #include <linux/i2c.h> | ||
| 14 | #include <linux/rtc.h> | ||
| 15 | #include <linux/bcd.h> | ||
| 16 | |||
| 17 | #define FM3130_RTC_CONTROL (0x0) | ||
| 18 | #define FM3130_CAL_CONTROL (0x1) | ||
| 19 | #define FM3130_RTC_SECONDS (0x2) | ||
| 20 | #define FM3130_RTC_MINUTES (0x3) | ||
| 21 | #define FM3130_RTC_HOURS (0x4) | ||
| 22 | #define FM3130_RTC_DAY (0x5) | ||
| 23 | #define FM3130_RTC_DATE (0x6) | ||
| 24 | #define FM3130_RTC_MONTHS (0x7) | ||
| 25 | #define FM3130_RTC_YEARS (0x8) | ||
| 26 | |||
| 27 | #define FM3130_ALARM_SECONDS (0x9) | ||
| 28 | #define FM3130_ALARM_MINUTES (0xa) | ||
| 29 | #define FM3130_ALARM_HOURS (0xb) | ||
| 30 | #define FM3130_ALARM_DATE (0xc) | ||
| 31 | #define FM3130_ALARM_MONTHS (0xd) | ||
| 32 | #define FM3130_ALARM_WP_CONTROL (0xe) | ||
| 33 | |||
| 34 | #define FM3130_CAL_CONTROL_BIT_nOSCEN (1 << 7) /* Osciallator enabled */ | ||
| 35 | #define FM3130_RTC_CONTROL_BIT_LB (1 << 7) /* Low battery */ | ||
| 36 | #define FM3130_RTC_CONTROL_BIT_AF (1 << 6) /* Alarm flag */ | ||
| 37 | #define FM3130_RTC_CONTROL_BIT_CF (1 << 5) /* Century overflow */ | ||
| 38 | #define FM3130_RTC_CONTROL_BIT_POR (1 << 4) /* Power on reset */ | ||
| 39 | #define FM3130_RTC_CONTROL_BIT_AEN (1 << 3) /* Alarm enable */ | ||
| 40 | #define FM3130_RTC_CONTROL_BIT_CAL (1 << 2) /* Calibration mode */ | ||
| 41 | #define FM3130_RTC_CONTROL_BIT_WRITE (1 << 1) /* W=1 -> write mode W=0 normal */ | ||
| 42 | #define FM3130_RTC_CONTROL_BIT_READ (1 << 0) /* R=1 -> read mode R=0 normal */ | ||
| 43 | |||
| 44 | #define FM3130_CLOCK_REGS 7 | ||
| 45 | #define FM3130_ALARM_REGS 5 | ||
| 46 | |||
| 47 | struct fm3130 { | ||
| 48 | u8 reg_addr_time; | ||
| 49 | u8 reg_addr_alarm; | ||
| 50 | u8 regs[15]; | ||
| 51 | struct i2c_msg msg[4]; | ||
| 52 | struct i2c_client *client; | ||
| 53 | struct rtc_device *rtc; | ||
| 54 | int data_valid; | ||
| 55 | int alarm; | ||
| 56 | }; | ||
| 57 | static const struct i2c_device_id fm3130_id[] = { | ||
| 58 | { "fm3130-rtc", 0 }, | ||
| 59 | { } | ||
| 60 | }; | ||
| 61 | MODULE_DEVICE_TABLE(i2c, fm3130_id); | ||
| 62 | |||
| 63 | #define FM3130_MODE_NORMAL 0 | ||
| 64 | #define FM3130_MODE_WRITE 1 | ||
| 65 | #define FM3130_MODE_READ 2 | ||
| 66 | |||
| 67 | static void fm3130_rtc_mode(struct device *dev, int mode) | ||
| 68 | { | ||
| 69 | struct fm3130 *fm3130 = dev_get_drvdata(dev); | ||
| 70 | |||
| 71 | fm3130->regs[FM3130_RTC_CONTROL] = | ||
| 72 | i2c_smbus_read_byte_data(fm3130->client, FM3130_RTC_CONTROL); | ||
| 73 | switch (mode) { | ||
| 74 | case FM3130_MODE_NORMAL: | ||
| 75 | fm3130->regs[FM3130_RTC_CONTROL] &= | ||
| 76 | ~(FM3130_RTC_CONTROL_BIT_WRITE | | ||
| 77 | FM3130_RTC_CONTROL_BIT_READ); | ||
| 78 | break; | ||
| 79 | case FM3130_MODE_WRITE: | ||
| 80 | fm3130->regs[FM3130_RTC_CONTROL] |= FM3130_RTC_CONTROL_BIT_WRITE; | ||
| 81 | break; | ||
| 82 | case FM3130_MODE_READ: | ||
| 83 | fm3130->regs[FM3130_RTC_CONTROL] |= FM3130_RTC_CONTROL_BIT_READ; | ||
| 84 | break; | ||
| 85 | default: | ||
| 86 | dev_dbg(dev, "invalid mode %d\n", mode); | ||
| 87 | break; | ||
| 88 | } | ||
| 89 | /* Checking for alarm */ | ||
| 90 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_AF) { | ||
| 91 | fm3130->alarm = 1; | ||
| 92 | fm3130->regs[FM3130_RTC_CONTROL] &= ~FM3130_RTC_CONTROL_BIT_AF; | ||
| 93 | } | ||
| 94 | i2c_smbus_write_byte_data(fm3130->client, | ||
| 95 | FM3130_RTC_CONTROL, fm3130->regs[FM3130_RTC_CONTROL]); | ||
| 96 | } | ||
| 97 | |||
| 98 | static int fm3130_get_time(struct device *dev, struct rtc_time *t) | ||
| 99 | { | ||
| 100 | struct fm3130 *fm3130 = dev_get_drvdata(dev); | ||
| 101 | int tmp; | ||
| 102 | |||
| 103 | if (!fm3130->data_valid) { | ||
| 104 | /* We have invalid data in RTC, probably due | ||
| 105 | to battery faults or other problems. Return EIO | ||
| 106 | for now, it will allow us to set data later insted | ||
| 107 | of error during probing which disables device */ | ||
| 108 | return -EIO; | ||
| 109 | } | ||
| 110 | fm3130_rtc_mode(dev, FM3130_MODE_READ); | ||
| 111 | |||
| 112 | /* read the RTC date and time registers all at once */ | ||
| 113 | tmp = i2c_transfer(to_i2c_adapter(fm3130->client->dev.parent), | ||
| 114 | fm3130->msg, 2); | ||
| 115 | if (tmp != 2) { | ||
| 116 | dev_err(dev, "%s error %d\n", "read", tmp); | ||
| 117 | return -EIO; | ||
| 118 | } | ||
| 119 | |||
| 120 | fm3130_rtc_mode(dev, FM3130_MODE_NORMAL); | ||
| 121 | |||
| 122 | dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x %02x" | ||
| 123 | "%02x %02x %02x %02x %02x %02x %02x\n", | ||
| 124 | "read", | ||
| 125 | fm3130->regs[0], fm3130->regs[1], | ||
| 126 | fm3130->regs[2], fm3130->regs[3], | ||
| 127 | fm3130->regs[4], fm3130->regs[5], | ||
| 128 | fm3130->regs[6], fm3130->regs[7], | ||
| 129 | fm3130->regs[8], fm3130->regs[9], | ||
| 130 | fm3130->regs[0xa], fm3130->regs[0xb], | ||
| 131 | fm3130->regs[0xc], fm3130->regs[0xd], | ||
| 132 | fm3130->regs[0xe]); | ||
| 133 | |||
| 134 | t->tm_sec = BCD2BIN(fm3130->regs[FM3130_RTC_SECONDS] & 0x7f); | ||
| 135 | t->tm_min = BCD2BIN(fm3130->regs[FM3130_RTC_MINUTES] & 0x7f); | ||
| 136 | tmp = fm3130->regs[FM3130_RTC_HOURS] & 0x3f; | ||
| 137 | t->tm_hour = BCD2BIN(tmp); | ||
| 138 | t->tm_wday = BCD2BIN(fm3130->regs[FM3130_RTC_DAY] & 0x07) - 1; | ||
| 139 | t->tm_mday = BCD2BIN(fm3130->regs[FM3130_RTC_DATE] & 0x3f); | ||
| 140 | tmp = fm3130->regs[FM3130_RTC_MONTHS] & 0x1f; | ||
| 141 | t->tm_mon = BCD2BIN(tmp) - 1; | ||
| 142 | |||
| 143 | /* assume 20YY not 19YY, and ignore CF bit */ | ||
| 144 | t->tm_year = BCD2BIN(fm3130->regs[FM3130_RTC_YEARS]) + 100; | ||
| 145 | |||
| 146 | dev_dbg(dev, "%s secs=%d, mins=%d, " | ||
| 147 | "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", | ||
| 148 | "read", t->tm_sec, t->tm_min, | ||
| 149 | t->tm_hour, t->tm_mday, | ||
| 150 | t->tm_mon, t->tm_year, t->tm_wday); | ||
| 151 | |||
| 152 | /* initial clock setting can be undefined */ | ||
| 153 | return rtc_valid_tm(t); | ||
| 154 | } | ||
| 155 | |||
| 156 | |||
| 157 | static int fm3130_set_time(struct device *dev, struct rtc_time *t) | ||
| 158 | { | ||
| 159 | struct fm3130 *fm3130 = dev_get_drvdata(dev); | ||
| 160 | int tmp, i; | ||
| 161 | u8 *buf = fm3130->regs; | ||
| 162 | |||
| 163 | dev_dbg(dev, "%s secs=%d, mins=%d, " | ||
| 164 | "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", | ||
| 165 | "write", t->tm_sec, t->tm_min, | ||
| 166 | t->tm_hour, t->tm_mday, | ||
| 167 | t->tm_mon, t->tm_year, t->tm_wday); | ||
| 168 | |||
| 169 | /* first register addr */ | ||
| 170 | buf[FM3130_RTC_SECONDS] = BIN2BCD(t->tm_sec); | ||
| 171 | buf[FM3130_RTC_MINUTES] = BIN2BCD(t->tm_min); | ||
| 172 | buf[FM3130_RTC_HOURS] = BIN2BCD(t->tm_hour); | ||
| 173 | buf[FM3130_RTC_DAY] = BIN2BCD(t->tm_wday + 1); | ||
| 174 | buf[FM3130_RTC_DATE] = BIN2BCD(t->tm_mday); | ||
| 175 | buf[FM3130_RTC_MONTHS] = BIN2BCD(t->tm_mon + 1); | ||
| 176 | |||
| 177 | /* assume 20YY not 19YY */ | ||
| 178 | tmp = t->tm_year - 100; | ||
| 179 | buf[FM3130_RTC_YEARS] = BIN2BCD(tmp); | ||
| 180 | |||
| 181 | dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x" | ||
| 182 | "%02x %02x %02x %02x %02x %02x %02x %02x\n", | ||
| 183 | "write", buf[0], buf[1], buf[2], buf[3], | ||
| 184 | buf[4], buf[5], buf[6], buf[7], | ||
| 185 | buf[8], buf[9], buf[0xa], buf[0xb], | ||
| 186 | buf[0xc], buf[0xd], buf[0xe]); | ||
| 187 | |||
| 188 | fm3130_rtc_mode(dev, FM3130_MODE_WRITE); | ||
| 189 | |||
| 190 | /* Writing time registers, we don't support multibyte transfers */ | ||
| 191 | for (i = 0; i < FM3130_CLOCK_REGS; i++) { | ||
| 192 | i2c_smbus_write_byte_data(fm3130->client, | ||
| 193 | FM3130_RTC_SECONDS + i, | ||
| 194 | fm3130->regs[FM3130_RTC_SECONDS + i]); | ||
| 195 | } | ||
| 196 | |||
| 197 | fm3130_rtc_mode(dev, FM3130_MODE_NORMAL); | ||
| 198 | |||
| 199 | /* We assume here that data are valid once written */ | ||
| 200 | if (!fm3130->data_valid) | ||
| 201 | fm3130->data_valid = 1; | ||
| 202 | return 0; | ||
| 203 | } | ||
| 204 | |||
| 205 | static int fm3130_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) | ||
| 206 | { | ||
| 207 | struct fm3130 *fm3130 = dev_get_drvdata(dev); | ||
| 208 | int tmp; | ||
| 209 | struct rtc_time *tm = &alrm->time; | ||
| 210 | /* read the RTC alarm registers all at once */ | ||
| 211 | tmp = i2c_transfer(to_i2c_adapter(fm3130->client->dev.parent), | ||
| 212 | &fm3130->msg[2], 2); | ||
| 213 | if (tmp != 2) { | ||
| 214 | dev_err(dev, "%s error %d\n", "read", tmp); | ||
| 215 | return -EIO; | ||
| 216 | } | ||
| 217 | dev_dbg(dev, "alarm read %02x %02x %02x %02x %02x\n", | ||
| 218 | fm3130->regs[FM3130_ALARM_SECONDS], | ||
| 219 | fm3130->regs[FM3130_ALARM_MINUTES], | ||
| 220 | fm3130->regs[FM3130_ALARM_HOURS], | ||
| 221 | fm3130->regs[FM3130_ALARM_DATE], | ||
| 222 | fm3130->regs[FM3130_ALARM_MONTHS]); | ||
| 223 | |||
| 224 | |||
| 225 | tm->tm_sec = BCD2BIN(fm3130->regs[FM3130_ALARM_SECONDS] & 0x7F); | ||
| 226 | tm->tm_min = BCD2BIN(fm3130->regs[FM3130_ALARM_MINUTES] & 0x7F); | ||
| 227 | tm->tm_hour = BCD2BIN(fm3130->regs[FM3130_ALARM_HOURS] & 0x3F); | ||
| 228 | tm->tm_mday = BCD2BIN(fm3130->regs[FM3130_ALARM_DATE] & 0x3F); | ||
| 229 | tm->tm_mon = BCD2BIN(fm3130->regs[FM3130_ALARM_MONTHS] & 0x1F); | ||
| 230 | if (tm->tm_mon > 0) | ||
| 231 | tm->tm_mon -= 1; /* RTC is 1-12, tm_mon is 0-11 */ | ||
| 232 | dev_dbg(dev, "%s secs=%d, mins=%d, " | ||
| 233 | "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", | ||
| 234 | "read alarm", tm->tm_sec, tm->tm_min, | ||
| 235 | tm->tm_hour, tm->tm_mday, | ||
| 236 | tm->tm_mon, tm->tm_year, tm->tm_wday); | ||
| 237 | |||
| 238 | return 0; | ||
| 239 | } | ||
| 240 | |||
| 241 | static int fm3130_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) | ||
| 242 | { | ||
| 243 | struct fm3130 *fm3130 = dev_get_drvdata(dev); | ||
| 244 | struct rtc_time *tm = &alrm->time; | ||
| 245 | int i; | ||
| 246 | |||
| 247 | dev_dbg(dev, "%s secs=%d, mins=%d, " | ||
| 248 | "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", | ||
| 249 | "write alarm", tm->tm_sec, tm->tm_min, | ||
| 250 | tm->tm_hour, tm->tm_mday, | ||
| 251 | tm->tm_mon, tm->tm_year, tm->tm_wday); | ||
| 252 | |||
| 253 | if (tm->tm_sec != -1) | ||
| 254 | fm3130->regs[FM3130_ALARM_SECONDS] = | ||
| 255 | BIN2BCD(tm->tm_sec) | 0x80; | ||
| 256 | |||
| 257 | if (tm->tm_min != -1) | ||
| 258 | fm3130->regs[FM3130_ALARM_MINUTES] = | ||
| 259 | BIN2BCD(tm->tm_min) | 0x80; | ||
| 260 | |||
| 261 | if (tm->tm_hour != -1) | ||
| 262 | fm3130->regs[FM3130_ALARM_HOURS] = | ||
| 263 | BIN2BCD(tm->tm_hour) | 0x80; | ||
| 264 | |||
| 265 | if (tm->tm_mday != -1) | ||
| 266 | fm3130->regs[FM3130_ALARM_DATE] = | ||
| 267 | BIN2BCD(tm->tm_mday) | 0x80; | ||
| 268 | |||
| 269 | if (tm->tm_mon != -1) | ||
| 270 | fm3130->regs[FM3130_ALARM_MONTHS] = | ||
| 271 | BIN2BCD(tm->tm_mon + 1) | 0x80; | ||
| 272 | |||
| 273 | dev_dbg(dev, "alarm write %02x %02x %02x %02x %02x\n", | ||
| 274 | fm3130->regs[FM3130_ALARM_SECONDS], | ||
| 275 | fm3130->regs[FM3130_ALARM_MINUTES], | ||
| 276 | fm3130->regs[FM3130_ALARM_HOURS], | ||
| 277 | fm3130->regs[FM3130_ALARM_DATE], | ||
| 278 | fm3130->regs[FM3130_ALARM_MONTHS]); | ||
| 279 | /* Writing time registers, we don't support multibyte transfers */ | ||
| 280 | for (i = 0; i < FM3130_ALARM_REGS; i++) { | ||
| 281 | i2c_smbus_write_byte_data(fm3130->client, | ||
| 282 | FM3130_ALARM_SECONDS + i, | ||
| 283 | fm3130->regs[FM3130_ALARM_SECONDS + i]); | ||
| 284 | } | ||
| 285 | fm3130->regs[FM3130_RTC_CONTROL] = | ||
| 286 | i2c_smbus_read_byte_data(fm3130->client, FM3130_RTC_CONTROL); | ||
| 287 | /* Checking for alarm */ | ||
| 288 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_AF) { | ||
| 289 | fm3130->alarm = 1; | ||
| 290 | fm3130->regs[FM3130_RTC_CONTROL] &= ~FM3130_RTC_CONTROL_BIT_AF; | ||
| 291 | } | ||
| 292 | if (alrm->enabled) { | ||
| 293 | i2c_smbus_write_byte_data(fm3130->client, FM3130_RTC_CONTROL, | ||
| 294 | (fm3130->regs[FM3130_RTC_CONTROL] & | ||
| 295 | ~(FM3130_RTC_CONTROL_BIT_CAL)) | | ||
| 296 | FM3130_RTC_CONTROL_BIT_AEN); | ||
| 297 | } else { | ||
| 298 | i2c_smbus_write_byte_data(fm3130->client, FM3130_RTC_CONTROL, | ||
| 299 | fm3130->regs[FM3130_RTC_CONTROL] & | ||
| 300 | ~(FM3130_RTC_CONTROL_BIT_AEN)); | ||
| 301 | } | ||
| 302 | return 0; | ||
| 303 | } | ||
| 304 | |||
| 305 | static const struct rtc_class_ops fm3130_rtc_ops = { | ||
| 306 | .read_time = fm3130_get_time, | ||
| 307 | .set_time = fm3130_set_time, | ||
| 308 | .read_alarm = fm3130_read_alarm, | ||
| 309 | .set_alarm = fm3130_set_alarm, | ||
| 310 | }; | ||
| 311 | |||
| 312 | static struct i2c_driver fm3130_driver; | ||
| 313 | |||
| 314 | static int __devinit fm3130_probe(struct i2c_client *client, | ||
| 315 | const struct i2c_device_id *id) | ||
| 316 | { | ||
| 317 | struct fm3130 *fm3130; | ||
| 318 | int err = -ENODEV; | ||
| 319 | int tmp; | ||
| 320 | struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); | ||
| 321 | |||
| 322 | if (!i2c_check_functionality(adapter, | ||
| 323 | I2C_FUNC_I2C | I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) | ||
| 324 | return -EIO; | ||
| 325 | |||
| 326 | fm3130 = kzalloc(sizeof(struct fm3130), GFP_KERNEL); | ||
| 327 | |||
| 328 | if (!fm3130) | ||
| 329 | return -ENOMEM; | ||
| 330 | |||
| 331 | fm3130->client = client; | ||
| 332 | i2c_set_clientdata(client, fm3130); | ||
| 333 | fm3130->reg_addr_time = FM3130_RTC_SECONDS; | ||
| 334 | fm3130->reg_addr_alarm = FM3130_ALARM_SECONDS; | ||
| 335 | |||
| 336 | /* Messages to read time */ | ||
| 337 | fm3130->msg[0].addr = client->addr; | ||
| 338 | fm3130->msg[0].flags = 0; | ||
| 339 | fm3130->msg[0].len = 1; | ||
| 340 | fm3130->msg[0].buf = &fm3130->reg_addr_time; | ||
| 341 | |||
| 342 | fm3130->msg[1].addr = client->addr; | ||
| 343 | fm3130->msg[1].flags = I2C_M_RD; | ||
| 344 | fm3130->msg[1].len = FM3130_CLOCK_REGS; | ||
| 345 | fm3130->msg[1].buf = &fm3130->regs[FM3130_RTC_SECONDS]; | ||
| 346 | |||
| 347 | /* Messages to read alarm */ | ||
| 348 | fm3130->msg[2].addr = client->addr; | ||
| 349 | fm3130->msg[2].flags = 0; | ||
| 350 | fm3130->msg[2].len = 1; | ||
| 351 | fm3130->msg[2].buf = &fm3130->reg_addr_alarm; | ||
| 352 | |||
| 353 | fm3130->msg[3].addr = client->addr; | ||
| 354 | fm3130->msg[3].flags = I2C_M_RD; | ||
| 355 | fm3130->msg[3].len = FM3130_ALARM_REGS; | ||
| 356 | fm3130->msg[3].buf = &fm3130->regs[FM3130_ALARM_SECONDS]; | ||
| 357 | |||
| 358 | fm3130->data_valid = 0; | ||
| 359 | |||
| 360 | tmp = i2c_transfer(adapter, fm3130->msg, 4); | ||
| 361 | if (tmp != 4) { | ||
| 362 | pr_debug("read error %d\n", tmp); | ||
| 363 | err = -EIO; | ||
| 364 | goto exit_free; | ||
| 365 | } | ||
| 366 | |||
| 367 | fm3130->regs[FM3130_RTC_CONTROL] = | ||
| 368 | i2c_smbus_read_byte_data(client, FM3130_RTC_CONTROL); | ||
| 369 | fm3130->regs[FM3130_CAL_CONTROL] = | ||
| 370 | i2c_smbus_read_byte_data(client, FM3130_CAL_CONTROL); | ||
| 371 | |||
| 372 | /* Checking for alarm */ | ||
| 373 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_AF) { | ||
| 374 | fm3130->alarm = 1; | ||
| 375 | fm3130->regs[FM3130_RTC_CONTROL] &= ~FM3130_RTC_CONTROL_BIT_AF; | ||
| 376 | } | ||
| 377 | |||
| 378 | /* Disabling calibration mode */ | ||
| 379 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL) | ||
| 380 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, | ||
| 381 | fm3130->regs[FM3130_RTC_CONTROL] & | ||
| 382 | ~(FM3130_RTC_CONTROL_BIT_CAL)); | ||
| 383 | dev_warn(&client->dev, "Disabling calibration mode!\n"); | ||
| 384 | |||
| 385 | /* Disabling read and write modes */ | ||
| 386 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_WRITE || | ||
| 387 | fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ) | ||
| 388 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, | ||
| 389 | fm3130->regs[FM3130_RTC_CONTROL] & | ||
| 390 | ~(FM3130_RTC_CONTROL_BIT_READ | | ||
| 391 | FM3130_RTC_CONTROL_BIT_WRITE)); | ||
| 392 | dev_warn(&client->dev, "Disabling READ or WRITE mode!\n"); | ||
| 393 | |||
| 394 | /* oscillator off? turn it on, so clock can tick. */ | ||
| 395 | if (fm3130->regs[FM3130_CAL_CONTROL] & FM3130_CAL_CONTROL_BIT_nOSCEN) | ||
| 396 | i2c_smbus_write_byte_data(client, FM3130_CAL_CONTROL, | ||
| 397 | fm3130->regs[FM3130_CAL_CONTROL] & | ||
| 398 | ~(FM3130_CAL_CONTROL_BIT_nOSCEN)); | ||
| 399 | |||
| 400 | /* oscillator fault? clear flag, and warn */ | ||
| 401 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_LB) | ||
| 402 | dev_warn(&client->dev, "Low battery!\n"); | ||
| 403 | |||
| 404 | /* oscillator fault? clear flag, and warn */ | ||
| 405 | if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_POR) { | ||
| 406 | i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, | ||
| 407 | fm3130->regs[FM3130_RTC_CONTROL] & | ||
| 408 | ~FM3130_RTC_CONTROL_BIT_POR); | ||
| 409 | dev_warn(&client->dev, "SET TIME!\n"); | ||
| 410 | } | ||
| 411 | /* ACS is controlled by alarm */ | ||
| 412 | i2c_smbus_write_byte_data(client, FM3130_ALARM_WP_CONTROL, 0x80); | ||
| 413 | |||
| 414 | /* TODO */ | ||
| 415 | /* TODO need to sanity check alarm */ | ||
| 416 | tmp = fm3130->regs[FM3130_RTC_SECONDS]; | ||
| 417 | tmp = BCD2BIN(tmp & 0x7f); | ||
| 418 | if (tmp > 60) | ||
| 419 | goto exit_bad; | ||
| 420 | tmp = BCD2BIN(fm3130->regs[FM3130_RTC_MINUTES] & 0x7f); | ||
| 421 | if (tmp > 60) | ||
| 422 | goto exit_bad; | ||
| 423 | |||
| 424 | tmp = BCD2BIN(fm3130->regs[FM3130_RTC_DATE] & 0x3f); | ||
| 425 | if (tmp == 0 || tmp > 31) | ||
| 426 | goto exit_bad; | ||
| 427 | |||
| 428 | tmp = BCD2BIN(fm3130->regs[FM3130_RTC_MONTHS] & 0x1f); | ||
| 429 | if (tmp == 0 || tmp > 12) | ||
| 430 | goto exit_bad; | ||
| 431 | |||
| 432 | tmp = fm3130->regs[FM3130_RTC_HOURS]; | ||
| 433 | |||
| 434 | fm3130->data_valid = 1; | ||
| 435 | |||
| 436 | exit_bad: | ||
| 437 | if (!fm3130->data_valid) | ||
| 438 | dev_dbg(&client->dev, | ||
| 439 | "%s: %02x %02x %02x %02x %02x %02x %02x %02x" | ||
| 440 | "%02x %02x %02x %02x %02x %02x %02x\n", | ||
| 441 | "bogus registers", | ||
| 442 | fm3130->regs[0], fm3130->regs[1], | ||
| 443 | fm3130->regs[2], fm3130->regs[3], | ||
| 444 | fm3130->regs[4], fm3130->regs[5], | ||
| 445 | fm3130->regs[6], fm3130->regs[7], | ||
| 446 | fm3130->regs[8], fm3130->regs[9], | ||
| 447 | fm3130->regs[0xa], fm3130->regs[0xb], | ||
| 448 | fm3130->regs[0xc], fm3130->regs[0xd], | ||
| 449 | fm3130->regs[0xe]); | ||
| 450 | |||
| 451 | /* We won't bail out here because we just got invalid data. | ||
| 452 | Time setting from u-boot doesn't work anyway */ | ||
| 453 | fm3130->rtc = rtc_device_register(client->name, &client->dev, | ||
| 454 | &fm3130_rtc_ops, THIS_MODULE); | ||
| 455 | if (IS_ERR(fm3130->rtc)) { | ||
| 456 | err = PTR_ERR(fm3130->rtc); | ||
| 457 | dev_err(&client->dev, | ||
| 458 | "unable to register the class device\n"); | ||
| 459 | goto exit_free; | ||
| 460 | } | ||
| 461 | return 0; | ||
| 462 | exit_free: | ||
| 463 | kfree(fm3130); | ||
| 464 | return err; | ||
| 465 | } | ||
| 466 | |||
| 467 | static int __devexit fm3130_remove(struct i2c_client *client) | ||
| 468 | { | ||
| 469 | struct fm3130 *fm3130 = i2c_get_clientdata(client); | ||
| 470 | |||
| 471 | rtc_device_unregister(fm3130->rtc); | ||
| 472 | kfree(fm3130); | ||
| 473 | return 0; | ||
| 474 | } | ||
| 475 | |||
| 476 | static struct i2c_driver fm3130_driver = { | ||
| 477 | .driver = { | ||
| 478 | .name = "rtc-fm3130", | ||
| 479 | .owner = THIS_MODULE, | ||
| 480 | }, | ||
| 481 | .probe = fm3130_probe, | ||
| 482 | .remove = __devexit_p(fm3130_remove), | ||
| 483 | .id_table = fm3130_id, | ||
| 484 | }; | ||
| 485 | |||
| 486 | static int __init fm3130_init(void) | ||
| 487 | { | ||
| 488 | return i2c_add_driver(&fm3130_driver); | ||
| 489 | } | ||
| 490 | module_init(fm3130_init); | ||
| 491 | |||
| 492 | static void __exit fm3130_exit(void) | ||
| 493 | { | ||
| 494 | i2c_del_driver(&fm3130_driver); | ||
| 495 | } | ||
| 496 | module_exit(fm3130_exit); | ||
| 497 | |||
| 498 | MODULE_DESCRIPTION("RTC driver for FM3130"); | ||
| 499 | MODULE_AUTHOR("Sergey Lapin <slapin@ossfans.org>"); | ||
| 500 | MODULE_LICENSE("GPL"); | ||
| 501 | |||
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 436bf1f6d4a6..9a71dae223e8 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c | |||
| @@ -290,9 +290,6 @@ int qeth_set_large_send(struct qeth_card *card, | |||
| 290 | card->dev->features |= NETIF_F_TSO | NETIF_F_SG | | 290 | card->dev->features |= NETIF_F_TSO | NETIF_F_SG | |
| 291 | NETIF_F_HW_CSUM; | 291 | NETIF_F_HW_CSUM; |
| 292 | } else { | 292 | } else { |
| 293 | PRINT_WARN("TSO not supported on %s. " | ||
| 294 | "large_send set to 'no'.\n", | ||
| 295 | card->dev->name); | ||
| 296 | card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG | | 293 | card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG | |
| 297 | NETIF_F_HW_CSUM); | 294 | NETIF_F_HW_CSUM); |
| 298 | card->options.large_send = QETH_LARGE_SEND_NO; | 295 | card->options.large_send = QETH_LARGE_SEND_NO; |
| @@ -1407,12 +1404,6 @@ static void qeth_init_func_level(struct qeth_card *card) | |||
| 1407 | } | 1404 | } |
| 1408 | } | 1405 | } |
| 1409 | 1406 | ||
| 1410 | static inline __u16 qeth_raw_devno_from_bus_id(char *id) | ||
| 1411 | { | ||
| 1412 | id += (strlen(id) - 4); | ||
| 1413 | return (__u16) simple_strtoul(id, &id, 16); | ||
| 1414 | } | ||
| 1415 | |||
| 1416 | static int qeth_idx_activate_get_answer(struct qeth_channel *channel, | 1407 | static int qeth_idx_activate_get_answer(struct qeth_channel *channel, |
| 1417 | void (*idx_reply_cb)(struct qeth_channel *, | 1408 | void (*idx_reply_cb)(struct qeth_channel *, |
| 1418 | struct qeth_cmd_buffer *)) | 1409 | struct qeth_cmd_buffer *)) |
| @@ -1439,7 +1430,7 @@ static int qeth_idx_activate_get_answer(struct qeth_channel *channel, | |||
| 1439 | spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); | 1430 | spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); |
| 1440 | 1431 | ||
| 1441 | if (rc) { | 1432 | if (rc) { |
| 1442 | PRINT_ERR("Error2 in activating channel rc=%d\n", rc); | 1433 | QETH_DBF_MESSAGE(2, "Error2 in activating channel rc=%d\n", rc); |
| 1443 | QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc); | 1434 | QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc); |
| 1444 | atomic_set(&channel->irq_pending, 0); | 1435 | atomic_set(&channel->irq_pending, 0); |
| 1445 | wake_up(&card->wait_q); | 1436 | wake_up(&card->wait_q); |
| @@ -1468,6 +1459,7 @@ static int qeth_idx_activate_channel(struct qeth_channel *channel, | |||
| 1468 | __u16 temp; | 1459 | __u16 temp; |
| 1469 | __u8 tmp; | 1460 | __u8 tmp; |
| 1470 | int rc; | 1461 | int rc; |
| 1462 | struct ccw_dev_id temp_devid; | ||
| 1471 | 1463 | ||
| 1472 | card = CARD_FROM_CDEV(channel->ccwdev); | 1464 | card = CARD_FROM_CDEV(channel->ccwdev); |
| 1473 | 1465 | ||
| @@ -1494,8 +1486,8 @@ static int qeth_idx_activate_channel(struct qeth_channel *channel, | |||
| 1494 | &card->token.issuer_rm_w, QETH_MPC_TOKEN_LENGTH); | 1486 | &card->token.issuer_rm_w, QETH_MPC_TOKEN_LENGTH); |
| 1495 | memcpy(QETH_IDX_ACT_FUNC_LEVEL(iob->data), | 1487 | memcpy(QETH_IDX_ACT_FUNC_LEVEL(iob->data), |
| 1496 | &card->info.func_level, sizeof(__u16)); | 1488 | &card->info.func_level, sizeof(__u16)); |
| 1497 | temp = qeth_raw_devno_from_bus_id(CARD_DDEV_ID(card)); | 1489 | ccw_device_get_id(CARD_DDEV(card), &temp_devid); |
| 1498 | memcpy(QETH_IDX_ACT_QDIO_DEV_CUA(iob->data), &temp, 2); | 1490 | memcpy(QETH_IDX_ACT_QDIO_DEV_CUA(iob->data), &temp_devid.devno, 2); |
| 1499 | temp = (card->info.cula << 8) + card->info.unit_addr2; | 1491 | temp = (card->info.cula << 8) + card->info.unit_addr2; |
| 1500 | memcpy(QETH_IDX_ACT_QDIO_DEV_REALADDR(iob->data), &temp, 2); | 1492 | memcpy(QETH_IDX_ACT_QDIO_DEV_REALADDR(iob->data), &temp, 2); |
| 1501 | 1493 | ||
| @@ -1508,7 +1500,8 @@ static int qeth_idx_activate_channel(struct qeth_channel *channel, | |||
| 1508 | spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); | 1500 | spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); |
| 1509 | 1501 | ||
| 1510 | if (rc) { | 1502 | if (rc) { |
| 1511 | PRINT_ERR("Error1 in activating channel. rc=%d\n", rc); | 1503 | QETH_DBF_MESSAGE(2, "Error1 in activating channel. rc=%d\n", |
| 1504 | rc); | ||
| 1512 | QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc); | 1505 | QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc); |
| 1513 | atomic_set(&channel->irq_pending, 0); | 1506 | atomic_set(&channel->irq_pending, 0); |
| 1514 | wake_up(&card->wait_q); | 1507 | wake_up(&card->wait_q); |
| @@ -1658,7 +1651,6 @@ int qeth_send_control_data(struct qeth_card *card, int len, | |||
| 1658 | 1651 | ||
| 1659 | reply = qeth_alloc_reply(card); | 1652 | reply = qeth_alloc_reply(card); |
| 1660 | if (!reply) { | 1653 | if (!reply) { |
| 1661 | PRINT_WARN("Could not alloc qeth_reply!\n"); | ||
| 1662 | return -ENOMEM; | 1654 | return -ENOMEM; |
| 1663 | } | 1655 | } |
| 1664 | reply->callback = reply_cb; | 1656 | reply->callback = reply_cb; |
| @@ -2612,15 +2604,9 @@ void qeth_queue_input_buffer(struct qeth_card *card, int index) | |||
| 2612 | if (newcount < count) { | 2604 | if (newcount < count) { |
| 2613 | /* we are in memory shortage so we switch back to | 2605 | /* we are in memory shortage so we switch back to |
| 2614 | traditional skb allocation and drop packages */ | 2606 | traditional skb allocation and drop packages */ |
| 2615 | if (!atomic_read(&card->force_alloc_skb) && | ||
| 2616 | net_ratelimit()) | ||
| 2617 | PRINT_WARN("Switch to alloc skb\n"); | ||
| 2618 | atomic_set(&card->force_alloc_skb, 3); | 2607 | atomic_set(&card->force_alloc_skb, 3); |
| 2619 | count = newcount; | 2608 | count = newcount; |
| 2620 | } else { | 2609 | } else { |
| 2621 | if ((atomic_read(&card->force_alloc_skb) == 1) && | ||
| 2622 | net_ratelimit()) | ||
| 2623 | PRINT_WARN("Switch to sg\n"); | ||
| 2624 | atomic_add_unless(&card->force_alloc_skb, -1, 0); | 2610 | atomic_add_unless(&card->force_alloc_skb, -1, 0); |
| 2625 | } | 2611 | } |
| 2626 | 2612 | ||
| @@ -3034,7 +3020,7 @@ int qeth_get_elements_no(struct qeth_card *card, void *hdr, | |||
| 3034 | elements_needed = 1 + (((((unsigned long) hdr) % PAGE_SIZE) | 3020 | elements_needed = 1 + (((((unsigned long) hdr) % PAGE_SIZE) |
| 3035 | + skb->len) >> PAGE_SHIFT); | 3021 | + skb->len) >> PAGE_SHIFT); |
| 3036 | if ((elements_needed + elems) > QETH_MAX_BUFFER_ELEMENTS(card)) { | 3022 | if ((elements_needed + elems) > QETH_MAX_BUFFER_ELEMENTS(card)) { |
| 3037 | PRINT_ERR("Invalid size of IP packet " | 3023 | QETH_DBF_MESSAGE(2, "Invalid size of IP packet " |
| 3038 | "(Number=%d / Length=%d). Discarded.\n", | 3024 | "(Number=%d / Length=%d). Discarded.\n", |
| 3039 | (elements_needed+elems), skb->len); | 3025 | (elements_needed+elems), skb->len); |
| 3040 | return 0; | 3026 | return 0; |
| @@ -3247,8 +3233,6 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue, | |||
| 3247 | * free buffers) to handle eddp context */ | 3233 | * free buffers) to handle eddp context */ |
| 3248 | if (qeth_eddp_check_buffers_for_context(queue, ctx) | 3234 | if (qeth_eddp_check_buffers_for_context(queue, ctx) |
| 3249 | < 0) { | 3235 | < 0) { |
| 3250 | if (net_ratelimit()) | ||
| 3251 | PRINT_WARN("eddp tx_dropped 1\n"); | ||
| 3252 | rc = -EBUSY; | 3236 | rc = -EBUSY; |
| 3253 | goto out; | 3237 | goto out; |
| 3254 | } | 3238 | } |
| @@ -3260,7 +3244,6 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue, | |||
| 3260 | tmp = qeth_eddp_fill_buffer(queue, ctx, | 3244 | tmp = qeth_eddp_fill_buffer(queue, ctx, |
| 3261 | queue->next_buf_to_fill); | 3245 | queue->next_buf_to_fill); |
| 3262 | if (tmp < 0) { | 3246 | if (tmp < 0) { |
| 3263 | PRINT_ERR("eddp tx_dropped 2\n"); | ||
| 3264 | rc = -EBUSY; | 3247 | rc = -EBUSY; |
| 3265 | goto out; | 3248 | goto out; |
| 3266 | } | 3249 | } |
| @@ -3602,8 +3585,6 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata) | |||
| 3602 | 3585 | ||
| 3603 | if ((!qeth_adp_supported(card, IPA_SETADP_SET_SNMP_CONTROL)) && | 3586 | if ((!qeth_adp_supported(card, IPA_SETADP_SET_SNMP_CONTROL)) && |
| 3604 | (!card->options.layer2)) { | 3587 | (!card->options.layer2)) { |
| 3605 | PRINT_WARN("SNMP Query MIBS not supported " | ||
| 3606 | "on %s!\n", QETH_CARD_IFNAME(card)); | ||
| 3607 | return -EOPNOTSUPP; | 3588 | return -EOPNOTSUPP; |
| 3608 | } | 3589 | } |
| 3609 | /* skip 4 bytes (data_len struct member) to get req_len */ | 3590 | /* skip 4 bytes (data_len struct member) to get req_len */ |
| @@ -3634,7 +3615,7 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata) | |||
| 3634 | rc = qeth_send_ipa_snmp_cmd(card, iob, QETH_SETADP_BASE_LEN + req_len, | 3615 | rc = qeth_send_ipa_snmp_cmd(card, iob, QETH_SETADP_BASE_LEN + req_len, |
| 3635 | qeth_snmp_command_cb, (void *)&qinfo); | 3616 | qeth_snmp_command_cb, (void *)&qinfo); |
| 3636 | if (rc) | 3617 | if (rc) |
| 3637 | PRINT_WARN("SNMP command failed on %s: (0x%x)\n", | 3618 | QETH_DBF_MESSAGE(2, "SNMP command failed on %s: (0x%x)\n", |
| 3638 | QETH_CARD_IFNAME(card), rc); | 3619 | QETH_CARD_IFNAME(card), rc); |
| 3639 | else { | 3620 | else { |
| 3640 | if (copy_to_user(udata, qinfo.udata, qinfo.udata_len)) | 3621 | if (copy_to_user(udata, qinfo.udata, qinfo.udata_len)) |
| @@ -3807,8 +3788,8 @@ retry: | |||
| 3807 | if (mpno) | 3788 | if (mpno) |
| 3808 | mpno = min(mpno - 1, QETH_MAX_PORTNO); | 3789 | mpno = min(mpno - 1, QETH_MAX_PORTNO); |
| 3809 | if (card->info.portno > mpno) { | 3790 | if (card->info.portno > mpno) { |
| 3810 | PRINT_ERR("Device %s does not offer port number %d \n.", | 3791 | QETH_DBF_MESSAGE(2, "Device %s does not offer port number %d" |
| 3811 | CARD_BUS_ID(card), card->info.portno); | 3792 | "\n.", CARD_BUS_ID(card), card->info.portno); |
| 3812 | rc = -ENODEV; | 3793 | rc = -ENODEV; |
| 3813 | goto out; | 3794 | goto out; |
| 3814 | } | 3795 | } |
| @@ -3985,8 +3966,6 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, | |||
| 3985 | return skb; | 3966 | return skb; |
| 3986 | no_mem: | 3967 | no_mem: |
| 3987 | if (net_ratelimit()) { | 3968 | if (net_ratelimit()) { |
| 3988 | PRINT_WARN("No memory for packet received on %s.\n", | ||
| 3989 | QETH_CARD_IFNAME(card)); | ||
| 3990 | QETH_DBF_TEXT(TRACE, 2, "noskbmem"); | 3969 | QETH_DBF_TEXT(TRACE, 2, "noskbmem"); |
| 3991 | QETH_DBF_TEXT_(TRACE, 2, "%s", CARD_BUS_ID(card)); | 3970 | QETH_DBF_TEXT_(TRACE, 2, "%s", CARD_BUS_ID(card)); |
| 3992 | } | 3971 | } |
| @@ -4004,15 +3983,17 @@ static void qeth_unregister_dbf_views(void) | |||
| 4004 | } | 3983 | } |
| 4005 | } | 3984 | } |
| 4006 | 3985 | ||
| 4007 | void qeth_dbf_longtext(enum qeth_dbf_names dbf_nix, int level, char *text, ...) | 3986 | void qeth_dbf_longtext(enum qeth_dbf_names dbf_nix, int level, char *fmt, ...) |
| 4008 | { | 3987 | { |
| 4009 | char dbf_txt_buf[32]; | 3988 | char dbf_txt_buf[32]; |
| 3989 | va_list args; | ||
| 4010 | 3990 | ||
| 4011 | if (level > (qeth_dbf[dbf_nix].id)->level) | 3991 | if (level > (qeth_dbf[dbf_nix].id)->level) |
| 4012 | return; | 3992 | return; |
| 4013 | snprintf(dbf_txt_buf, sizeof(dbf_txt_buf), text); | 3993 | va_start(args, fmt); |
| 3994 | vsnprintf(dbf_txt_buf, sizeof(dbf_txt_buf), fmt, args); | ||
| 3995 | va_end(args); | ||
| 4014 | debug_text_event(qeth_dbf[dbf_nix].id, level, dbf_txt_buf); | 3996 | debug_text_event(qeth_dbf[dbf_nix].id, level, dbf_txt_buf); |
| 4015 | |||
| 4016 | } | 3997 | } |
| 4017 | EXPORT_SYMBOL_GPL(qeth_dbf_longtext); | 3998 | EXPORT_SYMBOL_GPL(qeth_dbf_longtext); |
| 4018 | 3999 | ||
diff --git a/drivers/s390/net/qeth_core_offl.c b/drivers/s390/net/qeth_core_offl.c index 822df8362856..452874e89740 100644 --- a/drivers/s390/net/qeth_core_offl.c +++ b/drivers/s390/net/qeth_core_offl.c | |||
| @@ -122,8 +122,8 @@ int qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, | |||
| 122 | if (element == 0) | 122 | if (element == 0) |
| 123 | return -EBUSY; | 123 | return -EBUSY; |
| 124 | else { | 124 | else { |
| 125 | PRINT_WARN("could only partially fill eddp " | 125 | QETH_DBF_MESSAGE(2, "could only partially fill" |
| 126 | "buffer!\n"); | 126 | "eddp buffer!\n"); |
| 127 | goto out; | 127 | goto out; |
| 128 | } | 128 | } |
| 129 | } | 129 | } |
| @@ -143,8 +143,6 @@ int qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, | |||
| 143 | if (must_refcnt) { | 143 | if (must_refcnt) { |
| 144 | must_refcnt = 0; | 144 | must_refcnt = 0; |
| 145 | if (qeth_eddp_buf_ref_context(buf, ctx)) { | 145 | if (qeth_eddp_buf_ref_context(buf, ctx)) { |
| 146 | PRINT_WARN("no memory to create eddp context " | ||
| 147 | "reference\n"); | ||
| 148 | goto out_check; | 146 | goto out_check; |
| 149 | } | 147 | } |
| 150 | } | 148 | } |
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c index 08a50f057284..c26e842ad905 100644 --- a/drivers/s390/net/qeth_core_sys.c +++ b/drivers/s390/net/qeth_core_sys.c | |||
| @@ -129,7 +129,6 @@ static ssize_t qeth_dev_portno_store(struct device *dev, | |||
| 129 | 129 | ||
| 130 | portno = simple_strtoul(buf, &tmp, 16); | 130 | portno = simple_strtoul(buf, &tmp, 16); |
| 131 | if (portno > QETH_MAX_PORTNO) { | 131 | if (portno > QETH_MAX_PORTNO) { |
| 132 | PRINT_WARN("portno 0x%X is out of range\n", portno); | ||
| 133 | return -EINVAL; | 132 | return -EINVAL; |
| 134 | } | 133 | } |
| 135 | 134 | ||
| @@ -223,8 +222,6 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev, | |||
| 223 | * if though we have to permit priority queueing | 222 | * if though we have to permit priority queueing |
| 224 | */ | 223 | */ |
| 225 | if (card->qdio.no_out_queues == 1) { | 224 | if (card->qdio.no_out_queues == 1) { |
| 226 | PRINT_WARN("Priority queueing disabled due " | ||
| 227 | "to hardware limitations!\n"); | ||
| 228 | card->qdio.do_prio_queueing = QETH_PRIOQ_DEFAULT; | 225 | card->qdio.do_prio_queueing = QETH_PRIOQ_DEFAULT; |
| 229 | return -EPERM; | 226 | return -EPERM; |
| 230 | } | 227 | } |
| @@ -250,7 +247,6 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev, | |||
| 250 | card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING; | 247 | card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING; |
| 251 | card->qdio.default_out_queue = QETH_DEFAULT_QUEUE; | 248 | card->qdio.default_out_queue = QETH_DEFAULT_QUEUE; |
| 252 | } else { | 249 | } else { |
| 253 | PRINT_WARN("Unknown queueing type '%s'\n", tmp); | ||
| 254 | return -EINVAL; | 250 | return -EINVAL; |
| 255 | } | 251 | } |
| 256 | return count; | 252 | return count; |
| @@ -291,9 +287,6 @@ static ssize_t qeth_dev_bufcnt_store(struct device *dev, | |||
| 291 | ((cnt > QETH_IN_BUF_COUNT_MAX) ? QETH_IN_BUF_COUNT_MAX : cnt); | 287 | ((cnt > QETH_IN_BUF_COUNT_MAX) ? QETH_IN_BUF_COUNT_MAX : cnt); |
| 292 | if (old_cnt != cnt) { | 288 | if (old_cnt != cnt) { |
| 293 | rc = qeth_realloc_buffer_pool(card, cnt); | 289 | rc = qeth_realloc_buffer_pool(card, cnt); |
| 294 | if (rc) | ||
| 295 | PRINT_WARN("Error (%d) while setting " | ||
| 296 | "buffer count.\n", rc); | ||
| 297 | } | 290 | } |
| 298 | return count; | 291 | return count; |
| 299 | } | 292 | } |
| @@ -355,7 +348,6 @@ static ssize_t qeth_dev_performance_stats_store(struct device *dev, | |||
| 355 | card->perf_stats.initial_rx_packets = card->stats.rx_packets; | 348 | card->perf_stats.initial_rx_packets = card->stats.rx_packets; |
| 356 | card->perf_stats.initial_tx_packets = card->stats.tx_packets; | 349 | card->perf_stats.initial_tx_packets = card->stats.tx_packets; |
| 357 | } else { | 350 | } else { |
| 358 | PRINT_WARN("performance_stats: write 0 or 1 to this file!\n"); | ||
| 359 | return -EINVAL; | 351 | return -EINVAL; |
| 360 | } | 352 | } |
| 361 | return count; | 353 | return count; |
| @@ -399,7 +391,6 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, | |||
| 399 | newdis = QETH_DISCIPLINE_LAYER2; | 391 | newdis = QETH_DISCIPLINE_LAYER2; |
| 400 | break; | 392 | break; |
| 401 | default: | 393 | default: |
| 402 | PRINT_WARN("layer2: write 0 or 1 to this file!\n"); | ||
| 403 | return -EINVAL; | 394 | return -EINVAL; |
| 404 | } | 395 | } |
| 405 | 396 | ||
| @@ -463,7 +454,6 @@ static ssize_t qeth_dev_large_send_store(struct device *dev, | |||
| 463 | } else if (!strcmp(tmp, "TSO")) { | 454 | } else if (!strcmp(tmp, "TSO")) { |
| 464 | type = QETH_LARGE_SEND_TSO; | 455 | type = QETH_LARGE_SEND_TSO; |
| 465 | } else { | 456 | } else { |
| 466 | PRINT_WARN("large_send: invalid mode %s!\n", tmp); | ||
| 467 | return -EINVAL; | 457 | return -EINVAL; |
| 468 | } | 458 | } |
| 469 | if (card->options.large_send == type) | 459 | if (card->options.large_send == type) |
| @@ -503,8 +493,6 @@ static ssize_t qeth_dev_blkt_store(struct qeth_card *card, | |||
| 503 | if (i <= max_value) { | 493 | if (i <= max_value) { |
| 504 | *value = i; | 494 | *value = i; |
| 505 | } else { | 495 | } else { |
| 506 | PRINT_WARN("blkt total time: write values between" | ||
| 507 | " 0 and %d to this file!\n", max_value); | ||
| 508 | return -EINVAL; | 496 | return -EINVAL; |
| 509 | } | 497 | } |
| 510 | return count; | 498 | return count; |
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 86ec50ddae13..f682f7b14480 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c | |||
| @@ -101,19 +101,16 @@ static struct net_device *qeth_l2_netdev_by_devno(unsigned char *read_dev_no) | |||
| 101 | { | 101 | { |
| 102 | struct qeth_card *card; | 102 | struct qeth_card *card; |
| 103 | struct net_device *ndev; | 103 | struct net_device *ndev; |
| 104 | unsigned char *readno; | 104 | __u16 temp_dev_no; |
| 105 | __u16 temp_dev_no, card_dev_no; | ||
| 106 | char *endp; | ||
| 107 | unsigned long flags; | 105 | unsigned long flags; |
| 106 | struct ccw_dev_id read_devid; | ||
| 108 | 107 | ||
| 109 | ndev = NULL; | 108 | ndev = NULL; |
| 110 | memcpy(&temp_dev_no, read_dev_no, 2); | 109 | memcpy(&temp_dev_no, read_dev_no, 2); |
| 111 | read_lock_irqsave(&qeth_core_card_list.rwlock, flags); | 110 | read_lock_irqsave(&qeth_core_card_list.rwlock, flags); |
| 112 | list_for_each_entry(card, &qeth_core_card_list.list, list) { | 111 | list_for_each_entry(card, &qeth_core_card_list.list, list) { |
| 113 | readno = CARD_RDEV_ID(card); | 112 | ccw_device_get_id(CARD_RDEV(card), &read_devid); |
| 114 | readno += (strlen(readno) - 4); | 113 | if (read_devid.devno == temp_dev_no) { |
| 115 | card_dev_no = simple_strtoul(readno, &endp, 16); | ||
| 116 | if (card_dev_no == temp_dev_no) { | ||
| 117 | ndev = card->dev; | 114 | ndev = card->dev; |
| 118 | break; | 115 | break; |
| 119 | } | 116 | } |
| @@ -134,14 +131,14 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card, | |||
| 134 | mac = &cmd->data.setdelmac.mac[0]; | 131 | mac = &cmd->data.setdelmac.mac[0]; |
| 135 | /* MAC already registered, needed in couple/uncouple case */ | 132 | /* MAC already registered, needed in couple/uncouple case */ |
| 136 | if (cmd->hdr.return_code == 0x2005) { | 133 | if (cmd->hdr.return_code == 0x2005) { |
| 137 | PRINT_WARN("Group MAC %02x:%02x:%02x:%02x:%02x:%02x " \ | 134 | QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x " |
| 138 | "already existing on %s \n", | 135 | "already existing on %s \n", |
| 139 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], | 136 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], |
| 140 | QETH_CARD_IFNAME(card)); | 137 | QETH_CARD_IFNAME(card)); |
| 141 | cmd->hdr.return_code = 0; | 138 | cmd->hdr.return_code = 0; |
| 142 | } | 139 | } |
| 143 | if (cmd->hdr.return_code) | 140 | if (cmd->hdr.return_code) |
| 144 | PRINT_ERR("Could not set group MAC " \ | 141 | QETH_DBF_MESSAGE(2, "Could not set group MAC " |
| 145 | "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", | 142 | "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", |
| 146 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], | 143 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], |
| 147 | QETH_CARD_IFNAME(card), cmd->hdr.return_code); | 144 | QETH_CARD_IFNAME(card), cmd->hdr.return_code); |
| @@ -166,7 +163,7 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card, | |||
| 166 | cmd = (struct qeth_ipa_cmd *) data; | 163 | cmd = (struct qeth_ipa_cmd *) data; |
| 167 | mac = &cmd->data.setdelmac.mac[0]; | 164 | mac = &cmd->data.setdelmac.mac[0]; |
| 168 | if (cmd->hdr.return_code) | 165 | if (cmd->hdr.return_code) |
| 169 | PRINT_ERR("Could not delete group MAC " \ | 166 | QETH_DBF_MESSAGE(2, "Could not delete group MAC " |
| 170 | "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", | 167 | "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", |
| 171 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], | 168 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], |
| 172 | QETH_CARD_IFNAME(card), cmd->hdr.return_code); | 169 | QETH_CARD_IFNAME(card), cmd->hdr.return_code); |
| @@ -186,10 +183,8 @@ static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) | |||
| 186 | 183 | ||
| 187 | mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); | 184 | mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); |
| 188 | 185 | ||
| 189 | if (!mc) { | 186 | if (!mc) |
| 190 | PRINT_ERR("no mem vor mc mac address\n"); | ||
| 191 | return; | 187 | return; |
| 192 | } | ||
| 193 | 188 | ||
| 194 | memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); | 189 | memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); |
| 195 | mc->mc_addrlen = OSA_ADDR_LEN; | 190 | mc->mc_addrlen = OSA_ADDR_LEN; |
| @@ -280,7 +275,7 @@ static int qeth_l2_send_setdelvlan_cb(struct qeth_card *card, | |||
| 280 | QETH_DBF_TEXT(TRACE, 2, "L2sdvcb"); | 275 | QETH_DBF_TEXT(TRACE, 2, "L2sdvcb"); |
| 281 | cmd = (struct qeth_ipa_cmd *) data; | 276 | cmd = (struct qeth_ipa_cmd *) data; |
| 282 | if (cmd->hdr.return_code) { | 277 | if (cmd->hdr.return_code) { |
| 283 | PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. " | 278 | QETH_DBF_MESSAGE(2, "Error in processing VLAN %i on %s: 0x%x. " |
| 284 | "Continuing\n", cmd->data.setdelvlan.vlan_id, | 279 | "Continuing\n", cmd->data.setdelvlan.vlan_id, |
| 285 | QETH_CARD_IFNAME(card), cmd->hdr.return_code); | 280 | QETH_CARD_IFNAME(card), cmd->hdr.return_code); |
| 286 | QETH_DBF_TEXT_(TRACE, 2, "L2VL%4x", cmd->hdr.command); | 281 | QETH_DBF_TEXT_(TRACE, 2, "L2VL%4x", cmd->hdr.command); |
| @@ -333,8 +328,6 @@ static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) | |||
| 333 | spin_lock_bh(&card->vlanlock); | 328 | spin_lock_bh(&card->vlanlock); |
| 334 | list_add_tail(&id->list, &card->vid_list); | 329 | list_add_tail(&id->list, &card->vid_list); |
| 335 | spin_unlock_bh(&card->vlanlock); | 330 | spin_unlock_bh(&card->vlanlock); |
| 336 | } else { | ||
| 337 | PRINT_ERR("no memory for vid\n"); | ||
| 338 | } | 331 | } |
| 339 | } | 332 | } |
| 340 | 333 | ||
| @@ -550,16 +543,15 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) | |||
| 550 | 543 | ||
| 551 | rc = qeth_query_setadapterparms(card); | 544 | rc = qeth_query_setadapterparms(card); |
| 552 | if (rc) { | 545 | if (rc) { |
| 553 | PRINT_WARN("could not query adapter parameters on device %s: " | 546 | QETH_DBF_MESSAGE(2, "could not query adapter parameters on " |
| 554 | "x%x\n", CARD_BUS_ID(card), rc); | 547 | "device %s: x%x\n", CARD_BUS_ID(card), rc); |
| 555 | } | 548 | } |
| 556 | 549 | ||
| 557 | if (card->info.guestlan) { | 550 | if (card->info.guestlan) { |
| 558 | rc = qeth_setadpparms_change_macaddr(card); | 551 | rc = qeth_setadpparms_change_macaddr(card); |
| 559 | if (rc) { | 552 | if (rc) { |
| 560 | PRINT_WARN("couldn't get MAC address on " | 553 | QETH_DBF_MESSAGE(2, "couldn't get MAC address on " |
| 561 | "device %s: x%x\n", | 554 | "device %s: x%x\n", CARD_BUS_ID(card), rc); |
| 562 | CARD_BUS_ID(card), rc); | ||
| 563 | QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc); | 555 | QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc); |
| 564 | return rc; | 556 | return rc; |
| 565 | } | 557 | } |
| @@ -585,8 +577,6 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) | |||
| 585 | } | 577 | } |
| 586 | 578 | ||
| 587 | if (card->info.type == QETH_CARD_TYPE_OSN) { | 579 | if (card->info.type == QETH_CARD_TYPE_OSN) { |
| 588 | PRINT_WARN("Setting MAC address on %s is not supported.\n", | ||
| 589 | dev->name); | ||
| 590 | QETH_DBF_TEXT(TRACE, 3, "setmcOSN"); | 580 | QETH_DBF_TEXT(TRACE, 3, "setmcOSN"); |
| 591 | return -EOPNOTSUPP; | 581 | return -EOPNOTSUPP; |
| 592 | } | 582 | } |
| @@ -666,7 +656,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 666 | ctx = qeth_eddp_create_context(card, new_skb, hdr, | 656 | ctx = qeth_eddp_create_context(card, new_skb, hdr, |
| 667 | skb->sk->sk_protocol); | 657 | skb->sk->sk_protocol); |
| 668 | if (ctx == NULL) { | 658 | if (ctx == NULL) { |
| 669 | PRINT_WARN("could not create eddp context\n"); | 659 | QETH_DBF_MESSAGE(2, "could not create eddp context\n"); |
| 670 | goto tx_drop; | 660 | goto tx_drop; |
| 671 | } | 661 | } |
| 672 | } else { | 662 | } else { |
| @@ -731,6 +721,7 @@ tx_drop: | |||
| 731 | if ((new_skb != skb) && new_skb) | 721 | if ((new_skb != skb) && new_skb) |
| 732 | dev_kfree_skb_any(new_skb); | 722 | dev_kfree_skb_any(new_skb); |
| 733 | dev_kfree_skb_any(skb); | 723 | dev_kfree_skb_any(skb); |
| 724 | netif_wake_queue(dev); | ||
| 734 | return NETDEV_TX_OK; | 725 | return NETDEV_TX_OK; |
| 735 | } | 726 | } |
| 736 | 727 | ||
| @@ -1155,7 +1146,7 @@ static int qeth_osn_send_control_data(struct qeth_card *card, int len, | |||
| 1155 | (addr_t) iob, 0, 0); | 1146 | (addr_t) iob, 0, 0); |
| 1156 | spin_unlock_irqrestore(get_ccwdev_lock(card->write.ccwdev), flags); | 1147 | spin_unlock_irqrestore(get_ccwdev_lock(card->write.ccwdev), flags); |
| 1157 | if (rc) { | 1148 | if (rc) { |
| 1158 | PRINT_WARN("qeth_osn_send_control_data: " | 1149 | QETH_DBF_MESSAGE(2, "qeth_osn_send_control_data: " |
| 1159 | "ccw_device_start rc = %i\n", rc); | 1150 | "ccw_device_start rc = %i\n", rc); |
| 1160 | QETH_DBF_TEXT_(TRACE, 2, " err%d", rc); | 1151 | QETH_DBF_TEXT_(TRACE, 2, " err%d", rc); |
| 1161 | qeth_release_buffer(iob->channel, iob); | 1152 | qeth_release_buffer(iob->channel, iob); |
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 94a8ead64ed4..999552c83bbe 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c | |||
| @@ -311,7 +311,6 @@ static struct qeth_ipaddr *qeth_l3_get_addr_buffer( | |||
| 311 | 311 | ||
| 312 | addr = kzalloc(sizeof(struct qeth_ipaddr), GFP_ATOMIC); | 312 | addr = kzalloc(sizeof(struct qeth_ipaddr), GFP_ATOMIC); |
| 313 | if (addr == NULL) { | 313 | if (addr == NULL) { |
| 314 | PRINT_WARN("Not enough memory to add address\n"); | ||
| 315 | return NULL; | 314 | return NULL; |
| 316 | } | 315 | } |
| 317 | addr->type = QETH_IP_TYPE_NORMAL; | 316 | addr->type = QETH_IP_TYPE_NORMAL; |
| @@ -649,15 +648,6 @@ static void qeth_l3_correct_routing_type(struct qeth_card *card, | |||
| 649 | } | 648 | } |
| 650 | } | 649 | } |
| 651 | out_inval: | 650 | out_inval: |
| 652 | PRINT_WARN("Routing type '%s' not supported for interface %s.\n" | ||
| 653 | "Router status set to 'no router'.\n", | ||
| 654 | ((*type == PRIMARY_ROUTER)? "primary router" : | ||
| 655 | (*type == SECONDARY_ROUTER)? "secondary router" : | ||
| 656 | (*type == PRIMARY_CONNECTOR)? "primary connector" : | ||
| 657 | (*type == SECONDARY_CONNECTOR)? "secondary connector" : | ||
| 658 | (*type == MULTICAST_ROUTER)? "multicast router" : | ||
| 659 | "unknown"), | ||
| 660 | card->dev->name); | ||
| 661 | *type = NO_ROUTER; | 651 | *type = NO_ROUTER; |
| 662 | } | 652 | } |
| 663 | 653 | ||
| @@ -674,9 +664,9 @@ int qeth_l3_setrouting_v4(struct qeth_card *card) | |||
| 674 | QETH_PROT_IPV4); | 664 | QETH_PROT_IPV4); |
| 675 | if (rc) { | 665 | if (rc) { |
| 676 | card->options.route4.type = NO_ROUTER; | 666 | card->options.route4.type = NO_ROUTER; |
| 677 | PRINT_WARN("Error (0x%04x) while setting routing type on %s. " | 667 | QETH_DBF_MESSAGE(2, "Error (0x%04x) while setting routing type" |
| 678 | "Type set to 'no router'.\n", | 668 | " on %s. Type set to 'no router'.\n", rc, |
| 679 | rc, QETH_CARD_IFNAME(card)); | 669 | QETH_CARD_IFNAME(card)); |
| 680 | } | 670 | } |
| 681 | return rc; | 671 | return rc; |
| 682 | } | 672 | } |
| @@ -697,9 +687,9 @@ int qeth_l3_setrouting_v6(struct qeth_card *card) | |||
| 697 | QETH_PROT_IPV6); | 687 | QETH_PROT_IPV6); |
| 698 | if (rc) { | 688 | if (rc) { |
| 699 | card->options.route6.type = NO_ROUTER; | 689 | card->options.route6.type = NO_ROUTER; |
| 700 | PRINT_WARN("Error (0x%04x) while setting routing type on %s. " | 690 | QETH_DBF_MESSAGE(2, "Error (0x%04x) while setting routing type" |
| 701 | "Type set to 'no router'.\n", | 691 | " on %s. Type set to 'no router'.\n", rc, |
| 702 | rc, QETH_CARD_IFNAME(card)); | 692 | QETH_CARD_IFNAME(card)); |
| 703 | } | 693 | } |
| 704 | #endif | 694 | #endif |
| 705 | return rc; | 695 | return rc; |
| @@ -737,7 +727,6 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card, | |||
| 737 | if (!memcmp(ipatoe->addr, new->addr, | 727 | if (!memcmp(ipatoe->addr, new->addr, |
| 738 | (ipatoe->proto == QETH_PROT_IPV4)? 4:16) && | 728 | (ipatoe->proto == QETH_PROT_IPV4)? 4:16) && |
| 739 | (ipatoe->mask_bits == new->mask_bits)) { | 729 | (ipatoe->mask_bits == new->mask_bits)) { |
| 740 | PRINT_WARN("ipato entry already exists!\n"); | ||
| 741 | rc = -EEXIST; | 730 | rc = -EEXIST; |
| 742 | break; | 731 | break; |
| 743 | } | 732 | } |
| @@ -802,7 +791,6 @@ int qeth_l3_add_vipa(struct qeth_card *card, enum qeth_prot_versions proto, | |||
| 802 | rc = -EEXIST; | 791 | rc = -EEXIST; |
| 803 | spin_unlock_irqrestore(&card->ip_lock, flags); | 792 | spin_unlock_irqrestore(&card->ip_lock, flags); |
| 804 | if (rc) { | 793 | if (rc) { |
| 805 | PRINT_WARN("Cannot add VIPA. Address already exists!\n"); | ||
| 806 | return rc; | 794 | return rc; |
| 807 | } | 795 | } |
| 808 | if (!qeth_l3_add_ip(card, ipaddr)) | 796 | if (!qeth_l3_add_ip(card, ipaddr)) |
| @@ -867,7 +855,6 @@ int qeth_l3_add_rxip(struct qeth_card *card, enum qeth_prot_versions proto, | |||
| 867 | rc = -EEXIST; | 855 | rc = -EEXIST; |
| 868 | spin_unlock_irqrestore(&card->ip_lock, flags); | 856 | spin_unlock_irqrestore(&card->ip_lock, flags); |
| 869 | if (rc) { | 857 | if (rc) { |
| 870 | PRINT_WARN("Cannot add RXIP. Address already exists!\n"); | ||
| 871 | return rc; | 858 | return rc; |
| 872 | } | 859 | } |
| 873 | if (!qeth_l3_add_ip(card, ipaddr)) | 860 | if (!qeth_l3_add_ip(card, ipaddr)) |
| @@ -1020,23 +1007,23 @@ static int qeth_l3_setadapter_hstr(struct qeth_card *card) | |||
| 1020 | IPA_SETADP_SET_BROADCAST_MODE, | 1007 | IPA_SETADP_SET_BROADCAST_MODE, |
| 1021 | card->options.broadcast_mode); | 1008 | card->options.broadcast_mode); |
| 1022 | if (rc) | 1009 | if (rc) |
| 1023 | PRINT_WARN("couldn't set broadcast mode on " | 1010 | QETH_DBF_MESSAGE(2, "couldn't set broadcast mode on " |
| 1024 | "device %s: x%x\n", | 1011 | "device %s: x%x\n", |
| 1025 | CARD_BUS_ID(card), rc); | 1012 | CARD_BUS_ID(card), rc); |
| 1026 | rc = qeth_l3_send_setadp_mode(card, | 1013 | rc = qeth_l3_send_setadp_mode(card, |
| 1027 | IPA_SETADP_ALTER_MAC_ADDRESS, | 1014 | IPA_SETADP_ALTER_MAC_ADDRESS, |
| 1028 | card->options.macaddr_mode); | 1015 | card->options.macaddr_mode); |
| 1029 | if (rc) | 1016 | if (rc) |
| 1030 | PRINT_WARN("couldn't set macaddr mode on " | 1017 | QETH_DBF_MESSAGE(2, "couldn't set macaddr mode on " |
| 1031 | "device %s: x%x\n", CARD_BUS_ID(card), rc); | 1018 | "device %s: x%x\n", CARD_BUS_ID(card), rc); |
| 1032 | return rc; | 1019 | return rc; |
| 1033 | } | 1020 | } |
| 1034 | if (card->options.broadcast_mode == QETH_TR_BROADCAST_LOCAL) | 1021 | if (card->options.broadcast_mode == QETH_TR_BROADCAST_LOCAL) |
| 1035 | PRINT_WARN("set adapter parameters not available " | 1022 | QETH_DBF_MESSAGE(2, "set adapter parameters not available " |
| 1036 | "to set broadcast mode, using ALLRINGS " | 1023 | "to set broadcast mode, using ALLRINGS " |
| 1037 | "on device %s:\n", CARD_BUS_ID(card)); | 1024 | "on device %s:\n", CARD_BUS_ID(card)); |
| 1038 | if (card->options.macaddr_mode == QETH_TR_MACADDR_CANONICAL) | 1025 | if (card->options.macaddr_mode == QETH_TR_MACADDR_CANONICAL) |
| 1039 | PRINT_WARN("set adapter parameters not available " | 1026 | QETH_DBF_MESSAGE(2, "set adapter parameters not available " |
| 1040 | "to set macaddr mode, using NONCANONICAL " | 1027 | "to set macaddr mode, using NONCANONICAL " |
| 1041 | "on device %s:\n", CARD_BUS_ID(card)); | 1028 | "on device %s:\n", CARD_BUS_ID(card)); |
| 1042 | return 0; | 1029 | return 0; |
| @@ -2070,7 +2057,7 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev) | |||
| 2070 | card = netdev_priv(dev); | 2057 | card = netdev_priv(dev); |
| 2071 | else if (rc == QETH_VLAN_CARD) | 2058 | else if (rc == QETH_VLAN_CARD) |
| 2072 | card = netdev_priv(vlan_dev_info(dev)->real_dev); | 2059 | card = netdev_priv(vlan_dev_info(dev)->real_dev); |
| 2073 | if (card->options.layer2) | 2060 | if (card && card->options.layer2) |
| 2074 | card = NULL; | 2061 | card = NULL; |
| 2075 | QETH_DBF_TEXT_(TRACE, 4, "%d", rc); | 2062 | QETH_DBF_TEXT_(TRACE, 4, "%d", rc); |
| 2076 | return card ; | 2063 | return card ; |
| @@ -2182,8 +2169,6 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries) | |||
| 2182 | if (card->info.guestlan) | 2169 | if (card->info.guestlan) |
| 2183 | return -EOPNOTSUPP; | 2170 | return -EOPNOTSUPP; |
| 2184 | if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { | 2171 | if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { |
| 2185 | PRINT_WARN("ARP processing not supported " | ||
| 2186 | "on %s!\n", QETH_CARD_IFNAME(card)); | ||
| 2187 | return -EOPNOTSUPP; | 2172 | return -EOPNOTSUPP; |
| 2188 | } | 2173 | } |
| 2189 | rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING, | 2174 | rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING, |
| @@ -2191,8 +2176,8 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries) | |||
| 2191 | no_entries); | 2176 | no_entries); |
| 2192 | if (rc) { | 2177 | if (rc) { |
| 2193 | tmp = rc; | 2178 | tmp = rc; |
| 2194 | PRINT_WARN("Could not set number of ARP entries on %s: " | 2179 | QETH_DBF_MESSAGE(2, "Could not set number of ARP entries on " |
| 2195 | "%s (0x%x/%d)\n", QETH_CARD_IFNAME(card), | 2180 | "%s: %s (0x%x/%d)\n", QETH_CARD_IFNAME(card), |
| 2196 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); | 2181 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); |
| 2197 | } | 2182 | } |
| 2198 | return rc; | 2183 | return rc; |
| @@ -2260,9 +2245,6 @@ static int qeth_l3_arp_query_cb(struct qeth_card *card, | |||
| 2260 | qdata->no_entries * uentry_size){ | 2245 | qdata->no_entries * uentry_size){ |
| 2261 | QETH_DBF_TEXT_(TRACE, 4, "qaer3%i", -ENOMEM); | 2246 | QETH_DBF_TEXT_(TRACE, 4, "qaer3%i", -ENOMEM); |
| 2262 | cmd->hdr.return_code = -ENOMEM; | 2247 | cmd->hdr.return_code = -ENOMEM; |
| 2263 | PRINT_WARN("query ARP user space buffer is too small for " | ||
| 2264 | "the returned number of ARP entries. " | ||
| 2265 | "Aborting query!\n"); | ||
| 2266 | goto out_error; | 2248 | goto out_error; |
| 2267 | } | 2249 | } |
| 2268 | QETH_DBF_TEXT_(TRACE, 4, "anore%i", | 2250 | QETH_DBF_TEXT_(TRACE, 4, "anore%i", |
| @@ -2324,8 +2306,6 @@ static int qeth_l3_arp_query(struct qeth_card *card, char __user *udata) | |||
| 2324 | 2306 | ||
| 2325 | if (!qeth_is_supported(card,/*IPA_QUERY_ARP_ADDR_INFO*/ | 2307 | if (!qeth_is_supported(card,/*IPA_QUERY_ARP_ADDR_INFO*/ |
| 2326 | IPA_ARP_PROCESSING)) { | 2308 | IPA_ARP_PROCESSING)) { |
| 2327 | PRINT_WARN("ARP processing not supported " | ||
| 2328 | "on %s!\n", QETH_CARD_IFNAME(card)); | ||
| 2329 | return -EOPNOTSUPP; | 2309 | return -EOPNOTSUPP; |
| 2330 | } | 2310 | } |
| 2331 | /* get size of userspace buffer and mask_bits -> 6 bytes */ | 2311 | /* get size of userspace buffer and mask_bits -> 6 bytes */ |
| @@ -2344,7 +2324,7 @@ static int qeth_l3_arp_query(struct qeth_card *card, char __user *udata) | |||
| 2344 | qeth_l3_arp_query_cb, (void *)&qinfo); | 2324 | qeth_l3_arp_query_cb, (void *)&qinfo); |
| 2345 | if (rc) { | 2325 | if (rc) { |
| 2346 | tmp = rc; | 2326 | tmp = rc; |
| 2347 | PRINT_WARN("Error while querying ARP cache on %s: %s " | 2327 | QETH_DBF_MESSAGE(2, "Error while querying ARP cache on %s: %s " |
| 2348 | "(0x%x/%d)\n", QETH_CARD_IFNAME(card), | 2328 | "(0x%x/%d)\n", QETH_CARD_IFNAME(card), |
| 2349 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); | 2329 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); |
| 2350 | if (copy_to_user(udata, qinfo.udata, 4)) | 2330 | if (copy_to_user(udata, qinfo.udata, 4)) |
| @@ -2375,8 +2355,6 @@ static int qeth_l3_arp_add_entry(struct qeth_card *card, | |||
| 2375 | if (card->info.guestlan) | 2355 | if (card->info.guestlan) |
| 2376 | return -EOPNOTSUPP; | 2356 | return -EOPNOTSUPP; |
| 2377 | if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { | 2357 | if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { |
| 2378 | PRINT_WARN("ARP processing not supported " | ||
| 2379 | "on %s!\n", QETH_CARD_IFNAME(card)); | ||
| 2380 | return -EOPNOTSUPP; | 2358 | return -EOPNOTSUPP; |
| 2381 | } | 2359 | } |
| 2382 | 2360 | ||
| @@ -2391,10 +2369,9 @@ static int qeth_l3_arp_add_entry(struct qeth_card *card, | |||
| 2391 | if (rc) { | 2369 | if (rc) { |
| 2392 | tmp = rc; | 2370 | tmp = rc; |
| 2393 | qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf); | 2371 | qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf); |
| 2394 | PRINT_WARN("Could not add ARP entry for address %s on %s: " | 2372 | QETH_DBF_MESSAGE(2, "Could not add ARP entry for address %s " |
| 2395 | "%s (0x%x/%d)\n", | 2373 | "on %s: %s (0x%x/%d)\n", buf, QETH_CARD_IFNAME(card), |
| 2396 | buf, QETH_CARD_IFNAME(card), | 2374 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); |
| 2397 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); | ||
| 2398 | } | 2375 | } |
| 2399 | return rc; | 2376 | return rc; |
| 2400 | } | 2377 | } |
| @@ -2417,8 +2394,6 @@ static int qeth_l3_arp_remove_entry(struct qeth_card *card, | |||
| 2417 | if (card->info.guestlan) | 2394 | if (card->info.guestlan) |
| 2418 | return -EOPNOTSUPP; | 2395 | return -EOPNOTSUPP; |
| 2419 | if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { | 2396 | if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { |
| 2420 | PRINT_WARN("ARP processing not supported " | ||
| 2421 | "on %s!\n", QETH_CARD_IFNAME(card)); | ||
| 2422 | return -EOPNOTSUPP; | 2397 | return -EOPNOTSUPP; |
| 2423 | } | 2398 | } |
| 2424 | memcpy(buf, entry, 12); | 2399 | memcpy(buf, entry, 12); |
| @@ -2433,10 +2408,9 @@ static int qeth_l3_arp_remove_entry(struct qeth_card *card, | |||
| 2433 | tmp = rc; | 2408 | tmp = rc; |
| 2434 | memset(buf, 0, 16); | 2409 | memset(buf, 0, 16); |
| 2435 | qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf); | 2410 | qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf); |
| 2436 | PRINT_WARN("Could not delete ARP entry for address %s on %s: " | 2411 | QETH_DBF_MESSAGE(2, "Could not delete ARP entry for address %s" |
| 2437 | "%s (0x%x/%d)\n", | 2412 | " on %s: %s (0x%x/%d)\n", buf, QETH_CARD_IFNAME(card), |
| 2438 | buf, QETH_CARD_IFNAME(card), | 2413 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); |
| 2439 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); | ||
| 2440 | } | 2414 | } |
| 2441 | return rc; | 2415 | return rc; |
| 2442 | } | 2416 | } |
| @@ -2456,16 +2430,14 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card) | |||
| 2456 | if (card->info.guestlan || (card->info.type == QETH_CARD_TYPE_IQD)) | 2430 | if (card->info.guestlan || (card->info.type == QETH_CARD_TYPE_IQD)) |
| 2457 | return -EOPNOTSUPP; | 2431 | return -EOPNOTSUPP; |
| 2458 | if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { | 2432 | if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { |
| 2459 | PRINT_WARN("ARP processing not supported " | ||
| 2460 | "on %s!\n", QETH_CARD_IFNAME(card)); | ||
| 2461 | return -EOPNOTSUPP; | 2433 | return -EOPNOTSUPP; |
| 2462 | } | 2434 | } |
| 2463 | rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING, | 2435 | rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING, |
| 2464 | IPA_CMD_ASS_ARP_FLUSH_CACHE, 0); | 2436 | IPA_CMD_ASS_ARP_FLUSH_CACHE, 0); |
| 2465 | if (rc) { | 2437 | if (rc) { |
| 2466 | tmp = rc; | 2438 | tmp = rc; |
| 2467 | PRINT_WARN("Could not flush ARP cache on %s: %s (0x%x/%d)\n", | 2439 | QETH_DBF_MESSAGE(2, "Could not flush ARP cache on %s: %s " |
| 2468 | QETH_CARD_IFNAME(card), | 2440 | "(0x%x/%d)\n", QETH_CARD_IFNAME(card), |
| 2469 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); | 2441 | qeth_l3_arp_get_error_cause(&rc), tmp, tmp); |
| 2470 | } | 2442 | } |
| 2471 | return rc; | 2443 | return rc; |
| @@ -2724,7 +2696,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 2724 | ctx = qeth_eddp_create_context(card, new_skb, hdr, | 2696 | ctx = qeth_eddp_create_context(card, new_skb, hdr, |
| 2725 | skb->sk->sk_protocol); | 2697 | skb->sk->sk_protocol); |
| 2726 | if (ctx == NULL) { | 2698 | if (ctx == NULL) { |
| 2727 | PRINT_WARN("could not create eddp context\n"); | 2699 | QETH_DBF_MESSAGE(2, "could not create eddp context\n"); |
| 2728 | goto tx_drop; | 2700 | goto tx_drop; |
| 2729 | } | 2701 | } |
| 2730 | } else { | 2702 | } else { |
| @@ -2792,6 +2764,7 @@ tx_drop: | |||
| 2792 | if ((new_skb != skb) && new_skb) | 2764 | if ((new_skb != skb) && new_skb) |
| 2793 | dev_kfree_skb_any(new_skb); | 2765 | dev_kfree_skb_any(new_skb); |
| 2794 | dev_kfree_skb_any(skb); | 2766 | dev_kfree_skb_any(skb); |
| 2767 | netif_wake_queue(dev); | ||
| 2795 | return NETDEV_TX_OK; | 2768 | return NETDEV_TX_OK; |
| 2796 | } | 2769 | } |
| 2797 | 2770 | ||
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c index 08f51fd902c4..ac1993708ae9 100644 --- a/drivers/s390/net/qeth_l3_sys.c +++ b/drivers/s390/net/qeth_l3_sys.c | |||
| @@ -85,7 +85,6 @@ static ssize_t qeth_l3_dev_route_store(struct qeth_card *card, | |||
| 85 | } else if (!strcmp(tmp, "multicast_router")) { | 85 | } else if (!strcmp(tmp, "multicast_router")) { |
| 86 | route->type = MULTICAST_ROUTER; | 86 | route->type = MULTICAST_ROUTER; |
| 87 | } else { | 87 | } else { |
| 88 | PRINT_WARN("Invalid routing type '%s'.\n", tmp); | ||
| 89 | return -EINVAL; | 88 | return -EINVAL; |
| 90 | } | 89 | } |
| 91 | if (((card->state == CARD_STATE_SOFTSETUP) || | 90 | if (((card->state == CARD_STATE_SOFTSETUP) || |
| @@ -137,9 +136,6 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev, | |||
| 137 | return -EINVAL; | 136 | return -EINVAL; |
| 138 | 137 | ||
| 139 | if (!qeth_is_supported(card, IPA_IPV6)) { | 138 | if (!qeth_is_supported(card, IPA_IPV6)) { |
| 140 | PRINT_WARN("IPv6 not supported for interface %s.\n" | ||
| 141 | "Routing status no changed.\n", | ||
| 142 | QETH_CARD_IFNAME(card)); | ||
| 143 | return -ENOTSUPP; | 139 | return -ENOTSUPP; |
| 144 | } | 140 | } |
| 145 | 141 | ||
| @@ -179,7 +175,6 @@ static ssize_t qeth_l3_dev_fake_broadcast_store(struct device *dev, | |||
| 179 | if ((i == 0) || (i == 1)) | 175 | if ((i == 0) || (i == 1)) |
| 180 | card->options.fake_broadcast = i; | 176 | card->options.fake_broadcast = i; |
| 181 | else { | 177 | else { |
| 182 | PRINT_WARN("fake_broadcast: write 0 or 1 to this file!\n"); | ||
| 183 | return -EINVAL; | 178 | return -EINVAL; |
| 184 | } | 179 | } |
| 185 | return count; | 180 | return count; |
| @@ -220,7 +215,6 @@ static ssize_t qeth_l3_dev_broadcast_mode_store(struct device *dev, | |||
| 220 | 215 | ||
| 221 | if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) || | 216 | if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) || |
| 222 | (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) { | 217 | (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) { |
| 223 | PRINT_WARN("Device is not a tokenring device!\n"); | ||
| 224 | return -EINVAL; | 218 | return -EINVAL; |
| 225 | } | 219 | } |
| 226 | 220 | ||
| @@ -233,8 +227,6 @@ static ssize_t qeth_l3_dev_broadcast_mode_store(struct device *dev, | |||
| 233 | card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS; | 227 | card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS; |
| 234 | return count; | 228 | return count; |
| 235 | } else { | 229 | } else { |
| 236 | PRINT_WARN("broadcast_mode: invalid mode %s!\n", | ||
| 237 | tmp); | ||
| 238 | return -EINVAL; | 230 | return -EINVAL; |
| 239 | } | 231 | } |
| 240 | return count; | 232 | return count; |
| @@ -275,7 +267,6 @@ static ssize_t qeth_l3_dev_canonical_macaddr_store(struct device *dev, | |||
| 275 | 267 | ||
| 276 | if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) || | 268 | if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) || |
| 277 | (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) { | 269 | (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) { |
| 278 | PRINT_WARN("Device is not a tokenring device!\n"); | ||
| 279 | return -EINVAL; | 270 | return -EINVAL; |
| 280 | } | 271 | } |
| 281 | 272 | ||
| @@ -285,7 +276,6 @@ static ssize_t qeth_l3_dev_canonical_macaddr_store(struct device *dev, | |||
| 285 | QETH_TR_MACADDR_CANONICAL : | 276 | QETH_TR_MACADDR_CANONICAL : |
| 286 | QETH_TR_MACADDR_NONCANONICAL; | 277 | QETH_TR_MACADDR_NONCANONICAL; |
| 287 | else { | 278 | else { |
| 288 | PRINT_WARN("canonical_macaddr: write 0 or 1 to this file!\n"); | ||
| 289 | return -EINVAL; | 279 | return -EINVAL; |
| 290 | } | 280 | } |
| 291 | return count; | 281 | return count; |
| @@ -327,7 +317,6 @@ static ssize_t qeth_l3_dev_checksum_store(struct device *dev, | |||
| 327 | else if (!strcmp(tmp, "no_checksumming")) | 317 | else if (!strcmp(tmp, "no_checksumming")) |
| 328 | card->options.checksum_type = NO_CHECKSUMMING; | 318 | card->options.checksum_type = NO_CHECKSUMMING; |
| 329 | else { | 319 | else { |
| 330 | PRINT_WARN("Unknown checksumming type '%s'\n", tmp); | ||
| 331 | return -EINVAL; | 320 | return -EINVAL; |
| 332 | } | 321 | } |
| 333 | return count; | 322 | return count; |
| @@ -382,8 +371,6 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev, | |||
| 382 | } else if (!strcmp(tmp, "0")) { | 371 | } else if (!strcmp(tmp, "0")) { |
| 383 | card->ipato.enabled = 0; | 372 | card->ipato.enabled = 0; |
| 384 | } else { | 373 | } else { |
| 385 | PRINT_WARN("ipato_enable: write 0, 1 or 'toggle' to " | ||
| 386 | "this file\n"); | ||
| 387 | return -EINVAL; | 374 | return -EINVAL; |
| 388 | } | 375 | } |
| 389 | return count; | 376 | return count; |
| @@ -422,8 +409,6 @@ static ssize_t qeth_l3_dev_ipato_invert4_store(struct device *dev, | |||
| 422 | } else if (!strcmp(tmp, "0")) { | 409 | } else if (!strcmp(tmp, "0")) { |
| 423 | card->ipato.invert4 = 0; | 410 | card->ipato.invert4 = 0; |
| 424 | } else { | 411 | } else { |
| 425 | PRINT_WARN("ipato_invert4: write 0, 1 or 'toggle' to " | ||
| 426 | "this file\n"); | ||
| 427 | return -EINVAL; | 412 | return -EINVAL; |
| 428 | } | 413 | } |
| 429 | return count; | 414 | return count; |
| @@ -486,13 +471,10 @@ static int qeth_l3_parse_ipatoe(const char *buf, enum qeth_prot_versions proto, | |||
| 486 | /* get address string */ | 471 | /* get address string */ |
| 487 | end = strchr(start, '/'); | 472 | end = strchr(start, '/'); |
| 488 | if (!end || (end - start >= 40)) { | 473 | if (!end || (end - start >= 40)) { |
| 489 | PRINT_WARN("Invalid format for ipato_addx/delx. " | ||
| 490 | "Use <ip addr>/<mask bits>\n"); | ||
| 491 | return -EINVAL; | 474 | return -EINVAL; |
| 492 | } | 475 | } |
| 493 | strncpy(buffer, start, end - start); | 476 | strncpy(buffer, start, end - start); |
| 494 | if (qeth_l3_string_to_ipaddr(buffer, proto, addr)) { | 477 | if (qeth_l3_string_to_ipaddr(buffer, proto, addr)) { |
| 495 | PRINT_WARN("Invalid IP address format!\n"); | ||
| 496 | return -EINVAL; | 478 | return -EINVAL; |
| 497 | } | 479 | } |
| 498 | start = end + 1; | 480 | start = end + 1; |
| @@ -500,7 +482,6 @@ static int qeth_l3_parse_ipatoe(const char *buf, enum qeth_prot_versions proto, | |||
| 500 | if (!strlen(start) || | 482 | if (!strlen(start) || |
| 501 | (tmp == start) || | 483 | (tmp == start) || |
| 502 | (*mask_bits > ((proto == QETH_PROT_IPV4) ? 32 : 128))) { | 484 | (*mask_bits > ((proto == QETH_PROT_IPV4) ? 32 : 128))) { |
| 503 | PRINT_WARN("Invalid mask bits for ipato_addx/delx !\n"); | ||
| 504 | return -EINVAL; | 485 | return -EINVAL; |
| 505 | } | 486 | } |
| 506 | return 0; | 487 | return 0; |
| @@ -520,7 +501,6 @@ static ssize_t qeth_l3_dev_ipato_add_store(const char *buf, size_t count, | |||
| 520 | 501 | ||
| 521 | ipatoe = kzalloc(sizeof(struct qeth_ipato_entry), GFP_KERNEL); | 502 | ipatoe = kzalloc(sizeof(struct qeth_ipato_entry), GFP_KERNEL); |
| 522 | if (!ipatoe) { | 503 | if (!ipatoe) { |
| 523 | PRINT_WARN("No memory to allocate ipato entry\n"); | ||
| 524 | return -ENOMEM; | 504 | return -ENOMEM; |
| 525 | } | 505 | } |
| 526 | ipatoe->proto = proto; | 506 | ipatoe->proto = proto; |
| @@ -609,8 +589,6 @@ static ssize_t qeth_l3_dev_ipato_invert6_store(struct device *dev, | |||
| 609 | } else if (!strcmp(tmp, "0")) { | 589 | } else if (!strcmp(tmp, "0")) { |
| 610 | card->ipato.invert6 = 0; | 590 | card->ipato.invert6 = 0; |
| 611 | } else { | 591 | } else { |
| 612 | PRINT_WARN("ipato_invert6: write 0, 1 or 'toggle' to " | ||
| 613 | "this file\n"); | ||
| 614 | return -EINVAL; | 592 | return -EINVAL; |
| 615 | } | 593 | } |
| 616 | return count; | 594 | return count; |
| @@ -724,7 +702,6 @@ static int qeth_l3_parse_vipae(const char *buf, enum qeth_prot_versions proto, | |||
| 724 | u8 *addr) | 702 | u8 *addr) |
| 725 | { | 703 | { |
| 726 | if (qeth_l3_string_to_ipaddr(buf, proto, addr)) { | 704 | if (qeth_l3_string_to_ipaddr(buf, proto, addr)) { |
| 727 | PRINT_WARN("Invalid IP address format!\n"); | ||
| 728 | return -EINVAL; | 705 | return -EINVAL; |
| 729 | } | 706 | } |
| 730 | return 0; | 707 | return 0; |
| @@ -891,7 +868,6 @@ static int qeth_l3_parse_rxipe(const char *buf, enum qeth_prot_versions proto, | |||
| 891 | u8 *addr) | 868 | u8 *addr) |
| 892 | { | 869 | { |
| 893 | if (qeth_l3_string_to_ipaddr(buf, proto, addr)) { | 870 | if (qeth_l3_string_to_ipaddr(buf, proto, addr)) { |
| 894 | PRINT_WARN("Invalid IP address format!\n"); | ||
| 895 | return -EINVAL; | 871 | return -EINVAL; |
| 896 | } | 872 | } |
| 897 | return 0; | 873 | return 0; |
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c index 5080f343ad74..5bfbe7659830 100644 --- a/drivers/s390/s390mach.c +++ b/drivers/s390/s390mach.c | |||
| @@ -207,6 +207,7 @@ s390_handle_mcck(void) | |||
| 207 | do_exit(SIGSEGV); | 207 | do_exit(SIGSEGV); |
| 208 | } | 208 | } |
| 209 | } | 209 | } |
| 210 | EXPORT_SYMBOL_GPL(s390_handle_mcck); | ||
| 210 | 211 | ||
| 211 | /* | 212 | /* |
| 212 | * returns 0 if all registers could be validated | 213 | * returns 0 if all registers could be validated |
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 8eb4da332f56..94789be54ca3 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
| @@ -644,6 +644,48 @@ static void hub_stop(struct usb_hub *hub) | |||
| 644 | 644 | ||
| 645 | #ifdef CONFIG_PM | 645 | #ifdef CONFIG_PM |
| 646 | 646 | ||
| 647 | /* Try to identify which devices need USB-PERSIST handling */ | ||
| 648 | static int persistent_device(struct usb_device *udev) | ||
| 649 | { | ||
| 650 | int i; | ||
| 651 | int retval; | ||
| 652 | struct usb_host_config *actconfig; | ||
| 653 | |||
| 654 | /* Explicitly not marked persistent? */ | ||
| 655 | if (!udev->persist_enabled) | ||
| 656 | return 0; | ||
| 657 | |||
| 658 | /* No active config? */ | ||
| 659 | actconfig = udev->actconfig; | ||
| 660 | if (!actconfig) | ||
| 661 | return 0; | ||
| 662 | |||
| 663 | /* FIXME! We should check whether it's open here or not! */ | ||
| 664 | |||
| 665 | /* | ||
| 666 | * Check that all the interface drivers have a | ||
| 667 | * 'reset_resume' entrypoint | ||
| 668 | */ | ||
| 669 | retval = 0; | ||
| 670 | for (i = 0; i < actconfig->desc.bNumInterfaces; i++) { | ||
| 671 | struct usb_interface *intf; | ||
| 672 | struct usb_driver *driver; | ||
| 673 | |||
| 674 | intf = actconfig->interface[i]; | ||
| 675 | if (!intf->dev.driver) | ||
| 676 | continue; | ||
| 677 | driver = to_usb_driver(intf->dev.driver); | ||
| 678 | if (!driver->reset_resume) | ||
| 679 | return 0; | ||
| 680 | /* | ||
| 681 | * We have at least one driver, and that one | ||
| 682 | * has a reset_resume method. | ||
| 683 | */ | ||
| 684 | retval = 1; | ||
| 685 | } | ||
| 686 | return retval; | ||
| 687 | } | ||
| 688 | |||
| 647 | static void hub_restart(struct usb_hub *hub, int type) | 689 | static void hub_restart(struct usb_hub *hub, int type) |
| 648 | { | 690 | { |
| 649 | struct usb_device *hdev = hub->hdev; | 691 | struct usb_device *hdev = hub->hdev; |
| @@ -689,8 +731,8 @@ static void hub_restart(struct usb_hub *hub, int type) | |||
| 689 | * turn off the various status changes to prevent | 731 | * turn off the various status changes to prevent |
| 690 | * khubd from disconnecting it later. | 732 | * khubd from disconnecting it later. |
| 691 | */ | 733 | */ |
| 692 | if (udev->persist_enabled && status == 0 && | 734 | if (status == 0 && !(portstatus & USB_PORT_STAT_ENABLE) && |
| 693 | !(portstatus & USB_PORT_STAT_ENABLE)) { | 735 | persistent_device(udev)) { |
| 694 | if (portchange & USB_PORT_STAT_C_ENABLE) | 736 | if (portchange & USB_PORT_STAT_C_ENABLE) |
| 695 | clear_port_feature(hub->hdev, port1, | 737 | clear_port_feature(hub->hdev, port1, |
| 696 | USB_PORT_FEAT_C_ENABLE); | 738 | USB_PORT_FEAT_C_ENABLE); |
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c index c9cec8738261..65aa5ecf569a 100644 --- a/drivers/usb/host/isp1760-hcd.c +++ b/drivers/usb/host/isp1760-hcd.c | |||
| @@ -2207,14 +2207,14 @@ struct usb_hcd *isp1760_register(u64 res_start, u64 res_len, int irq, | |||
| 2207 | goto err_put; | 2207 | goto err_put; |
| 2208 | } | 2208 | } |
| 2209 | 2209 | ||
| 2210 | ret = usb_add_hcd(hcd, irq, irqflags); | ||
| 2211 | if (ret) | ||
| 2212 | goto err_unmap; | ||
| 2213 | |||
| 2214 | hcd->irq = irq; | 2210 | hcd->irq = irq; |
| 2215 | hcd->rsrc_start = res_start; | 2211 | hcd->rsrc_start = res_start; |
| 2216 | hcd->rsrc_len = res_len; | 2212 | hcd->rsrc_len = res_len; |
| 2217 | 2213 | ||
| 2214 | ret = usb_add_hcd(hcd, irq, irqflags); | ||
| 2215 | if (ret) | ||
| 2216 | goto err_unmap; | ||
| 2217 | |||
| 2218 | return hcd; | 2218 | return hcd; |
| 2219 | 2219 | ||
| 2220 | err_unmap: | 2220 | err_unmap: |
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index eb6c06979f3b..001789c9a11a 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
| @@ -272,6 +272,7 @@ config USB_TEST | |||
| 272 | config USB_ISIGHTFW | 272 | config USB_ISIGHTFW |
| 273 | tristate "iSight firmware loading support" | 273 | tristate "iSight firmware loading support" |
| 274 | depends on USB | 274 | depends on USB |
| 275 | select FW_LOADER | ||
| 275 | help | 276 | help |
| 276 | This driver loads firmware for USB Apple iSight cameras, allowing | 277 | This driver loads firmware for USB Apple iSight cameras, allowing |
| 277 | them to be driven by the USB video class driver available at | 278 | them to be driven by the USB video class driver available at |
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index 390e04885536..9f30aa1f8a5d 100644 --- a/drivers/usb/misc/isight_firmware.c +++ b/drivers/usb/misc/isight_firmware.c | |||
| @@ -39,9 +39,12 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
| 39 | struct usb_device *dev = interface_to_usbdev(intf); | 39 | struct usb_device *dev = interface_to_usbdev(intf); |
| 40 | int llen, len, req, ret = 0; | 40 | int llen, len, req, ret = 0; |
| 41 | const struct firmware *firmware; | 41 | const struct firmware *firmware; |
| 42 | unsigned char *buf; | 42 | unsigned char *buf = kmalloc(50, GFP_KERNEL); |
| 43 | unsigned char data[4]; | 43 | unsigned char data[4]; |
| 44 | char *ptr; | 44 | u8 *ptr; |
| 45 | |||
| 46 | if (!buf) | ||
| 47 | return -ENOMEM; | ||
| 45 | 48 | ||
| 46 | if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) { | 49 | if (request_firmware(&firmware, "isight.fw", &dev->dev) != 0) { |
| 47 | printk(KERN_ERR "Unable to load isight firmware\n"); | 50 | printk(KERN_ERR "Unable to load isight firmware\n"); |
| @@ -59,7 +62,7 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
| 59 | goto out; | 62 | goto out; |
| 60 | } | 63 | } |
| 61 | 64 | ||
| 62 | while (1) { | 65 | while (ptr+4 <= firmware->data+firmware->size) { |
| 63 | memcpy(data, ptr, 4); | 66 | memcpy(data, ptr, 4); |
| 64 | len = (data[0] << 8 | data[1]); | 67 | len = (data[0] << 8 | data[1]); |
| 65 | req = (data[2] << 8 | data[3]); | 68 | req = (data[2] << 8 | data[3]); |
| @@ -71,10 +74,14 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
| 71 | continue; | 74 | continue; |
| 72 | 75 | ||
| 73 | for (; len > 0; req += 50) { | 76 | for (; len > 0; req += 50) { |
| 74 | llen = len > 50 ? 50 : len; | 77 | llen = min(len, 50); |
| 75 | len -= llen; | 78 | len -= llen; |
| 76 | 79 | if (ptr+llen > firmware->data+firmware->size) { | |
| 77 | buf = kmalloc(llen, GFP_KERNEL); | 80 | printk(KERN_ERR |
| 81 | "Malformed isight firmware"); | ||
| 82 | ret = -ENODEV; | ||
| 83 | goto out; | ||
| 84 | } | ||
| 78 | memcpy(buf, ptr, llen); | 85 | memcpy(buf, ptr, llen); |
| 79 | 86 | ||
| 80 | ptr += llen; | 87 | ptr += llen; |
| @@ -89,16 +96,18 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
| 89 | goto out; | 96 | goto out; |
| 90 | } | 97 | } |
| 91 | 98 | ||
| 92 | kfree(buf); | ||
| 93 | } | 99 | } |
| 94 | } | 100 | } |
| 101 | |||
| 95 | if (usb_control_msg | 102 | if (usb_control_msg |
| 96 | (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, "\0", 1, | 103 | (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, "\0", 1, |
| 97 | 300) != 1) { | 104 | 300) != 1) { |
| 98 | printk(KERN_ERR "isight firmware loading completion failed\n"); | 105 | printk(KERN_ERR "isight firmware loading completion failed\n"); |
| 99 | ret = -ENODEV; | 106 | ret = -ENODEV; |
| 100 | } | 107 | } |
| 108 | |||
| 101 | out: | 109 | out: |
| 110 | kfree(buf); | ||
| 102 | release_firmware(firmware); | 111 | release_firmware(firmware); |
| 103 | return ret; | 112 | return ret; |
| 104 | } | 113 | } |
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index 35ac9d956b3d..c14b2435d23e 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
| @@ -2432,9 +2432,9 @@ static int cirrusfb_pci_register(struct pci_dev *pdev, | |||
| 2432 | info->screen_size = board_size; | 2432 | info->screen_size = board_size; |
| 2433 | cinfo->unmap = cirrusfb_pci_unmap; | 2433 | cinfo->unmap = cirrusfb_pci_unmap; |
| 2434 | 2434 | ||
| 2435 | printk(KERN_INFO " RAM (%lu kB) at 0xx%lx, ", | 2435 | printk(KERN_INFO "RAM (%lu kB) at 0x%lx, Cirrus " |
| 2436 | info->screen_size >> 10, board_addr); | 2436 | "Logic chipset on PCI bus\n", |
| 2437 | printk(KERN_INFO "Cirrus Logic chipset on PCI bus\n"); | 2437 | info->screen_size >> 10, board_addr); |
| 2438 | pci_set_drvdata(pdev, info); | 2438 | pci_set_drvdata(pdev, info); |
| 2439 | 2439 | ||
| 2440 | ret = cirrusfb_register(info); | 2440 | ret = cirrusfb_register(info); |
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c index b50bb03cb5ab..0a2785361ca3 100644 --- a/drivers/video/fsl-diu-fb.c +++ b/drivers/video/fsl-diu-fb.c | |||
| @@ -1320,7 +1320,7 @@ static void free_irq_local(int irq) | |||
| 1320 | * Power management hooks. Note that we won't be called from IRQ context, | 1320 | * Power management hooks. Note that we won't be called from IRQ context, |
| 1321 | * unlike the blank functions above, so we may sleep. | 1321 | * unlike the blank functions above, so we may sleep. |
| 1322 | */ | 1322 | */ |
| 1323 | static int fsl_diu_suspend(struct of_device *dev, pm_message_t state) | 1323 | static int fsl_diu_suspend(struct of_device *ofdev, pm_message_t state) |
| 1324 | { | 1324 | { |
| 1325 | struct fsl_diu_data *machine_data; | 1325 | struct fsl_diu_data *machine_data; |
| 1326 | 1326 | ||
| @@ -1330,7 +1330,7 @@ static int fsl_diu_suspend(struct of_device *dev, pm_message_t state) | |||
| 1330 | return 0; | 1330 | return 0; |
| 1331 | } | 1331 | } |
| 1332 | 1332 | ||
| 1333 | static int fsl_diu_resume(struct of_device *dev) | 1333 | static int fsl_diu_resume(struct of_device *ofdev) |
| 1334 | { | 1334 | { |
| 1335 | struct fsl_diu_data *machine_data; | 1335 | struct fsl_diu_data *machine_data; |
| 1336 | 1336 | ||
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c index fb9e67228543..c18880d9db1f 100644 --- a/drivers/video/hgafb.c +++ b/drivers/video/hgafb.c | |||
| @@ -279,7 +279,7 @@ static void hga_blank(int blank_mode) | |||
| 279 | 279 | ||
| 280 | static int __init hga_card_detect(void) | 280 | static int __init hga_card_detect(void) |
| 281 | { | 281 | { |
| 282 | int count=0; | 282 | int count = 0; |
| 283 | void __iomem *p, *q; | 283 | void __iomem *p, *q; |
| 284 | unsigned short p_save, q_save; | 284 | unsigned short p_save, q_save; |
| 285 | 285 | ||
| @@ -303,20 +303,18 @@ static int __init hga_card_detect(void) | |||
| 303 | writew(0x55aa, p); if (readw(p) == 0x55aa) count++; | 303 | writew(0x55aa, p); if (readw(p) == 0x55aa) count++; |
| 304 | writew(p_save, p); | 304 | writew(p_save, p); |
| 305 | 305 | ||
| 306 | if (count != 2) { | 306 | if (count != 2) |
| 307 | return 0; | 307 | goto error; |
| 308 | } | ||
| 309 | 308 | ||
| 310 | /* Ok, there is definitely a card registering at the correct | 309 | /* Ok, there is definitely a card registering at the correct |
| 311 | * memory location, so now we do an I/O port test. | 310 | * memory location, so now we do an I/O port test. |
| 312 | */ | 311 | */ |
| 313 | 312 | ||
| 314 | if (!test_hga_b(0x66, 0x0f)) { /* cursor low register */ | 313 | if (!test_hga_b(0x66, 0x0f)) /* cursor low register */ |
| 315 | return 0; | 314 | goto error; |
| 316 | } | 315 | |
| 317 | if (!test_hga_b(0x99, 0x0f)) { /* cursor low register */ | 316 | if (!test_hga_b(0x99, 0x0f)) /* cursor low register */ |
| 318 | return 0; | 317 | goto error; |
| 319 | } | ||
| 320 | 318 | ||
| 321 | /* See if the card is a Hercules, by checking whether the vsync | 319 | /* See if the card is a Hercules, by checking whether the vsync |
| 322 | * bit of the status register is changing. This test lasts for | 320 | * bit of the status register is changing. This test lasts for |
| @@ -331,7 +329,7 @@ static int __init hga_card_detect(void) | |||
| 331 | } | 329 | } |
| 332 | 330 | ||
| 333 | if (p_save == q_save) | 331 | if (p_save == q_save) |
| 334 | return 0; | 332 | goto error; |
| 335 | 333 | ||
| 336 | switch (inb_p(HGA_STATUS_PORT) & 0x70) { | 334 | switch (inb_p(HGA_STATUS_PORT) & 0x70) { |
| 337 | case 0x10: | 335 | case 0x10: |
| @@ -348,6 +346,12 @@ static int __init hga_card_detect(void) | |||
| 348 | break; | 346 | break; |
| 349 | } | 347 | } |
| 350 | return 1; | 348 | return 1; |
| 349 | error: | ||
| 350 | if (release_io_ports) | ||
| 351 | release_region(0x3b0, 12); | ||
| 352 | if (release_io_port) | ||
| 353 | release_region(0x3bf, 1); | ||
| 354 | return 0; | ||
| 351 | } | 355 | } |
| 352 | 356 | ||
| 353 | /** | 357 | /** |
diff --git a/drivers/video/leo.c b/drivers/video/leo.c index 8bc46e930340..13fea61d6ae4 100644 --- a/drivers/video/leo.c +++ b/drivers/video/leo.c | |||
| @@ -17,8 +17,8 @@ | |||
| 17 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | #include <linux/of_device.h> | 19 | #include <linux/of_device.h> |
| 20 | #include <linux/io.h> | ||
| 20 | 21 | ||
| 21 | #include <asm/io.h> | ||
| 22 | #include <asm/fbio.h> | 22 | #include <asm/fbio.h> |
| 23 | 23 | ||
| 24 | #include "sbuslib.h" | 24 | #include "sbuslib.h" |
| @@ -33,7 +33,6 @@ static int leo_blank(int, struct fb_info *); | |||
| 33 | 33 | ||
| 34 | static int leo_mmap(struct fb_info *, struct vm_area_struct *); | 34 | static int leo_mmap(struct fb_info *, struct vm_area_struct *); |
| 35 | static int leo_ioctl(struct fb_info *, unsigned int, unsigned long); | 35 | static int leo_ioctl(struct fb_info *, unsigned int, unsigned long); |
| 36 | static int leo_pan_display(struct fb_var_screeninfo *, struct fb_info *); | ||
| 37 | 36 | ||
| 38 | /* | 37 | /* |
| 39 | * Frame buffer operations | 38 | * Frame buffer operations |
| @@ -43,7 +42,6 @@ static struct fb_ops leo_ops = { | |||
| 43 | .owner = THIS_MODULE, | 42 | .owner = THIS_MODULE, |
| 44 | .fb_setcolreg = leo_setcolreg, | 43 | .fb_setcolreg = leo_setcolreg, |
| 45 | .fb_blank = leo_blank, | 44 | .fb_blank = leo_blank, |
| 46 | .fb_pan_display = leo_pan_display, | ||
| 47 | .fb_fillrect = cfb_fillrect, | 45 | .fb_fillrect = cfb_fillrect, |
| 48 | .fb_copyarea = cfb_copyarea, | 46 | .fb_copyarea = cfb_copyarea, |
| 49 | .fb_imageblit = cfb_imageblit, | 47 | .fb_imageblit = cfb_imageblit, |
| @@ -78,7 +76,7 @@ static struct fb_ops leo_ops = { | |||
| 78 | #define LEO_CUR_TYPE_CMAP 0x00000050 | 76 | #define LEO_CUR_TYPE_CMAP 0x00000050 |
| 79 | 77 | ||
| 80 | struct leo_cursor { | 78 | struct leo_cursor { |
| 81 | u8 xxx0[16]; | 79 | u8 xxx0[16]; |
| 82 | u32 cur_type; | 80 | u32 cur_type; |
| 83 | u32 cur_misc; | 81 | u32 cur_misc; |
| 84 | u32 cur_cursxy; | 82 | u32 cur_cursxy; |
| @@ -105,7 +103,7 @@ struct leo_lx_krn { | |||
| 105 | 103 | ||
| 106 | struct leo_lc_ss0_krn { | 104 | struct leo_lc_ss0_krn { |
| 107 | u32 misc; | 105 | u32 misc; |
| 108 | u8 xxx0[0x800-4]; | 106 | u8 xxx0[0x800-4]; |
| 109 | u32 rev; | 107 | u32 rev; |
| 110 | }; | 108 | }; |
| 111 | 109 | ||
| @@ -116,7 +114,7 @@ struct leo_lc_ss0_usr { | |||
| 116 | u32 fontt; | 114 | u32 fontt; |
| 117 | u32 extent; | 115 | u32 extent; |
| 118 | u32 src; | 116 | u32 src; |
| 119 | u32 dst; | 117 | u32 dst; |
| 120 | u32 copy; | 118 | u32 copy; |
| 121 | u32 fill; | 119 | u32 fill; |
| 122 | }; | 120 | }; |
| @@ -129,8 +127,8 @@ struct leo_lc_ss1_usr { | |||
| 129 | u8 unknown; | 127 | u8 unknown; |
| 130 | }; | 128 | }; |
| 131 | 129 | ||
| 132 | struct leo_ld { | 130 | struct leo_ld_ss0 { |
| 133 | u8 xxx0[0xe00]; | 131 | u8 xxx0[0xe00]; |
| 134 | u32 csr; | 132 | u32 csr; |
| 135 | u32 wid; | 133 | u32 wid; |
| 136 | u32 wmask; | 134 | u32 wmask; |
| @@ -144,13 +142,13 @@ struct leo_ld { | |||
| 144 | u32 src; /* Copy/Scroll (SS0 only) */ | 142 | u32 src; /* Copy/Scroll (SS0 only) */ |
| 145 | u32 dst; /* Copy/Scroll/Fill (SS0 only) */ | 143 | u32 dst; /* Copy/Scroll/Fill (SS0 only) */ |
| 146 | u32 extent; /* Copy/Scroll/Fill size (SS0 only) */ | 144 | u32 extent; /* Copy/Scroll/Fill size (SS0 only) */ |
| 147 | u32 xxx1[3]; | 145 | u32 xxx1[3]; |
| 148 | u32 setsem; /* SS1 only */ | 146 | u32 setsem; /* SS1 only */ |
| 149 | u32 clrsem; /* SS1 only */ | 147 | u32 clrsem; /* SS1 only */ |
| 150 | u32 clrpick; /* SS1 only */ | 148 | u32 clrpick; /* SS1 only */ |
| 151 | u32 clrdat; /* SS1 only */ | 149 | u32 clrdat; /* SS1 only */ |
| 152 | u32 alpha; /* SS1 only */ | 150 | u32 alpha; /* SS1 only */ |
| 153 | u8 xxx2[0x2c]; | 151 | u8 xxx2[0x2c]; |
| 154 | u32 winbg; | 152 | u32 winbg; |
| 155 | u32 planemask; | 153 | u32 planemask; |
| 156 | u32 rop; | 154 | u32 rop; |
| @@ -199,11 +197,12 @@ struct leo_par { | |||
| 199 | static void leo_wait(struct leo_lx_krn __iomem *lx_krn) | 197 | static void leo_wait(struct leo_lx_krn __iomem *lx_krn) |
| 200 | { | 198 | { |
| 201 | int i; | 199 | int i; |
| 202 | 200 | ||
| 203 | for (i = 0; | 201 | for (i = 0; |
| 204 | (sbus_readl(&lx_krn->krn_csr) & LEO_KRN_CSR_PROGRESS) && i < 300000; | 202 | (sbus_readl(&lx_krn->krn_csr) & LEO_KRN_CSR_PROGRESS) && |
| 203 | i < 300000; | ||
| 205 | i++) | 204 | i++) |
| 206 | udelay (1); /* Busy wait at most 0.3 sec */ | 205 | udelay(1); /* Busy wait at most 0.3 sec */ |
| 207 | return; | 206 | return; |
| 208 | } | 207 | } |
| 209 | 208 | ||
| @@ -221,7 +220,7 @@ static int leo_setcolreg(unsigned regno, | |||
| 221 | unsigned transp, struct fb_info *info) | 220 | unsigned transp, struct fb_info *info) |
| 222 | { | 221 | { |
| 223 | struct leo_par *par = (struct leo_par *) info->par; | 222 | struct leo_par *par = (struct leo_par *) info->par; |
| 224 | struct leo_lx_krn __iomem *lx_krn = par->lx_krn; | 223 | struct leo_lx_krn __iomem *lx_krn = par->lx_krn; |
| 225 | unsigned long flags; | 224 | unsigned long flags; |
| 226 | u32 val; | 225 | u32 val; |
| 227 | int i; | 226 | int i; |
| @@ -408,7 +407,7 @@ static void leo_wid_put(struct fb_info *info, struct fb_wid_list *wl) | |||
| 408 | leo_wait(lx_krn); | 407 | leo_wait(lx_krn); |
| 409 | 408 | ||
| 410 | for (i = 0, wi = wl->wl_list; i < wl->wl_count; i++, wi++) { | 409 | for (i = 0, wi = wl->wl_list; i < wl->wl_count; i++, wi++) { |
| 411 | switch(wi->wi_type) { | 410 | switch (wi->wi_type) { |
| 412 | case FB_WID_DBL_8: | 411 | case FB_WID_DBL_8: |
| 413 | j = (wi->wi_index & 0xf) + 0x40; | 412 | j = (wi->wi_index & 0xf) + 0x40; |
| 414 | break; | 413 | break; |
| @@ -453,13 +452,12 @@ static void leo_init_wids(struct fb_info *info) | |||
| 453 | wi.wi_index = 1; | 452 | wi.wi_index = 1; |
| 454 | wi.wi_values [0] = 0x30; | 453 | wi.wi_values [0] = 0x30; |
| 455 | leo_wid_put(info, &wl); | 454 | leo_wid_put(info, &wl); |
| 456 | |||
| 457 | } | 455 | } |
| 458 | 456 | ||
| 459 | static void leo_switch_from_graph(struct fb_info *info) | 457 | static void leo_switch_from_graph(struct fb_info *info) |
| 460 | { | 458 | { |
| 461 | struct leo_par *par = (struct leo_par *) info->par; | 459 | struct leo_par *par = (struct leo_par *) info->par; |
| 462 | struct leo_ld __iomem *ss = (struct leo_ld __iomem *) par->ld_ss0; | 460 | struct leo_ld_ss0 __iomem *ss = par->ld_ss0; |
| 463 | unsigned long flags; | 461 | unsigned long flags; |
| 464 | u32 val; | 462 | u32 val; |
| 465 | 463 | ||
| @@ -485,19 +483,13 @@ static void leo_switch_from_graph(struct fb_info *info) | |||
| 485 | val = sbus_readl(&par->lc_ss0_usr->csr); | 483 | val = sbus_readl(&par->lc_ss0_usr->csr); |
| 486 | } while (val & 0x20000000); | 484 | } while (val & 0x20000000); |
| 487 | 485 | ||
| 488 | spin_unlock_irqrestore(&par->lock, flags); | 486 | /* setup screen buffer for cfb_* functions */ |
| 489 | } | 487 | sbus_writel(1, &ss->wid); |
| 490 | 488 | sbus_writel(0x00ffffff, &ss->planemask); | |
| 491 | static int leo_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) | 489 | sbus_writel(0x310b90, &ss->rop); |
| 492 | { | 490 | sbus_writel(0, &par->lc_ss0_usr->addrspace); |
| 493 | /* We just use this to catch switches out of | ||
| 494 | * graphics mode. | ||
| 495 | */ | ||
| 496 | leo_switch_from_graph(info); | ||
| 497 | 491 | ||
| 498 | if (var->xoffset || var->yoffset || var->vmode) | 492 | spin_unlock_irqrestore(&par->lock, flags); |
| 499 | return -EINVAL; | ||
| 500 | return 0; | ||
| 501 | } | 493 | } |
| 502 | 494 | ||
| 503 | static void leo_init_hw(struct fb_info *info) | 495 | static void leo_init_hw(struct fb_info *info) |
| @@ -542,7 +534,8 @@ static void leo_unmap_regs(struct of_device *op, struct fb_info *info, | |||
| 542 | of_iounmap(&op->resource[0], info->screen_base, 0x800000); | 534 | of_iounmap(&op->resource[0], info->screen_base, 0x800000); |
| 543 | } | 535 | } |
| 544 | 536 | ||
| 545 | static int __devinit leo_probe(struct of_device *op, const struct of_device_id *match) | 537 | static int __devinit leo_probe(struct of_device *op, |
| 538 | const struct of_device_id *match) | ||
| 546 | { | 539 | { |
| 547 | struct device_node *dp = op->node; | 540 | struct device_node *dp = op->node; |
| 548 | struct fb_info *info; | 541 | struct fb_info *info; |
| @@ -594,8 +587,9 @@ static int __devinit leo_probe(struct of_device *op, const struct of_device_id * | |||
| 594 | !info->screen_base) | 587 | !info->screen_base) |
| 595 | goto out_unmap_regs; | 588 | goto out_unmap_regs; |
| 596 | 589 | ||
| 597 | info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; | 590 | info->flags = FBINFO_DEFAULT; |
| 598 | info->fbops = &leo_ops; | 591 | info->fbops = &leo_ops; |
| 592 | info->pseudo_palette = par->clut_data; | ||
| 599 | 593 | ||
| 600 | leo_init_wids(info); | 594 | leo_init_wids(info); |
| 601 | leo_init_hw(info); | 595 | leo_init_hw(info); |
| @@ -649,7 +643,7 @@ static int __devexit leo_remove(struct of_device *op) | |||
| 649 | 643 | ||
| 650 | static struct of_device_id leo_match[] = { | 644 | static struct of_device_id leo_match[] = { |
| 651 | { | 645 | { |
| 652 | .name = "leo", | 646 | .name = "SUNW,leo", |
| 653 | }, | 647 | }, |
| 654 | {}, | 648 | {}, |
| 655 | }; | 649 | }; |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 274bc93ab7d8..7dcda187d9ba 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -573,8 +573,8 @@ static int setup_frame_dma(struct pxafb_info *fbi, int dma, int pal, | |||
| 573 | dma_desc->fdadr = fbi->dma_buff_phys + dma_desc_off; | 573 | dma_desc->fdadr = fbi->dma_buff_phys + dma_desc_off; |
| 574 | fbi->fdadr[dma] = fbi->dma_buff_phys + dma_desc_off; | 574 | fbi->fdadr[dma] = fbi->dma_buff_phys + dma_desc_off; |
| 575 | } else { | 575 | } else { |
| 576 | pal_desc = &fbi->dma_buff->pal_desc[dma]; | 576 | pal_desc = &fbi->dma_buff->pal_desc[pal]; |
| 577 | pal_desc_off = offsetof(struct pxafb_dma_buff, dma_desc[pal]); | 577 | pal_desc_off = offsetof(struct pxafb_dma_buff, pal_desc[pal]); |
| 578 | 578 | ||
| 579 | pal_desc->fsadr = fbi->dma_buff_phys + pal * PALETTE_SIZE; | 579 | pal_desc->fsadr = fbi->dma_buff_phys + pal * PALETTE_SIZE; |
| 580 | pal_desc->fidr = 0; | 580 | pal_desc->fidr = 0; |
| @@ -1276,6 +1276,8 @@ static int __init pxafb_map_video_memory(struct pxafb_info *fbi) | |||
| 1276 | fbi->dma_buff_phys = fbi->map_dma; | 1276 | fbi->dma_buff_phys = fbi->map_dma; |
| 1277 | fbi->palette_cpu = (u16 *) fbi->dma_buff->palette; | 1277 | fbi->palette_cpu = (u16 *) fbi->dma_buff->palette; |
| 1278 | 1278 | ||
| 1279 | pr_debug("pxafb: palette_mem_size = 0x%08lx\n", fbi->palette_size*sizeof(u16)); | ||
| 1280 | |||
| 1279 | #ifdef CONFIG_FB_PXA_SMARTPANEL | 1281 | #ifdef CONFIG_FB_PXA_SMARTPANEL |
| 1280 | fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff; | 1282 | fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff; |
| 1281 | fbi->n_smart_cmds = 0; | 1283 | fbi->n_smart_cmds = 0; |
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 0f3c2bb7bf35..7084e7e146c0 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c | |||
| @@ -124,9 +124,9 @@ static int virtio_dev_probe(struct device *_d) | |||
| 124 | if (err) | 124 | if (err) |
| 125 | add_status(dev, VIRTIO_CONFIG_S_FAILED); | 125 | add_status(dev, VIRTIO_CONFIG_S_FAILED); |
| 126 | else { | 126 | else { |
| 127 | add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK); | ||
| 128 | /* They should never have set feature bits beyond 32 */ | 127 | /* They should never have set feature bits beyond 32 */ |
| 129 | dev->config->set_features(dev, dev->features[0]); | 128 | dev->config->set_features(dev, dev->features[0]); |
| 129 | add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK); | ||
| 130 | } | 130 | } |
| 131 | return err; | 131 | return err; |
| 132 | } | 132 | } |
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 0fa95b198e6e..d48ff5f370f4 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/time.h> | 16 | #include <linux/time.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/mman.h> | 18 | #include <linux/mman.h> |
| 19 | #include <linux/a.out.h> | ||
| 20 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 21 | #include <linux/signal.h> | 20 | #include <linux/signal.h> |
| 22 | #include <linux/binfmts.h> | 21 | #include <linux/binfmts.h> |
| @@ -548,7 +547,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 548 | struct { | 547 | struct { |
| 549 | struct elfhdr elf_ex; | 548 | struct elfhdr elf_ex; |
| 550 | struct elfhdr interp_elf_ex; | 549 | struct elfhdr interp_elf_ex; |
| 551 | struct exec interp_ex; | ||
| 552 | } *loc; | 550 | } *loc; |
| 553 | 551 | ||
| 554 | loc = kmalloc(sizeof(*loc), GFP_KERNEL); | 552 | loc = kmalloc(sizeof(*loc), GFP_KERNEL); |
| @@ -680,7 +678,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 680 | } | 678 | } |
| 681 | 679 | ||
| 682 | /* Get the exec headers */ | 680 | /* Get the exec headers */ |
| 683 | loc->interp_ex = *((struct exec *)bprm->buf); | ||
| 684 | loc->interp_elf_ex = *((struct elfhdr *)bprm->buf); | 681 | loc->interp_elf_ex = *((struct elfhdr *)bprm->buf); |
| 685 | break; | 682 | break; |
| 686 | } | 683 | } |
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index 28e3d5c5fcac..1f3465201fdf 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES | |||
| @@ -2,6 +2,11 @@ Version 1.53 | |||
| 2 | ------------ | 2 | ------------ |
| 3 | DFS support added (Microsoft Distributed File System client support needed | 3 | DFS support added (Microsoft Distributed File System client support needed |
| 4 | for referrals which enable a hierarchical name space among servers). | 4 | for referrals which enable a hierarchical name space among servers). |
| 5 | Disable temporary caching of mode bits to servers which do not support | ||
| 6 | storing of mode (e.g. Windows servers, when client mounts without cifsacl | ||
| 7 | mount option) and add new "dynperm" mount option to enable temporary caching | ||
| 8 | of mode (enable old behavior). Fix hang on mount caused when server crashes | ||
| 9 | tcp session during negotiate protocol. | ||
| 5 | 10 | ||
| 6 | Version 1.52 | 11 | Version 1.52 |
| 7 | ------------ | 12 | ------------ |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 5df93fd6303f..86b4d5f405ae 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -97,9 +97,6 @@ cifs_read_super(struct super_block *sb, void *data, | |||
| 97 | { | 97 | { |
| 98 | struct inode *inode; | 98 | struct inode *inode; |
| 99 | struct cifs_sb_info *cifs_sb; | 99 | struct cifs_sb_info *cifs_sb; |
| 100 | #ifdef CONFIG_CIFS_DFS_UPCALL | ||
| 101 | int len; | ||
| 102 | #endif | ||
| 103 | int rc = 0; | 100 | int rc = 0; |
| 104 | 101 | ||
| 105 | /* BB should we make this contingent on mount parm? */ | 102 | /* BB should we make this contingent on mount parm? */ |
| @@ -117,15 +114,17 @@ cifs_read_super(struct super_block *sb, void *data, | |||
| 117 | * complex operation (mount), and in case of fail | 114 | * complex operation (mount), and in case of fail |
| 118 | * just exit instead of doing mount and attempting | 115 | * just exit instead of doing mount and attempting |
| 119 | * undo it if this copy fails?*/ | 116 | * undo it if this copy fails?*/ |
| 120 | len = strlen(data); | 117 | if (data) { |
| 121 | cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL); | 118 | int len = strlen(data); |
| 122 | if (cifs_sb->mountdata == NULL) { | 119 | cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL); |
| 123 | kfree(sb->s_fs_info); | 120 | if (cifs_sb->mountdata == NULL) { |
| 124 | sb->s_fs_info = NULL; | 121 | kfree(sb->s_fs_info); |
| 125 | return -ENOMEM; | 122 | sb->s_fs_info = NULL; |
| 123 | return -ENOMEM; | ||
| 124 | } | ||
| 125 | strncpy(cifs_sb->mountdata, data, len + 1); | ||
| 126 | cifs_sb->mountdata[len] = '\0'; | ||
| 126 | } | 127 | } |
| 127 | strncpy(cifs_sb->mountdata, data, len + 1); | ||
| 128 | cifs_sb->mountdata[len] = '\0'; | ||
| 129 | #endif | 128 | #endif |
| 130 | 129 | ||
| 131 | rc = cifs_mount(sb, cifs_sb, data, devname); | 130 | rc = cifs_mount(sb, cifs_sb, data, devname); |
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 08914053242b..9cfcf326ead3 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
| @@ -333,7 +333,6 @@ struct cifsFileInfo { | |||
| 333 | bool messageMode:1; /* for pipes: message vs byte mode */ | 333 | bool messageMode:1; /* for pipes: message vs byte mode */ |
| 334 | atomic_t wrtPending; /* handle in use - defer close */ | 334 | atomic_t wrtPending; /* handle in use - defer close */ |
| 335 | struct semaphore fh_sem; /* prevents reopen race after dead ses*/ | 335 | struct semaphore fh_sem; /* prevents reopen race after dead ses*/ |
| 336 | char *search_resume_name; /* BB removeme BB */ | ||
| 337 | struct cifs_search_info srch_inf; | 336 | struct cifs_search_info srch_inf; |
| 338 | }; | 337 | }; |
| 339 | 338 | ||
| @@ -626,7 +625,7 @@ GLOBAL_EXTERN atomic_t tcpSesAllocCount; | |||
| 626 | GLOBAL_EXTERN atomic_t tcpSesReconnectCount; | 625 | GLOBAL_EXTERN atomic_t tcpSesReconnectCount; |
| 627 | GLOBAL_EXTERN atomic_t tconInfoReconnectCount; | 626 | GLOBAL_EXTERN atomic_t tconInfoReconnectCount; |
| 628 | 627 | ||
| 629 | /* Various Debug counters to remove someday (BB) */ | 628 | /* Various Debug counters */ |
| 630 | GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */ | 629 | GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */ |
| 631 | #ifdef CONFIG_CIFS_STATS2 | 630 | #ifdef CONFIG_CIFS_STATS2 |
| 632 | GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */ | 631 | GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */ |
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index 65d58b4e6a61..0f327c224da3 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h | |||
| @@ -79,6 +79,19 @@ | |||
| 79 | #define TRANS2_GET_DFS_REFERRAL 0x10 | 79 | #define TRANS2_GET_DFS_REFERRAL 0x10 |
| 80 | #define TRANS2_REPORT_DFS_INCOSISTENCY 0x11 | 80 | #define TRANS2_REPORT_DFS_INCOSISTENCY 0x11 |
| 81 | 81 | ||
| 82 | /* SMB Transact (Named Pipe) subcommand codes */ | ||
| 83 | #define TRANS_SET_NMPIPE_STATE 0x0001 | ||
| 84 | #define TRANS_RAW_READ_NMPIPE 0x0011 | ||
| 85 | #define TRANS_QUERY_NMPIPE_STATE 0x0021 | ||
| 86 | #define TRANS_QUERY_NMPIPE_INFO 0x0022 | ||
| 87 | #define TRANS_PEEK_NMPIPE 0x0023 | ||
| 88 | #define TRANS_TRANSACT_NMPIPE 0x0026 | ||
| 89 | #define TRANS_RAW_WRITE_NMPIPE 0x0031 | ||
| 90 | #define TRANS_READ_NMPIPE 0x0036 | ||
| 91 | #define TRANS_WRITE_NMPIPE 0x0037 | ||
| 92 | #define TRANS_WAIT_NMPIPE 0x0053 | ||
| 93 | #define TRANS_CALL_NMPIPE 0x0054 | ||
| 94 | |||
| 82 | /* NT Transact subcommand codes */ | 95 | /* NT Transact subcommand codes */ |
| 83 | #define NT_TRANSACT_CREATE 0x01 | 96 | #define NT_TRANSACT_CREATE 0x01 |
| 84 | #define NT_TRANSACT_IOCTL 0x02 | 97 | #define NT_TRANSACT_IOCTL 0x02 |
| @@ -328,12 +341,13 @@ | |||
| 328 | #define CREATE_COMPLETE_IF_OPLK 0x00000100 /* should be zero */ | 341 | #define CREATE_COMPLETE_IF_OPLK 0x00000100 /* should be zero */ |
| 329 | #define CREATE_NO_EA_KNOWLEDGE 0x00000200 | 342 | #define CREATE_NO_EA_KNOWLEDGE 0x00000200 |
| 330 | #define CREATE_EIGHT_DOT_THREE 0x00000400 /* doc says this is obsolete | 343 | #define CREATE_EIGHT_DOT_THREE 0x00000400 /* doc says this is obsolete |
| 331 | open for recovery flag - should | 344 | "open for recovery" flag - should |
| 332 | be zero */ | 345 | be zero in any case */ |
| 346 | #define CREATE_OPEN_FOR_RECOVERY 0x00000400 | ||
| 333 | #define CREATE_RANDOM_ACCESS 0x00000800 | 347 | #define CREATE_RANDOM_ACCESS 0x00000800 |
| 334 | #define CREATE_DELETE_ON_CLOSE 0x00001000 | 348 | #define CREATE_DELETE_ON_CLOSE 0x00001000 |
| 335 | #define CREATE_OPEN_BY_ID 0x00002000 | 349 | #define CREATE_OPEN_BY_ID 0x00002000 |
| 336 | #define CREATE_OPEN_BACKUP_INTN 0x00004000 | 350 | #define CREATE_OPEN_BACKUP_INTENT 0x00004000 |
| 337 | #define CREATE_NO_COMPRESSION 0x00008000 | 351 | #define CREATE_NO_COMPRESSION 0x00008000 |
| 338 | #define CREATE_RESERVE_OPFILTER 0x00100000 /* should be zero */ | 352 | #define CREATE_RESERVE_OPFILTER 0x00100000 /* should be zero */ |
| 339 | #define OPEN_REPARSE_POINT 0x00200000 | 353 | #define OPEN_REPARSE_POINT 0x00200000 |
| @@ -722,7 +736,6 @@ typedef struct smb_com_tconx_rsp_ext { | |||
| 722 | #define SMB_CSC_CACHE_AUTO_REINT 0x0004 | 736 | #define SMB_CSC_CACHE_AUTO_REINT 0x0004 |
| 723 | #define SMB_CSC_CACHE_VDO 0x0008 | 737 | #define SMB_CSC_CACHE_VDO 0x0008 |
| 724 | #define SMB_CSC_NO_CACHING 0x000C | 738 | #define SMB_CSC_NO_CACHING 0x000C |
| 725 | |||
| 726 | #define SMB_UNIQUE_FILE_NAME 0x0010 | 739 | #define SMB_UNIQUE_FILE_NAME 0x0010 |
| 727 | #define SMB_EXTENDED_SIGNATURES 0x0020 | 740 | #define SMB_EXTENDED_SIGNATURES 0x0020 |
| 728 | 741 | ||
| @@ -806,7 +819,7 @@ typedef struct smb_com_findclose_req { | |||
| 806 | #define ICOUNT_MASK 0x00FF | 819 | #define ICOUNT_MASK 0x00FF |
| 807 | #define PIPE_READ_MODE 0x0100 | 820 | #define PIPE_READ_MODE 0x0100 |
| 808 | #define NAMED_PIPE_TYPE 0x0400 | 821 | #define NAMED_PIPE_TYPE 0x0400 |
| 809 | #define PIPE_END_POINT 0x0800 | 822 | #define PIPE_END_POINT 0x4000 |
| 810 | #define BLOCKING_NAMED_PIPE 0x8000 | 823 | #define BLOCKING_NAMED_PIPE 0x8000 |
| 811 | 824 | ||
| 812 | typedef struct smb_com_open_req { /* also handles create */ | 825 | typedef struct smb_com_open_req { /* also handles create */ |
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index fb655b4593c6..4511b708f0f3 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
| @@ -1728,7 +1728,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, | |||
| 1728 | { | 1728 | { |
| 1729 | int rc = 0; | 1729 | int rc = 0; |
| 1730 | LOCK_REQ *pSMB = NULL; | 1730 | LOCK_REQ *pSMB = NULL; |
| 1731 | LOCK_RSP *pSMBr = NULL; | 1731 | /* LOCK_RSP *pSMBr = NULL; */ /* No response data other than rc to parse */ |
| 1732 | int bytes_returned; | 1732 | int bytes_returned; |
| 1733 | int timeout = 0; | 1733 | int timeout = 0; |
| 1734 | __u16 count; | 1734 | __u16 count; |
| @@ -1739,8 +1739,6 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, | |||
| 1739 | if (rc) | 1739 | if (rc) |
| 1740 | return rc; | 1740 | return rc; |
| 1741 | 1741 | ||
| 1742 | pSMBr = (LOCK_RSP *)pSMB; /* BB removeme BB */ | ||
| 1743 | |||
| 1744 | if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) { | 1742 | if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) { |
| 1745 | timeout = CIFS_ASYNC_OP; /* no response expected */ | 1743 | timeout = CIFS_ASYNC_OP; /* no response expected */ |
| 1746 | pSMB->Timeout = 0; | 1744 | pSMB->Timeout = 0; |
| @@ -1774,7 +1772,7 @@ CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, | |||
| 1774 | 1772 | ||
| 1775 | if (waitFlag) { | 1773 | if (waitFlag) { |
| 1776 | rc = SendReceiveBlockingLock(xid, tcon, (struct smb_hdr *) pSMB, | 1774 | rc = SendReceiveBlockingLock(xid, tcon, (struct smb_hdr *) pSMB, |
| 1777 | (struct smb_hdr *) pSMBr, &bytes_returned); | 1775 | (struct smb_hdr *) pSMB, &bytes_returned); |
| 1778 | cifs_small_buf_release(pSMB); | 1776 | cifs_small_buf_release(pSMB); |
| 1779 | } else { | 1777 | } else { |
| 1780 | rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *)pSMB, | 1778 | rc = SendReceiveNoRsp(xid, tcon->ses, (struct smb_hdr *)pSMB, |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 023434f72c15..e8fa46c7cff2 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -653,6 +653,7 @@ multi_t2_fnd: | |||
| 653 | spin_lock(&GlobalMid_Lock); | 653 | spin_lock(&GlobalMid_Lock); |
| 654 | server->tcpStatus = CifsExiting; | 654 | server->tcpStatus = CifsExiting; |
| 655 | spin_unlock(&GlobalMid_Lock); | 655 | spin_unlock(&GlobalMid_Lock); |
| 656 | wake_up_all(&server->response_q); | ||
| 656 | 657 | ||
| 657 | /* don't exit until kthread_stop is called */ | 658 | /* don't exit until kthread_stop is called */ |
| 658 | set_current_state(TASK_UNINTERRUPTIBLE); | 659 | set_current_state(TASK_UNINTERRUPTIBLE); |
| @@ -2120,6 +2121,10 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
| 2120 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; | 2121 | cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO; |
| 2121 | } | 2122 | } |
| 2122 | 2123 | ||
| 2124 | if ((volume_info.cifs_acl) && (volume_info.dynperm)) | ||
| 2125 | cERROR(1, ("mount option dynperm ignored if cifsacl " | ||
| 2126 | "mount option supported")); | ||
| 2127 | |||
| 2123 | tcon = | 2128 | tcon = |
| 2124 | find_unc(sin_server.sin_addr.s_addr, volume_info.UNC, | 2129 | find_unc(sin_server.sin_addr.s_addr, volume_info.UNC, |
| 2125 | volume_info.username); | 2130 | volume_info.username); |
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index f0b5b5f3dd2e..fb69c1fa85c9 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
| @@ -260,7 +260,9 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, | |||
| 260 | buf, inode->i_sb, xid, | 260 | buf, inode->i_sb, xid, |
| 261 | &fileHandle); | 261 | &fileHandle); |
| 262 | if (newinode) { | 262 | if (newinode) { |
| 263 | newinode->i_mode = mode; | 263 | if (cifs_sb->mnt_cifs_flags & |
| 264 | CIFS_MOUNT_DYNPERM) | ||
| 265 | newinode->i_mode = mode; | ||
| 264 | if ((oplock & CIFS_CREATE_ACTION) && | 266 | if ((oplock & CIFS_CREATE_ACTION) && |
| 265 | (cifs_sb->mnt_cifs_flags & | 267 | (cifs_sb->mnt_cifs_flags & |
| 266 | CIFS_MOUNT_SET_UID)) { | 268 | CIFS_MOUNT_SET_UID)) { |
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 8636cec2642c..0aac824371a5 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
| @@ -546,7 +546,6 @@ int cifs_close(struct inode *inode, struct file *file) | |||
| 546 | msleep(timeout); | 546 | msleep(timeout); |
| 547 | timeout *= 8; | 547 | timeout *= 8; |
| 548 | } | 548 | } |
| 549 | kfree(pSMBFile->search_resume_name); | ||
| 550 | kfree(file->private_data); | 549 | kfree(file->private_data); |
| 551 | file->private_data = NULL; | 550 | file->private_data = NULL; |
| 552 | } else | 551 | } else |
| @@ -605,12 +604,6 @@ int cifs_closedir(struct inode *inode, struct file *file) | |||
| 605 | else | 604 | else |
| 606 | cifs_buf_release(ptmp); | 605 | cifs_buf_release(ptmp); |
| 607 | } | 606 | } |
| 608 | ptmp = pCFileStruct->search_resume_name; | ||
| 609 | if (ptmp) { | ||
| 610 | cFYI(1, ("closedir free resume name")); | ||
| 611 | pCFileStruct->search_resume_name = NULL; | ||
| 612 | kfree(ptmp); | ||
| 613 | } | ||
| 614 | kfree(file->private_data); | 607 | kfree(file->private_data); |
| 615 | file->private_data = NULL; | 608 | file->private_data = NULL; |
| 616 | } | 609 | } |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 129dbfe4dca7..722be543ceec 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -418,6 +418,7 @@ int cifs_get_inode_info(struct inode **pinode, | |||
| 418 | char *buf = NULL; | 418 | char *buf = NULL; |
| 419 | bool adjustTZ = false; | 419 | bool adjustTZ = false; |
| 420 | bool is_dfs_referral = false; | 420 | bool is_dfs_referral = false; |
| 421 | umode_t default_mode; | ||
| 421 | 422 | ||
| 422 | pTcon = cifs_sb->tcon; | 423 | pTcon = cifs_sb->tcon; |
| 423 | cFYI(1, ("Getting info on %s", full_path)); | 424 | cFYI(1, ("Getting info on %s", full_path)); |
| @@ -530,47 +531,42 @@ int cifs_get_inode_info(struct inode **pinode, | |||
| 530 | inode->i_mtime.tv_sec += pTcon->ses->server->timeAdj; | 531 | inode->i_mtime.tv_sec += pTcon->ses->server->timeAdj; |
| 531 | } | 532 | } |
| 532 | 533 | ||
| 533 | /* set default mode. will override for dirs below */ | 534 | /* get default inode mode */ |
| 534 | if (atomic_read(&cifsInfo->inUse) == 0) | 535 | if (attr & ATTR_DIRECTORY) |
| 535 | /* new inode, can safely set these fields */ | 536 | default_mode = cifs_sb->mnt_dir_mode; |
| 536 | inode->i_mode = cifs_sb->mnt_file_mode; | 537 | else |
| 537 | else /* since we set the inode type below we need to mask off | 538 | default_mode = cifs_sb->mnt_file_mode; |
| 538 | to avoid strange results if type changes and both | 539 | |
| 539 | get orred in */ | 540 | /* set permission bits */ |
| 540 | inode->i_mode &= ~S_IFMT; | 541 | if (atomic_read(&cifsInfo->inUse) == 0 || |
| 541 | /* if (attr & ATTR_REPARSE) */ | 542 | (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) == 0) |
| 542 | /* We no longer handle these as symlinks because we could not | 543 | inode->i_mode = default_mode; |
| 543 | follow them due to the absolute path with drive letter */ | 544 | else { |
| 544 | if (attr & ATTR_DIRECTORY) { | 545 | /* just reenable write bits if !ATTR_READONLY */ |
| 545 | /* override default perms since we do not do byte range locking | 546 | if ((inode->i_mode & S_IWUGO) == 0 && |
| 546 | on dirs */ | 547 | (attr & ATTR_READONLY) == 0) |
| 547 | inode->i_mode = cifs_sb->mnt_dir_mode; | 548 | inode->i_mode |= (S_IWUGO & default_mode); |
| 548 | inode->i_mode |= S_IFDIR; | 549 | inode->i_mode &= ~S_IFMT; |
| 549 | } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && | 550 | } |
| 550 | (cifsInfo->cifsAttrs & ATTR_SYSTEM) && | 551 | /* clear write bits if ATTR_READONLY is set */ |
| 551 | /* No need to le64 convert size of zero */ | 552 | if (attr & ATTR_READONLY) |
| 552 | (pfindData->EndOfFile == 0)) { | 553 | inode->i_mode &= ~S_IWUGO; |
| 553 | inode->i_mode = cifs_sb->mnt_file_mode; | 554 | |
| 554 | inode->i_mode |= S_IFIFO; | 555 | /* set inode type */ |
| 555 | /* BB Finish for SFU style symlinks and devices */ | 556 | if ((attr & ATTR_SYSTEM) && |
| 556 | } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && | 557 | (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)) { |
| 557 | (cifsInfo->cifsAttrs & ATTR_SYSTEM)) { | 558 | /* no need to fix endianness on 0 */ |
| 558 | if (decode_sfu_inode(inode, le64_to_cpu(pfindData->EndOfFile), | 559 | if (pfindData->EndOfFile == 0) |
| 559 | full_path, cifs_sb, xid)) | 560 | inode->i_mode |= S_IFIFO; |
| 560 | cFYI(1, ("Unrecognized sfu inode type")); | 561 | else if (decode_sfu_inode(inode, |
| 561 | 562 | le64_to_cpu(pfindData->EndOfFile), | |
| 562 | cFYI(1, ("sfu mode 0%o", inode->i_mode)); | 563 | full_path, cifs_sb, xid)) |
| 564 | cFYI(1, ("unknown SFU file type\n")); | ||
| 563 | } else { | 565 | } else { |
| 564 | inode->i_mode |= S_IFREG; | 566 | if (attr & ATTR_DIRECTORY) |
| 565 | /* treat dos attribute of read-only as read-only mode eg 555 */ | 567 | inode->i_mode |= S_IFDIR; |
| 566 | if (cifsInfo->cifsAttrs & ATTR_READONLY) | 568 | else |
| 567 | inode->i_mode &= ~(S_IWUGO); | 569 | inode->i_mode |= S_IFREG; |
| 568 | else if ((inode->i_mode & S_IWUGO) == 0) | ||
| 569 | /* the ATTR_READONLY flag may have been */ | ||
| 570 | /* changed on server -- set any w bits */ | ||
| 571 | /* allowed by mnt_file_mode */ | ||
| 572 | inode->i_mode |= (S_IWUGO & cifs_sb->mnt_file_mode); | ||
| 573 | /* BB add code to validate if device or weird share or device type? */ | ||
| 574 | } | 570 | } |
| 575 | 571 | ||
| 576 | spin_lock(&inode->i_lock); | 572 | spin_lock(&inode->i_lock); |
| @@ -1019,8 +1015,11 @@ mkdir_get_info: | |||
| 1019 | CIFS_MOUNT_MAP_SPECIAL_CHR); | 1015 | CIFS_MOUNT_MAP_SPECIAL_CHR); |
| 1020 | } | 1016 | } |
| 1021 | if (direntry->d_inode) { | 1017 | if (direntry->d_inode) { |
| 1022 | direntry->d_inode->i_mode = mode; | 1018 | if (cifs_sb->mnt_cifs_flags & |
| 1023 | direntry->d_inode->i_mode |= S_IFDIR; | 1019 | CIFS_MOUNT_DYNPERM) |
| 1020 | direntry->d_inode->i_mode = | ||
| 1021 | (mode | S_IFDIR); | ||
| 1022 | |||
| 1024 | if (cifs_sb->mnt_cifs_flags & | 1023 | if (cifs_sb->mnt_cifs_flags & |
| 1025 | CIFS_MOUNT_SET_UID) { | 1024 | CIFS_MOUNT_SET_UID) { |
| 1026 | direntry->d_inode->i_uid = | 1025 | direntry->d_inode->i_uid = |
| @@ -1547,13 +1546,26 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
| 1547 | } else | 1546 | } else |
| 1548 | goto cifs_setattr_exit; | 1547 | goto cifs_setattr_exit; |
| 1549 | } | 1548 | } |
| 1550 | if (attrs->ia_valid & ATTR_UID) { | 1549 | |
| 1551 | cFYI(1, ("UID changed to %d", attrs->ia_uid)); | 1550 | /* |
| 1552 | uid = attrs->ia_uid; | 1551 | * Without unix extensions we can't send ownership changes to the |
| 1553 | } | 1552 | * server, so silently ignore them. This is consistent with how |
| 1554 | if (attrs->ia_valid & ATTR_GID) { | 1553 | * local DOS/Windows filesystems behave (VFAT, NTFS, etc). With |
| 1555 | cFYI(1, ("GID changed to %d", attrs->ia_gid)); | 1554 | * CIFSACL support + proper Windows to Unix idmapping, we may be |
| 1556 | gid = attrs->ia_gid; | 1555 | * able to support this in the future. |
| 1556 | */ | ||
| 1557 | if (!pTcon->unix_ext && | ||
| 1558 | !(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID)) { | ||
| 1559 | attrs->ia_valid &= ~(ATTR_UID | ATTR_GID); | ||
| 1560 | } else { | ||
| 1561 | if (attrs->ia_valid & ATTR_UID) { | ||
| 1562 | cFYI(1, ("UID changed to %d", attrs->ia_uid)); | ||
| 1563 | uid = attrs->ia_uid; | ||
| 1564 | } | ||
| 1565 | if (attrs->ia_valid & ATTR_GID) { | ||
| 1566 | cFYI(1, ("GID changed to %d", attrs->ia_gid)); | ||
| 1567 | gid = attrs->ia_gid; | ||
| 1568 | } | ||
| 1557 | } | 1569 | } |
| 1558 | 1570 | ||
| 1559 | time_buf.Attributes = 0; | 1571 | time_buf.Attributes = 0; |
| @@ -1563,7 +1575,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
| 1563 | attrs->ia_valid &= ~ATTR_MODE; | 1575 | attrs->ia_valid &= ~ATTR_MODE; |
| 1564 | 1576 | ||
| 1565 | if (attrs->ia_valid & ATTR_MODE) { | 1577 | if (attrs->ia_valid & ATTR_MODE) { |
| 1566 | cFYI(1, ("Mode changed to 0x%x", attrs->ia_mode)); | 1578 | cFYI(1, ("Mode changed to 0%o", attrs->ia_mode)); |
| 1567 | mode = attrs->ia_mode; | 1579 | mode = attrs->ia_mode; |
| 1568 | } | 1580 | } |
| 1569 | 1581 | ||
| @@ -1578,18 +1590,18 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
| 1578 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 1590 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
| 1579 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) | 1591 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) |
| 1580 | rc = mode_to_acl(inode, full_path, mode); | 1592 | rc = mode_to_acl(inode, full_path, mode); |
| 1581 | else if ((mode & S_IWUGO) == 0) { | 1593 | else |
| 1582 | #else | ||
| 1583 | if ((mode & S_IWUGO) == 0) { | ||
| 1584 | #endif | 1594 | #endif |
| 1585 | /* not writeable */ | 1595 | if (((mode & S_IWUGO) == 0) && |
| 1586 | if ((cifsInode->cifsAttrs & ATTR_READONLY) == 0) { | 1596 | (cifsInode->cifsAttrs & ATTR_READONLY) == 0) { |
| 1587 | set_dosattr = true; | 1597 | set_dosattr = true; |
| 1588 | time_buf.Attributes = | 1598 | time_buf.Attributes = cpu_to_le32(cifsInode->cifsAttrs | |
| 1589 | cpu_to_le32(cifsInode->cifsAttrs | | 1599 | ATTR_READONLY); |
| 1590 | ATTR_READONLY); | 1600 | /* fix up mode if we're not using dynperm */ |
| 1591 | } | 1601 | if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) == 0) |
| 1592 | } else if (cifsInode->cifsAttrs & ATTR_READONLY) { | 1602 | attrs->ia_mode = inode->i_mode & ~S_IWUGO; |
| 1603 | } else if ((mode & S_IWUGO) && | ||
| 1604 | (cifsInode->cifsAttrs & ATTR_READONLY)) { | ||
| 1593 | /* If file is readonly on server, we would | 1605 | /* If file is readonly on server, we would |
| 1594 | not be able to write to it - so if any write | 1606 | not be able to write to it - so if any write |
| 1595 | bit is enabled for user or group or other we | 1607 | bit is enabled for user or group or other we |
| @@ -1600,6 +1612,20 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
| 1600 | /* Windows ignores set to zero */ | 1612 | /* Windows ignores set to zero */ |
| 1601 | if (time_buf.Attributes == 0) | 1613 | if (time_buf.Attributes == 0) |
| 1602 | time_buf.Attributes |= cpu_to_le32(ATTR_NORMAL); | 1614 | time_buf.Attributes |= cpu_to_le32(ATTR_NORMAL); |
| 1615 | |||
| 1616 | /* reset local inode permissions to normal */ | ||
| 1617 | if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)) { | ||
| 1618 | attrs->ia_mode &= ~(S_IALLUGO); | ||
| 1619 | if (S_ISDIR(inode->i_mode)) | ||
| 1620 | attrs->ia_mode |= | ||
| 1621 | cifs_sb->mnt_dir_mode; | ||
| 1622 | else | ||
| 1623 | attrs->ia_mode |= | ||
| 1624 | cifs_sb->mnt_file_mode; | ||
| 1625 | } | ||
| 1626 | } else if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)) { | ||
| 1627 | /* ignore mode change - ATTR_READONLY hasn't changed */ | ||
| 1628 | attrs->ia_valid &= ~ATTR_MODE; | ||
| 1603 | } | 1629 | } |
| 1604 | } | 1630 | } |
| 1605 | 1631 | ||
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 1d69b8014e0b..4b17f8fe3157 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c | |||
| @@ -519,8 +519,7 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv) | |||
| 519 | pnotify = (struct file_notify_information *) | 519 | pnotify = (struct file_notify_information *) |
| 520 | ((char *)&pSMBr->hdr.Protocol + data_offset); | 520 | ((char *)&pSMBr->hdr.Protocol + data_offset); |
| 521 | cFYI(1, ("dnotify on %s Action: 0x%x", | 521 | cFYI(1, ("dnotify on %s Action: 0x%x", |
| 522 | pnotify->FileName, | 522 | pnotify->FileName, pnotify->Action)); |
| 523 | pnotify->Action)); /* BB removeme BB */ | ||
| 524 | /* cifs_dump_mem("Rcvd notify Data: ",buf, | 523 | /* cifs_dump_mem("Rcvd notify Data: ",buf, |
| 525 | sizeof(struct smb_hdr)+60); */ | 524 | sizeof(struct smb_hdr)+60); */ |
| 526 | return true; | 525 | return true; |
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 713c25110197..83f306954883 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
| @@ -132,6 +132,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, | |||
| 132 | __u32 attr; | 132 | __u32 attr; |
| 133 | __u64 allocation_size; | 133 | __u64 allocation_size; |
| 134 | __u64 end_of_file; | 134 | __u64 end_of_file; |
| 135 | umode_t default_mode; | ||
| 135 | 136 | ||
| 136 | /* save mtime and size */ | 137 | /* save mtime and size */ |
| 137 | local_mtime = tmp_inode->i_mtime; | 138 | local_mtime = tmp_inode->i_mtime; |
| @@ -187,48 +188,54 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, | |||
| 187 | if (atomic_read(&cifsInfo->inUse) == 0) { | 188 | if (atomic_read(&cifsInfo->inUse) == 0) { |
| 188 | tmp_inode->i_uid = cifs_sb->mnt_uid; | 189 | tmp_inode->i_uid = cifs_sb->mnt_uid; |
| 189 | tmp_inode->i_gid = cifs_sb->mnt_gid; | 190 | tmp_inode->i_gid = cifs_sb->mnt_gid; |
| 190 | /* set default mode. will override for dirs below */ | 191 | } |
| 191 | tmp_inode->i_mode = cifs_sb->mnt_file_mode; | 192 | |
| 192 | } else { | 193 | if (attr & ATTR_DIRECTORY) |
| 193 | /* mask off the type bits since it gets set | 194 | default_mode = cifs_sb->mnt_dir_mode; |
| 194 | below and we do not want to get two type | 195 | else |
| 195 | bits set */ | 196 | default_mode = cifs_sb->mnt_file_mode; |
| 197 | |||
| 198 | /* set initial permissions */ | ||
| 199 | if ((atomic_read(&cifsInfo->inUse) == 0) || | ||
| 200 | (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) == 0) | ||
| 201 | tmp_inode->i_mode = default_mode; | ||
| 202 | else { | ||
| 203 | /* just reenable write bits if !ATTR_READONLY */ | ||
| 204 | if ((tmp_inode->i_mode & S_IWUGO) == 0 && | ||
| 205 | (attr & ATTR_READONLY) == 0) | ||
| 206 | tmp_inode->i_mode |= (S_IWUGO & default_mode); | ||
| 207 | |||
| 196 | tmp_inode->i_mode &= ~S_IFMT; | 208 | tmp_inode->i_mode &= ~S_IFMT; |
| 197 | } | 209 | } |
| 198 | 210 | ||
| 199 | if (attr & ATTR_DIRECTORY) { | 211 | /* clear write bits if ATTR_READONLY is set */ |
| 200 | *pobject_type = DT_DIR; | 212 | if (attr & ATTR_READONLY) |
| 201 | /* override default perms since we do not lock dirs */ | 213 | tmp_inode->i_mode &= ~S_IWUGO; |
| 202 | if (atomic_read(&cifsInfo->inUse) == 0) | 214 | |
| 203 | tmp_inode->i_mode = cifs_sb->mnt_dir_mode; | 215 | /* set inode type */ |
| 204 | tmp_inode->i_mode |= S_IFDIR; | 216 | if ((attr & ATTR_SYSTEM) && |
| 205 | } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && | 217 | (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)) { |
| 206 | (attr & ATTR_SYSTEM)) { | ||
| 207 | if (end_of_file == 0) { | 218 | if (end_of_file == 0) { |
| 208 | *pobject_type = DT_FIFO; | ||
| 209 | tmp_inode->i_mode |= S_IFIFO; | 219 | tmp_inode->i_mode |= S_IFIFO; |
| 220 | *pobject_type = DT_FIFO; | ||
| 210 | } else { | 221 | } else { |
| 211 | /* rather than get the type here, we mark the | 222 | /* |
| 212 | inode as needing revalidate and get the real type | 223 | * trying to get the type can be slow, so just call |
| 213 | (blk vs chr vs. symlink) later ie in lookup */ | 224 | * this a regular file for now, and mark for reval |
| 214 | *pobject_type = DT_REG; | 225 | */ |
| 215 | tmp_inode->i_mode |= S_IFREG; | 226 | tmp_inode->i_mode |= S_IFREG; |
| 227 | *pobject_type = DT_REG; | ||
| 216 | cifsInfo->time = 0; | 228 | cifsInfo->time = 0; |
| 217 | } | 229 | } |
| 218 | /* we no longer mark these because we could not follow them */ | ||
| 219 | /* } else if (attr & ATTR_REPARSE) { | ||
| 220 | *pobject_type = DT_LNK; | ||
| 221 | tmp_inode->i_mode |= S_IFLNK; */ | ||
| 222 | } else { | 230 | } else { |
| 223 | *pobject_type = DT_REG; | 231 | if (attr & ATTR_DIRECTORY) { |
| 224 | tmp_inode->i_mode |= S_IFREG; | 232 | tmp_inode->i_mode |= S_IFDIR; |
| 225 | if (attr & ATTR_READONLY) | 233 | *pobject_type = DT_DIR; |
| 226 | tmp_inode->i_mode &= ~(S_IWUGO); | 234 | } else { |
| 227 | else if ((tmp_inode->i_mode & S_IWUGO) == 0) | 235 | tmp_inode->i_mode |= S_IFREG; |
| 228 | /* the ATTR_READONLY flag may have been changed on */ | 236 | *pobject_type = DT_REG; |
| 229 | /* server -- set any w bits allowed by mnt_file_mode */ | 237 | } |
| 230 | tmp_inode->i_mode |= (S_IWUGO & cifs_sb->mnt_file_mode); | 238 | } |
| 231 | } /* could add code here - to validate if device or weird share type? */ | ||
| 232 | 239 | ||
| 233 | /* can not fill in nlink here as in qpathinfo version and Unx search */ | 240 | /* can not fill in nlink here as in qpathinfo version and Unx search */ |
| 234 | if (atomic_read(&cifsInfo->inUse) == 0) | 241 | if (atomic_read(&cifsInfo->inUse) == 0) |
| @@ -675,8 +682,6 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, | |||
| 675 | cifsFile->invalidHandle = true; | 682 | cifsFile->invalidHandle = true; |
| 676 | CIFSFindClose(xid, pTcon, cifsFile->netfid); | 683 | CIFSFindClose(xid, pTcon, cifsFile->netfid); |
| 677 | } | 684 | } |
| 678 | kfree(cifsFile->search_resume_name); | ||
| 679 | cifsFile->search_resume_name = NULL; | ||
| 680 | if (cifsFile->srch_inf.ntwrk_buf_start) { | 685 | if (cifsFile->srch_inf.ntwrk_buf_start) { |
| 681 | cFYI(1, ("freeing SMB ff cache buf on search rewind")); | 686 | cFYI(1, ("freeing SMB ff cache buf on search rewind")); |
| 682 | if (cifsFile->srch_inf.smallBuf) | 687 | if (cifsFile->srch_inf.smallBuf) |
| @@ -1043,9 +1048,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) | |||
| 1043 | } /* else { | 1048 | } /* else { |
| 1044 | cifsFile->invalidHandle = true; | 1049 | cifsFile->invalidHandle = true; |
| 1045 | CIFSFindClose(xid, pTcon, cifsFile->netfid); | 1050 | CIFSFindClose(xid, pTcon, cifsFile->netfid); |
| 1046 | } | 1051 | } */ |
| 1047 | kfree(cifsFile->search_resume_name); | ||
| 1048 | cifsFile->search_resume_name = NULL; */ | ||
| 1049 | 1052 | ||
| 1050 | rc = find_cifs_entry(xid, pTcon, file, | 1053 | rc = find_cifs_entry(xid, pTcon, file, |
| 1051 | ¤t_entry, &num_to_fill); | 1054 | ¤t_entry, &num_to_fill); |
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/file.h> | 26 | #include <linux/file.h> |
| 27 | #include <linux/fdtable.h> | 27 | #include <linux/fdtable.h> |
| 28 | #include <linux/mman.h> | 28 | #include <linux/mman.h> |
| 29 | #include <linux/a.out.h> | ||
| 30 | #include <linux/stat.h> | 29 | #include <linux/stat.h> |
| 31 | #include <linux/fcntl.h> | 30 | #include <linux/fcntl.h> |
| 32 | #include <linux/smp_lock.h> | 31 | #include <linux/smp_lock.h> |
| @@ -61,6 +60,11 @@ | |||
| 61 | #include <linux/kmod.h> | 60 | #include <linux/kmod.h> |
| 62 | #endif | 61 | #endif |
| 63 | 62 | ||
| 63 | #ifdef __alpha__ | ||
| 64 | /* for /sbin/loader handling in search_binary_handler() */ | ||
| 65 | #include <linux/a.out.h> | ||
| 66 | #endif | ||
| 67 | |||
| 64 | int core_uses_pid; | 68 | int core_uses_pid; |
| 65 | char core_pattern[CORENAME_MAX_SIZE] = "core"; | 69 | char core_pattern[CORENAME_MAX_SIZE] = "core"; |
| 66 | int suid_dumpable = 0; | 70 | int suid_dumpable = 0; |
| @@ -1155,7 +1159,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | |||
| 1155 | { | 1159 | { |
| 1156 | int try,retval; | 1160 | int try,retval; |
| 1157 | struct linux_binfmt *fmt; | 1161 | struct linux_binfmt *fmt; |
| 1158 | #if defined(__alpha__) && defined(CONFIG_ARCH_SUPPORTS_AOUT) | 1162 | #ifdef __alpha__ |
| 1159 | /* handle /sbin/loader.. */ | 1163 | /* handle /sbin/loader.. */ |
| 1160 | { | 1164 | { |
| 1161 | struct exec * eh = (struct exec *) bprm->buf; | 1165 | struct exec * eh = (struct exec *) bprm->buf; |
diff --git a/fs/fat/file.c b/fs/fat/file.c index 27cc1164ec36..771326b8047e 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
| @@ -257,26 +257,34 @@ int fat_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) | |||
| 257 | } | 257 | } |
| 258 | EXPORT_SYMBOL_GPL(fat_getattr); | 258 | EXPORT_SYMBOL_GPL(fat_getattr); |
| 259 | 259 | ||
| 260 | static int fat_check_mode(const struct msdos_sb_info *sbi, struct inode *inode, | 260 | static int fat_sanitize_mode(const struct msdos_sb_info *sbi, |
| 261 | mode_t mode) | 261 | struct inode *inode, umode_t *mode_ptr) |
| 262 | { | 262 | { |
| 263 | mode_t mask, req = mode & ~S_IFMT; | 263 | mode_t mask, perm; |
| 264 | 264 | ||
| 265 | if (S_ISREG(mode)) | 265 | /* |
| 266 | * Note, the basic check is already done by a caller of | ||
| 267 | * (attr->ia_mode & ~MSDOS_VALID_MODE) | ||
| 268 | */ | ||
| 269 | |||
| 270 | if (S_ISREG(inode->i_mode)) | ||
| 266 | mask = sbi->options.fs_fmask; | 271 | mask = sbi->options.fs_fmask; |
| 267 | else | 272 | else |
| 268 | mask = sbi->options.fs_dmask; | 273 | mask = sbi->options.fs_dmask; |
| 269 | 274 | ||
| 275 | perm = *mode_ptr & ~(S_IFMT | mask); | ||
| 276 | |||
| 270 | /* | 277 | /* |
| 271 | * Of the r and x bits, all (subject to umask) must be present. Of the | 278 | * Of the r and x bits, all (subject to umask) must be present. Of the |
| 272 | * w bits, either all (subject to umask) or none must be present. | 279 | * w bits, either all (subject to umask) or none must be present. |
| 273 | */ | 280 | */ |
| 274 | req &= ~mask; | 281 | if ((perm & (S_IRUGO | S_IXUGO)) != (inode->i_mode & (S_IRUGO|S_IXUGO))) |
| 275 | if ((req & (S_IRUGO | S_IXUGO)) != (inode->i_mode & (S_IRUGO|S_IXUGO))) | ||
| 276 | return -EPERM; | 282 | return -EPERM; |
| 277 | if ((req & S_IWUGO) && ((req & S_IWUGO) != (S_IWUGO & ~mask))) | 283 | if ((perm & S_IWUGO) && ((perm & S_IWUGO) != (S_IWUGO & ~mask))) |
| 278 | return -EPERM; | 284 | return -EPERM; |
| 279 | 285 | ||
| 286 | *mode_ptr &= S_IFMT | perm; | ||
| 287 | |||
| 280 | return 0; | 288 | return 0; |
| 281 | } | 289 | } |
| 282 | 290 | ||
| @@ -299,7 +307,7 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 299 | { | 307 | { |
| 300 | struct msdos_sb_info *sbi = MSDOS_SB(dentry->d_sb); | 308 | struct msdos_sb_info *sbi = MSDOS_SB(dentry->d_sb); |
| 301 | struct inode *inode = dentry->d_inode; | 309 | struct inode *inode = dentry->d_inode; |
| 302 | int mask, error = 0; | 310 | int error = 0; |
| 303 | unsigned int ia_valid; | 311 | unsigned int ia_valid; |
| 304 | 312 | ||
| 305 | lock_kernel(); | 313 | lock_kernel(); |
| @@ -332,12 +340,13 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 332 | error = 0; | 340 | error = 0; |
| 333 | goto out; | 341 | goto out; |
| 334 | } | 342 | } |
| 343 | |||
| 335 | if (((attr->ia_valid & ATTR_UID) && | 344 | if (((attr->ia_valid & ATTR_UID) && |
| 336 | (attr->ia_uid != sbi->options.fs_uid)) || | 345 | (attr->ia_uid != sbi->options.fs_uid)) || |
| 337 | ((attr->ia_valid & ATTR_GID) && | 346 | ((attr->ia_valid & ATTR_GID) && |
| 338 | (attr->ia_gid != sbi->options.fs_gid)) || | 347 | (attr->ia_gid != sbi->options.fs_gid)) || |
| 339 | ((attr->ia_valid & ATTR_MODE) && | 348 | ((attr->ia_valid & ATTR_MODE) && |
| 340 | fat_check_mode(sbi, inode, attr->ia_mode) < 0)) | 349 | (attr->ia_mode & ~MSDOS_VALID_MODE))) |
| 341 | error = -EPERM; | 350 | error = -EPERM; |
| 342 | 351 | ||
| 343 | if (error) { | 352 | if (error) { |
| @@ -346,15 +355,16 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 346 | goto out; | 355 | goto out; |
| 347 | } | 356 | } |
| 348 | 357 | ||
| 349 | error = inode_setattr(inode, attr); | 358 | /* |
| 350 | if (error) | 359 | * We don't return -EPERM here. Yes, strange, but this is too |
| 351 | goto out; | 360 | * old behavior. |
| 361 | */ | ||
| 362 | if (attr->ia_valid & ATTR_MODE) { | ||
| 363 | if (fat_sanitize_mode(sbi, inode, &attr->ia_mode) < 0) | ||
| 364 | attr->ia_valid &= ~ATTR_MODE; | ||
| 365 | } | ||
| 352 | 366 | ||
| 353 | if (S_ISDIR(inode->i_mode)) | 367 | error = inode_setattr(inode, attr); |
| 354 | mask = sbi->options.fs_dmask; | ||
| 355 | else | ||
| 356 | mask = sbi->options.fs_fmask; | ||
| 357 | inode->i_mode &= S_IFMT | (S_IRWXUGO & ~mask); | ||
| 358 | out: | 368 | out: |
| 359 | unlock_kernel(); | 369 | unlock_kernel(); |
| 360 | return error; | 370 | return error; |
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 17403629e330..ab8ccc9d14ff 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
| @@ -315,9 +315,9 @@ struct mem_size_stats { | |||
| 315 | }; | 315 | }; |
| 316 | 316 | ||
| 317 | static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, | 317 | static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, |
| 318 | void *private) | 318 | struct mm_walk *walk) |
| 319 | { | 319 | { |
| 320 | struct mem_size_stats *mss = private; | 320 | struct mem_size_stats *mss = walk->private; |
| 321 | struct vm_area_struct *vma = mss->vma; | 321 | struct vm_area_struct *vma = mss->vma; |
| 322 | pte_t *pte, ptent; | 322 | pte_t *pte, ptent; |
| 323 | spinlock_t *ptl; | 323 | spinlock_t *ptl; |
| @@ -365,19 +365,21 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, | |||
| 365 | return 0; | 365 | return 0; |
| 366 | } | 366 | } |
| 367 | 367 | ||
| 368 | static struct mm_walk smaps_walk = { .pmd_entry = smaps_pte_range }; | ||
| 369 | |||
| 370 | static int show_smap(struct seq_file *m, void *v) | 368 | static int show_smap(struct seq_file *m, void *v) |
| 371 | { | 369 | { |
| 372 | struct vm_area_struct *vma = v; | 370 | struct vm_area_struct *vma = v; |
| 373 | struct mem_size_stats mss; | 371 | struct mem_size_stats mss; |
| 374 | int ret; | 372 | int ret; |
| 373 | struct mm_walk smaps_walk = { | ||
| 374 | .pmd_entry = smaps_pte_range, | ||
| 375 | .mm = vma->vm_mm, | ||
| 376 | .private = &mss, | ||
| 377 | }; | ||
| 375 | 378 | ||
| 376 | memset(&mss, 0, sizeof mss); | 379 | memset(&mss, 0, sizeof mss); |
| 377 | mss.vma = vma; | 380 | mss.vma = vma; |
| 378 | if (vma->vm_mm && !is_vm_hugetlb_page(vma)) | 381 | if (vma->vm_mm && !is_vm_hugetlb_page(vma)) |
| 379 | walk_page_range(vma->vm_mm, vma->vm_start, vma->vm_end, | 382 | walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk); |
| 380 | &smaps_walk, &mss); | ||
| 381 | 383 | ||
| 382 | ret = show_map(m, v); | 384 | ret = show_map(m, v); |
| 383 | if (ret) | 385 | if (ret) |
| @@ -426,9 +428,9 @@ const struct file_operations proc_smaps_operations = { | |||
| 426 | }; | 428 | }; |
| 427 | 429 | ||
| 428 | static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr, | 430 | static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr, |
| 429 | unsigned long end, void *private) | 431 | unsigned long end, struct mm_walk *walk) |
| 430 | { | 432 | { |
| 431 | struct vm_area_struct *vma = private; | 433 | struct vm_area_struct *vma = walk->private; |
| 432 | pte_t *pte, ptent; | 434 | pte_t *pte, ptent; |
| 433 | spinlock_t *ptl; | 435 | spinlock_t *ptl; |
| 434 | struct page *page; | 436 | struct page *page; |
| @@ -452,8 +454,6 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr, | |||
| 452 | return 0; | 454 | return 0; |
| 453 | } | 455 | } |
| 454 | 456 | ||
| 455 | static struct mm_walk clear_refs_walk = { .pmd_entry = clear_refs_pte_range }; | ||
| 456 | |||
| 457 | static ssize_t clear_refs_write(struct file *file, const char __user *buf, | 457 | static ssize_t clear_refs_write(struct file *file, const char __user *buf, |
| 458 | size_t count, loff_t *ppos) | 458 | size_t count, loff_t *ppos) |
| 459 | { | 459 | { |
| @@ -476,11 +476,17 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, | |||
| 476 | return -ESRCH; | 476 | return -ESRCH; |
| 477 | mm = get_task_mm(task); | 477 | mm = get_task_mm(task); |
| 478 | if (mm) { | 478 | if (mm) { |
| 479 | static struct mm_walk clear_refs_walk; | ||
| 480 | memset(&clear_refs_walk, 0, sizeof(clear_refs_walk)); | ||
| 481 | clear_refs_walk.pmd_entry = clear_refs_pte_range; | ||
| 482 | clear_refs_walk.mm = mm; | ||
| 479 | down_read(&mm->mmap_sem); | 483 | down_read(&mm->mmap_sem); |
| 480 | for (vma = mm->mmap; vma; vma = vma->vm_next) | 484 | for (vma = mm->mmap; vma; vma = vma->vm_next) { |
| 485 | clear_refs_walk.private = vma; | ||
| 481 | if (!is_vm_hugetlb_page(vma)) | 486 | if (!is_vm_hugetlb_page(vma)) |
| 482 | walk_page_range(mm, vma->vm_start, vma->vm_end, | 487 | walk_page_range(vma->vm_start, vma->vm_end, |
| 483 | &clear_refs_walk, vma); | 488 | &clear_refs_walk); |
| 489 | } | ||
| 484 | flush_tlb_mm(mm); | 490 | flush_tlb_mm(mm); |
| 485 | up_read(&mm->mmap_sem); | 491 | up_read(&mm->mmap_sem); |
| 486 | mmput(mm); | 492 | mmput(mm); |
| @@ -528,9 +534,9 @@ static int add_to_pagemap(unsigned long addr, u64 pfn, | |||
| 528 | } | 534 | } |
| 529 | 535 | ||
| 530 | static int pagemap_pte_hole(unsigned long start, unsigned long end, | 536 | static int pagemap_pte_hole(unsigned long start, unsigned long end, |
| 531 | void *private) | 537 | struct mm_walk *walk) |
| 532 | { | 538 | { |
| 533 | struct pagemapread *pm = private; | 539 | struct pagemapread *pm = walk->private; |
| 534 | unsigned long addr; | 540 | unsigned long addr; |
| 535 | int err = 0; | 541 | int err = 0; |
| 536 | for (addr = start; addr < end; addr += PAGE_SIZE) { | 542 | for (addr = start; addr < end; addr += PAGE_SIZE) { |
| @@ -547,24 +553,45 @@ static u64 swap_pte_to_pagemap_entry(pte_t pte) | |||
| 547 | return swp_type(e) | (swp_offset(e) << MAX_SWAPFILES_SHIFT); | 553 | return swp_type(e) | (swp_offset(e) << MAX_SWAPFILES_SHIFT); |
| 548 | } | 554 | } |
| 549 | 555 | ||
| 556 | static unsigned long pte_to_pagemap_entry(pte_t pte) | ||
| 557 | { | ||
| 558 | unsigned long pme = 0; | ||
| 559 | if (is_swap_pte(pte)) | ||
| 560 | pme = PM_PFRAME(swap_pte_to_pagemap_entry(pte)) | ||
| 561 | | PM_PSHIFT(PAGE_SHIFT) | PM_SWAP; | ||
| 562 | else if (pte_present(pte)) | ||
| 563 | pme = PM_PFRAME(pte_pfn(pte)) | ||
| 564 | | PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT; | ||
| 565 | return pme; | ||
| 566 | } | ||
| 567 | |||
| 550 | static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, | 568 | static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, |
| 551 | void *private) | 569 | struct mm_walk *walk) |
| 552 | { | 570 | { |
| 553 | struct pagemapread *pm = private; | 571 | struct vm_area_struct *vma; |
| 572 | struct pagemapread *pm = walk->private; | ||
| 554 | pte_t *pte; | 573 | pte_t *pte; |
| 555 | int err = 0; | 574 | int err = 0; |
| 556 | 575 | ||
| 576 | /* find the first VMA at or above 'addr' */ | ||
| 577 | vma = find_vma(walk->mm, addr); | ||
| 557 | for (; addr != end; addr += PAGE_SIZE) { | 578 | for (; addr != end; addr += PAGE_SIZE) { |
| 558 | u64 pfn = PM_NOT_PRESENT; | 579 | u64 pfn = PM_NOT_PRESENT; |
| 559 | pte = pte_offset_map(pmd, addr); | 580 | |
| 560 | if (is_swap_pte(*pte)) | 581 | /* check to see if we've left 'vma' behind |
| 561 | pfn = PM_PFRAME(swap_pte_to_pagemap_entry(*pte)) | 582 | * and need a new, higher one */ |
| 562 | | PM_PSHIFT(PAGE_SHIFT) | PM_SWAP; | 583 | if (vma && (addr >= vma->vm_end)) |
| 563 | else if (pte_present(*pte)) | 584 | vma = find_vma(walk->mm, addr); |
| 564 | pfn = PM_PFRAME(pte_pfn(*pte)) | 585 | |
| 565 | | PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT; | 586 | /* check that 'vma' actually covers this address, |
| 566 | /* unmap so we're not in atomic when we copy to userspace */ | 587 | * and that it isn't a huge page vma */ |
| 567 | pte_unmap(pte); | 588 | if (vma && (vma->vm_start <= addr) && |
| 589 | !is_vm_hugetlb_page(vma)) { | ||
| 590 | pte = pte_offset_map(pmd, addr); | ||
| 591 | pfn = pte_to_pagemap_entry(*pte); | ||
| 592 | /* unmap before userspace copy */ | ||
| 593 | pte_unmap(pte); | ||
| 594 | } | ||
| 568 | err = add_to_pagemap(addr, pfn, pm); | 595 | err = add_to_pagemap(addr, pfn, pm); |
| 569 | if (err) | 596 | if (err) |
| 570 | return err; | 597 | return err; |
| @@ -675,8 +702,8 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, | |||
| 675 | * user buffer is tracked in "pm", and the walk | 702 | * user buffer is tracked in "pm", and the walk |
| 676 | * will stop when we hit the end of the buffer. | 703 | * will stop when we hit the end of the buffer. |
| 677 | */ | 704 | */ |
| 678 | ret = walk_page_range(mm, start_vaddr, end_vaddr, | 705 | ret = walk_page_range(start_vaddr, end_vaddr, |
| 679 | &pagemap_walk, &pm); | 706 | &pagemap_walk); |
| 680 | if (ret == PM_END_OF_BUFFER) | 707 | if (ret == PM_END_OF_BUFFER) |
| 681 | ret = 0; | 708 | ret = 0; |
| 682 | /* don't need mmap_sem for these, but this looks cleaner */ | 709 | /* don't need mmap_sem for these, but this looks cleaner */ |
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 06480bcabfdc..06ebb6ef72aa 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -319,6 +319,7 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) | |||
| 319 | #endif /* CONFIG_CPU_FREQ */ | 319 | #endif /* CONFIG_CPU_FREQ */ |
| 320 | 320 | ||
| 321 | /* in processor_throttling.c */ | 321 | /* in processor_throttling.c */ |
| 322 | int acpi_processor_tstate_has_changed(struct acpi_processor *pr); | ||
| 322 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); | 323 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); |
| 323 | extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); | 324 | extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); |
| 324 | extern struct file_operations acpi_processor_throttling_fops; | 325 | extern struct file_operations acpi_processor_throttling_fops; |
diff --git a/include/asm-arm/arch-pxa/regs-lcd.h b/include/asm-arm/arch-pxa/regs-lcd.h index f762493f5141..3ba464c913a5 100644 --- a/include/asm-arm/arch-pxa/regs-lcd.h +++ b/include/asm-arm/arch-pxa/regs-lcd.h | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | #ifndef __ASM_ARCH_REGS_LCD_H | 1 | #ifndef __ASM_ARCH_REGS_LCD_H |
| 2 | #define __ASM_ARCH_REGS_LCD_H | 2 | #define __ASM_ARCH_REGS_LCD_H |
| 3 | |||
| 4 | #include <asm/arch/bitfield.h> | ||
| 5 | |||
| 3 | /* | 6 | /* |
| 4 | * LCD Controller Registers and Bits Definitions | 7 | * LCD Controller Registers and Bits Definitions |
| 5 | */ | 8 | */ |
| @@ -69,7 +72,7 @@ | |||
| 69 | #define LCCR0_QDM (1 << 11) /* LCD Quick Disable mask */ | 72 | #define LCCR0_QDM (1 << 11) /* LCD Quick Disable mask */ |
| 70 | #define LCCR0_PDD (0xff << 12) /* Palette DMA request delay */ | 73 | #define LCCR0_PDD (0xff << 12) /* Palette DMA request delay */ |
| 71 | #define LCCR0_PDD_S 12 | 74 | #define LCCR0_PDD_S 12 |
| 72 | #define LCCR0_BM (1 << 20) /* Branch mask */ | 75 | #define LCCR0_BM (1 << 20) /* Branch mask */ |
| 73 | #define LCCR0_OUM (1 << 21) /* Output FIFO underrun mask */ | 76 | #define LCCR0_OUM (1 << 21) /* Output FIFO underrun mask */ |
| 74 | #define LCCR0_LCDT (1 << 22) /* LCD panel type */ | 77 | #define LCCR0_LCDT (1 << 22) /* LCD panel type */ |
| 75 | #define LCCR0_RDSTM (1 << 23) /* Read status interrupt mask */ | 78 | #define LCCR0_RDSTM (1 << 23) /* Read status interrupt mask */ |
diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h index 83d1f286230b..3e8106442d5a 100644 --- a/include/asm-m68k/bitops.h +++ b/include/asm-m68k/bitops.h | |||
| @@ -410,8 +410,49 @@ static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size, | |||
| 410 | res = ext2_find_first_zero_bit (p, size - 32 * (p - addr)); | 410 | res = ext2_find_first_zero_bit (p, size - 32 * (p - addr)); |
| 411 | return (p - addr) * 32 + res; | 411 | return (p - addr) * 32 + res; |
| 412 | } | 412 | } |
| 413 | #define ext2_find_next_bit(addr, size, off) \ | 413 | |
| 414 | generic_find_next_le_bit((unsigned long *)(addr), (size), (off)) | 414 | static inline int ext2_find_first_bit(const void *vaddr, unsigned size) |
| 415 | { | ||
| 416 | const unsigned long *p = vaddr, *addr = vaddr; | ||
| 417 | int res; | ||
| 418 | |||
| 419 | if (!size) | ||
| 420 | return 0; | ||
| 421 | |||
| 422 | size = (size >> 5) + ((size & 31) > 0); | ||
| 423 | while (*p++ == 0UL) { | ||
| 424 | if (--size == 0) | ||
| 425 | return (p - addr) << 5; | ||
| 426 | } | ||
| 427 | |||
| 428 | --p; | ||
| 429 | for (res = 0; res < 32; res++) | ||
| 430 | if (ext2_test_bit(res, p)) | ||
| 431 | break; | ||
| 432 | return (p - addr) * 32 + res; | ||
| 433 | } | ||
| 434 | |||
| 435 | static inline int ext2_find_next_bit(const void *vaddr, unsigned size, | ||
| 436 | unsigned offset) | ||
| 437 | { | ||
| 438 | const unsigned long *addr = vaddr; | ||
| 439 | const unsigned long *p = addr + (offset >> 5); | ||
| 440 | int bit = offset & 31UL, res; | ||
| 441 | |||
| 442 | if (offset >= size) | ||
| 443 | return size; | ||
| 444 | |||
| 445 | if (bit) { | ||
| 446 | /* Look for one in first longword */ | ||
| 447 | for (res = bit; res < 32; res++) | ||
| 448 | if (ext2_test_bit(res, p)) | ||
| 449 | return (p - addr) * 32 + res; | ||
| 450 | p++; | ||
| 451 | } | ||
| 452 | /* No set bit yet, search remaining full bytes for a set bit */ | ||
| 453 | res = ext2_find_first_bit(p, size - 32 * (p - addr)); | ||
| 454 | return (p - addr) * 32 + res; | ||
| 455 | } | ||
| 415 | 456 | ||
| 416 | #endif /* __KERNEL__ */ | 457 | #endif /* __KERNEL__ */ |
| 417 | 458 | ||
diff --git a/include/asm-mips/cpu-info.h b/include/asm-mips/cpu-info.h index 0c5a358863f3..2de73dbb2e9e 100644 --- a/include/asm-mips/cpu-info.h +++ b/include/asm-mips/cpu-info.h | |||
| @@ -56,7 +56,7 @@ struct cpuinfo_mips { | |||
| 56 | struct cache_desc tcache; /* Tertiary/split secondary cache */ | 56 | struct cache_desc tcache; /* Tertiary/split secondary cache */ |
| 57 | int srsets; /* Shadow register sets */ | 57 | int srsets; /* Shadow register sets */ |
| 58 | int core; /* physical core number */ | 58 | int core; /* physical core number */ |
| 59 | #if defined(CONFIG_MIPS_MT_SMTC) | 59 | #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC) |
| 60 | /* | 60 | /* |
| 61 | * In the MIPS MT "SMTC" model, each TC is considered | 61 | * In the MIPS MT "SMTC" model, each TC is considered |
| 62 | * to be a "CPU" for the purposes of scheduling, but | 62 | * to be a "CPU" for the purposes of scheduling, but |
| @@ -64,7 +64,7 @@ struct cpuinfo_mips { | |||
| 64 | * to all TCs within the same VPE. | 64 | * to all TCs within the same VPE. |
| 65 | */ | 65 | */ |
| 66 | int vpe_id; /* Virtual Processor number */ | 66 | int vpe_id; /* Virtual Processor number */ |
| 67 | #endif /* CONFIG_MIPS_MT */ | 67 | #endif |
| 68 | #ifdef CONFIG_MIPS_MT_SMTC | 68 | #ifdef CONFIG_MIPS_MT_SMTC |
| 69 | int tc_id; /* Thread Context number */ | 69 | int tc_id; /* Thread Context number */ |
| 70 | #endif | 70 | #endif |
diff --git a/include/asm-mips/gic.h b/include/asm-mips/gic.h index 3a492f225f00..954807d9d66a 100644 --- a/include/asm-mips/gic.h +++ b/include/asm-mips/gic.h | |||
| @@ -24,8 +24,8 @@ | |||
| 24 | 24 | ||
| 25 | #define MSK(n) ((1 << (n)) - 1) | 25 | #define MSK(n) ((1 << (n)) - 1) |
| 26 | #define REG32(addr) (*(volatile unsigned int *) (addr)) | 26 | #define REG32(addr) (*(volatile unsigned int *) (addr)) |
| 27 | #define REG(base, offs) REG32((unsigned int)(base) + offs##_##OFS) | 27 | #define REG(base, offs) REG32((unsigned long)(base) + offs##_##OFS) |
| 28 | #define REGP(base, phys) REG32((unsigned int)(base) + (phys)) | 28 | #define REGP(base, phys) REG32((unsigned long)(base) + (phys)) |
| 29 | 29 | ||
| 30 | /* Accessors */ | 30 | /* Accessors */ |
| 31 | #define GIC_REG(segment, offset) \ | 31 | #define GIC_REG(segment, offset) \ |
diff --git a/include/asm-mips/lasat/serial.h b/include/asm-mips/lasat/serial.h index bafe68b10614..1c37d70579b8 100644 --- a/include/asm-mips/lasat/serial.h +++ b/include/asm-mips/lasat/serial.h | |||
| @@ -4,10 +4,10 @@ | |||
| 4 | #define LASAT_BASE_BAUD_100 (7372800 / 16) | 4 | #define LASAT_BASE_BAUD_100 (7372800 / 16) |
| 5 | #define LASAT_UART_REGS_BASE_100 0x1c8b0000 | 5 | #define LASAT_UART_REGS_BASE_100 0x1c8b0000 |
| 6 | #define LASAT_UART_REGS_SHIFT_100 2 | 6 | #define LASAT_UART_REGS_SHIFT_100 2 |
| 7 | #define LASATINT_UART_100 8 | 7 | #define LASATINT_UART_100 16 |
| 8 | 8 | ||
| 9 | /* * LASAT 200 boards serial configuration */ | 9 | /* * LASAT 200 boards serial configuration */ |
| 10 | #define LASAT_BASE_BAUD_200 (100000000 / 16 / 12) | 10 | #define LASAT_BASE_BAUD_200 (100000000 / 16 / 12) |
| 11 | #define LASAT_UART_REGS_BASE_200 (Vrc5074_PHYS_BASE + 0x0300) | 11 | #define LASAT_UART_REGS_BASE_200 (Vrc5074_PHYS_BASE + 0x0300) |
| 12 | #define LASAT_UART_REGS_SHIFT_200 3 | 12 | #define LASAT_UART_REGS_SHIFT_200 3 |
| 13 | #define LASATINT_UART_200 13 | 13 | #define LASATINT_UART_200 21 |
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index 1b5064dac007..0d302bad4492 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
| @@ -615,6 +615,7 @@ enum soc_au1500_ints { | |||
| 615 | AU1000_RTC_MATCH1_INT, | 615 | AU1000_RTC_MATCH1_INT, |
| 616 | AU1000_RTC_MATCH2_INT, | 616 | AU1000_RTC_MATCH2_INT, |
| 617 | AU1500_PCI_ERR_INT, | 617 | AU1500_PCI_ERR_INT, |
| 618 | AU1500_RESERVED_INT, | ||
| 618 | AU1000_USB_DEV_REQ_INT, | 619 | AU1000_USB_DEV_REQ_INT, |
| 619 | AU1000_USB_DEV_SUS_INT, | 620 | AU1000_USB_DEV_SUS_INT, |
| 620 | AU1000_USB_HOST_INT, | 621 | AU1000_USB_HOST_INT, |
diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 60e2f9338fcd..51b34a48c84a 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h | |||
| @@ -134,6 +134,4 @@ | |||
| 134 | 134 | ||
| 135 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) | 135 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) |
| 136 | 136 | ||
| 137 | #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT>>_CACHE_SHIFT) | ||
| 138 | |||
| 139 | #endif /* _ASM_PGTABLE_BITS_H */ | 137 | #endif /* _ASM_PGTABLE_BITS_H */ |
diff --git a/include/asm-parisc/checksum.h b/include/asm-parisc/checksum.h index cc3ec1bd8919..e9639ccc3fce 100644 --- a/include/asm-parisc/checksum.h +++ b/include/asm-parisc/checksum.h | |||
| @@ -65,7 +65,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) | |||
| 65 | "2:\n" | 65 | "2:\n" |
| 66 | : "=r" (sum), "=r" (iph), "=r" (ihl) | 66 | : "=r" (sum), "=r" (iph), "=r" (ihl) |
| 67 | : "1" (iph), "2" (ihl) | 67 | : "1" (iph), "2" (ihl) |
| 68 | : "r19", "r20", "r21" ); | 68 | : "r19", "r20", "r21", "memory"); |
| 69 | 69 | ||
| 70 | return (__force __sum16)sum; | 70 | return (__force __sum16)sum; |
| 71 | } | 71 | } |
diff --git a/include/asm-powerpc/kvm_ppc.h b/include/asm-powerpc/kvm_ppc.h index b35a7e3ef978..5a21115228af 100644 --- a/include/asm-powerpc/kvm_ppc.h +++ b/include/asm-powerpc/kvm_ppc.h | |||
| @@ -57,6 +57,7 @@ extern int kvmppc_handle_store(struct kvm_run *run, struct kvm_vcpu *vcpu, | |||
| 57 | 57 | ||
| 58 | extern int kvmppc_emulate_instruction(struct kvm_run *run, | 58 | extern int kvmppc_emulate_instruction(struct kvm_run *run, |
| 59 | struct kvm_vcpu *vcpu); | 59 | struct kvm_vcpu *vcpu); |
| 60 | extern int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu); | ||
| 60 | 61 | ||
| 61 | extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, | 62 | extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, |
| 62 | u64 asid, u32 flags); | 63 | u64 asid, u32 flags); |
diff --git a/include/asm-powerpc/mediabay.h b/include/asm-powerpc/mediabay.h index df111c362a7f..b2efb3325808 100644 --- a/include/asm-powerpc/mediabay.h +++ b/include/asm-powerpc/mediabay.h | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | #define MB_POWER 6 /* media bay contains a Power device (???) */ | 17 | #define MB_POWER 6 /* media bay contains a Power device (???) */ |
| 18 | #define MB_NO 7 /* media bay contains nothing */ | 18 | #define MB_NO 7 /* media bay contains nothing */ |
| 19 | 19 | ||
| 20 | int check_media_bay(struct device_node *which_bay, int what); | ||
| 21 | |||
| 22 | /* Number of bays in the machine or 0 */ | 20 | /* Number of bays in the machine or 0 */ |
| 23 | extern int media_bay_count; | 21 | extern int media_bay_count; |
| 24 | 22 | ||
| @@ -29,6 +27,16 @@ int check_media_bay_by_base(unsigned long base, int what); | |||
| 29 | /* called by IDE PMAC host driver to register IDE controller for media bay */ | 27 | /* called by IDE PMAC host driver to register IDE controller for media bay */ |
| 30 | int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base, | 28 | int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base, |
| 31 | int irq, ide_hwif_t *hwif); | 29 | int irq, ide_hwif_t *hwif); |
| 30 | |||
| 31 | int check_media_bay(struct device_node *which_bay, int what); | ||
| 32 | |||
| 33 | #else | ||
| 34 | |||
| 35 | static inline int check_media_bay(struct device_node *which_bay, int what) | ||
| 36 | { | ||
| 37 | return -ENODEV; | ||
| 38 | } | ||
| 39 | |||
| 32 | #endif | 40 | #endif |
| 33 | 41 | ||
| 34 | #endif /* __KERNEL__ */ | 42 | #endif /* __KERNEL__ */ |
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index 6abead6e681a..99348c1f4cab 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h | |||
| @@ -131,7 +131,6 @@ struct spu { | |||
| 131 | u64 flags; | 131 | u64 flags; |
| 132 | u64 class_0_pending; | 132 | u64 class_0_pending; |
| 133 | u64 class_0_dar; | 133 | u64 class_0_dar; |
| 134 | u64 class_0_dsisr; | ||
| 135 | u64 class_1_dar; | 134 | u64 class_1_dar; |
| 136 | u64 class_1_dsisr; | 135 | u64 class_1_dsisr; |
| 137 | size_t ls_size; | 136 | size_t ls_size; |
diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h index 129ec148d451..a40fd491250c 100644 --- a/include/asm-powerpc/spu_csa.h +++ b/include/asm-powerpc/spu_csa.h | |||
| @@ -254,7 +254,7 @@ struct spu_state { | |||
| 254 | u64 spu_chnldata_RW[32]; | 254 | u64 spu_chnldata_RW[32]; |
| 255 | u32 spu_mailbox_data[4]; | 255 | u32 spu_mailbox_data[4]; |
| 256 | u32 pu_mailbox_data[1]; | 256 | u32 pu_mailbox_data[1]; |
| 257 | u64 class_0_dar, class_0_dsisr, class_0_pending; | 257 | u64 class_0_dar, class_0_pending; |
| 258 | u64 class_1_dar, class_1_dsisr; | 258 | u64 class_1_dar, class_1_dsisr; |
| 259 | unsigned long suspend_time; | 259 | unsigned long suspend_time; |
| 260 | spinlock_t register_lock; | 260 | spinlock_t register_lock; |
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h index 2b6559a6d113..5235f875b932 100644 --- a/include/asm-powerpc/system.h +++ b/include/asm-powerpc/system.h | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | * SMP since it is only used to order updates to system memory. | 34 | * SMP since it is only used to order updates to system memory. |
| 35 | */ | 35 | */ |
| 36 | #define mb() __asm__ __volatile__ ("sync" : : : "memory") | 36 | #define mb() __asm__ __volatile__ ("sync" : : : "memory") |
| 37 | #define rmb() __asm__ __volatile__ (__stringify(LWSYNC) : : : "memory") | 37 | #define rmb() __asm__ __volatile__ ("sync" : : : "memory") |
| 38 | #define wmb() __asm__ __volatile__ ("sync" : : : "memory") | 38 | #define wmb() __asm__ __volatile__ ("sync" : : : "memory") |
| 39 | #define read_barrier_depends() do { } while(0) | 39 | #define read_barrier_depends() do { } while(0) |
| 40 | 40 | ||
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 93b98856007a..b6fbb2573e88 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -166,6 +166,9 @@ unifdef-y += acct.h | |||
| 166 | unifdef-y += adb.h | 166 | unifdef-y += adb.h |
| 167 | unifdef-y += adfs_fs.h | 167 | unifdef-y += adfs_fs.h |
| 168 | unifdef-y += agpgart.h | 168 | unifdef-y += agpgart.h |
| 169 | ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) | ||
| 170 | unifdef-y += a.out.h | ||
| 171 | endif | ||
| 169 | unifdef-y += apm_bios.h | 172 | unifdef-y += apm_bios.h |
| 170 | unifdef-y += atalk.h | 173 | unifdef-y += atalk.h |
| 171 | unifdef-y += atmdev.h | 174 | unifdef-y += atmdev.h |
diff --git a/include/linux/a.out.h b/include/linux/a.out.h index 208f4e8ed304..e86dfca44589 100644 --- a/include/linux/a.out.h +++ b/include/linux/a.out.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef __A_OUT_GNU_H__ | 1 | #ifndef __A_OUT_GNU_H__ |
| 2 | #define __A_OUT_GNU_H__ | 2 | #define __A_OUT_GNU_H__ |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_ARCH_SUPPORTS_AOUT | ||
| 5 | |||
| 6 | #define __GNU_EXEC_MACROS__ | 4 | #define __GNU_EXEC_MACROS__ |
| 7 | 5 | ||
| 8 | #ifndef __STRUCT_EXEC_OVERRIDE__ | 6 | #ifndef __STRUCT_EXEC_OVERRIDE__ |
| @@ -277,10 +275,4 @@ struct relocation_info | |||
| 277 | #endif /* no N_RELOCATION_INFO_DECLARED. */ | 275 | #endif /* no N_RELOCATION_INFO_DECLARED. */ |
| 278 | 276 | ||
| 279 | #endif /*__ASSEMBLY__ */ | 277 | #endif /*__ASSEMBLY__ */ |
| 280 | #else /* CONFIG_ARCH_SUPPORTS_AOUT */ | ||
| 281 | #ifndef __ASSEMBLY__ | ||
| 282 | struct exec { | ||
| 283 | }; | ||
| 284 | #endif | ||
| 285 | #endif /* CONFIG_ARCH_SUPPORTS_AOUT */ | ||
| 286 | #endif /* __A_OUT_GNU_H__ */ | 278 | #endif /* __A_OUT_GNU_H__ */ |
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 51e6b1e520e6..dcf77fa826b5 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h | |||
| @@ -82,6 +82,7 @@ struct cpuidle_state_kobj { | |||
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| 84 | struct cpuidle_device { | 84 | struct cpuidle_device { |
| 85 | unsigned int registered:1; | ||
| 85 | unsigned int enabled:1; | 86 | unsigned int enabled:1; |
| 86 | unsigned int cpu; | 87 | unsigned int cpu; |
| 87 | 88 | ||
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index d5d40a9f7929..c6801bffe76d 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
| @@ -53,14 +53,14 @@ struct resource_list { | |||
| 53 | #define IORESOURCE_AUTO 0x40000000 | 53 | #define IORESOURCE_AUTO 0x40000000 |
| 54 | #define IORESOURCE_BUSY 0x80000000 /* Driver has marked this resource busy */ | 54 | #define IORESOURCE_BUSY 0x80000000 /* Driver has marked this resource busy */ |
| 55 | 55 | ||
| 56 | /* ISA PnP IRQ specific bits (IORESOURCE_BITS) */ | 56 | /* PnP IRQ specific bits (IORESOURCE_BITS) */ |
| 57 | #define IORESOURCE_IRQ_HIGHEDGE (1<<0) | 57 | #define IORESOURCE_IRQ_HIGHEDGE (1<<0) |
| 58 | #define IORESOURCE_IRQ_LOWEDGE (1<<1) | 58 | #define IORESOURCE_IRQ_LOWEDGE (1<<1) |
| 59 | #define IORESOURCE_IRQ_HIGHLEVEL (1<<2) | 59 | #define IORESOURCE_IRQ_HIGHLEVEL (1<<2) |
| 60 | #define IORESOURCE_IRQ_LOWLEVEL (1<<3) | 60 | #define IORESOURCE_IRQ_LOWLEVEL (1<<3) |
| 61 | #define IORESOURCE_IRQ_SHAREABLE (1<<4) | 61 | #define IORESOURCE_IRQ_SHAREABLE (1<<4) |
| 62 | 62 | ||
| 63 | /* ISA PnP DMA specific bits (IORESOURCE_BITS) */ | 63 | /* PnP DMA specific bits (IORESOURCE_BITS) */ |
| 64 | #define IORESOURCE_DMA_TYPE_MASK (3<<0) | 64 | #define IORESOURCE_DMA_TYPE_MASK (3<<0) |
| 65 | #define IORESOURCE_DMA_8BIT (0<<0) | 65 | #define IORESOURCE_DMA_8BIT (0<<0) |
| 66 | #define IORESOURCE_DMA_8AND16BIT (1<<0) | 66 | #define IORESOURCE_DMA_8AND16BIT (1<<0) |
| @@ -76,7 +76,7 @@ struct resource_list { | |||
| 76 | #define IORESOURCE_DMA_TYPEB (2<<6) | 76 | #define IORESOURCE_DMA_TYPEB (2<<6) |
| 77 | #define IORESOURCE_DMA_TYPEF (3<<6) | 77 | #define IORESOURCE_DMA_TYPEF (3<<6) |
| 78 | 78 | ||
| 79 | /* ISA PnP memory I/O specific bits (IORESOURCE_BITS) */ | 79 | /* PnP memory I/O specific bits (IORESOURCE_BITS) */ |
| 80 | #define IORESOURCE_MEM_WRITEABLE (1<<0) /* dup: IORESOURCE_READONLY */ | 80 | #define IORESOURCE_MEM_WRITEABLE (1<<0) /* dup: IORESOURCE_READONLY */ |
| 81 | #define IORESOURCE_MEM_CACHEABLE (1<<1) /* dup: IORESOURCE_CACHEABLE */ | 81 | #define IORESOURCE_MEM_CACHEABLE (1<<1) /* dup: IORESOURCE_CACHEABLE */ |
| 82 | #define IORESOURCE_MEM_RANGELENGTH (1<<2) /* dup: IORESOURCE_RANGELENGTH */ | 82 | #define IORESOURCE_MEM_RANGELENGTH (1<<2) /* dup: IORESOURCE_RANGELENGTH */ |
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 10b666b61add..cde056e08181 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -396,8 +396,10 @@ static inline struct request_sock *inet6_reqsk_alloc(struct request_sock_ops *op | |||
| 396 | { | 396 | { |
| 397 | struct request_sock *req = reqsk_alloc(ops); | 397 | struct request_sock *req = reqsk_alloc(ops); |
| 398 | 398 | ||
| 399 | if (req != NULL) | 399 | if (req != NULL) { |
| 400 | inet_rsk(req)->inet6_rsk_offset = inet6_rsk_offset(req); | 400 | inet_rsk(req)->inet6_rsk_offset = inet6_rsk_offset(req); |
| 401 | inet6_rsk(req)->pktopts = NULL; | ||
| 402 | } | ||
| 401 | 403 | ||
| 402 | return req; | 404 | return req; |
| 403 | } | 405 | } |
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 398978972b7a..092b1b25291d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
| @@ -297,7 +297,7 @@ static inline gpa_t gfn_to_gpa(gfn_t gfn) | |||
| 297 | return (gpa_t)gfn << PAGE_SHIFT; | 297 | return (gpa_t)gfn << PAGE_SHIFT; |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | static inline void kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) | 300 | static inline void kvm_migrate_timers(struct kvm_vcpu *vcpu) |
| 301 | { | 301 | { |
| 302 | set_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests); | 302 | set_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests); |
| 303 | } | 303 | } |
diff --git a/include/linux/math64.h b/include/linux/math64.h index c1a5f81501ff..c87f1528703a 100644 --- a/include/linux/math64.h +++ b/include/linux/math64.h | |||
| @@ -81,4 +81,25 @@ static inline s64 div_s64(s64 dividend, s32 divisor) | |||
| 81 | } | 81 | } |
| 82 | #endif | 82 | #endif |
| 83 | 83 | ||
| 84 | u32 iter_div_u64_rem(u64 dividend, u32 divisor, u64 *remainder); | ||
| 85 | |||
| 86 | static __always_inline u32 | ||
| 87 | __iter_div_u64_rem(u64 dividend, u32 divisor, u64 *remainder) | ||
| 88 | { | ||
| 89 | u32 ret = 0; | ||
| 90 | |||
| 91 | while (dividend >= divisor) { | ||
| 92 | /* The following asm() prevents the compiler from | ||
| 93 | optimising this loop into a modulo operation. */ | ||
| 94 | asm("" : "+rm"(dividend)); | ||
| 95 | |||
| 96 | dividend -= divisor; | ||
| 97 | ret++; | ||
| 98 | } | ||
| 99 | |||
| 100 | *remainder = dividend; | ||
| 101 | |||
| 102 | return ret; | ||
| 103 | } | ||
| 104 | |||
| 84 | #endif /* _LINUX_MATH64_H */ | 105 | #endif /* _LINUX_MATH64_H */ |
diff --git a/include/linux/mm.h b/include/linux/mm.h index c31a9cd2a30e..586a943cab01 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -760,16 +760,17 @@ unsigned long unmap_vmas(struct mmu_gather **tlb, | |||
| 760 | * (see walk_page_range for more details) | 760 | * (see walk_page_range for more details) |
| 761 | */ | 761 | */ |
| 762 | struct mm_walk { | 762 | struct mm_walk { |
| 763 | int (*pgd_entry)(pgd_t *, unsigned long, unsigned long, void *); | 763 | int (*pgd_entry)(pgd_t *, unsigned long, unsigned long, struct mm_walk *); |
| 764 | int (*pud_entry)(pud_t *, unsigned long, unsigned long, void *); | 764 | int (*pud_entry)(pud_t *, unsigned long, unsigned long, struct mm_walk *); |
| 765 | int (*pmd_entry)(pmd_t *, unsigned long, unsigned long, void *); | 765 | int (*pmd_entry)(pmd_t *, unsigned long, unsigned long, struct mm_walk *); |
| 766 | int (*pte_entry)(pte_t *, unsigned long, unsigned long, void *); | 766 | int (*pte_entry)(pte_t *, unsigned long, unsigned long, struct mm_walk *); |
| 767 | int (*pte_hole)(unsigned long, unsigned long, void *); | 767 | int (*pte_hole)(unsigned long, unsigned long, struct mm_walk *); |
| 768 | struct mm_struct *mm; | ||
| 769 | void *private; | ||
| 768 | }; | 770 | }; |
| 769 | 771 | ||
| 770 | int walk_page_range(const struct mm_struct *, unsigned long addr, | 772 | int walk_page_range(unsigned long addr, unsigned long end, |
| 771 | unsigned long end, const struct mm_walk *walk, | 773 | struct mm_walk *walk); |
| 772 | void *private); | ||
| 773 | void free_pgd_range(struct mmu_gather **tlb, unsigned long addr, | 774 | void free_pgd_range(struct mmu_gather **tlb, unsigned long addr, |
| 774 | unsigned long end, unsigned long floor, unsigned long ceiling); | 775 | unsigned long end, unsigned long floor, unsigned long ceiling); |
| 775 | void free_pgtables(struct mmu_gather **tlb, struct vm_area_struct *start_vma, | 776 | void free_pgtables(struct mmu_gather **tlb, struct vm_area_struct *start_vma, |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 509159bcd4e7..d18b1dd49fab 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -206,6 +206,7 @@ struct pci_dev { | |||
| 206 | struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ | 206 | struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ |
| 207 | int rom_attr_enabled; /* has display of the rom attribute been enabled? */ | 207 | int rom_attr_enabled; /* has display of the rom attribute been enabled? */ |
| 208 | struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ | 208 | struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ |
| 209 | struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */ | ||
| 209 | #ifdef CONFIG_PCI_MSI | 210 | #ifdef CONFIG_PCI_MSI |
| 210 | struct list_head msi_list; | 211 | struct list_head msi_list; |
| 211 | #endif | 212 | #endif |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9b940e644179..eafc9d6d2b35 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -716,6 +716,7 @@ | |||
| 716 | #define PCI_DEVICE_ID_HP_CISSA 0x3220 | 716 | #define PCI_DEVICE_ID_HP_CISSA 0x3220 |
| 717 | #define PCI_DEVICE_ID_HP_CISSC 0x3230 | 717 | #define PCI_DEVICE_ID_HP_CISSC 0x3230 |
| 718 | #define PCI_DEVICE_ID_HP_CISSD 0x3238 | 718 | #define PCI_DEVICE_ID_HP_CISSD 0x3238 |
| 719 | #define PCI_DEVICE_ID_HP_CISSE 0x323a | ||
| 719 | #define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031 | 720 | #define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031 |
| 720 | 721 | ||
| 721 | #define PCI_VENDOR_ID_PCTECH 0x1042 | 722 | #define PCI_VENDOR_ID_PCTECH 0x1042 |
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 9883bc942262..fff1d27ddb4c 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
| @@ -9,6 +9,8 @@ | |||
| 9 | 9 | ||
| 10 | struct net; | 10 | struct net; |
| 11 | struct completion; | 11 | struct completion; |
| 12 | struct mm_struct; | ||
| 13 | |||
| 12 | /* | 14 | /* |
| 13 | * The proc filesystem constants/structures | 15 | * The proc filesystem constants/structures |
| 14 | */ | 16 | */ |
| @@ -101,8 +103,6 @@ extern spinlock_t proc_subdir_lock; | |||
| 101 | extern void proc_root_init(void); | 103 | extern void proc_root_init(void); |
| 102 | extern void proc_misc_init(void); | 104 | extern void proc_misc_init(void); |
| 103 | 105 | ||
| 104 | struct mm_struct; | ||
| 105 | |||
| 106 | void proc_flush_task(struct task_struct *task); | 106 | void proc_flush_task(struct task_struct *task); |
| 107 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *); | 107 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *); |
| 108 | int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir); | 108 | int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir); |
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index a2aec2c0cfb5..b358c704d102 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
| @@ -246,6 +246,7 @@ enum rt_class_t | |||
| 246 | { | 246 | { |
| 247 | RT_TABLE_UNSPEC=0, | 247 | RT_TABLE_UNSPEC=0, |
| 248 | /* User defined values */ | 248 | /* User defined values */ |
| 249 | RT_TABLE_COMPAT=252, | ||
| 249 | RT_TABLE_DEFAULT=253, | 250 | RT_TABLE_DEFAULT=253, |
| 250 | RT_TABLE_MAIN=254, | 251 | RT_TABLE_MAIN=254, |
| 251 | RT_TABLE_LOCAL=255, | 252 | RT_TABLE_LOCAL=255, |
diff --git a/include/linux/sched.h b/include/linux/sched.h index ae0be3c62375..c5d3f847ca8d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -2026,6 +2026,19 @@ static inline int fatal_signal_pending(struct task_struct *p) | |||
| 2026 | return signal_pending(p) && __fatal_signal_pending(p); | 2026 | return signal_pending(p) && __fatal_signal_pending(p); |
| 2027 | } | 2027 | } |
| 2028 | 2028 | ||
| 2029 | static inline int signal_pending_state(long state, struct task_struct *p) | ||
| 2030 | { | ||
| 2031 | if (!(state & (TASK_INTERRUPTIBLE | TASK_WAKEKILL))) | ||
| 2032 | return 0; | ||
| 2033 | if (!signal_pending(p)) | ||
| 2034 | return 0; | ||
| 2035 | |||
| 2036 | if (state & (__TASK_STOPPED | __TASK_TRACED)) | ||
| 2037 | return 0; | ||
| 2038 | |||
| 2039 | return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); | ||
| 2040 | } | ||
| 2041 | |||
| 2029 | static inline int need_resched(void) | 2042 | static inline int need_resched(void) |
| 2030 | { | 2043 | { |
| 2031 | return unlikely(test_thread_flag(TIF_NEED_RESCHED)); | 2044 | return unlikely(test_thread_flag(TIF_NEED_RESCHED)); |
diff --git a/include/linux/ssb/ssb_driver_gige.h b/include/linux/ssb/ssb_driver_gige.h index 01fbdf5fef22..942e38736901 100644 --- a/include/linux/ssb/ssb_driver_gige.h +++ b/include/linux/ssb/ssb_driver_gige.h | |||
| @@ -100,7 +100,7 @@ extern char * nvram_get(const char *name); | |||
| 100 | /* Get the device MAC address */ | 100 | /* Get the device MAC address */ |
| 101 | static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) | 101 | static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) |
| 102 | { | 102 | { |
| 103 | #ifdef CONFIG_BCM947XX | 103 | #ifdef CONFIG_BCM47XX |
| 104 | char *res = nvram_get("et0macaddr"); | 104 | char *res = nvram_get("et0macaddr"); |
| 105 | if (res) | 105 | if (res) |
| 106 | memcpy(macaddr, res, 6); | 106 | memcpy(macaddr, res, 6); |
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 18e62e3d406f..b31b6b74aa28 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
| @@ -239,11 +239,6 @@ static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req) | |||
| 239 | return (struct tcp_request_sock *)req; | 239 | return (struct tcp_request_sock *)req; |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | struct tcp_deferred_accept_info { | ||
| 243 | struct sock *listen_sk; | ||
| 244 | struct request_sock *request; | ||
| 245 | }; | ||
| 246 | |||
| 247 | struct tcp_sock { | 242 | struct tcp_sock { |
| 248 | /* inet_connection_sock has to be the first member of tcp_sock */ | 243 | /* inet_connection_sock has to be the first member of tcp_sock */ |
| 249 | struct inet_connection_sock inet_conn; | 244 | struct inet_connection_sock inet_conn; |
| @@ -379,8 +374,6 @@ struct tcp_sock { | |||
| 379 | unsigned int keepalive_intvl; /* time interval between keep alive probes */ | 374 | unsigned int keepalive_intvl; /* time interval between keep alive probes */ |
| 380 | int linger2; | 375 | int linger2; |
| 381 | 376 | ||
| 382 | struct tcp_deferred_accept_info defer_tcp_accept; | ||
| 383 | |||
| 384 | unsigned long last_synq_overflow; | 377 | unsigned long last_synq_overflow; |
| 385 | 378 | ||
| 386 | u32 tso_deferred; | 379 | u32 tso_deferred; |
diff --git a/include/linux/time.h b/include/linux/time.h index d32ef0ad4c0a..e15206a7e82e 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
| 7 | # include <linux/cache.h> | 7 | # include <linux/cache.h> |
| 8 | # include <linux/seqlock.h> | 8 | # include <linux/seqlock.h> |
| 9 | # include <linux/math64.h> | ||
| 9 | #endif | 10 | #endif |
| 10 | 11 | ||
| 11 | #ifndef _STRUCT_TIMESPEC | 12 | #ifndef _STRUCT_TIMESPEC |
| @@ -169,18 +170,13 @@ extern struct timeval ns_to_timeval(const s64 nsec); | |||
| 169 | * timespec_add_ns - Adds nanoseconds to a timespec | 170 | * timespec_add_ns - Adds nanoseconds to a timespec |
| 170 | * @a: pointer to timespec to be incremented | 171 | * @a: pointer to timespec to be incremented |
| 171 | * @ns: unsigned nanoseconds value to be added | 172 | * @ns: unsigned nanoseconds value to be added |
| 173 | * | ||
| 174 | * This must always be inlined because its used from the x86-64 vdso, | ||
| 175 | * which cannot call other kernel functions. | ||
| 172 | */ | 176 | */ |
| 173 | static inline void timespec_add_ns(struct timespec *a, u64 ns) | 177 | static __always_inline void timespec_add_ns(struct timespec *a, u64 ns) |
| 174 | { | 178 | { |
| 175 | ns += a->tv_nsec; | 179 | a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns); |
| 176 | while(unlikely(ns >= NSEC_PER_SEC)) { | ||
| 177 | /* The following asm() prevents the compiler from | ||
| 178 | * optimising this loop into a modulo operation. */ | ||
| 179 | asm("" : "+r"(ns)); | ||
| 180 | |||
| 181 | ns -= NSEC_PER_SEC; | ||
| 182 | a->tv_sec++; | ||
| 183 | } | ||
| 184 | a->tv_nsec = ns; | 180 | a->tv_nsec = ns; |
| 185 | } | 181 | } |
| 186 | #endif /* __KERNEL__ */ | 182 | #endif /* __KERNEL__ */ |
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 9405aa6cdf26..38c0571820fb 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h | |||
| @@ -38,7 +38,7 @@ struct virtio_net_hdr | |||
| 38 | #define VIRTIO_NET_HDR_GSO_ECN 0x80 // TCP has ECN set | 38 | #define VIRTIO_NET_HDR_GSO_ECN 0x80 // TCP has ECN set |
| 39 | __u8 gso_type; | 39 | __u8 gso_type; |
| 40 | __u16 hdr_len; /* Ethernet + IP + tcp/udp hdrs */ | 40 | __u16 hdr_len; /* Ethernet + IP + tcp/udp hdrs */ |
| 41 | __u16 gso_size; /* Bytes to append to gso_hdr_len per frame */ | 41 | __u16 gso_size; /* Bytes to append to hdr_len per frame */ |
| 42 | __u16 csum_start; /* Position to start checksumming from */ | 42 | __u16 csum_start; /* Position to start checksumming from */ |
| 43 | __u16 csum_offset; /* Offset after that to place checksum */ | 43 | __u16 csum_offset; /* Offset after that to place checksum */ |
| 44 | }; | 44 | }; |
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index a42cd63d241a..9fabe5b38912 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h | |||
| @@ -197,4 +197,14 @@ static inline int inet_iif(const struct sk_buff *skb) | |||
| 197 | return skb->rtable->rt_iif; | 197 | return skb->rtable->rt_iif; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops) | ||
| 201 | { | ||
| 202 | struct request_sock *req = reqsk_alloc(ops); | ||
| 203 | |||
| 204 | if (req != NULL) | ||
| 205 | inet_rsk(req)->opt = NULL; | ||
| 206 | |||
| 207 | return req; | ||
| 208 | } | ||
| 209 | |||
| 200 | #endif /* _INET_SOCK_H */ | 210 | #endif /* _INET_SOCK_H */ |
diff --git a/include/net/request_sock.h b/include/net/request_sock.h index b220b5f624de..0c96e7bed5db 100644 --- a/include/net/request_sock.h +++ b/include/net/request_sock.h | |||
| @@ -115,8 +115,8 @@ struct request_sock_queue { | |||
| 115 | struct request_sock *rskq_accept_head; | 115 | struct request_sock *rskq_accept_head; |
| 116 | struct request_sock *rskq_accept_tail; | 116 | struct request_sock *rskq_accept_tail; |
| 117 | rwlock_t syn_wait_lock; | 117 | rwlock_t syn_wait_lock; |
| 118 | u16 rskq_defer_accept; | 118 | u8 rskq_defer_accept; |
| 119 | /* 2 bytes hole, try to pack */ | 119 | /* 3 bytes hole, try to pack */ |
| 120 | struct listen_sock *listen_opt; | 120 | struct listen_sock *listen_opt; |
| 121 | }; | 121 | }; |
| 122 | 122 | ||
diff --git a/include/net/tcp.h b/include/net/tcp.h index 633147cb6bbc..cf54034019d9 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -139,7 +139,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo); | |||
| 139 | #define MAX_TCP_KEEPINTVL 32767 | 139 | #define MAX_TCP_KEEPINTVL 32767 |
| 140 | #define MAX_TCP_KEEPCNT 127 | 140 | #define MAX_TCP_KEEPCNT 127 |
| 141 | #define MAX_TCP_SYNCNT 127 | 141 | #define MAX_TCP_SYNCNT 127 |
| 142 | #define MAX_TCP_ACCEPT_DEFERRED 65535 | ||
| 143 | 142 | ||
| 144 | #define TCP_SYNQ_INTERVAL (HZ/5) /* Period of SYNACK timer */ | 143 | #define TCP_SYNQ_INTERVAL (HZ/5) /* Period of SYNACK timer */ |
| 145 | 144 | ||
| @@ -433,7 +432,6 @@ extern struct sk_buff * tcp_make_synack(struct sock *sk, | |||
| 433 | 432 | ||
| 434 | extern int tcp_disconnect(struct sock *sk, int flags); | 433 | extern int tcp_disconnect(struct sock *sk, int flags); |
| 435 | 434 | ||
| 436 | extern void tcp_unhash(struct sock *sk); | ||
| 437 | 435 | ||
| 438 | /* From syncookies.c */ | 436 | /* From syncookies.c */ |
| 439 | extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS]; | 437 | extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS]; |
| @@ -1058,16 +1058,16 @@ asmlinkage long sys_shmdt(char __user *shmaddr) | |||
| 1058 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it) | 1058 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it) |
| 1059 | { | 1059 | { |
| 1060 | struct shmid_kernel *shp = it; | 1060 | struct shmid_kernel *shp = it; |
| 1061 | char *format; | ||
| 1062 | 1061 | ||
| 1063 | #define SMALL_STRING "%10d %10d %4o %10u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n" | 1062 | #if BITS_PER_LONG <= 32 |
| 1064 | #define BIG_STRING "%10d %10d %4o %21u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n" | 1063 | #define SIZE_SPEC "%10lu" |
| 1064 | #else | ||
| 1065 | #define SIZE_SPEC "%21lu" | ||
| 1066 | #endif | ||
| 1065 | 1067 | ||
| 1066 | if (sizeof(size_t) <= sizeof(int)) | 1068 | return seq_printf(s, |
| 1067 | format = SMALL_STRING; | 1069 | "%10d %10d %4o " SIZE_SPEC " %5u %5u " |
| 1068 | else | 1070 | "%5lu %5u %5u %5u %5u %10lu %10lu %10lu\n", |
| 1069 | format = BIG_STRING; | ||
| 1070 | return seq_printf(s, format, | ||
| 1071 | shp->shm_perm.key, | 1071 | shp->shm_perm.key, |
| 1072 | shp->shm_perm.id, | 1072 | shp->shm_perm.id, |
| 1073 | shp->shm_perm.mode, | 1073 | shp->shm_perm.mode, |
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 1e0250cb9486..d4998f81e229 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
| @@ -699,8 +699,9 @@ static int __register_kprobes(struct kprobe **kps, int num, | |||
| 699 | return -EINVAL; | 699 | return -EINVAL; |
| 700 | for (i = 0; i < num; i++) { | 700 | for (i = 0; i < num; i++) { |
| 701 | ret = __register_kprobe(kps[i], called_from); | 701 | ret = __register_kprobe(kps[i], called_from); |
| 702 | if (ret < 0 && i > 0) { | 702 | if (ret < 0) { |
| 703 | unregister_kprobes(kps, i); | 703 | if (i > 0) |
| 704 | unregister_kprobes(kps, i); | ||
| 704 | break; | 705 | break; |
| 705 | } | 706 | } |
| 706 | } | 707 | } |
| @@ -776,8 +777,9 @@ static int __register_jprobes(struct jprobe **jps, int num, | |||
| 776 | jp->kp.break_handler = longjmp_break_handler; | 777 | jp->kp.break_handler = longjmp_break_handler; |
| 777 | ret = __register_kprobe(&jp->kp, called_from); | 778 | ret = __register_kprobe(&jp->kp, called_from); |
| 778 | } | 779 | } |
| 779 | if (ret < 0 && i > 0) { | 780 | if (ret < 0) { |
| 780 | unregister_jprobes(jps, i); | 781 | if (i > 0) |
| 782 | unregister_jprobes(jps, i); | ||
| 781 | break; | 783 | break; |
| 782 | } | 784 | } |
| 783 | } | 785 | } |
| @@ -920,8 +922,9 @@ static int __register_kretprobes(struct kretprobe **rps, int num, | |||
| 920 | return -EINVAL; | 922 | return -EINVAL; |
| 921 | for (i = 0; i < num; i++) { | 923 | for (i = 0; i < num; i++) { |
| 922 | ret = __register_kretprobe(rps[i], called_from); | 924 | ret = __register_kretprobe(rps[i], called_from); |
| 923 | if (ret < 0 && i > 0) { | 925 | if (ret < 0) { |
| 924 | unregister_kretprobes(rps, i); | 926 | if (i > 0) |
| 927 | unregister_kretprobes(rps, i); | ||
| 925 | break; | 928 | break; |
| 926 | } | 929 | } |
| 927 | } | 930 | } |
diff --git a/kernel/sched.c b/kernel/sched.c index bfb8ad8ed171..eaf6751e7612 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -312,12 +312,15 @@ static DEFINE_SPINLOCK(task_group_lock); | |||
| 312 | #endif | 312 | #endif |
| 313 | 313 | ||
| 314 | /* | 314 | /* |
| 315 | * A weight of 0, 1 or ULONG_MAX can cause arithmetics problems. | 315 | * A weight of 0 or 1 can cause arithmetics problems. |
| 316 | * A weight of a cfs_rq is the sum of weights of which entities | ||
| 317 | * are queued on this cfs_rq, so a weight of a entity should not be | ||
| 318 | * too large, so as the shares value of a task group. | ||
| 316 | * (The default weight is 1024 - so there's no practical | 319 | * (The default weight is 1024 - so there's no practical |
| 317 | * limitation from this.) | 320 | * limitation from this.) |
| 318 | */ | 321 | */ |
| 319 | #define MIN_SHARES 2 | 322 | #define MIN_SHARES 2 |
| 320 | #define MAX_SHARES (ULONG_MAX - 1) | 323 | #define MAX_SHARES (1UL << 18) |
| 321 | 324 | ||
| 322 | static int init_task_group_load = INIT_TASK_GROUP_LOAD; | 325 | static int init_task_group_load = INIT_TASK_GROUP_LOAD; |
| 323 | #endif | 326 | #endif |
| @@ -1337,8 +1340,13 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, | |||
| 1337 | { | 1340 | { |
| 1338 | u64 tmp; | 1341 | u64 tmp; |
| 1339 | 1342 | ||
| 1340 | if (!lw->inv_weight) | 1343 | if (!lw->inv_weight) { |
| 1341 | lw->inv_weight = 1 + (WMULT_CONST-lw->weight/2)/(lw->weight+1); | 1344 | if (BITS_PER_LONG > 32 && unlikely(lw->weight >= WMULT_CONST)) |
| 1345 | lw->inv_weight = 1; | ||
| 1346 | else | ||
| 1347 | lw->inv_weight = 1 + (WMULT_CONST-lw->weight/2) | ||
| 1348 | / (lw->weight+1); | ||
| 1349 | } | ||
| 1342 | 1350 | ||
| 1343 | tmp = (u64)delta_exec * weight; | 1351 | tmp = (u64)delta_exec * weight; |
| 1344 | /* | 1352 | /* |
| @@ -4159,12 +4167,10 @@ need_resched_nonpreemptible: | |||
| 4159 | clear_tsk_need_resched(prev); | 4167 | clear_tsk_need_resched(prev); |
| 4160 | 4168 | ||
| 4161 | if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) { | 4169 | if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) { |
| 4162 | if (unlikely((prev->state & TASK_INTERRUPTIBLE) && | 4170 | if (unlikely(signal_pending_state(prev->state, prev))) |
| 4163 | signal_pending(prev))) { | ||
| 4164 | prev->state = TASK_RUNNING; | 4171 | prev->state = TASK_RUNNING; |
| 4165 | } else { | 4172 | else |
| 4166 | deactivate_task(rq, prev, 1); | 4173 | deactivate_task(rq, prev, 1); |
| 4167 | } | ||
| 4168 | switch_count = &prev->nvcsw; | 4174 | switch_count = &prev->nvcsw; |
| 4169 | } | 4175 | } |
| 4170 | 4176 | ||
diff --git a/lib/div64.c b/lib/div64.c index bb5bd0c0f030..a111eb8de9cf 100644 --- a/lib/div64.c +++ b/lib/div64.c | |||
| @@ -98,3 +98,13 @@ EXPORT_SYMBOL(div64_u64); | |||
| 98 | #endif | 98 | #endif |
| 99 | 99 | ||
| 100 | #endif /* BITS_PER_LONG == 32 */ | 100 | #endif /* BITS_PER_LONG == 32 */ |
| 101 | |||
| 102 | /* | ||
| 103 | * Iterative div/mod for use when dividend is not expected to be much | ||
| 104 | * bigger than divisor. | ||
| 105 | */ | ||
| 106 | u32 iter_div_u64_rem(u64 dividend, u32 divisor, u64 *remainder) | ||
| 107 | { | ||
| 108 | return __iter_div_u64_rem(dividend, divisor, remainder); | ||
| 109 | } | ||
| 110 | EXPORT_SYMBOL(iter_div_u64_rem); | ||
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index bd521716ab1a..169a2f8dabcc 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c | |||
| @@ -88,6 +88,57 @@ static inline gfp_t root_gfp_mask(struct radix_tree_root *root) | |||
| 88 | return root->gfp_mask & __GFP_BITS_MASK; | 88 | return root->gfp_mask & __GFP_BITS_MASK; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | static inline void tag_set(struct radix_tree_node *node, unsigned int tag, | ||
| 92 | int offset) | ||
| 93 | { | ||
| 94 | __set_bit(offset, node->tags[tag]); | ||
| 95 | } | ||
| 96 | |||
| 97 | static inline void tag_clear(struct radix_tree_node *node, unsigned int tag, | ||
| 98 | int offset) | ||
| 99 | { | ||
| 100 | __clear_bit(offset, node->tags[tag]); | ||
| 101 | } | ||
| 102 | |||
| 103 | static inline int tag_get(struct radix_tree_node *node, unsigned int tag, | ||
| 104 | int offset) | ||
| 105 | { | ||
| 106 | return test_bit(offset, node->tags[tag]); | ||
| 107 | } | ||
| 108 | |||
| 109 | static inline void root_tag_set(struct radix_tree_root *root, unsigned int tag) | ||
| 110 | { | ||
| 111 | root->gfp_mask |= (__force gfp_t)(1 << (tag + __GFP_BITS_SHIFT)); | ||
| 112 | } | ||
| 113 | |||
| 114 | static inline void root_tag_clear(struct radix_tree_root *root, unsigned int tag) | ||
| 115 | { | ||
| 116 | root->gfp_mask &= (__force gfp_t)~(1 << (tag + __GFP_BITS_SHIFT)); | ||
| 117 | } | ||
| 118 | |||
| 119 | static inline void root_tag_clear_all(struct radix_tree_root *root) | ||
| 120 | { | ||
| 121 | root->gfp_mask &= __GFP_BITS_MASK; | ||
| 122 | } | ||
| 123 | |||
| 124 | static inline int root_tag_get(struct radix_tree_root *root, unsigned int tag) | ||
| 125 | { | ||
| 126 | return (__force unsigned)root->gfp_mask & (1 << (tag + __GFP_BITS_SHIFT)); | ||
| 127 | } | ||
| 128 | |||
| 129 | /* | ||
| 130 | * Returns 1 if any slot in the node has this tag set. | ||
| 131 | * Otherwise returns 0. | ||
| 132 | */ | ||
| 133 | static inline int any_tag_set(struct radix_tree_node *node, unsigned int tag) | ||
| 134 | { | ||
| 135 | int idx; | ||
| 136 | for (idx = 0; idx < RADIX_TREE_TAG_LONGS; idx++) { | ||
| 137 | if (node->tags[tag][idx]) | ||
| 138 | return 1; | ||
| 139 | } | ||
| 140 | return 0; | ||
| 141 | } | ||
| 91 | /* | 142 | /* |
| 92 | * This assumes that the caller has performed appropriate preallocation, and | 143 | * This assumes that the caller has performed appropriate preallocation, and |
| 93 | * that the caller has pinned this thread of control to the current CPU. | 144 | * that the caller has pinned this thread of control to the current CPU. |
| @@ -124,6 +175,17 @@ static void radix_tree_node_rcu_free(struct rcu_head *head) | |||
| 124 | { | 175 | { |
| 125 | struct radix_tree_node *node = | 176 | struct radix_tree_node *node = |
| 126 | container_of(head, struct radix_tree_node, rcu_head); | 177 | container_of(head, struct radix_tree_node, rcu_head); |
| 178 | |||
| 179 | /* | ||
| 180 | * must only free zeroed nodes into the slab. radix_tree_shrink | ||
| 181 | * can leave us with a non-NULL entry in the first slot, so clear | ||
| 182 | * that here to make sure. | ||
| 183 | */ | ||
| 184 | tag_clear(node, 0, 0); | ||
| 185 | tag_clear(node, 1, 0); | ||
| 186 | node->slots[0] = NULL; | ||
| 187 | node->count = 0; | ||
| 188 | |||
| 127 | kmem_cache_free(radix_tree_node_cachep, node); | 189 | kmem_cache_free(radix_tree_node_cachep, node); |
| 128 | } | 190 | } |
| 129 | 191 | ||
| @@ -165,59 +227,6 @@ out: | |||
| 165 | } | 227 | } |
| 166 | EXPORT_SYMBOL(radix_tree_preload); | 228 | EXPORT_SYMBOL(radix_tree_preload); |
| 167 | 229 | ||
| 168 | static inline void tag_set(struct radix_tree_node *node, unsigned int tag, | ||
| 169 | int offset) | ||
| 170 | { | ||
| 171 | __set_bit(offset, node->tags[tag]); | ||
| 172 | } | ||
| 173 | |||
| 174 | static inline void tag_clear(struct radix_tree_node *node, unsigned int tag, | ||
| 175 | int offset) | ||
| 176 | { | ||
| 177 | __clear_bit(offset, node->tags[tag]); | ||
| 178 | } | ||
| 179 | |||
| 180 | static inline int tag_get(struct radix_tree_node *node, unsigned int tag, | ||
| 181 | int offset) | ||
| 182 | { | ||
| 183 | return test_bit(offset, node->tags[tag]); | ||
| 184 | } | ||
| 185 | |||
| 186 | static inline void root_tag_set(struct radix_tree_root *root, unsigned int tag) | ||
| 187 | { | ||
| 188 | root->gfp_mask |= (__force gfp_t)(1 << (tag + __GFP_BITS_SHIFT)); | ||
| 189 | } | ||
| 190 | |||
| 191 | |||
| 192 | static inline void root_tag_clear(struct radix_tree_root *root, unsigned int tag) | ||
| 193 | { | ||
| 194 | root->gfp_mask &= (__force gfp_t)~(1 << (tag + __GFP_BITS_SHIFT)); | ||
| 195 | } | ||
| 196 | |||
| 197 | static inline void root_tag_clear_all(struct radix_tree_root *root) | ||
| 198 | { | ||
| 199 | root->gfp_mask &= __GFP_BITS_MASK; | ||
| 200 | } | ||
| 201 | |||
| 202 | static inline int root_tag_get(struct radix_tree_root *root, unsigned int tag) | ||
| 203 | { | ||
| 204 | return (__force unsigned)root->gfp_mask & (1 << (tag + __GFP_BITS_SHIFT)); | ||
| 205 | } | ||
| 206 | |||
| 207 | /* | ||
| 208 | * Returns 1 if any slot in the node has this tag set. | ||
| 209 | * Otherwise returns 0. | ||
| 210 | */ | ||
| 211 | static inline int any_tag_set(struct radix_tree_node *node, unsigned int tag) | ||
| 212 | { | ||
| 213 | int idx; | ||
| 214 | for (idx = 0; idx < RADIX_TREE_TAG_LONGS; idx++) { | ||
| 215 | if (node->tags[tag][idx]) | ||
| 216 | return 1; | ||
| 217 | } | ||
| 218 | return 0; | ||
| 219 | } | ||
| 220 | |||
| 221 | /* | 230 | /* |
| 222 | * Return the maximum key which can be store into a | 231 | * Return the maximum key which can be store into a |
| 223 | * radix tree with height HEIGHT. | 232 | * radix tree with height HEIGHT. |
| @@ -930,11 +939,6 @@ static inline void radix_tree_shrink(struct radix_tree_root *root) | |||
| 930 | newptr = radix_tree_ptr_to_indirect(newptr); | 939 | newptr = radix_tree_ptr_to_indirect(newptr); |
| 931 | root->rnode = newptr; | 940 | root->rnode = newptr; |
| 932 | root->height--; | 941 | root->height--; |
| 933 | /* must only free zeroed nodes into the slab */ | ||
| 934 | tag_clear(to_free, 0, 0); | ||
| 935 | tag_clear(to_free, 1, 0); | ||
| 936 | to_free->slots[0] = NULL; | ||
| 937 | to_free->count = 0; | ||
| 938 | radix_tree_node_free(to_free); | 942 | radix_tree_node_free(to_free); |
| 939 | } | 943 | } |
| 940 | } | 944 | } |
diff --git a/mm/nommu.c b/mm/nommu.c index 3abd0845bda4..4462b6a3fcb9 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
| @@ -104,21 +104,15 @@ EXPORT_SYMBOL(vmtruncate); | |||
| 104 | unsigned int kobjsize(const void *objp) | 104 | unsigned int kobjsize(const void *objp) |
| 105 | { | 105 | { |
| 106 | struct page *page; | 106 | struct page *page; |
| 107 | int order = 0; | ||
| 108 | 107 | ||
| 109 | /* | 108 | /* |
| 110 | * If the object we have should not have ksize performed on it, | 109 | * If the object we have should not have ksize performed on it, |
| 111 | * return size of 0 | 110 | * return size of 0 |
| 112 | */ | 111 | */ |
| 113 | if (!objp) | 112 | if (!objp || !virt_addr_valid(objp)) |
| 114 | return 0; | ||
| 115 | |||
| 116 | if ((unsigned long)objp >= memory_end) | ||
| 117 | return 0; | 113 | return 0; |
| 118 | 114 | ||
| 119 | page = virt_to_head_page(objp); | 115 | page = virt_to_head_page(objp); |
| 120 | if (!page) | ||
| 121 | return 0; | ||
| 122 | 116 | ||
| 123 | /* | 117 | /* |
| 124 | * If the allocator sets PageSlab, we know the pointer came from | 118 | * If the allocator sets PageSlab, we know the pointer came from |
| @@ -129,18 +123,9 @@ unsigned int kobjsize(const void *objp) | |||
| 129 | 123 | ||
| 130 | /* | 124 | /* |
| 131 | * The ksize() function is only guaranteed to work for pointers | 125 | * The ksize() function is only guaranteed to work for pointers |
| 132 | * returned by kmalloc(). So handle arbitrary pointers, that we expect | 126 | * returned by kmalloc(). So handle arbitrary pointers here. |
| 133 | * always to be compound pages, here. | ||
| 134 | */ | ||
| 135 | if (PageCompound(page)) | ||
| 136 | order = compound_order(page); | ||
| 137 | |||
| 138 | /* | ||
| 139 | * Finally, handle arbitrary pointers that don't set PageSlab. | ||
| 140 | * Default to 0-order in the case when we're unable to ksize() | ||
| 141 | * the object. | ||
| 142 | */ | 127 | */ |
| 143 | return PAGE_SIZE << order; | 128 | return PAGE_SIZE << compound_order(page); |
| 144 | } | 129 | } |
| 145 | 130 | ||
| 146 | /* | 131 | /* |
diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 0afd2387e507..d5878bed7841 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c | |||
| @@ -3,14 +3,14 @@ | |||
| 3 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
| 4 | 4 | ||
| 5 | static int walk_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, | 5 | static int walk_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, |
| 6 | const struct mm_walk *walk, void *private) | 6 | struct mm_walk *walk) |
| 7 | { | 7 | { |
| 8 | pte_t *pte; | 8 | pte_t *pte; |
| 9 | int err = 0; | 9 | int err = 0; |
| 10 | 10 | ||
| 11 | pte = pte_offset_map(pmd, addr); | 11 | pte = pte_offset_map(pmd, addr); |
| 12 | for (;;) { | 12 | for (;;) { |
| 13 | err = walk->pte_entry(pte, addr, addr + PAGE_SIZE, private); | 13 | err = walk->pte_entry(pte, addr, addr + PAGE_SIZE, walk); |
| 14 | if (err) | 14 | if (err) |
| 15 | break; | 15 | break; |
| 16 | addr += PAGE_SIZE; | 16 | addr += PAGE_SIZE; |
| @@ -24,7 +24,7 @@ static int walk_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, | |||
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end, | 26 | static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end, |
| 27 | const struct mm_walk *walk, void *private) | 27 | struct mm_walk *walk) |
| 28 | { | 28 | { |
| 29 | pmd_t *pmd; | 29 | pmd_t *pmd; |
| 30 | unsigned long next; | 30 | unsigned long next; |
| @@ -35,15 +35,15 @@ static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end, | |||
| 35 | next = pmd_addr_end(addr, end); | 35 | next = pmd_addr_end(addr, end); |
| 36 | if (pmd_none_or_clear_bad(pmd)) { | 36 | if (pmd_none_or_clear_bad(pmd)) { |
| 37 | if (walk->pte_hole) | 37 | if (walk->pte_hole) |
| 38 | err = walk->pte_hole(addr, next, private); | 38 | err = walk->pte_hole(addr, next, walk); |
| 39 | if (err) | 39 | if (err) |
| 40 | break; | 40 | break; |
| 41 | continue; | 41 | continue; |
| 42 | } | 42 | } |
| 43 | if (walk->pmd_entry) | 43 | if (walk->pmd_entry) |
| 44 | err = walk->pmd_entry(pmd, addr, next, private); | 44 | err = walk->pmd_entry(pmd, addr, next, walk); |
| 45 | if (!err && walk->pte_entry) | 45 | if (!err && walk->pte_entry) |
| 46 | err = walk_pte_range(pmd, addr, next, walk, private); | 46 | err = walk_pte_range(pmd, addr, next, walk); |
| 47 | if (err) | 47 | if (err) |
| 48 | break; | 48 | break; |
| 49 | } while (pmd++, addr = next, addr != end); | 49 | } while (pmd++, addr = next, addr != end); |
| @@ -52,7 +52,7 @@ static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end, | |||
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end, | 54 | static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end, |
| 55 | const struct mm_walk *walk, void *private) | 55 | struct mm_walk *walk) |
| 56 | { | 56 | { |
| 57 | pud_t *pud; | 57 | pud_t *pud; |
| 58 | unsigned long next; | 58 | unsigned long next; |
| @@ -63,15 +63,15 @@ static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end, | |||
| 63 | next = pud_addr_end(addr, end); | 63 | next = pud_addr_end(addr, end); |
| 64 | if (pud_none_or_clear_bad(pud)) { | 64 | if (pud_none_or_clear_bad(pud)) { |
| 65 | if (walk->pte_hole) | 65 | if (walk->pte_hole) |
| 66 | err = walk->pte_hole(addr, next, private); | 66 | err = walk->pte_hole(addr, next, walk); |
| 67 | if (err) | 67 | if (err) |
| 68 | break; | 68 | break; |
| 69 | continue; | 69 | continue; |
| 70 | } | 70 | } |
| 71 | if (walk->pud_entry) | 71 | if (walk->pud_entry) |
| 72 | err = walk->pud_entry(pud, addr, next, private); | 72 | err = walk->pud_entry(pud, addr, next, walk); |
| 73 | if (!err && (walk->pmd_entry || walk->pte_entry)) | 73 | if (!err && (walk->pmd_entry || walk->pte_entry)) |
| 74 | err = walk_pmd_range(pud, addr, next, walk, private); | 74 | err = walk_pmd_range(pud, addr, next, walk); |
| 75 | if (err) | 75 | if (err) |
| 76 | break; | 76 | break; |
| 77 | } while (pud++, addr = next, addr != end); | 77 | } while (pud++, addr = next, addr != end); |
| @@ -85,15 +85,15 @@ static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end, | |||
| 85 | * @addr: starting address | 85 | * @addr: starting address |
| 86 | * @end: ending address | 86 | * @end: ending address |
| 87 | * @walk: set of callbacks to invoke for each level of the tree | 87 | * @walk: set of callbacks to invoke for each level of the tree |
| 88 | * @private: private data passed to the callback function | ||
| 89 | * | 88 | * |
| 90 | * Recursively walk the page table for the memory area in a VMA, | 89 | * Recursively walk the page table for the memory area in a VMA, |
| 91 | * calling supplied callbacks. Callbacks are called in-order (first | 90 | * calling supplied callbacks. Callbacks are called in-order (first |
| 92 | * PGD, first PUD, first PMD, first PTE, second PTE... second PMD, | 91 | * PGD, first PUD, first PMD, first PTE, second PTE... second PMD, |
| 93 | * etc.). If lower-level callbacks are omitted, walking depth is reduced. | 92 | * etc.). If lower-level callbacks are omitted, walking depth is reduced. |
| 94 | * | 93 | * |
| 95 | * Each callback receives an entry pointer, the start and end of the | 94 | * Each callback receives an entry pointer and the start and end of the |
| 96 | * associated range, and a caller-supplied private data pointer. | 95 | * associated range, and a copy of the original mm_walk for access to |
| 96 | * the ->private or ->mm fields. | ||
| 97 | * | 97 | * |
| 98 | * No locks are taken, but the bottom level iterator will map PTE | 98 | * No locks are taken, but the bottom level iterator will map PTE |
| 99 | * directories from highmem if necessary. | 99 | * directories from highmem if necessary. |
| @@ -101,9 +101,8 @@ static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end, | |||
| 101 | * If any callback returns a non-zero value, the walk is aborted and | 101 | * If any callback returns a non-zero value, the walk is aborted and |
| 102 | * the return value is propagated back to the caller. Otherwise 0 is returned. | 102 | * the return value is propagated back to the caller. Otherwise 0 is returned. |
| 103 | */ | 103 | */ |
| 104 | int walk_page_range(const struct mm_struct *mm, | 104 | int walk_page_range(unsigned long addr, unsigned long end, |
| 105 | unsigned long addr, unsigned long end, | 105 | struct mm_walk *walk) |
| 106 | const struct mm_walk *walk, void *private) | ||
| 107 | { | 106 | { |
| 108 | pgd_t *pgd; | 107 | pgd_t *pgd; |
| 109 | unsigned long next; | 108 | unsigned long next; |
| @@ -112,21 +111,24 @@ int walk_page_range(const struct mm_struct *mm, | |||
| 112 | if (addr >= end) | 111 | if (addr >= end) |
| 113 | return err; | 112 | return err; |
| 114 | 113 | ||
| 115 | pgd = pgd_offset(mm, addr); | 114 | if (!walk->mm) |
| 115 | return -EINVAL; | ||
| 116 | |||
| 117 | pgd = pgd_offset(walk->mm, addr); | ||
| 116 | do { | 118 | do { |
| 117 | next = pgd_addr_end(addr, end); | 119 | next = pgd_addr_end(addr, end); |
| 118 | if (pgd_none_or_clear_bad(pgd)) { | 120 | if (pgd_none_or_clear_bad(pgd)) { |
| 119 | if (walk->pte_hole) | 121 | if (walk->pte_hole) |
| 120 | err = walk->pte_hole(addr, next, private); | 122 | err = walk->pte_hole(addr, next, walk); |
| 121 | if (err) | 123 | if (err) |
| 122 | break; | 124 | break; |
| 123 | continue; | 125 | continue; |
| 124 | } | 126 | } |
| 125 | if (walk->pgd_entry) | 127 | if (walk->pgd_entry) |
| 126 | err = walk->pgd_entry(pgd, addr, next, private); | 128 | err = walk->pgd_entry(pgd, addr, next, walk); |
| 127 | if (!err && | 129 | if (!err && |
| 128 | (walk->pud_entry || walk->pmd_entry || walk->pte_entry)) | 130 | (walk->pud_entry || walk->pmd_entry || walk->pte_entry)) |
| 129 | err = walk_pud_range(pgd, addr, next, walk, private); | 131 | err = walk_pud_range(pgd, addr, next, walk); |
| 130 | if (err) | 132 | if (err) |
| 131 | break; | 133 | break; |
| 132 | } while (pgd++, addr = next, addr != end); | 134 | } while (pgd++, addr = next, addr != end); |
diff --git a/mm/vmscan.c b/mm/vmscan.c index 9a29901ad3b3..967d30ccd92b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -1307,7 +1307,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, | |||
| 1307 | struct scan_control *sc) | 1307 | struct scan_control *sc) |
| 1308 | { | 1308 | { |
| 1309 | int priority; | 1309 | int priority; |
| 1310 | int ret = 0; | 1310 | unsigned long ret = 0; |
| 1311 | unsigned long total_scanned = 0; | 1311 | unsigned long total_scanned = 0; |
| 1312 | unsigned long nr_reclaimed = 0; | 1312 | unsigned long nr_reclaimed = 0; |
| 1313 | struct reclaim_state *reclaim_state = current->reclaim_state; | 1313 | struct reclaim_state *reclaim_state = current->reclaim_state; |
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c index 6de4bd195d28..1e8be246ad15 100644 --- a/net/dccp/ackvec.c +++ b/net/dccp/ackvec.c | |||
| @@ -290,12 +290,12 @@ int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk, | |||
| 290 | 290 | ||
| 291 | while (1) { | 291 | while (1) { |
| 292 | const u8 len = dccp_ackvec_len(av, index); | 292 | const u8 len = dccp_ackvec_len(av, index); |
| 293 | const u8 state = dccp_ackvec_state(av, index); | 293 | const u8 av_state = dccp_ackvec_state(av, index); |
| 294 | /* | 294 | /* |
| 295 | * valid packets not yet in av_buf have a reserved | 295 | * valid packets not yet in av_buf have a reserved |
| 296 | * entry, with a len equal to 0. | 296 | * entry, with a len equal to 0. |
| 297 | */ | 297 | */ |
| 298 | if (state == DCCP_ACKVEC_STATE_NOT_RECEIVED && | 298 | if (av_state == DCCP_ACKVEC_STATE_NOT_RECEIVED && |
| 299 | len == 0 && delta == 0) { /* Found our | 299 | len == 0 && delta == 0) { /* Found our |
| 300 | reserved seat! */ | 300 | reserved seat! */ |
| 301 | dccp_pr_debug("Found %llu reserved seat!\n", | 301 | dccp_pr_debug("Found %llu reserved seat!\n", |
| @@ -325,31 +325,6 @@ out_duplicate: | |||
| 325 | return -EILSEQ; | 325 | return -EILSEQ; |
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | #ifdef CONFIG_IP_DCCP_DEBUG | ||
| 329 | void dccp_ackvector_print(const u64 ackno, const unsigned char *vector, int len) | ||
| 330 | { | ||
| 331 | dccp_pr_debug_cat("ACK vector len=%d, ackno=%llu |", len, | ||
| 332 | (unsigned long long)ackno); | ||
| 333 | |||
| 334 | while (len--) { | ||
| 335 | const u8 state = (*vector & DCCP_ACKVEC_STATE_MASK) >> 6; | ||
| 336 | const u8 rl = *vector & DCCP_ACKVEC_LEN_MASK; | ||
| 337 | |||
| 338 | dccp_pr_debug_cat("%d,%d|", state, rl); | ||
| 339 | ++vector; | ||
| 340 | } | ||
| 341 | |||
| 342 | dccp_pr_debug_cat("\n"); | ||
| 343 | } | ||
| 344 | |||
| 345 | void dccp_ackvec_print(const struct dccp_ackvec *av) | ||
| 346 | { | ||
| 347 | dccp_ackvector_print(av->av_buf_ackno, | ||
| 348 | av->av_buf + av->av_buf_head, | ||
| 349 | av->av_vec_len); | ||
| 350 | } | ||
| 351 | #endif | ||
| 352 | |||
| 353 | static void dccp_ackvec_throw_record(struct dccp_ackvec *av, | 328 | static void dccp_ackvec_throw_record(struct dccp_ackvec *av, |
| 354 | struct dccp_ackvec_record *avr) | 329 | struct dccp_ackvec_record *avr) |
| 355 | { | 330 | { |
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index f813077234b7..a1929f33d703 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
| @@ -159,8 +159,8 @@ static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp) | |||
| 159 | } else if (ktime_us_delta(now, hctx->ccid3hctx_t_ld) | 159 | } else if (ktime_us_delta(now, hctx->ccid3hctx_t_ld) |
| 160 | - (s64)hctx->ccid3hctx_rtt >= 0) { | 160 | - (s64)hctx->ccid3hctx_rtt >= 0) { |
| 161 | 161 | ||
| 162 | hctx->ccid3hctx_x = | 162 | hctx->ccid3hctx_x = min(2 * hctx->ccid3hctx_x, min_rate); |
| 163 | max(min(2 * hctx->ccid3hctx_x, min_rate), | 163 | hctx->ccid3hctx_x = max(hctx->ccid3hctx_x, |
| 164 | scaled_div(((__u64)hctx->ccid3hctx_s) << 6, | 164 | scaled_div(((__u64)hctx->ccid3hctx_s) << 6, |
| 165 | hctx->ccid3hctx_rtt)); | 165 | hctx->ccid3hctx_rtt)); |
| 166 | hctx->ccid3hctx_t_ld = now; | 166 | hctx->ccid3hctx_t_ld = now; |
| @@ -329,8 +329,14 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb) | |||
| 329 | hctx->ccid3hctx_x = rfc3390_initial_rate(sk); | 329 | hctx->ccid3hctx_x = rfc3390_initial_rate(sk); |
| 330 | hctx->ccid3hctx_t_ld = now; | 330 | hctx->ccid3hctx_t_ld = now; |
| 331 | } else { | 331 | } else { |
| 332 | /* Sender does not have RTT sample: X_pps = 1 pkt/sec */ | 332 | /* |
| 333 | hctx->ccid3hctx_x = hctx->ccid3hctx_s; | 333 | * Sender does not have RTT sample: |
| 334 | * - set fallback RTT (RFC 4340, 3.4) since a RTT value | ||
| 335 | * is needed in several parts (e.g. window counter); | ||
| 336 | * - set sending rate X_pps = 1pps as per RFC 3448, 4.2. | ||
| 337 | */ | ||
| 338 | hctx->ccid3hctx_rtt = DCCP_FALLBACK_RTT; | ||
| 339 | hctx->ccid3hctx_x = hctx->ccid3hctx_s; | ||
| 334 | hctx->ccid3hctx_x <<= 6; | 340 | hctx->ccid3hctx_x <<= 6; |
| 335 | } | 341 | } |
| 336 | ccid3_update_send_interval(hctx); | 342 | ccid3_update_send_interval(hctx); |
diff --git a/net/dccp/ccids/lib/tfrc.c b/net/dccp/ccids/lib/tfrc.c index d1dfbb8de64c..97ecec0a8e76 100644 --- a/net/dccp/ccids/lib/tfrc.c +++ b/net/dccp/ccids/lib/tfrc.c | |||
| @@ -14,14 +14,6 @@ module_param(tfrc_debug, bool, 0444); | |||
| 14 | MODULE_PARM_DESC(tfrc_debug, "Enable debug messages"); | 14 | MODULE_PARM_DESC(tfrc_debug, "Enable debug messages"); |
| 15 | #endif | 15 | #endif |
| 16 | 16 | ||
| 17 | extern int tfrc_tx_packet_history_init(void); | ||
| 18 | extern void tfrc_tx_packet_history_exit(void); | ||
| 19 | extern int tfrc_rx_packet_history_init(void); | ||
| 20 | extern void tfrc_rx_packet_history_exit(void); | ||
| 21 | |||
| 22 | extern int tfrc_li_init(void); | ||
| 23 | extern void tfrc_li_exit(void); | ||
| 24 | |||
| 25 | static int __init tfrc_module_init(void) | 17 | static int __init tfrc_module_init(void) |
| 26 | { | 18 | { |
| 27 | int rc = tfrc_li_init(); | 19 | int rc = tfrc_li_init(); |
diff --git a/net/dccp/ccids/lib/tfrc.h b/net/dccp/ccids/lib/tfrc.h index 1fb1187bbf1c..ed9857527acf 100644 --- a/net/dccp/ccids/lib/tfrc.h +++ b/net/dccp/ccids/lib/tfrc.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * (at your option) any later version. | 15 | * (at your option) any later version. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <asm/div64.h> | 18 | #include <linux/math64.h> |
| 19 | #include "../../dccp.h" | 19 | #include "../../dccp.h" |
| 20 | /* internal includes that this module exports: */ | 20 | /* internal includes that this module exports: */ |
| 21 | #include "loss_interval.h" | 21 | #include "loss_interval.h" |
| @@ -29,21 +29,19 @@ extern int tfrc_debug; | |||
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | /* integer-arithmetic divisions of type (a * 1000000)/b */ | 31 | /* integer-arithmetic divisions of type (a * 1000000)/b */ |
| 32 | static inline u64 scaled_div(u64 a, u32 b) | 32 | static inline u64 scaled_div(u64 a, u64 b) |
| 33 | { | 33 | { |
| 34 | BUG_ON(b==0); | 34 | BUG_ON(b==0); |
| 35 | a *= 1000000; | 35 | return div64_u64(a * 1000000, b); |
| 36 | do_div(a, b); | ||
| 37 | return a; | ||
| 38 | } | 36 | } |
| 39 | 37 | ||
| 40 | static inline u32 scaled_div32(u64 a, u32 b) | 38 | static inline u32 scaled_div32(u64 a, u64 b) |
| 41 | { | 39 | { |
| 42 | u64 result = scaled_div(a, b); | 40 | u64 result = scaled_div(a, b); |
| 43 | 41 | ||
| 44 | if (result > UINT_MAX) { | 42 | if (result > UINT_MAX) { |
| 45 | DCCP_CRIT("Overflow: a(%llu)/b(%u) > ~0U", | 43 | DCCP_CRIT("Overflow: %llu/%llu > UINT_MAX", |
| 46 | (unsigned long long)a, b); | 44 | (unsigned long long)a, (unsigned long long)b); |
| 47 | return UINT_MAX; | 45 | return UINT_MAX; |
| 48 | } | 46 | } |
| 49 | return result; | 47 | return result; |
| @@ -58,7 +56,14 @@ static inline u32 tfrc_ewma(const u32 avg, const u32 newval, const u8 weight) | |||
| 58 | return avg ? (weight * avg + (10 - weight) * newval) / 10 : newval; | 56 | return avg ? (weight * avg + (10 - weight) * newval) / 10 : newval; |
| 59 | } | 57 | } |
| 60 | 58 | ||
| 61 | extern u32 tfrc_calc_x(u16 s, u32 R, u32 p); | 59 | extern u32 tfrc_calc_x(u16 s, u32 R, u32 p); |
| 62 | extern u32 tfrc_calc_x_reverse_lookup(u32 fvalue); | 60 | extern u32 tfrc_calc_x_reverse_lookup(u32 fvalue); |
| 63 | 61 | ||
| 62 | extern int tfrc_tx_packet_history_init(void); | ||
| 63 | extern void tfrc_tx_packet_history_exit(void); | ||
| 64 | extern int tfrc_rx_packet_history_init(void); | ||
| 65 | extern void tfrc_rx_packet_history_exit(void); | ||
| 66 | |||
| 67 | extern int tfrc_li_init(void); | ||
| 68 | extern void tfrc_li_exit(void); | ||
| 64 | #endif /* _TFRC_H_ */ | 69 | #endif /* _TFRC_H_ */ |
diff --git a/net/dccp/ccids/lib/tfrc_equation.c b/net/dccp/ccids/lib/tfrc_equation.c index e4e64b76c10c..2f20a29cffe4 100644 --- a/net/dccp/ccids/lib/tfrc_equation.c +++ b/net/dccp/ccids/lib/tfrc_equation.c | |||
| @@ -661,7 +661,7 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p) | |||
| 661 | 661 | ||
| 662 | EXPORT_SYMBOL_GPL(tfrc_calc_x); | 662 | EXPORT_SYMBOL_GPL(tfrc_calc_x); |
| 663 | 663 | ||
| 664 | /* | 664 | /** |
| 665 | * tfrc_calc_x_reverse_lookup - try to find p given f(p) | 665 | * tfrc_calc_x_reverse_lookup - try to find p given f(p) |
| 666 | * | 666 | * |
| 667 | * @fvalue: function value to match, scaled by 1000000 | 667 | * @fvalue: function value to match, scaled by 1000000 |
| @@ -676,11 +676,11 @@ u32 tfrc_calc_x_reverse_lookup(u32 fvalue) | |||
| 676 | 676 | ||
| 677 | /* Error cases. */ | 677 | /* Error cases. */ |
| 678 | if (fvalue < tfrc_calc_x_lookup[0][1]) { | 678 | if (fvalue < tfrc_calc_x_lookup[0][1]) { |
| 679 | DCCP_WARN("fvalue %d smaller than resolution\n", fvalue); | 679 | DCCP_WARN("fvalue %u smaller than resolution\n", fvalue); |
| 680 | return tfrc_calc_x_lookup[0][1]; | 680 | return TFRC_SMALLEST_P; |
| 681 | } | 681 | } |
| 682 | if (fvalue > tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][0]) { | 682 | if (fvalue > tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][0]) { |
| 683 | DCCP_WARN("fvalue %d exceeds bounds!\n", fvalue); | 683 | DCCP_WARN("fvalue %u exceeds bounds!\n", fvalue); |
| 684 | return 1000000; | 684 | return 1000000; |
| 685 | } | 685 | } |
| 686 | 686 | ||
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index c22a3780c14e..37d27bcb361f 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
| @@ -589,7 +589,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
| 589 | if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1) | 589 | if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1) |
| 590 | goto drop; | 590 | goto drop; |
| 591 | 591 | ||
| 592 | req = reqsk_alloc(&dccp_request_sock_ops); | 592 | req = inet_reqsk_alloc(&dccp_request_sock_ops); |
| 593 | if (req == NULL) | 593 | if (req == NULL) |
| 594 | goto drop; | 594 | goto drop; |
| 595 | 595 | ||
| @@ -605,7 +605,6 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
| 605 | ireq = inet_rsk(req); | 605 | ireq = inet_rsk(req); |
| 606 | ireq->loc_addr = ip_hdr(skb)->daddr; | 606 | ireq->loc_addr = ip_hdr(skb)->daddr; |
| 607 | ireq->rmt_addr = ip_hdr(skb)->saddr; | 607 | ireq->rmt_addr = ip_hdr(skb)->saddr; |
| 608 | ireq->opt = NULL; | ||
| 609 | 608 | ||
| 610 | /* | 609 | /* |
| 611 | * Step 3: Process LISTEN state | 610 | * Step 3: Process LISTEN state |
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 9b1129bb7ece..f7fe2a572d7b 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
| @@ -421,7 +421,6 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
| 421 | ireq6 = inet6_rsk(req); | 421 | ireq6 = inet6_rsk(req); |
| 422 | ipv6_addr_copy(&ireq6->rmt_addr, &ipv6_hdr(skb)->saddr); | 422 | ipv6_addr_copy(&ireq6->rmt_addr, &ipv6_hdr(skb)->saddr); |
| 423 | ipv6_addr_copy(&ireq6->loc_addr, &ipv6_hdr(skb)->daddr); | 423 | ipv6_addr_copy(&ireq6->loc_addr, &ipv6_hdr(skb)->daddr); |
| 424 | ireq6->pktopts = NULL; | ||
| 425 | 424 | ||
| 426 | if (ipv6_opt_accepted(sk, skb) || | 425 | if (ipv6_opt_accepted(sk, skb) || |
| 427 | np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo || | 426 | np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo || |
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index 33ad48321b08..66dca5bba858 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c | |||
| @@ -165,12 +165,12 @@ out_free: | |||
| 165 | /* See dccp_v4_conn_request */ | 165 | /* See dccp_v4_conn_request */ |
| 166 | newdmsk->dccpms_sequence_window = req->rcv_wnd; | 166 | newdmsk->dccpms_sequence_window = req->rcv_wnd; |
| 167 | 167 | ||
| 168 | newdp->dccps_gar = newdp->dccps_isr = dreq->dreq_isr; | 168 | newdp->dccps_gar = newdp->dccps_iss = dreq->dreq_iss; |
| 169 | dccp_update_gsr(newsk, dreq->dreq_isr); | ||
| 170 | |||
| 171 | newdp->dccps_iss = dreq->dreq_iss; | ||
| 172 | dccp_update_gss(newsk, dreq->dreq_iss); | 169 | dccp_update_gss(newsk, dreq->dreq_iss); |
| 173 | 170 | ||
| 171 | newdp->dccps_isr = dreq->dreq_isr; | ||
| 172 | dccp_update_gsr(newsk, dreq->dreq_isr); | ||
| 173 | |||
| 174 | /* | 174 | /* |
| 175 | * SWL and AWL are initially adjusted so that they are not less than | 175 | * SWL and AWL are initially adjusted so that they are not less than |
| 176 | * the initial Sequence Numbers received and sent, respectively: | 176 | * the initial Sequence Numbers received and sent, respectively: |
diff --git a/net/dccp/options.c b/net/dccp/options.c index d2a84a2fecee..43bc24e761d0 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c | |||
| @@ -107,9 +107,11 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq, | |||
| 107 | * | 107 | * |
| 108 | * CCID-specific options are ignored during connection setup, as | 108 | * CCID-specific options are ignored during connection setup, as |
| 109 | * negotiation may still be in progress (see RFC 4340, 10.3). | 109 | * negotiation may still be in progress (see RFC 4340, 10.3). |
| 110 | * The same applies to Ack Vectors, as these depend on the CCID. | ||
| 110 | * | 111 | * |
| 111 | */ | 112 | */ |
| 112 | if (dreq != NULL && opt >= 128) | 113 | if (dreq != NULL && (opt >= 128 || |
| 114 | opt == DCCPO_ACK_VECTOR_0 || opt == DCCPO_ACK_VECTOR_1)) | ||
| 113 | goto ignore_option; | 115 | goto ignore_option; |
| 114 | 116 | ||
| 115 | switch (opt) { | 117 | switch (opt) { |
diff --git a/net/dccp/output.c b/net/dccp/output.c index 1f8a9b64c083..fe20068c5d8e 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
| @@ -508,6 +508,7 @@ void dccp_send_ack(struct sock *sk) | |||
| 508 | 508 | ||
| 509 | EXPORT_SYMBOL_GPL(dccp_send_ack); | 509 | EXPORT_SYMBOL_GPL(dccp_send_ack); |
| 510 | 510 | ||
| 511 | #if 0 | ||
| 511 | /* FIXME: Is this still necessary (11.3) - currently nowhere used by DCCP. */ | 512 | /* FIXME: Is this still necessary (11.3) - currently nowhere used by DCCP. */ |
| 512 | void dccp_send_delayed_ack(struct sock *sk) | 513 | void dccp_send_delayed_ack(struct sock *sk) |
| 513 | { | 514 | { |
| @@ -538,6 +539,7 @@ void dccp_send_delayed_ack(struct sock *sk) | |||
| 538 | icsk->icsk_ack.timeout = timeout; | 539 | icsk->icsk_ack.timeout = timeout; |
| 539 | sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout); | 540 | sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout); |
| 540 | } | 541 | } |
| 542 | #endif | ||
| 541 | 543 | ||
| 542 | void dccp_send_sync(struct sock *sk, const u64 ackno, | 544 | void dccp_send_sync(struct sock *sk, const u64 ackno, |
| 543 | const enum dccp_pkt_type pkt_type) | 545 | const enum dccp_pkt_type pkt_type) |
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 0bcdc9250279..81368a7f5379 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c | |||
| @@ -42,7 +42,7 @@ static int bufsize = 64 * 1024; | |||
| 42 | 42 | ||
| 43 | static const char procname[] = "dccpprobe"; | 43 | static const char procname[] = "dccpprobe"; |
| 44 | 44 | ||
| 45 | struct { | 45 | static struct { |
| 46 | struct kfifo *fifo; | 46 | struct kfifo *fifo; |
| 47 | spinlock_t lock; | 47 | spinlock_t lock; |
| 48 | wait_queue_head_t wait; | 48 | wait_queue_head_t wait; |
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 3b83c34019fc..0d4d72827e4b 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c | |||
| @@ -960,7 +960,10 @@ int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, | |||
| 960 | rtm->rtm_dst_len = dst_len; | 960 | rtm->rtm_dst_len = dst_len; |
| 961 | rtm->rtm_src_len = 0; | 961 | rtm->rtm_src_len = 0; |
| 962 | rtm->rtm_tos = tos; | 962 | rtm->rtm_tos = tos; |
| 963 | rtm->rtm_table = tb_id; | 963 | if (tb_id < 256) |
| 964 | rtm->rtm_table = tb_id; | ||
| 965 | else | ||
| 966 | rtm->rtm_table = RT_TABLE_COMPAT; | ||
| 964 | NLA_PUT_U32(skb, RTA_TABLE, tb_id); | 967 | NLA_PUT_U32(skb, RTA_TABLE, tb_id); |
| 965 | rtm->rtm_type = type; | 968 | rtm->rtm_type = type; |
| 966 | rtm->rtm_flags = fi->fib_flags; | 969 | rtm->rtm_flags = fi->fib_flags; |
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 828ea211ff21..045e799d3e1d 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
| @@ -419,7 +419,8 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, | |||
| 419 | struct inet_connection_sock *icsk = inet_csk(parent); | 419 | struct inet_connection_sock *icsk = inet_csk(parent); |
| 420 | struct request_sock_queue *queue = &icsk->icsk_accept_queue; | 420 | struct request_sock_queue *queue = &icsk->icsk_accept_queue; |
| 421 | struct listen_sock *lopt = queue->listen_opt; | 421 | struct listen_sock *lopt = queue->listen_opt; |
| 422 | int thresh = icsk->icsk_syn_retries ? : sysctl_tcp_synack_retries; | 422 | int max_retries = icsk->icsk_syn_retries ? : sysctl_tcp_synack_retries; |
| 423 | int thresh = max_retries; | ||
| 423 | unsigned long now = jiffies; | 424 | unsigned long now = jiffies; |
| 424 | struct request_sock **reqp, *req; | 425 | struct request_sock **reqp, *req; |
| 425 | int i, budget; | 426 | int i, budget; |
| @@ -455,6 +456,9 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, | |||
| 455 | } | 456 | } |
| 456 | } | 457 | } |
| 457 | 458 | ||
| 459 | if (queue->rskq_defer_accept) | ||
| 460 | max_retries = queue->rskq_defer_accept; | ||
| 461 | |||
| 458 | budget = 2 * (lopt->nr_table_entries / (timeout / interval)); | 462 | budget = 2 * (lopt->nr_table_entries / (timeout / interval)); |
| 459 | i = lopt->clock_hand; | 463 | i = lopt->clock_hand; |
| 460 | 464 | ||
| @@ -462,8 +466,9 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, | |||
| 462 | reqp=&lopt->syn_table[i]; | 466 | reqp=&lopt->syn_table[i]; |
| 463 | while ((req = *reqp) != NULL) { | 467 | while ((req = *reqp) != NULL) { |
| 464 | if (time_after_eq(now, req->expires)) { | 468 | if (time_after_eq(now, req->expires)) { |
| 465 | if (req->retrans < thresh && | 469 | if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh)) && |
| 466 | !req->rsk_ops->rtx_syn_ack(parent, req)) { | 470 | (inet_rsk(req)->acked || |
| 471 | !req->rsk_ops->rtx_syn_ack(parent, req))) { | ||
| 467 | unsigned long timeo; | 472 | unsigned long timeo; |
| 468 | 473 | ||
| 469 | if (req->retrans++ == 0) | 474 | if (req->retrans++ == 0) |
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index 73ba98921d64..d182a2a26291 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c | |||
| @@ -285,7 +285,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, | |||
| 285 | cookie_check_timestamp(&tcp_opt); | 285 | cookie_check_timestamp(&tcp_opt); |
| 286 | 286 | ||
| 287 | ret = NULL; | 287 | ret = NULL; |
| 288 | req = reqsk_alloc(&tcp_request_sock_ops); /* for safety */ | 288 | req = inet_reqsk_alloc(&tcp_request_sock_ops); /* for safety */ |
| 289 | if (!req) | 289 | if (!req) |
| 290 | goto out; | 290 | goto out; |
| 291 | 291 | ||
| @@ -301,7 +301,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, | |||
| 301 | ireq->rmt_port = th->source; | 301 | ireq->rmt_port = th->source; |
| 302 | ireq->loc_addr = ip_hdr(skb)->daddr; | 302 | ireq->loc_addr = ip_hdr(skb)->daddr; |
| 303 | ireq->rmt_addr = ip_hdr(skb)->saddr; | 303 | ireq->rmt_addr = ip_hdr(skb)->saddr; |
| 304 | ireq->opt = NULL; | ||
| 305 | ireq->snd_wscale = tcp_opt.snd_wscale; | 304 | ireq->snd_wscale = tcp_opt.snd_wscale; |
| 306 | ireq->rcv_wscale = tcp_opt.rcv_wscale; | 305 | ireq->rcv_wscale = tcp_opt.rcv_wscale; |
| 307 | ireq->sack_ok = tcp_opt.sack_ok; | 306 | ireq->sack_ok = tcp_opt.sack_ok; |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index ab66683b8043..fc54a48fde1e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -2112,12 +2112,15 @@ static int do_tcp_setsockopt(struct sock *sk, int level, | |||
| 2112 | break; | 2112 | break; |
| 2113 | 2113 | ||
| 2114 | case TCP_DEFER_ACCEPT: | 2114 | case TCP_DEFER_ACCEPT: |
| 2115 | if (val < 0) { | 2115 | icsk->icsk_accept_queue.rskq_defer_accept = 0; |
| 2116 | err = -EINVAL; | 2116 | if (val > 0) { |
| 2117 | } else { | 2117 | /* Translate value in seconds to number of |
| 2118 | if (val > MAX_TCP_ACCEPT_DEFERRED) | 2118 | * retransmits */ |
| 2119 | val = MAX_TCP_ACCEPT_DEFERRED; | 2119 | while (icsk->icsk_accept_queue.rskq_defer_accept < 32 && |
| 2120 | icsk->icsk_accept_queue.rskq_defer_accept = val; | 2120 | val > ((TCP_TIMEOUT_INIT / HZ) << |
| 2121 | icsk->icsk_accept_queue.rskq_defer_accept)) | ||
| 2122 | icsk->icsk_accept_queue.rskq_defer_accept++; | ||
| 2123 | icsk->icsk_accept_queue.rskq_defer_accept++; | ||
| 2121 | } | 2124 | } |
| 2122 | break; | 2125 | break; |
| 2123 | 2126 | ||
| @@ -2299,7 +2302,8 @@ static int do_tcp_getsockopt(struct sock *sk, int level, | |||
| 2299 | val = (val ? : sysctl_tcp_fin_timeout) / HZ; | 2302 | val = (val ? : sysctl_tcp_fin_timeout) / HZ; |
| 2300 | break; | 2303 | break; |
| 2301 | case TCP_DEFER_ACCEPT: | 2304 | case TCP_DEFER_ACCEPT: |
| 2302 | val = icsk->icsk_accept_queue.rskq_defer_accept; | 2305 | val = !icsk->icsk_accept_queue.rskq_defer_accept ? 0 : |
| 2306 | ((TCP_TIMEOUT_INIT / HZ) << (icsk->icsk_accept_queue.rskq_defer_accept - 1)); | ||
| 2303 | break; | 2307 | break; |
| 2304 | case TCP_WINDOW_CLAMP: | 2308 | case TCP_WINDOW_CLAMP: |
| 2305 | val = tp->window_clamp; | 2309 | val = tp->window_clamp; |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index eba873e9b560..cad73b7dfef0 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -4541,49 +4541,6 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, struct tcphdr *th) | |||
| 4541 | } | 4541 | } |
| 4542 | } | 4542 | } |
| 4543 | 4543 | ||
| 4544 | static int tcp_defer_accept_check(struct sock *sk) | ||
| 4545 | { | ||
| 4546 | struct tcp_sock *tp = tcp_sk(sk); | ||
| 4547 | |||
| 4548 | if (tp->defer_tcp_accept.request) { | ||
| 4549 | int queued_data = tp->rcv_nxt - tp->copied_seq; | ||
| 4550 | int hasfin = !skb_queue_empty(&sk->sk_receive_queue) ? | ||
| 4551 | tcp_hdr((struct sk_buff *) | ||
| 4552 | sk->sk_receive_queue.prev)->fin : 0; | ||
| 4553 | |||
| 4554 | if (queued_data && hasfin) | ||
| 4555 | queued_data--; | ||
| 4556 | |||
| 4557 | if (queued_data && | ||
| 4558 | tp->defer_tcp_accept.listen_sk->sk_state == TCP_LISTEN) { | ||
| 4559 | if (sock_flag(sk, SOCK_KEEPOPEN)) { | ||
| 4560 | inet_csk_reset_keepalive_timer(sk, | ||
| 4561 | keepalive_time_when(tp)); | ||
| 4562 | } else { | ||
| 4563 | inet_csk_delete_keepalive_timer(sk); | ||
| 4564 | } | ||
| 4565 | |||
| 4566 | inet_csk_reqsk_queue_add( | ||
| 4567 | tp->defer_tcp_accept.listen_sk, | ||
| 4568 | tp->defer_tcp_accept.request, | ||
| 4569 | sk); | ||
| 4570 | |||
| 4571 | tp->defer_tcp_accept.listen_sk->sk_data_ready( | ||
| 4572 | tp->defer_tcp_accept.listen_sk, 0); | ||
| 4573 | |||
| 4574 | sock_put(tp->defer_tcp_accept.listen_sk); | ||
| 4575 | sock_put(sk); | ||
| 4576 | tp->defer_tcp_accept.listen_sk = NULL; | ||
| 4577 | tp->defer_tcp_accept.request = NULL; | ||
| 4578 | } else if (hasfin || | ||
| 4579 | tp->defer_tcp_accept.listen_sk->sk_state != TCP_LISTEN) { | ||
| 4580 | tcp_reset(sk); | ||
| 4581 | return -1; | ||
| 4582 | } | ||
| 4583 | } | ||
| 4584 | return 0; | ||
| 4585 | } | ||
| 4586 | |||
| 4587 | static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen) | 4544 | static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen) |
| 4588 | { | 4545 | { |
| 4589 | struct tcp_sock *tp = tcp_sk(sk); | 4546 | struct tcp_sock *tp = tcp_sk(sk); |
| @@ -4944,8 +4901,6 @@ step5: | |||
| 4944 | 4901 | ||
| 4945 | tcp_data_snd_check(sk); | 4902 | tcp_data_snd_check(sk); |
| 4946 | tcp_ack_snd_check(sk); | 4903 | tcp_ack_snd_check(sk); |
| 4947 | |||
| 4948 | tcp_defer_accept_check(sk); | ||
| 4949 | return 0; | 4904 | return 0; |
| 4950 | 4905 | ||
| 4951 | csum_error: | 4906 | csum_error: |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index cd601a866c2f..97a230026e13 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -1285,7 +1285,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
| 1285 | if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1) | 1285 | if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1) |
| 1286 | goto drop; | 1286 | goto drop; |
| 1287 | 1287 | ||
| 1288 | req = reqsk_alloc(&tcp_request_sock_ops); | 1288 | req = inet_reqsk_alloc(&tcp_request_sock_ops); |
| 1289 | if (!req) | 1289 | if (!req) |
| 1290 | goto drop; | 1290 | goto drop; |
| 1291 | 1291 | ||
| @@ -1918,14 +1918,6 @@ int tcp_v4_destroy_sock(struct sock *sk) | |||
| 1918 | sk->sk_sndmsg_page = NULL; | 1918 | sk->sk_sndmsg_page = NULL; |
| 1919 | } | 1919 | } |
| 1920 | 1920 | ||
| 1921 | if (tp->defer_tcp_accept.request) { | ||
| 1922 | reqsk_free(tp->defer_tcp_accept.request); | ||
| 1923 | sock_put(tp->defer_tcp_accept.listen_sk); | ||
| 1924 | sock_put(sk); | ||
| 1925 | tp->defer_tcp_accept.listen_sk = NULL; | ||
| 1926 | tp->defer_tcp_accept.request = NULL; | ||
| 1927 | } | ||
| 1928 | |||
| 1929 | atomic_dec(&tcp_sockets_allocated); | 1921 | atomic_dec(&tcp_sockets_allocated); |
| 1930 | 1922 | ||
| 1931 | return 0; | 1923 | return 0; |
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 019c8c16e5cc..8245247a6ceb 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c | |||
| @@ -571,8 +571,10 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb, | |||
| 571 | does sequence test, SYN is truncated, and thus we consider | 571 | does sequence test, SYN is truncated, and thus we consider |
| 572 | it a bare ACK. | 572 | it a bare ACK. |
| 573 | 573 | ||
| 574 | Both ends (listening sockets) accept the new incoming | 574 | If icsk->icsk_accept_queue.rskq_defer_accept, we silently drop this |
| 575 | connection and try to talk to each other. 8-) | 575 | bare ACK. Otherwise, we create an established connection. Both |
| 576 | ends (listening sockets) accept the new incoming connection and try | ||
| 577 | to talk to each other. 8-) | ||
| 576 | 578 | ||
| 577 | Note: This case is both harmless, and rare. Possibility is about the | 579 | Note: This case is both harmless, and rare. Possibility is about the |
| 578 | same as us discovering intelligent life on another plant tomorrow. | 580 | same as us discovering intelligent life on another plant tomorrow. |
| @@ -640,6 +642,13 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb, | |||
| 640 | if (!(flg & TCP_FLAG_ACK)) | 642 | if (!(flg & TCP_FLAG_ACK)) |
| 641 | return NULL; | 643 | return NULL; |
| 642 | 644 | ||
| 645 | /* If TCP_DEFER_ACCEPT is set, drop bare ACK. */ | ||
| 646 | if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept && | ||
| 647 | TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) { | ||
| 648 | inet_rsk(req)->acked = 1; | ||
| 649 | return NULL; | ||
| 650 | } | ||
| 651 | |||
| 643 | /* OK, ACK is valid, create big socket and | 652 | /* OK, ACK is valid, create big socket and |
| 644 | * feed this segment to it. It will repeat all | 653 | * feed this segment to it. It will repeat all |
| 645 | * the tests. THIS SEGMENT MUST MOVE SOCKET TO | 654 | * the tests. THIS SEGMENT MUST MOVE SOCKET TO |
| @@ -678,24 +687,7 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb, | |||
| 678 | inet_csk_reqsk_queue_unlink(sk, req, prev); | 687 | inet_csk_reqsk_queue_unlink(sk, req, prev); |
| 679 | inet_csk_reqsk_queue_removed(sk, req); | 688 | inet_csk_reqsk_queue_removed(sk, req); |
| 680 | 689 | ||
| 681 | if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept && | 690 | inet_csk_reqsk_queue_add(sk, req, child); |
| 682 | TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) { | ||
| 683 | |||
| 684 | /* the accept queue handling is done is est recv slow | ||
| 685 | * path so lets make sure to start there | ||
| 686 | */ | ||
| 687 | tcp_sk(child)->pred_flags = 0; | ||
| 688 | sock_hold(sk); | ||
| 689 | sock_hold(child); | ||
| 690 | tcp_sk(child)->defer_tcp_accept.listen_sk = sk; | ||
| 691 | tcp_sk(child)->defer_tcp_accept.request = req; | ||
| 692 | |||
| 693 | inet_csk_reset_keepalive_timer(child, | ||
| 694 | inet_csk(sk)->icsk_accept_queue.rskq_defer_accept * HZ); | ||
| 695 | } else { | ||
| 696 | inet_csk_reqsk_queue_add(sk, req, child); | ||
| 697 | } | ||
| 698 | |||
| 699 | return child; | 691 | return child; |
| 700 | 692 | ||
| 701 | listen_overflow: | 693 | listen_overflow: |
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 4de68cf5f2aa..63ed9d6830e7 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
| @@ -489,11 +489,6 @@ static void tcp_keepalive_timer (unsigned long data) | |||
| 489 | goto death; | 489 | goto death; |
| 490 | } | 490 | } |
| 491 | 491 | ||
| 492 | if (tp->defer_tcp_accept.request && sk->sk_state == TCP_ESTABLISHED) { | ||
| 493 | tcp_send_active_reset(sk, GFP_ATOMIC); | ||
| 494 | goto death; | ||
| 495 | } | ||
| 496 | |||
| 497 | if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCP_CLOSE) | 492 | if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCP_CLOSE) |
| 498 | goto out; | 493 | goto out; |
| 499 | 494 | ||
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 3c6aafb02183..e84b3fd17fb4 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -191,7 +191,7 @@ lookup_protocol: | |||
| 191 | np->mcast_hops = -1; | 191 | np->mcast_hops = -1; |
| 192 | np->mc_loop = 1; | 192 | np->mc_loop = 1; |
| 193 | np->pmtudisc = IPV6_PMTUDISC_WANT; | 193 | np->pmtudisc = IPV6_PMTUDISC_WANT; |
| 194 | np->ipv6only = init_net.ipv6.sysctl.bindv6only; | 194 | np->ipv6only = net->ipv6.sysctl.bindv6only; |
| 195 | 195 | ||
| 196 | /* Init the ipv4 part of the socket since we can have sockets | 196 | /* Init the ipv4 part of the socket since we can have sockets |
| 197 | * using v6 API for ipv4. | 197 | * using v6 API for ipv4. |
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index b9c2de84a8a2..0f0f94a40335 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c | |||
| @@ -705,6 +705,11 @@ int datagram_send_ctl(struct net *net, | |||
| 705 | } | 705 | } |
| 706 | 706 | ||
| 707 | *hlimit = *(int *)CMSG_DATA(cmsg); | 707 | *hlimit = *(int *)CMSG_DATA(cmsg); |
| 708 | if (*hlimit < -1 || *hlimit > 0xff) { | ||
| 709 | err = -EINVAL; | ||
| 710 | goto exit_f; | ||
| 711 | } | ||
| 712 | |||
| 708 | break; | 713 | break; |
| 709 | 714 | ||
| 710 | case IPV6_TCLASS: | 715 | case IPV6_TCLASS: |
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 26b83e512a09..c042ce19bd14 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -67,7 +67,7 @@ int ip6_ra_control(struct sock *sk, int sel, void (*destructor)(struct sock *)) | |||
| 67 | 67 | ||
| 68 | /* RA packet may be delivered ONLY to IPPROTO_RAW socket */ | 68 | /* RA packet may be delivered ONLY to IPPROTO_RAW socket */ |
| 69 | if (sk->sk_type != SOCK_RAW || inet_sk(sk)->num != IPPROTO_RAW) | 69 | if (sk->sk_type != SOCK_RAW || inet_sk(sk)->num != IPPROTO_RAW) |
| 70 | return -EINVAL; | 70 | return -ENOPROTOOPT; |
| 71 | 71 | ||
| 72 | new_ra = (sel>=0) ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL; | 72 | new_ra = (sel>=0) ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL; |
| 73 | 73 | ||
| @@ -446,7 +446,7 @@ done: | |||
| 446 | 446 | ||
| 447 | case IPV6_MULTICAST_HOPS: | 447 | case IPV6_MULTICAST_HOPS: |
| 448 | if (sk->sk_type == SOCK_STREAM) | 448 | if (sk->sk_type == SOCK_STREAM) |
| 449 | goto e_inval; | 449 | break; |
| 450 | if (optlen < sizeof(int)) | 450 | if (optlen < sizeof(int)) |
| 451 | goto e_inval; | 451 | goto e_inval; |
| 452 | if (val > 255 || val < -1) | 452 | if (val > 255 || val < -1) |
| @@ -458,13 +458,15 @@ done: | |||
| 458 | case IPV6_MULTICAST_LOOP: | 458 | case IPV6_MULTICAST_LOOP: |
| 459 | if (optlen < sizeof(int)) | 459 | if (optlen < sizeof(int)) |
| 460 | goto e_inval; | 460 | goto e_inval; |
| 461 | if (val != valbool) | ||
| 462 | goto e_inval; | ||
| 461 | np->mc_loop = valbool; | 463 | np->mc_loop = valbool; |
| 462 | retv = 0; | 464 | retv = 0; |
| 463 | break; | 465 | break; |
| 464 | 466 | ||
| 465 | case IPV6_MULTICAST_IF: | 467 | case IPV6_MULTICAST_IF: |
| 466 | if (sk->sk_type == SOCK_STREAM) | 468 | if (sk->sk_type == SOCK_STREAM) |
| 467 | goto e_inval; | 469 | break; |
| 468 | if (optlen < sizeof(int)) | 470 | if (optlen < sizeof(int)) |
| 469 | goto e_inval; | 471 | goto e_inval; |
| 470 | 472 | ||
| @@ -860,7 +862,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, | |||
| 860 | if (sk->sk_protocol != IPPROTO_UDP && | 862 | if (sk->sk_protocol != IPPROTO_UDP && |
| 861 | sk->sk_protocol != IPPROTO_UDPLITE && | 863 | sk->sk_protocol != IPPROTO_UDPLITE && |
| 862 | sk->sk_protocol != IPPROTO_TCP) | 864 | sk->sk_protocol != IPPROTO_TCP) |
| 863 | return -EINVAL; | 865 | return -ENOPROTOOPT; |
| 864 | if (sk->sk_state != TCP_ESTABLISHED) | 866 | if (sk->sk_state != TCP_ESTABLISHED) |
| 865 | return -ENOTCONN; | 867 | return -ENOTCONN; |
| 866 | val = sk->sk_family; | 868 | val = sk->sk_family; |
| @@ -874,6 +876,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, | |||
| 874 | return -EINVAL; | 876 | return -EINVAL; |
| 875 | if (copy_from_user(&gsf, optval, GROUP_FILTER_SIZE(0))) | 877 | if (copy_from_user(&gsf, optval, GROUP_FILTER_SIZE(0))) |
| 876 | return -EFAULT; | 878 | return -EFAULT; |
| 879 | if (gsf.gf_group.ss_family != AF_INET6) | ||
| 880 | return -EADDRNOTAVAIL; | ||
| 877 | lock_sock(sk); | 881 | lock_sock(sk); |
| 878 | err = ip6_mc_msfget(sk, &gsf, | 882 | err = ip6_mc_msfget(sk, &gsf, |
| 879 | (struct group_filter __user *)optval, optlen); | 883 | (struct group_filter __user *)optval, optlen); |
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 8fee9a15b2d3..3aee12310d94 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
| @@ -1169,7 +1169,8 @@ static int raw6_destroy(struct sock *sk) | |||
| 1169 | lock_sock(sk); | 1169 | lock_sock(sk); |
| 1170 | ip6_flush_pending_frames(sk); | 1170 | ip6_flush_pending_frames(sk); |
| 1171 | release_sock(sk); | 1171 | release_sock(sk); |
| 1172 | return 0; | 1172 | |
| 1173 | return inet6_destroy_sock(sk); | ||
| 1173 | } | 1174 | } |
| 1174 | 1175 | ||
| 1175 | static int rawv6_init_sk(struct sock *sk) | 1176 | static int rawv6_init_sk(struct sock *sk) |
| @@ -1200,7 +1201,6 @@ struct proto rawv6_prot = { | |||
| 1200 | .disconnect = udp_disconnect, | 1201 | .disconnect = udp_disconnect, |
| 1201 | .ioctl = rawv6_ioctl, | 1202 | .ioctl = rawv6_ioctl, |
| 1202 | .init = rawv6_init_sk, | 1203 | .init = rawv6_init_sk, |
| 1203 | .destroy = inet6_destroy_sock, | ||
| 1204 | .setsockopt = rawv6_setsockopt, | 1204 | .setsockopt = rawv6_setsockopt, |
| 1205 | .getsockopt = rawv6_getsockopt, | 1205 | .getsockopt = rawv6_getsockopt, |
| 1206 | .sendmsg = rawv6_sendmsg, | 1206 | .sendmsg = rawv6_sendmsg, |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 220cffe9e63b..d1f3e19b06c7 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -2196,8 +2196,12 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt, | |||
| 2196 | 2196 | ||
| 2197 | NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric); | 2197 | NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric); |
| 2198 | 2198 | ||
| 2199 | expires = (rt->rt6i_flags & RTF_EXPIRES) ? | 2199 | if (!(rt->rt6i_flags & RTF_EXPIRES)) |
| 2200 | rt->rt6i_expires - jiffies : 0; | 2200 | expires = 0; |
| 2201 | else if (rt->rt6i_expires - jiffies < INT_MAX) | ||
| 2202 | expires = rt->rt6i_expires - jiffies; | ||
| 2203 | else | ||
| 2204 | expires = INT_MAX; | ||
| 2201 | 2205 | ||
| 2202 | if (rtnl_put_cacheinfo(skb, &rt->u.dst, 0, 0, 0, | 2206 | if (rtnl_put_cacheinfo(skb, &rt->u.dst, 0, 0, 0, |
| 2203 | expires, rt->u.dst.error) < 0) | 2207 | expires, rt->u.dst.error) < 0) |
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index 938ce4ecde55..3ecc1157994e 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c | |||
| @@ -198,7 +198,6 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) | |||
| 198 | ireq = inet_rsk(req); | 198 | ireq = inet_rsk(req); |
| 199 | ireq6 = inet6_rsk(req); | 199 | ireq6 = inet6_rsk(req); |
| 200 | treq = tcp_rsk(req); | 200 | treq = tcp_rsk(req); |
| 201 | ireq6->pktopts = NULL; | ||
| 202 | 201 | ||
| 203 | if (security_inet_conn_request(sk, skb, req)) { | 202 | if (security_inet_conn_request(sk, skb, req)) { |
| 204 | reqsk_free(req); | 203 | reqsk_free(req); |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 715965f0fac0..cb46749d4c32 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1299,7 +1299,6 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
| 1299 | treq = inet6_rsk(req); | 1299 | treq = inet6_rsk(req); |
| 1300 | ipv6_addr_copy(&treq->rmt_addr, &ipv6_hdr(skb)->saddr); | 1300 | ipv6_addr_copy(&treq->rmt_addr, &ipv6_hdr(skb)->saddr); |
| 1301 | ipv6_addr_copy(&treq->loc_addr, &ipv6_hdr(skb)->daddr); | 1301 | ipv6_addr_copy(&treq->loc_addr, &ipv6_hdr(skb)->daddr); |
| 1302 | treq->pktopts = NULL; | ||
| 1303 | if (!want_cookie) | 1302 | if (!want_cookie) |
| 1304 | TCP_ECN_create_request(req, tcp_hdr(skb)); | 1303 | TCP_ECN_create_request(req, tcp_hdr(skb)); |
| 1305 | 1304 | ||
diff --git a/net/key/af_key.c b/net/key/af_key.c index 9bba7ac5fee0..7470e367272b 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
| @@ -3030,6 +3030,9 @@ static int key_notify_sa_expire(struct xfrm_state *x, struct km_event *c) | |||
| 3030 | 3030 | ||
| 3031 | static int pfkey_send_notify(struct xfrm_state *x, struct km_event *c) | 3031 | static int pfkey_send_notify(struct xfrm_state *x, struct km_event *c) |
| 3032 | { | 3032 | { |
| 3033 | if (atomic_read(&pfkey_socks_nr) == 0) | ||
| 3034 | return 0; | ||
| 3035 | |||
| 3033 | switch (c->event) { | 3036 | switch (c->event) { |
| 3034 | case XFRM_MSG_EXPIRE: | 3037 | case XFRM_MSG_EXPIRE: |
| 3035 | return key_notify_sa_expire(x, c); | 3038 | return key_notify_sa_expire(x, c); |
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index c7314bf4bec2..006486b26726 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -899,7 +899,7 @@ extern const struct iw_handler_def ieee80211_iw_handler_def; | |||
| 899 | 899 | ||
| 900 | 900 | ||
| 901 | /* ieee80211_ioctl.c */ | 901 | /* ieee80211_ioctl.c */ |
| 902 | int ieee80211_set_freq(struct ieee80211_local *local, int freq); | 902 | int ieee80211_set_freq(struct net_device *dev, int freq); |
| 903 | /* ieee80211_sta.c */ | 903 | /* ieee80211_sta.c */ |
| 904 | void ieee80211_sta_timer(unsigned long data); | 904 | void ieee80211_sta_timer(unsigned long data); |
| 905 | void ieee80211_sta_work(struct work_struct *work); | 905 | void ieee80211_sta_work(struct work_struct *work); |
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 5c876450b14c..98c0b5e56ecc 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
| @@ -511,6 +511,7 @@ static int ieee80211_stop(struct net_device *dev) | |||
| 511 | case IEEE80211_IF_TYPE_STA: | 511 | case IEEE80211_IF_TYPE_STA: |
| 512 | case IEEE80211_IF_TYPE_IBSS: | 512 | case IEEE80211_IF_TYPE_IBSS: |
| 513 | sdata->u.sta.state = IEEE80211_DISABLED; | 513 | sdata->u.sta.state = IEEE80211_DISABLED; |
| 514 | memset(sdata->u.sta.bssid, 0, ETH_ALEN); | ||
| 514 | del_timer_sync(&sdata->u.sta.timer); | 515 | del_timer_sync(&sdata->u.sta.timer); |
| 515 | /* | 516 | /* |
| 516 | * When we get here, the interface is marked down. | 517 | * When we get here, the interface is marked down. |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 841278f1df8e..4d2b582dd055 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #define IEEE80211_RETRY_AUTH_INTERVAL (1 * HZ) | 44 | #define IEEE80211_RETRY_AUTH_INTERVAL (1 * HZ) |
| 45 | #define IEEE80211_SCAN_INTERVAL (2 * HZ) | 45 | #define IEEE80211_SCAN_INTERVAL (2 * HZ) |
| 46 | #define IEEE80211_SCAN_INTERVAL_SLOW (15 * HZ) | 46 | #define IEEE80211_SCAN_INTERVAL_SLOW (15 * HZ) |
| 47 | #define IEEE80211_IBSS_JOIN_TIMEOUT (20 * HZ) | 47 | #define IEEE80211_IBSS_JOIN_TIMEOUT (7 * HZ) |
| 48 | 48 | ||
| 49 | #define IEEE80211_PROBE_DELAY (HZ / 33) | 49 | #define IEEE80211_PROBE_DELAY (HZ / 33) |
| 50 | #define IEEE80211_CHANNEL_TIME (HZ / 33) | 50 | #define IEEE80211_CHANNEL_TIME (HZ / 33) |
| @@ -2336,6 +2336,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev, | |||
| 2336 | u8 *pos; | 2336 | u8 *pos; |
| 2337 | struct ieee80211_sub_if_data *sdata; | 2337 | struct ieee80211_sub_if_data *sdata; |
| 2338 | struct ieee80211_supported_band *sband; | 2338 | struct ieee80211_supported_band *sband; |
| 2339 | union iwreq_data wrqu; | ||
| 2339 | 2340 | ||
| 2340 | sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; | 2341 | sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; |
| 2341 | 2342 | ||
| @@ -2358,13 +2359,10 @@ static int ieee80211_sta_join_ibss(struct net_device *dev, | |||
| 2358 | sdata->drop_unencrypted = bss->capability & | 2359 | sdata->drop_unencrypted = bss->capability & |
| 2359 | WLAN_CAPABILITY_PRIVACY ? 1 : 0; | 2360 | WLAN_CAPABILITY_PRIVACY ? 1 : 0; |
| 2360 | 2361 | ||
| 2361 | res = ieee80211_set_freq(local, bss->freq); | 2362 | res = ieee80211_set_freq(dev, bss->freq); |
| 2362 | 2363 | ||
| 2363 | if (local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS) { | 2364 | if (res) |
| 2364 | printk(KERN_DEBUG "%s: IBSS not allowed on frequency " | 2365 | return res; |
| 2365 | "%d MHz\n", dev->name, local->oper_channel->center_freq); | ||
| 2366 | return -1; | ||
| 2367 | } | ||
| 2368 | 2366 | ||
| 2369 | /* Set beacon template */ | 2367 | /* Set beacon template */ |
| 2370 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + 400); | 2368 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + 400); |
| @@ -2479,6 +2477,10 @@ static int ieee80211_sta_join_ibss(struct net_device *dev, | |||
| 2479 | ifsta->state = IEEE80211_IBSS_JOINED; | 2477 | ifsta->state = IEEE80211_IBSS_JOINED; |
| 2480 | mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL); | 2478 | mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL); |
| 2481 | 2479 | ||
| 2480 | memset(&wrqu, 0, sizeof(wrqu)); | ||
| 2481 | memcpy(wrqu.ap_addr.sa_data, bss->bssid, ETH_ALEN); | ||
| 2482 | wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL); | ||
| 2483 | |||
| 2482 | return res; | 2484 | return res; |
| 2483 | } | 2485 | } |
| 2484 | 2486 | ||
| @@ -3486,7 +3488,7 @@ static int ieee80211_sta_config_auth(struct net_device *dev, | |||
| 3486 | spin_unlock_bh(&local->sta_bss_lock); | 3488 | spin_unlock_bh(&local->sta_bss_lock); |
| 3487 | 3489 | ||
| 3488 | if (selected) { | 3490 | if (selected) { |
| 3489 | ieee80211_set_freq(local, selected->freq); | 3491 | ieee80211_set_freq(dev, selected->freq); |
| 3490 | if (!(ifsta->flags & IEEE80211_STA_SSID_SET)) | 3492 | if (!(ifsta->flags & IEEE80211_STA_SSID_SET)) |
| 3491 | ieee80211_sta_set_ssid(dev, selected->ssid, | 3493 | ieee80211_sta_set_ssid(dev, selected->ssid, |
| 3492 | selected->ssid_len); | 3494 | selected->ssid_len); |
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 8311bb24f9f3..a8bb8e31b1ec 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
| @@ -290,14 +290,22 @@ static int ieee80211_ioctl_giwmode(struct net_device *dev, | |||
| 290 | return 0; | 290 | return 0; |
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | int ieee80211_set_freq(struct ieee80211_local *local, int freqMHz) | 293 | int ieee80211_set_freq(struct net_device *dev, int freqMHz) |
| 294 | { | 294 | { |
| 295 | int ret = -EINVAL; | 295 | int ret = -EINVAL; |
| 296 | struct ieee80211_channel *chan; | 296 | struct ieee80211_channel *chan; |
| 297 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | ||
| 298 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | ||
| 297 | 299 | ||
| 298 | chan = ieee80211_get_channel(local->hw.wiphy, freqMHz); | 300 | chan = ieee80211_get_channel(local->hw.wiphy, freqMHz); |
| 299 | 301 | ||
| 300 | if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) { | 302 | if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) { |
| 303 | if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS && | ||
| 304 | chan->flags & IEEE80211_CHAN_NO_IBSS) { | ||
| 305 | printk(KERN_DEBUG "%s: IBSS not allowed on frequency " | ||
| 306 | "%d MHz\n", dev->name, chan->center_freq); | ||
| 307 | return ret; | ||
| 308 | } | ||
| 301 | local->oper_channel = chan; | 309 | local->oper_channel = chan; |
| 302 | 310 | ||
| 303 | if (local->sta_sw_scanning || local->sta_hw_scanning) | 311 | if (local->sta_sw_scanning || local->sta_hw_scanning) |
| @@ -315,7 +323,6 @@ static int ieee80211_ioctl_siwfreq(struct net_device *dev, | |||
| 315 | struct iw_request_info *info, | 323 | struct iw_request_info *info, |
| 316 | struct iw_freq *freq, char *extra) | 324 | struct iw_freq *freq, char *extra) |
| 317 | { | 325 | { |
| 318 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | ||
| 319 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 326 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
| 320 | 327 | ||
| 321 | if (sdata->vif.type == IEEE80211_IF_TYPE_STA) | 328 | if (sdata->vif.type == IEEE80211_IF_TYPE_STA) |
| @@ -329,14 +336,14 @@ static int ieee80211_ioctl_siwfreq(struct net_device *dev, | |||
| 329 | IEEE80211_STA_AUTO_CHANNEL_SEL; | 336 | IEEE80211_STA_AUTO_CHANNEL_SEL; |
| 330 | return 0; | 337 | return 0; |
| 331 | } else | 338 | } else |
| 332 | return ieee80211_set_freq(local, | 339 | return ieee80211_set_freq(dev, |
| 333 | ieee80211_channel_to_frequency(freq->m)); | 340 | ieee80211_channel_to_frequency(freq->m)); |
| 334 | } else { | 341 | } else { |
| 335 | int i, div = 1000000; | 342 | int i, div = 1000000; |
| 336 | for (i = 0; i < freq->e; i++) | 343 | for (i = 0; i < freq->e; i++) |
| 337 | div /= 10; | 344 | div /= 10; |
| 338 | if (div > 0) | 345 | if (div > 0) |
| 339 | return ieee80211_set_freq(local, freq->m / div); | 346 | return ieee80211_set_freq(dev, freq->m / div); |
| 340 | else | 347 | else |
| 341 | return -EINVAL; | 348 | return -EINVAL; |
| 342 | } | 349 | } |
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index c4b1799da5d7..662c1ccfee26 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
| @@ -196,8 +196,6 @@ destroy_conntrack(struct nf_conntrack *nfct) | |||
| 196 | if (l4proto && l4proto->destroy) | 196 | if (l4proto && l4proto->destroy) |
| 197 | l4proto->destroy(ct); | 197 | l4proto->destroy(ct); |
| 198 | 198 | ||
| 199 | nf_ct_ext_destroy(ct); | ||
| 200 | |||
| 201 | rcu_read_unlock(); | 199 | rcu_read_unlock(); |
| 202 | 200 | ||
| 203 | spin_lock_bh(&nf_conntrack_lock); | 201 | spin_lock_bh(&nf_conntrack_lock); |
| @@ -520,6 +518,7 @@ static void nf_conntrack_free_rcu(struct rcu_head *head) | |||
| 520 | 518 | ||
| 521 | void nf_conntrack_free(struct nf_conn *ct) | 519 | void nf_conntrack_free(struct nf_conn *ct) |
| 522 | { | 520 | { |
| 521 | nf_ct_ext_destroy(ct); | ||
| 523 | call_rcu(&ct->rcu, nf_conntrack_free_rcu); | 522 | call_rcu(&ct->rcu, nf_conntrack_free_rcu); |
| 524 | } | 523 | } |
| 525 | EXPORT_SYMBOL_GPL(nf_conntrack_free); | 524 | EXPORT_SYMBOL_GPL(nf_conntrack_free); |
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index bc11d7092032..9fda6ee95a31 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c | |||
| @@ -92,10 +92,6 @@ void nf_log_packet(int pf, | |||
| 92 | vsnprintf(prefix, sizeof(prefix), fmt, args); | 92 | vsnprintf(prefix, sizeof(prefix), fmt, args); |
| 93 | va_end(args); | 93 | va_end(args); |
| 94 | logger->logfn(pf, hooknum, skb, in, out, loginfo, prefix); | 94 | logger->logfn(pf, hooknum, skb, in, out, loginfo, prefix); |
| 95 | } else if (net_ratelimit()) { | ||
| 96 | printk(KERN_WARNING "nf_log_packet: can\'t log since " | ||
| 97 | "no backend logging module loaded in! Please either " | ||
| 98 | "load one, or disable logging explicitly\n"); | ||
| 99 | } | 95 | } |
| 100 | rcu_read_unlock(); | 96 | rcu_read_unlock(); |
| 101 | } | 97 | } |
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 508c5895c680..a07f91aac920 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -467,6 +467,25 @@ static void parse_elf_finish(struct elf_info *info) | |||
| 467 | release_file(info->hdr, info->size); | 467 | release_file(info->hdr, info->size); |
| 468 | } | 468 | } |
| 469 | 469 | ||
| 470 | static int ignore_undef_symbol(struct elf_info *info, const char *symname) | ||
| 471 | { | ||
| 472 | /* ignore __this_module, it will be resolved shortly */ | ||
| 473 | if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0) | ||
| 474 | return 1; | ||
| 475 | /* ignore global offset table */ | ||
| 476 | if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0) | ||
| 477 | return 1; | ||
| 478 | if (info->hdr->e_machine == EM_PPC) | ||
| 479 | /* Special register function linked on all modules during final link of .ko */ | ||
| 480 | if (strncmp(symname, "_restgpr_", sizeof("_restgpr_") - 1) == 0 || | ||
| 481 | strncmp(symname, "_savegpr_", sizeof("_savegpr_") - 1) == 0 || | ||
| 482 | strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 || | ||
| 483 | strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0) | ||
| 484 | return 1; | ||
| 485 | /* Do not ignore this symbol */ | ||
| 486 | return 0; | ||
| 487 | } | ||
| 488 | |||
| 470 | #define CRC_PFX MODULE_SYMBOL_PREFIX "__crc_" | 489 | #define CRC_PFX MODULE_SYMBOL_PREFIX "__crc_" |
| 471 | #define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_" | 490 | #define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_" |
| 472 | 491 | ||
| @@ -493,11 +512,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info, | |||
| 493 | if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL && | 512 | if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL && |
| 494 | ELF_ST_BIND(sym->st_info) != STB_WEAK) | 513 | ELF_ST_BIND(sym->st_info) != STB_WEAK) |
| 495 | break; | 514 | break; |
| 496 | /* ignore global offset table */ | 515 | if (ignore_undef_symbol(info, symname)) |
| 497 | if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0) | ||
| 498 | break; | ||
| 499 | /* ignore __this_module, it will be resolved shortly */ | ||
| 500 | if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0) | ||
| 501 | break; | 516 | break; |
| 502 | /* cope with newer glibc (2.3.4 or higher) STT_ definition in elf.h */ | 517 | /* cope with newer glibc (2.3.4 or higher) STT_ definition in elf.h */ |
| 503 | #if defined(STT_REGISTER) || defined(STT_SPARC_REGISTER) | 518 | #if defined(STT_REGISTER) || defined(STT_SPARC_REGISTER) |
diff --git a/security/dummy.c b/security/dummy.c index f50c6c3c32c9..b8916883b77f 100644 --- a/security/dummy.c +++ b/security/dummy.c | |||
| @@ -27,6 +27,8 @@ | |||
| 27 | #include <linux/hugetlb.h> | 27 | #include <linux/hugetlb.h> |
| 28 | #include <linux/ptrace.h> | 28 | #include <linux/ptrace.h> |
| 29 | #include <linux/file.h> | 29 | #include <linux/file.h> |
| 30 | #include <linux/prctl.h> | ||
| 31 | #include <linux/securebits.h> | ||
| 30 | 32 | ||
| 31 | static int dummy_ptrace (struct task_struct *parent, struct task_struct *child) | 33 | static int dummy_ptrace (struct task_struct *parent, struct task_struct *child) |
| 32 | { | 34 | { |
| @@ -607,7 +609,27 @@ static int dummy_task_kill (struct task_struct *p, struct siginfo *info, | |||
| 607 | static int dummy_task_prctl (int option, unsigned long arg2, unsigned long arg3, | 609 | static int dummy_task_prctl (int option, unsigned long arg2, unsigned long arg3, |
| 608 | unsigned long arg4, unsigned long arg5, long *rc_p) | 610 | unsigned long arg4, unsigned long arg5, long *rc_p) |
| 609 | { | 611 | { |
| 610 | return 0; | 612 | switch (option) { |
| 613 | case PR_CAPBSET_READ: | ||
| 614 | *rc_p = (cap_valid(arg2) ? 1 : -EINVAL); | ||
| 615 | break; | ||
| 616 | case PR_GET_KEEPCAPS: | ||
| 617 | *rc_p = issecure(SECURE_KEEP_CAPS); | ||
| 618 | break; | ||
| 619 | case PR_SET_KEEPCAPS: | ||
| 620 | if (arg2 > 1) | ||
| 621 | *rc_p = -EINVAL; | ||
| 622 | else if (arg2) | ||
| 623 | current->securebits |= issecure_mask(SECURE_KEEP_CAPS); | ||
| 624 | else | ||
| 625 | current->securebits &= | ||
| 626 | ~issecure_mask(SECURE_KEEP_CAPS); | ||
| 627 | break; | ||
| 628 | default: | ||
| 629 | return 0; | ||
| 630 | } | ||
| 631 | |||
| 632 | return 1; | ||
| 611 | } | 633 | } |
| 612 | 634 | ||
| 613 | static void dummy_task_reparent_to_init (struct task_struct *p) | 635 | static void dummy_task_reparent_to_init (struct task_struct *p) |
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index cc0cddadd589..6facac5aed90 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c | |||
| @@ -936,11 +936,13 @@ static int add_controls(struct oxygen *chip, | |||
| 936 | 936 | ||
| 937 | for (i = 0; i < count; ++i) { | 937 | for (i = 0; i < count; ++i) { |
| 938 | template = controls[i]; | 938 | template = controls[i]; |
| 939 | err = chip->model->control_filter(&template); | 939 | if (chip->model->control_filter) { |
| 940 | if (err < 0) | 940 | err = chip->model->control_filter(&template); |
| 941 | return err; | 941 | if (err < 0) |
| 942 | if (err == 1) | 942 | return err; |
| 943 | continue; | 943 | if (err == 1) |
| 944 | continue; | ||
| 945 | } | ||
| 944 | if (!strcmp(template.name, "Master Playback Volume") && | 946 | if (!strcmp(template.name, "Master Playback Volume") && |
| 945 | chip->model->dac_tlv) { | 947 | chip->model->dac_tlv) { |
| 946 | template.tlv.p = chip->model->dac_tlv; | 948 | template.tlv.p = chip->model->dac_tlv; |
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 4232fd75dd20..98778cb69c6e 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #else | 45 | #else |
| 46 | #define ioapic_debug(fmt, arg...) | 46 | #define ioapic_debug(fmt, arg...) |
| 47 | #endif | 47 | #endif |
| 48 | static void ioapic_deliver(struct kvm_ioapic *vioapic, int irq); | 48 | static int ioapic_deliver(struct kvm_ioapic *vioapic, int irq); |
| 49 | 49 | ||
| 50 | static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic, | 50 | static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic, |
| 51 | unsigned long addr, | 51 | unsigned long addr, |
| @@ -89,8 +89,8 @@ static void ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx) | |||
| 89 | pent = &ioapic->redirtbl[idx]; | 89 | pent = &ioapic->redirtbl[idx]; |
| 90 | 90 | ||
| 91 | if (!pent->fields.mask) { | 91 | if (!pent->fields.mask) { |
| 92 | ioapic_deliver(ioapic, idx); | 92 | int injected = ioapic_deliver(ioapic, idx); |
| 93 | if (pent->fields.trig_mode == IOAPIC_LEVEL_TRIG) | 93 | if (injected && pent->fields.trig_mode == IOAPIC_LEVEL_TRIG) |
| 94 | pent->fields.remote_irr = 1; | 94 | pent->fields.remote_irr = 1; |
| 95 | } | 95 | } |
| 96 | if (!pent->fields.trig_mode) | 96 | if (!pent->fields.trig_mode) |
| @@ -133,7 +133,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) | |||
| 133 | } | 133 | } |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | static void ioapic_inj_irq(struct kvm_ioapic *ioapic, | 136 | static int ioapic_inj_irq(struct kvm_ioapic *ioapic, |
| 137 | struct kvm_vcpu *vcpu, | 137 | struct kvm_vcpu *vcpu, |
| 138 | u8 vector, u8 trig_mode, u8 delivery_mode) | 138 | u8 vector, u8 trig_mode, u8 delivery_mode) |
| 139 | { | 139 | { |
| @@ -143,7 +143,7 @@ static void ioapic_inj_irq(struct kvm_ioapic *ioapic, | |||
| 143 | ASSERT((delivery_mode == IOAPIC_FIXED) || | 143 | ASSERT((delivery_mode == IOAPIC_FIXED) || |
| 144 | (delivery_mode == IOAPIC_LOWEST_PRIORITY)); | 144 | (delivery_mode == IOAPIC_LOWEST_PRIORITY)); |
| 145 | 145 | ||
| 146 | kvm_apic_set_irq(vcpu, vector, trig_mode); | 146 | return kvm_apic_set_irq(vcpu, vector, trig_mode); |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest, | 149 | static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest, |
| @@ -186,7 +186,7 @@ static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest, | |||
| 186 | return mask; | 186 | return mask; |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | static void ioapic_deliver(struct kvm_ioapic *ioapic, int irq) | 189 | static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq) |
| 190 | { | 190 | { |
| 191 | u8 dest = ioapic->redirtbl[irq].fields.dest_id; | 191 | u8 dest = ioapic->redirtbl[irq].fields.dest_id; |
| 192 | u8 dest_mode = ioapic->redirtbl[irq].fields.dest_mode; | 192 | u8 dest_mode = ioapic->redirtbl[irq].fields.dest_mode; |
| @@ -195,7 +195,7 @@ static void ioapic_deliver(struct kvm_ioapic *ioapic, int irq) | |||
| 195 | u8 trig_mode = ioapic->redirtbl[irq].fields.trig_mode; | 195 | u8 trig_mode = ioapic->redirtbl[irq].fields.trig_mode; |
| 196 | u32 deliver_bitmask; | 196 | u32 deliver_bitmask; |
| 197 | struct kvm_vcpu *vcpu; | 197 | struct kvm_vcpu *vcpu; |
| 198 | int vcpu_id; | 198 | int vcpu_id, r = 0; |
| 199 | 199 | ||
| 200 | ioapic_debug("dest=%x dest_mode=%x delivery_mode=%x " | 200 | ioapic_debug("dest=%x dest_mode=%x delivery_mode=%x " |
| 201 | "vector=%x trig_mode=%x\n", | 201 | "vector=%x trig_mode=%x\n", |
| @@ -204,7 +204,7 @@ static void ioapic_deliver(struct kvm_ioapic *ioapic, int irq) | |||
| 204 | deliver_bitmask = ioapic_get_delivery_bitmask(ioapic, dest, dest_mode); | 204 | deliver_bitmask = ioapic_get_delivery_bitmask(ioapic, dest, dest_mode); |
| 205 | if (!deliver_bitmask) { | 205 | if (!deliver_bitmask) { |
| 206 | ioapic_debug("no target on destination\n"); | 206 | ioapic_debug("no target on destination\n"); |
| 207 | return; | 207 | return 0; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | switch (delivery_mode) { | 210 | switch (delivery_mode) { |
| @@ -216,7 +216,7 @@ static void ioapic_deliver(struct kvm_ioapic *ioapic, int irq) | |||
| 216 | vcpu = ioapic->kvm->vcpus[0]; | 216 | vcpu = ioapic->kvm->vcpus[0]; |
| 217 | #endif | 217 | #endif |
| 218 | if (vcpu != NULL) | 218 | if (vcpu != NULL) |
| 219 | ioapic_inj_irq(ioapic, vcpu, vector, | 219 | r = ioapic_inj_irq(ioapic, vcpu, vector, |
| 220 | trig_mode, delivery_mode); | 220 | trig_mode, delivery_mode); |
| 221 | else | 221 | else |
| 222 | ioapic_debug("null lowest prio vcpu: " | 222 | ioapic_debug("null lowest prio vcpu: " |
| @@ -234,7 +234,7 @@ static void ioapic_deliver(struct kvm_ioapic *ioapic, int irq) | |||
| 234 | deliver_bitmask &= ~(1 << vcpu_id); | 234 | deliver_bitmask &= ~(1 << vcpu_id); |
| 235 | vcpu = ioapic->kvm->vcpus[vcpu_id]; | 235 | vcpu = ioapic->kvm->vcpus[vcpu_id]; |
| 236 | if (vcpu) { | 236 | if (vcpu) { |
| 237 | ioapic_inj_irq(ioapic, vcpu, vector, | 237 | r = ioapic_inj_irq(ioapic, vcpu, vector, |
| 238 | trig_mode, delivery_mode); | 238 | trig_mode, delivery_mode); |
| 239 | } | 239 | } |
| 240 | } | 240 | } |
| @@ -246,6 +246,7 @@ static void ioapic_deliver(struct kvm_ioapic *ioapic, int irq) | |||
| 246 | delivery_mode); | 246 | delivery_mode); |
| 247 | break; | 247 | break; |
| 248 | } | 248 | } |
| 249 | return r; | ||
| 249 | } | 250 | } |
| 250 | 251 | ||
| 251 | void kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level) | 252 | void kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level) |